From patchwork Fri Sep 23 14:43:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 116743 X-Patchwork-Delegate: thomas@monjalon.net 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 47562A054A; Fri, 23 Sep 2022 16:44:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B074742BC6; Fri, 23 Sep 2022 16:44:13 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2071.outbound.protection.outlook.com [40.107.244.71]) by mails.dpdk.org (Postfix) with ESMTP id D7BDE42BBD for ; Fri, 23 Sep 2022 16:44:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jaRx/8TgnY3e8+JehWkn0SUOuG1LpgfiLc23VLqg8W1WnArTu/M/Pzz+oSnC7iUUUsY8feHMyXT4OfZDzm5Pp+lqPdkdUmI5dPQgpnX6OFMjv082TLK5Ui8n2hlYBhz8Jh/Z+5HRXjVzoqmrrZQV8DFK2/vl6QpgVMvfDzJrTCBfiiheZQ4qwJxGISxNnnYh/SSFd9xvDN0jOhu6abWxQTdCgiKGNdRpq1IAHSOaWbsNyNhyP7+Ew3GHcIncdwxLvBxACvwAVVa9uZjEC97l5FOjzi+TgZP1g73WmRpVbKVoGADSJ6hVt+0lWlx0pGOLVBjb33hM/gEhifQJosTNLA== 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=fOoWBwQENOsg8boY3YQPdzuGQJpyZE7/dB5eY2a280g=; b=RxNoCWEwPcStPkxyie//+D6PpO/e6xt0nJ9SlYN96pQPjmmIXpEc4pAKBpSBsOmNBXEmYlgkuwnbuzJ1YZMKXFOg96KQCfIJlj7quA7KUuYGxZSe7iS7rLn0iITR+XATuZBA78UvC7PdbKMgzD9BsXS9Zim5S762PgEUqrunQvIEbewwjPH9Yl4XE0sxY0qPF9ZynkxD9V2yNb+EP3FTex4Q/6h8JEx49uW6v4vW15ENKPubYZ7iaS0MWDv/YX9UgPVw5h/TEu6V8Uc2iWvnX2ACFjBodevOrLF5eNFaMCq+zPcw8TTqSnUtbUYE835XfF+M1chZVoMMFQlq0Ik7JQ== 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=fOoWBwQENOsg8boY3YQPdzuGQJpyZE7/dB5eY2a280g=; b=bF9PNgvjIMOaNpbecxKl+R5FVD9KOhUhTnt7rq22ucBnnU4hm1VpQ3Px0SNuj3DclUwKLPVUG7F3p0iKp6aTEqYnAH/iN5dpmEBLYEnUEN7P5q7OdoHYCPdDyU1cwmECL/1C6lUbT484md6u7Sn8/trufKvfO+0aWJ0eeYen2EEDsg0f2B+SFsN9LhJQ8SGdqbtZXrKMHkuVq+sfeQOPpOLQjZRggo9EOUjegMRkML07fqFQ1jsFJx3QnJkpbPYZQw5geu0YPhGSawuXcT1esblH6J4OOkSV22ogGcyf6cd4rxt/nUw5x4vjS8koD06lghodAZWAe+FTp1IiPshjSA== Received: from DM6PR03CA0093.namprd03.prod.outlook.com (2603:10b6:5:333::26) by MW4PR12MB5604.namprd12.prod.outlook.com (2603:10b6:303:18d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.14; Fri, 23 Sep 2022 14:44:09 +0000 Received: from DM6NAM11FT079.eop-nam11.prod.protection.outlook.com (2603:10b6:5:333:cafe::5) by DM6PR03CA0093.outlook.office365.com (2603:10b6:5:333::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.20 via Frontend Transport; Fri, 23 Sep 2022 14:44:08 +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 DM6NAM11FT079.mail.protection.outlook.com (10.13.173.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.14 via Frontend Transport; Fri, 23 Sep 2022 14:44:08 +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.26; Fri, 23 Sep 2022 07:43:56 -0700 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.986.29; Fri, 23 Sep 2022 07:43:54 -0700 From: Suanming Mou To: Matan Azrad , Viacheslav Ovsiienko CC: , Dariusz Sosnowski Subject: [PATCH 05/27] net/mlx5: validate modify field action template Date: Fri, 23 Sep 2022 17:43:12 +0300 Message-ID: <20220923144334.27736-6-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20220923144334.27736-1-suanmingm@nvidia.com> References: <20220923144334.27736-1-suanmingm@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT079:EE_|MW4PR12MB5604:EE_ X-MS-Office365-Filtering-Correlation-Id: e172b0b0-7335-46a3-59b5-08da9d721266 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CUoZEmc8EG6y/nFL2XbekaXTMvUg+e/JddGBa4FbM+kA/Z6qWlGkiwrLPNciho9OOmoEBAH+sJbTuxwEHU1m1Jislf6dlKGQqwI02j5yZad0uBda9nMLhSA03cgSU+t4di/c/GvDUrKTEIbj85roMjhUQd+PfnZqarQx9tLwlRciVRHSh+GX0jqIGySl9/K11ab/k+k4vDuIP05dsMI89+3mzsXO97gOWTufEyelxYhN+YDvOaJU2MUWMxkTIuhjxe8n6zQ9ryMuzLMIgjXECfCiz+HFMj751tsopdzlpLwOtNyfckX/5kveAwDyKSsVQNJirES3KqUp6oGWOL/NgewmcOoj6OD49gUlOm/UVnvi6krZWOCxlfiFd8qJapz8qlQdnmMWeh5ZXOsgtwnMH1pLy4Imft6FpZC//wWg8sS4v6RKIHsqKUrdidzNtvTmMe5DEGF/+XR7AdMyoVSsMd2yUJ/n6MwLYn88BnwoKombraNrCrYqkg9lUsWQp5oWNdzwXcA03va8CqJCyr6N3Tw5mdUbK1oDrRwdpEvEZvH+WoKb9CnQ8ecVu97w9jeisFuwPX6VRXG15hChOGBW+8KLjqUZzhadctSmBcJeaqjz6LC3V4mlDPWyHfZskM0eJqg95YDUY3wOcfFqhZpAyC0q9+QaxW7WcQlcuUUx11X5UL/AYsjuqvbrCTdDwG2LjrPrdadSG68AR6sbYsg6TgEn7BYasR0vJRC5Iyo1W7jjC4V1eKuqKf9sQ64pbVwH8oC6yzlR/+5zof7eyOnBLw== 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:(13230022)(4636009)(396003)(136003)(346002)(376002)(39860400002)(451199015)(36840700001)(40470700004)(46966006)(82310400005)(2616005)(356005)(1076003)(186003)(2906002)(316002)(41300700001)(107886003)(82740400003)(426003)(47076005)(110136005)(6636002)(54906003)(86362001)(7696005)(36756003)(40460700003)(478600001)(4326008)(8676002)(6666004)(70206006)(70586007)(5660300002)(26005)(6286002)(8936002)(16526019)(7636003)(15650500001)(336012)(40480700001)(55016003)(36860700001)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 14:44:08.5314 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e172b0b0-7335-46a3-59b5-08da9d721266 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: DM6NAM11FT079.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB5604 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 From: Dariusz Sosnowski This patch adds validation step for action templates and validates if RTE_FLOW_ACTION_TYPE_MODIFY_FIELD actions' fields are properly masked. Signed-off-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 132 ++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index b89d2cc44f..1f98e1248a 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -2047,6 +2047,136 @@ flow_hw_table_destroy(struct rte_eth_dev *dev, return 0; } +static int +flow_hw_validate_action_modify_field(const struct rte_flow_action *action, + const struct rte_flow_action *mask, + struct rte_flow_error *error) +{ + const struct rte_flow_action_modify_field *action_conf = + action->conf; + const struct rte_flow_action_modify_field *mask_conf = + mask->conf; + + if (action_conf->operation != mask_conf->operation) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "modify_field operation mask and template are not equal"); + if (action_conf->dst.field != mask_conf->dst.field) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "destination field mask and template are not equal"); + if (action_conf->dst.field == RTE_FLOW_FIELD_POINTER || + action_conf->dst.field == RTE_FLOW_FIELD_VALUE) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "immediate value and pointer cannot be used as destination"); + if (mask_conf->dst.level != UINT32_MAX) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "destination encapsulation level must be fully masked"); + if (mask_conf->dst.offset != UINT32_MAX) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "destination offset level must be fully masked"); + if (action_conf->src.field != mask_conf->src.field) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "destination field mask and template are not equal"); + if (action_conf->src.field != RTE_FLOW_FIELD_POINTER && + action_conf->src.field != RTE_FLOW_FIELD_VALUE) { + if (mask_conf->src.level != UINT32_MAX) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "source encapsulation level must be fully masked"); + if (mask_conf->src.offset != UINT32_MAX) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "source offset level must be fully masked"); + } + if (mask_conf->width != UINT32_MAX) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "modify_field width field must be fully masked"); + return 0; +} + +static int +flow_hw_action_validate(const struct rte_flow_action actions[], + const struct rte_flow_action masks[], + struct rte_flow_error *error) +{ + int i; + bool actions_end = false; + int ret; + + for (i = 0; !actions_end; ++i) { + const struct rte_flow_action *action = &actions[i]; + const struct rte_flow_action *mask = &masks[i]; + + if (action->type != mask->type) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + action, + "mask type does not match action type"); + switch (action->type) { + case RTE_FLOW_ACTION_TYPE_VOID: + break; + case RTE_FLOW_ACTION_TYPE_INDIRECT: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_MARK: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_DROP: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_JUMP: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_QUEUE: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_RSS: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_NVGRE_DECAP: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_RAW_DECAP: + /* TODO: Validation logic */ + break; + case RTE_FLOW_ACTION_TYPE_MODIFY_FIELD: + ret = flow_hw_validate_action_modify_field(action, + mask, + error); + if (ret < 0) + return ret; + break; + case RTE_FLOW_ACTION_TYPE_END: + actions_end = true; + break; + default: + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + action, + "action not supported in template API"); + } + } + return 0; +} + /** * Create flow action template. * @@ -2075,6 +2205,8 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev, int len, act_len, mask_len, i; struct rte_flow_actions_template *at; + if (flow_hw_action_validate(actions, masks, error)) + return NULL; act_len = rte_flow_conv(RTE_FLOW_CONV_OP_ACTIONS, NULL, 0, actions, error); if (act_len <= 0)