From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 706D5C07E9E for ; Thu, 8 Jul 2021 12:26:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 143576192A for ; Thu, 8 Jul 2021 12:26:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 143576192A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E5D9B6E241; Thu, 8 Jul 2021 12:26:43 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 150E86E222; Thu, 8 Jul 2021 12:26:43 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10038"; a="273334407" X-IronPort-AV: E=Sophos;i="5.84,222,1620716400"; d="scan'208";a="273334407" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2021 05:26:42 -0700 X-IronPort-AV: E=Sophos;i="5.84,222,1620716400"; d="scan'208";a="487585280" Received: from dhowell-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.213.219.126]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2021 05:26:41 -0700 From: Matthew Auld To: igt-dev@lists.freedesktop.org Date: Thu, 8 Jul 2021 13:25:53 +0100 Message-Id: <20210708122554.1874987-2-matthew.auld@intel.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210708122554.1874987-1-matthew.auld@intel.com> References: <20210708122554.1874987-1-matthew.auld@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 2/3] tests/i915_query: extract query_garbage_items X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" We should be able to re-use this for other queries. Signed-off-by: Matthew Auld Cc: Ville Syrjala --- tests/i915/i915_query.c | 46 ++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/tests/i915/i915_query.c b/tests/i915/i915_query.c index 29b938e9..34965841 100644 --- a/tests/i915/i915_query.c +++ b/tests/i915/i915_query.c @@ -92,7 +92,8 @@ static void test_query_garbage(int fd) i915_query_items_err(fd, &item, 1, EINVAL); } -static void test_query_garbage_items(int fd) +static void test_query_garbage_items(int fd, int query_id, int min_item_size, + int sizeof_query_item) { struct drm_i915_query_item items[2]; struct drm_i915_query_item *items_ptr; @@ -103,7 +104,7 @@ static void test_query_garbage_items(int fd) * Subject to change in the future. */ memset(items, 0, sizeof(items)); - items[0].query_id = DRM_I915_QUERY_TOPOLOGY_INFO; + items[0].query_id = query_id; items[0].flags = 42; i915_query_items(fd, items, 1); igt_assert_eq(items[0].length, -EINVAL); @@ -113,10 +114,10 @@ static void test_query_garbage_items(int fd) * one is properly processed. */ memset(items, 0, sizeof(items)); - items[0].query_id = DRM_I915_QUERY_TOPOLOGY_INFO; + items[0].query_id = query_id; items[1].query_id = ULONG_MAX; i915_query_items(fd, items, 2); - igt_assert_lte(MIN_TOPOLOGY_ITEM_SIZE, items[0].length); + igt_assert_lte(min_item_size, items[0].length); igt_assert_eq(items[1].length, -EINVAL); /* @@ -126,16 +127,16 @@ static void test_query_garbage_items(int fd) */ memset(items, 0, sizeof(items)); items[0].query_id = ULONG_MAX; - items[1].query_id = DRM_I915_QUERY_TOPOLOGY_INFO; + items[1].query_id = query_id; i915_query_items(fd, items, 2); igt_assert_eq(items[0].length, -EINVAL); - igt_assert_lte(MIN_TOPOLOGY_ITEM_SIZE, items[1].length); + igt_assert_lte(min_item_size, items[1].length); /* Test a couple of invalid data pointer in query item. */ memset(items, 0, sizeof(items)); - items[0].query_id = DRM_I915_QUERY_TOPOLOGY_INFO; + items[0].query_id = query_id; i915_query_items(fd, items, 1); - igt_assert_lte(MIN_TOPOLOGY_ITEM_SIZE, items[0].length); + igt_assert_lte(min_item_size, items[0].length); items[0].data_ptr = 0; i915_query_items(fd, items, 1); @@ -145,14 +146,13 @@ static void test_query_garbage_items(int fd) i915_query_items(fd, items, 1); igt_assert_eq(items[0].length, -EFAULT); - /* Test an invalid query item length. */ memset(items, 0, sizeof(items)); - items[0].query_id = DRM_I915_QUERY_TOPOLOGY_INFO; - items[1].query_id = DRM_I915_QUERY_TOPOLOGY_INFO; - items[1].length = sizeof(struct drm_i915_query_topology_info) - 1; + items[0].query_id = query_id; + items[1].query_id = query_id; + items[1].length = sizeof_query_item - 1; i915_query_items(fd, items, 2); - igt_assert_lte(MIN_TOPOLOGY_ITEM_SIZE, items[0].length); + igt_assert_lte(min_item_size, items[0].length); igt_assert_eq(items[1].length, -EINVAL); /* @@ -162,9 +162,9 @@ static void test_query_garbage_items(int fd) * has been removed from our address space. */ items_ptr = mmap(0, 4096, PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); - items_ptr[0].query_id = DRM_I915_QUERY_TOPOLOGY_INFO; + items_ptr[0].query_id = query_id; i915_query_items(fd, items_ptr, 1); - igt_assert_lte(MIN_TOPOLOGY_ITEM_SIZE, items_ptr[0].length); + igt_assert_lte(min_item_size, items_ptr[0].length); munmap(items_ptr, 4096); i915_query_items_err(fd, items_ptr, 1, EFAULT); @@ -173,7 +173,7 @@ static void test_query_garbage_items(int fd) * the kernel errors out with EFAULT. */ items_ptr = mmap(0, 4096, PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); - items_ptr[0].query_id = DRM_I915_QUERY_TOPOLOGY_INFO; + items_ptr[0].query_id = query_id; igt_assert_eq(0, mprotect(items_ptr, 4096, PROT_READ)); i915_query_items_err(fd, items_ptr, 1, EFAULT); munmap(items_ptr, 4096); @@ -186,12 +186,20 @@ static void test_query_garbage_items(int fd) memset(items_ptr, 0, 8192); n_items = 8192 / sizeof(struct drm_i915_query_item); for (i = 0; i < n_items; i++) - items_ptr[i].query_id = DRM_I915_QUERY_TOPOLOGY_INFO; + items_ptr[i].query_id = query_id; mprotect(((uint8_t *)items_ptr) + 4096, 4096, PROT_READ); i915_query_items_err(fd, items_ptr, n_items, EFAULT); munmap(items_ptr, 8192); } +static void test_query_topology_garbage_items(int fd) +{ + test_query_garbage_items(fd, + DRM_I915_QUERY_TOPOLOGY_INFO, + MIN_TOPOLOGY_ITEM_SIZE, + sizeof(struct drm_i915_query_topology_info)); +} + /* * Allocate more on both sides of where the kernel is going to write and verify * that it writes only where it's supposed to. @@ -738,9 +746,9 @@ igt_main igt_subtest("query-garbage") test_query_garbage(fd); - igt_subtest("query-garbage-items") { + igt_subtest("query-topology-garbage-items") { igt_require(query_topology_supported(fd)); - test_query_garbage_items(fd); + test_query_topology_garbage_items(fd); } igt_subtest("query-topology-kernel-writes") { -- 2.26.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx