[dpdk-stable] patch 'net/virtio: fix unexpected event after reconnect' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/24/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From f9630f56a4c7dc4781c94ab6782762eeb201d293 Mon Sep 17 00:00:00 2001
From: Marvin Liu <yong.liu at intel.com>
Date: Fri, 15 May 2020 10:35:07 +0800
Subject: [PATCH] net/virtio: fix unexpected event after reconnect

[ upstream commit f50560a54b8bd6b52d763213aee40f0164fb4099 ]

Event notification should be disabled after virtqueue initialization and
enabled by calling rte_eth_dev_rx_intr_enable later. When virtio user
device reconnecting to vhost, virtqueue_disable_intr should be called to
disable event notification.

Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode")

Signed-off-by: Marvin Liu <yong.liu at intel.com>
Acked-by: Xiao Wang <xiao.w.wang at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtqueue.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c
index 0b4e3bf3e2..02c8b9fc54 100644
--- a/drivers/net/virtio/virtqueue.c
+++ b/drivers/net/virtio/virtqueue.c
@@ -174,6 +174,7 @@ virtqueue_rxvq_reset_packed(struct virtqueue *vq)
 
 	vring_desc_init_packed(vq, size);
 
+	virtqueue_disable_intr(vq);
 	return 0;
 }
 
@@ -210,5 +211,6 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq)
 
 	vring_desc_init_packed(vq, size);
 
+	virtqueue_disable_intr(vq);
 	return 0;
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:39.988738322 +0100
+++ 0020-net-virtio-fix-unexpected-event-after-reconnect.patch	2020-05-22 10:37:39.108412355 +0100
@@ -1,15 +1,16 @@
-From f50560a54b8bd6b52d763213aee40f0164fb4099 Mon Sep 17 00:00:00 2001
+From f9630f56a4c7dc4781c94ab6782762eeb201d293 Mon Sep 17 00:00:00 2001
 From: Marvin Liu <yong.liu at intel.com>
 Date: Fri, 15 May 2020 10:35:07 +0800
 Subject: [PATCH] net/virtio: fix unexpected event after reconnect
 
+[ upstream commit f50560a54b8bd6b52d763213aee40f0164fb4099 ]
+
 Event notification should be disabled after virtqueue initialization and
 enabled by calling rte_eth_dev_rx_intr_enable later. When virtio user
 device reconnecting to vhost, virtqueue_disable_intr should be called to
 disable event notification.
 
 Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Marvin Liu <yong.liu at intel.com>
 Acked-by: Xiao Wang <xiao.w.wang at intel.com>
@@ -19,10 +20,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c
-index 408bba236a..2702e120ee 100644
+index 0b4e3bf3e2..02c8b9fc54 100644
 --- a/drivers/net/virtio/virtqueue.c
 +++ b/drivers/net/virtio/virtqueue.c
-@@ -175,6 +175,7 @@ virtqueue_rxvq_reset_packed(struct virtqueue *vq)
+@@ -174,6 +174,7 @@ virtqueue_rxvq_reset_packed(struct virtqueue *vq)
  
  	vring_desc_init_packed(vq, size);
  
@@ -30,7 +31,7 @@
  	return 0;
  }
  
-@@ -211,5 +212,6 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq)
+@@ -210,5 +211,6 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq)
  
  	vring_desc_init_packed(vq, size);