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 68DA7A0032 for ; Fri, 18 Feb 2022 13:41:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 640CF40141; Fri, 18 Feb 2022 13:41:20 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 48BAF41140 for ; Fri, 18 Feb 2022 13:41:19 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id d14-20020a05600c34ce00b0037bf4d14dc7so6308832wmq.3 for ; Fri, 18 Feb 2022 04:41:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wlvSMwL/PnTK3lCKEkjB/+7T1M2RKQgbnCFXuWlGMEI=; b=Dv1GIESgqQbId+73TVzF7XNp3uNEnbcazbdKk+5jIgffhomEjWRAG+xewsz6BjIxjF 9gAR+8P+MytG5brZaPhMalk8+/QcRfilEnFYBYdb/dT/chT2xySveSWyMI/Uogi5Znls oBdHIOKpzsYtePCHo5e0Xv6Z2BIeCLtx72rP59VNG7RgIqKVScbFx+6Ai4ErLuuinJd1 /xBnRAQJus2IsDAQFTCLxInpobx46JT+9Aq2vGzN17z9PGR2KnoO6bgtJ8Lqt/gRQB33 uYpURPrtIdhFc3D+F3dRhhWn42WUHXxyRL1vbOH0azReTq2XelOZhnt211BoN0Oe4H5x njpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wlvSMwL/PnTK3lCKEkjB/+7T1M2RKQgbnCFXuWlGMEI=; b=HOGrYD+7u1nJ5EA7NgvmViirIObsZ7YqLRQT7Ta82UPvTUBAF+WuZrsh9VO4W3BGYo Tdjmr8vp4u56yEF2YUXzkcHuq00GPokW9ATm4psiQSL+EsrDQqrWo3YurBrpzTF36H7j CAB1MBw5lVpJjIQKU23mvaemcFGTJHNzptD4dDJ9hHXoImgfdEZsuVAEFL61KucOA4A2 rIHjL0jp4VxC+hqPzySgZ0f69FiV+3gc42/E44npK6L3i6KP1kkDMLJUXYLj7diUaoD/ MgHGNMjvdkMeTXLU3sDgaDrLLZNZtbA0175N9PRrtdMFZTzU6y5Ty9NXEMLItGsywWTz wwpg== X-Gm-Message-State: AOAM532troEXv1WFCeQzEqE/BPyXrRHWv9UwfY9dpOCFfhTyICbi7C1y OuqsFZ6MtTgctTV+zIRK+W4Xz8E5qLqTFsK1 X-Google-Smtp-Source: ABdhPJzTy+2IiCm/Qu5WCDc4agcJ7MLq2rsSLCEm57mJ2EYGC16J4j0O9XLHJbA4POhQLj3cD1fCYQ== X-Received: by 2002:a7b:cf2a:0:b0:37b:bf79:669f with SMTP id m10-20020a7bcf2a000000b0037bbf79669fmr10338978wmg.84.1645188078939; Fri, 18 Feb 2022 04:41:18 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id k28sm4747686wms.23.2022.02.18.04.41.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:41:18 -0800 (PST) From: luca.boccassi@gmail.com To: Chengchang Tang Cc: Min Hu , dpdk stable Subject: patch 'net/bonding: fix offloading configuration' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:04 +0000 Message-Id: <20220218123931.1749595-35-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8d0afb3f68968e0421f4fd819102a9b5189a4835 Thanks. Luca Boccassi --- >From 8d0afb3f68968e0421f4fd819102a9b5189a4835 Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Tue, 9 Nov 2021 15:57:26 +0800 Subject: [PATCH] net/bonding: fix offloading configuration [ upstream commit 57b156540f51a89214098e594494023e3820fa4f ] Currently, part offloadings of the bonding device will not take effect by using dev_configure(). Because the related configuration will not be delivered to the slave devices in this way. The offloading capability of the bonding device is the intersection of the capability of all slave devices. Based on this, the following functions are added to the bonding driver: 1. If a Tx offloading is within the capability of the bonding device (i.e, all the slave devices support this Tx offloading), the enabling status of the offloading of all slave devices depends on the configuration of the bonding device. 2. For the Tx offloading that is not within the Tx offloading capability of the bonding device, the enabling status of the offloading on the slave devices is irrelevant to the bonding device configuration. And it depends on the original configuration of the slave devices. Fixes: e8b3e1a9b1bb ("net/bonding: switch to new offloading API") Signed-off-by: Chengchang Tang Signed-off-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 44b2e684d2..e38d55f0d7 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1717,13 +1717,20 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, bonded_eth_dev->data->dev_conf.rxmode.mq_mode; } - if (bonded_eth_dev->data->dev_conf.rxmode.offloads & - DEV_RX_OFFLOAD_VLAN_FILTER) - slave_eth_dev->data->dev_conf.rxmode.offloads |= - DEV_RX_OFFLOAD_VLAN_FILTER; - else - slave_eth_dev->data->dev_conf.rxmode.offloads &= - ~DEV_RX_OFFLOAD_VLAN_FILTER; + slave_eth_dev->data->dev_conf.txmode.offloads |= + bonded_eth_dev->data->dev_conf.txmode.offloads; + + slave_eth_dev->data->dev_conf.txmode.offloads &= + (bonded_eth_dev->data->dev_conf.txmode.offloads | + ~internals->tx_offload_capa); + + slave_eth_dev->data->dev_conf.rxmode.offloads |= + bonded_eth_dev->data->dev_conf.rxmode.offloads; + + slave_eth_dev->data->dev_conf.rxmode.offloads &= + (bonded_eth_dev->data->dev_conf.rxmode.offloads | + ~internals->rx_offload_capa); + nb_rx_queues = bonded_eth_dev->data->nb_rx_queues; nb_tx_queues = bonded_eth_dev->data->nb_tx_queues; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:39.468928293 +0000 +++ 0035-net-bonding-fix-offloading-configuration.patch 2022-02-18 12:37:37.622790401 +0000 @@ -1 +1 @@ -From 57b156540f51a89214098e594494023e3820fa4f Mon Sep 17 00:00:00 2001 +From 8d0afb3f68968e0421f4fd819102a9b5189a4835 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 57b156540f51a89214098e594494023e3820fa4f ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -29,2 +30,2 @@ - drivers/net/bonding/rte_eth_bond_pmd.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) + drivers/net/bonding/rte_eth_bond_pmd.c | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) @@ -33 +34 @@ -index 84f4900ee5..0f11a2f5a8 100644 +index 44b2e684d2..e38d55f0d7 100644 @@ -36 +37 @@ -@@ -1713,17 +1713,24 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, +@@ -1717,13 +1717,20 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, @@ -41 +42 @@ -- RTE_ETH_RX_OFFLOAD_VLAN_FILTER) +- DEV_RX_OFFLOAD_VLAN_FILTER) @@ -43 +44 @@ -- RTE_ETH_RX_OFFLOAD_VLAN_FILTER; +- DEV_RX_OFFLOAD_VLAN_FILTER; @@ -46,5 +47 @@ -- ~RTE_ETH_RX_OFFLOAD_VLAN_FILTER; -- - slave_eth_dev->data->dev_conf.rxmode.mtu = - bonded_eth_dev->data->dev_conf.rxmode.mtu; - +- ~DEV_RX_OFFLOAD_VLAN_FILTER; @@ -65 +62 @@ -+ + @@ -68 +64,0 @@ -