From: Nicolas Saenz Julienne <nsaenz@amazon.com>
To: <kvm@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-hyperv@vger.kernel.org>,
<pbonzini@redhat.com>, <seanjc@google.com>, <vkuznets@redhat.com>,
<anelkz@amazon.com>, <graf@amazon.com>, <dwmw@amazon.co.uk>,
<jgowans@amazon.com>, <corbert@lwn.net>, <kys@microsoft.com>,
<haiyangz@microsoft.com>, <decui@microsoft.com>, <x86@kernel.org>,
<linux-doc@vger.kernel.org>,
Nicolas Saenz Julienne <nsaenz@amazon.com>
Subject: [RFC 05/33] KVM: x86: hyper-v: Introduce VTL call/return prologues in hypercall page
Date: Wed, 8 Nov 2023 11:17:38 +0000 [thread overview]
Message-ID: <20231108111806.92604-6-nsaenz@amazon.com> (raw)
In-Reply-To: <20231108111806.92604-1-nsaenz@amazon.com>
VTL call/return hypercalls have their own entry points in the hypercall
page because they don't follow normal hyper-v hypercall conventions.
Move the VTL call/return control input into ECX/RAX and set the
hypercall code into EAX/RCX before calling the hypercall instruction in
order to be able to use the Hyper-V hypercall entry function.
Guests can read an emulated code page offsets register to know the
offsets into the hypercall page for the VTL call/return entries.
Signed-off-by: Nicolas Saenz Julienne <nsaenz@amazon.com>
---
My tree has the additional patch, we're still trying to understand under
what conditions Windows expects the offset to be fixed.
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 54f7f36a89bf..9f2ea8c34447 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -294,6 +294,7 @@ static int patch_hypercall_page(struct kvm_vcpu *vcpu, u64 data)
/* VTL call/return entries */
if (!kvm_xen_hypercall_enabled(kvm) && kvm_hv_vsm_enabled(kvm)) {
+ i = 22;
#ifdef CONFIG_X86_64
if (is_64_bit_mode(vcpu)) {
/*
---
arch/x86/include/asm/kvm_host.h | 2 +
arch/x86/kvm/hyperv.c | 78 ++++++++++++++++++++++++++++++-
include/asm-generic/hyperv-tlfs.h | 11 +++++
3 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index a2f224f95404..00cd21b09f8c 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1105,6 +1105,8 @@ struct kvm_hv {
u64 hv_tsc_emulation_status;
u64 hv_invtsc_control;
+ union hv_register_vsm_code_page_offsets vsm_code_page_offsets;
+
/* How many vCPUs have VP index != vCPU index */
atomic_t num_mismatched_vp_indexes;
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 78d053042667..d4b1b53ea63d 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -259,7 +259,8 @@ static void synic_exit(struct kvm_vcpu_hv_synic *synic, u32 msr)
static int patch_hypercall_page(struct kvm_vcpu *vcpu, u64 data)
{
struct kvm *kvm = vcpu->kvm;
- u8 instructions[9];
+ struct kvm_hv *hv = to_kvm_hv(kvm);
+ u8 instructions[0x30];
int i = 0;
u64 addr;
@@ -285,6 +286,81 @@ static int patch_hypercall_page(struct kvm_vcpu *vcpu, u64 data)
/* ret */
((unsigned char *)instructions)[i++] = 0xc3;
+ /* VTL call/return entries */
+ if (!kvm_xen_hypercall_enabled(kvm) && kvm_hv_vsm_enabled(kvm)) {
+#ifdef CONFIG_X86_64
+ if (is_64_bit_mode(vcpu)) {
+ /*
+ * VTL call 64-bit entry prologue:
+ * mov %rcx, %rax
+ * mov $0x11, %ecx
+ * jmp 0:
+ */
+ hv->vsm_code_page_offsets.vtl_call_offset = i;
+ instructions[i++] = 0x48;
+ instructions[i++] = 0x89;
+ instructions[i++] = 0xc8;
+ instructions[i++] = 0xb9;
+ instructions[i++] = 0x11;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0xeb;
+ instructions[i++] = 0xe0;
+ /*
+ * VTL return 64-bit entry prologue:
+ * mov %rcx, %rax
+ * mov $0x12, %ecx
+ * jmp 0:
+ */
+ hv->vsm_code_page_offsets.vtl_return_offset = i;
+ instructions[i++] = 0x48;
+ instructions[i++] = 0x89;
+ instructions[i++] = 0xc8;
+ instructions[i++] = 0xb9;
+ instructions[i++] = 0x12;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0xeb;
+ instructions[i++] = 0xd6;
+ } else
+#endif
+ {
+ /*
+ * VTL call 32-bit entry prologue:
+ * mov %eax, %ecx
+ * mov $0x11, %eax
+ * jmp 0:
+ */
+ hv->vsm_code_page_offsets.vtl_call_offset = i;
+ instructions[i++] = 0x89;
+ instructions[i++] = 0xc1;
+ instructions[i++] = 0xb8;
+ instructions[i++] = 0x11;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0xeb;
+ instructions[i++] = 0xf3;
+ /*
+ * VTL return 32-bit entry prologue:
+ * mov %eax, %ecx
+ * mov $0x12, %eax
+ * jmp 0:
+ */
+ hv->vsm_code_page_offsets.vtl_return_offset = i;
+ instructions[i++] = 0x89;
+ instructions[i++] = 0xc1;
+ instructions[i++] = 0xb8;
+ instructions[i++] = 0x12;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0x00;
+ instructions[i++] = 0xeb;
+ instructions[i++] = 0xea;
+ }
+ }
addr = data & HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_MASK;
if (kvm_vcpu_write_guest(vcpu, addr, instructions, i))
return 1;
diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h
index fdac4a1714ec..0e7643c1ef01 100644
--- a/include/asm-generic/hyperv-tlfs.h
+++ b/include/asm-generic/hyperv-tlfs.h
@@ -823,4 +823,15 @@ struct hv_mmio_write_input {
u8 data[HV_HYPERCALL_MMIO_MAX_DATA_LENGTH];
} __packed;
+/*
+ * VTL call/return hypercall page offsets register
+ */
+union hv_register_vsm_code_page_offsets {
+ u64 as_u64;
+ struct {
+ u64 vtl_call_offset:12;
+ u64 vtl_return_offset:12;
+ u64 reserved:40;
+ } __packed;
+};
#endif
--
2.40.1
next prev parent reply other threads:[~2023-11-08 11:19 UTC|newest]
Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-08 11:17 [RFC 0/33] KVM: x86: hyperv: Introduce VSM support Nicolas Saenz Julienne
2023-11-08 11:17 ` [RFC 01/33] KVM: x86: Decouple lapic.h from hyperv.h Nicolas Saenz Julienne
2023-11-08 16:11 ` Sean Christopherson
2023-11-08 11:17 ` [RFC 02/33] KVM: x86: Introduce KVM_CAP_APIC_ID_GROUPS Nicolas Saenz Julienne
2023-11-08 12:11 ` Alexander Graf
2023-11-08 17:47 ` Sean Christopherson
2023-11-10 18:46 ` Nicolas Saenz Julienne
2023-11-28 6:56 ` Maxim Levitsky
2023-12-01 15:25 ` Nicolas Saenz Julienne
2023-11-08 11:17 ` [RFC 03/33] KVM: x86: hyper-v: Introduce XMM output support Nicolas Saenz Julienne
2023-11-08 11:44 ` Alexander Graf
2023-11-08 12:11 ` Vitaly Kuznetsov
2023-11-08 12:16 ` Alexander Graf
2023-11-28 6:57 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 04/33] KVM: x86: hyper-v: Move hypercall page handling into separate function Nicolas Saenz Julienne
2023-11-28 7:01 ` Maxim Levitsky
2023-11-08 11:17 ` Nicolas Saenz Julienne [this message]
2023-11-08 11:53 ` [RFC 05/33] KVM: x86: hyper-v: Introduce VTL call/return prologues in hypercall page Alexander Graf
2023-11-08 14:10 ` Nicolas Saenz Julienne
2023-11-28 7:08 ` Maxim Levitsky
2023-11-28 16:33 ` Sean Christopherson
2023-12-01 16:19 ` Nicolas Saenz Julienne
2023-12-01 16:32 ` Sean Christopherson
2023-12-01 16:50 ` Nicolas Saenz Julienne
2023-12-01 17:47 ` Sean Christopherson
2023-12-01 18:15 ` Nicolas Saenz Julienne
2023-12-05 19:21 ` Sean Christopherson
2023-12-05 20:04 ` Maxim Levitsky
2023-12-06 0:07 ` Sean Christopherson
2023-12-06 16:19 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 06/33] KVM: x86: hyper-v: Introduce VTL awareness to Hyper-V's PV-IPIs Nicolas Saenz Julienne
2023-11-28 7:14 ` Maxim Levitsky
2023-12-01 16:31 ` Nicolas Saenz Julienne
2023-12-05 15:02 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 07/33] KVM: x86: hyper-v: Introduce KVM_CAP_HYPERV_VSM Nicolas Saenz Julienne
2023-11-28 7:16 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 08/33] KVM: x86: Don't use hv_timer if CAP_HYPERV_VSM enabled Nicolas Saenz Julienne
2023-11-28 7:21 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 09/33] KVM: x86: hyper-v: Introduce per-VTL vcpu helpers Nicolas Saenz Julienne
2023-11-08 12:21 ` Alexander Graf
2023-11-08 14:04 ` Nicolas Saenz Julienne
2023-11-28 7:25 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 10/33] KVM: x86: hyper-v: Introduce KVM_HV_GET_VSM_STATE Nicolas Saenz Julienne
2023-11-28 7:26 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 11/33] KVM: x86: hyper-v: Handle GET/SET_VP_REGISTER hcall in user-space Nicolas Saenz Julienne
2023-11-08 12:14 ` Alexander Graf
2023-11-28 7:26 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 12/33] KVM: x86: hyper-v: Handle VSM hcalls " Nicolas Saenz Julienne
2023-11-28 7:28 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 13/33] KVM: Allow polling vCPUs for events Nicolas Saenz Julienne
2023-11-28 7:30 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 14/33] KVM: x86: Add VTL to the MMU role Nicolas Saenz Julienne
2023-11-08 17:26 ` Sean Christopherson
2023-11-10 18:52 ` Nicolas Saenz Julienne
2023-11-28 7:34 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 15/33] KVM: x86/mmu: Introduce infrastructure to handle non-executable faults Nicolas Saenz Julienne
2023-11-28 7:34 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 16/33] KVM: x86/mmu: Expose R/W/X flags during memory fault exits Nicolas Saenz Julienne
2023-11-28 7:36 ` Maxim Levitsky
2023-11-28 16:31 ` Sean Christopherson
2023-11-08 11:17 ` [RFC 17/33] KVM: x86/mmu: Allow setting memory attributes if VSM enabled Nicolas Saenz Julienne
2023-11-28 7:39 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 18/33] KVM: x86: Decouple kvm_get_memory_attributes() from struct kvm's mem_attr_array Nicolas Saenz Julienne
2023-11-08 16:59 ` Sean Christopherson
2023-11-28 7:41 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 19/33] KVM: x86: Decouple kvm_range_has_memory_attributes() " Nicolas Saenz Julienne
2023-11-28 7:42 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 20/33] KVM: x86/mmu: Decouple hugepage_has_attrs() " Nicolas Saenz Julienne
2023-11-28 7:43 ` Maxim Levitsky
2023-11-08 11:17 ` [RFC 21/33] KVM: Pass memory attribute array as a MMU notifier argument Nicolas Saenz Julienne
2023-11-08 17:08 ` Sean Christopherson
2023-11-08 11:17 ` [RFC 22/33] KVM: Decouple kvm_ioctl_set_mem_attributes() from kvm's mem_attr_array Nicolas Saenz Julienne
2023-11-08 11:17 ` [RFC 23/33] KVM: Expose memory attribute helper functions unanimously Nicolas Saenz Julienne
2023-11-08 11:17 ` [RFC 24/33] KVM: x86: hyper-v: Introduce KVM VTL device Nicolas Saenz Julienne
2023-11-08 11:17 ` [RFC 25/33] KVM: Introduce a set of new memory attributes Nicolas Saenz Julienne
2023-11-08 12:30 ` Alexander Graf
2023-11-08 16:43 ` Sean Christopherson
2023-11-08 11:17 ` [RFC 26/33] KVM: x86: hyper-vsm: Allow setting per-VTL " Nicolas Saenz Julienne
2023-11-28 7:44 ` Maxim Levitsky
2023-11-08 11:18 ` [RFC 27/33] KVM: x86/mmu/hyper-v: Validate memory faults against per-VTL memprots Nicolas Saenz Julienne
2023-11-28 7:46 ` Maxim Levitsky
2023-11-08 11:18 ` [RFC 28/33] x86/hyper-v: Introduce memory intercept message structure Nicolas Saenz Julienne
2023-11-28 7:53 ` Maxim Levitsky
2023-11-08 11:18 ` [RFC 29/33] KVM: VMX: Save instruction length on EPT violation Nicolas Saenz Julienne
2023-11-08 12:40 ` Alexander Graf
2023-11-08 16:15 ` Sean Christopherson
2023-11-08 17:11 ` Alexander Graf
2023-11-08 17:20 ` Sean Christopherson
2023-11-08 17:27 ` Alexander Graf
2023-11-08 18:19 ` Jim Mattson
2023-11-08 11:18 ` [RFC 30/33] KVM: x86: hyper-v: Introduce KVM_REQ_HV_INJECT_INTERCEPT request Nicolas Saenz Julienne
2023-11-08 12:45 ` Alexander Graf
2023-11-08 13:38 ` Nicolas Saenz Julienne
2023-11-28 8:19 ` Maxim Levitsky
2023-11-08 11:18 ` [RFC 31/33] KVM: x86: hyper-v: Inject intercept on VTL memory protection fault Nicolas Saenz Julienne
2023-11-08 11:18 ` [RFC 32/33] KVM: x86: hyper-v: Implement HVCALL_TRANSLATE_VIRTUAL_ADDRESS Nicolas Saenz Julienne
2023-11-08 12:49 ` Alexander Graf
2023-11-08 13:44 ` Nicolas Saenz Julienne
2023-11-08 11:18 ` [RFC 33/33] Documentation: KVM: Introduce "Emulating Hyper-V VSM with KVM" Nicolas Saenz Julienne
2023-11-28 8:19 ` Maxim Levitsky
2023-11-08 11:40 ` [RFC 0/33] KVM: x86: hyperv: Introduce VSM support Alexander Graf
2023-11-08 14:41 ` Nicolas Saenz Julienne
2023-11-08 16:55 ` Sean Christopherson
2023-11-08 18:33 ` Sean Christopherson
2023-11-10 17:56 ` Nicolas Saenz Julienne
2023-11-10 19:32 ` Sean Christopherson
2023-11-11 11:55 ` Nicolas Saenz Julienne
2023-11-10 19:04 ` Nicolas Saenz Julienne
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=20231108111806.92604-6-nsaenz@amazon.com \
--to=nsaenz@amazon.com \
--cc=anelkz@amazon.com \
--cc=corbert@lwn.net \
--cc=decui@microsoft.com \
--cc=dwmw@amazon.co.uk \
--cc=graf@amazon.com \
--cc=haiyangz@microsoft.com \
--cc=jgowans@amazon.com \
--cc=kvm@vger.kernel.org \
--cc=kys@microsoft.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=vkuznets@redhat.com \
--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;
as well as URLs for NNTP newsgroup(s).