From patchwork Mon Dec 19 05:59:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 9479729 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ABE2C601C0 for ; Mon, 19 Dec 2016 06:35:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D8B328427 for ; Mon, 19 Dec 2016 06:35:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9168028459; Mon, 19 Dec 2016 06:35:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0C66528427 for ; Mon, 19 Dec 2016 06:35:35 +0000 (UTC) Received: from localhost ([::1]:43636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIrXq-00014V-2D for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Dec 2016 01:35:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIr0f-0003oT-Pz for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cIr0b-0004os-Ux for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:17 -0500 Received: from mga06.intel.com ([134.134.136.31]:33815) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cIr0b-0004Vl-NE for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:13 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 18 Dec 2016 22:01:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,372,1477983600"; d="scan'208";a="44550185" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by fmsmga006.fm.intel.com with ESMTP; 18 Dec 2016 22:01:11 -0800 From: Wei Wang To: marcandre.lureau@gmail.com, mst@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, virtio-dev@lists.oasis-open.org Date: Mon, 19 Dec 2016 13:59:05 +0800 Message-Id: <1482127152-84732-31-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482127152-84732-1-git-send-email-wei.w.wang@intel.com> References: <1482127152-84732-1-git-send-email-wei.w.wang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.31 Subject: [Qemu-devel] [RESEND Patch v1 30/37] vhost-pci-slave/msg: VHOST_USER_SET_VHOST_PCI (stop) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Wang Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The slave removes the slave device when receiving the request with the stop command. In the case that the master side guest crashes, the crashed guest, typically, will be killed by the admin. This event will be captured via the close of the socket connection, so we can remove the vhost-pci device and free the related resources there. Signed-off-by: Wei Wang --- hw/net/vhost-pci-net.c | 1 + hw/virtio/vhost-pci-slave.c | 41 +++++++++++++++++++++++++++++++++++++ include/hw/virtio/vhost-pci-slave.h | 2 ++ 3 files changed, 44 insertions(+) diff --git a/hw/net/vhost-pci-net.c b/hw/net/vhost-pci-net.c index 2560e3d..5ad4a9f 100644 --- a/hw/net/vhost-pci-net.c +++ b/hw/net/vhost-pci-net.c @@ -173,6 +173,7 @@ static void vpnet_device_realize(DeviceState *dev, Error **errp) vpnet_handle_rq); } vpnet->status = 0; + vp_slave->vdev = vdev; } static void vpnet_device_unrealize(DeviceState *dev, Error **errp) diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index 5c16365..de08324 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -34,6 +34,10 @@ static void vp_slave_cleanup(void) uint32_t i, nregions; PeerVqNode *pvq_node; + if (!vp_slave->vdev) { + return; + } + nregions = vp_slave->pmem_msg.nregions; for (i = 0; i < nregions; i++) { ret = munmap(vp_slave->mr_map_base[i], vp_slave->mr_map_size[i]); @@ -49,6 +53,7 @@ static void vp_slave_cleanup(void) } QLIST_INIT(&vp_slave->pvq_list); vp_slave->pvq_num = 0; + vp_slave->vdev = NULL; } static int vp_slave_write(CharBackend *chr_be, VhostUserMsg *msg) @@ -83,12 +88,44 @@ static void vp_slave_set_features(VhostUserMsg *msg) & ~(1 << VHOST_USER_F_PROTOCOL_FEATURES); } +static DeviceState *virtio_to_pci_dev(VirtIODevice *vdev, uint16_t virtio_id) +{ + DeviceState *qdev; + VhostPCINet *vpnet; + VhostPCINetPCI *netpci; + + switch (virtio_id) { + case VIRTIO_ID_NET: + vpnet = VHOST_PCI_NET(vdev); + netpci = container_of(vpnet, VhostPCINetPCI, vdev); + qdev = &netpci->parent_obj.pci_dev.qdev; + break; + default: + error_report("virtio_to_pci_dev: device type %d not supported", + virtio_id); + } + + return qdev; +} + +static void vp_slave_device_del(VirtIODevice *vdev) +{ + Error *errp = NULL; + DeviceState *qdev = virtio_to_pci_dev(vdev, vp_slave->dev_type); + + if (vdev != NULL) { + qdev_unplug(qdev, &errp); + vp_slave_cleanup(); + } +} + static void vp_slave_event(void *opaque, int event) { switch (event) { case CHR_EVENT_OPENED: break; case CHR_EVENT_CLOSED: + vp_slave_device_del(vp_slave->vdev); break; } } @@ -306,6 +343,10 @@ static int vp_slave_set_vhost_pci(CharBackend *chr_be, VhostUserMsg *msg) return ret; } break; + case VHOST_USER_SET_VHOST_PCI_stop: + vp_slave_device_del(vp_slave->vdev); + ret = 0; + break; default: error_report("slave pconnection: cmd %d not supported yet", cmd); return -1; diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-pci-slave.h index 3e0f4c7..79e1ffd 100644 --- a/include/hw/virtio/vhost-pci-slave.h +++ b/include/hw/virtio/vhost-pci-slave.h @@ -19,6 +19,8 @@ typedef struct PeerVqNode { typedef struct VhostPCISlave { CharBackend chr_be; + /* Ponnter to the slave device */ + VirtIODevice *vdev; uint16_t dev_type; uint64_t feature_bits; /* hotplugged memory should be mapped following the offset */