From: David Woodhouse <dwmw2@infradead.org>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>, Paul Durrant <paul@xen.org>,
Joao Martins <joao.m.martins@oracle.com>,
Ankur Arora <ankur.a.arora@oracle.com>
Subject: [RFC PATCH 16/21] i386/xen: handle register_vcpu_time_memory_area
Date: Mon, 5 Dec 2022 17:31:32 +0000 [thread overview]
Message-ID: <20221205173137.607044-17-dwmw2@infradead.org> (raw)
In-Reply-To: <20221205173137.607044-1-dwmw2@infradead.org>
From: Joao Martins <joao.m.martins@oracle.com>
In order to support Linux vdso in Xen.
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
target/i386/xen.c | 36 +++++++++++++++++++++++++++++++++---
1 file changed, 33 insertions(+), 3 deletions(-)
diff --git a/target/i386/xen.c b/target/i386/xen.c
index 59aca2ad19..1def526e08 100644
--- a/target/i386/xen.c
+++ b/target/i386/xen.c
@@ -43,17 +43,22 @@ static void *gpa_to_hva(uint64_t gpa)
mrs.offset_within_region);
}
-static void *gva_to_hva(CPUState *cs, uint64_t gva)
+static uint64_t gva_to_gpa(CPUState *cs, uint64_t gva)
{
struct kvm_translation t = { .linear_address = gva };
int err;
err = kvm_vcpu_ioctl(cs, KVM_TRANSLATE, &t);
if (err || !t.valid) {
- return NULL;
+ return 0;
}
- return gpa_to_hva(t.physical_address);
+ return t.physical_address;
+}
+
+static void *gva_to_hva(CPUState *cs, uint64_t gva)
+{
+ return gpa_to_hva(gva_to_gpa(cs, gva));
}
int kvm_xen_init(KVMState *s, uint32_t xen_version)
@@ -244,6 +249,27 @@ static int vcpuop_register_vcpu_info(CPUState *cs, CPUState *target,
return xen_set_vcpu_attr(target, KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO, gpa);
}
+static int vcpuop_register_vcpu_time_info(CPUState *cs, CPUState *target,
+ uint64_t arg)
+{
+ struct vcpu_register_time_memory_area *tma;
+ uint64_t gpa;
+ void *hva;
+
+ tma = gva_to_hva(cs, arg);
+ if (!tma) {
+ return -EFAULT;
+ }
+
+ hva = gva_to_hva(cs, tma->addr.p);
+ if (!hva || !tma->addr.p) {
+ return -EFAULT;
+ }
+
+ gpa = gva_to_gpa(cs, tma->addr.p);
+ return xen_set_vcpu_attr(target, KVM_XEN_VCPU_ATTR_TYPE_VCPU_TIME_INFO, gpa);
+}
+
static int kvm_xen_hcall_vcpu_op(struct kvm_xen_exit *exit, X86CPU *cpu,
int cmd, int vcpu_id, uint64_t arg)
{
@@ -252,6 +278,10 @@ static int kvm_xen_hcall_vcpu_op(struct kvm_xen_exit *exit, X86CPU *cpu,
int err = -ENOSYS;
switch (cmd) {
+ case VCPUOP_register_vcpu_time_memory_area: {
+ err = vcpuop_register_vcpu_time_info(cs, dest, arg);
+ break;
+ }
case VCPUOP_register_vcpu_info: {
err = vcpuop_register_vcpu_info(cs, dest, arg);
break;
--
2.35.3
next prev parent reply other threads:[~2022-12-05 17:38 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-05 17:31 [RFC PATCH 00/21] Xen HVM support under KVM David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 01/21] include: import xen public headers David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 02/21] i386/xen: Add xen-version machine property and init KVM Xen support David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 03/21] i386/kvm: handle Xen HVM cpuid leaves David Woodhouse
2022-12-05 21:58 ` Philippe Mathieu-Daudé
2022-12-06 0:18 ` David Woodhouse
2022-12-06 7:58 ` Philippe Mathieu-Daudé
2022-12-06 8:05 ` David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 04/21] xen-platform-pci: allow its creation with XEN_EMULATE mode David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 05/21] hw/xen_backend: refactor xen_be_init() David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 06/21] pc_piix: handle XEN_EMULATE backend init David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 07/21] xen-platform-pci: register xen-mmio as RAM for XEN_EMULATE David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 08/21] xen_platform: exclude vfio-pci from the PCI platform unplug David Woodhouse
2022-12-05 22:03 ` Philippe Mathieu-Daudé
2022-12-05 17:31 ` [RFC PATCH 09/21] pc_piix: allow xenfv machine with XEN_EMULATE David Woodhouse
2022-12-05 22:06 ` Philippe Mathieu-Daudé
2022-12-06 0:59 ` David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 10/21] i386/xen: handle guest hypercalls David Woodhouse
2022-12-05 22:11 ` Philippe Mathieu-Daudé
2022-12-06 1:10 ` David Woodhouse
2022-12-06 8:16 ` Philippe Mathieu-Daudé
2022-12-06 9:40 ` David Woodhouse
2022-12-06 11:07 ` Philippe Mathieu-Daudé
2022-12-06 11:30 ` David Woodhouse
2022-12-06 10:41 ` Alex Bennée
2022-12-05 17:31 ` [RFC PATCH 11/21] i386/xen: implement HYPERCALL_xen_version David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 12/21] i386/xen: set shared_info page David Woodhouse
2022-12-05 22:17 ` Philippe Mathieu-Daudé
2022-12-06 2:20 ` David Woodhouse
2022-12-06 8:26 ` Philippe Mathieu-Daudé
2022-12-06 10:00 ` Dr. David Alan Gilbert
2022-12-07 11:15 ` David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 13/21] i386/xen: implement HYPERVISOR_hvm_op David Woodhouse
2022-12-05 22:13 ` Philippe Mathieu-Daudé
2022-12-06 1:18 ` David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 14/21] i386/xen: implement HYPERVISOR_vcpu_op David Woodhouse
2022-12-05 22:18 ` Philippe Mathieu-Daudé
2022-12-05 17:31 ` [RFC PATCH 15/21] i386/xen: handle register_vcpu_info David Woodhouse
2022-12-05 17:31 ` David Woodhouse [this message]
2022-12-05 17:31 ` [RFC PATCH 17/21] i386/xen: handle register_runstate_memory_area David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 18/21] kvm/ioapic: mark gsi-2 used in ioapic routing init David Woodhouse
2022-12-05 22:25 ` Philippe Mathieu-Daudé
2022-12-06 1:21 ` David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 19/21] i386/xen: handle event channel upcall related hypercalls David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 20/21] i386/xen: implement HYPERVISOR_event_channel_op David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 21/21] i386/xen: implement HYPERVISOR_sched_op 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=20221205173137.607044-17-dwmw2@infradead.org \
--to=dwmw2@infradead.org \
--cc=ankur.a.arora@oracle.com \
--cc=joao.m.martins@oracle.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.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;
as well as URLs for NNTP newsgroup(s).