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 51ED4A00C2 for ; Wed, 23 Nov 2022 19:04:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 267CD42DA3; Wed, 23 Nov 2022 19:04:32 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 91A2340E5A for ; Wed, 23 Nov 2022 19:04:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S+rIMl5tM2o1McrO8OuTOnCjssCDRRYhQYzYfUcZvCI=; b=RjeqXAsRGhve+vG69wATnGPjxo7krv+urhAxg0ReWqW+n07N3mFUlvK/h2x8zVp/zJX2NT zJjBr8hBaEfNUhPG53Fn8LWkyjPE4LACdsHWMh3g6aRUtO2P4bwxNdbQSxohqbvkd1mpTs CKvEc2/yVXYy+sTGa1RpcyYbIQH7fCo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-395-ZWM4Y1GHN9ucZD26hihpcQ-1; Wed, 23 Nov 2022 13:04:28 -0500 X-MC-Unique: ZWM4Y1GHN9ucZD26hihpcQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 012EA3C0E466; Wed, 23 Nov 2022 18:04:28 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EB9C492B07; Wed, 23 Nov 2022 18:04:27 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/bonding: fix slave device Rx/Tx offload configuration' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:14 +0000 Message-Id: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 11/28/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/8bdb61a66fb9c9e8f93722939fec63c7f593299f Thanks. Kevin --- >From 8bdb61a66fb9c9e8f93722939fec63c7f593299f Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 28 Oct 2022 10:36:46 +0800 Subject: [PATCH] net/bonding: fix slave device Rx/Tx offload configuration [ upstream commit b5145667785e8954077c593480ddfb2bdd708eac ] Normally, the Rx/Tx offload capability of bonding interface is the intersection of the capability of all slave devices. And Rx/Tx offloads configuration of slave device comes from bonding interface. But now there is a risk that slave device retains its previous offload configurations which is not within the offload configurations of bond interface. Fixes: 57b156540f51 ("net/bonding: fix offloading configuration") Signed-off-by: Huisong Li Acked-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 707c22a7a4..c25fa9df24 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1719,18 +1719,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, bonded_eth_dev->data->dev_conf.rxmode.mtu; - 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); + slave_eth_dev->data->dev_conf.txmode.offloads = + bonded_eth_dev->data->dev_conf.txmode.offloads; + slave_eth_dev->data->dev_conf.rxmode.offloads = + bonded_eth_dev->data->dev_conf.rxmode.offloads; nb_rx_queues = bonded_eth_dev->data->nb_rx_queues; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.146163339 +0000 +++ 0001-net-bonding-fix-slave-device-Rx-Tx-offload-configura.patch 2022-11-23 09:55:56.983149090 +0000 @@ -1 +1 @@ -From b5145667785e8954077c593480ddfb2bdd708eac Mon Sep 17 00:00:00 2001 +From 8bdb61a66fb9c9e8f93722939fec63c7f593299f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b5145667785e8954077c593480ddfb2bdd708eac ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index e0da1fa7c9..006e13838a 100644 +index 707c22a7a4..c25fa9df24 100644 @@ -26,2 +27,2 @@ -@@ -1742,18 +1742,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, - bonded_eth_dev->data->dev_conf.link_speeds; +@@ -1719,18 +1719,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, + bonded_eth_dev->data->dev_conf.rxmode.mtu;