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 3DF8CC0218A for ; Thu, 30 Jan 2025 10:27:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E46FD10E926; Thu, 30 Jan 2025 10:27:46 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="L+lWxQtd"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id E828710E936 for ; Thu, 30 Jan 2025 10:27:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738232866; x=1769768866; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=6HCJxkrDpQktqf/6nrQ2K4hxhdH+bzRuk5Urtsdn+qg=; b=L+lWxQtd5pOeU+/tSzgEOYBgHcOtV2qQu1VLPtWgn+ON5SryDuAv4Gi7 4yAgDwV1mVq1Zj1cj6QRaXydh+34FJs2fPiXqnW4T1xT1pwnSKgKfkSwi MSz0eSltKJ3Qs9S8EEdHN+twiJWstXPqkeNWgxMg/uxkJisMdLDkY3oJ5 ki/qJy692dQmdRwLUIUfow7wh1i0sXzbhXTkxdZI6BPfHah9V/k1TbG3h ZhWI4fZqfNlf55UcmSx5IWLOHsuXUPweiAIUMbsbboe1MPKjf/zN+SfLr CCSmwbfPcQ9WQERS3H+ekFgtNHv8vUEPnQ9cZ+LS0xqGjsiKYf01TbrQB Q==; X-CSE-ConnectionGUID: IQWRJMffSWGVBfMWbdeQRA== X-CSE-MsgGUID: pQ9X/4veTR6zNUQ0Mxj8cQ== X-IronPort-AV: E=McAfee;i="6700,10204,11330"; a="56309736" X-IronPort-AV: E=Sophos;i="6.13,245,1732608000"; d="scan'208";a="56309736" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 02:27:46 -0800 X-CSE-ConnectionGUID: GiRtFOloQKq27YdTB7tnBw== X-CSE-MsgGUID: 0oOJHadzQ1K3G7m1TTJcKA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,245,1732608000"; d="scan'208";a="109193546" Received: from dprybysh-mobl.ger.corp.intel.com (HELO localhost) ([10.245.246.58]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 02:27:44 -0800 From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Cc: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= , Lucas De Marchi , Kamil Konieczny Subject: [PATCH i-g-t] lib/igt_device_scan: limit fetched device attributes from udev Date: Thu, 30 Jan 2025 11:27:41 +0100 Message-Id: <20250130102741.38454-1-zbigniew.kempczynski@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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" Tests don't need all attributes so default device scanning is now limited to small list directly used in device filters. To be backward compatible tools like lsgpu still may scan whole attribute list what keeps this behavior intact. Cc: Lucas De Marchi Cc: Kamil Konieczny Signed-off-by: Zbigniew Kempczyński --- v2: refactor code a bit (Kamil) --- lib/igt_device_scan.c | 50 ++++++++++++++++++++++++++++++++++--------- lib/igt_device_scan.h | 1 + tools/lsgpu.c | 2 +- 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c index c36b0efa90..711bedc5c8 100644 --- a/lib/igt_device_scan.c +++ b/lib/igt_device_scan.c @@ -22,6 +22,7 @@ * */ +#include "drmtest.h" #include "igt_core.h" #include "igt_device_scan.h" #include "igt_list.h" @@ -206,6 +207,8 @@ enum dev_type { #define STR_INTEGRATED "integrated" #define STR_DISCRETE "discrete" +static const char * const attrs[] = { "driver", "sriov_numvfs", "physfn" }; + static inline bool strequal(const char *a, const char *b) { if (a == NULL || b == NULL) @@ -548,7 +551,7 @@ static void get_props(struct udev_device *dev, struct igt_device *idev) * Function skips sysattrs from blacklist ht (acquiring some values can take * seconds). */ -static void get_attrs(struct udev_device *dev, struct igt_device *idev) +static void get_attrs_all(struct udev_device *dev, struct igt_device *idev) { struct udev_list_entry *entry; @@ -569,6 +572,19 @@ static void get_attrs(struct udev_device *dev, struct igt_device *idev) } } +static void get_attrs_limited(struct udev_device *dev, struct igt_device *idev) +{ + const char *value; + + for (int i = 0; i < ARRAY_SIZE(attrs); i++) { + value = udev_device_get_sysattr_value(dev, attrs[i]); + if (!value) + continue; + igt_device_add_attr(idev, attrs[i], value); + DBG("attr: %s, val: %s\n", attrs[i], value); + } +} + #define get_prop(dev, prop) ((char *) g_hash_table_lookup(dev->props_ht, prop)) #define get_attr(dev, attr) ((char *) g_hash_table_lookup(dev->attrs_ht, attr)) #define get_prop_subsystem(dev) get_prop(dev, "SUBSYSTEM") @@ -639,7 +655,8 @@ static char* strdup_nullsafe(const char* str) * Fills structure with most usable udev device variables, properties * and sysattrs. */ -static struct igt_device *igt_device_new_from_udev(struct udev_device *dev) +static struct igt_device *igt_device_new_from_udev(struct udev_device *dev, + bool limit_attrs) { struct igt_device *idev = igt_device_new(); @@ -654,7 +671,8 @@ static struct igt_device *igt_device_new_from_udev(struct udev_device *dev) idev->drm_render = strdup(idev->devnode); get_props(dev, idev); - get_attrs(dev, idev); + limit_attrs ? get_attrs_limited(dev, idev) : + get_attrs_all(dev, idev); if (is_pci_subsystem(idev)) { uint16_t vendor, device; @@ -868,7 +886,8 @@ static struct igt_device *igt_device_from_syspath(const char *syspath) */ static void update_or_add_parent(struct udev *udev, struct udev_device *dev, - struct igt_device *idev) + struct igt_device *idev, + bool limit_attrs) { struct udev_device *parent_dev; struct igt_device *parent_idev; @@ -899,7 +918,7 @@ static void update_or_add_parent(struct udev *udev, * return fresh udev device. */ parent_dev = udev_device_new_from_syspath(udev, syspath); - parent_idev = igt_device_new_from_udev(parent_dev); + parent_idev = igt_device_new_from_udev(parent_dev, limit_attrs); udev_device_unref(parent_dev); if (parent_idev) @@ -1000,7 +1019,7 @@ static void index_pci_devices(void) * Function sorts all found devices to keep same order of bus devices * for providing predictable search. */ -static void scan_drm_devices(void) +static void scan_drm_devices(bool limit_attrs) { struct udev *udev; struct udev_enumerate *enumerate; @@ -1035,9 +1054,9 @@ static void scan_drm_devices(void) path = udev_list_entry_get_name(dev_list_entry); udev_dev = udev_device_new_from_syspath(udev, path); - idev = igt_device_new_from_udev(udev_dev); + idev = igt_device_new_from_udev(udev_dev, limit_attrs); igt_list_add_tail(&idev->link, &igt_devs.all); - update_or_add_parent(udev, udev_dev, idev); + update_or_add_parent(udev, udev_dev, idev, limit_attrs); udev_device_unref(udev_dev); } @@ -1092,17 +1111,28 @@ void igt_devices_free(void) * * Function scans udev in search of gpu devices. */ -void igt_devices_scan(void) + +static void __igt_devices_scan(bool limit_attrs) { if (igt_devs.devs_scanned) igt_devices_free(); prepare_scan(); - scan_drm_devices(); + scan_drm_devices(limit_attrs); igt_devs.devs_scanned = true; } +void igt_devices_scan(void) +{ + __igt_devices_scan(true); +} + +void igt_devices_scan_all_attrs(void) +{ + __igt_devices_scan(false); +} + static inline void _pr_simple(const char *k, const char *v) { printf(" %-16s: %s\n", k, v); diff --git a/lib/igt_device_scan.h b/lib/igt_device_scan.h index fa90134aa3..92741fe3c7 100644 --- a/lib/igt_device_scan.h +++ b/lib/igt_device_scan.h @@ -64,6 +64,7 @@ struct igt_device_card { }; void igt_devices_scan(void); +void igt_devices_scan_all_attrs(void); void igt_devices_print(const struct igt_devices_print_format *fmt); void igt_devices_print_vendors(void); diff --git a/tools/lsgpu.c b/tools/lsgpu.c index e482ca6b75..e683900833 100644 --- a/tools/lsgpu.c +++ b/tools/lsgpu.c @@ -362,7 +362,7 @@ int main(int argc, char *argv[]) printf("Notice: Using filter from .igtrc\n"); } - igt_devices_scan(); + igt_devices_scan_all_attrs(); if (igt_device != NULL) { struct igt_device_card card; -- 2.34.1