From patchwork Wed Nov 9 07:53:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shun Hao X-Patchwork-Id: 119604 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 AB122A0093; Wed, 9 Nov 2022 08:53:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 55D97400D7; Wed, 9 Nov 2022 08:53:42 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2057.outbound.protection.outlook.com [40.107.243.57]) by mails.dpdk.org (Postfix) with ESMTP id DC7CE400D4; Wed, 9 Nov 2022 08:53:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D38mMas2cvEq0NVDLBapeSzEq3kXS7iHvHm9OShZakt/XLzCxMkUo1nqS2Cvrc6UkAte2QeDOHlfNCI98uNMZevrspZZeUtd/DO0+tSbdZQ0Vab/dw2KIO5Tk50jkgWbXO29+cTKCznpN/cUIhh8lVXAViT3JRxTFcMMGdC6ggNTjky6UWqvDpioKcIeGCRw1ILqYDKjLnTze/3dsFTP72uZDeMgBZgLZw9fEmUNihZPRYtt9EZ1cl1on3EfhKnExOzX3euWCbpzrxH0u2CaTdt/CW3fA8TqpzG6kxf87hU4smXFl6h0HOmVidG2s2sBJdhUQruTkxlVm0gdZAfdCA== 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=EDtquMdPSg4a7RYp0S/7MQX1yzl03R+jcXFiQBxyG3Q=; b=Sq3l2lFLilayhMClhFzhc9k5wHuFWqI8ZKlNDatWfTE/QDgBP51aRXAgO0bBCLzIWY6vQn4uMgzRfXBCN/t1SIlvdNcyNEfbSzBm+PPNok3+ZUXuE2pVCG6QsGyfoXgaTcThB82llCl0DvvFjYZBZ6mZSou+u93s56MjOliirgm43Q0B2QljprnM6nrlFVDU5n4iTcLUOajwFLhjk4oHXXMu29YGYeyCS8biROsR6UHvdrrmP6X5lNpGa7M69TOBXTBU57WaubviakEic0WJbfhAvI34Gb+RoYi1hd0zCKndh8BFgPJ0LxRIOC09oHbTR4dBJ4SnyYsqGTtYLlDODg== 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=EDtquMdPSg4a7RYp0S/7MQX1yzl03R+jcXFiQBxyG3Q=; b=Nj1Ga0QUhdi+P4seVfRw83AxDnG6OfMtgxCd0I2yZSN7LmroQ+w0k3PFyBt48IO0/ZHsAAIIp0/Bdh3whWFFwQnIViUot3lNcZbtOIz7vP9nLGlh+WWJo1RavBt9PQwHS5WRZI0UmnsU/X7Xv6Ks8rX3i3UQnqJ6uUb3wUuwrQC7pwSmB8Cqc6kPzCdpHHfsNMbqvID4NeYvGGVYNSJQOXiGXm0VQ8CsR7XfLepAyc1FfpfBDfmvG28CE5gkWUZdEPKT83gPsfWAJGheEH+9L4KDsx/6iVv+1ocLISK61Zf6dq5kZpanaZee1RbnKmh1eEYwU6bdP9n8EFV3xzAH1w== Received: from BN9P221CA0005.NAMP221.PROD.OUTLOOK.COM (2603:10b6:408:10a::28) by BL3PR12MB6571.namprd12.prod.outlook.com (2603:10b6:208:38e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Wed, 9 Nov 2022 07:53:39 +0000 Received: from BN8NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10a:cafe::63) by BN9P221CA0005.outlook.office365.com (2603:10b6:408:10a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27 via Frontend Transport; Wed, 9 Nov 2022 07:53:39 +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 BN8NAM11FT060.mail.protection.outlook.com (10.13.177.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12 via Frontend Transport; Wed, 9 Nov 2022 07:53:38 +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.26; Tue, 8 Nov 2022 23:53:25 -0800 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.29; Tue, 8 Nov 2022 23:53:23 -0800 From: Shun Hao To: , , , "Jiawei Wang" CC: , , Subject: [PATCH] net/mlx5: fix assert when creating meter policy Date: Wed, 9 Nov 2022 09:53:09 +0200 Message-ID: <20221109075309.958086-1-shunh@nvidia.com> X-Mailer: git-send-email 2.20.0 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: BN8NAM11FT060:EE_|BL3PR12MB6571:EE_ X-MS-Office365-Filtering-Correlation-Id: 25d24c85-d462-4d3a-11ce-08dac227833f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VJC0mwc32IMGAuEddWznmr4IKQvcCGoJRYU86rVh4a3xTXuDMtd/2jedcWGTQX8y7WV6d9TnJ7QZ96UtFCfusf5aPquSzxHl9rdWV1RfTPiOsEGO08TxmfAYsWUqJTLx9rpRlxpt6cI/cbaY7/hD0xBL03L+jYS7u36hrtnCPZOxCso/lXvGatH4AlOulHfWGXJagp4Z2Ow9yRPlv0zEJDdYvEpsil3oWplrxkeB1lYN8bfez9iCxnkydjazLhzsizTQNxWqrnvV6H1i8C6XGe4aYBdzA6FQB3uB8V8dpY5liM46Ij6m/4514NMX7CkxnftyKdlZ/6vtqMeb4skpsxBNwI4qmhQsdWxKjYZsQdh11rbQizhL3aowTputNyHpG9WmZuqSeogcdsjUWM9Rfi8vf1fKdKwQdOmxzNvZWQh8uGNIopOEu6W0xyx93SmHtCvKnFU/jexZgSNt3CGhnmvDEshBMEDoAg/dq85hxNiZGWiF56snIocKJga+PmjXxExhKFhgbffNQ7U4Yi5TKBHT78zqx0EeS4/O+zockt6nzRDeotv6eY5coz7d2PvgIB8Vsg6+yRhMq8e+/R54dPRY6N0ffRqM8ikQZxNnpjVZ1KihFCs2l7hvmHlWVwS70Rql4YUi9MTbsfWGhCdEyxquVQfQJSxzlmM2UItHvcOP5XavvmS9g8CJE4tTD+KyojeV9IjNspOVBYgZxHg0AhlqzyfFVs6J8FBo1OQ8hb2XV6X3pK0DEZh9S5Jua/bI/I4syrWj2DPSBeblLC1rAw== 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:(13230022)(4636009)(346002)(136003)(376002)(39860400002)(396003)(451199015)(46966006)(40470700004)(36840700001)(36860700001)(36756003)(86362001)(47076005)(186003)(2906002)(8936002)(5660300002)(110136005)(82740400003)(54906003)(426003)(2616005)(356005)(6286002)(7636003)(83380400001)(26005)(336012)(16526019)(1076003)(316002)(41300700001)(6636002)(82310400005)(70586007)(70206006)(4326008)(8676002)(40460700003)(6666004)(40480700001)(7696005)(55016003)(450100002)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2022 07:53:38.5777 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25d24c85-d462-4d3a-11ce-08dac227833f 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: BN8NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6571 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 meter policy rules, it's possible to use flow items translation to add src port match criteria. Currently the items translation process needs to get thread workspace to store vport metadata tag, but in policy creation, the thread workspace was not initialized so it will cause assert failure. This patch adds initialization of thread-local workspace when creating meter policy rules to avoid that assert. Fixes: 65c86202 ("net/mlx5: fix flow source port checking in sample flow rule") CC: stable@dpdk.org Signed-off-by: Shun Hao Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 57af95b8a9..e9da59320a 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -17425,8 +17425,11 @@ flow_dv_create_policy_rules(struct rte_eth_dev *dev, struct mlx5_flow_meter_policy *mtr_policy) { int i; + int ret = 0; uint16_t sub_policy_num; + struct mlx5_flow_workspace *wks = mlx5_flow_push_thread_workspace(); + RTE_SET_USED(wks); for (i = 0; i < MLX5_MTR_DOMAIN_MAX; i++) { sub_policy_num = (mtr_policy->sub_policy_num >> (MLX5_MTR_SUB_POLICY_NUM_SHIFT * i)) & @@ -17438,10 +17441,13 @@ flow_dv_create_policy_rules(struct rte_eth_dev *dev, mtr_policy->sub_policys[i][0], i)) { DRV_LOG(ERR, "Failed to create policy action " "list per domain."); - return -1; + ret = -1; + goto exit; } } - return 0; +exit: + mlx5_flow_pop_thread_workspace(); + return ret; } static int