| Message ID | ba4b4ff1fe77ca76cca370b2fd4aa57a2d23c86d.1689151537.git.kai.huang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Unify TDCALL/SEAMCALL and TDVMCALL assembly | expand |
On 12.07.23 г. 11:55 ч., Kai Huang wrote: > The TDX spec names all TDCALLs with prefix "TDG". Currently, the kernel > doesn't follow such convention for the macros of those TDCALLs but uses > prefix "TDX_" for all of them. Although it's arguable whether the TDX > spec names those TDCALLs properly, it's better for the kernel to follow > the spec when naming those macros. > > Change all macros of TDCALLs to make them consistent with the spec. As > a bonus, they get distinguished easily from the host-side SEAMCALLs, > which all have prefix "TDH". > > No functional change intended. > > Signed-off-by: Kai Huang <kai.huang@intel.com> > --- > arch/x86/coco/tdx/tdx.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c > index 5b8056f6c83f..de021df92009 100644 > --- a/arch/x86/coco/tdx/tdx.c > +++ b/arch/x86/coco/tdx/tdx.c > @@ -15,11 +15,11 @@ > #include <asm/pgtable.h> > > /* TDX module Call Leaf IDs */ > -#define TDX_GET_INFO 1 > -#define TDX_GET_VEINFO 3 > -#define TDX_GET_REPORT 4 > -#define TDX_ACCEPT_PAGE 6 > -#define TDX_WR 8 > +#define TDG_VP_INFO 1 > +#define TDG_VP_VEINFO_GET 3 > +#define TDG_MR_REPORT 4 > +#define TDG_MEM_PAGE_ACCEPT 6 > +#define TDG_VM_WR 8 > What branch is this patch set based off? Because the existing TDX_GET_* defines are in arch/x86/include/asm/shared/tdx.h due to ff40b5769a50f ? <snip>
On 12.07.23 г. 11:55 ч., Kai Huang wrote: > The TDX spec names all TDCALLs with prefix "TDG". Currently, the kernel > doesn't follow such convention for the macros of those TDCALLs but uses > prefix "TDX_" for all of them. Although it's arguable whether the TDX > spec names those TDCALLs properly, it's better for the kernel to follow > the spec when naming those macros. > > Change all macros of TDCALLs to make them consistent with the spec. As > a bonus, they get distinguished easily from the host-side SEAMCALLs, > which all have prefix "TDH". > > No functional change intended. > > Signed-off-by: Kai Huang <kai.huang@intel.com> > --- > arch/x86/coco/tdx/tdx.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c > index 5b8056f6c83f..de021df92009 100644 > --- a/arch/x86/coco/tdx/tdx.c > +++ b/arch/x86/coco/tdx/tdx.c > @@ -15,11 +15,11 @@ > #include <asm/pgtable.h> > > /* TDX module Call Leaf IDs */ > -#define TDX_GET_INFO 1 > -#define TDX_GET_VEINFO 3 > -#define TDX_GET_REPORT 4 > -#define TDX_ACCEPT_PAGE 6 > -#define TDX_WR 8 > +#define TDG_VP_INFO 1 > +#define TDG_VP_VEINFO_GET 3 > +#define TDG_MR_REPORT 4 > +#define TDG_MEM_PAGE_ACCEPT 6 > +#define TDG_VM_WR 8 > What branch is this patch set based off? Because the existing TDX_GET_* defines are in arch/x86/include/asm/shared/tdx.h due to ff40b5769a50f ? <snip>
On Fri, 2023-07-14 at 15:28 +0300, Nikolay Borisov wrote: > > On 12.07.23 г. 11:55 ч., Kai Huang wrote: > > The TDX spec names all TDCALLs with prefix "TDG". Currently, the kernel > > doesn't follow such convention for the macros of those TDCALLs but uses > > prefix "TDX_" for all of them. Although it's arguable whether the TDX > > spec names those TDCALLs properly, it's better for the kernel to follow > > the spec when naming those macros. > > > > Change all macros of TDCALLs to make them consistent with the spec. As > > a bonus, they get distinguished easily from the host-side SEAMCALLs, > > which all have prefix "TDH". > > > > No functional change intended. > > > > Signed-off-by: Kai Huang <kai.huang@intel.com> > > --- > > arch/x86/coco/tdx/tdx.c | 22 +++++++++++----------- > > 1 file changed, 11 insertions(+), 11 deletions(-) > > > > diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c > > index 5b8056f6c83f..de021df92009 100644 > > --- a/arch/x86/coco/tdx/tdx.c > > +++ b/arch/x86/coco/tdx/tdx.c > > @@ -15,11 +15,11 @@ > > #include <asm/pgtable.h> > > > > /* TDX module Call Leaf IDs */ > > -#define TDX_GET_INFO 1 > > -#define TDX_GET_VEINFO 3 > > -#define TDX_GET_REPORT 4 > > -#define TDX_ACCEPT_PAGE 6 > > -#define TDX_WR 8 > > +#define TDG_VP_INFO 1 > > +#define TDG_VP_VEINFO_GET 3 > > +#define TDG_MR_REPORT 4 > > +#define TDG_MEM_PAGE_ACCEPT 6 > > +#define TDG_VM_WR 8 > > > What branch is this patch set based off? Because the existing TDX_GET_* > defines are in arch/x86/include/asm/shared/tdx.h due to ff40b5769a50f ? > It was based on tip/x86/tdx, which didn't have above patch. I'll rebase to the Linus's tree for the next round since it now has all TDX patches anyway.
diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index 5b8056f6c83f..de021df92009 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -15,11 +15,11 @@ #include <asm/pgtable.h> /* TDX module Call Leaf IDs */ -#define TDX_GET_INFO 1 -#define TDX_GET_VEINFO 3 -#define TDX_GET_REPORT 4 -#define TDX_ACCEPT_PAGE 6 -#define TDX_WR 8 +#define TDG_VP_INFO 1 +#define TDG_VP_VEINFO_GET 3 +#define TDG_MR_REPORT 4 +#define TDG_MEM_PAGE_ACCEPT 6 +#define TDG_VM_WR 8 /* TDCS fields. To be used by TDG.VM.WR and TDG.VM.RD module calls */ #define TDCS_NOTIFY_ENABLES 0x9100000000000010 @@ -123,7 +123,7 @@ int tdx_mcall_get_report0(u8 *reportdata, u8 *tdreport) { u64 ret; - ret = __tdx_module_call(TDX_GET_REPORT, virt_to_phys(tdreport), + ret = __tdx_module_call(TDG_MR_REPORT, virt_to_phys(tdreport), virt_to_phys(reportdata), TDREPORT_SUBTYPE_0, 0, NULL); if (ret) { @@ -184,7 +184,7 @@ static void tdx_parse_tdinfo(u64 *cc_mask) * Guest-Host-Communication Interface (GHCI), section 2.4.2 TDCALL * [TDG.VP.INFO]. */ - tdx_module_call(TDX_GET_INFO, 0, 0, 0, 0, &out); + tdx_module_call(TDG_VP_INFO, 0, 0, 0, 0, &out); /* * The highest bit of a guest physical address is the "sharing" bit. @@ -626,7 +626,7 @@ void tdx_get_ve_info(struct ve_info *ve) * Note, the TDX module treats virtual NMIs as inhibited if the #VE * valid flag is set. It means that NMI=>#VE will not result in a #DF. */ - tdx_module_call(TDX_GET_VEINFO, 0, 0, 0, 0, &out); + tdx_module_call(TDG_VP_VEINFO_GET, 0, 0, 0, 0, &out); /* Transfer the output parameters */ ve->exit_reason = out.rcx; @@ -768,7 +768,7 @@ static bool try_accept_one(phys_addr_t *start, unsigned long len, } tdcall_rcx = *start | page_size; - if (__tdx_module_call(TDX_ACCEPT_PAGE, tdcall_rcx, 0, 0, 0, NULL)) + if (__tdx_module_call(TDG_MEM_PAGE_ACCEPT, tdcall_rcx, 0, 0, 0, NULL)) return false; *start += accept_size; @@ -805,7 +805,7 @@ static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) /* * For shared->private conversion, accept the page using - * TDX_ACCEPT_PAGE TDX module call. + * TDG_MEM_PAGE_ACCEPT TDX module call. */ while (start < end) { unsigned long len = end - start; @@ -870,7 +870,7 @@ void __init tdx_early_init(void) cc_set_mask(cc_mask); /* Kernel does not use NOTIFY_ENABLES and does not need random #VEs */ - tdx_module_call(TDX_WR, 0, TDCS_NOTIFY_ENABLES, 0, -1ULL, NULL); + tdx_module_call(TDG_VM_WR, 0, TDCS_NOTIFY_ENABLES, 0, -1ULL, NULL); /* * All bits above GPA width are reserved and kernel treats shared bit
The TDX spec names all TDCALLs with prefix "TDG". Currently, the kernel doesn't follow such convention for the macros of those TDCALLs but uses prefix "TDX_" for all of them. Although it's arguable whether the TDX spec names those TDCALLs properly, it's better for the kernel to follow the spec when naming those macros. Change all macros of TDCALLs to make them consistent with the spec. As a bonus, they get distinguished easily from the host-side SEAMCALLs, which all have prefix "TDH". No functional change intended. Signed-off-by: Kai Huang <kai.huang@intel.com> --- arch/x86/coco/tdx/tdx.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)