From patchwork Mon Oct 16 18:42:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132652 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 878F543181; Mon, 16 Oct 2023 20:45:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7BA98410D3; Mon, 16 Oct 2023 20:43:58 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2045.outbound.protection.outlook.com [40.107.220.45]) by mails.dpdk.org (Postfix) with ESMTP id 88EF240299 for ; Mon, 16 Oct 2023 20:43:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e7p0ssxFETkUBwUZtaEW7vA4I7V6ea3CcaSj1xji00f6pVMrZaLMTNosM52SNrMuDU2wwMbwzzESw62C2ChbV0ZA31IYFsv37ptT7xCi8zQak4oxhfEUQQ/IcpwRtPHi4RIb7wQu07npw+CVJ6bF/lq+QoiOR9cDdUc8jTq4Sx2hTjcFEb+y52zu2drLShKk5ATtnngqNks163grby8EWtSSJbeWBzMZiGStENXL8kRjDovYIh7yAFp977ABvDWdx0j9Xc6UAcJ2MaCO3aJ8svdMHYRZw9hQi0uRiPAtdiS370pEU3/1LqCSnJEWtnqlbkbPhmTRxBn22W0wJQ4SUg== 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=2aGsAR4AnYXU5PWD7y/9UnHL0bSMZXf09v8vm4Q354I=; b=R5FXPkAbiUFyvE30Tad3rsmTWlxW482Vr2YxpPhE7RzHHPI0c90KIqEkj71H73XmZ0LT4bEyBHa6EiBgSVK2HOPOim19PSywQVaVligrcr8Q1hBqijmkJDzkQu26ec/ft2e+zWSeYfbii2X4OOpBxvwhE2omCD5UEoRkabInz73OURRs0qGHK/ixyuLUfZ8E7hecF2GOU5s68ddCXgJSxv3q2vMeZdQXmNh44pfF1zTECyXj87F/WciJCmNPVykVfy/shC/iFrVF1Yq0f+k8DiS+k7GGAm33qtAaSVxFsirxxyHB3/vqZyIm9jMw53sFbCIR78oNFGhJ0vvErZoh9A== 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=2aGsAR4AnYXU5PWD7y/9UnHL0bSMZXf09v8vm4Q354I=; b=ODvs9CWoxn0EskWKH0xkt9+qw3hp+lrEZriw6lM/P7CNPDEJ4Xu23JVI82+lYK++sfW+40+Fa0eYA5uy/Jp1PvYM1UbjmFvpdCVPf3EKr/IdTps8vYazgzQmEi0ERGvKVISK2Ef7gIbGNVKmrBdRZ5dNKV8Q5ZbTJvhcu1Nu1KJbwEJmVvu5Lk7rc5fgvn/Mq5AoS/qii9ncUpQDhR3JLodt/3IXrqCVZ2XQ1tn1JAwJvF91kGuH0qMO8biNIEotDaIr4FID8EpehkLSB4HgreQ1R+OWzwO+RD3Eiuvi1CfsBc7HJrGizcgZ84spwYpo66bMRV0iIVU+P8+O+wnR/Q== Received: from SA1P222CA0150.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c2::20) by PH7PR12MB5949.namprd12.prod.outlook.com (2603:10b6:510:1d8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.47; Mon, 16 Oct 2023 18:43:53 +0000 Received: from SN1PEPF0002636E.namprd02.prod.outlook.com (2603:10b6:806:3c2:cafe::22) by SA1P222CA0150.outlook.office365.com (2603:10b6:806:3c2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.30 via Frontend Transport; Mon, 16 Oct 2023 18:43:53 +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 SN1PEPF0002636E.mail.protection.outlook.com (10.167.241.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Mon, 16 Oct 2023 18:43:53 +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.41; Mon, 16 Oct 2023 11:43:40 -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.41; Mon, 16 Oct 2023 11:43:37 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , =?utf-8?q?=C2=A0_=2E_=2E_/patches/upstream-pmd-indirect-actions-list/v2/v2-?= =?utf-8?q?0000-cover-letter_=2E_patch?= , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v2 16/16] net/mlx5: fix METER_MARK indirection list callback Date: Mon, 16 Oct 2023 21:42:35 +0300 Message-ID: <20231016184235.200427-16-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231016184235.200427-1-getelson@nvidia.com> References: <20230927191046.405282-1-getelson@nvidia.com> <20231016184235.200427-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] 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: SN1PEPF0002636E:EE_|PH7PR12MB5949:EE_ X-MS-Office365-Filtering-Correlation-Id: 92f1ff7c-e90f-437f-7b23-08dbce77d8bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x8tdNk/tC6fwUIDVVpabtGvwcsyqnN+QPNxNR2g95eJb3mPHW5Dg5nlBq9mtO45nus4GWD48y5t2tVmZp/+9fM10ybneY6IWExj/dBPWYs2HyDYLj/CXQdtzIXbhRhPKhYfxOX0VRNpUD8A7eQJact3j9cQgUwsUcE6Gbnp+ZYjrH40ysIeXhOPqCzkFJP1CCqtQ/4fV5bi3/N3r0ftyqdr4CTNhUQEJ/krP73ywUH2Z2mL+pYnwg4O+6+WX+BDl3YN25QGLZdmu7y9E3pZ+/OT/ja6dSawIX2U8v7nnP0JBV0hPAzqw5svEf3nEMnbwgvBKEWm8FFlp6JSo0QujLPIyJjQ8AFC/ePavfqLCh4v1MN+s/BqkJV29Nx6gRReHCikxiR8+/BomMt8QWTedgHvp50ovy15ItCmLdmdY3+p+eGKDLtsHOhCLonb/udzx5Ro12NvwfyvAwoepdvuIyh/MnX8VQk9b+bJdv7Im0cXsoM6KJyxBAcD3Xn17EMPUMFqbl4ozc6c3shBmtk2ckRYHAUiTjYaknHjp42AZsG1lpWoeC/yRAlgWd2CwW2oA+5k7USLrGBQ6+ipbrKCD7A77aMZzqnl/xbOdK19eWnkaBWi8oB96nTMsQPoM1TPD8ZuCr2f+wT/1TWLHIeXMQ9kDgLTWZVhtZbClsIz59AuRskXXvTqvBZvCb4OaY4HYS9tpB/wLEGslQNLj7W+57wKY+IiDszXIYyUHcS2yf/s= 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:(13230031)(4636009)(396003)(346002)(376002)(136003)(39860400002)(230922051799003)(82310400011)(186009)(64100799003)(451199024)(1800799009)(46966006)(36840700001)(40470700004)(36756003)(7696005)(478600001)(1076003)(83380400001)(16526019)(426003)(107886003)(2616005)(336012)(26005)(6286002)(2906002)(6916009)(70206006)(4326008)(5660300002)(316002)(70586007)(41300700001)(8676002)(8936002)(54906003)(47076005)(36860700001)(86362001)(356005)(82740400003)(7636003)(40480700001)(55016003)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 18:43:53.4246 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92f1ff7c-e90f-437f-7b23-08dbce77d8bb 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: SN1PEPF0002636E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5949 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 Indirect action list METER_MARK handle and configuration parameters can be independently masked or non-masked in actions template. Non-masked configuration state is saved in the `mlx5_action_construct_data::shared_meter` object. The patch moves indirect action list callback from `mlx5_action_construct_data` types union to prevent it's collision with shared_meter. Fixes: 82641ccee69d ("net/mlx5: support indirect list METER_MARK action") Signed-off-by: Gregory Etelson --- drivers/net/mlx5/mlx5_flow.h | 4 +--- drivers/net/mlx5/mlx5_flow_hw.c | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 2c086026a2..53c11651c8 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1271,6 +1271,7 @@ struct mlx5_action_construct_data { uint32_t idx; /* Data index. */ uint16_t action_src; /* rte_flow_action src offset. */ uint16_t action_dst; /* mlx5dr_rule_action dst offset. */ + indirect_list_callback_t indirect_list_cb; union { struct { /* encap data len. */ @@ -1312,9 +1313,6 @@ struct mlx5_action_construct_data { uint32_t id; uint32_t conf_masked:1; } shared_meter; - struct { - indirect_list_callback_t cb; - } indirect_list; }; }; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 4d070624c8..5114cc1920 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -605,7 +605,7 @@ flow_hw_act_data_indirect_list_append(struct mlx5_priv *priv, act_data = __flow_hw_act_data_alloc(priv, type, action_src, action_dst); if (!act_data) return -1; - act_data->indirect_list.cb = cb; + act_data->indirect_list_cb = cb; LIST_INSERT_HEAD(&acts->act_list, act_data, next); return 0; } @@ -2538,7 +2538,8 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, (int)action->type == act_data->type); switch ((int)act_data->type) { case RTE_FLOW_ACTION_TYPE_INDIRECT_LIST: - act_data->indirect_list.cb(dev, act_data, actions, rule_acts); + act_data->indirect_list_cb(dev, act_data, actions, + &rule_acts[act_data->action_dst]); break; case RTE_FLOW_ACTION_TYPE_INDIRECT: if (flow_hw_shared_action_construct