From patchwork Tue Nov 23 16:00:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 104617 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A9DFDA0C4C; Tue, 23 Nov 2021 17:01:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74AE040040; Tue, 23 Nov 2021 17:01:37 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2047.outbound.protection.outlook.com [40.107.237.47]) by mails.dpdk.org (Postfix) with ESMTP id 14B084003C; Tue, 23 Nov 2021 17:01:36 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mQ++llLXYRmxEeTl6FzwTLI6hH0mdwXxmcRiT7qJv3BxPWt6hV40mrtcqj6lZ8a6DWByE/kvEoVrBrAz86XAizih9jIsRINMGO+WZpTk/WhgNxzZTReu3rIvq+FB7exkiGDTItesp73byoZpETXfRkZI0DzzyRW5KOPruMgq7bSG5l+lhI+KyHSZr860M2DVweQgvOwOpvdyFvs8DovWPwtN4X95r7ZdCq4k7BpwSyjKSDOQHA5/zT3NeCMSLxWoQQ9A65pwdCTNpomn+P/lsnM0kT43UCeImKdfTYJfFi6SuIvNOfSWkZnPyKHoQYh9NDL31+ULYKW29kHMxamVUQ== 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=zGfovvJOkzcC6necPsSJHf4y3YhQT2dgbaHJiHMEX5A=; b=MLeWN7pE8c4/2sbcYf2e9XWONsS+ihbuM3yZ5Knnon3UdZP7+kCmXtQdKoputIiGYDYP9VgmTybMB6QcKf9NbUoGVuFD+cV5sf//Hs2q00VmvUJpjqSV/heUqj3eJR35Ak4mTPd01l8kOtmvH44kz97h9RL5u19G3sRZrAQhzr+lWZMXdyDP1BXjKF+5n6CMaISctlfi1PzPuG55fXKnI4jx5rpUf3SaxLhZvdojJ/qiCfAmFjxcNVI5Uzgi30G+gdTI/C8XOpTbShttQX+yMOrZFLLw5TP5BuTELb1YTz7QMNIOA9F7IK3ONnjDP8529InqWMWKuMbglWGALWJquw== 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=quarantine sp=quarantine 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=zGfovvJOkzcC6necPsSJHf4y3YhQT2dgbaHJiHMEX5A=; b=KY2MkKfwRiNDfwccGdHAHmhueBGPtnbP30TCC0jcdWjCkZ5Eiin8vLnulFgcCDEY1u0phI0g92hATpXCns5j1BNp8caVEEPXYjb3Pn/sZlw15A7IgvwrX+Uc2BrblHMUY58LpSeCxtyfWt5cuGn1PuEegPsiv2Bg9iphsjEpdz3lz9F5xNFKELo2OVyrUv7rIo0yLlqyB3ZxJ7vkKiONs+MIdnXZpgHg/hhXVBLEtCXotDJ1Qs8Jdt0tc2HLhUjAHLax1QznsBeK+w2dybMDwNl0i3+2lUagwP4aCVEUbKWfF0qfzm47Kc9VqYsZcWNRWUo8TD0UQS/DkzGR8RS2tw== Received: from BN8PR15CA0049.namprd15.prod.outlook.com (2603:10b6:408:80::26) by MN2PR12MB4784.namprd12.prod.outlook.com (2603:10b6:208:39::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Tue, 23 Nov 2021 16:01:32 +0000 Received: from BN8NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:408:80:cafe::13) by BN8PR15CA0049.outlook.office365.com (2603:10b6:408:80::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.21 via Frontend Transport; Tue, 23 Nov 2021 16:01:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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 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 BN8NAM11FT015.mail.protection.outlook.com (10.13.176.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4713.20 via Frontend Transport; Tue, 23 Nov 2021 16:01:32 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 23 Nov 2021 16:00:25 +0000 From: Bing Zhao To: , CC: , , , Li Zhang , Shun Hao Subject: [PATCH] net/mlx5: fix RSS validation for meter hierarchy Date: Tue, 23 Nov 2021 18:00:11 +0200 Message-ID: <20211123160011.79219-1-bingz@nvidia.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5e264da-ffe3-43e0-e50f-08d9ae9a84c6 X-MS-TrafficTypeDiagnostic: MN2PR12MB4784: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IG1ANmZUqa6mrnU8E4KyeIBQ8Z0u1oXaOnWfqVdgZE3T7SzQ5IFkCYB4Mg7aHlQaLJ2LgfT4zt5ha3oDeXKUdTaM827s4xKMpotlpUqZp7MfvMmyN3rzCU7mWKqy+HurPcLGdTr1OzTNOYcSpclATWJgtSx2F3qXSdpuIoq5xYmhyrN/NVY3qcwx0xVR0XG2zipuZSIEeeYyaGlm8hMwtp6TgjLJgWoiT4yUAdFYrREL3kpDtvUb2U9FL/lNcjwh2htVBV8fOALNfBaqYIC8QflR5T+G+30oMIDONPfZzVfpUKTY2kx98uRndqsL9RrKty1YJuLzp3XL+sQDenUUNws81pUGX5/UkY0K3mHDOX+BtIxqC+JVHHip4K4UhfEVDgt5yyD0nAp2cuxqPzv4uC//bZV5li2qlrvj1CcJUy7Jl5ppcVckHK5scZ+HmQk8u07ysMfbFXyoA4Hp0+E9eFE/vbed2JJKmLHYnEKlSDKjDpn9RukKP89Ih4eMS/c74Qxv1Q8Fud/zwRnUMlYc7l10sxGkXZlId3SVLMmNDGtbHliSLYnZkx4JExGbkNhSFNA8PyOZIt9TMkk/Na03gzZjPDbL06YyOicvN2DUQIFBZ7ZHaQxpRbchbj14Kguo9vrl7dBNVRtPQctAkALEK640mmgB9B26jmnzHXDv8m5phS+XPjlfN+/vnEl2pD6J 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)(36840700001)(46966006)(2906002)(6666004)(70206006)(110136005)(8676002)(186003)(54906003)(36756003)(7636003)(1076003)(356005)(26005)(5660300002)(6636002)(16526019)(83380400001)(107886003)(7696005)(2616005)(336012)(47076005)(8936002)(426003)(450100002)(36906005)(6286002)(316002)(70586007)(86362001)(82310400004)(55016003)(36860700001)(4326008)(508600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 16:01:32.3900 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e5e264da-ffe3-43e0-e50f-08d9ae9a84c6 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: BN8NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4784 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org In a meter hierarchy, all the meters are marked with having RSS if the final meter's termination action is RSS. When validating a flow rule with meter hierarchy, the RSS action should not be fetched from the current meter if it is not the final one. The fate action union is next meter ID instead of the pointer to the RSS action. By using the final meter in the hierarchy, the flow rule validation will succeed without any crash caused by the invalide RSS action pointer access. Fixes: 1ce19ab1f43b ("net/mlx5: fix RSS validation with meter policy") Cc: stable@dpdk.org Signed-off-by: Bing Zhao Reviewed-by: Li Zhang Reviewed-by: Shun Hao Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 2f03e59f9c..f5356418fa 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -5254,13 +5254,21 @@ mlx5_flow_validate_action_meter(struct rte_eth_dev *dev, "Flow and meter policy " "have different src port."); } else if (mtr_policy->is_rss) { - struct mlx5_meter_policy_action_container *acg = - &mtr_policy->act_cnt[RTE_COLOR_GREEN]; - struct mlx5_meter_policy_action_container *acy = - &mtr_policy->act_cnt[RTE_COLOR_YELLOW]; + struct mlx5_flow_meter_policy *fp; + struct mlx5_meter_policy_action_container *acg; + struct mlx5_meter_policy_action_container *acy; const struct rte_flow_action *rss_act; int ret; + fp = mlx5_flow_meter_hierarchy_get_final_policy(dev, + mtr_policy); + if (fp == NULL) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "Unable to get the final " + "policy in the hierarchy"); + acg = &fp->act_cnt[RTE_COLOR_GREEN]; + acy = &fp->act_cnt[RTE_COLOR_YELLOW]; MLX5_ASSERT(acg->fate_action == MLX5_FLOW_FATE_SHARED_RSS || acy->fate_action ==