Commit 5a4b3fbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_cache_for_v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cache resource control updates from Borislav Petkov:

 - Add support for 6-node sub-NUMA clustering on Intel

 - Cleanup

* tag 'x86_cache_for_v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Support Sub-NUMA cluster mode SNC6
  x86/resctrl: Slightly clean-up mbm_config_show()
parents c1f2ffe2 9bce6e94

arch/x86/kernel/cpu/resctrl/monitor.c

+2 −1
Original line number Diff line number Diff line
@@ -1158,11 +1158,12 @@ static __init int snc_get_config(void) 


	ret = cpus_per_l3 / cpus_per_node;



	/* sanity check: Only valid results are 1, 2, 3, 4 */

	/* sanity check: Only valid results are 1, 2, 3, 4, 6 */

	switch (ret) {

	case 1:

		break;

	case 2 ... 4:

	case 6:

		pr_info("Sub-NUMA Cluster mode detected with %d nodes per L3 cache\n", ret);

		rdt_resources_all[RDT_RESOURCE_L3].r_resctrl.mon_scope = RESCTRL_L3_NODE;

		break;

arch/x86/kernel/cpu/resctrl/rdtgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -1596,7 +1596,7 @@ static void mondata_config_read(struct rdt_mon_domain *d, struct mon_config_info 


static int mbm_config_show(struct seq_file *s, struct rdt_resource *r, u32 evtid)

{

	struct mon_config_info mon_info = {0};

	struct mon_config_info mon_info;

	struct rdt_mon_domain *dom;

	bool sep = false;