KVM: x86/xen: register shared_info page

We add a new ioctl, XEN_HVM_SHARED_INFO, to allow hypervisor
to know where the guest's shared info page is.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index c9a4feaee2e710245ef9c24ef71976e727419ac5..8bcd83dacf4350ef4f3a52261066c1fb38c1c7d3 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -893,6 +893,8 @@ struct msr_bitmap_range {
 /* Xen emulation context */
 struct kvm_xen {
        bool long_mode;
+       bool shinfo_set;
+       struct gfn_to_hva_cache shinfo_cache;
 };
 
 enum kvm_irqchip_mode {

diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index 52cb9e4655421cd57424ff2a74025c322382b928..9dd9c42842b8f0caf40913a49af8a8e3ef5476da 100644 (file)
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -13,9 +13,23 @@
 #include <linux/kvm_host.h>
 
 #include <trace/events/kvm.h>
+#include <xen/interface/xen.h>
 
 #include "trace.h"
 
+static int kvm_xen_shared_info_init(struct kvm *kvm, gfn_t gfn)
+{
+       int ret;
+
+       ret = kvm_gfn_to_hva_cache_init(kvm, &kvm->arch.xen.shinfo_cache,
+                                       gfn_to_gpa(gfn), PAGE_SIZE);
+       if (ret)
+               return ret;
+
+       kvm->arch.xen.shinfo_set = true;
+       return 0;
+}
+
 int kvm_xen_hvm_set_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data)
 {
        int r = -ENOENT;
@@ -28,6 +42,11 @@ int kvm_xen_hvm_set_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data)
                kvm->arch.xen.long_mode = !!data->u.long_mode;
                r = 0;
                break;
+
+       case KVM_XEN_ATTR_TYPE_SHARED_INFO:
+               r = kvm_xen_shared_info_init(kvm, data->u.shared_info.gfn);
+               break;
+
        default:
                break;
        }
@@ -44,6 +63,14 @@ int kvm_xen_hvm_get_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data)
                data->u.long_mode = kvm->arch.xen.long_mode;
                r = 0;
                break;
+
+       case KVM_XEN_ATTR_TYPE_SHARED_INFO:
+               if (kvm->arch.xen.shinfo_set) {
+                       data->u.shared_info.gfn = gpa_to_gfn(kvm->arch.xen.shinfo_cache.gpa);
+                       r = 0;
+               }
+               break;
+
        default:
                break;
        }

diff --git a/arch/x86/kvm/xen.h b/arch/x86/kvm/xen.h
index cd3c52b62068912348bfc956966ff52205778807..120b7450252aed3a34ed7b2affcbff804cd27475 100644 (file)
--- a/arch/x86/kvm/xen.h
+++ b/arch/x86/kvm/xen.h
@@ -13,7 +13,6 @@ 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);
 int kvm_xen_hypercall(struct kvm_vcpu *vcpu);
 int kvm_xen_hvm_config(struct kvm_vcpu *vcpu, u64 data);
-void kvm_xen_destroy_vm(struct kvm *kvm);
 
 static inline bool kvm_xen_hypercall_enabled(struct kvm *kvm)
 {

diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 6b556ef98b767016f583837d8ce126a2ed686750..caa9faf3c5adbca136b8fb103a6a871571010ce4 100644 (file)
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1585,11 +1585,15 @@ struct kvm_xen_hvm_attr {
 
        union {
                __u8 long_mode;
+               struct {
+                       __u64 gfn;
+               } shared_info;
                __u64 pad[4];
        } u;
 };
 
 #define KVM_XEN_ATTR_TYPE_LONG_MODE            0x0
+#define KVM_XEN_ATTR_TYPE_SHARED_INFO          0x1
 
 /* Secure Encrypted Virtualization command */
 enum sev_cmd_id {