From patchwork Wed May 5 08:05:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 92886 X-Patchwork-Delegate: rasland@nvidia.com 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 3EDABA0524; Wed, 5 May 2021 10:07:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C75634114A; Wed, 5 May 2021 10:06:57 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2050.outbound.protection.outlook.com [40.107.212.50]) by mails.dpdk.org (Postfix) with ESMTP id 5EDE5410FD for ; Wed, 5 May 2021 10:06:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VX4V7DNv4sEuWaG6CFk6dQ2HoP3sIYrubJgOLqIbVB3t9Iq/xLtABI/UkpZcB6b3yhPmGZHfCJHEJxtOdiHWH4Wciul9sZn9Q/0rxur7i4WOtgo1itLPp05zT5zUoJ6HJ9Wli9yPMwaR5riNSDUSX0bEez02DJ3wWi8u5HAoxnD6eDLMre8JhdR7P3zVHyMPXJ+baVZJ6ctI1wcbNkAVUf2vKJ76JJcPiI3jInFYgLSfpGcCEWt2oLXyPeS7gZxdI+R1UjIXHKU+oaIYJXItfD3+uWnFluBc5wiV+COmqzzdyQ5jNhfW+STZhR0vwRg9hrn26KmmI5DSA0DjslPXhQ== 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=fE2pRAjf4ySJh5RT1BadgB3oxf/Yg1+1WJdLbw7rFmY=; b=hB4TQSH+ms4Tg7AcF9QXZ/mzpOq6YG8/qjwPKEBuooENTgTIlPLHsGF3dfeJkXDMOLZoJ3CcLDRb05S20lkBjy/caWjUwcNR4rbVznpyeaPOtxs6N0iWGri0vhUgCWa01uMY8CLy9g7JMes1blfGyI2RZ51RfqUWbwoOd94TpEaCWjsLAWlees9XzWABB/KS3q4qKKyZB1ZFPiNfCbar9PLYKoNCq9q+bQT19KwccTkjv/ROqAfhSXk8ZH+ui4g3gYVjndAoW5E7W7UMlnohSJP9dP8uw/L7tVsAvaVv/Xvtx2SRbCcIFrrFgDa5AImg+c+K2WQmNr+fINVQvSYzNQ== 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=fE2pRAjf4ySJh5RT1BadgB3oxf/Yg1+1WJdLbw7rFmY=; b=eOqzOwT2E7pLtcxU+YBUjN6fI32dfLsUxTAVPFBBGu8J+5J5A/z4SPpMhH0W/hrUR8rbrxiuZVKIz8gQ8RZtm8i6dsRc8d5INXoo0WQ3S6olQ/4FZ4DjIDuICsqGqsdDyghqgJ+H0xSQhXH5ifPmi2JPy8wCwTFhommAwcSDMoQUg4BJkILxzyb48X6xAiekY5OTHiULG4H/4CLztE3CvDOHDCAta18kX98zcTzmMjzyrNZFyDYes5FIeP909rYhaOaUzwTLmBdeBDhNMup7GYPv2YNKctmqTK049v9A48Yh1KiNwEYnQwrvcpyTlzCXepRBglldoU4rv5KpzKqNQg== Received: from BN0PR04CA0208.namprd04.prod.outlook.com (2603:10b6:408:e9::33) by CH2PR12MB3800.namprd12.prod.outlook.com (2603:10b6:610:2d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.41; Wed, 5 May 2021 08:06:54 +0000 Received: from BN8NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e9:cafe::87) by BN0PR04CA0208.outlook.office365.com (2603:10b6:408:e9::33) 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 08:06:54 +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 BN8NAM11FT056.mail.protection.outlook.com (10.13.177.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Wed, 5 May 2021 08:06:54 +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 08:06:51 +0000 From: Bing Zhao To: , , CC: , , Date: Wed, 5 May 2021 11:05:55 +0300 Message-ID: <20210505080600.33749-13-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210505080600.33749-1-bingz@nvidia.com> References: <20210427153811.11554-1-bingz@nvidia.com> <20210505080600.33749-1-bingz@nvidia.com> MIME-Version: 1.0 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: fcb6d9cf-b894-4eec-6886-08d90f9cbf55 X-MS-TrafficTypeDiagnostic: CH2PR12MB3800: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lrs1UDN0DES5/qJwcIvacH85CIAJZKQh4/CBGVGjP7sh9jz8b8pD/8t6Nv+YbTGRUrepfxpcq/YTgus3uXjfLylRfXprag0yg+cqKn9wZOHDdaoMs+sB+lPTWYB2sI5CjtxddjhbcX9Drg9wgT9+ANt7qDIwMqzI++8m1NxF/BvsFDrQh8vSz9TI42l4zYb4GGGCciPRHFlR49n+edrMPMxAUAB+1TxPYMvyRRQX6TlWFdRMuSt54dCIbw4uS9m9WtNPRI4MdKwld4BsnwYd1iNOUKMYi6m6QJsu4enJVyW06vySNFboD8J8p1fSTCKtdQWpqhTHymE0VWsLzLO4CEGzXEEHE9mouEas7EJCpdsKAsnHbC8+olBh+XwbXatacKLIFjz28D2534kthvGEAiXGWaD12OZV8/GejpoUvo11IlUbdKcXx58WaMJVwJqs3axc1Ud7nd1kq6rBnUheJ29YPT3bhjsOQVTAZEso06sJASSChm4+xg6OKuHRR4SX61LDVt78qI01d2ui0g6qZmyu+IpUqXW896w1Lr2ERnyfRGBuoXM6lFgLr1AKB4Ko9zZihnv5sx5Wn5v7xhgZ0l2mGp9GgqQtG20Qw75Uh1Y8i6shPvgKw+S13VlKqD4LnFW9Sd6x4RTq1h4GDH9kQA== 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)(39860400002)(136003)(376002)(396003)(346002)(46966006)(36840700001)(2616005)(426003)(478600001)(36860700001)(26005)(1076003)(7636003)(82740400003)(8936002)(107886003)(83380400001)(54906003)(186003)(2906002)(7696005)(4326008)(86362001)(8676002)(356005)(316002)(82310400003)(16526019)(55016002)(5660300002)(36906005)(47076005)(36756003)(70586007)(6286002)(110136005)(336012)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2021 08:06:54.7227 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fcb6d9cf-b894-4eec-6886-08d90f9cbf55 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: BN8NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3800 Subject: [dpdk-dev] [PATCH v5 12/17] net/mlx5: add translation of CT item 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 return register of the DR action will be used for matching. After the ASO CT checking of a TCP packet, the syndrome is filled in the register. Only the 8 LSB should be used. A converting from RTE_FLOW_CONNTRACK_FLAG* to the syndrome should be done after checing the spec and mask fields. Signed-off-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow.h | 7 ++++ drivers/net/mlx5/mlx5_flow_dv.c | 62 +++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 286e3fb6a4..eb0bb42161 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -405,6 +405,13 @@ enum mlx5_feature_name { /* Maximum number of fields to modify in MODIFY_FIELD */ #define MLX5_ACT_MAX_MOD_FIELDS 5 +/* Syndrome bits definition for connection tracking. */ +#define MLX5_CT_SYNDROME_VALID (0x0 << 6) +#define MLX5_CT_SYNDROME_INVALID (0x1 << 6) +#define MLX5_CT_SYNDROME_TRAP (0x2 << 6) +#define MLX5_CT_SYNDROME_STATE_CHANGE (0x1 << 1) +#define MLX5_CT_SYNDROME_BAD_PACKET (0x1 << 0) + enum mlx5_flow_drv_type { MLX5_FLOW_TYPE_MIN, MLX5_FLOW_TYPE_DV, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 14af900267..b0858e3df8 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9379,6 +9379,64 @@ flow_dv_translate_item_ecpri(struct rte_eth_dev *dev, void *matcher, } } +/* + * Add connection tracking status item to matcher + * + * @param[in] dev + * The devich to configure through. + * @param[in, out] matcher + * Flow matcher. + * @param[in, out] key + * Flow matcher value. + * @param[in] item + * Flow pattern to translate. + */ +static void +flow_dv_translate_item_aso_ct(struct rte_eth_dev *dev, + void *matcher, void *key, + const struct rte_flow_item *item) +{ + uint32_t reg_value = 0; + int reg_id; + /* 8LSB 0b 11/0000/11, middle 4 bits are reserved. */ + uint32_t reg_mask = 0; + const struct rte_flow_item_conntrack *spec = item->spec; + const struct rte_flow_item_conntrack *mask = item->mask; + uint32_t flags; + struct rte_flow_error error; + + if (!mask) + mask = &rte_flow_item_conntrack_mask; + if (!spec || !mask->flags) + return; + flags = spec->flags & mask->flags; + /* The conflict should be checked in the validation. */ + if (flags & RTE_FLOW_CONNTRACK_PKT_STATE_VALID) + reg_value |= MLX5_CT_SYNDROME_VALID; + if (flags & RTE_FLOW_CONNTRACK_PKT_STATE_CHANGED) + reg_value |= MLX5_CT_SYNDROME_STATE_CHANGE; + if (flags & RTE_FLOW_CONNTRACK_PKT_STATE_INVALID) + reg_value |= MLX5_CT_SYNDROME_INVALID; + if (flags & RTE_FLOW_CONNTRACK_PKT_STATE_DISABLED) + reg_value |= MLX5_CT_SYNDROME_TRAP; + if (flags & RTE_FLOW_CONNTRACK_PKT_STATE_BAD) + reg_value |= MLX5_CT_SYNDROME_BAD_PACKET; + if (mask->flags & (RTE_FLOW_CONNTRACK_PKT_STATE_VALID | + RTE_FLOW_CONNTRACK_PKT_STATE_INVALID | + RTE_FLOW_CONNTRACK_PKT_STATE_DISABLED)) + reg_mask |= 0xc0; + if (mask->flags & RTE_FLOW_CONNTRACK_PKT_STATE_CHANGED) + reg_mask |= MLX5_CT_SYNDROME_STATE_CHANGE; + if (mask->flags & RTE_FLOW_CONNTRACK_PKT_STATE_BAD) + reg_mask |= MLX5_CT_SYNDROME_BAD_PACKET; + /* The REG_C_x value could be saved during startup. */ + reg_id = mlx5_flow_get_reg_id(dev, MLX5_ASO_CONNTRACK, 0, &error); + if (reg_id == REG_NON) + return; + flow_dv_match_meta_reg(matcher, key, (enum modify_reg)reg_id, + reg_value, reg_mask); +} + static uint32_t matcher_zero[MLX5_ST_SZ_DW(fte_match_param)] = { 0 }; #define HEADER_IS_ZERO(match_criteria, headers) \ @@ -12322,6 +12380,10 @@ flow_dv_translate(struct rte_eth_dev *dev, /* No other protocol should follow eCPRI layer. */ last_item = MLX5_FLOW_LAYER_ECPRI; break; + case RTE_FLOW_ITEM_TYPE_CONNTRACK: + flow_dv_translate_item_aso_ct(dev, match_mask, + match_value, items); + break; default: break; }