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 4409942D83 for ; Wed, 28 Jun 2023 16:11:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3FD1640151; Wed, 28 Jun 2023 16:11:18 +0200 (CEST) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id D0283400EF for ; Wed, 28 Jun 2023 16:11:16 +0200 (CEST) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-313f61890fbso2973925f8f.3 for ; Wed, 28 Jun 2023 07:11:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687961476; x=1690553476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JYl6kztJKwLBwiMXmI+ieONkRY0j+fEfdOZOmCzO79M=; b=LLnnt6DlvjfG1LoqjhDjbTD/qKFKNxHN9+7iA6rfnwbCSEyTcBStj6FFzBrY/BCVyc AWzO2ebk5nrsDK/sXccB23sgsyC7ANUI2xjdlLeZbJS1BZc8nMATwAxniiD1Y4FXL6tN bHjUwLbh5phXmUaYJ5KRoqjKvIwKjV8rP1gYMuLmUAKpkEPywAlyvzQkqvOT/XMxvDEZ mymufW/jXoCtpkWYxjteLxas94+2MxYyRFQlBWFTYPgPYGmWXWA3oCnTZg5B582Mr6De vwjHmXaWv3mwXDrFusKtyZFa/kwMso7kWhqmpXmYL+oPaQI3Q9danWK8I7QAnih265uU rt+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687961476; x=1690553476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JYl6kztJKwLBwiMXmI+ieONkRY0j+fEfdOZOmCzO79M=; b=IQUPyTeRFTxz8IRttk4x+x8GcJhfic9VMI9WVHUle0TPQFesfX2esgbUS+q4/eT9YB xgOLvBuMpa0RQVAvVlnPJvvsbFWyTDW6vYTUhVHrwUcqtnIFbA/Hp/VAAw+HKiNJplii LVhd3DQf6b7Tn51aysdN3+tlWLBo9w5xvUjK1ZlOSPGreWfpecUcdOS6c5gBbjDVk3eP tE7KKkBy2MqTPH/Qnlj6dEE0JJLq4qrm7zTVBhBCDvMsqi/q4wESXwh5lPJISo0h/ov3 BPxUQTGNZ0F2Sg9/6c1wmXctYBNzdP8fs5kYu3s1q1wLcdWtLVvT711zVmcQ26tyxFRL m1yA== X-Gm-Message-State: AC+VfDyY6elWosFX78/RSfiacOjLrT44Grs8k4n61WFpRDaYE1US+920 YYV1WMskDy9aZXHO4mKMLV/bV6ExudXitQ== X-Google-Smtp-Source: ACHHUZ5tyt9u3KXNynRqti2WWYhi9q1lQkjmSsSX7qT4RGb6HrfMgB1qgTVWK2sO6YoymbXOD+Ug0A== X-Received: by 2002:a5d:44c7:0:b0:311:b44:2d74 with SMTP id z7-20020a5d44c7000000b003110b442d74mr25961139wrr.0.1687961476271; Wed, 28 Jun 2023 07:11:16 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id u3-20020a05600c00c300b003faa6ce54b2sm7951019wmm.2.2023.06.28.07.11.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 07:11:15 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.9 Date: Wed, 28 Jun 2023 15:10:32 +0100 Message-Id: <20230628141046.2145871-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230628141046.2145871-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-63-luca.boccassi@gmail.com> <20230628141046.2145871-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.9 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/30/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/c012d925d9e5e581cb1a8a7bd8c622c4fcdca79d Thanks. Luca Boccassi --- >From c012d925d9e5e581cb1a8a7bd8c622c4fcdca79d 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 [ 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 764b1b8c8e..1b27e0f779 100644 --- a/drivers/net/bonding/rte_eth_bond_args.c +++ b/drivers/net/bonding/rte_eth_bond_args.c @@ -211,6 +211,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 164a1d1575..3dcdae72b6 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3306,7 +3306,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; @@ -3506,7 +3506,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; @@ -3531,7 +3531,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-28 11:40:08.414268209 +0100 +++ 0008-net-bonding-fix-startup-when-NUMA-is-not-supported.patch 2023-06-28 11:40:08.048027340 +0100 @@ -1 +1 @@ -From 85e6be63dfa8bff9c42ab0b4dea6fcbba7d680b2 Mon Sep 17 00:00:00 2001 +From c012d925d9e5e581cb1a8a7bd8c622c4fcdca79d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 85e6be63dfa8bff9c42ab0b4dea6fcbba7d680b2 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 6553166f5c..c137efd55f 100644 +index 764b1b8c8e..1b27e0f779 100644 @@ -32 +33 @@ -@@ -212,6 +212,12 @@ bond_ethdev_parse_socket_id_kvarg(const char *key __rte_unused, +@@ -211,6 +211,12 @@ bond_ethdev_parse_socket_id_kvarg(const char *key __rte_unused, @@ -46 +47 @@ -index f0c4f7d26b..73205f78f4 100644 +index 164a1d1575..3dcdae72b6 100644 @@ -49 +50 @@ -@@ -3604,7 +3604,7 @@ static int +@@ -3306,7 +3306,7 @@ static int @@ -58 +59 @@ -@@ -3806,7 +3806,7 @@ bond_probe(struct rte_vdev_device *dev) +@@ -3506,7 +3506,7 @@ bond_probe(struct rte_vdev_device *dev) @@ -67 +68 @@ -@@ -3831,7 +3831,7 @@ bond_probe(struct rte_vdev_device *dev) +@@ -3531,7 +3531,7 @@ bond_probe(struct rte_vdev_device *dev)