From patchwork Mon Oct 10 06:08:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117771 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 8666FA0544; Mon, 10 Oct 2022 08:10:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB62342B84; Mon, 10 Oct 2022 08:09:40 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2128.outbound.protection.outlook.com [40.107.100.128]) by mails.dpdk.org (Postfix) with ESMTP id C8D32427F6 for ; Mon, 10 Oct 2022 08:09:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S3y3R2b6PLXnK0MWagkZq3t6KAYRqd74a2rKz4bxiirVWnM1ZTC5hmNLieYYR8AZrtJFQYjTh/5tTFTDY1Fe7Cj3+TaV5F/h8QdBM/qWATRV4eLY4R3b+DNtNIQfqjQCdUZo69SbJ9xupgaz/Wury9H59VetTAs1gCXVaEMQRBCMxPNrXoBnCN/fdr0Gx7dC+9A6HC8gsT1z+ejMu+sR2v6odplT3OWCS14DPBv1DPv9jTNP3N8XiD0Lq4/wSeswgbbFtbX+AoTPzkRvXxNKlHNbNkxwawO3rix+CqtFI8oyr2VnWwF9M5bePWe1oeG3iADDbOipCOvDToiPy0fOuA== 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=LIEmglfK4/7ldopX85rCI6Y/XsAmeprHJLT6OTaVMY8=; b=Etkj7D6ZM+YApNrRX5pJHZvUeHP1d19Ffm7iSeMdQ/hwp4HuDYp3yF3Fr3MdceS3GGItQksm2DZfCZ4D4EvE75YUxQN7yhVXNmgbC+4iHOif+C+bxaxvM4TdWlIdzUrXpWDVVADOQuSfwBjJpRlT9OAkbXJqs09tje+RlVLxugveEjCtt3hD0zrheNOaIwkzrRb8SXoSMPkNW79oDcLlP6YhxW6ZA4jTR8jcAwiIWnRPcCCK99V55ResYKUpW7C2F7TdlaRnGeqR8cSw+EY272M45DiEmhC8lZYoHcbYl8s+Jxs/skMRYyL6MseJw4XJGeEF6xVYhb02YmuLIja1eg== 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=LIEmglfK4/7ldopX85rCI6Y/XsAmeprHJLT6OTaVMY8=; b=iJTnF+8J0SDztG9gDmEN6Vg8J2RvgJnRFArlx+2AYxOf+CFoKamDXV+XkIBoA048XPTDSiSpZsWg3j5zKA5QmFMZZ3SwEQSs3wNFFJlVWU7oLHTx4RS2ardQ5DGTDmvdPdXdOf1Lo2LY5SvmTe70+c5osKcLwbITAl1MzlX8eJM= 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 SN4PR13MB5296.namprd13.prod.outlook.com (2603:10b6:806:207::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.14; Mon, 10 Oct 2022 06:09:37 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b%4]) with mapi id 15.20.5723.014; Mon, 10 Oct 2022 06:09:37 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 09/24] net/nfp: add the offload support of TCP item Date: Mon, 10 Oct 2022 14:08:47 +0800 Message-Id: <1665382142-21684-10-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> References: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0051.apcprd01.prod.exchangelabs.com (2603:1096:4:193::6) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SN4PR13MB5296:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e4135b4-d705-42a1-fd3f-08daaa8602aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X2BKJYFmN73BMFU6Hzjkg1GobKOVXxcwB5XEq+kvhxubceSplZFQowBqChGslPw5En3A/iHL8ewKsFskXjNWnNdy5pjr9b/UVK37gLlsCi4ldhZjAUHY5+YExTb3oW1fUqTP97qRicyIexUIASC9KZdYx6Q7c5jdkTpb0dSsg2q9Afz6NGAhCeI+t3mN9FplQ3f1KFyTdV2oOWaT300w284KO74PwFLulleISUt95wE69ZA60Y0BFL91NoPPbOwG+xinxobAVFjMOLa7VY2brA+fcEL40lq77FjmOcs3QUPySTwQ5oRIeV8ghTkXopSa6skVZ8FHzZpZzlz6Xeckrrw5euxxzVsq3fcYJtx+P71ov5jZ24TcObojt1Ds5jp4rLJsP6U34bJVgtQHT0rJNSXeJfzbuZneTAHsqC5ZfeFAZDDAajGYIRwfRMb+xsT3WHys0vKHAG3eQHw1w9iDLbZesMr5rDBuYPKVTnxWMpXolTcjjmbPstXtbL/aUJ81H0MD6XyR59qK17ffIlCxebnNgre0BDFxoUwyAopilSEkNBOvg+X7LQFJtxfoVdQm7vto2jzT1eCrfGCqWqqjiFASBupQAu0eUhxkmdFHAvZnCqbiPRaFr0ex6jM54JXh9qGKPmbUkHDZfD5rqEdm0PcqBu5fKyKBvllr7BdmQNDhuFwlQFeo1ycFrY5ztSQnQb+yAnTLQPS6aLfpYSr1N4fNaariOTAiIG17PgJd2AZ4ROJ83fMrRjlgKWMaPkdAkb9vYIdhwI4CyPt6liAcABtDzTyQSpx7oLt2ex/eRw6/+cp7H0dnkpYytdDZL3/x 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)(366004)(396003)(346002)(376002)(136003)(39830400003)(451199015)(6916009)(316002)(2906002)(186003)(6486002)(2616005)(66476007)(6666004)(107886003)(66556008)(41300700001)(66946007)(83380400001)(8936002)(8676002)(4326008)(5660300002)(44832011)(26005)(6506007)(6512007)(52116002)(86362001)(478600001)(36756003)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?JFVtxOBtfmGPvIGj6sBqtfxC+RqB?= =?utf-8?q?pgBxJZ2c27LGch3kwQp92cs9BFJdnUCp8f0B+rzKMiwyBU3ofNw9uX6xiIbmeu9gj?= =?utf-8?q?fUcA7s9ZJNxGNdhRDwGaJPpOpAOH/JAf95laTwmI9m9pswB5uw0kGna6oe5nkYK4c?= =?utf-8?q?40s+kZR3XHcGZiQXrJZOlgwIVt/KJrms8cikj18Z+Op2bzCThaomLxOl9uArHj0PK?= =?utf-8?q?9bxPkrKhYQO0c+NrivtOsY1Zq3cvgFdKKJ4C+4/egHj7Mp4YNI0Ew+9hNeZ5iCweN?= =?utf-8?q?x3B/bx7dB+5M5r+B/oDaVql6K1JBZpfzMFj3hfqQv09BJk74lIA0VrXu2sUphYqZF?= =?utf-8?q?JS/PsZomA4QtUR/XYf8JrWEpOv9WqcWRVQpXe3lIRyzc/lHreHDe0CmmxQIjFir2Z?= =?utf-8?q?rXHBnqZ3l8+k3yI3rlibjQWQ1nybEs2BWn3AWLp8ZKilFcL6O01OzelaR23eZRJ2a?= =?utf-8?q?ARe4ksd4G/qCYefbEzttji5TpBLL9zFaQG4tlqv1qqXxHWiXDF6bqS7bfBGt+T+gJ?= =?utf-8?q?wAUPBdXb/5ethvAdkSuI4bwVYtb8iuGdcIaVLLx4/mOPaybJMwLeymm7vugCjIIn+?= =?utf-8?q?ryF3/PMxkoWnSPd2ustmgmqS7eCbUdF0yPv1RyhS8hqipEsgAY5d1r1JYkCPLYnq+?= =?utf-8?q?vPTH3+JDUiJUzgLuirUObWdtzXNlqIZ5G045B+TA8GAQrrGoKuqiq1IXETNfcrgNw?= =?utf-8?q?8s+Bzp8VEydlWo3phmZTpO9RsWELTMfYuirofQgOI+MQVQdpmUJURH2tyc564KkMO?= =?utf-8?q?ZMya/fyAGSEzsG//tWOVvw52x6nxvIvvD1Iz4ljKGiB0uG8l8wsBTTKP4uDhSlyyj?= =?utf-8?q?UiJngSgnWVD40qsxp46NMGl++Sj13j9Z4tuF0ZQlqo81JSMuSK0PIDIf/yziqRDfN?= =?utf-8?q?rl5WC5AvdvK/SGA5acvWtoc4LlT3OK8QUJWygg9K1FR+Jziy30U/A8ugbiGh8XP60?= =?utf-8?q?nyPjVOpa8f/gMhXLZPX31XCskiW4RdqBa601DxAvX34aH4aZ5S9+2tRCpWkSxr4F9?= =?utf-8?q?R6uS/bhsq9T1S7NIzbU7kTX1OXPtIsooTVsSw7bylTV2U6TQaguCyCvNgfPABtg1b?= =?utf-8?q?TTZI+MEBp44F8uhF6TMhnWK5cLfPhUlX0r/RmKfu1tMnv9oH59ls0hreVoqcZH46d?= =?utf-8?q?49h9+/nCj9lrf30jeKFLLRiqQRG0OWQgaFC7WAdBWIW0ma1+He8gSmumnWwQP02aI?= =?utf-8?q?x92QYfBAiGy4mAh1LGqH0hXRNgeJKA/GamtDsV6l2nKJW14Rv94uu18pnMtjzCd2h?= =?utf-8?q?kW7WBsKvCYN2btgSvpFzTH0Wotu0kcLzbESYuArjyQ0UryeHWDf9Th3pQ+uhN3fX7?= =?utf-8?q?2NurLgyxE4otAupzTyuGNLSVlTYO8JH3va/8lNFPRaep0MMdnWeSnRsgzOB8qaYoV?= =?utf-8?q?Odp+CWwmuxORdDHcRiJOyOXeGg9CJJMIkATDCiWut2+Rg8sFXaShQfpKrtgJrr3mt?= =?utf-8?q?P5tJHQpGvqjoEhH0cX3jvieCY1NaLblCywCapMZFM+OGgadwpKlzTFL2B0nEWiEY7?= =?utf-8?q?VjjSRCZvcQYYj4twjFaPS/lvx/JP6jut9A=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e4135b4-d705-42a1-fd3f-08daaa8602aa X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 06:09:37.6415 (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: kLFIC07zFaEB3+U17ibsIgZgJS7iZIIgMbqaZxxMM4Wef3DjMoykAzoWj7VCbVelqZuYcF3uZ3cMGDOtZl8JVxyzQwZGOfic7ud7h9jmT0A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5296 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 5039a6f..95e5ed2 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -157,6 +157,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)