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 4e6b8c4d782478137f142454f920bf60ce5252bf..fd0a4ff1157e7d6970c7bf2e591cdccbbc8b2bbf 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5618,6 +5618,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 (!r && copy_to_user(argp, &xha, sizeof(xha)))
+                       r = -EFAULT;
+               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..d06b5afcc1f2d2f0edc26fa519e7b27c8bde5a8b 100644 (file)
--- a/arch/x86/kvm/xen.h
+++ b/arch/x86/kvm/xen.h
@@ -9,6 +9,8 @@
 #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);
 

diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 9eee81bcd0e0c8d736b0ef792627ee1918d9670a..31d4eb100efddace2a36cdc62df5fcae25c5419c 100644 (file)
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1585,6 +1585,17 @@ struct kvm_pv_cmd {
 /* Available with KVM_CAP_DIRTY_LOG_RING */
 #define KVM_RESET_DIRTY_RINGS          _IO(KVMIO, 0xc7)
 
+#define KVM_XEN_HVM_GET_ATTR   _IOWR(KVMIO, 0xc8, struct kvm_xen_hvm_attr)
+#define KVM_XEN_HVM_SET_ATTR   _IOW(KVMIO,  0xc9, struct kvm_xen_hvm_attr)
+
+struct kvm_xen_hvm_attr {
+       __u16 type;
+       __u16 pad[3];
+       union {
+               __u64 pad[4];
+       } u;
+};
+
 /* Secure Encrypted Virtualization command */
 enum sev_cmd_id {
        /* Guest initialization commands */