The resctrl selftest currently fails on Hygon CPUs that support Platform
QoS features, printing the error:
"# Can not get vendor info..."
This occurs because vendor detection is missing for Hygon CPUs.
Fix this by extending the CPU vendor detection logic to include
Hygon's vendor ID.
Signed-off-by: Xiaochen Shen <shenxiaochen@open-hieco.net>
---
tools/testing/selftests/resctrl/resctrl.h | 6 ++++--
tools/testing/selftests/resctrl/resctrl_tests.c | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h
index cd3adfc14969..411ee10380a5 100644
--- a/tools/testing/selftests/resctrl/resctrl.h
+++ b/tools/testing/selftests/resctrl/resctrl.h
@@ -23,6 +23,7 @@
#include <asm/unistd.h>
#include <linux/perf_event.h>
#include <linux/compiler.h>
+#include <linux/bits.h>
#include "../kselftest.h"
#define MB (1024 * 1024)
@@ -36,8 +37,9 @@
* Define as bits because they're used for vendor_specific bitmask in
* the struct resctrl_test.
*/
-#define ARCH_INTEL 1
-#define ARCH_AMD 2
+#define ARCH_INTEL BIT(0)
+#define ARCH_AMD BIT(1)
+#define ARCH_HYGON BIT(2)
#define END_OF_TESTS 1
diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
index 5154ffd821c4..9bf35f3beb6b 100644
--- a/tools/testing/selftests/resctrl/resctrl_tests.c
+++ b/tools/testing/selftests/resctrl/resctrl_tests.c
@@ -42,6 +42,8 @@ static int detect_vendor(void)
vendor_id = ARCH_INTEL;
else if (s && !strcmp(s, ": AuthenticAMD\n"))
vendor_id = ARCH_AMD;
+ else if (s && !strcmp(s, ": HygonGenuine\n"))
+ vendor_id = ARCH_HYGON;
fclose(inf);
free(res);
--
2.47.3Hi, Xiaochen, On 12/5/25 01:25, Xiaochen Shen wrote: > The resctrl selftest currently fails on Hygon CPUs that support Platform > QoS features, printing the error: > > "# Can not get vendor info..." > > This occurs because vendor detection is missing for Hygon CPUs. > > Fix this by extending the CPU vendor detection logic to include > Hygon's vendor ID. > > Signed-off-by: Xiaochen Shen <shenxiaochen@open-hieco.net> > --- > tools/testing/selftests/resctrl/resctrl.h | 6 ++++-- > tools/testing/selftests/resctrl/resctrl_tests.c | 2 ++ > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h > index cd3adfc14969..411ee10380a5 100644 > --- a/tools/testing/selftests/resctrl/resctrl.h > +++ b/tools/testing/selftests/resctrl/resctrl.h > @@ -23,6 +23,7 @@ > #include <asm/unistd.h> > #include <linux/perf_event.h> > #include <linux/compiler.h> > +#include <linux/bits.h> > #include "../kselftest.h" > > #define MB (1024 * 1024) > @@ -36,8 +37,9 @@ > * Define as bits because they're used for vendor_specific bitmask in > * the struct resctrl_test. > */ > -#define ARCH_INTEL 1 > -#define ARCH_AMD 2 > +#define ARCH_INTEL BIT(0) > +#define ARCH_AMD BIT(1) > +#define ARCH_HYGON BIT(2) > > #define END_OF_TESTS 1 > > diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c > index 5154ffd821c4..9bf35f3beb6b 100644 > --- a/tools/testing/selftests/resctrl/resctrl_tests.c > +++ b/tools/testing/selftests/resctrl/resctrl_tests.c > @@ -42,6 +42,8 @@ static int detect_vendor(void) > vendor_id = ARCH_INTEL; > else if (s && !strcmp(s, ": AuthenticAMD\n")) > vendor_id = ARCH_AMD; > + else if (s && !strcmp(s, ": HygonGenuine\n")) > + vendor_id = ARCH_HYGON; > Since vendor_id is bitmask now and BIT() is a UL value, it's better to define it as "unsigned int" (unsigned long is a bit overkill). Otherwise, type conversion may be risky. Is it better to change vendor_id as "unsigned int", static unsigned int detect_vendor(), and a couple of other places? > fclose(inf); > free(res); Thanks. -Fenghua
Hi Fenghua,
On 12/6/2025 3:28 AM, Fenghua Yu wrote:
>> --- a/tools/testing/selftests/resctrl/resctrl_tests.c
>> +++ b/tools/testing/selftests/resctrl/resctrl_tests.c
>> @@ -42,6 +42,8 @@ static int detect_vendor(void)
>> vendor_id = ARCH_INTEL;
>> else if (s && !strcmp(s, ": AuthenticAMD\n"))
>> vendor_id = ARCH_AMD;
>> + else if (s && !strcmp(s, ": HygonGenuine\n"))
>> + vendor_id = ARCH_HYGON;
>>
> Since vendor_id is bitmask now and BIT() is a UL value, it's better to define it as "unsigned int" (unsigned long is a bit overkill). Otherwise, type conversion may be risky.
Thank you for the suggestion. How about using BIT_U8() instead of BIT()?
In my opinion, 8-bits type "unsigned int" is enough for "vendor id".
>
> Is it better to change vendor_id as "unsigned int", static unsigned int detect_vendor(), and a couple of other places?
Yes. It is better to update the return types of detect_vendor() and get_vendor() from 'int' to 'unsigned int'
to align with their usage as bitmask values and to prevent potentially risky type conversions.
Should I split the code changes (using BIT_xx(), updates of type 'unsigned int') into a separate patch?
The patch may look like:
-----------------------------
commit baaabb7bd3a3e45a8093422b576383da20488aca
Author: Xiaochen Shen <shenxiaochen@open-hieco.net>
Date: Mon Dec 8 14:26:45 2025 +0800
selftests/resctrl: Improve type definitions of CPU vendor IDs
In file resctrl.h:
-----------------
/*
* CPU vendor IDs
*
* Define as bits because they're used for vendor_specific bitmask in
* the struct resctrl_test.
*/
#define ARCH_INTEL 1
#define ARCH_AMD 2
-----------------
The comment before the CPU vendor IDs defines attempts to provide
guidance but it is clearly still quite subtle that these values are
required to be unique bits. Consider for example their usage in
test_vendor_specific_check():
return get_vendor() & test->vendor_specific
A clearer and more maintainable approach is to define these CPU vendor
IDs using BIT(). This ensures each vendor corresponds to a distinct bit
and makes it obvious when adding new vendor IDs.
Additionally, update the return types of detect_vendor() and
get_vendor() from 'int' to 'unsigned int' to align with their usage as
bitmask values and to prevent potentially risky type conversions.
Suggested-by: Reinette Chatre <reinette.chatre@intel.com>
Suggested-by: Fenghua Yu <fenghuay@nvidia.com>
Signed-off-by: Xiaochen Shen <shenxiaochen@open-hieco.net>
diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h
index cd3adfc14969..2922dfbf9090 100644
--- a/tools/testing/selftests/resctrl/resctrl.h
+++ b/tools/testing/selftests/resctrl/resctrl.h
@@ -23,6 +23,7 @@
#include <asm/unistd.h>
#include <linux/perf_event.h>
#include <linux/compiler.h>
+#include <linux/bits.h>
#include "../kselftest.h"
#define MB (1024 * 1024)
@@ -36,8 +37,8 @@
* Define as bits because they're used for vendor_specific bitmask in
* the struct resctrl_test.
*/
-#define ARCH_INTEL 1
-#define ARCH_AMD 2
+#define ARCH_INTEL BIT_U8(0)
+#define ARCH_AMD BIT_U8(1)
#define END_OF_TESTS 1
@@ -163,7 +164,7 @@ extern int snc_unreliable;
extern char llc_occup_path[1024];
int snc_nodes_per_l3_cache(void);
-int get_vendor(void);
+unsigned int get_vendor(void);
bool check_resctrlfs_support(void);
int filter_dmesg(void);
int get_domain_id(const char *resource, int cpu_no, int *domain_id);
diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
index 5154ffd821c4..0fef2e4171e7 100644
--- a/tools/testing/selftests/resctrl/resctrl_tests.c
+++ b/tools/testing/selftests/resctrl/resctrl_tests.c
@@ -23,10 +23,10 @@ static struct resctrl_test *resctrl_tests[] = {
&l2_noncont_cat_test,
};
-static int detect_vendor(void)
+static unsigned int detect_vendor(void)
{
FILE *inf = fopen("/proc/cpuinfo", "r");
- int vendor_id = 0;
+ unsigned int vendor_id = 0;
char *s = NULL;
char *res;
@@ -48,12 +48,14 @@ static int detect_vendor(void)
return vendor_id;
}
-int get_vendor(void)
+unsigned int get_vendor(void)
{
- static int vendor = -1;
+ static unsigned int vendor;
- if (vendor == -1)
+ if (vendor == 0)
vendor = detect_vendor();
+
+ /* detect_vendor() returns invalid vendor id */
if (vendor == 0)
ksft_print_msg("Can not get vendor info...\n");
-----------------------------
Thank you!
Best regards,
Xiaochen Shen
Hi Xiaochen,
On 12/8/25 12:01 AM, Xiaochen Shen wrote:
> Hi Fenghua,
>
> On 12/6/2025 3:28 AM, Fenghua Yu wrote:
>>> --- a/tools/testing/selftests/resctrl/resctrl_tests.c
>>> +++ b/tools/testing/selftests/resctrl/resctrl_tests.c
>>> @@ -42,6 +42,8 @@ static int detect_vendor(void)
>>> vendor_id = ARCH_INTEL;
>>> else if (s && !strcmp(s, ": AuthenticAMD\n"))
>>> vendor_id = ARCH_AMD;
>>> + else if (s && !strcmp(s, ": HygonGenuine\n"))
>>> + vendor_id = ARCH_HYGON;
>>>
>> Since vendor_id is bitmask now and BIT() is a UL value, it's better to define it as "unsigned int" (unsigned long is a bit overkill). Otherwise, type conversion may be risky.
>
> Thank you for the suggestion. How about using BIT_U8() instead of BIT()?
> In my opinion, 8-bits type "unsigned int" is enough for "vendor id".
BIT() is fine here. I prefer that types used by selftests are consistent, that is, not
a mix of user space and kernel types.
There may be good motivation to switch to kernel types but then it needs to be
throughout the resctrl selftests, which is not something this work needs to take on.
>
>>
>> Is it better to change vendor_id as "unsigned int", static unsigned int detect_vendor(), and a couple of other places?
>
> Yes. It is better to update the return types of detect_vendor() and get_vendor() from 'int' to 'unsigned int'
> to align with their usage as bitmask values and to prevent potentially risky type conversions.
>
> Should I split the code changes (using BIT_xx(), updates of type 'unsigned int') into a separate patch?
I agree this would be better as a separate patch.
>
> The patch may look like:
> -----------------------------
> commit baaabb7bd3a3e45a8093422b576383da20488aca
> Author: Xiaochen Shen <shenxiaochen@open-hieco.net>
> Date: Mon Dec 8 14:26:45 2025 +0800
>
> selftests/resctrl: Improve type definitions of CPU vendor IDs
Instead of a generic "Improve" it can just be specific about what it does:
"selftests/resctrl: Define CPU vendor IDs as bits to match usage"
>
> In file resctrl.h:
> -----------------
> /*
> * CPU vendor IDs
> *
> * Define as bits because they're used for vendor_specific bitmask in
> * the struct resctrl_test.
> */
> #define ARCH_INTEL 1
> #define ARCH_AMD 2
> -----------------
>
> The comment before the CPU vendor IDs defines attempts to provide
> guidance but it is clearly still quite subtle that these values are
I wrote "clearly" in response to the earlier patch that did not follow the quoted
documentation, implying that the documentation was not sufficient. I do not
think "clearly" applies here. This can just be specific about how these values
are used ... which this paragraph duplicates from the quoted comment so either this
paragraph or the code quote could be dropped?
> required to be unique bits. Consider for example their usage in
> test_vendor_specific_check():
> return get_vendor() & test->vendor_specific
>
> A clearer and more maintainable approach is to define these CPU vendor
> IDs using BIT(). This ensures each vendor corresponds to a distinct bit
> and makes it obvious when adding new vendor IDs.
>
> Additionally, update the return types of detect_vendor() and
> get_vendor() from 'int' to 'unsigned int' to align with their usage as
> bitmask values and to prevent potentially risky type conversions.
>
> Suggested-by: Reinette Chatre <reinette.chatre@intel.com>
> Suggested-by: Fenghua Yu <fenghuay@nvidia.com>
> Signed-off-by: Xiaochen Shen <shenxiaochen@open-hieco.net>
>
> diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h
> index cd3adfc14969..2922dfbf9090 100644
> --- a/tools/testing/selftests/resctrl/resctrl.h
> +++ b/tools/testing/selftests/resctrl/resctrl.h
> @@ -23,6 +23,7 @@
> #include <asm/unistd.h>
> #include <linux/perf_event.h>
> #include <linux/compiler.h>
> +#include <linux/bits.h>
> #include "../kselftest.h"
>
> #define MB (1024 * 1024)
> @@ -36,8 +37,8 @@
> * Define as bits because they're used for vendor_specific bitmask in
> * the struct resctrl_test.
> */
> -#define ARCH_INTEL 1
> -#define ARCH_AMD 2
> +#define ARCH_INTEL BIT_U8(0)
> +#define ARCH_AMD BIT_U8(1)
>
> #define END_OF_TESTS 1
>
> @@ -163,7 +164,7 @@ extern int snc_unreliable;
> extern char llc_occup_path[1024];
>
> int snc_nodes_per_l3_cache(void);
> -int get_vendor(void);
> +unsigned int get_vendor(void);
> bool check_resctrlfs_support(void);
> int filter_dmesg(void);
> int get_domain_id(const char *resource, int cpu_no, int *domain_id);
> diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
> index 5154ffd821c4..0fef2e4171e7 100644
> --- a/tools/testing/selftests/resctrl/resctrl_tests.c
> +++ b/tools/testing/selftests/resctrl/resctrl_tests.c
> @@ -23,10 +23,10 @@ static struct resctrl_test *resctrl_tests[] = {
> &l2_noncont_cat_test,
> };
>
> -static int detect_vendor(void)
> +static unsigned int detect_vendor(void)
> {
> FILE *inf = fopen("/proc/cpuinfo", "r");
> - int vendor_id = 0;
> + unsigned int vendor_id = 0;
> char *s = NULL;
> char *res;
>
> @@ -48,12 +48,14 @@ static int detect_vendor(void)
> return vendor_id;
> }
>
> -int get_vendor(void)
> +unsigned int get_vendor(void)
> {
> - static int vendor = -1;
> + static unsigned int vendor;
>
> - if (vendor == -1)
> + if (vendor == 0)
> vendor = detect_vendor();
> +
> + /* detect_vendor() returns invalid vendor id */
> if (vendor == 0)
> ksft_print_msg("Can not get vendor info...\n");
detect_vendor() returns 0 if it cannot detect the vendor. Using "0" as well as
return value of detect_vendor() to indicate that detect_vendor() should be run will
thus cause detect_vendor() to always be called on failure even though it will keep
failing.
Can vendor be kept as int and just cast it on return? This may be introducing the
risky type conversion that the changelog claims to avoid though ....
Reinette
Hi Reinette,
On 12/9/2025 1:57 AM, Reinette Chatre wrote:
>> Thank you for the suggestion. How about using BIT_U8() instead of BIT()?
>> In my opinion, 8-bits type "unsigned int" is enough for "vendor id".
> BIT() is fine here. I prefer that types used by selftests are consistent, that is, not
> a mix of user space and kernel types.
> There may be good motivation to switch to kernel types but then it needs to be
> throughout the resctrl selftests, which is not something this work needs to take on.
Thank you. I will keep BIT() here.
>> Should I split the code changes (using BIT_xx(), updates of type 'unsigned int') into a separate patch?
> I agree this would be better as a separate patch.
Sure. I will add a prerequisite patch in this series.
>> The patch may look like:
>> -----------------------------
>> commit baaabb7bd3a3e45a8093422b576383da20488aca
>> Author: Xiaochen Shen <shenxiaochen@open-hieco.net>
>> Date: Mon Dec 8 14:26:45 2025 +0800
>>
>> selftests/resctrl: Improve type definitions of CPU vendor IDs
> Instead of a generic "Improve" it can just be specific about what it does:
> "selftests/resctrl: Define CPU vendor IDs as bits to match usage"
Thank you for the suggestion. The subject of the patch looks much better.
>> In file resctrl.h:
>> -----------------
>> /*
>> * CPU vendor IDs
>> *
>> * Define as bits because they're used for vendor_specific bitmask in
>> * the struct resctrl_test.
>> */
>> #define ARCH_INTEL 1
>> #define ARCH_AMD 2
>> -----------------
>>
>> The comment before the CPU vendor IDs defines attempts to provide
>> guidance but it is clearly still quite subtle that these values are
> I wrote "clearly" in response to the earlier patch that did not follow the quoted
> documentation, implying that the documentation was not sufficient. I do not
> think "clearly" applies here. This can just be specific about how these values
> are used ... which this paragraph duplicates from the quoted comment so either this
> paragraph or the code quote could be dropped?
Thank you for the suggestion.
The revised patch description as below:
--------------------------------------
The CPU vendor IDs are required to be unique bits because they're used
for vendor_specific bitmask in the struct resctrl_test.
Consider for example their usage in test_vendor_specific_check():
return get_vendor() & test->vendor_specific
However, the definitions of CPU vendor IDs in file resctrl.h is quite
subtle as a bitmask value:
#define ARCH_INTEL 1
#define ARCH_AMD 2
A clearer and more maintainable approach is to define these CPU vendor
IDs using BIT(). This ensures each vendor corresponds to a distinct bit
and makes it obvious when adding new vendor IDs.
...
--------------------------------------
>
>> required to be unique bits. Consider for example their usage in
>> test_vendor_specific_check():
>> return get_vendor() & test->vendor_specific
>> -int get_vendor(void)
>> +unsigned int get_vendor(void)
>> {
>> - static int vendor = -1;
>> + static unsigned int vendor;
>>
>> - if (vendor == -1)
>> + if (vendor == 0)
>> vendor = detect_vendor();
>> +
>> + /* detect_vendor() returns invalid vendor id */
>> if (vendor == 0)
>> ksft_print_msg("Can not get vendor info...\n");
> detect_vendor() returns 0 if it cannot detect the vendor. Using "0" as well as
> return value of detect_vendor() to indicate that detect_vendor() should be run will
> thus cause detect_vendor() to always be called on failure even though it will keep
> failing.
Thank you.
I got it. In original code, "static int vendor = -1;" does it intentionally.
>
> Can vendor be kept as int and just cast it on return? This may be introducing the
> risky type conversion that the changelog claims to avoid though ....
This is really a dilemma.
I could keep vendor as int, even thought the code doesn't look graceful. I will try to add a comment for it.
The code changes may look like:
-------------------------------
-int get_vendor(void)
+unsigned int get_vendor(void)
{
static int vendor = -1;
+ /*
+ * Notes on vendor:
+ * -1: initial value, detect_vendor() is not called yet.
+ * 0: detect_vendor() returns 0 if it cannot detect the vendor.
+ * > 0: detect_vendor() returns valid vendor id.
+ *
+ * The return type of detect_vendor() is 'unsigned int'.
+ * Cast vendor from 'int' to 'unsigned int' on return.
+ */
if (vendor == -1)
vendor = detect_vendor();
+
if (vendor == 0)
ksft_print_msg("Can not get vendor info...\n");
- return vendor;
+ return (unsigned int) vendor;
}
-------------------------------
Thank you!
Best regards,
Xiaochen Shen
Hi Xiaochen,
On 12/8/25 10:10 PM, Xiaochen Shen wrote:
> On 12/9/2025 1:57 AM, Reinette Chatre wrote:
...
>>> In file resctrl.h:
>>> -----------------
>>> /*
>>> * CPU vendor IDs
>>> *
>>> * Define as bits because they're used for vendor_specific bitmask in
>>> * the struct resctrl_test.
>>> */
>>> #define ARCH_INTEL 1
>>> #define ARCH_AMD 2
>>> -----------------
>>>
>>> The comment before the CPU vendor IDs defines attempts to provide
>>> guidance but it is clearly still quite subtle that these values are
>> I wrote "clearly" in response to the earlier patch that did not follow the quoted
>> documentation, implying that the documentation was not sufficient. I do not
>> think "clearly" applies here. This can just be specific about how these values
>> are used ... which this paragraph duplicates from the quoted comment so either this
>> paragraph or the code quote could be dropped?
>
> Thank you for the suggestion.
> The revised patch description as below:
> --------------------------------------
> The CPU vendor IDs are required to be unique bits because they're used
> for vendor_specific bitmask in the struct resctrl_test.
> Consider for example their usage in test_vendor_specific_check():
> return get_vendor() & test->vendor_specific
>
> However, the definitions of CPU vendor IDs in file resctrl.h is quite
> subtle as a bitmask value:
> #define ARCH_INTEL 1
> #define ARCH_AMD 2
>
> A clearer and more maintainable approach is to define these CPU vendor
> IDs using BIT(). This ensures each vendor corresponds to a distinct bit
> and makes it obvious when adding new vendor IDs.
Thank you. Looks good to me.
> ...
> --------------------------------------
>
>>
>>> required to be unique bits. Consider for example their usage in
>>> test_vendor_specific_check():
>>> return get_vendor() & test->vendor_specific
>>> -int get_vendor(void)
>>> +unsigned int get_vendor(void)
>>> {
>>> - static int vendor = -1;
>>> + static unsigned int vendor;
>>>
>>> - if (vendor == -1)
>>> + if (vendor == 0)
>>> vendor = detect_vendor();
>>> +
>>> + /* detect_vendor() returns invalid vendor id */
>>> if (vendor == 0)
>>> ksft_print_msg("Can not get vendor info...\n");
>> detect_vendor() returns 0 if it cannot detect the vendor. Using "0" as well as
>> return value of detect_vendor() to indicate that detect_vendor() should be run will
>> thus cause detect_vendor() to always be called on failure even though it will keep
>> failing.
>
> Thank you.
> I got it. In original code, "static int vendor = -1;" does it intentionally.
>
>
>>
>> Can vendor be kept as int and just cast it on return? This may be introducing the
>> risky type conversion that the changelog claims to avoid though ....
>
> This is really a dilemma.
> I could keep vendor as int, even thought the code doesn't look graceful. I will try to add a comment for it.
> The code changes may look like:
> -------------------------------
> -int get_vendor(void)
> +unsigned int get_vendor(void)
> {
> static int vendor = -1;
>
> + /*
> + * Notes on vendor:
> + * -1: initial value, detect_vendor() is not called yet.
> + * 0: detect_vendor() returns 0 if it cannot detect the vendor.
> + * > 0: detect_vendor() returns valid vendor id.
> + *
> + * The return type of detect_vendor() is 'unsigned int'.
> + * Cast vendor from 'int' to 'unsigned int' on return.
> + */
> if (vendor == -1)
> vendor = detect_vendor();
> +
> if (vendor == 0)
> ksft_print_msg("Can not get vendor info...\n");
>
> - return vendor;
> + return (unsigned int) vendor;
> }
I suggest this be simplified to not have the vendor ID be used both as a value and as a state.
Here is some pseudo-code that should be able to accomplish this:
unsigned int detect_vendor(void)
{
static bool initialized = false;
static unsigned int vendor_id;
...
FILE *inf;
if (initialized)
return vendor_id;
inf = fopen("/proc/cpuinfo", "r");
if (!inf) {
vendor_id = 0;
initialized = true;
return vendor_id;
}
/* initialize vendor_id from /proc/cpuinfo */
initialized = true;
return vendor_id;
}
unsigned int get_vendor(void)
{
unsigned int vendor;
vendor = detect_vendor();
if (vendor == 0)
ksft_print_msg(...);
return vendor;
}
Reinette
Hi Reinette,
On 12/10/2025 7:02 AM, Reinette Chatre wrote:
> I suggest this be simplified to not have the vendor ID be used both as a value and as a state.
> Here is some pseudo-code that should be able to accomplish this:
>
>
> unsigned int detect_vendor(void)
> {
> static bool initialized = false;
> static unsigned int vendor_id;
> ...
> FILE *inf;
>
>
> if (initialized)
> return vendor_id;
>
> inf = fopen("/proc/cpuinfo", "r");
> if (!inf) {
> vendor_id = 0;
> initialized = true;
> return vendor_id;
> }
>
> /* initialize vendor_id from /proc/cpuinfo */
>
> initialized = true;
> return vendor_id;
> }
>
> unsigned int get_vendor(void)
> {
> unsigned int vendor;
>
> vendor = detect_vendor();
>
> if (vendor == 0)
> ksft_print_msg(...);
>
> return vendor;
> }
>
> Reinette
Thank you very much! I will make the change in v3 patch series.
Could you help review the revised patch description for the change?
--------------------------------
...
and makes it obvious when adding new vendor IDs.
Accordingly, update the return types of detect_vendor() and get_vendor()
from 'int' to 'unsigned int' to align with their usage as bitmask values
and to prevent potentially risky type conversions.
Furthermore, introduce a bool flag 'initialized' to simplify the
get_vendor() -> detect_vendor() logic. This ensures the vendor ID is
detected only once and resolves the ambiguity of using the same variable
'vendor' both as a value and as a state.
--------------------------------
Thank you!
Best regards,
Xiaochen Shen
On Tue, Dec 09, 2025 at 03:02:14PM -0800, Reinette Chatre wrote:
> I suggest this be simplified to not have the vendor ID be used both as a value and as a state.
> Here is some pseudo-code that should be able to accomplish this:
>
>
> unsigned int detect_vendor(void)
> {
> static bool initialized = false;
> static unsigned int vendor_id;
> ...
> FILE *inf;
>
>
> if (initialized)
> return vendor_id;
>
> inf = fopen("/proc/cpuinfo", "r");
> if (!inf) {
> vendor_id = 0;
> initialized = true;
> return vendor_id;
> }
>
> /* initialize vendor_id from /proc/cpuinfo */
>
> initialized = true;
> return vendor_id;
> }
>
> unsigned int get_vendor(void)
> {
> unsigned int vendor;
>
> vendor = detect_vendor();
>
> if (vendor == 0)
> ksft_print_msg(...);
>
> return vendor;
> }
If detect_vendor() failed, this you'd get the ksft_print_msg() for every
call to get_vendor().
Why not split completly.
static unsigned int vendor_id;
void detect_vendor(void)
{
FILE *inf = fopen("/proc/cpuinfo", "r");
if (!inf) {
... warning unable to get vendor id ...
}
... initialize from /proc/cpuinfo ...
... warn if doesn't find a known vendor ...
}
Call detect_vendor() at the beginning of main() in each test.
Then just use "vendor_id" whenever you need to test for some vendor
specific feature.
-Tony
Hi Tony,
On 12/9/25 3:42 PM, Luck, Tony wrote:
> On Tue, Dec 09, 2025 at 03:02:14PM -0800, Reinette Chatre wrote:
>
>> I suggest this be simplified to not have the vendor ID be used both as a value and as a state.
>> Here is some pseudo-code that should be able to accomplish this:
>>
>>
>> unsigned int detect_vendor(void)
>> {
>> static bool initialized = false;
>> static unsigned int vendor_id;
>> ...
>> FILE *inf;
>>
>>
>> if (initialized)
>> return vendor_id;
>>
>> inf = fopen("/proc/cpuinfo", "r");
>> if (!inf) {
>> vendor_id = 0;
>> initialized = true;
>> return vendor_id;
>> }
>>
>> /* initialize vendor_id from /proc/cpuinfo */
>>
>> initialized = true;
>> return vendor_id;
>> }
>>
>> unsigned int get_vendor(void)
>> {
>> unsigned int vendor;
>>
>> vendor = detect_vendor();
>>
>> if (vendor == 0)
>> ksft_print_msg(...);
>>
>> return vendor;
>> }
>
> If detect_vendor() failed, this you'd get the ksft_print_msg() for every
> call to get_vendor().
Right. This is intended to match existing behavior. The goal is to
only do the work of querying the vendor information once. The tests are
independent so to avoid the failure message about obtaining vendor information
to only be in the test that did the original query it is printed in every
test's output.
>
> Why not split completly.
>
> static unsigned int vendor_id;
>
> void detect_vendor(void)
> {
> FILE *inf = fopen("/proc/cpuinfo", "r");
>
> if (!inf) {
> ... warning unable to get vendor id ...
> }
>
> ... initialize from /proc/cpuinfo ...
>
> ... warn if doesn't find a known vendor ...
> }
>
> Call detect_vendor() at the beginning of main() in each test.
This will repeat the vendor detection for every (currently six) test?
This seems unnecessary work to me considering this only needs to be done
once.
>
> Then just use "vendor_id" whenever you need to test for some vendor
> specific feature.
Including the warning within detect_vendor() and calling it in each test
does address the goal of including any vendor detection failure message in log of
every test that depends on it. Even so, from what I can tell this separates the message
from where test actually fails though, making things harder to debug, and I expect will
result in more code duplication: the duplicated calls to detect_vendor() and likely
tests needing to duplicate current get_vendor() (more below):
If I understand correctly this would look something like:
some_function()
{
if (vendor_id == ARCH_TBD)
/* Do something */
}
resctrl_test::run_test(...)
{
/* prep */
detect_vendor(); /* may print warning */
/*
* Do not fail the test if vendor detection fails since not all
* flows may depend on vendor information.
*/
/* run actual test */
/* do some things that result in messages in test log */
some_function();
/* do some things that result in messages in test log */
}
In above the test log will show early that vendor detection failed but it is not
clear in the test log what the impact on the test is by being clear where in the
test the failed vendor detection is needed/used.
I anticipate that tests will start to be defensive and do things like below that
would create unnecessary duplication that is currently handled by get_vendor().
some_function()
{
if (vendor_id == 0) {
ksft_print_msg("Vendor invalid, cannot do <something>\n");
return;
}
if (vendor_id == ARCH_TBD)
/* Do something */
}
Just failing tests if the vendor cannot be determined may be an easy solution but
since not all tests depend on vendor information this seems too severe.
Reinette
© 2016 - 2025 Red Hat, Inc.