vhost: fix vhost interrupt support

When VIRTIO_RING_F_EVENT_IDX is negotiated, we need to
update the avail event to enable the notification.

Fixes: 3f8ff12821e4 ("vhost: support interrupt mode")
Cc: stable@dpdk.org
Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile
index de431fb..531cf48 100644 (file)
--- a/lib/librte_vhost/Makefile
+++ b/lib/librte_vhost/Makefile
@@ -13,6 +13,7 @@ LIBABIVER := 4
 CFLAGS += -DALLOW_EXPERIMENTAL_API
 CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -D_FILE_OFFSET_BITS=64
 CFLAGS += -I vhost_user
+CFLAGS += -fno-strict-aliasing
 LDLIBS += -lpthread
 
 ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y)

diff --git a/lib/librte_vhost/meson.build b/lib/librte_vhost/meson.build
index bd62e0e..9d25b4d 100644 (file)
--- a/lib/librte_vhost/meson.build
+++ b/lib/librte_vhost/meson.build
@@ -9,6 +9,7 @@ if has_libnuma == 1
 endif
 version = 4
 allow_experimental_apis = true
+cflags += '-fno-strict-aliasing'
 sources = files('fd_man.c', 'iotlb.c', 'socket.c', 'vdpa.c',
                'vhost.c', 'vhost_user.c',
                'virtio_net.c', 'vhost_crypto.c')

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 91026b3..e62f4c5 100644 (file)
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -647,12 +647,18 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id)
 }
 
 static inline void
-vhost_enable_notify_split(struct vhost_virtqueue *vq, int enable)
+vhost_enable_notify_split(struct virtio_net *dev,
+               struct vhost_virtqueue *vq, int enable)
 {
-       if (enable)
-               vq->used->flags &= ~VRING_USED_F_NO_NOTIFY;
-       else
-               vq->used->flags |= VRING_USED_F_NO_NOTIFY;
+       if (!(dev->features & (1ULL << VIRTIO_RING_F_EVENT_IDX))) {
+               if (enable)
+                       vq->used->flags &= ~VRING_USED_F_NO_NOTIFY;
+               else
+                       vq->used->flags |= VRING_USED_F_NO_NOTIFY;
+       } else {
+               if (enable)
+                       vhost_avail_event(vq) = vq->last_avail_idx;
+       }
 }
 
 static inline void
@@ -690,7 +696,7 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable)
        if (vq_is_packed(dev))
                vhost_enable_notify_packed(dev, vq, enable);
        else
-               vhost_enable_notify_split(vq, enable);
+               vhost_enable_notify_split(dev, vq, enable);
 
        return 0;
 }

diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 760a09c..25ffd76 100644 (file)
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -648,6 +648,8 @@ vhost_iova_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
        return __vhost_iova_to_vva(dev, vq, iova, len, perm);
 }
 
+#define vhost_avail_event(vr) \
+       (*(volatile uint16_t*)&(vr)->used->ring[(vr)->size])
 #define vhost_used_event(vr) \
        (*(volatile uint16_t*)&(vr)->avail->ring[(vr)->size])