[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]
Subject: [PATCH v2 09/16] vhost-user: send VHOST_USER_SET_VHOST_PCI_START/STOP
The master requests the slave to create or destroy a vhost-pci device. Signed-off-by: Wei Wang <wei.w.wang@intel.com> --- hw/net/vhost_net.c | 36 ++++++++++++++++++++++++++++++++++++ hw/virtio/vhost-user.c | 17 +++++++++++++++++ include/hw/virtio/vhost-backend.h | 2 ++ include/net/vhost_net.h | 2 ++ 4 files changed, 57 insertions(+) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index ea9879f..0a5278d 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -18,6 +18,7 @@ #include "net/tap.h" #include "net/vhost-user.h" +#include "hw/virtio/vhost-user.h" #include "hw/virtio/virtio-net.h" #include "net/vhost_net.h" #include "qemu/error-report.h" @@ -296,6 +297,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(dev))); VirtioBusState *vbus = VIRTIO_BUS(qbus); VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(vbus); + struct vhost_net *last_net; int r, e, i; if (!k->set_guest_notifiers) { @@ -341,6 +343,15 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, } } + last_net = get_vhost_net(ncs[total_queues - 1].peer); + if (vhost_pci_enabled(&last_net->dev)) { + r = vhost_set_vhost_pci(ncs[total_queues - 1].peer, + VHOST_USER_SET_VHOST_PCI_START); + if (r < 0) { + goto err_start; + } + } + return 0; err_start: @@ -362,8 +373,15 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs, BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(dev))); VirtioBusState *vbus = VIRTIO_BUS(qbus); VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(vbus); + struct vhost_net *last_net; int i, r; + last_net = get_vhost_net(ncs[total_queues - 1].peer); + if (vhost_pci_enabled(&last_net->dev)) { + vhost_set_vhost_pci(ncs[total_queues - 1].peer, + VHOST_USER_SET_VHOST_PCI_STOP); + } + for (i = 0; i < total_queues; i++) { vhost_net_stop_one(get_vhost_net(ncs[i].peer), dev); } @@ -450,6 +468,18 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu) return vhost_ops->vhost_net_set_mtu(&net->dev, mtu); } +int vhost_set_vhost_pci(NetClientState *nc, uint8_t cmd) +{ + VHostNetState *net = get_vhost_net(nc); + const VhostOps *vhost_ops = net->dev.vhost_ops; + + if (vhost_ops && vhost_ops->vhost_set_vhost_pci) { + return vhost_ops->vhost_set_vhost_pci(&net->dev, cmd); + } + + return 0; +} + #else uint64_t vhost_net_get_max_queues(VHostNetState *net) { @@ -521,4 +551,10 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu) { return 0; } + +int vhost_set_vhost_pci(NetClientState *nc, uint8_t cmd) +{ + return 0; +} + #endif diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 1eba5e5..ca8fe36 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -313,6 +313,22 @@ static int vhost_user_set_vring_enable(struct vhost_dev *dev, int enable) return 0; } +static int vhost_user_set_vhost_pci(struct vhost_dev *dev, uint8_t cmd) +{ + VhostUserMsg msg = { + .request = VHOST_USER_SET_VHOST_PCI, + .flags = VHOST_USER_VERSION, + .payload.u64 = (uint64_t)cmd, + .size = sizeof(msg.payload.u64), + }; + + if (vhost_user_write(dev, &msg, NULL, 0) < 0) { + return -1; + } + + return 0; +} + static int vhost_user_get_vring_base(struct vhost_dev *dev, struct vhost_vring_state *ring) { @@ -671,6 +687,7 @@ const VhostOps user_ops = { .vhost_reset_device = vhost_user_reset_device, .vhost_get_vq_index = vhost_user_get_vq_index, .vhost_set_vring_enable = vhost_user_set_vring_enable, + .vhost_set_vhost_pci = vhost_user_set_vhost_pci, .vhost_requires_shm_log = vhost_user_requires_shm_log, .vhost_migration_done = vhost_user_migration_done, .vhost_backend_can_merge = vhost_user_can_merge, diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h index c3cf4a7..1c68f67 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -70,6 +70,7 @@ typedef int (*vhost_reset_device_op)(struct vhost_dev *dev); typedef int (*vhost_get_vq_index_op)(struct vhost_dev *dev, int idx); typedef int (*vhost_set_vring_enable_op)(struct vhost_dev *dev, int enable); +typedef int (*vhost_set_vhost_pci_op)(struct vhost_dev *dev, uint8_t cmd); typedef bool (*vhost_requires_shm_log_op)(struct vhost_dev *dev); typedef int (*vhost_migration_done_op)(struct vhost_dev *dev, char *mac_addr); @@ -114,6 +115,7 @@ typedef struct VhostOps { vhost_reset_device_op vhost_reset_device; vhost_get_vq_index_op vhost_get_vq_index; vhost_set_vring_enable_op vhost_set_vring_enable; + vhost_set_vhost_pci_op vhost_set_vhost_pci; vhost_requires_shm_log_op vhost_requires_shm_log; vhost_migration_done_op vhost_migration_done; vhost_backend_can_merge_op vhost_backend_can_merge; diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h index afc1499..3db5559 100644 --- a/include/net/vhost_net.h +++ b/include/net/vhost_net.h @@ -37,4 +37,6 @@ uint64_t vhost_net_get_acked_features(VHostNetState *net); int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu); +int vhost_set_vhost_pci(NetClientState *nc, uint8_t cmd); + #endif -- 2.7.4
[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]