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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9551CCFD379 for ; Tue, 25 Nov 2025 09:39:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C33510E39F; Tue, 25 Nov 2025 09:39:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="TGRXqFFl"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D34F10E3A0 for ; Tue, 25 Nov 2025 09:38:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764063539; x=1795599539; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=0Nk6BofhcsvZtHcuj5Rf7yRGizMz7IMHy0OFKeeBfYs=; b=TGRXqFFlnLMDs8t3ZM9mBaD8RFbiUZC+KoNriilzO9egGYFbw8Ajp0X9 0Q/VVivR06IEwiTJq/+JfVruaLz2Ot4fNpqMwL5GhWy7ZJnvEE8gkNJAE OVxEgZCZFoIjClWLYKUyNPaEs3562FrgNGbEPmr1vjsHy6oBtvHpIDmsh OumUZDheXwgIhL3DxL/S21nOf0ChF4p0huQYV+OjMCk4SD1RsCtkGC4Vw EccIlgoL23oaUzEuBT/SpdtF/WSAmxAmbEXgIRr+VKidgl71spmf7Lt7X mOl3/l5fLGiPgVMl9ssmIoWr04G9wBVi3dxhlcuXwWFT006nra/euDWZP g==; X-CSE-ConnectionGUID: RxrZFy2LQfaBQfruY3aYaQ== X-CSE-MsgGUID: 6kaDPKw0R5eo92xNqHwzhQ== X-IronPort-AV: E=McAfee;i="6800,10657,11623"; a="66022183" X-IronPort-AV: E=Sophos;i="6.20,225,1758610800"; d="scan'208";a="66022183" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Nov 2025 01:38:59 -0800 X-CSE-ConnectionGUID: vfT5dkBcTvqX+BYEbU/a3A== X-CSE-MsgGUID: 7rfI9UzBRyyg9/uU5EzKMg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,225,1758610800"; d="scan'208";a="215943988" Received: from lab-ah.igk.intel.com (HELO [127.0.1.1]) ([10.211.135.228]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Nov 2025 01:38:57 -0800 From: Andrzej Hajda Date: Tue, 25 Nov 2025 10:37:23 +0100 Subject: [PATCH v6 3/7] lib/xe/xe_query: use recently introduced helper to query device MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251125-xe_query_helpers-v6-3-97686fac1b77@intel.com> References: <20251125-xe_query_helpers-v6-0-97686fac1b77@intel.com> In-Reply-To: <20251125-xe_query_helpers-v6-0-97686fac1b77@intel.com> To: igt-dev@lists.freedesktop.org Cc: Kamil Konieczny , Priyanka Dandamudi , Gwan-gyeong Mun , =?utf-8?q?Piotr_Pi=C3=B3rkowski?= , Christoph Manszewski , Andrzej Hajda X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7578; i=andrzej.hajda@intel.com; h=from:subject:message-id; bh=0Nk6BofhcsvZtHcuj5Rf7yRGizMz7IMHy0OFKeeBfYs=; b=owEB7QES/pANAwAKASNispPeEP3XAcsmYgBpJXjmx9HF3sV3yGvlfT1VAOqGvBkzkWGPSSiEx G1i2hR6HSaJAbMEAAEKAB0WIQT8qEQxNN2/XeF/A00jYrKT3hD91wUCaSV45gAKCRAjYrKT3hD9 19mVC/4gij/m8BqFFn8nmAdK3pzD2uwBIuSjK0rcd5TPFdHQBpl5T7AOnNi/UF8uGhYoNNpUmA1 g8YjEN3Sn1bN4Zatg3FRjODaiYp62LRuryzrv7cl20gEGn8IWr0On5PZOS6WCTzmLcEOyS1ULfg mQYXHosEgCnxs3j+Y/AQy8YpxqExe7i6AyxgIIv77vQIgVJhBFSgINAulDPAvhG5DBaDs1qVS5Q UZPvSH3ikG1EMrw+HwOHSayL7fwixNMiZ99Rr4OxAaQzriADxlyzCp7aG8biWlDoNc6R1cX2dlh O4bWiVlLbaPA9kSrc6JRM3oMlbJJ5SMrAv6iqcZ3+ZLVMq0RhbWafvNsSxewX/8OZXhM7YvkX6N E/s4FW7+V7LwaNoqONKPncrd76AcZkEiuA+i2TGDiSaLUYrHT0OdW/Q5weiRdMYa2GM3L4LmnJd DlJ29v7L14vtSTxXl0A9PTYekZSAl0QkUV+OhjQ7m9EI/FxQ/CoFIHMoXQEcWJhbutg7A= X-Developer-Key: i=andrzej.hajda@intel.com; a=openpgp; fpr=FCA8443134DDBF5DE17F034D2362B293DE10FDD7 X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" It simplifies the code. Signed-off-by: Andrzej Hajda Reviewed-by: Kamil Konieczny --- lib/xe/xe_query.c | 190 +++--------------------------------------------------- 1 file changed, 8 insertions(+), 182 deletions(-) diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c index a185b852e19b87e393f4bc6edbf9e0952439d518..3f3ee9b965949c2d0b821c9346183021db8338a9 100644 --- a/lib/xe/xe_query.c +++ b/lib/xe/xe_query.c @@ -68,83 +68,6 @@ skip_query: return data; } -static struct drm_xe_query_config *xe_query_config_new(int fd) -{ - struct drm_xe_query_config *config; - struct drm_xe_device_query query = { - .extensions = 0, - .query = DRM_XE_DEVICE_QUERY_CONFIG, - .size = 0, - .data = 0, - }; - - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - config = malloc(query.size); - igt_assert(config); - - query.data = to_user_pointer(config); - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - VG(VALGRIND_MAKE_MEM_DEFINED(config, query.size)); - - igt_assert(config->num_params > 0); - - return config; -} - -static uint32_t *xe_query_hwconfig_new(int fd, uint32_t *hwconfig_size) -{ - uint32_t *hwconfig; - struct drm_xe_device_query query = { - .extensions = 0, - .query = DRM_XE_DEVICE_QUERY_HWCONFIG, - .size = 0, - .data = 0, - }; - - /* Perform the initial query to get the size */ - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - if (!query.size) - return NULL; - - hwconfig = malloc(query.size); - igt_assert(hwconfig); - - query.data = to_user_pointer(hwconfig); - - /* Perform the query to get the actual data */ - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - VG(VALGRIND_MAKE_MEM_DEFINED(hwconfig, query.size)); - - *hwconfig_size = query.size; - return hwconfig; -} - -static struct drm_xe_query_gt_list *xe_query_gt_list_new(int fd) -{ - struct drm_xe_query_gt_list *gt_list; - struct drm_xe_device_query query = { - .extensions = 0, - .query = DRM_XE_DEVICE_QUERY_GT_LIST, - .size = 0, - .data = 0, - }; - - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - gt_list = malloc(query.size); - igt_assert(gt_list); - - query.data = to_user_pointer(gt_list); - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - VG(VALGRIND_MAKE_MEM_DEFINED(gt_list, query.size)); - - return gt_list; -} - static uint64_t __memory_regions(const struct drm_xe_query_gt_list *gt_list) { uint64_t regions = 0; @@ -157,103 +80,6 @@ static uint64_t __memory_regions(const struct drm_xe_query_gt_list *gt_list) return regions; } -static struct drm_xe_query_engines *xe_query_engines(int fd) -{ - struct drm_xe_query_engines *engines; - struct drm_xe_device_query query = { - .extensions = 0, - .query = DRM_XE_DEVICE_QUERY_ENGINES, - .size = 0, - .data = 0, - }; - - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - engines = malloc(query.size); - igt_assert(engines); - - query.data = to_user_pointer(engines); - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - VG(VALGRIND_MAKE_MEM_DEFINED(engines, query.size)); - - return engines; -} - -static struct drm_xe_query_mem_regions *xe_query_mem_regions_new(int fd) -{ - struct drm_xe_query_mem_regions *mem_regions; - struct drm_xe_device_query query = { - .extensions = 0, - .query = DRM_XE_DEVICE_QUERY_MEM_REGIONS, - .size = 0, - .data = 0, - }; - - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - mem_regions = malloc(query.size); - igt_assert(mem_regions); - - query.data = to_user_pointer(mem_regions); - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - VG(VALGRIND_MAKE_MEM_DEFINED(mem_regions, query.size)); - - return mem_regions; -} - -static struct drm_xe_query_eu_stall *xe_query_eu_stall_new(int fd) -{ - struct drm_xe_query_eu_stall *query_eu_stall; - struct drm_xe_device_query query = { - .extensions = 0, - .query = DRM_XE_DEVICE_QUERY_EU_STALL, - .size = 0, - .data = 0, - }; - - /* Support older kernels where this uapi is not yet available */ - if (igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query)) - return NULL; - igt_assert_neq(query.size, 0); - - query_eu_stall = malloc(query.size); - igt_assert(query_eu_stall); - - query.data = to_user_pointer(query_eu_stall); - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - VG(VALGRIND_MAKE_MEM_DEFINED(query_eu_stall, query.size)); - - return query_eu_stall; -} - -static struct drm_xe_query_oa_units *xe_query_oa_units_new(int fd) -{ - struct drm_xe_query_oa_units *oa_units; - struct drm_xe_device_query query = { - .extensions = 0, - .query = DRM_XE_DEVICE_QUERY_OA_UNITS, - .size = 0, - .data = 0, - }; - - /* Support older kernels where this uapi is not yet available */ - if (igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query)) - return NULL; - - oa_units = malloc(query.size); - igt_assert(oa_units); - - query.data = to_user_pointer(oa_units); - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - - VG(VALGRIND_MAKE_MEM_DEFINED(oa_units, query.size)); - - return oa_units; -} - static uint64_t native_region_for_gt(const struct drm_xe_gt *gt) { uint64_t region; @@ -412,11 +238,11 @@ struct xe_device *xe_device_get(int fd) igt_assert(xe_dev); xe_dev->fd = fd; - xe_dev->config = xe_query_config_new(fd); - xe_dev->hwconfig = xe_query_hwconfig_new(fd, &xe_dev->hwconfig_size); + xe_dev->config = xe_query_device(fd, DRM_XE_DEVICE_QUERY_CONFIG, NULL); + xe_dev->hwconfig = xe_query_device_may_fail(fd, DRM_XE_DEVICE_QUERY_HWCONFIG, &xe_dev->hwconfig_size); xe_dev->va_bits = xe_dev->config->info[DRM_XE_QUERY_CONFIG_VA_BITS]; xe_dev->dev_id = xe_dev->config->info[DRM_XE_QUERY_CONFIG_REV_AND_DEVICE_ID] & 0xffff; - xe_dev->gt_list = xe_query_gt_list_new(fd); + xe_dev->gt_list = xe_query_device(fd, DRM_XE_DEVICE_QUERY_GT_LIST, NULL); /* GT IDs may be non-consecutive; keep a mask of valid IDs */ for (int gt = 0; gt < xe_dev->gt_list->num_gt; gt++) @@ -427,10 +253,10 @@ struct xe_device *xe_device_get(int fd) xe_dev->tile_mask |= (1ull << xe_dev->gt_list->gt_list[gt].tile_id); xe_dev->memory_regions = __memory_regions(xe_dev->gt_list); - xe_dev->engines = xe_query_engines(fd); - xe_dev->mem_regions = xe_query_mem_regions_new(fd); - xe_dev->eu_stall = xe_query_eu_stall_new(fd); - xe_dev->oa_units = xe_query_oa_units_new(fd); + xe_dev->engines = xe_query_device(fd, DRM_XE_DEVICE_QUERY_ENGINES, NULL); + xe_dev->mem_regions = xe_query_device(fd, DRM_XE_DEVICE_QUERY_MEM_REGIONS, NULL); + xe_dev->eu_stall = xe_query_device_may_fail(fd, DRM_XE_DEVICE_QUERY_EU_STALL, NULL); + xe_dev->oa_units = xe_query_device_may_fail(fd, DRM_XE_DEVICE_QUERY_OA_UNITS, NULL); /* * vram_size[] and visible_vram_size[] are indexed by uapi ID; ensure @@ -860,7 +686,7 @@ static void __available_vram_size_snapshot(int fd, int gt, struct __available_vr mem_region = &xe_dev->mem_regions->mem_regions[region_idx]; if (XE_IS_CLASS_VRAM(mem_region)) { - mem_regions = xe_query_mem_regions_new(fd); + mem_regions = xe_query_device(fd, DRM_XE_DEVICE_QUERY_MEM_REGIONS, NULL); pthread_mutex_lock(&cache.cache_mutex); mem_region->used = mem_regions->mem_regions[region_idx].used; mem_region->cpu_visible_used = -- 2.43.0