Commit 9bf9511e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_cache_updates_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cache resource control updates from Borislav Petkov:
 "Add support for wider Memory Bandwidth Monitoring counters by querying
  their width from CPUID.

  As a prerequsite for that, streamline and unify the CPUID detection of
  the respective resource control attributes.

  By Reinette Chatre"

* tag 'x86_cache_updates_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Support wider MBM counters
  x86/resctrl: Support CPUID enumeration of MBM counter width
  x86/resctrl: Maintain MBM counter width per resource
  x86/resctrl: Query LLC monitoring properties once during boot
  x86/resctrl: Remove unnecessary RMID checks
  x86/cpu: Move resctrl CPUID code to resctrl/
  x86/resctrl: Rename asm/resctrl_sched.h to asm/resctrl.h
parents ef34ba6d 0c4d5ba1

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -14269,7 +14269,7 @@ M: Reinette Chatre <reinette.chatre@intel.com> 
L:	linux-kernel@vger.kernel.org

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/processor.h



+2
−1






























Original line number
Diff line number
Diff line








@@ -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/include/asm/resctrl_sched.h→arch/x86/include/asm/resctrl.h



+6
−3






























Original line number
Diff line number
Diff line















/* 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


























@@ -84,10 +84,13 @@ 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 */





























#endif /* _ASM_X86_RESCTRL_SCHED_H */












#endif /* _ASM_X86_RESCTRL_H */
























arch/x86/kernel/cpu/amd.c



+3
−0






























Original line number
Diff line number
Diff line








@@ -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
−40






























Original line number
Diff line number
Diff line








@@ -854,30 +854,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 +921,6 @@ void get_cpu_cap(struct cpuinfo_x86 *c)





























	init_scattered_cpuid_features(c);















	init_speculation_control(c);













	init_cqm(c);































	/*















	 * Clear/Set all flags overridden by options, after probe.










@@ -1377,20 +1352,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.










@@ -1503,7 +1464,6 @@ static void identify_cpu(struct cpuinfo_x86 *c)













#endif































	x86_init_rdrand(c);













	x86_init_cache_qos(c);















	setup_pku(c);































	/*









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE