From patchwork Fri Oct 7 02:18:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117516 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 881F2A0093; Fri, 7 Oct 2022 04:20:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A20C842B84; Fri, 7 Oct 2022 04:19:34 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2114.outbound.protection.outlook.com [40.107.220.114]) by mails.dpdk.org (Postfix) with ESMTP id D1FCA42B95 for ; Fri, 7 Oct 2022 04:19:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ffKB0LwA+y5F+zuvNAQs1ik+M97g0nuEDu7sr3U5bx1cFd1UlQ6Sx29HrznKzmJxaGJ7bQrVAeZ3eeoc112TnY64vTKuQiOnTSFvNU2D1VOPMeJcslucXbhgAv/DEWMl30guEODJiy3ULZVaelGoaVH3Fnmr+VFyJg+MYLyrdcclfyuXM0NgWqQ0DoprkPQh5TqwmNnP+8WwdajN3JV8PZYCZi/FXET7S51vAzaH2DgZTT8XeWYnvHJ2oazk7mBmaikKJp7JRTNupz3EyiZy4GxbZbq/4vzpZN7ijwvE8G3B2jCPodPFnA/5gBIYK75ettoNidzvPZJo5XzlgE6Ghw== 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=dVcwAdP1TIV+wDzlORTPwLhj4jlB1kzkaM4X01s+nE8=; b=gWTQ/y1hjyRZrMVyzClfh4sGlZSRRC+8UbXYk6mnvumgm7saeNkRlLUf7OWeWwZ9e94VAouX+i/36WsnVLyedzD5WySKKuR5rZ/i4ho0rQ1j1oowq/i0rCDJAa0q8B0l3ZE8/Rd0xSeub6OcgJaHyALFtpWOqu8Kb+TgJRIAx3vZvYEPgCCXzhAKyAN4eDp+u3jQkD1YvmqcJwz9MCbdO8SxcQHQZmaEDbIfVT2/rEYF2aysF0WX14pCVgyZg8BdG4Nt7nZMWODD2k+XN9K8FuBPhEQhXsBhK+Eiaadijby/icrudvNZA8I1oMW31Lw5jjgcejpztgnksoxstmm2hQ== 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=dVcwAdP1TIV+wDzlORTPwLhj4jlB1kzkaM4X01s+nE8=; b=HE+BwBM2e9jk0p/3Lv/gtQuhnG9yZmGxqbmXjofhJ8sYOyYz7x4W5S96PB/0GznMuxH4UdyrmDvulFfGJ1fxxF1BPAtenIMy9TdDv4KT0TofGtn6/TSSZdt/GzNX3epPwLeQH49D4YN576VN/QMR8yiolmPyEXxcw1HB7/xbob8= 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:31 +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:31 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 11/24] net/nfp: add the offload support of SCTP item Date: Fri, 7 Oct 2022 10:18:33 +0800 Message-Id: <1665109126-16201-12-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: 7365cea0-8061-4ac7-b5a7-08daa80a5e17 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mGyfzmRv1Wt/3THDKJKipPaLWfwFOzXwYow+d2iJYROLElaoZjytPqtoET7eE6cR5GyNxUY3SbyduisATF6/eKHssnPabAeMROoTz7PfifwTkTERWtqBdeNj2lE+U4S92SQ+J9iOspHPZWUIH6a/bfvM/RkohGbceS5+frHqojeuUbRBbtN2Sw/xnLizrrpl3+4bf26QZtDo7uJiTGgVqSV26kay60dh23BnxE4B5DBIjNw9R59CRCvPVgIlTQcWzuagtXuHaP4ypIYJWRJZbIWDC7poxzJqvXpLS9HfV79fIllxt212hQLeHxMbGA7GmpWszw0JEkvCDV8kxo+aeBwzy6DGi/zvHJ1m4LAC1H3mqntJoYq7knTWOpmh5KIODgOCb5RR9RA04SClzbbxFtN8niS21rrnmoCGDdjuP17NrIutnTwWgYOMrHyIPFCaXhz2BYKPXncY5bKNzl8iSubbPkCKwqY2BHR6qz8tLQeWa5xNo/F2XBqcbwzh2vayUCltLzQThSR0Bvs9maP6v8W0aCohoJ2Y2t3bwxkCC8P425xHZpNNKl06QkHfhIVMddZn1d+GtlZo1hpT4cswIB2GFHH9xCf1wqawAh2UDD79+4hGTq3Dq16cSuH0O7D+KDyMlfm/XOWImYr8IrlOWMhQpPR94eH8UNKsV6DVaTtrxHaIG77hnee4JNAWHv9ZSckXspFclE3lvOxhcFJzRGwBK6icMlsZxDGoXFg06lXDoYcQW/8eRAzMXzMqJC9G 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)(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?2mMr0anHNRZWZza8M5pt0fBrDmEB?= =?utf-8?q?B5Qd4ffo3RpnICaGJU0ps5Ez7JVckBuW4TXiTnUEKeXjE75hOjN2cMI+mbC9coMSR?= =?utf-8?q?WVLf1mY/vXIGuZRIGIgR+WZi2mQv6u76xCdV3cxyp1NhC+k0YxHQ3MFuyMRE11R9a?= =?utf-8?q?N7kCys/xmGSKA4QrMLnSU9qEYHhIhqfDoa7EzBA/n2vYogFbxTW+kWLi1sd6TkZYL?= =?utf-8?q?FYbCy04qgbido7ypd4y6PmXJjULG55PQBn4XNMMtK6HedmTDXwmMb+5jlb/ESYFij?= =?utf-8?q?zBuYV1kX6VcyMINTkRn+lEuDFE6g/obgg0nmvp6VzLxqLE3Xh8K4nweEYx+DO0F0T?= =?utf-8?q?G3LEQ/VK6pcFBMICGaenKR9a7gyAT0sPEAT0Dpg82j5qHDCSH4prvixhhuMB7SdZj?= =?utf-8?q?TYeZlKYdApnoWnwBWuvs3SHumBB2EvTrM1aj7M7lGoR6v9BLs+RnKlXhrxhDTh9yT?= =?utf-8?q?+ZvSo7uJ4wbaG8qfzChlmW3zHFAwy0BvQPcoEwrAyD4csfAESKEw/5eg/BSVkJBz9?= =?utf-8?q?zPBYmVkDdS7m04pEWHpC9fkoNm/YzenQ86GCY7F7h6UTQEDq7SARY/cRpfCMbswZq?= =?utf-8?q?sbCx7TFOD2RFDYgh19BA+mc7sZ2NSajVbBe7avoYa1zTgzWORmnbTy/vtBZmVRK14?= =?utf-8?q?A9K+ZEjJj1oRKIy02dPs+4vo5UfBdaMgEF1o12c6q5kbhtYI/mMyblKPEG0Sd9d1g?= =?utf-8?q?g+FKhbtdIqnDM3rS7/iuAu2DZKoEDITieHy1D1wMCJwjenUOqHp5GvvNypC0QjR3y?= =?utf-8?q?dvPYPQtXaV3r2zneaELMX8FaJFP9fQz9to2cEs7t2Dy7CMUjuAU1yTMrXzt4KomzU?= =?utf-8?q?p1DRnVwLNI0yTBu0F1HAjEAea3fh21fG03GMx/XN89+oKZN4tOqKTbIlIs/MFcVKp?= =?utf-8?q?00ioQ6XgtLbUh+AMPzVj2wld5KtsQkvKYG+utIscA5dxKAMVFwyqYfP5ZEGQWDRR7?= =?utf-8?q?78p21RDVJTNEgD/rWn3IaUmbiPwspDWoUiN99xjDSFMWJ88KX5FS1Go+h9Pd3Zfyq?= =?utf-8?q?6S6vLdOiShSZ7HNLVbHJqJhKxrxOQxp7nLt9aglVGGkeZj6JFY2g+/slGUDQC4EGS?= =?utf-8?q?JLCsXr2vuxMUloAvj4KVPq2PXHDVPg5zpxoBJvGXA3WSRWZYq0cmK1lR25c/Z9q5+?= =?utf-8?q?01YR/PKS+qMDfTyWZ5TPrmqoKuSQtwYq0+PAuMsb20ueFmxefIg1Asw8LTJToFoYO?= =?utf-8?q?0wYlfKcTlzUuZZHByycCpLXuds1nh5HmWtKX2VUybnPm7Q2dlnQ2GbU2RkAJ+tvnI?= =?utf-8?q?gti0YkqdxmZ+3VuM0izVu3bFKT/cTKghlli9fC6J7KF1JAuzKX09uuuz7nwX9RmuG?= =?utf-8?q?7nxYmEJgGVDu36XR6DmpRoMAejv+t2iGahakwORhaA7bCnDEwTpg0FL/WCfbfmc89?= =?utf-8?q?cqEk4fDWfY/1dCWBQhCkUXWwxTOrtFCrGyHDiM7ZFdsR1mpkH32ZisR91OY8pOvhu?= =?utf-8?q?P5wZNhiA2R0KIsssAjl4nSn+giyGFbXdHiPYZxTFmZMBvXjeJA5cqBghdBFNg5f0C?= =?utf-8?q?lZ3DdL/rKL24eu8++cf2rKULqCvYs0nNLA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7365cea0-8061-4ac7-b5a7-08daa80a5e17 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:31.1378 (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: AwZA2APEh3C4THemfQvCRbKOdiP5JDUKGtp6KN+3dMhSGFg60zz3Mm5vkJqfYB4m9y8UgfVQq31GidVmz2cfYi6G573NWxnWbdRPov32tBQ= 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 logics to support the offload of SCTP 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 | 63 ++++++++++++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index f6ba2eb..f8f2577 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 +sctp = Y tcp = Y udp = Y vlan = Y diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index e9e2a63..0809bc8 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -113,6 +113,7 @@ New Features * IPv6 * TCP * UDP + * SCTP 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 b20a341..bb445ef 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -554,6 +554,11 @@ struct nfp_mask_id_entry { key_ls->key_layer |= NFP_FLOWER_LAYER_TP; key_ls->key_size += sizeof(struct nfp_flower_tp_ports); break; + case RTE_FLOW_ITEM_TYPE_SCTP: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_SCTP 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; @@ -896,6 +901,47 @@ struct nfp_mask_id_entry { return 0; } +static int +nfp_flow_merge_sctp(struct rte_flow *nfp_flow, + char **mbuf_off, + const struct rte_flow_item *item, + const struct nfp_flow_item_proc *proc, + bool is_mask) +{ + char *ports_off; + struct nfp_flower_tp_ports *ports; + struct nfp_flower_meta_tci *meta_tci; + const struct rte_flow_item_sctp *spec; + const struct rte_flow_item_sctp *mask; + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge sctp: 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) { + ports_off = *mbuf_off - sizeof(struct nfp_flower_ipv4) - + sizeof(struct nfp_flower_tp_ports); + } else { /* IPv6 */ + ports_off = *mbuf_off - sizeof(struct nfp_flower_ipv6) - + sizeof(struct nfp_flower_tp_ports); + } + ports = (struct nfp_flower_tp_ports *)ports_off; + + 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; + } else { + ports->port_src = spec->hdr.src_port; + ports->port_dst = spec->hdr.dst_port; + } + + 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] = { @@ -933,7 +979,8 @@ struct nfp_mask_id_entry { }, [RTE_FLOW_ITEM_TYPE_IPV4] = { .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP, - RTE_FLOW_ITEM_TYPE_UDP), + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_SCTP), .mask_support = &(const struct rte_flow_item_ipv4){ .hdr = { .type_of_service = 0xff, @@ -950,7 +997,8 @@ struct nfp_mask_id_entry { }, [RTE_FLOW_ITEM_TYPE_IPV6] = { .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP, - RTE_FLOW_ITEM_TYPE_UDP), + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_SCTP), .mask_support = &(const struct rte_flow_item_ipv6){ .hdr = { .vtc_flow = RTE_BE32(0x0ff00000), @@ -990,6 +1038,17 @@ struct nfp_mask_id_entry { .mask_sz = sizeof(struct rte_flow_item_udp), .merge = nfp_flow_merge_udp, }, + [RTE_FLOW_ITEM_TYPE_SCTP] = { + .mask_support = &(const struct rte_flow_item_sctp){ + .hdr = { + .src_port = RTE_BE16(0xffff), + .dst_port = RTE_BE16(0xffff), + }, + }, + .mask_default = &rte_flow_item_sctp_mask, + .mask_sz = sizeof(struct rte_flow_item_sctp), + .merge = nfp_flow_merge_sctp, + }, }; static int