From: Peter Fang struct tdx_quote_buf is currently used only by the guest, but the Quote buffer format will also be needed by the host for in-kernel Quote generation. Move the definition to tdx.h so it can be shared by both. Rename the struct to tdx_quote_req to better reflect its purpose. Signed-off-by: Peter Fang Signed-off-by: Xu Yilun --- arch/x86/include/asm/tdx.h | 21 +++++++++++++++++++++ drivers/virt/coco/tdx-guest/tdx-guest.c | 25 +++---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h index bc512a00a0d0..945e6817abb2 100644 --- a/arch/x86/include/asm/tdx.h +++ b/arch/x86/include/asm/tdx.h @@ -96,6 +96,27 @@ static inline long tdx_kvm_hypercall(unsigned int nr, unsigned long p1, } #endif /* CONFIG_INTEL_TDX_GUEST && CONFIG_KVM_GUEST */ +#if defined(CONFIG_INTEL_TDX_GUEST) || defined(CONFIG_KVM_INTEL_TDX) +/* struct tdx_quote_req: Format of Quote request message. + * @version: Quote format version, filled by TD. + * @status: Status code of Quote request, filled by VMM. + * @in_len: Length of TDREPORT, filled by TD. + * @out_len: Length of Quote data, filled by VMM. + * @data: Quote data on output or TDREPORT on input. + * + * More details of Quote request message can be found in TDX + * Guest-Host Communication Interface (GHCI) for Intel TDX 1.0, + * section titled "TDG.VP.VMCALL" + */ +struct tdx_quote_req { + u64 version; + u64 status; + u32 in_len; + u32 out_len; + u8 data[]; +}; +#endif /* CONFIG_INTEL_TDX_GUEST || CONFIG_KVM_INTEL_TDX */ + #ifdef CONFIG_INTEL_TDX_HOST u64 __seamcall(u64 fn, struct tdx_module_args *args); u64 __seamcall_ret(u64 fn, struct tdx_module_args *args); diff --git a/drivers/virt/coco/tdx-guest/tdx-guest.c b/drivers/virt/coco/tdx-guest/tdx-guest.c index a9ecc46df187..d0ddbbc98fb8 100644 --- a/drivers/virt/coco/tdx-guest/tdx-guest.c +++ b/drivers/virt/coco/tdx-guest/tdx-guest.c @@ -171,26 +171,7 @@ static void tdx_mr_deinit(const struct attribute_group *mr_grp) #define GET_QUOTE_SUCCESS 0 #define GET_QUOTE_IN_FLIGHT 0xffffffffffffffff -#define TDX_QUOTE_MAX_LEN (GET_QUOTE_BUF_SIZE - sizeof(struct tdx_quote_buf)) - -/* struct tdx_quote_buf: Format of Quote request buffer. - * @version: Quote format version, filled by TD. - * @status: Status code of Quote request, filled by VMM. - * @in_len: Length of TDREPORT, filled by TD. - * @out_len: Length of Quote data, filled by VMM. - * @data: Quote data on output or TDREPORT on input. - * - * More details of Quote request buffer can be found in TDX - * Guest-Host Communication Interface (GHCI) for Intel TDX 1.0, - * section titled "TDG.VP.VMCALL" - */ -struct tdx_quote_buf { - u64 version; - u64 status; - u32 in_len; - u32 out_len; - u8 data[]; -}; +#define TDX_QUOTE_MAX_LEN (GET_QUOTE_BUF_SIZE - sizeof(struct tdx_quote_req)) /* Quote data buffer */ static void *quote_data; @@ -250,7 +231,7 @@ static void *alloc_quote_buf(void) * or error code after processing is complete. So wait till the status * changes from GET_QUOTE_IN_FLIGHT or the request being timed out. */ -static int wait_for_quote_completion(struct tdx_quote_buf *quote_buf, u32 timeout) +static int wait_for_quote_completion(struct tdx_quote_req *quote_buf, u32 timeout) { int i = 0; @@ -269,7 +250,7 @@ static int wait_for_quote_completion(struct tdx_quote_buf *quote_buf, u32 timeou static int tdx_report_new_locked(struct tsm_report *report, void *data) { u8 *buf; - struct tdx_quote_buf *quote_buf = quote_data; + struct tdx_quote_req *quote_buf = quote_data; struct tsm_report_desc *desc = &report->desc; u32 out_len; int ret; -- 2.25.1