On Fri, Aug 20, 2021 at 10:58:42AM -0500, Brijesh Singh wrote: > When SEV-SNP is enabled globally, a write from the host goes through the > RMP check. If the hardware encounters the check failure, then it raises > the #PF (with RMP set). Dump the RMP entry at the faulting pfn to help > the debug. > > Signed-off-by: Brijesh Singh <brijesh.singh@xxxxxxx> > --- > arch/x86/include/asm/sev.h | 7 +++++++ > arch/x86/kernel/sev.c | 43 ++++++++++++++++++++++++++++++++++++++ > arch/x86/mm/fault.c | 17 +++++++++++---- > include/linux/sev.h | 2 ++ > 4 files changed, 65 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h > index 92ced9626e95..569294f687e6 100644 > --- a/arch/x86/include/asm/sev.h > +++ b/arch/x86/include/asm/sev.h > @@ -106,6 +106,11 @@ struct __packed rmpentry { > > #define rmpentry_assigned(x) ((x)->info.assigned) > #define rmpentry_pagesize(x) ((x)->info.pagesize) > +#define rmpentry_vmsa(x) ((x)->info.vmsa) > +#define rmpentry_asid(x) ((x)->info.asid) > +#define rmpentry_validated(x) ((x)->info.validated) > +#define rmpentry_gpa(x) ((unsigned long)(x)->info.gpa) > +#define rmpentry_immutable(x) ((x)->info.immutable) If some of those accessors are going to be used only in dump_rmpentry(), then you don't really need them. > > #define RMPADJUST_VMSA_PAGE_BIT BIT(16) > > @@ -165,6 +170,7 @@ void __init snp_prep_memory(unsigned long paddr, unsigned int sz, enum psc_op op > void snp_set_memory_shared(unsigned long vaddr, unsigned int npages); > void snp_set_memory_private(unsigned long vaddr, unsigned int npages); > void snp_set_wakeup_secondary_cpu(void); > +void dump_rmpentry(u64 pfn); > #ifdef __BOOT_COMPRESSED > bool sev_snp_enabled(void); > #else > @@ -188,6 +194,7 @@ static inline void snp_set_memory_shared(unsigned long vaddr, unsigned int npage > static inline void snp_set_memory_private(unsigned long vaddr, unsigned int npages) { } > static inline void snp_set_wakeup_secondary_cpu(void) { } > static inline void sev_snp_cpuid_init(struct boot_params *bp) { } > +static inline void dump_rmpentry(u64 pfn) {} > #ifdef __BOOT_COMPRESSED > static inline bool sev_snp_enabled { return false; } > #else > diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c > index bad41deb8335..8b3e83e50468 100644 > --- a/arch/x86/kernel/sev.c > +++ b/arch/x86/kernel/sev.c > @@ -2404,6 +2404,49 @@ static struct rmpentry *__snp_lookup_rmpentry(u64 pfn, int *level) > return entry; > } > > +void dump_rmpentry(u64 pfn) snp_dump_rmpentry() > +{ > + unsigned long pfn_end; > + struct rmpentry *e; > + int level; > + > + e = __snp_lookup_rmpentry(pfn, &level); > + if (!e) { > + pr_alert("failed to read RMP entry pfn 0x%llx\n", pfn); > + return; > + } > + > + if (rmpentry_assigned(e)) { > + pr_alert("RMPEntry paddr 0x%llx [assigned=%d immutable=%d pagesize=%d gpa=0x%lx" > + " asid=%d vmsa=%d validated=%d]\n", pfn << PAGE_SHIFT, WARNING: quoted string split across lines #174: FILE: arch/x86/kernel/sev.c:2421: + pr_alert("RMPEntry paddr 0x%llx [assigned=%d immutable=%d pagesize=%d gpa=0x%lx" + " asid=%d vmsa=%d validated=%d]\n", pfn << PAGE_SHIFT, > + rmpentry_assigned(e), rmpentry_immutable(e), rmpentry_pagesize(e), > + rmpentry_gpa(e), rmpentry_asid(e), rmpentry_vmsa(e), > + rmpentry_validated(e)); > + return; > + } > + > + /* > + * If the RMP entry at the faulting pfn was not assigned, then we do not > + * know what caused the RMP violation. To get some useful debug information, > + * let iterate through the entire 2MB region, and dump the RMP entries if > + * one of the bit in the RMP entry is set. > + */ > + pfn = pfn & ~(PTRS_PER_PMD - 1); > + pfn_end = pfn + PTRS_PER_PMD; > + > + while (pfn < pfn_end) { > + e = __snp_lookup_rmpentry(pfn, &level); > + if (!e) > + return; return? You mean "continue;" ? > + > + if (e->low || e->high) > + pr_alert("RMPEntry paddr 0x%llx: [high=0x%016llx low=0x%016llx]\n", > + pfn << PAGE_SHIFT, e->high, e->low); > + pfn++; > + } > +} > +EXPORT_SYMBOL_GPL(dump_rmpentry); Why is that exported? Some module will be calling it too? > + > /* > * Return 1 if the RMP entry is assigned, 0 if it exists but is not assigned, > * and -errno if there is no corresponding RMP entry. > diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c > index f2d543b92f43..9cd33169dfb5 100644 > --- a/arch/x86/mm/fault.c > +++ b/arch/x86/mm/fault.c > @@ -33,6 +33,7 @@ > #include <asm/pgtable_areas.h> /* VMALLOC_START, ... */ > #include <asm/kvm_para.h> /* kvm_handle_async_pf */ > #include <asm/vdso.h> /* fixup_vdso_exception() */ > +#include <asm/sev.h> /* dump_rmpentry() */ > > #define CREATE_TRACE_POINTS > #include <asm/trace/exceptions.h> > @@ -289,7 +290,7 @@ static bool low_pfn(unsigned long pfn) > return pfn < max_low_pfn; > } > > -static void dump_pagetable(unsigned long address) > +static void dump_pagetable(unsigned long address, bool show_rmpentry) I think passing in error_code and testing X86_PF_RMP inside should make this a bit more palatable than simply "grafting" SNP-specific functionality to generic paths. Thx. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette