[dpdk-stable] patch 'net/virtio-user: fix setting filters' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/21/19. 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 e3ecf90edcff2b29658dc2dc37347b6e0bba3abf Mon Sep 17 00:00:00 2001
From: Marvin Liu <yong.liu at intel.com>
Date: Wed, 6 Nov 2019 17:02:50 +0800
Subject: [PATCH] net/virtio-user: fix setting filters

[ upstream commit a76552d48f17a990662592ff5e13a6e83b62025c ]

As doc mentioned, Rx/Mac/vlan filters are all supported by best effort.
These control commands should return success.

Fixes: f9b9d1a55775 ("net/virtio-user: add multiple queues in device emulation")

Signed-off-by: Marvin Liu <yong.liu at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 23510a9906..95433f7c43 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -484,6 +484,10 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
 
 		queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
 		status = virtio_user_handle_mq(dev, queues);
+	} else if (hdr->class == VIRTIO_NET_CTRL_RX  ||
+		   hdr->class == VIRTIO_NET_CTRL_MAC ||
+		   hdr->class == VIRTIO_NET_CTRL_VLAN) {
+		status = 0;
 	}
 
 	/* Update status */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:30.903299430 +0000
+++ 0115-net-virtio-user-fix-setting-filters.patch	2019-12-19 14:32:26.289301474 +0000
@@ -1,41 +1,31 @@
-From a76552d48f17a990662592ff5e13a6e83b62025c Mon Sep 17 00:00:00 2001
+From e3ecf90edcff2b29658dc2dc37347b6e0bba3abf Mon Sep 17 00:00:00 2001
 From: Marvin Liu <yong.liu at intel.com>
 Date: Wed, 6 Nov 2019 17:02:50 +0800
 Subject: [PATCH] net/virtio-user: fix setting filters
 
+[ upstream commit a76552d48f17a990662592ff5e13a6e83b62025c ]
+
 As doc mentioned, Rx/Mac/vlan filters are all supported by best effort.
 These control commands should return success.
 
 Fixes: f9b9d1a55775 ("net/virtio-user: add multiple queues in device emulation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Marvin Liu <yong.liu at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
 ---
- drivers/net/virtio/virtio_user/virtio_user_dev.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ drivers/net/virtio/virtio_user/virtio_user_dev.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
-index 1c575d0cdd..a4400e7720 100644
+index 23510a9906..95433f7c43 100644
 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
 +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
-@@ -613,6 +613,10 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
+@@ -484,6 +484,10 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
  
  		queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
  		status = virtio_user_handle_mq(dev, queues);
 +	} else if (hdr->class == VIRTIO_NET_CTRL_RX  ||
 +		   hdr->class == VIRTIO_NET_CTRL_MAC ||
-+		   hdr->class == VIRTIO_NET_CTRL_VLAN) {
-+		status = 0;
- 	}
- 
- 	/* Update status */
-@@ -664,6 +668,10 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,
- 		queues = *(uint16_t *)(uintptr_t)
- 				vring->desc[idx_data].addr;
- 		status = virtio_user_handle_mq(dev, queues);
-+	} else if (hdr->class == VIRTIO_NET_CTRL_RX  ||
-+		   hdr->class == VIRTIO_NET_CTRL_MAC ||
 +		   hdr->class == VIRTIO_NET_CTRL_VLAN) {
 +		status = 0;
  	}