From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1D49742803; Wed, 22 Mar 2023 11:17:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F368442D12; Wed, 22 Mar 2023 11:17:02 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id 2D87442D12 for ; Wed, 22 Mar 2023 11:17:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mHEogSW4J0xAp9SUcsBQHnf90d+NbzBDf6SVf5PKJb8gQJLLyD4o3LZgN+I47F8vjuDPUEoldL9MehtYJGl/EgoLoNjcH09CqyFPc9p/qumEE7K6tDipVyS463uIoQORoR9coX3Yfn2kWxQHEFxcLn0u0kNR8rsnSjh4fP1PIUFZbbisycTc8Xi5Ccduzo13Lg/M1SQcTVr4/R72rRZnJDtzPwOI2rGgzGrid7Jtat0zNX52SO4vygEMElITLCKwMooMPg0LwuJxRTLMes/DpnxpANv5ofkpHS/pTI1PJ57RCIhZekbBadAGJC8M85H82XuLJjFwmxvirJo36YBRtQ== 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=c6gqmJjCLUfmjBq6aE3NdkgFd5Mw8VBc/YZp1G/Q5bA=; b=kDIY0e8b8krHEq5J9BkDpsmIwplumDL4eczxA8w7V/ZufYBKfjlZ9+m17WDy+9EiQ33Q84LRJkLvSebuFm0dwGJ73tMMbc1eqwgS3PxVrz3CQf39F1/CaClyiYRIW5aP6XWspRP7ljLjIjGnsMb9VngAuWGHE+SPi6qyNAuS3RysDoXno+ltJA2IYVngLX9MJsZgThVt4YKj7qTYpAJ5ok5kFteUpyvDMzBwQNK9gyXpb3P05+nKZnuCKBWzlZFBdb/ax1XZxg2AUxQPpBPTJwlcI1IQoBEIuRp4JwZksQ5+gC4TFh9yQ53rvLsEMjJOTulnTdMSPkW4KiZCe41zfg== 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=c6gqmJjCLUfmjBq6aE3NdkgFd5Mw8VBc/YZp1G/Q5bA=; b=KLCnKgL/bDUzkUi5dP8KrHwpEHm5P4IRhihKLM6uyLfomHZjZ7zF/NXg1HcukXpAyt9DLsERajNKiBk3zCJAYTd3vZeeIe9zSNeTMAe2+H5YWNTz0UKzU2Ldiu+RgXJiqqr5QzAlziDyO4Fhrs6rckq2Jv0qIQVMkAb+Eby6D7Wmzmte42H6X33xJsY2RXYOTvNpZeiSfOWDeY0WZm/7x+r29KKbDI1kwVkplG0hEvpQuqR1JKv563JWr//qYD6lOjRPDlQi+PBbcctuLSmuwcykHxAU4F30wEYsRxyPz//aLbd8CrIIfJ+WwXs/TcHUlmaxLhkLHWLoaxcYDK9JTw== Received: from SJ0PR05CA0202.namprd05.prod.outlook.com (2603:10b6:a03:330::27) by DS0PR12MB7581.namprd12.prod.outlook.com (2603:10b6:8:13d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Wed, 22 Mar 2023 10:16:59 +0000 Received: from CO1PEPF00001A61.namprd05.prod.outlook.com (2603:10b6:a03:330:cafe::5) by SJ0PR05CA0202.outlook.office365.com (2603:10b6:a03:330::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.17 via Frontend Transport; Wed, 22 Mar 2023 10:16:58 +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 CO1PEPF00001A61.mail.protection.outlook.com (10.167.241.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.30 via Frontend Transport; Wed, 22 Mar 2023 10:16:58 +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.5; Wed, 22 Mar 2023 03:16:45 -0700 Received: from nvidia.com (10.126.231.37) 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.37; Wed, 22 Mar 2023 03:16:43 -0700 From: Erez Shitrit To: CC: , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH] net/mlx5/hws: add check for modify-header actions Date: Wed, 22 Mar 2023 12:16:21 +0200 Message-ID: <20230322101621.642765-4-erezsh@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20230322101621.642765-1-erezsh@nvidia.com> References: <20230322101621.642765-1-erezsh@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.231.37] 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: CO1PEPF00001A61:EE_|DS0PR12MB7581:EE_ X-MS-Office365-Filtering-Correlation-Id: 858dc39b-ba50-421c-683e-08db2abe91e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VBd3WOWXu9GnDgQg5sCiTcdCqyYHFiI8ikISROFSHZIgmX8DFaLPriN2F3GLrpTpusCJKDeubC807xdLOFUypSEMelfoMFn9S6+LzZrUpw9ot1em7fWACdSFG8OVDNgqIR0m5d4WhXN6FfXjtqfZyIVEpJimHHhOIHkffeYeynhDHPWAfKBU1VEpAgxH+WsJK3WuqyPvRJ+icrC/3yboc+n6Tj9EKPvPj9KmbhsfKM7EjpkzqwhBysUcKrBX6JIy5jmHS6r1WMwE5pGwggPk+KngPEaasNJopXXWNq2eZpddbamcicB758eIHPeUFGhVZd9mODf0V2pdCemVXfKkf1Y/AmZEVvNGb19j9c8p/CLPB951FaLDXwW+0QJ2ecBND/SECRI2yCJCfvmXiZfhlQK7b5z5nCFiD6FJWE+awlsLF/w/HqssHWGd0VUwrehY0i27c84vVqreLOpQWm73VsL4KyqAYZVJscqALXUyYnj1MEes7BK4YRtbYabkTyjjQ9BIkMGmvBHAmHZ1M0rMx7yt1XmFc8aJ7Xyaj1ktwWngawcnZDKi7oU2jXesn+RAFyvaAj7ir5wmSxNeuwRawT7W/KepgP6O2+c7mH5jLKNsN+Inr7Mx59QSGtZOVkQWsL3+t/wuzmjKYKT7FEZBNLDeAQ0dVEqQfVOf3sEER+1BwKhf4As5zDIj/Bz3LHgoIK4Y2MrH/OFw03cK8Lu53ph2P7mwv+UyLulwDWz2Cmt20eoXCEmTtmqvtKPrpCUT 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:(13230025)(4636009)(376002)(39860400002)(136003)(396003)(346002)(451199018)(46966006)(40470700004)(36840700001)(336012)(26005)(1076003)(16526019)(47076005)(426003)(6286002)(107886003)(6666004)(8676002)(316002)(70206006)(186003)(83380400001)(7696005)(54906003)(2616005)(4326008)(6916009)(478600001)(70586007)(8936002)(41300700001)(5660300002)(2906002)(7636003)(82740400003)(36860700001)(356005)(82310400005)(86362001)(36756003)(40480700001)(55016003)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 10:16:58.2003 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 858dc39b-ba50-421c-683e-08db2abe91e5 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: CO1PEPF00001A61.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7581 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 Allow only actions that are currently supported. Signed-off-by: Erez Shitrit Reviewed-by: Alex Vesker Acked-by: Matan Azrad --- drivers/common/mlx5/mlx5_prm.h | 1 + drivers/net/mlx5/hws/mlx5dr_action.c | 6 ++++++ drivers/net/mlx5/hws/mlx5dr_pat_arg.c | 16 ++++++++++++++++ drivers/net/mlx5/hws/mlx5dr_pat_arg.h | 2 ++ 4 files changed, 25 insertions(+) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 4b0a56f4e5..0b6dc43752 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -715,6 +715,7 @@ enum { MLX5_MODIFICATION_TYPE_REMOVE = 0x5, MLX5_MODIFICATION_TYPE_NOP = 0x6, MLX5_MODIFICATION_TYPE_REMOVE_WORDS = 0x7, + MLX5_MODIFICATION_TYPE_MAX, }; /* The field of packet to be modified. */ diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c index 77cf1f5132..2d93be717f 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -1603,6 +1603,12 @@ mlx5dr_action_create_modify_header(struct mlx5dr_context *ctx, goto free_action; } + if (!mlx5dr_pat_arg_verify_actions(pattern, pattern_sz / MLX5DR_MODIFY_ACTION_SIZE)) { + DR_LOG(ERR, "One of the actions is not supported\n"); + rte_errno = EINVAL; + goto free_action; + } + if (pattern_sz / MLX5DR_MODIFY_ACTION_SIZE == 1) { /* Optimize single modiy action to be used inline */ action->modify_header.single_action = pattern[0]; diff --git a/drivers/net/mlx5/hws/mlx5dr_pat_arg.c b/drivers/net/mlx5/hws/mlx5dr_pat_arg.c index 6ed04dac6d..830bc08678 100644 --- a/drivers/net/mlx5/hws/mlx5dr_pat_arg.c +++ b/drivers/net/mlx5/hws/mlx5dr_pat_arg.c @@ -441,6 +441,22 @@ mlx5dr_arg_create_modify_header_arg(struct mlx5dr_context *ctx, return 0; } +bool mlx5dr_pat_arg_verify_actions(__be64 pattern[], uint16_t num_of_actions) +{ + int i; + + for (i = 0; i < num_of_actions; i++) { + u8 action_id = + MLX5_GET(set_action_in, &pattern[i], action_type); + if (action_id >= MLX5_MODIFICATION_TYPE_MAX) { + DR_LOG(ERR, "Invalid action %u\n", action_id); + return false; + } + } + + return true; +} + int mlx5dr_pat_arg_create_modify_header(struct mlx5dr_context *ctx, struct mlx5dr_action *action, size_t pattern_sz, diff --git a/drivers/net/mlx5/hws/mlx5dr_pat_arg.h b/drivers/net/mlx5/hws/mlx5dr_pat_arg.h index 92db6d6aee..ec467dbb4b 100644 --- a/drivers/net/mlx5/hws/mlx5dr_pat_arg.h +++ b/drivers/net/mlx5/hws/mlx5dr_pat_arg.h @@ -53,6 +53,8 @@ int mlx5dr_pat_init_pattern_cache(struct mlx5dr_pattern_cache **cache); void mlx5dr_pat_uninit_pattern_cache(struct mlx5dr_pattern_cache *cache); +bool mlx5dr_pat_arg_verify_actions(__be64 pattern[], uint16_t num_of_actions); + int mlx5dr_pat_arg_create_modify_header(struct mlx5dr_context *ctx, struct mlx5dr_action *action, size_t pattern_sz, -- 2.18.2