linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Fenghua Yu <fenghua.yu@intel.com>
To: "Shuah Khan" <shuah@kernel.org>,
	"Reinette Chatre" <reinette.chatre@intel.com>,
	"Tony Luck" <tony.luck@intel.com>,
	"Babu Moger" <babu.moger@amd.com>,
	"James Morse" <james.morse@arm.com>,
	"Borislav Petkov" <bp@alien8.de>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"Ravi V Shankar" <ravi.v.shankar@intel.com>
Cc: "linux-kselftest" <linux-kselftest@vger.kernel.org>,
	"linux-kernel" <linux-kernel@vger.kernel.org>,
	Fenghua Yu <fenghua.yu@intel.com>
Subject: [PATCH v3 05/21] selftests/resctrl: Return if resctrl file system is not supported
Date: Tue, 20 Oct 2020 23:51:10 +0000	[thread overview]
Message-ID: <20201020235126.1871815-6-fenghua.yu@intel.com> (raw)
In-Reply-To: <20201020235126.1871815-1-fenghua.yu@intel.com>

check_resctrlfs_support() checks if the platform supports resctrl file
system or not by looking for resctrl in /proc/filesystems and returns a
boolean value. The main function of resctrl test suite calls
check_resctrlfs_support() but forgets to check for it's return value. This
means that resctrl test suite will attempt to run resctrl tests (like CMT,
CAT, MBM and MBA) even if the platform doesn't support resctrl file system.

Fix this by checking for the return value of check_resctrlfs_support() in
the main function. If resctrl file system isn't supported on the platform
then exit the test suite gracefully without attempting to run any of
resctrl unit tests.

Fixes: ecdbb911f22d ("selftests/resctrl: Add MBM test")
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
---
 tools/testing/selftests/resctrl/resctrl_tests.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
index b2a560c0c5dc..d24de546d4ef 100644
--- a/tools/testing/selftests/resctrl/resctrl_tests.c
+++ b/tools/testing/selftests/resctrl/resctrl_tests.c
@@ -155,7 +155,11 @@ int main(int argc, char **argv)
 	sprintf(bw_report, "reads");
 	sprintf(bm_type, "fill_buf");
 
-	check_resctrlfs_support();
+	if (!check_resctrlfs_support()) {
+		printf("Bail out! resctrl FS does not exist\n");
+		goto out;
+	}
+
 	filter_dmesg();
 
 	if (!is_amd && mbm_test) {
@@ -196,6 +200,7 @@ int main(int argc, char **argv)
 		cat_test_cleanup();
 	}
 
+out:
 	printf("1..%d\n", tests_run);
 
 	return 0;
-- 
2.29.0


  parent reply	other threads:[~2020-10-20 23:51 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-20 23:51 [PATCH v3 00/21] Miscellaneous fixes for resctrl selftests Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 01/21] selftests/resctrl: Rename CQM test as CMT test Fenghua Yu
2020-10-27 20:55   ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 02/21] selftests/resctrl: Fix typo Fenghua Yu
2020-10-27 20:56   ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 03/21] selftests/resctrl: Fix typo in help text Fenghua Yu
2020-10-27 20:58   ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 04/21] selftests/resctrl: Declare global variables as extern Fenghua Yu
2020-10-20 23:51 ` Fenghua Yu [this message]
2020-10-27 21:34   ` [PATCH v3 05/21] selftests/resctrl: Return if resctrl file system is not supported Shuah Khan
2020-10-20 23:51 ` [PATCH v3 06/21] selftests/resctrl: Check for resctrl mount point only if resctrl FS is supported Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 07/21] selftests/resctrl: Use resctrl/info for feature detection Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 08/21] selftests/resctrl: Ensure sibling CPU is not same as original CPU Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 09/21] selftests/resctrl: Fix missing options "-n" and "-p" Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 10/21] selftests/resctrl: Fix MBA/MBM results reporting format Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 11/21] selftests/resctrl: Abort running tests if not root user Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 12/21] selftests/resctrl: Enable gcc checks to detect buffer overflows Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 13/21] selftests/resctrl: Don't hard code value of "no_of_bits" variable Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 14/21] selftests/resctrl: Modularize resctrl test suite main() function Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 15/21] selftests/resctrl: Skip the test if requested resctrl feature is not supported Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 16/21] selftests/resctrl: Umount resctrl FS only if mounted Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 17/21] selftests/resctrl: Unmount resctrl FS after running all tests Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 18/21] selftests/resctrl: Fix incorrect parsing of iMC counters Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 19/21] selftests/resctrl: Fix checking for < 0 for unsigned values Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 20/21] selftests/resctrl: Fix unnecessary usage of global variables Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 21/21] selftests/resctrl: Don't use global variable for capacity bitmask (CBM) Fenghua Yu
2020-10-28  0:46 ` [PATCH v3 00/21] Miscellaneous fixes for resctrl selftests Shuah Khan

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=20201020235126.1871815-6-fenghua.yu@intel.com \
    --to=fenghua.yu@intel.com \
    --cc=babu.moger@amd.com \
    --cc=bp@alien8.de \
    --cc=james.morse@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=ravi.v.shankar@intel.com \
    --cc=reinette.chatre@intel.com \
    --cc=shuah@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).