Add support for Sub-NUMA cluster (SNC) systems
Subsystems (2)
Tony Luck
maintainerPATCH 1/1 Add support for Sub-NUMA cluster (SNC) systems
Updated parts 14 & 17 addressing Boris' comments on v23 of this series:
Tony Luck (19):
x86/resctrl: Handle removing directories in Sub-NUMA Cluster (SNC)
mode
x86/resctrl: Enable shared RMID mode on Sub-NUMA Cluster (SNC) systems
Tony Luck
maintainerPATCH 14/19 x86/resctrl: Handle removing directories in Sub-NUMA Cluster (SNC) mode
In SNC mode there are multiple subdirectories in each L3 level monitor directory (one for each SNC node). If all the CPUs in an SNC node are taken offline, just remove the SNC directory for that node. In non-SNC mode, or when the last SNC node directory is removed, remove the L3 monitor directory.
Add a helper function to avoid duplicated code.
--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 35 +++++++++++++++++++++----- 1 file changed, 29 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/resctrl/rdtgroup.c +29 -6
@@ -3006,22 +3006,45 @@ static int mon_addfile(struct kernfs_node *parent_kn, const char *name,return ret; } +static void mon_rmdir_one_subdir (struct kernfs_node *pkn,char *name,char *subname) +{ +struct kernfs_node *kn; + + kn =kernfs_find_and_get (pkn, name); +if (!kn) +return ; +kernfs_put (kn); + +if (kn->dir.subdirs <=1 ) +kernfs_remove (kn); +else +kernfs_remove_by_name (kn, subname); +} +/* * Remove all subdirectories of mon_data of ctrl_mon groups -* and monitor groups with given domain id. +* and monitor groups for the given domain. +* Remove files and directories containing "sum" of domain data +* when last domain being summed is removed. */ static void rmdir_mondata_subdir_allrdtgrp (struct rdt_resource *r, -unsigned int dom_id) +struct rdt_mon_domain *d) {struct rdtgroup *prgrp, *crgrp; +char subname[32 ]; +bool snc_mode;char name[32 ]; + snc_mode = r->mon_scope ==RESCTRL_L3_NODE ; +sprintf (name,"mon_%s_%02d" , r->name, snc_mode ? d->ci->id : d->hdr.id); +if (snc_mode) +sprintf (subname,"mon_sub_%s_%02d" , r->name, d->hdr.id); +list_for_each_entry (prgrp, &rdt_all_groups, rdtgroup_list) { -sprintf (name,"mon_%s_%02d" , r->name, dom_id); -kernfs_remove_by_name (prgrp->mon.mon_data_kn, name); +mon_rmdir_one_subdir (prgrp->mon.mon_data_kn, name, subname);list_for_each_entry (crgrp, &prgrp->mon.crdtgrp_list, mon.crdtgrp_list) -kernfs_remove_by_name (crgrp->mon.mon_data_kn, name); +mon_rmdir_one_subdir (crgrp->mon.mon_data_kn, name, subname); } }
@@ -3991,7 +4014,7 @@ void resctrl_offline_mon_domain(struct rdt_resource *r, struct rdt_mon_domain *d* per domain monitor data directories. */ if (resctrl_mounted &&resctrl_arch_mon_capable ()) -rmdir_mondata_subdir_allrdtgrp (r, d->hdr.id); +rmdir_mondata_subdir_allrdtgrp (r, d);if (is_mbm_enabled ())cancel_delayed_work (&d->mbm_over);
Signature · 1 line
2.45.2
[tip: x86/cache] x86/resctrl: Handle removing directories in Sub-NUMA Cluster (SNC) mode
The following commit has been merged into the x86/cache branch of tip:
The following commit has been merged into the x86/cache branch of tip:
Commit-ID: 6b48b80b08e6f08eea8eaf7e44555ada191b6bee Gitweb: https://git.kernel.org/tip/6b48b80b08e6f08eea8eaf7e44555ada191b6bee Author: Tony Luck <[email protected]> AuthorDate: Tue, 02 Jul 2024 10:38:19 -07:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 02 Jul 2024 19:51:06 +02:00
x86/resctrl: Handle removing directories in Sub-NUMA Cluster (SNC) mode
In SNC mode, there are multiple subdirectories in each L3 level monitor directory (one for each SNC node). If all the CPUs in an SNC node are taken offline, just remove the SNC directory for that node. In non-SNC mode, or when the last SNC node directory is removed, remove the L3 monitor directory.
Add a helper function to avoid duplicated code.
--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 35 ++++++++++++++++++++----- 1 file changed, 29 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/resctrl/rdtgroup.c +29 -6
@@ -3006,22 +3006,45 @@ static int mon_addfile(struct kernfs_node *parent_kn, const char *name,return ret; } +static void mon_rmdir_one_subdir (struct kernfs_node *pkn,char *name,char *subname) +{ +struct kernfs_node *kn; + + kn =kernfs_find_and_get (pkn, name); +if (!kn) +return ; +kernfs_put (kn); + +if (kn->dir.subdirs <=1 ) +kernfs_remove (kn); +else +kernfs_remove_by_name (kn, subname); +} +/* * Remove all subdirectories of mon_data of ctrl_mon groups -* and monitor groups with given domain id. +* and monitor groups for the given domain. +* Remove files and directories containing "sum" of domain data +* when last domain being summed is removed. */ static void rmdir_mondata_subdir_allrdtgrp (struct rdt_resource *r, -unsigned int dom_id) +struct rdt_mon_domain *d) {struct rdtgroup *prgrp, *crgrp; +char subname[32 ]; +bool snc_mode;char name[32 ]; + snc_mode = r->mon_scope ==RESCTRL_L3_NODE ; +sprintf (name,"mon_%s_%02d" , r->name, snc_mode ? d->ci->id : d->hdr.id); +if (snc_mode) +sprintf (subname,"mon_sub_%s_%02d" , r->name, d->hdr.id); +list_for_each_entry (prgrp, &rdt_all_groups, rdtgroup_list) { -sprintf (name,"mon_%s_%02d" , r->name, dom_id); -kernfs_remove_by_name (prgrp->mon.mon_data_kn, name); +mon_rmdir_one_subdir (prgrp->mon.mon_data_kn, name, subname);list_for_each_entry (crgrp, &prgrp->mon.crdtgrp_list, mon.crdtgrp_list) -kernfs_remove_by_name (crgrp->mon.mon_data_kn, name); +mon_rmdir_one_subdir (crgrp->mon.mon_data_kn, name, subname); } }
@@ -3991,7 +4014,7 @@ void resctrl_offline_mon_domain(struct rdt_resource *r, struct rdt_mon_domain *d* per domain monitor data directories. */ if (resctrl_mounted &&resctrl_arch_mon_capable ()) -rmdir_mondata_subdir_allrdtgrp (r, d->hdr.id); +rmdir_mondata_subdir_allrdtgrp (r, d);if (is_mbm_enabled ())cancel_delayed_work (&d->mbm_over);
Tony Luck
maintainerPATCH 17/19 x86/resctrl: Enable shared RMID mode on Sub-NUMA Cluster (SNC) systems
In reply to Tony LuckHardware has two RMID configuration options for SNC systems. The default mode divides RMID counters between SNC nodes. E.g. with 200 RMIDs and two SNC nodes per L3 cache RMIDs 0..99 are used on node 0, and 100..199 on node 1. This isn't compatible with Linux resctrl usage. On this example system a process using RMID 5 would only update monitor counters while running on SNC node 0.
The other mode is "RMID Sharing Mode". This is enabled by clearing bit 0 of the RMID_SNC_CONFIG (0xCA0) model specific register. In this mode the number of logical RMIDs is the number of physical RMIDs (from CPUID leaf 0xF) divided by the number of SNC nodes per L3 cache instance. A process can use the same RMID across different SNC nodes.
See the "Intel Resource Director Technology Architecture Specification" for additional details.
When SNC is enabled, update the MSR when a monitor domain is marked online. Technically this is overkill. It only needs to be done once per L3 cache instance rather than per SNC domain. But there is no harm in doing it more than once, and this is not in a critical path.
--- arch/x86/include/asm/msr-index.h | 1 + arch/x86/kernel/cpu/resctrl/internal.h | 2 ++ arch/x86/kernel/cpu/resctrl/core.c | 2 ++ arch/x86/kernel/cpu/resctrl/monitor.c | 20 ++++++++++++++++++++ 4 files changed, 25 insertions(+)
arch/x86/include/asm/msr-index.h +1 -0
@@ -1164,6 +1164,7 @@#define MSR_IA32_QM_CTR 0xc8e#define MSR_IA32_PQR_ASSOC 0xc8f#define MSR_IA32_L3_CBM_BASE 0xc90 +#define MSR_RMID_SNC_CONFIG 0xca0#define MSR_IA32_L2_CBM_BASE 0xd10#define MSR_IA32_MBA_THRTL_BASE 0xd50
arch/x86/kernel/cpu/resctrl/internal.h +2 -0
@@ -534,6 +534,8 @@ static inline bool resctrl_arch_get_cdp_enabled(enum resctrl_res_level l)int resctrl_arch_set_cdp_enabled (enum resctrl_res_level l,bool enable); +void arch_mon_domain_online (struct rdt_resource *r,struct rdt_mon_domain *d); +/* * To return the common struct rdt_resource, which is contained in struct * rdt_hw_resource, walk the resctrl member of struct rdt_hw_resource.
arch/x86/kernel/cpu/resctrl/core.c +2 -0
@@ -615,6 +615,8 @@ static void domain_add_cpu_mon(int cpu, struct rdt_resource *r) }cpumask_set_cpu (cpu, &d->hdr.cpu_mask); +arch_mon_domain_online (r, d); +if (arch_domain_mbm_alloc (r->num_rmid, hw_dom)) {mon_domain_free (hw_dom);return ;
arch/x86/kernel/cpu/resctrl/monitor.c +20 -0
@@ -1090,6 +1090,26 @@ static void l3_mon_evt_init(struct rdt_resource *r)list_add_tail (&mbm_local_event.list, &r->evt_list); } +/* +* The power-on reset value of MSR_RMID_SNC_CONFIG is 0x1 +* which indicates that RMIDs are configured in legacy mode. +* This mode is incompatible with Linux resctrl semantics +* as RMIDs are partitioned between SNC nodes, which requires +* a user to know which RMID is allocated to a task. +* Clearing bit 0 reconfigures the RMID counters for use +* in RMID sharing mode. This mode is better for Linux. +* The RMID space is divided between all SNC nodes with the +* RMIDs renumbered to start from zero in each node when +* counting operations from tasks. Code to read the counters +* must adjust RMID counter numbers based on SNC node. See +* logical_rmid_to_physical_rmid() for code that does this. +*/ +void arch_mon_domain_online (struct rdt_resource *r,struct rdt_mon_domain *d) +{ +if (snc_nodes_per_l3_cache >1 ) +msr_clear_bit (MSR_RMID_SNC_CONFIG ,0 ); +} +int __init rdt_get_mon_l3_config (struct rdt_resource *r) {unsigned int mbm_offset = boot_cpu_data.x86_cache_mbm_width_offset;
Signature · 1 line
2.45.2
[tip: x86/cache] x86/resctrl: Enable shared RMID mode on Sub-NUMA Cluster (SNC) systems
The following commit has been merged into the x86/cache branch of tip:
The following commit has been merged into the x86/cache branch of tip:
Commit-ID: 21b362cc762aabb3e8496d33d7b4538154c95a0b Gitweb: https://git.kernel.org/tip/21b362cc762aabb3e8496d33d7b4538154c95a0b Author: Tony Luck <[email protected]> AuthorDate: Tue, 02 Jul 2024 10:38:20 -07:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 02 Jul 2024 19:57:51 +02:00
x86/resctrl: Enable shared RMID mode on Sub-NUMA Cluster (SNC) systems
Hardware has two RMID configuration options for SNC systems. The default mode divides RMID counters between SNC nodes. E.g. with 200 RMIDs and two SNC nodes per L3 cache RMIDs 0..99 are used on node 0, and 100..199 on node 1. This isn't compatible with Linux resctrl usage. On this example system a process using RMID 5 would only update monitor counters while running on SNC node 0.
The other mode is "RMID Sharing Mode". This is enabled by clearing bit 0 of the RMID_SNC_CONFIG (0xCA0) model specific register. In this mode the number of logical RMIDs is the number of physical RMIDs (from CPUID leaf 0xF) divided by the number of SNC nodes per L3 cache instance. A process can use the same RMID across different SNC nodes.
See the "Intel Resource Director Technology Architecture Specification" for additional details.
When SNC is enabled, update the MSR when a monitor domain is marked online. Technically this is overkill. It only needs to be done once per L3 cache instance rather than per SNC domain. But there is no harm in doing it more than once, and this is not in a critical path.
--- arch/x86/include/asm/msr-index.h | 1 + arch/x86/kernel/cpu/resctrl/core.c | 2 ++ arch/x86/kernel/cpu/resctrl/internal.h | 2 ++ arch/x86/kernel/cpu/resctrl/monitor.c | 20 ++++++++++++++++++++ 4 files changed, 25 insertions(+)
arch/x86/include/asm/msr-index.h +1 -0
@@ -1164,6 +1164,7 @@#define MSR_IA32_QM_CTR 0xc8e#define MSR_IA32_PQR_ASSOC 0xc8f#define MSR_IA32_L3_CBM_BASE 0xc90 +#define MSR_RMID_SNC_CONFIG 0xca0#define MSR_IA32_L2_CBM_BASE 0xd10#define MSR_IA32_MBA_THRTL_BASE 0xd50
arch/x86/kernel/cpu/resctrl/core.c +2 -0
@@ -615,6 +615,8 @@ static void domain_add_cpu_mon(int cpu, struct rdt_resource *r) }cpumask_set_cpu (cpu, &d->hdr.cpu_mask); +arch_mon_domain_online (r, d); +if (arch_domain_mbm_alloc (r->num_rmid, hw_dom)) {mon_domain_free (hw_dom);return ;
arch/x86/kernel/cpu/resctrl/internal.h +2 -0
@@ -534,6 +534,8 @@ static inline bool resctrl_arch_get_cdp_enabled(enum resctrl_res_level l)int resctrl_arch_set_cdp_enabled (enum resctrl_res_level l,bool enable); +void arch_mon_domain_online (struct rdt_resource *r,struct rdt_mon_domain *d); +/* * To return the common struct rdt_resource, which is contained in struct * rdt_hw_resource, walk the resctrl member of struct rdt_hw_resource.
arch/x86/kernel/cpu/resctrl/monitor.c +20 -0
@@ -1090,6 +1090,26 @@ static void l3_mon_evt_init(struct rdt_resource *r)list_add_tail (&mbm_local_event.list, &r->evt_list); } +/* +* The power-on reset value of MSR_RMID_SNC_CONFIG is 0x1 +* which indicates that RMIDs are configured in legacy mode. +* This mode is incompatible with Linux resctrl semantics +* as RMIDs are partitioned between SNC nodes, which requires +* a user to know which RMID is allocated to a task. +* Clearing bit 0 reconfigures the RMID counters for use +* in RMID sharing mode. This mode is better for Linux. +* The RMID space is divided between all SNC nodes with the +* RMIDs renumbered to start from zero in each node when +* counting operations from tasks. Code to read the counters +* must adjust RMID counter numbers based on SNC node. See +* logical_rmid_to_physical_rmid() for code that does this. +*/ +void arch_mon_domain_online (struct rdt_resource *r,struct rdt_mon_domain *d) +{ +if (snc_nodes_per_l3_cache >1 ) +msr_clear_bit (MSR_RMID_SNC_CONFIG ,0 ); +} +int __init rdt_get_mon_l3_config (struct rdt_resource *r) {unsigned int mbm_offset = boot_cpu_data.x86_cache_mbm_width_offset;