* [igt-dev] [PATCH i-g-t v5 0/2] Add device selection methods
@ 2019-08-23 7:03 Zbigniew Kempczyński
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API Zbigniew Kempczyński
` (3 more replies)
0 siblings, 4 replies; 15+ messages in thread
From: Zbigniew Kempczyński @ 2019-08-23 7:03 UTC (permalink / raw)
To: igt-dev
v2: In this series I've removed module management and hand device classes
filtering (udev filters are now used in this case). Lsgpu was
simplified (some options were unreadable and they were removed).
Still migration to gtkdoc is necessary which will be made in v3.
v3: Change device scanning to drm subsystem with getting parent
according to Daniel Vetter suggestion. Splitting to two patches
and adding gtk-doc documentation.
v4: Extending and fixing documentation. Adding reviewers forgotten
in v3.
v5: Adding .igtrc support. Fixing code according to review comments.
Lsgpu device selection order now uses same search strategy
like IGT core. It uses --device / IGT_DEVICE and .igtrc
order accordingly to verify tests device selection works as expected.
Zbigniew Kempczyński (2):
Introduce device selection API
Add device selection for IGT
docs/chamelium.txt | 3 +
.../igt-gpu-tools/igt-gpu-tools-docs.xml | 1 +
lib/Makefile.sources | 2 +
lib/drmtest.c | 188 ++-
lib/drmtest.h | 9 +
lib/igt_core.c | 34 +
lib/igt_device_scan.c | 1380 +++++++++++++++++
lib/igt_device_scan.h | 74 +
lib/meson.build | 1 +
tools/Makefile.sources | 1 +
tools/lsgpu.c | 261 ++++
tools/meson.build | 1 +
12 files changed, 1953 insertions(+), 2 deletions(-)
create mode 100644 lib/igt_device_scan.c
create mode 100644 lib/igt_device_scan.h
create mode 100644 tools/lsgpu.c
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API
2019-08-23 7:03 [igt-dev] [PATCH i-g-t v5 0/2] Add device selection methods Zbigniew Kempczyński
@ 2019-08-23 7:03 ` Zbigniew Kempczyński
2019-08-28 6:10 ` Katarzyna Dec
2019-09-03 6:04 ` Arkadiusz Hiler
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT Zbigniew Kempczyński
` (2 subsequent siblings)
3 siblings, 2 replies; 15+ messages in thread
From: Zbigniew Kempczyński @ 2019-08-23 7:03 UTC (permalink / raw)
To: igt-dev; +Cc: Daniel Vetter, Petri Latvala
Change adds device selection based on scanning drm subsystem
using udev library.
Tool 'lsgpu' for device scanning and selection was added.
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Petri Latvala <petri.latvala@intel.com>
---
.../igt-gpu-tools/igt-gpu-tools-docs.xml | 1 +
lib/Makefile.sources | 2 +
lib/igt_device_scan.c | 1380 +++++++++++++++++
lib/igt_device_scan.h | 74 +
lib/meson.build | 1 +
tools/Makefile.sources | 1 +
tools/lsgpu.c | 261 ++++
tools/meson.build | 1 +
8 files changed, 1721 insertions(+)
create mode 100644 lib/igt_device_scan.c
create mode 100644 lib/igt_device_scan.h
create mode 100644 tools/lsgpu.c
diff --git a/docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml b/docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
index ac83272f..4b3c38af 100644
--- a/docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
+++ b/docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
@@ -23,6 +23,7 @@
<xi:include href="xml/igt_core.xml"/>
<xi:include href="xml/igt_debugfs.xml"/>
<xi:include href="xml/igt_device.xml"/>
+ <xi:include href="xml/igt_device_scan.xml"/>
<xi:include href="xml/igt_draw.xml"/>
<xi:include href="xml/igt_dummyload.xml"/>
<xi:include href="xml/igt_fb.xml"/>
diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index cf094ab8..a9e9557a 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -25,6 +25,8 @@ lib_source_list = \
igt_debugfs.h \
igt_device.c \
igt_device.h \
+ igt_device_scan.c \
+ igt_device_scan.h \
igt_aux.c \
igt_aux.h \
igt_color_encoding.c \
diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c
new file mode 100644
index 00000000..8de790d9
--- /dev/null
+++ b/lib/igt_device_scan.c
@@ -0,0 +1,1380 @@
+/*
+ * Copyright © 2019 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include "igt.h"
+#include "igt_sysfs.h"
+#include "igt_device.h"
+#include "igt_device_scan.h"
+#include <glib.h>
+#include <libudev.h>
+#include <linux/limits.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <fcntl.h>
+
+/**
+ * SECTION:igt_device_scan
+ * @short_description: Device scanning and selection
+ * @title: Device selection
+ * @include: igt.h
+ *
+ * # Device scanning
+ *
+ * Device scanning iterates over drm subsystem using udev library
+ * to acquire drm devices.
+ * For each drm device we also get and store its parent in a device array
+ * to allow device selection in more contextual way.
+ *
+ * Parent devices are bus devices (like pci, platform, etc.) and contain a lot
+ * of usable information comparing to drm device.
+ *
+ * Udev keeps properties and sysattrs for the device as a list what is not
+ * convinient for key/value searching. So udev device properties and sysattrs
+ * are rewritten to internal hash tables in igt_device structure.
+ *
+ * # Filters
+ *
+ * Device selection can be done using filters. Filters allow sophisticated
+ * device matching and selection. Previously mentioned properties and sysattrs
+ * collected in igt_device hash tables simplify writing filter implementation.
+ *
+ * Direct device selection filter
+ * is special filter and it is checked first. Then contextual filter is chosen
+ * depending on filter name.
+ *
+ * Direct device selection filter must be:
+ *
+ * |[<!-- language="plain" -->
+ * subsystem:/sys
+ * ]|
+ *
+ * So, when user passes filter which looks like follows:
+ * |[<!-- language="plain" -->
+ * - drm:/sys/devices/pci0000:00/0000:00:02.0/drm/card0
+ * - pci:/sys/devices/pci0000:00/0000:00:02.0
+ * - platform:/sys/devices/platform/vgem
+ * ]|
+ *
+ * device from array which has subsystem and sys path will be returned.
+ *
+ * When /sys is not specified after colon contextual filters are taken
+ * into account. Drm device occurs in the system when appropriate module
+ * is loaded and device is detected (or exposed for platform devices). Loading
+ * drivers in different order can be problematic from CI point of view, where
+ * expectation is to get same device especially when multiple gpu devices
+ * exists in the system. For such devices its parent location on pci bus
+ * is constant and allows appropriate device selection using for example
+ * vendor / device ids.
+ *
+ * For tests which opens more than one device device filter collection API
+ * can be used. You can add a filter to the array using igt_device_filter_add(),
+ * get the nth filter stored using igt_device_filter_get() and get
+ * #igt_device_card using igt_device_card_match() with that filter.
+ *
+ * Implemented filters:
+ *
+ * - drm: get drm /dev/dri/... device directly
+ *
+ * |[<!-- language="plain" -->
+ * drm:/dev/dri/...
+ * ]|
+ *
+ * - pci: select device using pci properties
+ * |[<!-- language="plain" -->
+ * pci:[vendor=%04x/name][,device=%04x][,card=%d]
+ * ]|
+ *
+ * Filter allows device selection using vendor (hex or name), device id
+ * (hex) and nth-card from all matches. For example if there're 4 pci
+ * cards installed (let two cards have 1234 and other two 1235 device id,
+ * all of them of vendor Intel) you can select one using:
+ *
+ * |[<!-- language="plain" -->
+ * pci:vendor=Intel,device=1234,card=0
+ * ]|
+ *
+ * or
+ *
+ * |[<!-- language="plain" -->
+ * pci:vendor=8086,device=1234,card=0
+ * ]|
+ *
+ * This takes first device with 1234 id for Intel vendor (8086).
+ *
+ * |[<!-- language="plain" -->
+ * pci:vendor=Intel,device=1234,card=1
+ * ]|
+ *
+ * or
+ *
+ * |[<!-- language="plain" -->
+ * pci:vendor=8086,device=1234,card=1
+ * ]|
+ *
+ * It selects second one.
+ *
+ * As order on pci bus doesn't change (unless you'll add new device or
+ * reorder existing one) device selection using this filter will always
+ * return you same device regardless module loading time.
+ *
+ * - vgem: select virtual gem device
+ *
+ * |[<!-- language="plain" -->
+ * vgem:[card=%d]
+ * ]|
+ *
+ * For example:
+ *
+ * |[<!-- language="plain" -->
+ * vgem:
+ * vgem:card=0
+ * ]|
+ *
+ * Both selects first vgem device (no idea if more than one device will
+ * be visible, if yes use card= argument to point right one).
+ *
+ * - vkms: select virtual kms device
+ *
+ * |[<!-- language="plain" -->
+ * vkms:[card=%d]
+ * ]|
+ *
+ * For example:
+ *
+ * |[<!-- language="plain" -->
+ * vkms:
+ * vkms:card=0
+ * ]|
+ *
+ * Both selects first vkms device. Same as for vgem I assume more than
+ * one device can appear in the future.
+ *
+ * - vc4: select VC4 device
+ *
+ * |[<!-- language="plain" -->
+ * vc4:[card=%d]
+ * ]|
+ *
+ * For example:
+ *
+ * |[<!-- language="plain" -->
+ * vc4:
+ * vc4:card=0
+ * ]|
+ *
+ * Both selects first VC4 device. At the moment Rasperry PI has only
+ * one gpu, but filter is ready if there will be more.
+ *
+ * # lsgpu
+ *
+ * The devices can be scanned and displayed using 'lsgpu' tool. Tool also
+ * displays properties and sysattrs (-p switch, means print detail) which
+ * can be used during filter implementation.
+ *
+ * Tool can also be used to try out filters.
+ * To select device use '-d' or '--device' argument like:
+ *
+ * |[<!-- language="plain" -->
+ * ./lsgpu -d 'pci:vendor=Intel'
+ * === Device filter list ===
+ * [ 0]: pci:vendor=Intel
+
+ * === Testing device open ===
+ * subsystem : pci
+ * chipset : 1
+ * drm card : /dev/dri/card0
+ * drm render : /dev/dri/renderD128
+ * Device /dev/dri/card0 successfully opened
+ * Device /dev/dri/renderD128 successfully opened
+ * ]|
+ *
+ * Additionally lsgpu tries to open the card and render nodes to verify
+ * permissions. It also uses IGT variable search order:
+ * - use --device first (it overrides IGT_DEVICE and .igtrc Common::Device
+ * settings)
+ * - use IGT_DEVICE enviroment variable if no --device are passed
+ * - use .igtrc Common::Device if no --device nor IGT_DEVICE are passed
+ */
+
+#ifdef DEBUG_DEVICE_SCAN
+#define DBG(...) \
+{ \
+ struct timeval tm; \
+ gettimeofday(&tm, NULL); \
+ printf("%10ld.%03ld: ", tm.tv_sec, tm.tv_usec); \
+ printf(__VA_ARGS__); \
+ }
+
+#else
+#define DBG(...) {}
+#endif
+
+#define strequal(x, y) ((x) && (y) && !strcmp((x), (y)))
+#define IGT_DRM_PATH "/dev/dri"
+
+static GHashTable *sysattrs_blacklist_ht; /* sysattrs we don't want to read */
+static GHashTable *gpu_vendor_ht; /* search id -> vendor_spec mapping */
+static GHashTable *filter_definition_ht; /* supported filters (pci=..., etc.) */
+
+/* Generic name->value struct */
+struct name_value {
+ const char *name;
+ gpointer *value;
+};
+
+/* Vendor specific data */
+struct vendor_spec {
+ const char *vendor;
+ const char *match;
+ int chipset;
+};
+
+struct igt_device {
+ /* Filled for drm devices */
+ struct igt_device *parent;
+
+ /* Point to vendor spec if can be found */
+ const struct vendor_spec *vs;
+
+ /* Properties / sysattrs rewriten from udev lists */
+ GHashTable *props_ht;
+ GHashTable *attrs_ht;
+
+ /* Most usable variables from udev device */
+ char *subsystem;
+ char *syspath;
+ char *devnode;
+
+ /* /dev/dri/... paths */
+ char *drm_card;
+ char *drm_render;
+
+ /* For pci subsystem */
+ char *vendor;
+ char *device;
+};
+
+/* Scanned devices */
+struct igt_devices {
+ GPtrArray *devs; //all devices
+ GPtrArray *view; //filtered view
+ bool devs_scanned;
+};
+
+/* Scanned devices holder */
+static struct igt_devices igt_devs;
+
+static const struct vendor_spec v_intel = {
+ .vendor = "Intel",
+ .chipset = DRIVER_INTEL
+};
+
+static const struct vendor_spec v_amd = {
+ .vendor = "AMD",
+ .chipset = DRIVER_AMDGPU
+};
+
+static const struct vendor_spec v_vgem = {
+ .vendor = "Virtual-GEM",
+ .chipset = DRIVER_VGEM
+};
+
+static const struct vendor_spec v_vc4 = {
+ .vendor = "Broadcom",
+ .chipset = DRIVER_VC4
+};
+
+/* Mapping vendor id => vendor_spec should be unique (vendor string matching
+ * is written around this).
+ *
+ * Keys must be defined as follows:
+ * PCI devices: PCI_SLOT_ID -> vendor_spec.
+ */
+const struct name_value gpu_vendor_list[] = {
+ { "8086", (gpointer) &v_intel },
+ { "1002", (gpointer) &v_amd },
+ { NULL, },
+};
+
+/* Generic hash table fill function, requires name / value ptrs array */
+static void fill_ht(GHashTable **ht, const struct name_value *data)
+{
+ if (*ht)
+ return;
+
+ *ht = g_hash_table_new(g_str_hash, g_str_equal);
+ igt_assert(*ht);
+
+ while (data->name) {
+ g_hash_table_insert(*ht,
+ (gpointer) data->name,
+ data->value);
+ data++;
+ }
+}
+
+#define get_vendor_spec(prop) \
+ g_hash_table_lookup(gpu_vendor_ht, prop)
+
+/* Go through whole vendor list and compare against vendor field.
+ * Used mostly with vendor=... filter parameter when PCI id is not matched.
+ */
+static const char *get_pci_vendor_id_by_name(const char *name)
+{
+ const struct name_value *data = &gpu_vendor_list[0];
+
+ while (data->name) {
+ struct vendor_spec *vs = (struct vendor_spec *) data->value;
+
+ if (!strcasecmp(name, vs->vendor))
+ return data->name;
+ data++;
+ }
+
+ return NULL;
+}
+
+/* Reading sysattr values can take time (even seconds),
+ * we want to avoid reading such keys.
+ */
+static void populate_blacklist_keys(void)
+{
+ const char *keys[] = { "config", "modalias", "modes",
+ "resource",
+ "resource0", "resource1", "resource2",
+ "resource3", "resource4", "resource5",
+ "resource0_wc", "resource1_wc", "resource2_wc",
+ "resource3_wc", "resource4_wc", "resource5_wc",
+ "driver",
+ "uevent", NULL};
+ const char *key;
+ int i = 0;
+
+ if (sysattrs_blacklist_ht)
+ return;
+
+ sysattrs_blacklist_ht = g_hash_table_new(g_str_hash, g_str_equal);
+ igt_assert(sysattrs_blacklist_ht);
+
+ while ((key = keys[i++]))
+ g_hash_table_add(sysattrs_blacklist_ht, (gpointer) key);
+}
+
+#define is_on_blacklist(key) \
+ g_hash_table_contains(sysattrs_blacklist_ht, key)
+
+static struct igt_device *igt_device_new(void)
+{
+ struct igt_device *dev;
+
+ dev = calloc(1, sizeof(struct igt_device));
+ if (!dev)
+ return NULL;
+
+ dev->attrs_ht = g_hash_table_new_full(g_str_hash, g_str_equal,
+ free, free);
+ dev->props_ht = g_hash_table_new_full(g_str_hash, g_str_equal,
+ free, free);
+
+ if (dev->attrs_ht && dev->props_ht)
+ return dev;
+
+ return NULL;
+}
+
+static void igt_device_add_prop(struct igt_device *dev,
+ const char *key, const char *value)
+{
+ if (!key || !value)
+ return;
+
+ g_hash_table_insert(dev->props_ht, strdup(key), strdup(value));
+}
+
+static void igt_device_add_attr(struct igt_device *dev,
+ const char *key, const char *value)
+{
+ const char *v = value;
+
+ if (!key)
+ return;
+
+ /* It's possible we have symlink at key filename, but udev
+ * library resolves only few of them
+ */
+ if (!v) {
+ struct stat st;
+ char path[PATH_MAX];
+ char linkto[PATH_MAX];
+ int len;
+
+ snprintf(path, sizeof(path), "%s/%s", dev->syspath, key);
+ if (lstat(path, &st) != 0)
+ return;
+
+ len = readlink(path, linkto, sizeof(linkto));
+ if (len <= 0 || len == (ssize_t) sizeof(linkto))
+ return;
+ linkto[len] = '\0';
+ v = strrchr(linkto, '/');
+ if (v == NULL)
+ return;
+ v++;
+ }
+
+ g_hash_table_insert(dev->attrs_ht, strdup(key), strdup(v));
+}
+
+/* Iterate over udev properties list and rewrite it to igt_device properties
+ * hash table for instant access.
+ */
+static void get_props(struct udev_device *dev, struct igt_device *idev)
+{
+ struct udev_list_entry *entry;
+
+ entry = udev_device_get_properties_list_entry(dev);
+ while (entry) {
+ const char *name = udev_list_entry_get_name(entry);
+ const char *value = udev_list_entry_get_value(entry);
+
+ igt_device_add_prop(idev, name, value);
+ entry = udev_list_entry_get_next(entry);
+ DBG("prop: %s, val: %s\n", name, value);
+ }
+}
+
+/* Same as get_props(), but rewrites sysattrs. Resolves symbolic links
+ * not handled by udev get_sysattr_value().
+ * Function skips sysattrs from blacklist ht (acquiring some values can take
+ * seconds).
+ */
+static void get_attrs(struct udev_device *dev, struct igt_device *idev)
+{
+ struct udev_list_entry *entry;
+
+ entry = udev_device_get_sysattr_list_entry(dev);
+ while (entry) {
+ const char *key = udev_list_entry_get_name(entry);
+ const char *value;
+
+ if (is_on_blacklist(key)) {
+ entry = udev_list_entry_get_next(entry);
+ continue;
+ }
+
+ value = udev_device_get_sysattr_value(dev, key);
+ igt_device_add_attr(idev, key, value);
+ entry = udev_list_entry_get_next(entry);
+ DBG("attr: %s, val: %s\n", key, 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")
+#define is_drm_subsystem(dev) (!strcmp(get_prop_subsystem(dev), "drm"))
+#define is_pci_subsystem(dev) (!strcmp(get_prop_subsystem(dev), "pci"))
+#define is_platform_subsystem(dev) \
+ (!strcmp(get_prop_subsystem(dev), "platform"))
+
+/* Gets PCI_ID property, splits to xxxx:yyyy and stores
+ * xxxx to dev->vendor and yyyy to dev->device for
+ * faster access.
+ */
+static void set_vendor_device(struct igt_device *dev)
+{
+ const char *pci_id = get_prop(dev, "PCI_ID");
+
+ if (!pci_id || strlen(pci_id) != 9)
+ return;
+ dev->vendor = strndup(pci_id, 4);
+ dev->device = strndup(pci_id + 5, 4);
+}
+
+/* Allocate arrays for keeping scanned devices */
+static bool prepare_scan(void)
+{
+ if (!igt_devs.devs)
+ igt_devs.devs = g_ptr_array_sized_new(4);
+ if (!igt_devs.view)
+ igt_devs.view = g_ptr_array_sized_new(4);
+
+ if (!igt_devs.devs || !igt_devs.view)
+ return false;
+
+ return true;
+}
+
+/* Create new igt_device from udev device.
+ * Fills structure with most usable udev device variables, properties
+ * and sysattrs.
+ */
+static struct igt_device *igt_device_new_from_udev(struct udev_device *dev)
+{
+ struct igt_device *idev = igt_device_new();
+
+ igt_assert(idev);
+ idev->syspath = g_strdup(udev_device_get_syspath(dev));
+ idev->subsystem = g_strdup(udev_device_get_subsystem(dev));
+ idev->devnode = g_strdup(udev_device_get_devnode(dev));
+
+ if (idev->devnode && strstr(idev->devnode, "/dev/dri/card"))
+ idev->drm_card = g_strdup(idev->devnode);
+ else if (idev->devnode && strstr(idev->devnode, "/dev/dri/render"))
+ idev->drm_render = g_strdup(idev->devnode);
+
+ get_props(dev, idev);
+ get_attrs(dev, idev);
+
+ return idev;
+}
+
+/* Iterate over all igt_devices array and find one matched to
+ * subsystem and syspath.
+ */
+static struct igt_device *igt_device_find(const char *subsystem,
+ const char *syspath)
+{
+ struct igt_device *dev;
+
+ for (int i = 0; i < igt_devs.devs->len; i++) {
+ dev = g_ptr_array_index(igt_devs.devs, i);
+ if (!strcmp(dev->subsystem, subsystem) &&
+ !strcmp(dev->syspath, syspath))
+ return dev;
+ }
+ return NULL;
+}
+
+/* For each drm igt_device add or update its parent igt_device to the array.
+ * As card/render drm devices mostly have same parent (vkms is an exception)
+ * link to it and update corresponding drm_card / drm_render fields.
+ */
+static void update_or_add_parent(struct udev_device *dev,
+ struct igt_device *idev)
+{
+ struct udev_device *parent_dev;
+ struct igt_device *parent_idev;
+ const char *subsystem, *syspath, *devname;
+
+ parent_dev = udev_device_get_parent(dev);
+ igt_assert(parent_dev);
+
+ subsystem = udev_device_get_subsystem(parent_dev);
+ syspath = udev_device_get_syspath(parent_dev);
+
+ parent_idev = igt_device_find(subsystem, syspath);
+ if (!parent_idev) {
+ parent_idev = igt_device_new_from_udev(parent_dev);
+ if (is_pci_subsystem(parent_idev)) {
+ set_vendor_device(parent_idev);
+ parent_idev->vs = get_vendor_spec(parent_idev->vendor);
+ }
+ g_ptr_array_add(igt_devs.devs, parent_idev);
+ }
+ devname = udev_device_get_devnode(dev);
+ if (strstr(devname, "/dev/dri/card"))
+ parent_idev->drm_card = g_strdup(devname);
+ else if (strstr(devname, "/dev/dri/render"))
+ parent_idev->drm_render = g_strdup(devname);
+
+ idev->parent = parent_idev;
+}
+
+static gint devs_compare(gconstpointer a, gconstpointer b)
+{
+ struct igt_device *dev1, *dev2;
+ int ret;
+
+ dev1 = *(struct igt_device **) a;
+ dev2 = *(struct igt_device **) b;
+ ret = strcmp(dev1->subsystem, dev2->subsystem);
+ if (ret)
+ return ret;
+
+ return strcmp(dev1->syspath, dev2->syspath);
+}
+
+/* Core scanning function.
+ *
+ * All scanned devices are kept inside igt_devs.devs pointer array.
+ * Each added device is igt_device structure, which contrary to udev device
+ * has properties / sysattrs stored inside hash table instead of list.
+ *
+ * Function iterates over devices on 'drm' subsystem. For each drm device
+ * its parent is taken (bus device) and stored inside same array.
+ * Function sorts all found devices to keep same order of bus devices
+ * for providing predictable search.
+ */
+static void scan_drm_devices(void)
+{
+ struct udev *udev;
+ struct udev_enumerate *enumerate;
+ struct udev_list_entry *devices, *dev_list_entry;
+ int ret;
+
+ udev = udev_new();
+ igt_assert(udev);
+
+ enumerate = udev_enumerate_new(udev);
+ igt_assert(enumerate);
+
+ DBG("Scanning drm subsystem\n");
+ ret = udev_enumerate_add_match_subsystem(enumerate, "drm");
+ igt_assert(!ret);
+
+ udev_enumerate_add_match_property(enumerate, "DEVNAME", "/dev/dri/*");
+ igt_assert(!ret);
+
+ ret = udev_enumerate_scan_devices(enumerate);
+ igt_assert(!ret);
+
+ devices = udev_enumerate_get_list_entry(enumerate);
+ if (!devices)
+ return;
+
+ udev_list_entry_foreach(dev_list_entry, devices) {
+ const char *path;
+ struct udev_device *dev;
+ struct igt_device *idev;
+
+ path = udev_list_entry_get_name(dev_list_entry);
+ dev = udev_device_new_from_syspath(udev, path);
+ idev = igt_device_new_from_udev(dev);
+ update_or_add_parent(dev, idev);
+ g_ptr_array_add(igt_devs.devs, idev);
+
+ udev_device_unref(dev);
+ }
+ udev_enumerate_unref(enumerate);
+ udev_unref(udev);
+
+ g_ptr_array_sort(igt_devs.devs, devs_compare);
+ for (int i = 0; i < igt_devs.devs->len; i++) {
+ g_ptr_array_add(igt_devs.view,
+ g_ptr_array_index(igt_devs.devs, i));
+ }
+}
+
+static struct name_value filter_definition_list[];
+static void populate_gpu_data(void)
+{
+ fill_ht(&gpu_vendor_ht, &gpu_vendor_list[0]);
+ fill_ht(&filter_definition_ht, &filter_definition_list[0]);
+}
+
+static void igt_device_free(struct igt_device *dev)
+{
+ free(dev->devnode);
+ free(dev->subsystem);
+ free(dev->syspath);
+ free(dev->drm_card);
+ free(dev->drm_render);
+ free(dev->vendor);
+ free(dev->device);
+ g_hash_table_destroy(dev->attrs_ht);
+ g_hash_table_destroy(dev->props_ht);
+}
+
+/**
+ * igt_devices_scan
+ * @force: enforce scanning devices
+ *
+ * Function scans udev in search of gpu devices. For first run it can be
+ * called with @force = false. If something changes during the the test
+ * or test does some module loading (new drm devices occurs during execution)
+ * function must be called again with @force = true to refresh device array.
+ */
+void igt_devices_scan(bool force)
+{
+ if (force && igt_devs.devs_scanned) {
+ for (int i = 0; i < igt_devs.devs->len; i++) {
+ struct igt_device *dev =
+ g_ptr_array_index(igt_devs.devs, i);
+ igt_device_free(dev);
+ free(dev);
+ }
+ igt_devs.devs_scanned = false;
+ g_ptr_array_free(igt_devs.view, true);
+ g_ptr_array_free(igt_devs.devs, true);
+ igt_devs.view = NULL;
+ igt_devs.devs = NULL;
+ }
+
+ if (igt_devs.devs_scanned)
+ return;
+
+ populate_blacklist_keys(); //keys from sysattr we skip
+ populate_gpu_data();
+
+ prepare_scan();
+ scan_drm_devices();
+
+ igt_devs.devs_scanned = true;
+}
+
+#define pr_simple(k, v) printf(" %-16s: %s\n", k, v)
+#define pr_simple2(k, v1, v2) printf(" %-16s: %s:%s\n", k, v1, v2)
+#define pr_simple_prop(dev, key) pr_simple(key, get_prop(dev, key))
+#define pr_simple_attr(dev, key) pr_simple(key, get_attr(dev, key))
+
+static void igt_devs_print_simple(GPtrArray *view)
+{
+ struct igt_device *dev;
+ int i;
+
+ if (!view)
+ return;
+
+ if (!view->len) {
+ printf("No GPU devices found\n");
+ return;
+ }
+
+ for (i = 0; i < view->len; i++) {
+ dev = g_ptr_array_index(view, i);
+ printf("%s:%s\n", dev->subsystem, dev->syspath);
+ if (dev->drm_card)
+ pr_simple("drm card", dev->drm_card);
+ if (dev->drm_render)
+ pr_simple("drm render", dev->drm_render);
+ if (is_drm_subsystem(dev)) {
+ pr_simple2("parent", dev->parent->subsystem,
+ dev->parent->syspath);
+ } else {
+ if (is_pci_subsystem(dev)) {
+ pr_simple("vendor", dev->vendor);
+ pr_simple("device", dev->device);
+ }
+ }
+ printf("\n");
+ }
+}
+
+#define pr_detail(k, v) printf("%-32s: %s\n", k, v)
+
+static void print_ht(GHashTable *ht)
+{
+ GList *keys = g_hash_table_get_keys(ht);
+
+ keys = g_list_sort(keys, (GCompareFunc) strcmp);
+ while (keys) {
+ char *k = (char *) keys->data;
+ char *v = g_hash_table_lookup(ht, k);
+
+ pr_detail(k, v);
+ keys = g_list_next(keys);
+ }
+ g_list_free(keys);
+}
+
+static void igt_devs_print_detail(GPtrArray *view)
+{
+ struct igt_device *dev;
+ int i;
+
+ if (!view)
+ return;
+
+ if (!view->len) {
+ printf("No GPU devices found\n");
+ return;
+ }
+
+ for (i = 0; i < view->len; i++) {
+ dev = g_ptr_array_index(view, i);
+ printf("========== %s:%s ==========\n",
+ dev->subsystem, dev->syspath);
+ if (!is_drm_subsystem(dev)) {
+ pr_detail("card device", dev->drm_card);
+ pr_detail("render device", dev->drm_render);
+ }
+
+ printf("\n[properties]\n");
+ print_ht(dev->props_ht);
+ printf("\n[attributes]\n");
+ print_ht(dev->attrs_ht);
+ printf("\n");
+ }
+}
+
+static struct print_func {
+ void (*prn)(GPtrArray *view);
+} print_functions[] = {
+ [IGT_PRINT_SIMPLE] = { .prn = igt_devs_print_simple },
+ [IGT_PRINT_DETAIL] = { .prn = igt_devs_print_detail },
+};
+
+/**
+ * igt_devices_print
+ * @printtype: IGT_PRINT_SIMPLE or IGT_PRINT_DETAIL
+ *
+ * Function is used by 'lsgpu' tool to print device array in simple or detailed
+ * form. This function is added here instead in 'lsgpu' to avoid exposing
+ * internal implementation data structures.
+ */
+void igt_devices_print(enum igt_devices_print_type printtype)
+{
+ print_functions[printtype].prn(igt_devs.view);
+}
+
+/**
+ * igt_devices_print_vendors
+ *
+ * Print pci id -> vendor mappings. Vendor names printed by this function
+ * can be used for filters like pci which allows passing vendor - like
+ * vendor id (8086) or as a string (Intel).
+ */
+void igt_devices_print_vendors(void)
+{
+ const struct name_value *list = &gpu_vendor_list[0];
+
+ printf("Recognized vendors:\n");
+ printf("%-8s %-16s\n", "PCI ID", "vendor");
+ while (list->name) {
+ struct vendor_spec *vs = (struct vendor_spec *) list->value;
+
+ if (vs)
+ printf("%-8s %-16s\n", list->name, vs->vendor);
+ list++;
+ }
+}
+
+/* ------------------------------------------------------------------------- */
+#define FILTER_SPEC_NAME_LEN 32
+#define FILTER_SPEC_DATA_LEN 256
+struct filter_spec {
+ char name[FILTER_SPEC_NAME_LEN];
+ char data[FILTER_SPEC_DATA_LEN];
+};
+
+struct filter_func {
+ GPtrArray *(*filter_function)(struct filter_spec *fspec,
+ struct filter_func *ffunc);
+ const char *help;
+ const char *detail;
+
+ const char *property;
+ const char *value;
+};
+
+struct filter_data {
+ char *vendor;
+ char *device;
+ char *card;
+ char *drm;
+};
+
+static GHashTable *split_filter_data(const char *data)
+{
+ GHashTable *ht = g_hash_table_new_full(g_str_hash, g_str_equal,
+ free, free);
+ gchar **s;
+ gchar **strv = g_strsplit(data, ",", -1);
+
+ s = strv;
+ while (*s) {
+ char *k, *v;
+
+ v = strchr(*s, '=');
+ if (!v) {
+ s++;
+ continue;
+ }
+ k = strndup(*s, v - (*s));
+ v = strdup(v + 1);
+ g_hash_table_insert(ht, k, v);
+ s++;
+ }
+ g_strfreev(strv);
+
+ return ht;
+}
+
+static bool get_filter_spec(const char *filter, struct filter_spec *spec)
+{
+ if (!filter)
+ return false;
+
+ if (sscanf(filter, "%31[^:]:%255s", spec->name, spec->data) >= 1)
+ return true;
+
+ return false;
+}
+
+static bool is_vendor_matched(struct igt_device *dev, const char *vendor)
+{
+ const char *vendor_id;
+
+ if (!dev->vendor || !vendor)
+ return false;
+
+ /* First we compare vendor id, like 8086 */
+ if (!strcasecmp(dev->vendor, vendor))
+ return true;
+
+ /* Likely we have vendor string instead of id */
+ vendor_id = get_pci_vendor_id_by_name(vendor);
+ if (!vendor_id)
+ return false;
+
+ return !strcasecmp(dev->vendor, vendor_id);
+}
+
+/* Filter which matches subsystem:/sys/... path.
+ * Used as first filter in chain.
+ */
+static GPtrArray *filter_sys(struct filter_spec *fspec,
+ struct filter_func *ffunc)
+{
+ (void) ffunc;
+
+ DBG("filter sys\n");
+ if (!strlen(fspec->data))
+ return igt_devs.view;
+
+ for (int i = 0; i < igt_devs.devs->len; i++) {
+ struct igt_device *dev = g_ptr_array_index(igt_devs.devs, i);
+
+ if (strequal(dev->subsystem, fspec->name) &&
+ strequal(dev->syspath, fspec->data)) {
+ g_ptr_array_add(igt_devs.view, dev);
+ break;
+ }
+ }
+
+ DBG("Filter sys view size: %d\n", igt_devs.view->len);
+
+ return igt_devs.view;
+}
+
+/* Find drm device using direct path to /dev/dri/.
+ * It extends filter_sys to allow using drm:/dev/dri/cardX and
+ * drm:/dev/dri/renderDX filter syntax.
+ */
+static GPtrArray *filter_drm(struct filter_spec *fspec,
+ struct filter_func *ffunc)
+{
+ (void) ffunc;
+
+ DBG("filter drm\n");
+ if (!strlen(fspec->data))
+ return igt_devs.view;
+
+ for (int i = 0; i < igt_devs.devs->len; i++) {
+ struct igt_device *dev = g_ptr_array_index(igt_devs.devs, i);
+
+ if (!is_drm_subsystem(dev))
+ continue;
+
+ if (strequal(dev->syspath, fspec->data) ||
+ strequal(dev->drm_card, fspec->data) ||
+ strequal(dev->drm_render, fspec->data)) {
+ g_ptr_array_add(igt_devs.view, dev);
+ break;
+ }
+ }
+
+ DBG("Filter drm view size: %d\n", igt_devs.view->len);
+
+ return igt_devs.view;
+}
+
+/* Find appropriate pci device matching vendor/device/card filter arguments.
+ */
+static GPtrArray *filter_pci(struct filter_spec *fspec,
+ struct filter_func *ffunc)
+{
+ GHashTable *ht;
+ struct filter_data fdata;
+ int card = -1;
+ (void) ffunc;
+
+ DBG("filter pci\n");
+
+ ht = split_filter_data(fspec->data);
+ fdata.vendor = g_hash_table_lookup(ht, "vendor");
+ fdata.device = g_hash_table_lookup(ht, "device");
+ fdata.card = g_hash_table_lookup(ht, "card");
+
+ if (fdata.card) {
+ sscanf(fdata.card, "%d", &card);
+ if (card < 0) {
+ g_hash_table_destroy(ht);
+ return igt_devs.view;
+ }
+ } else {
+ card = 0;
+ }
+
+ for (int i = 0; i < igt_devs.devs->len; i++) {
+ struct igt_device *dev = g_ptr_array_index(igt_devs.devs, i);
+
+ if (!is_pci_subsystem(dev))
+ continue;
+
+ /* Skip if 'vendor' doesn't match (hex or name) */
+ if (fdata.vendor && !is_vendor_matched(dev, fdata.vendor))
+ continue;
+
+ /* Skip if 'device' doesn't match */
+ if (fdata.device && strcasecmp(fdata.device, dev->device))
+ continue;
+
+ /* We get n-th card */
+ if (!card) {
+ g_ptr_array_add(igt_devs.view, dev);
+ break;
+ }
+ card--;
+ }
+
+ DBG("Filter pci view size: %d\n", igt_devs.view->len);
+
+ g_hash_table_destroy(ht);
+
+ return igt_devs.view;
+}
+
+/* Helper for finding first device matching property:value.
+ */
+static GPtrArray *filter_property(struct filter_spec *fspec,
+ struct filter_func *ffunc)
+{
+ GHashTable *ht;
+ struct filter_data fdata;
+ int card = -1;
+ const char *property = ffunc->property;
+ const char *value = ffunc->value;
+
+ if (!property || !value)
+ return igt_devs.view;
+
+ DBG("filter property/value [%s/%s]\n", property, value);
+
+ ht = split_filter_data(fspec->data);
+ fdata.card = g_hash_table_lookup(ht, "card");
+
+ if (fdata.card) {
+ sscanf(fdata.card, "%d", &card);
+ if (card < 0) {
+ g_hash_table_destroy(ht);
+ return igt_devs.view;
+ }
+ } else {
+ card = 0;
+ }
+
+ for (int i = 0; i < igt_devs.devs->len; i++) {
+ const char *prop_value;
+ struct igt_device *dev = g_ptr_array_index(igt_devs.devs, i);
+
+ prop_value = get_prop(dev, property);
+ if (prop_value && !strcmp(prop_value, value)) {
+ if (!card) {
+ g_ptr_array_add(igt_devs.view, dev);
+ break;
+ }
+ card--;
+ }
+ }
+
+ DBG("Filter view size: %d\n", igt_devs.view->len);
+
+ g_hash_table_destroy(ht);
+
+ return igt_devs.view;
+}
+
+static GPtrArray *filter_vgem(struct filter_spec *fspec,
+ struct filter_func *ffunc)
+{
+ GPtrArray *view = filter_property(fspec, ffunc);
+
+ if (view) {
+ struct igt_device *dev = g_ptr_array_index(view, 0);
+
+ dev->vs = &v_vgem;
+ }
+ return view;
+}
+
+static GPtrArray *filter_vkms(struct filter_spec *fspec,
+ struct filter_func *ffunc)
+{
+ return filter_property(fspec, ffunc);
+}
+
+static GPtrArray *filter_vc4(struct filter_spec *fspec,
+ struct filter_func *ffunc)
+{
+ GPtrArray *view = filter_property(fspec, ffunc);
+
+ if (view) {
+ struct igt_device *dev = g_ptr_array_index(view, 0);
+
+ dev->vs = &v_vc4;
+ }
+ return filter_property(fspec, ffunc);
+}
+
+static const struct filter_func f_drm = {
+ .filter_function = filter_drm,
+ .help = "drm:/dev/dri/* path",
+ .detail = "find drm device by /dev/dri/* node\n",
+};
+
+static const struct filter_func f_pci = {
+ .filter_function = filter_pci,
+ .help = "pci:[vendor=%04x/name][,device=%04x][,card=%d]",
+ .detail = "vendor is hex number or vendor name\n",
+};
+
+static const struct filter_func f_vgem = {
+ .filter_function = filter_vgem,
+ .help = "vgem:[card=%d]",
+ .detail = "card is n-th vgem card number\n",
+ .property = "MODALIAS",
+ .value = "platform:vgem",
+};
+
+static const struct filter_func f_vkms = {
+ .filter_function = filter_vkms,
+ .help = "vkms:[card=%d]",
+ .detail = "card is n-th vkms card number\n",
+ .property = "MODALIAS",
+ .value = "platform:vkms",
+};
+
+static const struct filter_func f_vc4 = {
+ .filter_function = filter_vc4,
+ .help = "vc4:[card=%d]",
+ .detail = "card is n-th vc4 card number\n",
+ .property = "OF_COMPATIBLE_0",
+ .value = "brcm,bcm2835-vc4",
+};
+
+static struct name_value filter_definition_list[] = {
+ { "drm", (gpointer) &f_drm },
+ { "pci", (gpointer) &f_pci },
+ { "vgem", (gpointer) &f_vgem },
+ { "vkms", (gpointer) &f_vkms },
+ { "vc4", (gpointer) &f_vc4 },
+ { NULL, },
+};
+
+/**
+ * @igt_device_print_filter_types
+ *
+ * Print all filters syntax for device selection.
+ */
+void igt_device_print_filter_types(void)
+{
+ struct name_value *list = &filter_definition_list[0];
+
+ printf("Filter types:\n---\n");
+ printf("%-12s %s\n---\n", "filter", "syntax");
+
+ printf("%-12s %s\n", "", "direct subsystem:/sys/... path selection\n");
+ printf("%-12s %s\n", "",
+ "ex: drm:/sys/devices/pci0000:00/0000:00:02.0/drm/card0");
+ printf("%-12s %s\n", "",
+ " pci:/sys/devices/pci0000:00/0000:00:02.0");
+ printf("%-12s %s\n", "",
+ " platform:/sys/devices/platform/vgem\n");
+
+ while (list->name) {
+ struct filter_func *v = (struct filter_func *) list->value;
+
+ printf("%-12s %s\n", list->name, v->help);
+ printf("%-12s %s\n", "", v->detail);
+ list++;
+ }
+}
+
+static GPtrArray *device_filters = NULL;
+
+#define DEVICE_FILTER_CHECK_ALLOC() \
+ do { \
+ if (!device_filters) \
+ device_filters = g_ptr_array_new_full(2, free); \
+ igt_assert(device_filters); \
+ } while (0)
+
+/**
+ * igt_device_filter_count
+ *
+ * Returns number of filters collected in the filter array.
+ */
+int igt_device_filter_count(void)
+{
+ DEVICE_FILTER_CHECK_ALLOC();
+
+ return device_filters->len;
+}
+
+/**
+ * igt_device_filter_add
+ * @filter: filter to be stored in filter array
+ *
+ * Function allows passing single or more filters within one string. This is
+ * for CI when it can extract filter from environment variable (and it must
+ * be single string). So if @filter contains semicolon ';' it treats
+ * each part as separate filter and adds to the filter array.
+ *
+ * Returns number of filters added to filter array. Can be greater than
+ * 1 if @filter contains more than one filter separated by semicolon.
+ */
+int igt_device_filter_add(const char *filter)
+{
+ gchar **strv, **s;
+ int c = 0;
+
+ DEVICE_FILTER_CHECK_ALLOC();
+
+ strv = g_strsplit(filter, ";", -1);
+
+ s = strv;
+ while (*s) {
+ g_ptr_array_add(device_filters, strdup(*s));
+ s++;
+ }
+ g_strfreev(strv);
+
+ return c;
+}
+
+/**
+ * igt_device_filter_free_all
+ *
+ * Free all filters within array.
+ */
+void igt_device_filter_free_all(void)
+{
+ if (!device_filters)
+ return;
+
+ g_ptr_array_set_free_func(device_filters, free);
+ g_ptr_array_unref(device_filters);
+ device_filters = NULL;
+}
+
+/**
+ * igt_device_filter_get
+ * @num: Number of filter from filter array
+ *
+ * Returns filter string or NULL if @num is out of range of filter array.
+ */
+const char *igt_device_filter_get(int num)
+{
+ DEVICE_FILTER_CHECK_ALLOC();
+
+ if (num < 0 || num >= device_filters->len)
+ return NULL;
+
+ return g_ptr_array_index(device_filters, num);
+}
+
+static bool igt_device_filter_apply(const char *filter)
+{
+ struct filter_spec fspec;
+ bool ret;
+
+ if (!filter)
+ return false;
+
+ memset(&fspec, 0, sizeof(fspec));
+ ret = get_filter_spec(filter, &fspec);
+ if (!ret) {
+ igt_warn("Can't split filter [%s]\n", filter);
+ return false;
+ }
+
+ /* Clean view */
+ g_ptr_array_remove_range(igt_devs.view, 0, igt_devs.view->len);
+
+ /* If fspec.data contains "/sys" use direct path instead
+ * contextual filter.
+ */
+ if (!strncmp(fspec.data, "/sys", 4))
+ filter_sys(&fspec, NULL);
+ else {
+ struct filter_func *ffunc;
+
+ ffunc = g_hash_table_lookup(filter_definition_ht, fspec.name);
+ if (!ffunc) {
+ igt_warn("No filter with name [%s]\n", fspec.name);
+ return false;
+ }
+ ffunc->filter_function(&fspec, ffunc);
+ }
+
+ return true;
+}
+
+#define safe_strncpy(dst, src, size) do { \
+ if ((dst) && (src)) \
+ strncpy((dst), (src), (size)); \
+ } while (0)
+
+/**
+ * igt_device_card_match
+ * @filter: filter string
+ * @card: pointer to igt_device_card struct
+ *
+ * Function applies filter to match device from device array.
+ *
+ * Returns:
+ * false - no card pointer was passed or card wasn't matched,
+ * true - card matched and returned.
+ */
+bool igt_device_card_match(const char *filter, struct igt_device_card *card)
+{
+ struct igt_device *dev = NULL;
+
+ if (!card)
+ return false;
+ memset(card, 0, sizeof(*card));
+
+ igt_devices_scan(false);
+
+ if (igt_device_filter_apply(filter) == false)
+ return false;
+
+ if (!igt_devs.view->len)
+ return false;
+
+ /* We take first one if more than one card matches filter */
+ dev = g_ptr_array_index(igt_devs.view, 0);
+ card->chipset = DRIVER_ANY;
+ if (dev->vs)
+ card->chipset = dev->vs->chipset;
+
+ safe_strncpy(card->subsystem, dev->subsystem, NAME_MAX);
+ safe_strncpy(card->card, dev->drm_card, NAME_MAX);
+ safe_strncpy(card->render, dev->drm_render, NAME_MAX);
+
+ return true;
+}
diff --git a/lib/igt_device_scan.h b/lib/igt_device_scan.h
new file mode 100644
index 00000000..c68d23f0
--- /dev/null
+++ b/lib/igt_device_scan.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2019 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#ifndef __IGT_DEVICE_SCAN_H__
+#define __IGT_DEVICE_SCAN_H__
+
+#include <limits.h>
+#include <igt.h>
+
+enum igt_devices_print_type {
+ IGT_PRINT_SIMPLE,
+ IGT_PRINT_DETAIL,
+};
+
+struct igt_device_card {
+ int chipset;
+ char subsystem[NAME_MAX];
+ char card[NAME_MAX];
+ char render[NAME_MAX];
+};
+
+/* Scan udev subsystems. Do it once unless force is true, what rescans
+ * devices again.
+ */
+void igt_devices_scan(bool force);
+
+void igt_devices_print(enum igt_devices_print_type printtype);
+void igt_devices_print_vendors(void);
+void igt_device_print_filter_types(void);
+
+/*
+ * Handle device filter collection array.
+ * IGT can store/retrieve filters passed by user using '--device' args.
+ */
+
+/* Return number of filters collected. */
+int igt_device_filter_count(void);
+
+/* Add filter(s) to the array. Returns number of filters added (>1 if
+ * user passes more than one filter separated by ';')
+ */
+int igt_device_filter_add(const char *filter);
+
+/* Free all filters. */
+void igt_device_filter_free_all(void);
+
+/* Get n-th filter stored in the array or NULL */
+const char *igt_device_filter_get(int num);
+
+/* Use filter to match the device and fill card structure */
+bool igt_device_card_match(const char *filter, struct igt_device_card *card);
+
+#endif /* __IGT_DEVICE_SCAN_H__ */
diff --git a/lib/meson.build b/lib/meson.build
index 221ae28c..7395d388 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -10,6 +10,7 @@ lib_sources = [
'igt_color_encoding.c',
'igt_debugfs.c',
'igt_device.c',
+ 'igt_device_scan.c',
'igt_aux.c',
'igt_gpu_power.c',
'igt_gt.c',
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index 50706f41..0e67b654 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -33,6 +33,7 @@ tools_prog_lists = \
intel_watermark \
intel_gem_info \
intel_gvtg_test \
+ lsgpu \
$(NULL)
dist_bin_SCRIPTS = intel_gpu_abrt
diff --git a/tools/lsgpu.c b/tools/lsgpu.c
new file mode 100644
index 00000000..bc6046fa
--- /dev/null
+++ b/tools/lsgpu.c
@@ -0,0 +1,261 @@
+/*
+ * Copyright © 2019 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include "igt_device_scan.h"
+#include "igt.h"
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <signal.h>
+#include <glib.h>
+
+enum {
+ OPT_PRINT_DETAIL = 'p',
+ OPT_LIST_VENDORS = 'v',
+ OPT_LIST_FILTERS = 'l',
+ OPT_DEVICE = 'd',
+ OPT_HELP = 'h'
+};
+
+static bool g_show_vendors;
+static bool g_list_filters;
+static bool g_device;
+static bool g_help;
+static char *igt_rc_device;
+
+static const char *usage_str =
+ "usage: lsgpu [options]\n\n"
+ "Options:\n"
+ " -p, --print-details Print devices with details\n"
+ " -v, --list-vendors List recognized vendors\n"
+ " -l, --list-filter-types List registered device filters types\n"
+ " -d, --device filter Device filter, can be given multiple times\n"
+ " -h, --help Show this help message and exit\n";
+
+static void test_device_open(struct igt_device_card *card)
+{
+ int fd;
+
+ if (!card)
+ return;
+
+ fd = drm_open_card(card);
+ if (fd >= 0) {
+ printf("Device %s successfully opened\n", card->card);
+ close(fd);
+ } else {
+ if (strlen(card->card))
+ printf("Cannot open card %s device\n", card->card);
+ else
+ printf("Cannot open card device, empty name\n");
+ }
+
+ fd = drm_open_render(card);
+ if (fd >= 0) {
+ printf("Device %s successfully opened\n", card->render);
+ close(fd);
+ } else {
+ if (strlen(card->render))
+ printf("Cannot open render %s device\n", card->render);
+ else
+ printf("Cannot open render device, empty name\n");
+ }
+}
+
+static void print_card(struct igt_device_card *card)
+{
+ if (!card)
+ return;
+
+ printf("subsystem : %s\n", card->subsystem);
+ printf("chipset : %x\n", card->chipset);
+ printf("drm card : %s\n", card->card);
+ printf("drm render : %s\n", card->render);
+}
+
+/* Partially copied from igt_core to simulate device selection order:
+ * 1. --device (IGT_DEVICE and .igtrc Common::Device are ignored)
+ * 2. IGT_DEVICE env (.igtrc Common::Device is ignored)
+ * 3. .igtrc (overrides
+ */
+static void common_init_config(void)
+{
+ char *key_file_env = NULL;
+ char *key_file_loc = NULL;
+ GError *error = NULL;
+ GKeyFile *igt_key_file;
+ int ret;
+
+ /* Filter count > 0, just skip .igtrc */
+ if (igt_device_filter_count())
+ return;
+
+ /* Determine igt config path */
+ key_file_env = getenv("IGT_CONFIG_PATH");
+ if (key_file_env) {
+ key_file_loc = key_file_env;
+ } else {
+ key_file_loc = malloc(100);
+ snprintf(key_file_loc, 100, "%s/.igtrc", g_get_home_dir());
+ }
+
+ /* Load igt config file */
+ igt_key_file = g_key_file_new();
+ ret = g_key_file_load_from_file(igt_key_file, key_file_loc,
+ G_KEY_FILE_NONE, &error);
+ if (!ret) {
+ g_error_free(error);
+ g_key_file_free(igt_key_file);
+ igt_key_file = NULL;
+
+ return;
+ }
+
+ g_clear_error(&error);
+
+ if (!igt_rc_device)
+ igt_rc_device =
+ g_key_file_get_string(igt_key_file, "Common",
+ "Device", &error);
+
+ if (igt_rc_device) {
+ igt_device_filter_add(igt_rc_device);
+ g_device = true;
+ }
+
+ g_clear_error(&error);
+}
+
+
+int main(int argc, char *argv[])
+{
+ static struct option long_options[] = {
+ {"print-detail", no_argument, NULL, OPT_PRINT_DETAIL},
+ {"list-vendors", no_argument, NULL, OPT_LIST_VENDORS},
+ {"list-filter-types", no_argument, NULL, OPT_LIST_FILTERS},
+ {"device", required_argument, NULL, OPT_DEVICE},
+ {"help", no_argument, NULL, OPT_HELP},
+ {0, 0, 0, 0}
+ };
+ int c, index = 0;
+ const char *env;
+ enum igt_devices_print_type printtype = IGT_PRINT_SIMPLE;
+
+ env = getenv("IGT_DEVICE");
+ if (env) {
+ igt_device_filter_add(env);
+ g_device = true;
+ }
+
+ while ((c = getopt_long(argc, argv, "pvld:h",
+ long_options, &index)) != -1) {
+ switch(c) {
+
+ case OPT_PRINT_DETAIL:
+ printtype = IGT_PRINT_DETAIL;
+ break;
+ case OPT_LIST_VENDORS:
+ g_show_vendors = true;
+ break;
+ case OPT_LIST_FILTERS:
+ g_list_filters = true;
+ break;
+ case OPT_DEVICE:
+ g_device = true;
+ if (getenv("IGT_DEVICE") && igt_device_filter_count()) {
+ unsetenv("IGT_DEVICE");
+ igt_rc_device = NULL;
+ igt_device_filter_free_all();
+ }
+ igt_device_filter_add(optarg);
+ break;
+ case OPT_HELP:
+ g_help = true;
+ break;
+ }
+ }
+ common_init_config();
+
+ if (g_help) {
+ printf("%s\n", usage_str);
+ exit(0);
+ }
+
+ if (g_show_vendors) {
+ igt_devices_print_vendors();
+ return 0;
+ }
+
+ if (g_list_filters) {
+ igt_device_print_filter_types();
+ return 0;
+ }
+
+ igt_devices_scan(false);
+
+ if (getenv("IGT_DEVICE")) {
+ printf("Notice: Using IGT_DEVICE device settings [%s]\n",
+ getenv("IGT_DEVICE"));
+ } else if (igt_rc_device) {
+ printf("Notice: Using .igtrc device settings [%s]\n",
+ igt_rc_device);
+ }
+
+ if (g_device) {
+ int n = igt_device_filter_count();
+ printf("=== Device filter list ===\n");
+ for (int i = 0; i < n; i++) {
+ printf("[%2d]: %s\n", i,
+ igt_device_filter_get(i));
+ }
+ printf("\n");
+
+ printf("=== Testing device open ===\n");
+ for (int i = 0; i < n; i++) {
+ struct igt_device_card card;
+ const char *filter = igt_device_filter_get(i);
+
+ if (!igt_device_card_match(filter, &card)) {
+ printf("[%2d]: No device found for filter\n\n",
+ i);
+ continue;
+ }
+ printf("[%2d]: Device detail:\n", i);
+ print_card(&card);
+ test_device_open(&card);
+ if (printtype == IGT_PRINT_DETAIL) {
+ printf("\n");
+ igt_devices_print(printtype);
+ }
+ printf("-------------------------------------------\n");
+ }
+
+ return 0;
+ }
+
+ igt_devices_print(printtype);
+
+ return 0;
+}
diff --git a/tools/meson.build b/tools/meson.build
index 6e72b263..9b3a2a69 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -36,6 +36,7 @@ tools_progs = [
'intel_gem_info',
'intel_gvtg_test',
'dpcd_reg',
+ 'lsgpu',
]
tool_deps = igt_deps
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT
2019-08-23 7:03 [igt-dev] [PATCH i-g-t v5 0/2] Add device selection methods Zbigniew Kempczyński
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API Zbigniew Kempczyński
@ 2019-08-23 7:03 ` Zbigniew Kempczyński
2019-08-28 6:18 ` Katarzyna Dec
2019-09-03 6:51 ` Arkadiusz Hiler
2019-08-23 9:05 ` [igt-dev] ✓ Fi.CI.BAT: success for Add device selection methods (rev5) Patchwork
2019-08-24 2:39 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
3 siblings, 2 replies; 15+ messages in thread
From: Zbigniew Kempczyński @ 2019-08-23 7:03 UTC (permalink / raw)
To: igt-dev; +Cc: Daniel Vetter, Petri Latvala
New IGT command line argument --device, IGT_DEVICE enviroment
and .igtrc Common::Device were added to allow selecting device
using device selection API.
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Petri Latvala <petri.latvala@intel.com>
---
docs/chamelium.txt | 3 +
lib/drmtest.c | 188 ++++++++++++++++++++++++++++++++++++++++++++-
lib/drmtest.h | 9 +++
lib/igt_core.c | 34 ++++++++
4 files changed, 232 insertions(+), 2 deletions(-)
diff --git a/docs/chamelium.txt b/docs/chamelium.txt
index 32c296f7..d3a379d3 100644
--- a/docs/chamelium.txt
+++ b/docs/chamelium.txt
@@ -84,6 +84,9 @@ example (only Chamelium.URL is mandatory):
# The path to dump frames that fail comparison checks
FrameDumpPath=/root/
+ # Device selection filter
+ Device=pci:vendor=8086,card=0;vgem:
+
# The following section is used for configuring the Device Under Test.
# It is not mandatory and allows overriding default values.
[DUT]
diff --git a/lib/drmtest.c b/lib/drmtest.c
index c379a7b7..c01a88a9 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -55,6 +55,7 @@
#include "igt_gt.h"
#include "igt_kmod.h"
#include "igt_sysfs.h"
+#include "igt_device_scan.h"
#include "version.h"
#include "config.h"
#include "intel_reg.h"
@@ -289,25 +290,208 @@ static int __open_driver(const char *base, int offset, unsigned int chipset)
return __search_and_open(base, offset, chipset);
}
+static int __open_driver_exact(const char *name, unsigned int chipset)
+{
+ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+ int fd;
+
+ fd = open_device(name, chipset);
+ if (fd != -1)
+ return fd;
+
+ pthread_mutex_lock(&mutex);
+ for (const struct module *m = modules; m->module; m++) {
+ if (chipset & m->bit) {
+ if (m->modprobe)
+ m->modprobe(m->module);
+ else
+ modprobe(m->module);
+ }
+ }
+ pthread_mutex_unlock(&mutex);
+
+ return open_device(name, chipset);
+}
+
+/*
+ * For compatibility mode when multiple --device argument were passed
+ * this function tries to be smart enough to handle tests which opens
+ * more than single device. It iterates over filter list and
+ * compares requested chipset to card chipset (or any).
+ *
+ * Returns:
+ * True if card according to filters added and chipset was found,
+ * false othwerwise.
+ */
+static bool __find_card_with_chipset(int chipset, struct igt_device_card *card)
+{
+ int i, n = igt_device_filter_count();
+ const char *filter;
+ bool match;
+
+ for (i = 0; i < n; i++) {
+ filter = igt_device_filter_get(i);
+ match = igt_device_card_match(filter, card);
+ if (match && (card->chipset == chipset ||
+ card->chipset == DRIVER_ANY)) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
/**
* __drm_open_driver:
* @chipset: OR'd flags for each chipset to search, eg. #DRIVER_INTEL
*
- * Open the first DRM device we can find, searching up to 16 device nodes
+ * Function opens device in the following order:
+ * 1. when --device arguments are present device scanning will be executed,
+ * then filter argument is used to find matching one.
+ * 2. compatibility mode - open the first DRM device we can find,
+ * searching up to 16 device nodes.
*
* Returns:
* An open DRM fd or -1 on error
*/
int __drm_open_driver(int chipset)
{
+ int n = igt_device_filter_count();
+
+ if (n) {
+ bool found;
+ struct igt_device_card card;
+
+ found = __find_card_with_chipset(chipset, &card);
+ if (!found || !strlen(card.card))
+ return -1;
+
+ return __open_driver_exact(card.card, chipset);
+ }
+
return __open_driver("/dev/dri/card", 0, chipset);
}
-static int __drm_open_driver_render(int chipset)
+int __drm_open_driver_render(int chipset)
{
+ int n = igt_device_filter_count();
+
+ if (n) {
+ bool found;
+ struct igt_device_card card;
+
+ found = __find_card_with_chipset(chipset, &card);
+ if (!found || !strlen(card.render))
+ return -1;
+
+ return __open_driver_exact(card.render, chipset);
+ }
+
return __open_driver("/dev/dri/renderD", 128, chipset);
}
+static int __drm_open_with_nth_filter(int num, int chipset, bool open_render)
+{
+ struct igt_device_card card;
+ const char *filter, *devname;
+ bool match;
+ int n = igt_device_filter_count();
+
+ if (!n || num < 0 || num >= n) {
+ igt_warn("No device filter num == %d passed\n", num);
+ return -1;
+ }
+
+ filter = igt_device_filter_get(num);
+ match = igt_device_card_match(filter, &card);
+ if (!match) {
+ igt_warn("No device match filter: %s\n", filter);
+ return -1;
+ }
+
+ if (!strlen(card.card) && !strlen(card.render))
+ return -1;
+
+ devname = open_render ? card.render : card.card;
+ if (!strlen(devname)) {
+ igt_warn("No %s node matching filter: %s\n",
+ open_render ? "render" : "card", filter);
+ return -1;
+ }
+ return __open_driver_exact(devname, chipset);
+}
+
+/**
+ * drm_open_card_with_nth_filter:
+ * @num: number of --device argument
+ * @chipset: OR'd flags for each chipset to search, eg. #DRIVER_INTEL
+ *
+ * Open /dev/dri/cardX device using multi-device selection API.
+ * When test require to open more than one device selection uses filter
+ * passed as --device argument. Arguments @num indicate filter number
+ * and @chipset expected device card chipset.
+ *
+ * An open DRM fd or -1 on error
+ */
+int drm_open_card_with_nth_filter(int num, int chipset)
+{
+ return __drm_open_with_nth_filter(num, chipset, false);
+}
+
+/**
+ * drm_open_render_with_nth_filter:
+ * @num: number of --device argument
+ * @chipset: OR'd flags for each chipset to search, eg. #DRIVER_INTEL
+ *
+ * Open /dev/dri/renderDX device using multi-device selection API.
+ *
+ * When test require to open more than one device selection uses filter
+ * passed as --device argument. Arguments @num indicate filter number
+ * and @chipset expected device card chipset.
+ *
+ * An open DRM fd or -1 on error
+ */
+int drm_open_render_with_nth_filter(int num, int chipset)
+{
+ return __drm_open_with_nth_filter(num, chipset, true);
+}
+
+/**
+ * drm_open_card:
+ * @card: pointer to igt_device_card structure
+ *
+ * Open /dev/dri/cardX device using multi-device selection API.
+ *
+ * Require filled @card argument (see igt_device_card_match() function).
+ *
+ * An open DRM fd or -1 on error
+ */
+int drm_open_card(struct igt_device_card *card)
+{
+ if (!card || !strlen(card->card))
+ return -1;
+
+ return __open_driver_exact(card->card, card->chipset);
+}
+
+/**
+ * drm_open_render:
+ * @card: pointer to igt_device_card structure
+ *
+ * Open /dev/dri/renderDX device using multi-device selection API.
+ * Require filled @card argument (see igt_device_card_match() function).
+ *
+ * An open DRM fd or -1 on error
+ */
+int drm_open_render(struct igt_device_card *card)
+{
+ if (!card || !strlen(card->render))
+ return -1;
+
+ return __open_driver_exact(card->render, card->chipset);
+}
+
+
static int at_exit_drm_fd = -1;
static int at_exit_drm_render_fd = -1;
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 614f57e6..fc2a0b57 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -50,6 +50,7 @@
#define DRIVER_AMDGPU (1 << 3)
#define DRIVER_V3D (1 << 4)
#define DRIVER_PANFROST (1 << 5)
+
/*
* Exclude DRVER_VGEM from DRIVER_ANY since if you run on a system
* with vgem as well as a supported driver, you can end up with a
@@ -81,6 +82,14 @@ int drm_open_driver(int chipset);
int drm_open_driver_master(int chipset);
int drm_open_driver_render(int chipset);
int __drm_open_driver(int chipset);
+int __drm_open_driver_render(int chipset);
+
+/* Multi device API */
+int drm_open_card_with_nth_filter(int num, int chipset);
+int drm_open_render_with_nth_filter(int num, int chipset);
+struct igt_device_card;
+int drm_open_card(struct igt_device_card *card);
+int drm_open_render(struct igt_device_card *card);
void gem_quiescent_gpu(int fd);
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 1cbb09f9..a8a11b5c 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -71,6 +71,7 @@
#include "igt_sysrq.h"
#include "igt_rc.h"
#include "igt_list.h"
+#include "igt_device_scan.h"
#define UNW_LOCAL_ONLY
#include <libunwind.h>
@@ -245,6 +246,9 @@
* [Common]
* FrameDumpPath=/tmp # The path to dump frames that fail comparison checks
*
+ * # Device selection filter
+ * Device=pci:vendor=8086,card=0;vgem:
+ *
* # The following section is used for configuring the Device Under Test.
* # It is not mandatory and allows overriding default values.
* [DUT]
@@ -304,6 +308,7 @@ enum {
OPT_DEBUG,
OPT_INTERACTIVE_DEBUG,
OPT_SKIP_CRC,
+ OPT_DEVICE,
OPT_HELP = 'h'
};
@@ -320,6 +325,7 @@ static pthread_mutex_t log_buffer_mutex = PTHREAD_MUTEX_INITIALIZER;
GKeyFile *igt_key_file;
char *igt_frame_dump_path;
+char *igt_rc_device;
static bool stderr_needs_sentinel = false;
@@ -624,6 +630,7 @@ static void print_usage(const char *help_str, bool output_on_stderr)
" --skip-crc-compare\n"
" --help-description\n"
" --describe\n"
+ " --device filter\n"
" --help|-h\n");
if (help_str)
fprintf(f, "%s\n", help_str);
@@ -688,6 +695,16 @@ static void common_init_config(void)
if (ret != 0)
igt_set_autoresume_delay(ret);
+ /* No IGT_DEVICE and no --device passed, try .igtrc Common::Device */
+ if (!igt_rc_device)
+ igt_rc_device =
+ g_key_file_get_string(igt_key_file, "Common",
+ "Device", &error);
+ if (igt_rc_device && !igt_device_filter_count())
+ igt_device_filter_add(igt_rc_device);
+
+ g_clear_error(&error);
+
out:
if (!key_file_env && key_file_loc)
free(key_file_loc);
@@ -725,6 +742,11 @@ static void common_init_env(void)
if (env) {
__set_forced_driver(env);
}
+
+ env = getenv("IGT_DEVICE");
+ if (env) {
+ igt_device_filter_add(env);
+ }
}
static int common_init(int *argc, char **argv,
@@ -743,6 +765,7 @@ static int common_init(int *argc, char **argv,
{"debug", optional_argument, NULL, OPT_DEBUG},
{"interactive-debug", optional_argument, NULL, OPT_INTERACTIVE_DEBUG},
{"skip-crc-compare", no_argument, NULL, OPT_SKIP_CRC},
+ {"device", required_argument, NULL, OPT_DEVICE},
{"help", no_argument, NULL, OPT_HELP},
{0, 0, 0, 0}
};
@@ -865,6 +888,17 @@ static int common_init(int *argc, char **argv,
case OPT_SKIP_CRC:
igt_skip_crc_compare = true;
goto out;
+ case OPT_DEVICE:
+ assert(optarg);
+ /* We need to free all devices passed in
+ * IGT_DEVICE environment variable.
+ */
+ if (getenv("IGT_DEVICE") && igt_device_filter_count()) {
+ unsetenv("IGT_DEVICE");
+ igt_device_filter_free_all();
+ }
+ igt_device_filter_add(optarg);
+ break;
case OPT_HELP:
print_usage(help_str, false);
ret = -1;
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for Add device selection methods (rev5)
2019-08-23 7:03 [igt-dev] [PATCH i-g-t v5 0/2] Add device selection methods Zbigniew Kempczyński
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API Zbigniew Kempczyński
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT Zbigniew Kempczyński
@ 2019-08-23 9:05 ` Patchwork
2019-08-24 2:39 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2019-08-23 9:05 UTC (permalink / raw)
To: Zbigniew Kempczyński; +Cc: igt-dev
== Series Details ==
Series: Add device selection methods (rev5)
URL : https://patchwork.freedesktop.org/series/63553/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6774 -> IGTPW_3374
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/63553/revisions/5/mbox/
Known issues
------------
Here are the changes found in IGTPW_3374 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_mmap_gtt@basic-copy:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/fi-icl-u3/igt@gem_mmap_gtt@basic-copy.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/fi-icl-u3/igt@gem_mmap_gtt@basic-copy.html
* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [PASS][3] -> [DMESG-FAIL][4] ([fdo#111108])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
#### Possible fixes ####
* igt@gem_mmap_gtt@basic-write-read-distinct:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/fi-icl-u3/igt@gem_mmap_gtt@basic-write-read-distinct.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/fi-icl-u3/igt@gem_mmap_gtt@basic-write-read-distinct.html
#### Warnings ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-kbl-guc: [SKIP][7] ([fdo#109271]) -> [FAIL][8] ([fdo#107707])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/fi-kbl-guc/igt@i915_pm_rpm@basic-pci-d3-state.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/fi-kbl-guc/igt@i915_pm_rpm@basic-pci-d3-state.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#107707]: https://bugs.freedesktop.org/show_bug.cgi?id=107707
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
Participating hosts (55 -> 47)
------------------------------
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5148 -> IGTPW_3374
CI-20190529: 20190529
CI_DRM_6774: 15c71d0ff5a99fd6fb08800ff1689a5210dcbb37 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3374: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/
IGT_5148: 50390dd7adaccae21cafa85b866c17606cec94c3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for Add device selection methods (rev5)
2019-08-23 7:03 [igt-dev] [PATCH i-g-t v5 0/2] Add device selection methods Zbigniew Kempczyński
` (2 preceding siblings ...)
2019-08-23 9:05 ` [igt-dev] ✓ Fi.CI.BAT: success for Add device selection methods (rev5) Patchwork
@ 2019-08-24 2:39 ` Patchwork
3 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2019-08-24 2:39 UTC (permalink / raw)
To: Zbigniew Kempczyński; +Cc: igt-dev
== Series Details ==
Series: Add device selection methods (rev5)
URL : https://patchwork.freedesktop.org/series/63553/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6774_full -> IGTPW_3374_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/63553/revisions/5/mbox/
Known issues
------------
Here are the changes found in IGTPW_3374_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@reset-stress:
- shard-apl: [PASS][1] -> [FAIL][2] ([fdo#109661])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-apl2/igt@gem_eio@reset-stress.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-apl7/igt@gem_eio@reset-stress.html
* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#110854])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb2/igt@gem_exec_balancer@smoke.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb6/igt@gem_exec_balancer@smoke.html
* igt@gem_exec_schedule@independent-bsd1:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276]) +17 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb1/igt@gem_exec_schedule@independent-bsd1.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb7/igt@gem_exec_schedule@independent-bsd1.html
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#111325]) +4 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb8/igt@gem_exec_schedule@preempt-other-chain-bsd.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb2/igt@gem_exec_schedule@preempt-other-chain-bsd.html
* igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
- shard-glk: [PASS][9] -> [FAIL][10] ([fdo#106509] / [fdo#107409])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-glk3/igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-glk1/igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic.html
* igt@kms_flip@flip-vs-suspend:
- shard-hsw: [PASS][11] -> [INCOMPLETE][12] ([fdo#103540])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-hsw1/igt@kms_flip@flip-vs-suspend.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-hsw5/igt@kms_flip@flip-vs-suspend.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: [PASS][13] -> [DMESG-WARN][14] ([fdo#108566]) +5 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-apl7/igt@kms_frontbuffer_tracking@fbc-suspend.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-apl8/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-render:
- shard-iclb: [PASS][15] -> [FAIL][16] ([fdo#103167]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-render.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-render.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [PASS][17] -> [SKIP][18] ([fdo#109441]) +2 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb8/igt@kms_psr@psr2_primary_mmap_cpu.html
#### Possible fixes ####
* igt@gem_eio@reset-stress:
- shard-iclb: [FAIL][19] ([fdo#109661]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb7/igt@gem_eio@reset-stress.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb1/igt@gem_eio@reset-stress.html
* igt@gem_exec_parallel@contexts:
- shard-hsw: [TIMEOUT][21] -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-hsw1/igt@gem_exec_parallel@contexts.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-hsw1/igt@gem_exec_parallel@contexts.html
* igt@gem_exec_schedule@promotion-bsd:
- shard-iclb: [SKIP][23] ([fdo#111325]) -> [PASS][24] +4 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb2/igt@gem_exec_schedule@promotion-bsd.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb5/igt@gem_exec_schedule@promotion-bsd.html
* igt@gem_tiled_wb:
- shard-hsw: [INCOMPLETE][25] ([fdo#103540]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-hsw1/igt@gem_tiled_wb.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-hsw6/igt@gem_tiled_wb.html
* igt@i915_pm_rpm@i2c:
- shard-hsw: [FAIL][27] ([fdo#104097]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-hsw2/igt@i915_pm_rpm@i2c.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-hsw1/igt@i915_pm_rpm@i2c.html
* igt@kms_cursor_crc@pipe-b-cursor-64x64-sliding:
- shard-snb: [INCOMPLETE][29] ([fdo#105411]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-snb1/igt@kms_cursor_crc@pipe-b-cursor-64x64-sliding.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-snb4/igt@kms_cursor_crc@pipe-b-cursor-64x64-sliding.html
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-apl: [INCOMPLETE][31] ([fdo#103927]) -> [PASS][32] +6 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-apl2/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-apl3/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt:
- shard-apl: [FAIL][33] ([fdo#103167]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-apl4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-apl3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt.html
* igt@kms_frontbuffer_tracking@fbc-1p-rte:
- shard-kbl: [FAIL][35] ([fdo#103167] / [fdo#110378]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-kbl2/igt@kms_frontbuffer_tracking@fbc-1p-rte.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-kbl6/igt@kms_frontbuffer_tracking@fbc-1p-rte.html
- shard-apl: [FAIL][37] ([fdo#103167] / [fdo#110378]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-apl4/igt@kms_frontbuffer_tracking@fbc-1p-rte.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-apl4/igt@kms_frontbuffer_tracking@fbc-1p-rte.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-shrfb-plflip-blt:
- shard-hsw: [SKIP][39] ([fdo#109271]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-hsw6/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-shrfb-plflip-blt.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-shrfb-plflip-blt.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw:
- shard-iclb: [FAIL][41] ([fdo#103167]) -> [PASS][42] +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-kbl: [FAIL][43] ([fdo#103375]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-kbl4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-kbl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][45] ([fdo#103166]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb4/igt@kms_plane_lowres@pipe-a-tiling-x.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [SKIP][47] ([fdo#109441]) -> [PASS][48] +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb4/igt@kms_psr@psr2_sprite_mmap_gtt.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [DMESG-WARN][49] ([fdo#108566]) -> [PASS][50] +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-apl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-apl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][51] ([fdo#109276]) -> [PASS][52] +16 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb3/igt@prime_busy@hang-bsd2.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb2/igt@prime_busy@hang-bsd2.html
#### Warnings ####
* igt@gem_mocs_settings@mocs-settings-bsd2:
- shard-iclb: [FAIL][53] ([fdo#111330]) -> [SKIP][54] ([fdo#109276])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6774/shard-iclb1/igt@gem_mocs_settings@mocs-settings-bsd2.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/shard-iclb3/igt@gem_mocs_settings@mocs-settings-bsd2.html
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104097]: https://bugs.freedesktop.org/show_bug.cgi?id=104097
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#106509]: https://bugs.freedesktop.org/show_bug.cgi?id=106509
[fdo#107409]: https://bugs.freedesktop.org/show_bug.cgi?id=107409
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
Participating hosts (9 -> 6)
------------------------------
Missing (3): pig-skl-6260u shard-skl pig-hsw-4770r
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5148 -> IGTPW_3374
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_6774: 15c71d0ff5a99fd6fb08800ff1689a5210dcbb37 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3374: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/
IGT_5148: 50390dd7adaccae21cafa85b866c17606cec94c3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3374/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API Zbigniew Kempczyński
@ 2019-08-28 6:10 ` Katarzyna Dec
2019-08-28 8:23 ` Kempczynski, Zbigniew
2019-09-03 6:04 ` Arkadiusz Hiler
1 sibling, 1 reply; 15+ messages in thread
From: Katarzyna Dec @ 2019-08-28 6:10 UTC (permalink / raw)
To: Zbigniew Kempczyński; +Cc: igt-dev, Petri Latvala, Daniel Vetter
On Fri, Aug 23, 2019 at 09:03:50AM +0200, Zbigniew Kempczyński wrote:
> Change adds device selection based on scanning drm subsystem
> using udev library.
>
> Tool 'lsgpu' for device scanning and selection was added.
>
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Petri Latvala <petri.latvala@intel.com>
> ---
> .../igt-gpu-tools/igt-gpu-tools-docs.xml | 1 +
> lib/Makefile.sources | 2 +
> lib/igt_device_scan.c | 1380 +++++++++++++++++
> lib/igt_device_scan.h | 74 +
> lib/meson.build | 1 +
> tools/Makefile.sources | 1 +
> tools/lsgpu.c | 261 ++++
> tools/meson.build | 1 +
> 8 files changed, 1721 insertions(+)
> create mode 100644 lib/igt_device_scan.c
> create mode 100644 lib/igt_device_scan.h
> create mode 100644 tools/lsgpu.c
>
> diff --git a/docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml b/docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
> index ac83272f..4b3c38af 100644
> --- a/docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
> +++ b/docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
> @@ -23,6 +23,7 @@
> <xi:include href="xml/igt_core.xml"/>
> <xi:include href="xml/igt_debugfs.xml"/>
> <xi:include href="xml/igt_device.xml"/>
> + <xi:include href="xml/igt_device_scan.xml"/>
> <xi:include href="xml/igt_draw.xml"/>
> <xi:include href="xml/igt_dummyload.xml"/>
> <xi:include href="xml/igt_fb.xml"/>
> diff --git a/lib/Makefile.sources b/lib/Makefile.sources
> index cf094ab8..a9e9557a 100644
> --- a/lib/Makefile.sources
> +++ b/lib/Makefile.sources
> @@ -25,6 +25,8 @@ lib_source_list = \
> igt_debugfs.h \
> igt_device.c \
> igt_device.h \
> + igt_device_scan.c \
> + igt_device_scan.h \
> igt_aux.c \
> igt_aux.h \
> igt_color_encoding.c \
> diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c
> new file mode 100644
> index 00000000..8de790d9
> --- /dev/null
> +++ b/lib/igt_device_scan.c
> @@ -0,0 +1,1380 @@
> +/*
> + * Copyright © 2019 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#include "igt.h"
> +#include "igt_sysfs.h"
> +#include "igt_device.h"
> +#include "igt_device_scan.h"
> +#include <glib.h>
> +#include <libudev.h>
> +#include <linux/limits.h>
> +#include <sys/stat.h>
> +#include <sys/types.h>
> +#include <dirent.h>
> +#include <fcntl.h>
> +
> +/**
> + * SECTION:igt_device_scan
> + * @short_description: Device scanning and selection
> + * @title: Device selection
> + * @include: igt.h
> + *
> + * # Device scanning
> + *
> + * Device scanning iterates over drm subsystem using udev library
> + * to acquire drm devices.
> + * For each drm device we also get and store its parent in a device array
> + * to allow device selection in more contextual way.
> + *
> + * Parent devices are bus devices (like pci, platform, etc.) and contain a lot
> + * of usable information comparing to drm device.
> + *
> + * Udev keeps properties and sysattrs for the device as a list what is not
> + * convinient for key/value searching. So udev device properties and sysattrs
> + * are rewritten to internal hash tables in igt_device structure.
> + *
> + * # Filters
> + *
> + * Device selection can be done using filters. Filters allow sophisticated
> + * device matching and selection. Previously mentioned properties and sysattrs
> + * collected in igt_device hash tables simplify writing filter implementation.
> + *
> + * Direct device selection filter
> + * is special filter and it is checked first. Then contextual filter is chosen
> + * depending on filter name.
> + *
> + * Direct device selection filter must be:
> + *
> + * |[<!-- language="plain" -->
> + * subsystem:/sys
> + * ]|
> + *
> + * So, when user passes filter which looks like follows:
> + * |[<!-- language="plain" -->
> + * - drm:/sys/devices/pci0000:00/0000:00:02.0/drm/card0
> + * - pci:/sys/devices/pci0000:00/0000:00:02.0
> + * - platform:/sys/devices/platform/vgem
> + * ]|
> + *
> + * device from array which has subsystem and sys path will be returned.
> + *
> + * When /sys is not specified after colon contextual filters are taken
> + * into account. Drm device occurs in the system when appropriate module
> + * is loaded and device is detected (or exposed for platform devices). Loading
> + * drivers in different order can be problematic from CI point of view, where
> + * expectation is to get same device especially when multiple gpu devices
> + * exists in the system. For such devices its parent location on pci bus
> + * is constant and allows appropriate device selection using for example
> + * vendor / device ids.
> + *
> + * For tests which opens more than one device device filter collection API
> + * can be used. You can add a filter to the array using igt_device_filter_add(),
> + * get the nth filter stored using igt_device_filter_get() and get
> + * #igt_device_card using igt_device_card_match() with that filter.
> + *
> + * Implemented filters:
> + *
> + * - drm: get drm /dev/dri/... device directly
> + *
> + * |[<!-- language="plain" -->
> + * drm:/dev/dri/...
> + * ]|
> + *
> + * - pci: select device using pci properties
> + * |[<!-- language="plain" -->
> + * pci:[vendor=%04x/name][,device=%04x][,card=%d]
> + * ]|
> + *
> + * Filter allows device selection using vendor (hex or name), device id
> + * (hex) and nth-card from all matches. For example if there're 4 pci
> + * cards installed (let two cards have 1234 and other two 1235 device id,
> + * all of them of vendor Intel) you can select one using:
> + *
> + * |[<!-- language="plain" -->
> + * pci:vendor=Intel,device=1234,card=0
> + * ]|
> + *
> + * or
> + *
> + * |[<!-- language="plain" -->
> + * pci:vendor=8086,device=1234,card=0
> + * ]|
> + *
> + * This takes first device with 1234 id for Intel vendor (8086).
> + *
> + * |[<!-- language="plain" -->
> + * pci:vendor=Intel,device=1234,card=1
> + * ]|
> + *
> + * or
> + *
> + * |[<!-- language="plain" -->
> + * pci:vendor=8086,device=1234,card=1
> + * ]|
> + *
> + * It selects second one.
> + *
> + * As order on pci bus doesn't change (unless you'll add new device or
> + * reorder existing one) device selection using this filter will always
> + * return you same device regardless module loading time.
> + *
> + * - vgem: select virtual gem device
> + *
> + * |[<!-- language="plain" -->
> + * vgem:[card=%d]
> + * ]|
> + *
> + * For example:
> + *
> + * |[<!-- language="plain" -->
> + * vgem:
> + * vgem:card=0
> + * ]|
> + *
> + * Both selects first vgem device (no idea if more than one device will
> + * be visible, if yes use card= argument to point right one).
> + *
> + * - vkms: select virtual kms device
> + *
> + * |[<!-- language="plain" -->
> + * vkms:[card=%d]
> + * ]|
> + *
> + * For example:
> + *
> + * |[<!-- language="plain" -->
> + * vkms:
> + * vkms:card=0
> + * ]|
> + *
> + * Both selects first vkms device. Same as for vgem I assume more than
> + * one device can appear in the future.
> + *
> + * - vc4: select VC4 device
> + *
> + * |[<!-- language="plain" -->
> + * vc4:[card=%d]
> + * ]|
> + *
> + * For example:
> + *
> + * |[<!-- language="plain" -->
> + * vc4:
> + * vc4:card=0
> + * ]|
> + *
> + * Both selects first VC4 device. At the moment Rasperry PI has only
> + * one gpu, but filter is ready if there will be more.
> + *
> + * # lsgpu
> + *
> + * The devices can be scanned and displayed using 'lsgpu' tool. Tool also
> + * displays properties and sysattrs (-p switch, means print detail) which
> + * can be used during filter implementation.
> + *
> + * Tool can also be used to try out filters.
> + * To select device use '-d' or '--device' argument like:
> + *
> + * |[<!-- language="plain" -->
> + * ./lsgpu -d 'pci:vendor=Intel'
> + * === Device filter list ===
> + * [ 0]: pci:vendor=Intel
> +
> + * === Testing device open ===
> + * subsystem : pci
> + * chipset : 1
> + * drm card : /dev/dri/card0
> + * drm render : /dev/dri/renderD128
> + * Device /dev/dri/card0 successfully opened
> + * Device /dev/dri/renderD128 successfully opened
> + * ]|
> + *
> + * Additionally lsgpu tries to open the card and render nodes to verify
> + * permissions. It also uses IGT variable search order:
> + * - use --device first (it overrides IGT_DEVICE and .igtrc Common::Device
> + * settings)
> + * - use IGT_DEVICE enviroment variable if no --device are passed
> + * - use .igtrc Common::Device if no --device nor IGT_DEVICE are passed
> + */
I looked thought code in all patch and it generally looks good.
I have a question about lsgpu usage.
'-p' prints all devices, but there is not information in help about that
'-d' used without '-p' filters and prints details about particular device
Mixing '-p' and '-d' has no affect - we still see all devices, not filtered
ones. Is it by desing?
Kasia :)
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT Zbigniew Kempczyński
@ 2019-08-28 6:18 ` Katarzyna Dec
2019-08-28 8:28 ` Kempczynski, Zbigniew
2019-09-03 6:51 ` Arkadiusz Hiler
1 sibling, 1 reply; 15+ messages in thread
From: Katarzyna Dec @ 2019-08-28 6:18 UTC (permalink / raw)
To: Zbigniew Kempczyński; +Cc: igt-dev, Petri Latvala, Daniel Vetter
On Fri, Aug 23, 2019 at 09:03:51AM +0200, Zbigniew Kempczyński wrote:
> New IGT command line argument --device, IGT_DEVICE enviroment
> and .igtrc Common::Device were added to allow selecting device
> using device selection API.
>
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Petri Latvala <petri.latvala@intel.com>
Code looks good, but I found some hole in usage. When you give wrong value to
'--device' parameter while running igt test - binary 'hangs' looping
infinitely.
Does it supposed to work like that?
Kasia :)
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API
2019-08-28 6:10 ` Katarzyna Dec
@ 2019-08-28 8:23 ` Kempczynski, Zbigniew
2019-08-28 9:00 ` Katarzyna Dec
0 siblings, 1 reply; 15+ messages in thread
From: Kempczynski, Zbigniew @ 2019-08-28 8:23 UTC (permalink / raw)
To: Dec, Katarzyna; +Cc: igt-dev, Latvala, Petri, daniel
On Wed, 2019-08-28 at 08:10 +0200, Katarzyna Dec wrote:
> On Fri, Aug 23, 2019 at 09:03:50AM +0200, Zbigniew Kempczyński wrote:
> > + * # lsgpu
> > + *
> > + * The devices can be scanned and displayed using 'lsgpu' tool. Tool also
> > + * displays properties and sysattrs (-p switch, means print detail) which
> > + * can be used during filter implementation.
> > + *
> > + * Tool can also be used to try out filters.
> > + * To select device use '-d' or '--device' argument like:
> > + *
> > + * |[<!-- language="plain" -->
> > + * ./lsgpu -d 'pci:vendor=Intel'
> > + * === Device filter list ===
> > + * [ 0]: pci:vendor=Intel
> > +
> > + * === Testing device open ===
> > + * subsystem : pci
> > + * chipset : 1
> > + * drm card : /dev/dri/card0
> > + * drm render : /dev/dri/renderD128
> > + * Device /dev/dri/card0 successfully opened
> > + * Device /dev/dri/renderD128 successfully opened
> > + * ]|
> > + *
> > + * Additionally lsgpu tries to open the card and render nodes to verify
> > + * permissions. It also uses IGT variable search order:
> > + * - use --device first (it overrides IGT_DEVICE and .igtrc
> > Common::Device
> > + * settings)
> > + * - use IGT_DEVICE enviroment variable if no --device are passed
> > + * - use .igtrc Common::Device if no --device nor IGT_DEVICE are passed
> > + */
>
> I looked thought code in all patch and it generally looks good.
> I have a question about lsgpu usage.
> '-p' prints all devices, but there is not information in help about that
> '-d' used without '-p' filters and prints details about particular device
> Mixing '-p' and '-d' has no affect - we still see all devices, not filtered
> ones. Is it by desing?
Argument -p displays details for devices filtered with -d. If you use:
$ lsgpu -d platform:/sys/devices/platform/vgem -p
will display detail only for vgem device.
>
> Kasia :)
Zbigniew
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT
2019-08-28 6:18 ` Katarzyna Dec
@ 2019-08-28 8:28 ` Kempczynski, Zbigniew
2019-08-28 8:48 ` Katarzyna Dec
0 siblings, 1 reply; 15+ messages in thread
From: Kempczynski, Zbigniew @ 2019-08-28 8:28 UTC (permalink / raw)
To: Dec, Katarzyna; +Cc: igt-dev, Latvala, Petri, daniel
On Wed, 2019-08-28 at 08:18 +0200, Katarzyna Dec wrote:
> On Fri, Aug 23, 2019 at 09:03:51AM +0200, Zbigniew Kempczyński wrote:
> > New IGT command line argument --device, IGT_DEVICE enviroment
> > and .igtrc Common::Device were added to allow selecting device
> > using device selection API.
> >
> > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> > Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Cc: Petri Latvala <petri.latvala@intel.com>
>
> Code looks good, but I found some hole in usage. When you give wrong value
> to
> '--device' parameter while running igt test - binary 'hangs' looping
> infinitely.
> Does it supposed to work like that?
> Kasia :)
Some tests are prone to loop forever when there's some fail (my code
does nothing to that).
If you try to run gem_busy test for example on your desktop with running
compositor (which is drm master) you'll fail and get into infinite loop.
Zbigniew
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT
2019-08-28 8:28 ` Kempczynski, Zbigniew
@ 2019-08-28 8:48 ` Katarzyna Dec
2019-09-03 6:05 ` Arkadiusz Hiler
0 siblings, 1 reply; 15+ messages in thread
From: Katarzyna Dec @ 2019-08-28 8:48 UTC (permalink / raw)
To: Kempczynski, Zbigniew; +Cc: igt-dev, Petri Latvala, Daniel Vetter
On Wed, Aug 28, 2019 at 09:28:26AM +0100, Kempczynski, Zbigniew wrote:
> On Wed, 2019-08-28 at 08:18 +0200, Katarzyna Dec wrote:
> > On Fri, Aug 23, 2019 at 09:03:51AM +0200, Zbigniew Kempczyński wrote:
> > > New IGT command line argument --device, IGT_DEVICE enviroment
> > > and .igtrc Common::Device were added to allow selecting device
> > > using device selection API.
> > >
> > > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> > > Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> > > Cc: Daniel Vetter <daniel@ffwll.ch>
> > > Cc: Petri Latvala <petri.latvala@intel.com>
> >
> > Code looks good, but I found some hole in usage. When you give wrong value
> > to
> > '--device' parameter while running igt test - binary 'hangs' looping
> > infinitely.
> > Does it supposed to work like that?
> > Kasia :)
>
> Some tests are prone to loop forever when there's some fail (my code
> does nothing to that).
>
> If you try to run gem_busy test for example on your desktop with running
> compositor (which is drm master) you'll fail and get into infinite loop.
>
> Zbigniew
Ok, I guess I picked the wrong binary for test :)
Code looks good and my testing passes:
Reviewed-by: Katarzyna Dec <katarzana.dec@intel.com>
Kasia :)
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API
2019-08-28 8:23 ` Kempczynski, Zbigniew
@ 2019-08-28 9:00 ` Katarzyna Dec
0 siblings, 0 replies; 15+ messages in thread
From: Katarzyna Dec @ 2019-08-28 9:00 UTC (permalink / raw)
To: Kempczynski, Zbigniew; +Cc: igt-dev, Petri Latvala, Daniel Vetter
On Wed, Aug 28, 2019 at 09:23:38AM +0100, Kempczynski, Zbigniew wrote:
> On Wed, 2019-08-28 at 08:10 +0200, Katarzyna Dec wrote:
> > On Fri, Aug 23, 2019 at 09:03:50AM +0200, Zbigniew Kempczyński wrote:
> > > + * # lsgpu
> > > + *
> > > + * The devices can be scanned and displayed using 'lsgpu' tool. Tool also
> > > + * displays properties and sysattrs (-p switch, means print detail) which
> > > + * can be used during filter implementation.
> > > + *
> > > + * Tool can also be used to try out filters.
> > > + * To select device use '-d' or '--device' argument like:
> > > + *
> > > + * |[<!-- language="plain" -->
> > > + * ./lsgpu -d 'pci:vendor=Intel'
> > > + * === Device filter list ===
> > > + * [ 0]: pci:vendor=Intel
> > > +
> > > + * === Testing device open ===
> > > + * subsystem : pci
> > > + * chipset : 1
> > > + * drm card : /dev/dri/card0
> > > + * drm render : /dev/dri/renderD128
> > > + * Device /dev/dri/card0 successfully opened
> > > + * Device /dev/dri/renderD128 successfully opened
> > > + * ]|
> > > + *
> > > + * Additionally lsgpu tries to open the card and render nodes to verify
> > > + * permissions. It also uses IGT variable search order:
> > > + * - use --device first (it overrides IGT_DEVICE and .igtrc
> > > Common::Device
> > > + * settings)
> > > + * - use IGT_DEVICE enviroment variable if no --device are passed
> > > + * - use .igtrc Common::Device if no --device nor IGT_DEVICE are passed
> > > + */
> >
> > I looked thought code in all patch and it generally looks good.
> > I have a question about lsgpu usage.
> > '-p' prints all devices, but there is not information in help about that
> > '-d' used without '-p' filters and prints details about particular device
> > Mixing '-p' and '-d' has no affect - we still see all devices, not filtered
> > ones. Is it by desing?
>
> Argument -p displays details for devices filtered with -d. If you use:
>
> $ lsgpu -d platform:/sys/devices/platform/vgem -p
>
> will display detail only for vgem device.
This was my first thought that I am doing it wrong. I forgot to add 'platform:'.
Code looks good, thanks for addressing comments from previous revision.
Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>
Let's start using it!
Kasia :)
>
> >
> > Kasia :)
>
> Zbigniew
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API Zbigniew Kempczyński
2019-08-28 6:10 ` Katarzyna Dec
@ 2019-09-03 6:04 ` Arkadiusz Hiler
1 sibling, 0 replies; 15+ messages in thread
From: Arkadiusz Hiler @ 2019-09-03 6:04 UTC (permalink / raw)
To: Zbigniew Kempczyński; +Cc: igt-dev, Petri Latvala, Daniel Vetter
On Fri, Aug 23, 2019 at 09:03:50AM +0200, Zbigniew Kempczyński wrote:
> Change adds device selection based on scanning drm subsystem
> using udev library.
>
> Tool 'lsgpu' for device scanning and selection was added.
>
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Petri Latvala <petri.latvala@intel.com>
Acked-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT
2019-08-28 8:48 ` Katarzyna Dec
@ 2019-09-03 6:05 ` Arkadiusz Hiler
0 siblings, 0 replies; 15+ messages in thread
From: Arkadiusz Hiler @ 2019-09-03 6:05 UTC (permalink / raw)
To: Katarzyna Dec; +Cc: igt-dev, Petri Latvala, Daniel Vetter
On Wed, Aug 28, 2019 at 10:48:22AM +0200, Katarzyna Dec wrote:
> On Wed, Aug 28, 2019 at 09:28:26AM +0100, Kempczynski, Zbigniew wrote:
> > On Wed, 2019-08-28 at 08:18 +0200, Katarzyna Dec wrote:
> > > On Fri, Aug 23, 2019 at 09:03:51AM +0200, Zbigniew Kempczyński wrote:
> > > > New IGT command line argument --device, IGT_DEVICE enviroment
> > > > and .igtrc Common::Device were added to allow selecting device
> > > > using device selection API.
> > > >
> > > > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> > > > Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> > > > Cc: Daniel Vetter <daniel@ffwll.ch>
> > > > Cc: Petri Latvala <petri.latvala@intel.com>
> > >
> > > Code looks good, but I found some hole in usage. When you give wrong value
> > > to
> > > '--device' parameter while running igt test - binary 'hangs' looping
> > > infinitely.
> > > Does it supposed to work like that?
> > > Kasia :)
> >
> > Some tests are prone to loop forever when there's some fail (my code
> > does nothing to that).
> >
> > If you try to run gem_busy test for example on your desktop with running
> > compositor (which is drm master) you'll fail and get into infinite loop.
> >
> > Zbigniew
> Ok, I guess I picked the wrong binary for test :)
Do you happen to remember which binary it was? If you don't feel like
fixing it I would appreciate a bug report on https://bugs.freedesktop.org/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT Zbigniew Kempczyński
2019-08-28 6:18 ` Katarzyna Dec
@ 2019-09-03 6:51 ` Arkadiusz Hiler
2019-09-03 12:23 ` Kempczynski, Zbigniew
1 sibling, 1 reply; 15+ messages in thread
From: Arkadiusz Hiler @ 2019-09-03 6:51 UTC (permalink / raw)
To: Zbigniew Kempczyński; +Cc: igt-dev, Petri Latvala, Daniel Vetter
On Fri, Aug 23, 2019 at 09:03:51AM +0200, Zbigniew Kempczyński wrote:
> New IGT command line argument --device, IGT_DEVICE enviroment
> and .igtrc Common::Device were added to allow selecting device
> using device selection API.
>
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Petri Latvala <petri.latvala@intel.com>
> ---
> docs/chamelium.txt | 3 +
> lib/drmtest.c | 188 ++++++++++++++++++++++++++++++++++++++++++++-
> lib/drmtest.h | 9 +++
> lib/igt_core.c | 34 ++++++++
> 4 files changed, 232 insertions(+), 2 deletions(-)
>
> diff --git a/docs/chamelium.txt b/docs/chamelium.txt
> index 32c296f7..d3a379d3 100644
> --- a/docs/chamelium.txt
> +++ b/docs/chamelium.txt
> @@ -84,6 +84,9 @@ example (only Chamelium.URL is mandatory):
> # The path to dump frames that fail comparison checks
> FrameDumpPath=/root/
>
> + # Device selection filter
> + Device=pci:vendor=8086,card=0;vgem:
> +
> # The following section is used for configuring the Device Under Test.
> # It is not mandatory and allows overriding default values.
> [DUT]
> diff --git a/lib/drmtest.c b/lib/drmtest.c
> index c379a7b7..c01a88a9 100644
> --- a/lib/drmtest.c
> +++ b/lib/drmtest.c
> @@ -55,6 +55,7 @@
> #include "igt_gt.h"
> #include "igt_kmod.h"
> #include "igt_sysfs.h"
> +#include "igt_device_scan.h"
> #include "version.h"
> #include "config.h"
> #include "intel_reg.h"
> @@ -289,25 +290,208 @@ static int __open_driver(const char *base, int offset, unsigned int chipset)
> return __search_and_open(base, offset, chipset);
> }
>
> +static int __open_driver_exact(const char *name, unsigned int chipset)
> +{
> + static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
> + int fd;
> +
> + fd = open_device(name, chipset);
> + if (fd != -1)
> + return fd;
> +
> + pthread_mutex_lock(&mutex);
> + for (const struct module *m = modules; m->module; m++) {
> + if (chipset & m->bit) {
> + if (m->modprobe)
> + m->modprobe(m->module);
> + else
> + modprobe(m->module);
> + }
> + }
> + pthread_mutex_unlock(&mutex);
> +
> + return open_device(name, chipset);
> +}
> +
> +/*
> + * For compatibility mode when multiple --device argument were passed
> + * this function tries to be smart enough to handle tests which opens
> + * more than single device. It iterates over filter list and
> + * compares requested chipset to card chipset (or any).
> + *
> + * Returns:
> + * True if card according to filters added and chipset was found,
> + * false othwerwise.
> + */
> +static bool __find_card_with_chipset(int chipset, struct igt_device_card *card)
> +{
> + int i, n = igt_device_filter_count();
> + const char *filter;
> + bool match;
> +
> + for (i = 0; i < n; i++) {
> + filter = igt_device_filter_get(i);
I think that for now we should just go with the first filter and then,
when we have an API for explicit opening a second, different device
start caring about other filter. For now we can just
assert_f(igt_device_filter_count() > 1, "Only a single filter is
supported by this version of igt\n"); or something.
> + match = igt_device_card_match(filter, card);
> + if (match && (card->chipset == chipset ||
> + card->chipset == DRIVER_ANY)) {
> + return true;
> + }
> + }
> +
> + return false;
> +}
> +
> /**
> * __drm_open_driver:
> * @chipset: OR'd flags for each chipset to search, eg. #DRIVER_INTEL
> *
> - * Open the first DRM device we can find, searching up to 16 device nodes
> + * Function opens device in the following order:
> + * 1. when --device arguments are present device scanning will be executed,
> + * then filter argument is used to find matching one.
> + * 2. compatibility mode - open the first DRM device we can find,
> + * searching up to 16 device nodes.
> *
> * Returns:
> * An open DRM fd or -1 on error
> */
> int __drm_open_driver(int chipset)
> {
> + int n = igt_device_filter_count();
> +
> + if (n) {
> + bool found;
> + struct igt_device_card card;
> +
> + found = __find_card_with_chipset(chipset, &card);
> + if (!found || !strlen(card.card))
> + return -1;
> +
> + return __open_driver_exact(card.card, chipset);
> + }
> +
$ ./core_auth --r getclient-simple --device vkms
IGT-Version: 1.24-g64068440 (x86_64) (Linux: 5.2.10-250.vanilla.knurd.1.fc30.x86_64 x86_64)
Starting subtest: getclient-simple
Test requirement not met in function drm_open_driver, file ../lib/drmtest.c:569:
Test requirement: !(fd<0)
No known gpu found for chipset flags 0x4294967291 (any)
Last errno: 2, No such file or directory
Subtest getclient-simple: SKIP (0.002s)
Test requirement not met in function drm_open_driver, file ../lib/drmtest.c:569:
Test requirement: !(fd<0)
No known gpu found for chipset flags 0x4294967291 (any)
Which says nothing about filters. In such cases I think we should be
pretty verbose herbose:
1. print the filter
2. print discovered cards
3. mention that we have failed to match
Otherwise we will get people confused by shared logs, somthing they put
in .igtrc ages ago, CI, etc.
> return __open_driver("/dev/dri/card", 0, chipset);
> }
>
> -static int __drm_open_driver_render(int chipset)
> +int __drm_open_driver_render(int chipset)
> {
> + int n = igt_device_filter_count();
> +
> + if (n) {
> + bool found;
> + struct igt_device_card card;
> +
> + found = __find_card_with_chipset(chipset, &card);
> + if (!found || !strlen(card.render))
> + return -1;
> +
> + return __open_driver_exact(card.render, chipset);
> + }
> +
> return __open_driver("/dev/dri/renderD", 128, chipset);
> }
>
> +static int __drm_open_with_nth_filter(int num, int chipset, bool open_render)
> +{
> + struct igt_device_card card;
> + const char *filter, *devname;
> + bool match;
> + int n = igt_device_filter_count();
> +
> + if (!n || num < 0 || num >= n) {
> + igt_warn("No device filter num == %d passed\n", num);
> + return -1;
> + }
> +
> + filter = igt_device_filter_get(num);
> + match = igt_device_card_match(filter, &card);
> + if (!match) {
> + igt_warn("No device match filter: %s\n", filter);
> + return -1;
> + }
> +
> + if (!strlen(card.card) && !strlen(card.render))
> + return -1;
> +
> + devname = open_render ? card.render : card.card;
> + if (!strlen(devname)) {
> + igt_warn("No %s node matching filter: %s\n",
> + open_render ? "render" : "card", filter);
> + return -1;
> + }
> + return __open_driver_exact(devname, chipset);
> +}
> +
> +/**
> + * drm_open_card_with_nth_filter:
> + * @num: number of --device argument
> + * @chipset: OR'd flags for each chipset to search, eg. #DRIVER_INTEL
> + *
> + * Open /dev/dri/cardX device using multi-device selection API.
> + * When test require to open more than one device selection uses filter
> + * passed as --device argument. Arguments @num indicate filter number
> + * and @chipset expected device card chipset.
> + *
> + * An open DRM fd or -1 on error
> + */
> +int drm_open_card_with_nth_filter(int num, int chipset)
> +{
> + return __drm_open_with_nth_filter(num, chipset, false);
> +}
> +
> +/**
> + * drm_open_render_with_nth_filter:
> + * @num: number of --device argument
> + * @chipset: OR'd flags for each chipset to search, eg. #DRIVER_INTEL
> + *
> + * Open /dev/dri/renderDX device using multi-device selection API.
> + *
> + * When test require to open more than one device selection uses filter
> + * passed as --device argument. Arguments @num indicate filter number
> + * and @chipset expected device card chipset.
> + *
> + * An open DRM fd or -1 on error
> + */
> +int drm_open_render_with_nth_filter(int num, int chipset)
> +{
> + return __drm_open_with_nth_filter(num, chipset, true);
> +}
I am still not completely happy with those.
I can't imagine any real use-cases of the current implementation.
Instead I would probably just go with writing what I have described in
the previous iteration.
How about splitting the *_with_nth_filter() into a separate patch and
sending it on its own, as a reference? Then we can leave the design of
this bit of the interface to people that will actually consume it.
> +/**
> + * drm_open_card:
> + * @card: pointer to igt_device_card structure
> + *
> + * Open /dev/dri/cardX device using multi-device selection API.
> + *
> + * Require filled @card argument (see igt_device_card_match() function).
> + *
> + * An open DRM fd or -1 on error
> + */
> +int drm_open_card(struct igt_device_card *card)
> +{
> + if (!card || !strlen(card->card))
> + return -1;
> +
> + return __open_driver_exact(card->card, card->chipset);
> +}
> +
> +/**
> + * drm_open_render:
> + * @card: pointer to igt_device_card structure
> + *
> + * Open /dev/dri/renderDX device using multi-device selection API.
> + * Require filled @card argument (see igt_device_card_match() function).
> + *
> + * An open DRM fd or -1 on error
> + */
> +int drm_open_render(struct igt_device_card *card)
> +{
> + if (!card || !strlen(card->render))
> + return -1;
> +
> + return __open_driver_exact(card->render, card->chipset);
> +}
> +
> +
> static int at_exit_drm_fd = -1;
> static int at_exit_drm_render_fd = -1;
>
> diff --git a/lib/drmtest.h b/lib/drmtest.h
> index 614f57e6..fc2a0b57 100644
> --- a/lib/drmtest.h
> +++ b/lib/drmtest.h
> @@ -50,6 +50,7 @@
> #define DRIVER_AMDGPU (1 << 3)
> #define DRIVER_V3D (1 << 4)
> #define DRIVER_PANFROST (1 << 5)
> +
> /*
> * Exclude DRVER_VGEM from DRIVER_ANY since if you run on a system
> * with vgem as well as a supported driver, you can end up with a
> @@ -81,6 +82,14 @@ int drm_open_driver(int chipset);
> int drm_open_driver_master(int chipset);
> int drm_open_driver_render(int chipset);
> int __drm_open_driver(int chipset);
> +int __drm_open_driver_render(int chipset);
> +
> +/* Multi device API */
> +int drm_open_card_with_nth_filter(int num, int chipset);
> +int drm_open_render_with_nth_filter(int num, int chipset);
> +struct igt_device_card;
> +int drm_open_card(struct igt_device_card *card);
> +int drm_open_render(struct igt_device_card *card);
>
> void gem_quiescent_gpu(int fd);
>
> diff --git a/lib/igt_core.c b/lib/igt_core.c
> index 1cbb09f9..a8a11b5c 100644
> --- a/lib/igt_core.c
> +++ b/lib/igt_core.c
> @@ -71,6 +71,7 @@
> #include "igt_sysrq.h"
> #include "igt_rc.h"
> #include "igt_list.h"
> +#include "igt_device_scan.h"
>
> #define UNW_LOCAL_ONLY
> #include <libunwind.h>
> @@ -245,6 +246,9 @@
> * [Common]
> * FrameDumpPath=/tmp # The path to dump frames that fail comparison checks
> *
> + * # Device selection filter
> + * Device=pci:vendor=8086,card=0;vgem:
> + *
> * # The following section is used for configuring the Device Under Test.
> * # It is not mandatory and allows overriding default values.
> * [DUT]
> @@ -304,6 +308,7 @@ enum {
> OPT_DEBUG,
> OPT_INTERACTIVE_DEBUG,
> OPT_SKIP_CRC,
> + OPT_DEVICE,
> OPT_HELP = 'h'
> };
>
> @@ -320,6 +325,7 @@ static pthread_mutex_t log_buffer_mutex = PTHREAD_MUTEX_INITIALIZER;
> GKeyFile *igt_key_file;
>
> char *igt_frame_dump_path;
> +char *igt_rc_device;
>
> static bool stderr_needs_sentinel = false;
>
> @@ -624,6 +630,7 @@ static void print_usage(const char *help_str, bool output_on_stderr)
> " --skip-crc-compare\n"
> " --help-description\n"
> " --describe\n"
> + " --device filter\n"
> " --help|-h\n");
> if (help_str)
> fprintf(f, "%s\n", help_str);
> @@ -688,6 +695,16 @@ static void common_init_config(void)
> if (ret != 0)
> igt_set_autoresume_delay(ret);
>
> + /* No IGT_DEVICE and no --device passed, try .igtrc Common::Device */
> + if (!igt_rc_device)
> + igt_rc_device =
> + g_key_file_get_string(igt_key_file, "Common",
> + "Device", &error);
> + if (igt_rc_device && !igt_device_filter_count())
> + igt_device_filter_add(igt_rc_device);
> +
> + g_clear_error(&error);
> +
> out:
> if (!key_file_env && key_file_loc)
> free(key_file_loc);
> @@ -725,6 +742,11 @@ static void common_init_env(void)
> if (env) {
> __set_forced_driver(env);
> }
> +
> + env = getenv("IGT_DEVICE");
> + if (env) {
> + igt_device_filter_add(env);
> + }
> }
>
> static int common_init(int *argc, char **argv,
> @@ -743,6 +765,7 @@ static int common_init(int *argc, char **argv,
> {"debug", optional_argument, NULL, OPT_DEBUG},
> {"interactive-debug", optional_argument, NULL, OPT_INTERACTIVE_DEBUG},
> {"skip-crc-compare", no_argument, NULL, OPT_SKIP_CRC},
> + {"device", required_argument, NULL, OPT_DEVICE},
> {"help", no_argument, NULL, OPT_HELP},
> {0, 0, 0, 0}
> };
> @@ -865,6 +888,17 @@ static int common_init(int *argc, char **argv,
> case OPT_SKIP_CRC:
> igt_skip_crc_compare = true;
> goto out;
> + case OPT_DEVICE:
> + assert(optarg);
> + /* We need to free all devices passed in
> + * IGT_DEVICE environment variable.
> + */
> + if (getenv("IGT_DEVICE") && igt_device_filter_count()) {
> + unsetenv("IGT_DEVICE");
> + igt_device_filter_free_all();
> + }
I would structure that slightly differently:
char *device_filter_str = NULL;
device_filter_str = g_key_file_get_string(igt_key_file, "Common", "Device", &error);
env = getenv("IGT_DEVICE");
if (env) {
free(device_filter_str);
device_filter_str = strdup(env);
}
/* ... */
switch (c) {
case OPT_DEVICE:
assert(optarg);
free(device_filter_str);
device_filter_str = strdup(optarg);
break;
}
/* ... */
if (device_filter_str) {
igt_device_filter_add(device_filter_str);
free(device_filter_str);
}
--
Cheers,
Arek
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT
2019-09-03 6:51 ` Arkadiusz Hiler
@ 2019-09-03 12:23 ` Kempczynski, Zbigniew
0 siblings, 0 replies; 15+ messages in thread
From: Kempczynski, Zbigniew @ 2019-09-03 12:23 UTC (permalink / raw)
To: Hiler, Arkadiusz; +Cc: igt-dev, Latvala, Petri, daniel
On Tue, 2019-09-03 at 09:51 +0300, Arkadiusz Hiler wrote:
<cut>
> > +/*
> > + * For compatibility mode when multiple --device argument were passed
> > + * this function tries to be smart enough to handle tests which opens
> > + * more than single device. It iterates over filter list and
> > + * compares requested chipset to card chipset (or any).
> > + *
> > + * Returns:
> > + * True if card according to filters added and chipset was found,
> > + * false othwerwise.
> > + */
> > +static bool __find_card_with_chipset(int chipset, struct igt_device_card
> > *card)
> > +{
> > + int i, n = igt_device_filter_count();
> > + const char *filter;
> > + bool match;
> > +
> > + for (i = 0; i < n; i++) {
> > + filter = igt_device_filter_get(i);
>
> I think that for now we should just go with the first filter and then,
> when we have an API for explicit opening a second, different device
> start caring about other filter. For now we can just
> assert_f(igt_device_filter_count() > 1, "Only a single filter is
> supported by this version of igt\n"); or something.
> > + match = igt_device_card_match(filter, card);
> > + if (match && (card->chipset == chipset ||
> > + card->chipset == DRIVER_ANY)) {
> > + return true;
> > + }
> > + }
> > +
> > + return false;
> > +}
> > +
My intention was to run kms_prime tests without changing test code,
allowing user to select vgem and other device he wants. Without
reiterating the filters and matching chipset it is not possible.
Above function has a bug, I've fixed it.
So:
# kms_prime --device vgem: --device pci:
or
# kms_prime --device pci: --device vgem:
will work properly when I'll push the new patchset.
I would like to rewrite tests adopting new API partially, not making
revolution within tests now.
<cut>
> $ ./core_auth --r getclient-simple --device vkms
>
> IGT-Version: 1.24-g64068440 (x86_64) (Linux: 5.2.10-
> 250.vanilla.knurd.1.fc30.x86_64 x86_64)
> Starting subtest: getclient-simple
> Test requirement not met in function drm_open_driver, file
> ../lib/drmtest.c:569:
> Test requirement: !(fd<0)
> No known gpu found for chipset flags 0x4294967291 (any)
> Last errno: 2, No such file or directory
> Subtest getclient-simple: SKIP (0.002s)
> Test requirement not met in function drm_open_driver, file
> ../lib/drmtest.c:569:
> Test requirement: !(fd<0)
> No known gpu found for chipset flags 0x4294967291 (any)
>
> Which says nothing about filters. In such cases I think we should be
> pretty verbose herbose:
> 1. print the filter
> 2. print discovered cards
> 3. mention that we have failed to match
>
> Otherwise we will get people confused by shared logs, somthing they put
> in .igtrc ages ago, CI, etc.
You're right. Currently device selection code is not verbose and
in case of problems you're not informed what's wrong.
I will add debug / error messages to the code.
<cut>
> +int drm_open_card_with_nth_filter(int num, int chipset)
<cut>
> +int drm_open_render_with_nth_filter(int num, int chipset)
> I am still not completely happy with those.
>
> I can't imagine any real use-cases of the current implementation.
> Instead I would probably just go with writing what I have described in
> the previous iteration.
>
> How about splitting the *_with_nth_filter() into a separate patch and
> sending it on its own, as a reference? Then we can leave the design of
> this bit of the interface to people that will actually consume it.
Ok, I will add this as separate patch when device selection core
will be reviewed and merged.
We can take then few tests and propose new API in drmtest.[ch].
<cut>
>
> > diff --git a/lib/igt_core.c b/lib/igt_core.c
> > index 1cbb09f9..a8a11b5c 100644
> > --- a/lib/igt_core.c
> > +++ b/lib/igt_core.c
> > @@ -71,6 +71,7 @@
> > #include "igt_sysrq.h"
> > #include "igt_rc.h"
> > #include "igt_list.h"
> > +#include "igt_device_scan.h"
> >
> > #define UNW_LOCAL_ONLY
> > #include <libunwind.h>
> > @@ -245,6 +246,9 @@
> > * [Common]
> > * FrameDumpPath=/tmp # The path to dump frames that fail comparison
> > checks
> > *
> > + * # Device selection filter
> > + * Device=pci:vendor=8086,card=0;vgem:
> > + *
> > * # The following section is used for configuring the Device Under
> > Test.
> > * # It is not mandatory and allows overriding default values.
> > * [DUT]
> > @@ -304,6 +308,7 @@ enum {
> > OPT_DEBUG,
> > OPT_INTERACTIVE_DEBUG,
> > OPT_SKIP_CRC,
> > + OPT_DEVICE,
> > OPT_HELP = 'h'
> > };
> >
> > @@ -320,6 +325,7 @@ static pthread_mutex_t log_buffer_mutex =
> > PTHREAD_MUTEX_INITIALIZER;
> > GKeyFile *igt_key_file;
> >
> > char *igt_frame_dump_path;
> > +char *igt_rc_device;
> >
> > static bool stderr_needs_sentinel = false;
> >
> > @@ -624,6 +630,7 @@ static void print_usage(const char *help_str, bool
> > output_on_stderr)
> > " --skip-crc-compare\n"
> > " --help-description\n"
> > " --describe\n"
> > + " --device filter\n"
> > " --help|-h\n");
> > if (help_str)
> > fprintf(f, "%s\n", help_str);
> > @@ -688,6 +695,16 @@ static void common_init_config(void)
> > if (ret != 0)
> > igt_set_autoresume_delay(ret);
> >
> > + /* No IGT_DEVICE and no --device passed, try .igtrc Common::Device */
> > + if (!igt_rc_device)
> > + igt_rc_device =
> > + g_key_file_get_string(igt_key_file, "Common",
> > + "Device", &error);
> > + if (igt_rc_device && !igt_device_filter_count())
> > + igt_device_filter_add(igt_rc_device);
> > +
> > + g_clear_error(&error);
> > +
> > out:
> > if (!key_file_env && key_file_loc)
> > free(key_file_loc);
> > @@ -725,6 +742,11 @@ static void common_init_env(void)
> > if (env) {
> > __set_forced_driver(env);
> > }
> > +
> > + env = getenv("IGT_DEVICE");
> > + if (env) {
> > + igt_device_filter_add(env);
> > + }
> > }
> >
> > static int common_init(int *argc, char **argv,
> > @@ -743,6 +765,7 @@ static int common_init(int *argc, char **argv,
> > {"debug", optional_argument, NULL, OPT_DEBUG},
> > {"interactive-debug", optional_argument, NULL,
> > OPT_INTERACTIVE_DEBUG},
> > {"skip-crc-compare", no_argument, NULL, OPT_SKIP_CRC},
> > + {"device", required_argument, NULL, OPT_DEVICE},
> > {"help", no_argument, NULL, OPT_HELP},
> > {0, 0, 0, 0}
> > };
> > @@ -865,6 +888,17 @@ static int common_init(int *argc, char **argv,
> > case OPT_SKIP_CRC:
> > igt_skip_crc_compare = true;
> > goto out;
> > + case OPT_DEVICE:
> > + assert(optarg);
> > + /* We need to free all devices passed in
> > + * IGT_DEVICE environment variable.
> > + */
> > + if (getenv("IGT_DEVICE") && igt_device_filter_count())
> > {
> > + unsetenv("IGT_DEVICE");
> > + igt_device_filter_free_all();
> > + }
>
> I would structure that slightly differently:
>
> char *device_filter_str = NULL;
>
> device_filter_str = g_key_file_get_string(igt_key_file, "Common", "Device",
> &error);
>
> env = getenv("IGT_DEVICE");
> if (env) {
> free(device_filter_str);
> device_filter_str = strdup(env);
> }
>
> /* ... */
> switch (c) {
> case OPT_DEVICE:
> assert(optarg);
> free(device_filter_str);
> device_filter_str = strdup(optarg);
> break;
> }
>
> /* ... */
>
> if (device_filter_str) {
> igt_device_filter_add(device_filter_str);
> free(device_filter_str);
> }
I would also do that but current IGT code do the following:
common_init()
-> common_init_env() - getenv(IGT_DEVICE)
...
-> getopt() loop - (--device) passing
...
-> common_init_config() - parse .igtrc
So reading .igtrc is done at the end, so I have do some tricks
to keep device selection order we set in previous email.
Zbigniew
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2019-09-03 12:25 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-23 7:03 [igt-dev] [PATCH i-g-t v5 0/2] Add device selection methods Zbigniew Kempczyński
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 1/2] Introduce device selection API Zbigniew Kempczyński
2019-08-28 6:10 ` Katarzyna Dec
2019-08-28 8:23 ` Kempczynski, Zbigniew
2019-08-28 9:00 ` Katarzyna Dec
2019-09-03 6:04 ` Arkadiusz Hiler
2019-08-23 7:03 ` [igt-dev] [PATCH i-g-t v5 2/2] Add device selection for IGT Zbigniew Kempczyński
2019-08-28 6:18 ` Katarzyna Dec
2019-08-28 8:28 ` Kempczynski, Zbigniew
2019-08-28 8:48 ` Katarzyna Dec
2019-09-03 6:05 ` Arkadiusz Hiler
2019-09-03 6:51 ` Arkadiusz Hiler
2019-09-03 12:23 ` Kempczynski, Zbigniew
2019-08-23 9:05 ` [igt-dev] ✓ Fi.CI.BAT: success for Add device selection methods (rev5) Patchwork
2019-08-24 2:39 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.