public inbox for linux-coco@lists.linux.dev
 help / color / mirror / Atom feed
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: Sean Christopherson <seanjc@google.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
	"K. Y. Srinivasan" <kys@microsoft.com>,
	Haiyang Zhang <haiyangz@microsoft.com>,
	Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>,
	Josh Poimboeuf <jpoimboe@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>
Cc: linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org,
	linux-hyperv@vger.kernel.org,
	"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH 06/20] x86/tdx: Convert MSR write handling to use new TDVMCALL_0()
Date: Fri, 17 May 2024 17:19:24 +0300	[thread overview]
Message-ID: <20240517141938.4177174-7-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <20240517141938.4177174-1-kirill.shutemov@linux.intel.com>

Use newly introduced TDVMCALL_0() instead of __tdx_hypercall() to handle
MSR write emulation.

It cuts code bloat substantially:

Function                                     old     new   delta
tdx_handle_virt_exception                   1947    1819    -128

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 arch/x86/coco/tdx/tdx.c | 9 ++-------
 arch/x86/hyperv/ivm.c   | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c
index 32c519d096de..f59a2b3500db 100644
--- a/arch/x86/coco/tdx/tdx.c
+++ b/arch/x86/coco/tdx/tdx.c
@@ -399,19 +399,14 @@ static int read_msr(struct pt_regs *regs, struct ve_info *ve)
 
 static int write_msr(struct pt_regs *regs, struct ve_info *ve)
 {
-	struct tdx_module_args args = {
-		.r10 = TDX_HYPERCALL_STANDARD,
-		.r11 = hcall_func(EXIT_REASON_MSR_WRITE),
-		.r12 = regs->cx,
-		.r13 = (u64)regs->dx << 32 | regs->ax,
-	};
+	u64 val = (u64)regs->dx << 32 | regs->ax;
 
 	/*
 	 * Emulate the MSR write via hypercall. More info about ABI
 	 * can be found in TDX Guest-Host-Communication Interface
 	 * (GHCI) section titled "TDG.VP.VMCALL<Instruction.WRMSR>".
 	 */
-	if (__tdx_hypercall(&args))
+	if (TDVMCALL_0(hcall_func(EXIT_REASON_MSR_WRITE), regs->cx, val, 0, 0))
 		return -EIO;
 
 	return ve_instr_len(ve);
diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c
index 3e2cbfb2203d..18d0892d9fc4 100644
--- a/arch/x86/hyperv/ivm.c
+++ b/arch/x86/hyperv/ivm.c
@@ -385,14 +385,9 @@ static inline void hv_ghcb_msr_read(u64 msr, u64 *value) {}
 #ifdef CONFIG_INTEL_TDX_GUEST
 static void hv_tdx_msr_write(u64 msr, u64 val)
 {
-	struct tdx_module_args args = {
-		.r10 = TDX_HYPERCALL_STANDARD,
-		.r11 = EXIT_REASON_MSR_WRITE,
-		.r12 = msr,
-		.r13 = val,
-	};
+	u64 ret;
 
-	u64 ret = __tdx_hypercall(&args);
+	ret = TDVMCALL_0(hcall_func(EXIT_REASON_MSR_WRITE), msr, val, 0, 0);
 
 	WARN_ONCE(ret, "Failed to emulate MSR write: %lld\n", ret);
 }
-- 
2.43.0


  parent reply	other threads:[~2024-05-17 14:20 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-17 14:19 [PATCH 00/20] x86/tdx: Rewrite TDCALL wrappers Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 01/20] x86/tdx: Introduce tdvmcall_trampoline() Kirill A. Shutemov
2024-05-17 15:21   ` Dave Hansen
2024-05-20 10:32     ` Kirill A. Shutemov
2024-05-20 15:49       ` Dave Hansen
2024-05-17 17:02   ` Paolo Bonzini
2024-05-20 10:35     ` Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 02/20] x86/tdx: Add macros to generate TDVMCALL wrappers Kirill A. Shutemov
2024-05-17 16:54   ` Paolo Bonzini
2024-05-20 10:35     ` Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 03/20] x86/tdx: Convert port I/O handling to use new TDVMCALL macros Kirill A. Shutemov
2024-05-17 15:28   ` Dave Hansen
2024-05-17 17:37     ` Paolo Bonzini
2024-05-17 14:19 ` [PATCH 04/20] x86/tdx: Convert HLT handling to use new TDVMCALL_0() Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 05/20] x86/tdx: Convert MSR read handling to use new TDVMCALL_1() Kirill A. Shutemov
2024-05-28  5:33   ` Wei Liu
2024-05-17 14:19 ` Kirill A. Shutemov [this message]
2024-05-28  5:33   ` [PATCH 06/20] x86/tdx: Convert MSR write handling to use new TDVMCALL_0() Wei Liu
2024-05-17 14:19 ` [PATCH 07/20] x86/tdx: Convert CPUID handling to use new TDVMCALL_4() Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 08/20] x86/tdx: Convert MMIO handling to use new TDVMCALL macros Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 09/20] x86/tdx: Convert MAP_GPA hypercall " Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 10/20] x86/tdx: Convert GET_QUOTE " Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 11/20] x86/tdx: Rewrite tdx_panic() without __tdx_hypercall() Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 12/20] x86/tdx: Rewrite tdx_kvm_hypercall() " Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 13/20] x86/tdx: Rewrite hv_tdx_hypercall() " Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 14/20] x86/tdx: Add macros to generate TDCALL wrappers Kirill A. Shutemov
2024-05-17 17:04   ` Paolo Bonzini
2024-05-17 14:19 ` [PATCH 15/20] x86/tdx: Convert PAGE_ACCEPT tdcall to use new TDCALL_0() macro Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 16/20] x86/tdx: Convert VP_INFO tdcall to use new TDCALL_5() macro Kirill A. Shutemov
2024-05-17 15:57   ` Dave Hansen
2024-05-20 11:02     ` Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 17/20] x86/tdx: Convert VM_RD/VM_WR tdcalls to use new TDCALL macros Kirill A. Shutemov
2024-05-17 16:07   ` Dave Hansen
2024-05-17 14:19 ` [PATCH 18/20] x86/tdx: Convert VP_VEINFO_GET tdcall to use new TDCALL_5() macro Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 19/20] x86/tdx: Convert MR_REPORT tdcall to use new TDCALL_0() macro Kirill A. Shutemov
2024-05-17 14:19 ` [PATCH 20/20] x86/tdx: Remove old TDCALL wrappers Kirill A. Shutemov
2024-05-17 15:18 ` [PATCH 00/20] x86/tdx: Rewrite " Dave Hansen
2024-05-20 11:56   ` Huang, Kai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240517141938.4177174-7-kirill.shutemov@linux.intel.com \
    --to=kirill.shutemov@linux.intel.com \
    --cc=bp@alien8.de \
    --cc=dave.hansen@linux.intel.com \
    --cc=decui@microsoft.com \
    --cc=haiyangz@microsoft.com \
    --cc=hpa@zytor.com \
    --cc=jpoimboe@kernel.org \
    --cc=kys@microsoft.com \
    --cc=linux-coco@lists.linux.dev \
    --cc=linux-hyperv@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterz@infradead.org \
    --cc=seanjc@google.com \
    --cc=tglx@linutronix.de \
    --cc=wei.liu@kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox