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 0DA92A0543 for ; Tue, 21 Jun 2022 10:05:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0838842802; Tue, 21 Jun 2022 10:05:12 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2063.outbound.protection.outlook.com [40.107.220.63]) by mails.dpdk.org (Postfix) with ESMTP id 0A38C4280C for ; Tue, 21 Jun 2022 10:05:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mfy/JJiBjDlqPgmiNfNyYtRTEgWCmuFYmNJrBYWhxHmdpdnO328Vb0P3aotj77lK5kKFy/xKV7HupsQao66n+X1qCvFk/qDJNNJICfeTWPJsYj9KKMtBZG0agynD4hHEG0viEJF85vL6lK7v9qMA2jAE+557BINzyWCummEB6U6McKK65IO2TmOC1g1Hln4N+IbsU2SYMU0kKneTrrt0mVpI5OriVmyI0Ph+dFvL9PEBpp0QZqLUijXQuOGNmzY6Dgz5mylejGWNYy+egbtV3yYVo69qc6myd7xTwtCff7pcSz0WSB5lFBkofOargd89q7oHZpMPWhwM+5wqRditRA== 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=1ga/Psd5iRubBx0V0XzYJQ89gfpeYsOjVDznK8jgxR0=; b=IJQQ691nrlRoHWa4JMGVQAbXgC4TlQXMGYl3BekRheCA2OVRcG2LLhMLv4IxZqGn3MKBi3nQmHPlfYT3dHQVUyBaq/40oLHADVeRWEr/VjxWv3MuvSPyyN8Wou92viEObvpOYuaHuXZvueYdd15U+y1xtbl13EtJIRdGI/ntG/f3oEv5dZLkfU07TkmN1O91YSE5D7Ed4HhVNdAG3VuITfKP7GqXRA8V0kCJcfGdKxmShfNWW5Jt33NxskN+8CMjga16GBm/G/g7Ijvllv7e8Ngeit7gAZ0Zg82Hth9jnjE0e4+PnpR863njRBH3w3S+T12UbrJ1hQWN8b2hfTJBbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=dpdk.org 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=1ga/Psd5iRubBx0V0XzYJQ89gfpeYsOjVDznK8jgxR0=; b=oc4TlIDW/4QPAOddkf+LFl+lcC3GwHXXLMHWssudQBAKxzs4Kn+1CMRz+HzlDW4SueWy6L8/ph8M4j6IGhWgJM/ClOVJHC+ybs/SziPxbtZ7PkbllCjev+a5L9TwxPZi48nYETYjrurU/6FmZi/k/04wP97P6ZB83yLovnKCHNx+cnEV4Q79XA+AdT6FH4sXKSnrM0IYTTWiY6dkKehanPwvAkl7Ycl0xLprTS/6PCu0ZFGy4K73eXdSkguzXTqNvMDjVT6QzZrZ7eQ7lpCuOhG+6aqpRsDVLvsh8Y154h1et73M1HKzK/thaiCD/E/mHuInVcvNzSNl2XtEMEQ4iw== Received: from BN0PR08CA0002.namprd08.prod.outlook.com (2603:10b6:408:142::18) by MN2PR12MB2943.namprd12.prod.outlook.com (2603:10b6:208:ad::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Tue, 21 Jun 2022 08:05:08 +0000 Received: from BN8NAM11FT065.eop-nam11.prod.protection.outlook.com (2603:10b6:408:142:cafe::f4) by BN0PR08CA0002.outlook.office365.com (2603:10b6:408:142::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16 via Frontend Transport; Tue, 21 Jun 2022 08:05:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) 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.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.234) by BN8NAM11FT065.mail.protection.outlook.com (10.13.177.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:05:07 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:05:07 +0000 Received: from nvidia.com (10.126.230.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.22; Tue, 21 Jun 2022 01:05:05 -0700 From: Xueming Li To: Ke Zhang CC: Min Hu , dpdk stable Subject: patch 'net/bonding: fix RSS key config with extended key length' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:30 +0300 Message-ID: <20220621080301.2315720-25-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: 45015914-e912-43f3-a7a4-08da535cc1bf X-MS-TrafficTypeDiagnostic: MN2PR12MB2943:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ygM/Vt7/HvelreErWSWe0SRvH8VlsiQ4YdTCrCLnSHZ8JarBDA+7B4jLMkINkrZUsKv4RGW+hXQvBks8Yoa5YTs/6CcappkCn6wiGtZRM3TfJxGekf4dRxTTEHcgfXShI7qUzlCc64Kt9BKyO1wwHsYyMzLccdex/qj5loIM0K5wyY+udgjTv9/BhKrbeHR4o8pmXHHkE6xPTUB4yDIJm7rK+Kf9mPBKbAvIVA/qjntu8W8FCwMxLqqD0MHSCSLxna10i15xyZr7ZVHYYy7M0VlBNEMVFZglXjxJwLp4pkd96aZJ5RElaal5tB0adY0Ukrj6GAWZWg6EpjqjnCewGxYmMT+cbhV+IUMgcq+tHsG1bPxkVX2qIO4D4LTj4MSCemgx+eaXGFRTCGmxzTAqNVpxekt0X/Fi+/rtKVvcNeIDVSTtlr1TXuidWUtx9OjnWYDqbmI3+JMWHaG5p2HDcJMyDIHm6+WD9sK/qSgEV8NbCV1fk9sYI4qX0F13lEAWLM50s35Qp1ZrNMNCJ51h/xjSxkw0TKp/MVKswen0diZ8To6F1IhyPlyGGMB59ujOUWqWRnODJZbO7tauFqzVplwA+827j4HQbKfy1hrQNV0lD4kDdoh8p/TF3W4TR31EWgv7xBUGQidDwbbZDguSauUgNRUdFszGH8HDpSLQsvOndzEJYjgp61O6Sw35wwflOoHSPmNd54DeiIC2wb4d5jWBjuj78uav4UWX8TO2Em3kNEChbLDagOCBDy/73Cde5zy1kayR15A+9iRKZBLr4pkPfMxQfusdCW4SvMGgtv+myBRZgiyvEoCLICTLKyeDIl2JOW4zuwP7L41s5KrnaWe7CxxGL6rbd4bm7gqXkkA= X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(376002)(346002)(136003)(39860400002)(396003)(46966006)(40470700004)(36840700001)(478600001)(6916009)(8936002)(54906003)(53546011)(83380400001)(86362001)(6666004)(40460700003)(40480700001)(7696005)(81166007)(966005)(2906002)(426003)(55016003)(336012)(82740400003)(70586007)(26005)(316002)(6286002)(70206006)(82310400005)(8676002)(5660300002)(16526019)(186003)(41300700001)(1076003)(36756003)(4326008)(47076005)(2616005)(36860700001)(356005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:05:07.7287 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45015914-e912-43f3-a7a4-08da535cc1bf 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.234]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT065.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB2943 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 06/23/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/5e7c16ee766246345f034695536598baa0b0c739 Thanks. Xueming Li --- >From 5e7c16ee766246345f034695536598baa0b0c739 Mon Sep 17 00:00:00 2001 From: Ke Zhang Date: Mon, 11 Apr 2022 05:40:03 +0000 Subject: [PATCH] net/bonding: fix RSS key config with extended key length Cc: Xueming Li [ upstream commit 94d9c7d45b43fd44af718b621fa52e556028aa3d ] When creating a bonding device, if the slave device's RSS key length = standard_rss_key length + extended_hash_key length, then bonding device will be same as slave, in function bond_ethdev_configure(), the default_rss_key length is 40, it is not matched, so it should calculate a new key for bonding device if the default key could not be used. Fixes: 6b1a001ec546 ("net/bonding: fix RSS key length") Signed-off-by: Ke Zhang Acked-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index d7bc0f0875..5fc759d3e8 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3597,13 +3597,18 @@ bond_ethdev_configure(struct rte_eth_dev *dev) internals->rss_key_len); } else { if (internals->rss_key_len > sizeof(default_rss_key)) { - RTE_BOND_LOG(ERR, - "There is no suitable default hash key"); - return -EINVAL; + /* + * If the rss_key includes standard_rss_key and + * extended_hash_key, the rss key length will be + * larger than default rss key length, so it should + * re-calculate the hash key. + */ + for (i = 0; i < internals->rss_key_len; i++) + internals->rss_key[i] = (uint8_t)rte_rand(); + } else { + memcpy(internals->rss_key, default_rss_key, + internals->rss_key_len); } - - memcpy(internals->rss_key, default_rss_key, - internals->rss_key_len); } for (i = 0; i < RTE_DIM(internals->reta_conf); i++) { -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:50.431908924 +0800 +++ 0024-net-bonding-fix-RSS-key-config-with-extended-key-len.patch 2022-06-21 15:37:49.001117789 +0800 @@ -1 +1 @@ -From 94d9c7d45b43fd44af718b621fa52e556028aa3d Mon Sep 17 00:00:00 2001 +From 5e7c16ee766246345f034695536598baa0b0c739 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 94d9c7d45b43fd44af718b621fa52e556028aa3d ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index b305b6a35b..5cbe89031b 100644 +index d7bc0f0875..5fc759d3e8 100644 @@ -26 +28 @@ -@@ -3617,13 +3617,18 @@ bond_ethdev_configure(struct rte_eth_dev *dev) +@@ -3597,13 +3597,18 @@ bond_ethdev_configure(struct rte_eth_dev *dev)