From patchwork Wed May 5 12:23:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 92926 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 9E9BCA0524; Wed, 5 May 2021 14:25:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C6FE41163; Wed, 5 May 2021 14:24:14 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2084.outbound.protection.outlook.com [40.107.92.84]) by mails.dpdk.org (Postfix) with ESMTP id 3E4974115D for ; Wed, 5 May 2021 14:24:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YWnKDWhdswxQz7qWkgAUEOBUkiaQKg6qYcPsygLCdxG9K7rWjXVYYJKL2bfJPKhYjZqaSfSXopwchAiHaTAYFSq4qmobECZm8L6z4VHbTPOUBwWoSBjdKAIgSpY6wBfw9KvE/z8Xa6TEkerJMsXOtMzDjkiKLejbUpQ+B4QNrlEj25Q/AokvEl3i/E8Djydnl4OWLbJn1pS6NK86E5ve3XLT/GB5AgfbbexkgHZpz8uL0y0fMkCzxUiIPjs+/uDq7sPQHSRAnGymcUTZRnklPnznYJLp348KikMj1oIN4BBj0zUU3eUjQ5Ze5ZFF2TpLzcoag+A5Lcl/Gz57oPtMBQ== 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=cnJqwAR1LbdS5c/Y12wVWOKrg2q6ZbByDkSreIRG8sg=; b=Lm0yTPs4aaH4ehU4DKC5l9iq67xFH/dIbp7TreK7+shNS6jFwmMYFEWifgAp+Cvbn7fcR2eqvxMEnYGjIHU7BGPx0v6m4p1jD0Cst9cQIUsf0Uya63iW3CkiaQmoOj7f8F6f/BjhNyN8BRP07amixXWtW9uyY36o1fA0cgPYv1mA2IuMTlqw6HZaH5qqQcPPpKOkJfzRv+P7jiJratPPOsdvTrcr7Tf2p+fHGGRIlk9lKPFcKHkDIlVZw4Yc94EFmzF1PsqdHMFaVlQ1G8X4CHKaATeBweOH/4jk5Md99MJja/jWCFEeeozA5627TWpt/eXk8KX+ZfJHdEfOHqNDlA== 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=cnJqwAR1LbdS5c/Y12wVWOKrg2q6ZbByDkSreIRG8sg=; b=a2KpxBiOHQxwF/wFvrryJrXjpMhw9gn7j2zpsCB4P68xwlVMIZwsi2lPWvaiDfRQKukp4yawYPYMstB24fe6qMz+IxL315Awxwgg8lknvEcqHiMnwiKhQZxBck2tMf9cumIpalmtuzPTF6ARJXzAxfot8vO8tFOXHD734El6UoEcF5cXC28Ol17CUP4F+tey68HcQp4G6VVdzSe/QoJPgbcjeyx5HslSvz1FUgIpeGSBdfmqXJmSE4hV7hXAliJtVGkP9uZU4k5bkK9Jfe9AcvtkAfRLQNGUJgbuiTJ5LVdjzCzFc8cRl8MMb++adCe8NvxCSYF5ozxlxpmZtzTFQA== Received: from DS7PR05CA0012.namprd05.prod.outlook.com (2603:10b6:5:3b9::17) by CH0PR12MB5060.namprd12.prod.outlook.com (2603:10b6:610:e3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.25; Wed, 5 May 2021 12:24:12 +0000 Received: from DM6NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::52) by DS7PR05CA0012.outlook.office365.com (2603:10b6:5:3b9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.9 via Frontend Transport; Wed, 5 May 2021 12:24:12 +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 DM6NAM11FT059.mail.protection.outlook.com (10.13.172.92) 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 12:24:12 +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 12:24:10 +0000 From: Bing Zhao To: , , CC: , , Date: Wed, 5 May 2021 15:23:23 +0300 Message-ID: <20210505122328.51129-13-bingz@nvidia.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505122328.51129-1-bingz@nvidia.com> References: <20210427153811.11554-1-bingz@nvidia.com> <20210505122328.51129-1-bingz@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8194f931-92a7-4492-f8fa-08d90fc0b0b9 X-MS-TrafficTypeDiagnostic: CH0PR12MB5060: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1eO8IVStnFraALftme+BDFSC+m6rnTXcW+ofB1vjg2SLvyN0tpP2S1nrr8VltsxUVZJMcl6yfskLpkobaixmM/iR4xsnn3g02OiBy2kXRgnKE8I9ze1gO0uEWFrQSVGTIJuWO+X3ANp/1QQm8eGzeE3Hqoiukxr1LVJYbtun9z+ZHsswBAGtwvTc/vaza1LrO31v/EzT9e8zlOzjhT1SJhc8fvfz01FUIFJ4lS/CvQjy0D6YsiWYBVX2gbQKr0d7okYo/5NLb16HIS1D76P9dF6zKMgxT+z3l823gnAsrMNNaPXFl0U4l4RmY3wS6CEwnJnCjCw8G2nC+/LpoPmrImHku6YMVn5hCGGZZSOuRgNl+70a1nkx0I8s9EiFtdAW5e0+j6P0nb5pzGgMnLOJ5TkQqLDeilATNRYc5AgeKTYHqE/auTb+eWLAvhyC9bxVPugNwoA77HOa4p0ZC2URgZI0/pZcnLUqEn/SHOUkPLpJ1oI+3N7DRZIBRP9DnqBZlnI2CiQrwvlfq3p++Bdrsdt/L/C+HMDMR381UThzH8Kjt5Hy7QNqt1qmQfVz7sUDe2pRlofaolQMW9S4lB3w91+jTZ1PWyiRxQpZvrDaDPRA6FaV1QJjOyGQq3OrT8pAcWYnJVw21UCIQtwWT/b4fg== 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)(136003)(346002)(39860400002)(36840700001)(46966006)(7696005)(36756003)(5660300002)(86362001)(54906003)(316002)(8936002)(110136005)(2616005)(186003)(36906005)(82310400003)(8676002)(2906002)(6666004)(26005)(356005)(107886003)(7636003)(70206006)(4326008)(478600001)(36860700001)(55016002)(336012)(83380400001)(82740400003)(1076003)(16526019)(426003)(70586007)(6286002)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2021 12:24:12.1651 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8194f931-92a7-4492-f8fa-08d90fc0b0b9 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: DM6NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5060 Subject: [dpdk-dev] [PATCH v7 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 Acked-by: Viacheslav Ovsiienko --- 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 fe0a53c1e2..9ad518b824 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -409,6 +409,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 1a27379d3b..4a58b01da7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9616,6 +9616,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) \ @@ -12734,6 +12792,10 @@ flow_dv_translate(struct rte_eth_dev *dev, match_value, head_item, items); break; + case RTE_FLOW_ITEM_TYPE_CONNTRACK: + flow_dv_translate_item_aso_ct(dev, match_mask, + match_value, items); + break; default: break; }