Re: [PATCH 2/4] x86/tdx: Rename tdx_parse_tdinfo() to tdx_setup()

From: Kuppuswamy Sathyanarayanan
Date: Sat Mar 09 2024 - 21:49:54 EST



On 3/9/24 1:02 PM, Kirill A. Shutemov wrote:
> Rename tdx_parse_tdinfo() to tdx_setup() and move setting NOTIFY_ENABLES
> there.
>
> The function will be extended to adjust TD configuration.
>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
> ---

Looks good to me.

Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@xxxxxxxxxxxxxxx>

> arch/x86/coco/tdx/tdx.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c
> index 5ffe5ef99536..afdaf46cabb9 100644
> --- a/arch/x86/coco/tdx/tdx.c
> +++ b/arch/x86/coco/tdx/tdx.c
> @@ -181,7 +181,7 @@ static void __noreturn tdx_panic(const char *msg)
> __tdx_hypercall(&args);
> }
>
> -static void tdx_parse_tdinfo(u64 *cc_mask)
> +static void tdx_setup(u64 *cc_mask)
> {
> struct tdx_module_args args = {};
> unsigned int gpa_width;
> @@ -206,6 +206,9 @@ static void tdx_parse_tdinfo(u64 *cc_mask)
> gpa_width = args.rcx & GENMASK(5, 0);
> *cc_mask = BIT_ULL(gpa_width - 1);
>
> + /* Kernel does not use NOTIFY_ENABLES and does not need random #VEs */
> + tdg_vm_wr(TDCS_NOTIFY_ENABLES, 0, -1ULL);
> +
> /*
> * The kernel can not handle #VE's when accessing normal kernel
> * memory. Ensure that no #VE will be delivered for accesses to
> @@ -930,11 +933,11 @@ void __init tdx_early_init(void)
> setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE);
>
> cc_vendor = CC_VENDOR_INTEL;
> - tdx_parse_tdinfo(&cc_mask);
> - cc_set_mask(cc_mask);
>
> - /* Kernel does not use NOTIFY_ENABLES and does not need random #VEs */
> - tdg_vm_wr(TDCS_NOTIFY_ENABLES, 0, -1ULL);
> + /* Configure the TD */
> + tdx_setup(&cc_mask);
> +
> + cc_set_mask(cc_mask);
>
> /*
> * All bits above GPA width are reserved and kernel treats shared bit

--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer