From: Maxim Levitsky <mlevitsk@redhat.com>
To: Nicolas Saenz Julienne <nsaenz@amazon.com>, 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
Subject: Re: [RFC 04/33] KVM: x86: hyper-v: Move hypercall page handling into separate function
Date: Tue, 28 Nov 2023 09:01:42 +0200 [thread overview]
Message-ID: <04a6495330967c74cb6e6e122a634992bb3efa0e.camel@redhat.com> (raw)
In-Reply-To: <20231108111806.92604-5-nsaenz@amazon.com>
On Wed, 2023-11-08 at 11:17 +0000, Nicolas Saenz Julienne wrote:
> The hypercall page patching is about to grow considerably, move it into
> its own function.
>
> No functional change intended.
>
> Signed-off-by: Nicolas Saenz Julienne <nsaenz@amazon.com>
> ---
> arch/x86/kvm/hyperv.c | 69 ++++++++++++++++++++++++-------------------
> 1 file changed, 39 insertions(+), 30 deletions(-)
>
> diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
> index e1bc861ab3b0..78d053042667 100644
> --- a/arch/x86/kvm/hyperv.c
> +++ b/arch/x86/kvm/hyperv.c
> @@ -256,6 +256,42 @@ static void synic_exit(struct kvm_vcpu_hv_synic *synic, u32 msr)
> kvm_make_request(KVM_REQ_HV_EXIT, vcpu);
> }
>
> +static int patch_hypercall_page(struct kvm_vcpu *vcpu, u64 data)
> +{
> + struct kvm *kvm = vcpu->kvm;
> + u8 instructions[9];
> + int i = 0;
> + u64 addr;
> +
> + /*
> + * If Xen and Hyper-V hypercalls are both enabled, disambiguate
> + * the same way Xen itself does, by setting the bit 31 of EAX
> + * which is RsvdZ in the 32-bit Hyper-V hypercall ABI and just
> + * going to be clobbered on 64-bit.
> + */
> + if (kvm_xen_hypercall_enabled(kvm)) {
> + /* orl $0x80000000, %eax */
> + instructions[i++] = 0x0d;
> + instructions[i++] = 0x00;
> + instructions[i++] = 0x00;
> + instructions[i++] = 0x00;
> + instructions[i++] = 0x80;
> + }
> +
> + /* vmcall/vmmcall */
> + static_call(kvm_x86_patch_hypercall)(vcpu, instructions + i);
> + i += 3;
> +
> + /* ret */
> + ((unsigned char *)instructions)[i++] = 0xc3;
> +
> + addr = data & HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_MASK;
> + if (kvm_vcpu_write_guest(vcpu, addr, instructions, i))
> + return 1;
> +
> + return 0;
> +}
> +
> static int synic_set_msr(struct kvm_vcpu_hv_synic *synic,
> u32 msr, u64 data, bool host)
> {
> @@ -1338,11 +1374,7 @@ static int kvm_hv_set_msr_pw(struct kvm_vcpu *vcpu, u32 msr, u64 data,
> if (!hv->hv_guest_os_id)
> hv->hv_hypercall &= ~HV_X64_MSR_HYPERCALL_ENABLE;
> break;
> - case HV_X64_MSR_HYPERCALL: {
> - u8 instructions[9];
> - int i = 0;
> - u64 addr;
> -
> + case HV_X64_MSR_HYPERCALL:
> /* if guest os id is not set hypercall should remain disabled */
> if (!hv->hv_guest_os_id)
> break;
> @@ -1351,34 +1383,11 @@ static int kvm_hv_set_msr_pw(struct kvm_vcpu *vcpu, u32 msr, u64 data,
> break;
> }
>
> - /*
> - * If Xen and Hyper-V hypercalls are both enabled, disambiguate
> - * the same way Xen itself does, by setting the bit 31 of EAX
> - * which is RsvdZ in the 32-bit Hyper-V hypercall ABI and just
> - * going to be clobbered on 64-bit.
> - */
> - if (kvm_xen_hypercall_enabled(kvm)) {
> - /* orl $0x80000000, %eax */
> - instructions[i++] = 0x0d;
> - instructions[i++] = 0x00;
> - instructions[i++] = 0x00;
> - instructions[i++] = 0x00;
> - instructions[i++] = 0x80;
> - }
> -
> - /* vmcall/vmmcall */
> - static_call(kvm_x86_patch_hypercall)(vcpu, instructions + i);
> - i += 3;
> -
> - /* ret */
> - ((unsigned char *)instructions)[i++] = 0xc3;
> -
> - addr = data & HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_MASK;
> - if (kvm_vcpu_write_guest(vcpu, addr, instructions, i))
> + if (patch_hypercall_page(vcpu, data))
> return 1;
> +
> hv->hv_hypercall = data;
> break;
> - }
> case HV_X64_MSR_REFERENCE_TSC:
> hv->hv_tsc_page = data;
> if (hv->hv_tsc_page & HV_X64_MSR_TSC_REFERENCE_ENABLE) {
This looks like another nice cleanup that can be accepted to the kvm,
before the main VTL patch series.
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky
next prev parent reply other threads:[~2023-11-28 7:01 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 [this message]
2023-11-08 11:17 ` [RFC 05/33] KVM: x86: hyper-v: Introduce VTL call/return prologues in hypercall page Nicolas Saenz Julienne
2023-11-08 11:53 ` 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=04a6495330967c74cb6e6e122a634992bb3efa0e.camel@redhat.com \
--to=mlevitsk@redhat.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=nsaenz@amazon.com \
--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).