public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] intel_gpu_top: Fix cleanup on old kernels / unsupported GPU
@ 2023-01-19 15:54 Tvrtko Ursulin
  2023-01-19 16:18 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (6 more replies)
  0 siblings, 7 replies; 11+ messages in thread
From: Tvrtko Ursulin @ 2023-01-19 15:54 UTC (permalink / raw)
  To: igt-dev, Intel-gfx; +Cc: Tvrtko Ursulin

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Avoid trying to dereference null engines on exit when there are either
none which are supported, or kernel does not have i915 PMU support.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 tools/intel_gpu_top.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 7aa233570463..517dc2995d26 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -448,6 +448,9 @@ static void free_engines(struct engines *engines)
 	};
 	unsigned int i;
 
+	if (!engines)
+		return;
+
 	for (pmu = &free_list[0]; *pmu; pmu++) {
 		if ((*pmu)->present)
 			free((char *)(*pmu)->units);
@@ -2568,7 +2571,7 @@ int main(int argc, char **argv)
 			"Failed to detect engines! (%s)\n(Kernel 4.16 or newer is required for i915 PMU support.)\n",
 			strerror(errno));
 		ret = EXIT_FAILURE;
-		goto err;
+		goto err_engines;
 	}
 
 	ret = pmu_init(engines);
@@ -2585,7 +2588,7 @@ int main(int argc, char **argv)
 "More information can be found at 'Perf events and tool security' document:\n"
 "https://www.kernel.org/doc/html/latest/admin-guide/perf-security.html\n");
 		ret = EXIT_FAILURE;
-		goto err;
+		goto err_pmu;
 	}
 
 	ret = EXIT_SUCCESS;
@@ -2699,8 +2702,9 @@ int main(int argc, char **argv)
 		free_clients(clients);
 
 	free(codename);
-err:
+err_pmu:
 	free_engines(engines);
+err_engines:
 	free(pmu_device);
 exit:
 	igt_devices_free();
-- 
2.34.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-01-24  2:53 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-19 15:54 [igt-dev] [PATCH i-g-t] intel_gpu_top: Fix cleanup on old kernels / unsupported GPU Tvrtko Ursulin
2023-01-19 16:18 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2023-01-20 13:53 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2023-01-20 14:29 ` [igt-dev] [Intel-gfx] [PATCH i-g-t] " Das, Nirmoy
2023-01-23 10:24   ` Tvrtko Ursulin
2023-01-23 11:09     ` Das, Nirmoy
2023-01-23 11:13       ` Das, Nirmoy
2023-01-23 11:15 ` Das, Nirmoy
2023-01-23 11:31 ` [igt-dev] [PATCH i-g-t v2] " Tvrtko Ursulin
2023-01-23 14:48 ` [igt-dev] ✓ Fi.CI.BAT: success for intel_gpu_top: Fix cleanup on old kernels / unsupported GPU (rev2) Patchwork
2023-01-24  2:53 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

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