From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9E9A4C4167B for ; Fri, 30 Dec 2022 12:27:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBEGh-0000Bq-Jy; Fri, 30 Dec 2022 07:13:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pBEG1-000834-9r for qemu-devel@nongnu.org; Fri, 30 Dec 2022 07:13:05 -0500 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pBEFv-00052O-5v for qemu-devel@nongnu.org; Fri, 30 Dec 2022 07:13:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=semlhnSx67J/zaR/iX+k8r1/nv4ujVXeRUes4DJdIpo=; b=Qm+86UNdLRIHsFlGz3/nnZfIr+ ggBSQJXEJHXym5di6A/sMhjm9GIH13pyESWPnh+mep+xNAduGx+17DliiACvED3jDhFSu7HpFxWMW zyB76bTkGhSh/Br1M/mOvoVqgksW1/JYnjzA12/CQYf7L/ktVx0LbwQGdMsSAh/bsXoBjjU84Xvx0 H71LvtRcsm9YADJh7eiLjkGXVcQGo6cgTbVc2Ah0mRCxPMx8UAtslsEdGDdYvDN/fLmU4YDbLb0cG 9Js7jUXm/yrdNTPhPw6reAWfK+LFFmKW67WGKVFHJdqR/a4hHAvr4nRv3l/JKE0i9t74wxvzyGeSv E6uRO/OA==; Received: from i7.infradead.org ([2001:8b0:10b:1:21e:67ff:fecb:7a92]) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pBEFW-00Gpjk-23; Fri, 30 Dec 2022 12:12:43 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBEFa-005Nyq-8O; Fri, 30 Dec 2022 12:12:38 +0000 From: David Woodhouse To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Paul Durrant , Joao Martins , Ankur Arora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , "Dr . David Alan Gilbert" , Claudio Fontana , Julien Grall Subject: [RFC PATCH v5 39/52] i386/xen: add monitor commands to test event injection Date: Fri, 30 Dec 2022 12:12:22 +0000 Message-Id: <20221230121235.1282915-40-dwmw2@infradead.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221230121235.1282915-1-dwmw2@infradead.org> References: <20221230121235.1282915-1-dwmw2@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by desiato.infradead.org. See http://www.infradead.org/rpr.html Received-SPF: none client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; envelope-from=BATV+3cbd6dee458626289faf+7068+infradead.org+dwmw2@desiato.srs.infradead.org; helo=desiato.infradead.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Joao Martins Specifically add listing, injection of event channels. Signed-off-by: Joao Martins Signed-off-by: David Woodhouse --- hmp-commands.hx | 29 ++++++++++++++ hw/i386/kvm/xen_evtchn.c | 83 ++++++++++++++++++++++++++++++++++++++++ hw/i386/kvm/xen_evtchn.h | 3 ++ monitor/misc.c | 4 ++ 4 files changed, 119 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 cdf7d86da8..87136334f5 100644 --- a/hw/i386/kvm/xen_evtchn.c +++ b/hw/i386/kvm/xen_evtchn.c @@ -19,6 +19,8 @@ #include "exec/target_page.h" #include "exec/address-spaces.h" #include "migration/vmstate.h" +#include "monitor/monitor.h" +#include "qapi/qmp/qdict.h" #include "hw/sysbus.h" #include "hw/xen/xen.h" @@ -1061,3 +1063,84 @@ int xen_evtchn_send_op(struct evtchn_send *send) return ret; } +static const char *type_names[] = { + "closed", + "unbound", + "interdomain", + "pirq", + "virq", + "ipi" +}; + +void hmp_xen_event_list(Monitor *mon, const QDict *qdict) +{ + XenEvtchnState *s = xen_evtchn_singleton; + void *shinfo, *pending, *mask; + int i; + + if (!s) { + monitor_printf(mon, "Xen event channel emulation not enabled\n"); + return; + } + + shinfo = xen_overlay_get_shinfo_ptr(); + if (!shinfo) { + monitor_printf(mon, "Xen shared info page not allocated\n"); + return; + } + 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_mutex_lock(&s->port_lock); + + for (i = 0; i < s->nr_ports; i++) { + XenEvtchnPort *p = &s->port_table[i]; + + if (p->type == EVTCHNSTAT_closed) { + continue; + } + + monitor_printf(mon, "port %4u %s/%d vcpu:%d pending:%d mask:%d\n", i, + type_names[p->type], p->type_val, p->vcpu, + test_bit(i, pending), test_bit(i, mask)); + } + + qemu_mutex_unlock(&s->port_lock); +} + +void hmp_xen_event_inject(Monitor *mon, const QDict *qdict) +{ + XenEvtchnState *s = xen_evtchn_singleton; + int port = qdict_get_int(qdict, "port"); + XenEvtchnPort *p; + + if (!s) { + monitor_printf(mon, "Xen event channel emulation not enabled\n"); + return; + } + + if (!valid_port(port)) { + monitor_printf(mon, "Invalid port %d\n", port); + return; + } + p = &s->port_table[port]; + + qemu_mutex_lock(&s->port_lock); + + monitor_printf(mon, "port %4u %s/%d vcpu:%d\n", port, + type_names[p->type], p->type_val, p->vcpu); + + if (set_port_pending(s, port)) { + monitor_printf(mon, "Failed to set port %d\n", port); + } else { + monitor_printf(mon, "Delivered port %d\n", port); + } + + qemu_mutex_unlock(&s->port_lock); +} + diff --git a/hw/i386/kvm/xen_evtchn.h b/hw/i386/kvm/xen_evtchn.h index 5d3e03553f..1de53daa52 100644 --- a/hw/i386/kvm/xen_evtchn.h +++ b/hw/i386/kvm/xen_evtchn.h @@ -16,6 +16,9 @@ void xen_evtchn_create(void); int xen_evtchn_soft_reset(void); int xen_evtchn_set_callback_param(uint64_t param); +void hmp_xen_event_list(Monitor *mon, const QDict *qdict); +void hmp_xen_event_inject(Monitor *mon, const QDict *qdict); + struct evtchn_status; struct evtchn_close; struct evtchn_unmask; diff --git a/monitor/misc.c b/monitor/misc.c index 205487e2b9..2b11c0f86a 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -88,6 +88,10 @@ /* Make devices configuration available for use in hmp-commands*.hx templates */ #include CONFIG_DEVICES +#ifdef CONFIG_XEN_EMU +#include "hw/i386/kvm/xen_evtchn.h" +#endif + /* file descriptors passed via SCM_RIGHTS */ typedef struct mon_fd_t mon_fd_t; struct mon_fd_t { -- 2.35.3