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 78BADA00C4 for ; Fri, 18 Nov 2022 00:09:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74E894067B; Fri, 18 Nov 2022 00:09:23 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id 1AC244021F for ; Fri, 18 Nov 2022 00:09:22 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id p16so2436940wmc.3 for ; Thu, 17 Nov 2022 15:09:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=cKaydGTKTr5V6xK+0iE9Ib2HHeB3F4llI7kI5eFDb3s=; b=NSbiKqcbovfnnjVxOj+9RHVe78Gnn1nU7OMnpRL+JeFC5PNKhVueyE0fzU4doyciex smqaRvyaC//JSkeVJ9ss3Z900KLdeXHtp5KF1vZXiS+nT5bOESfbdNRS7jAqzN+suMtJ EnNtaKLoHZz+vfVUBcQHlaFn5HlJqbfOmBFPF4/f+uJXBZYlvF5J1NnQUQyICY0b7VqE mMd5x3VTZ/41rHPF9dRKyMAq9aDa6T69qmh8nz9UY0bbQaKhf8QCmBG0RiLPa1GyFjNP rc0dSaC7IxmsAXDkSsyJ3VlzN/0JXHNQ5SG9kgLTwJFtjXqbvogts2g55JRiLdHDZ+bL Vblg== 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=cKaydGTKTr5V6xK+0iE9Ib2HHeB3F4llI7kI5eFDb3s=; b=xgnkN+Z7LfF4CDolprC488UsNEAI23WbLE+B1F8SfbPd3pcS2fCZhRU+DpNnAMdT0o o3vvCUaJ/p6/+Qr+F1sRVi+fMF91rp51FAlF28GEAr3/QXEzVT2mOUV6T4VxIzlK6m0p ZVD68mudQi2Q/SVoZn1frav9u2RHgcSL8ttd8Hk0SS/RWdZ32YuEboljndsvDN4wLS0U CmONWfaT7QT3Ef1OFozP8CqaydsuTO372dgjKVCzWbA2sl4v+qMV9NZrIok5ul6pYxuL JoTDqJgYErm5JU8TDG30rKhV5hvVtyw5ARkxATkBP6Ed1Aqy5+gOvnQgL4ayFrrkuPPv DR3Q== X-Gm-Message-State: ANoB5pn9K7R5h9F89ygWsY4OAPFJz2e5z/WY3WydyrZHG1jo1GDnCl9A fk5hnb/xuMbNZfNEiMwtQPJhEnu6esc= X-Google-Smtp-Source: AA0mqf5KdqwHPa++/s8pouXCy/McGXrjRXBhwuSbHaob/hRgMeoc7tlCUYA8b4wo64D36eLc8hKMQQ== X-Received: by 2002:a05:600c:3ac9:b0:3cf:cfc8:9450 with SMTP id d9-20020a05600c3ac900b003cfcfc89450mr3105329wms.99.1668726561860; Thu, 17 Nov 2022 15:09:21 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id n38-20020a05600c182600b003c6deb5c1edsm2358557wmp.45.2022.11.17.15.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 15:09:21 -0800 (PST) From: luca.boccassi@gmail.com To: Huisong Li Cc: Stephen Hemminger , dpdk stable Subject: patch 'net/bonding: fix mbuf fast free handling' has been queued to stable release 20.11.7 Date: Thu, 17 Nov 2022 23:08:30 +0000 Message-Id: <20221117230859.611465-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117230859.611465-1-luca.boccassi@gmail.com> References: <20221105171146.1520039-47-luca.boccassi@gmail.com> <20221117230859.611465-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.7 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/19/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/30769b703cdbbd921ee9b752005057f062bbca1c Thanks. Luca Boccassi --- >From 30769b703cdbbd921ee9b752005057f062bbca1c 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 2f8d003cb0..7925f35882 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -541,6 +541,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 b147be0b84..5a9b9cc4b9 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3585,7 +3585,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; @@ -3646,16 +3645,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-17 23:07:55.786887658 +0000 +++ 0006-net-bonding-fix-mbuf-fast-free-handling.patch 2022-11-17 23:07:55.440329196 +0000 @@ -1 +1 @@ -From b4924c0db589b5d4698abfab3ce60978d9df518b Mon Sep 17 00:00:00 2001 +From 30769b703cdbbd921ee9b752005057f062bbca1c 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 2f8d003cb0..7925f35882 100644 @@ -29 +30 @@ -@@ -544,6 +544,11 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) +@@ -541,6 +541,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 b147be0b84..5a9b9cc4b9 100644 @@ -45 +46 @@ -@@ -3643,7 +3643,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev) +@@ -3585,7 +3585,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; +@@ -3646,16 +3645,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; +