On Sat, Feb 05, 2022 at 11:54:01AM +0100, Borislav Petkov wrote:
> On Fri, Jan 28, 2022 at 11:17:52AM -0600, Brijesh Singh wrote:
>
> > +static const struct snp_cpuid_info *snp_cpuid_info_get_ptr(void)
> > +{
> > + void *ptr;
> > +
> > + asm ("lea cpuid_info_copy(%%rip), %0"
> > + : "=r" (ptr)
>
> Same question as the last time:
>
> Why not "=g" and let the compiler decide?
The documentation for lea (APM Volume 3 Chapter 3) seemed to require
that the destination register be a general purpose register, so it
seemed like there was potential for breakage in allowing GCC to use
anything otherwise. Maybe GCC is smart enough to figure that out, but
since we know the constraint in advance it seemed safer to stick
with the current approach of enforcing that constraint.
>
> > + : "p" (&cpuid_info_copy));
> > +
> > + return ptr;
> > +}
>
> ...
>
> > +static bool snp_cpuid_check_range(u32 func)
> > +{
> > + if (func <= cpuid_std_range_max ||
> > + (func >= 0x40000000 && func <= cpuid_hyp_range_max) ||
> > + (func >= 0x80000000 && func <= cpuid_ext_range_max))
> > + return true;
> > +
> > + return false;
> > +}
> > +
> > +static int snp_cpuid_postprocess(u32 func, u32 subfunc, u32 *eax, u32 *ebx,
> > + u32 *ecx, u32 *edx)
>
> And again, same question as the last time:
>
> I'm wondering if you could make everything a lot easier by doing
>
> static int snp_cpuid_postprocess(struct cpuid_leaf *leaf)
>
> and marshall around that struct cpuid_leaf which contains func, subfunc,
> e[abcd]x instead of dealing with 6 parameters.
>
> Callers of snp_cpuid() can simply allocate it on their stack and hand it
> in and it is all in sev-shared.c so nicely self-contained...
>
> Ok I'm ignoring this patch for now and I'll review it only after you've
> worked in all comments from the previous review.
I did look into it and honestly it just seemed to add more abstractions that
made it harder to parse the specific operations taken place here. For
instance, post-processing of 0x8000001E entry, we have e{a,b,c,d}x from
the CPUID table, then to post process:
switch (func):
case 0x8000001E:
/* extended APIC ID */
snp_cpuid_hv(func, subfunc, eax, &ebx2, &ecx2, NULL);
| | | |
| | | edx from cpuid table is used as-is
| | |
| | |
| | load HV value into tmp ecx2
| |
| load HV value into tmp ebx2
|
|
replace eax completely with the HV value
# then do the remaining fixups for final ebx/ecx
/* compute ID */
*ebx = (*ebx & GENMASK(31, 8)) | (ebx2 & GENMASK(7, 0));
/* node ID */
*ecx = (*ecx & GENMASK(31, 8)) | (ecx2 & GENMASK(7, 0));
and it all reads in a clear/familiar way to all the other
cpuid()/native_cpuid() users throughout the kernel, and from the
persective of someone auditing this from a security perspective that
needs to quickly check what registers come from the CPUID table, what
registers come from HV, what the final result is, it all just seems very
clear and familiar to me.
But if we start passing around this higher-level structure that does
not do anything other than abstract away e{a,b,c,x} to save on function
arguments, things become muddier, and there's more pointer dereference
operations and abstractions to sift through. I saved the diff from when
I looked into it previously (was just a rough-sketch, not build-tested),
and included it below for reference, but it just didn't seem to help with
readability to me, which I think is important here since this is probably
one of the most security-sensitive piece of the CPUID table handling,
since we're dealing with untrusted CPUID sources here and it needs to be
clear what exactly is ending up in the E{A,B,C,D} registers we're
returning for a particular CPUID instruction:
(There are some possible optimizations below, like added a mask parameter
so control specifically what EAX/EBX/ECX/EDX field should be modified,
possibly reworking snp_cpuid_info structure definitions to re-use the
cpuid_leaf struct internally, also modifying __sev_cpuid_hv() to take
the cpuid_leaf struct, etc., but none of that really seemed like
it would help much with the key issue of readability, so I ended up
setting it aside for v9)
diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c
index b2defbf7e66b..53534a6b1dcc 100644
--- a/arch/x86/kernel/sev-shared.c
+++ b/arch/x86/kernel/sev-shared.c
@@ -49,6 +49,13 @@ struct snp_cpuid_info {
struct snp_cpuid_fn fn[SNP_CPUID_COUNT_MAX];
} __packed;
+struct cpuid_leaf {
+ u32 eax;
+ u32 ebx;
+ u32 ecx;
+ u32 edx;
+};
+
/*
* Since feature negotiation related variables are set early in the boot
* process they must reside in the .data section so as not to be zeroed
@@ -260,14 +267,14 @@ static int __sev_cpuid_hv(u32 func, int reg_idx, u32 *reg)
return 0;
}
-static int sev_cpuid_hv(u32 func, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)
+static int sev_cpuid_hv(u32 func, struct cpuid_leaf *leaf)
{
int ret;
- ret = __sev_cpuid_hv(func, GHCB_CPUID_REQ_EAX, eax);
- ret = ret ? : __sev_cpuid_hv(func, GHCB_CPUID_REQ_EBX, ebx);
- ret = ret ? : __sev_cpuid_hv(func, GHCB_CPUID_REQ_ECX, ecx);
- ret = ret ? : __sev_cpuid_hv(func, GHCB_CPUID_REQ_EDX, edx);
+ ret = __sev_cpuid_hv(func, GHCB_CPUID_REQ_EAX, &leaf->eax);
+ ret = ret ? : __sev_cpuid_hv(func, GHCB_CPUID_REQ_EBX, &leaf->ebx);
+ ret = ret ? : __sev_cpuid_hv(func, GHCB_CPUID_REQ_ECX, &leaf->ecx);
+ ret = ret ? : __sev_cpuid_hv(func, GHCB_CPUID_REQ_EDX, &leaf->edx);
return ret;
}
@@ -328,8 +335,7 @@ static int snp_cpuid_calc_xsave_size(u64 xfeatures_en, bool compacted)
return xsave_size;
}
-static void snp_cpuid_hv(u32 func, u32 subfunc, u32 *eax, u32 *ebx, u32 *ecx,
- u32 *edx)
+static void snp_cpuid_hv(u32 func, u32 subfunc, struct cpuid_leaf *leaf)
{
/*
* MSR protocol does not support fetching indexed subfunction, but is
@@ -342,13 +348,12 @@ static void snp_cpuid_hv(u32 func, u32 subfunc, u32 *eax, u32 *ebx, u32 *ecx,
if (cpuid_function_is_indexed(func) && subfunc)
sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_CPUID_HV);
- if (sev_cpuid_hv(func, eax, ebx, ecx, edx))
+ if (sev_cpuid_hv(func, leaf))
sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_CPUID_HV);
}
static bool
-snp_cpuid_get_validated_func(u32 func, u32 subfunc, u32 *eax, u32 *ebx,
- u32 *ecx, u32 *edx)
+snp_cpuid_get_validated_func(u32 func, u32 subfunc, struct cpuid_leaf *leaf)
{
const struct snp_cpuid_info *cpuid_info = snp_cpuid_info_get_ptr();
int i;
@@ -362,10 +367,10 @@ snp_cpuid_get_validated_func(u32 func, u32 subfunc, u32 *eax, u32 *ebx,
if (cpuid_function_is_indexed(func) && fn->ecx_in != subfunc)
continue;
- *eax = fn->eax;
- *ebx = fn->ebx;
- *ecx = fn->ecx;
- *edx = fn->edx;
+ leaf->eax = fn->eax;
+ leaf->ebx = fn->ebx;
+ leaf->ecx = fn->ecx;
+ leaf->edx = fn->edx;
return true;
}
@@ -383,33 +388,34 @@ static bool snp_cpuid_check_range(u32 func)
return false;
}
-static int snp_cpuid_postprocess(u32 func, u32 subfunc, u32 *eax, u32 *ebx,
- u32 *ecx, u32 *edx)
+static int snp_cpuid_postprocess(u32 func, u32 subfunc, struct cpuid_leaf *leaf)
{
- u32 ebx2, ecx2, edx2;
+ struct cpuid_leaf leaf_tmp;
switch (func) {
case 0x1:
- snp_cpuid_hv(func, subfunc, NULL, &ebx2, NULL, &edx2);
+ snp_cpuid_hv(func, subfunc, &leaf_tmp);
/* initial APIC ID */
- *ebx = (ebx2 & GENMASK(31, 24)) | (*ebx & GENMASK(23, 0));
+ leaf->ebx = (leaf_tmp.ebx & GENMASK(31, 24)) | (leaf->ebx & GENMASK(23, 0));
/* APIC enabled bit */
- *edx = (edx2 & BIT(9)) | (*edx & ~BIT(9));
+ leaf->edx = (leaf_tmp.edx & BIT(9)) | (leaf->edx & ~BIT(9));
/* OSXSAVE enabled bit */
if (native_read_cr4() & X86_CR4_OSXSAVE)
- *ecx |= BIT(27);
+ leaf->ecx |= BIT(27);
break;
case 0x7:
/* OSPKE enabled bit */
- *ecx &= ~BIT(4);
+ leaf->ecx &= ~BIT(4);
if (native_read_cr4() & X86_CR4_PKE)
- *ecx |= BIT(4);
+ leaf->ecx |= BIT(4);
break;
case 0xB:
/* extended APIC ID */
- snp_cpuid_hv(func, 0, NULL, NULL, NULL, edx);
+ snp_cpuid_hv(func, 0, &leaf_tmp);
+ leaf->edx = leaf_tmp.edx;
+
break;
case 0xD: {
bool compacted = false;
@@ -440,7 +446,7 @@ static int snp_cpuid_postprocess(u32 func, u32 subfunc, u32 *eax, u32 *ebx,
* to avoid this becoming an issue it's safer to simply
* treat this as unsupported for SEV-SNP guests.
*/
- if (!(*eax & (BIT(1) | BIT(3))))
+ if (!(leaf->eax & (BIT(1) | BIT(3))))
return -EINVAL;
compacted = true;
@@ -450,16 +456,17 @@ static int snp_cpuid_postprocess(u32 func, u32 subfunc, u32 *eax, u32 *ebx,
if (xsave_size < 0)
return -EINVAL;
- *ebx = xsave_size;
+ leaf->ebx = xsave_size;
}
break;
case 0x8000001E:
/* extended APIC ID */
- snp_cpuid_hv(func, subfunc, eax, &ebx2, &ecx2, NULL);
+ snp_cpuid_hv(func, subfunc, &leaf_tmp);
+ leaf->eax = leaf_tmp.eax;
/* compute ID */
- *ebx = (*ebx & GENMASK(31, 8)) | (ebx2 & GENMASK(7, 0));
+ leaf->ebx = (leaf->ebx & GENMASK(31, 8)) | (leaf_tmp.ebx & GENMASK(7, 0));
/* node ID */
- *ecx = (*ecx & GENMASK(31, 8)) | (ecx2 & GENMASK(7, 0));
+ leaf->ecx = (leaf->ecx & GENMASK(31, 8)) | (leaf_tmp.ecx & GENMASK(7, 0));
break;
default:
/* No fix-ups needed, use values as-is. */
@@ -473,15 +480,14 @@ static int snp_cpuid_postprocess(u32 func, u32 subfunc, u32 *eax, u32 *ebx,
* Returns -EOPNOTSUPP if feature not enabled. Any other return value should be
* treated as fatal by caller.
*/
-static int snp_cpuid(u32 func, u32 subfunc, u32 *eax, u32 *ebx, u32 *ecx,
- u32 *edx)
+static int snp_cpuid(u32 func, u32 subfunc, struct cpuid_leaf *leaf)
{
const struct snp_cpuid_info *cpuid_info = snp_cpuid_info_get_ptr();
if (!cpuid_info->count)
return -EOPNOTSUPP;
- if (!snp_cpuid_get_validated_func(func, subfunc, eax, ebx, ecx, edx)) {
+ if (!snp_cpuid_get_validated_func(func, subfunc, leaf)) {
/*
* Some hypervisors will avoid keeping track of CPUID entries
* where all values are zero, since they can be handled the
@@ -497,12 +503,12 @@ static int snp_cpuid(u32 func, u32 subfunc, u32 *eax, u32 *ebx, u32 *ecx,
* not in the table, but is still in the valid range, proceed
* with the post-processing. Otherwise, just return zeros.
*/
- *eax = *ebx = *ecx = *edx = 0;
+ leaf->eax = leaf->ebx = leaf->ecx = leaf->edx = 0;
if (!snp_cpuid_check_range(func))
return 0;
}
- return snp_cpuid_postprocess(func, subfunc, eax, ebx, ecx, edx);
+ return snp_cpuid_postprocess(func, subfunc, leaf);
}
/*
@@ -514,28 +520,28 @@ void __init do_vc_no_ghcb(struct pt_regs *regs, unsigned long exit_code)
{
unsigned int subfn = lower_bits(regs->cx, 32);
unsigned int fn = lower_bits(regs->ax, 32);
- u32 eax, ebx, ecx, edx;
+ struct cpuid_leaf *leaf;
int ret;
/* Only CPUID is supported via MSR protocol */
if (exit_code != SVM_EXIT_CPUID)
goto fail;
- ret = snp_cpuid(fn, subfn, &eax, &ebx, &ecx, &edx);
+ ret = snp_cpuid(fn, subfn, leaf);
if (!ret)
goto cpuid_done;
if (ret != -EOPNOTSUPP)
goto fail;
- if (sev_cpuid_hv(fn, &eax, &ebx, &ecx, &edx))
+ if (sev_cpuid_hv(fn, leaf))
goto fail;
cpuid_done:
- regs->ax = eax;
- regs->bx = ebx;
- regs->cx = ecx;
- regs->dx = edx;
+ regs->ax = leaf->eax;
+ regs->bx = leaf->ebx;
+ regs->cx = leaf->ecx;
+ regs->dx = leaf->edx;
/*
* This is a VC handler and the #VC is only raised when SEV-ES is
>
> --
> Regards/Gruss,
> Boris.
>
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpeople.kernel.org%2Ftglx%2Fnotes-about-netiquette&data=04%7C01%7CMichael.Roth%40amd.com%7C6bc14b8b5b854a38d7c008d9e895da5b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637796552649205409%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=Lc5o1tYKrtqUy2h%2B8onmgdaydqUWTlnj7V9rfuBEU0s%3D&reserved=0
