x86/cpu changes for v4.12
Subsystems (5)
Linus,
Please pull the latest x86-cpu-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus
# HEAD: 4797b7dfdfcf457075c36743d71e2b0feeaaa20f x86/intel_rdt: Return error for incorrect resource names in schemata
The biggest changes are an extension of the Intel RDT code to extend it with Intel Memory Bandwidth Allocation CPU support: MBA allows bandwidth allocation between cores, while CBM (already upstream) allows CPU cache partitioning.
There's also misc smaller fixes and updates.
Thanks,
Ingo
------------------>
Andy Shevchenko (1):
x86/cpu: Keep model defines sorted by model number
Jiri Olsa (1):
x86/intel_rdt: Add cpus_list rdtgroup file
Mathias Krause (2):
x86/cpu: Drop unneded members of struct cpuinfo_x86 x86/cpu: Drop wp_works_ok member of struct cpuinfo_x86
Thomas Gleixner (6):
x86/intel_rdt: Cleanup kernel-doc x86/intel_rdt: Init padding only if a device exists x86/intel_rdt: Organize code properly x86/intel_rdt: Move CBM specific data into a struct x86/intel_rdt: Add resource specific msr update function x86/intel_rdt: Get rid of anon union
Tony Luck (1):
x86/intel_rdt: Implement "update" mode when writing schemata file
Vikas Shivappa (12):
x86/intel_rdt: Update schemata read to show data in tabular format Documentation, x86: Intel Memory bandwidth allocation x86/intel_rdt: Cleanup namespace to support multiple resource types x86/intel_rdt/mba: Memory bandwith allocation feature detect x86/intel_rdt/mba: Add primary support for Memory Bandwidth Allocation (MBA) x86/intel_rdt: Make information files resource specific x86/intel_rdt/mba: Add info directory files for Memory Bandwidth Allocation x86/intel_rdt: Make schemata file parsers resource specific x86/intel_rdt/mba: Add schemata file support for MBA x86/intel_rdt: Fix padding when resource is enabled via mount x86/intel_rdt: Trim whitespace while parsing schemata input x86/intel_rdt: Return error for incorrect resource names in schemata
Documentation/x86/intel_rdt_ui.txt | 124 +++++++++-- arch/x86/include/asm/cpufeatures.h | 2 + arch/x86/include/asm/intel-family.h | 6 +- arch/x86/include/asm/intel_rdt.h | 157 +++++++++----- arch/x86/include/asm/processor.h | 11 +- arch/x86/kernel/cpu/intel_rdt.c | 350 ++++++++++++++++++++++--------- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 125 +++++++++-- arch/x86/kernel/cpu/intel_rdt_schemata.c | 181 +++++++++------- arch/x86/kernel/cpu/proc.c | 5 +- arch/x86/kernel/cpu/scattered.c | 1 + arch/x86/kernel/setup.c | 11 +- arch/x86/mm/init_32.c | 9 +- arch/x86/xen/enlighten.c | 1 - 13 files changed, 707 insertions(+), 276 deletions(-)
Documentation/x86/intel_rdt_ui.txt +104 -20
@@ -4,6 +4,7 @@ Copyright (C) 2016 Intel Corporation Fenghua Yu <[email protected]> Tony Luck <[email protected]> +Vikas Shivappa <[email protected]> This feature is enabled by the CONFIG_INTEL_RDT_A Kconfig and the X86 /proc/cpuinfo flag bits "rdt", "cat_l3" and "cdp_l3".
@@ -22,19 +23,34 @@ Info directory The 'info' directory contains information about the enabled resources. Each resource has its own subdirectory. The subdirectory -names reflect the resource names. Each subdirectory contains the -following files: +names reflect the resource names. +Cache resource(L3/L2) subdirectory contains the following files: -"num_closids": The number of CLOSIDs which are valid for this - resource. The kernel uses the smallest number of - CLOSIDs of all enabled resources as limit. +"num_closids": The number of CLOSIDs which are valid for this + resource. The kernel uses the smallest number of + CLOSIDs of all enabled resources as limit. -"cbm_mask": The bitmask which is valid for this resource. This - mask is equivalent to 100%. +"cbm_mask": The bitmask which is valid for this resource. + This mask is equivalent to 100%. -"min_cbm_bits": The minimum number of consecutive bits which must be - set when writing a mask. +"min_cbm_bits": The minimum number of consecutive bits which + must be set when writing a mask. +Memory bandwitdh(MB) subdirectory contains the following files: + +"min_bandwidth": The minimum memory bandwidth percentage which + user can request. + +"bandwidth_gran": The granularity in which the memory bandwidth + percentage is allocated. The allocated + b/w percentage is rounded off to the next + control step available on the hardware. The + available bandwidth control steps are: + min_bandwidth + N * bandwidth_gran. + +"delay_linear": Indicates if the delay scale is linear or + non-linear. This field is purely informational + only. Resource groups ---------------
@@ -59,6 +75,9 @@ command, and removed using "rmdir(1)". given to the default (root) group. You cannot remove CPUs from the default group. +"cpus_list": One or more CPU ranges of logical CPUs assigned to this + group. Same rules apply like for the "cpus" file. + "schemata": A list of all the resources available to this group. Each resource has its own line and format - see below for details.
@@ -107,6 +126,22 @@ and 0xA are not. On a system with a 20-bit mask each bit represents 5% of the capacity of the cache. You could partition the cache into four equal parts with masks: 0x1f, 0x3e0, 0x7c00, 0xf8000. +Memory bandwidth(b/w) percentage +-------------------------------- +For Memory b/w resource, user controls the resource by indicating the +percentage of total memory b/w. + +The minimum bandwidth percentage value for each cpu model is predefined +and can be looked up through "info/MB/min_bandwidth". The bandwidth +granularity that is allocated is also dependent on the cpu model and can +be looked up at "info/MB/bandwidth_gran". The available bandwidth +control steps are: min_bw + N * bw_gran. Intermediate values are rounded +to the next control step available on the hardware. + +The bandwidth throttling is a core specific mechanism on some of Intel +SKUs. Using a high bandwidth and a low bandwidth setting on two threads +sharing a core will result in both threads being throttled to use the +low bandwidth. L3 details (code and data prioritization disabled) --------------------------------------------------
@@ -129,16 +164,38 @@ L2 cache does not support code and data prioritization, so the L2:<cache_id0>=<cbm>;<cache_id1>=<cbm>;... +Memory b/w Allocation details +----------------------------- + +Memory b/w domain is L3 cache. + + MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;... + +Reading/writing the schemata file +--------------------------------- +Reading the schemata file will show the state of all resources +on all domains. When writing you only need to specify those values +which you wish to change. E.g. + +# cat schemata +L3DATA:0=fffff;1=fffff;2=fffff;3=fffff +L3CODE:0=fffff;1=fffff;2=fffff;3=fffff +# echo "L3DATA:2=3c0;" > schemata +# cat schemata +L3DATA:0=fffff;1=fffff;2=3c0;3=fffff +L3CODE:0=fffff;1=fffff;2=fffff;3=fffff + Example 1 --------- On a two socket machine (one L3 cache per socket) with just four bits -for cache bit masks +for cache bit masks, minimum b/w of 10% with a memory bandwidth +granularity of 10% # mount -t resctrl resctrl /sys/fs/resctrl # cd /sys/fs/resctrl # mkdir p0 p1 -# echo "L3:0=3;1=c" > /sys/fs/resctrl/p0/schemata -# echo "L3:0=3;1=3" > /sys/fs/resctrl/p1/schemata +# echo "L3:0=3;1=c\nMB:0=50;1=50" > /sys/fs/resctrl/p0/schemata +# echo "L3:0=3;1=3\nMB:0=50;1=50" > /sys/fs/resctrl/p1/schemata The default resource group is unmodified, so we have access to all parts of all caches (its schemata file reads "L3:0=f;1=f").
@@ -147,6 +204,14 @@ Tasks that are under the control of group "p0" may only allocate from the "lower" 50% on cache ID 0, and the "upper" 50% of cache ID 1. Tasks in group "p1" use the "lower" 50% of cache on both sockets. +Similarly, tasks that are under the control of group "p0" may use a +maximum memory b/w of 50% on socket0 and 50% on socket 1. +Tasks in group "p1" may also use 50% memory b/w on both sockets. +Note that unlike cache masks, memory b/w cannot specify whether these +allocations can overlap or not. The allocations specifies the maximum +b/w that the group may be able to use and the system admin can configure +the b/w accordingly. + Example 2 --------- Again two sockets, but this time with a more realistic 20-bit mask.
@@ -160,9 +225,10 @@ of L3 cache on socket 0. # cd /sys/fs/resctrl First we reset the schemata for the default group so that the "upper" -50% of the L3 cache on socket 0 cannot be used by ordinary tasks: +50% of the L3 cache on socket 0 and 50% of memory b/w cannot be used by +ordinary tasks: -# echo "L3:0=3ff;1=fffff" > schemata +# echo "L3:0=3ff;1=fffff\nMB:0=50;1=100" > schemata Next we make a resource group for our first real time task and give it access to the "top" 25% of the cache on socket 0.
@@ -185,6 +251,20 @@ processors tasks run on. # echo 5678 > p1/tasks # taskset -cp 2 5678 +For the same 2 socket system with memory b/w resource and CAT L3 the +schemata would look like(Assume min_bandwidth 10 and bandwidth_gran is +10): + +For our first real time task this would request 20% memory b/w on socket +0. + +# echo -e "L3:0=f8000;1=fffff\nMB:0=20;1=100" > p0/schemata + +For our second real time task this would request an other 20% memory b/w +on socket 0. + +# echo -e "L3:0=f8000;1=fffff\nMB:0=20;1=100" > p0/schemata + Example 3 ---------
@@ -198,18 +278,22 @@ the tasks. # cd /sys/fs/resctrl First we reset the schemata for the default group so that the "upper" -50% of the L3 cache on socket 0 cannot be used by ordinary tasks: +50% of the L3 cache on socket 0, and 50% of memory bandwidth on socket 0 +cannot be used by ordinary tasks: -# echo "L3:0=3ff" > schemata +# echo "L3:0=3ff\nMB:0=50" > schemata -Next we make a resource group for our real time cores and give -it access to the "top" 50% of the cache on socket 0. +Next we make a resource group for our real time cores and give it access +to the "top" 50% of the cache on socket 0 and 50% of memory bandwidth on +socket 0. # mkdir p0 -# echo "L3:0=ffc00;" > p0/schemata +# echo "L3:0=ffc00\nMB:0=50" > p0/schemata Finally we move core 4-7 over to the new group and make sure that the -kernel and the tasks running there get 50% of the cache. +kernel and the tasks running there get 50% of the cache. They should +also get 50% of memory bandwidth assuming that the cores 4-7 are SMT +siblings and only the real time threads are scheduled on the cores 4-7. # echo C0 > p0/cpus
arch/x86/include/asm/cpufeatures.h +2 -0
@@ -201,6 +201,8 @@#define X86_FEATURE_AVX512_4VNNIW (7*32+16)/* AVX-512 Neural Network Instructions */ #define X86_FEATURE_AVX512_4FMAPS (7*32+17)/* AVX-512 Multiply Accumulation Single precision */ +#define X86_FEATURE_MBA ( 7*32+18)/* Memory Bandwidth Allocation */ +/* Virtualization flags: Linux defined, word 8 */ #define X86_FEATURE_TPR_SHADOW ( 8*32+ 0)/* Intel TPR Shadow */ #define X86_FEATURE_VNMI ( 8*32+ 1)/* Intel Virtual NMI */
arch/x86/include/asm/intel-family.h +4 -2
@@ -12,6 +12,7 @@*/ #define INTEL_FAM6_CORE_YONAH 0x0E +#define INTEL_FAM6_CORE2_MEROM 0x0F#define INTEL_FAM6_CORE2_MEROM_L 0x16#define INTEL_FAM6_CORE2_PENRYN 0x17
@@ -21,6 +22,7 @@#define INTEL_FAM6_NEHALEM_G 0x1F/* Auburndale / Havendale */ #define INTEL_FAM6_NEHALEM_EP 0x1A#define INTEL_FAM6_NEHALEM_EX 0x2E +#define INTEL_FAM6_WESTMERE 0x25#define INTEL_FAM6_WESTMERE_EP 0x2C#define INTEL_FAM6_WESTMERE_EX 0x2F
@@ -36,9 +38,9 @@#define INTEL_FAM6_HASWELL_GT3E 0x46#define INTEL_FAM6_BROADWELL_CORE 0x3D -#define INTEL_FAM6_BROADWELL_XEON_D 0x56#define INTEL_FAM6_BROADWELL_GT3E 0x47#define INTEL_FAM6_BROADWELL_X 0x4F +#define INTEL_FAM6_BROADWELL_XEON_D 0x56#define INTEL_FAM6_SKYLAKE_MOBILE 0x4E#define INTEL_FAM6_SKYLAKE_DESKTOP 0x5E
@@ -59,8 +61,8 @@#define INTEL_FAM6_ATOM_MERRIFIELD 0x4A/* Tangier */ #define INTEL_FAM6_ATOM_MOOREFIELD 0x5A/* Anniedale */ #define INTEL_FAM6_ATOM_GOLDMONT 0x5C -#define INTEL_FAM6_ATOM_GEMINI_LAKE 0x7A#define INTEL_FAM6_ATOM_DENVERTON 0x5F/* Goldmont Microserver */ +#define INTEL_FAM6_ATOM_GEMINI_LAKE 0x7A/* Xeon Phi */
arch/x86/include/asm/intel_rdt.h +109 -48
226 lines not on this page · raw message
arch/x86/include/asm/processor.h +2 -9
@@ -80,7 +80,7 @@ extern u16 __read_mostly tlb_lld_1g[NR_INFO];/* * CPU type and hardware bug flags. Kept separately for each CPU. -* Members of this structure are referenced in head.S, so think twice +* Members of this structure are referenced in head_32.S, so think twice * before touching them. [mj] */
@@ -89,14 +89,7 @@ struct cpuinfo_x86 {__u8 x86_vendor;/* CPU vendor */ __u8 x86_model;__u8 x86_mask; -#ifdef CONFIG_X86_32 -char wp_works_ok;/* It doesn't on 386's */ - -/* Problems on some 486Dx4's and old 386's: */ -char rfu; -char pad0; -char pad1; -#else +#ifdef CONFIG_X86_64 /* Number of 4K pages in DTLB/ITLB combined(in pages): */ int x86_tlbsize;#endif
arch/x86/kernel/cpu/intel_rdt.c +256 -94
461 lines not on this page · raw message
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +107 -18
222 lines not on this page · raw message
arch/x86/kernel/cpu/intel_rdt_schemata.c +111 -70
285 lines not on this page · raw message
arch/x86/kernel/cpu/proc.c +2 -3
@@ -31,14 +31,13 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)"fpu\t\t: %s\n" "fpu_exception\t: %s\n" "cpuid level\t: %d\n" -"wp\t\t: %s\n" , +"wp\t\t: yes\n" ,static_cpu_has_bug (X86_BUG_FDIV ) ?"yes" :"no" ,static_cpu_has_bug (X86_BUG_F00F ) ?"yes" :"no" ,static_cpu_has_bug (X86_BUG_COMA ) ?"yes" :"no" ,static_cpu_has (X86_FEATURE_FPU ) ?"yes" :"no" ,static_cpu_has (X86_FEATURE_FPU ) ?"yes" :"no" , - c->cpuid_level, - c->wp_works_ok ? "yes" : "no"); + c->cpuid_level); }#else static void show_cpuinfo_misc (struct seq_file *m,struct cpuinfo_x86 *c)
arch/x86/kernel/cpu/scattered.c +1 -0
@@ -27,6 +27,7 @@ static const struct cpuid_bit cpuid_bits[] = { { X86_FEATURE_CAT_L3, CPUID_EBX, 1, 0x00000010, 0 }, { X86_FEATURE_CAT_L2, CPUID_EBX, 2, 0x00000010, 0 }, { X86_FEATURE_CDP_L3, CPUID_ECX, 2, 0x00000010, 1 }, + { X86_FEATURE_MBA, CPUID_EBX, 3, 0x00000010, 0 }, { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 }, { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 },
arch/x86/kernel/setup.c +4 -7
@@ -173,14 +173,11 @@ static struct resource bss_resource = {#ifdef CONFIG_X86_32 -/* cpu data as detected by the assembly code in head.S */ -struct cpuinfo_x86 new_cpu_data = { - .wp_works_ok =-1 , -}; +/* cpu data as detected by the assembly code in head_32.S */ +struct cpuinfo_x86 new_cpu_data; +/* common cpu data for all cpus */ -struct cpuinfo_x86 boot_cpu_data__read_mostly = { - .wp_works_ok =-1 , -}; +struct cpuinfo_x86 boot_cpu_data__read_mostly ;EXPORT_SYMBOL (boot_cpu_data);unsigned int def_to_bigsmp;
arch/x86/mm/init_32.c +5 -4
@@ -716,15 +716,17 @@ void __init paging_init(void)*/ static void __init test_wp_bit (void ) { +int wp_works_ok; +printk (KERN_INFO "Checking if this processor honours the WP bit even in supervisor mode..." );/* Any page-aligned address will do, the test is non-destructive */ __set_fixmap (FIX_WP_TEST ,__pa (&swapper_pg_dir),PAGE_KERNEL_RO ); - boot_cpu_data.wp_works_ok =do_test_wp_bit (); + wp_works_ok =do_test_wp_bit ();clear_fixmap (FIX_WP_TEST ); -if (!boot_cpu_data.wp_works_ok) { +if (!wp_works_ok) {printk (KERN_CONT "No.\n" );panic ("Linux doesn't support CPUs with broken WP." ); }else {
@@ -811,8 +813,7 @@ void __init mem_init(void)BUG_ON (VMALLOC_START >=VMALLOC_END );BUG_ON ((unsigned long )high_memory >VMALLOC_START ); -if (boot_cpu_data.wp_works_ok <0 ) -test_wp_bit (); +test_wp_bit (); }#ifdef CONFIG_MEMORY_HOTPLUG
arch/x86/xen/enlighten.c +0 -1
@@ -1595,7 +1595,6 @@ asmlinkage __visible void __init xen_start_kernel(void)/* set up basic CPUID stuff */ cpu_detect (&new_cpu_data);set_cpu_cap (&new_cpu_data,X86_FEATURE_FPU ); - new_cpu_data.wp_works_ok =1 ; new_cpu_data.x86_capability[CPUID_1_EDX ] =cpuid_edx (1 );#endif