[dpdk-stable] patch 'net/netvsc: ignore unsupported packet on sync command' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/06/21. 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.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/216f57c06ccc8d5d1c5a438b89bfbc0e1578976a

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 216f57c06ccc8d5d1c5a438b89bfbc0e1578976a Mon Sep 17 00:00:00 2001
From: Long Li <longli at microsoft.com>
Date: Fri, 11 Dec 2020 12:48:21 -0800
Subject: [PATCH] net/netvsc: ignore unsupported packet on sync command

[ upstream commit 0a4533facb49b0ca0d7520fee09270a82017e8fe ]

On netvsc initialization, the host VSP may send a NVS_TYPE_TXTBL_NOTE
packet while executing a VSP command synchronously.

Instead of returning an error, ignore this packet as we don't use it for
DPDK.

Signed-off-by: Long Li <longli at microsoft.com>
---
 drivers/net/netvsc/hn_nvs.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/netvsc/hn_nvs.c b/drivers/net/netvsc/hn_nvs.c
index eeb82ab9ee..03b6cc1551 100644
--- a/drivers/net/netvsc/hn_nvs.c
+++ b/drivers/net/netvsc/hn_nvs.c
@@ -97,8 +97,13 @@ __hn_nvs_execute(struct hn_data *hv,
 	hdr = (struct hn_nvs_hdr *)buffer;
 
 	/* Silently drop received packets while waiting for response */
-	if (hdr->type == NVS_TYPE_RNDIS) {
+	switch (hdr->type) {
+	case NVS_TYPE_RNDIS:
 		hn_nvs_ack_rxbuf(chan, xactid);
+		/* fallthrough */
+
+	case NVS_TYPE_TXTBL_NOTE:
+		PMD_DRV_LOG(DEBUG, "discard packet type 0x%x", hdr->type);
 		goto retry;
 	}
 
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:29.167737710 +0100
+++ 0024-net-netvsc-ignore-unsupported-packet-on-sync-command.patch	2021-02-04 12:04:27.890789593 +0100
@@ -1 +1 @@
-From 0a4533facb49b0ca0d7520fee09270a82017e8fe Mon Sep 17 00:00:00 2001
+From 216f57c06ccc8d5d1c5a438b89bfbc0e1578976a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0a4533facb49b0ca0d7520fee09270a82017e8fe ]
+
@@ -11,2 +12,0 @@
-
-Cc: stable at dpdk.org