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 CF19F4301E for ; Thu, 10 Aug 2023 01:51:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C430440DD8; Thu, 10 Aug 2023 01:51:51 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2079.outbound.protection.outlook.com [40.107.94.79]) by mails.dpdk.org (Postfix) with ESMTP id 83AAE406B6 for ; Thu, 10 Aug 2023 01:51:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hT3ACG849v7WYRsTEvFB9B1ZzPayua+r6Z3twGNbvpgSKUdW19ribspwSXztnqeF5m0RQ/NoyOY2KmVu0jpcHH91v6yT09J6SIPxvVKAyG+F0SEQLFGDurgSDKbKmGvbNkMIT9M6jvudYzqydZb/sahK3AbzLHgDq2YwoZ52PQjy7qRpEQfjhAhLq+EAufyGqCHzX2+ynhqFY85pBEqHlcs/A8I2bqmoRGpf6GCHBO3NIVPk9wmYio/DfgUQh+CxLPpLbfSVcxBWsZyE8XHL/yrObE7ZiHHRydd7FWSsdfKErcnCjJoJtNwkiixGtT9nVN8ok2oOF+uIm9KJzOvvWQ== 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=QLYUCGbpzpnbCbB9tA8N7YtYuK0Hwi9fNKvm4wRr1Ts=; b=RGDtbXtxlwWOln8JTVzkFt3Tjb/iGhMP8S2iqzgeGDzggk1i6t1dEzFeScusoU70qec5a8X97GQ+OaCVt/ceU7vCjCcbet2TdhgFb1yPE3Vyf0iDFkc58lMcY84V82YM5cjNudIdUJgYXauWiMPwXcbxtgPrzMSQCgc1cbWOxJmLM41QmggBnyH+9Sj/N3p7v+hpo8rDE5y8lHKWraUcKpL3jab/3LB74pdmmW+sIv+0YgMd2QNYucxjDucIA5SekxKK7iEKd1xXrtBzq55AWuDxoR3UGSNIhhBT2uLCGMn1327czsfkvpNd5hPvP6UEuhctXDstAtonMx65ea37/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=QLYUCGbpzpnbCbB9tA8N7YtYuK0Hwi9fNKvm4wRr1Ts=; b=DajZrdpAEEVSwNK3Dz8KeGv6+WVNDBQAcgW3B76MBxXvB11+48JinGuztX44jcQaF6xZwbzgzpuQxdEG3VyjdV3xCDWEdvj0HoEO1UgxJbhxE/47X/M/hSR7F8vIgvBP9+XYjCc3HKkoN0t3rKqq1M5ANV/sNrgbs8bhgz8cd8D8Mr+CLvA7s23kgaTsXzlE1FexKm9DhIEBqR0O23ObU3xuxIRUTvI78Y9SJfomPNd9KV3aIducbzaqWltt5JKKhd6IqYNUXEMFp5KzuZYQw+eas/9iRdQivJhechIf2TQPqRk7bxkMf5dLREHuMbVG8GDGU7rXNYUXoN03EG/Reg== Received: from DS7PR03CA0028.namprd03.prod.outlook.com (2603:10b6:5:3b8::33) by MW4PR12MB7239.namprd12.prod.outlook.com (2603:10b6:303:228::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:51:48 +0000 Received: from CY4PEPF0000E9D7.namprd05.prod.outlook.com (2603:10b6:5:3b8:cafe::4) by DS7PR03CA0028.outlook.office365.com (2603:10b6:5:3b8::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:51:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000E9D7.mail.protection.outlook.com (10.167.241.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:51:47 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 16:51:38 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Wed, 9 Aug 2023 16:51:36 -0700 From: Xueming Li To: Zerun Fu CC: Peng Zhang , Chaoyong He , Long Wu , Min Hu , dpdk stable Subject: patch 'net/bonding: fix startup when NUMA is not supported' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:42 +0800 Message-ID: <20230809234930.32424-21-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D7:EE_|MW4PR12MB7239:EE_ X-MS-Office365-Filtering-Correlation-Id: 38bf1e10-77fa-4289-9aa4-08db99339813 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s6pgjbFdrtxN61vt/zVKnxFdCFDNxaJI49/qvr6bh8J+o/tF0YU32owczRepIl8TX0B0y0ufezDSFHf8VkHtpk4CBo8T/LdUR+9sS2SeOyvdDUjYuT67LoMXU9+lwAVmcOUl1I/XXJbdc8/NeXxIZuae0wBPC+vONK3i82w0mNQy7s/Rg3GmC/PvulnzFNKRexymiCm42BGyrs4c7vMwSWRFMU4ZnlZDcxpL3JF4MISmJZURgEYi7JCGGpKx2vaqIClJUXTN8D4/lj/Mg3DOcK4W8eeYu5YnhCCG0mD77sN57bfb996ZSaQPNZmAUQ0fcbYNaqD4z1kH+c501RFE7nGyrLQFEyHmwWDKPOQMrXK0v6HM1FwaDLRxjO745lgFIaFt2qKANrr/RfvlK3JB8S3H+yYjqNXt5aTAAEQOTK30NC2orTT8VzkWeax02u5SWGXWuF4Ulie4PznhQblM75qJA29/Nnwey9M4QjWHUHF0HFOZVBwtut1CiaunasmoSINsYletjT+jgOw07FVuj/YurHmV2O2TPVJBQxu1mC3EeLO9+p3NJOfVfHnEewdSAnTziJEvgwNWcx+3L7+VXXYcReHXbbLbxoWN5NTb+1DQzgVu5CxNqLkE9IoNQPC47FnN73fSxIp45bPEc3UcWsfgbm5XHDFfsBjfgOkJjOzRCyd5jzYheygoFi8xsGqaCZkpSrRiniUt0L1G2oV9H30JR5c0LSqL22j5xJunDOI5IfBd+iCxsXLapYYystg1OZk5cAey13vTfc4vTXu0DA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(396003)(376002)(39860400002)(346002)(136003)(186006)(1800799006)(82310400008)(451199021)(40470700004)(36840700001)(46966006)(41300700001)(54906003)(5660300002)(70586007)(70206006)(316002)(6916009)(4326008)(6666004)(7696005)(966005)(36860700001)(8936002)(8676002)(1076003)(336012)(26005)(478600001)(83380400001)(356005)(7636003)(82740400003)(86362001)(55016003)(36756003)(40460700003)(6286002)(16526019)(53546011)(2616005)(2906002)(47076005)(426003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:51:47.5610 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 38bf1e10-77fa-4289-9aa4-08db99339813 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D7.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7239 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 Hi, FYI, your patch has been queued to stable release 22.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 08/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c193423238e8e1e82256ccdd574f6098f568f28f Thanks. Xueming Li --- >From c193423238e8e1e82256ccdd574f6098f568f28f Mon Sep 17 00:00:00 2001 From: Zerun Fu Date: Fri, 16 Jun 2023 15:20:34 +0800 Subject: [PATCH] net/bonding: fix startup when NUMA is not supported Cc: Xueming Li [ upstream commit 85e6be63dfa8bff9c42ab0b4dea6fcbba7d680b2 ] After the mainline Linux kernel commit "fe205d984e7730f4d21f6f8ebc60f0698404ac31" (ACPI: Remove side effect of partly creating a node in acpi_map_pxm_to_online_node) by Jonathan Cameron. When the system does not support NUMA architecture, the "socket_id" is expected to be -1. The valid "socket_id" in BOND PMD is greater than or equal to zero. So it will cause an error when DPDK checks the validity of the "socket_id" when starting the bond. This commit can fix this bug. Fixes: f294e04851fd ("net/bonding: fix socket ID check") Signed-off-by: Zerun Fu Reviewed-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Long Wu Acked-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_args.c | 6 ++++++ drivers/net/bonding/rte_eth_bond_pmd.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c index 6553166f5c..c137efd55f 100644 --- a/drivers/net/bonding/rte_eth_bond_args.c +++ b/drivers/net/bonding/rte_eth_bond_args.c @@ -212,6 +212,12 @@ bond_ethdev_parse_socket_id_kvarg(const char *key __rte_unused, if (*endptr != 0 || errno != 0) return -1; + /* SOCKET_ID_ANY also consider a valid socket id */ + if ((int8_t)socket_id == SOCKET_ID_ANY) { + *(int *)extra_args = SOCKET_ID_ANY; + return 0; + } + /* validate socket id value */ if (socket_id >= 0 && socket_id < RTE_MAX_NUMA_NODES) { *(int *)extra_args = (int)socket_id; diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index b9bcebc6cb..8cd78ce1ed 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3362,7 +3362,7 @@ static int bond_alloc(struct rte_vdev_device *dev, uint8_t mode) { const char *name = rte_vdev_device_name(dev); - uint8_t socket_id = dev->device.numa_node; + int socket_id = dev->device.numa_node; struct bond_dev_private *internals = NULL; struct rte_eth_dev *eth_dev = NULL; uint32_t vlan_filter_bmp_size; @@ -3564,7 +3564,7 @@ bond_probe(struct rte_vdev_device *dev) port_id = bond_alloc(dev, bonding_mode); if (port_id < 0) { RTE_BOND_LOG(ERR, "Failed to create socket %s in mode %u on " - "socket %u.", name, bonding_mode, socket_id); + "socket %d.", name, bonding_mode, socket_id); goto parse_error; } internals = rte_eth_devices[port_id].data->dev_private; @@ -3589,7 +3589,7 @@ bond_probe(struct rte_vdev_device *dev) rte_eth_dev_probing_finish(&rte_eth_devices[port_id]); RTE_BOND_LOG(INFO, "Create bonded device %s on port %d in mode %u on " - "socket %u.", name, port_id, bonding_mode, socket_id); + "socket %d.", name, port_id, bonding_mode, socket_id); return 0; parse_error: -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:18.799616400 +0800 +++ 0020-net-bonding-fix-startup-when-NUMA-is-not-supported.patch 2023-08-09 21:51:18.144352000 +0800 @@ -1 +1 @@ -From 85e6be63dfa8bff9c42ab0b4dea6fcbba7d680b2 Mon Sep 17 00:00:00 2001 +From c193423238e8e1e82256ccdd574f6098f568f28f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 85e6be63dfa8bff9c42ab0b4dea6fcbba7d680b2 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -46 +48 @@ -index f0c4f7d26b..73205f78f4 100644 +index b9bcebc6cb..8cd78ce1ed 100644 @@ -49 +51 @@ -@@ -3604,7 +3604,7 @@ static int +@@ -3362,7 +3362,7 @@ static int @@ -58 +60 @@ -@@ -3806,7 +3806,7 @@ bond_probe(struct rte_vdev_device *dev) +@@ -3564,7 +3564,7 @@ bond_probe(struct rte_vdev_device *dev) @@ -67 +69 @@ -@@ -3831,7 +3831,7 @@ bond_probe(struct rte_vdev_device *dev) +@@ -3589,7 +3589,7 @@ bond_probe(struct rte_vdev_device *dev)