[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]
Subject: [RESEND Patch v1 34/37] vhost-pci-slave: add "peer_reset"
Setting "peer_reset" flags that the peer device is about to be reset. This happens when the slave side device driver only accepts a subset of the feature bits offered by the peer device. The peer device is expected to have a second run of the vhost-user protocol for the re-setup. Signed-off-by: Wei Wang <wei.w.wang@intel.com> --- hw/net/vhost-pci-net.c | 4 ++++ hw/virtio/vhost-pci-slave.c | 20 ++++++++++++++++++-- include/hw/virtio/vhost-pci-slave.h | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/hw/net/vhost-pci-net.c b/hw/net/vhost-pci-net.c index 8e30281..3289f4d 100644 --- a/hw/net/vhost-pci-net.c +++ b/hw/net/vhost-pci-net.c @@ -144,6 +144,10 @@ static void vpnet_set_features(VirtIODevice *vdev, uint64_t features) int ret; if (need_send) { + if (vp_slave->feature_bits != features) { + vp_slave->feature_bits = features; + vp_slave->peer_reset = 1; + } need_send = 0; ret = vp_slave_send_feature_bits(features); if (ret < 0) { diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index a966885..568e258 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -38,6 +38,15 @@ static void vp_slave_cleanup(void) return; } + /* + * if this cleanup is not invoked due to peer reset, re-initialize + * the feature bits, so that the slave can work with a new master + */ + if (!vp_slave->peer_reset) { + vp_slave->feature_bits = + 1ULL << VHOST_USER_F_PROTOCOL_FEATURES; + } + 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]); @@ -167,8 +176,11 @@ static void vp_slave_set_device_type(VhostUserMsg *msg) switch (vp_slave->dev_type) { case VIRTIO_ID_NET: - vp_slave->feature_bits |= (VHOST_PCI_FEATURE_BITS - | VHOST_PCI_NET_FEATURE_BITS); + /* Don't initialize the feature bits if they have been negotiated */ + if (!vp_slave->peer_reset) { + vp_slave->feature_bits |= (VHOST_PCI_FEATURE_BITS + | VHOST_PCI_NET_FEATURE_BITS); + } break; default: error_report("device type %d is not supported", vp_slave->dev_type); @@ -359,6 +371,9 @@ static int vp_slave_set_vhost_pci(CharBackend *chr_be, VhostUserMsg *msg) switch (cmd) { case VHOST_USER_SET_VHOST_PCI_start: + if (vp_slave->peer_reset) { + vp_slave->peer_reset = 0; + } ret = vp_slave_device_create(vp_slave->dev_type); if (ret < 0) { return ret; @@ -534,6 +549,7 @@ int vhost_pci_slave_init(QemuOpts *opts) vp_slave->sub_mr = NULL; QLIST_INIT(&vp_slave->pvq_list); vp_slave->pvq_num = 0; + vp_slave->peer_reset = 0; qemu_chr_fe_init(&vp_slave->chr_be, chr, &error_abort); qemu_chr_fe_set_handlers(&vp_slave->chr_be, vp_slave_can_read, vp_slave_read, vp_slave_event, diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-pci-slave.h index e60580a..dd78ed4 100644 --- a/include/hw/virtio/vhost-pci-slave.h +++ b/include/hw/virtio/vhost-pci-slave.h @@ -21,6 +21,7 @@ typedef struct VhostPCISlave { CharBackend chr_be; /* Ponnter to the slave device */ VirtIODevice *vdev; + bool peer_reset; uint16_t dev_type; uint64_t feature_bits; /* hotplugged memory should be mapped following the offset */ -- 2.7.4
[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]