From patchwork Wed Feb 21 10:01:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariusz Sosnowski X-Patchwork-Id: 136950 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 17E5543B61; Wed, 21 Feb 2024 11:02:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18BB2406B8; Wed, 21 Feb 2024 11:02:29 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2083.outbound.protection.outlook.com [40.107.93.83]) by mails.dpdk.org (Postfix) with ESMTP id 4CDCD40685; Wed, 21 Feb 2024 11:02:27 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E3mqTo+uzi9KGaywMk7SbIDv3/ynr1VFIhovmcT7vBh0PrnRLyz/kNQtSxeA9n45LgpqKaNzVGF5KgloVDlR7MdChgR7+r3UVwT5I6cmL5cXc/3lsuHP+UA2Lv4LVg4Vual0eHcPxgZ72fhEOfKiDktcCn0CEnKtaOdhtD09oO3EZAOo6HG1KxST5eiaIAydQlFn7O5atBptebliZJ9/ELb/vUXsKfL9a6RG8qqQ6tzn7GSbutwHTvBFZAY8UgpxwNnctga/shVKn679pID0hVs+mtFCW1QcVKRRgrJV0WeExzHB0ubScOydTYWzJ/U4WKICOnX3FLrhiEb5mI6Aag== 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=aLrbx94QAyQOdMu9sTDDAoiPSECmB55Rezm0jP5XtBc=; b=lV5iUg/MXb67gfl/9Nhjru5ho3MbhEbB+AxIFK22HJf3BWdshJlhF+pVPRC6f6t4xM3LFYJQYhBFp+2evn4lpjbVw7EChcN6ZuesNgG/j1Ppt5X+wl2dU5v3AXFMQ5mSj2iCdur513RKIUVeX1cAf06iL4QJgY3Jd6Fujy/MWxkFqIPdfZusN6IM2bXUDSpd2AI7ucXK6k/xZ5D1lZGcTDFc5pqB1Ibj+RnlAIkxX1pYZzW88r1CBSwAi1y/6BaBT0H2KcKttDadVMqzd0wop/uThhA6GnchGpsK5Nem8Sjo0EVbtAVdk34YTZS2Oljm18In5TQE0fjjAv8K2tm/cg== 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 (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=aLrbx94QAyQOdMu9sTDDAoiPSECmB55Rezm0jP5XtBc=; b=YeExOuXPBbco5kXi5TRYN0aUfPzChZSARJcmTF+BIpTHdC/1f4awaBxUO9O7p/zhKRNXzikQzG2pebQ+Eu/fB2ToZHGukufFpLBPz+S1+Rlt9Z0KCEvRfzfqhzs2bbYftjLpVhITmwEb6T0l8Jh+OVCLM24cQBFkVCyjL3t9Mmt/yCuASr6i5vLoAds8EJKTVyZxfI2EJWWQDV2kJpJ/InXlMrHQZIgE4EqUU39PTMiNHi1QGTrd9l50GNJO5QfOIyviNzlW31Pd6VX1YNqsauFIJO9fwJOA8K8O37BjR3wjToItAHqUhdljbjXnc/eFUd65fRyC0u8A/TuxL0jbcQ== Received: from CYZPR05CA0007.namprd05.prod.outlook.com (2603:10b6:930:89::19) by PH8PR12MB7026.namprd12.prod.outlook.com (2603:10b6:510:1bd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.20; Wed, 21 Feb 2024 10:02:25 +0000 Received: from CY4PEPF0000E9CE.namprd03.prod.outlook.com (2603:10b6:930:89:cafe::7f) by CYZPR05CA0007.outlook.office365.com (2603:10b6:930:89::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.19 via Frontend Transport; Wed, 21 Feb 2024 10:02:24 +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 CY4PEPF0000E9CE.mail.protection.outlook.com (10.167.241.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Wed, 21 Feb 2024 10:02:24 +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; Wed, 21 Feb 2024 02:02:11 -0800 Received: from nvidia.com (10.126.231.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; Wed, 21 Feb 2024 02:02:09 -0800 From: Dariusz Sosnowski To: Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad CC: , Subject: [PATCH 2/4] net/mlx5: fix connection tracking action validation Date: Wed, 21 Feb 2024 12:01:43 +0200 Message-ID: <20240221100145.8234-3-dsosnowski@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240221100145.8234-1-dsosnowski@nvidia.com> References: <20240221100145.8234-1-dsosnowski@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.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: CY4PEPF0000E9CE:EE_|PH8PR12MB7026:EE_ X-MS-Office365-Filtering-Correlation-Id: a67ca6f3-788c-4585-043d-08dc32c433f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wDelbxnvcWzlTAuLXpJANRVqYbIhxAj0v9H+liifWRgV9REOaXAsXumTVnnshgrlceFckhUtQDRBx4jPPAkXh+T9Q0usH692i64ou/9QSRG8Cpx2E3cH3UMp9WSnt8fZgIU8tLeCGRs5uO833Oe8qTgoCnQVttRpjVcew62AcIlD59BZTUfOJJgWzg368K4x0xO2F23q/AbE4QKkbnHbtUzvgfSYEuEkBPUKTBH+QbpbW4HWE7hI1ExB7ahEzRw2cDf8tCJIoT3N8Hk8ufADa9aone7NX2EbB9qQ+pY4jDDCW1KigjmRF4Tx+uwlDXRtwMsTJ1sMqDWnQRwsa1xIVClDz2dM66sjy5NK0Iw7TVRShmw+REJ6yl1GtoHHKA9Rc6mg8kNYiLgiPf5vU8iSwwkdRFuLaoytN3BS9Xis+vvW6KquZnbCQufithVchZ4HuzK9PZzEN/mFBlXJpEj32VorPNlXG7my/eAx8qUElBesfRDJ32h6EHM7+aYMU5o5lRJw7cwxGHAPq1LgxH4STW5FgeIUiKhDBgjZ+IXWdzuzhSlSFB6TR49ZFER0PuGm27nzYB8bv32snBR2MtkpZv4OQfzEqt9/JOHz2E56lmDIIYkN0VemFbStthNxfrX6bUa2tEmrGU/eyahjQAw1paP8adhP6F7LS5HUelbSjoo= 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)(36860700004)(46966006)(40470700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2024 10:02:24.3679 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a67ca6f3-788c-4585-043d-08dc32c433f1 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: CY4PEPF0000E9CE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7026 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 In mlx5 PMD, handles to indirect connection tracking flow actions are encoded as 32-bit unsigned integers, where port ID is stored in bits 28-25. Because of this, connection tracking flow actions cannot be created on ports with IDs higher than 15. This patch adds missing validation. Fixes: 463170a7c934 ("net/mlx5: support connection tracking with HWS") Cc: stable@dpdk.org Signed-off-by: Dariusz Sosnowski Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_dv.c | 9 +++++++++ drivers/net/mlx5/mlx5_flow_hw.c | 7 +++++++ 2 files changed, 16 insertions(+) -- 2.25.1 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 6fded15d91..0604f92531 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -13861,6 +13861,13 @@ flow_dv_translate_create_conntrack(struct rte_eth_dev *dev, return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "Connection is not supported"); + if (dev->data->port_id >= MLX5_INDIRECT_ACT_CT_MAX_PORT) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "CT supports port indexes up to " + RTE_STR(MLX5_ACTION_CTX_CT_MAX_PORT)); + return 0; + } idx = flow_dv_aso_ct_alloc(dev, error); if (!idx) return rte_flow_error_set(error, rte_errno, @@ -16558,6 +16565,8 @@ flow_dv_action_create(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_CONNTRACK: ret = flow_dv_translate_create_conntrack(dev, action->conf, err); + if (!ret) + break; idx = MLX5_INDIRECT_ACT_CT_GEN_IDX(PORT_ID(priv), ret); break; default: diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 3bb3a9a178..2f366e9078 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -10048,6 +10048,13 @@ flow_hw_conntrack_create(struct rte_eth_dev *dev, uint32_t queue, "CT is not enabled"); return 0; } + if (dev->data->port_id >= MLX5_INDIRECT_ACT_CT_MAX_PORT) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "CT supports port indexes up to " + RTE_STR(MLX5_ACTION_CTX_CT_MAX_PORT)); + return 0; + } ct = mlx5_ipool_zmalloc(pool->cts, &ct_idx); if (!ct) { rte_flow_error_set(error, rte_errno,