x86/resctrl: Move MSR defines into msr-index.h
Subsystems (2)
Borislav Petkov
maintainerPATCH 1/1 x86/resctrl: Move MSR defines into msr-index.h
From: Borislav Petkov <[email protected]>
msr-index.h should contain all MSRs for easier grepping for MSR numbers when dealing with unchecked MSR access warnings, for example.
Move the resctrl ones. Prefix IA32_PQR_ASSOC with "MSR_" while at it.
No functional changes.
--- arch/x86/include/asm/msr-index.h | 22 ++++++++++++++++------ arch/x86/include/asm/resctrl.h | 8 +++----- arch/x86/kernel/cpu/resctrl/core.c | 2 +- arch/x86/kernel/cpu/resctrl/internal.h | 10 +--------- arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-)
arch/x86/include/asm/msr-index.h +16 -6
@@ -4,12 +4,7 @@#include <linux/bits.h> -/* -* CPU model specific register (MSR) numbers. -* -* Do not add new entries to this file unless the definitions are shared -* between multiple compilation units. -*/ +/* CPU model specific register (MSR) numbers. */ /* x86-64 specific MSRs */ #define MSR_EFER 0xc0000080/* extended feature register */
@@ -1051,6 +1046,21 @@#define VMX_BASIC_MEM_TYPE_WB 6LLU#define VMX_BASIC_INOUT 0x0040000000000000LLU +/* Resctrl MSRs: */ +/* - Intel: */ +#define MSR_IA32_L3_QOS_CFG 0xc81 +#define MSR_IA32_L2_QOS_CFG 0xc82 +#define MSR_IA32_QM_EVTSEL 0xc8d +#define MSR_IA32_QM_CTR 0xc8e +#define MSR_IA32_PQR_ASSOC 0xc8f +#define MSR_IA32_L3_CBM_BASE 0xc90 +#define MSR_IA32_L2_CBM_BASE 0xd10 +#define MSR_IA32_MBA_THRTL_BASE 0xd50 + + +/* - AMD: */ +#define MSR_IA32_MBA_BW_BASE 0xc0000200 +/* MSR_IA32_VMX_MISC bits */ #define MSR_IA32_VMX_MISC_INTEL_PT (1ULL << 14)#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29)
arch/x86/include/asm/resctrl.h +3 -5
@@ -7,8 +7,6 @@#include <linux/sched.h> #include <linux/jump_label.h> -#define IA32_PQR_ASSOC 0x0c8f -/** * struct resctrl_pqr_state - State cache for the PQR MSR * @cur_rmid: The cached Resource Monitoring ID
@@ -16,8 +14,8 @@* @default_rmid: The user assigned Resource Monitoring ID * @default_closid: The user assigned cached Class Of Service ID * -* The upper 32 bits of IA32_PQR_ASSOC contain closid and the -* lower 10 bits rmid. The update to IA32_PQR_ASSOC always +* The upper 32 bits of MSR_IA32_PQR_ASSOC contain closid and the +* lower 10 bits rmid. The update to MSR_IA32_PQR_ASSOC always * contains both parts, so we need to cache them. This also * stores the user configured per cpu CLOSID and RMID. *
@@ -77,7 +75,7 @@ static void __resctrl_sched_in(void)if (closid != state->cur_closid || rmid != state->cur_rmid) { state->cur_closid = closid; state->cur_rmid = rmid; -wrmsr (IA32_PQR_ASSOC , rmid, closid); +wrmsr (MSR_IA32_PQR_ASSOC , rmid, closid); } }
arch/x86/kernel/cpu/resctrl/core.c +1 -1
@@ -575,7 +575,7 @@ static void clear_closid_rmid(int cpu) state->default_rmid =0 ; state->cur_closid =0 ; state->cur_rmid =0 ; -wrmsr (IA32_PQR_ASSOC ,0 ,0 ); +wrmsr (MSR_IA32_PQR_ASSOC ,0 ,0 ); }static int resctrl_online_cpu (unsigned int cpu)
arch/x86/kernel/cpu/resctrl/internal.h +1 -9
@@ -8,15 +8,7 @@#include <linux/fs_context.h> #include <linux/jump_label.h> -#define MSR_IA32_L3_QOS_CFG 0xc81 -#define MSR_IA32_L2_QOS_CFG 0xc82 -#define MSR_IA32_L3_CBM_BASE 0xc90 -#define MSR_IA32_L2_CBM_BASE 0xd10 -#define MSR_IA32_MBA_THRTL_BASE 0xd50 -#define MSR_IA32_MBA_BW_BASE 0xc0000200 - -#define MSR_IA32_QM_CTR 0x0c8e -#define MSR_IA32_QM_EVTSEL 0x0c8d +#define L3_QOS_CDP_ENABLE 0x01ULL
arch/x86/kernel/cpu/resctrl/pseudo_lock.c +2 -2
@@ -477,7 +477,7 @@ static int pseudo_lock_fn(void *_rdtgrp)* pseudo-locked followed by reading of kernel memory to load it * into the cache. */ -__wrmsr (IA32_PQR_ASSOC , rmid_p, rdtgrp->closid); +__wrmsr (MSR_IA32_PQR_ASSOC , rmid_p, rdtgrp->closid);/* * Cache was flushed earlier. Now access kernel memory to read it * into cache region associated with just activated plr->closid.
@@ -513,7 +513,7 @@ static int pseudo_lock_fn(void *_rdtgrp)* Critical section end: restore closid with capacity bitmask that * does not overlap with pseudo-locked region. */ -__wrmsr (IA32_PQR_ASSOC , rmid_p, closid_p); +__wrmsr (MSR_IA32_PQR_ASSOC , rmid_p, closid_p);/* Re-enable the hardware prefetcher(s) */ wrmsrl (MSR_MISC_FEATURE_CONTROL , saved_msr);
Signature · 1 line
2.35.1
Reinette Chatre
maintainerHi Boris,
Quoted 24 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
msr-index.hshould contain all MSRs for easier grepping for MSR numbers when dealing with unchecked MSR access warnings, for example.Move the resctrl ones. Prefix
IA32_PQR_ASSOCwith "MSR_" while at it.No functional changes.
Signed-off-by Borislav Petkov <[email protected]>--- arch/x86/include/asm/msr-index.h | 22 ++++++++++++++++------ arch/x86/include/asm/resctrl.h | 8 +++----- arch/x86/kernel/cpu/resctrl/core.c | 2 +- arch/x86/kernel/cpu/resctrl/internal.h | 10 +--------- arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-)arch/x86/include/asm/msr-index.h +0
-0@@ -4,12 +4,7 @@
arch/x86/include/asm/msr-index.h line 8
Quoted 10 lines
arch/x86/include/asm/msr-index.h +1
-6#include <linux/bits.h> -/* -* CPU model specific register (MSR) numbers. -* -* Do not add new entries to this file unless the definitions are shared -* between multiple compilation units. -*/ +/* CPU model specific register (MSR) numbers. */
Not an objection, just an observation: the above is a significant change for a patch with the x86/resctrl prefix.
Quoted 11 lines
arch/x86/include/asm/msr-index.h +5
-0/* x86-64 specific MSRs */ #define MSR_EFER 0xc0000080/* extended feature register */ @@ -1051,6 +1046,21 @@#define VMX_BASIC_MEM_TYPE_WB 6LLU#define VMX_BASIC_INOUT 0x0040000000000000LLU +/* Resctrl MSRs: */ +/* - Intel: */ +#define MSR_IA32_L3_QOS_CFG 0xc81 +#define MSR_IA32_L2_QOS_CFG 0xc82 +#define MSR_IA32_QM_EVTSEL 0xc8d
arch/x86/include/asm/msr-index.h line 1063
Quoted 10 lines
arch/x86/include/asm/msr-index.h +10
-0+#define MSR_IA32_QM_CTR 0xc8e +#define MSR_IA32_PQR_ASSOC 0xc8f +#define MSR_IA32_L3_CBM_BASE 0xc90 +#define MSR_IA32_L2_CBM_BASE 0xd10 +#define MSR_IA32_MBA_THRTL_BASE 0xd50 + + +/* - AMD: */ +#define MSR_IA32_MBA_BW_BASE 0xc0000200 +
Is it important to distinguish between Intel and AMD? All but one (MSR_IA32_MBA_THRTL_BASE) of the register values under the "Intel" heading are also used by AMD.
(sidenote: multiple blank lines above)
Quoted 10 lines
arch/x86/kernel/cpu/resctrl/internal.h +0
-2@@ -8,15 +8,7 @@#include <linux/fs_context.h> #include <linux/jump_label.h> -#define MSR_IA32_L3_QOS_CFG 0xc81 -#define MSR_IA32_L2_QOS_CFG 0xc82
arch/x86/kernel/cpu/resctrl/internal.h line 13
Quoted 10 lines
arch/x86/kernel/cpu/resctrl/internal.h +1
-7-#define MSR_IA32_L3_CBM_BASE 0xc90 -#define MSR_IA32_L2_CBM_BASE 0xd10 -#define MSR_IA32_MBA_THRTL_BASE 0xd50 -#define MSR_IA32_MBA_BW_BASE 0xc0000200 - -#define MSR_IA32_QM_CTR 0x0c8e -#define MSR_IA32_QM_EVTSEL 0x0c8d +#define L3_QOS_CDP_ENABLE 0x01ULL
This new empty line results in a multiple blank lines warning in this area.
Reinette
Borislav Petkov
maintainerQuoted 2 lines · Reinette Chatre
Not an objection, just an observation: the above is a significant change for a patch with the x86/resctrl prefix.
Yeah, I felt it is a small-enough change not to warrant a separate patch.
Quoted 1 line
Is it important to distinguish between Intel and AMD?
Yeah, look at the rest of that file.
Quoted 2 lines
All but one (
MSR_IA32_MBA_THRTL_BASE) of the register values under the "Intel" heading are also used by AMD.
This basically says that AMD is using Intel's MSRs. Which is fine.
I'll fix the multiple blank lines.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteThe 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: 97fa21f65c3eb5bbab9b4734bed37fd624cddd86 Gitweb: https://git.kernel.org/tip/97fa21f65c3eb5bbab9b4734bed37fd624cddd86 Author: Borislav Petkov <[email protected]> AuthorDate: Sun, 06 Nov 2022 22:24:08 +01:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Sun, 27 Nov 2022 23:00:45 +01:00
x86/resctrl: Move MSR defines into msr-index.h
msr-index.h should contain all MSRs for easier grepping for MSR numbers when dealing with unchecked MSR access warnings, for example.
Move the resctrl ones. Prefix IA32_PQR_ASSOC with "MSR_" while at it.
No functional changes.
--- arch/x86/include/asm/msr-index.h | 21 +++++++++++++++------ arch/x86/include/asm/resctrl.h | 8 +++----- arch/x86/kernel/cpu/resctrl/core.c | 2 +- arch/x86/kernel/cpu/resctrl/internal.h | 10 ---------- arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 4 ++-- 5 files changed, 21 insertions(+), 24 deletions(-)
arch/x86/include/asm/msr-index.h +15 -6
@@ -4,12 +4,7 @@#include <linux/bits.h> -/* -* CPU model specific register (MSR) numbers. -* -* Do not add new entries to this file unless the definitions are shared -* between multiple compilation units. -*/ +/* CPU model specific register (MSR) numbers. */ /* x86-64 specific MSRs */ #define MSR_EFER 0xc0000080/* extended feature register */
@@ -1050,6 +1045,20 @@#define VMX_BASIC_MEM_TYPE_WB 6LLU#define VMX_BASIC_INOUT 0x0040000000000000LLU +/* Resctrl MSRs: */ +/* - Intel: */ +#define MSR_IA32_L3_QOS_CFG 0xc81 +#define MSR_IA32_L2_QOS_CFG 0xc82 +#define MSR_IA32_QM_EVTSEL 0xc8d +#define MSR_IA32_QM_CTR 0xc8e +#define MSR_IA32_PQR_ASSOC 0xc8f +#define MSR_IA32_L3_CBM_BASE 0xc90 +#define MSR_IA32_L2_CBM_BASE 0xd10 +#define MSR_IA32_MBA_THRTL_BASE 0xd50 + +/* - AMD: */ +#define MSR_IA32_MBA_BW_BASE 0xc0000200 +/* MSR_IA32_VMX_MISC bits */ #define MSR_IA32_VMX_MISC_INTEL_PT (1ULL << 14)#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29)
arch/x86/include/asm/resctrl.h +3 -5
@@ -7,8 +7,6 @@#include <linux/sched.h> #include <linux/jump_label.h> -#define IA32_PQR_ASSOC 0x0c8f -/** * struct resctrl_pqr_state - State cache for the PQR MSR * @cur_rmid: The cached Resource Monitoring ID
@@ -16,8 +14,8 @@* @default_rmid: The user assigned Resource Monitoring ID * @default_closid: The user assigned cached Class Of Service ID * -* The upper 32 bits of IA32_PQR_ASSOC contain closid and the -* lower 10 bits rmid. The update to IA32_PQR_ASSOC always +* The upper 32 bits of MSR_IA32_PQR_ASSOC contain closid and the +* lower 10 bits rmid. The update to MSR_IA32_PQR_ASSOC always * contains both parts, so we need to cache them. This also * stores the user configured per cpu CLOSID and RMID. *
@@ -77,7 +75,7 @@ static void __resctrl_sched_in(void)if (closid != state->cur_closid || rmid != state->cur_rmid) { state->cur_closid = closid; state->cur_rmid = rmid; -wrmsr (IA32_PQR_ASSOC , rmid, closid); +wrmsr (MSR_IA32_PQR_ASSOC , rmid, closid); } }
arch/x86/kernel/cpu/resctrl/core.c +1 -1
@@ -575,7 +575,7 @@ static void clear_closid_rmid(int cpu) state->default_rmid =0 ; state->cur_closid =0 ; state->cur_rmid =0 ; -wrmsr (IA32_PQR_ASSOC ,0 ,0 ); +wrmsr (MSR_IA32_PQR_ASSOC ,0 ,0 ); }static int resctrl_online_cpu (unsigned int cpu)
arch/x86/kernel/cpu/resctrl/internal.h +0 -10
@@ -8,16 +8,6 @@#include <linux/fs_context.h> #include <linux/jump_label.h> -#define MSR_IA32_L3_QOS_CFG 0xc81 -#define MSR_IA32_L2_QOS_CFG 0xc82 -#define MSR_IA32_L3_CBM_BASE 0xc90 -#define MSR_IA32_L2_CBM_BASE 0xd10 -#define MSR_IA32_MBA_THRTL_BASE 0xd50 -#define MSR_IA32_MBA_BW_BASE 0xc0000200 - -#define MSR_IA32_QM_CTR 0x0c8e -#define MSR_IA32_QM_EVTSEL 0x0c8d -#define L3_QOS_CDP_ENABLE 0x01ULL#define L2_QOS_CDP_ENABLE 0x01ULL
arch/x86/kernel/cpu/resctrl/pseudo_lock.c +2 -2
@@ -477,7 +477,7 @@ static int pseudo_lock_fn(void *_rdtgrp)* pseudo-locked followed by reading of kernel memory to load it * into the cache. */ -__wrmsr (IA32_PQR_ASSOC , rmid_p, rdtgrp->closid); +__wrmsr (MSR_IA32_PQR_ASSOC , rmid_p, rdtgrp->closid);/* * Cache was flushed earlier. Now access kernel memory to read it * into cache region associated with just activated plr->closid.
@@ -513,7 +513,7 @@ static int pseudo_lock_fn(void *_rdtgrp)* Critical section end: restore closid with capacity bitmask that * does not overlap with pseudo-locked region. */ -__wrmsr (IA32_PQR_ASSOC , rmid_p, closid_p); +__wrmsr (MSR_IA32_PQR_ASSOC , rmid_p, closid_p);/* Re-enable the hardware prefetcher(s) */ wrmsrl (MSR_MISC_FEATURE_CONTROL , saved_msr);