From patchwork Thu Mar 7 10:12:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 138093 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 1E82743BA7; Thu, 7 Mar 2024 11:13:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 60E6642EE0; Thu, 7 Mar 2024 11:13:05 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2072.outbound.protection.outlook.com [40.107.94.72]) by mails.dpdk.org (Postfix) with ESMTP id C05A442ED1; Thu, 7 Mar 2024 11:13:03 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EF4UzYeTa2x3Q0ofXS/naIHhWmGCcTUnidt4HOLOlVx6sx3NnkxnKnFoJi8woSx7Q0AN04VUmJAqE053SNfjRDRb9RrrVkFcX+p0JUBkWY2Nn9paMXwlkCPAMBba4AuhBh79M6y6EsIZfQWQSlCutbbkrMNWXdWLExebsfVH8xLQiph5fPJyriMt4EaZVJEAB3MYYEI6/B9WP1DVtX7opSc1MMZ0Mupf9Wt/tixubmWVRRbxImp3PrGHeSSvV5OEhRIiVFE3jIvfRxQ+i6bCHqDlRrzMFxfenT3OwoR5Uer37JsVqLdjsDEipg81PkV71k3xlX1zECjFvgrwX4t8hg== 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=PSWdCgDkWgCQJ3c8j5GWoj0qjmrPuQmyaXN3TbUxnfc=; b=Dut9VfGVhjkXTnD4/TgDv1F4x1q2l4V7w/LFdl58/dd1P7b+Oz5STrxacfYCUPKT029kBRuWvPcQQw/1NyA5cMT2rX1gi05111bk+cJ1x1fuqc+k2Z5A/xkzF1N9mg76ycplPwctp3IhTooE057NqhVRoWm+0XdmA37tlg3bos1ZrI+UM9EU+ZR5tHXUflNWo9oyc1AlqMzmNDFg3MS0Pfma/OgjpTbA4Aczv0fDTt/MIZWbOfnCkPEusQanrPT+U4tsMrcdGh2NypCH9RtUcWsVxlYaCST5MHBbnj5BcIUm0JxylYv1P/NdoR0ZlasZnmNf0sOQ/oqDJT5KGSxhGw== 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 (0) 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=PSWdCgDkWgCQJ3c8j5GWoj0qjmrPuQmyaXN3TbUxnfc=; b=SyKtcWxC8/Y5B2J59b08cXdMXN+UOgHcroJziZmccyd4KP2bc7Jeb38gJ4MHACSV1EKoWRtfJJpk5voanb1mO/lnLBgE1BWJeuF5T/9iiO22hNZqMYs6GvznZuWl0u2Tmdcrsxj0+4+O404Er4c+dJXDX3phjtq4xtcpsnKOuBUITz2h1rqj5Y5Y0qhcZRI3n1BsIoz+Lr1Ls+i5tIEPWSuFpbJ5TQcC0Ci/Bt1l65+Z/gwDrwT/tj1CL7BJ6EqTS45zeb0ueMxvwuGEy2toEePWw5QI7pGloYP9qsyRXj13Bwj9MF8fwx07XTF/P7/aWZ0Q5UrHuf7B049UuCTXvw== Received: from SA9PR13CA0177.namprd13.prod.outlook.com (2603:10b6:806:28::32) by CY8PR12MB8412.namprd12.prod.outlook.com (2603:10b6:930:6f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.26; Thu, 7 Mar 2024 10:13:01 +0000 Received: from SA2PEPF0000150A.namprd04.prod.outlook.com (2603:10b6:806:28:cafe::9c) by SA9PR13CA0177.outlook.office365.com (2603:10b6:806:28::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.9 via Frontend Transport; Thu, 7 Mar 2024 10:13:01 +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 SA2PEPF0000150A.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Thu, 7 Mar 2024 10:13:01 +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.41; Thu, 7 Mar 2024 02:12:42 -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.1258.12; Thu, 7 Mar 2024 02:12:38 -0800 From: Gregory Etelson To: CC: , , , , Dariusz Sosnowski , "Viacheslav Ovsiienko" , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH 3/3] net/mlx5: fix indirect action async job initialization Date: Thu, 7 Mar 2024 12:12:11 +0200 Message-ID: <20240307101211.1134473-4-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307101211.1134473-1-getelson@nvidia.com> References: <20240307101211.1134473-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: SA2PEPF0000150A:EE_|CY8PR12MB8412:EE_ X-MS-Office365-Filtering-Correlation-Id: 8051dcc4-7f5a-441e-024f-08dc3e8f2bcc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5F/VBrvJ1nrM6jO6KJSPXsM2LVY+vsZRbRW61gU2fCja5yi0HGsz/4J6PDt7oNdG9jXfMc1/q/dKJprpvKSfTR4iZiCxWJLIz3KMtVG1hi1CBVrGTIDNweKv6LnAacmgyTBhvjN9pKlWZYpXuwysidadQqz+p4gq8n9dSFTfDISkL3N7UyxM3GFWZE8Ctw/vdPlbAzoTPceVNZyPJ1tDfisem4dlBf3gAcWaHqxd3e5fTunpjvQMfFU3LKklEgq/yQiLjme32TregPMN7QrZOnPrAKG0YRmQpQG7dPmx1BbiQkx2wXZTo+vzySg9BpzEf19OLMlfjo0hPe+fpt1mhbsBZNj3OdXSo13Pr7ZL3DKYhLvoZO9CEp3hrd3erke+g7x/cC9MdtUUMpPLevo39YWoryA+iCkE6GM/kcIbcZZKptiLMHPX0TXaNSEJdnFH9DZrh4W3ZqIp6dBlJbOkK40nRDJrDAt9Dt5XLGn6rjgldRUAAUFrE1Ni3U992Q+n1nNmInyhu/z9TLFCIqZB5U6CRxwdTJFDfEGDdpWGKc9L7hKS5nvlqpFbzF9rZQ3AmhbeF7eJf9gPX37xm5X+IWuNY+n/UGgz9TF2o9ad1QDX4hUDNChuA/Q75GRirP+01gH24a2jcARTr7GXdKPesUvM5RTS2paKWEJxbnEgIVHAVDk05EsvlxhssX29eAvGg3mI4Py5Kj7XDSXzFNSUQWtWGG9gigtsxplBY7W+R45Trv64rOZ70rOQNUHfHkUw 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:(13230031)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 10:13:01.4397 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8051dcc4-7f5a-441e-024f-08dc3e8f2bcc 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: SA2PEPF0000150A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8412 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 MLX5 PMD driver supports 2 types of indirect actions: legacy INDIRECT and INDIRECT_LIST. PMD has different handlers for each of indirection actions types. Therefore PMD marks async `job::indirect_type` with relevant value. PMD set the type only during indirect action creation. Legacy INDIRECT query could have get a job object used previously by INDIRECT_LIST action. In that case such job object was handled as INDIRECT_LIST because the `job::indirect_type` was not re-assigned. The patch sets `job::indirect_type` during the job initialization according to operation type. Fixes: 59155721936e ("net/mlx5: fix indirect flow completion processing") Cc: stable@dpdk.org Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 8f004b5435..b9ba05f695 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -188,6 +188,7 @@ flow_hw_action_job_init(struct mlx5_priv *priv, uint32_t queue, const struct rte_flow_action_handle *handle, void *user_data, void *query_data, enum mlx5_hw_job_type type, + enum mlx5_hw_indirect_type indirect_type, struct rte_flow_error *error); static int mlx5_tbl_multi_pattern_process(struct rte_eth_dev *dev, @@ -1692,7 +1693,8 @@ flow_hw_meter_mark_compile(struct rte_eth_dev *dev, struct mlx5_aso_mtr *aso_mtr; struct mlx5_hw_q_job *job = flow_hw_action_job_init(priv, queue, NULL, NULL, NULL, - MLX5_HW_Q_JOB_TYPE_CREATE, NULL); + MLX5_HW_Q_JOB_TYPE_CREATE, + MLX5_HW_INDIRECT_TYPE_LEGACY, NULL); if (!job) return -1; @@ -10998,6 +11000,7 @@ flow_hw_action_job_init(struct mlx5_priv *priv, uint32_t queue, const struct rte_flow_action_handle *handle, void *user_data, void *query_data, enum mlx5_hw_job_type type, + enum mlx5_hw_indirect_type indirect_type, struct rte_flow_error *error) { struct mlx5_hw_q_job *job; @@ -11015,6 +11018,7 @@ flow_hw_action_job_init(struct mlx5_priv *priv, uint32_t queue, job->action = handle; job->user_data = user_data; job->query.user = query_data; + job->indirect_type = indirect_type; return job; } @@ -11026,7 +11030,7 @@ mlx5_flow_action_job_init(struct mlx5_priv *priv, uint32_t queue, struct rte_flow_error *error) { return flow_hw_action_job_init(priv, queue, handle, user_data, query_data, - type, error); + type, MLX5_HW_INDIRECT_TYPE_LEGACY, error); } static __rte_always_inline void @@ -11096,7 +11100,7 @@ flow_hw_action_handle_create(struct rte_eth_dev *dev, uint32_t queue, if (attr || force_job) { job = flow_hw_action_job_init(priv, queue, NULL, user_data, NULL, MLX5_HW_Q_JOB_TYPE_CREATE, - error); + MLX5_HW_INDIRECT_TYPE_LEGACY, error); if (!job) return NULL; } @@ -11165,7 +11169,6 @@ flow_hw_action_handle_create(struct rte_eth_dev *dev, uint32_t queue, } if (job && !force_job) { job->action = handle; - job->indirect_type = MLX5_HW_INDIRECT_TYPE_LEGACY; flow_hw_action_finalize(dev, queue, job, push, aso, handle != NULL); } @@ -11257,7 +11260,7 @@ flow_hw_action_handle_update(struct rte_eth_dev *dev, uint32_t queue, if (attr || force_job) { job = flow_hw_action_job_init(priv, queue, handle, user_data, NULL, MLX5_HW_Q_JOB_TYPE_UPDATE, - error); + MLX5_HW_INDIRECT_TYPE_LEGACY, error); if (!job) return -rte_errno; } @@ -11339,7 +11342,7 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, if (attr || force_job) { job = flow_hw_action_job_init(priv, queue, handle, user_data, NULL, MLX5_HW_Q_JOB_TYPE_DESTROY, - error); + MLX5_HW_INDIRECT_TYPE_LEGACY, error); if (!job) return -rte_errno; } @@ -11663,7 +11666,7 @@ flow_hw_action_handle_query(struct rte_eth_dev *dev, uint32_t queue, if (attr) { job = flow_hw_action_job_init(priv, queue, handle, user_data, data, MLX5_HW_Q_JOB_TYPE_QUERY, - error); + MLX5_HW_INDIRECT_TYPE_LEGACY, error); if (!job) return -rte_errno; } @@ -11717,7 +11720,7 @@ flow_hw_async_action_handle_query_update job = flow_hw_action_job_init(priv, queue, handle, user_data, query, MLX5_HW_Q_JOB_TYPE_UPDATE_QUERY, - error); + MLX5_HW_INDIRECT_TYPE_LEGACY, error); if (!job) return -rte_errno; } @@ -12397,7 +12400,7 @@ flow_hw_async_action_list_handle_create(struct rte_eth_dev *dev, uint32_t queue, if (attr) { job = flow_hw_action_job_init(priv, queue, NULL, user_data, NULL, MLX5_HW_Q_JOB_TYPE_CREATE, - error); + MLX5_HW_INDIRECT_TYPE_LIST, error); if (!job) return NULL; } @@ -12417,7 +12420,6 @@ flow_hw_async_action_list_handle_create(struct rte_eth_dev *dev, uint32_t queue, } if (job) { job->action = handle; - job->indirect_type = MLX5_HW_INDIRECT_TYPE_LIST; flow_hw_action_finalize(dev, queue, job, push, false, handle != NULL); } @@ -12462,7 +12464,7 @@ flow_hw_async_action_list_handle_destroy if (attr) { job = flow_hw_action_job_init(priv, queue, NULL, user_data, NULL, MLX5_HW_Q_JOB_TYPE_DESTROY, - error); + MLX5_HW_INDIRECT_TYPE_LIST, error); if (!job) return rte_errno; }