Fixes for recovery for machine check in TDX/SEAM non-root mode
v2 cover Fixes for recovery for machine check in TDX/SEAM non-root mode
Hi
Here is V2 of a small fix related to recovery for machine check in TDX/SEAM non-root mode, and a small tidy-up.
Changes in V2:
x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Mask address when it is read
Amend struct mce addr description
KVM: TDX: Do not clear poisoned pages
Patch dropped
x86/mce: Remove MCI_ADDR_PHYSADDR
New patch
The issue was noticed as part of work to determine the conditions under which TDX private memory needs to be cleared after being reclaimed. For guests with a large amount of memory, clearing all private pages during VM shutdown can take minutes, so we are looking at when that can be skipped. A future patch will deal with that.
One thing that was investigated was the effect of deliberately corrupting a TDX guest private page by writing to it on the host, and then reading it on the guest, which results in a machine check as expected, but revealed the issue addressed in patch 1.
There are 2 outstanding issues:
1. It is assumed that once the TDX VM is shutdown that the memory is returned to the allocator. That is true at present, but may not be in the future. Consider, for example, patch set "New KVM ioctl to link a gmem inode to a new gmem file" :
https://lore.kernel.org/r/[email protected]/
2. Currently, KVM TDX does not cater for the TDX VM to enter a FATAL error state, where the only operation permitted is to tear down the VM. KVM just carries on, hitting various errors, but in particular, memory reclaim fails because it is not following the teardown procedure, and all guest private memory is leaked.
Adrian Hunter (2):
x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode x86/mce: Remove MCI_ADDR_PHYSADDR
arch/x86/include/asm/mce.h | 3 --- arch/x86/include/uapi/asm/mce.h | 2 +- arch/x86/kernel/cpu/mce/core.c | 9 ++++++--- drivers/cxl/core/mce.c | 2 +- drivers/edac/skx_common.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)
Regards
Adrian
PATCH RESEND v2 1/2 x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Commit 8a01ec97dc066 ("x86/mce: Mask out non-address bits from machine check bank") introduced a new #define MCI_ADDR_PHYSADDR for the mask of valid physical address bits within the machine check bank address register.
This is particularly needed in the case of errors in TDX/SEAM non-root mode because the reported address contains the TDX KeyID. Refer to TDX and TME-MK documentation for more information about KeyIDs.
Commit 7911f145de5fe ("x86/mce: Implement recovery for errors in TDX/SEAM non-root mode") uses the address to mark the affected page as poisoned, but omits to use the aforementioned mask.
Investigation of user space expectations has concluded it would be more correct for the address to contain only address bits in the first place. Refer https://lore.kernel.org/r/[email protected]
Mask the address when it is read from the machine check bank address register. Do not use MCI_ADDR_PHYSADDR because that will be removed in a later patch.
It is assumed __log_error() in arch/x86/kernel/cpu/mce/amd.c does not need similar treatment.
Amend struct mce addr member description slightly to reflect that it is not, and never has been, an exact copy of the bank's MCi_ADDR MSR.
---
Changes in V2:
Mask address when it is read
Amend struct mce addr description
arch/x86/include/uapi/asm/mce.h | 2 +- arch/x86/kernel/cpu/mce/core.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
arch/x86/include/uapi/asm/mce.h +1 -1
@@ -14,7 +14,7 @@struct mce {__u64 status;/* Bank's MCi_STATUS MSR */ __u64 misc;/* Bank's MCi_MISC MSR */ -__u64 addr;/* Bank's MCi_ADDR MSR */ +__u64 addr;/* Address from bank's MCi_ADDR MSR */ __u64 mcgstatus;/* Machine Check Global Status MSR */ __u64 ip;/* Instruction Pointer when the error happened */ __u64 tsc;/* CPU time stamp counter */
arch/x86/kernel/cpu/mce/core.c +3 -0
@@ -699,6 +699,9 @@ static noinstr void mce_read_aux(struct mce_hw_err *err, int i) }smca_extract_err_addr (m); + +/* Mask out non-address bits, such as TDX KeyID */ + m->addr &=GENMASK_ULL (boot_cpu_data.x86_phys_bits -1 ,0 ); }if (mce_flags.smca) {
Signature · 1 line
2.48.1
Re: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 20 lines · Adrian Hunter
Commit
8a01ec97dc066("x86/mce: Mask out non-address bits from machine check bank") introduced a new #defineMCI_ADDR_PHYSADDRfor the mask of valid physical address bits within the machine check bank address register.This is particularly needed in the case of errors in TDX/SEAM non-root mode because the reported address contains the TDX KeyID. Refer to TDX and TME-MK documentation for more information about KeyIDs.
Commit
7911f145de5fe("x86/mce: Implement recovery for errors in TDX/SEAM non-root mode") uses the address to mark the affected page as poisoned, but omits to use the aforementioned mask.Investigation of user space expectations has concluded it would be more correct for the address to contain only address bits in the first place. Refer https://lore.kernel.org/r/[email protected]
Mask the address when it is read from the machine check bank address register. Do not use
MCI_ADDR_PHYSADDRbecause that will be removed in a later patch.
Quoted 6 lines
It is assumed
__log_error()inarch/x86/kernel/cpu/mce/amd.cdoes not need similar treatment.Amend struct mce addr member description slightly to reflect that it is not, and never has been, an exact copy of the bank's
MCi_ADDRMSR.
I think it would be more accurate to say that the MCi_ADDR MSR is not, and never has been, guaranteed to be a system physical address.
We could introduce a new field that represents the system physical address, if one exists for the error type. This way we can operate on a value without assumption or additional checks. And we can keep the raw MCi_ADDR MSR value in case it is of value to debug folks or hardware designers. In my experience, they seem to appreciate having the full, unfiltered data. We don't give them that today, but we can work towards that goal.
I have some old work in this area:
https://github.com/AMDESE/linux/commit/76732c67cbf96c14f55ed1061804db9ff1505ea3
This isn't a quick fix, so maybe we can come back to it if folks are happy with your current solution.
But I do think there's value in sharing the data as given to us by hardware. And providing new interfaces to users if we need to modify something for them to take action.
Thanks,
Yazen
Luck, Tony
maintainerRe: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 31 lines · Yazen Ghannam
Quoted 20 lines · Adrian Hunter
Commit
8a01ec97dc066("x86/mce: Mask out non-address bits from machine check bank") introduced a new #defineMCI_ADDR_PHYSADDRfor the mask of valid physical address bits within the machine check bank address register.This is particularly needed in the case of errors in TDX/SEAM non-root mode because the reported address contains the TDX KeyID. Refer to TDX and TME-MK documentation for more information about KeyIDs.
Commit
7911f145de5fe("x86/mce: Implement recovery for errors in TDX/SEAM non-root mode") uses the address to mark the affected page as poisoned, but omits to use the aforementioned mask.Investigation of user space expectations has concluded it would be more correct for the address to contain only address bits in the first place. Refer https://lore.kernel.org/r/[email protected]
Mask the address when it is read from the machine check bank address register. Do not use
MCI_ADDR_PHYSADDRbecause that will be removed in a later patch.Quoted 6 lines
It is assumed
__log_error()inarch/x86/kernel/cpu/mce/amd.cdoes not need similar treatment.Amend struct mce addr member description slightly to reflect that it is not, and never has been, an exact copy of the bank's
MCi_ADDRMSR.I think it would be more accurate to say that the
MCi_ADDRMSR is not, and never has been, guaranteed to be a system physical address.
Quoted 7 lines
We could introduce a new field that represents the system physical address, if one exists for the error type. This way we can operate on a value without assumption or additional checks. And we can keep the raw
MCi_ADDRMSR value in case it is of value to debug folks or hardware designers. In my experience, they seem to appreciate having the full, unfiltered data. We don't give them that today, but we can work towards that goal.
Having and exact copy of MCi_ADDR might be useful. I recall some angst about this code masking off low order bits:
m->addr = mce_rdmsrq(mca_msr_reg(i, MCA_ADDR));
/*
* Mask the reported address by the reported granularity.
*/
if (mca_cfg.ser && (m->status & MCI_STATUS_MISCV)) {
u8 shift = MCI_MISC_ADDR_LSB(m->misc);
m->addr >>= shift;
m->addr <<= shift;
}this proposal masks some high order bits too.
I second Yazen's suggestion of a new field. One for the raw value, another for the massaged phsical address derived from the MSR.
-Tony
Re: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 54 lines · Tony
Quoted 31 lines · Yazen Ghannam
Quoted 20 lines · Adrian Hunter
Commit
8a01ec97dc066("x86/mce: Mask out non-address bits from machine check bank") introduced a new #defineMCI_ADDR_PHYSADDRfor the mask of valid physical address bits within the machine check bank address register.This is particularly needed in the case of errors in TDX/SEAM non-root mode because the reported address contains the TDX KeyID. Refer to TDX and TME-MK documentation for more information about KeyIDs.
Commit
7911f145de5fe("x86/mce: Implement recovery for errors in TDX/SEAM non-root mode") uses the address to mark the affected page as poisoned, but omits to use the aforementioned mask.Investigation of user space expectations has concluded it would be more correct for the address to contain only address bits in the first place. Refer https://lore.kernel.org/r/[email protected]
Mask the address when it is read from the machine check bank address register. Do not use
MCI_ADDR_PHYSADDRbecause that will be removed in a later patch.Quoted 6 lines
It is assumed
__log_error()inarch/x86/kernel/cpu/mce/amd.cdoes not need similar treatment.Amend struct mce addr member description slightly to reflect that it is not, and never has been, an exact copy of the bank's
MCi_ADDRMSR.I think it would be more accurate to say that the
MCi_ADDRMSR is not, and never has been, guaranteed to be a system physical address.Quoted 7 lines
We could introduce a new field that represents the system physical address, if one exists for the error type. This way we can operate on a value without assumption or additional checks. And we can keep the raw
MCi_ADDRMSR value in case it is of value to debug folks or hardware designers. In my experience, they seem to appreciate having the full, unfiltered data. We don't give them that today, but we can work towards that goal.Having and exact copy of
MCi_ADDRmight be useful. I recall some angst about this code masking off low order bits:m->addr = mce_rdmsrq(mca_msr_reg(i, MCA_ADDR)); /* * Mask the reported address by the reported granularity. */ if (mca_cfg.ser && (m->status & MCI_STATUS_MISCV)) { u8 shift = MCI_MISC_ADDR_LSB(m->misc); m->addr >>= shift; m->addr <<= shift; }
Quoted 4 lines
this proposal masks some high order bits too.
I second Yazen's suggestion of a new field. One for the raw value, another for the massaged phsical address derived from the MSR.
For struct mce? Maybe that should be 2 new fields:
__u64 addr; /* Deprecated */ ... __u64 mci_addr; /* Bank's MCi_ADDR MSR */ __u64 phys_addr; /* Physical address */
Luck, Tony
maintainerRE: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 6 lines
For struct mce? Maybe that should be 2 new fields:
__u64 addr; /* Deprecated */ ... __u64 mci_addr; /* Bank's MCi_ADDR MSR */ __u64 phys_addr; /* Physical address */
Would "addr" keep the current (low bits masked, high bits preserved) value?
-Tony
Re: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 8 lines · Tony
Quoted 6 lines
For struct mce? Maybe that should be 2 new fields:
__u64 addr; /* Deprecated */ ... __u64 mci_addr; /* Bank's MCi_ADDR MSR */ __u64 phys_addr; /* Physical address */Would "addr" keep the current (low bits masked, high bits preserved) value?
Yeah, it wouldn't make much sense if phys_addr was the same as addr anyway. Not really thinking
Luck, Tony
maintainerRE: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 11 lines
Quoted 8 lines
Quoted 6 lines
For struct mce? Maybe that should be 2 new fields:
__u64addr; /* Deprecated */
...
__u64mci_addr; /* Bank'sMCi_ADDRMSR */
__u64phys_addr; /* Physical address */Would "addr" keep the current (low bits masked, high bits preserved) value?
Yeah, it wouldn't make much sense if
phys_addrwas the same as addr anyway. Not really thinking
The other option (but a bad one) would be:
__u64 deprecated; /* was "addr" */
...
__u64 mci_addr; /* Bank's MCi_ADDR MSR */
__u64 phys_addr; /* Physical address */
which would be good to force cleanup in the kernel, but bad for preserving ABI (since "struct mce" is visible to user space via /dev/mcelog).
-Tony
Re: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 14 lines · Tony
Quoted 11 lines
Quoted 8 lines
Quoted 6 lines
For struct mce? Maybe that should be 2 new fields:
__u64addr; /* Deprecated */
...
__u64mci_addr; /* Bank'sMCi_ADDRMSR */
__u64phys_addr; /* Physical address */Would "addr" keep the current (low bits masked, high bits preserved) value?
Yeah, it wouldn't make much sense if
phys_addrwas the same as addr anyway. Not really thinkingThe other option (but a bad one) would be:
Quoted 8 lines
__u64deprecated; /* was "addr" */
...
__u64mci_addr; /* Bank'sMCi_ADDRMSR */
__u64phys_addr; /* Physical address */which would be good to force cleanup in the kernel, but bad for preserving ABI (since "struct mce" is visible to user space via
/dev/mcelog).
/dev/mcelog has been deprecated for a while.
Is the mcelog app still in active development? Could it be updated to use trace events for MCE info?
You could also just fix up the address value in the mcelog notifier's copy. I believe it has its own cache separate from the MCE genpool.
Thanks,
Yazen
Re: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 20 lines · Yazen Ghannam
Quoted 19 lines · Tony
Quoted 11 lines
Quoted 8 lines
Quoted 6 lines
For struct mce? Maybe that should be 2 new fields:
__u64addr; /* Deprecated */
...
__u64mci_addr; /* Bank'sMCi_ADDRMSR */
__u64phys_addr; /* Physical address */Would "addr" keep the current (low bits masked, high bits preserved) value?
Yeah, it wouldn't make much sense if
phys_addrwas the same as addr anyway. Not really thinkingThe other option (but a bad one) would be:
__u64deprecated; /* was "addr" */
...
__u64mci_addr; /* Bank'sMCi_ADDRMSR */
__u64phys_addr; /* Physical address */
Quoted 5 lines
Quoted 3 lines
which would be good to force cleanup in the kernel, but bad for preserving ABI (since "struct mce" is visible to user space via
/dev/mcelog).
/dev/mceloghas been deprecated for a while.
There is also mce_record tracepoint
Quoted 6 lines
Is the mcelog app still in active development? Could it be updated to use trace events for MCE info?
You could also just fix up the address value in the mcelog notifier's copy. I believe it has its own cache separate from the MCE genpool.
Is there an advantage to fixing up later rather than when addr is initially assigned?
Borislav Petkov
maintainerRe: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
In reply to Adrian HunterQuoted 12 lines · Adrian Hunter
Commit
8a01ec97dc066("x86/mce: Mask out non-address bits from machine check bank") introduced a new #defineMCI_ADDR_PHYSADDRfor the mask of valid physical address bits within the machine check bank address register.This is particularly needed in the case of errors in TDX/SEAM non-root mode because the reported address contains the TDX KeyID. Refer to TDX and TME-MK documentation for more information about KeyIDs.
Commit
7911f145de5fe("x86/mce: Implement recovery for errors in TDX/SEAM non-root mode") uses the address to mark the affected page as poisoned, but omits to use the aforementioned mask.
Quoted 7 lines
Investigation of user space expectations has concluded it would be more correct for the address to contain only address bits in the first place. Refer https://lore.kernel.org/r/[email protected]
Mask the address when it is read from the machine check bank address register. Do not use
MCI_ADDR_PHYSADDRbecause that will be removed in a later patch.
Why is this patch talking about TDX-something but doing "global" changes to mce.addr?
Why don't you simply do a TDX-specific masking out when you're running on in TDX env and leave the rest as is?
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 17 lines · Borislav Petkov
Quoted 16 lines · Adrian Hunter
Commit
8a01ec97dc066("x86/mce: Mask out non-address bits from machine check bank") introduced a new #defineMCI_ADDR_PHYSADDRfor the mask of valid physical address bits within the machine check bank address register.This is particularly needed in the case of errors in TDX/SEAM non-root mode because the reported address contains the TDX KeyID. Refer to TDX and TME-MK documentation for more information about KeyIDs.
Commit
7911f145de5fe("x86/mce: Implement recovery for errors in TDX/SEAM non-root mode") uses the address to mark the affected page as poisoned, but omits to use the aforementioned mask.Investigation of user space expectations has concluded it would be more correct for the address to contain only address bits in the first place. Refer https://lore.kernel.org/r/[email protected]
Quoted 6 lines
Quoted 3 lines
Mask the address when it is read from the machine check bank address register. Do not use
MCI_ADDR_PHYSADDRbecause that will be removed in a later patch.Why is this patch talking about TDX-something but doing "global" changes to mce.addr?
It falls a bit into the category of: easier to maintain a global way of doing things than have lots of special-cases.
Quoted 4 lines
Why don't you simply do a TDX-specific masking out when you're running on in TDX env and leave the rest as is?
It was kinda like that in V1:
https://lore.kernel.org/r/[email protected]/
where the code change was dealing with SEAM_NR in the block starting:
} else if (m->mcgstatus & MCG_STATUS_SEAM_NR) {Then Dave asked about changing addr itself:
https://lore.kernel.org/all/[email protected]/ https://lore.kernel.org/all/[email protected]/
And it seems like user space does expect addr to be a physical address:
https://lore.kernel.org/r/[email protected]
Something like below would work, but doesn't answer Dave's question of why not do it in mce_read_aux()
arch/x86/kernel/cpu/mce/core.c +3 -1
@@ -1655,28 +1655,30 @@ noinstr void do_machine_check(struct pt_regs *regs) }else if (m->mcgstatus &MCG_STATUS_SEAM_NR ) {/* * Saved RIP on stack makes it look like the machine check * was taken in the kernel on the instruction following * the entry to SEAM mode. But MCG_STATUS_SEAM_NR indicates * that the machine check was taken inside SEAM non-root * mode. CPU core has already marked that guest as dead. * It is OK for the kernel to resume execution at the * apparent point of the machine check as the fault did * not occur there. Mark the page as poisoned so it won't * be added to free list when the guest is terminated. */ if (mce_usable_address (m)) { -struct page *p =pfn_to_online_page (m->addr >>PAGE_SHIFT ); +struct page *p; + m->addr &=MCI_ADDR_PHYSADDR ; + p =pfn_to_online_page (m->addr >>PAGE_SHIFT );if (p)SetPageHWPoison (p); } }else {
Borislav Petkov
maintainerRe: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 2 lines · Adrian Hunter
Something like below would work, but doesn't answer Dave's question of why not do it in
mce_read_aux()
So, let me see what I understand from all this bla: you want to zap the KeyID from mci_addr because it is completely useless there. So zap it.
You can't make any other changes to mci_addr because that goes to luserspace.
So far so good.
Now, all that other bla leads me to believe that there might be some need to dump the raw mci_addr value after all.
If so, your patch is not needed.
Which makes me think, all yall folks need to make up your mind here.
And you need to get rid of all that extraneous information in your commit message:
"Investigation of user space expectations has concluded it..."
No investigation needed - this is exported to userspace so you can't touch it.
The one and only question you need to answer is, do you really need KeyID in it or not. And whatever you do, once you do it, we're stuck with it because it goes out to userspace.
Especially if you want this backported to stable.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 3 lines · Borislav Petkov
Quoted 2 lines · Adrian Hunter
Something like below would work, but doesn't answer Dave's question of why not do it in
mce_read_aux()
Thanks for looking at this.
Quoted 2 lines
So, let me see what I understand from all this bla: you want to zap the KeyID from
mci_addrbecause it is completely useless there. So zap it.
Not exactly. I just want to fix the bug whereby the mce handler fails to mark the affected page as poisoned because it does not remove the KeyID from the address before looking-up the page.
Quoted 9 lines
You can't make any other changes to
mci_addrbecause that goes to luserspace.So far so good.
Now, all that other bla leads me to believe that there might be some need to dump the raw
mci_addrvalue after all.If so, your patch is not needed.
Quoted 8 lines
Which makes me think, all yall folks need to make up your mind here.
And you need to get rid of all that extraneous information in your commit message:
"Investigation of user space expectations has concluded it..."
No investigation needed - this is exported to userspace so you can't touch it.
It is a bit of a grey area. No one expects to find non-address bits in struct mce addr, and the kernel already strips low-order bits, and in the case of SMCA, high-order bits too, refer smca_extract_err_addr().
Quoted 3 lines
The one and only question you need to answer is, do you really need KeyID in it or not. And whatever you do, once you do it, we're stuck with it because it goes out to userspace.
No, the KeyID is almost useless. It is just a dynamically allocated number. It might indicate which TDX VM encountered the error, except the MCE is fatal to the VM, so a fatal error is reported to the VMM anyway.
However, it is allowed to extend struct mce, so adding KeyID or raw MCI ADDR later is quite possible.
Quoted 1 line
Especially if you want this backported to stable.
The bug exists in stable. Ideally it would get fixed there too somehow.
Borislav Petkov
maintainerRe: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 3 lines · Adrian Hunter
Not exactly. I just want to fix the bug whereby the mce handler fails to mark the affected page as poisoned because it does not remove the KeyID from the address before looking-up the page.
Lemme ask this differently then: are you ever going to need KeyID in mci_addr?
Quoted 1 line
No one expects to find non-address bits in struct mce addr,
You're preaching to the choir - I don't know whose idea it was to shove a key ID in an address value... it sure sounds silly.
Quoted 2 lines
However, it is allowed to extend struct mce, so adding KeyID or raw MCI ADDR later is quite possible.
Why would you want to do that? Do you have a use case?
If not, you can drop that whole angle about adding KeyID later. If yes, let's hear it.
Just this hypothetically, maybe we'd need it, maybe not, it might be a good idea ... bla is muddying the water unnecessarily. So let's focus pls and address *only* the issue(s) at hand.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
Quoted 6 lines · Borislav Petkov
Quoted 3 lines · Adrian Hunter
Not exactly. I just want to fix the bug whereby the mce handler fails to mark the affected page as poisoned because it does not remove the KeyID from the address before looking-up the page.
Lemme ask this differently then: are you ever going to need KeyID in
mci_addr?
No
Quoted 6 lines
Quoted 2 lines
No one expects to find non-address bits in struct mce addr,
You're preaching to the choir - I don't know whose idea it was to shove a key ID in an address value... it sure sounds silly.
Quoted 6 lines
Quoted 2 lines
However, it is allowed to extend struct mce, so adding KeyID or raw MCI ADDR later is quite possible.
Why would you want to do that? Do you have a use case?
If not, you can drop that whole angle about adding KeyID later
Droppin' it.
Re: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
In reply to Borislav PetkovQuoted 21 lines · Borislav Petkov
Quoted 12 lines · Adrian Hunter
Commit
8a01ec97dc066("x86/mce: Mask out non-address bits from machine check bank") introduced a new #defineMCI_ADDR_PHYSADDRfor the mask of valid physical address bits within the machine check bank address register.This is particularly needed in the case of errors in TDX/SEAM non-root mode because the reported address contains the TDX KeyID. Refer to TDX and TME-MK documentation for more information about KeyIDs.
Commit
7911f145de5fe("x86/mce: Implement recovery for errors in TDX/SEAM non-root mode") uses the address to mark the affected page as poisoned, but omits to use the aforementioned mask.Quoted 7 lines
Investigation of user space expectations has concluded it would be more correct for the address to contain only address bits in the first place. Refer https://lore.kernel.org/r/[email protected]
Mask the address when it is read from the machine check bank address register. Do not use
MCI_ADDR_PHYSADDRbecause that will be removed in a later patch.
Quoted 6 lines
Why is this patch talking about TDX-something but doing "global" changes to mce.addr?
Why don't you simply do a TDX-specific masking out when you're running on in TDX env and leave the rest as is?
How about this?
arch/x86/kernel/cpu/mce/core.c +2 -0
@@ -699,6 +699,8 @@ static noinstr void mce_read_aux(struct mce_hw_err *err, int i) }smca_extract_err_addr (m); + +tdx_extract_err_addr (m); }if (mce_flags.smca) {
arch/x86/kernel/cpu/mce/internal.h +10 -0
@@ -298,6 +298,16 @@ static inline bool amd_mce_usable_address(struct mce *m) { return false; }static inline void smca_extract_err_addr (struct mce *m) { }#endif +#ifdef CONFIG_X86_MCE_INTEL +static __always_inline void tdx_extract_err_addr(struct mce *m) +{ +if (boot_cpu_has (X86_FEATURE_TDX_HOST_PLATFORM )) + m->addr &=GENMASK_ULL (boot_cpu_data.x86_phys_bits -1 ,0 ); +} +#else +static inline void tdx_extract_err_addr (struct mce *m) { } +#endif +#ifdef CONFIG_X86_ANCIENT_MCE void intel_p5_mcheck_init (struct cpuinfo_x86 *c);void winchip_mcheck_init (struct cpuinfo_x86 *c);
Borislav Petkov
maintainerRe: [PATCH RESEND V2 1/2] x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode
arch/x86/kernel/cpu/mce/internal.h static inline bool amd_mce_usable_address(struct mce *m) { return false; } · line 305
Quoted 5 lines · Adrian Hunter
arch/x86/kernel/cpu/mce/internal.h +5
-0+#ifdef CONFIG_X86_MCE_INTEL +static __always_inline void tdx_extract_err_addr(struct mce *m) +{ +if (boot_cpu_has (X86_FEATURE_TDX_HOST_PLATFORM )) + m->addr &=GENMASK_ULL (boot_cpu_data.x86_phys_bits -1 ,0 );
Right, you can stick that thing straight into mce_read_aux() since it is simple enough and drop the ifdeffery and use cpu_feature_enabled():
mce_read_aux:
... /* Remove TDX KeyID from the address */ if (cpu_feature_enabled(X86_FEATURE_TDX_HOST_PLATFORM)) m->addr &= GENMASK_ULL(boot_cpu_data.x86_phys_bits - 1, 0);
Something like that...
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquettePATCH RESEND v2 2/2 x86/mce: Remove MCI_ADDR_PHYSADDR
In reply to Adrian HunterNow that the address is masked when it is read from the machine check bank address register (refer patch "x86/mce: Fix missing address mask in recovery for errors in TDX/SEAM non-root mode"), the MCI_ADDR_PHYSADDR macro is no longer needed. Remove it.
Note MCE address information also enters the kernel from APEI via the Common Platform Error Record (CPER) Memory Error Section "Physical Address" field (struct cper_sec_mem_err physical_addr), refer the UEFI specification. It is assumed that field contains only the physical address.
---
Changes in V2:
New patch
arch/x86/include/asm/mce.h | 3 --- arch/x86/kernel/cpu/mce/core.c | 6 +++--- drivers/cxl/core/mce.c | 2 +- drivers/edac/skx_common.c | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-)
arch/x86/include/asm/mce.h +0 -3
@@ -91,9 +91,6 @@#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 +3 -3
@@ -642,7 +642,7 @@ static int uc_decode_notifier(struct notifier_block *nb, unsigned long val, mce->severity != MCE_DEFERRED_SEVERITY)return NOTIFY_DONE ; - pfn = (mce->addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; + pfn = mce->addr >>PAGE_SHIFT ;if (!memory_failure (pfn,0 )) {set_mce_nospec (pfn); mce->kflags |=MCE_HANDLED_UC ;
@@ -1415,7 +1415,7 @@ static void kill_me_maybe(struct callback_head *cb)if (!p->mce_ripv) flags |=MF_MUST_KILL ; - pfn = (p->mce_addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; + pfn = p->mce_addr >>PAGE_SHIFT ; ret =memory_failure (pfn, flags);if (!ret) {set_mce_nospec (pfn);
@@ -1444,7 +1444,7 @@ static void kill_me_never(struct callback_head *cb) p->mce_count =0 ;pr_err ("Kernel accessed poison in user space at %llx\n" , p->mce_addr); - pfn = (p->mce_addr &MCI_ADDR_PHYSADDR ) >>PAGE_SHIFT ; + pfn = p->mce_addr >>PAGE_SHIFT ;if (!memory_failure (pfn,0 ))set_mce_nospec (pfn); }
drivers/cxl/core/mce.c +1 -1
@@ -24,7 +24,7 @@ static int cxl_handle_mce(struct notifier_block *nb, unsigned long val,if (!endpoint)return NOTIFY_DONE ; - spa = mce->addr &MCI_ADDR_PHYSADDR ; + spa = mce->addr; pfn = spa >>PAGE_SHIFT ;if (!pfn_valid (pfn))
drivers/edac/skx_common.c +1 -1
@@ -732,7 +732,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 &MCI_ADDR_PHYSADDR ; + res.addr = mce->addr;if (!pfn_to_online_page (res.addr >>PAGE_SHIFT ) && !arch_is_platform_page (res.addr)) {pr_err ("Invalid address 0x%llx in IA32_MC%d_ADDR\n" , mce->addr, mce->bank);return NOTIFY_DONE ;
Signature · 1 line
2.48.1