tools/igt_power: fix Xe crash via drmtest path helpers
v4 cover tools/igt_power: fix Xe crash via drmtest path helpers
igt_power opened its DRM device fd with a raw open() call, which skips the Xe device cache initialisation performed by the drmtest open helpers. This caused an assertion failure in xe_query the moment igt_power_open() called into is_intel_dgfx() on a Xe device.
The fix is split into two patches. The first adds __drm_open_driver_path() to lib/drmtest, a non-asserting helper that validates the fd is a real DRM device (DRM_IOCTL_VERSION) before initialising the Xe cache. The second switches igt_power to that helper and its matching __drm_close_driver(), completely removing the direct Xe dependency from the tool.
v4:
- rename drm_open_driver_path to __drm_open_driver_path (no asserts/requires)
- add DRM_IOCTL_VERSION check to verify fd is a DRM device before proceeding
- split the single patch into two: lib helper addition and igt_power
v3:
- remove redundant if (fd >= 0) guards on both close call sites
v2:
- move Xe cache setup/teardown out of igt_power
- add drm_open_driver_path() and use __drm_close_driver()
- drop the direct xe/xe_query dependency from igt_power
Sebastian Brzezinka (2):
lib/drmtest: add __drm_open_driver_path() tools/igt_power: fix crash on Xe devices by initializing xe_device
cache
lib/drmtest.c | 30 ++++++++++++++++++++++++++++++ lib/drmtest.h | 1 + tools/igt_power.c | 6 +++--- 3 files changed, 34 insertions(+), 3 deletions(-)
Signature · 1 line
2.53.0
PATCH v4 1/2 lib/drmtest: add __drm_open_driver_path()
Add __drm_open_driver_path() as a path-based DRM open helper. It opens the given path with O_RDWR, verifies the resulting fd is a DRM device by issuing DRM_IOCTL_VERSION via __get_drm_device_name() before proceeding (returning -1 and closing on failure), logs the opened device path, and populates the xe_device cache when the device is Xe.
The __ prefix signals that the function does not throw assertions or igt_require() calls, consistent with the existing __drm_open_driver* family.
--- lib/drmtest.c | 30 ++++++++++++++++++++++++++++++ lib/drmtest.h | 1 + 2 files changed, 31 insertions(+)
lib/drmtest.c +30 -0
@@ -379,6 +379,36 @@ err:return -1 ; } +/** +* __drm_open_driver_path: +* @path: DRM device node path +* +* Opens @path with O_RDWR and populates the xe_device cache for Xe fds. +* +* Returns: DRM file descriptor or -1 on error +*/ +int __drm_open_driver_path (const char *path) +{ +char name[12 ] ="" ; +int fd; + + fd =open (path,O_RDWR ); +if (fd <0 ) +return -1 ; + +if (__get_drm_device_name (fd, name,sizeof (name) -1 )) { +close (fd); +return -1 ; + } + +log_opened_device_path (path); + +if (is_xe_device (fd)) +xe_device_get (fd); + +return fd; +} + static struct { int fd; struct stat stat;
lib/drmtest.h +1 -0
@@ -123,6 +123,7 @@ int drm_open_driver_another(int idx, int chipset);int drm_open_driver (int chipset);int drm_open_driver_master (int chipset);int drm_open_driver_render (int chipset); +int __drm_open_driver_path (const char *path);int __drm_open_driver_another (int idx,int chipset);int __drm_open_driver (int chipset);int __drm_open_driver_render (int chipset);
Signature · 1 line
2.53.0
PATCH v4 2/2 tools/igt_power: fix crash on Xe devices by initializing xe_device cache
Opening a DRM device with plain open() does not initialize the Xe device cache. When igt_power_open() calls is_intel_dgfx() -> xe_has_vram(), it reaches find_in_cache() which asserts the cache entry exists, causing a crash on Xe devices with: xe_query-CRITICAL: Failed assertion: xe_dev
Switch both open/close call sites to __drm_open_driver_path() and __drm_close_driver() so that Xe cache setup and teardown are paired with the fd lifecycle, keeping igt_power free of Xe-specific handling.
--- tools/igt_power.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/igt_power.c +3 -3
@@ -38,7 +38,7 @@ static bool prepare(struct measurement *m)int ret, fd =-1 ;if (m->drm_device) { - fd =open (m->drm_device,O_RDONLY ); + fd =__drm_open_driver_path (m->drm_device);if (fd <0 ) {fprintf (stderr,"Unable to open drm device %s (%d)\n" , m->drm_device, -errno);
@@ -54,12 +54,12 @@ static bool prepare(struct measurement *m)else fprintf (stderr,"Unable to open rapl domain %s (%d)\n" , m->rapl_domain, ret); -close (fd); +__drm_close_driver (fd);return false; } -close (fd); +__drm_close_driver (fd); }return true;
Signature · 1 line
2.53.0
Re: [PATCH v4 1/2] lib/drmtest: add __drm_open_driver_path()
In reply to Sebastian BrzezinkaQuoted 9 lines · Sebastian Brzezinka
Add
__drm_open_driver_path()as a path-based DRM open helper. It opens the given path withO_RDWR, verifies the resulting fd is a DRM device by issuingDRM_IOCTL_VERSIONvia__get_drm_device_name()before proceeding (returning -1 and closing on failure), logs the opened device path, and populates thexe_devicecache when the device is Xe.The __ prefix signals that the function does not throw assertions or
igt_require()calls, consistent with the existing __drm_open_driver* family.
FWIW, I think the __ prefix should indicate "implementation detail, don't call directly" or something along those lines.
I think it's problematic to encourage tests to call __ prefixed functions.
BR,
Jani.
Quoted 60 lines
Signed-off-by Sebastian Brzezinka <[email protected]>--- lib/drmtest.c | 30 ++++++++++++++++++++++++++++++ lib/drmtest.h | 1 + 2 files changed, 31 insertions(+)lib/drmtest.c +30
-0@@ -379,6 +379,36 @@ err:return -1 ; } +/** +* __drm_open_driver_path: +* @path: DRM device node path +* +* Opens @path with O_RDWR and populates the xe_device cache for Xe fds. +* +* Returns: DRM file descriptor or -1 on error +*/ +int __drm_open_driver_path (const char *path) +{ +char name[12 ] ="" ; +int fd; + + fd =open (path,O_RDWR ); +if (fd <0 ) +return -1 ; + +if (__get_drm_device_name (fd, name,sizeof (name) -1 )) { +close (fd); +return -1 ; + } + +log_opened_device_path (path); + +if (is_xe_device (fd)) +xe_device_get (fd); + +return fd; +} + static struct { int fd; struct stat stat;lib/drmtest.h +1
-0@@ -123,6 +123,7 @@ int drm_open_driver_another(int idx, int chipset);int drm_open_driver (int chipset);int drm_open_driver_master (int chipset);int drm_open_driver_render (int chipset); +int __drm_open_driver_path (const char *path);int __drm_open_driver_another (int idx,int chipset);int __drm_open_driver (int chipset);int __drm_open_driver_render (int chipset);
Signature · 1 line
Jani Nikula, Intel
Re: [PATCH v4 1/2] lib/drmtest: add __drm_open_driver_path()
Hi Jani,
Quoted 11 lines · Jani Nikula
Quoted 9 lines · Sebastian Brzezinka
Add
__drm_open_driver_path()as a path-based DRM open helper. It opens the given path withO_RDWR, verifies the resulting fd is a DRM device by issuingDRM_IOCTL_VERSIONvia__get_drm_device_name()before proceeding (returning -1 and closing on failure), logs the opened device path, and populates thexe_devicecache when the device is Xe.The __ prefix signals that the function does not throw assertions or
igt_require()calls, consistent with the existing __drm_open_driver* family.
Quoted 5 lines
FWIW, I think the __ prefix should indicate "implementation detail, don't call directly" or something along those lines.
I think it's problematic to encourage tests to call __ prefixed functions.
In general I agree with you, but in v3 Kamil comment on this:
``` >>Could you rename it into __drm_open_driver_path? >>The idea is that all __functions should not throw asserts nor >>require. ```
So I added an explanation in the comment.
Signature · 2 lines
Best regards, Sebastian
Re: [PATCH v4 1/2] lib/drmtest: add __drm_open_driver_path()
Quoted 19 lines · Sebastian Brzezinka
Hi Jani,
Quoted 11 lines · Jani Nikula
Quoted 9 lines · Sebastian Brzezinka
Add
__drm_open_driver_path()as a path-based DRM open helper. It opens the given path withO_RDWR, verifies the resulting fd is a DRM device by issuingDRM_IOCTL_VERSIONvia__get_drm_device_name()before proceeding (returning -1 and closing on failure), logs the opened device path, and populates thexe_devicecache when the device is Xe.The __ prefix signals that the function does not throw assertions or
igt_require()calls, consistent with the existing __drm_open_driver* family.Quoted 5 lines
FWIW, I think the __ prefix should indicate "implementation detail, don't call directly" or something along those lines.
I think it's problematic to encourage tests to call __ prefixed functions.
Quoted 8 lines
In general I agree with you, but in v3 Kamil comment on this:
``` >>Could you rename it into __drm_open_driver_path? >>The idea is that all __functions should not throw asserts nor >>require. ```So I added an explanation in the comment.
I obviously disagree with all of that, but *shrug*.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel
Re: [PATCH v4 1/2] lib/drmtest: add __drm_open_driver_path()
Hi Jani,
Quoted 24 lines · Jani Nikula
Quoted 23 lines · Sebastian Brzezinka
Hi Jani,
Quoted 11 lines · Jani Nikula
Quoted 9 lines · Sebastian Brzezinka
Add
__drm_open_driver_path()as a path-based DRM open helper. It opens the given path withO_RDWR, verifies the resulting fd is a DRM device by issuingDRM_IOCTL_VERSIONvia__get_drm_device_name()before proceeding (returning -1 and closing on failure), logs the opened device path, and populates thexe_devicecache when the device is Xe.The __ prefix signals that the function does not throw assertions or
igt_require()calls, consistent with the existing __drm_open_driver* family.Quoted 5 lines
FWIW, I think the __ prefix should indicate "implementation detail, don't call directly" or something along those lines.
I think it's problematic to encourage tests to call __ prefixed functions.
In general I agree with you, but in v3 Kamil comment on this:
```
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Could you rename it into
__drm_open_driver_path? The idea is that all__functionsshould not throw asserts nor require.```
So I added an explanation in the comment.
I obviously disagree with all of that, but *shrug*.
We could implement separete lib functions for tools but that will require duplicate effort.
The idea with __function is that it should be implemented without any igt_assert nor igt_require so tools could use them. We could go with function() but then developers could later on change behaviour and break a tool.
Or we could add some suffix to a name? function_safe()?
Btw why tool/igt_power couldn't just read sysfs? Why does it needs to open /dev/dri/card* to get any info? +cc Ville
Regards,
Kamil
Quoted 7 lines
BR,
Jani.Signature · 1 line
Jani Nikula, Intel
Re: [PATCH v4 1/2] lib/drmtest: add __drm_open_driver_path()
Quoted 43 lines · Kamil Konieczny
Hi Jani,
Quoted 24 lines · Jani Nikula
Quoted 23 lines · Sebastian Brzezinka
Hi Jani,
Quoted 11 lines · Jani Nikula
Quoted 9 lines · Sebastian Brzezinka
Add
__drm_open_driver_path()as a path-based DRM open helper. It opens the given path withO_RDWR, verifies the resulting fd is a DRM device by issuingDRM_IOCTL_VERSIONvia__get_drm_device_name()before proceeding (returning -1 and closing on failure), logs the opened device path, and populates thexe_devicecache when the device is Xe.The __ prefix signals that the function does not throw assertions or
igt_require()calls, consistent with the existing __drm_open_driver* family.Quoted 5 lines
FWIW, I think the __ prefix should indicate "implementation detail, don't call directly" or something along those lines.
I think it's problematic to encourage tests to call __ prefixed functions.
In general I agree with you, but in v3 Kamil comment on this:
```Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Could you rename it into
__drm_open_driver_path? The idea is that all__functionsshould not throw asserts nor require.```
So I added an explanation in the comment.
I obviously disagree with all of that, but *shrug*.
We could implement separete lib functions for tools but that will require duplicate effort.
The idea with
__functionis that it should be implemented without anyigt_assertnorigt_requireso tools could use them. We could go withfunction()but then developers could later on change behaviour and break a tool.
Quoted 4 lines
Or we could add some suffix to a name?
function_safe()?Btw why tool/igt_power couldn't just read sysfs? Why does it needs to open
/dev/dri/card*to get any info? +cc Ville
It opens the device just because lib/igt_power and its dependencies want the fd.
Signature · 2 lines
Ville Syrjälä Intel
Re: [PATCH v4 1/2] lib/drmtest: add __drm_open_driver_path()
In reply to Kamil KoniecznyQuoted 38 lines · Kamil Konieczny
Hi Jani,
Quoted 24 lines · Jani Nikula
Quoted 23 lines · Sebastian Brzezinka
Hi Jani,
Quoted 11 lines · Jani Nikula
Quoted 9 lines · Sebastian Brzezinka
Add
__drm_open_driver_path()as a path-based DRM open helper. It opens the given path withO_RDWR, verifies the resulting fd is a DRM device by issuingDRM_IOCTL_VERSIONvia__get_drm_device_name()before proceeding (returning -1 and closing on failure), logs the opened device path, and populates thexe_devicecache when the device is Xe.The __ prefix signals that the function does not throw assertions or
igt_require()calls, consistent with the existing __drm_open_driver* family.Quoted 5 lines
FWIW, I think the __ prefix should indicate "implementation detail, don't call directly" or something along those lines.
I think it's problematic to encourage tests to call __ prefixed functions.
In general I agree with you, but in v3 Kamil comment on this:
```Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Could you rename it into
__drm_open_driver_path? The idea is that all__functionsshould not throw asserts nor require.```
So I added an explanation in the comment.
I obviously disagree with all of that, but *shrug*.
We could implement separete lib functions for tools but that will require duplicate effort.
Quoted 6 lines
The idea with
__functionis that it should be implemented without anyigt_assertnorigt_requireso tools could use them. We could go withfunction()but then developers could later on change behaviour and break a tool.Or we could add some suffix to a name?
function_safe()?
Given the number of assertions that already exist under lib/, perhaps this would be somewhat hard to achieve, but I feel like we should go the other way around: a suffix to denote that a function uses IGT assertions.
I.o.w., do_something() would be usable from both test and tools code; do_something_asserting() would be a version of the same function that contains assertions.
"asserting" is a bit long for a prefix, we could try to come up with something better.
--
Gustavo Sousa
Quoted 14 lines
Btw why tool/igt_power couldn't just read sysfs? Why does it needs to open
/dev/dri/card*to get any info? +cc VilleRegards,
KamilQuoted 7 lines
BR,
Jani.Signature · 1 line
Jani Nikula, Intel
Re: [PATCH v4 1/2] lib/drmtest: add __drm_open_driver_path()
In reply to Sebastian BrzezinkaHi Sebastian,
Quoted 23 lines · Sebastian Brzezinka
Add
__drm_open_driver_path()as a path-based DRM open helper. It opens the given path withO_RDWR, verifies the resulting fd is a DRM device by issuingDRM_IOCTL_VERSIONvia__get_drm_device_name()before proceeding (returning -1 and closing on failure), logs the opened device path, and populates thexe_devicecache when the device is Xe.The __ prefix signals that the function does not throw assertions or
igt_require()calls, consistent with the existing __drm_open_driver* family.Signed-off-by Sebastian Brzezinka <[email protected]>--- lib/drmtest.c | 30 ++++++++++++++++++++++++++++++ lib/drmtest.h | 1 + 2 files changed, 31 insertions(+)lib/drmtest.c +0
-0@@ -379,6 +379,36 @@ err:return -1 ; }
lib/drmtest.c err: · line 390
Quoted 10 lines
lib/drmtest.c +9
-0+/** +* __drm_open_driver_path: +* @path: DRM device node path +* +* Opens @path with O_RDWR and populates the xe_device cache for Xe fds. +* +* Returns: DRM file descriptor or -1 on error +*/ +int __drm_open_driver_path (const char *path)
This should be
int drm_open_driver_path(const char *path)
see below.
lib/drmtest.c err: · line 403
Quoted 13 lines
lib/drmtest.c +13
-0+{ +char name[12 ] ="" ; +int fd; + + fd =open (path,O_RDWR ); +if (fd <0 ) +return -1 ; + +if (__get_drm_device_name (fd, name,sizeof (name) -1 )) { +close (fd); +return -1 ; + } +
Please verify here that name[0] != 0.
lib/drmtest.c err: · line 407
Quoted 4 lines
lib/drmtest.c +4
-0+log_opened_device_path (path); + +if (is_xe_device (fd)) +xe_device_get (fd);
xe_device_get() uses igt_assert() so use drm_open_driver_path() as function name.
Regards,
Kamil
Quoted 22 lines
lib/drmtest.c +4
-0+ +return fd; +} + static struct { int fd; struct stat stat;lib/drmtest.h +1
-0@@ -123,6 +123,7 @@ int drm_open_driver_another(int idx, int chipset);int drm_open_driver (int chipset);int drm_open_driver_master (int chipset);int drm_open_driver_render (int chipset); +int __drm_open_driver_path (const char *path);int __drm_open_driver_another (int idx,int chipset);int __drm_open_driver (int chipset);int __drm_open_driver_render (int chipset);Signature · 1 line
2.53.0
Hi Sebastian,
On 2026-05-26 at 13:39:52 +0200, Sebastian Brzezinka wrote:
Please keep i-g-t string after PATCH, so it will look like:
[PATCH i-g-t v4 0/2] tools/igt_power: fix Xe crash via drmtest path
Maybe that is a reason why it is not on igt patchwork?
Regards,
Kamil
Quoted 37 lines
igt_poweropened its DRM device fd with a rawopen()call, which skips the Xe device cache initialisation performed by the drmtest open helpers. This caused an assertion failure inxe_querythe momentigt_power_open()called intois_intel_dgfx()on a Xe device.The fix is split into two patches. The first adds
__drm_open_driver_path()to lib/drmtest, a non-asserting helper that validates the fd is a real DRM device (DRM_IOCTL_VERSION) before initialising the Xe cache. The second switchesigt_powerto that helper and its matching__drm_close_driver(), completely removing the direct Xe dependency from the tool.v4:
- renamedrm_open_driver_pathto__drm_open_driver_path(no asserts/requires)
- addDRM_IOCTL_VERSIONcheck to verify fd is a DRM device before proceeding
- split the single patch into two: lib helper addition andigt_powerv3:
- remove redundant if (fd >= 0) guards on both close call sitesv2:
- move Xe cache setup/teardown out ofigt_power
- adddrm_open_driver_path()and use__drm_close_driver()
- drop the direct xe/xe_query dependency fromigt_powerSebastian Brzezinka (2):
lib/drmtest: add__drm_open_driver_path()tools/igt_power: fix crash on Xe devices by initializingxe_device
cachelib/drmtest.c | 30 ++++++++++++++++++++++++++++++ lib/drmtest.h | 1 + tools/igt_power.c | 6 +++--- 3 files changed, 34 insertions(+), 3 deletions(-)Signature · 1 line
2.53.0