x86/resctrl: Correct MBM total and local values
Subsystems (2)
Fenghua Yu
AppliedPATCH 1/1 x86/resctrl: Correct MBM total and local values
MBM total and local readings are corrected by the following correction factor table on Broadwell server and Skylake server.
core rmid rmid correction
count count threshold factor
1 8 0 1.000000
2 16 0 1.000000
3 24 15 0.969650
4 32 0 1.000000
5 40 31 1.066667
6 48 31 0.969650
7 56 47 1.142857
8 64 0 1.000000
9 72 63 1.185115
10 80 63 1.066553
11 88 79 1.454545
12 96 0 1.000000
13 104 95 1.230769
14 112 95 1.142857
15 120 95 1.066667
16 128 0 1.000000
17 136 127 1.254863
18 144 127 1.185255
19 152 0 1.000000
20 160 127 1.066667
21 168 0 1.000000
22 176 159 1.454334
23 184 0 1.000000
24 192 127 0.969744
25 200 191 1.280246
26 208 191 1.230921
27 216 0 1.000000
28 224 191 1.143118
If rmid > rmid threshold, MBM total and local values should be multipled by the correction factor.
The above table is modified for better code:
1. The threshold 0 is changed to rmid count - 1 so we don't do correction for the case.
2. Correction factor is normalized to 2^20 for better performance by avoiding floating point and division calculation in corrected MBM values.
Detailed information about the correction is described in erratum SKX99:
https://www.intel.com/content/www/us/en/processors/xeon/scalable/xeon-scalable-spec-update.html
and BDF102: https://www.intel.com/content/dam/www/public/us/en/documents/specification-updates/xeon-e5-v4-spec-update.pdf
The problem is described in details in "3.6 Intel MBM RMID Imbalance":
https://software.intel.com/content/www/us/en/develop/articles/intel-resource-director-technology-rdt-reference-manual.html
---
Applied to tip:x86/cache.
arch/x86/kernel/cpu/resctrl/core.c | 4 ++ arch/x86/kernel/cpu/resctrl/internal.h | 1 + arch/x86/kernel/cpu/resctrl/monitor.c | 75 +++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/resctrl/core.c +4 -0
@@ -893,6 +893,10 @@ static __init void __check_quirks_intel(void)set_rdt_options ("!cmt,!mbmtotal,!mbmlocal,!l3cat" ); else set_rdt_options("!l3cat"); + /* FALLTHROUGH */ + case INTEL_FAM6_BROADWELL_X: +intel_rdt_mbm_quirk (); +break ; } }
arch/x86/kernel/cpu/resctrl/internal.h +1 -0
@@ -616,6 +616,7 @@ void mon_event_read(struct rmid_read *rr, struct rdt_resource *r,void mbm_setup_overflow_handler (struct rdt_domain *dom,unsigned long delay_ms);void mbm_handle_overflow (struct work_struct *work); +void intel_rdt_mbm_quirk (void );bool is_mba_sc (struct rdt_resource *r);void setup_default_ctrlval (struct rdt_resource *r,u32 *dc,u32 *dm);u32 delay_bw_map (unsigned long bw,struct rdt_resource *r);
arch/x86/kernel/cpu/resctrl/monitor.c +73 -2
102 lines not on this page · raw message
Signature · 1 line
2.28.0
Borislav Petkov
maintainerQuoted 25 lines · Fenghua Yu
MBM total and local readings are corrected by the following correction factor table on Broadwell server and Skylake server.
core rmid rmid correction
count count threshold factor
1 8 0 1.000000
2 16 0 1.000000
3 24 15 0.969650
4 32 0 1.000000
5 40 31 1.066667
6 48 31 0.969650
7 56 47 1.142857
8 64 0 1.000000
9 72 63 1.185115
10 80 63 1.066553
11 88 79 1.454545
12 96 0 1.000000
13 104 95 1.230769
14 112 95 1.142857
15 120 95 1.066667
16 128 0 1.000000
17 136 127 1.254863
18 144 127 1.185255
19 152 0 1.000000
20 160 127 1.066667
Quoted 8 lines
21 168 0 1.000000
22 176 159 1.454334
23 184 0 1.000000
24 192 127 0.969744
25 200 191 1.280246
26 208 191 1.230921
27 216 0 1.000000
28 224 191 1.143118
Table is already in the code, why is it needed in the commit message too?
Quoted 5 lines
If rmid > rmid threshold, MBM total and local values should be multipled by the correction factor.
The above table is modified for better code:
1. The threshold 0 is changed to rmid count - 1 so we don't do correction
Who is "we"?
Quoted 11 lines
for the case.
2. Correction factor is normalized to 2^20 for better performance by avoiding floating point and division calculation in corrected MBM values.Detailed information about the correction is described in erratum SKX99:
https://www.intel.com/content/www/us/en/processors/xeon/scalable/xeon-scalable-spec-update.html
and BDF102: https://www.intel.com/content/dam/www/public/us/en/documents/specification-updates/xeon-e5-v4-spec-update.pdfThe problem is described in details in "3.6 Intel MBM RMID Imbalance":
https://software.intel.com/content/www/us/en/develop/articles/intel-resource-director-technology-rdt-reference-manual.html
I hear those URLs are awfully unstable. I'd suggested you upload the pdfs to bugzilla but the erratum text is short enough so that you can simply add it here.
Quoted 16 lines
Signed-off-by Fenghua Yu <[email protected]>Reviewed-by Tony Luck <[email protected]>---
Applied to tip:x86/cache.
arch/x86/kernel/cpu/resctrl/core.c | 4 ++ arch/x86/kernel/cpu/resctrl/internal.h | 1 + arch/x86/kernel/cpu/resctrl/monitor.c | 75 +++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 2 deletions(-)arch/x86/kernel/cpu/resctrl/core.c +0
-0
arch/x86/kernel/cpu/resctrl/core.c static __init void __check_quirks_intel(void) · line 896
Quoted 4 lines
arch/x86/kernel/cpu/resctrl/core.c +1
-0@@ -893,6 +893,10 @@ static __init void __check_quirks_intel(void)set_rdt_options ("!cmt,!mbmtotal,!mbmlocal,!l3cat" ); else set_rdt_options("!l3cat"); + /* FALLTHROUGH */
WARNING: Prefer 'fallthrough;' over fallthrough comment #89: FILE: arch/x86/kernel/cpu/resctrl/core.c:896:
+ /* FALLTHROUGH */
Have you heard of checkpatch.pl?
Quoted 4 lines
arch/x86/kernel/cpu/resctrl/core.c +3
-0+case INTEL_FAM6_BROADWELL_X : +intel_rdt_mbm_quirk (); +break ; }
...
Quoted 13 lines
arch/x86/kernel/cpu/resctrl/monitor.c +1
-0@@ -18,6 +18,7 @@#include <linux/module.h> #include <linux/slab.h> #include <asm/cpu_device_id.h> +#include <asm/intel-family.h> #include "internal.h" struct rmid_entry {
arch/x86/kernel/cpu/resctrl/monitor.c unsigned int rdt_mon_features; · line 71
Quoted 7 lines
arch/x86/kernel/cpu/resctrl/monitor.c +4
-0@@ -64,6 +65,61 @@ unsigned int rdt_mon_features;*/ unsigned int resctrl_cqm_threshold; +#define CF (cf) ((unsigned long)(1048576 * (cf) + 0.5)) + +/* +* MBM total and local correction table indexed by CBO which is equal to
"CBO" is?
arch/x86/kernel/cpu/resctrl/monitor.c unsigned int rdt_mon_features; · line 80
Quoted 9 lines
arch/x86/kernel/cpu/resctrl/monitor.c +9
-0+* (x86_cache_max_rmid + 1) / 8 - 1 and is from 0 up to 27. +* The correction factor is normalized to 2^20 (1048576) so it's faster +* to calculate corrected value by shifting: +* corrected_value = (original_value * correction_factor) >> 20 +*/ +static struct mbm_creation_factor_table { +u32 rmidthreshold; +u64 cf; +} mbm_cf_table[] = {
That array wants to be read-only right?
Quoted 24 lines
arch/x86/kernel/cpu/resctrl/monitor.c +24
-0+ {7, CF(1.000000)}, + {15, CF(1.000000)}, + {15, CF(0.969650)}, + {31, CF(1.000000)}, + {31, CF(1.066667)}, + {31, CF(0.969650)}, + {47, CF(1.142857)}, + {63, CF(1.000000)}, + {63, CF(1.185115)}, + {63, CF(1.066553)}, + {79, CF(1.454545)}, + {95, CF(1.000000)}, + {95, CF(1.230769)}, + {95, CF(1.142857)}, + {95, CF(1.066667)}, + {127, CF(1.000000)}, + {127, CF(1.254863)}, + {127, CF(1.185255)}, + {151, CF(1.000000)}, + {127, CF(1.066667)}, + {167, CF(1.000000)}, + {159, CF(1.454334)}, + {183, CF(1.000000)}, + {127, CF(0.969744)},
arch/x86/kernel/cpu/resctrl/monitor.c unsigned int rdt_mon_features; · line 114
Quoted 10 lines
arch/x86/kernel/cpu/resctrl/monitor.c +10
-0+ {191, CF(1.280246)}, + {191, CF(1.230921)}, + {215, CF(1.000000)}, + {191, CF(1.143118)}, +}; + +static u32 mbm_cf_rmidthreshold =UINT_MAX ; +static u64 mbm_cf; + +static inline u64 corrected_mbm_count (u32 rmid,unsigned long val)
Function name needs a verb.
Quoted 7 lines
arch/x86/kernel/cpu/resctrl/monitor.c +7
-0+{ +/* Correct MBM value. */ +if (rmid > mbm_cf_rmidthreshold) + val = (val * mbm_cf) >>20 ; + +return val; +}
...
arch/x86/kernel/cpu/resctrl/monitor.c int rdt_get_mon_l3_config(struct rdt_resource *r) · line 705
Quoted 6 lines
arch/x86/kernel/cpu/resctrl/monitor.c +2
-0@@ -644,3 +701,17 @@ int rdt_get_mon_l3_config(struct rdt_resource *r)return 0 ; } + +void intel_rdt_mbm_quirk (void )
Function name needs a verb.
arch/x86/kernel/cpu/resctrl/monitor.c int rdt_get_mon_l3_config(struct rdt_resource *r) · line 717
Quoted 13 lines
arch/x86/kernel/cpu/resctrl/monitor.c +12
-0+{ +int cf_index; + + cf_index = (boot_cpu_data.x86_cache_max_rmid +1 ) /8 -1 ; +if (cf_index >=ARRAY_SIZE (mbm_cf_table)) { +pr_info ("No MBM correction factor available\n" ); +return ; + } + + mbm_cf_rmidthreshold = mbm_cf_table[cf_index].rmidthreshold; + mbm_cf = mbm_cf_table[cf_index].cf; +}
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteHi, Boris,
Quoted 35 lines · Borislav Petkov
Quoted 25 lines · Fenghua Yu
MBM total and local readings are corrected by the following correction factor table on Broadwell server and Skylake server.
core rmid rmid correction
count count threshold factor
1 8 0 1.000000
2 16 0 1.000000
3 24 15 0.969650
4 32 0 1.000000
5 40 31 1.066667
6 48 31 0.969650
7 56 47 1.142857
8 64 0 1.000000
9 72 63 1.185115
10 80 63 1.066553
11 88 79 1.454545
12 96 0 1.000000
13 104 95 1.230769
14 112 95 1.142857
15 120 95 1.066667
16 128 0 1.000000
17 136 127 1.254863
18 144 127 1.185255
19 152 0 1.000000
20 160 127 1.066667Quoted 8 lines
21 168 0 1.000000
22 176 159 1.454334
23 184 0 1.000000
24 192 127 0.969744
25 200 191 1.280246
26 208 191 1.230921
27 216 0 1.000000
28 224 191 1.143118
Quoted 2 lines
Table is already in the code, why is it needed in the commit message too?
This is the original table I get from hardware guys. The table is not published anywhere else (not in errata docs) except in this patch. To optimize the code, the table is converted to an array in the patch.
I keep this original table here for two reasons:
1. It's an original table that can be tracked by any one in the future. If I don't list the original table here, others may wonder where I get the converted table from.
2. Reviewers may check if the converted table in the patch is correctly converted by comparing the converted table to the original table.
So I can keep this original table in the commit message, right? I will add more info why I keep it in the commit message.
Quoted 8 lines
Quoted 6 lines
If rmid > rmid threshold, MBM total and local values should be multipled by the correction factor.
The above table is modified for better code:
1. The threshold 0 is changed to rmid count - 1 so we don't do correctionWho is "we"?
I will not use "we".
Quoted 10 lines
Quoted 10 lines
for the case.
2. Correction factor is normalized to 2^20 for better performance by avoiding floating point and division calculation in corrected MBM values.Detailed information about the correction is described in erratum SKX99:
https://www.intel.com/content/www/us/en/processors/xeon/scalable/xeon-scalable-spec-update.html
and BDF102: https://www.intel.com/content/dam/www/public/us/en/documents/specification-updates/xeon-e5-v4-spec-update.pdf
Quoted 6 lines
Quoted 2 lines
The problem is described in details in "3.6 Intel MBM RMID Imbalance":
https://software.intel.com/content/www/us/en/develop/articles/intel-resource-director-technology-rdt-reference-manual.htmlI hear those URLs are awfully unstable. I'd suggested you upload the pdfs to bugzilla but the erratum text is short enough so that you can simply add it here.
Ok. I will describe the problem in the commit message.
Quoted 27 lines
Quoted 17 lines
Signed-off-by Fenghua Yu <[email protected]>Reviewed-by Tony Luck <[email protected]>---
Applied to tip:x86/cache.
arch/x86/kernel/cpu/resctrl/core.c | 4 ++ arch/x86/kernel/cpu/resctrl/internal.h | 1 + arch/x86/kernel/cpu/resctrl/monitor.c | 75 +++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 2 deletions(-)arch/x86/kernel/cpu/resctrl/core.c +0
-0arch/x86/kernel/cpu/resctrl/core.c static __init void __check_quirks_intel(void) · line 896
Quoted 4 lines
arch/x86/kernel/cpu/resctrl/core.c +1
-0@@ -893,6 +893,10 @@ static __init void __check_quirks_intel(void)set_rdt_options ("!cmt,!mbmtotal,!mbmlocal,!l3cat" ); else set_rdt_options("!l3cat"); + /* FALLTHROUGH */WARNING: Prefer 'fallthrough;' over fallthrough comment #89: FILE:
arch/x86/kernel/cpu/resctrl/core.c:896:
+ /* FALLTHROUGH */
Quoted 2 lines
Have you heard of checkpatch.pl?
Ok. Will fix the warning.
Quoted 23 lines
Quoted 4 lines
arch/x86/kernel/cpu/resctrl/core.c +3
-0+case INTEL_FAM6_BROADWELL_X : +intel_rdt_mbm_quirk (); +break ; }...
Quoted 16 lines
arch/x86/kernel/cpu/resctrl/monitor.c +1
-0@@ -18,6 +18,7 @@#include <linux/module.h> #include <linux/slab.h> #include <asm/cpu_device_id.h> +#include <asm/intel-family.h> #include "internal.h" struct rmid_entry {@@ -64,6 +65,61 @@ unsigned int rdt_mon_features;*/ unsigned int resctrl_cqm_threshold;
Quoted 6 lines
arch/x86/kernel/cpu/resctrl/monitor.c unsigned int rdt_mon_features; · line 71
Quoted 4 lines
arch/x86/kernel/cpu/resctrl/monitor.c +4
-0+#define CF (cf) ((unsigned long)(1048576 * (cf) + 0.5)) + +/* +* MBM total and local correction table indexed by CBO which is equal to "CBO" is?
CBO is Caching Agent. To make it more readable, I will change the words to "... indexed by core count which ...".
Quoted 12 lines
arch/x86/kernel/cpu/resctrl/monitor.c unsigned int rdt_mon_features; · line 80
Quoted 10 lines
arch/x86/kernel/cpu/resctrl/monitor.c +9
-0+* (x86_cache_max_rmid + 1) / 8 - 1 and is from 0 up to 27. +* The correction factor is normalized to 2^20 (1048576) so it's faster +* to calculate corrected value by shifting: +* corrected_value = (original_value * correction_factor) >> 20 +*/ +static struct mbm_creation_factor_table { +u32 rmidthreshold; +u64 cf; +} mbm_cf_table[] = {That array wants to be read-only right?
Ok. Will add "const" to the array.
Quoted 29 lines
Quoted 29 lines
arch/x86/kernel/cpu/resctrl/monitor.c +28
-0+ {7, CF(1.000000)}, + {15, CF(1.000000)}, + {15, CF(0.969650)}, + {31, CF(1.000000)}, + {31, CF(1.066667)}, + {31, CF(0.969650)}, + {47, CF(1.142857)}, + {63, CF(1.000000)}, + {63, CF(1.185115)}, + {63, CF(1.066553)}, + {79, CF(1.454545)}, + {95, CF(1.000000)}, + {95, CF(1.230769)}, + {95, CF(1.142857)}, + {95, CF(1.066667)}, + {127, CF(1.000000)}, + {127, CF(1.254863)}, + {127, CF(1.185255)}, + {151, CF(1.000000)}, + {127, CF(1.066667)}, + {167, CF(1.000000)}, + {159, CF(1.454334)}, + {183, CF(1.000000)}, + {127, CF(0.969744)}, + {191, CF(1.280246)}, + {191, CF(1.230921)}, + {215, CF(1.000000)}, + {191, CF(1.143118)},
Quoted 8 lines
arch/x86/kernel/cpu/resctrl/monitor.c unsigned int rdt_mon_features; · line 114
Quoted 6 lines
arch/x86/kernel/cpu/resctrl/monitor.c +6
-0+}; + +static u32 mbm_cf_rmidthreshold =UINT_MAX ; +static u64 mbm_cf; + +static inline u64 corrected_mbm_count (u32 rmid,unsigned long val)Function name needs a verb.
Will add a verb in the name.
Quoted 11 lines
Quoted 8 lines
arch/x86/kernel/cpu/resctrl/monitor.c +7
-0+{ +/* Correct MBM value. */ +if (rmid > mbm_cf_rmidthreshold) + val = (val * mbm_cf) >>20 ; + +return val; +}...
Quoted 8 lines
arch/x86/kernel/cpu/resctrl/monitor.c int rdt_get_mon_l3_config(struct rdt_resource *r) · line 705
Quoted 6 lines
arch/x86/kernel/cpu/resctrl/monitor.c +2
-0@@ -644,3 +701,17 @@ int rdt_get_mon_l3_config(struct rdt_resource *r)return 0 ; } + +void intel_rdt_mbm_quirk (void )Function name needs a verb.
Will add a verb in the name.
Quoted 15 lines
Quoted 4 lines
arch/x86/kernel/cpu/resctrl/monitor.c +2
-0+{ +int cf_index;arch/x86/kernel/cpu/resctrl/monitor.c int rdt_get_mon_l3_config(struct rdt_resource *r) · line 717
Quoted 10 lines
arch/x86/kernel/cpu/resctrl/monitor.c +10
-0+ + cf_index = (boot_cpu_data.x86_cache_max_rmid +1 ) /8 -1 ; +if (cf_index >=ARRAY_SIZE (mbm_cf_table)) { +pr_info ("No MBM correction factor available\n" ); +return ; + } + + mbm_cf_rmidthreshold = mbm_cf_table[cf_index].rmidthreshold; + mbm_cf = mbm_cf_table[cf_index].cf; +}
Thank you very much for your review!
-Fenghua
Borislav Petkov
maintainerQuoted 4 lines · Fenghua Yu
I keep this original table here for two reasons:
1. It's an original table that can be tracked by any one in the future. If I don't list the original table here, others may wonder where I get the converted table from.
If you wanna document it then put that table inDocumentation/x86/resctrl_ui.rst.
Before you put it there, you can rename that file to
Documentation/x86/resctrl.rst
because after that change, it won't contain UI documentation only anymore.
Commit messages tend to become hard to dig out in the future, when a lot of patches accumulate ontop. Even more so if someone renames files so if you really need to document something, you can either put it a comment over the code where it is used, or if it is something bigger as this table, you can put it in Documentation/ and refer to it in the code.
Quoted 1 line
Ok. I will describe the problem in the commit message.
Just paste the erratum text. That's it - it is small enough.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteHi, Boris,
Quoted 13 lines · Borislav Petkov
Quoted 4 lines · Fenghua Yu
I keep this original table here for two reasons:
1. It's an original table that can be tracked by any one in the future. If I don't list the original table here, others may wonder where I get the converted table from.If you wanna document it then put that table in
Documentation/x86/resctrl_ui.rst.Before you put it there, you can rename that file to
Documentation/x86/resctrl.rst
Quoted 8 lines
because after that change, it won't contain UI documentation only anymore.
Commit messages tend to become hard to dig out in the future, when a lot of patches accumulate ontop. Even more so if someone renames files so if you really need to document something, you can either put it a comment over the code where it is used, or if it is something bigger as this table, you can put it in
Documentation/and refer to it in the code.
Sure. I will put the correction table in resctrl.rst.
Quoted 4 lines
Quoted 2 lines
Ok. I will describe the problem in the commit message.
Just paste the erratum text. That's it - it is small enough.
Sure. I will do that.
Thank you very much for your review!
-Fenghua