From nobody Thu Apr 9 15:53:20 2026 Received: from mail-yw1-f228.google.com (mail-yw1-f228.google.com [209.85.128.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D175D284682 for ; Sat, 7 Mar 2026 01:06:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772845613; cv=none; b=udbrUG+YXKqEcPovCNsiucRmG47JtXC0xQEU12xAkKDbzoGETBl1fJ5sqSJ9I4CRRJPGBovHB6cbKRucFzD+G5MHoPC7mYTnnLAaDkh/QV6z2Mgx0i+t/mtoM3c2GUHG+wowFS2fhzgUfAlwGyyIk09Vqgpc/TeJ07+MSKYvBYI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772845613; c=relaxed/simple; bh=sYGIrnAJyjCt8iIoF30ta2b9Ec4Gre5mQsKFa6a6+tY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jVfrthjTEXNZ5TW9+4eQWB2aLLYOdBiPtBmeSXUJ+qnzDuUPhPk7HiRBWpSz3WiLQlmhfXzFhb2SISjHfbInWSJ4mEflrDr1J7xJpqdk2D8su3DEvDc9VCk5R5hk/u+lhoRECWxI/2ibXN4ZtfLWb9doE59sYHBzP5rGJUkb+oQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=ID4W212e; arc=none smtp.client-ip=209.85.128.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="ID4W212e" Received: by mail-yw1-f228.google.com with SMTP id 00721157ae682-79868cde1eeso110097447b3.2 for ; Fri, 06 Mar 2026 17:06:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772845610; x=1773450410; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sDBpeRPGQkSyveVh0r0L9u3UrQSmg15QNxwWzbeb67Y=; b=E3XOfehz6o2rposNQajYq4tWNfav+VRNz2CkKfCeJFJk8Vb47zHg2RKy61WAScOK5S IZZlUidPURuMfoNduN9QeKhOU5RfweaClSJQT2X6I+tEHi+drcETlK0eZrq1iZ6uHXES vLREg2SIbN2aECmZNyHRW1GbrnmoK08m5/rhrXouZ/d48RFwpVXZgOAtJC9qBPoWstCH j7LRGNl1pgNJ/TMcAxKtNKzw5WDJtV+84eL8gQdilSjtWoiJqqRdbJQT1GSRsFnobSNK L6BDe+pv+xOCZTFjhlaqpxsG46txu88CXWzIvT9LJ+jphYv5k7bA05rHJ9cwjcuuil6G lGCA== X-Forwarded-Encrypted: i=1; AJvYcCUpgjxU6AWaFK5vgsC9k5QWBRj2hRPyJ3J1q2Vs2PspOklKJ94PXek1/1sBrAWg1XQulKRKOR6/Qj/Bmb0=@vger.kernel.org X-Gm-Message-State: AOJu0YyxVYE4qgPzXnFwE7kLaoaukxoVBaIUKq6YVi+/jJoTAX8qte+c wzJcAUshhHQXD48EtGh+MlPPWEiAFPwzl22tp2vK9Ca8XQhO2cBueBniYHCYkdSlPnJsq4yeyAl TZuC+9SgzBItayqr+TO++6Coc44K7b+0h6jzHCU0IXsMKxqWV3S/WG9xNHau6jtQhnfe+I91j8N tp8QGDonkGE7KZ9d8M9Kv/sMf/OJGBSS2CILTAifrT2a04+zoA/wmHU7zHPXbZdnC8K3JacHiy7 v0ysubDSQWL8dTRRanlDl0= X-Gm-Gg: ATEYQzwfF7UuxueJTrMZguyGNlpZVXcSgYV/bZE0DeGlqD2A/t6TTmefhB39EADTn5p TfLio8G3GKcXbE1NsG6px60nykgmcgKG/Kp4rmQpdg2ZUzD8Zyw3tnYECmmv7+LTfrQJfnNLnWO xydNEH4S0FN+FCAoDrO7mD9tJq0cnYtxU3ZZbk7O7d72vL6XB4MuQao7xLS8hjR390OTektB5yw l/AwA0xNH/JUM3ussrov7i7A/wpebGaRPfgrzjpDLfePsmVMXgBrC4H6FQIZlKfEUkLZiPnmNzZ +YutCNIryGYLE+61W3OYIOUWVvfjAC7f22MISMhr78pgH2iHpbkTYB2+hnVLrnSxmzCh/49gfn8 AomDSyq+TYp3Gdpxopm0FJ4FH/zYTq2vPWetbNKfTAvaiAz54mI0a5YVP0FmojiqS8fCuwOEQTF rI0HkCF4gb+a+n0LouMqs2WJf8lbjI1mRJUOkNsjBwMQhRsE8p/EuUsXstypEicr0= X-Received: by 2002:a05:690c:6609:b0:794:d15b:5225 with SMTP id 00721157ae682-798dd79a803mr38347827b3.57.1772845609758; Fri, 06 Mar 2026 17:06:49 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-117.dlp.protect.broadcom.com. [144.49.247.117]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-798dedb8a95sm2658697b3.30.2026.03.06.17.06.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Mar 2026 17:06:49 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-2be07cafe1cso83359002eec.0 for ; Fri, 06 Mar 2026 17:06:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772845608; x=1773450408; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sDBpeRPGQkSyveVh0r0L9u3UrQSmg15QNxwWzbeb67Y=; b=ID4W212e5FgQ04K29zzOP0OohyPpSh0/oxx1eRe16N9McB+S5FDMGWdxL6GyYFGPkE IM47u2oWKZwRt+yn9dd2B2oQHyHQ10t0CoSa2OzRNSNHHeeN/g2/DxC6pvaEcB6S/yp9 x8BokQCbNJ2vGPUNOErBgf+WWXNAnHR9eeL58= X-Forwarded-Encrypted: i=1; AJvYcCUlxqet9oxyg824hibYRVyvxIAOs8AUAf6hfp+2Uo8iAlhwf/CZPERrEMP+HK+p2yf9bJz/h7FiwxmkDEM=@vger.kernel.org X-Received: by 2002:a05:7300:fd0e:b0:2be:53a:5f4 with SMTP id 5a478bee46e88-2be4deac6f0mr1729604eec.9.1772845607962; Fri, 06 Mar 2026 17:06:47 -0800 (PST) X-Received: by 2002:a05:7300:fd0e:b0:2be:53a:5f4 with SMTP id 5a478bee46e88-2be4deac6f0mr1729584eec.9.1772845606909; Fri, 06 Mar 2026 17:06:46 -0800 (PST) Received: from amakhalov-build-vm.. ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2be4f80cc1dsm2237336eec.3.2026.03.06.17.06.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 17:06:46 -0800 (PST) From: Alexey Makhalov To: x86@kernel.org, virtualization@lists.linux.dev, bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, mingo@redhat.com, tglx@linutronix.de Cc: ajay.kaher@broadcom.com, brennan.lamoreaux@broadcom.com, bo.gan@broadcom.com, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, kas@kernel.org, rick.p.edgecombe@intel.com, linux-coco@lists.linux.dev, Alexey Makhalov , Linus Torvalds Subject: [PATCH 1/4] x86/vmware: Introduce common vmware_hypercall() Date: Sat, 7 Mar 2026 00:42:35 +0000 Message-ID: <20260307004238.1181299-2-alexey.makhalov@broadcom.com> X-Mailer: git-send-email 2.43.7 In-Reply-To: <20260307004238.1181299-1-alexey.makhalov@broadcom.com> References: <20260307004238.1181299-1-alexey.makhalov@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" Introduce vmware_hypercall(), a unified low-bandwidth VMware hypercall API, and convert the static inlines vmware_hypercallX() family into thin wrappers on top of it. vmware_hypercall() is implemented as a static call with four backend implementations: backdoor, vmcall, vmmcall, and tdxcall. All share the same logical API but differ in their underlying register mappings. By updating the static call target early during boot, before the first hypercall is issued, the !alternatives_patched case no longer needs to be handled. This allows removal of vmware_hypercall_slow(). The new API implements the widest practical hypercall use case: up to six input and six output arguments. While this may be slightly less efficient due to clobbering all six registers and moving unused arguments - it avoids subtle ABI issues, including cases where other hypervisors implementing VMware hypercalls corrupt registers. See QEMU issue #3293 ("vmmouse driver corrupts upper 32 bits of registers on x86-64") for an example of such behavior. Additionally, enhance the VMware hypercall ABI documentation in . Link: https://gitlab.com/qemu-project/qemu/-/issues/3293 Suggested-by: Linus Torvalds Signed-off-by: Alexey Makhalov --- arch/x86/include/asm/vmware.h | 274 ++++++++++++++------------------- arch/x86/kernel/cpu/vmware.c | 276 +++++++++++++++++++--------------- 2 files changed, 267 insertions(+), 283 deletions(-) diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h index 4220dae14a2d..6a084e088b30 100644 --- a/arch/x86/include/asm/vmware.h +++ b/arch/x86/include/asm/vmware.h @@ -3,48 +3,84 @@ #define _ASM_X86_VMWARE_H =20 #include -#include #include +#include =20 /* * 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: I/O port based (aka backdoor), vmcall = and + * vmmcall have up to 6 input and 6 output on registers arguments, with the + * register mapping: + * +------+----------------------------------------+-----------------+ + * | Reg | Input argument | Output argument | + * +=3D=3D=3D=3D=3D=3D+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ + * | %eax | VMWARE_HYPERVISOR_MAGIC | out0 | + * +------+----------------------------------------+-----------------+ + * | %ebx | (in1) | out1 | + * +------+----------------------------------------+-----------------+ + * | %ecx | (cmd) - Hypercall command | out2 | + * +------+----------------------------------------+-----------------+ + * | %edx | Bits [15:0] - Port number for backdoor | out3 | + * | | Zero for vmcall/vmmcall | | + * | | Bits [31:16] - (in3) | | + * +------+----------------------------------------+-----------------+ + * | %esi | (in4) | out4 | + * +------+----------------------------------------+-----------------+ + * | %edi | (in5) | out5 | + * +------+----------------------------------------+-----------------+ * - * - 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). + * - Low bandwidth TDX hypercalls (x86_64 only) are similar to LB hypercal= ls. + * They also have up to 6 input and 6 output on registers arguments, with + * different argument to register mapping: + * +------+----------------------------------------+-----------------+ + * | Reg | Input argument | Output argument | + * +=3D=3D=3D=3D=3D=3D+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ + * | %r12 | VMWARE_HYPERVISOR_MAGIC | out0 | + * +------+----------------------------------------+-----------------+ + * | %ebx | (in1) | out1 | + * +------+----------------------------------------+-----------------+ + * | %r13 | (cmd) - Hypercall command | out2 | + * +------+----------------------------------------+-----------------+ + * | %edx | Bits [15:0] - Must be zero | out3 | + * | | 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 + * - High bandwidth (HB) hypercalls are I/O port based only. They have up = to 7 + * input and 7 output on reegister arguments with the following mapping: + * +------+----------------------------------------+-----------------+ + * | Reg | Input argument | Output argument | + * +=3D=3D=3D=3D=3D=3D+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ + * | %eax | VMWARE_HYPERVISOR_MAGIC | out0 | + * +------+----------------------------------------+-----------------+ + * | %ebx | (cmd) - Hypercall command | out1 | + * +------+----------------------------------------+-----------------+ + * | %ebx | (in2) | out2 | + * +------+----------------------------------------+-----------------+ + * | %edx | Bits [15:0] - Port number and HB flag | out3 | + * | | Bits [31:16] - (in3) | | + * +------+----------------------------------------+-----------------+ + * | %esi | (in4) | out4 | + * +------+----------------------------------------+-----------------+ + * | %edi | (in5) | out5 | + * +------+----------------------------------------+-----------------+ + * | %ebp | (in6) | out6 | + * +------+----------------------------------------+-----------------+ * - * For compatibility purposes, x86_64 systems use only lower 32 bits - * for input and output arguments. + * For compatibility purposes, x86_64 systems use only lower 32 bits for i= nput + * and output arguments. * - * 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. + * 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, t= he + * bandwidth mode flag, and uses IN/OUT instructions to define transfer + * direction. * - * 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. + * The new vmcall interface instead uses a set of flags to select bandwidth + * mode and transfer direction. */ =20 #define VMWARE_HYPERVISOR_HB BIT(0) @@ -70,103 +106,64 @@ #define CPUID_VMWARE_FEATURES_ECX_VMMCALL BIT(0) #define CPUID_VMWARE_FEATURES_ECX_VMCALL BIT(1) =20 -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); - #define VMWARE_TDX_VENDOR_LEAF 0x1af7e4909ULL #define VMWARE_TDX_HCALL_FUNC 1 =20 -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 dummy_vmware_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); =20 /* - * 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. + * Low bandwidth (LB) VMware hypercall. + * + * It is backed by the backdoor, vmcall, vmmcall or tdx call implementatio= n. + * + * Use inX/outX arguments naming as the register mappings vary between + * different implementations. See VMware hypercall ABI above. + * These 10 arguments could be nicely wrapped in in/out structures, but it + * will introduce unnecessary structs copy in vmware_tdx_hypercall(). + * + * NOTE: + * Do not merge vmware_{backdoor,vmcall,vmmcall}_hypercall implementations + * using alternative instructions. Such patching mechanism can not be used + * in vmware_hypercall path, as the first hypercall will be called much + * before the apply_alternatives(). See vmware_platform_setup(). */ -#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, dummy_vmware_hypercall); =20 +/* + * Set of commonly used vmware_hypercallX functions - wrappers on top of t= he + * vmware_hypercall. + */ static inline unsigned long vmware_hypercall1(unsigned long cmd, unsigned long in1) { - unsigned long out0; - - 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); + u32 out1, out2, out3, out4, out5; =20 - asm_inline volatile (VMWARE_HYPERCALL - : "=3Da" (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, in1, 0, 0, 0, + &out1, &out2, &out3, &out4, &out5); } =20 static inline unsigned long vmware_hypercall3(unsigned long cmd, unsigned long in1, u32 *out1, u32 *out2) { - unsigned long out0; - - 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); + u32 out3, out4, out5; =20 - asm_inline volatile (VMWARE_HYPERCALL - : "=3Da" (out0), "=3Db" (*out1), "=3Dc" (*out2) - : [port] "i" (VMWARE_HYPERVISOR_PORT), - "a" (VMWARE_HYPERVISOR_MAGIC), - "b" (in1), - "c" (cmd), - "d" (0) - : "di", "si", "cc", "memory"); - return out0; + return static_call_mod(vmware_hypercall)(cmd, in1, 0, 0, 0, + out1, out2, &out3, &out4, &out5); } =20 static inline unsigned long vmware_hypercall4(unsigned long cmd, unsigned long in1, u32 *out1, u32 *out2, u32 *out3) { - unsigned long out0; - - 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); + u32 out4, out5; =20 - asm_inline volatile (VMWARE_HYPERCALL - : "=3Da" (out0), "=3Db" (*out1), "=3Dc" (*out2), "=3Dd" (*out3) - : [port] "i" (VMWARE_HYPERVISOR_PORT), - "a" (VMWARE_HYPERVISOR_MAGIC), - "b" (in1), - "c" (cmd), - "d" (0) - : "di", "si", "cc", "memory"); - return out0; + return static_call_mod(vmware_hypercall)(cmd, in1, 0, 0, 0, + out1, out2, out3, &out4, &out5); } =20 static inline @@ -174,27 +171,10 @@ unsigned long vmware_hypercall5(unsigned long cmd, un= signed long in1, unsigned long in3, unsigned long in4, unsigned long in5, u32 *out2) { - unsigned long out0; - - if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) - return vmware_tdx_hypercall(cmd, in1, in3, in4, in5, - NULL, out2, NULL, NULL, NULL); + u32 out1, out3, out4, out5; =20 - 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 - : "=3Da" (out0), "=3Dc" (*out2) - : [port] "i" (VMWARE_HYPERVISOR_PORT), - "a" (VMWARE_HYPERVISOR_MAGIC), - "b" (in1), - "c" (cmd), - "d" (in3), - "S" (in4), - "D" (in5) - : "cc", "memory"); - return out0; + return static_call_mod(vmware_hypercall)(cmd, in1, in3, in4, in5, + &out1, out2, &out3, &out4, &out5); } =20 static inline @@ -202,26 +182,10 @@ unsigned long vmware_hypercall6(unsigned long cmd, un= signed long in1, unsigned long in3, u32 *out2, u32 *out3, u32 *out4, u32 *out5) { - unsigned long out0; - - if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) - return vmware_tdx_hypercall(cmd, in1, in3, 0, 0, - NULL, out2, out3, out4, out5); + u32 out1; =20 - 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 - : "=3Da" (out0), "=3Dc" (*out2), "=3Dd" (*out3), "=3DS" (*out4), - "=3DD" (*out5) - : [port] "i" (VMWARE_HYPERVISOR_PORT), - "a" (VMWARE_HYPERVISOR_MAGIC), - "b" (in1), - "c" (cmd), - "d" (in3) - : "cc", "memory"); - return out0; + return static_call_mod(vmware_hypercall)(cmd, in1, in3, 0, 0, + &out1, out2, out3, out4, out5); } =20 static inline @@ -230,27 +194,10 @@ unsigned long vmware_hypercall7(unsigned long cmd, un= signed long in1, unsigned long in5, u32 *out1, u32 *out2, u32 *out3) { - unsigned long out0; - - if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) - return vmware_tdx_hypercall(cmd, in1, in3, in4, in5, - out1, out2, out3, NULL, NULL); + u32 out4, out5; =20 - 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 - : "=3Da" (out0), "=3Db" (*out1), "=3Dc" (*out2), "=3Dd" (*out3) - : [port] "i" (VMWARE_HYPERVISOR_PORT), - "a" (VMWARE_HYPERVISOR_MAGIC), - "b" (in1), - "c" (cmd), - "d" (in3), - "S" (in4), - "D" (in5) - : "cc", "memory"); - return out0; + return static_call_mod(vmware_hypercall)(cmd, in1, in3, in4, in5, + out1, out2, out3, &out4, &out5); } =20 #ifdef CONFIG_X86_64 @@ -322,6 +269,5 @@ unsigned long vmware_hypercall_hb_in(unsigned long cmd,= unsigned long in2, return out0; } #undef VMW_BP_CONSTRAINT -#undef VMWARE_HYPERCALL =20 #endif diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index a3e6936839b1..93acd3414e37 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -64,70 +64,140 @@ struct vmware_steal_time { }; =20 static unsigned long vmware_tsc_khz __ro_after_init; -static u8 vmware_hypercall_mode __ro_after_init; - -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) -{ - unsigned long out0, rbx, rcx, rdx, rsi, rdi; - - switch (vmware_hypercall_mode) { - case CPUID_VMWARE_FEATURES_ECX_VMCALL: - asm_inline volatile ("vmcall" - : "=3Da" (out0), "=3Db" (rbx), "=3Dc" (rcx), - "=3Dd" (rdx), "=3DS" (rsi), "=3DD" (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" - : "=3Da" (out0), "=3Db" (rbx), "=3Dc" (rcx), - "=3Dd" (rdx), "=3DS" (rsi), "=3DD" (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" - : "=3Da" (out0), "=3Db" (rbx), "=3Dc" (rcx), - "=3Dd" (rdx), "=3DS" (rsi), "=3DD" (rdi) - : [port] "i" (VMWARE_HYPERVISOR_PORT), - "a" (VMWARE_HYPERVISOR_MAGIC), - "b" (in1), - "c" (cmd), - "d" (in3), - "S" (in4), - "D" (in5) - : "cc", "memory"); - break; - } +static u8 vmware_hypercall_mode __initdata; + +static unsigned long vmware_backdoor_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 out0; + + /* The low word of in3(%edx) must have the backdoor port number */ + in3 =3D (in3 & ~0xffff) | VMWARE_HYPERVISOR_PORT; + + asm_inline volatile ("inl (%%dx), %%eax" + : "=3Da" (out0), "=3Db" (*out1), "=3Dc" (*out2), + "=3Dd" (*out3), "=3DS" (*out4), "=3DD" (*out5) + : "a" (VMWARE_HYPERVISOR_MAGIC), + "b" (in1), + "c" (cmd), + "d" (in3), + "S" (in4), + "D" (in5) + : "cc", "memory"); =20 - if (out1) - *out1 =3D rbx; - if (out2) - *out2 =3D rcx; - if (out3) - *out3 =3D rdx; - if (out4) - *out4 =3D rsi; - if (out5) - *out5 =3D rdi; + return out0; +} + +static unsigned long vmware_vmcall_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 out0; + + /* The low word of in3(%edx) must be zero: LB, IN */ + in3 &=3D ~0xffff; + + asm_inline volatile ("vmcall" + : "=3Da" (out0), "=3Db" (*out1), "=3Dc" (*out2), + "=3Dd" (*out3), "=3DS" (*out4), "=3DD" (*out5) + : "a" (VMWARE_HYPERVISOR_MAGIC), + "b" (in1), + "c" (cmd), + "d" (in3), + "S" (in4), + "D" (in5) + : "cc", "memory"); =20 return out0; } =20 +static unsigned long vmware_vmmcall_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 out0; + + /* The low word of in3(%edx) must be zero: LB, IN */ + in3 &=3D ~0xffff; + + asm_inline volatile ("vmmcall" + : "=3Da" (out0), "=3Db" (*out1), "=3Dc" (*out2), + "=3Dd" (*out3), "=3DS" (*out4), "=3DD" (*out5) + : "a" (VMWARE_HYPERVISOR_MAGIC), + "b" (in1), + "c" (cmd), + "d" (in3), + "S" (in4), + "D" (in5) + : "cc", "memory"); + + return out0; +} + +/* + * TDCALL[TDG.VP.VMCALL] uses %rax (arg0) and %rcx (arg2). Therefore, + * we remap those registers to %r12 and %r13, respectively. + */ +static 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) +{ +#ifdef CONFIG_INTEL_TDX_GUEST + struct tdx_module_args args =3D {}; + + if (!hypervisor_is_type(X86_HYPER_VMWARE)) { + pr_warn_once("Incorrect usage\n"); + return ULONG_MAX; + } + + if (cmd & ~VMWARE_CMD_MASK) { + pr_warn_once("Out of range command %lx\n", cmd); + return ULONG_MAX; + } + + args.rbx =3D in1; + /* The low word of in3(%rdx) must be zero: LB, IN */ + args.rdx =3D in3 & ~0xffff; + args.rsi =3D in4; + args.rdi =3D in5; + args.r10 =3D VMWARE_TDX_VENDOR_LEAF; + args.r11 =3D VMWARE_TDX_HCALL_FUNC; + args.r12 =3D VMWARE_HYPERVISOR_MAGIC; + args.r13 =3D cmd; + /* CPL */ + args.r15 =3D 0; + + __tdx_hypercall(&args); + + *out1 =3D args.rbx; + *out2 =3D args.r13; + *out3 =3D args.rdx; + *out4 =3D args.rsi; + *out5 =3D args.rdi; + + return args.r12; +#else + return ULONG_MAX; +#endif +} + + +DEFINE_STATIC_CALL(vmware_hypercall, vmware_backdoor_hypercall); +EXPORT_STATIC_CALL_GPL(vmware_hypercall); + +/* + * Perform backdoor probbing of the hypervisor when + * X86_FEATURE_HYPERVISOR bit is not set. + */ static inline int __vmware_platform(void) { u32 eax, ebx, ecx; @@ -397,11 +467,35 @@ static void __init vmware_set_capabilities(void) setup_force_cpu_cap(X86_FEATURE_VMW_VMMCALL); } =20 +static void __init vmware_select_hypercall(void) +{ + char *mode; + + if (IS_ENABLED(CONFIG_INTEL_TDX_GUEST) && + cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { + static_call_update(vmware_hypercall, vmware_tdx_hypercall); + mode =3D "tdcall"; + } else if (vmware_hypercall_mode =3D=3D CPUID_VMWARE_FEATURES_ECX_VMCALL)= { + static_call_update(vmware_hypercall, vmware_vmcall_hypercall); + mode =3D "vmcall"; + } else if (vmware_hypercall_mode =3D=3D CPUID_VMWARE_FEATURES_ECX_VMMCALL= ) { + static_call_update(vmware_hypercall, vmware_vmmcall_hypercall); + mode =3D "vmmcall"; + } else { + mode =3D "backdoor"; + } + + pr_info("hypercall mode: %s\n", mode); +} + static void __init vmware_platform_setup(void) { u32 eax, ebx, ecx; u64 lpj, tsc_khz; =20 + /* Update vmware_hypercall() before the first use. */ + vmware_select_hypercall(); + eax =3D vmware_hypercall3(VMWARE_CMD_GETHZ, UINT_MAX, &ebx, &ecx); =20 if (ebx !=3D UINT_MAX) { @@ -443,7 +537,7 @@ static void __init vmware_platform_setup(void) vmware_set_capabilities(); } =20 -static u8 __init vmware_select_hypercall(void) +static u8 __init get_hypercall_mode(void) { int eax, ebx, ecx, edx; =20 @@ -456,8 +550,8 @@ static u8 __init vmware_select_hypercall(void) * While checking the dmi string information, just checking the product * serial key should be enough, as this will always have a VMware * specific string when running under VMware hypervisor. - * If !boot_cpu_has(X86_FEATURE_HYPERVISOR), vmware_hypercall_mode - * intentionally defaults to 0. + * If !boot_cpu_has(X86_FEATURE_HYPERVISOR), __vmware_platform() + * intentionally defaults to backdoor hypercall. */ static u32 __init vmware_platform(void) { @@ -470,11 +564,7 @@ static u32 __init vmware_platform(void) if (!memcmp(hyper_vendor_id, "VMwareVMware", 12)) { if (eax >=3D CPUID_VMWARE_FEATURES_LEAF) vmware_hypercall_mode =3D - vmware_select_hypercall(); - - pr_info("hypercall mode: 0x%02x\n", - (unsigned int) vmware_hypercall_mode); - + get_hypercall_mode(); return CPUID_VMWARE_INFO_LEAF; } } else if (dmi_available && dmi_name_in_serial("VMware") && @@ -494,58 +584,6 @@ static bool __init vmware_legacy_x2apic_available(void) (eax & GETVCPU_INFO_LEGACY_X2APIC); } =20 -#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) -{ - struct tdx_module_args args =3D {}; - - if (!hypervisor_is_type(X86_HYPER_VMWARE)) { - pr_warn_once("Incorrect usage\n"); - return ULONG_MAX; - } - - if (cmd & ~VMWARE_CMD_MASK) { - pr_warn_once("Out of range command %lx\n", cmd); - return ULONG_MAX; - } - - args.rbx =3D in1; - args.rdx =3D in3; - args.rsi =3D in4; - args.rdi =3D in5; - args.r10 =3D VMWARE_TDX_VENDOR_LEAF; - args.r11 =3D VMWARE_TDX_HCALL_FUNC; - args.r12 =3D VMWARE_HYPERVISOR_MAGIC; - args.r13 =3D cmd; - /* CPL */ - args.r15 =3D 0; - - __tdx_hypercall(&args); - - if (out1) - *out1 =3D args.rbx; - if (out2) - *out2 =3D args.r13; - if (out3) - *out3 =3D args.rdx; - if (out4) - *out4 =3D args.rsi; - if (out5) - *out5 =3D args.rdi; - - return args.r12; -} -EXPORT_SYMBOL_GPL(vmware_tdx_hypercall); -#endif - #ifdef CONFIG_AMD_MEM_ENCRYPT static void vmware_sev_es_hcall_prepare(struct ghcb *ghcb, struct pt_regs *regs) --=20 2.43.7 From nobody Thu Apr 9 15:53:20 2026 Received: from mail-qt1-f225.google.com (mail-qt1-f225.google.com [209.85.160.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0433D284880 for ; Sat, 7 Mar 2026 01:06:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772845613; cv=none; b=c4otRA9sZnlKzESXjsOUb7fIBVD9T4mLL7RJeQQk9z/87dGNuD8ArjYiGl7YiOxPDuemux9AAvQPRRgEmTO0gJuxYvQdwujqe3llPOAiZ2WmeOGEYDGsU0h8mJxJ++6WGsdvtSvgogi7r2f+KJ/556FlsJwKEwZYA2IinGXo0I0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772845613; c=relaxed/simple; bh=WqcoyHAfK4LJ4JbVa9jm080V6YhsNdvVNFhOv9s8H8g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=frrDaCOc5R/4MWEeb2YFFKPKfOmK1QEkdIO1nC4OFBJ0iqL0c+rC4PQ6Msg4FToMv1/S16SaffG0DxnU8J/BEE8lOiu8UaRvBleN/nk7U/LXcLFTk/rv22rNn8YFW8l+3ajMrjEQhh8zdhXybIDTESD7pIj7Gcwlk9ATdAOf51A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=OxC0h2fs; arc=none smtp.client-ip=209.85.160.225 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="OxC0h2fs" Received: by mail-qt1-f225.google.com with SMTP id d75a77b69052e-5033387c80aso128996811cf.0 for ; Fri, 06 Mar 2026 17:06:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772845611; x=1773450411; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=b2kd6mc3vO4n+WElMpRdy7mOjUgRYFPVOH3tEWHzajY=; b=lEEAbIlAAYz6a66kCjbTqG5L8vqD7/dD6OO1dG00lPdYlPmPxTgqC3hiNKmVbm/wzD ZJguNk9xoMaeUvz2y7r+lcdy4iyi8AaXhRhIA0v6RpJGy9sgt1LlZ+kNAVLAoChFyd1P V/32uZUL4DE8SFof2yWkzNHxvE+z9iTdKnZ64E78GRaaU367AtvEeqCWo2hc7zNoizMR E8DENsnapuG6FDG4a95GR0r3oo38Djgg0CFXa8QNankirelH4BWjUFcV6oHDj0fFz/Xj G355LnuJLJEJCf0neo6eoP2Qz8su9dwNunke+lKp7JVEOKt+0SrAMTzXBE85KykWI4au qSgA== X-Forwarded-Encrypted: i=1; AJvYcCXdpqQ6eI8EFnUVobEK74SsO/QWch247OLyz8Rs7htp3ZPvzmVe//KaRwYgnJgaUf1SJ/rIWy87GJzRcUY=@vger.kernel.org X-Gm-Message-State: AOJu0YzPKG/mDHIX37w8Jy6yrOUfJd+FuM9SY9xORVuMU7Ohe6SKZTcZ 1T8+G48ayqo1zuN7LF6jX8NMFzj9KndDlHVh0JEBBKRTH7g1Mj4P+Ff5no7MjXOfVZSAKQm2sjS dk1s8HjcdJRCep8dCfzdAMQBXBVAJ9t3lv7KVFusmHuIpG+xno0agw+ps2SCC6iJrQ82dmq6RDu So5ZSMJOn8FEY7cASQ2RjcKjtTWlMWBGgRFWo5SRZWaICxLrSJFoPX2Vf4R0/mPMoB46pY++7EI 4Y4TUXjxgC65+skyU8onKI= X-Gm-Gg: ATEYQzzuSuqrggBuyq07Mh0c/GSVEggwHqCmWvc9ZvspCO6oKvm6pUqDzSN4U6sThnz 4cTBvMWLWHachdWZUOoC0ZfuYL652bx3CSzcbiCGpKBGRC38wZmMKEt7iWQtR3c2ViAEp9QaEtg /kSMKJbBoJp0fMRDkSHSpmqK9KYHE/cVY/XQyrTa5Ukkf9KsZv37PwDcziVC4BqAswSPhgacPXj COVnKO7xCSc4yRjIdKXaZ5FHo15H6KgDGizb0dhI3zRMx//uEMP68+INSYOBGLjwndD1jFKWyZM hupR0L5WTSG4+Wn6DUu2skV5RPAgocpVphVLjkIZAK5kW/niMz3GrCUsOeWSLWEqYHED/1SiT1I CWLB2pI6flD6UwPZcUxIxN8067waBV2EB/vS4nevny7jLoOj1MtfUFuvz32xiXRyJv+9BkzHXCW ueW1y10FNT3QOAiLXNvlTzUy74wI0BP/xBMIcOwnmGw+2t0w7Kc6t8+dEUs6/6 X-Received: by 2002:a05:622a:548:b0:4ff:b0f4:c307 with SMTP id d75a77b69052e-508f4b17f4amr49519421cf.24.1772845610986; Fri, 06 Mar 2026 17:06:50 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-29.dlp.protect.broadcom.com. [144.49.247.29]) by smtp-relay.gmail.com with ESMTPS id d75a77b69052e-508f662beeasm2869601cf.7.2026.03.06.17.06.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Mar 2026 17:06:50 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dy1-f199.google.com with SMTP id 5a478bee46e88-2bda35eab74so3211637eec.0 for ; Fri, 06 Mar 2026 17:06:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772845609; x=1773450409; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=b2kd6mc3vO4n+WElMpRdy7mOjUgRYFPVOH3tEWHzajY=; b=OxC0h2fsCBu1EWb5LiqMWkq9FYFArDqb4I3imTdLaY3syYzr4/ivkYwhL9O3T/7a8+ OjFPnxxI5xoo/xiFrKeZlSsGZi2Atw8w1pmmwk4RKRUSlj7N+PwG2oTIvHkK88UHXTB3 9FJXEbCz2wQeOkpCL6l1gRyX5ptOaSgpwMOYk= X-Forwarded-Encrypted: i=1; AJvYcCWkQVRGWKQQzt1D4MZiqSwgZ7A55NQ+pcYX8gJAzUDe6XlCeRR3L3T9J07661+FuYu2zLcp24C8VkCqbmE=@vger.kernel.org X-Received: by 2002:a05:7300:5711:b0:2b8:68cd:a7b1 with SMTP id 5a478bee46e88-2be3da5e890mr2609670eec.0.1772845608921; Fri, 06 Mar 2026 17:06:48 -0800 (PST) X-Received: by 2002:a05:7300:5711:b0:2b8:68cd:a7b1 with SMTP id 5a478bee46e88-2be3da5e890mr2609656eec.0.1772845608258; Fri, 06 Mar 2026 17:06:48 -0800 (PST) Received: from amakhalov-build-vm.. ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2be4f80cc1dsm2237336eec.3.2026.03.06.17.06.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 17:06:47 -0800 (PST) From: Alexey Makhalov To: x86@kernel.org, virtualization@lists.linux.dev, bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, mingo@redhat.com, tglx@linutronix.de Cc: ajay.kaher@broadcom.com, brennan.lamoreaux@broadcom.com, bo.gan@broadcom.com, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, kas@kernel.org, rick.p.edgecombe@intel.com, linux-coco@lists.linux.dev, Alexey Makhalov Subject: [PATCH 2/4] x86/vmware: Log kmsg dump on panic Date: Sat, 7 Mar 2026 00:42:36 +0000 Message-ID: <20260307004238.1181299-3-alexey.makhalov@broadcom.com> X-Mailer: git-send-email 2.43.7 In-Reply-To: <20260307004238.1181299-1-alexey.makhalov@broadcom.com> References: <20260307004238.1181299-1-alexey.makhalov@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" Improve debugability of VMware Linux guests by dumping kernel messages during a panic to VM log file (vmware.log). Co-developed-by: Bo Gan Signed-off-by: Bo Gan Signed-off-by: Alexey Makhalov --- arch/x86/include/asm/vmware.h | 1 + arch/x86/kernel/cpu/vmware.c | 132 ++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h index 6a084e088b30..c23164503e54 100644 --- a/arch/x86/include/asm/vmware.h +++ b/arch/x86/include/asm/vmware.h @@ -93,6 +93,7 @@ #define VMWARE_HYPERVISOR_MAGIC 0x564d5868U =20 #define VMWARE_CMD_GETVERSION 10 +#define VMWARE_CMD_MESSAGE 30 #define VMWARE_CMD_GETHZ 45 #define VMWARE_CMD_GETVCPU_INFO 68 #define VMWARE_CMD_STEALCLOCK 91 diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 93acd3414e37..d9753b1aba58 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -211,6 +212,13 @@ static unsigned long vmware_get_tsc_khz(void) return vmware_tsc_khz; } =20 +static void kmsg_dumper_vmware_log(struct kmsg_dumper *dumper, + struct kmsg_dump_detail *detail); + +static struct kmsg_dumper kmsg_dumper =3D { + .dump =3D kmsg_dumper_vmware_log +}; + #ifdef CONFIG_PARAVIRT static struct cyc2ns_data vmware_cyc2ns __ro_after_init; static bool vmw_sched_clock __initdata =3D true; @@ -535,6 +543,8 @@ static void __init vmware_platform_setup(void) #endif =20 vmware_set_capabilities(); + + kmsg_dump_register(&kmsg_dumper); } =20 static u8 __init get_hypercall_mode(void) @@ -630,3 +640,125 @@ const __initconst struct hypervisor_x86 x86_hyper_vmw= are =3D { .runtime.sev_es_hcall_finish =3D vmware_sev_es_hcall_finish, #endif }; + +#define VMWARE_HB_CMD_MESSAGE 0 +#define MESSAGE_STATUS_SUCCESS (0x01 << 16) +#define MESSAGE_STATUS_CPT (0x10 << 16) +#define MESSAGE_STATUS_HB (0x80 << 16) + +#define RPCI_PROTOCOL_NUM 0x49435052 /* 'RPCI' */ +#define GUESTMSG_FLAG_COOKIE 0x80000000 + +#define MESSAGE_TYPE_OPEN (0 << 16) +#define MESSAGE_TYPE_SENDSIZE (1 << 16) +#define MESSAGE_TYPE_SEND (2 << 16) +#define MESSAGE_TYPE_CLOSE (6 << 16) + +struct vmw_msg { + u32 id; + u32 cookie_high; + u32 cookie_low; +}; + +static int +vmware_log_open(struct vmw_msg *msg) +{ + u32 info; + + vmware_hypercall6(VMWARE_CMD_MESSAGE | MESSAGE_TYPE_OPEN, + RPCI_PROTOCOL_NUM | GUESTMSG_FLAG_COOKIE, + 0, &info, &msg->id, &msg->cookie_high, + &msg->cookie_low); + + if ((info & MESSAGE_STATUS_SUCCESS) =3D=3D 0) + return 1; + + msg->id &=3D 0xffff0000UL; + return 0; +} + +static int +vmware_log_close(struct vmw_msg *msg) +{ + u32 info; + + vmware_hypercall5(VMWARE_CMD_MESSAGE | MESSAGE_TYPE_CLOSE, 0, msg->id, + msg->cookie_high, msg->cookie_low, &info); + + if ((info & MESSAGE_STATUS_SUCCESS) =3D=3D 0) + return 1; + return 0; +} + +static int +vmware_log_send(struct vmw_msg *msg, const char *string) +{ + u32 info; + u32 len =3D strlen(string); + +retry: + vmware_hypercall5(VMWARE_CMD_MESSAGE | MESSAGE_TYPE_SENDSIZE, len, + msg->id, msg->cookie_high, msg->cookie_low, &info); + + if (!(info & MESSAGE_STATUS_SUCCESS)) + return 1; + + /* HB port can't access encrypted memory. */ + if (!cc_platform_has(CC_ATTR_MEM_ENCRYPT) && (info & MESSAGE_STATUS_HB)) { + vmware_hypercall_hb_out( + VMWARE_HB_CMD_MESSAGE | MESSAGE_STATUS_SUCCESS, + len, msg->id, (uintptr_t) string, msg->cookie_low, + msg->cookie_high, &info); + } else { + do { + u32 word; + size_t s =3D min_t(u32, len, sizeof(word)); + + memcpy(&word, string, s); + len -=3D s; + string +=3D s; + + vmware_hypercall5(VMWARE_CMD_MESSAGE | MESSAGE_TYPE_SEND, + word, msg->id, msg->cookie_high, + msg->cookie_low, &info); + } while (len && (info & MESSAGE_STATUS_SUCCESS)); + } + + if ((info & MESSAGE_STATUS_SUCCESS) =3D=3D 0) { + if (info & MESSAGE_STATUS_CPT) + /* A checkpoint occurred. Retry. */ + goto retry; + return 1; + } + return 0; +} +STACK_FRAME_NON_STANDARD(vmware_log_send); + +/** + * kmsg_dumper_vmware_log - dumps kmsg to vmware.log file on the host + */ +static void kmsg_dumper_vmware_log(struct kmsg_dumper *dumper, + struct kmsg_dump_detail *detail) +{ + struct vmw_msg msg; + struct kmsg_dump_iter iter; + static char line[1024]; + size_t len =3D 0; + + /* Line prefix to send to VM log file. */ + line[0] =3D 'l'; + line[1] =3D 'o'; + line[2] =3D 'g'; + line[3] =3D ' '; + + kmsg_dump_rewind(&iter); + while (kmsg_dump_get_line(&iter, true, line + 4, sizeof(line) - 4, + &len)) { + line[len + 4] =3D '\0'; + if (vmware_log_open(&msg)) + return; + if (vmware_log_send(&msg, line)) + return; + vmware_log_close(&msg); + } +} --=20 2.43.7 From nobody Thu Apr 9 15:53:20 2026 Received: from mail-pl1-f226.google.com (mail-pl1-f226.google.com [209.85.214.226]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A20F2857C7 for ; Sat, 7 Mar 2026 01:06:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.226 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772845613; cv=none; b=s+KA1821ZUUquxbhGLFNTFD6UYEvHXYoQzA0ua+xfymViHpk7XQ9UDegcIauKto0Wd1/6UsG6JqmEFJmKMOpCIl71qYVgBQlWLCiVIh+zQG41S1PV6sUfQDzNuCp6UeNAprlF8vANh3QLfVoJ2MmLx3+CPef5a17vrwpa7pXsEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772845613; c=relaxed/simple; bh=ksnYJ5X86WbgcBRlSUFMRlXPK4HJhXyOZMPOHMjp2H0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VPdMshwX8gW6WobdKXhli3fS8lKUUNcH96vgHR/CXrqhjVpVSUEvLowweQQwbAddgjkSr/OKhVQUIssxAxko9OEb6Znez9PEmovwMWNygMe11oZWg805P4jWn8RuBYp18FROEfHNSOerc5a1mLEL5lDGh1SM/X1J9YUP+suOOTM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=VD/TNjS4; arc=none smtp.client-ip=209.85.214.226 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="VD/TNjS4" Received: by mail-pl1-f226.google.com with SMTP id d9443c01a7336-2a9296b3926so73754095ad.1 for ; Fri, 06 Mar 2026 17:06:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772845612; x=1773450412; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cUw9NhYmIBNJuB5E0xXDdMiSKNxtEhWoJKcE3kIR6ic=; b=UQjSQxKsR6XVNHoQG+3ugtN4+INSM5l1IN1SAdvte/PQ2LMJyf0ZP/lkKqAJo3pkWg arpsC5QozVJ2Tw3poxCdXZYth9fNL2TEd/W2c+6G12deK3taafp39CBy3X/lGRJeCZVQ wmMQVk4DgpBJVyBi8Di7XrhtYlkw+Gw6EjvGPqPYAN7GEVQUu1luFKZafnSLTdQH5Gmf eukD9caWRX+6FQmgJ8aXb0upL8HcTcR3TPE1maoC9OkZWHCGG6O1rRsJOklt8LMChkYY xH5BlRC+jEwoZarz3Xqo81EEpcKTPqb+S9vgtdRhNQ+15AESOJzbEHYs54sr6MlqmPSF 4FrA== X-Forwarded-Encrypted: i=1; AJvYcCXlOifd4UXfAROM+A65SK68cQ2MHGJHdU2DFiwS4SSqxx6dlShQ5YMHWHfIxhxewfm2ALqctJN3TT6lU9g=@vger.kernel.org X-Gm-Message-State: AOJu0Yzp6OWyr3OskpqyeytJE0CYdWCf66ldNS9DI4llQBH2bSfkmfwx WCCV4PrU+zB7Zo0lBmqpZVYIflxbYQVb/fPMe8gQPoemnhqz3ZnpcCulahnrGNS+qL/dQG/ICzv JTVh4H9MVt93bLWf5wA6CmvGbJXjir//bxfpOYzMsFYHGZUyoHLZALEvGMjf7yYhaEVjTxpau4y IuSwdoYr0eaHO7jsY0kOphmRonZdit4f9ewa0J6OAdljnOE5pkK2B/Wrm/yYGD6gt7e1snD9CJ7 baWg0nCyyjHx+oW6e8QzYQ= X-Gm-Gg: ATEYQzw3+EHkjSGv5L8cnweL8Tm04OkVnCf7KWnLlSWGzkPqFlGv36FmfHGjdMDqLqB qveyPWVueXbv+iyC5Wbd8a4IAyOwAfvnSAOrTp6n9FoyM3C6TEjhN5obKydoRwJyk1BvZ3T4QCt 93YRzmUJtEVJnW/3eaZRJgqw6o8kCKY3IJuXN9QpSxWmMQHbkUFD+xH2XuSm/YRQaIzLxfx6UKx HRp+FUzB0RqJzBUiy+j/QtV6NoItp12RgAOzjLCRITFZU0aP4R3FOX+qFuVwK0jOGLxLjQYUOXB mjgeN/sW6v3UG9Au6Ps7yiXM76DVUUbAmp0ieVtPeqOOJqmc3+JRwz68GlBFQbKKMoHL4HIQcEM FfJBhk4NrZq80wjo1bp5gOxRqjp8Etv202b+sQ6n2Z0g0R0KiP65+3HAtt0VsalZRkKy2HzMtpM peWg86PENlQmBkJ7a6j3f5ijnUex04moRdxZ8BZtTp9ala6A+1Dss5PV8eXEB+V5Y= X-Received: by 2002:a17:903:b4b:b0:2ae:3a77:a1f4 with SMTP id d9443c01a7336-2ae8247ed08mr38935545ad.24.1772845611797; Fri, 06 Mar 2026 17:06:51 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-117.dlp.protect.broadcom.com. [144.49.247.117]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2ae83f5a9c4sm4067945ad.58.2026.03.06.17.06.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Mar 2026 17:06:51 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dy1-f198.google.com with SMTP id 5a478bee46e88-2bdf75bc88fso7375022eec.0 for ; Fri, 06 Mar 2026 17:06:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772845610; x=1773450410; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cUw9NhYmIBNJuB5E0xXDdMiSKNxtEhWoJKcE3kIR6ic=; b=VD/TNjS4jwg4i+jBBCIble54HMCx6kn2Q7tgemo5i8wa2w0D5fgYk5fGpJ+G6Cj02g vJHMmBZUWxDeT3ubuUPUiTi3JFWzd+aATU5AXv+0qd4PQSGMdK+RM+Qnbx7/khT3lzPg 9TTNA9C04g4Gq4PW522XCCfcYpb4d9JeYnnWA= X-Forwarded-Encrypted: i=1; AJvYcCWWhYHVeIlZZQyqMycoGgfKyl03KvgDPovmLwxPIBGW5eWaFim468W8PkR284SgX2zIUxhECF6OJAm6SpY=@vger.kernel.org X-Received: by 2002:a05:7301:fa0f:b0:2bd:e892:b075 with SMTP id 5a478bee46e88-2be4dea8cfamr1393885eec.9.1772845610194; Fri, 06 Mar 2026 17:06:50 -0800 (PST) X-Received: by 2002:a05:7301:fa0f:b0:2bd:e892:b075 with SMTP id 5a478bee46e88-2be4dea8cfamr1393873eec.9.1772845609534; Fri, 06 Mar 2026 17:06:49 -0800 (PST) Received: from amakhalov-build-vm.. ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2be4f80cc1dsm2237336eec.3.2026.03.06.17.06.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 17:06:49 -0800 (PST) From: Alexey Makhalov To: x86@kernel.org, virtualization@lists.linux.dev, bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, mingo@redhat.com, tglx@linutronix.de Cc: ajay.kaher@broadcom.com, brennan.lamoreaux@broadcom.com, bo.gan@broadcom.com, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, kas@kernel.org, rick.p.edgecombe@intel.com, linux-coco@lists.linux.dev, Alexey Makhalov Subject: [PATCH 3/4] x86/vmware: Report guest crash to the hypervisor Date: Sat, 7 Mar 2026 00:42:37 +0000 Message-ID: <20260307004238.1181299-4-alexey.makhalov@broadcom.com> X-Mailer: git-send-email 2.43.7 In-Reply-To: <20260307004238.1181299-1-alexey.makhalov@broadcom.com> References: <20260307004238.1181299-1-alexey.makhalov@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" Register the guest crash reporter to panic_notifier_list, which will be called at panic time. Guest crash reporter will report the crash to the hypervisor through a hypercall. Co-developed-by: Brennan Lamoreaux Signed-off-by: Brennan Lamoreaux Signed-off-by: Alexey Makhalov --- arch/x86/include/asm/vmware.h | 1 + arch/x86/kernel/cpu/vmware.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h index c23164503e54..bf6141353774 100644 --- a/arch/x86/include/asm/vmware.h +++ b/arch/x86/include/asm/vmware.h @@ -97,6 +97,7 @@ #define VMWARE_CMD_GETHZ 45 #define VMWARE_CMD_GETVCPU_INFO 68 #define VMWARE_CMD_STEALCLOCK 91 +#define VMWARE_CMD_REPORTGUESTCRASH 102 /* * Hypercall command mask: * bits [6:0] command, range [0, 127] diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index d9753b1aba58..8997295a5a5c 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -451,6 +452,24 @@ static void __init vmware_paravirt_ops_setup(void) #define vmware_paravirt_ops_setup() do {} while (0) #endif =20 +static int vmware_report_guest_crash(struct notifier_block *self, + unsigned long action, void *data) +{ + vmware_hypercall1(VMWARE_CMD_REPORTGUESTCRASH, 0); + return 0; +} + +static struct notifier_block guest_crash_reporter =3D { + .notifier_call =3D vmware_report_guest_crash +}; + +static int __init register_guest_crash_reporter(void) +{ + atomic_notifier_chain_register(&panic_notifier_list, + &guest_crash_reporter); + + return 0; +} /* * VMware hypervisor takes care of exporting a reliable TSC to the guest. * Still, due to timing difference when running on virtual cpus, the TSC c= an @@ -545,6 +564,8 @@ static void __init vmware_platform_setup(void) vmware_set_capabilities(); =20 kmsg_dump_register(&kmsg_dumper); + + register_guest_crash_reporter(); } =20 static u8 __init get_hypercall_mode(void) --=20 2.43.7 From nobody Thu Apr 9 15:53:20 2026 Received: from mail-pj1-f100.google.com (mail-pj1-f100.google.com [209.85.216.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 153C12C032E for ; Sat, 7 Mar 2026 01:06:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772845615; cv=none; b=QttFcdYSy6PIVACgDs4iYWqeAWUhX3ohl5NmvD6Xq+ybtrS72ZTuw8HQ2VhPozfDJ1jKJS2/bjpssHwlCePInrsI38FV06QAySRZUotINLmJgILiWGnVC832CNQnV15n8XSq8AlCmsgw4YKZoA+qtqf/qOo+K6AG+r8aKe4PjBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772845615; c=relaxed/simple; bh=rYYGRODllNK9eX0TUjsapgqgpHgysFWK4Kr8HBelE/I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j/n0/JBo7xHcqkCSRGXgy28V8LLCXVwRR+Fi2VwSG/4U8PRTv3Cx+sS3FgYrw9sgHMCl/oXML4a3kCWesooiOR/5qpfBq/rhqAwXS0UxoT8aU/yCyjZEe3SLrfr1yJl5aE72W7rn3XHTPygw/VbPWQ8Xg2O0KBBblpALaxSzXMU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=W+Mz9p8m; arc=none smtp.client-ip=209.85.216.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="W+Mz9p8m" Received: by mail-pj1-f100.google.com with SMTP id 98e67ed59e1d1-3599126be32so3600306a91.1 for ; Fri, 06 Mar 2026 17:06:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772845613; x=1773450413; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LVGUdA4dy5MsWjDIDv+6CpBj4bGfDTWltsIW6DUSLms=; b=Zox8t0N7pOXrfai+epb53YimzNr41iN77hMmrxKruVdy4S217BSloWwOTGFGvTsrni 7qjety1SRvjYuXRz4libu2kkLVHt9U/CNk+Andk666ZUYJHWs2afe0HCplSj92fQJNpy Zmq6g24DmVtz4Ina3T7n0DSCV0oKmYkHyRPw8b+Rk+1bTMBREuMcMy7zI0aDYJg5okhp U5Atp0yx47kQwGDU7xsfqn/rpenH/C67Mgv6kUc/96il6n0pvGJdSElk8YnjbARvfsBF ldCX5dioVsYcA2zTAHZ7ky4vPfNvaSatI96LiCxfPHHwR9VDc0FZCAXCjbtCXYDoJ1AN pM8A== X-Forwarded-Encrypted: i=1; AJvYcCW60k1iPX4X+8pP3qlfIs4d5G4ufNZE9fJ6+2aQpsDItCLg1d7LUFwh3Ht5Eyd1E+dP7sap6s+PVJwbj7c=@vger.kernel.org X-Gm-Message-State: AOJu0YyDuVYw+K7RiDbASuxNYtvHhirt+DDDe/v2sCU/12n1yhheW+Bx Ycj8IlEpyTQKFRnlgo441cJEYiLRTgnCkp5kL96WPEYORD8Rnm6PP8fyxMg4EJsYTv1ybyoHKHi 9spVRBQupm/Z81jm0RwM40K3/5ag4LGKJlO2ABqPRpwrOVhj638xFsPDuZqt8b6IbBNiKRIbk7k oT3l+pLFSYl/rq/0TW+vzuV3p0ksE2PBWR3aH7Hc+rhUq/4slAvgKDEorsxENtVLgSmrZaXkLmj YnJK/T0+7hhaw1A+5X18Ao= X-Gm-Gg: ATEYQzwAY9ZfyDHZGgIO6YS7lbg0sC/1v5989qy4fbjZ9yhbvkYDlkrVVtXaT7Tnes8 zK54hJ5Z4/p2Us3wQOCAZUlE8mNBI+og9Nz0BfnoOGUPu+i0F/BkD+h8d6rH/oMKM+SIwnK7Wap XIAasf1JKpayptvutsVfYs4rQLwcIbVRJuHrFSdJ48CW+/dolnVvl/GbHxRUA+JlAO1g9WIs4Lx +bC2lmkNqeW6b9XNrCusqwLYF2+/GFQY5RW2YYUx8C+3admqrVZ81eA7gYJcD1hIzcRjyEFQMA1 qaj4zt6nZS4wIccz1y++Y9DM1uevDvuXemy2csBxN41sl1o/4+TeM8YXS+ZSjRklyjeQNelcp2y n0X1NIoMthVOre4W1CVAlSgk6ChSAN6escNWuYuLEoz5+VFab7XLiHjU6GAewl6eVKqcymo1Y+S eELTrWPdapDoQ0YId2iGxrYUv2j6McmJWG/iuec/wkETXj+whAKgVYYHp0yOg7 X-Received: by 2002:a17:90a:fc45:b0:359:df9:c9f9 with SMTP id 98e67ed59e1d1-359be281d90mr3786624a91.7.1772845613416; Fri, 06 Mar 2026 17:06:53 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-29.dlp.protect.broadcom.com. [144.49.247.29]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-359bd6cd1c0sm103816a91.0.2026.03.06.17.06.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Mar 2026 17:06:53 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-2be47f2899aso14482275eec.0 for ; Fri, 06 Mar 2026 17:06:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772845611; x=1773450411; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LVGUdA4dy5MsWjDIDv+6CpBj4bGfDTWltsIW6DUSLms=; b=W+Mz9p8m0fVBpZLg/xRiK7p7x8pZenazlLJ3o8txD+Px0PT52YqCIeBMIoPyfQeEtf qKffNXTSXTMvitruEkBXDp8ZmBSuNeQgFdn7Au8EuxmQO45a5q/AayDN8fZdaQMtlSNJ BWr5jbzbn76+MGm/LArVl6UjQmsk159E54Kwk= X-Forwarded-Encrypted: i=1; AJvYcCVWuHFKhOYhCikwjSJ6It5c8W7eeZOOHMGUnrr87e2svzt2gQq8SU2AljxL8pCKAEue3dUf5iBsfijrfAg=@vger.kernel.org X-Received: by 2002:a05:7300:cd8a:b0:2be:142f:d499 with SMTP id 5a478bee46e88-2be4dfc61b1mr1673508eec.16.1772845611528; Fri, 06 Mar 2026 17:06:51 -0800 (PST) X-Received: by 2002:a05:7300:cd8a:b0:2be:142f:d499 with SMTP id 5a478bee46e88-2be4dfc61b1mr1673488eec.16.1772845610837; Fri, 06 Mar 2026 17:06:50 -0800 (PST) Received: from amakhalov-build-vm.. ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2be4f80cc1dsm2237336eec.3.2026.03.06.17.06.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 17:06:50 -0800 (PST) From: Alexey Makhalov To: x86@kernel.org, virtualization@lists.linux.dev, bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, mingo@redhat.com, tglx@linutronix.de Cc: ajay.kaher@broadcom.com, brennan.lamoreaux@broadcom.com, bo.gan@broadcom.com, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, kas@kernel.org, rick.p.edgecombe@intel.com, linux-coco@lists.linux.dev, Alexey Makhalov Subject: [PATCH 4/4] x86/vmware: Support steal time clock for encrypted guests Date: Sat, 7 Mar 2026 00:42:38 +0000 Message-ID: <20260307004238.1181299-5-alexey.makhalov@broadcom.com> X-Mailer: git-send-email 2.43.7 In-Reply-To: <20260307004238.1181299-1-alexey.makhalov@broadcom.com> References: <20260307004238.1181299-1-alexey.makhalov@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" Shared memory containing steal time counter should be set to decrypted when guest memory is encrypted. Co-developed-by: Bo Gan Signed-off-by: Bo Gan Signed-off-by: Alexey Makhalov --- arch/x86/kernel/cpu/vmware.c | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 8997295a5a5c..e33400d4f2c1 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +40,7 @@ #include #include #include +#include =20 #undef pr_fmt #define pr_fmt(fmt) "vmware: " fmt @@ -379,9 +381,47 @@ static struct notifier_block vmware_pv_reboot_nb =3D { .notifier_call =3D vmware_pv_reboot_notify, }; =20 +/* + * Map per-CPU variables for all possible CPUs as decrypted. + * Do this early in boot, before sharing the corresponding + * guest physical addresses with the hypervisor. + */ +static void __init set_shared_memory_decrypted(void) +{ + int cpu; + + if (!cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT)) + return; + + for_each_possible_cpu(cpu) { + unsigned long size =3D sizeof(vmw_steal_time); + unsigned long addr =3D (unsigned long)&per_cpu(vmw_steal_time, + cpu); + + /* + * There is no generic high-level API to mark memory as + * decrypted. Intel's set_memory_decrypted() depends on the + * buddy allocator and can fail early in boot if a page split + * is required and allocation is not possible. Use AMD's + * early_set_memory_decrypted() instead, which can perform + * the split during early boot. + */ + early_set_memory_decrypted(addr, size); + + /* That's it for AMD */ + if (cc_vendor =3D=3D CC_VENDOR_AMD) + continue; + + set_memory_decrypted(addr & PAGE_MASK, 1UL << + get_order((addr & ~PAGE_MASK) + size)); + + } +} + #ifdef CONFIG_SMP static void __init vmware_smp_prepare_boot_cpu(void) { + set_shared_memory_decrypted(); vmware_guest_cpu_init(); native_smp_prepare_boot_cpu(); } @@ -444,6 +484,7 @@ static void __init vmware_paravirt_ops_setup(void) vmware_cpu_down_prepare) < 0) pr_err("vmware_guest: Failed to install cpu hotplug callbacks\n"); #else + set_shared_memory_decrypted(); vmware_guest_cpu_init(); #endif } --=20 2.43.7