| Message ID | 484aef5f10e2a13a7c4f575f4a0b3eb726271277.1719842207.git.maciej.wieczor-retman@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | selftests/resctrl: SNC kernel support discovery | expand |
+static bool cpus_offline_empty(void)
+{
+ char offline_cpus_str[64];
+ FILE *fp;
+
+ fp = fopen("/sys/devices/system/cpu/offline", "r");
Check for fp == NULL before using it.
+ if (fscanf(fp, "%s", offline_cpus_str) < 0) {
fscanf() seems like a heavy hammer.
if (fgets(offline_cpus_str, sizeof(offline_cpus_str), fp) == NULL) {
+ if (!errno) {
Don't need an errno check (seems dubious mixing errno with stdio).
+ fclose(fp);
+ return 1;
return true;
+ }
+ ksft_perror("Could not read offline CPUs file!");
+ }
+
+ fclose(fp);
+
+ return 0;
return false;
+}
Hi Tony, On 7/1/24 9:04 AM, Luck, Tony wrote: > +static bool cpus_offline_empty(void) > +{ > + char offline_cpus_str[64]; > + FILE *fp; > + > + fp = fopen("/sys/devices/system/cpu/offline", "r"); > > Check for fp == NULL before using it. > > + if (fscanf(fp, "%s", offline_cpus_str) < 0) { > > fscanf() seems like a heavy hammer. Do you perhaps have any recommendations that should be used instead of fscanf()? I checked with stat() but could not see a difference between file with a CPU and a file without. Other alternative is open()/read()/close()? Looks like when there are no offline CPUs then the file will only contain '\n' so it may be possible to read one byte from the file and confirm it is '\n' as a check for "cpus_offline_empty()". Reinette
On Tue, Jul 02, 2024 at 02:26:25PM -0700, Reinette Chatre wrote: > Hi Tony, > > On 7/1/24 9:04 AM, Luck, Tony wrote: > > +static bool cpus_offline_empty(void) > > +{ > > + char offline_cpus_str[64]; > > + FILE *fp; > > + > > + fp = fopen("/sys/devices/system/cpu/offline", "r"); > > > > Check for fp == NULL before using it. > > > > + if (fscanf(fp, "%s", offline_cpus_str) < 0) { > > > > fscanf() seems like a heavy hammer. > > Do you perhaps have any recommendations that should be used instead of > fscanf()? I checked with stat() but could not see a difference between > file with a CPU and a file without. Other alternative is > open()/read()/close()? Looks like when there are no offline CPUs then > the file will only contain '\n' so it may be possible to read one byte > from the file and confirm it is '\n' as a check for "cpus_offline_empty()". Sorry. I replied with Outlook and didn't quote things properly so my alternate suggestion didn't stand out. Here it is again: if (fgets(offline_cpus_str, sizeof(offline_cpus_str), fp) == NULL) { fclose(fp); return true; } But that was with the assumption that /sys/devices/system/cpu/offline would be empty. Not that it would conatain a single "\n" as you say above. So fgets( ...) followed with "if (offline_cpus_str[0] == '\n') "? -Tony
Hi Tony, On 7/2/24 2:46 PM, Tony Luck wrote: > On Tue, Jul 02, 2024 at 02:26:25PM -0700, Reinette Chatre wrote: >> Hi Tony, >> >> On 7/1/24 9:04 AM, Luck, Tony wrote: >>> +static bool cpus_offline_empty(void) >>> +{ >>> + char offline_cpus_str[64]; >>> + FILE *fp; >>> + >>> + fp = fopen("/sys/devices/system/cpu/offline", "r"); >>> >>> Check for fp == NULL before using it. >>> >>> + if (fscanf(fp, "%s", offline_cpus_str) < 0) { >>> >>> fscanf() seems like a heavy hammer. >> >> Do you perhaps have any recommendations that should be used instead of >> fscanf()? I checked with stat() but could not see a difference between >> file with a CPU and a file without. Other alternative is >> open()/read()/close()? Looks like when there are no offline CPUs then >> the file will only contain '\n' so it may be possible to read one byte >> from the file and confirm it is '\n' as a check for "cpus_offline_empty()". > > Sorry. I replied with Outlook and didn't quote things properly > so my alternate suggestion didn't stand out. Here it is again: > > if (fgets(offline_cpus_str, sizeof(offline_cpus_str), fp) == NULL) { > fclose(fp); > return true; > } Apologies, missed this. > > But that was with the assumption that /sys/devices/system/cpu/offline > would be empty. Not that it would conatain a single "\n" as you say > above. > > So fgets( ...) followed with "if (offline_cpus_str[0] == '\n') "? How about simplifying it more to "if (fgetc(fp) == '\n')" ? Reinette
>> So fgets( ...) followed with "if (offline_cpus_str[0] == '\n') "? > > How about simplifying it more to "if (fgetc(fp) == '\n')" ? Reinette, Even better. -Tony
Hi Maciej, On 7/1/24 7:18 AM, Maciej Wieczor-Retman wrote: > Resctrl selftest prints a message on test failure that Sub-Numa > Clustering (SNC) could be enabled and points the user to check theirs BIOS theirs BIOS -> their BIOS? > settings. No actual check is performed before printing that message so > it is not very accurate in pinpointing a problem. > > Figuring out if SNC is enabled is only one part of the problem, the > others being whether the detected SNC mode is reliable and whether the > kernel supports SNC in resctrl. > > When there is SNC support for kernel's resctrl subsystem and SNC is > enabled then sub node files are created for each node in the resctrlfs. > The sub node files exist in each regular node's L3 monitoring directory. > The reliable path to check for existence of sub node files is > /sys/fs/resctrl/mon_data/mon_L3_00/mon_sub_L3_00. > > To check if SNC detection is reliable one can check the > /sys/devices/system/cpu/offline file. If it's empty, it means all cores > are operational and the ratio should be calculated correctly. If it has > any contents, it means the detected SNC mode can't be trusted and should > be disabled. > > Add helpers for detecting SNC mode and checking its reliability. > > Detect SNC mode once and let other tests inherit that information. > > Add messages to alert the user when SNC detection could return incorrect > results. > > Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com> > --- > Changelog v3: > - Change snc_ways() to snc_nodes_per_l3_cache(). (Reinette) > - Add printing the discovered SNC mode. (Reinette) > - Change method of kernel support discovery from cache sizes to > existance of sub node files. > - Check if SNC detection is unreliable. > - Move SNC detection to only the first run_single_test() instead on > error at the end of test runs. > - Add global value to remind user at the end of relevant tests if SNC > detection was found to be unreliable. > - Redo the patch message after the changes. > > Changelog v2: > - Move snc_ways() checks from individual tests into > snc_kernel_support(). > - Write better comment for snc_kernel_support(). > > tools/testing/selftests/resctrl/cache.c | 3 + > tools/testing/selftests/resctrl/cmt_test.c | 4 +- > tools/testing/selftests/resctrl/mba_test.c | 4 ++ > tools/testing/selftests/resctrl/mbm_test.c | 6 +- > tools/testing/selftests/resctrl/resctrl.h | 4 ++ > .../testing/selftests/resctrl/resctrl_tests.c | 7 ++ > tools/testing/selftests/resctrl/resctrlfs.c | 70 ++++++++++++++++++- > 7 files changed, 93 insertions(+), 5 deletions(-) > > diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selftests/resctrl/cache.c > index 1ff1104e6575..9885d64b8a21 100644 > --- a/tools/testing/selftests/resctrl/cache.c > +++ b/tools/testing/selftests/resctrl/cache.c > @@ -186,4 +186,7 @@ void show_cache_info(int no_of_bits, __u64 avg_llc_val, size_t cache_span, bool > ksft_print_msg("Average LLC val: %llu\n", avg_llc_val); > ksft_print_msg("Cache span (%s): %zu\n", lines ? "lines" : "bytes", > cache_span); > + if (snc_unreliable) > + ksft_print_msg("SNC detection unreliable due to offline CPUs!\n"); The message abour SNC detection being unreliable is already printed at beginning of every test so I do not think it is necessary to print it again at this point. > + > } > diff --git a/tools/testing/selftests/resctrl/cmt_test.c b/tools/testing/selftests/resctrl/cmt_test.c > index 0c045080d808..588543ae2654 100644 > --- a/tools/testing/selftests/resctrl/cmt_test.c > +++ b/tools/testing/selftests/resctrl/cmt_test.c > @@ -175,8 +175,8 @@ static int cmt_run_test(const struct resctrl_test *test, const struct user_param > goto out; > > ret = check_results(¶m, span, n); > - if (ret && (get_vendor() == ARCH_INTEL)) > - ksft_print_msg("Intel CMT may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n"); This message does seem to still be applicable if snc_unreliable == 1. > + if (ret && (get_vendor() == ARCH_INTEL) && !snc_kernel_support()) > + ksft_print_msg("Kernel doesn't support Sub-NUMA Clustering but it is enabled. Check BIOS configuration.\n"); > > out: > free(span_str); > diff --git a/tools/testing/selftests/resctrl/mba_test.c b/tools/testing/selftests/resctrl/mba_test.c > index ab8496a4925b..c91e85f11285 100644 > --- a/tools/testing/selftests/resctrl/mba_test.c > +++ b/tools/testing/selftests/resctrl/mba_test.c > @@ -108,6 +108,8 @@ static bool show_mba_info(unsigned long *bw_imc, unsigned long *bw_resc) > ksft_print_msg("avg_diff_per: %d%%\n", avg_diff_per); > ksft_print_msg("avg_bw_imc: %lu\n", avg_bw_imc); > ksft_print_msg("avg_bw_resc: %lu\n", avg_bw_resc); > + if (snc_unreliable) > + ksft_print_msg("SNC detection unreliable due to offline CPUs!\n"); (here I also think this is unnecessary) > if (avg_diff_per > MAX_DIFF_PERCENT) > ret = true; > } > @@ -179,6 +181,8 @@ static int mba_run_test(const struct resctrl_test *test, const struct user_param > return ret; > > ret = check_results(); > + if (ret && (get_vendor() == ARCH_INTEL) && !snc_kernel_support()) > + ksft_print_msg("Kernel doesn't support Sub-NUMA Clustering but it is enabled. Check BIOS configuration.\n"); > > return ret; > } > diff --git a/tools/testing/selftests/resctrl/mbm_test.c b/tools/testing/selftests/resctrl/mbm_test.c > index 6b5a3b52d861..562b02118270 100644 > --- a/tools/testing/selftests/resctrl/mbm_test.c > +++ b/tools/testing/selftests/resctrl/mbm_test.c > @@ -43,6 +43,8 @@ show_bw_info(unsigned long *bw_imc, unsigned long *bw_resc, size_t span) > ksft_print_msg("Span (MB): %zu\n", span / MB); > ksft_print_msg("avg_bw_imc: %lu\n", avg_bw_imc); > ksft_print_msg("avg_bw_resc: %lu\n", avg_bw_resc); > + if (snc_unreliable) > + ksft_print_msg("SNC detection unreliable due to offline CPUs!\n"); > > return ret; > } > @@ -147,8 +149,8 @@ static int mbm_run_test(const struct resctrl_test *test, const struct user_param > return ret; > > ret = check_results(DEFAULT_SPAN); > - if (ret && (get_vendor() == ARCH_INTEL)) > - ksft_print_msg("Intel MBM may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n"); This message does seem to still be applicable if snc_unreliable == 1. > + if (ret && (get_vendor() == ARCH_INTEL) && !snc_kernel_support()) > + ksft_print_msg("Kernel doesn't support Sub-NUMA Clustering but it is enabled. Check BIOS configuration.\n"); > > return ret; > } > diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h > index 851b37c9c38a..fa44e1cde21b 100644 > --- a/tools/testing/selftests/resctrl/resctrl.h > +++ b/tools/testing/selftests/resctrl/resctrl.h > @@ -121,10 +121,13 @@ struct perf_event_read { > */ > extern volatile int *value_sink; > > +extern int snc_unreliable; > + > extern char llc_occup_path[1024]; > > int snc_nodes_per_l3_cache(void); > int get_vendor(void); > +int get_snc_mode(void); > bool check_resctrlfs_support(void); > int filter_dmesg(void); > int get_domain_id(const char *resource, int cpu_no, int *domain_id); > @@ -167,6 +170,7 @@ void ctrlc_handler(int signum, siginfo_t *info, void *ptr); > int signal_handler_register(const struct resctrl_test *test); > void signal_handler_unregister(void); > unsigned int count_bits(unsigned long n); > +int snc_kernel_support(void); > > void perf_event_attr_initialize(struct perf_event_attr *pea, __u64 config); > void perf_event_initialize_read_format(struct perf_event_read *pe_read); > diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c > index ecbb7605a981..b17560bbaf5c 100644 > --- a/tools/testing/selftests/resctrl/resctrl_tests.c > +++ b/tools/testing/selftests/resctrl/resctrl_tests.c > @@ -12,6 +12,7 @@ > > /* Volatile memory sink to prevent compiler optimizations */ > static volatile int sink_target; > +static int snc_mode; This global seems unnecessary (more later) and also potentially confusing since the get_snc_mode() has a function local static variable of same name. > volatile int *value_sink = &sink_target; > > static struct resctrl_test *resctrl_tests[] = { > @@ -123,6 +124,12 @@ static void run_single_test(const struct resctrl_test *test, const struct user_p > if (test->disabled) > return; > > + if (!snc_mode) { > + snc_mode = get_snc_mode(); > + if (snc_mode > 1) From what I can tell this is the only place the global is used and this can just be: if (get_snc_mode() > 1) > + ksft_print_msg("SNC-%d mode discovered!\n", snc_mode); > + } > + > if (!test_vendor_specific_check(test)) { > ksft_test_result_skip("Hardware does not support %s\n", test->name); > return; > diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c > index 18a31a2ba7b3..004fb6649789 100644 > --- a/tools/testing/selftests/resctrl/resctrlfs.c > +++ b/tools/testing/selftests/resctrl/resctrlfs.c > @@ -13,6 +13,8 @@ > > #include "resctrl.h" > > +int snc_unreliable; > + > static int find_resctrl_mount(char *buffer) > { > FILE *mounts; > @@ -280,7 +282,7 @@ int get_cache_size(int cpu_no, const char *cache_type, unsigned long *cache_size > * with a fully populated L3 mask in the schemata file. > */ > if (cache_num == 3) > - *cache_size /= snc_nodes_per_l3_cache(); > + *cache_size /= get_snc_mode(); hmmm ... it is not ideal to use second patch to change something from first patch. Just having a single snc_nodes_per_l3_cache() will eliminate this change (more below). > return 0; > } > > @@ -939,3 +941,69 @@ unsigned int count_bits(unsigned long n) > > return count; > } > + > +static bool cpus_offline_empty(void) > +{ > + char offline_cpus_str[64]; > + FILE *fp; > + > + fp = fopen("/sys/devices/system/cpu/offline", "r"); > + if (fscanf(fp, "%s", offline_cpus_str) < 0) { > + if (!errno) { > + fclose(fp); > + return 1; > + } > + ksft_perror("Could not read offline CPUs file!"); > + } > + > + fclose(fp); > + > + return 0; > +} > + > +int get_snc_mode(void) > +{ > + static int snc_mode; > + > + if (!snc_mode) { > + snc_mode = snc_nodes_per_l3_cache(); > + if (!cpus_offline_empty()) { > + ksft_print_msg("Runtime SNC detection unreliable due to offline CPUs!\n"); > + ksft_print_msg("Setting SNC mode to disabled.\n"); > + snc_mode = 1; > + snc_unreliable = 1; > + } > + } > + > + return snc_mode; > +} I think the SNC detection will be easier to understand if it is done in a single place. Can the static local variable and checks using the offline file instead be included in existing snc_nodes_per_l3_cache()? > + > +/** > + * snc_kernel_support - Compare system reported cache size and resctrl > + * reported cache size to get an idea if SNC is supported on the kernel side. This comment does not seem to match what the function does. > + * > + * Return: 0 if not supported, 1 if SNC is disabled or SNC is both enabled and > + * supported, < 0 on failure. > + */ > +int snc_kernel_support(void) > +{ > + char node_path[PATH_MAX]; > + struct stat statbuf; > + int ret; > + > + ret = get_snc_mode(); > + /* > + * If SNC is disabled then its kernel support isn't important. If value > + * is smaller than 1 an error happened. How can a value smaller than 1 be returned? > + */ > + if (ret <= 1) > + return ret; > + > + snprintf(node_path, sizeof(node_path), "%s/%s/%s", RESCTRL_PATH, "mon_data", > + "mon_L3_00/mon_sub_L3_00"); > + > + if (!stat(node_path, &statbuf)) > + return 1; > + > + return 0; > +} Reinette
On 2024-07-03 at 00:03:58 +0200, Luck, Tony wrote: >>> So fgets( ...) followed with "if (offline_cpus_str[0] == '\n') "? >> >> How about simplifying it more to "if (fgetc(fp) == '\n')" ? > >Reinette, > >Even better. > >-Tony Thanks, I'll try using this instead of fscanf.
Thanks for the review, On 2024-07-01 at 18:04:00 +0200, Luck, Tony wrote: >+static bool cpus_offline_empty(void) >+{ >+ char offline_cpus_str[64]; >+ FILE *fp; >+ >+ fp = fopen("/sys/devices/system/cpu/offline", "r"); > >Check for fp == NULL before using it. Thanks, will add it. > >+ if (fscanf(fp, "%s", offline_cpus_str) < 0) { > >fscanf() seems like a heavy hammer. > > if (fgets(offline_cpus_str, sizeof(offline_cpus_str), fp) == NULL) { >+ if (!errno) { > >Don't need an errno check (seems dubious mixing errno with stdio). fscanf() returns "-1" when nothing was read as well as if there was an error. But when nothing was read the errno is "0" instead of some error code so I could differentiate the cases that way. The fgetc() you settled on shouldn't have this problem. > >+ fclose(fp); >+ return 1; > > return true; > >+ } >+ ksft_perror("Could not read offline CPUs file!"); >+ } >+ >+ fclose(fp); >+ >+ return 0; > > return false; >+} >
Hi, and thanks for the review, On 3.07.2024 00:21, Reinette Chatre wrote: > Hi Maciej, > > On 7/1/24 7:18 AM, Maciej Wieczor-Retman wrote: >> Resctrl selftest prints a message on test failure that Sub-Numa >> Clustering (SNC) could be enabled and points the user to check theirs BIOS > > theirs BIOS -> their BIOS? Right, thanks. > >> settings. No actual check is performed before printing that message so >> it is not very accurate in pinpointing a problem. >> >> Figuring out if SNC is enabled is only one part of the problem, the >> others being whether the detected SNC mode is reliable and whether the >> kernel supports SNC in resctrl. >> >> When there is SNC support for kernel's resctrl subsystem and SNC is >> enabled then sub node files are created for each node in the resctrlfs. >> The sub node files exist in each regular node's L3 monitoring directory. >> The reliable path to check for existence of sub node files is >> /sys/fs/resctrl/mon_data/mon_L3_00/mon_sub_L3_00. >> >> To check if SNC detection is reliable one can check the >> /sys/devices/system/cpu/offline file. If it's empty, it means all cores >> are operational and the ratio should be calculated correctly. If it has >> any contents, it means the detected SNC mode can't be trusted and should >> be disabled. >> >> Add helpers for detecting SNC mode and checking its reliability. >> >> Detect SNC mode once and let other tests inherit that information. >> >> Add messages to alert the user when SNC detection could return incorrect >> results. >> >> Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com> >> --- >> Changelog v3: >> - Change snc_ways() to snc_nodes_per_l3_cache(). (Reinette) >> - Add printing the discovered SNC mode. (Reinette) >> - Change method of kernel support discovery from cache sizes to >> existance of sub node files. >> - Check if SNC detection is unreliable. >> - Move SNC detection to only the first run_single_test() instead on >> error at the end of test runs. >> - Add global value to remind user at the end of relevant tests if SNC >> detection was found to be unreliable. >> - Redo the patch message after the changes. >> >> Changelog v2: >> - Move snc_ways() checks from individual tests into >> snc_kernel_support(). >> - Write better comment for snc_kernel_support(). >> >> tools/testing/selftests/resctrl/cache.c | 3 + >> tools/testing/selftests/resctrl/cmt_test.c | 4 +- >> tools/testing/selftests/resctrl/mba_test.c | 4 ++ >> tools/testing/selftests/resctrl/mbm_test.c | 6 +- >> tools/testing/selftests/resctrl/resctrl.h | 4 ++ >> .../testing/selftests/resctrl/resctrl_tests.c | 7 ++ >> tools/testing/selftests/resctrl/resctrlfs.c | 70 ++++++++++++++++++- >> 7 files changed, 93 insertions(+), 5 deletions(-) >> >> diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selftests/resctrl/cache.c >> index 1ff1104e6575..9885d64b8a21 100644 >> --- a/tools/testing/selftests/resctrl/cache.c >> +++ b/tools/testing/selftests/resctrl/cache.c >> @@ -186,4 +186,7 @@ void show_cache_info(int no_of_bits, __u64 avg_llc_val, size_t cache_span, bool >> ksft_print_msg("Average LLC val: %llu\n", avg_llc_val); >> ksft_print_msg("Cache span (%s): %zu\n", lines ? "lines" : "bytes", >> cache_span); >> + if (snc_unreliable) >> + ksft_print_msg("SNC detection unreliable due to offline CPUs!\n"); > > The message abour SNC detection being unreliable is already printed at beginning of every > test so I do not think it is necessary to print it again at this point. > The "SNC detection was unreliable" only gets printed on the first execution of run_single_test(). That's what the global snc_mode was for mostly, it starts initialized to 0, and then on the first run of run_single_test() it is set so other tests don't call get_snc_mode(). And then the local static variable inside get_snc_mode() prevents the detection from running more than once when other places call get_snc_mode() (like when the cache size is adjusted). And as we discussed last time it's beneficial to put error messages at the end of the test in case the user misses the initial warning at the very beginning. >> + >> } >> diff --git a/tools/testing/selftests/resctrl/cmt_test.c b/tools/testing/selftests/resctrl/cmt_test.c >> index 0c045080d808..588543ae2654 100644 >> --- a/tools/testing/selftests/resctrl/cmt_test.c >> +++ b/tools/testing/selftests/resctrl/cmt_test.c >> @@ -175,8 +175,8 @@ static int cmt_run_test(const struct resctrl_test *test, const struct user_param >> goto out; >> ret = check_results(¶m, span, n); >> - if (ret && (get_vendor() == ARCH_INTEL)) >> - ksft_print_msg("Intel CMT may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n"); > > This message does seem to still be applicable if snc_unreliable == 1. I was going for this one error message to specifically catch the kernel not having snc support for resctrl while snc is enabled. While the above message could be true when snc_unreliable == 1, it doesn't have to. SNC might not be enabled at all so there would be no reason to send the user to check their BIOS - instead they can learn they have offline CPUs and they can work on fixing that. In my opinion it could be beneficial to have more specialized messages in the selftests to help users diagnose problems quicker. Having only this one message wihtout the "if snc unreliable" messages would mean nothing would get printed at the end on success with unreliable SNC detection. > >> + if (ret && (get_vendor() == ARCH_INTEL) && !snc_kernel_support()) >> + ksft_print_msg("Kernel doesn't support Sub-NUMA Clustering but it is enabled. Check BIOS configuration.\n"); >> out: >> free(span_str); >> diff --git a/tools/testing/selftests/resctrl/mba_test.c b/tools/testing/selftests/resctrl/mba_test.c >> index ab8496a4925b..c91e85f11285 100644 >> --- a/tools/testing/selftests/resctrl/mba_test.c >> +++ b/tools/testing/selftests/resctrl/mba_test.c >> @@ -108,6 +108,8 @@ static bool show_mba_info(unsigned long *bw_imc, unsigned long *bw_resc) >> ksft_print_msg("avg_diff_per: %d%%\n", avg_diff_per); >> ksft_print_msg("avg_bw_imc: %lu\n", avg_bw_imc); >> ksft_print_msg("avg_bw_resc: %lu\n", avg_bw_resc); >> + if (snc_unreliable) >> + ksft_print_msg("SNC detection unreliable due to offline CPUs!\n"); > > (here I also think this is unnecessary) Same as above. > >> if (avg_diff_per > MAX_DIFF_PERCENT) >> ret = true; >> } >> @@ -179,6 +181,8 @@ static int mba_run_test(const struct resctrl_test *test, const struct user_param >> return ret; >> ret = check_results(); >> + if (ret && (get_vendor() == ARCH_INTEL) && !snc_kernel_support()) >> + ksft_print_msg("Kernel doesn't support Sub-NUMA Clustering but it is enabled. Check BIOS configuration.\n"); >> return ret; >> } >> diff --git a/tools/testing/selftests/resctrl/mbm_test.c b/tools/testing/selftests/resctrl/mbm_test.c >> index 6b5a3b52d861..562b02118270 100644 >> --- a/tools/testing/selftests/resctrl/mbm_test.c >> +++ b/tools/testing/selftests/resctrl/mbm_test.c >> @@ -43,6 +43,8 @@ show_bw_info(unsigned long *bw_imc, unsigned long *bw_resc, size_t span) >> ksft_print_msg("Span (MB): %zu\n", span / MB); >> ksft_print_msg("avg_bw_imc: %lu\n", avg_bw_imc); >> ksft_print_msg("avg_bw_resc: %lu\n", avg_bw_resc); >> + if (snc_unreliable) >> + ksft_print_msg("SNC detection unreliable due to offline CPUs!\n"); >> return ret; >> } >> @@ -147,8 +149,8 @@ static int mbm_run_test(const struct resctrl_test *test, const struct user_param >> return ret; >> ret = check_results(DEFAULT_SPAN); >> - if (ret && (get_vendor() == ARCH_INTEL)) >> - ksft_print_msg("Intel MBM may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n"); > > This message does seem to still be applicable if snc_unreliable == 1. Same as above. > >> + if (ret && (get_vendor() == ARCH_INTEL) && !snc_kernel_support()) >> + ksft_print_msg("Kernel doesn't support Sub-NUMA Clustering but it is enabled. Check BIOS configuration.\n"); >> return ret; >> } >> diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h >> index 851b37c9c38a..fa44e1cde21b 100644 >> --- a/tools/testing/selftests/resctrl/resctrl.h >> +++ b/tools/testing/selftests/resctrl/resctrl.h >> @@ -121,10 +121,13 @@ struct perf_event_read { >> */ >> extern volatile int *value_sink; >> +extern int snc_unreliable; >> + >> extern char llc_occup_path[1024]; >> int snc_nodes_per_l3_cache(void); >> int get_vendor(void); >> +int get_snc_mode(void); >> bool check_resctrlfs_support(void); >> int filter_dmesg(void); >> int get_domain_id(const char *resource, int cpu_no, int *domain_id); >> @@ -167,6 +170,7 @@ void ctrlc_handler(int signum, siginfo_t *info, void *ptr); >> int signal_handler_register(const struct resctrl_test *test); >> void signal_handler_unregister(void); >> unsigned int count_bits(unsigned long n); >> +int snc_kernel_support(void); >> void perf_event_attr_initialize(struct perf_event_attr *pea, __u64 config); >> void perf_event_initialize_read_format(struct perf_event_read *pe_read); >> diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c >> index ecbb7605a981..b17560bbaf5c 100644 >> --- a/tools/testing/selftests/resctrl/resctrl_tests.c >> +++ b/tools/testing/selftests/resctrl/resctrl_tests.c >> @@ -12,6 +12,7 @@ >> /* Volatile memory sink to prevent compiler optimizations */ >> static volatile int sink_target; >> +static int snc_mode; > > This global seems unnecessary (more later) and also potentially confusing since > the get_snc_mode() has a function local static variable of same name. > >> volatile int *value_sink = &sink_target; >> static struct resctrl_test *resctrl_tests[] = { >> @@ -123,6 +124,12 @@ static void run_single_test(const struct resctrl_test *test, const struct user_p >> if (test->disabled) >> return; >> + if (!snc_mode) { >> + snc_mode = get_snc_mode(); >> + if (snc_mode > 1) > > > From what I can tell this is the only place the global is used and this can just be: > if (get_snc_mode() > 1) I wanted to print the message below only on the first call to run_single_test() and then print relevant warnings at the very end of each test. I thought that was your intention when we discussed what messages are supposed to be printed and when in v2 of this series. Do you think it would be better to just print this message at the start of each test? Or should I make "snc_mode" into local static inside run_single_test()? Or maybe add a second local static variable into get_snc_mode() that would control whether or not the message should be printed? > >> + ksft_print_msg("SNC-%d mode discovered!\n", snc_mode); >> + } >> + >> if (!test_vendor_specific_check(test)) { >> ksft_test_result_skip("Hardware does not support %s\n", test->name); >> return; >> diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c >> index 18a31a2ba7b3..004fb6649789 100644 >> --- a/tools/testing/selftests/resctrl/resctrlfs.c >> +++ b/tools/testing/selftests/resctrl/resctrlfs.c >> @@ -13,6 +13,8 @@ >> #include "resctrl.h" >> +int snc_unreliable; >> + >> static int find_resctrl_mount(char *buffer) >> { >> FILE *mounts; >> @@ -280,7 +282,7 @@ int get_cache_size(int cpu_no, const char *cache_type, unsigned long *cache_size >> * with a fully populated L3 mask in the schemata file. >> */ >> if (cache_num == 3) >> - *cache_size /= snc_nodes_per_l3_cache(); >> + *cache_size /= get_snc_mode(); > > hmmm ... it is not ideal to use second patch to change something from first patch. > Just having a single snc_nodes_per_l3_cache() will eliminate this change (more below). > >> return 0; >> } >> @@ -939,3 +941,69 @@ unsigned int count_bits(unsigned long n) >> return count; >> } >> + >> +static bool cpus_offline_empty(void) >> +{ >> + char offline_cpus_str[64]; >> + FILE *fp; >> + >> + fp = fopen("/sys/devices/system/cpu/offline", "r"); >> + if (fscanf(fp, "%s", offline_cpus_str) < 0) { >> + if (!errno) { >> + fclose(fp); >> + return 1; >> + } >> + ksft_perror("Could not read offline CPUs file!"); >> + } >> + >> + fclose(fp); >> + >> + return 0; >> +} >> + >> +int get_snc_mode(void) >> +{ >> + static int snc_mode; >> + >> + if (!snc_mode) { >> + snc_mode = snc_nodes_per_l3_cache(); >> + if (!cpus_offline_empty()) { >> + ksft_print_msg("Runtime SNC detection unreliable due to offline CPUs!\n"); >> + ksft_print_msg("Setting SNC mode to disabled.\n"); >> + snc_mode = 1; >> + snc_unreliable = 1; >> + } >> + } >> + >> + return snc_mode; >> +} > > I think the SNC detection will be easier to understand if it is done in a single > place. Can the static local variable and checks using the offline file instead be included in > existing snc_nodes_per_l3_cache()? Sure, that sounds good. > >> + >> +/** >> + * snc_kernel_support - Compare system reported cache size and resctrl >> + * reported cache size to get an idea if SNC is supported on the kernel side. > > This comment does not seem to match what the function does. Oops, sorry, will fix it. > >> + * >> + * Return: 0 if not supported, 1 if SNC is disabled or SNC is both enabled and >> + * supported, < 0 on failure. >> + */ >> +int snc_kernel_support(void) >> +{ >> + char node_path[PATH_MAX]; >> + struct stat statbuf; >> + int ret; >> + >> + ret = get_snc_mode(); >> + /* >> + * If SNC is disabled then its kernel support isn't important. If value >> + * is smaller than 1 an error happened. > > How can a value smaller than 1 be returned? I think I left it here by accident because I was experimenting with other ways of detecting the snc mode and then it could return errors. Will remove it. > >> + */ >> + if (ret <= 1) >> + return ret; >> + >> + snprintf(node_path, sizeof(node_path), "%s/%s/%s", RESCTRL_PATH, "mon_data", >> + "mon_L3_00/mon_sub_L3_00"); >> + >> + if (!stat(node_path, &statbuf)) >> + return 1; >> + >> + return 0; >> +} > > > Reinette -- Kind regards Maciej Wieczór-Retman
diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selftests/resctrl/cache.c index 1ff1104e6575..9885d64b8a21 100644 --- a/tools/testing/selftests/resctrl/cache.c +++ b/tools/testing/selftests/resctrl/cache.c @@ -186,4 +186,7 @@ void show_cache_info(int no_of_bits, __u64 avg_llc_val, size_t cache_span, bool ksft_print_msg("Average LLC val: %llu\n", avg_llc_val); ksft_print_msg("Cache span (%s): %zu\n", lines ? "lines" : "bytes", cache_span); + if (snc_unreliable) + ksft_print_msg("SNC detection unreliable due to offline CPUs!\n"); + } diff --git a/tools/testing/selftests/resctrl/cmt_test.c b/tools/testing/selftests/resctrl/cmt_test.c index 0c045080d808..588543ae2654 100644 --- a/tools/testing/selftests/resctrl/cmt_test.c +++ b/tools/testing/selftests/resctrl/cmt_test.c @@ -175,8 +175,8 @@ static int cmt_run_test(const struct resctrl_test *test, const struct user_param goto out; ret = check_results(¶m, span, n); - if (ret && (get_vendor() == ARCH_INTEL)) - ksft_print_msg("Intel CMT may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n"); + if (ret && (get_vendor() == ARCH_INTEL) && !snc_kernel_support()) + ksft_print_msg("Kernel doesn't support Sub-NUMA Clustering but it is enabled. Check BIOS configuration.\n"); out: free(span_str); diff --git a/tools/testing/selftests/resctrl/mba_test.c b/tools/testing/selftests/resctrl/mba_test.c index ab8496a4925b..c91e85f11285 100644 --- a/tools/testing/selftests/resctrl/mba_test.c +++ b/tools/testing/selftests/resctrl/mba_test.c @@ -108,6 +108,8 @@ static bool show_mba_info(unsigned long *bw_imc, unsigned long *bw_resc) ksft_print_msg("avg_diff_per: %d%%\n", avg_diff_per); ksft_print_msg("avg_bw_imc: %lu\n", avg_bw_imc); ksft_print_msg("avg_bw_resc: %lu\n", avg_bw_resc); + if (snc_unreliable) + ksft_print_msg("SNC detection unreliable due to offline CPUs!\n"); if (avg_diff_per > MAX_DIFF_PERCENT) ret = true; } @@ -179,6 +181,8 @@ static int mba_run_test(const struct resctrl_test *test, const struct user_param return ret; ret = check_results(); + if (ret && (get_vendor() == ARCH_INTEL) && !snc_kernel_support()) + ksft_print_msg("Kernel doesn't support Sub-NUMA Clustering but it is enabled. Check BIOS configuration.\n"); return ret; } diff --git a/tools/testing/selftests/resctrl/mbm_test.c b/tools/testing/selftests/resctrl/mbm_test.c index 6b5a3b52d861..562b02118270 100644 --- a/tools/testing/selftests/resctrl/mbm_test.c +++ b/tools/testing/selftests/resctrl/mbm_test.c @@ -43,6 +43,8 @@ show_bw_info(unsigned long *bw_imc, unsigned long *bw_resc, size_t span) ksft_print_msg("Span (MB): %zu\n", span / MB); ksft_print_msg("avg_bw_imc: %lu\n", avg_bw_imc); ksft_print_msg("avg_bw_resc: %lu\n", avg_bw_resc); + if (snc_unreliable) + ksft_print_msg("SNC detection unreliable due to offline CPUs!\n"); return ret; } @@ -147,8 +149,8 @@ static int mbm_run_test(const struct resctrl_test *test, const struct user_param return ret; ret = check_results(DEFAULT_SPAN); - if (ret && (get_vendor() == ARCH_INTEL)) - ksft_print_msg("Intel MBM may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n"); + if (ret && (get_vendor() == ARCH_INTEL) && !snc_kernel_support()) + ksft_print_msg("Kernel doesn't support Sub-NUMA Clustering but it is enabled. Check BIOS configuration.\n"); return ret; } diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h index 851b37c9c38a..fa44e1cde21b 100644 --- a/tools/testing/selftests/resctrl/resctrl.h +++ b/tools/testing/selftests/resctrl/resctrl.h @@ -121,10 +121,13 @@ struct perf_event_read { */ extern volatile int *value_sink; +extern int snc_unreliable; + extern char llc_occup_path[1024]; int snc_nodes_per_l3_cache(void); int get_vendor(void); +int get_snc_mode(void); bool check_resctrlfs_support(void); int filter_dmesg(void); int get_domain_id(const char *resource, int cpu_no, int *domain_id); @@ -167,6 +170,7 @@ void ctrlc_handler(int signum, siginfo_t *info, void *ptr); int signal_handler_register(const struct resctrl_test *test); void signal_handler_unregister(void); unsigned int count_bits(unsigned long n); +int snc_kernel_support(void); void perf_event_attr_initialize(struct perf_event_attr *pea, __u64 config); void perf_event_initialize_read_format(struct perf_event_read *pe_read); diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c index ecbb7605a981..b17560bbaf5c 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -12,6 +12,7 @@ /* Volatile memory sink to prevent compiler optimizations */ static volatile int sink_target; +static int snc_mode; volatile int *value_sink = &sink_target; static struct resctrl_test *resctrl_tests[] = { @@ -123,6 +124,12 @@ static void run_single_test(const struct resctrl_test *test, const struct user_p if (test->disabled) return; + if (!snc_mode) { + snc_mode = get_snc_mode(); + if (snc_mode > 1) + ksft_print_msg("SNC-%d mode discovered!\n", snc_mode); + } + if (!test_vendor_specific_check(test)) { ksft_test_result_skip("Hardware does not support %s\n", test->name); return; diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c index 18a31a2ba7b3..004fb6649789 100644 --- a/tools/testing/selftests/resctrl/resctrlfs.c +++ b/tools/testing/selftests/resctrl/resctrlfs.c @@ -13,6 +13,8 @@ #include "resctrl.h" +int snc_unreliable; + static int find_resctrl_mount(char *buffer) { FILE *mounts; @@ -280,7 +282,7 @@ int get_cache_size(int cpu_no, const char *cache_type, unsigned long *cache_size * with a fully populated L3 mask in the schemata file. */ if (cache_num == 3) - *cache_size /= snc_nodes_per_l3_cache(); + *cache_size /= get_snc_mode(); return 0; } @@ -939,3 +941,69 @@ unsigned int count_bits(unsigned long n) return count; } + +static bool cpus_offline_empty(void) +{ + char offline_cpus_str[64]; + FILE *fp; + + fp = fopen("/sys/devices/system/cpu/offline", "r"); + if (fscanf(fp, "%s", offline_cpus_str) < 0) { + if (!errno) { + fclose(fp); + return 1; + } + ksft_perror("Could not read offline CPUs file!"); + } + + fclose(fp); + + return 0; +} + +int get_snc_mode(void) +{ + static int snc_mode; + + if (!snc_mode) { + snc_mode = snc_nodes_per_l3_cache(); + if (!cpus_offline_empty()) { + ksft_print_msg("Runtime SNC detection unreliable due to offline CPUs!\n"); + ksft_print_msg("Setting SNC mode to disabled.\n"); + snc_mode = 1; + snc_unreliable = 1; + } + } + + return snc_mode; +} + +/** + * snc_kernel_support - Compare system reported cache size and resctrl + * reported cache size to get an idea if SNC is supported on the kernel side. + * + * Return: 0 if not supported, 1 if SNC is disabled or SNC is both enabled and + * supported, < 0 on failure. + */ +int snc_kernel_support(void) +{ + char node_path[PATH_MAX]; + struct stat statbuf; + int ret; + + ret = get_snc_mode(); + /* + * If SNC is disabled then its kernel support isn't important. If value + * is smaller than 1 an error happened. + */ + if (ret <= 1) + return ret; + + snprintf(node_path, sizeof(node_path), "%s/%s/%s", RESCTRL_PATH, "mon_data", + "mon_L3_00/mon_sub_L3_00"); + + if (!stat(node_path, &statbuf)) + return 1; + + return 0; +}
Resctrl selftest prints a message on test failure that Sub-Numa Clustering (SNC) could be enabled and points the user to check theirs BIOS settings. No actual check is performed before printing that message so it is not very accurate in pinpointing a problem. Figuring out if SNC is enabled is only one part of the problem, the others being whether the detected SNC mode is reliable and whether the kernel supports SNC in resctrl. When there is SNC support for kernel's resctrl subsystem and SNC is enabled then sub node files are created for each node in the resctrlfs. The sub node files exist in each regular node's L3 monitoring directory. The reliable path to check for existence of sub node files is /sys/fs/resctrl/mon_data/mon_L3_00/mon_sub_L3_00. To check if SNC detection is reliable one can check the /sys/devices/system/cpu/offline file. If it's empty, it means all cores are operational and the ratio should be calculated correctly. If it has any contents, it means the detected SNC mode can't be trusted and should be disabled. Add helpers for detecting SNC mode and checking its reliability. Detect SNC mode once and let other tests inherit that information. Add messages to alert the user when SNC detection could return incorrect results. Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com> --- Changelog v3: - Change snc_ways() to snc_nodes_per_l3_cache(). (Reinette) - Add printing the discovered SNC mode. (Reinette) - Change method of kernel support discovery from cache sizes to existance of sub node files. - Check if SNC detection is unreliable. - Move SNC detection to only the first run_single_test() instead on error at the end of test runs. - Add global value to remind user at the end of relevant tests if SNC detection was found to be unreliable. - Redo the patch message after the changes. Changelog v2: - Move snc_ways() checks from individual tests into snc_kernel_support(). - Write better comment for snc_kernel_support(). tools/testing/selftests/resctrl/cache.c | 3 + tools/testing/selftests/resctrl/cmt_test.c | 4 +- tools/testing/selftests/resctrl/mba_test.c | 4 ++ tools/testing/selftests/resctrl/mbm_test.c | 6 +- tools/testing/selftests/resctrl/resctrl.h | 4 ++ .../testing/selftests/resctrl/resctrl_tests.c | 7 ++ tools/testing/selftests/resctrl/resctrlfs.c | 70 ++++++++++++++++++- 7 files changed, 93 insertions(+), 5 deletions(-)