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 3132FA0093 for ; Fri, 24 Jun 2022 17:02:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C9234281A; Fri, 24 Jun 2022 17:02:35 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6ACE7427F1 for ; Fri, 24 Jun 2022 17:02:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656082954; 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=7TWSulOBsjW1smaGFa2iU7ewvgHaHossQGNJBeWdEI4=; b=cqu7sAc3HEthUaZwFhMN5+3jYliCPAtUz+HIyQq4aW0HvoMYpbQ4bEb0B9C1yasnaZOnxE wwsr9oV/U7M9T8nTSPi157FxgtmtWo6JIKjC/LYZWsy83PQMBralPMjoO7ow30i2Vwm9td K7bHaYiE3pLQftM6Z/hglecs+Sy7lmM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-478-4rhqoXc2MRG2Dn20c97YFQ-1; Fri, 24 Jun 2022 11:02:30 -0400 X-MC-Unique: 4rhqoXc2MRG2Dn20c97YFQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F365185A7B2; Fri, 24 Jun 2022 15:02:30 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D84E10725; Fri, 24 Jun 2022 15:02:28 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , Andrew Rybchenko , dpdk stable Subject: patch 'net/bonding: fix RSS inconsistency between ports' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 16:01:32 +0100 Message-Id: <20220624150148.1855580-24-ktraynor@redhat.com> In-Reply-To: <20220624150148.1855580-1-ktraynor@redhat.com> References: <20220624150148.1855580-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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-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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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/2b71d44b8012ad4944a25e42d3ab8bc4ddd315d4 Thanks. Kevin --- >From 2b71d44b8012ad4944a25e42d3ab8bc4ddd315d4 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 8 Jun 2022 19:45:47 +0800 Subject: [PATCH] net/bonding: fix RSS inconsistency between ports [ upstream commit 9e0fb72c75cd03c40fc7cedc39d3a342f447b6ee ] Currently, RSS configuration of slave is set only when RSS is enabled for bonded port. If RSS is enabled for the slaves port before adding to the bonded port with disabling RSS, it will run into that the RSS enabled state of bonded and slaves port is inconsistent after starting bonded port. So the RSS configuration of slave should also be set when RSS is disabled for bonded port. Fixes: 734ce47f71e0 ("bonding: support RSS dynamic configuration") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu Reviewed-by: Andrew Rybchenko --- drivers/net/bonding/rte_eth_bond_pmd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index b6fed1495b..9b3acde46c 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1708,4 +1708,10 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, slave_eth_dev->data->dev_conf.rxmode.mq_mode = bonded_eth_dev->data->dev_conf.rxmode.mq_mode; + } else { + slave_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len = 0; + slave_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key = NULL; + slave_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf = 0; + slave_eth_dev->data->dev_conf.rxmode.mq_mode = + bonded_eth_dev->data->dev_conf.rxmode.mq_mode; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 15:51:09.716049237 +0100 +++ 0029-net-bonding-fix-RSS-inconsistency-between-ports.patch 2022-06-24 15:51:08.899984157 +0100 @@ -1 +1 @@ -From 9e0fb72c75cd03c40fc7cedc39d3a342f447b6ee Mon Sep 17 00:00:00 2001 +From 2b71d44b8012ad4944a25e42d3ab8bc4ddd315d4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9e0fb72c75cd03c40fc7cedc39d3a342f447b6ee ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index ace8f8b45e..73e6972035 100644 +index b6fed1495b..9b3acde46c 100644