x86/tdx: Drop flags from __tdx_hypercall()
Subsystems (2)
PATCH 1/1 x86/tdx: Drop flags from __tdx_hypercall()
After TDX_HCALL_ISSUE_STI got dropped, the only flag left is TDX_HCALL_HAS_OUTPUT. The flag indicates if the caller wants to see tdx_hypercall_args updated based on the hypercall output.
Drop the flags and provide __tdx_hypercall_ret() that matches TDX_HCALL_HAS_OUTPUT semantics.
Signed-off-by Kirill A. Shutemov <[email protected]>
Suggested-by Peter Zijlstra <[email protected]>
--- arch/x86/boot/compressed/tdx.c | 4 +- arch/x86/coco/tdx/tdcall.S | 66 ++++++++++++++++++------------- arch/x86/coco/tdx/tdx.c | 18 ++++----- arch/x86/include/asm/shared/tdx.h | 5 +-- 4 files changed, 51 insertions(+), 42 deletions(-)
arch/x86/boot/compressed/tdx.c +2 -2
@@ -26,7 +26,7 @@ static inline unsigned int tdx_io_in(int size, u16 port) .r14 = port, }; -if (__tdx_hypercall (&args,TDX_HCALL_HAS_OUTPUT )) +if (__tdx_hypercall_ret (&args))return UINT_MAX ;return args.r11;
@@ -43,7 +43,7 @@ static inline void tdx_io_out(int size, u16 port, u32 value) .r15 = value, }; -__tdx_hypercall (&args,0 ); +__tdx_hypercall (&args); }static inline u8 tdx_inb (u16 port)
arch/x86/coco/tdx/tdcall.S +38 -28
124 lines not on this page · raw message
arch/x86/coco/tdx/tdx.c +9 -9
@@ -66,7 +66,7 @@ static inline u64 _tdx_hypercall(u64 fn, u64 r12, u64 r13, u64 r14, u64 r15) .r15 = r15, }; -return __tdx_hypercall (&args,0 ); +return __tdx_hypercall (&args); }/* Called from __tdx_hypercall() for unrecoverable failure */
@@ -99,7 +99,7 @@ long tdx_kvm_hypercall(unsigned int nr, unsigned long p1, unsigned long p2, .r14 = p4, }; -return __tdx_hypercall (&args,0 ); +return __tdx_hypercall (&args); }EXPORT_SYMBOL_GPL (tdx_kvm_hypercall);#endif
@@ -179,7 +179,7 @@ static void __noreturn tdx_panic(const char *msg)* happens to return. */ while (1 ) -__tdx_hypercall (&args,0 ); +__tdx_hypercall (&args); }static void tdx_parse_tdinfo (u64 *cc_mask)
@@ -289,7 +289,7 @@ static u64 __cpuidle __halt(const bool irq_disabled)* can keep the vCPU in virtual HLT, even if an IRQ is * pending, without hanging/breaking the guest. */ -return __tdx_hypercall (&args,0 ); +return __tdx_hypercall (&args); }static int handle_halt (struct ve_info *ve)
@@ -326,7 +326,7 @@ static int read_msr(struct pt_regs *regs, struct ve_info *ve)* can be found in TDX Guest-Host-Communication Interface * (GHCI), section titled "TDG.VP.VMCALL<Instruction.RDMSR>". */ -if (__tdx_hypercall (&args,TDX_HCALL_HAS_OUTPUT )) +if (__tdx_hypercall_ret (&args))return -EIO ; regs->ax =lower_32_bits (args.r11);
@@ -348,7 +348,7 @@ static int write_msr(struct pt_regs *regs, struct ve_info *ve)* can be found in TDX Guest-Host-Communication Interface * (GHCI) section titled "TDG.VP.VMCALL<Instruction.WRMSR>". */ -if (__tdx_hypercall (&args,0 )) +if (__tdx_hypercall (&args))return -EIO ;return ve_instr_len (ve);
@@ -380,7 +380,7 @@ static int handle_cpuid(struct pt_regs *regs, struct ve_info *ve)* ABI can be found in TDX Guest-Host-Communication Interface * (GHCI), section titled "VP.VMCALL<Instruction.CPUID>". */ -if (__tdx_hypercall (&args,TDX_HCALL_HAS_OUTPUT )) +if (__tdx_hypercall_ret (&args))return -EIO ;/*
@@ -407,7 +407,7 @@ static bool mmio_read(int size, unsigned long addr, unsigned long *val) .r15 = *val, }; -if (__tdx_hypercall (&args,TDX_HCALL_HAS_OUTPUT )) +if (__tdx_hypercall_ret (&args))return false; *val = args.r11;return true;
@@ -541,7 +541,7 @@ 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,TDX_HCALL_HAS_OUTPUT ); + success = !__tdx_hypercall_ret (&args);/* Update part of the register affected by the emulated instruction */ regs->ax &= ~mask;
arch/x86/include/asm/shared/tdx.h +2 -3
@@ -7,8 +7,6 @@#define TDX_HYPERCALL_STANDARD 0 -#define TDX_HCALL_HAS_OUTPUT BIT(0) -#define TDX_CPUID_LEAF_ID 0x21#define TDX_IDENT "IntelTDX "
@@ -36,7 +34,8 @@ struct tdx_hypercall_args { };/* Used to request services from the VMM */ -u64 __tdx_hypercall (struct tdx_hypercall_args *args,unsigned long flags); +u64 __tdx_hypercall (struct tdx_hypercall_args *args); +u64 __tdx_hypercall_ret (struct tdx_hypercall_args *args);/* Called from __tdx_hypercall() for unrecoverable failure */ void __tdx_hypercall_failed (void );
Signature · 1 line
2.39.1
Quoted 9 lines · Kirill A. Shutemov
After
TDX_HCALL_ISSUE_STIgot dropped, the only flag left isTDX_HCALL_HAS_OUTPUT. The flag indicates if the caller wants to seetdx_hypercall_argsupdated based on the hypercall output.Drop the flags and provide
__tdx_hypercall_ret()that matchesTDX_HCALL_HAS_OUTPUTsemantics.Signed-off-by Kirill A. Shutemov <[email protected]>Suggested-by Peter Zijlstra <[email protected]>
Nice!