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 D5CE4A0C3F for ; Sat, 12 Jun 2021 01:07:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB7F44003F; Sat, 12 Jun 2021 01:07:28 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2043.outbound.protection.outlook.com [40.107.244.43]) by mails.dpdk.org (Postfix) with ESMTP id 7313B4003F for ; Sat, 12 Jun 2021 01:07:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D65Z/rbMBKgyyGp+9opRlY1cnKuly6cV+3wBwuT40q27YiQ7Yfd9pwknoRNhDGE3iuxwG8f41vD6qUUPGz5LrUn5HDHJ4I/rVkSeSIugexsCuo0TwQ+p3l8OmF5fD/XoNtRQibZ28nSdWGzSJemVJFrLY5+0YyNPibke/38C49gg9cOQe2VjUkXN7PZgTLwmdZRkhyrt66BdSzi+f8COjlDtSOI3gFg2t1JiXfiCxQXyVFT39YK5zZzXjjLVeSTYBXvHg30C3lOrIhIIz9bo13w6zGM/ksQ9Mp0E9EPsb4YeVL3ubXJrwJRgTZ7QKEttbuMeifhXECt5jD99bnZ93w== 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-SenderADCheck; bh=rzgYCh4nu8VH1OCzF/1qzl4ijqlHbRKkegajlhwDxkY=; b=k8TLz6W+GHCEan/jp0TczOA9ZEC9VbGAlZnZxHzxq2wAG5JmK6TKmitoZnyFZUMZtB54MCBppdwJ9IHP7qRxRPvvDZ/sC9pVHgT8IpEumlGXsyIuf15iK4YQTxHHV1ntCTSCW+al8Mzp9wT4kKR1u0vrhnCzyeu9CT42S7PJ7s0/6br/1G1cJ8TAiRy4bTCt51MXeZGp8lRm5ezgB+LvBv9GBtVuzrWqM8BlodDGya5lyPbpE6NtZxo0q2zhLx4Qjvvyfuh+dlWh+1fLPUM42fGE2fmHbe0WJPyxnshBMf3oVs6CDxTd0HJRfOyxboF4GJvsQ6LM5cUu0qfx9yoAow== 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=none sp=none 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=rzgYCh4nu8VH1OCzF/1qzl4ijqlHbRKkegajlhwDxkY=; b=XvMa4gd+TtdVPXjfk1fqyo6SSvCyQKNmQdNORJTIz7iYm7q6oLkHB6NchmAhexVryQT2WuDz4tnXogHi3U3S/RiJxG5OSq4eRaxpz7BciWYZIyluB17cwdBULwQbpKwE5TGnnoj/dh3HGCRiHKW+2Ygtq3QAq28kDnGIR45Vom293Yz9lWnPTCQ729YP3BUNopcVn2v+6ByjNTKC9Bgwia/o4XPRe5YhD4z8Bzcm8i++ohpn26ce5u9oCHcRZNVNfJdolNqhvL/XE1T3KBdOk9FUEMjVVFk7N7hg9NAm23Q4OsazCHv6TW3otFckosrgKbgQQg2QMCIRNVKNOMORAQ== Received: from MWHPR21CA0040.namprd21.prod.outlook.com (2603:10b6:300:129::26) by BYAPR12MB3192.namprd12.prod.outlook.com (2603:10b6:a03:139::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Fri, 11 Jun 2021 23:07:26 +0000 Received: from CO1NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:300:129:cafe::66) by MWHPR21CA0040.outlook.office365.com (2603:10b6:300:129::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.0 via Frontend Transport; Fri, 11 Jun 2021 23:07:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; 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 CO1NAM11FT048.mail.protection.outlook.com (10.13.175.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:07:26 +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.2; Fri, 11 Jun 2021 23:07:23 +0000 From: Xueming Li To: Chengchang Tang CC: Luca Boccassi , Min Hu , Ferruh Yigit , dpdk stable Date: Sat, 12 Jun 2021 07:02:01 +0800 Message-ID: <20210611230433.8208-27-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-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: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2942d7f8-d822-499a-ad9c-08d92d2dadbb X-MS-TrafficTypeDiagnostic: BYAPR12MB3192: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c0ddgClewR89hE6Zz0YcXqBDNMY3wB2h78qYs70P1MuPwnBxRoOPO2023p37/aw4BMevyK1mPk0o15I7B6w18RO+C4W7tgH6kzGSmWr5wPeylXNDofts60XVC8Suuy+PGaCotw8i3ICgGO50IV5DBe9LBncyQWDVBugJCvlDs7T2+3glCaIuwNWZgaBfoKVVofzoQZvym6YQtWW3TIIPAjwZZwJsIbmlLDOqa/Cy0YArIqSlBCIn8UFxSYPMkY8CLTa56u8IB9Rw15RKXe+kjYYrVO53u5Y3iK+nY69d+nNNMGHhgWWyBL50bLy5jhWwDB/Vtz+i/R32P6O6rvUw0E1CkkUIfvx/bCmmrPCxoM9wx2ZsruAMF1xfioxmN50qTjMtF2b8YpBNvP/kUF+dCtKMC4SaYa3Um0FkMGr1egcgmsg0zbS21KLm7oS81GSW+Zo/tdtkNkacyNHSPGtWBGkwitZgzOdFvMdvukoscggjWhuV9fRwB6wrw8C7Byc3x1du/ipz0f5cUAwsFLf9HsNo3fnuxim5x3NIcrj4/aSTf6VqmHc8i21nfRdiqEquNX9wnqtLgcwvAwlSnQEW8QUT6m4B4gG/r2Unojkek9Gf6C/wSiYneCAS67A9H+/vPNbawzs49NmNk/uXKwDphtLljYxdXRi2Ta+3VuwP0KEbeun5IReVR/vOPTFE1/O5C+QdOfTTuAUgNCQYOKAQrr/DvFcoA1bg23sUpDBJRWcRAZi+aDdo3ZxXiGYlazTj5pB4HV1OKyVHsDX3BBBKK7MLa7NKm2tP8hCqY6dbTowjCLGcvLap065N2AcecbHM 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)(346002)(136003)(396003)(376002)(39860400002)(36840700001)(46966006)(6286002)(7636003)(2616005)(2906002)(316002)(426003)(8676002)(336012)(36860700001)(8936002)(53546011)(966005)(36906005)(1076003)(26005)(186003)(16526019)(478600001)(4326008)(82310400003)(70206006)(70586007)(356005)(36756003)(55016002)(6916009)(5660300002)(82740400003)(47076005)(7696005)(83380400001)(6666004)(86362001)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:07:26.0032 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2942d7f8-d822-499a-ad9c-08d92d2dadbb 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: CO1NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3192 Subject: [dpdk-stable] patch 'net/bonding: fix socket ID check' has been queued to stable release 20.11.2 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 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/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/adefa69ef3d394fc249d90295414c69e14e9a5a1 Thanks. Xueming Li --- >From adefa69ef3d394fc249d90295414c69e14e9a5a1 Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Tue, 27 Apr 2021 19:39:41 +0800 Subject: [PATCH] net/bonding: fix socket ID check Cc: Luca Boccassi [ upstream commit f294e04851fda95ef7842319865d53d2df0da0d1 ] The socket ID entered by user is cast to an unsigned integer. However, the value may be an illegal negative value, which may cause some problems. In this case, an error should be returned. In addition, the socket ID may be an invalid positive number, which is also processed in this patch. Fixes: 2efb58cbab6e ("bond: new link bonding library") Signed-off-by: Chengchang Tang Signed-off-by: Min Hu (Connor) Reviewed-by: Ferruh Yigit --- drivers/net/bonding/rte_eth_bond_args.c | 8 ++++---- drivers/net/bonding/rte_eth_bond_pmd.c | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c index 8c5f90dc63..764b1b8c8e 100644 --- a/drivers/net/bonding/rte_eth_bond_args.c +++ b/drivers/net/bonding/rte_eth_bond_args.c @@ -200,20 +200,20 @@ int bond_ethdev_parse_socket_id_kvarg(const char *key __rte_unused, const char *value, void *extra_args) { - int socket_id; + long socket_id; char *endptr; if (value == NULL || extra_args == NULL) return -1; errno = 0; - socket_id = (uint8_t)strtol(value, &endptr, 10); + socket_id = strtol(value, &endptr, 10); if (*endptr != 0 || errno != 0) return -1; /* validate socket id value */ - if (socket_id >= 0) { - *(uint8_t *)extra_args = (uint8_t)socket_id; + if (socket_id >= 0 && socket_id < RTE_MAX_NUMA_NODES) { + *(int *)extra_args = (int)socket_id; return 0; } return -1; diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 9bcef952ea..ec7db3dcd3 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3325,8 +3325,9 @@ bond_probe(struct rte_vdev_device *dev) const char *name; struct bond_dev_private *internals; struct rte_kvargs *kvlist; - uint8_t bonding_mode, socket_id/*, agg_mode*/; - int arg_count, port_id; + uint8_t bonding_mode; + int arg_count, port_id; + int socket_id; uint8_t agg_mode; struct rte_eth_dev *eth_dev; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.398069600 +0800 +++ 0027-net-bonding-fix-socket-ID-check.patch 2021-06-12 06:53:56.140000000 +0800 @@ -1 +1 @@ -From f294e04851fda95ef7842319865d53d2df0da0d1 Mon Sep 17 00:00:00 2001 +From adefa69ef3d394fc249d90295414c69e14e9a5a1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit f294e04851fda95ef7842319865d53d2df0da0d1 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -54 +56 @@ -index 25b1f771a1..6ba09c4d9e 100644 +index 9bcef952ea..ec7db3dcd3 100644 @@ -57 +59 @@ -@@ -3333,8 +3333,9 @@ bond_probe(struct rte_vdev_device *dev) +@@ -3325,8 +3325,9 @@ bond_probe(struct rte_vdev_device *dev)