x86/mce: Mask out non-address bits from machine check bank
Subsystems (4)
Tony Luck
maintainerPATCH 1/1 x86/mce: Mask out non-address bits from machine check bank
Systems that support various memory encryption schemes (MKTME, TDX, SEV) use high order physical address bits to indicate which key should be used for a specific memory location.
When a memory error is reported, some systems may report those key bits in the IA32_MCi_ADDR machine check MSR. This is legitimate because the Intel SDM has a footnote for the contents of the address register that says: "Useful bits in this field depend on the address methodology in use when the register state is saved."
Note: I don't know if any AMD systems include key bits in the reported address, if they do, they also need this fix. If not, it is harmless.
Add a new #define MCI_ADDR_PHYSADDR for the mask of valid physical address bits within the machine check bank address register. Use this mask for recoverable machine check handling and in the EDAC driver to ignore any key bits that may be present.
[Credit: fix is based on those proposed by Fan Du and Isaku Yamahata]
--- arch/x86/include/asm/mce.h | 3 +++ arch/x86/kernel/cpu/mce/core.c | 14 +++++++++----- drivers/edac/skx_common.c | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-)
arch/x86/include/asm/mce.h +3 -0
@@ -88,6 +88,9 @@#define MCI_MISC_ADDR_MEM 3/* memory address */ #define MCI_MISC_ADDR_GENERIC 7/* generic */ +/* MCi_ADDR register defines */ +#define MCI_ADDR_PHYSADDR GENMASK(boot_cpu_data.x86_phys_bits - 1, 0) +/* CTL2 register defines */ #define MCI_CTL2_CMCI_EN BIT_ULL(30)#define MCI_CTL2_CMCI_THRESHOLD_MASK 0x7fffULL
arch/x86/kernel/cpu/mce/core.c +9 -5
@@ -579,7 +579,7 @@ static int uc_decode_notifier(struct notifier_block *nb, unsigned long val, mce->severity != MCE_DEFERRED_SEVERITY)return NOTIFY_DONE ; - pfn = mce->addr >>PAGE_SHIFT ; + pfn = (mce->addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ;if (!memory_failure (pfn,0 )) {set_mce_nospec (pfn); mce->kflags |=MCE_HANDLED_UC ;
@@ -1308,6 +1308,7 @@ static void kill_me_maybe(struct callback_head *cb) { struct task_struct *p = container_of(cb, struct task_struct, mce_kill_me);int flags =MF_ACTION_REQUIRED ; +unsigned long pfn;int ret; p->mce_count =0 ;
@@ -1316,9 +1317,10 @@ static void kill_me_maybe(struct callback_head *cb)if (!p->mce_ripv) flags |=MF_MUST_KILL ; - ret =memory_failure (p->mce_addr >>PAGE_SHIFT , flags); + pfn = (p->mce_addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; + ret =memory_failure (pfn, flags);if (!ret) { -set_mce_nospec (p->mce_addr >>PAGE_SHIFT ); +set_mce_nospec (pfn);sync_core ();return ; }
@@ -1340,11 +1342,13 @@ static void kill_me_maybe(struct callback_head *cb)static void kill_me_never (struct callback_head *cb) { struct task_struct *p = container_of(cb, struct task_struct, mce_kill_me); +unsigned long pfn; p->mce_count =0 ;pr_err ("Kernel accessed poison in user space at %llx\n" , p->mce_addr); -if (!memory_failure (p->mce_addr >>PAGE_SHIFT ,0 )) -set_mce_nospec (p->mce_addr >>PAGE_SHIFT ); + pfn = (p->mce_addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; +if (!memory_failure (pfn,0 )) +set_mce_nospec (pfn); }static void queue_task_work (struct mce *m,char *msg,void (*func)(struct callback_head *))
drivers/edac/skx_common.c +1 -1
@@ -657,7 +657,7 @@ int skx_mce_check_error(struct notifier_block *nb, unsigned long val,memset (&res,0 ,sizeof (res)); res.mce = mce; - res.addr = mce->addr; + res.addr = mce->addr &MCI_ADDR_PHYSADDR ;/* Try driver decoder first */ if (!(driver_decode &&driver_decode (&res))) {
Signature · 1 line
2.38.1
Quoted 4 lines · Tony Luck
Systems that support various memory encryption schemes (MKTME, TDX, SEV) use high order physical address bits to indicate which key should be used for a specific memory location.
Quoted 9 lines
When a memory error is reported, some systems may report those key bits in the
IA32_MCi_ADDRmachine check MSR. This is legitimate because the Intel SDM has a footnote for the contents of the address register that says: "Useful bits in this field depend on the address methodology in use when the register state is saved."Note: I don't know if any AMD systems include key bits in the reported address, if they do, they also need this fix. If not, it is harmless.
The following note is in the description of the MCA_ADDR[ErrorAddr] field in the AMD Processor Programming Reference.
For physical addresses, the most significant bit is given by Core::X86::Cpuid::LongModeInfo[PhysAddrSize].
And I see that x86_phys_bits does get fixed up in early_detect_mem_encrypt(). I'm not sure if key bits are included in the reported address, or if the HW automatically masks them off. But in any case, I think this patch is valid as you stated above.
Quoted 21 lines
Add a new #define
MCI_ADDR_PHYSADDRfor the mask of valid physical address bits within the machine check bank address register. Use this mask for recoverable machine check handling and in the EDAC driver to ignore any key bits that may be present.[Credit: fix is based on those proposed by Fan Du and Isaku Yamahata]
Signed-off-by Tony Luck <[email protected]>Reported-by Isaku Yamahata <[email protected]>Reported-by Fan Du <[email protected]>--- arch/x86/include/asm/mce.h | 3 +++ arch/x86/kernel/cpu/mce/core.c | 14 +++++++++----- drivers/edac/skx_common.c | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-)arch/x86/include/asm/mce.h +0
-0
arch/x86/include/asm/mce.h line 92
Quoted 5 lines
arch/x86/include/asm/mce.h +2
-0@@ -88,6 +88,9 @@#define MCI_MISC_ADDR_MEM 3/* memory address */ #define MCI_MISC_ADDR_GENERIC 7/* generic */ +/* MCi_ADDR register defines */ +#define MCI_ADDR_PHYSADDR GENMASK(boot_cpu_data.x86_phys_bits - 1, 0)
Should this use GENMASK_ULL in case we're running in 32-bit mode?
Quoted 60 lines
arch/x86/include/asm/mce.h +1
-0+/* CTL2 register defines */ #define MCI_CTL2_CMCI_EN BIT_ULL(30)#define MCI_CTL2_CMCI_THRESHOLD_MASK 0x7fffULLarch/x86/kernel/cpu/mce/core.c +9
-5@@ -579,7 +579,7 @@ static int uc_decode_notifier(struct notifier_block *nb, unsigned long val, mce->severity != MCE_DEFERRED_SEVERITY)return NOTIFY_DONE ; - pfn = mce->addr >>PAGE_SHIFT ; + pfn = (mce->addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ;if (!memory_failure (pfn,0 )) {set_mce_nospec (pfn); mce->kflags |=MCE_HANDLED_UC ;@@ -1308,6 +1308,7 @@ static void kill_me_maybe(struct callback_head *cb) { struct task_struct *p = container_of(cb, struct task_struct, mce_kill_me);int flags =MF_ACTION_REQUIRED ; +unsigned long pfn;int ret; p->mce_count =0 ;@@ -1316,9 +1317,10 @@ static void kill_me_maybe(struct callback_head *cb)if (!p->mce_ripv) flags |=MF_MUST_KILL ; - ret =memory_failure (p->mce_addr >>PAGE_SHIFT , flags); + pfn = (p->mce_addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; + ret =memory_failure (pfn, flags);if (!ret) { -set_mce_nospec (p->mce_addr >>PAGE_SHIFT ); +set_mce_nospec (pfn);sync_core ();return ; }@@ -1340,11 +1342,13 @@ static void kill_me_maybe(struct callback_head *cb)static void kill_me_never (struct callback_head *cb) { struct task_struct *p = container_of(cb, struct task_struct, mce_kill_me); +unsigned long pfn; p->mce_count =0 ;pr_err ("Kernel accessed poison in user space at %llx\n" , p->mce_addr); -if (!memory_failure (p->mce_addr >>PAGE_SHIFT ,0 )) -set_mce_nospec (p->mce_addr >>PAGE_SHIFT ); + pfn = (p->mce_addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; +if (!memory_failure (pfn,0 )) +set_mce_nospec (pfn); }static void queue_task_work (struct mce *m,char *msg,void (*func)(struct callback_head *))drivers/edac/skx_common.c +0
-0
drivers/edac/skx_common.c int skx_mce_check_error(struct notifier_block *nb, unsigned long val, · line 663
Quoted 8 lines
drivers/edac/skx_common.c +1
-1@@ -657,7 +657,7 @@ int skx_mce_check_error(struct notifier_block *nb, unsigned long val,memset (&res,0 ,sizeof (res)); res.mce = mce; - res.addr = mce->addr; + res.addr = mce->addr &MCI_ADDR_PHYSADDR ;/* Try driver decoder first */ if (!(driver_decode &&driver_decode (&res))) {
The address decode in the AMD64 EDAC module operates on a non-physical address, so this update is not needed there. The MCE recovery changes look good to me.
Thanks,
Yazen
Luck, Tony
maintainerQuoted 4 lines
arch/x86/include/asm/mce.h line 92
Quoted 2 lines
arch/x86/include/asm/mce.h +2
-0+/* MCi_ADDR register defines */ +#define MCI_ADDR_PHYSADDR GENMASK(boot_cpu_data.x86_phys_bits - 1, 0)Should this use
GENMASK_ULLin case we're running in 32-bit mode?
Indeed it should! Thanks for the catch. Also for the review.
-Tony
Tony Luck
maintainerPATCH v2 1/1 x86/mce: Mask out non-address bits from machine check bank
In reply to Tony LuckSystems that support various memory encryption schemes (MKTME, TDX, SEV) use high order physical address bits to indicate which key should be used for a specific memory location.
When a memory error is reported, some systems may report those key bits in the IA32_MCi_ADDR machine check MSR.
The Intel SDM has a footnote for the contents of the address register that says: "Useful bits in this field depend on the address methodology in use when the register state is saved."
AMD Processor Programming Reference has a more explicit description of the MCA_ADDR register:
"For physical addresses, the most significant bit is given by
Core::X86::Cpuid::LongModeInfo[PhysAddrSize]."
Add a new #define MCI_ADDR_PHYSADDR for the mask of valid physical address bits within the machine check bank address register. Use this mask for recoverable machine check handling and in the EDAC driver to ignore any key bits that may be present.
[Credit: Based on independent fixes proposed by Fan Du and Isaku Yamahata]
---
Changes in V2:
Yazen: Use GENMASK_ULL() rather that GENMASK() to set up mask of
valid address bits so this will work on 32-bit kernels.
I also updated the commit message from the quote from the AMD documentation that Yazen provided.
arch/x86/include/asm/mce.h | 3 +++ arch/x86/kernel/cpu/mce/core.c | 14 +++++++++----- drivers/edac/skx_common.c | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-)
arch/x86/include/asm/mce.h +3 -0
@@ -88,6 +88,9 @@#define MCI_MISC_ADDR_MEM 3/* memory address */ #define MCI_MISC_ADDR_GENERIC 7/* generic */ +/* MCi_ADDR register defines */ +#define MCI_ADDR_PHYSADDR GENMASK_ULL(boot_cpu_data.x86_phys_bits - 1, 0) +/* CTL2 register defines */ #define MCI_CTL2_CMCI_EN BIT_ULL(30)#define MCI_CTL2_CMCI_THRESHOLD_MASK 0x7fffULL
arch/x86/kernel/cpu/mce/core.c +9 -5
@@ -579,7 +579,7 @@ static int uc_decode_notifier(struct notifier_block *nb, unsigned long val, mce->severity != MCE_DEFERRED_SEVERITY)return NOTIFY_DONE ; - pfn = mce->addr >>PAGE_SHIFT ; + pfn = (mce->addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ;if (!memory_failure (pfn,0 )) {set_mce_nospec (pfn); mce->kflags |=MCE_HANDLED_UC ;
@@ -1308,6 +1308,7 @@ static void kill_me_maybe(struct callback_head *cb) { struct task_struct *p = container_of(cb, struct task_struct, mce_kill_me);int flags =MF_ACTION_REQUIRED ; +unsigned long pfn;int ret; p->mce_count =0 ;
@@ -1316,9 +1317,10 @@ static void kill_me_maybe(struct callback_head *cb)if (!p->mce_ripv) flags |=MF_MUST_KILL ; - ret =memory_failure (p->mce_addr >>PAGE_SHIFT , flags); + pfn = (p->mce_addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; + ret =memory_failure (pfn, flags);if (!ret) { -set_mce_nospec (p->mce_addr >>PAGE_SHIFT ); +set_mce_nospec (pfn);sync_core ();return ; }
@@ -1340,11 +1342,13 @@ static void kill_me_maybe(struct callback_head *cb)static void kill_me_never (struct callback_head *cb) { struct task_struct *p = container_of(cb, struct task_struct, mce_kill_me); +unsigned long pfn; p->mce_count =0 ;pr_err ("Kernel accessed poison in user space at %llx\n" , p->mce_addr); -if (!memory_failure (p->mce_addr >>PAGE_SHIFT ,0 )) -set_mce_nospec (p->mce_addr >>PAGE_SHIFT ); + pfn = (p->mce_addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; +if (!memory_failure (pfn,0 )) +set_mce_nospec (pfn); }static void queue_task_work (struct mce *m,char *msg,void (*func)(struct callback_head *))
drivers/edac/skx_common.c +1 -1
@@ -657,7 +657,7 @@ int skx_mce_check_error(struct notifier_block *nb, unsigned long val,memset (&res,0 ,sizeof (res)); res.mce = mce; - res.addr = mce->addr; + res.addr = mce->addr &MCI_ADDR_PHYSADDR ;/* Try driver decoder first */ if (!(driver_decode &&driver_decode (&res))) {
Signature · 1 line
2.38.1
The following commit has been merged into the ras/core branch of tip:
The following commit has been merged into the ras/core branch of tip:
Commit-ID: 8a01ec97dc066009dd89e43bfcf55644f2dd6d19 Gitweb: https://git.kernel.org/tip/8a01ec97dc066009dd89e43bfcf55644f2dd6d19 Author: Tony Luck <[email protected]> AuthorDate: Mon, 09 Jan 2023 07:29:36 -08:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 10 Jan 2023 11:47:07 +01:00
x86/mce: Mask out non-address bits from machine check bank
Systems that support various memory encryption schemes (MKTME, TDX, SEV) use high order physical address bits to indicate which key should be used for a specific memory location.
When a memory error is reported, some systems may report those key bits in the IA32_MCi_ADDR machine check MSR.
The Intel SDM has a footnote for the contents of the address register that says: "Useful bits in this field depend on the address methodology in use when the register state is saved."
AMD Processor Programming Reference has a more explicit description of the MCA_ADDR register:
"For physical addresses, the most significant bit is given by
Core::X86::Cpuid::LongModeInfo[PhysAddrSize]."
Add a new #define MCI_ADDR_PHYSADDR for the mask of valid physical address bits within the machine check bank address register. Use this mask for recoverable machine check handling and in the EDAC driver to ignore any key bits that may be present.
[ Tony: Based on independent fixes proposed by Fan Du and Isaku Yamahata ]
--- arch/x86/include/asm/mce.h | 3 +++ arch/x86/kernel/cpu/mce/core.c | 14 +++++++++----- drivers/edac/skx_common.c | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-)
arch/x86/include/asm/mce.h +3 -0
@@ -88,6 +88,9 @@#define MCI_MISC_ADDR_MEM 3/* memory address */ #define MCI_MISC_ADDR_GENERIC 7/* generic */ +/* MCi_ADDR register defines */ +#define MCI_ADDR_PHYSADDR GENMASK_ULL(boot_cpu_data.x86_phys_bits - 1, 0) +/* CTL2 register defines */ #define MCI_CTL2_CMCI_EN BIT_ULL(30)#define MCI_CTL2_CMCI_THRESHOLD_MASK 0x7fffULL
arch/x86/kernel/cpu/mce/core.c +9 -5
@@ -573,7 +573,7 @@ static int uc_decode_notifier(struct notifier_block *nb, unsigned long val, mce->severity != MCE_DEFERRED_SEVERITY)return NOTIFY_DONE ; - pfn = mce->addr >>PAGE_SHIFT ; + pfn = (mce->addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ;if (!memory_failure (pfn,0 )) {set_mce_nospec (pfn); mce->kflags |=MCE_HANDLED_UC ;
@@ -1294,6 +1294,7 @@ static void kill_me_maybe(struct callback_head *cb) { struct task_struct *p = container_of(cb, struct task_struct, mce_kill_me);int flags =MF_ACTION_REQUIRED ; +unsigned long pfn;int ret; p->mce_count =0 ;
@@ -1302,9 +1303,10 @@ static void kill_me_maybe(struct callback_head *cb)if (!p->mce_ripv) flags |=MF_MUST_KILL ; - ret =memory_failure (p->mce_addr >>PAGE_SHIFT , flags); + pfn = (p->mce_addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; + ret =memory_failure (pfn, flags);if (!ret) { -set_mce_nospec (p->mce_addr >>PAGE_SHIFT ); +set_mce_nospec (pfn);sync_core ();return ; }
@@ -1326,11 +1328,13 @@ static void kill_me_maybe(struct callback_head *cb)static void kill_me_never (struct callback_head *cb) { struct task_struct *p = container_of(cb, struct task_struct, mce_kill_me); +unsigned long pfn; p->mce_count =0 ;pr_err ("Kernel accessed poison in user space at %llx\n" , p->mce_addr); -if (!memory_failure (p->mce_addr >>PAGE_SHIFT ,0 )) -set_mce_nospec (p->mce_addr >>PAGE_SHIFT ); + pfn = (p->mce_addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; +if (!memory_failure (pfn,0 )) +set_mce_nospec (pfn); }static void queue_task_work (struct mce *m,char *msg,void (*func)(struct callback_head *))
drivers/edac/skx_common.c +1 -1
@@ -657,7 +657,7 @@ int skx_mce_check_error(struct notifier_block *nb, unsigned long val,memset (&res,0 ,sizeof (res)); res.mce = mce; - res.addr = mce->addr; + res.addr = mce->addr &MCI_ADDR_PHYSADDR ;/* Try driver decoder first */ if (!(driver_decode &&driver_decode (&res))) {