From patchwork Mon Feb 13 13:45:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 123803 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 DB2D641C89; Mon, 13 Feb 2023 14:46:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD6A440A81; Mon, 13 Feb 2023 14:46:24 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2055.outbound.protection.outlook.com [40.107.223.55]) by mails.dpdk.org (Postfix) with ESMTP id 8A885400D6 for ; Mon, 13 Feb 2023 14:46:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bmE+0SJVrsJJkAbzP21ytUEC2jU0UuGUqSsIB0gbLNckAuisOIJsR0jUGJvEHx0f0Rbexw4nbwzJvPkulLDWRG3y+QCnEYi3B0eNNiHV+BHwCHJ2dNaQin7r3OsnSKANG/DCtmvTUpS4uL3hif6uJ+ct7SmTSl8hX/Gzaz0Zq3XVuPMn7VCs/RjxRMQc9bcK4pgruzeyMdXMW0ssTuqqIPLMXQJ8byXXQR9VSToTTxyN2hMvNKc4CtXvyA3Z8E0QuMxzhIx22zjxVybLL71AwicuPcik7lIWLGIEIhMTnKm66el91rbW0rmlzFCMm1AGruDiqgA+oAj2jquUmspfbg== 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=VU12TZUym3yBSOLTPKiQBKmfDUz94j16jMtu0ZBfrCg=; b=eD66UhJ44MA7lYzZzBbB1Tfuzxv8tPUJqT+uME/LJIAkbLDcKy75VoHqqxof2mjk1fiGXiOfrPSY3fZ/EMwkde7w1LufBKMqRm+hf9J22ofSxmwCde/fylGy++jmqNZnGpk9W4VvCzv7oRLRAYDevzMIBExGd5fGby9uDVxgOjZDXiH7JIYtwhdRFchTYwHuux55zlj1G9JmQazhqgqEI4KvoLC/Is6GTx+XV9K2i1vYGquIvWXmSCN+MicRkMa11S7eLFIsTMD0/6njXqzcuKwgA1Yc8SKdtDM2hlup7TILB38v83BVkZtTsTNyWrc6kUvRWBfS123d+uioatoXzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=VU12TZUym3yBSOLTPKiQBKmfDUz94j16jMtu0ZBfrCg=; b=SK0jS85I9umPbaOSv2Eecc/rx/woE24wfJpypGaLY+A7oFaAcGHok5UC694zYQYzVLw7MENXSfSOJpD5Nzd5P9wszyoZiCDPlxwP2DQ4GAHRZsHPwUAug1Py2OA6SxFusOJRVS/eVlDk6IT9HMc24thV8xm0w58pbQq6GM6WJbSRsSJ8r+DtN2O4QAEme/52qPxY2Nxr96AjMLBuHCWhjf6GLMPps+ts/xizQz0hyEEAZhyzTSJ0pSN33wFbV7oPvzpBukXVR/AS9EBcDoe6L25a8MOzGW9SbRw/gEeDUtnfIHuQ0z1cwRDH6rKiM2FsIkY48rJTJQPxXAlcB97TEA== Received: from BN0PR03CA0002.namprd03.prod.outlook.com (2603:10b6:408:e6::7) by CH2PR12MB4923.namprd12.prod.outlook.com (2603:10b6:610:6a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Mon, 13 Feb 2023 13:46:21 +0000 Received: from BN8NAM11FT099.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e6:cafe::18) by BN0PR03CA0002.outlook.office365.com (2603:10b6:408:e6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24 via Frontend Transport; Mon, 13 Feb 2023 13:46:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT099.mail.protection.outlook.com (10.13.177.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24 via Frontend Transport; Mon, 13 Feb 2023 13:46:21 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 13 Feb 2023 05:46:09 -0800 Received: from nvidia.com (10.126.231.37) 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.36; Mon, 13 Feb 2023 05:46:07 -0800 From: Viacheslav Ovsiienko To: CC: , , , "Hamdan Igbaria" Subject: [PATCH v3] net/mlx5/hws: support match on ESP item Date: Mon, 13 Feb 2023 15:45:48 +0200 Message-ID: <20230213134548.17923-1-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20230206095550.24572-1-viacheslavo@nvidia.com> References: <20230206095550.24572-1-viacheslavo@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.37] 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: BN8NAM11FT099:EE_|CH2PR12MB4923:EE_ X-MS-Office365-Filtering-Correlation-Id: 73cb667e-0886-4b72-a446-08db0dc8b10b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p77IAIiktkhKhXWs8iyOhPEKMR5uHRP2cM/Bz01z13hxTdRSrzuJ11t+7DFJnsqM3KmPhYeI+b9aj3HrFsvjNqxSEjk9Op6xOrzEujC9QmUxmIJOq8Bm3ftErWxYWdy/9+XzVJuh1YqLEWTBRcEHAfIFiKGeAiGoI+to2aEGJh5z+T9T80/OAVRU2gN6yCRvTpG66lmE9fiF2CmC2aHh0duoZ99KxEXVP+QBdMLmF/y1WLGNRq/mbFRe6ph0IP5e58JGMS3CKsqB3/o7tg1zR2pTAOgf6qy9naRaJjbOcetKv10rI//xg4VJizb/GJFOb58TmQ/2KIdrqSWJYaZ6wdfeBa5RHoJPYotxRL1pRzCH+AcqRVzS4DknTkUgCEsNrDR8nuxqsqEghTyvBBE89MDXjQQclrZQzFxHKPFj20UlkyYNGT63V283qYN+F6SFaOuFGiqwfWgwsI845pqgXddLu2xj6AqG359Yp8Y8mLwep+ggMtFjvDB9DdoJDlw5bygfP/BiR3jNu3Auif2z6qY3Q1Le+oHEl+SWW/kEwOPUL8vhqnfX7Xe9Rvs7ibVxVupHAVbynf1It+O+tRrWptZ5iME9EJ7vFr5i8kXRS/wQObAxyL+QMrQ9wj7luoAgEzhNS8I1Cd4Qz1m9cSJ+8P+FHQQZVtAYFz/t/WQMBb4ipWXkuinS89V05u4PcjGeX5vp0MIFHTHmembmfotwVw== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(376002)(136003)(396003)(39860400002)(346002)(451199018)(40470700004)(46966006)(36840700001)(36756003)(86362001)(82310400005)(40460700003)(40480700001)(55016003)(47076005)(426003)(83380400001)(70586007)(70206006)(8676002)(6916009)(4326008)(316002)(54906003)(1076003)(2616005)(186003)(26005)(16526019)(6286002)(336012)(6666004)(7696005)(478600001)(107886003)(7636003)(82740400003)(2906002)(8936002)(356005)(41300700001)(5660300002)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2023 13:46:21.5976 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 73cb667e-0886-4b72-a446-08db0dc8b10b 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT099.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4923 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: Hamdan Igbaria Add the support to match on SPI and sequence number fields of ESP header. The match on ESP header in hardware steering is supported only if firmware reports the device supports IPsec offload. Signed-off-by: Hamdan Igbaria Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/mlx5_prm.h | 3 ++- drivers/net/mlx5/hws/mlx5dr_cmd.c | 3 +++ drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 38 ++++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 2 ++ drivers/net/mlx5/mlx5_flow_hw.c | 1 + 6 files changed, 46 insertions(+), 2 deletions(-) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 243952bf85..ad563908ce 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -1696,7 +1696,8 @@ struct mlx5_ifc_cmd_hca_cap_bits { u8 reserved_at_460[0x8]; u8 aes_xts[0x1]; u8 crypto[0x1]; - u8 reserved_at_46a[0x6]; + u8 ipsec_offload[0x1]; + u8 reserved_at_46b[0x5]; u8 max_num_eqs[0x10]; u8 reserved_at_480[0x3]; u8 log_max_l2_table[0x5]; diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.c b/drivers/net/mlx5/hws/mlx5dr_cmd.c index 3578fe4b69..a444fb4438 100644 --- a/drivers/net/mlx5/hws/mlx5dr_cmd.c +++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c @@ -906,6 +906,9 @@ int mlx5dr_cmd_query_caps(struct ibv_context *ctx, caps->sq_ts_format = MLX5_GET(query_hca_cap_out, out, capability.cmd_hca_cap.sq_ts_format); + caps->ipsec_offload = MLX5_GET(query_hca_cap_out, out, + capability.cmd_hca_cap.ipsec_offload); + MLX5_SET(query_hca_cap_in, in, op_mod, MLX5_GET_HCA_CAP_OP_MOD_GENERAL_DEVICE_2 | MLX5_HCA_CAP_OPMOD_GET_CUR); diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.h b/drivers/net/mlx5/hws/mlx5dr_cmd.h index 0fc65aad49..3f40c085be 100644 --- a/drivers/net/mlx5/hws/mlx5dr_cmd.h +++ b/drivers/net/mlx5/hws/mlx5dr_cmd.h @@ -202,6 +202,7 @@ struct mlx5dr_cmd_query_caps { bool cross_vhca_resources; uint32_t shared_vhca_id; char fw_ver[64]; + bool ipsec_offload; }; int mlx5dr_cmd_destroy_obj(struct mlx5dr_devx_obj *devx_obj); diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 4849158407..b682d7582d 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -162,7 +162,9 @@ struct mlx5dr_definer_conv_data { X(SET_BE32, gre_opt_key, v->key.key, rte_flow_item_gre_opt) \ X(SET_BE32, gre_opt_seq, v->sequence.sequence, rte_flow_item_gre_opt) \ X(SET_BE16, gre_opt_checksum, v->checksum_rsvd.checksum, rte_flow_item_gre_opt) \ - X(SET, meter_color, rte_col_2_mlx5_col(v->color), rte_flow_item_meter_color) + X(SET, meter_color, rte_col_2_mlx5_col(v->color), rte_flow_item_meter_color) \ + X(SET_BE32, ipsec_spi, v->hdr.spi, rte_flow_item_esp) \ + X(SET_BE32, ipsec_sequence_number, v->hdr.seq, rte_flow_item_esp) /* Item set function format */ #define X(set_type, func_name, value, item_type) \ @@ -1645,6 +1647,36 @@ mlx5dr_definer_check_item_range_supp(struct rte_flow_item *item) } } +static int +mlx5dr_definer_conv_item_esp(struct mlx5dr_definer_conv_data *cd, + struct rte_flow_item *item, + int item_idx) +{ + const struct rte_flow_item_esp *m = item->mask; + struct mlx5dr_definer_fc *fc; + + if (!cd->caps->ipsec_offload) { + rte_errno = ENOTSUP; + return rte_errno; + } + + if (!m) + return 0; + if (m->hdr.spi) { + fc = &cd->fc[MLX5DR_DEFINER_FNAME_ESP_SPI]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_ipsec_spi_set; + DR_CALC_SET_HDR(fc, ipsec, spi); + } + if (m->hdr.seq) { + fc = &cd->fc[MLX5DR_DEFINER_FNAME_ESP_SEQUENCE_NUMBER]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_ipsec_sequence_number_set; + DR_CALC_SET_HDR(fc, ipsec, sequence_number); + } + return 0; +} + static int mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, struct mlx5dr_match_template *mt, @@ -1767,6 +1799,10 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, ret = mlx5dr_definer_conv_item_meter_color(&cd, items, i); item_flags |= MLX5_FLOW_ITEM_METER_COLOR; break; + case RTE_FLOW_ITEM_TYPE_ESP: + ret = mlx5dr_definer_conv_item_esp(&cd, items, i); + item_flags |= MLX5_FLOW_ITEM_ESP; + break; default: DR_LOG(ERR, "Unsupported item type %d", items->type); rte_errno = ENOTSUP; diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.h b/drivers/net/mlx5/hws/mlx5dr_definer.h index 464872acd6..d8d6157154 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.h +++ b/drivers/net/mlx5/hws/mlx5dr_definer.h @@ -112,6 +112,8 @@ enum mlx5dr_definer_fname { MLX5DR_DEFINER_FNAME_INTEGRITY_I, MLX5DR_DEFINER_FNAME_ICMP_DW1, MLX5DR_DEFINER_FNAME_ICMP_DW2, + MLX5DR_DEFINER_FNAME_ESP_SPI, + MLX5DR_DEFINER_FNAME_ESP_SEQUENCE_NUMBER, MLX5DR_DEFINER_FNAME_MAX, }; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index aacde224f2..9cbd3b2693 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4734,6 +4734,7 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST: case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY: case RTE_FLOW_ITEM_TYPE_CONNTRACK: + case RTE_FLOW_ITEM_TYPE_ESP: break; case RTE_FLOW_ITEM_TYPE_INTEGRITY: /*