From patchwork Tue Oct 17 08:09:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132736 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 655664318A; Tue, 17 Oct 2023 10:12:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3247342D83; Tue, 17 Oct 2023 10:11:00 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2063.outbound.protection.outlook.com [40.107.102.63]) by mails.dpdk.org (Postfix) with ESMTP id C866640269 for ; Tue, 17 Oct 2023 10:10:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LXhkocTAC3o2kzUx2/3gt5e417+VM6unPGoDnnbaEQJvC5pyWBugnRu7Z7X2pwDKWq9968vP2kEoUz6cFKpr3ORdgfKp7RXmcX1i1nyfhOuwWtOlnQSS89yrBaD/NFa1EWYOcaavdkjwaPCQr1h7S/JgUSEww77BTKOGz8SAvK/zqw10xtH8CdeMJM7a7/yfpG64W+JD6Xreih5OMdsP+QQ1miBi8i6scy2rgGMf6IKYENGP1bnRYsrB85o0CyVyT9NTMgBrHzmfW1n+d8hOAYYNy9Dv2bFjtCqjfiKiyBPZLOoep6xWuNmK/aI6Pj8r3c7ug9oTFFuPVrJd1fW/pQ== 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=ajhX4SfRQRrALfI9+bsLAY6HCGlEi/yfGvdsrg8097c=; b=mF5/88WaclAQ+bgYojXwXq6qyTkFfUBoStCblO3XC0CiKZ8hj7ZI+uhzA3JhpCtSBJ/WdHOAa8td2ajTRZpRYQkRBocwL+uX5iDKC63RCsPU+QgRLcCJg/pQ1HYHtfuFhuBSe8y5wfvmLaXNPGgVj2GeG1Xziy8bsx8U6ehbf87SGjAXLxkL5IWaqyYGqjgtQ0PLGUFTsAGolkxDAsfQUI3BOlSMztziyhXR5W4hUwSp9Vu0f7iMoxD1/rtdnMb3QZjmydLt3yWmaIjWLNdSqHkhSO54Wa/xhAMva9/JXNjyuG8kdD7dhY9WSFWIqhtVjZdP1O1XnGx38hyqTizVbg== 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=ajhX4SfRQRrALfI9+bsLAY6HCGlEi/yfGvdsrg8097c=; b=jfiUs3HlTjEtUBrAz0n/hP5GgpAsVANoKUPyiMWMpVb9xSVRQMJ7NPV0MEYDeZYmVKBFxSf1+bMDXZbAsAx/H7YMDM+DkQCfo+AhazCM+ldYQF5oIUlEauB/daIW7DkWoxCsbvbQuHoH88znmN1rQ72xbc3yzlLiw18NkulDuuWGiZdxmtcCiScdYQETgZ2WnqtZ5nX8whRkt+5M0DMJfk7RuUvD5s5UDyMwxq7g6T8zfGEFAE/B9ruQ9xZiCcuNRlMZofYXWQmW5SnZD9zaz5ueUxyCfSbqsaL2mu/atXyDDppgzMAZAuZjjlpN5f47uPHdgwDiHE5OG96AHTRTig== Received: from BL1PR13CA0021.namprd13.prod.outlook.com (2603:10b6:208:256::26) by MN0PR12MB6222.namprd12.prod.outlook.com (2603:10b6:208:3c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.46; Tue, 17 Oct 2023 08:10:57 +0000 Received: from MN1PEPF0000F0DE.namprd04.prod.outlook.com (2603:10b6:208:256:cafe::98) by BL1PR13CA0021.outlook.office365.com (2603:10b6:208:256::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.17 via Frontend Transport; Tue, 17 Oct 2023 08:10:57 +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 MN1PEPF0000F0DE.mail.protection.outlook.com (10.167.242.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Tue, 17 Oct 2023 08:10:56 +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; Tue, 17 Oct 2023 01:10:38 -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; Tue, 17 Oct 2023 01:10:35 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , , Suanming Mou , Matan Azrad , Viacheslav Ovsiienko , Ori Kam Subject: [PATCH v3 16/16] net/mlx5: fix METER_MARK indirection list callback Date: Tue, 17 Oct 2023 11:09:28 +0300 Message-ID: <20231017080928.30454-17-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017080928.30454-1-getelson@nvidia.com> References: <20230927191046.405282-1-getelson@nvidia.com> <20231017080928.30454-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0DE:EE_|MN0PR12MB6222:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f5aa1e2-3c40-456a-d6ad-08dbcee8976d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BaUda9S2okisCAN/TrtpwJ/uxZAiJ8PcaTPGm1/4p+Cpr2sFUiNl3sL8tn4D/0uhCp+EaqhpVNdvHL+R4BaC+hw236UGuxe0vIFP663rRSFgHpGysbuV8NbqOxyQj4ZmtqbmRFkImeIBeA4pBZ6M98hCUkz9kfl+AHk/cLujuwrXqsDBBwlEayPtMd7JehVit2r1HGl3Cu2BMUT2ej0W0J3p63I6Kct+gUFzsSakw0FUVmSRoApHjfbr7OqSUJUILsDCv5ex1Ijf4o8D3KFyDgEDrJfwD0gySkEVkqJ7ggy9OCYBnyPZwZ7y+lyxTG0D0W8vDVRgGFZgeA6AS8DJxeJ1qILJtbT6BhwPbfRGJTiFttEwM8CV/J+M1ppFkyJIGg+VH3FSuoBUphuATRFWqFQGCwpvguR99OvPcjytPrfQGR15/Kosce8UIySb1wuOzPRSoD6KptkvmT+GTNnZ91Cp6vJEDsvsJz4q6Vljl7hNuHczjYxyccdBgqc7rOEXQfb+RFq+klbkhayEqv1AscIsbyPGP3ai2HCRXOctksn7Nz15HZ1yr0KjtXLD6Y6kZP9MWb4JciOTNJISXL6Z65slmzDKT4K797Rv4fsIoiSahZVf2sInrqDyHnkvEQDvH9jajNqRxI74KRLHaqD70TbnetF1BoLoQ2pwlhVW2UkJ9Ofm2tu8Um2gfWQM5HFD33PBtIVmp/kr4UxN469vl3m9eh9+L0qEw6gwCAubf6Q= 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)(346002)(396003)(39860400002)(376002)(136003)(230922051799003)(64100799003)(451199024)(82310400011)(1800799009)(186009)(40470700004)(36840700001)(46966006)(7636003)(356005)(40460700003)(82740400003)(55016003)(40480700001)(36756003)(86362001)(2906002)(478600001)(2616005)(70586007)(1076003)(6286002)(26005)(7696005)(16526019)(54906003)(6666004)(107886003)(316002)(41300700001)(4326008)(8676002)(8936002)(70206006)(6916009)(47076005)(336012)(36860700001)(5660300002)(426003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 08:10:56.9318 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f5aa1e2-3c40-456a-d6ad-08dbcee8976d 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: MN1PEPF0000F0DE.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6222 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 Acked-by: Suanming Mou --- 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