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 D4C81A00C4 for ; Fri, 18 Nov 2022 00:09:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD7F84067B; Fri, 18 Nov 2022 00:09:07 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id A312F4021F for ; Fri, 18 Nov 2022 00:09:04 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id 187-20020a1c02c4000000b003cfe48519a6so474134wmc.0 for ; Thu, 17 Nov 2022 15:09:04 -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=Q5c7pJ0y8MqYoaarYm12pQwU4R/MpIJSoZjG7lcBQUQ=; b=d8zDmnEBofUHVVJina9aoo8FN+zeIDxpzE4MCT5jPiq4KPPp3Tj25MG+ebDrdzQrqw QNSYeUMO/o0c0qFN+k2knwXAQZ+IRMVFaLGaqk4aVuPnAkz7jrjBVN82gp52Dbybhula 9nYmjpiq5xJ7HzAa5NgyQ1zIc61/KvYzFoE0VVfKEClR+WBUX+wRC8Iuz3EQ9b8z91tC 1fIT7zzjxvixQxf9a1DcmMSU7wXYy5kkhQlDSpqQXIv2jA3l019J7iw+kHRU/YHPeIOi knwZclnHlk/sLpB40MHT63qEucAlsLEqsIA972S5YJjQ0lkUACLGTYhUhCf+3M6/8kOe LezA== 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=Q5c7pJ0y8MqYoaarYm12pQwU4R/MpIJSoZjG7lcBQUQ=; b=1kkCvkmtHqK0Br88/VDZ1qk3locB1wka4H0V7L+T78ci59GlkGuHCt7ioV2HutkWaO ANUOMvcGi/6UeUBLZPJfsikNsFiJk+n8YUWbpeY6lTstGIjScmbhXuVYAAOODzYprwnv Xoe8r4jg8NbTRGFClAEgmEFEbDLlDsjecG6buWMrMODQ31vq42u7GYTDZuF+hc0iA7fi Zl+Cz/nXRIjiJNAd9AiWJ5EKAMtAK4Rbs7YG0m7jUnvKMDZ66V6NkLOcn5+Vj6xnIJtT Xoh6dWrZn6QGEygUcX57pbeKAprKYA2zi3c0AKdud/r8KNpAQKDvuqV5oMNEvlLTT+9v Aw3w== X-Gm-Message-State: ANoB5pkLwqfv3n5lWoRSyYPrF6L1Aij9I2zmKgpJ27XAntYgp6RyrhUT YfLNUboMZGjRL7YlJ9Yh1+9ytyxPDcQ= X-Google-Smtp-Source: AA0mqf5HK3gzRGOepoCK5HzI5NREN7BqN8quVprsjOhrDNxCFrvPapYPiVr0zazLsDeq/8uTgiRqRQ== X-Received: by 2002:a7b:c456:0:b0:3a5:f600:502e with SMTP id l22-20020a7bc456000000b003a5f600502emr3194815wmi.39.1668726544279; Thu, 17 Nov 2022 15:09:04 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id j2-20020adfb302000000b002206203ed3dsm2132703wrd.29.2022.11.17.15.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 15:09:03 -0800 (PST) From: luca.boccassi@gmail.com 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 20.11.7 Date: Thu, 17 Nov 2022 23:08:26 +0000 Message-Id: <20221117230859.611465-2-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/a69e929afedd08cfbe7e579730f01b15aba246e7 Thanks. Luca Boccassi --- >From a69e929afedd08cfbe7e579730f01b15aba246e7 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 d8172be041..4549fbf6ff 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1723,20 +1723,11 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, bonded_eth_dev->data->dev_conf.rxmode.mq_mode; } - 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; 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-11-17 23:07:55.621357669 +0000 +++ 0002-net-bonding-fix-slave-device-Rx-Tx-offload-configura.patch 2022-11-17 23:07:55.404328385 +0000 @@ -1 +1 @@ -From b5145667785e8954077c593480ddfb2bdd708eac Mon Sep 17 00:00:00 2001 +From a69e929afedd08cfbe7e579730f01b15aba246e7 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 d8172be041..4549fbf6ff 100644 @@ -26,3 +27,3 @@ -@@ -1741,20 +1741,11 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, - slave_eth_dev->data->dev_conf.link_speeds = - bonded_eth_dev->data->dev_conf.link_speeds; +@@ -1723,20 +1723,11 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, + bonded_eth_dev->data->dev_conf.rxmode.mq_mode; + }