* [PATCH v3 1/3] x86/vmware: Move high-bandwidth hypercalls out of line
2026-11-03 7:14 [PATCH v3 0/3] x86/vmware: Clean up the hypercall code Zack Rusin
@ 2026-11-03 7:14 ` Zack Rusin
2026-11-03 7:14 ` [PATCH v3 2/3] x86/vmware: Route low-bandwidth hypercalls through a static call Zack Rusin
2026-11-03 7:14 ` [PATCH v3 3/3] x86/cpufeatures: Remove unused VMware hypercall feature bits Zack Rusin
2 siblings, 0 replies; 5+ messages in thread
From: Zack Rusin @ 2026-11-03 7:14 UTC (permalink / raw)
To: Borislav Petkov, Ajay Kaher, Alexey Makhalov, x86
Cc: Thomas Gleixner, Ingo Molnar, Dave Hansen, H. Peter Anvin,
virtualization, bcm-kernel-feedback-list, linux-kernel,
Linus Torvalds, Peter Zijlstra, Josh Poimboeuf, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Simona Vetter,
Kiryl Shutsemau, Rick Edgecombe, linux-coco, kvm, dri-devel,
Zack Rusin
The high-bandwidth helpers contain inline assembly which temporarily uses
%bp as a VMware ABI register. Keeping that assembly in vmware.h duplicates
it in callers.
Move both helpers to vmware.c and export them for the vmwgfx module.
Preserve their unwind hints and remove the redundant caller-wide objtool
annotations from vmwgfx.
Preserve the argument sequence from commit e0e022004bbe ("x86/vmware:
Fix i386 high-bandwidth hypercall arguments").
Signed-off-by: Zack Rusin <zack.rusin@broadcom.com>
---
arch/x86/include/asm/vmware.h | 62 +-------------------------
arch/x86/kernel/cpu/vmware.c | 68 +++++++++++++++++++++++++++++
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 3 --
3 files changed, 70 insertions(+), 63 deletions(-)
diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h
index fb011cef01e7..f3ffe358d2a3 100644
--- a/arch/x86/include/asm/vmware.h
+++ b/arch/x86/include/asm/vmware.h
@@ -253,12 +253,6 @@ unsigned long vmware_hypercall7(unsigned long cmd, unsigned long in1,
return out0;
}
-#ifdef CONFIG_X86_64
-#define VMW_BP_CONSTRAINT "r"
-#else
-#define VMW_BP_CONSTRAINT "m"
-#endif
-
/*
* High bandwidth calls are not supported on encrypted memory guests.
* The caller should check cc_platform_has(CC_ATTR_MEM_ENCRYPT) and use
@@ -266,66 +260,14 @@ unsigned long vmware_hypercall7(unsigned long cmd, unsigned long in1,
* This assumption simplifies HB hypercall implementation to just I/O port
* based approach without alternative patching.
*/
-static inline
unsigned long vmware_hypercall_hb_out(unsigned long cmd, unsigned long in2,
unsigned long in3, unsigned long in4,
unsigned long in5, unsigned long in6,
- u32 *out1)
-{
- unsigned long out0;
-
- asm_inline volatile (
- UNWIND_HINT_SAVE
- "mov %[in6], %%" _ASM_AX "\n\t"
- "push %%" _ASM_BP "\n\t"
- UNWIND_HINT_UNDEFINED
- "mov %%" _ASM_AX ", %%" _ASM_BP "\n\t"
- "mov %[magic], %%eax\n\t"
- "rep outsb\n\t"
- "pop %%" _ASM_BP "\n\t"
- UNWIND_HINT_RESTORE
- : "=&a" (out0), "=b" (*out1)
- : "b" (cmd),
- "c" (in2),
- "d" (in3 | VMWARE_HYPERVISOR_PORT_HB),
- "S" (in4),
- "D" (in5),
- [in6] VMW_BP_CONSTRAINT(in6),
- [magic] "i" (VMWARE_HYPERVISOR_MAGIC)
- : "cc", "memory");
- return out0;
-}
-
-static inline
+ u32 *out1);
unsigned long vmware_hypercall_hb_in(unsigned long cmd, unsigned long in2,
unsigned long in3, unsigned long in4,
unsigned long in5, unsigned long in6,
- u32 *out1)
-{
- unsigned long out0;
-
- asm_inline volatile (
- UNWIND_HINT_SAVE
- "mov %[in6], %%" _ASM_AX "\n\t"
- "push %%" _ASM_BP "\n\t"
- UNWIND_HINT_UNDEFINED
- "mov %%" _ASM_AX ", %%" _ASM_BP "\n\t"
- "mov %[magic], %%eax\n\t"
- "rep insb\n\t"
- "pop %%" _ASM_BP "\n\t"
- UNWIND_HINT_RESTORE
- : "=&a" (out0), "=b" (*out1)
- : "b" (cmd),
- "c" (in2),
- "d" (in3 | VMWARE_HYPERVISOR_PORT_HB),
- "S" (in4),
- "D" (in5),
- [in6] VMW_BP_CONSTRAINT(in6),
- [magic] "i" (VMWARE_HYPERVISOR_MAGIC)
- : "cc", "memory");
- return out0;
-}
-#undef VMW_BP_CONSTRAINT
+ u32 *out1);
#undef VMWARE_HYPERCALL
#endif
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index f7ab9e7902cf..7cfc894f0663 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -30,12 +30,14 @@
#include <linux/reboot.h>
#include <linux/static_call.h>
#include <linux/sched/cputime.h>
+#include <asm/asm.h>
#include <asm/div64.h>
#include <asm/x86_init.h>
#include <asm/hypervisor.h>
#include <asm/cpuid/api.h>
#include <asm/timer.h>
#include <asm/apic.h>
+#include <asm/unwind_hints.h>
#include <asm/vmware.h>
#include <asm/svm.h>
@@ -67,6 +69,72 @@ struct vmware_steal_time {
static unsigned long vmware_tsc_khz __ro_after_init;
static u8 vmware_hypercall_mode __ro_after_init;
+#ifdef CONFIG_X86_64
+#define VMW_BP_CONSTRAINT "r"
+#else
+#define VMW_BP_CONSTRAINT "m"
+#endif
+
+unsigned long vmware_hypercall_hb_out(unsigned long cmd, unsigned long in2,
+ unsigned long in3, unsigned long in4,
+ unsigned long in5, unsigned long in6,
+ u32 *out1)
+{
+ unsigned long out0;
+
+ asm volatile(UNWIND_HINT_SAVE
+ "mov %[in6], %%" _ASM_AX "\n\t"
+ "push %%" _ASM_BP "\n\t"
+ UNWIND_HINT_UNDEFINED
+ "mov %%" _ASM_AX ", %%" _ASM_BP "\n\t"
+ "mov %[magic], %%eax\n\t"
+ "rep outsb\n\t"
+ "pop %%" _ASM_BP "\n\t"
+ UNWIND_HINT_RESTORE
+ : "=&a" (out0), "=b" (*out1)
+ : "b" (cmd),
+ "c" (in2),
+ "d" (in3 | VMWARE_HYPERVISOR_PORT_HB),
+ "S" (in4),
+ "D" (in5),
+ [in6] VMW_BP_CONSTRAINT(in6),
+ [magic] "i" (VMWARE_HYPERVISOR_MAGIC)
+ : "cc", "memory");
+ return out0;
+}
+EXPORT_SYMBOL_GPL(vmware_hypercall_hb_out);
+
+unsigned long vmware_hypercall_hb_in(unsigned long cmd, unsigned long in2,
+ unsigned long in3, unsigned long in4,
+ unsigned long in5, unsigned long in6,
+ u32 *out1)
+{
+ unsigned long out0;
+
+ asm volatile(UNWIND_HINT_SAVE
+ "mov %[in6], %%" _ASM_AX "\n\t"
+ "push %%" _ASM_BP "\n\t"
+ UNWIND_HINT_UNDEFINED
+ "mov %%" _ASM_AX ", %%" _ASM_BP "\n\t"
+ "mov %[magic], %%eax\n\t"
+ "rep insb\n\t"
+ "pop %%" _ASM_BP "\n\t"
+ UNWIND_HINT_RESTORE
+ : "=&a" (out0), "=b" (*out1)
+ : "b" (cmd),
+ "c" (in2),
+ "d" (in3 | VMWARE_HYPERVISOR_PORT_HB),
+ "S" (in4),
+ "D" (in5),
+ [in6] VMW_BP_CONSTRAINT(in6),
+ [magic] "i" (VMWARE_HYPERVISOR_MAGIC)
+ : "cc", "memory");
+ return out0;
+}
+EXPORT_SYMBOL_GPL(vmware_hypercall_hb_in);
+
+#undef VMW_BP_CONSTRAINT
+
unsigned long vmware_hypercall_slow(unsigned long cmd,
unsigned long in1, unsigned long in3,
unsigned long in4, unsigned long in5,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
index fd77ab6568cb..20ab4019680c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
@@ -24,7 +24,6 @@
*
*/
-#include <linux/objtool.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
@@ -289,7 +288,6 @@ static int vmw_send_msg(struct rpc_channel *channel, const char *msg)
return -EINVAL;
}
-STACK_FRAME_NON_STANDARD_FP(vmw_send_msg);
/**
@@ -384,7 +382,6 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,
return 0;
}
-STACK_FRAME_NON_STANDARD(vmw_recv_msg);
/**
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v3 2/3] x86/vmware: Route low-bandwidth hypercalls through a static call
2026-11-03 7:14 [PATCH v3 0/3] x86/vmware: Clean up the hypercall code Zack Rusin
2026-11-03 7:14 ` [PATCH v3 1/3] x86/vmware: Move high-bandwidth hypercalls out of line Zack Rusin
@ 2026-11-03 7:14 ` Zack Rusin
2026-11-03 7:34 ` sashiko-bot
2026-11-03 7:14 ` [PATCH v3 3/3] x86/cpufeatures: Remove unused VMware hypercall feature bits Zack Rusin
2 siblings, 1 reply; 5+ messages in thread
From: Zack Rusin @ 2026-11-03 7:14 UTC (permalink / raw)
To: Borislav Petkov, Ajay Kaher, Alexey Makhalov, x86
Cc: Thomas Gleixner, Ingo Molnar, Dave Hansen, H. Peter Anvin,
virtualization, bcm-kernel-feedback-list, linux-kernel,
Linus Torvalds, Peter Zijlstra, Josh Poimboeuf, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Simona Vetter,
Kiryl Shutsemau, Rick Edgecombe, linux-coco, kvm, dri-devel,
Zack Rusin
From: Alexey Makhalov <alexey.makhalov@broadcom.com>
The low-bandwidth wrappers duplicate inline assembly for the backdoor,
vmcall, vmmcall and TDX paths. The early boot path also needs a separate
dispatcher until alternatives have been patched.
Move the assembly into four backends selected by a static call. Pass the
command with input and result structures instead of ten arguments with
nullable output pointers, as suggested by Linus. Keep the existing wrapper
API for callers.
The backdoor remains the link-time target for early DMI probing. Each
backend fills the complete result structure. The backdoor replaces the low
word of %dx with its port; vmcall, vmmcall and TDX preserve that word.
Export only the GPL trampoline so modules can call it but cannot retarget
it.
The selected static call also makes vmware_hypercall_slow() obsolete.
Remove it in the same change so no runtime code refers to the init-only
mode byte. Print the selected backend by name instead of its numeric mode.
Link: https://lore.kernel.org/r/20260309235250.2611115-2-alexey.makhalov@broadcom.com
Link: https://lore.kernel.org/all/CAHk-=wivx7pi+h+hGmvNFAJm6StQLiQ-b8DdsE5J=LMOWae8Ng@mail.gmail.com/
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Alexey Makhalov <alexey.makhalov@broadcom.com>
Co-developed-by: Zack Rusin <zack.rusin@broadcom.com>
Signed-off-by: Zack Rusin <zack.rusin@broadcom.com>
---
arch/x86/include/asm/vmware.h | 309 +++++++++++++++-------------------
arch/x86/kernel/cpu/vmware.c | 225 ++++++++++++++++---------
2 files changed, 278 insertions(+), 256 deletions(-)
diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h
index f3ffe358d2a3..207067ed8c35 100644
--- a/arch/x86/include/asm/vmware.h
+++ b/arch/x86/include/asm/vmware.h
@@ -2,49 +2,79 @@
#ifndef _ASM_X86_VMWARE_H
#define _ASM_X86_VMWARE_H
-#include <asm/cpufeatures.h>
-#include <asm/alternative.h>
-#include <linux/stringify.h>
+#include <linux/bits.h>
+#include <linux/static_call.h>
+#include <linux/types.h>
/*
* VMware hypercall ABI.
*
- * - Low bandwidth (LB) hypercalls (I/O port based, vmcall and vmmcall)
- * have up to 6 input and 6 output arguments passed and returned using
- * registers: %eax (arg0), %ebx (arg1), %ecx (arg2), %edx (arg3),
- * %esi (arg4), %edi (arg5).
- * The following input arguments must be initialized by the caller:
- * arg0 - VMWARE_HYPERVISOR_MAGIC
- * arg2 - Hypercall command
- * arg3 bits [15:0] - Port number, LB and direction flags
+ * Low bandwidth (LB) hypercalls use the I/O-port backdoor, vmcall or vmmcall
+ * and have the following register mapping:
*
- * - Low bandwidth TDX hypercalls (x86_64 only) are similar to LB
- * hypercalls. They also have up to 6 input and 6 output on registers
- * arguments, with different argument to register mapping:
- * %r12 (arg0), %rbx (arg1), %r13 (arg2), %rdx (arg3),
- * %rsi (arg4), %rdi (arg5).
+ * +------+---------------------------------------+-----------------+
+ * | Reg | Input | Output |
+ * +======+=======================================+=================+
+ * | %eax | VMWARE_HYPERVISOR_MAGIC | out0 |
+ * +------+---------------------------------------+-----------------+
+ * | %ebx | in1 | out1 |
+ * +------+---------------------------------------+-----------------+
+ * | %ecx | cmd | out2 |
+ * +------+---------------------------------------+-----------------+
+ * | %edx | Bits 15:0: port for the backdoor, | out3 |
+ * | | flags for vmcall/vmmcall | |
+ * | | Bits 31:16: in3 | |
+ * +------+---------------------------------------+-----------------+
+ * | %esi | in4 | out4 |
+ * +------+---------------------------------------+-----------------+
+ * | %edi | in5 | out5 |
+ * +------+---------------------------------------+-----------------+
*
- * - High bandwidth (HB) hypercalls are I/O port based only. They have
- * up to 7 input and 7 output arguments passed and returned using
- * registers: %eax (arg0), %ebx (arg1), %ecx (arg2), %edx (arg3),
- * %esi (arg4), %edi (arg5), %ebp (arg6).
- * The following input arguments must be initialized by the caller:
- * arg0 - VMWARE_HYPERVISOR_MAGIC
- * arg1 - Hypercall command
- * arg3 bits [15:0] - Port number, HB and direction flags
+ * TDX LB hypercalls are x86-64-only and use a different mapping:
*
- * For compatibility purposes, x86_64 systems use only lower 32 bits
- * for input and output arguments.
+ * +------+---------------------------------------+-----------------+
+ * | Reg | Input | Output |
+ * +======+=======================================+=================+
+ * | %r12 | VMWARE_HYPERVISOR_MAGIC | out0 |
+ * +------+---------------------------------------+-----------------+
+ * | %rbx | in1 | out1 |
+ * +------+---------------------------------------+-----------------+
+ * | %r13 | cmd | out2 |
+ * +------+---------------------------------------+-----------------+
+ * | %rdx | Bits 15:0: flags | out3 |
+ * | | Bits 31:16: in3 | |
+ * +------+---------------------------------------+-----------------+
+ * | %rsi | in4 | out4 |
+ * +------+---------------------------------------+-----------------+
+ * | %rdi | in5 | out5 |
+ * +------+---------------------------------------+-----------------+
*
- * The hypercall definitions differ in the low word of the %edx (arg3)
- * in the following way: the old I/O port based interface uses the port
- * number to distinguish between high- and low bandwidth versions, and
- * uses IN/OUT instructions to define transfer direction.
+ * For vmcall, vmmcall and TDX, a zero low word selects the ordinary
+ * low-bandwidth input form. Other low-word flags are passed through.
*
- * The new vmcall interface instead uses a set of flags to select
- * bandwidth mode and transfer direction. The flags should be loaded
- * into arg3 by any user and are automatically replaced by the port
- * number if the I/O port method is used.
+ * High bandwidth (HB) hypercalls use the I/O-port backdoor only:
+ *
+ * +------+---------------------------------------+-----------------+
+ * | Reg | Input | Output |
+ * +======+=======================================+=================+
+ * | %eax | VMWARE_HYPERVISOR_MAGIC | out0 |
+ * +------+---------------------------------------+-----------------+
+ * | %ebx | cmd | out1 |
+ * +------+---------------------------------------+-----------------+
+ * | %ecx | in2 | out2 |
+ * +------+---------------------------------------+-----------------+
+ * | %edx | Bits 15:0: port and HB flag | out3 |
+ * | | Bits 31:16: in3 | |
+ * +------+---------------------------------------+-----------------+
+ * | %esi | in4 | out4 |
+ * +------+---------------------------------------+-----------------+
+ * | %edi | in5 | out5 |
+ * +------+---------------------------------------+-----------------+
+ * | %ebp | in6 | out6 |
+ * +------+---------------------------------------+-----------------+
+ *
+ * The low-bandwidth wrappers return non-%rax results through u32 pointers.
+ * High-bandwidth buffer addresses in %rsi/%rdi are pointer-sized on x86-64.
*/
#define VMWARE_HYPERVISOR_HB BIT(0)
@@ -70,103 +100,64 @@
#define CPUID_VMWARE_FEATURES_ECX_VMMCALL BIT(0)
#define CPUID_VMWARE_FEATURES_ECX_VMCALL BIT(1)
-extern unsigned long vmware_hypercall_slow(unsigned long cmd,
- unsigned long in1, unsigned long in3,
- unsigned long in4, unsigned long in5,
- u32 *out1, u32 *out2, u32 *out3,
- u32 *out4, u32 *out5);
+struct vmware_hypercall_args {
+ unsigned long bx;
+ unsigned long dx;
+ unsigned long si;
+ unsigned long di;
+};
-#define VMWARE_TDX_VENDOR_LEAF 0x1af7e4909ULL
-#define VMWARE_TDX_HCALL_FUNC 1
+struct vmware_hypercall_results {
+ unsigned long bx;
+ unsigned long cx;
+ unsigned long dx;
+ unsigned long si;
+ unsigned long di;
+};
-extern unsigned long vmware_tdx_hypercall(unsigned long cmd,
- unsigned long in1, unsigned long in3,
- unsigned long in4, unsigned long in5,
- u32 *out1, u32 *out2, u32 *out3,
- u32 *out4, u32 *out5);
+unsigned long
+vmware_hypercall_func(unsigned long cmd,
+ const struct vmware_hypercall_args *in,
+ struct vmware_hypercall_results *out);
-/*
- * The low bandwidth call. The low word of %edx is presumed to have OUT bit
- * set. The high word of %edx may contain input data from the caller.
- */
-#define VMWARE_HYPERCALL \
- ALTERNATIVE_2("movw %[port], %%dx\n\t" \
- "inl (%%dx), %%eax", \
- "vmcall", X86_FEATURE_VMCALL, \
- "vmmcall", X86_FEATURE_VMW_VMMCALL)
+DECLARE_STATIC_CALL(vmware_hypercall, vmware_hypercall_func);
static inline
unsigned long vmware_hypercall1(unsigned long cmd, unsigned long in1)
{
- unsigned long out0;
+ const struct vmware_hypercall_args in = { .bx = in1 };
+ struct vmware_hypercall_results out;
- if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST))
- return vmware_tdx_hypercall(cmd, in1, 0, 0, 0,
- NULL, NULL, NULL, NULL, NULL);
-
- if (unlikely(!alternatives_patched) && !__is_defined(MODULE))
- return vmware_hypercall_slow(cmd, in1, 0, 0, 0,
- NULL, NULL, NULL, NULL, NULL);
-
- asm_inline volatile (VMWARE_HYPERCALL
- : "=a" (out0)
- : [port] "i" (VMWARE_HYPERVISOR_PORT),
- "a" (VMWARE_HYPERVISOR_MAGIC),
- "b" (in1),
- "c" (cmd),
- "d" (0)
- : "cc", "memory");
- return out0;
+ return static_call_mod(vmware_hypercall)(cmd, &in, &out);
}
static inline
unsigned long vmware_hypercall3(unsigned long cmd, unsigned long in1,
u32 *out1, u32 *out2)
{
- unsigned long out0;
+ const struct vmware_hypercall_args in = { .bx = in1 };
+ struct vmware_hypercall_results out;
+ unsigned long ret;
- if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST))
- return vmware_tdx_hypercall(cmd, in1, 0, 0, 0,
- out1, out2, NULL, NULL, NULL);
-
- if (unlikely(!alternatives_patched) && !__is_defined(MODULE))
- return vmware_hypercall_slow(cmd, in1, 0, 0, 0,
- out1, out2, NULL, NULL, NULL);
-
- asm_inline volatile (VMWARE_HYPERCALL
- : "=a" (out0), "=b" (*out1), "=c" (*out2)
- : [port] "i" (VMWARE_HYPERVISOR_PORT),
- "a" (VMWARE_HYPERVISOR_MAGIC),
- "b" (in1),
- "c" (cmd),
- "d" (0)
- : "di", "si", "cc", "memory");
- return out0;
+ ret = static_call_mod(vmware_hypercall)(cmd, &in, &out);
+ *out1 = out.bx;
+ *out2 = out.cx;
+ return ret;
}
static inline
unsigned long vmware_hypercall4(unsigned long cmd, unsigned long in1,
u32 *out1, u32 *out2, u32 *out3)
{
- unsigned long out0;
+ const struct vmware_hypercall_args in = { .bx = in1 };
+ struct vmware_hypercall_results out;
+ unsigned long ret;
- if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST))
- return vmware_tdx_hypercall(cmd, in1, 0, 0, 0,
- out1, out2, out3, NULL, NULL);
-
- if (unlikely(!alternatives_patched) && !__is_defined(MODULE))
- return vmware_hypercall_slow(cmd, in1, 0, 0, 0,
- out1, out2, out3, NULL, NULL);
-
- asm_inline volatile (VMWARE_HYPERCALL
- : "=a" (out0), "=b" (*out1), "=c" (*out2), "=d" (*out3)
- : [port] "i" (VMWARE_HYPERVISOR_PORT),
- "a" (VMWARE_HYPERVISOR_MAGIC),
- "b" (in1),
- "c" (cmd),
- "d" (0)
- : "di", "si", "cc", "memory");
- return out0;
+ ret = static_call_mod(vmware_hypercall)(cmd, &in, &out);
+ *out1 = out.bx;
+ *out2 = out.cx;
+ *out3 = out.dx;
+ return ret;
}
static inline
@@ -174,27 +165,18 @@ unsigned long vmware_hypercall5(unsigned long cmd, unsigned long in1,
unsigned long in3, unsigned long in4,
unsigned long in5, u32 *out2)
{
- unsigned long out0;
+ const struct vmware_hypercall_args in = {
+ .bx = in1,
+ .dx = in3,
+ .si = in4,
+ .di = in5,
+ };
+ struct vmware_hypercall_results out;
+ unsigned long ret;
- if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST))
- return vmware_tdx_hypercall(cmd, in1, in3, in4, in5,
- NULL, out2, NULL, NULL, NULL);
-
- if (unlikely(!alternatives_patched) && !__is_defined(MODULE))
- return vmware_hypercall_slow(cmd, in1, in3, in4, in5,
- NULL, out2, NULL, NULL, NULL);
-
- asm_inline volatile (VMWARE_HYPERCALL
- : "=a" (out0), "=c" (*out2)
- : [port] "i" (VMWARE_HYPERVISOR_PORT),
- "a" (VMWARE_HYPERVISOR_MAGIC),
- "b" (in1),
- "c" (cmd),
- "d" (in3),
- "S" (in4),
- "D" (in5)
- : "cc", "memory");
- return out0;
+ ret = static_call_mod(vmware_hypercall)(cmd, &in, &out);
+ *out2 = out.cx;
+ return ret;
}
static inline
@@ -202,26 +184,19 @@ unsigned long vmware_hypercall6(unsigned long cmd, unsigned long in1,
unsigned long in3, u32 *out2,
u32 *out3, u32 *out4, u32 *out5)
{
- unsigned long out0;
+ const struct vmware_hypercall_args in = {
+ .bx = in1,
+ .dx = in3,
+ };
+ struct vmware_hypercall_results out;
+ unsigned long ret;
- if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST))
- return vmware_tdx_hypercall(cmd, in1, in3, 0, 0,
- NULL, out2, out3, out4, out5);
-
- if (unlikely(!alternatives_patched) && !__is_defined(MODULE))
- return vmware_hypercall_slow(cmd, in1, in3, 0, 0,
- NULL, out2, out3, out4, out5);
-
- asm_inline volatile (VMWARE_HYPERCALL
- : "=a" (out0), "=c" (*out2), "=d" (*out3), "=S" (*out4),
- "=D" (*out5)
- : [port] "i" (VMWARE_HYPERVISOR_PORT),
- "a" (VMWARE_HYPERVISOR_MAGIC),
- "b" (in1),
- "c" (cmd),
- "d" (in3)
- : "cc", "memory");
- return out0;
+ ret = static_call_mod(vmware_hypercall)(cmd, &in, &out);
+ *out2 = out.cx;
+ *out3 = out.dx;
+ *out4 = out.si;
+ *out5 = out.di;
+ return ret;
}
static inline
@@ -230,35 +205,26 @@ unsigned long vmware_hypercall7(unsigned long cmd, unsigned long in1,
unsigned long in5, u32 *out1,
u32 *out2, u32 *out3)
{
- unsigned long out0;
+ const struct vmware_hypercall_args in = {
+ .bx = in1,
+ .dx = in3,
+ .si = in4,
+ .di = in5,
+ };
+ struct vmware_hypercall_results out;
+ unsigned long ret;
- if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST))
- return vmware_tdx_hypercall(cmd, in1, in3, in4, in5,
- out1, out2, out3, NULL, NULL);
-
- if (unlikely(!alternatives_patched) && !__is_defined(MODULE))
- return vmware_hypercall_slow(cmd, in1, in3, in4, in5,
- out1, out2, out3, NULL, NULL);
-
- asm_inline volatile (VMWARE_HYPERCALL
- : "=a" (out0), "=b" (*out1), "=c" (*out2), "=d" (*out3)
- : [port] "i" (VMWARE_HYPERVISOR_PORT),
- "a" (VMWARE_HYPERVISOR_MAGIC),
- "b" (in1),
- "c" (cmd),
- "d" (in3),
- "S" (in4),
- "D" (in5)
- : "cc", "memory");
- return out0;
+ ret = static_call_mod(vmware_hypercall)(cmd, &in, &out);
+ *out1 = out.bx;
+ *out2 = out.cx;
+ *out3 = out.dx;
+ return ret;
}
/*
* High bandwidth calls are not supported on encrypted memory guests.
* The caller should check cc_platform_has(CC_ATTR_MEM_ENCRYPT) and use
- * low bandwidth hypercall if memory encryption is set.
- * This assumption simplifies HB hypercall implementation to just I/O port
- * based approach without alternative patching.
+ * low bandwidth hypercalls if memory encryption is set.
*/
unsigned long vmware_hypercall_hb_out(unsigned long cmd, unsigned long in2,
unsigned long in3, unsigned long in4,
@@ -268,6 +234,5 @@ unsigned long vmware_hypercall_hb_in(unsigned long cmd, unsigned long in2,
unsigned long in3, unsigned long in4,
unsigned long in5, unsigned long in6,
u32 *out1);
-#undef VMWARE_HYPERCALL
#endif
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index 7cfc894f0663..6719c009f237 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -50,6 +50,9 @@
#define GETVCPU_INFO_LEGACY_X2APIC BIT(3)
#define GETVCPU_INFO_VCPU_RESERVED BIT(31)
+#define VMWARE_TDX_VENDOR_LEAF 0x1af7e4909ULL
+#define VMWARE_TDX_HCALL_FUNC 1
+
#define STEALCLOCK_NOT_AVAILABLE (-1)
#define STEALCLOCK_DISABLED 0
#define STEALCLOCK_ENABLED 1
@@ -67,7 +70,7 @@ struct vmware_steal_time {
};
static unsigned long vmware_tsc_khz __ro_after_init;
-static u8 vmware_hypercall_mode __ro_after_init;
+static u8 vmware_hypercall_mode __initdata;
#ifdef CONFIG_X86_64
#define VMW_BP_CONSTRAINT "r"
@@ -135,68 +138,97 @@ EXPORT_SYMBOL_GPL(vmware_hypercall_hb_in);
#undef VMW_BP_CONSTRAINT
-unsigned long vmware_hypercall_slow(unsigned long cmd,
- unsigned long in1, unsigned long in3,
- unsigned long in4, unsigned long in5,
- u32 *out1, u32 *out2, u32 *out3,
- u32 *out4, u32 *out5)
+static unsigned long
+vmware_backdoor_hypercall(unsigned long cmd,
+ const struct vmware_hypercall_args *in,
+ struct vmware_hypercall_results *out)
{
- unsigned long out0, rbx, rcx, rdx, rsi, rdi;
+ unsigned long ax = VMWARE_HYPERVISOR_MAGIC;
+ unsigned long bx = in->bx;
+ unsigned long cx = cmd;
+ unsigned long dx = in->dx;
+ unsigned long si = in->si;
+ unsigned long di = in->di;
- switch (vmware_hypercall_mode) {
- case CPUID_VMWARE_FEATURES_ECX_VMCALL:
- asm_inline volatile ("vmcall"
- : "=a" (out0), "=b" (rbx), "=c" (rcx),
- "=d" (rdx), "=S" (rsi), "=D" (rdi)
- : "a" (VMWARE_HYPERVISOR_MAGIC),
- "b" (in1),
- "c" (cmd),
- "d" (in3),
- "S" (in4),
- "D" (in5)
- : "cc", "memory");
- break;
- case CPUID_VMWARE_FEATURES_ECX_VMMCALL:
- asm_inline volatile ("vmmcall"
- : "=a" (out0), "=b" (rbx), "=c" (rcx),
- "=d" (rdx), "=S" (rsi), "=D" (rdi)
- : "a" (VMWARE_HYPERVISOR_MAGIC),
- "b" (in1),
- "c" (cmd),
- "d" (in3),
- "S" (in4),
- "D" (in5)
- : "cc", "memory");
- break;
- default:
- asm_inline volatile ("movw %[port], %%dx; inl (%%dx), %%eax"
- : "=a" (out0), "=b" (rbx), "=c" (rcx),
- "=d" (rdx), "=S" (rsi), "=D" (rdi)
- : [port] "i" (VMWARE_HYPERVISOR_PORT),
- "a" (VMWARE_HYPERVISOR_MAGIC),
- "b" (in1),
- "c" (cmd),
- "d" (in3),
- "S" (in4),
- "D" (in5)
- : "cc", "memory");
- break;
- }
+ dx = (dx & ~0xffffUL) | VMWARE_HYPERVISOR_PORT;
+ asm volatile ("inl (%%dx), %%eax"
+ : "+a" (ax), "+b" (bx), "+c" (cx),
+ "+d" (dx), "+S" (si), "+D" (di)
+ :
+ : "cc", "memory");
- if (out1)
- *out1 = rbx;
- if (out2)
- *out2 = rcx;
- if (out3)
- *out3 = rdx;
- if (out4)
- *out4 = rsi;
- if (out5)
- *out5 = rdi;
+ *out = (struct vmware_hypercall_results) {
+ .bx = bx,
+ .cx = cx,
+ .dx = dx,
+ .si = si,
+ .di = di,
+ };
- return out0;
+ return ax;
}
+static unsigned long
+vmware_vmcall_hypercall(unsigned long cmd,
+ const struct vmware_hypercall_args *in,
+ struct vmware_hypercall_results *out)
+{
+ unsigned long ax = VMWARE_HYPERVISOR_MAGIC;
+ unsigned long bx = in->bx;
+ unsigned long cx = cmd;
+ unsigned long dx = in->dx;
+ unsigned long si = in->si;
+ unsigned long di = in->di;
+
+ asm volatile ("vmcall"
+ : "+a" (ax), "+b" (bx), "+c" (cx),
+ "+d" (dx), "+S" (si), "+D" (di)
+ :
+ : "cc", "memory");
+
+ *out = (struct vmware_hypercall_results) {
+ .bx = bx,
+ .cx = cx,
+ .dx = dx,
+ .si = si,
+ .di = di,
+ };
+
+ return ax;
+}
+
+static unsigned long
+vmware_vmmcall_hypercall(unsigned long cmd,
+ const struct vmware_hypercall_args *in,
+ struct vmware_hypercall_results *out)
+{
+ unsigned long ax = VMWARE_HYPERVISOR_MAGIC;
+ unsigned long bx = in->bx;
+ unsigned long cx = cmd;
+ unsigned long dx = in->dx;
+ unsigned long si = in->si;
+ unsigned long di = in->di;
+
+ asm volatile ("vmmcall"
+ : "+a" (ax), "+b" (bx), "+c" (cx),
+ "+d" (dx), "+S" (si), "+D" (di)
+ :
+ : "cc", "memory");
+
+ *out = (struct vmware_hypercall_results) {
+ .bx = bx,
+ .cx = cx,
+ .dx = dx,
+ .si = si,
+ .di = di,
+ };
+
+ return ax;
+}
+
+DEFINE_STATIC_CALL(vmware_hypercall, vmware_backdoor_hypercall);
+EXPORT_STATIC_CALL_TRAMP_GPL(vmware_hypercall);
+
static inline int __vmware_platform(void)
{
u32 eax, ebx, ecx;
@@ -466,11 +498,38 @@ static void __init vmware_set_capabilities(void)
setup_force_cpu_cap(X86_FEATURE_VMW_VMMCALL);
}
+static unsigned long
+vmware_tdx_hypercall(unsigned long cmd,
+ const struct vmware_hypercall_args *in,
+ struct vmware_hypercall_results *out);
+
+static void __init vmware_init_hypercall(void)
+{
+ const char *mode;
+
+ if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) {
+ static_call_update(vmware_hypercall, vmware_tdx_hypercall);
+ mode = "tdcall";
+ } else if (vmware_hypercall_mode == CPUID_VMWARE_FEATURES_ECX_VMCALL) {
+ static_call_update(vmware_hypercall, vmware_vmcall_hypercall);
+ mode = "vmcall";
+ } else if (vmware_hypercall_mode == CPUID_VMWARE_FEATURES_ECX_VMMCALL) {
+ static_call_update(vmware_hypercall, vmware_vmmcall_hypercall);
+ mode = "vmmcall";
+ } else {
+ mode = "backdoor";
+ }
+
+ pr_info("hypercall mode: %s\n", mode);
+}
+
static void __init vmware_platform_setup(void)
{
u32 eax, ebx, ecx;
u64 lpj, tsc_khz;
+ vmware_init_hypercall();
+
eax = vmware_hypercall3(VMWARE_CMD_GETHZ, UINT_MAX, &ebx, &ecx);
if (ebx != UINT_MAX) {
@@ -541,9 +600,6 @@ static u32 __init vmware_platform(void)
vmware_hypercall_mode =
vmware_select_hypercall();
- pr_info("hypercall mode: 0x%02x\n",
- (unsigned int) vmware_hypercall_mode);
-
return CPUID_VMWARE_INFO_LEAF;
}
} else if (dmi_available && dmi_name_in_serial("VMware") &&
@@ -564,18 +620,16 @@ static bool __init vmware_legacy_x2apic_available(void)
}
#ifdef CONFIG_INTEL_TDX_GUEST
-/*
- * TDCALL[TDG.VP.VMCALL] uses %rax (arg0) and %rcx (arg2). Therefore,
- * we remap those registers to %r12 and %r13, respectively.
- */
-unsigned long vmware_tdx_hypercall(unsigned long cmd,
- unsigned long in1, unsigned long in3,
- unsigned long in4, unsigned long in5,
- u32 *out1, u32 *out2, u32 *out3,
- u32 *out4, u32 *out5)
+/* TDCALL maps the VMware %rax and %rcx arguments to %r12 and %r13. */
+static unsigned long
+vmware_tdx_hypercall(unsigned long cmd,
+ const struct vmware_hypercall_args *in,
+ struct vmware_hypercall_results *out)
{
struct tdx_module_args args = {};
+ *out = (struct vmware_hypercall_results) {};
+
if (!hypervisor_is_type(X86_HYPER_VMWARE)) {
pr_warn_once("Incorrect usage\n");
return ULONG_MAX;
@@ -586,10 +640,10 @@ unsigned long vmware_tdx_hypercall(unsigned long cmd,
return ULONG_MAX;
}
- args.rbx = in1;
- args.rdx = in3;
- args.rsi = in4;
- args.rdi = in5;
+ args.rbx = in->bx;
+ args.rdx = in->dx;
+ args.rsi = in->si;
+ args.rdi = in->di;
args.r10 = VMWARE_TDX_VENDOR_LEAF;
args.r11 = VMWARE_TDX_HCALL_FUNC;
args.r12 = VMWARE_HYPERVISOR_MAGIC;
@@ -599,20 +653,23 @@ unsigned long vmware_tdx_hypercall(unsigned long cmd,
__tdx_hypercall(&args);
- if (out1)
- *out1 = args.rbx;
- if (out2)
- *out2 = args.r13;
- if (out3)
- *out3 = args.rdx;
- if (out4)
- *out4 = args.rsi;
- if (out5)
- *out5 = args.rdi;
+ out->bx = args.rbx;
+ out->cx = args.r13;
+ out->dx = args.rdx;
+ out->si = args.rsi;
+ out->di = args.rdi;
return args.r12;
}
-EXPORT_SYMBOL_GPL(vmware_tdx_hypercall);
+#else
+static unsigned long
+vmware_tdx_hypercall(unsigned long cmd,
+ const struct vmware_hypercall_args *in,
+ struct vmware_hypercall_results *out)
+{
+ *out = (struct vmware_hypercall_results) {};
+ return ULONG_MAX;
+}
#endif
#ifdef CONFIG_AMD_MEM_ENCRYPT
^ permalink raw reply related [flat|nested] 5+ messages in thread