Received: by 2002:a89:288:0:b0:1f7:eeee:6653 with SMTP id j8csp247894lqh; Mon, 6 May 2024 19:01:32 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV8ap9/Pk/81IwUaus8q0bEHXrkixojHN7apaVONn/Sg08ZDjUhotUWVoMBOqbgQrVKXQQvLad8RtOfjRnak47WLO7S+A6YmHC+viPoPA== X-Google-Smtp-Source: AGHT+IE0eRdUD6nQY5oHfYAWTiTKBMxYuZoXKB5L4Lb5cvsmLCaiTXZWFktSgZ/35lnDqR/cfK1c X-Received: by 2002:a05:6a21:398c:b0:1af:63fc:4125 with SMTP id ad12-20020a056a21398c00b001af63fc4125mr16671294pzc.62.1715047292012; Mon, 06 May 2024 19:01:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715047291; cv=pass; d=google.com; s=arc-20160816; b=Ms8suXAYR8B5NarnZrpQr1NbdLMjgQCFL3jCS80kb2VUoRrJE1P/L6MpMlsJjZYfLx R9XUaYDyr2peJPQ/PRLbP+aceB5kJrTaFXisKICx89ItTf3zz3AtV19fz9kre0lxt6Ig dlrVGL2UaEnPlqIJvi1m1QlPfVhzPcOHChfXHE3DJdU1Jmp/+rOKLMjrHPqwY4RpWJZ3 6LI2nZFKx7iz7UIxcbd8ituew8AbOAfAyrd+HbIbOavbrgkIaL1IVYzgwDFsswnqNRxK 2DnX59i7bW2nFrb9rPWnnx1l0n/sHWakWffffzi3M0/gEc4Wh5JyUuBJVI0fFj5XtR5a SdiA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=kh0mykQw2I5Qf0he3/MzjGti1lWApBZCerfJYGXXmog=; fh=lZzfmW9RNLnz5mQiEzXwsK7sDaTj0vmHcnmM487ejgU=; b=uUV9bVwVAkANRmuoFc/bGiMrwrLcN0/dERtkgk850dkn6ahmOvCExchOJIHcd734ZA ND2Dq3hBD9MKLflwxCqISzUDdSxViZMhqfF5cDrZU06K7lsxoNKLZ+BkqgamRurP0Iiv VaeFJR9lfAkxETBdLTDwgKfKbdDZYpPtvbrJcr5oGWC/IS1Z0PXGNCzHqmMAH892H+37 845FJXEk4QHwIDzx0J/uyqTCRPXm4r7fI7Hxm1st8JBcEewTxHd+w9Pyms79yH1czYPE /yXmIfw8DNTfsc8viQOW3rrosyuChj9um+WgVohluB130lPQBDteJy9g2mXJS4xRIkbV g/Xw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=WMlST1hF; arc=pass (i=1 dkim=pass dkdomain=broadcom.com dmarc=pass fromdomain=broadcom.com); spf=pass (google.com: domain of linux-kernel+bounces-170461-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-170461-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id g18-20020a056a000b9200b006f4861b2be5si2052562pfj.147.2024.05.06.19.01.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 19:01:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-170461-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=WMlST1hF; arc=pass (i=1 dkim=pass dkdomain=broadcom.com dmarc=pass fromdomain=broadcom.com); spf=pass (google.com: domain of linux-kernel+bounces-170461-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-170461-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 8DE94B23F64 for ; Mon, 6 May 2024 21:57:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3274E15F3F6; Mon, 6 May 2024 21:54:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="WMlST1hF" Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 9995D15CD78 for ; Mon, 6 May 2024 21:53:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715032440; cv=none; b=InuvgmrE6N2Vw1B+0QUD5+qQkFGjC+7v4p3FDEfpg/D1GmbSmzzwHuaQ0R/Rzu/4aKuAXU/aR4UMzuYvxTJj7Xxa0JxYBGz/7v0GWGxbWn7hgtFvOovFiqRNdmy365Jfp9cCAyiagC2nd6mujKf4ZkFJ89R602JaFLOiKxwAbas= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715032440; c=relaxed/simple; bh=a8ZkZmnVhcIQK/jNpksKkemF2Tz85TXnflbv4oGRDGs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ASWIkL8qvrl/csENFnVHZxgLf/MkAZx1uGHYVyzE39wMh5yMt2TOSc2iZvDstZUJPm/7bj33EvCwnPVTKfXUNGGD60hk9762xXqOTmYM4/QMx2/CojzDwgMQsKCY6Jq8nEoIGH3GIMpwqGr8rJqumFv7u6hTaADQ0svh+H+GJVE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=WMlST1hF; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1ed41eb3382so18460145ad.0 for ; Mon, 06 May 2024 14:53:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1715032438; x=1715637238; 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=kh0mykQw2I5Qf0he3/MzjGti1lWApBZCerfJYGXXmog=; b=WMlST1hFe8CT4dTetyVVXbTkS+J5osh2aLVp7cYObH/5cta1n8t1mCakMG73lEFLyx eIzLwSjjXaZJEw5OvGjfcDJeAtcHzJ99/Bqnoi1PffEnmXh2KvjsVxzTuH+gBAdAlbMM cumQpoCvXLvjXAdgCeSyK4ehqX0xeJiD88bSw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715032438; x=1715637238; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kh0mykQw2I5Qf0he3/MzjGti1lWApBZCerfJYGXXmog=; b=DiVpK81NoZkGYGj0ddChg9zk/ub3wfTFfL9HRtCejqnwXQ4JnWG6T3XTXWedwfNbua +vmxbsHw5q2rxfQr/ddWgiTd3dnTSaGifPk0+ebaW20ys306AudAtR4wNCdluMzGqXXw VMB/OLq8q61a0qFfsTSRCDcTxRb2oVcbzShSzTjgX3qcGB283yc/vAJrdOPsTsahEutD sq3YmazA4duH+JVtBI0xUzngto2e/bFxVWI4sM6aR1iVhxCO2O7ASqKwiBYoxnhDBUG5 LuaGWWQQoDWt7+0TGtEUpUgD49CnuFi3Wt2E3k4zINK19FdD7OsTEAsxPlrezrw6T2CQ 8aaw== X-Gm-Message-State: AOJu0YzWRIlXX9jmZUksHQfoOo6P/yJLB7jgfshCOHlQMtPgCNJ1aVRL 5SJt6QzkaVhiA0bXVIXbYBWYgQsG+YOvOTqo95tCmCgHjs6m2+ps+2gABt3+HRAdIJoafwragcW Y4rfCAIfCh32dSeut30DRwAEVtvKRmCWkE3KezfggzkXl45+0w8BybgZxV61yYyQrI+rvaTq+pW barN2SrjSzvtjaJGT+ljWXSAO1FgRaSt53BJt9kfanaBgUVuHWfYjO X-Received: by 2002:a17:902:ea11:b0:1e2:adce:9139 with SMTP id s17-20020a170902ea1100b001e2adce9139mr16091891plg.44.1715032437559; Mon, 06 May 2024 14:53:57 -0700 (PDT) Received: from amakhalov-build-vm.eng.vmware.com ([128.177.82.146]) by smtp.gmail.com with ESMTPSA id h8-20020a170902f54800b001ed6868e257sm5664008plf.123.2024.05.06.14.53.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 14:53:57 -0700 (PDT) From: Alexey Makhalov To: linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, mingo@redhat.com, tglx@linutronix.de Cc: x86@kernel.org, netdev@vger.kernel.org, richardcochran@gmail.com, linux-input@vger.kernel.org, dmitry.torokhov@gmail.com, zackr@vmware.com, linux-graphics-maintainer@vmware.com, pv-drivers@vmware.com, timothym@vmware.com, akaher@vmware.com, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, airlied@gmail.com, tzimmermann@suse.de, mripard@kernel.org, maarten.lankhorst@linux.intel.com, horms@kernel.org, kirill.shutemov@linux.intel.com, Alexey Makhalov , Tim Merrifield , Nadav Amit Subject: [PATCH v9 8/8] x86/vmware: Add TDX hypercall support Date: Mon, 6 May 2024 14:53:05 -0700 Message-Id: <20240506215305.30756-9-alexey.makhalov@broadcom.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20240506215305.30756-1-alexey.makhalov@broadcom.com> References: <20240505182829.GBZjfPzeEijTsBUth5@fat_crate.local> <20240506215305.30756-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: 8bit VMware hypercalls use I/O port, VMCALL or VMMCALL instructions. Add __tdx_hypercall path to support TDX guests. No change in high bandwidth hypercalls, as only low bandwidth ones are supported for TDX guests. Co-developed-by: Tim Merrifield Signed-off-by: Tim Merrifield Signed-off-by: Alexey Makhalov Reviewed-by: Nadav Amit Acked-by: Kirill A. Shutemov Acked-by: Dave Hansen --- arch/x86/include/asm/vmware.h | 46 +++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/vmware.c | 52 +++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h index 84a31f579a30..cc79c14d1ac2 100644 --- a/arch/x86/include/asm/vmware.h +++ b/arch/x86/include/asm/vmware.h @@ -18,6 +18,12 @@ * arg2 - Hypercall command * arg3 bits [15:0] - Port number, LB and direction flags * + * - 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). + * * - 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), @@ -54,12 +60,28 @@ #define VMWARE_CMD_GETHZ 45 #define VMWARE_CMD_GETVCPU_INFO 68 #define VMWARE_CMD_STEALCLOCK 91 +/* + * Hypercall command mask: + * bits [6:0] command, range [0, 127] + * bits [19:16] sub-command, range [0, 15] + */ +#define VMWARE_CMD_MASK 0xf007fU #define CPUID_VMWARE_FEATURES_ECX_VMMCALL BIT(0) #define CPUID_VMWARE_FEATURES_ECX_VMCALL BIT(1) extern u8 vmware_hypercall_mode; +#define VMWARE_TDX_VENDOR_LEAF 0x1af7e4909ULL +#define VMWARE_TDX_HCALL_FUNC 1 + +extern unsigned long vmware_tdx_hypercall(unsigned long cmd, + unsigned long in1, unsigned long in3, + unsigned long in4, unsigned long in5, + uint32_t *out1, uint32_t *out2, + uint32_t *out3, uint32_t *out4, + uint32_t *out5); + /* * 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. @@ -87,6 +109,10 @@ 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); + asm_inline volatile (VMWARE_HYPERCALL : "=a" (out0) : [port] "i" (VMWARE_HYPERVISOR_PORT), @@ -105,6 +131,10 @@ unsigned long vmware_hypercall3(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, + out1, out2, NULL, NULL, NULL); + asm_inline volatile (VMWARE_HYPERCALL : "=a" (out0), "=b" (*out1), "=c" (*out2) : [port] "i" (VMWARE_HYPERVISOR_PORT), @@ -124,6 +154,10 @@ unsigned long vmware_hypercall4(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, + out1, out2, out3, NULL, NULL); + asm_inline volatile (VMWARE_HYPERCALL : "=a" (out0), "=b" (*out1), "=c" (*out2), "=d" (*out3) : [port] "i" (VMWARE_HYPERVISOR_PORT), @@ -143,6 +177,10 @@ unsigned long vmware_hypercall5(unsigned long cmd, unsigned long in1, { 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); + asm_inline volatile (VMWARE_HYPERCALL : "=a" (out0), "=c" (*out2) : [port] "i" (VMWARE_HYPERVISOR_PORT), @@ -165,6 +203,10 @@ unsigned long vmware_hypercall6(unsigned long cmd, unsigned long in1, { 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); + asm_inline volatile (VMWARE_HYPERCALL : "=a" (out0), "=c" (*out2), "=d" (*out3), "=S" (*out4), "=D" (*out5) @@ -186,6 +228,10 @@ unsigned long vmware_hypercall7(unsigned long cmd, unsigned long in1, { 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); + asm_inline volatile (VMWARE_HYPERCALL : "=a" (out0), "=b" (*out1), "=c" (*out2), "=d" (*out3) : [port] "i" (VMWARE_HYPERVISOR_PORT), diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 3ec14a5fa4ac..7511ef706d48 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -428,6 +428,58 @@ static bool __init vmware_legacy_x2apic_available(void) (eax & GETVCPU_INFO_LEGACY_X2APIC); } +#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, + uint32_t *out1, uint32_t *out2, + uint32_t *out3, uint32_t *out4, + uint32_t *out5) +{ + struct tdx_module_args args; + + 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 = in1; + args.rdx = in3; + args.rsi = in4; + args.rdi = in5; + args.r10 = VMWARE_TDX_VENDOR_LEAF; + args.r11 = VMWARE_TDX_HCALL_FUNC; + args.r12 = VMWARE_HYPERVISOR_MAGIC; + args.r13 = cmd; + args.r15 = 0; /* CPL */ + + __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; + + 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) -- 2.39.0