vhost: fix virtio-net header length with packed ring

In case packed ring layout has been negotiated, but neither
Version 1 nor mergeable buffers, the Virtio-net header len
is assigned to the legacy devices value, which is wrong.

This patch fixes this with using the proper len as devices
using packed ring are not legacy devices.

Fixes: a922401f35cc ("vhost: add Rx support for packed ring")
Fixes: ae999ce49dcb ("vhost: add Tx support for packed ring")
Cc: stable@dpdk.org
Reported-by: Marvin Liu <yong.liu@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 4deceb3e00d6b8b8b08251bb57558f0928f5394e..5d1fb9e86321fa3dce2a950c7f04ea523002b2e1 100644 (file)
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -341,7 +341,9 @@ vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg,
 
        dev->features = features;
        if (dev->features &
-               ((1 << VIRTIO_NET_F_MRG_RXBUF) | (1ULL << VIRTIO_F_VERSION_1))) {
+               ((1ULL << VIRTIO_NET_F_MRG_RXBUF) |
+                (1ULL << VIRTIO_F_VERSION_1) |
+                (1ULL << VIRTIO_F_RING_PACKED))) {
                dev->vhost_hlen = sizeof(struct virtio_net_hdr_mrg_rxbuf);
        } else {
                dev->vhost_hlen = sizeof(struct virtio_net_hdr);