From patchwork Fri Jun 30 12:44:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 129163 X-Patchwork-Delegate: rasland@nvidia.com 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 4FCEA42D95; Fri, 30 Jun 2023 14:45:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 94E1F41611; Fri, 30 Jun 2023 14:45:13 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2055.outbound.protection.outlook.com [40.107.102.55]) by mails.dpdk.org (Postfix) with ESMTP id 38719406B6; Fri, 30 Jun 2023 14:45:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Eg1xUdj/fNhoN7aWaiXClQCoapeCndbscPN/zkX19m/CmjRkNXDqnY+A3Pj6lX+8QM0jqZk4Io2HHfuA09geWoGEgxLdRJfGgT/f/40aDxyS0PhBnD+Zeq06cL8BCQLX1ROr9jHRzaT7pvMA46jPGhmaM6x6Ek2FzlELkrc/j7Cn8aAOj1WnQDtdFCLEok7jxxbzZNTfsV+j8IAsgNvQlPn2pFLGS1qYY3Xry6i7+fjydSoOWVKJHM4bJaiPzzpAPd83vpCDj7qc3aoKUFctKeCgUvsoe9C0VW01kmq5dnPJTwW4wfwm7HySqAskJdnf90r9ZU6CQc+/CiWz/q4NBA== 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=H7GjeHUAgQA5za3/8Xl8StBbdukZkqEh4GfkBvLR7Po=; b=NiP5qMDFstVUYJ04OOQbI20VBc81lYTQ7wiv5ZoaTtFz6KIrt+uDQfHqgAcfLOkTUFIEzSSM8SOKaOLugSMu2xky7uq2fvpO9NBrmVBU5y65DtUAJ4HULMT+qerG1QUdhGN2IOL8al3/Xp33aBStn46A/1sxJwUwNo5X8RyamSt7WujHlBBhVcuLwAWjMmyVp0fA4jwvKkPK39zSb/5WafD32Y6142FFcQFugVn4jK24awYH+qyllg7fGgPxXFSOmTRFsIOl8e13xVCqP4M8lMgXUeHRY35JBiYIAxvNMLYO5tIWK6vxpkEL85348ZRzutfvXYFjc+cae9PvVULNxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=H7GjeHUAgQA5za3/8Xl8StBbdukZkqEh4GfkBvLR7Po=; b=JQt1Vzdwry8mTR0/cdLPFisdfh7KqYNvyQ1fUNpn9voL8axvy9Wk2NiUhSjhiVgGtKpW/+06gT8zVHHkMZtSnnL+cqbbtKnkgmUvjd/kIjW8BGUVPZMurF0tqUeVMnJ7sg+MrkmeiT6k0BFpLc5SDGrNvwVe+x5AWv3mw9F72a1K062LWsLzUjoGU89aHq5DB/bI0MNbEjiwgju4gdzvSX3YY0lHWKY0zfZ0a+ewJp2CwtmjCDsBn9pE0G9t+0sfyz3sX8mModX59/rNEftvZPBgj1xeDw67QfTDn86Owe0qT7i1xtqCE11YkWYWkrqPviJLMGkqqQXJZ81LqHOiXg== Received: from MW4PR03CA0328.namprd03.prod.outlook.com (2603:10b6:303:dd::33) by PH0PR12MB7078.namprd12.prod.outlook.com (2603:10b6:510:21d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Fri, 30 Jun 2023 12:45:06 +0000 Received: from CO1NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dd:cafe::10) by MW4PR03CA0328.outlook.office365.com (2603:10b6:303:dd::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.22 via Frontend Transport; Fri, 30 Jun 2023 12:45:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT056.mail.protection.outlook.com (10.13.175.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.51 via Frontend Transport; Fri, 30 Jun 2023 12:45:06 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Fri, 30 Jun 2023 05:45:01 -0700 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.37; Fri, 30 Jun 2023 05:44:58 -0700 From: Bing Zhao To: , , , , CC: , , Subject: [PATCH] net/mlx5: fix the profile check of meter mark Date: Fri, 30 Jun 2023 15:44:45 +0300 Message-ID: <20230630124445.435352-1-bingz@nvidia.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT056:EE_|PH0PR12MB7078:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b1c4774-fa42-400b-1823-08db7967d4e2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1lzIgpdAZhxh+yPK9oW1lVNeREaYEQKQuJ2Fu8pctp7AQwmOyCyznSeaesB6QZIXjp747UeucmqkGCU2ubt4A1VS9k6r3m3T2pjQzxKlq+8zRXpBXdzPPpFWCY4kuq4Kl/3h6sJUA3xn6d1fzIk0sJuVKsaIxTe3I33MGDDdxjislj/EIZLkeyxrz1DNpqBEKbXJj4dMjZCsxEFZ2dGDOhIpz0eTNZ5alCcSPCQVc5+YUgTRKFkoHILFwgpw2vbwAs+eJ53Z2D/6lWYTaciJukibircuH/SzBePEgXAHaloXhkc8etyD6ww+MQMj8RDy6zmg2IgHh5UAApRDU7U8Z9yBq0uTUpAtuZrH0uX8x/gs0peorK1CCWoqfifmqkk96mNqibJBljOf6LLYOuqtkNBHFqOxD+fTAnbU837TzWGoyBEFLxWaQE790mABCtB8vEvIDBtNsJgHQFtzMJDJ6606Y7X/ZNqiKxHX3uUMe0/0Hch8qlinkAzAg7VpA5mB0+abF7/N+HAjHD7fDjmDCFj28FE9k7vTEzkmD17SBUvFjfnu4uMAYp+Uy6E+EhpZ8RZVWv5VIpsas95jgjhQagNtoDi/iOJs9bX+2tSq2xBmFsEdJUuQoLcvL6eUBhirnLVigzbMXMXN+ac9yBo61EseDwGzUwlS/9/y83xHVWjv1VpYqzRJrA30OmUBIdJyZqSMyQ5igPZGsRmVWQXTHqV3GkKrw+D1IQQJRYMXXAE= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(376002)(39860400002)(396003)(136003)(451199021)(40470700004)(36840700001)(46966006)(82310400005)(40460700003)(36860700001)(356005)(1076003)(47076005)(54906003)(83380400001)(2616005)(110136005)(6666004)(478600001)(6286002)(16526019)(26005)(426003)(336012)(7696005)(2906002)(186003)(82740400003)(70206006)(450100002)(36756003)(40480700001)(55016003)(7636003)(70586007)(5660300002)(6636002)(8676002)(4326008)(86362001)(8936002)(316002)(41300700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 12:45:06.2299 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9b1c4774-fa42-400b-1823-08db7967d4e2 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7078 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 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") Cc: akozyrev@nvidia.com Cc: stable@dpdk.org 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 b5137a822a..c64b260fea 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1325,6 +1325,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;