Use newly introduced TDVMCALL_0() and TDVMCALL_1() instead of __tdx_hypercall() to handle port I/O in TDX guest.
It cuts handle_io() size in half: Function old new delta handle_io 436 202 -234 Signed-off-by: Kirill A. Shutemov <[email protected]> --- arch/x86/boot/compressed/tdx.c | 26 +++++++------------------- arch/x86/coco/tdx/tdx.c | 23 +++++++---------------- arch/x86/include/asm/shared/tdx.h | 4 ++++ 3 files changed, 18 insertions(+), 35 deletions(-) diff --git a/arch/x86/boot/compressed/tdx.c b/arch/x86/boot/compressed/tdx.c index 8451d6a1030c..0ae05edc7d42 100644 --- a/arch/x86/boot/compressed/tdx.c +++ b/arch/x86/boot/compressed/tdx.c @@ -18,32 +18,20 @@ void __tdx_hypercall_failed(void) static inline unsigned int tdx_io_in(int size, u16 port) { - struct tdx_module_args args = { - .r10 = TDX_HYPERCALL_STANDARD, - .r11 = hcall_func(EXIT_REASON_IO_INSTRUCTION), - .r12 = size, - .r13 = 0, - .r14 = port, - }; + u64 out; - if (__tdx_hypercall(&args)) + if (TDVMCALL_1(hcall_func(EXIT_REASON_IO_INSTRUCTION), + size, TDX_PORT_READ, port, 0, out)) { return UINT_MAX; + } - return args.r11; + return out; } static inline void tdx_io_out(int size, u16 port, u32 value) { - struct tdx_module_args args = { - .r10 = TDX_HYPERCALL_STANDARD, - .r11 = hcall_func(EXIT_REASON_IO_INSTRUCTION), - .r12 = size, - .r13 = 1, - .r14 = port, - .r15 = value, - }; - - __tdx_hypercall(&args); + TDVMCALL_0(hcall_func(EXIT_REASON_IO_INSTRUCTION), + size, TDX_PORT_WRITE, port, value); } static inline u8 tdx_inb(u16 port) diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index cadd583d6f62..6e0e5648ebd1 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -21,10 +21,6 @@ #define EPT_READ 0 #define EPT_WRITE 1 -/* Port I/O direction */ -#define PORT_READ 0 -#define PORT_WRITE 1 - /* See Exit Qualification for I/O Instructions in VMX documentation */ #define VE_IS_IO_IN(e) ((e) & BIT(3)) #define VE_GET_IO_SIZE(e) (((e) & GENMASK(2, 0)) + 1) @@ -612,14 +608,7 @@ static int handle_mmio(struct pt_regs *regs, struct ve_info *ve) static bool handle_in(struct pt_regs *regs, int size, int port) { - struct tdx_module_args args = { - .r10 = TDX_HYPERCALL_STANDARD, - .r11 = hcall_func(EXIT_REASON_IO_INSTRUCTION), - .r12 = size, - .r13 = PORT_READ, - .r14 = port, - }; - u64 mask = GENMASK(BITS_PER_BYTE * size, 0); + u64 mask, out; bool success; /* @@ -627,12 +616,14 @@ static bool handle_in(struct pt_regs *regs, int size, int port) * in TDX Guest-Host-Communication Interface (GHCI) section titled * "TDG.VP.VMCALL<Instruction.IO>". */ - success = !__tdx_hypercall(&args); + success = !TDVMCALL_1(hcall_func(EXIT_REASON_IO_INSTRUCTION), + size, TDX_PORT_READ, port, 0, out); /* Update part of the register affected by the emulated instruction */ + mask = GENMASK(BITS_PER_BYTE * size, 0); regs->ax &= ~mask; if (success) - regs->ax |= args.r11 & mask; + regs->ax |= out & mask; return success; } @@ -646,8 +637,8 @@ static bool handle_out(struct pt_regs *regs, int size, int port) * in TDX Guest-Host-Communication Interface (GHCI) section titled * "TDG.VP.VMCALL<Instruction.IO>". */ - return !_tdx_hypercall(hcall_func(EXIT_REASON_IO_INSTRUCTION), size, - PORT_WRITE, port, regs->ax & mask); + return !TDVMCALL_0(hcall_func(EXIT_REASON_IO_INSTRUCTION), + size, TDX_PORT_WRITE, port, regs->ax & mask); } /* diff --git a/arch/x86/include/asm/shared/tdx.h b/arch/x86/include/asm/shared/tdx.h index ddf2cc4a45da..46c299dc9cf0 100644 --- a/arch/x86/include/asm/shared/tdx.h +++ b/arch/x86/include/asm/shared/tdx.h @@ -72,6 +72,10 @@ #define TDX_PS_1G 2 #define TDX_PS_NR (TDX_PS_1G + 1) +/* Port I/O direction */ +#define TDX_PORT_READ 0 +#define TDX_PORT_WRITE 1 + #ifndef __ASSEMBLY__ #include <linux/compiler_attributes.h> -- 2.43.0
