| Message ID | 20230201143148.1744093-40-dwmw2@infradead.org |
|---|---|
| State | New |
| Headers | show |
| Series | Xen HVM support under KVM | expand |
On 01/02/2023 14:31, David Woodhouse wrote: > From: Joao Martins <joao.m.martins@oracle.com> > > Specifically add listing, injection of event channels. > > Signed-off-by: Joao Martins <joao.m.martins@oracle.com> > Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> > Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > hmp-commands.hx | 29 +++++++++ > hw/i386/kvm/xen_evtchn.c | 137 +++++++++++++++++++++++++++++++++++++++ > include/monitor/hmp.h | 2 + > qapi/misc-target.json | 116 +++++++++++++++++++++++++++++++++ > 4 files changed, 284 insertions(+) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 673e39a697..fd77c432c0 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1815,3 +1815,32 @@ SRST > Dump the FDT in dtb format to *filename*. > ERST > #endif > + > +#if defined(CONFIG_XEN_EMU) > + { > + .name = "xen-event-inject", > + .args_type = "port:i", > + .params = "port", > + .help = "inject event channel", > + .cmd = hmp_xen_event_inject, > + }, > + > +SRST > +``xen-event-inject`` *port* > + Notify guest via event channel on port *port*. > +ERST > + > + > + { > + .name = "xen-event-list", > + .args_type = "", > + .params = "", > + .help = "list event channel state", > + .cmd = hmp_xen_event_list, > + }, > + > +SRST > +``xen-event-list`` > + List event channels in the guest > +ERST > +#endif > diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c > index 9b1fb47e85..fa54d185cd 100644 > --- a/hw/i386/kvm/xen_evtchn.c > +++ b/hw/i386/kvm/xen_evtchn.c > @@ -15,7 +15,11 @@ > #include "qemu/lockable.h" > #include "qemu/main-loop.h" > #include "qemu/log.h" > +#include "monitor/monitor.h" > +#include "monitor/hmp.h" > #include "qapi/error.h" > +#include "qapi/qapi-commands-misc-target.h" > +#include "qapi/qmp/qdict.h" > #include "qom/object.h" > #include "exec/target_page.h" > #include "exec/address-spaces.h" > @@ -1067,3 +1071,136 @@ int xen_evtchn_send_op(struct evtchn_send *send) > return ret; > } > > +EvtchnInfoList *qmp_xen_event_list(Error **errp) > +{ > + XenEvtchnState *s = xen_evtchn_singleton; > + EvtchnInfoList *head = NULL, **tail = &head; > + void *shinfo, *pending, *mask; > + int i; > + > + if (!s) { > + error_setg(errp, "Xen event channel emulation not enabled"); > + return NULL; > + } > + > + shinfo = xen_overlay_get_shinfo_ptr(); > + if (!shinfo) { > + error_setg(errp, "Xen shared info page not allocated"); > + return NULL; > + } > + > + if (xen_is_long_mode()) { > + pending = shinfo + offsetof(struct shared_info, evtchn_pending); > + mask = shinfo + offsetof(struct shared_info, evtchn_mask); > + } else { > + pending = shinfo + offsetof(struct compat_shared_info, evtchn_pending); > + mask = shinfo + offsetof(struct compat_shared_info, evtchn_mask); > + } > + > + QEMU_LOCK_GUARD(&s->port_lock); > + > + for (i = 0; i < s->nr_ports; i++) { > + XenEvtchnPort *p = &s->port_table[i]; > + EvtchnInfo *info; > + > + if (p->type == EVTCHNSTAT_closed) { > + continue; > + } > + > + info = g_new0(EvtchnInfo, 1); > + > + info->port = i; > + qemu_build_assert(EVTCHN_PORT_TYPE_CLOSED == EVTCHNSTAT_closed); > + qemu_build_assert(EVTCHN_PORT_TYPE_UNBOUND == EVTCHNSTAT_unbound); > + qemu_build_assert(EVTCHN_PORT_TYPE_INTERDOMAIN == EVTCHNSTAT_interdomain); > + qemu_build_assert(EVTCHN_PORT_TYPE_PIRQ == EVTCHNSTAT_pirq); > + qemu_build_assert(EVTCHN_PORT_TYPE_VIRQ == EVTCHNSTAT_virq); > + qemu_build_assert(EVTCHN_PORT_TYPE_IPI == EVTCHNSTAT_ipi); > + > + info->type = p->type; > + if (p->type == EVTCHNSTAT_interdomain) { > + info->remote_domain = g_strdup((p->type_val & PORT_INFO_TYPEVAL_REMOTE_QEMU) ? > + "qemu" : "loopback"); > + info->target = p->type_val & PORT_INFO_TYPEVAL_REMOTE_PORT_MASK; > + } else { > + info->target = p->type_val; > + } Given that this patch only provides a command to inject an event on a specific port, I think it's be useful to have the target field report the type of a VIRQ. PV drivers often hook VIRQ_DEBUG for dumping debug info, so knowing which of the VIRQ ports that is would be useful. Paul > + info->vcpu = p->vcpu; > + info->pending = test_bit(i, pending); > + info->masked = test_bit(i, mask); > + > + QAPI_LIST_APPEND(tail, info); > + } > + > + return head; > +} > + > +void qmp_xen_event_inject(uint32_t port, Error **errp) > +{ > + XenEvtchnState *s = xen_evtchn_singleton; > + > + if (!s) { > + error_setg(errp, "Xen event channel emulation not enabled"); > + return; > + } > + > + if (!valid_port(port)) { > + error_setg(errp, "Invalid port %u", port); > + } > + > + QEMU_LOCK_GUARD(&s->port_lock); > + > + if (set_port_pending(s, port)) { > + error_setg(errp, "Failed to set port %u", port); > + return; > + } > +} > + > +void hmp_xen_event_list(Monitor *mon, const QDict *qdict) > +{ > + EvtchnInfoList *iter, *info_list; > + Error *err = NULL; > + > + info_list = qmp_xen_event_list(&err); > + if (err) { > + hmp_handle_error(mon, err); > + return; > + } > + > + for (iter = info_list; iter; iter = iter->next) { > + EvtchnInfo *info = iter->value; > + > + monitor_printf(mon, "port %4lu: vcpu: %ld %s", info->port, info->vcpu, > + EvtchnPortType_str(info->type)); > + if (info->type != EVTCHN_PORT_TYPE_IPI) { > + monitor_printf(mon, "("); > + if (info->remote_domain) { > + monitor_printf(mon, "%s:", info->remote_domain); > + } > + monitor_printf(mon, "%ld)", info->target); > + } > + if (info->pending) { > + monitor_printf(mon, " PENDING"); > + } > + if (info->masked) { > + monitor_printf(mon, " MASKED"); > + } > + monitor_printf(mon, "\n"); > + } > + > + qapi_free_EvtchnInfoList(info_list); > +} > + > +void hmp_xen_event_inject(Monitor *mon, const QDict *qdict) > +{ > + int port = qdict_get_int(qdict, "port"); > + Error *err = NULL; > + > + qmp_xen_event_inject(port, &err); > + if (err) { > + hmp_handle_error(mon, err); > + } else { > + monitor_printf(mon, "Delivered port %d\n", port); > + } > +} > + > diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h > index 1b3bdcb446..cbc6e9bb91 100644 > --- a/include/monitor/hmp.h > +++ b/include/monitor/hmp.h > @@ -108,6 +108,8 @@ void hmp_virtio_status(Monitor *mon, const QDict *qdict); > void hmp_virtio_queue_status(Monitor *mon, const QDict *qdict); > void hmp_vhost_queue_status(Monitor *mon, const QDict *qdict); > void hmp_virtio_queue_element(Monitor *mon, const QDict *qdict); > +void hmp_xen_event_inject(Monitor *mon, const QDict *qdict); > +void hmp_xen_event_list(Monitor *mon, const QDict *qdict); > void object_add_completion(ReadLineState *rs, int nb_args, const char *str); > void object_del_completion(ReadLineState *rs, int nb_args, const char *str); > void device_add_completion(ReadLineState *rs, int nb_args, const char *str); > diff --git a/qapi/misc-target.json b/qapi/misc-target.json > index 5b6a8e9185..652e6e0b37 100644 > --- a/qapi/misc-target.json > +++ b/qapi/misc-target.json > @@ -380,3 +380,119 @@ > # > ## > { 'command': 'query-sgx-capabilities', 'returns': 'SGXInfo', 'if': 'TARGET_I386' } > + > + > +## > +# @EvtchnPortType: > +# > +# An enumeration of Xen event channel port types. > +# > +# @closed: The port is unused. > +# > +# @unbound: The port is allocated and ready to be bound. > +# > +# @interdomain: The port is connected as an interdomain interrupt. > +# > +# @pirq: The port is bound to a physical IRQ (PIRQ). > +# > +# @virq: The port is bound to a virtual IRQ (VIRQ). > +# > +# @ipi: The post is an inter-processor interrupt (IPI). > +# > +# Since: 8.0.0 > +## > +{ 'enum': 'EvtchnPortType', > + 'data': ['closed', 'unbound', 'interdomain', 'pirq', 'virq', 'ipi'], > + 'if': 'TARGET_I386' } > + > +## > +# @EvtchnInfo: > +# > +# Information about a Xen event channel port > +# > +# @port: the port number > +# > +# @vcpu: target vCPU for this port > +# > +# @type: the port type > +# > +# @remote-domain: remote domain for interdomain ports > +# > +# @target: remote port ID, or virq/pirq number > +# > +# @pending: port is currently active pending delivery > +# > +# @masked: port is masked > +# > +# Since: 8.0.0 > +## > +{ 'struct': 'EvtchnInfo', > + 'data': {'port': 'int', > + 'vcpu': 'int', > + 'type': 'EvtchnPortType', > + 'remote-domain': 'str', > + 'target': 'int', > + 'pending': 'bool', > + 'masked': 'bool'}, > + 'if': 'TARGET_I386' } > + > + > +## > +# @xen-event-list: > +# > +# Query the Xen event channels opened by the guest. > +# > +# Returns: list of open event channel ports. > +# > +# Since: 8.0.0 > +# > +# Example: > +# > +# -> { "execute": "xen-event-list" } > +# <- { "return": [ > +# { > +# "pending": false, > +# "port": 1, > +# "vcpu": 1, > +# "remote-domain": "qemu", > +# "masked": false, > +# "type": "interdomain", > +# "target": 1 > +# }, > +# { > +# "pending": false, > +# "port": 2, > +# "vcpu": 0, > +# "remote-domain": "", > +# "masked": false, > +# "type": "virq", > +# "target": 0 > +# } > +# ] > +# } > +# > +## > +{ 'command': 'xen-event-list', > + 'returns': ['EvtchnInfo'], > + 'if': 'TARGET_I386' } > + > +## > +# @xen-event-inject: > +# > +# Inject a Xen event channel port (interrupt) to the guest. > +# > +# @port: The port number > +# > +# Returns: - Nothing on success. > +# > +# Since: 8.0.0 > +# > +# Example: > +# > +# -> { "execute": "xen-event-inject", "arguments": { "port": 1 } } > +# <- { "return": { } } > +# > +## > +{ 'command': 'xen-event-inject', > + 'data': { 'port': 'uint32' }, > + 'if': 'TARGET_I386' }
On Fri, 2023-02-10 at 14:54 +0000, Paul Durrant wrote: > > Given that this patch only provides a command to inject an event on a > specific port, I think it's be useful to have the target field report > the type of a VIRQ. PV drivers often hook VIRQ_DEBUG for dumping debug > info, so knowing which of the VIRQ ports It's there in type_val, Wary of overengineering I hadn't actually translated it to strings but frankly if you don't know VIRQ_DEBUG is 1 you don't deserve to play... (qemu) xen-event-list port 1: vcpu: 0 interdomain(qemu:2) port 2: vcpu: 0 virq(0) port 3: vcpu: 0 ipi port 4: vcpu: 0 ipi port 5: vcpu: 0 virq(1) port 6: vcpu: 0 ipi port 7: vcpu: 0 ipi MASKED port 8: vcpu: 1 virq(0) port 9: vcpu: 1 ipi port 10: vcpu: 1 ipi port 11: vcpu: 1 virq(1) port 12: vcpu: 1 ipi port 13: vcpu: 1 ipi PENDING MASKED port 14: vcpu: 1 pirq(16) port 15: vcpu: 1 interdomain(qemu:3) port 16: vcpu: 0 pirq(22) port 17: vcpu: 1 pirq(18) port 18: vcpu: 0 pirq(17) port 19: vcpu: 1 pirq(20) port 20: vcpu: 0 pirq(19) (qemu) xen-event-inject 5 Delivered port 5 (qemu) [ 26.555560] [ 26.555560] vcpu 0 [ 26.555560] [ 26.555592] 0: masked=0 pending=0 event_sel 0000000000000000 [ 26.555592] [ 26.556526] 1: masked=0 pending=0 event_sel 0000000000000000 [ 26.556526] [ 26.557537] [ 26.557537] pending: [ 26.557537] [ 26.558514] 0000000000000000 [ 26.559242] 0000000000000000 ...
On 10/02/2023 15:05, David Woodhouse wrote: > On Fri, 2023-02-10 at 14:54 +0000, Paul Durrant wrote: >> >> Given that this patch only provides a command to inject an event on a >> specific port, I think it's be useful to have the target field report >> the type of a VIRQ. PV drivers often hook VIRQ_DEBUG for dumping debug >> info, so knowing which of the VIRQ ports > > It's there in type_val, Wary of overengineering I hadn't actually > translated it to strings but frankly if you don't know VIRQ_DEBUG is 1 > you don't deserve to play... > Ah, it's already in there... good. And indeed a number is all that's needed. In which case... Reviewed-by: Paul Durrant <paul@xen.org>
diff --git a/hmp-commands.hx b/hmp-commands.hx index 673e39a697..fd77c432c0 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1815,3 +1815,32 @@ SRST Dump the FDT in dtb format to *filename*. ERST #endif + +#if defined(CONFIG_XEN_EMU) + { + .name = "xen-event-inject", + .args_type = "port:i", + .params = "port", + .help = "inject event channel", + .cmd = hmp_xen_event_inject, + }, + +SRST +``xen-event-inject`` *port* + Notify guest via event channel on port *port*. +ERST + + + { + .name = "xen-event-list", + .args_type = "", + .params = "", + .help = "list event channel state", + .cmd = hmp_xen_event_list, + }, + +SRST +``xen-event-list`` + List event channels in the guest +ERST +#endif diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c index 9b1fb47e85..fa54d185cd 100644 --- a/hw/i386/kvm/xen_evtchn.c +++ b/hw/i386/kvm/xen_evtchn.c @@ -15,7 +15,11 @@ #include "qemu/lockable.h" #include "qemu/main-loop.h" #include "qemu/log.h" +#include "monitor/monitor.h" +#include "monitor/hmp.h" #include "qapi/error.h" +#include "qapi/qapi-commands-misc-target.h" +#include "qapi/qmp/qdict.h" #include "qom/object.h" #include "exec/target_page.h" #include "exec/address-spaces.h" @@ -1067,3 +1071,136 @@ int xen_evtchn_send_op(struct evtchn_send *send) return ret; } +EvtchnInfoList *qmp_xen_event_list(Error **errp) +{ + XenEvtchnState *s = xen_evtchn_singleton; + EvtchnInfoList *head = NULL, **tail = &head; + void *shinfo, *pending, *mask; + int i; + + if (!s) { + error_setg(errp, "Xen event channel emulation not enabled"); + return NULL; + } + + shinfo = xen_overlay_get_shinfo_ptr(); + if (!shinfo) { + error_setg(errp, "Xen shared info page not allocated"); + return NULL; + } + + if (xen_is_long_mode()) { + pending = shinfo + offsetof(struct shared_info, evtchn_pending); + mask = shinfo + offsetof(struct shared_info, evtchn_mask); + } else { + pending = shinfo + offsetof(struct compat_shared_info, evtchn_pending); + mask = shinfo + offsetof(struct compat_shared_info, evtchn_mask); + } + + QEMU_LOCK_GUARD(&s->port_lock); + + for (i = 0; i < s->nr_ports; i++) { + XenEvtchnPort *p = &s->port_table[i]; + EvtchnInfo *info; + + if (p->type == EVTCHNSTAT_closed) { + continue; + } + + info = g_new0(EvtchnInfo, 1); + + info->port = i; + qemu_build_assert(EVTCHN_PORT_TYPE_CLOSED == EVTCHNSTAT_closed); + qemu_build_assert(EVTCHN_PORT_TYPE_UNBOUND == EVTCHNSTAT_unbound); + qemu_build_assert(EVTCHN_PORT_TYPE_INTERDOMAIN == EVTCHNSTAT_interdomain); + qemu_build_assert(EVTCHN_PORT_TYPE_PIRQ == EVTCHNSTAT_pirq); + qemu_build_assert(EVTCHN_PORT_TYPE_VIRQ == EVTCHNSTAT_virq); + qemu_build_assert(EVTCHN_PORT_TYPE_IPI == EVTCHNSTAT_ipi); + + info->type = p->type; + if (p->type == EVTCHNSTAT_interdomain) { + info->remote_domain = g_strdup((p->type_val & PORT_INFO_TYPEVAL_REMOTE_QEMU) ? + "qemu" : "loopback"); + info->target = p->type_val & PORT_INFO_TYPEVAL_REMOTE_PORT_MASK; + } else { + info->target = p->type_val; + } + info->vcpu = p->vcpu; + info->pending = test_bit(i, pending); + info->masked = test_bit(i, mask); + + QAPI_LIST_APPEND(tail, info); + } + + return head; +} + +void qmp_xen_event_inject(uint32_t port, Error **errp) +{ + XenEvtchnState *s = xen_evtchn_singleton; + + if (!s) { + error_setg(errp, "Xen event channel emulation not enabled"); + return; + } + + if (!valid_port(port)) { + error_setg(errp, "Invalid port %u", port); + } + + QEMU_LOCK_GUARD(&s->port_lock); + + if (set_port_pending(s, port)) { + error_setg(errp, "Failed to set port %u", port); + return; + } +} + +void hmp_xen_event_list(Monitor *mon, const QDict *qdict) +{ + EvtchnInfoList *iter, *info_list; + Error *err = NULL; + + info_list = qmp_xen_event_list(&err); + if (err) { + hmp_handle_error(mon, err); + return; + } + + for (iter = info_list; iter; iter = iter->next) { + EvtchnInfo *info = iter->value; + + monitor_printf(mon, "port %4lu: vcpu: %ld %s", info->port, info->vcpu, + EvtchnPortType_str(info->type)); + if (info->type != EVTCHN_PORT_TYPE_IPI) { + monitor_printf(mon, "("); + if (info->remote_domain) { + monitor_printf(mon, "%s:", info->remote_domain); + } + monitor_printf(mon, "%ld)", info->target); + } + if (info->pending) { + monitor_printf(mon, " PENDING"); + } + if (info->masked) { + monitor_printf(mon, " MASKED"); + } + monitor_printf(mon, "\n"); + } + + qapi_free_EvtchnInfoList(info_list); +} + +void hmp_xen_event_inject(Monitor *mon, const QDict *qdict) +{ + int port = qdict_get_int(qdict, "port"); + Error *err = NULL; + + qmp_xen_event_inject(port, &err); + if (err) { + hmp_handle_error(mon, err); + } else { + monitor_printf(mon, "Delivered port %d\n", port); + } +} + diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 1b3bdcb446..cbc6e9bb91 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -108,6 +108,8 @@ void hmp_virtio_status(Monitor *mon, const QDict *qdict); void hmp_virtio_queue_status(Monitor *mon, const QDict *qdict); void hmp_vhost_queue_status(Monitor *mon, const QDict *qdict); void hmp_virtio_queue_element(Monitor *mon, const QDict *qdict); +void hmp_xen_event_inject(Monitor *mon, const QDict *qdict); +void hmp_xen_event_list(Monitor *mon, const QDict *qdict); void object_add_completion(ReadLineState *rs, int nb_args, const char *str); void object_del_completion(ReadLineState *rs, int nb_args, const char *str); void device_add_completion(ReadLineState *rs, int nb_args, const char *str); diff --git a/qapi/misc-target.json b/qapi/misc-target.json index 5b6a8e9185..652e6e0b37 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -380,3 +380,119 @@ # ## { 'command': 'query-sgx-capabilities', 'returns': 'SGXInfo', 'if': 'TARGET_I386' } + + +## +# @EvtchnPortType: +# +# An enumeration of Xen event channel port types. +# +# @closed: The port is unused. +# +# @unbound: The port is allocated and ready to be bound. +# +# @interdomain: The port is connected as an interdomain interrupt. +# +# @pirq: The port is bound to a physical IRQ (PIRQ). +# +# @virq: The port is bound to a virtual IRQ (VIRQ). +# +# @ipi: The post is an inter-processor interrupt (IPI). +# +# Since: 8.0.0 +## +{ 'enum': 'EvtchnPortType', + 'data': ['closed', 'unbound', 'interdomain', 'pirq', 'virq', 'ipi'], + 'if': 'TARGET_I386' } + +## +# @EvtchnInfo: +# +# Information about a Xen event channel port +# +# @port: the port number +# +# @vcpu: target vCPU for this port +# +# @type: the port type +# +# @remote-domain: remote domain for interdomain ports +# +# @target: remote port ID, or virq/pirq number +# +# @pending: port is currently active pending delivery +# +# @masked: port is masked +# +# Since: 8.0.0 +## +{ 'struct': 'EvtchnInfo', + 'data': {'port': 'int', + 'vcpu': 'int', + 'type': 'EvtchnPortType', + 'remote-domain': 'str', + 'target': 'int', + 'pending': 'bool', + 'masked': 'bool'}, + 'if': 'TARGET_I386' } + + +## +# @xen-event-list: +# +# Query the Xen event channels opened by the guest. +# +# Returns: list of open event channel ports. +# +# Since: 8.0.0 +# +# Example: +# +# -> { "execute": "xen-event-list" } +# <- { "return": [ +# { +# "pending": false, +# "port": 1, +# "vcpu": 1, +# "remote-domain": "qemu", +# "masked": false, +# "type": "interdomain", +# "target": 1 +# }, +# { +# "pending": false, +# "port": 2, +# "vcpu": 0, +# "remote-domain": "", +# "masked": false, +# "type": "virq", +# "target": 0 +# } +# ] +# } +# +## +{ 'command': 'xen-event-list', + 'returns': ['EvtchnInfo'], + 'if': 'TARGET_I386' } + +## +# @xen-event-inject: +# +# Inject a Xen event channel port (interrupt) to the guest. +# +# @port: The port number +# +# Returns: - Nothing on success. +# +# Since: 8.0.0 +# +# Example: +# +# -> { "execute": "xen-event-inject", "arguments": { "port": 1 } } +# <- { "return": { } } +# +## +{ 'command': 'xen-event-inject', + 'data': { 'port': 'uint32' }, + 'if': 'TARGET_I386' }