All of lore.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>,
	Fenghua Yu <fenghua.yu@intel.com>, Shuah Khan <shuah@kernel.org>,
	Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>,
	Babu Moger <babu.moger@amd.com>,
	linux-kernel@vger.kernel.org
Cc: "Shaopeng Tan" <tan.shaopeng@jp.fujitsu.com>,
	"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v2 03/24] selftests/resctrl: Move resctrl FS mount/umount to higher level
Date: Tue, 18 Apr 2023 14:44:45 +0300	[thread overview]
Message-ID: <20230418114506.46788-4-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20230418114506.46788-1-ilpo.jarvinen@linux.intel.com>

A few places currently lack umounting resctrl FS on error paths.

Each and every test does require resctrl FS to be present already for
feature check. Thus, it makes sense to just mount it on higher level in
resctrl_tests.c.

Move resctrl FS mount/unmount into each test function in
resctrl_tests.c. Make feature validation to simply check that resctrl
FS is mounted.

Fixes: 790bf585b0ee ("selftests/resctrl: Add Cache Allocation Technology (CAT) selftest")
Fixes: 78941183d1b1 ("selftests/resctrl: Add Cache QoS Monitoring (CQM) selftest")
Fixes: f1dd71982d19 ("selftests/resctrl: Skip the test if requested resctrl feature is not supported")
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
 tools/testing/selftests/resctrl/cat_test.c    |  6 ---
 tools/testing/selftests/resctrl/cmt_test.c    |  4 --
 .../testing/selftests/resctrl/resctrl_tests.c | 48 ++++++++++++++++---
 tools/testing/selftests/resctrl/resctrl_val.c |  5 --
 tools/testing/selftests/resctrl/resctrlfs.c   |  7 ++-
 5 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/selftests/resctrl/cat_test.c
index 722c9cd4120d..dec3151cf888 100644
--- a/tools/testing/selftests/resctrl/cat_test.c
+++ b/tools/testing/selftests/resctrl/cat_test.c
@@ -106,10 +106,6 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type)
 
 	cache_size = 0;
 
-	ret = remount_resctrlfs(true);
-	if (ret)
-		return ret;
-
 	/* Get default cbm mask for L3/L2 cache */
 	ret = get_cbm_mask(cache_type, cbm_mask);
 	if (ret)
@@ -227,8 +223,6 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type)
 
 out:
 	cat_test_cleanup();
-	if (bm_pid)
-		umount_resctrlfs();
 
 	return ret;
 }
diff --git a/tools/testing/selftests/resctrl/cmt_test.c b/tools/testing/selftests/resctrl/cmt_test.c
index af71b2141271..426d11189a99 100644
--- a/tools/testing/selftests/resctrl/cmt_test.c
+++ b/tools/testing/selftests/resctrl/cmt_test.c
@@ -86,10 +86,6 @@ int cmt_resctrl_val(int cpu_no, int n, char **benchmark_cmd)
 
 	cache_size = 0;
 
-	ret = remount_resctrlfs(true);
-	if (ret)
-		return ret;
-
 	if (!validate_resctrl_feature_request(CMT_STR))
 		return -1;
 
diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
index 9b9751206e1c..5c9ed52b69f2 100644
--- a/tools/testing/selftests/resctrl/resctrl_tests.c
+++ b/tools/testing/selftests/resctrl/resctrl_tests.c
@@ -77,9 +77,15 @@ static void run_mbm_test(bool has_ben, char **benchmark_cmd, int span,
 
 	ksft_print_msg("Starting MBM BW change ...\n");
 
+	res = remount_resctrlfs(false);
+	if (res) {
+		ksft_exit_fail_msg("Failed to mount resctrl FS\n");
+		return;
+	}
+
 	if (!validate_resctrl_feature_request(MBM_STR) || (get_vendor() != ARCH_INTEL)) {
 		ksft_test_result_skip("Hardware does not support MBM or MBM is disabled\n");
-		return;
+		goto umount;
 	}
 
 	if (!has_ben)
@@ -88,6 +94,9 @@ static void run_mbm_test(bool has_ben, char **benchmark_cmd, int span,
 	ksft_test_result(!res, "MBM: bw change\n");
 	if ((get_vendor() == ARCH_INTEL) && res)
 		ksft_print_msg("Intel MBM may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n");
+
+umount:
+	umount_resctrlfs();
 }
 
 static void run_mba_test(bool has_ben, char **benchmark_cmd, int span,
@@ -97,15 +106,24 @@ static void run_mba_test(bool has_ben, char **benchmark_cmd, int span,
 
 	ksft_print_msg("Starting MBA Schemata change ...\n");
 
+	res = remount_resctrlfs(false);
+	if (res) {
+		ksft_exit_fail_msg("Failed to mount resctrl FS\n");
+		return;
+	}
+
 	if (!validate_resctrl_feature_request(MBA_STR) || (get_vendor() != ARCH_INTEL)) {
 		ksft_test_result_skip("Hardware does not support MBA or MBA is disabled\n");
-		return;
+		goto umount;
 	}
 
 	if (!has_ben)
 		sprintf(benchmark_cmd[1], "%d", span);
 	res = mba_schemata_change(cpu_no, bw_report, benchmark_cmd);
 	ksft_test_result(!res, "MBA: schemata change\n");
+
+umount:
+	umount_resctrlfs();
 }
 
 static void run_cmt_test(bool has_ben, char **benchmark_cmd, int cpu_no)
@@ -113,9 +131,16 @@ static void run_cmt_test(bool has_ben, char **benchmark_cmd, int cpu_no)
 	int res;
 
 	ksft_print_msg("Starting CMT test ...\n");
+
+	res = remount_resctrlfs(false);
+	if (res) {
+		ksft_exit_fail_msg("Failed to mount resctrl FS\n");
+		return;
+	}
+
 	if (!validate_resctrl_feature_request(CMT_STR)) {
 		ksft_test_result_skip("Hardware does not support CMT or CMT is disabled\n");
-		return;
+		goto umount;
 	}
 
 	if (!has_ben)
@@ -124,6 +149,9 @@ static void run_cmt_test(bool has_ben, char **benchmark_cmd, int cpu_no)
 	ksft_test_result(!res, "CMT: test\n");
 	if ((get_vendor() == ARCH_INTEL) && res)
 		ksft_print_msg("Intel CMT may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n");
+
+umount:
+	umount_resctrlfs();
 }
 
 static void run_cat_test(int cpu_no, int no_of_bits)
@@ -132,13 +160,23 @@ static void run_cat_test(int cpu_no, int no_of_bits)
 
 	ksft_print_msg("Starting CAT test ...\n");
 
+	res = remount_resctrlfs(false);
+	if (res) {
+		ksft_exit_fail_msg("Failed to mount resctrl FS\n");
+		return;
+	}
+
 	if (!validate_resctrl_feature_request(CAT_STR)) {
 		ksft_test_result_skip("Hardware does not support CAT or CAT is disabled\n");
-		return;
+		goto umount;
 	}
 
 	res = cat_perf_miss_val(cpu_no, no_of_bits, "L3");
 	ksft_test_result(!res, "CAT: test\n");
+
+
+umount:
+	umount_resctrlfs();
 }
 
 int main(int argc, char **argv)
@@ -266,7 +304,5 @@ int main(int argc, char **argv)
 	if (cat_test)
 		run_cat_test(cpu_no, no_of_bits);
 
-	umount_resctrlfs();
-
 	ksft_finished();
 }
diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c
index ab1eab1e7ff6..e8f1e6a59f4a 100644
--- a/tools/testing/selftests/resctrl/resctrl_val.c
+++ b/tools/testing/selftests/resctrl/resctrl_val.c
@@ -648,10 +648,6 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)
 			return ret;
 	}
 
-	ret = remount_resctrlfs(param->mum_resctrlfs);
-	if (ret)
-		return ret;
-
 	/*
 	 * If benchmark wasn't successfully started by child, then child should
 	 * kill parent, so save parent's pid
@@ -788,7 +784,6 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)
 	signal_handler_unregister();
 out:
 	kill(bm_pid, SIGKILL);
-	umount_resctrlfs();
 
 	return ret;
 }
diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c
index fb00245dee92..42f547a81e25 100644
--- a/tools/testing/selftests/resctrl/resctrlfs.c
+++ b/tools/testing/selftests/resctrl/resctrlfs.c
@@ -611,7 +611,8 @@ char *fgrep(FILE *inf, const char *str)
  * validate_resctrl_feature_request - Check if requested feature is valid.
  * @resctrl_val:	Requested feature
  *
- * Return: True if the feature is supported, else false
+ * Return: True if the feature is supported, else false. False is also
+ *	   returned if resctrl FS is not mounted.
  */
 bool validate_resctrl_feature_request(const char *resctrl_val)
 {
@@ -619,11 +620,13 @@ bool validate_resctrl_feature_request(const char *resctrl_val)
 	bool found = false;
 	char *res;
 	FILE *inf;
+	int ret;
 
 	if (!resctrl_val)
 		return false;
 
-	if (remount_resctrlfs(false))
+	ret = find_resctrl_mount(NULL);
+	if (ret)
 		return false;
 
 	if (!strncmp(resctrl_val, CAT_STR, sizeof(CAT_STR))) {
-- 
2.30.2


  parent reply	other threads:[~2023-04-18 11:45 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-18 11:44 [PATCH v2 00/24] selftests/resctrl: Fixes, cleanups, and rewritten CAT test Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 01/24] selftests/resctrl: Add resctrl.h into build deps Ilpo Järvinen
2023-04-22  0:07   ` Reinette Chatre
2023-04-18 11:44 ` [PATCH v2 02/24] selftests/resctrl: Check also too low values for CBM bits Ilpo Järvinen
2023-04-22  0:08   ` Reinette Chatre
2023-04-24 10:46     ` Ilpo Järvinen
2023-04-18 11:44 ` Ilpo Järvinen [this message]
2023-04-22  0:09   ` [PATCH v2 03/24] selftests/resctrl: Move resctrl FS mount/umount to higher level Reinette Chatre
2023-04-24 14:58     ` Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 04/24] selftests/resctrl: Remove mum_resctrlfs Ilpo Järvinen
2023-04-22  0:11   ` Reinette Chatre
2023-04-24 14:55     ` Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 05/24] selftests/resctrl: Make span unsigned long everywhere Ilpo Järvinen
2023-04-22  0:12   ` Reinette Chatre
2023-04-24 15:05     ` Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 06/24] selftests/resctrl: Express span in bytes Ilpo Järvinen
2023-04-22  0:12   ` Reinette Chatre
2023-04-24 15:31     ` Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 07/24] selftests/resctrl: Remove duplicated preparation for span arg Ilpo Järvinen
2023-04-22  0:14   ` Reinette Chatre
2023-04-24 15:41     ` Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 08/24] selftests/resctrl: Don't use variable argument list for ->setup() Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 09/24] selftests/resctrl: Remove "malloc_and_init_memory" param from run_fill_buf() Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 10/24] selftests/resctrl: Split run_fill_buf() to alloc, work, and dealloc helpers Ilpo Järvinen
2023-04-22  0:16   ` Reinette Chatre
2023-04-24 16:01     ` Ilpo Järvinen
2023-04-24 16:32       ` Reinette Chatre
2023-04-18 11:44 ` [PATCH v2 11/24] selftests/resctrl: Remove start_buf local variable from buffer alloc func Ilpo Järvinen
2023-04-22  0:16   ` Reinette Chatre
2023-04-18 11:44 ` [PATCH v2 12/24] selftests/resctrl: Don't pass test name to fill_buf Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 13/24] selftests/resctrl: Add flush_buffer() " Ilpo Järvinen
2023-04-22  0:16   ` Reinette Chatre
2023-04-18 11:44 ` [PATCH v2 14/24] selftests/resctrl: Remove test type checks from cat_val() Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 15/24] selftests/resctrl: Refactor get_cbm_mask() Ilpo Järvinen
2023-04-22  0:17   ` Reinette Chatre
2023-05-31  6:03   ` Shaopeng Tan (Fujitsu)
2023-05-31  9:24     ` Ilpo Järvinen
2023-04-18 11:44 ` [PATCH v2 16/24] selftests/resctrl: Create cache_alloc_size() helper Ilpo Järvinen
2023-04-22  0:19   ` Reinette Chatre
2023-04-24 16:28     ` Ilpo Järvinen
2023-04-24 16:45       ` Reinette Chatre
2023-04-18 11:44 ` [PATCH v2 17/24] selftests/resctrl: Replace count_bits with count_consecutive_bits() Ilpo Järvinen
2023-04-22  0:20   ` Reinette Chatre
2023-04-25 11:41     ` Ilpo Järvinen
2023-04-25 14:28       ` Reinette Chatre
2023-05-31  7:25   ` Shaopeng Tan (Fujitsu)
2023-05-31  9:35     ` Ilpo Järvinen
2023-06-01  6:20       ` Shaopeng Tan (Fujitsu)
2023-04-18 11:45 ` [PATCH v2 18/24] selftests/resctrl: Exclude shareable bits from schemata in CAT test Ilpo Järvinen
2023-04-18 11:45 ` [PATCH v2 19/24] selftests/resctrl: Pass the real number of tests to show_cache_info() Ilpo Järvinen
2023-04-22  0:20   ` Reinette Chatre
2023-04-18 11:45 ` [PATCH v2 20/24] selftests/resctrl: Move CAT/CMT test global vars to func they are used Ilpo Järvinen
2023-04-22  0:20   ` Reinette Chatre
2023-04-18 11:45 ` [PATCH v2 21/24] selftests/resctrl: Read in less obvious order to defeat prefetch optimizations Ilpo Järvinen
2023-05-31  5:33   ` Shaopeng Tan (Fujitsu)
2023-05-31  9:17     ` Ilpo Järvinen
2023-06-01  6:15       ` Shaopeng Tan (Fujitsu)
2023-06-02 13:51         ` Ilpo Järvinen
2023-06-02 14:39           ` Reinette Chatre
2023-06-14 13:02         ` Ilpo Järvinen
2023-06-16  5:30           ` Shaopeng Tan (Fujitsu)
2023-06-16  6:44             ` Ilpo Järvinen
2023-04-18 11:45 ` [PATCH v2 22/24] selftests/resctrl: Split measure_cache_vals() function Ilpo Järvinen
2023-04-22  0:21   ` Reinette Chatre
2023-04-18 11:45 ` [PATCH v2 23/24] selftests/resctrl: Split show_cache_info() to test specific and generic parts Ilpo Järvinen
2023-04-22  0:22   ` Reinette Chatre
2023-04-18 11:45 ` [PATCH v2 24/24] selftests/resctrl: Rewrite Cache Allocation Technology (CAT) test Ilpo Järvinen
2023-04-22  0:32   ` Reinette Chatre
2023-04-26 13:58     ` Ilpo Järvinen
2023-04-26 23:35       ` Reinette Chatre
2023-04-27  8:04         ` Ilpo Järvinen
2023-04-27 15:15           ` 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=20230418114506.46788-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=reinette.chatre@intel.com \
    --cc=sai.praneeth.prakhya@intel.com \
    --cc=shuah@kernel.org \
    --cc=tan.shaopeng@jp.fujitsu.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.