On Wed, Mar 24, 2021 at 11:44:14AM -0500, Brijesh Singh wrote: > arch/x86/include/asm/sev-snp.h | 52 ++++++++++++++++++++++++++++++++++ Hmm, a separate header. Yeah, I know we did sev-es.h but I think it all should be in a single sev.h which contains all AMD-specific memory encryption declarations. It's not like it is going to be huge or so, by the looks of how big sev-es.h is. Or is there a particular need to have a separate snp header? If not, please do a pre-patch which renames sev-es.h to sev.h and then add the SNP stuff to it. > 1 file changed, 52 insertions(+) > create mode 100644 arch/x86/include/asm/sev-snp.h > > diff --git a/arch/x86/include/asm/sev-snp.h b/arch/x86/include/asm/sev-snp.h > new file mode 100644 > index 000000000000..5a6d1367cab7 > --- /dev/null > +++ b/arch/x86/include/asm/sev-snp.h > @@ -0,0 +1,52 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * AMD SEV Secure Nested Paging Support > + * > + * Copyright (C) 2021 Advanced Micro Devices, Inc. > + * > + * Author: Brijesh Singh <brijesh.singh@xxxxxxx> > + */ > + > +#ifndef __ASM_SECURE_NESTED_PAGING_H > +#define __ASM_SECURE_NESTED_PAGING_H > + > +#ifndef __ASSEMBLY__ > +#include <asm/irqflags.h> /* native_save_fl() */ Where is that used? Looks like leftovers. > + > +/* Return code of __pvalidate */ > +#define PVALIDATE_SUCCESS 0 > +#define PVALIDATE_FAIL_INPUT 1 > +#define PVALIDATE_FAIL_SIZEMISMATCH 6 > + > +/* RMP page size */ > +#define RMP_PG_SIZE_2M 1 > +#define RMP_PG_SIZE_4K 0 > + > +#ifdef CONFIG_AMD_MEM_ENCRYPT > +static inline int __pvalidate(unsigned long vaddr, int rmp_psize, int validate, Why the "__" prefix? > + unsigned long *rflags) > +{ > + unsigned long flags; > + int rc; > + > + asm volatile(".byte 0xF2, 0x0F, 0x01, 0xFF\n\t" > + "pushf; pop %0\n\t" Ewww, PUSHF is expensive. > + : "=rm"(flags), "=a"(rc) > + : "a"(vaddr), "c"(rmp_psize), "d"(validate) > + : "memory", "cc"); > + > + *rflags = flags; > + return rc; Hmm, rc *and* rflags. Manual says "Upon completion, a return code is stored in EAX. rFLAGS bits OF, ZF, AF, PF and SF are set based on this return code." So what exactly does that mean and is the return code duplicated in rFLAGS? If so, can you return a single value which has everything you need to know? I see that you're using the retval only for the carry flag to check whether the page has already been validated so I think you could define a set of return value defines from that function which callers can check. And looking above again, you do have PVALIDATE_* defines except that nothing's using them. Use them please. Also, for how to do condition code checks properly, see how the CC_SET/CC_OUT macros are used. > +} > + > +#else /* !CONFIG_AMD_MEM_ENCRYPT */ This else-ifdeffery can go too if you move the ifdeffery inside the function: static inline int __pvalidate(unsigned long vaddr, int rmp_psize, int validate, { int rc = 0; #fidef CONFIG_AMD_MEM_ENCRYPT ... #endif return rc; } Thx. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette