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 20582A0540 for ; Thu, 7 Jul 2022 09:58:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A679406B4; Thu, 7 Jul 2022 09:58:34 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 1B9D0406B4 for ; Thu, 7 Jul 2022 09:58:33 +0200 (CEST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id E50403F1CA for ; Thu, 7 Jul 2022 07:58:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180712; bh=sfNmXjSSfjJKaiTQvUVpj0sHxCKN2K7mFhhnnL0xkfs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NvMTWRHQcUQRgX+Q/6Rdfgy5wsaHASI9jujZtJx/UerOc2D2BBSJqFs5KUTzy6SlT xrkQJHuSIHUAWxN7gLw+RvQpKOkn8Tv5mPecrfyZB/tXb/w1XhWRRgxFv3RbJuovFT DXY3nRgsMT0FCclby2Zok3C8hyWVFq25BDrjnNbavp469N0qf8emPwm9As3o9uOcnp iypmC1dv9+GqVt8CcqXQtstE1wanRNv4v8/5Y0daBxsDTF+quXqPTTFd/STjbKyLdR 1ttyZleOQcucdYXNuss/rfQpfVjILdD8ikn59SUOwbnXocjpDUpEXRViilptW3odS/ 3RlYnfR0NXUFA== Received: by mail-ej1-f70.google.com with SMTP id sh39-20020a1709076ea700b0072aa3156a68so3253006ejc.19 for ; Thu, 07 Jul 2022 00:58:32 -0700 (PDT) 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=sfNmXjSSfjJKaiTQvUVpj0sHxCKN2K7mFhhnnL0xkfs=; b=5gTzMmkuNSa35mNUBdgH5+G3jEaYRlqfUf2FEJC70fP9d6euXiwLkPkp3nk2uoffr4 NLHyh+o+81UH6BfHSOUjzpCNMT6M8UMbjy5zC5V/uhGE9koVqt4yBR+TJRTmprduawUF CmxNxGBDeU6FcxmQno3K9sWiXfOrw/B04T8SoUmEGX3NmPi3RwVDjSuXAAaV5WvLAPgu 9s6yWyBptZpTjabgwO7UGo/F6KzgesCKQ8w5NltIbLN+qfaGfbowD4BnzdbXvpgqtBYd 7U251HwgpqSc4PPQ0kHKnr/D+x7b04rZZvm+fxOqzaTsmFCSafPiH1ZoHc+QqFc5Lhyk Vqcg== X-Gm-Message-State: AJIora+XQtmLo4P/iqIdOjSKijY3jB06N+njNhZL1hj1M9PurPF3ej8P O6/m1WWdfenFqY0FsHOgyQDof+C9nx5PLlU3ZB/9fKAm0SOaM1LRoXoGfySx2EzvmyzFzUpLr+Q Wogg+cM5mf/Q89EmXshdOa5dv X-Received: by 2002:a17:907:1c8d:b0:6f2:eb2:1cd6 with SMTP id nb13-20020a1709071c8d00b006f20eb21cd6mr41776533ejc.568.1657180712274; Thu, 07 Jul 2022 00:58:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uPobYNZMi/TezNTppAJGUPuzbUpoJ2UACCKTFVlgttCgdFhyZJdwB/jFkypuRyQqZr1PVHaQ== X-Received: by 2002:a17:907:1c8d:b0:6f2:eb2:1cd6 with SMTP id nb13-20020a1709071c8d00b006f20eb21cd6mr41776517ejc.568.1657180712092; Thu, 07 Jul 2022 00:58:32 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id w2-20020a170906384200b00722f8d02928sm18667444ejc.174.2022.07.07.00.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:58:31 -0700 (PDT) From: christian.ehrhardt@canonical.com 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 19.11.13 Date: Thu, 7 Jul 2022 09:54:56 +0200 Message-Id: <20220707075522.194223-61-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/4ca26f407dd7942c20aa9c63daf3673ad36d0c54 Thanks. Christian Ehrhardt --- >From 4ca26f407dd7942c20aa9c63daf3673ad36d0c54 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 812bfb8bd3..2623650375 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1712,6 +1712,12 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf; 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; } if (bonded_eth_dev->data->dev_conf.rxmode.offloads & -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.713155438 +0200 +++ 0061-net-bonding-fix-RSS-inconsistency-between-ports.patch 2022-07-07 09:54:10.969824641 +0200 @@ -1 +1 @@ -From 9e0fb72c75cd03c40fc7cedc39d3a342f447b6ee Mon Sep 17 00:00:00 2001 +From 4ca26f407dd7942c20aa9c63daf3673ad36d0c54 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 812bfb8bd3..2623650375 100644 @@ -27 +28 @@ -@@ -1707,6 +1707,12 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, +@@ -1712,6 +1712,12 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, @@ -39 +40 @@ - slave_eth_dev->data->dev_conf.rxmode.mtu = + if (bonded_eth_dev->data->dev_conf.rxmode.offloads &