x86/resctrl: Support wider MBM counters
Subsystems (2)
Reinette Chatre
maintainerv2 cover x86/resctrl: Support wider MBM counters
V1 submission available from:
https://lore.kernel.org/lkml/[email protected]
Changes since V1:
- Add four new preparatory patches to this series to eliminate the unnecessary reading of monitoring properties from every CPU (reading from one CPU is sufficient) and remove some unnecessary existing code:
- Rename resctrl_sched.h to resctrl.h because it will no longer be dedicated to work done during scheduling.(Borislav)
- Move functions reading the monitoring properties via CPUID to resctrl subsystem, continue calling them from common CPU code.(Borislav)
- Read monitoring CPU properties once, no longer from every CPU.(Borislav)
- Remove unnecessary sanity checks on properties read from CPU.(Borislav)
- Split (1) obtaining the new enumerable MBM counter width from the system and (2) using it within resctrl into two patches.
Below is from V1 submission:
Memory Bandwidth Monitoring (MBM) is an Intel Resource Director Technology (RDT) feature that tracks Total and Local bandwidth generated which misses the L3 cache.
The original Memory Bandwidth Monitoring (MBM) architectural definition defines counters of up to 62 bits and the first-generation MBM implementation uses 24 bit counters. Software is required to poll at 1 second or faster to ensure that data is retrieved before a counter rollover occurs more than once under worst conditions.
As system bandwidths scale the software requirement is maintained with the introduction of a per-resource enumerable MBM counter width.
This series adds support for the new enumerable MBM counter width.
Details about the feature can be found in Chapter 9 of the most recent Intel ISE available from
https://software.intel.com/sites/default/files/managed/c5/15/architecture-instruction-set-extensions-programming-reference.pdf
Reinette Chatre (7):
x86/resctrl: Rename asm/resctrl_sched.h to asm/resctrl.h x86/cpu: Move resctrl CPUID code to resctrl x86/resctrl: Remove unnecessary RMID checks x86/resctrl: Query LLC monitoring properties once during boot x86/resctrl: Maintain MBM counter width per resource x86/resctrl: Support CPUID enumeration of MBM counter width x86/resctrl: Support wider MBM counters
MAINTAINERS | 2 +-
arch/x86/include/asm/processor.h | 3 +-
.../asm/{resctrl_sched.h => resctrl.h} | 9 +++--
arch/x86/kernel/cpu/amd.c | 3 ++
arch/x86/kernel/cpu/common.c | 40 -------------------
arch/x86/kernel/cpu/intel.c | 7 ++++
arch/x86/kernel/cpu/resctrl/core.c | 32 ++++++++++++++-
arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 8 ++--
arch/x86/kernel/cpu/resctrl/internal.h | 15 +++++--
arch/x86/kernel/cpu/resctrl/monitor.c | 27 +++++++++----
arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +-
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +-
arch/x86/kernel/process_32.c | 2 +-
arch/x86/kernel/process_64.c | 2 +-
14 files changed, 91 insertions(+), 65 deletions(-)
rename arch/x86/include/asm/{resctrl_sched.h => resctrl.h} (92%)Signature · 1 line
2.21.0
Reinette Chatre
maintainerPATCH v2 1/7 x86/resctrl: Rename asm/resctrl_sched.h to asm/resctrl.h
asm/resctrl_sched.h is dedicated to the code used for configuration of the CPU resource control state when a task is scheduled.
Rename resctrl_sched.h to resctrl.h in preparation of additions that will no longer make this file dedicated to work done during scheduling.
No functional change.
---
MAINTAINERS | 2 +-
arch/x86/include/asm/{resctrl_sched.h => resctrl.h} | 6 +++---
arch/x86/kernel/cpu/resctrl/core.c | 2 +-
arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +-
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +-
arch/x86/kernel/process_32.c | 2 +-
arch/x86/kernel/process_64.c | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
rename arch/x86/include/asm/{resctrl_sched.h => resctrl.h} (96%)MAINTAINERS +1 -1
@@ -14227,7 +14227,7 @@ M: Reinette Chatre <[email protected]> L: [email protected] S: Supported F: Documentation/x86/resctrl* -F: arch/x86/include/asm/resctrl_sched.h +F: arch/x86/include/asm/resctrl.h F: arch/x86/kernel/cpu/resctrl/ F: tools/testing/selftests/resctrl/
arch/x86/include/asm/resctrl.h renamed from arch/x86/include/asm/resctrl_sched.h +3 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_RESCTRL_SCHED_H -#define _ASM_X86_RESCTRL_SCHED_H +#ifndef _ASM_X86_RESCTRL_H +#define _ASM_X86_RESCTRL_H#ifdef CONFIG_X86_CPU_RESCTRL
@@ -90,4 +90,4 @@ static inline void resctrl_sched_in(void) {}#endif /* CONFIG_X86_CPU_RESCTRL */ -#endif /* _ASM_X86_RESCTRL_SCHED_H */ +#endif /* _ASM_X86_RESCTRL_H */
arch/x86/kernel/cpu/resctrl/core.c +1 -1
@@ -22,7 +22,7 @@#include <linux/cpuhotplug.h> #include <asm/intel-family.h> -#include <asm/resctrl_sched.h> +#include <asm/resctrl.h> #include "internal.h" /* Mutex to protect rdtgroup access. */
arch/x86/kernel/cpu/resctrl/pseudo_lock.c +1 -1
@@ -24,7 +24,7 @@#include <asm/cacheflush.h> #include <asm/intel-family.h> -#include <asm/resctrl_sched.h> +#include <asm/resctrl.h> #include <asm/perf_event.h> #include "../../events/perf_event.h" /* For X86_CONFIG() */
arch/x86/kernel/cpu/resctrl/rdtgroup.c +1 -1
@@ -29,7 +29,7 @@#include <uapi/linux/magic.h> -#include <asm/resctrl_sched.h> +#include <asm/resctrl.h> #include "internal.h" DEFINE_STATIC_KEY_FALSE (rdt_enable_key);
arch/x86/kernel/process_32.c +1 -1
@@ -52,7 +52,7 @@#include <asm/debugreg.h> #include <asm/switch_to.h> #include <asm/vm86.h> -#include <asm/resctrl_sched.h> +#include <asm/resctrl.h> #include <asm/proto.h> #include "process.h"
arch/x86/kernel/process_64.c +1 -1
@@ -52,7 +52,7 @@#include <asm/switch_to.h> #include <asm/xen/hypervisor.h> #include <asm/vdso.h> -#include <asm/resctrl_sched.h> +#include <asm/resctrl.h> #include <asm/unistd.h> #include <asm/fsgsbase.h> #ifdef CONFIG_IA32_EMULATION
Signature · 1 line
2.21.0
Reinette Chatre
maintainerPATCH v2 2/7 x86/cpu: Move resctrl CPUID code to resctrl
In reply to Reinette ChatreThe function determining a platform's support and properties of cache occupancy and memory bandwidth monitoring (properties of X86_FEATURE_CQM_LLC) can be found among the common CPU code. After the feature's properties is populated in the per-CPU data the resctrl subsystem is the only consumer (via boot_cpu_data).
Move the function that obtains the CPU information used by resctrl to the resctrl subsystem and rename it from init_cqm() to resctrl_cpu_detect(). The function continues to be called from the common CPU code. This move is done in preparation of the addition of some vendor specific code.
No functional change.
--- arch/x86/include/asm/resctrl.h | 3 +++ arch/x86/kernel/cpu/common.c | 27 ++------------------------- arch/x86/kernel/cpu/resctrl/core.c | 24 ++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 25 deletions(-)
arch/x86/include/asm/resctrl.h +3 -0
@@ -84,9 +84,12 @@ static inline void resctrl_sched_in(void) __resctrl_sched_in(); } +void resctrl_cpu_detect (struct cpuinfo_x86 *c); +#else static inline void resctrl_sched_in (void ) {} +static inline void resctrl_cpu_detect (struct cpuinfo_x86 *c) {}#endif /* CONFIG_X86_CPU_RESCTRL */
arch/x86/kernel/cpu/common.c +2 -25
@@ -56,6 +56,7 @@#include <asm/intel-family.h> #include <asm/cpu_device_id.h> #include <asm/uv/uv.h> +#include <asm/resctrl.h> #include "cpu.h"
@@ -854,30 +855,6 @@ static void init_speculation_control(struct cpuinfo_x86 *c) } } -static void init_cqm (struct cpuinfo_x86 *c) -{ -if (!cpu_has (c,X86_FEATURE_CQM_LLC )) { - c->x86_cache_max_rmid =-1 ; - c->x86_cache_occ_scale =-1 ; -return ; - } - -/* will be overridden if occupancy monitoring exists */ - c->x86_cache_max_rmid =cpuid_ebx (0xf ); - -if (cpu_has (c,X86_FEATURE_CQM_OCCUP_LLC ) || -cpu_has (c,X86_FEATURE_CQM_MBM_TOTAL ) || -cpu_has (c,X86_FEATURE_CQM_MBM_LOCAL )) { -u32 eax, ebx, ecx, edx; - -/* QoS sub-leaf, EAX=0Fh, ECX=1 */ -cpuid_count (0xf ,1 , &eax, &ebx, &ecx, &edx); - - c->x86_cache_max_rmid = ecx; - c->x86_cache_occ_scale = ebx; - } -} -void get_cpu_cap (struct cpuinfo_x86 *c) {u32 eax, ebx, ecx, edx;
@@ -945,7 +922,7 @@ void get_cpu_cap(struct cpuinfo_x86 *c)init_scattered_cpuid_features (c);init_speculation_control (c); -init_cqm (c); +resctrl_cpu_detect (c);/* * Clear/Set all flags overridden by options, after probe.
arch/x86/kernel/cpu/resctrl/core.c +24 -0
@@ -958,6 +958,30 @@ static __init void rdt_init_res_defs(void)static enum cpuhp_state rdt_online; +void resctrl_cpu_detect (struct cpuinfo_x86 *c) +{ +if (!cpu_has (c,X86_FEATURE_CQM_LLC )) { + c->x86_cache_max_rmid =-1 ; + c->x86_cache_occ_scale =-1 ; +return ; + } + +/* will be overridden if occupancy monitoring exists */ + c->x86_cache_max_rmid =cpuid_ebx (0xf ); + +if (cpu_has (c,X86_FEATURE_CQM_OCCUP_LLC ) || +cpu_has (c,X86_FEATURE_CQM_MBM_TOTAL ) || +cpu_has (c,X86_FEATURE_CQM_MBM_LOCAL )) { +u32 eax, ebx, ecx, edx; + +/* QoS sub-leaf, EAX=0Fh, ECX=1 */ +cpuid_count (0xf ,1 , &eax, &ebx, &ecx, &edx); + + c->x86_cache_max_rmid = ecx; + c->x86_cache_occ_scale = ebx; + } +} +static int __init resctrl_late_init (void ) {struct rdt_resource *r;
Signature · 1 line
2.21.0
Reinette Chatre
maintainerPATCH v2 3/7 x86/resctrl: Remove unnecessary RMID checks
In reply to Reinette ChatreThe cache and memory bandwidth monitoring properties are read using CPUID on every CPU. After the information is read from the system a sanity check is run to (1) ensure that the RMID data is initialized for the boot CPU in case the information was not available on the boot CPU and (2) the boot CPU's RMID is set to the minimum of RMID obtained from all CPUs.
Every known platform that supports resctrl has the same maximum RMID on all CPUs. Both sanity checks found in x86_init_cache_qos() can thus safely be removed.
--- arch/x86/kernel/cpu/common.c | 15 --------------- 1 file changed, 15 deletions(-)
arch/x86/kernel/cpu/common.c +0 -15
@@ -1354,20 +1354,6 @@ static void generic_identify(struct cpuinfo_x86 *c)#endif } -static void x86_init_cache_qos (struct cpuinfo_x86 *c) -{ -/* -* The heavy lifting of max_rmid and cache_occ_scale are handled -* in get_cpu_cap(). Here we just set the max_rmid for the boot_cpu -* in case CQM bits really aren't there in this CPU. -*/ -if (c != &boot_cpu_data) { - boot_cpu_data.x86_cache_max_rmid = -min (boot_cpu_data.x86_cache_max_rmid, - c->x86_cache_max_rmid); - } -} -/* * Validate that ACPI/mptables have the same information about the * effective APIC id and update the package map.
@@ -1480,7 +1466,6 @@ static void identify_cpu(struct cpuinfo_x86 *c)#endif x86_init_rdrand (c); -x86_init_cache_qos (c);setup_pku (c);/*
Signature · 1 line
2.21.0
Reinette Chatre
maintainerPATCH v2 6/7 x86/resctrl: Support CPUID enumeration of MBM counter width
In reply to Reinette ChatreThe original Memory Bandwidth Monitoring (MBM) architectural definition defines counters of up to 62 bits in the IA32_QM_CTR MSR while the first-generation MBM implementation uses statically defined 24 bit counters.
Expand the MBM CPUID enumeration properties to include the MBM counter width. The previously undefined EAX output register contains, in bits [7:0], the MBM counter width encoded as an offset from 24 bits. Enumerating this property is only specified for Intel CPUs.
--- arch/x86/include/asm/processor.h | 3 ++- arch/x86/kernel/cpu/resctrl/core.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-)
arch/x86/include/asm/processor.h +2 -1
@@ -113,9 +113,10 @@ struct cpuinfo_x86 {/* in KB - valid for CPUS which support this call: */ unsigned int x86_cache_size;int x86_cache_alignment;/* In bytes */ -/* Cache QoS architectural values: */ +/* Cache QoS architectural values, valid only on the BSP: */ int x86_cache_max_rmid;/* max index */ int x86_cache_occ_scale;/* scale to bytes */ +int x86_cache_mbm_width_offset;int x86_power;unsigned long loops_per_jiffy;/* cpuid returned max cores value: */
arch/x86/kernel/cpu/resctrl/core.c +5 -0
@@ -964,6 +964,7 @@ void resctrl_cpu_detect(struct cpuinfo_x86 *c)if (!cpu_has (c,X86_FEATURE_CQM_LLC )) { c->x86_cache_max_rmid =-1 ; c->x86_cache_occ_scale =-1 ; + c->x86_cache_mbm_width_offset =-1 ;return ; }
@@ -980,6 +981,10 @@ void resctrl_cpu_detect(struct cpuinfo_x86 *c) c->x86_cache_max_rmid = ecx; c->x86_cache_occ_scale = ebx; +if (c->x86_vendor ==X86_VENDOR_INTEL ) + c->x86_cache_mbm_width_offset = eax &0xff ; +else + c->x86_cache_mbm_width_offset =-1 ; } }
Signature · 1 line
2.21.0
Reinette Chatre
maintainerPATCH v2 7/7 x86/resctrl: Support wider MBM counters
In reply to Reinette ChatreThe original Memory Bandwidth Monitoring (MBM) architectural definition defines counters of up to 62 bits in the IA32_QM_CTR MSR while the first-generation MBM implementation uses statically defined 24 bit counters.
The MBM CPUID enumeration properties have been expanded to include the MBM counter width, encoded as an offset from 24 bits.
While eight bits are available for the counter width offset IA32_QM_CTR MSR only supports 62 bit counters. A sanity check, with warning printed when encountered, is added to ensure counters cannot exceed the 62 bit limit.
--- arch/x86/kernel/cpu/resctrl/internal.h | 8 +++++++- arch/x86/kernel/cpu/resctrl/monitor.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/resctrl/internal.h +7 -1
@@ -31,7 +31,7 @@#define CQM_LIMBOCHECK_INTERVAL 1000 -#define MBM_CNTR_WIDTH 24 +#define MBM_CNTR_WIDTH_BASE 24#define MBM_OVERFLOW_INTERVAL 1000#define MAX_MBA_BW 100u#define MBA_IS_LINEAR 0x4
@@ -40,6 +40,12 @@#define RMID_VAL_ERROR BIT_ULL(63)#define RMID_VAL_UNAVAIL BIT_ULL(62) +/* +* With the above fields in use 62 bits remain in MSR_IA32_QM_CTR for +* data to be returned. The counter width is discovered from the hardware +* as an offset from MBM_CNTR_WIDTH_BASE. +*/ +#define MBM_CNTR_WIDTH_OFFSET_MAX (62 - MBM_CNTR_WIDTH_BASE)struct rdt_fs_context {
arch/x86/kernel/cpu/resctrl/monitor.c +7 -1
@@ -618,12 +618,18 @@ static void l3_mon_evt_init(struct rdt_resource *r)int rdt_get_mon_l3_config (struct rdt_resource *r) { +unsigned int mbm_offset = boot_cpu_data.x86_cache_mbm_width_offset;unsigned int cl_size = boot_cpu_data.x86_cache_size;int ret; r->mon_scale = boot_cpu_data.x86_cache_occ_scale; r->num_rmid = boot_cpu_data.x86_cache_max_rmid +1 ; - r->mbm_width =MBM_CNTR_WIDTH ; + r->mbm_width =MBM_CNTR_WIDTH_BASE ; + +if (mbm_offset >0 && mbm_offset <=MBM_CNTR_WIDTH_OFFSET_MAX ) + r->mbm_width += mbm_offset; +else if (mbm_offset >MBM_CNTR_WIDTH_OFFSET_MAX ) +pr_warn ("Ignoring impossible MBM counter offset\n" );/* * A reasonable upper limit on the max threshold is the number
Signature · 1 line
2.21.0
Reinette Chatre
maintainerPATCH v2 5/7 x86/resctrl: Maintain MBM counter width per resource
In reply to Reinette ChatreThe original Memory Bandwidth Monitoring (MBM) architectural definition defines counters of up to 62 bits in the IA32_QM_CTR MSR, and the first-generation MBM implementation uses 24 bit counters. Software is required to poll at 1 second or faster to ensure that data is retrieved before a counter rollover occurs more than once under worst conditions.
As system bandwidths scale the software requirement is maintained with the introduction of a per-resource enumerable MBM counter width.
In preparation for supporting hardware with an enumerable MBM counter width the current globally static MBM counter width is moved to a per-resource MBM counter width. Currently initialized to 24 always to result in no functional change.
In essence there is one function, mbm_overflow_count() that needs to know the counter width to handle rollovers. The static value used within mbm_overflow_count() will be replaced with a value discovered from the hardware. Support for learning the MBM counter width from hardware is added in the change that follows.
--- arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 8 +++++--- arch/x86/kernel/cpu/resctrl/internal.h | 7 +++++-- arch/x86/kernel/cpu/resctrl/monitor.c | 21 +++++++++++++-------- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +- 4 files changed, 24 insertions(+), 14 deletions(-)
arch/x86/kernel/cpu/resctrl/ctrlmondata.c +5 -3
@@ -495,14 +495,16 @@ int rdtgroup_schemata_show(struct kernfs_open_file *of,return ret; } -void mon_event_read (struct rmid_read *rr,struct rdt_domain *d, -struct rdtgroup *rdtgrp,int evtid,int first) +void mon_event_read (struct rmid_read *rr,struct rdt_resource *r, +struct rdt_domain *d,struct rdtgroup *rdtgrp, +int evtid,int first) {/* * setup the parameters to send to the IPI to read the data. */ rr->rgrp = rdtgrp; rr->evtid = evtid; + rr->r = r; rr->d = d; rr->val =0 ; rr->first = first;
@@ -539,7 +541,7 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg) goto out; } -mon_event_read (&rr, d, rdtgrp, evtid, false); +mon_event_read (&rr, r, d, rdtgrp, evtid, false);if (rr.val &RMID_VAL_ERROR )seq_puts (m,"Error\n" );
arch/x86/kernel/cpu/resctrl/internal.h +5 -2
@@ -87,6 +87,7 @@ union mon_data_bits {struct rmid_read {struct rdtgroup *rgrp; +struct rdt_resource *r;struct rdt_domain *d;int evtid;bool first;
@@ -460,6 +461,7 @@ struct rdt_resource {struct list_head evt_list;int num_rmid;unsigned int mon_scale; +unsigned int mbm_width;unsigned long fflags; };
@@ -587,8 +589,9 @@ void rmdir_mondata_subdir_allrdtgrp(struct rdt_resource *r, unsigned int dom_id);void mkdir_mondata_subdir_allrdtgrp (struct rdt_resource *r,struct rdt_domain *d); -void mon_event_read (struct rmid_read *rr,struct rdt_domain *d, -struct rdtgroup *rdtgrp,int evtid,int first); +void mon_event_read (struct rmid_read *rr,struct rdt_resource *r, +struct rdt_domain *d,struct rdtgroup *rdtgrp, +int evtid,int first);void mbm_setup_overflow_handler (struct rdt_domain *dom,unsigned long delay_ms);void mbm_handle_overflow (struct work_struct *work);
arch/x86/kernel/cpu/resctrl/monitor.c +13 -8
@@ -214,9 +214,9 @@ void free_rmid(u32 rmid)list_add_tail (&entry->list, &rmid_free_lru); } -static u64 mbm_overflow_count (u64 prev_msr,u64 cur_msr) +static u64 mbm_overflow_count (u64 prev_msr,u64 cur_msr,unsigned int width) { -u64 shift =64 -MBM_CNTR_WIDTH , chunks; +u64 shift =64 - width, chunks; chunks = (cur_msr << shift) - (prev_msr << shift);return chunks >>= shift;
@@ -256,7 +256,7 @@ static int __mon_event_count(u32 rmid, struct rmid_read *rr)return 0 ; } - chunks =mbm_overflow_count (m->prev_msr, tval); + chunks =mbm_overflow_count (m->prev_msr, tval, rr->r->mbm_width); m->chunks += chunks; m->prev_msr = tval;
@@ -278,7 +278,7 @@ static void mbm_bw_count(u32 rmid, struct rmid_read *rr)if (tval & (RMID_VAL_ERROR |RMID_VAL_UNAVAIL ))return ; - chunks =mbm_overflow_count (m->prev_bw_msr, tval); + chunks =mbm_overflow_count (m->prev_bw_msr, tval, rr->r->mbm_width); m->chunks_bw += chunks; m->chunks = m->chunks_bw; cur_bw = (chunks * r->mon_scale) >>20 ;
@@ -433,11 +433,12 @@ static void update_mba_bw(struct rdtgroup *rgrp, struct rdt_domain *dom_mbm) } } -static void mbm_update (struct rdt_domain *d,int rmid) +static void mbm_update (struct rdt_resource *r,struct rdt_domain *d,int rmid) {struct rmid_read rr; rr.first = false; + rr.r = r; rr.d = d;/*
@@ -510,6 +511,7 @@ void mbm_handle_overflow(struct work_struct *work)struct rdtgroup *prgrp, *crgrp;int cpu =smp_processor_id ();struct list_head *head; +struct rdt_resource *r;struct rdt_domain *d;mutex_lock (&rdtgroup_mutex);
@@ -517,16 +519,18 @@ void mbm_handle_overflow(struct work_struct *work)if (!static_branch_likely (&rdt_mon_enable_key)) goto out_unlock; - d =get_domain_from_cpu (cpu, &rdt_resources_all[RDT_RESOURCE_L3 ]); + r = &rdt_resources_all[RDT_RESOURCE_L3 ]; + + d =get_domain_from_cpu (cpu, r);if (!d) goto out_unlock;list_for_each_entry (prgrp, &rdt_all_groups, rdtgroup_list) { -mbm_update (d, prgrp->mon.rmid); +mbm_update (r, d, prgrp->mon.rmid); head = &prgrp->mon.crdtgrp_list;list_for_each_entry (crgrp, head, mon.crdtgrp_list) -mbm_update (d, crgrp->mon.rmid); +mbm_update (r, d, crgrp->mon.rmid);if (is_mba_sc (NULL ))update_mba_bw (prgrp, d);
@@ -619,6 +623,7 @@ int rdt_get_mon_l3_config(struct rdt_resource *r) r->mon_scale = boot_cpu_data.x86_cache_occ_scale; r->num_rmid = boot_cpu_data.x86_cache_max_rmid +1 ; + r->mbm_width =MBM_CNTR_WIDTH ;/* * A reasonable upper limit on the max threshold is the number
arch/x86/kernel/cpu/resctrl/rdtgroup.c +1 -1
@@ -2472,7 +2472,7 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, goto out_destroy;if (is_mbm_event (mevt->evtid)) -mon_event_read (&rr, d, prgrp, mevt->evtid, true); +mon_event_read (&rr, r, d, prgrp, mevt->evtid, true); }kernfs_activate (kn);return 0 ;
Signature · 1 line
2.21.0
Reinette Chatre
maintainerPATCH v2 4/7 x86/resctrl: Query LLC monitoring properties once during boot
In reply to Reinette ChatreCache and memory bandwidth monitoring are features that are part of x86 CPU resource control that is supported by the resctrl subsystem. The monitoring properties are obtained via CPUID from every CPU and only used within the resctrl subsystem where the properties are only read from boot_cpu_data.
Obtain the monitoring properties once, placed in boot_cpu_data, via the c_bsp_init helpers of the vendors that support X86_FEATURE_CQM_LLC.
--- arch/x86/kernel/cpu/amd.c | 3 +++ arch/x86/kernel/cpu/common.c | 2 -- arch/x86/kernel/cpu/intel.c | 7 +++++++ arch/x86/kernel/cpu/resctrl/core.c | 1 + 4 files changed, 11 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/amd.c +3 -0
@@ -18,6 +18,7 @@#include <asm/pci-direct.h> #include <asm/delay.h> #include <asm/debugreg.h> +#include <asm/resctrl.h> #ifdef CONFIG_X86_64 # include <asm/mmconfig.h>
@@ -597,6 +598,8 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) x86_amd_ls_cfg_ssbd_mask =1ULL << bit; } } + +resctrl_cpu_detect (c); }static void early_detect_mem_encrypt (struct cpuinfo_x86 *c)
arch/x86/kernel/cpu/common.c +0 -2
@@ -56,7 +56,6 @@#include <asm/intel-family.h> #include <asm/cpu_device_id.h> #include <asm/uv/uv.h> -#include <asm/resctrl.h> #include "cpu.h"
@@ -922,7 +921,6 @@ void get_cpu_cap(struct cpuinfo_x86 *c)init_scattered_cpuid_features (c);init_speculation_control (c); -resctrl_cpu_detect (c);/* * Clear/Set all flags overridden by options, after probe.
arch/x86/kernel/cpu/intel.c +7 -0
@@ -22,6 +22,7 @@#include <asm/cpu_device_id.h> #include <asm/cmdline.h> #include <asm/traps.h> +#include <asm/resctrl.h> #ifdef CONFIG_X86_64 #include <linux/topology.h>
@@ -322,6 +323,11 @@ static void early_init_intel(struct cpuinfo_x86 *c)detect_ht_early (c); } +static void bsp_init_intel (struct cpuinfo_x86 *c) +{ +resctrl_cpu_detect (c); +} +#ifdef CONFIG_X86_32 /* * Early probe support logic for ppro memory erratum #50
@@ -961,6 +967,7 @@ static const struct cpu_dev intel_cpu_dev = {#endif .c_detect_tlb = intel_detect_tlb, .c_early_init = early_init_intel, + .c_bsp_init = bsp_init_intel, .c_init = init_intel, .c_x86_vendor = X86_VENDOR_INTEL, };
arch/x86/kernel/cpu/resctrl/core.c +1 -0
@@ -958,6 +958,7 @@ static __init void rdt_init_res_defs(void)static enum cpuhp_state rdt_online; +/* Runs once on the BSP during boot. */ void resctrl_cpu_detect (struct cpuinfo_x86 *c) {if (!cpu_has (c,X86_FEATURE_CQM_LLC )) {
Signature · 1 line
2.21.0
Borislav Petkov
maintainerQuoted 9 lines · Reinette Chatre
Reinette Chatre (7):
x86/resctrl: Renameasm/resctrl_sched.htoasm/resctrl.hx86/cpu: Move resctrl CPUID code to resctrl x86/resctrl: Remove unnecessary RMID checks x86/resctrl: Query LLC monitoring properties once during boot x86/resctrl: Maintain MBM counter width per resource x86/resctrl: Support CPUID enumeration of MBM counter width x86/resctrl: Support wider MBM counters
Quoted 16 lines
MAINTAINERS | 2 +-
arch/x86/include/asm/processor.h | 3 +-
.../asm/{resctrl_sched.h => resctrl.h} | 9 +++--
arch/x86/kernel/cpu/amd.c | 3 ++
arch/x86/kernel/cpu/common.c | 40 -------------------
arch/x86/kernel/cpu/intel.c | 7 ++++
arch/x86/kernel/cpu/resctrl/core.c | 32 ++++++++++++++-
arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 8 ++--
arch/x86/kernel/cpu/resctrl/internal.h | 15 +++++--
arch/x86/kernel/cpu/resctrl/monitor.c | 27 +++++++++----
arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +-
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +-
arch/x86/kernel/process_32.c | 2 +-
arch/x86/kernel/process_64.c | 2 +-
14 files changed, 91 insertions(+), 65 deletions(-)
rename arch/x86/include/asm/{resctrl_sched.h => resctrl.h} (92%)It all looks very good, thanks for the good work!
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette