From: David Woodhouse <dwmw2@infradead.org>
To: kvm@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Ankur Arora <ankur.a.arora@oracle.com>,
Joao Martins <joao.m.martins@oracle.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Sean Christopherson <seanjc@google.com>,
graf@amazon.com, iaslan@amazon.de, pdurrant@amazon.com,
aagch@amazon.com, fandree@amazon.com, hch@infradead.org
Subject: [PATCH v4 04/16] KVM: x86/xen: add KVM_XEN_HVM_SET_ATTR/KVM_XEN_HVM_GET_ATTR
Date: Wed, 6 Jan 2021 00:23:02 +0000 [thread overview]
Message-ID: <20210106002314.328380-5-dwmw2@infradead.org> (raw)
In-Reply-To: <20210106002314.328380-1-dwmw2@infradead.org>
From: Joao Martins <joao.m.martins@oracle.com>
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>
---
arch/x86/kvm/x86.c | 20 ++++++++++++++++++++
arch/x86/kvm/xen.c | 24 ++++++++++++++++++++++++
arch/x86/kvm/xen.h | 2 ++
include/linux/kvm_host.h | 30 +++++++++++++++---------------
include/uapi/linux/kvm.h | 11 +++++++++++
5 files changed, 72 insertions(+), 15 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e391f4dfe457..600d2b64928e 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5618,6 +5618,26 @@ long kvm_arch_vm_ioctl(struct file *filp,
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 503935d8212e..c0b2c67e0235 100644
--- 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 81e12f716d2e..d06b5afcc1f2 100644
--- 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/linux/kvm_host.h b/include/linux/kvm_host.h
index f3b1013fb22c..398ed0c99606 100644
--- 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>
#include <linux/kvm_dirty_ring.h>
@@ -226,21 +241,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 32b59efc2c30..7b5fed0cb2ad 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1583,6 +1583,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;
+
+ union {
+ __u64 pad[4];
+ } u;
+};
+
/* Secure Encrypted Virtualization command */
enum sev_cmd_id {
/* Guest initialization commands */
--
2.29.2
next prev parent reply other threads:[~2021-01-06 0:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 0:22 [PATCH v4 00/16] KVM: Add minimal support for Xen HVM guests David Woodhouse
2021-01-06 0:22 ` [PATCH v4 01/16] KVM: x86/xen: fix Xen hypercall page msr handling David Woodhouse
2021-01-06 0:23 ` [PATCH v4 02/16] KVM: x86/xen: intercept xen hypercalls if enabled David Woodhouse
2021-01-06 0:23 ` [PATCH v4 03/16] KVM: x86/xen: Fix coexistence of Xen and Hyper-V hypercalls David Woodhouse
2021-01-06 0:23 ` David Woodhouse [this message]
2021-01-06 0:23 ` [PATCH v4 05/16] KVM: x86/xen: latch long_mode when hypercall page is set up David Woodhouse
2021-01-06 0:23 ` [PATCH v4 06/16] KVM: x86/xen: add definitions of compat_shared_info, compat_vcpu_info David Woodhouse
2021-01-06 0:23 ` [PATCH v4 07/16] KVM: x86/xen: register shared_info page David Woodhouse
2021-01-06 0:23 ` [PATCH v4 08/16] xen: add wc_sec_hi to struct shared_info David Woodhouse
2021-01-06 0:23 ` [PATCH v4 09/16] KVM: x86/xen: update wallclock region David Woodhouse
2021-01-06 0:23 ` [PATCH v4 10/16] KVM: x86/xen: register vcpu info David Woodhouse
2021-01-06 0:23 ` [PATCH v4 11/16] KVM: x86/xen: setup pvclock updates David Woodhouse
2021-01-06 0:23 ` [PATCH v4 12/16] KVM: x86/xen: register vcpu time info region David Woodhouse
2021-01-06 0:23 ` [PATCH v4 13/16] KVM: x86/xen: register runstate info David Woodhouse
2021-01-06 0:23 ` [PATCH v4 14/16] KVM: x86: declare Xen HVM shared info capability and add test case David Woodhouse
2021-01-06 0:23 ` [PATCH v4 15/16] KVM: Add documentation for Xen hypercall and shared_info updates David Woodhouse
2021-01-06 0:23 ` [PATCH v4 16/16] KVM: x86/xen: Add event channel interrupt vector upcall David Woodhouse
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=20210106002314.328380-5-dwmw2@infradead.org \
--to=dwmw2@infradead.org \
--cc=aagch@amazon.com \
--cc=ankur.a.arora@oracle.com \
--cc=boris.ostrovsky@oracle.com \
--cc=fandree@amazon.com \
--cc=graf@amazon.com \
--cc=hch@infradead.org \
--cc=iaslan@amazon.de \
--cc=joao.m.martins@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=pdurrant@amazon.com \
--cc=seanjc@google.com \
/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).