From patchwork Fri Oct 7 02:18:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117514 X-Patchwork-Delegate: ferruh.yigit@amd.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 AF137A0093; Fri, 7 Oct 2022 04:20:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7268942B8E; Fri, 7 Oct 2022 04:19:30 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2138.outbound.protection.outlook.com [40.107.220.138]) by mails.dpdk.org (Postfix) with ESMTP id 8E18142B84 for ; Fri, 7 Oct 2022 04:19:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UPVKnZRFAUtugQYq8U9IKWVcD6TZiWzz9HIJ22d0Xt5f3Nk0aohdnLd+jQ+wPPbpt79Wi4bcEFf0+ZsyS70ykPiyxcLskUTAYPnKOULqbL4YEDgPk38RzRO5oIx5ovZvmw+gX3LBdKI8TKnQHsClQsUqTsTIzo0w0AAh38gGGnFDEY6rQp3CMtmzaPB6L6VgtmzpJED/EYCF6/xntAdZgju3+ic01E/ejtyd0cxsTB537eHKpcRqIgR9rtZaknWEkdf6RAqAONRgPnaogjwDzHpZc8TBahPmC3hx0rYusPuWYl9PFWQGodduDmUWTw3dLhX0KamquwB1fwtEn2XETw== 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=dgzRZyxgkI57/AvPrKnczyO0o7WZw2keIiPApeJ252o=; b=B5r2cRq203/kv5JJR0DYdGP93FhjMN2u9i8QIcLkPiEMUy436VYwvdDKthJ4OuqHE6aOL56ghOlkCorq1bhkxDPZsnwpqR7KARyhgX3anOZPVg69jgGbR/U1LyVtCcTXVJ1W1aDezHGJ6RxPM9OmsxwigwpGeNRl3APh3HIUO9BAhdt9X6QWygIhx7audrhCcpt0ncYiJtRV1CNjb8HsW6cnV4gMOBjMqRERSCV03kkJ9QwQs98JBbAu/lXEXfAP8Iv9PiTI9aogyuRkxKOqpRa/x6HsEWBjGfD6ugoZbePrhxZoBuV+ZBabWu1myFiajxWPj7c83Sxg9GHfzbhK6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dgzRZyxgkI57/AvPrKnczyO0o7WZw2keIiPApeJ252o=; b=H6zN2XCPXdffxzlHpmzWcgNct97isG4VI1cyfu3jiKahh0CGEmGAJ0M+n19n31NqT+hKp+DDtng4PXkEW+xq1I8FKdCZr+AhjMgfT72mOXbuVDq1XWEEfWvcId15NsIkxu/fdAF6ouA6IrJDK+/tVBwhXQtTLrXOF27mwREszfc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SA1PR13MB5465.namprd13.prod.outlook.com (2603:10b6:806:230::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10; Fri, 7 Oct 2022 02:19:27 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::a192:2720:1ef8:2773]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::a192:2720:1ef8:2773%4]) with mapi id 15.20.5723.010; Fri, 7 Oct 2022 02:19:27 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 09/24] net/nfp: add the offload support of TCP item Date: Fri, 7 Oct 2022 10:18:31 +0800 Message-Id: <1665109126-16201-10-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com> References: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2P153CA0043.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::12) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB5465:EE_ X-MS-Office365-Filtering-Correlation-Id: 402c9a22-031c-44b9-f668-08daa80a5ba3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kVlMsJQcIrJZxhps9uTnG3c+bhtXDG9oW+CGQbRBai1TTBmFphdfuq9icpZjT0HdgBBAFssRQAtubEx9rM6darmSbYvXMJkzEhBf27Jj7b1fBtRruFOvYuOzykcN27oXDiDXQaLzrqOUpMbK/+vc+2uR42bbKxrZLo5DjJwV2yJNclDt7PdFFCpE8LYnANjNTvlQK32590pVGiL3vqm+X6H8vXtC9AxXZ88VxviEagoeD4vC3aTZ1z5HTZ3AAffcqns1/wLGG1pcCm9UJxFW8tpARQRH9amTAMgg0UO66p838aLuNMj1MNuyz+VrKsyWpzT+GP2kGNMieOM+tbET2OpftcG/MOCj+/eiNmTcseJxKUDzRXPh76womXpZ0wChbl9Y2YVJc/pN3hQOwHBhjESvVgZ40S67tCDdQPy+mTSEsSlvnVi0iCJzf/iX/JxNPgF8O4YNkjZ3SUTj6IZxU7PKOiuh7dPDqOrK2P198mQgCpRZAe3GGqQ1lgR2clyH8wNiIKjmub9+bZFr7Kk8ejT1iLm0UPL6dkPETJPpwqlfB/X296msEfO4A+neW53AivSSY7rwuEo8d0N4lJWsgJRY0GLu9KqE5e4i4N9Vg7fxKvebed6+iM+0CNGO8Sacy2q16UVgm8ljqssy95jcW3uOlB+qaEMgxkSAGTDO6HE9AkxWWNW10R+mXjL3jVZ+E81+IAFd8UyfwtE/pUpNPlBxY2TIx0f/7VK+3pmYnhxZykt+8uUW4hxf7WqTKgDb X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(39830400003)(366004)(136003)(346002)(376002)(396003)(451199015)(36756003)(86362001)(66946007)(44832011)(38350700002)(38100700002)(8936002)(6486002)(6916009)(83380400001)(52116002)(478600001)(41300700001)(6512007)(4326008)(107886003)(26005)(2616005)(6506007)(316002)(6666004)(5660300002)(66476007)(66556008)(2906002)(186003)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?gYLtt+EbGiEf+BX/xCURmmk3SUUg?= =?utf-8?q?N/pILkXZ7nxDkgO8j6NJI3hjG8tszFEQrn/SlysD3T6sPnlnVOUrmIGhyTKV92Dzy?= =?utf-8?q?XSME1d4imHn49K+op3xetQsZuJ/+9uGEf8sUiT4RTaqFgEtoAZQLrUv8eRihrqlj6?= =?utf-8?q?TsrUcaXAhSBe+TxXfQHGki5iqMg3f4pdrldN4uLaQmzRSGQOcX8nevSDElGLzzJF6?= =?utf-8?q?b1ihRtkjM0AzJ9Wb0pnXmo2eSiqy6GIzTGF6RW9xdumIabqoU3QjtPaGzxdk8AACr?= =?utf-8?q?BNBxU+66frbX+BPcIIqgu4nEGBdl/YwfmUORIbTDu3gWzRP7Y7BEQloqlvmByzle+?= =?utf-8?q?gpp5eZBqtt8FsGP1F7qHmxInyy1Qv0CoG00YTTY+UroyutZeU5ezOhQLd1uY68dyQ?= =?utf-8?q?+pbhin/LvCbmvfaxR1XvJfhYk1VKUrptHJlQzAgw+HOBw8W3WJMlnC1K5DG4KETE3?= =?utf-8?q?1S4t/QW4/QS2I6WqAzapI6zUkHaLeHqpl4pN7D470bgu24JDm7h+u8R7O/5Uc2qU+?= =?utf-8?q?gBixxylpovU9FFnKgG5OeFk4n3clugOBVKWcvKqqwcfD5RSqHueeRKZKzXloF0Dbv?= =?utf-8?q?OuDVvV63eEtZlJujHYpzlK2RnYPExe3M35jF/EdOXCbHfq19WnhfeN5oBuDFFgN70?= =?utf-8?q?ZHcjFadYvn0hoqmriyrYrw1Q9Gt7YLAVu9lPfOMRxUh3LIbCGMsvR0GRSxVLwWLdy?= =?utf-8?q?mQ7t3OVTPVLDCfQnWsgVJ3/64fhDGDEk/sm7NtEpubZcVcHZZldK1O8fzeSp/GYVN?= =?utf-8?q?vQOapzxJLmtP8daepXPOHFw8Eg1crKZei1OBJx2FvmNTZzVSKKKEXSxOfC+EXpH6M?= =?utf-8?q?OHuBBQQN2usQq7hJ9WTxVL/i5jWyu/DxO6TA2OoAu4rFFIlawlQU14OzJ2Nfil8vA?= =?utf-8?q?iRw0AL0InY2D3Vhu248E5U6163aOOy34Y/CxJiKvNCkJkbs1GOyb5Jr6k8aVNGvwA?= =?utf-8?q?pXme6W8ZAqAD6rAblZoLWV9u5CaXCR5E/LUwJ8Sz5wh+nm+wQ2kbyRILUFu97Se3d?= =?utf-8?q?6KWRAM+cQ5+Dr6hAUlmnORPzwm2nqX9nWgApgmVj5PsmQT2Gw0NPsNoeibpXUq40n?= =?utf-8?q?fuvxqJ/1Y6uGi9Ukmav0qzxW7IVGs66Xwm+7XUqUj5LKA7fkkgT41Tssjcadc3Rex?= =?utf-8?q?X4LnoWHOw+g4M10/NVB1OF/hGD4Cvj4pH/kOvUsonSYEW3cN84ut8G2zX2ee2kJxV?= =?utf-8?q?AOHwYgTDtng/6YxV396E1OBYJa/i8IVRV0hIGuLhNL+fEQIvGR196bIXUblz+T7fL?= =?utf-8?q?PpgOxW/+Ik0EA66dtF/v8HUxIXHoQcaCP4+OJ6txLJ8h2vaJp2PkSItOPO33SBpOn?= =?utf-8?q?xP1/rpbSZI/ofH2MNQjaU/RKH2yP3r8vkxeosxqiYRAd7FCyzZ2za0fL1RUNZta+N?= =?utf-8?q?o2OHDgL5jXT+oQGKBEK/pj3n0LP1MRGSyktZf5td0pCGkEZsDnxmehHyIx4Hz7KEQ?= =?utf-8?q?v62/TytaCLZWG+aCotbd1BIC5KNtRqeK1pJh5vTfvBWI/5eNwxnMQcSF9NK5HoA+n?= =?utf-8?q?IgiVb8oa7JWrh4ZGzBHczW5mhteljKfBJg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 402c9a22-031c-44b9-f668-08daa80a5ba3 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 02:19:26.9926 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GhdeFtpJlIt8Z1jPS9D4O8gLoFrSBzVUxJc53ajxkyylBIT2zoO2bhxv4XQKQdZi/W5U9rOEOh190vFKtekF0MJqtQrIueKLIXBQlwJcIPM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB5465 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 Add the corresponding data structure and logics, to support the offload of TCP item. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 1 + doc/guides/rel_notes/release_22_11.rst | 1 + drivers/net/nfp/nfp_flow.c | 91 ++++++++++++++++++++++++++++++++++ drivers/net/nfp/nfp_flow.h | 7 +++ 4 files changed, 100 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 9dff34b..66ee03c 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -32,6 +32,7 @@ ipv4 = Y ipv6 = Y ipv6_frag_ext = Y port_id = Y +tcp = Y vlan = Y [rte_flow actions] diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index e794e11..aaedd0c 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -111,6 +111,7 @@ New Features * Single VLAN * IPv4 * IPv6 + * TCP Add the support of rte_flow actions as follow: diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 5b78110..f1d1bba 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -544,6 +544,11 @@ struct nfp_mask_id_entry { key_ls->key_layer |= NFP_FLOWER_LAYER_IPV6; key_ls->key_size += sizeof(struct nfp_flower_ipv6); break; + case RTE_FLOW_ITEM_TYPE_TCP: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_TCP detected"); + key_ls->key_layer |= NFP_FLOWER_LAYER_TP; + key_ls->key_size += sizeof(struct nfp_flower_tp_ports); + break; default: PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type); return -ENOTSUP; @@ -773,6 +778,78 @@ struct nfp_mask_id_entry { return 0; } +static int +nfp_flow_merge_tcp(struct rte_flow *nfp_flow, + char **mbuf_off, + const struct rte_flow_item *item, + const struct nfp_flow_item_proc *proc, + bool is_mask) +{ + uint8_t tcp_flags; + struct nfp_flower_tp_ports *ports; + struct nfp_flower_ipv4 *ipv4 = NULL; + struct nfp_flower_ipv6 *ipv6 = NULL; + const struct rte_flow_item_tcp *spec; + const struct rte_flow_item_tcp *mask; + struct nfp_flower_meta_tci *meta_tci; + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge tcp: no item->spec!"); + return 0; + } + + meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data; + if (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) { + ipv4 = (struct nfp_flower_ipv4 *) + (*mbuf_off - sizeof(struct nfp_flower_ipv4)); + ports = (struct nfp_flower_tp_ports *) + ((char *)ipv4 - sizeof(struct nfp_flower_tp_ports)); + } else { /* IPv6 */ + ipv6 = (struct nfp_flower_ipv6 *) + (*mbuf_off - sizeof(struct nfp_flower_ipv6)); + ports = (struct nfp_flower_tp_ports *) + ((char *)ipv6 - sizeof(struct nfp_flower_tp_ports)); + } + + mask = item->mask ? item->mask : proc->mask_default; + if (is_mask) { + ports->port_src = mask->hdr.src_port; + ports->port_dst = mask->hdr.dst_port; + tcp_flags = mask->hdr.tcp_flags; + } else { + ports->port_src = spec->hdr.src_port; + ports->port_dst = spec->hdr.dst_port; + tcp_flags = spec->hdr.tcp_flags; + } + + if (ipv4) { + if (tcp_flags & RTE_TCP_FIN_FLAG) + ipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_FIN; + if (tcp_flags & RTE_TCP_SYN_FLAG) + ipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_SYN; + if (tcp_flags & RTE_TCP_RST_FLAG) + ipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_RST; + if (tcp_flags & RTE_TCP_PSH_FLAG) + ipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_PSH; + if (tcp_flags & RTE_TCP_URG_FLAG) + ipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_URG; + } else { /* IPv6 */ + if (tcp_flags & RTE_TCP_FIN_FLAG) + ipv6->ip_ext.flags |= NFP_FL_TCP_FLAG_FIN; + if (tcp_flags & RTE_TCP_SYN_FLAG) + ipv6->ip_ext.flags |= NFP_FL_TCP_FLAG_SYN; + if (tcp_flags & RTE_TCP_RST_FLAG) + ipv6->ip_ext.flags |= NFP_FL_TCP_FLAG_RST; + if (tcp_flags & RTE_TCP_PSH_FLAG) + ipv6->ip_ext.flags |= NFP_FL_TCP_FLAG_PSH; + if (tcp_flags & RTE_TCP_URG_FLAG) + ipv6->ip_ext.flags |= NFP_FL_TCP_FLAG_URG; + } + + return 0; +} + /* Graph of supported items and associated process function */ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { [RTE_FLOW_ITEM_TYPE_END] = { @@ -809,6 +886,7 @@ struct nfp_mask_id_entry { .merge = nfp_flow_merge_vlan, }, [RTE_FLOW_ITEM_TYPE_IPV4] = { + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP), .mask_support = &(const struct rte_flow_item_ipv4){ .hdr = { .type_of_service = 0xff, @@ -824,6 +902,7 @@ struct nfp_mask_id_entry { .merge = nfp_flow_merge_ipv4, }, [RTE_FLOW_ITEM_TYPE_IPV6] = { + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP), .mask_support = &(const struct rte_flow_item_ipv6){ .hdr = { .vtc_flow = RTE_BE32(0x0ff00000), @@ -840,6 +919,18 @@ struct nfp_mask_id_entry { .mask_sz = sizeof(struct rte_flow_item_ipv6), .merge = nfp_flow_merge_ipv6, }, + [RTE_FLOW_ITEM_TYPE_TCP] = { + .mask_support = &(const struct rte_flow_item_tcp){ + .hdr = { + .tcp_flags = 0xff, + .src_port = RTE_BE16(0xffff), + .dst_port = RTE_BE16(0xffff), + }, + }, + .mask_default = &rte_flow_item_tcp_mask, + .mask_sz = sizeof(struct rte_flow_item_tcp), + .merge = nfp_flow_merge_tcp, + }, }; static int diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h index f6bd3e4..b3bd949 100644 --- a/drivers/net/nfp/nfp_flow.h +++ b/drivers/net/nfp/nfp_flow.h @@ -23,6 +23,13 @@ #define NFP_FLOWER_LAYER2_GENEVE_OP (1 << 6) #define NFP_FLOWER_LAYER2_TUN_IPV6 (1 << 7) +/* Compressed HW representation of TCP Flags */ +#define NFP_FL_TCP_FLAG_FIN (1 << 0) +#define NFP_FL_TCP_FLAG_SYN (1 << 1) +#define NFP_FL_TCP_FLAG_RST (1 << 2) +#define NFP_FL_TCP_FLAG_PSH (1 << 3) +#define NFP_FL_TCP_FLAG_URG (1 << 4) + #define NFP_FL_META_FLAG_MANAGE_MASK (1 << 7) #define NFP_FLOWER_MASK_VLAN_CFI (1 << 12)