public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-kselftest@vger.kernel.org,
	"Reinette Chatre" <reinette.chatre@intel.com>,
	"Shuah Khan" <shuah@kernel.org>,
	"Babu Moger" <babu.moger@amd.com>,
	"Maciej Wieczór-Retman" <maciej.wieczor-retman@intel.com>
Cc: "Fenghua Yu" <fenghua.yu@intel.com>,
	linux-kernel@vger.kernel.org,
	"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v3 03/16] selftests/resctrl: Fix closing IMC fds on error
Date: Mon,  8 Apr 2024 19:32:34 +0300	[thread overview]
Message-ID: <20240408163247.3224-4-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20240408163247.3224-1-ilpo.jarvinen@linux.intel.com>

If perf_open_imc_mem_bw() fails to open for a perf fd after the first
one, the already opened fds remain open and error is directly returned.

Close the fds inside perf_open_imc_mem_bw() if an error occurs.

Fixes: 7f4d257e3a2a ("selftests/resctrl: Add callback to start a benchmark")
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---

v3:
- New patch
---
 tools/testing/selftests/resctrl/resctrl_val.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c
index ca4da7f4cf25..f2b6824cd5f2 100644
--- a/tools/testing/selftests/resctrl/resctrl_val.c
+++ b/tools/testing/selftests/resctrl/resctrl_val.c
@@ -306,13 +306,23 @@ static int perf_open_imc_mem_bw(int cpu_no)
 	for (imc = 0; imc < imcs; imc++) {
 		ret = open_perf_event(imc, cpu_no, READ);
 		if (ret)
-			return -1;
+			goto close_fds;
 		ret = open_perf_event(imc, cpu_no, WRITE);
 		if (ret)
-			return -1;
+			goto close_read_fd;
 	}
 
 	return 0;
+
+close_read_fd:
+	close(imc_counters_config[imc][READ].fd);
+close_fds:
+	while (imc--) {
+		close(imc_counters_config[imc][READ].fd);
+		close(imc_counters_config[imc][WRITE].fd);
+	}
+
+	return -1;
 }
 
 /*
-- 
2.39.2


  parent reply	other threads:[~2024-04-08 16:33 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-08 16:32 [PATCH v3 00/16] selftests/resctrl: resctrl_val() related cleanups & improvements Ilpo Järvinen
2024-04-08 16:32 ` [PATCH v3 01/16] selftests/resctrl: Open get_mem_bw_imc() fd for loops Ilpo Järvinen
2024-04-25  4:37   ` Reinette Chatre
2024-04-08 16:32 ` [PATCH v3 02/16] selftests/resctrl: Calculate resctrl FS derived mem bw over sleep(1) only Ilpo Järvinen
2024-04-25  4:38   ` Reinette Chatre
2024-04-08 16:32 ` Ilpo Järvinen [this message]
2024-04-08 16:32 ` [PATCH v3 04/16] selftests/resctrl: Make "bandwidth" consistent in comments & prints Ilpo Järvinen
2024-04-08 16:32 ` [PATCH v3 05/16] selftests/resctrl: Consolidate get_domain_id() into resctrl_val() Ilpo Järvinen
2024-04-08 16:32 ` [PATCH v3 06/16] selftests/resctrl: Use correct type for pids Ilpo Järvinen
2024-04-08 16:32 ` [PATCH v3 07/16] selftests/resctrl: Cleanup bm_pid and ppid usage & limit scope Ilpo Järvinen
2024-04-25  4:37   ` Reinette Chatre
2024-04-08 16:32 ` [PATCH v3 08/16] selftests/resctrl: Rename measure_vals() to measure_mem_bw_vals() & document Ilpo Järvinen
2024-04-08 16:32 ` [PATCH v3 09/16] selftests/resctrl: Simplify mem bandwidth file code for MBA & MBM tests Ilpo Järvinen
2024-04-25  4:38   ` Reinette Chatre
2024-04-08 16:32 ` [PATCH v3 10/16] selftests/resctrl: Add ->measure() callback to resctrl_val_param Ilpo Järvinen
2024-04-08 16:32 ` [PATCH v3 11/16] selftests/resctrl: Add ->init() callback into resctrl_val_param Ilpo Järvinen
2024-04-25  4:39   ` Reinette Chatre
2024-04-08 16:32 ` [PATCH v3 12/16] selftests/resctrl: Simplify bandwidth report type handling Ilpo Järvinen
2024-04-08 16:32 ` [PATCH v3 13/16] selftests/resctrl: Make some strings passed to resctrlfs functions const Ilpo Järvinen
2024-04-08 16:32 ` [PATCH v3 14/16] selftests/resctrl: Convert ctrlgrp & mongrp to pointers Ilpo Järvinen
2024-04-08 16:32 ` [PATCH v3 15/16] selftests/resctrl: Remove mongrp from MBA test Ilpo Järvinen
2024-04-08 16:32 ` [PATCH v3 16/16] selftests/resctrl: Remove test name comparing from write_bm_pid_to_resctrl() Ilpo Järvinen
2024-04-24 13:49 ` [PATCH v3 00/16] selftests/resctrl: resctrl_val() related cleanups & improvements Shuah Khan
2024-04-25  4:46   ` Reinette Chatre

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240408163247.3224-4-ilpo.jarvinen@linux.intel.com \
    --to=ilpo.jarvinen@linux.intel.com \
    --cc=babu.moger@amd.com \
    --cc=fenghua.yu@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=maciej.wieczor-retman@intel.com \
    --cc=reinette.chatre@intel.com \
    --cc=shuah@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox