Re: [PATCH v3 13/14] x86/sev: Hide SVSM attestation entries if not running under an SVSM
From: Dan Williams
Date: Tue Apr 16 2024 - 02:05:50 EST
Tom Lendacky wrote:
> On 4/12/24 10:52, Tom Lendacky wrote:
> > On 4/9/24 13:12, Kuppuswamy Sathyanarayanan wrote:
> >> On 3/25/24 3:26 PM, Tom Lendacky wrote:
> >>> Config-fs provides support to hide individual attribute entries. Using
> >>> this support, base the display of the SVSM related entries on the
> >>> presence
> >>> of an SVSM.
> >>>
> >>> Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
> >>> Cc: Christoph Hellwig <hch@xxxxxx>
> >>> Signed-off-by: Tom Lendacky <thomas.lendacky@xxxxxxx>
> >>> ---
> >>> arch/x86/coco/core.c | 4 ++++
> >>> drivers/virt/coco/tsm.c | 14 ++++++++++----
> >>> include/linux/cc_platform.h | 8 ++++++++
> >>> 3 files changed, 22 insertions(+), 4 deletions(-)
> >>>
>
> >>
> >> Any comment about the following query? I think introducing a CC flag
> >> for this use
> >> case is over kill.
> >>
> >> https://lore.kernel.org/lkml/6b90b223-46e0-4e6d-a17c-5caf72e3c949@xxxxxxxxxxxxxxx/
> >
> > If you don't think TDX will be able to make use of the SVSM attribute I
> > can look at adding a callback. But I was waiting to see if anyone else
> > had comments, for or against, before re-doing it all.
> >
>
> What about something like this (applied on top of patch 13):
>
> diff --git a/arch/x86/coco/core.c b/arch/x86/coco/core.c
> index efa0f648f754..d07be9d05cd0 100644
> --- a/arch/x86/coco/core.c
> +++ b/arch/x86/coco/core.c
> @@ -12,7 +12,6 @@
>
> #include <asm/coco.h>
> #include <asm/processor.h>
> -#include <asm/sev.h>
>
> enum cc_vendor cc_vendor __ro_after_init = CC_VENDOR_NONE;
> u64 cc_mask __ro_after_init;
> @@ -79,9 +78,6 @@ static bool noinstr amd_cc_platform_has(enum cc_attr attr)
> case CC_ATTR_GUEST_STATE_ENCRYPT:
> return sev_status & MSR_AMD64_SEV_ES_ENABLED;
>
> - case CC_ATTR_GUEST_SVSM_PRESENT:
> - return snp_get_vmpl();
> -
> /*
> * With SEV, the rep string I/O instructions need to be unrolled
> * but SEV-ES supports them through the #VC handler.
> diff --git a/drivers/virt/coco/sev-guest/sev-guest.c b/drivers/virt/coco/sev-guest/sev-guest.c
> index 0d2c9926a97c..68c881a50026 100644
> --- a/drivers/virt/coco/sev-guest/sev-guest.c
> +++ b/drivers/virt/coco/sev-guest/sev-guest.c
> @@ -1036,6 +1036,17 @@ static int sev_report_new(struct tsm_report *report, void *data)
> return 0;
> }
>
> +static bool sev_tsm_visibility(enum tsm_type type)
> +{
> + /* Check for SVSM-related attributes */
> + switch (type) {
> + case TSM_TYPE_SERVICE_PROVIDER:
> + return snp_get_vmpl();
> + default:
> + return false;
> + }
> +}
> +
> static struct tsm_ops sev_tsm_ops = {
> .name = KBUILD_MODNAME,
> .report_new = sev_report_new,
> @@ -1126,7 +1137,8 @@ static int __init sev_guest_probe(struct platform_device *pdev)
> /* Set the privlevel_floor attribute based on the current VMPL */
> sev_tsm_ops.privlevel_floor = snp_get_vmpl();
>
> - ret = tsm_register(&sev_tsm_ops, snp_dev, &tsm_report_extra_type);
> + ret = tsm_register(&sev_tsm_ops, snp_dev, &tsm_report_extra_type,
> + sev_tsm_visibility);
I would have expected this in tsm_ops, but yes I think a callback lets
this fixup the ugly "extra" attributes situation as well.