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 77889A034F
for <public@inbox.dpdk.org>; Wed, 10 Nov 2021 07:59:46 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 72CE041100;
Wed, 10 Nov 2021 07:59:46 +0100 (CET)
Received: from NAM02-SN1-obe.outbound.protection.outlook.com
(mail-sn1anam02on2053.outbound.protection.outlook.com [40.107.96.53])
by mails.dpdk.org (Postfix) with ESMTP id 9F552410EF
for <stable@dpdk.org>; Wed, 10 Nov 2021 07:59:45 +0100 (CET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=RRLOwI9BWIzl5rRnLDnebYJ6HD84+dw45X/8JH2fBW11GaXxXtMaUN9x3cJUB7+0oHxzfpeh1TTKPHpidZjuDZ2NwJpnaqrPNQJCERVWacS4GCiUwd7Sz7tDyTRNufxTw20BLxtnsMWjeF80Z/FBk3QrxWuNb34b0qyEtTbKj6ovkbxtSKZmKh8RIMiNzDOJCLyjtbFnAwY3qcbCnEFC0iv/zB/R0rZcj2myi9PSJV0wM7GGxhqVg9f+GU1fGULER1x+bCtBfqgt4Tpd65k8O6q/AIThzmMcW1bG4YmRsjmDxTHwZdnqjY++cbvlMkUgXFwNkZc2HEBbXpkPSDebOg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector9901;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=csA6FmTc2aJHf+1Ok/qk7XGkIJC09wDs75dqT2YxXPU=;
b=hsbweNBOAvolBNPEHZwEIf5lC5h19M4NXqInOgkQbUKzxL7z1c6MWMDbmbq6JUGUhimmvildzTMFxo7yfSV2iZROWbfAWpeHlC+oRrgsk6LtDWg5n1CEKYLPNb1ikp6CFxSMCsgaSrL6yDLZNPEl3jXoCkbZS0UjITrSEkrdDs59i1+sdxqpxgmJKgI1njN8TujgAh3h0ThEFPsADGwj7tGIpde0rUAbH9yA82FWXb8D9iJZkfcqLRnIGqjRSp3Yo/Ce4vVJPFDLjBR4p4BW39ALPIHc+LC0yJ1oFb++jFwlalkzEgGNngRU5dHuU9JoZbZjsvIQD4FniAyF59DoKQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com;
dmarc=pass (p=quarantine sp=quarantine pct=100) action=none
header.from=nvidia.com; dkim=none (message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;
s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=csA6FmTc2aJHf+1Ok/qk7XGkIJC09wDs75dqT2YxXPU=;
b=WLgZ9yrkAIkwKLUJijEm6ce2o1sLv6mAwehGNtj0GHu4oORWpHiCvLtPJfIBd+qwWiJuLSHqSEKp6G43Z83A3g/NrYkz5O2T6cSyL9ulmM5D6or5Bta6l2w5x0DUuhvBXKxcqL2mRVpjkMuYZ6nXCqUmcjNGwddzFYUX+RSFVF1h5qblMJKj6W46cxxQiNFl6liW9xYjxkTId6s0CQ596Os7NT6oQzpEPQts07qXferKJPRNBhcuLNcCzfczH3VO8fkeaa7Ov0RejumiyZekcS/dE9y0nQfXF80mOvaZQpTb+xChCsZYucFbbZnMo0J6wtW2LZbhlvYPYgxwrHESBQ==
Received: from DM6PR11CA0034.namprd11.prod.outlook.com (2603:10b6:5:190::47)
by DM5PR12MB1324.namprd12.prod.outlook.com (2603:10b6:3:76::11) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15; Wed, 10 Nov
2021 06:59:37 +0000
Received: from DM6NAM11FT047.eop-nam11.prod.protection.outlook.com
(2603:10b6:5:190:cafe::c5) by DM6PR11CA0034.outlook.office365.com
(2603:10b6:5:190::47) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.16 via Frontend
Transport; Wed, 10 Nov 2021 06:59:37 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34)
smtp.mailfrom=nvidia.com; dkim=none (message not signed)
header.d=none;dmarc=pass action=none header.from=nvidia.com;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
216.228.112.34 as permitted sender) receiver=protection.outlook.com;
client-ip=216.228.112.34; helo=mail.nvidia.com;
Received: from mail.nvidia.com (216.228.112.34) by
DM6NAM11FT047.mail.protection.outlook.com (10.13.172.139) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:59:37 +0000
Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com
(172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov
2021 06:59:35 +0000
From: Xueming Li <xuemingl@nvidia.com>
To: Chengwen Feng <fengchengwen@huawei.com>
CC: Luca Boccassi <bluca@debian.org>, Min Hu <humin29@huawei.com>, Ferruh
Yigit <ferruh.yigit@intel.com>, dpdk stable <stable@dpdk.org>
Date: Wed, 10 Nov 2021 14:32:09 +0800
Message-ID: <20211110063216.2744012-246-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com>
References: <20211110063216.2744012-1-xuemingl@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [172.20.187.5]
X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To
HQMAIL107.nvidia.com (172.20.187.13)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 067a8f39-f4b4-4f0b-d5ac-08d9a417a8d9
X-MS-TrafficTypeDiagnostic: DM5PR12MB1324:
X-Microsoft-Antispam-PRVS: <DM5PR12MB1324EB2BA9B49D63DFB9D711A1939@DM5PR12MB1324.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:3513;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 2N45cKdWKhYwIVzmY437CNWBA4BZ9hO6q3KxKi8VJ0Fb7xY5CpKhYDtApViCuTs3nRdDeLo3yJ/W//dcrFxz9haZy/Imdg3nenfUzkPduSfavksp7VWSlkMLTIyQk6qvOxRzyd7ZL5PHul/hv3fOzre6yYG827WomfP0Aa8of1LhttmLw/heLPePx92Y200jf3SFFYfudbWrNEmSfA8BFE+CZmGHwZLmpIsMbUtofI4/Fq0S2aMjYm8v23LqamNqPaEsUPwzGlDesn6hGr6dWtQFNmobcvNMqCe67MBeFG3EaUdpcnyJ5N6KvNBXFoeE38cDV0sofqjfF0NEoRvieOtHm5VSbyVMjp0WwuNcWYVLPaoGPDbVyX0h72y6SRSZXqXmleLHcymyiWQVh7WA8USvkleKbSL8rGXAJPlpTSJddtLyyD3u1tmweJV9rRSBzHOALDkkDY+12buNjkSTZgU7mN3Gd7jMv8IRLrXDNkMVpSLvNU/zc5ifcC4OnRUO1YgYTg/4QWquO4z3gJ/7QWGPSlhBImS9IHwkVJG+1O/xOXIf/vyXP7bG94lKTF39QbW9ExOYpzEboHtJHqXAEL7u2hRI0vQ5AmgilhRgcU6TKv4cpzBsL1H4wKIMxkdP3wlQT16uEDtH/H4FdGyKe/z6ut9ptHVg00Gqqv6PgYA2+iRMr58sZqKR+LkSnukbCY3zFeIWCJ9QYylm4OFxvGo726QzbsdB2gQ5iF8nInIs/mgLDHSpNzMRMqftk6jFeCbFpJSGC7IsgKl8jAWxqQZYU95p9bEZdwSxv0xfhyACdfUF2Ffv2El2C+ztDdubCgZ4hg/TIZyyoNqvxkkalw==
X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;
SFS:(4636009)(36840700001)(46966006)(356005)(2616005)(6286002)(8936002)(508600001)(966005)(1076003)(83380400001)(6916009)(7696005)(16526019)(4326008)(36756003)(426003)(55016002)(4001150100001)(8676002)(6666004)(336012)(5660300002)(2906002)(54906003)(53546011)(26005)(47076005)(36906005)(70586007)(7636003)(70206006)(186003)(316002)(86362001)(82310400003)(36860700001);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:59:37.2607 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 067a8f39-f4b4-4f0b-d5ac-08d9a417a8d9
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT047.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1324
Subject: [dpdk-stable] patch 'kni: check error code of allmulticast mode
switch' has been queued to stable release 20.11.4
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.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/12/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/steevenlee/dpdk
This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/686908c0164bdafd3aeef65dc691af78c55eda2f
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
>From 686908c0164bdafd3aeef65dc691af78c55eda2f Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen@huawei.com>
Date: Fri, 23 Apr 2021 16:12:42 +0800
Subject: [PATCH] kni: check error code of allmulticast mode switch
Cc: Xueming Li <xuemingl@nvidia.com>
[ upstream commit b1f4933ef320cfc9096101499b711d0dd65f2e51 ]
Some drivers may return errcode when switch allmulticast mode,
so it's necessary to check the return code.
Fixes: b34801d1aa2e ("kni: support allmulticast mode set")
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
lib/librte_kni/rte_kni.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index eb24b0d0ae..17e4487306 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -514,6 +514,8 @@ kni_config_promiscusity(uint16_t port_id, uint8_t to_on)
static int
kni_config_allmulticast(uint16_t port_id, uint8_t to_on)
{
+ int ret;
+
if (!rte_eth_dev_is_valid_port(port_id)) {
RTE_LOG(ERR, KNI, "Invalid port id %d\n", port_id);
return -EINVAL;
@@ -523,11 +525,16 @@ kni_config_allmulticast(uint16_t port_id, uint8_t to_on)
port_id, to_on);
if (to_on)
- rte_eth_allmulticast_enable(port_id);
+ ret = rte_eth_allmulticast_enable(port_id);
else
- rte_eth_allmulticast_disable(port_id);
+ ret = rte_eth_allmulticast_disable(port_id);
+ if (ret != 0)
+ RTE_LOG(ERR, KNI,
+ "Failed to %s allmulticast mode for port %u: %s\n",
+ to_on ? "enable" : "disable", port_id,
+ rte_strerror(-ret));
- return 0;
+ return ret;
}
int
--
2.33.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-11-10 14:17:12.672163735 +0800
+++ 0245-kni-check-error-code-of-allmulticast-mode-switch.patch 2021-11-10 14:17:02.090744291 +0800
@@ -1 +1 @@
-From b1f4933ef320cfc9096101499b711d0dd65f2e51 Mon Sep 17 00:00:00 2001
+From 686908c0164bdafd3aeef65dc691af78c55eda2f Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit b1f4933ef320cfc9096101499b711d0dd65f2e51 ]
@@ -10 +12,0 @@
-Cc: stable@dpdk.org
@@ -16 +18 @@
- lib/kni/rte_kni.c | 13 ++++++++++---
+ lib/librte_kni/rte_kni.c | 13 ++++++++++---
@@ -19,4 +21,4 @@
-diff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c
-index d3e236005e..fc8f0e7b5a 100644
---- a/lib/kni/rte_kni.c
-+++ b/lib/kni/rte_kni.c
+diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
+index eb24b0d0ae..17e4487306 100644
+--- a/lib/librte_kni/rte_kni.c
++++ b/lib/librte_kni/rte_kni.c