Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH] tools/intel_gpu_top: Return the error to the caller of pmu_init
@ 2023-06-06 21:29 Umesh Nerlige Ramappa
  2023-06-06 22:13 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Umesh Nerlige Ramappa @ 2023-06-06 21:29 UTC (permalink / raw)
  To: Tvrtko Ursulin, Ashutosh Dixit, igt-dev

When run as a regular user, we see an assert instead of a proper error
message.  Propagate errors correctly to caller.

Link: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/139
Fixes: (c67825ba40de: intel_gpu_top: Determine number of tiles)
Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 tools/intel_gpu_top.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 7018499c..24fba88b 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -536,7 +536,7 @@ static void imc_reads_open(struct pmu_counter *pmu, struct engines *engines)
 	imc_open(pmu, "data_reads", engines);
 }
 
-static int get_num_gts(uint64_t type)
+static int get_num_gts(uint64_t type, int *num_gts)
 {
 	int fd, cnt;
 
@@ -548,11 +548,13 @@ static int get_num_gts(uint64_t type)
 
 		close(fd);
 	}
-	assert(!errno || errno == ENOENT);
+	if (errno && errno != ENOENT)
+		return fd;
+
 	assert(cnt > 0);
-	errno = 0;
+	*num_gts = cnt;
 
-	return cnt;
+	return 0;
 }
 
 static void init_aggregate_counters(struct engines *engines)
@@ -578,12 +580,14 @@ static void init_aggregate_counters(struct engines *engines)
 static int pmu_init(struct engines *engines)
 {
 	unsigned int i;
-	int fd;
+	int fd, ret;
 	uint64_t type = igt_perf_type_id(engines->device);
 
 	engines->fd = -1;
 	engines->num_counters = 0;
-	engines->num_gts = get_num_gts(type);
+	ret = get_num_gts(type, &engines->num_gts);
+	if (ret)
+		return ret;
 
 	engines->irq.config = I915_PMU_INTERRUPTS;
 	fd = _open_pmu(type, engines->num_counters, &engines->irq, engines->fd);
-- 
2.34.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-07 20:46 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-06 21:29 [igt-dev] [PATCH] tools/intel_gpu_top: Return the error to the caller of pmu_init Umesh Nerlige Ramappa
2023-06-06 22:13 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2023-06-07  8:10 ` [igt-dev] [PATCH] " Kamil Konieczny
2023-06-07 20:45   ` Umesh Nerlige Ramappa
2023-06-07 13:08 ` [igt-dev] ✗ Fi.CI.IGT: failure for " Patchwork

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