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 7E7EBA0A02; Tue, 27 Apr 2021 17:40:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 54685412AB; Tue, 27 Apr 2021 17:39:19 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2087.outbound.protection.outlook.com [40.107.100.87]) by mails.dpdk.org (Postfix) with ESMTP id 9F14341273 for ; Tue, 27 Apr 2021 17:39:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xw8FlpaAzuw6AyPhcJc0vL9THS7kwoEurC4UqZOAysN1kqYjjJ5sqf1XWVlmR6umFWI7d3Z+5/xm9C6ldgVCab9L6qObbpv2tzQCM6EFzPnh6pbf5XocBOHmstE19Kvd5nimngqAulSnYjna/mEKozgr+ApA7ebDPj3ygM+RvaaWAbNnaFpDmBogyV/T/eWNX2de5isY9J71+Dxxc1Uxe6ejhqCVIDdbhka5P4KVRHMi0IEfjOyCGGDd45H4kvsEWh6/OR077BcQbhcsrFj6Gydxc4xJZexDn3q0ZtT6S9oG263NFLuK4TQ1+kUHW4xzy0daQffD10mPjcZ2AocpBw== 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-SenderADCheck; bh=7PLdZW3goDRrnVAs9kIhM4OYia0Q6TQNDTC6dy6Ypu8=; b=KphIybyVzVddF+AUmW+umyEWqBktwdy9BOw6Ako7hRfqcPgxfXms20dKXD2Bh5kcdhB8QmY4RLhM6bA2qr9Id9M1ysLcP7VHFgGYzDeIq6A0fy5a+BUstHMDkPAs1VRbmq93cQn25VMs1rg+/47YP3KQJovgQr5RqE9+fLCz37wetup3jVYbfspnD15M5DsDsBjyny6FeyoF5OemqLqwv8hmf1CkS1RmsMfDOZyEMxeDS1Alf1bbPqqNeXDmKBgB3IvevDCgUoYRD2V7huTqCNGUGBAiaeYZUFpQleClAATTHVoNkNsZ3Oc2d+WF3MtadHsBkkUw4mTDwKSZz3W9zw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=7PLdZW3goDRrnVAs9kIhM4OYia0Q6TQNDTC6dy6Ypu8=; b=pJIvY4aL4UM5ot9U5Hoftm7NampmNA4C0oWOEHfrCmKaCJNQhm+u55Ywr7JUQtDzDzsBzY4xRL4OUogzrufm70qNRAZ3Kos2H490NZyuKkwET1R+Iy3hwcrzobtKaugAX2NX7j0vKPUyHhGuE2yVH9bCuooohU9qQ4+iLpcW04f88CQ9HMOTMtiREzNWZ0DzJ/1et9/kqXmDfuOvnHjAHtRKA0pu70Ra1swdEtF1tcT+cGde1/vf7+nAdsiT6fOVyhE/iDg6bA9ULVOe+1t3QgG8Sd7QCVvCVNpdc7crDxx/Hji1XNpETiuELx1WWNvInwTvRwGZfKYOe8IJ2uARDA== Received: from MW4PR03CA0318.namprd03.prod.outlook.com (2603:10b6:303:dd::23) by DM4PR12MB5136.namprd12.prod.outlook.com (2603:10b6:5:393::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.22; Tue, 27 Apr 2021 15:39:15 +0000 Received: from CO1NAM11FT066.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dd:cafe::b0) by MW4PR03CA0318.outlook.office365.com (2603:10b6:303:dd::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.25 via Frontend Transport; Tue, 27 Apr 2021 15:39:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT066.mail.protection.outlook.com (10.13.175.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4065.21 via Frontend Transport; Tue, 27 Apr 2021 15:39:14 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 27 Apr 2021 15:39:13 +0000 From: Bing Zhao To: , CC: , , Date: Tue, 27 Apr 2021 18:38:08 +0300 Message-ID: <20210427153811.11554-15-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210427153811.11554-1-bingz@nvidia.com> References: <20210427153811.11554-1-bingz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89523ce2-0aa7-43d0-09cc-08d909929cc7 X-MS-TrafficTypeDiagnostic: DM4PR12MB5136: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TgTSPbNrfUPyUZNRsEsBsA7X20N9VsQikZOVJ5XTvRk+MchODjVadCHiWJg7z5X3GueyRJXfVsSwNiqS6vxpTxpbo/5BaxjZKgZcNoaKBqxZOZe/JF/qvLiJZEs6El7U1/fCzCKKwwfucp/EdRV2zWEFtEUgfFMOMr6syDK+xpGU6Q1wKHdWEafommfLGqbwbqnLHizk7M6WEQNbXqWvZAb1k2Eia/M+N8irECs6niCH8muUjBpIZv05NigcxUdDJ+reDh8CanfATl0Vi+vnb6xqpbGYwNbFRyhkLk8AAGPhuRgrTOKLQ3rq3hpWkA88uj+NHCyEmhx7tuueEKJ3veAGUtEe6pVRWGWRd3uT9l52LX+sROJtyGVnUm1jOhvTloFEArZpsXm4Pn0iBpJi8sRAPGu4hQvd41MpuOI2zr3ScpBVWuqpM4vp5Eg4g2FD+gwYbFLjiE3BrqcJFgb9x0kIf4rFltbX+0Rdq9xO2JzWRpoJcCcr7hRpj5ihvsIu9XyNgay0olnH6O7hwaAhRDQoOO41h3DVNwqsDP3MuDwafBJy0KfLOEBIMWWITIFHMNE1Qmj8N4XQ/bLxCsDiL7sF2iL4rAHjyKAyakUnz54J+KBm7sYaCJ9F1O533yNm2fxllGUojOwMUBdB7dLDSjkVbQI6ITRIHeIQIz5GZdmDtpT2WgLPgSxB8Tp1aSxN X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(136003)(376002)(346002)(39860400002)(36840700001)(46966006)(107886003)(55016002)(6286002)(6636002)(26005)(7696005)(110136005)(70586007)(5660300002)(478600001)(16526019)(47076005)(82310400003)(70206006)(1076003)(4326008)(426003)(186003)(8936002)(2616005)(336012)(82740400003)(6666004)(83380400001)(2906002)(54906003)(7636003)(86362001)(36756003)(356005)(36906005)(36860700001)(8676002)(316002)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2021 15:39:14.8671 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 89523ce2-0aa7-43d0-09cc-08d909929cc7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT066.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5136 Subject: [dpdk-dev] [PATCH 14/17] net/mlx5: validation of CT action 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 Sender: "dev" The validation of a CT action contains two parts. The first is the CT action configurations parameter. When creating a CT action context, some members need to be verified. The second is that when creating a flow, the DR action of CT should be validated with other actions and items as well. Currently, only the TCP protocol support connection tracking. Signed-off-by: Bing Zhao --- drivers/net/mlx5/mlx5.h | 4 +++ drivers/net/mlx5/mlx5_flow.c | 31 +++++++++++++++++++ drivers/net/mlx5/mlx5_flow_dv.c | 68 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 3b67706..e983897 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1617,6 +1617,10 @@ int mlx5_flow_dev_dump(struct rte_eth_dev *dev, struct rte_flow *flow, void mlx5_flow_rxq_dynf_metadata_set(struct rte_eth_dev *dev); int mlx5_flow_get_aged_flows(struct rte_eth_dev *dev, void **contexts, uint32_t nb_contexts, struct rte_flow_error *error); +int mlx5_validate_action_ct(struct rte_eth_dev *dev, + const struct rte_flow_action_conntrack *conntrack, + struct rte_flow_error *error); + /* mlx5_mp_os.c */ diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 7b9f055..ee82243 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1687,6 +1687,37 @@ mlx5_flow_validate_action_count(struct rte_eth_dev *dev __rte_unused, return 0; } +/* + * Validate the ASO CT action. + * + * @param[in] dev + * Pointer to the Ethernet device structure. + * @param[in] conntrack + * Pointer to the CT action profile. + * @param[out] error + * Pointer to error structure. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + */ +int +mlx5_validate_action_ct(struct rte_eth_dev *dev, + const struct rte_flow_action_conntrack *conntrack, + struct rte_flow_error *error) +{ + RTE_SET_USED(dev); + + if (conntrack->state > RTE_FLOW_CONNTRACK_STATE_TIME_WAIT) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "Invalid CT state"); + if (conntrack->last_index > RTE_FLOW_CONNTRACK_FLAG_RST) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "Invalid last TCP packet flag"); + return 0; +} + /** * Verify the @p attributes will be correctly understood by the NIC and store * them in the @p flow if everything is correct. diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index a27aff6..2bf966c 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3400,6 +3400,57 @@ flow_dv_validate_action_raw_encap_decap return 0; } +/* + * Validate the ASO CT action. + * + * @param[in] dev + * Pointer to the rte_eth_dev structure. + * @param[in] action_flags + * Holds the actions detected until now. + * @param[in] item_flags + * The items found in this flow rule. + * @param[in] attr + * Pointer to flow attributes. + * @param[out] error + * Pointer to error structure. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + */ +static int +flow_dv_validate_action_aso_ct(struct rte_eth_dev *dev, + uint64_t action_flags, + uint64_t item_flags, + const struct rte_flow_attr *attr, + struct rte_flow_error *error) +{ + RTE_SET_USED(dev); + + if (attr->group == 0 && !attr->transfer) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "Only support non-root table"); + if (action_flags & MLX5_FLOW_FATE_ACTIONS) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "CT cannot follow a fate action"); + if ((action_flags & MLX5_FLOW_ACTION_METER) || + (action_flags & MLX5_FLOW_ACTION_AGE)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "Only one ASO action is supported"); + if (action_flags & MLX5_FLOW_ACTION_ENCAP) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "Encap cannot exist before CT"); + if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L4_TCP)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "Not a outer TCP packet"); + return 0; +} + /** * Match encap_decap resource. * @@ -7204,6 +7255,14 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, action_flags |= MLX5_FLOW_ACTION_MODIFY_FIELD; rw_act_num += ret; break; + case RTE_FLOW_ACTION_TYPE_CONNTRACK: + ret = flow_dv_validate_action_aso_ct(dev, action_flags, + item_flags, attr, + error); + if (ret < 0) + return ret; + action_flags |= MLX5_FLOW_ACTION_CT; + break; default: return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, @@ -13838,6 +13897,9 @@ __flow_dv_action_ct_update(struct rte_eth_dev *dev, uint32_t idx, if (update->direction) ct->is_original = !!new_prf->is_original_dir; if (update->state) { + ret = mlx5_validate_action_ct(dev, new_prf, error); + if (ret) + return ret; ret = mlx5_aso_ct_update_by_wqe(priv->sh, ct, new_prf); /* Block until ready or a failure. */ if (!ret) @@ -15691,6 +15753,12 @@ flow_dv_action_validate(struct rte_eth_dev *dev, NULL, "shared age action not supported"); return flow_dv_validate_action_age(0, action, dev, err); + case RTE_FLOW_ACTION_TYPE_CONNTRACK: + if (!priv->sh->ct_aso_en) + return rte_flow_error_set(err, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "ASO CT is not supported"); + return mlx5_validate_action_ct(dev, action->conf, err); default: return rte_flow_error_set(err, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, -- 2.5.5