KVM: x86/xen: add KVM_XEN_HVM_SET_ATTR/KVM_XEN_HVM_GET_ATTR

This will be used to set up shared info pages etc.

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

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 5394dda3e3b0690e22ab15ba13f71a2f70529c29..975ef5d6dda1fb74cdab17829d04b4d8b9f37e9a 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5595,6 +5595,26 @@ set_pit2_out:
                r = 0;
                break;
        }
+       case KVM_XEN_HVM_GET_ATTR: {
+               struct kvm_xen_hvm_attr xha;
+
+               r = -EFAULT;
+               if (copy_from_user(&xha, argp, sizeof(xha)))
+                       goto out;
+               r = kvm_xen_hvm_get_attr(kvm, &xha);
+               if (copy_to_user(argp, &xha, sizeof(xha)))
+                       goto out;
+               break;
+       }
+       case KVM_XEN_HVM_SET_ATTR: {
+               struct kvm_xen_hvm_attr xha;
+
+               r = -EFAULT;
+               if (copy_from_user(&xha, argp, sizeof(xha)))
+                       goto out;
+               r = kvm_xen_hvm_set_attr(kvm, &xha);
+               break;
+       }
        case KVM_SET_CLOCK: {
                struct kvm_clock_data user_ns;
                u64 now_ns;

diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index 503935d8212ed6cd05ed89872e2446664b307a4e..c0b2c67e02352d7203991e388065313188fd216a 100644 (file)
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -16,6 +16,30 @@
 
 #include "trace.h"
 
+int kvm_xen_hvm_set_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data)
+{
+       int r = -ENOENT;
+
+       switch (data->type) {
+       default:
+               break;
+       }
+
+       return r;
+}
+
+int kvm_xen_hvm_get_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data)
+{
+       int r = -ENOENT;
+
+       switch (data->type) {
+       default:
+               break;
+       }
+
+       return r;
+}
+
 int kvm_xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
 {
        struct kvm *kvm = vcpu->kvm;

diff --git a/arch/x86/kvm/xen.h b/arch/x86/kvm/xen.h
index 81e12f716d2eb492b7404cadeddaa59d77132720..afc6dad41fb5858eca49c47cac0f70db57fd6dea 100644 (file)
--- a/arch/x86/kvm/xen.h
+++ b/arch/x86/kvm/xen.h
@@ -9,8 +9,11 @@
 #ifndef __ARCH_X86_KVM_XEN_H__
 #define __ARCH_X86_KVM_XEN_H__
 
+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/linux/kvm_host.h b/include/linux/kvm_host.h
index 8eb5eb1399f58da4f95024019dadb0f1c64f0182..846a010f5d5feb7ed2265e35758ba59c4294e388 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -33,6 +33,21 @@
 
 #include <linux/kvm_types.h>
 
+struct kvm_host_map {
+       /*
+        * Only valid if the 'pfn' is managed by the host kernel (i.e. There is
+        * a 'struct page' for it. When using mem= kernel parameter some memory
+        * can be used as guest memory but they are not managed by host
+        * kernel).
+        * If 'pfn' is not managed by the host kernel, this field is
+        * initialized to KVM_UNMAPPED_PAGE.
+        */
+       struct page *page;
+       void *hva;
+       kvm_pfn_t pfn;
+       kvm_pfn_t gfn;
+};
+
 #include <asm/kvm_host.h>
 
 #ifndef KVM_MAX_VCPU_ID
@@ -225,21 +240,6 @@ enum {
 
 #define KVM_UNMAPPED_PAGE      ((void *) 0x500 + POISON_POINTER_DELTA)
 
-struct kvm_host_map {
-       /*
-        * Only valid if the 'pfn' is managed by the host kernel (i.e. There is
-        * a 'struct page' for it. When using mem= kernel parameter some memory
-        * can be used as guest memory but they are not managed by host
-        * kernel).
-        * If 'pfn' is not managed by the host kernel, this field is
-        * initialized to KVM_UNMAPPED_PAGE.
-        */
-       struct page *page;
-       void *hva;
-       kvm_pfn_t pfn;
-       kvm_pfn_t gfn;
-};
-
 /*
  * Used to check if the mapping is valid or not. Never use 'kvm_host_map'
  * directly to check for that.

diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 6b593a23cd4103257d3482eafcbad94f1bd62d44..3d9ac2f4dc10a19a897a6acacaff7c03acc0841a 100644 (file)
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1577,6 +1577,17 @@ struct kvm_pv_cmd {
 /* Available with KVM_CAP_X86_MSR_FILTER */
 #define KVM_X86_SET_MSR_FILTER _IOW(KVMIO,  0xc6, struct kvm_msr_filter)
 
+#define KVM_XEN_HVM_GET_ATTR   _IOWR(KVMIO, 0xc7, struct kvm_xen_hvm_attr)
+#define KVM_XEN_HVM_SET_ATTR   _IOW(KVMIO,  0xc8, struct kvm_xen_hvm_attr)
+
+struct kvm_xen_hvm_attr {
+       __u16 type;
+
+       union {
+               __u64 pad[4];
+       } u;
+};
+
 /* Secure Encrypted Virtualization command */
 enum sev_cmd_id {
        /* Guest initialization commands */