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 369AB4301F for ; Thu, 10 Aug 2023 02:02:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2DA7E40DD8; Thu, 10 Aug 2023 02:02:50 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2052.outbound.protection.outlook.com [40.107.223.52]) by mails.dpdk.org (Postfix) with ESMTP id AAC89406B6 for ; Thu, 10 Aug 2023 02:02:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZianoQ3DqSAemNcfuKZX5CsthdTNUWzfkg1THjg70Wm7vZCujQDZOBquDfrLvPcUQrKETUOu0BJrEG1+f9P9NXgjGADASmPN3vxFKgV0VMCenO+wgdPL9pcG+1IYRxZ3Q/t3r0I8W9VbbEla8ix5+oJDtetOaY6sEKmXO9oHBhaOdQlV8v67h+YiDZB5vzTCZgTYvVYBZujU0m1RkJXpEL1v7QUCiFnqcihzpRuBxOIJJQ8awXEZA11/43zD1pWU2M32mRZcqC4/bLtjh+t2jDWkVwKmDD5yqroyV2xG/6ybv4mmzHSdvyBR9ACSyaS9bh0r0Ehg7fxc7peYcoQgYA== 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=XBrB6rikDN3GpyIB5VtYxTXarFYfC0BcjzClBduNdg4=; b=F4Z+8UMtqtOLnm7AntF3MOizurhzgrcLOMUBcE/ISIEj82PIDzXi4f44VfhLoFXv/KP6pbpoLzm0mlA2Ywjh3tXSMuzbLm4wW0Qo44kV/rjDtE36oiuieaMVGq9jbIbDcOpo8m0DwZrKeubWwf7UdAjQ227fFRoSgwYT6E49Ry4bhSfxAFaoBUkvTXlwX5nvun5hFnrpX5JML23FD5v+WzFW4Hxs/aedJLB9FYDINr3IgRVvtwGpbmNmqlTKNYE5wx9qrH1TpdRzrROK6BVEjbxLPoF8HQAd7Dg3Y1ltAf0srti2fRdoG/sqMzXd/F+FOzIRnwS+zQ3kj89YcIP0UA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=XBrB6rikDN3GpyIB5VtYxTXarFYfC0BcjzClBduNdg4=; b=bqYUHrLxEZS1z8bLq5vLv5YZRiD8xV1nvUUgDYsEFf3gpNpjxLSiuGzNij/H11BVHmwq2wvGTHnlpJRYcxoiQvSDYt3+ug0iQ+es+W5HiYlSGTTX9tFYIK4a3+kdoESqki5xxSkwQolBPf3RIuuXxSmXjVdzPuvGy6dbvuMB8ZhxZ6/3WpJn5FotrHzs53niRmgYibO8UMJMeNEDLrC0n8EmxLPAFs5tU2HYe1Qo4NC1kO08fODXRvGQZmHYl+u5gN2Kj2h3gSClguBvBzJfNj1KS+IxFdYUiVGlKcJJkUES+emzLKCRnzIMTmT+JBzSHfZy9qo+pa3c9o3cccZ2Vg== Received: from DM6PR06CA0047.namprd06.prod.outlook.com (2603:10b6:5:54::24) by SN7PR12MB7323.namprd12.prod.outlook.com (2603:10b6:806:29a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:02:46 +0000 Received: from CY4PEPF0000EDD6.namprd03.prod.outlook.com (2603:10b6:5:54:cafe::6) by DM6PR06CA0047.outlook.office365.com (2603:10b6:5:54::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:02:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EDD6.mail.protection.outlook.com (10.167.241.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:02:45 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 17:02:33 -0700 Received: from nvidia.com (10.126.230.37) 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.37; Wed, 9 Aug 2023 17:02:31 -0700 From: Xueming Li To: Bing Zhao CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix profile check of meter mark' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:58:59 +0800 Message-ID: <20230809235947.1187-27-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809235947.1187-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809235947.1187-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] 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-TrafficTypeDiagnostic: CY4PEPF0000EDD6:EE_|SN7PR12MB7323:EE_ X-MS-Office365-Filtering-Correlation-Id: bfd18811-ced2-47d7-7e7a-08db99352058 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RB/fFfJOkg+NtwOlgOGNHyZoZkDIGTaWcSvQzBSuHssmPw8PT4o5QR1cXzwTSCR1VHLSD5TK+dDc9k6kfZ4gXEHjqa6L50zohoJ2/c2nYTJ2hBQmRLozivEHfPM2u8tEDhRLuxjMYxJ6Jij0HRvOxzkp9T2KySxzIFwoR1UJkxoj10nCwu1wxLyc1/CDnuGhRrtWqItE2jmllZTas6vJb7H1Pp0MiYAKSDF+bgawuC4jGule0T+CyfidNbshsgXbUYyPu+ATvpFOWNqWuO2vtQICUq/9xw43r75ARbWjE+HKq6/NHZeW6+RDmP+c8iUacQDFgy5HZMWzbx+DXGvZL/DatfN2NliEW8bLGpd6ToolDYgCvCLn1Gcab3sGueqGeZBfSK6eYNdPRQyU8Nq+1GrwUfF8b2o7bEa42aKqTliexJUGNLWSFAzr9i1RHSajwDecwhWdyWr7ND9BBACn3p71S35pcCMO4ZjUfcFF7LmbfbtgsdrUUSUoubPKDnMgpBys3pl5WYrs+evVw3fxR/1o9OhJH2PpPPckXgznslWN379BXRVGfM6s+0vKuZBnDpvxwq1tE9GbRsl79F5VXQeKDSjlIpkLdRdZ2WeyYx6e6yPEFwhXlzZoeuc+YffCDZGtvWRbvdqpuMcwxx2/DIvNOSX6qkWL6gUrLa3lMAD4sxpLUIJCCGdH6NkwOUQWT22nnw8EiTGpRJjCZbNFKoDv/2CRdP8xjo+dFV4sn8A6du7gnr+w6l5poyUb6OZxL3QzLHbU1UlIacwQoMmnRQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(396003)(136003)(39860400002)(376002)(82310400008)(186006)(1800799006)(451199021)(46966006)(40470700004)(36840700001)(40460700003)(55016003)(40480700001)(37006003)(26005)(54906003)(70206006)(70586007)(336012)(53546011)(16526019)(6286002)(1076003)(478600001)(6666004)(36756003)(36860700001)(83380400001)(426003)(2616005)(47076005)(41300700001)(316002)(6636002)(4326008)(966005)(7696005)(2906002)(86362001)(82740400003)(6862004)(8676002)(5660300002)(356005)(7636003)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:02:45.6637 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bfd18811-ced2-47d7-7e7a-08db99352058 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EDD6.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7323 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=92c7aa6a22ca77263470c4caf6e17b32a5e7187d Thanks. Xueming Li --- >From 92c7aa6a22ca77263470c4caf6e17b32a5e7187d Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Fri, 30 Jun 2023 15:44:45 +0300 Subject: [PATCH] net/mlx5: fix profile check of meter mark Cc: Xueming Li [ upstream commit c8957cc9d9750756eaa21e575781bf3b7d7277e6 ] When creating a meter_mark action, the profile should be specified. Or else there would be a crash if the pointer to the profile was not set properly: 1. creating an action template with only action mask set and using this template to create a table 2. creating a flow rule without setting the profile if the action of meter_mark is not fixed The check should be done inside the action allocation and an error needs to be returned immediately. Fixes: 48fbb0e93d06 ("net/mlx5: support flow meter mark indirect action with HWS") Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_hw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index a3fd87b16f..102f67a925 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1243,6 +1243,8 @@ flow_hw_meter_mark_alloc(struct rte_eth_dev *dev, uint32_t queue, struct mlx5_flow_meter_info *fm; uint32_t mtr_id; + if (meter_mark->profile == NULL) + return NULL; aso_mtr = mlx5_ipool_malloc(priv->hws_mpool->idx_pool, &mtr_id); if (!aso_mtr) return NULL; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:20.236679500 +0800 +++ 0080-net-mlx5-fix-profile-check-of-meter-mark.patch 2023-08-09 21:51:18.244352000 +0800 @@ -1 +1 @@ -From c8957cc9d9750756eaa21e575781bf3b7d7277e6 Mon Sep 17 00:00:00 2001 +From 92c7aa6a22ca77263470c4caf6e17b32a5e7187d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c8957cc9d9750756eaa21e575781bf3b7d7277e6 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index cbdac2996c..330386df77 100644 +index a3fd87b16f..102f67a925 100644 @@ -30 +32 @@ -@@ -1325,6 +1325,8 @@ flow_hw_meter_mark_alloc(struct rte_eth_dev *dev, uint32_t queue, +@@ -1243,6 +1243,8 @@ flow_hw_meter_mark_alloc(struct rte_eth_dev *dev, uint32_t queue,