From: David Woodhouse <dwmw2@infradead.org>
To: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: qemu-devel@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Paul Durrant" <paul@xen.org>,
"Joao Martins" <joao.m.martins@oracle.com>,
"Ankur Arora" <ankur.a.arora@oracle.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Juan Quintela" <quintela@redhat.com>,
"Claudio Fontana" <cfontana@suse.de>,
"Julien Grall" <julien@xen.org>
Subject: Re: [RFC PATCH v5 51/52] hw/xen: Add xen_xenstore device for xenstore emulation
Date: Wed, 04 Jan 2023 14:35:30 +0000 [thread overview]
Message-ID: <775B5623-223F-4CF7-96CB-C1C7AF1082AD@infradead.org> (raw)
In-Reply-To: <Y7VqsgBgK5XYkvzE@work-vm>
On 4 January 2023 12:01:54 GMT, "Dr. David Alan Gilbert" <dgilbert@redhat.com> wrote:
>* David Woodhouse (dwmw2@infradead.org) wrote:
>> From: David Woodhouse <dwmw@amazon.co.uk>
>>
>> The hookup to event channel is a bit of a special case hack right now; as
>> we make this work for real PV driver back ends, that will be implemented
>> for the general case of Dom0 ports binding to DomU.
>>
>> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
>> ---
>> hw/i386/kvm/meson.build | 1 +
>> hw/i386/kvm/xen_evtchn.c | 1 +
>> hw/i386/kvm/xen_xenstore.c | 248 +++++++++++++++++++++++++++++++++++++
>> hw/i386/kvm/xen_xenstore.h | 20 +++
>> hw/i386/pc.c | 2 +
>> target/i386/kvm/xen-emu.c | 12 ++
>> 6 files changed, 284 insertions(+)
>> create mode 100644 hw/i386/kvm/xen_xenstore.c
>> create mode 100644 hw/i386/kvm/xen_xenstore.h
>>
>> diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build
>> index e02449e4d4..6d6981fced 100644
>> --- a/hw/i386/kvm/meson.build
>> +++ b/hw/i386/kvm/meson.build
>> @@ -8,6 +8,7 @@ i386_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files(
>> 'xen_overlay.c',
>> 'xen_evtchn.c',
>> 'xen_gnttab.c',
>> + 'xen_xenstore.c',
>> ))
>>
>> i386_ss.add_all(when: 'CONFIG_KVM', if_true: i386_kvm_ss)
>> diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
>> index c0f6ef9dff..0653cad3bb 100644
>> --- a/hw/i386/kvm/xen_evtchn.c
>> +++ b/hw/i386/kvm/xen_evtchn.c
>> @@ -31,6 +31,7 @@
>>
>> #include "xen_evtchn.h"
>> #include "xen_overlay.h"
>> +#include "xen_xenstore.h"
>>
>> #include "sysemu/kvm.h"
>> #include "sysemu/kvm_xen.h"
>> diff --git a/hw/i386/kvm/xen_xenstore.c b/hw/i386/kvm/xen_xenstore.c
>> new file mode 100644
>> index 0000000000..63530059fa
>> --- /dev/null
>> +++ b/hw/i386/kvm/xen_xenstore.c
>> @@ -0,0 +1,248 @@
>> +/*
>> + * QEMU Xen emulation: Shared/overlay pages support
>> + *
>> + * Copyright © 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
>> + *
>> + * Authors: David Woodhouse <dwmw2@infradead.org>
>> + *
>> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
>> + * See the COPYING file in the top-level directory.
>> + */
>> +
>> +#include "qemu/osdep.h"
>> +
>> +#include "qemu/host-utils.h"
>> +#include "qemu/module.h"
>> +#include "qemu/main-loop.h"
>> +#include "qemu/cutils.h"
>> +#include "qapi/error.h"
>> +#include "qom/object.h"
>> +#include "migration/vmstate.h"
>> +
>> +#include "hw/sysbus.h"
>> +#include "hw/xen/xen.h"
>> +#include "xen_overlay.h"
>> +#include "xen_evtchn.h"
>> +#include "xen_xenstore.h"
>> +
>> +#include "sysemu/kvm.h"
>> +#include "sysemu/kvm_xen.h"
>> +
>> +#include "standard-headers/xen/io/xs_wire.h"
>> +#include "standard-headers/xen/event_channel.h"
>> +
>> +#define TYPE_XEN_XENSTORE "xen-xenstore"
>> +OBJECT_DECLARE_SIMPLE_TYPE(XenXenstoreState, XEN_XENSTORE)
>> +
>> +#define XEN_PAGE_SHIFT 12
>> +#define XEN_PAGE_SIZE (1ULL << XEN_PAGE_SHIFT)
>> +
>> +#define ENTRIES_PER_FRAME_V1 (XEN_PAGE_SIZE / sizeof(grant_entry_v1_t))
>> +#define ENTRIES_PER_FRAME_V2 (XEN_PAGE_SIZE / sizeof(grant_entry_v2_t))
>> +
>> +#define XENSTORE_HEADER_SIZE ((unsigned int)sizeof(struct xsd_sockmsg))
>> +
>> +struct XenXenstoreState {
>> + /*< private >*/
>> + SysBusDevice busdev;
>> + /*< public >*/
>> +
>> + MemoryRegion xenstore_page;
>> + struct xenstore_domain_interface *xs;
>> + uint8_t req_data[XENSTORE_HEADER_SIZE + XENSTORE_PAYLOAD_MAX];
>> + uint8_t rsp_data[XENSTORE_HEADER_SIZE + XENSTORE_PAYLOAD_MAX];
>> + uint32_t req_offset;
>> + uint32_t rsp_offset;
>> + bool rsp_pending;
>> + bool fatal_error;
>> +
>> + evtchn_port_t guest_port;
>> + evtchn_port_t be_port;
>> + struct xenevtchn_handle *eh;
>> +};
>> +
>> +struct XenXenstoreState *xen_xenstore_singleton;
>> +
>> +static void xen_xenstore_event(void *opaque);
>> +
>> +static void xen_xenstore_realize(DeviceState *dev, Error **errp)
>> +{
>> + XenXenstoreState *s = XEN_XENSTORE(dev);
>> +
>> + if (xen_mode != XEN_EMULATE) {
>> + error_setg(errp, "Xen xenstore support is for Xen emulation");
>> + return;
>> + }
>> + memory_region_init_ram(&s->xenstore_page, OBJECT(dev), "xen:xenstore_page",
>> + XEN_PAGE_SIZE, &error_abort);
>> + memory_region_set_enabled(&s->xenstore_page, true);
>> + s->xs = memory_region_get_ram_ptr(&s->xenstore_page);
>> + memset(s->xs, 0, XEN_PAGE_SIZE);
>> +
>> + /* We can't map it this early as KVM isn't ready */
>> + xen_xenstore_singleton = s;
>> +
>> + s->eh = xen_be_evtchn_open(NULL, 0);
>> + if (!s->eh) {
>> + error_setg(errp, "Xenstore evtchn port init failed");
>> + return;
>> + }
>> + aio_set_fd_handler(qemu_get_aio_context(), xen_be_evtchn_fd(s->eh), true,
>> + xen_xenstore_event, NULL, NULL, NULL, s);
>> +}
>> +
>> +static bool xen_xenstore_is_needed(void *opaque)
>> +{
>> + return xen_mode == XEN_EMULATE;
>> +}
>> +
>> +static int xen_xenstore_pre_save(void *opaque)
>> +{
>> + XenXenstoreState *s = opaque;
>> +
>> + if (s->eh) {
>> + s->guest_port = xen_be_evtchn_get_guest_port(s->eh);
>> + }
>> + return 0;
>> +}
>> +
>> +static int xen_xenstore_post_load(void *opaque, int ver)
>> +{
>> + XenXenstoreState *s = opaque;
>> +
>> + /*
>> + * As qemu/dom0, rebind to the guest's port. The Windows drivers may
>> + * unbind the XenStore evtchn and rebind to it, having obtained the
>> + * "remote" port through EVTCHNOP_status. In the case that migration
>> + * occurs while it's unbound, the "remote" port needs to be the same
>> + * as before so that the guest can find it, but should remain unbound.
>> + */
>> + if (s->guest_port) {
>> + int be_port = xen_be_evtchn_bind_interdomain(s->eh, xen_domid, s->guest_port);
>> + if (be_port < 0) {
>> + return be_port;
>> + }
>> + s->be_port = be_port;
>> + }
>> + return 0;
>> +}
>> +
>> +static const VMStateDescription xen_xenstore_vmstate = {
>> + .name = "xen_xenstore",
>> + .version_id = 1,
>> + .minimum_version_id = 1,
>> + .needed = xen_xenstore_is_needed,
>> + .pre_save = xen_xenstore_pre_save,
>> + .post_load = xen_xenstore_post_load,
>> + .fields = (VMStateField[]) {
>> + VMSTATE_UINT8_ARRAY(req_data, XenXenstoreState, sizeof_field(XenXenstoreState, req_data)),
>> + VMSTATE_UINT8_ARRAY(rsp_data, XenXenstoreState, sizeof_field(XenXenstoreState, rsp_data)),
>> + VMSTATE_UINT32(req_offset, XenXenstoreState),
>> + VMSTATE_UINT32(rsp_offset, XenXenstoreState),
>> + VMSTATE_BOOL(rsp_pending, XenXenstoreState),
>> + VMSTATE_UINT32(guest_port, XenXenstoreState),
>> + VMSTATE_BOOL(fatal_error, XenXenstoreState),
>> + VMSTATE_END_OF_LIST()
>> + }
>> +};
>> +
>> +static void xen_xenstore_class_init(ObjectClass *klass, void *data)
>> +{
>> + DeviceClass *dc = DEVICE_CLASS(klass);
>> +
>> + dc->realize = xen_xenstore_realize;
>> + dc->vmsd = &xen_xenstore_vmstate;
>> +}
>> +
>> +static const TypeInfo xen_xenstore_info = {
>> + .name = TYPE_XEN_XENSTORE,
>> + .parent = TYPE_SYS_BUS_DEVICE,
>> + .instance_size = sizeof(XenXenstoreState),
>> + .class_init = xen_xenstore_class_init,
>> +};
>> +
>> +void xen_xenstore_create(void)
>> +{
>> + xen_xenstore_singleton = XEN_XENSTORE(sysbus_create_simple(TYPE_XEN_XENSTORE,
>> + -1, NULL));
>> +
>> + /*
>> + * Defer the init (xen_xenstore_reset()) until KVM is set up and the
>> + * overlay page can be mapped.
>> + */
>> +}
>> +
>> +static void xen_xenstore_register_types(void)
>> +{
>> + type_register_static(&xen_xenstore_info);
>> +}
>> +
>> +type_init(xen_xenstore_register_types)
>> +
>> +uint16_t xen_xenstore_get_port(void)
>> +{
>> + XenXenstoreState *s = xen_xenstore_singleton;
>> + if (!s) {
>> + return 0;
>> + }
>> + return s->guest_port;
>> +}
>> +
>> +static void xen_xenstore_event(void *opaque)
>> +{
>> + XenXenstoreState *s = opaque;
>> + evtchn_port_t port = xen_be_evtchn_pending(s->eh);
>> + if (port != s->be_port) {
>> + return;
>> + }
>> + printf("xenstore event\n");
>> + /* We know this is a no-op. */
>> + xen_be_evtchn_unmask(s->eh, port);
>> + qemu_hexdump(stdout, "", s->xs, sizeof(*s->xs));
>
>debug ?
Perhaps, but it goes away in the next patch anyway, and Paul is working on something that actually works (instead of just returning ENOSYS to everything).
next prev parent reply other threads:[~2023-01-04 14:36 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-30 12:11 [RFC PATCH v5 00/52] Xen support under KVM David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 01/52] include: import Xen public headers to include/standard-headers/ David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 02/52] xen: add CONFIG_XENFV_MACHINE and CONFIG_XEN_EMU options for Xen emulation David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 03/52] xen: Add XEN_DISABLED mode and make it default David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 04/52] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 05/52] i386/kvm: handle Xen HVM cpuid leaves David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 06/52] i386/hvm: Set Xen vCPU ID in KVM David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 07/52] xen-platform: exclude vfio-pci from the PCI platform unplug David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 08/52] xen-platform: allow its creation with XEN_EMULATE mode David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 09/52] hw/xen_backend: refactor xen_be_init() David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 10/52] i386/xen: handle guest hypercalls David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 11/52] i386/xen: implement HYPERVISOR_xen_version David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 12/52] i386/xen: implement HYPERVISOR_sched_op, SCHEDOP_shutdown David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 13/52] i386/xen: Implement SCHEDOP_poll and SCHEDOP_yield David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 14/52] hw/xen: Add xen_overlay device for emulating shared xenheap pages David Woodhouse
2023-01-03 17:54 ` Dr. David Alan Gilbert
2022-12-30 12:11 ` [RFC PATCH v5 15/52] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode David Woodhouse
2022-12-30 12:11 ` [RFC PATCH v5 16/52] i386/xen: manage and save/restore Xen guest long_mode setting David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 17/52] i386/xen: implement HYPERVISOR_memory_op David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 18/52] i386/xen: implement XENMEM_add_to_physmap_batch David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 19/52] i386/xen: implement HYPERVISOR_hvm_op David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 20/52] i386/xen: implement HYPERVISOR_vcpu_op David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 21/52] i386/xen: handle VCPUOP_register_vcpu_info David Woodhouse
2023-01-03 18:13 ` Dr. David Alan Gilbert
2022-12-30 12:12 ` [RFC PATCH v5 22/52] i386/xen: handle VCPUOP_register_vcpu_time_info David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 23/52] i386/xen: handle VCPUOP_register_runstate_memory_area David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 24/52] i386/xen: implement HYPERVISOR_event_channel_op David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 25/52] i386/xen: implement HVMOP_set_evtchn_upcall_vector David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 26/52] i386/xen: implement HVMOP_set_param David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 27/52] hw/xen: Add xen_evtchn device for event channel emulation David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 28/52] i386/xen: Add support for Xen event channel delivery to vCPU David Woodhouse
2023-01-09 21:18 ` David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 29/52] hw/xen: Implement EVTCHNOP_status David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 30/52] hw/xen: Implement EVTCHNOP_close David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 31/52] hw/xen: Implement EVTCHNOP_unmask David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 32/52] hw/xen: Implement EVTCHNOP_bind_virq David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 33/52] hw/xen: Implement EVTCHNOP_bind_ipi David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 34/52] hw/xen: Implement EVTCHNOP_send David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 35/52] hw/xen: Implement EVTCHNOP_alloc_unbound David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 36/52] hw/xen: Implement EVTCHNOP_bind_interdomain David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 37/52] hw/xen: Implement EVTCHNOP_bind_vcpu David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 38/52] hw/xen: Implement EVTCHNOP_reset David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 39/52] i386/xen: add monitor commands to test event injection David Woodhouse
2023-01-04 12:48 ` Dr. David Alan Gilbert
2023-01-05 19:42 ` David Woodhouse
2023-01-05 20:09 ` Dr. David Alan Gilbert
2023-01-09 17:24 ` David Woodhouse
2023-01-09 18:51 ` Dr. David Alan Gilbert
2023-01-09 19:49 ` David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 40/52] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_GSI callback David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 41/52] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 42/52] kvm/i386: Add xen-gnttab-max-frames property David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 43/52] hw/xen: Add xen_gnttab device for grant table emulation David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 44/52] hw/xen: Support mapping grant frames David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 45/52] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 46/52] hw/xen: Implement GNTTABOP_query_size David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 47/52] i386/xen: handle PV timer hypercalls David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 48/52] i386/xen: Reserve Xen special pages for console, xenstore rings David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 49/52] i386/xen: handle HVMOP_get_param David Woodhouse
2022-12-30 12:12 ` [RFC PATCH v5 50/52] hw/xen: Add backend implementation of interdomain event channel support David Woodhouse
2023-01-04 11:22 ` Dr. David Alan Gilbert
2023-01-04 14:33 ` David Woodhouse
2023-01-04 11:52 ` Dr. David Alan Gilbert
2022-12-30 12:12 ` [RFC PATCH v5 51/52] hw/xen: Add xen_xenstore device for xenstore emulation David Woodhouse
2023-01-04 12:01 ` Dr. David Alan Gilbert
2023-01-04 14:35 ` David Woodhouse [this message]
2022-12-30 12:12 ` [RFC PATCH v5 52/52] hw/xen: Add basic ring handling to xenstore 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=775B5623-223F-4CF7-96CB-C1C7AF1082AD@infradead.org \
--to=dwmw2@infradead.org \
--cc=alex.bennee@linaro.org \
--cc=ankur.a.arora@oracle.com \
--cc=cfontana@suse.de \
--cc=dgilbert@redhat.com \
--cc=joao.m.martins@oracle.com \
--cc=julien@xen.org \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=thuth@redhat.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).