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 B949DA034E for ; Mon, 21 Feb 2022 16:38:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5BD741147; Mon, 21 Feb 2022 16:38:53 +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 9DEA2410E0 for ; Mon, 21 Feb 2022 16:38:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457932; 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: in-reply-to:in-reply-to:references:references; bh=9LLh8o2LVjgxLEPPPTmCLJfvfFhcrhPd0sG0VsJUM8o=; b=AQPWndlB3rxPs3HMaheeHMd7VfxBjMiBA3bS0NiUrQ3gkzukbvaW8hTqX9HwugViw+Y32i qA0KGUp12Nzqb6izSBZmAVJlet2fHjsezQHETl8JoKpgsaWGfQ+2ISKt0JVWQcYzJmtXz5 2BAr8anw2t7gy404MuJZX0ToXeD8C+o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-381-5SiQ8_eyPpOuNJ2hf58ZrQ-1; Mon, 21 Feb 2022 10:38:48 -0500 X-MC-Unique: 5SiQ8_eyPpOuNJ2hf58ZrQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A78358143E5; Mon, 21 Feb 2022 15:38:47 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18F3278DDE; Mon, 21 Feb 2022 15:38:45 +0000 (UTC) From: Kevin Traynor To: Chengchang Tang Cc: Min Hu , dpdk stable Subject: patch 'net/bonding: fix offloading configuration' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:16 +0000 Message-Id: <20220221153625.152324-67-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 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/26/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/96b92d045ff682f181844c2e3fc877e9729f159e Thanks. Kevin --- >From 96b92d045ff682f181844c2e3fc877e9729f159e 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 | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 84f4900ee5..0f11a2f5a8 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1714,15 +1714,22 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, } - if (bonded_eth_dev->data->dev_conf.rxmode.offloads & - RTE_ETH_RX_OFFLOAD_VLAN_FILTER) - slave_eth_dev->data->dev_conf.rxmode.offloads |= - RTE_ETH_RX_OFFLOAD_VLAN_FILTER; - else - slave_eth_dev->data->dev_conf.rxmode.offloads &= - ~RTE_ETH_RX_OFFLOAD_VLAN_FILTER; - slave_eth_dev->data->dev_conf.rxmode.mtu = 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); + + nb_rx_queues = bonded_eth_dev->data->nb_rx_queues; nb_tx_queues = bonded_eth_dev->data->nb_tx_queues; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.107080438 +0000 +++ 0067-net-bonding-fix-offloading-configuration.patch 2022-02-21 15:22:44.147704252 +0000 @@ -1 +1 @@ -From 57b156540f51a89214098e594494023e3820fa4f Mon Sep 17 00:00:00 2001 +From 96b92d045ff682f181844c2e3fc877e9729f159e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 57b156540f51a89214098e594494023e3820fa4f ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org