From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 2CC1CA0C47
for <public@inbox.dpdk.org>; Mon, 26 Jul 2021 15:55:42 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 220BA410EC;
Mon, 26 Jul 2021 15:55:42 +0200 (CEST)
Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com
[209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 88EAF410EC
for <stable@dpdk.org>; Mon, 26 Jul 2021 15:55:39 +0200 (CEST)
Received: by mail-wr1-f51.google.com with SMTP id p5so6092703wro.7
for <stable@dpdk.org>; Mon, 26 Jul 2021 06:55:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=HOMF3/lMNp85eQFM7+Hh0raovhoesT+DwULTlSRf4Y4=;
b=GYdYeN4Dw2/kZc0E0PP9HH4meBt3nPWs7BpNpt5eAHO5sW/f8CGAlVQ5BMdyko+4LL
jY3ASLREhpg3olB8ChzKdV7pRIs4q8hJ03Wmelz0cy1cT7+VEDsDdmXMSdgvvdKPyLur
0a9wtgji7xCXOQNFRPLOi4lGDiFF7Qk1rRcZg7EGYzdfySeaq1u/XYmZq9WHTJ9YXcnx
LlZI8ToTTVx2CJtL1GrPUdjLS5zLEWjvLkuQcOp2cvzm4oQm9xkW1QfHK5BC4eZsdk51
cdsKIf1eEeRuIRIo+baOF9w71Vs/BwR6YuOc6IDl1wHxeSGBQduHhP4J6V6Tfm9DhHj9
aoWw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=HOMF3/lMNp85eQFM7+Hh0raovhoesT+DwULTlSRf4Y4=;
b=VleY1xY+dP8JA4+rwtPVcD5Zrgx3s4uS3vGcNsgj5WlCPUc7IkDa4VLEg0BCBNWrEb
6meL/yjWI0PSqt+D5NT+d6yea96qHV37+k6mOmv+YcnbhhRC1hwPds/zg8pTavn/z7lY
3wYfs98DejYfxNehbw3MRsooja46/T+6fGgVkPyF0WZz+TFQ5o5UTCN+Rn28X4ccUMyc
RKRMTrG02fcDsEAIBs9pek/HzvnD9lK3kvHhkw6w4taZYOF0nNmLy79FBwoixBRzxGSx
CvNitQd/gNiT14K5HHECqmqONUa3jLo7SUe2Uc5RnfEyqh81hOj4AxDXbWxhfTELSa66
ge5A==
X-Gm-Message-State: AOAM531ZAssq6cW7o46MSO7UM763y6jrIRq4rgkF0OxFG30kIg4GDoZ9
/BQn+Fq0BgHv6P4ZrCJYjdY=
X-Google-Smtp-Source: ABdhPJyqt8hfZ2nPTnTdLHBt1e3N0ieKn7Sd3K6/vFtMZZShozeRYWgHb5522S9Up30PtnOSPNdQbw==
X-Received: by 2002:a5d:6284:: with SMTP id k4mr19646983wru.387.1627307739375;
Mon, 26 Jul 2021 06:55:39 -0700 (PDT)
Received: from localhost ([137.220.125.106])
by smtp.gmail.com with ESMTPSA id d8sm44465057wrv.20.2021.07.26.06.55.38
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 26 Jul 2021 06:55:38 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Guoyang Zhou <zhouguoyang@huawei.com>
Cc: dpdk stable <stable@dpdk.org>
Date: Mon, 26 Jul 2021 14:53:08 +0100
Message-Id: <20210726135322.149850-45-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com>
References: <20210712130551.2462159-1-luca.boccassi@gmail.com>
<20210726135322.149850-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/hinic: increase protection of the VLAN'
has been queued to stable release 20.11.3
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 20.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 07/28/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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/2ca9d750c9a6a6bd085343347de11209783c7e23
Thanks.
Luca Boccassi
---
>From 2ca9d750c9a6a6bd085343347de11209783c7e23 Mon Sep 17 00:00:00 2001
From: Guoyang Zhou <zhouguoyang@huawei.com>
Date: Fri, 16 Jul 2021 17:54:28 +0800
Subject: [PATCH] net/hinic: increase protection of the VLAN
[ upstream commit 2cfd68ec407609becd75661787043e7cae35f15c ]
If the VLAN id 0 is deleted for hinic, all packets without
VLAN will be discarded when the VLAN filter is turned on.
Fixes: 50ce3e7aec8f ("ethdev: fix VLAN offloads set if no relative capabilities")
Signed-off-by: Guoyang Zhou <zhouguoyang@huawei.com>
---
drivers/net/hinic/hinic_pmd_ethdev.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c
index f1b3ba3927..369d5003cd 100644
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -1617,6 +1617,9 @@ static int hinic_vlan_filter_set(struct rte_eth_dev *dev,
if (vlan_id > RTE_ETHER_MAX_VLAN_ID)
return -EINVAL;
+ if (vlan_id == 0)
+ return 0;
+
func_id = hinic_global_func_id(nic_dev->hwdev);
if (enable) {
--
2.30.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-07-26 13:53:18.376458416 +0100
+++ 0045-net-hinic-increase-protection-of-the-VLAN.patch 2021-07-26 13:53:15.937294472 +0100
@@ -1 +1 @@
-From 2cfd68ec407609becd75661787043e7cae35f15c Mon Sep 17 00:00:00 2001
+From 2ca9d750c9a6a6bd085343347de11209783c7e23 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2cfd68ec407609becd75661787043e7cae35f15c ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 946465779f..75849f28be 100644
+index f1b3ba3927..369d5003cd 100644