From patchwork Mon Oct 10 06:08:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117773 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 5A0DCA0544; Mon, 10 Oct 2022 08:10:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B048642B87; Mon, 10 Oct 2022 08:09:44 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2114.outbound.protection.outlook.com [40.107.100.114]) by mails.dpdk.org (Postfix) with ESMTP id D666E42B91 for ; Mon, 10 Oct 2022 08:09:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OFeZBYaitXOjrcCx8ug8fXlVydU8gRKsmMvlDsu3ebQ3ATzugbxlz3in8PRpJRf6B7UG6CGkFtQ6plSpi6NlmZ8tJyCOGYG5vKWBkaLiViiVLUz4IGmjoFlgLsuOiT670ZJ6sj0gfOxpqEqYHxuq854wv57OhXVb53bFgFJZq3nLrsGO5sib6lZqIHEf/jy4tokkIkS2JJNzNqxDhw3YO5Us+fu7p7HaNw7ChPN0kDBiY2Uw3j/3ZEHFmNlNIc0O9xR8pGtsfYZuhdSpXtOu35/HbQfeEm0ijyXO1htE8MYWvkayZ8SqOZIhQS57rLnmoWegCmpnwVKhD98O/eKgGQ== 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=kvIvxln4v92JKx2YPTHBYO/xarru7O+sOWXDeRodaSw=; b=LphxuRqzyLayDutu/hJtfLxyKPVayPjufdtuZRjAuVX7WEIUuqx4KW+4T32pm/r6fkcl8qjkXkpEFU+AjXRK8PMhZiNRTxigTDLQnPqW2u4W+hC5vrDBkf31KRHjnyzojpj/1OdojliUdL7ODrzfzDglMHJKLLob5UtWRWcdvL8j3s7n8w4QgkOl6YOKm+4rpGrgI/gCdl8kLenMoe2xZbQPfwLDLTica47glorT8alxZ17qzIY6/2Oi4b8mIrLjQfVjwgV3/+EJm+rKbFmpX3NELvJu6/93cBIQ0gZnZ3pKyOwnIkIB3H+OTL3kTmP4IXKec9DaC2jRp996ioEaWw== 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=kvIvxln4v92JKx2YPTHBYO/xarru7O+sOWXDeRodaSw=; b=hts92vIFamJMPoDS+XRuxw3OnC8iaPrwPvCIIaaVBe7KxXMCl7XQo2u8pPgVBz3YjcD+Jrb/PNc5m13DtvIa+CX7gVVOTrRLc0ti6crr/2gt3u+zd7GWVj5rnLKGes0sXCCsYjU5JU9OfMOILhWQfJ7XVFbhSpv7Gve7FJSAMas= 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:41 +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:41 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 11/24] net/nfp: add the offload support of SCTP item Date: Mon, 10 Oct 2022 14:08:49 +0800 Message-Id: <1665382142-21684-12-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: 3824a1fc-7ac8-4075-f73c-08daaa860521 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cJQY4nc/gwy4cZ7VAXmsRhwelQzcJ2OSKxzPpxoa5FKK2bui59gw1wHmtSMasqgLnHepZH2Qb+y6g6y58DvGoiduMqsnfOk7F7rtJZP7tEYx4E8BE1iT5tDZMiE3LN1e6kUxznzIjKoGod2JgW+WBFYViin1bI/0o/CMmZ4OvN0drLQxvbcsQGMT2UuwNKX+ieESU/wmaVO444TJkwDUeszy/6Goy/BbKjP9ic/TwMM68ms+s2Icwd2MQk0XQp/nEQbuL1utm5ZaoaqK0CjLiyrWAle7//9LjPOBD+hyFXJLlSHSuF4L9Z94onUFQQgV/ydCpmk+wl5eC5FG/wKN4RepaWyVgKywvoyZzQn9S7+GmmFZeUIDa/6dcySKdpSlioGSjhaME3XqoUfNcFs8LcB7VX38R+nH2ZC6f5/sH4eWapJL6GiIiGWGhdv5CKzSx373Q8zcrr4JwJ2m46BltctwRjRImnDG//w7idSe/+sQdmrnUC0rxy9HTVoT5GrIYuUfCh8X19IQy0JcdZmKdpY1QaGU0cytyzEpthvbQ7m0LB8ZEPF0OLLdP9HcFj6K8kKle/yzCPwLtFXBVa0MEVYff6YgWV9SYYbJQPVIJZSxK0ImtaEdhIBBF4wgk3UEY2SB3LQkejioBRVbP498WJLybn2lzK3Ztjd2ZmVZs6umC9du+qj121DY/uygAfmBwyIoain1L9FmY+zJo8cyYEHZzjUv6dos+iBgzfgAwbY1ZgMeEdDLF3HhwRYuIzWZcxMnlBeRw2T5y9WtnjwNRoK2MbgF1HrfCabxO16s717Cn7lXssdhV9JuNfoNKLSD 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)(39840400004)(396003)(346002)(376002)(136003)(451199015)(6916009)(316002)(2906002)(186003)(6486002)(2616005)(66476007)(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?IBAusqfCRAiIHeuFrT0R0RJcDNLI?= =?utf-8?q?D3SL0GGai0wx4Dvrr087TUe6F6JdES6rS9qLm5oISfeIQB9UQsNkrnLuFvQAQGt6k?= =?utf-8?q?78HOJg069BupniNV+RuzzlceQlHhykNKQK46YToqXkksJTZkzT7SEnGX9oUcRr2n3?= =?utf-8?q?iniJzJSFYivSYqk4wkb+l5os80S7+aryeEjtNW8TUiszDODOgn/g0m+MECxQUHKjq?= =?utf-8?q?a43WC793Bu419MU9wS4XObBVWCZV06DSxOEyeYNmkjSG9C3AGLPj7ZIZQt4gixR9P?= =?utf-8?q?UrSI79evI+tb9wnV2BJU0TldU30I8xeZ8PnfjR6/BcBn2En37MhcEdnoxboMKDbRl?= =?utf-8?q?4mSM6rtMddCQmUEZoqLPLo1I1ZloJ+rYVX4bt5Upr+q6PWQUxIkNyvKYdwoGezXAo?= =?utf-8?q?KLgzDzMarxOISKZmYGi4wikrITRyZtZRC+pTuFTUwvcLUx0z3qFdnbIj4ipKJDyRt?= =?utf-8?q?Gdp6jS3FtNpWJrV7M/T0217Os+JIRfrM99sAZVRvAX4nulLDOOozRUilnJfnLv6vh?= =?utf-8?q?xHwM4nVf0aKC32fknHdIzb9zwgqVyuhnvtliaYNaN1hF0GIdPLtQrPlrE0ZY3xSHm?= =?utf-8?q?g2u9CCb+w61Qo1n42feVak3ykMg0sMCSjJlfi3nb3SoPQs4FTnIfaaLbEF2qy4mVJ?= =?utf-8?q?dNo5/KcNSw8ay/3KI+dq5OMDvPcjcP//6VzThrrWH/aMTt+rnhiXg4NpJr4vhx03i?= =?utf-8?q?LFjJuKQsmDGAhLslatZKBsjExc5Xm6D68oI8hlOTSmr0oC2noVlVDyVN/KGxtPdzh?= =?utf-8?q?WdPFV0u/Lm5+fQEnkApvw5Caym+hUkPJwx+/KElHBpzzbZe04ac2gKRDDfMbJ2ByJ?= =?utf-8?q?FJaoMdelWlsGZ9AoLjcsQ1dgWJFTllQcBvzHsefw6IQrEfnZgQ+yByJl3VVx3N+0i?= =?utf-8?q?jOP/b+mAXy2XRDYD2j7MVXwqHy9+0WUTIcKnzcgJwAmnRWd1Qy6bI/VhRyFjdnh3Y?= =?utf-8?q?lyGymYWP2utbCQywYiztIDq+A6kpsm7iWtYUMSWfPmH+UPmW1z6+bZ0iVmdqVtvE7?= =?utf-8?q?V9MbgeOcm419drmbycd4LgYEUffpwuvOHgvcGr7mKksjeO7wPrKMiGrBVhOTAKPB1?= =?utf-8?q?dlQbpaBGDac3Q1R64LYZWIYsayD9Cc8BNFpuNVkllytXYyR/fy/0yzSFiNdmi4xa2?= =?utf-8?q?lNfKUuvMY6NzN23JVfaqQ1QAnMuMpSqUf7hqSSzn1zjt4sKjsa95ae2NQB4rKXflZ?= =?utf-8?q?WWUxEtJv5S242jufdnWfIU0ojwVc4GtArqNeDCCYfk33NEnEMuAXwm4jlM7Oizmd8?= =?utf-8?q?j1IPYQnBaPzXWEAMuLqnK4iLoLm5yiSSGxLJSrqxS49duNkJuLgXrfwVqzeJgypsM?= =?utf-8?q?8tcU9dRFRt9+tsE74ONVUrmmmSuiE2DNUczPR8tA6cPQC+yAF0ES6h+JJ0S0QVb1y?= =?utf-8?q?Wq3PvNZZZ/+GSjtpbQKK49FHQqLSxwvpXmIAV2U/zPhxKOYp9tBr+llbUCUiRPI9c?= =?utf-8?q?HBd/yI53LPhR9xV8JzoCfOF+wiRPLETZyNdLWkGQSA1Wy6btr1IBqv6P6WJ1z/zhz?= =?utf-8?q?MD/SSEhp0OZh+NGWc5Nu93DCyYe7KKt+fA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3824a1fc-7ac8-4075-f73c-08daaa860521 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:41.7766 (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: Vnbbe0sYTFqRrr7fOEEsIqmEK9GlQq1Npk28fOHPAJZU7RPSpAsp9JNd8dIpXoVNp0biJ9MmDcaTDck98c60eNzX6HJW+1D8keKaUkD7Frs= 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 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 2c4afa8..f51fb1f 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -159,6 +159,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