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 55F68A00C5 for ; Wed, 20 Jul 2022 10:23:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DA4441147; Wed, 20 Jul 2022 10:23:09 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2054.outbound.protection.outlook.com [40.107.244.54]) by mails.dpdk.org (Postfix) with ESMTP id 6CC8E4003C for ; Wed, 20 Jul 2022 10:23:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BrOZLwYLTOj+m+nWXxwnadtupsm/3IBxEMmMhY+dappHhMYg47ofsd5mbtmQ0Wmt8MO2iCtGxgtajngAC9bLeD51AsM4k1KJKZ4/emxQr3ljs0tBBhPF6xEip8V1aB0/8lcma7clf+79ep5QzLeGkeWvbs3yTv160RquvlB4gKEZpu8CHJCCyV7uTvBL+TnDisl+owMEYAF00XusADmlZZ8mITBmp9j3j9982ZMfVfINI/i6r8dvEF0JKM2ddsXGjLLFaZBojdKO+s/EbAKvriak1shU8gesbeiiHveomo7gGeSNGOOTbkaxwl9qQu6mRh3YRQMw4QzoJwwsWjpx6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=de4T7Y1KInDqIC5AZ8rf3YVv+DvDy7DH71bQ9d3XmAk=; b=HVMH+MTjWX4V6uhV9DZB/TwP9J9L8lxyZgG420r1COyQ3upXRY0nboGooPiB0xvVEl03ZDDHhLKAjxthPba3LqvPHzAQQtj22bWH3g0VvBWLEC5YIkXAxpa4kF47Kkq87bBjOmZCjmWbTYQ7rhX3U+wU2g4d5GSsanIn7S0kk6YgSCDr28Tx7hjKoRmHdbpiMJcNM4DfmhJvqIhvH2kiquaWPXA1MN+1EXEOJHhCKW2fzI/rq01D6oy/gMwTuHi9/wdqe9r9K8l6V7/AZKypKJ7/IgVrPyn7W8WvuizSnEFftGjqnr0/z3El729oSb45tMv+ggYCK2AS732iErj+Ig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=oktetlabs.ru smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=de4T7Y1KInDqIC5AZ8rf3YVv+DvDy7DH71bQ9d3XmAk=; b=t7KPwqvMeXkAOhXG1Xrt9sL94VCJp6HBj2xZ4nUWJdxwDXGypoubn/fI7HZFXFFNFUmSAvpQ7Dextc0iuFuMIzeS0GC9N2KNRiMGg7MJlBskaZBThEK5spNdmBWJT6QUICWFtEq3q3IuAWqIatiymbpTIAsdx1KgZ3ss/Yb4R4ZBftJed3h53Hkd9l6N8ejLj/Jw1Aha5hzcRIsHdVieFamaYyNszU4yap73cOycDKqhPcw38sUydyv4CUk6Hlsp/4Q13QaCi2KUmmy5m3p5garIOIalBAt2Qsu8cZzFd66BvLAb8328GYg33aliprljJaSeDaCwtIOs4nSJdgAmLg== Received: from MW4PR03CA0066.namprd03.prod.outlook.com (2603:10b6:303:b6::11) by BN8PR12MB3266.namprd12.prod.outlook.com (2603:10b6:408:6e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.21; Wed, 20 Jul 2022 08:23:05 +0000 Received: from CO1NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b6:cafe::cf) by MW4PR03CA0066.outlook.office365.com (2603:10b6:303:b6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15 via Frontend Transport; Wed, 20 Jul 2022 08:23:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.235) by CO1NAM11FT049.mail.protection.outlook.com (10.13.175.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:23:03 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:23:03 +0000 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 20 Jul 2022 01:23:00 -0700 From: Xueming Li 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 20.11.6 Date: Wed, 20 Jul 2022 11:20:43 +0300 Message-ID: <20220720082132.3954126-14-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 125a1600-1b33-4dc3-d1ad-08da6a291114 X-MS-TrafficTypeDiagnostic: BN8PR12MB3266:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?gcc+9SPehMANTTUrQLhhgavMjkGRNj5iGhTnu1LM6hbC2IfDzq3YNdLhgEUj?= =?us-ascii?Q?We6uGfsYJ4sYiutW09C5zsy8kbgduUuDTjqEnFGTSTDm4AxHldeVIYbuSolG?= =?us-ascii?Q?g5RbLYIp1GzeMJ2mHtep3py0Uo3kqxC7TtvfoXndais7QSyIoVXzchlqaJbp?= =?us-ascii?Q?D4n1zxTE4pkifKCMyT4HEBIiRTqpMBvp97NMji+8/lMTN1pGH4onmJhecFro?= =?us-ascii?Q?P80N/YJ/tkDe4LtEIK7/BZ9GOi2l18nodHO6dOUSW1IAwCr49xxlk5se6BIt?= =?us-ascii?Q?7n41V34c30mLFvxcSE1jc3R0VOCNmY31QgNL2bH0L9kCJMnMHJ0C/pBwCOJK?= =?us-ascii?Q?9FsEz6Ed39Fuu4r1WOVpqxSsSjnzHUbCtv0iK61JOgpIGCQPBuvcmp1cQpJa?= =?us-ascii?Q?PgPxgeTkg17LAXneIBnfgoMWqcWsRjQh6AcozdGtfeG0h56prRK6ifyR2thG?= =?us-ascii?Q?f5Un8fdSNGOcsE68krML3+7W4jmNCC//cgOsJFPlctzi1HeqiNxtwWbrihch?= =?us-ascii?Q?vN969ZzKFBJJRq4tNmerN6EfwvllzG180jyqu/uHKQVD4jpHWz1Uy1H5sXhg?= =?us-ascii?Q?iO6ycH4y30tSW7PJOx9x/QAK3Z7FCo5eUUgqqHYttwCl6FklpP8cB0JlPuZ8?= =?us-ascii?Q?8sl12DzCbWLrCAmIAXvm/uVyn/eGAhZMtan8kUj1RMtSDSuqumfirlzeQnaY?= =?us-ascii?Q?g1sKDg3UWTZGfVSPG48tmdHB8kpzmXySBmmn/dWN+/EletGq2CCqzONZVioN?= =?us-ascii?Q?iPu19/ERQmO095YKEVHVo6+Is0vQ6yXYPWBU3qD+Y9KVC0gsV4phLXOwkNtq?= =?us-ascii?Q?EPxxZV9OwTbjAw9qpvcOXnlM5kUghtE6ju6ywJliTD0tdTcnM5TJAODT6uU5?= =?us-ascii?Q?mBmvjAWbOeVkHVqipjRImfEFsZ6Xn6V0hyGfjzD6O3xGctKLAA62bC/BSRCT?= =?us-ascii?Q?mNWJWofhTvuixFMnPCgm/g=3D=3D?= X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(136003)(396003)(346002)(376002)(39860400002)(46966006)(40470700004)(36840700001)(356005)(6916009)(36860700001)(40480700001)(966005)(82740400003)(55016003)(5660300002)(81166007)(54906003)(36756003)(2906002)(316002)(86362001)(478600001)(8676002)(26005)(82310400005)(2616005)(83380400001)(70586007)(40460700003)(70206006)(186003)(47076005)(426003)(336012)(1076003)(16526019)(4326008)(7696005)(8936002)(41300700001)(53546011)(6666004)(6286002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:23:03.8189 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 125a1600-1b33-4dc3-d1ad-08da6a291114 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3266 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.6 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/22/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/da86d09eacf4c74957b0e85e05c2ee6cd0512351 Thanks. Xueming Li --- >From da86d09eacf4c74957b0e85e05c2ee6cd0512351 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 Cc: Xueming Li [ 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 43383db319..4fa523201f 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1715,6 +1715,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; } slave_eth_dev->data->dev_conf.txmode.offloads |= -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:00:59.430462476 +0800 +++ 0014-net-bonding-fix-RSS-inconsistency-between-ports.patch 2022-07-20 15:00:58.674333889 +0800 @@ -1 +1 @@ -From 9e0fb72c75cd03c40fc7cedc39d3a342f447b6ee Mon Sep 17 00:00:00 2001 +From da86d09eacf4c74957b0e85e05c2ee6cd0512351 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9e0fb72c75cd03c40fc7cedc39d3a342f447b6ee ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index ace8f8b45e..73e6972035 100644 +index 43383db319..4fa523201f 100644 @@ -27 +29 @@ -@@ -1707,6 +1707,12 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, +@@ -1715,6 +1715,12 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, @@ -39 +41 @@ - slave_eth_dev->data->dev_conf.rxmode.mtu = + slave_eth_dev->data->dev_conf.txmode.offloads |=