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 0B968A034F; Wed, 5 May 2021 06:22:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F059A41156; Wed, 5 May 2021 06:21:21 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2056.outbound.protection.outlook.com [40.107.236.56]) by mails.dpdk.org (Postfix) with ESMTP id A4CDC4114C for ; Wed, 5 May 2021 06:21:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WALN8eVwP4hejyJkJ824ng4dFnNBfV5tIW3t2uU+9YKbb+rXXKwD7YrAKcNCUYyj2dyGv4SqWnDkztZZ5zRmrqHmBG4kiWCA/y0zMMrL3/oCUqZRKVRbpRkGT/FBmF9Bkn24OWlsJ7atH7rILChcd2Ic2yntGZVQxYzfxcV/w1SAG5pB5vESCrthdMbT7LqPvz0MAPqechmDmM3Dx+bvc0I0CHJfrOC7zlk1n5R7FxRaIbyA/Mroeed83Wc4JeQs2W8Gyi/XUHgqIBEai0v+UzrI7RFCX0HmE9fN1bs1slbM3nmklRGpE3k6qaN0sHxV2/879tVKJmHjFIjyG9jhuw== 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=pVV4tzuozcUvQd2mRCQ4BpnUnOW1/SJxUjPmJAEnVA0=; b=c1RWSRZ2MvW7aXOJor7uh1z9nudZ2Q9k4K2OUSoqyWjb+6PIjbhQEqaijCXYiZurrjwNS5QEd3+t39Szq3mtRu9uQ2aUYo0d96iEyW3Axw9SSp+/RAeitSep1mUxKjDOUpg6ar/VMAOasCr2VYiuS9bYGmSasxxQETvN4xXt1e48NLIBMTQpRiwE/ZXT2xfPE7Xguvybl4TldOrQcr5eR4XEAY/NTGHYMHyiOCfaeCRu2XEnVrur13vvTidMjxuRzIN+3DTii3FiHSs+xcxMSRZDaD5xyupGH5JGqi/2jSMu+iCHXghysX9XzQ1KGeM3wluu40PY97riTT1PBAAI/g== 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=pVV4tzuozcUvQd2mRCQ4BpnUnOW1/SJxUjPmJAEnVA0=; b=EKgl0eWoc6x8gicyurmnf2bGxjcR4805xhQRb8TOhOfWvf6mGXm5Y7podxM4y0a8DgCW0C0Ww+OC05E6r3jtxCqpPqBPhh0Cnu9LtrX/PcfjGTqqirnlNiNdaqcdlijv/YdkeIgge3hoKCYcJqVaYWqIraOMnq+FX/UAPbtJvdhTykDEMafppGqIDYNgtkpVi+U6FVD44XgoW95cjnjjcpanhQRCwWCGUh5FmyQwB/eHaXfzjR++eXhEBlTgJSdWdgeYa0K61DbA1OP01efd2Wr50AZRQMk3MGyqxG+1q8RSKfTMNzC8BSg6hplyu7NWt3KdueLN5OwsQRjbugyyMQ== Received: from MW2PR16CA0042.namprd16.prod.outlook.com (2603:10b6:907:1::19) by SA0PR12MB4526.namprd12.prod.outlook.com (2603:10b6:806:98::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.38; Wed, 5 May 2021 04:21:19 +0000 Received: from CO1NAM11FT066.eop-nam11.prod.protection.outlook.com (2603:10b6:907:1:cafe::39) by MW2PR16CA0042.outlook.office365.com (2603:10b6:907:1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Wed, 5 May 2021 04:21:19 +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.4087.27 via Frontend Transport; Wed, 5 May 2021 04:21:19 +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; Wed, 5 May 2021 04:21:16 +0000 From: Bing Zhao To: , , CC: , , Date: Wed, 5 May 2021 07:20:01 +0300 Message-ID: <20210505042004.25280-15-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210505042004.25280-1-bingz@nvidia.com> References: <20210427153811.11554-1-bingz@nvidia.com> <20210505042004.25280-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: d41486ee-1203-47a6-9d7c-08d90f7d3b90 X-MS-TrafficTypeDiagnostic: SA0PR12MB4526: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr 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: TxuItWlCZZNgVmhhVgaduB4PypQt4UiPe6Wnrk+w597WryQIuyqB6AhNvz+z2zpYABhQR51SLsRTbWQYei1z/cv2GFhO6mBHO/pU/RWaBgNhELUW3dPg/sHuqeGGr6f1L2X0cvmnQQPGQ69TsVKcTjz8jZpWKdrJD7DOOig4j+rbfMcsbneJI7AvVcY98LDrfDpFM1cX+11vFwCaYhPt4/YqM8zPYXCpjuT1JS2FHDv8S5ifijHbxDiMtXOTgpakYYyxLuGKp6UZoI54g4P3GQ5IuYbgqo0O/dvuF8WTc4PrhTOf4xHr2BA5vnkUod9N8PNZdKhF6nisXQCaL61zrMPSm1iXVBe8+2yQgGlsD4pmGg+rtGdffA5Sk02sWcgiRNY33dOx93xwMoza33Uv3PgEF0fAPJtN4b58/WLigv68OXRUNNlQHm6sJeu8pOicKJGqJYLtrpyh7hy67pui0kVjZHZ5vBIzypzMwObqwPImYuQ9OQsLekTGcq2UWVhTbVJdDOB159wyfWlKqnN7+C7M+lyOwF9nNX15R+zX/VfhWUEqQv6XNUM9Q6J45H3w5IpP+jzBb0t9qfMKvnuEmWfdqPIj4uY3DnSQk06rBK/e2JRg9PiCDuxatidlJjPapVvlF+ISZkNVzTIsnr8UJL3BMEjvSUcBcHCAywO/rXTVkU/3Q34KLEGHnUXXC6jp 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)(376002)(39860400002)(136003)(346002)(46966006)(36840700001)(356005)(47076005)(5660300002)(2906002)(8676002)(82310400003)(36756003)(36860700001)(426003)(4326008)(110136005)(1076003)(55016002)(70206006)(26005)(6286002)(186003)(107886003)(7696005)(83380400001)(7636003)(16526019)(8936002)(70586007)(36906005)(82740400003)(86362001)(6666004)(2616005)(316002)(54906003)(478600001)(336012)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2021 04:21:19.3078 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d41486ee-1203-47a6-9d7c-08d90f7d3b90 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: SA0PR12MB4526 Subject: [dpdk-dev] [PATCH v2 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 | 69 +++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index d01a10ea54..36b7f05822 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1611,6 +1611,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 f36eeae03f..6baaefbaba 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1688,6 +1688,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 6afbbbc4bb..f2a2c609e2 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. * @@ -7205,6 +7256,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, @@ -13861,6 +13920,10 @@ __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) { + /* Only validate the profile when it needs to be updated. */ + 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); if (ret) return rte_flow_error_set(error, EIO, @@ -15732,6 +15795,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.27.0