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 4705DA0A0E for ; Mon, 10 May 2021 18:21:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40DF14003E; Mon, 10 May 2021 18:21:52 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2078.outbound.protection.outlook.com [40.107.100.78]) by mails.dpdk.org (Postfix) with ESMTP id 791224003E for ; Mon, 10 May 2021 18:21:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WkWtCu4pf5VXeoFZ3EMrK0yFafruN8BOqhaLcTXTNsarQIH2sYAy4J3628shvuKGIj9t+SpPrN6fYtSdrkkJuFpuAIaZoB66iWO9ATjIrpjMZkaWsdIMprWKiPLKHGhsEY/1IsSVQ+Txn9VOmvmplWaPFNVeLr2Y6sk4pQ23ETAH9NFZZRFUhgO7chY/NlKNlHUrPoxiYkCuDs62v3C7nNtfIHeu4hnsZaPlkVqptcn8D35Wh0IL7JebioqpdmgMdUIUQraEBIMdEeWcdEDP+ioFMqkBNwl+XOsTVG/fBJGc0d5eTneXK4dinTGRGlXoK7cA9zTszSYuob2MxjTN5w== 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-SenderADCheck; bh=BmpPKMptYoiASEJ1DtY0P2wNrzrZ20GLdhgUeywsdUU=; b=j8TFWsekvt2nKTPQfFAm3taKj3tb5GSjkoOHNe93HLgA9erQRTjb+jdr4na6xAd0uZ9AD0cSiXxgIsgN3EEgLZvqILr2TURnWP5AobuOq37XYQJ40QwOoXU6003DTVcs/HtOiQ04IkdnFSwYSGcObjYTo/EzAX8ZUwFK8Y+Cb5ZtaP6cNDwRG3Pdrxu/+bkT3mMrBJT/U9kbAh4H8aIwFyWp4j6bzBgaxwy9FYOBiun8pQrdX5xzoYKnVSNL3y0uvmuvzxcO+Pli30oX8zMp4I3Ot+JimDKv19SCI3MmAPw9Jk+SCXQlg1G6O12YAu/z2ueB+PwsZqe19qkzF3r7xQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=BmpPKMptYoiASEJ1DtY0P2wNrzrZ20GLdhgUeywsdUU=; b=tpONW9dy5iyYEKqYckVXjkFZw/uHvKqT2DQOFTNkBp+1tCOWUG0UYU5MA7bReWr1CMGMRawLrZQpRKqjeq/T/4LBV46ERJydiNbYyaQ6WttMsSn05qCRm2fcDBwBhBygk4lQm48pR1V19HGqz6hsVlCPYtIzKJUxNr+XeuLi8YpecLVxXAwrMux3XKcMiRcFDVkMhVCh/CIiZqXXlbaKigEj1ZqRNxFwRn7SxTQwFQK7ohVmj/bvZfzqbRWGJTW7+cuLO51kxvmz7BQVUY4rh5+qfsfH7Mup03ts60UsyLFe4777y9KkWxHEtLEcPptpK5OOZTFScGyHSzsm0t4bPQ== Received: from BN7PR06CA0049.namprd06.prod.outlook.com (2603:10b6:408:34::26) by DM5PR12MB1644.namprd12.prod.outlook.com (2603:10b6:4:f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:21:50 +0000 Received: from BN8NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:408:34:cafe::35) by BN7PR06CA0049.outlook.office365.com (2603:10b6:408:34::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT014.mail.protection.outlook.com (10.13.177.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:50 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:21:48 +0000 From: Xueming Li To: Viacheslav Ovsiienko CC: Luca Boccassi , Matan Azrad , "dpdk stable" Date: Tue, 11 May 2021 00:02:15 +0800 Message-ID: <20210510160258.30982-186-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 167d71f7-307c-492c-034f-08d913cfb75a X-MS-TrafficTypeDiagnostic: DM5PR12MB1644: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3Z3qnnEcKwpJsUE1i9UkjnR1mi2ing0PDElZz+WNBUUJ+S3YlXF3qaiVwKNE9oqzGGkTVoOTeLJM4iFvQ9g5rY0BRZlO3DhhROCAFhNBEsNL6It7AXlDmAegcSoI/G0Jnbgj5+6rv8ENm/8L+wNiShjgZyYclkb/4FKSzXOenFhwUn3cbgQWuwsTq74UWGh+6K5iu/4/2h/bMXavJzSd9Lt/eS2IkZT1AoZGEKfm94K3SH0gT7KRCzAnjnZ3WsrXXwvo8dBoqmTIP1VABG3AgZnjn81H6ainSS9UCQyBJRmPGW2QqqtyerOt9VUXrmXIJoToUUyHFYKUEBfFkphOnxcdwMHCNh3acojnoCGtFgsp/drIGSGrYFiYSYF2hmRH7H2KKkpS8w1ogGflT2uOzm9Gn44I/37l2sJuuVUKhcxwKSxFKfi9kXchbk3EEnMRVwR9vMq5uiNYYjYv0eHFsav1VqcxPxoAIQuk0RcPeMIlgEsbrJGrJ/JkbFkQkuqa2o9FDkSJAVMsVDMyObsZKoDoVQfLXiz/iZpGgmkuNIvMUAbl0qU7pUszmIauOksFkGrMYdS2KdZndQskV/p3U6qAfIDYJcpn+CU9EERDq0DsOzRWXuQwzaZ2PoltXyBXHk04xXhtM8HBfEEz0gEAiC6e6Bj80CUEqv3RfVnMRiXYG76vrv3mieDTIWtDUrPWiI249bItorTFLBQ/DeGw8g8v7DfiwBkkPej8hOQBRx6yOser2Ju+vuK7wIAKoC0ux+Q5XwUWrALdktXKpoRaIQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(346002)(396003)(39860400002)(136003)(46966006)(36840700001)(1076003)(4326008)(6862004)(5660300002)(316002)(47076005)(186003)(7636003)(6666004)(426003)(8936002)(36906005)(82310400003)(8676002)(16526019)(36756003)(83380400001)(478600001)(82740400003)(2906002)(53546011)(55016002)(36860700001)(26005)(2616005)(356005)(6636002)(70206006)(966005)(70586007)(6286002)(54906003)(37006003)(86362001)(336012)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:21:50.3134 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 167d71f7-307c-492c-034f-08d913cfb75a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1644 Subject: [dpdk-stable] patch 'net/mlx4: fix RSS action with null hash key' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 05/12/21. 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/00d769c5184fd606e94aa06cc5e07bc4136aaeb6 Thanks. Xueming Li --- >From 00d769c5184fd606e94aa06cc5e07bc4136aaeb6 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 7 Apr 2021 15:30:15 +0000 Subject: [PATCH] net/mlx4: fix RSS action with null hash key Cc: Luca Boccassi [ upstream commit 4a750d29927e750b7197dc18fb9ebd9286324108 ] If RSS action contains non zero hash key length and NULL key buffer pointer the default hash key should be used. The check for the NULL pointer this was missing in the mlx4 PMD causing crash, for example, in testpmd with command: flow validate 0 ingress group 0 pattern eth / ipv4 / end actions rss queues 0 end key_len 40 / end Fixes: ac8d22de2394 ("ethdev: flatten RSS configuration in flow API") Signed-off-by: Viacheslav Ovsiienko Acked-by: Matan Azrad --- drivers/net/mlx4/mlx4_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c index 2a86382db7..418e3c6bb0 100644 --- a/drivers/net/mlx4/mlx4_flow.c +++ b/drivers/net/mlx4/mlx4_flow.c @@ -791,7 +791,8 @@ fill: rss = action->conf; /* Default RSS configuration if none is provided. */ if (rss->key_len) { - rss_key = rss->key; + rss_key = rss->key ? + rss->key : mlx4_rss_hash_key_default; rss_key_len = rss->key_len; } else { rss_key = mlx4_rss_hash_key_default; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:31.392812600 +0800 +++ 0187-net-mlx4-fix-RSS-action-with-null-hash-key.patch 2021-05-10 23:59:26.630000000 +0800 @@ -1 +1 @@ -From 4a750d29927e750b7197dc18fb9ebd9286324108 Mon Sep 17 00:00:00 2001 +From 00d769c5184fd606e94aa06cc5e07bc4136aaeb6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 4a750d29927e750b7197dc18fb9ebd9286324108 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 43a65abcc0..71ea91b3fb 100644 +index 2a86382db7..418e3c6bb0 100644