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 7836FA0557 for ; Wed, 16 Nov 2022 11:40:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74DF740F16; Wed, 16 Nov 2022 11:40:28 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 2405340E03 for ; Wed, 16 Nov 2022 11:40:25 +0100 (CET) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id EB7883F0A2 for ; Wed, 16 Nov 2022 10:40:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668595224; bh=j1ITXJM0c7gUYsM2i/hMYxnEGd18Ac1h/CHwbPZ/lC8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sUrVS/5NUTcfkyIkycFEPZeeMU7zZG2XwXRQ0AOnghYpz85HgRSn1RbZ0cjHx3P8G BRiIzDbwtiN04IqCfoArRChZyt5ihtrWY7zo32OmYaV7inkqoR5GMtDpjRWRpHG9+2 pgacwr59W0NI0z4SZowJ52y53hFLknLcJH9LMKQcajMW6xF+0wqStMMlI4ZA1tTtDZ ah4K/N6n0leeWuBNukpU+0UChBcyonNX3ktH2s9dJk/4wjs0WJFVZfeBf0PIqrfthX jIIr/lJlFX67HwrqiqL9FG/C/SP0xjn8L6/SdrIkxvCjPr6nqHr1WdwjLOB6Dt5ONL E//fBidwF/ifw== Received: by mail-wr1-f69.google.com with SMTP id v12-20020adfa1cc000000b00236eaee7197so3526755wrv.0 for ; Wed, 16 Nov 2022 02:40:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=j1ITXJM0c7gUYsM2i/hMYxnEGd18Ac1h/CHwbPZ/lC8=; b=pzei93aAFYEUFPaLn6UybbRNI/RGIpHJrq8KVfvPd5+gD5LoBY9OQu45v/4VG9E8Iq aLBomWnYA2KesWYc9sPFnDh09EwP20NRzSck6Sr3EcQsztJI3AjlMUdUF8P4BjzZ66x5 CLiIyeFB4sEvWjXI8AtFK+QdDpQVjzvsLsKV8KZmyvmmdCDLLpjxKfS+CRkproKd2MhO x3O5A/q4XdXWaCyu/sTicbwKK2U//Lp1txaR10LGhVOzqTWhsFnz2fed1AfsxOjKTDto mUpNrb8e6frcBw6OHfxVHVA3NdDQU7UQS9GvxOlqZn/zi+DmoIEI2QoSZhaRV7AfEmDG c/pg== X-Gm-Message-State: ANoB5pnfSgk5G1JqtalgfnrU6I7y9m/EDigKyajn14+WSQYBfSqFypS9 DfmsLFgwRvuqiMV1hLfXWS9ZWNFFeSDhO7WzC65zKyuVUIPFJVU0+RQE/CtCN8W/49n55Hf0ljs WUz8xPBZqO2RREjNkjlIo0kJV X-Received: by 2002:adf:f209:0:b0:241:792e:237a with SMTP id p9-20020adff209000000b00241792e237amr11551401wro.511.1668595224620; Wed, 16 Nov 2022 02:40:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf4AawdhCNG6P27k/Zkv6A3ss4ZEpw+s7PkWw66X9gm+RWSopVnCpjuD3shZ9g4Ux8ac6Lx3+g== X-Received: by 2002:adf:f209:0:b0:241:792e:237a with SMTP id p9-20020adff209000000b00241792e237amr11551388wro.511.1668595224324; Wed, 16 Nov 2022 02:40:24 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39e5:dd00:975:f38b:96af:696f]) by smtp.gmail.com with ESMTPSA id u7-20020adff887000000b0023538fb27c1sm14662469wrp.85.2022.11.16.02.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 02:40:23 -0800 (PST) From: christian.ehrhardt@canonical.com To: Huisong Li Cc: Stephen Hemminger , dpdk stable Subject: patch 'net/bonding: fix mbuf fast free handling' has been queued to stable release 19.11.14 Date: Wed, 16 Nov 2022 11:39:59 +0100 Message-Id: <20221116104012.2975036-4-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116104012.2975036-1-christian.ehrhardt@canonical.com> References: <20221116104012.2975036-1-christian.ehrhardt@canonical.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 19.11.14 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/23/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/03d094959aa50c899d5494599d579b64f60dc243 Thanks. Christian Ehrhardt --- >From 03d094959aa50c899d5494599d579b64f60dc243 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 9 Nov 2022 10:22:37 +0800 Subject: [PATCH] net/bonding: fix mbuf fast free handling [ upstream commit b4924c0db589b5d4698abfab3ce60978d9df518b ] The RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE offload can't be used in bonding mode Broadcast and mode 8023AD. Currently, bonding driver forcibly removes from the dev->data->dev_conf.txmode.offloads and processes as success in bond_ethdev_configure(). But this still cause that rte_eth_dev_configure() fails to execute because of the failure of validating Tx offload in the eth_dev_validate_offloads(). So this patch moves the modification of txmode offlaods to the stage of adding slave device to report the correct txmode offloads. Fixes: 18c41457cbae ("net/bonding: fix mbuf fast free usage") Signed-off-by: Huisong Li Acked-by: Stephen Hemminger --- drivers/net/bonding/rte_eth_bond_api.c | 5 +++++ drivers/net/bonding/rte_eth_bond_pmd.c | 11 ----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index 7ae865c2cf..7b8d6fde91 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -536,6 +536,11 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) return ret; } + /* Bond mode Broadcast & 8023AD don't support MBUF_FAST_FREE offload. */ + if (internals->mode == BONDING_MODE_8023AD || + internals->mode == BONDING_MODE_BROADCAST) + internals->tx_offload_capa &= ~DEV_TX_OFFLOAD_MBUF_FAST_FREE; + bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf &= internals->flow_type_rss_offloads; diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 334a06cf73..24d9c1b414 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3569,7 +3569,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev) const char *name = dev->device->name; struct bond_dev_private *internals = dev->data->dev_private; struct rte_kvargs *kvlist = internals->kvlist; - uint64_t offloads; int arg_count; uint16_t port_id = dev - rte_eth_devices; uint8_t agg_mode; @@ -3630,16 +3629,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev) } } - offloads = dev->data->dev_conf.txmode.offloads; - if ((offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE) && - (internals->mode == BONDING_MODE_8023AD || - internals->mode == BONDING_MODE_BROADCAST)) { - RTE_BOND_LOG(WARNING, - "bond mode broadcast & 8023AD don't support MBUF_FAST_FREE offload, force disable it."); - offloads &= ~DEV_TX_OFFLOAD_MBUF_FAST_FREE; - dev->data->dev_conf.txmode.offloads = offloads; - } - /* set the max_rx_pktlen */ internals->max_rx_pktlen = internals->candidate_max_rx_pktlen; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-16 11:36:50.581581891 +0100 +++ 0004-net-bonding-fix-mbuf-fast-free-handling.patch 2022-11-16 11:36:50.404775402 +0100 @@ -1 +1 @@ -From b4924c0db589b5d4698abfab3ce60978d9df518b Mon Sep 17 00:00:00 2001 +From 03d094959aa50c899d5494599d579b64f60dc243 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b4924c0db589b5d4698abfab3ce60978d9df518b ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 694fe86115..c0178369b4 100644 +index 7ae865c2cf..7b8d6fde91 100644 @@ -29 +30 @@ -@@ -544,6 +544,11 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) +@@ -536,6 +536,11 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) @@ -36 +37 @@ -+ internals->tx_offload_capa &= ~RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE; ++ internals->tx_offload_capa &= ~DEV_TX_OFFLOAD_MBUF_FAST_FREE; @@ -42 +43 @@ -index 864e073db8..2efaad1e8e 100644 +index 334a06cf73..24d9c1b414 100644 @@ -45 +46 @@ -@@ -3643,7 +3643,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev) +@@ -3569,7 +3569,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev) @@ -52,2 +53,2 @@ - uint32_t link_speeds; -@@ -3708,16 +3707,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev) + uint8_t agg_mode; +@@ -3630,16 +3629,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev) @@ -58 +59 @@ -- if ((offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) && +- if ((offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE) && @@ -63 +64 @@ -- offloads &= ~RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE; +- offloads &= ~DEV_TX_OFFLOAD_MBUF_FAST_FREE; @@ -67,3 +68,3 @@ - link_speeds = dev->data->dev_conf.link_speeds; - /* - * The default value of 'link_speeds' is zero. From its definition, + /* set the max_rx_pktlen */ + internals->max_rx_pktlen = internals->candidate_max_rx_pktlen; +