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 609D2427E3; Mon, 20 Mar 2023 17:35:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 10EA142C24; Mon, 20 Mar 2023 17:35:21 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2077.outbound.protection.outlook.com [40.107.212.77]) by mails.dpdk.org (Postfix) with ESMTP id 7FBAD42BAC for ; Mon, 20 Mar 2023 17:35:19 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ABliAdM85oh/+/noARe73t5nDfLwhZmXbFY1MQ/NGZPZezREueKYCVp+9/Lhic2gyceuXrz8ZZjHGOCF4SjwZnzOg99tzcSHryKGBo4lUkNi2e1n7X+cnFjOquMFvtqW3RaCHgKxVJwrN8TFTjU4I/EppTyRUSzxS6rQUPCwJ+6mISsjkua7rWo3ULEB6iJnxdWdz13oMnpwWTtmoK1O1MOvyDjweUQ0XqtrW0a3/AFbK+ab4Ht+mJYRxb/4v5OxDjsl3RbYWWtnVLjF9SiQFis1mIlsP7614iWMh1B0gYp6YzySf7mj84+WIpTvjFxSYa5i8RsWT8S2chgrUD3Ktw== 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=bOZXOhwyRqYG01U86gM5OcfX1ruYK5q6XMvHTNv+ewE=; b=PQeCiz4xQXs9p9iG3OWynNG6TCPIkxNKXNF54XW7juXqWKbOycYe7ujs4sDnJrx5wTNuVhbcbauVPTF+mNc9SrU2JDmpgeg0Q+P6XwUJOoCaqwRV5IbC/6OjwVybNuvmC+kKEX4UPF4yM/lbqWGNkuUrJe4MHmv3U84URYkEfAz4/suyFPTeAiy9GPLgIpkiTu2nX0RR8sJAOX18ZfmIo8EOKgJkSCK0pldw3Nv2Eyt+MbtdeeM4Qin0gMRpYX/CgFNAEgPQxpg7SPBc+IiJ2uV5E3HKDMQySxr5JU3dQoHJzwfu18BY1R5Fg3VassEIZdDcpXivAWt0ucLltxU8Tg== 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=bOZXOhwyRqYG01U86gM5OcfX1ruYK5q6XMvHTNv+ewE=; b=LKEWlAWBB8RldwGUEJ8KVOooOPZjCWZEyDKZpSU6AiQCLdOLi06sWulOhPc8dUMqQ3Pca9ZR886KIl60/xaRidA01DyVGfOWCqDUyjuzQ5IEMiUFdmAFKVgx3IJ1qrlPrAEfIejBkkirE2YkrbXzJeXY6cwc81r7asT/RDrWaSg3bVsMuuuyt+goXIlcCXpmwSxlx8ZBO6uK4bHLPmyF5Dn5cRR9j8FB/N2KDMcn4COgWJeEAfGvDQQyzk/pT00PwtXQdNeIV28am0LFHLC7LaV3Txhdigjwi1OG4MJMAe9NIK/004vxln5+DY5sYhiPMq8Yf2NymN6Lu9AoXqBSXA== Received: from DS7PR05CA0014.namprd05.prod.outlook.com (2603:10b6:5:3b9::19) by CY5PR12MB6454.namprd12.prod.outlook.com (2603:10b6:930:36::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.25; Mon, 20 Mar 2023 16:35:18 +0000 Received: from DM6NAM11FT109.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::96) by DS7PR05CA0014.outlook.office365.com (2603:10b6:5:3b9::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.15 via Frontend Transport; Mon, 20 Mar 2023 16:35:18 +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 DM6NAM11FT109.mail.protection.outlook.com (10.13.173.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.15 via Frontend Transport; Mon, 20 Mar 2023 16:35:17 +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; Mon, 20 Mar 2023 09:35:05 -0700 Received: from nvidia.com (10.126.230.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; Mon, 20 Mar 2023 09:35:03 -0700 From: Erez Shitrit To: CC: , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH] net/mlx5/hws: add check for modify-header actions Date: Mon, 20 Mar 2023 18:34:43 +0200 Message-ID: <20230320163443.454222-4-erezsh@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20230320163443.454222-1-erezsh@nvidia.com> References: <20230320163443.454222-1-erezsh@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.230.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: DM6NAM11FT109:EE_|CY5PR12MB6454:EE_ X-MS-Office365-Filtering-Correlation-Id: 8242ea74-5bf7-4cac-7017-08db2961172c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zIlH3rFgRibDrn3UPUenuJAvqQ7ebgtQxxQP6OlTTfanxsxqViiyQ9q9lkjGiN16Vq6lU+tPcsOrlL9cnh0nfl9JfixVviBniJkWaDuf5l2DesWcxkhwFrmenyhtZTequG+ko5ni7jR9GeP0OTcKtGGCnRRQSNo1NpHF4CExMKsPkj29A38tr1I1vx3yUA2As5mKrX5Fg7HuUbCXDPdE6b2P4hP75UArGKy05GeIvWvGO+OBV6v96QO7ybJhma9Qe/wRV7C3tkF0m+pr3V5ZeOSWjj2mBUPyHA49Q/6Mtm96pXUIUCfxYNBnEph189g1RDJ6POX9lzhZYaXuZjjsAL/aRXHLyj66K4gegu2ecd9eqcEuuySjboefvppd/rDmwy/goesSGMzCFmw8ONGC9FgkAdS4tvEJawotyRYK2RgCI+i5k8tgmBWfg9ZilgvS7L+5etzvOboDozHqoHiQsNkrwAhjHgQ2ZhV+KzAZnatx8dyKEc+ebIl5JcdsmzShv88zqKKV4eiH6Tf58n4YrYhOmGVzOE8A11iSd4Eh4AzpR2hxQKgc+4OTiADWQ+Zkzh5fDuRdtTialdIqBQvQKX1s2FCDqFa0Vaotw6k2RiWT6Xlan6pMxDSsM4gI0QYbI3cHFiQr7KVG96k0VuHchGqJI1pBOjIvqHKkPTpQ3ZFATRW6bFTnRLNIsDqhQWCLH5Nyt1wbdQ10gGBU2Qzh2RrZQYOKUSbpEBazs9T3TFHRF6uVMtxCWIf4aK/kMJG+ 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)(396003)(346002)(39860400002)(136003)(376002)(451199018)(36840700001)(46966006)(40470700004)(6286002)(186003)(1076003)(26005)(47076005)(2906002)(55016003)(7696005)(36756003)(2616005)(40480700001)(426003)(356005)(478600001)(107886003)(16526019)(8936002)(40460700003)(82740400003)(36860700001)(70206006)(6666004)(7636003)(8676002)(86362001)(41300700001)(54906003)(316002)(70586007)(83380400001)(4326008)(336012)(5660300002)(6916009)(82310400005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 16:35:17.9005 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8242ea74-5bf7-4cac-7017-08db2961172c 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: DM6NAM11FT109.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6454 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. Fixes: f8c8a6d8440d ("net/mlx5/hws: add action object") Reviewed-by: Alex Vesker Signed-off-by: Erez Shitrit --- 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