From: Joao Martins <joao.m.martins@oracle.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: "Ankur Arora" <ankur.a.arora@oracle.com>,
"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
"Joao Martins" <joao.m.martins@oracle.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Borislav Petkov" <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org
Subject: [PATCH RFC 06/39] KVM: x86/xen: register vcpu info
Date: Wed, 20 Feb 2019 20:15:36 +0000 [thread overview]
Message-ID: <20190220201609.28290-7-joao.m.martins@oracle.com> (raw)
In-Reply-To: <20190220201609.28290-1-joao.m.martins@oracle.com>
The vcpu info supersedes the per vcpu area of the shared info page and
the guest vcpus will use this instead.
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: Ankur Arora <ankur.a.arora@oracle.com>
---
arch/x86/include/asm/kvm_host.h | 2 +
arch/x86/kvm/x86.c | 1 +
arch/x86/kvm/xen.c | 93 ++++++++++++++++++++++++++++++++++++++---
arch/x86/kvm/xen.h | 14 +++++++
include/uapi/linux/kvm.h | 5 +++
5 files changed, 110 insertions(+), 5 deletions(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index befc0e37f162..96f65ba4b3c0 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -537,6 +537,8 @@ struct kvm_vcpu_hv {
/* Xen per vcpu emulation context */
struct kvm_vcpu_xen {
struct kvm_xen_exit exit;
+ gpa_t vcpu_info_addr;
+ struct vcpu_info *vcpu_info;
};
struct kvm_vcpu_arch {
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 31a102b22042..3ce97860e6ee 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -9124,6 +9124,7 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
int idx;
kvm_hv_vcpu_uninit(vcpu);
+ kvm_xen_vcpu_uninit(vcpu);
kvm_pmu_destroy(vcpu);
kfree(vcpu->arch.mce_banks);
kvm_free_lapic(vcpu);
diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index 879bcfdd7b1d..36d6dd0ea4b8 100644
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -15,6 +15,33 @@
#include "trace.h"
+static void set_vcpu_attr(struct kvm_vcpu *v, u16 type, gpa_t gpa, void *addr)
+{
+ struct kvm_vcpu_xen *vcpu_xen = vcpu_to_xen_vcpu(v);
+
+ switch (type) {
+ case KVM_XEN_ATTR_TYPE_VCPU_INFO:
+ vcpu_xen->vcpu_info_addr = gpa;
+ vcpu_xen->vcpu_info = addr;
+ kvm_xen_setup_pvclock_page(v);
+ break;
+ default:
+ break;
+ }
+}
+
+static gpa_t get_vcpu_attr(struct kvm_vcpu *v, u16 type)
+{
+ struct kvm_vcpu_xen *vcpu_xen = vcpu_to_xen_vcpu(v);
+
+ switch (type) {
+ case KVM_XEN_ATTR_TYPE_VCPU_INFO:
+ return vcpu_xen->vcpu_info_addr;
+ default:
+ return 0;
+ }
+}
+
static int kvm_xen_shared_info_init(struct kvm *kvm, gfn_t gfn)
{
struct shared_info *shared_info;
@@ -37,26 +64,44 @@ static int kvm_xen_shared_info_init(struct kvm *kvm, gfn_t gfn)
return 0;
}
+static void *xen_vcpu_info(struct kvm_vcpu *v)
+{
+ struct kvm_vcpu_xen *vcpu_xen = vcpu_to_xen_vcpu(v);
+ struct kvm_xen *kvm = &v->kvm->arch.xen;
+ unsigned int offset = 0;
+ void *hva = NULL;
+
+ if (vcpu_xen->vcpu_info_addr)
+ return vcpu_xen->vcpu_info;
+
+ if (kvm->shinfo_addr && v->vcpu_id < MAX_VIRT_CPUS) {
+ hva = kvm->shinfo;
+ offset += offsetof(struct shared_info, vcpu_info);
+ offset += v->vcpu_id * sizeof(struct vcpu_info);
+ }
+
+ return hva + offset;
+}
+
void kvm_xen_setup_pvclock_page(struct kvm_vcpu *v)
{
struct kvm_vcpu_arch *vcpu = &v->arch;
struct pvclock_vcpu_time_info *guest_hv_clock;
+ void *hva = xen_vcpu_info(v);
unsigned int offset;
- if (v->vcpu_id >= MAX_VIRT_CPUS)
+ if (!hva)
return;
offset = offsetof(struct vcpu_info, time);
- offset += offsetof(struct shared_info, vcpu_info);
- offset += v->vcpu_id * sizeof(struct vcpu_info);
guest_hv_clock = (struct pvclock_vcpu_time_info *)
- (((void *)v->kvm->arch.xen.shinfo) + offset);
+ (hva + offset);
BUILD_BUG_ON(offsetof(struct pvclock_vcpu_time_info, version) != 0);
if (guest_hv_clock->version & 1)
- ++guest_hv_clock->version; /* first time write, random junk */
+ ++guest_hv_clock->version;
vcpu->hv_clock.version = guest_hv_clock->version + 1;
guest_hv_clock->version = vcpu->hv_clock.version;
@@ -93,6 +138,25 @@ int kvm_xen_hvm_set_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data)
r = kvm_xen_shared_info_init(kvm, gfn);
break;
}
+ case KVM_XEN_ATTR_TYPE_VCPU_INFO: {
+ gpa_t gpa = data->u.vcpu_attr.gpa;
+ struct kvm_vcpu *v;
+ struct page *page;
+ void *addr;
+
+ v = kvm_get_vcpu(kvm, data->u.vcpu_attr.vcpu);
+ if (!v)
+ return -EINVAL;
+
+ page = gfn_to_page(v->kvm, gpa_to_gfn(gpa));
+ if (is_error_page(page))
+ return -EFAULT;
+
+ addr = page_to_virt(page) + offset_in_page(gpa);
+ set_vcpu_attr(v, data->type, gpa, addr);
+ r = 0;
+ break;
+ }
default:
break;
}
@@ -109,6 +173,17 @@ int kvm_xen_hvm_get_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data)
data->u.shared_info.gfn = kvm->arch.xen.shinfo_addr;
break;
}
+ case KVM_XEN_ATTR_TYPE_VCPU_INFO: {
+ struct kvm_vcpu *v;
+
+ v = kvm_get_vcpu(kvm, data->u.vcpu_attr.vcpu);
+ if (!v)
+ return -EINVAL;
+
+ data->u.vcpu_attr.gpa = get_vcpu_attr(v, data->type);
+ r = 0;
+ break;
+ }
default:
break;
}
@@ -180,6 +255,14 @@ int kvm_xen_hypercall(struct kvm_vcpu *vcpu)
return 0;
}
+void kvm_xen_vcpu_uninit(struct kvm_vcpu *vcpu)
+{
+ struct kvm_vcpu_xen *vcpu_xen = vcpu_to_xen_vcpu(vcpu);
+
+ if (vcpu_xen->vcpu_info)
+ put_page(virt_to_page(vcpu_xen->vcpu_info));
+}
+
void kvm_xen_destroy_vm(struct kvm *kvm)
{
struct kvm_xen *xen = &kvm->arch.xen;
diff --git a/arch/x86/kvm/xen.h b/arch/x86/kvm/xen.h
index 827c9390da34..10ebd0b7a25e 100644
--- a/arch/x86/kvm/xen.h
+++ b/arch/x86/kvm/xen.h
@@ -3,6 +3,19 @@
#ifndef __ARCH_X86_KVM_XEN_H__
#define __ARCH_X86_KVM_XEN_H__
+static inline struct kvm_vcpu_xen *vcpu_to_xen_vcpu(struct kvm_vcpu *vcpu)
+{
+ return &vcpu->arch.xen;
+}
+
+static inline struct kvm_vcpu *xen_vcpu_to_vcpu(struct kvm_vcpu_xen *xen_vcpu)
+{
+ struct kvm_vcpu_arch *arch;
+
+ arch = container_of(xen_vcpu, struct kvm_vcpu_arch, xen);
+ return container_of(arch, struct kvm_vcpu, arch);
+}
+
void kvm_xen_setup_pvclock_page(struct kvm_vcpu *vcpu);
int kvm_xen_hvm_set_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data);
int kvm_xen_hvm_get_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data);
@@ -11,5 +24,6 @@ bool kvm_xen_hypercall_set(struct kvm *kvm);
int kvm_xen_hypercall(struct kvm_vcpu *vcpu);
void kvm_xen_destroy_vm(struct kvm *kvm);
+void kvm_xen_vcpu_uninit(struct kvm_vcpu *vcpu);
#endif
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index de2168d235af..782f497a0fdd 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1465,10 +1465,15 @@ struct kvm_xen_hvm_attr {
struct {
__u64 gfn;
} shared_info;
+ struct {
+ __u32 vcpu;
+ __u64 gpa;
+ } vcpu_attr;
} u;
};
#define KVM_XEN_ATTR_TYPE_SHARED_INFO 0x0
+#define KVM_XEN_ATTR_TYPE_VCPU_INFO 0x1
/* Secure Encrypted Virtualization command */
enum sev_cmd_id {
--
2.11.0
next prev parent reply other threads:[~2019-02-20 20:21 UTC|newest]
Thread overview: 126+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 20:15 [PATCH RFC 00/39] x86/KVM: Xen HVM guest support Joao Martins
2019-02-20 20:15 ` [PATCH RFC 01/39] KVM: x86: fix Xen hypercall page msr handling Joao Martins
2019-02-22 1:30 ` Sean Christopherson
2019-02-22 11:47 ` Joao Martins
2019-02-22 12:51 ` Paolo Bonzini
2020-11-30 10:39 ` David Woodhouse
2020-11-30 11:03 ` Paolo Bonzini
2020-11-30 11:27 ` David Woodhouse
2019-02-20 20:15 ` [PATCH RFC 02/39] KVM: x86/xen: intercept xen hypercalls if enabled Joao Martins
2019-02-21 18:29 ` Sean Christopherson
2019-02-21 20:56 ` Joao Martins
2019-02-22 0:30 ` Sean Christopherson
2019-02-22 12:50 ` Paolo Bonzini
2020-12-01 9:48 ` David Woodhouse
2020-12-01 11:19 ` David Woodhouse
2020-12-02 11:17 ` Joao Martins
2020-12-02 12:12 ` David Woodhouse
2020-12-02 5:19 ` Ankur Arora
2020-12-02 8:03 ` David Woodhouse
2020-12-02 18:20 ` Ankur Arora
2019-02-20 20:15 ` [PATCH RFC 03/39] KVM: x86/xen: register shared_info page Joao Martins
2020-12-01 13:07 ` David Woodhouse
2020-12-02 0:40 ` Ankur Arora
2020-12-02 1:26 ` David Woodhouse
2020-12-02 5:17 ` Ankur Arora
2020-12-02 10:50 ` Joao Martins
2020-12-02 10:44 ` Joao Martins
2020-12-02 12:20 ` David Woodhouse
2020-12-02 20:32 ` Ankur Arora
2020-12-03 10:16 ` David Woodhouse
2020-12-04 17:30 ` Sean Christopherson
2020-12-02 20:33 ` Ankur Arora
2020-12-12 12:07 ` David Woodhouse
2019-02-20 20:15 ` [PATCH RFC 04/39] KVM: x86/xen: setup pvclock updates Joao Martins
2019-02-20 20:15 ` [PATCH RFC 05/39] KVM: x86/xen: update wallclock region Joao Martins
2019-02-20 20:15 ` Joao Martins [this message]
2019-02-20 20:15 ` [PATCH RFC 07/39] KVM: x86/xen: register vcpu time info region Joao Martins
2019-02-20 20:15 ` [PATCH RFC 08/39] KVM: x86/xen: register steal clock Joao Martins
2019-02-20 20:15 ` [PATCH RFC 09/39] KVM: x86: declare Xen HVM guest capability Joao Martins
2019-02-20 20:15 ` [PATCH RFC 10/39] KVM: x86/xen: support upcall vector Joao Martins
2020-12-02 11:17 ` David Woodhouse
2020-12-02 13:12 ` Joao Martins
2020-12-02 16:47 ` David Woodhouse
2020-12-02 18:34 ` Joao Martins
2020-12-02 19:02 ` David Woodhouse
2020-12-02 20:12 ` Joao Martins
2020-12-02 20:37 ` David Woodhouse
2020-12-03 1:08 ` Ankur Arora
2020-12-08 16:08 ` David Woodhouse
2020-12-09 6:35 ` Ankur Arora
2020-12-09 10:27 ` David Woodhouse
2020-12-09 10:51 ` Joao Martins
2020-12-09 11:39 ` David Woodhouse
2020-12-09 13:26 ` Joao Martins
2020-12-09 15:41 ` David Woodhouse
2020-12-09 16:12 ` Joao Martins
2021-01-01 14:33 ` David Woodhouse
2021-01-05 12:11 ` Joao Martins
2021-01-05 13:23 ` David Woodhouse
2019-02-20 20:15 ` [PATCH RFC 11/39] KVM: x86/xen: evtchn signaling via eventfd Joao Martins
2020-11-30 9:41 ` David Woodhouse
2020-11-30 12:17 ` Joao Martins
2020-11-30 12:55 ` David Woodhouse
2020-11-30 15:08 ` Joao Martins
2020-11-30 16:48 ` David Woodhouse
2020-11-30 17:15 ` Joao Martins
2020-11-30 18:01 ` David Woodhouse
2020-11-30 18:41 ` Joao Martins
2020-11-30 19:04 ` David Woodhouse
2020-11-30 19:25 ` Joao Martins
2021-11-23 13:15 ` David Woodhouse
2019-02-20 20:15 ` [PATCH RFC 12/39] KVM: x86/xen: store virq when assigning evtchn Joao Martins
[not found] ` <b750291466f3c89e0a393e48079c087704b217a5.camel@amazon.co.uk>
2022-02-10 12:17 ` Joao Martins
2022-02-10 15:23 ` [EXTERNAL] " David Woodhouse
2019-02-20 20:15 ` [PATCH RFC 13/39] KVM: x86/xen: handle PV timers oneshot mode Joao Martins
2019-02-20 20:15 ` [PATCH RFC 14/39] KVM: x86/xen: handle PV IPI vcpu yield Joao Martins
2019-02-20 20:15 ` [PATCH RFC 15/39] KVM: x86/xen: handle PV spinlocks slowpath Joao Martins
2022-02-08 12:36 ` David Woodhouse
2022-02-10 12:17 ` Joao Martins
2022-02-10 14:11 ` David Woodhouse
2019-02-20 20:15 ` [PATCH RFC 16/39] KVM: x86: declare Xen HVM evtchn offload capability Joao Martins
2019-02-20 20:15 ` [PATCH RFC 17/39] x86/xen: export vcpu_info and shared_info Joao Martins
2019-02-20 20:15 ` [PATCH RFC 18/39] x86/xen: make hypercall_page generic Joao Martins
2019-02-20 20:15 ` [PATCH RFC 19/39] xen/xenbus: xenbus uninit support Joao Martins
2019-02-20 20:15 ` [PATCH RFC 20/39] xen-blkback: module_exit support Joao Martins
2019-02-25 18:57 ` Konrad Rzeszutek Wilk
2019-02-26 11:20 ` Joao Martins
2019-02-20 20:15 ` [PATCH RFC 21/39] KVM: x86/xen: domid allocation Joao Martins
2019-02-20 20:15 ` [PATCH RFC 22/39] KVM: x86/xen: grant table init Joao Martins
2019-02-20 20:15 ` [PATCH RFC 23/39] KVM: x86/xen: grant table grow support Joao Martins
2019-02-20 20:15 ` [PATCH RFC 24/39] KVM: x86/xen: backend hypercall support Joao Martins
2019-02-20 20:15 ` [PATCH RFC 25/39] KVM: x86/xen: grant map support Joao Martins
2019-02-20 20:15 ` [PATCH RFC 26/39] KVM: x86/xen: grant unmap support Joao Martins
2019-02-20 20:15 ` [PATCH RFC 27/39] KVM: x86/xen: grant copy support Joao Martins
2019-02-20 20:15 ` [PATCH RFC 28/39] KVM: x86/xen: interdomain evtchn support Joao Martins
2019-02-20 20:15 ` [PATCH RFC 29/39] KVM: x86/xen: evtchn unmask support Joao Martins
2019-02-20 20:16 ` [PATCH RFC 30/39] KVM: x86/xen: add additional evtchn ops Joao Martins
2019-02-20 20:16 ` [PATCH RFC 31/39] xen-shim: introduce shim domain driver Joao Martins
2019-02-20 20:16 ` [PATCH RFC 32/39] xen/balloon: xen_shim_domain() support Joao Martins
2019-02-20 20:16 ` [PATCH RFC 33/39] xen/grant-table: " Joao Martins
2019-02-20 20:16 ` [PATCH RFC 34/39] xen/gntdev: " Joao Martins
2019-02-20 20:16 ` [PATCH RFC 35/39] xen/xenbus: " Joao Martins
2019-02-20 20:16 ` [PATCH RFC 36/39] drivers/xen: " Joao Martins
2019-02-20 20:16 ` [PATCH RFC 37/39] xen-netback: " Joao Martins
2019-02-20 20:16 ` [PATCH RFC 38/39] xen-blkback: " Joao Martins
2019-02-20 20:16 ` [PATCH RFC 39/39] KVM: x86: declare Xen HVM Dom0 capability Joao Martins
2019-02-20 21:09 ` [PATCH RFC 00/39] x86/KVM: Xen HVM guest support Paolo Bonzini
2019-02-21 0:29 ` Ankur Arora
2019-02-21 11:45 ` Joao Martins
2019-02-22 16:59 ` Paolo Bonzini
2019-03-12 17:14 ` Joao Martins
2019-04-08 6:44 ` Juergen Gross
2019-04-08 10:36 ` Joao Martins
2019-04-08 10:42 ` Juergen Gross
2019-04-08 17:31 ` Joao Martins
2019-04-09 0:35 ` Stefano Stabellini
2019-04-10 5:50 ` [Xen-devel] " Ankur Arora
2019-04-10 20:45 ` Stefano Stabellini
2019-04-09 5:04 ` Juergen Gross
2019-04-10 6:55 ` Ankur Arora
2019-04-10 7:14 ` Juergen Gross
2019-02-20 23:39 ` [Xen-devel] " Marek Marczykowski-Górecki
2019-02-21 0:31 ` Ankur Arora
2019-02-21 7:57 ` Juergen Gross
2019-02-21 12:00 ` Joao Martins
2019-02-21 11:55 ` Joao Martins
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=20190220201609.28290-7-joao.m.martins@oracle.com \
--to=joao.m.martins@oracle.com \
--cc=ankur.a.arora@oracle.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--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
all inboxes | Powered by JetHome®