* [dpdk-stable] [PATCH v6 1/6] vhost: fix windows vm hang [not found] <1474255184-139302-1-git-send-email-zhihong.wang@intel.com> @ 2016-09-19 3:19 ` Zhihong Wang 0 siblings, 0 replies; 3+ messages in thread From: Zhihong Wang @ 2016-09-19 3:19 UTC (permalink / raw) To: yuanhan.liu; +Cc: stable, Zhihong Wang This patch fixes a Windows VM compatibility issue in DPDK 16.07 vhost code which causes the guest to hang once any packets are enqueued when mrg_rxbuf is turned on by setting the right id and len in the used ring. As defined in virtio spec 0.95 and 1.0, in each used ring element, id means index of start of used descriptor chain, and len means total length of the descriptor chain which was written to. While in 16.07 code, index of the last descriptor is assigned to id, and the length of the last descriptor is assigned to len. How to test? 1. Start testpmd in the host with a vhost port. 2. Start a Windows VM image with qemu and connect to the vhost port. 3. Start io forwarding with tx_first in host testpmd. For 16.07 code, the Windows VM will hang once any packets are enqueued. Cc: <stable@dpdk.org> Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> --- Changes in v5: 1. Add details in commit log. lib/librte_vhost/virtio_net.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index 8a151af..0d6e7d9 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -384,6 +384,8 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq, uint16_t start_idx = vq->last_used_idx; uint16_t cur_idx = start_idx; uint64_t desc_addr; + uint32_t desc_chain_head; + uint32_t desc_chain_len; uint32_t mbuf_offset, mbuf_avail; uint32_t desc_offset, desc_avail; uint32_t cpy_len; @@ -412,6 +414,8 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq, desc_avail = buf_vec[vec_idx].buf_len - dev->vhost_hlen; desc_offset = dev->vhost_hlen; + desc_chain_head = buf_vec[vec_idx].desc_idx; + desc_chain_len = desc_offset; mbuf_avail = rte_pktmbuf_data_len(m); mbuf_offset = 0; @@ -419,19 +423,21 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq, /* done with current desc buf, get the next one */ if (desc_avail == 0) { desc_idx = buf_vec[vec_idx].desc_idx; + vec_idx++; if (!(vq->desc[desc_idx].flags & VRING_DESC_F_NEXT)) { /* Update used ring with desc information */ used_idx = cur_idx++ & (vq->size - 1); - vq->used->ring[used_idx].id = desc_idx; - vq->used->ring[used_idx].len = desc_offset; + vq->used->ring[used_idx].id = desc_chain_head; + vq->used->ring[used_idx].len = desc_chain_len; vhost_log_used_vring(dev, vq, offsetof(struct vring_used, ring[used_idx]), sizeof(vq->used->ring[used_idx])); + desc_chain_head = buf_vec[vec_idx].desc_idx; + desc_chain_len = 0; } - vec_idx++; desc_addr = gpa_to_vva(dev, buf_vec[vec_idx].buf_addr); if (unlikely(!desc_addr)) return 0; @@ -463,11 +469,12 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq, mbuf_offset += cpy_len; desc_avail -= cpy_len; desc_offset += cpy_len; + desc_chain_len += cpy_len; } used_idx = cur_idx & (vq->size - 1); - vq->used->ring[used_idx].id = buf_vec[vec_idx].desc_idx; - vq->used->ring[used_idx].len = desc_offset; + vq->used->ring[used_idx].id = desc_chain_head; + vq->used->ring[used_idx].len = desc_chain_len; vhost_log_used_vring(dev, vq, offsetof(struct vring_used, ring[used_idx]), sizeof(vq->used->ring[used_idx])); -- 2.7.4 ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <1471319402-112998-1-git-send-email-zhihong.wang@intel.com>]
[parent not found: <1474336817-22683-1-git-send-email-zhihong.wang@intel.com>]
* [dpdk-stable] [PATCH v6 1/6] vhost: fix windows vm hang [not found] ` <1474336817-22683-1-git-send-email-zhihong.wang@intel.com> @ 2016-09-20 2:00 ` Zhihong Wang 2016-10-13 6:18 ` Yuanhan Liu 0 siblings, 1 reply; 3+ messages in thread From: Zhihong Wang @ 2016-09-20 2:00 UTC (permalink / raw) To: dev; +Cc: maxime.coquelin, yuanhan.liu, thomas.monjalon, stable, Zhihong Wang This patch fixes a Windows VM compatibility issue in DPDK 16.07 vhost code which causes the guest to hang once any packets are enqueued when mrg_rxbuf is turned on by setting the right id and len in the used ring. As defined in virtio spec 0.95 and 1.0, in each used ring element, id means index of start of used descriptor chain, and len means total length of the descriptor chain which was written to. While in 16.07 code, index of the last descriptor is assigned to id, and the length of the last descriptor is assigned to len. How to test? 1. Start testpmd in the host with a vhost port. 2. Start a Windows VM image with qemu and connect to the vhost port. 3. Start io forwarding with tx_first in host testpmd. For 16.07 code, the Windows VM will hang once any packets are enqueued. Cc: <stable@dpdk.org> Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> --- Changes in v5: 1. Add details in commit log. lib/librte_vhost/virtio_net.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index 8a151af..0d6e7d9 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -384,6 +384,8 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq, uint16_t start_idx = vq->last_used_idx; uint16_t cur_idx = start_idx; uint64_t desc_addr; + uint32_t desc_chain_head; + uint32_t desc_chain_len; uint32_t mbuf_offset, mbuf_avail; uint32_t desc_offset, desc_avail; uint32_t cpy_len; @@ -412,6 +414,8 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq, desc_avail = buf_vec[vec_idx].buf_len - dev->vhost_hlen; desc_offset = dev->vhost_hlen; + desc_chain_head = buf_vec[vec_idx].desc_idx; + desc_chain_len = desc_offset; mbuf_avail = rte_pktmbuf_data_len(m); mbuf_offset = 0; @@ -419,19 +423,21 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq, /* done with current desc buf, get the next one */ if (desc_avail == 0) { desc_idx = buf_vec[vec_idx].desc_idx; + vec_idx++; if (!(vq->desc[desc_idx].flags & VRING_DESC_F_NEXT)) { /* Update used ring with desc information */ used_idx = cur_idx++ & (vq->size - 1); - vq->used->ring[used_idx].id = desc_idx; - vq->used->ring[used_idx].len = desc_offset; + vq->used->ring[used_idx].id = desc_chain_head; + vq->used->ring[used_idx].len = desc_chain_len; vhost_log_used_vring(dev, vq, offsetof(struct vring_used, ring[used_idx]), sizeof(vq->used->ring[used_idx])); + desc_chain_head = buf_vec[vec_idx].desc_idx; + desc_chain_len = 0; } - vec_idx++; desc_addr = gpa_to_vva(dev, buf_vec[vec_idx].buf_addr); if (unlikely(!desc_addr)) return 0; @@ -463,11 +469,12 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq, mbuf_offset += cpy_len; desc_avail -= cpy_len; desc_offset += cpy_len; + desc_chain_len += cpy_len; } used_idx = cur_idx & (vq->size - 1); - vq->used->ring[used_idx].id = buf_vec[vec_idx].desc_idx; - vq->used->ring[used_idx].len = desc_offset; + vq->used->ring[used_idx].id = desc_chain_head; + vq->used->ring[used_idx].len = desc_chain_len; vhost_log_used_vring(dev, vq, offsetof(struct vring_used, ring[used_idx]), sizeof(vq->used->ring[used_idx])); -- 2.7.4 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [PATCH v6 1/6] vhost: fix windows vm hang 2016-09-20 2:00 ` Zhihong Wang @ 2016-10-13 6:18 ` Yuanhan Liu 0 siblings, 0 replies; 3+ messages in thread From: Yuanhan Liu @ 2016-10-13 6:18 UTC (permalink / raw) To: Zhihong Wang; +Cc: dev, maxime.coquelin, thomas.monjalon, stable On Mon, Sep 19, 2016 at 10:00:12PM -0400, Zhihong Wang wrote: > This patch fixes a Windows VM compatibility issue in DPDK 16.07 vhost code > which causes the guest to hang once any packets are enqueued when mrg_rxbuf > is turned on by setting the right id and len in the used ring. > > As defined in virtio spec 0.95 and 1.0, in each used ring element, id means > index of start of used descriptor chain, and len means total length of the > descriptor chain which was written to. While in 16.07 code, index of the > last descriptor is assigned to id, and the length of the last descriptor is > assigned to len. > > How to test? > > 1. Start testpmd in the host with a vhost port. > > 2. Start a Windows VM image with qemu and connect to the vhost port. > > 3. Start io forwarding with tx_first in host testpmd. > > For 16.07 code, the Windows VM will hang once any packets are enqueued. > > Cc: <stable@dpdk.org> > Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> Applied to dpdk-next-virtio (this patch only). Thanks. --yliu ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-13 6:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1474255184-139302-1-git-send-email-zhihong.wang@intel.com>
2016-09-19 3:19 ` [dpdk-stable] [PATCH v6 1/6] vhost: fix windows vm hang Zhihong Wang
[not found] <1471319402-112998-1-git-send-email-zhihong.wang@intel.com>
[not found] ` <1474336817-22683-1-git-send-email-zhihong.wang@intel.com>
2016-09-20 2:00 ` Zhihong Wang
2016-10-13 6:18 ` Yuanhan Liu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).