Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] lib/xe/xe_gt: Repair xe_gt_stats_get_count function
@ 2024-12-05 15:27 Jonathan Cavitt
  2024-12-06  4:24 ` ✓ i915.CI.BAT: success for lib/xe/xe_gt: Repair xe_gt_stats_get_count function (rev2) Patchwork
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Jonathan Cavitt @ 2024-12-05 15:27 UTC (permalink / raw)
  To: igt-dev
  Cc: jonathan.cavitt, alex.zuo, saurabhg.gupta, kamil.konieczny,
	sai.gowtham.ch

Resolve the following issues:

- The target directory for the fopen does not take into consideration
  the dri subdirectory and assumes the correct path is dri/0.  This
  might not be the case.  Use the "minor" function and fstat to
  generate the correct subdirectory.

- The fopen may fail and return a NULL pointer, causing the subsequent
  fgets to generate a SIGSEGV.  Assert the file opened correctly.

- The file opened by fopen is never closed.  Close it.

v2: fclose (Kamil)

Fixes: 10cefd82 ("tests/intel/xe_tlb: Add test to check TLB invalidation")
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/3212
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Suggested-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
CC: Sai Gowtham Ch <sai.gowtham.ch@intel.com>
Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
---
 lib/xe/xe_gt.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/xe/xe_gt.c b/lib/xe/xe_gt.c
index cee892af96..1f4b42ed9c 100644
--- a/lib/xe/xe_gt.c
+++ b/lib/xe/xe_gt.c
@@ -152,18 +152,28 @@ void xe_post_hang_ring(int fd, igt_hang_t arg)
 int xe_gt_stats_get_count(int fd, int gt, const char *stat)
 {
 	FILE *f;
+	struct stat st;
 	char tlb_path[4096];
 	char path[256];
 	int count;
 
-	sprintf(path, "/sys/kernel/debug/dri/0/gt%d/stats", gt);
+	igt_assert_eq(fstat(fd, &st), 0);
+
+	sprintf(path, "/sys/kernel/debug/dri/%d/gt%d/stats",
+		minor(st.st_rdev), gt);
 	f = fopen(path, "r");
 
+	igt_assert_f(f, "Failed to open /sys/kernel/debug/dri/%d/gt%d/stats",
+		     minor(st.st_rdev), gt);
+
 	while (fgets(tlb_path, sizeof(tlb_path), f)) {
 		if (strstr(tlb_path, stat) != NULL) {
 			sscanf(tlb_path, "%*[^:]: %d", &count);
 			break;
 		}
 	}
+
+	fclose(f);
+
 	return count;
 }
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-12-06 19:45 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-05 15:27 [PATCH v2] lib/xe/xe_gt: Repair xe_gt_stats_get_count function Jonathan Cavitt
2024-12-06  4:24 ` ✓ i915.CI.BAT: success for lib/xe/xe_gt: Repair xe_gt_stats_get_count function (rev2) Patchwork
2024-12-06  4:40 ` ✗ Xe.CI.BAT: failure " Patchwork
2024-12-06 19:45   ` Cavitt, Jonathan
2024-12-06  5:30 ` ✗ i915.CI.Full: " Patchwork
2024-12-06 19:44   ` Cavitt, Jonathan
2024-12-06  8:31 ` ✗ Xe.CI.Full: " Patchwork
2024-12-06 19:45   ` Cavitt, Jonathan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox