From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3A90FA0524 for ; Thu, 4 Feb 2021 12:31:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0958F240741; Thu, 4 Feb 2021 12:31:08 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 4179C24072F for ; Thu, 4 Feb 2021 12:31:07 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cqo-00057h-QR; Thu, 04 Feb 2021 11:31:06 +0000 From: Christian Ehrhardt To: Long Li Cc: dpdk stable Date: Thu, 4 Feb 2021 12:27:59 +0100 Message-Id: <20210204112954.2488123-24-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/netvsc: ignore unsupported packet on sync command' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- >From 216f57c06ccc8d5d1c5a438b89bfbc0e1578976a Mon Sep 17 00:00:00 2001 From: Long Li 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 --- 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@dpdk.org