[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RESEND Patch v1 30/37] vhost-pci-slave/msg: VHOST_USER_SET
From: |
Wei Wang |
Subject: |
[Qemu-devel] [RESEND Patch v1 30/37] vhost-pci-slave/msg: VHOST_USER_SET_VHOST_PCI (stop) |
Date: |
Mon, 19 Dec 2016 13:59:05 +0800 |
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 <address@hidden>
---
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 */
--
2.7.4
- [Qemu-devel] [RESEND Patch v1 21/37] vhost-pci-slave/msg: VHOST_USER_SET_VRING_CALL, (continued)
- [Qemu-devel] [RESEND Patch v1 21/37] vhost-pci-slave/msg: VHOST_USER_SET_VRING_CALL, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 20/37] vhost-pci-slave/msg: VHOST_USER_SET_VRING_KICK, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 19/37] vhost-pci-slave/msg: VHOST_USER_SET_VRING_ADDR, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 23/37] vhost-pci-slave/msg: VHOST_USER_SET_LOG_BASE, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 24/37] vhost-pci-slave/msg: VHOST_USER_SET_LOG_FD, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 25/37] vhost-pci-slave/msg: VHOST_USER_SEND_RARP, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 26/37] vhost-pci-slave/msg: VHOST_USER_GET_VRING_BASE, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 28/37] vhost-pci-net: pass the mem and vring info to the driver, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 27/37] vhost-pci-net: pass the info collected by vp_slave to the device, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 29/37] vhost-pci-slave/msg: VHOST_USER_SET_VHOST_PCI (start), Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 30/37] vhost-pci-slave/msg: VHOST_USER_SET_VHOST_PCI (stop),
Wei Wang <=
- [Qemu-devel] [RESEND Patch v1 33/37] vhost-pci-net: send the negotiated feature bits to the master, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 31/37] vhost-user/msg: send VHOST_USER_SET_VHOST_PCI (start/stop), Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 32/37] vhost-user: add asynchronous read for the vhost-user master, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 34/37] vhost-pci-slave: add "peer_reset", Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 35/37] vhost-pci-net: start the vhost-pci-net device, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 37/37] vl: enable vhost-pci-slave, Wei Wang, 2016/12/19
- [Qemu-devel] [RESEND Patch v1 36/37] vhost-user/msg: handling VHOST_USER_SET_FEATURES, Wei Wang, 2016/12/19
- Re: [Qemu-devel] [RESEND Patch v1 00/37] Implementation of vhost-pci for inter-vm commucation, no-reply, 2016/12/19
- Re: [Qemu-devel] [RESEND Patch v1 00/37] Implementation of vhost-pci for inter-vm commucation, Marc-André Lureau, 2016/12/19