From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: Muhammad Usama Anjum <usama.anjum@collabora.com>,
Shuah Khan <shuah@kernel.org>,
Reinette Chatre <reinette.chatre@intel.com>,
linux-kselftest@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
"Shaopeng Tan" <tan.shaopeng@jp.fujitsu.com>,
"Fenghua Yu" <fenghua.yu@intel.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v2 1/3] selftests/resctrl: Generalize non-contiguous CAT check
Date: Thu, 22 Aug 2024 11:11:12 +0300 [thread overview]
Message-ID: <20240822081114.4695-2-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20240822081114.4695-1-ilpo.jarvinen@linux.intel.com>
arch_supports_noncont_cat() checks if vendor is ARCH_AMD and if that is
not true, ARCH_INTEL is assumed which might not be true either because
get_vendor() can also return zero if neither AMD nor Intel is detected.
Generalize the vendor check using switch/case logic and return false
for unknown vendors.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
---
tools/testing/selftests/resctrl/cat_test.c | 26 +++++++++++++---------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/selftests/resctrl/cat_test.c
index 742782438ca3..51a1cb6aac34 100644
--- a/tools/testing/selftests/resctrl/cat_test.c
+++ b/tools/testing/selftests/resctrl/cat_test.c
@@ -292,19 +292,25 @@ static bool arch_supports_noncont_cat(const struct resctrl_test *test)
{
unsigned int eax, ebx, ecx, edx;
- /* AMD always supports non-contiguous CBM. */
- if (get_vendor() == ARCH_AMD)
+ switch (get_vendor()) {
+ case ARCH_AMD:
+ /* AMD always supports non-contiguous CBM. */
return true;
- /* Intel support for non-contiguous CBM needs to be discovered. */
- if (!strcmp(test->resource, "L3"))
- __cpuid_count(0x10, 1, eax, ebx, ecx, edx);
- else if (!strcmp(test->resource, "L2"))
- __cpuid_count(0x10, 2, eax, ebx, ecx, edx);
- else
- return false;
+ case ARCH_INTEL:
+ /* Intel support for non-contiguous CBM needs to be discovered. */
+ if (!strcmp(test->resource, "L3"))
+ __cpuid_count(0x10, 1, eax, ebx, ecx, edx);
+ else if (!strcmp(test->resource, "L2"))
+ __cpuid_count(0x10, 2, eax, ebx, ecx, edx);
+ else
+ return false;
+
+ return ((ecx >> 3) & 1);
- return ((ecx >> 3) & 1);
+ default:
+ return false;
+ }
}
static int noncont_cat_run_test(const struct resctrl_test *test,
--
2.39.2
next prev parent reply other threads:[~2024-08-22 8:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-22 8:11 [PATCH v2 0/3] selftests: Fix cpuid / vendor checking build issues Ilpo Järvinen
2024-08-22 8:11 ` Ilpo Järvinen [this message]
2024-08-22 16:26 ` [PATCH v2 1/3] selftests/resctrl: Generalize non-contiguous CAT check Reinette Chatre
2024-08-22 8:11 ` [PATCH v2 2/3] selftests/resctrl: Always initialize ecx to avoid build warnings Ilpo Järvinen
2024-08-22 16:26 ` Reinette Chatre
2024-08-22 8:11 ` [PATCH v2 3/3] kselftest: Provide __cpuid_count() stub on non-x86 archs Ilpo Järvinen
2024-08-22 16:27 ` Reinette Chatre
2024-08-23 10:47 ` Ilpo Järvinen
2024-08-23 16:17 ` Reinette Chatre
2024-08-26 10:44 ` Ilpo Järvinen
2024-08-26 15:33 ` 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=20240822081114.4695-2-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=shuah@kernel.org \
--cc=tan.shaopeng@jp.fujitsu.com \
--cc=usama.anjum@collabora.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