From patchwork Tue Mar 5 02:29:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 137955 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 0F0A243B80; Tue, 5 Mar 2024 03:29:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13871402F1; Tue, 5 Mar 2024 03:29:49 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2097.outbound.protection.outlook.com [40.107.94.97]) by mails.dpdk.org (Postfix) with ESMTP id 597154026B for ; Tue, 5 Mar 2024 03:29:46 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S/W9MIQtKNHDBUAa6TzIqojPEd98rYjHhoJ1cRddPxIFF+6u5N8Q4oLjkGv5e97yGl2cMJZKz+3nCGL/Zxe67nVYjQj3Xs4Etl/Wr8VfMg5WrnlUZoChIPH+OFUS2vZkmETrHkyS8MgrEfKkwM7+8QtOHtp0wFKS2NxT9DentgtxmeyX4mkz6j6KJ8wHfq2aT5zaI8/rn6mXnnmoGxmpjrA5mV5bp1doC0oeRJrzBA8lJVnD2WhF5WOCYZYDHbzlfpP9jeMl3KoYACv/auzSpvDALBOnMDNxlVRdx7qhfqnqWpHiVXgQ5uqjUBiX+R6Li80M9ejvojR7ALAwVlknxg== 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=9b9rN1X4cn+sbPozpcu46Mn7rpAyWGjaR3i+cq32sJs=; b=BCzrf8CELfi9jxlwekLuX8WN25k3mQ56+QIOyEQfT+vGndrAmhyatMe8SKb6T4/71Q/ZMdhBo1Awb4/5l5CXxWUREwTICf6fm398iQNHltRSjiyXZZ1wc4VCExUosAblzZI1a2EkLpB4SyvRdp+qRKciS1NpbVsxCQ+i6V+eSYd6vZNl3w3pb0UB1mYNPNDUtCv+0nJN7ySF8tK6UVxiCk7Ue7GHix9fR1742PDPkZArYcsAvbG4mdQhCzZpWbsZIbkvF/nyZCzuQxtvwcLCtyXQOAfX8FQdCdBmKkbXXrow4UkeWmON0wnzGthSof9DrjQbdcWNYz+KmPPZkzU30w== 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=9b9rN1X4cn+sbPozpcu46Mn7rpAyWGjaR3i+cq32sJs=; b=mP3e481pO1Z8BsyEWjmFfgl/D4ENaAZ65Znw+dXN3i3ELrfZA39ugDb4/Odf6wIK81kx7S1EgBhNZzGrU/O4F30YRBTith06o29y7nt8R9Y0+bxGGHehVLwN8AgU0BW+3uILPOhn/IVwrl8jyu0+ctrOfYshitdpVZ/YxJRVBAo= 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 PH0PR13MB5780.namprd13.prod.outlook.com (2603:10b6:510:11b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.37; Tue, 5 Mar 2024 02:29:44 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7339.035; Tue, 5 Mar 2024 02:29:44 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , Chaoyong He Subject: [PATCH 1/5] net/nfp: create new meta data module Date: Tue, 5 Mar 2024 10:29:19 +0800 Message-Id: <20240305022923.891544-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240305022923.891544-1-chaoyong.he@corigine.com> References: <20240305022923.891544-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY5PR04CA0028.namprd04.prod.outlook.com (2603:10b6:a03:1d0::38) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5780:EE_ X-MS-Office365-Filtering-Correlation-Id: a4691bb0-a31f-4b50-ffc5-08dc3cbc1e37 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wH/dxnJk6Ol9AF6Q56nlKUmZb4EgFwFeUXEOF+f+8stgqvOpWTny47Z7ZYoFN5MZsDYJUNYvmswnvC6gbDN0bMzqQ/De6B0TRQAE/p7DBhdsL0765QwSAxv+RZ86MYClTadF4j7VFA9kt5ZbjJOWPf1rbyhSx8a381PxXVW6+fvEt+65F9wBrm6bwyP4Nvb7ykGxuYmeF7LpFkQl4HBx1IN/L+wz4OjDXrfwJNOk/Bu9KoEOAJ3IxbBxWibTOGRQc2oQEXgZ4Q0D2UKn5dQYnSIZd++N8cmVrrum5sBWwx2WDN7Kj8EqDBBFBPkYEGdlQXRex0le9MWNXpqZ2+uRQkAJlkDoqd8R36xE7MdrQciJNG3M1shrtAL4vdJllAMmWRztRAf4IFJwr14s1VZlVPgDEWuiUr/z9J56umKdeNiMGj7kPdw4C1qNFzIlp1SpOMrJpw0ynllgeVI6N9Q8u86fWeOu+55eZIBctJqwXKOpMFcHQltNwsnMSWmC8ENJqtqjcKoWaEGFIhByJxFJlUvLfrJYDykd9EEDbhV1ccTiTgacv4/H9vQ6WYNZt+DVs15igor9gQ4+wdza+KSVsg70EUyrdPeKH02+7ktXZNcnqIaLnhjssR/cBTqm5N2v/5gkrtXUvSDPI55l7BWqTcyLE++SaeAUry30jaS+2GY9/7GrTsqEf39trmVPru+16odgvRSKuc4LJTvJMbFZmJnGUEtKSJvR0Fs2M0q0aGE= 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:(13230031)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0b0aR4zsx2/E+cJmY0sxTxqmQnIMlNq+3LL6RVGM3esXXSims5Fq/HfM41LF0niTs+Y/+KzPYiFk7hLDO9TEF0TWTL2KoaxDBrtxLHxueBPdkvgGMpIYAGE0p3gWm2FwKA+PhPlrFChtTC8w9sMcby3wKvrVUmjbvc9X6sBM/IX+n9JfOZR225kSkbLEF7NuBSLqZUYLHhYo6BsMo8tkQCFpIVgtaJYtXYo1pPEFU6sJ69opzQF+kl+oNWN48TJcFedbXpWh0UhxIc95UzNnaB9ureyzK+P8euDtOOLqZxjNOC0P70oQhBzQcJ6OGOc/4KS8h8yMarjDN0AUENYBMOpJ37xm56b//3nZo9H8I1udTSLQESDbKI21qCPY+uhqAhsI5d3WT4/J165sm26kOkZRInmgASiuW/6XsYyiAiFF0GxV7GX0s0JVWRkHI3nQ3C4C+ODGg86R07Q1kIXizwcUELWlWXPF1Qb3sGyHK4QPK8B4abizTwkPIiMlWf1uB+T0zZ2edeafEtxWCvqto6PxDX0bTLFpLK++/LIio5drZIvSOn0NEwzcztS9T3KkteLxccg7cK1DkY5Xt2iHA8P33mR50UXRj8+rZuc01lY6RIH7JX2naASdHVPFIbJ/NQQAVaMyWxFgRWUvM9lrZCH0TLOuAhjv3lrVJl2GjS6hnJVRyS207jNnATQiM5nDw7ffeFC4Rani9lxMshRCIm89BpQJF76p/+AAyinZMXBBjmcpHFMURa45upCgnbBh86u4aZ4Gl/FQ6IP6NCLxi/Sa21K53g+8feHV34kGdykBvRWGwDP9Rwh4IIUyK5uYm+V+6UQUyNr4ojdDuC/4IdPz2GpU0TwZKil+OxUxdJ+j4knNOxwlTpaZEuwbY5nqmKCn2nXMZ28AkA7+orKApHr//V1tPGQctloW7roId/csrH6yRV9JTFxJqDuEs+f/8g/XNzGvo8DFGQFHKOos8vGpyMi4y0uhQpO1X9mgayIItpqTUaH5OMBqKXSqd30hM2uxhO0lC/GTwJNnYLPP2lDfnStqh54Xa1rjBO/gIZiBAE1JMtfFalOKPQc+da7Z8NGvFdOnMYDpnT6LGL18S5k2KBWIIcPREKsvPWaSVuJpgTFtkZWf6wIvvgxWlVGI1DPcNmsq7FeJPRbx6upf5kpl71nQ6/ws9OuKlA2gkEhJpnbhTuKyzUkOSDHwQW9VbxERUCmwA4BszZr5nkDbMw5qzPR9EVKEGRj097h3AMecqqBGUoui5eDjTxsv4PUuxOV405bM60lxaUEhBtTErsU6TA/ySVEKTUapN6IVjJzeBv85dPec3ryVtphvDlqT6lVoE/PE3rlLP/psqO/2nZCXzYnwoQY3VLp8N8ktVOIxfQtBArC7YfJm9Eyf48aL6sBJGUpbFWr5CCkj/exd3CK4ggMhaH3/dWXnrRyq7XF9au5HHhtBniaH7wEsAh6ZrsbE+sezgkKSOtSXHHuRjYxt2ySaeGcU9XMkv67p7cVnPxL+iUsBj63AaSzeeRr453pp5zhl9WlE/FqIM7c/vQQBTkGEdBsk7k3Xlq6ELEL1JoNlYW8alhSSLQCmHJPgBxdIxs7Br6zpnL57lkKLSQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4691bb0-a31f-4b50-ffc5-08dc3cbc1e37 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 02:29:44.4821 (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: asGEwNIBIcT0iRK8a+5YhvKZzFwpu2PNNSh5n893LGR0EA7wyXgApxEanCw5cVaxAg/VaEyM6ZuqAymDUdb0kjlCHJA5ie5O7TbQZOVOCpI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5780 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: Long Wu Move the Rx meta data code to new 'nfp_net_meta' module, which makes related logic more clean and the code architecture more reasonable. There is no functional change, just moving verbatim code around. Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/common/nfp/nfp_common_ctrl.h | 41 --- drivers/net/nfp/flower/nfp_flower.c | 1 + drivers/net/nfp/flower/nfp_flower_cmsg.c | 1 + drivers/net/nfp/flower/nfp_flower_ctrl.c | 1 + drivers/net/nfp/meson.build | 1 + drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 1 + drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 1 + drivers/net/nfp/nfp_ipsec.c | 1 + drivers/net/nfp/nfp_ipsec.h | 6 - drivers/net/nfp/nfp_net_common.c | 24 +- drivers/net/nfp/nfp_net_common.h | 7 +- drivers/net/nfp/nfp_net_meta.c | 320 +++++++++++++++++++++++ drivers/net/nfp/nfp_net_meta.h | 108 ++++++++ drivers/net/nfp/nfp_rxtx.c | 305 +-------------------- drivers/net/nfp/nfp_rxtx.h | 20 -- 15 files changed, 438 insertions(+), 400 deletions(-) create mode 100644 drivers/net/nfp/nfp_net_meta.c create mode 100644 drivers/net/nfp/nfp_net_meta.h diff --git a/drivers/common/nfp/nfp_common_ctrl.h b/drivers/common/nfp/nfp_common_ctrl.h index 7749ba6459..6badf769fc 100644 --- a/drivers/common/nfp/nfp_common_ctrl.h +++ b/drivers/common/nfp/nfp_common_ctrl.h @@ -13,47 +13,6 @@ */ #define NFP_NET_CFG_BAR_SZ (32 * 1024) -/* Offset in Freelist buffer where packet starts on RX */ -#define NFP_NET_RX_OFFSET 32 - -/* Working with metadata api (NFD version > 3.0) */ -#define NFP_NET_META_FIELD_SIZE 4 -#define NFP_NET_META_FIELD_MASK ((1 << NFP_NET_META_FIELD_SIZE) - 1) -#define NFP_NET_META_HEADER_SIZE 4 -#define NFP_NET_META_NFDK_LENGTH 8 - -/* Working with metadata vlan api (NFD version >= 2.0) */ -#define NFP_NET_META_VLAN_INFO 16 -#define NFP_NET_META_VLAN_OFFLOAD 31 -#define NFP_NET_META_VLAN_TPID 3 -#define NFP_NET_META_VLAN_MASK ((1 << NFP_NET_META_VLAN_INFO) - 1) -#define NFP_NET_META_VLAN_TPID_MASK ((1 << NFP_NET_META_VLAN_TPID) - 1) -#define NFP_NET_META_TPID(d) (((d) >> NFP_NET_META_VLAN_INFO) & \ - NFP_NET_META_VLAN_TPID_MASK) - -/* Prepend field types */ -#define NFP_NET_META_HASH 1 /* Next field carries hash type */ -#define NFP_NET_META_MARK 2 -#define NFP_NET_META_VLAN 4 -#define NFP_NET_META_PORTID 5 -#define NFP_NET_META_IPSEC 9 - -#define NFP_META_PORT_ID_CTRL ~0U - -/* Hash type prepended when a RSS hash was computed */ -#define NFP_NET_RSS_NONE 0 -#define NFP_NET_RSS_IPV4 1 -#define NFP_NET_RSS_IPV6 2 -#define NFP_NET_RSS_IPV6_EX 3 -#define NFP_NET_RSS_IPV4_TCP 4 -#define NFP_NET_RSS_IPV6_TCP 5 -#define NFP_NET_RSS_IPV6_EX_TCP 6 -#define NFP_NET_RSS_IPV4_UDP 7 -#define NFP_NET_RSS_IPV6_UDP 8 -#define NFP_NET_RSS_IPV6_EX_UDP 9 -#define NFP_NET_RSS_IPV4_SCTP 10 -#define NFP_NET_RSS_IPV6_SCTP 11 - /* * @NFP_NET_TXR_MAX: Maximum number of TX rings * @NFP_NET_TXR_MASK: Mask for TX rings diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index c6a744e868..97219ff379 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -16,6 +16,7 @@ #include "../nfp_cpp_bridge.h" #include "../nfp_logs.h" #include "../nfp_mtr.h" +#include "../nfp_net_meta.h" #include "nfp_flower_ctrl.h" #include "nfp_flower_representor.h" #include "nfp_flower_service.h" diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c index 8effe9474d..f78bfba332 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.c +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c @@ -7,6 +7,7 @@ #include "../nfpcore/nfp_nsp.h" #include "../nfp_logs.h" +#include "../nfp_net_meta.h" #include "nfp_flower_ctrl.h" #include "nfp_flower_representor.h" diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index bcb325d475..720a0d9495 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -10,6 +10,7 @@ #include "../nfd3/nfp_nfd3.h" #include "../nfdk/nfp_nfdk.h" #include "../nfp_logs.h" +#include "../nfp_net_meta.h" #include "nfp_flower_representor.h" #include "nfp_mtr.h" #include "nfp_flower_service.h" diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index 959ca01844..d805644ec5 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -41,6 +41,7 @@ sources = files( 'nfp_net_common.c', 'nfp_net_ctrl.c', 'nfp_net_flow.c', + 'nfp_net_meta.c', 'nfp_rxtx.c', 'nfp_service.c', ) diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index be31f4ac33..5fb76ae9d7 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -10,6 +10,7 @@ #include "../flower/nfp_flower.h" #include "../nfp_logs.h" +#include "../nfp_net_meta.h" /* Flags in the host TX descriptor */ #define NFD3_DESC_TX_CSUM RTE_BIT32(7) diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index daf5ac5b30..8bdab5d463 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -11,6 +11,7 @@ #include "../flower/nfp_flower.h" #include "../nfp_logs.h" +#include "../nfp_net_meta.h" #define NFDK_TX_DESC_GATHER_MAX 17 diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c index 0b815fa983..0bf146b9be 100644 --- a/drivers/net/nfp/nfp_ipsec.c +++ b/drivers/net/nfp/nfp_ipsec.c @@ -18,6 +18,7 @@ #include "nfp_net_common.h" #include "nfp_net_ctrl.h" #include "nfp_rxtx.h" +#include "nfp_net_meta.h" #define NFP_UDP_ESP_PORT 4500 diff --git a/drivers/net/nfp/nfp_ipsec.h b/drivers/net/nfp/nfp_ipsec.h index d7a729398a..4ef0e196be 100644 --- a/drivers/net/nfp/nfp_ipsec.h +++ b/drivers/net/nfp/nfp_ipsec.h @@ -168,12 +168,6 @@ struct nfp_net_ipsec_data { struct nfp_ipsec_session *sa_entries[NFP_NET_IPSEC_MAX_SA_CNT]; }; -enum nfp_ipsec_meta_layer { - NFP_IPSEC_META_SAIDX, /**< Order of SA index in metadata */ - NFP_IPSEC_META_SEQLOW, /**< Order of Sequence Number (low 32bits) in metadata */ - NFP_IPSEC_META_SEQHI, /**< Order of Sequence Number (high 32bits) in metadata */ -}; - int nfp_ipsec_init(struct rte_eth_dev *dev); void nfp_ipsec_uninit(struct rte_eth_dev *dev); diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 20e628bfd1..384e042dfd 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -15,6 +15,7 @@ #include "nfpcore/nfp_mip.h" #include "nfpcore/nfp_nsp.h" #include "nfp_logs.h" +#include "nfp_net_meta.h" #define NFP_TX_MAX_SEG UINT8_MAX #define NFP_TX_MAX_MTU_SEG 8 @@ -2038,29 +2039,6 @@ nfp_net_check_dma_mask(struct nfp_net_hw *hw, return 0; } -void -nfp_net_init_metadata_format(struct nfp_net_hw *hw) -{ - /* - * ABI 4.x and ctrl vNIC always use chained metadata, in other cases we allow use of - * single metadata if only RSS(v1) is supported by hw capability, and RSS(v2) - * also indicate that we are using chained metadata. - */ - if (hw->ver.major == 4) { - hw->meta_format = NFP_NET_METAFORMAT_CHAINED; - } else if ((hw->super.cap & NFP_NET_CFG_CTRL_CHAIN_META) != 0) { - hw->meta_format = NFP_NET_METAFORMAT_CHAINED; - /* - * RSS is incompatible with chained metadata. hw->super.cap just represents - * firmware's ability rather than the firmware's configuration. We decide - * to reduce the confusion to allow us can use hw->super.cap to identify RSS later. - */ - hw->super.cap &= ~NFP_NET_CFG_CTRL_RSS; - } else { - hw->meta_format = NFP_NET_METAFORMAT_SINGLE; - } -} - void nfp_net_cfg_read_version(struct nfp_net_hw *hw) { diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 628c0d3491..49a5a84044 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -16,6 +16,7 @@ #include "nfpcore/nfp_sync.h" #include "nfp_net_ctrl.h" #include "nfp_service.h" +#include "nfp_net_meta.h" /* Interrupt definitions */ #define NFP_NET_IRQ_LSC_IDX 0 @@ -67,11 +68,6 @@ enum nfp_app_fw_id { NFP_APP_FW_FLOWER_NIC = 0x3, }; -enum nfp_net_meta_format { - NFP_NET_METAFORMAT_SINGLE, - NFP_NET_METAFORMAT_CHAINED, -}; - /* Parsed control BAR TLV capabilities */ struct nfp_net_tlv_caps { uint32_t mbox_off; /**< VNIC mailbox area offset */ @@ -306,7 +302,6 @@ void nfp_net_tx_desc_limits(struct nfp_net_hw *hw, uint16_t *min_tx_desc, uint16_t *max_tx_desc); int nfp_net_check_dma_mask(struct nfp_net_hw *hw, char *name); -void nfp_net_init_metadata_format(struct nfp_net_hw *hw); void nfp_net_cfg_read_version(struct nfp_net_hw *hw); int nfp_net_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size); bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version); diff --git a/drivers/net/nfp/nfp_net_meta.c b/drivers/net/nfp/nfp_net_meta.c new file mode 100644 index 0000000000..0bc22b2f88 --- /dev/null +++ b/drivers/net/nfp/nfp_net_meta.c @@ -0,0 +1,320 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2023 Corigine, Inc. + * All rights reserved. + */ + +#include "nfp_net_meta.h" + +#include "nfp_net_common.h" +#include "nfp_ipsec.h" +#include "nfp_logs.h" + +enum nfp_ipsec_meta_layer { + NFP_IPSEC_META_SAIDX, /**< Order of SA index in metadata */ + NFP_IPSEC_META_SEQLOW, /**< Order of Sequence Number (low 32bits) in metadata */ + NFP_IPSEC_META_SEQHI, /**< Order of Sequence Number (high 32bits) in metadata */ +}; + +/* Parse the chained metadata from packet */ +static bool +nfp_net_parse_chained_meta(uint8_t *meta_base, + rte_be32_t meta_header, + struct nfp_meta_parsed *meta) +{ + uint32_t meta_info; + uint32_t vlan_info; + uint8_t *meta_offset; + + meta_info = rte_be_to_cpu_32(meta_header); + meta_offset = meta_base + 4; + + for (; meta_info != 0; meta_info >>= NFP_NET_META_FIELD_SIZE, meta_offset += 4) { + switch (meta_info & NFP_NET_META_FIELD_MASK) { + case NFP_NET_META_PORTID: + meta->port_id = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); + break; + case NFP_NET_META_HASH: + /* Next field type is about the hash type */ + meta_info >>= NFP_NET_META_FIELD_SIZE; + /* Hash value is in the data field */ + meta->hash = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); + meta->hash_type = meta_info & NFP_NET_META_FIELD_MASK; + break; + case NFP_NET_META_VLAN: + vlan_info = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); + meta->vlan[meta->vlan_layer].offload = + vlan_info >> NFP_NET_META_VLAN_OFFLOAD; + meta->vlan[meta->vlan_layer].tci = + vlan_info & NFP_NET_META_VLAN_MASK; + meta->vlan[meta->vlan_layer].tpid = NFP_NET_META_TPID(vlan_info); + meta->vlan_layer++; + break; + case NFP_NET_META_IPSEC: + meta->sa_idx = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); + meta->ipsec_type = meta_info & NFP_NET_META_FIELD_MASK; + break; + case NFP_NET_META_MARK: + meta->flags |= (1 << NFP_NET_META_MARK); + meta->mark_id = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); + break; + default: + /* Unsupported metadata can be a performance issue */ + return false; + } + } + + return true; +} + +/* + * Parse the single metadata + * + * The RSS hash and hash-type are prepended to the packet data. + * Get it from metadata area. + */ +static inline void +nfp_net_parse_single_meta(uint8_t *meta_base, + rte_be32_t meta_header, + struct nfp_meta_parsed *meta) +{ + meta->hash_type = rte_be_to_cpu_32(meta_header); + meta->hash = rte_be_to_cpu_32(*(rte_be32_t *)(meta_base + 4)); +} + +/* Set mbuf hash data based on the metadata info */ +static void +nfp_net_parse_meta_hash(const struct nfp_meta_parsed *meta, + struct nfp_net_rxq *rxq, + struct rte_mbuf *mbuf) +{ + struct nfp_net_hw *hw = rxq->hw; + + if ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) + return; + + mbuf->hash.rss = meta->hash; + mbuf->ol_flags |= RTE_MBUF_F_RX_RSS_HASH; +} + +/* Set mbuf vlan_strip data based on metadata info */ +static void +nfp_net_parse_meta_vlan(const struct nfp_meta_parsed *meta, + struct nfp_net_rx_desc *rxd, + struct nfp_net_rxq *rxq, + struct rte_mbuf *mb) +{ + uint32_t ctrl = rxq->hw->super.ctrl; + + /* Skip if hardware don't support setting vlan. */ + if ((ctrl & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2)) == 0) + return; + + /* + * The firmware support two ways to send the VLAN info (with priority) : + * 1. Using the metadata when NFP_NET_CFG_CTRL_RXVLAN_V2 is set, + * 2. Using the descriptor when NFP_NET_CFG_CTRL_RXVLAN is set. + */ + if ((ctrl & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0) { + if (meta->vlan_layer > 0 && meta->vlan[0].offload != 0) { + mb->vlan_tci = rte_cpu_to_le_32(meta->vlan[0].tci); + mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; + } + } else if ((ctrl & NFP_NET_CFG_CTRL_RXVLAN) != 0) { + if ((rxd->rxd.flags & PCIE_DESC_RX_VLAN) != 0) { + mb->vlan_tci = rte_cpu_to_le_32(rxd->rxd.offload_info); + mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; + } + } +} + +/* + * Set mbuf qinq_strip data based on metadata info + * + * The out VLAN tci are prepended to the packet data. + * Extract and decode it and set the mbuf fields. + * + * If both RTE_MBUF_F_RX_VLAN and NFP_NET_CFG_CTRL_RXQINQ are set, the 2 VLANs + * have been stripped by the hardware and their TCIs are saved in + * mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer). + * If NFP_NET_CFG_CTRL_RXQINQ is set and RTE_MBUF_F_RX_VLAN is unset, only the + * outer VLAN is removed from packet data, but both tci are saved in + * mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer). + * + * qinq set & vlan set : meta->vlan_layer>=2, meta->vlan[0].offload=1, meta->vlan[1].offload=1 + * qinq set & vlan not set: meta->vlan_layer>=2, meta->vlan[1].offload=1,meta->vlan[0].offload=0 + * qinq not set & vlan set: meta->vlan_layer=1, meta->vlan[0].offload=1 + * qinq not set & vlan not set: meta->vlan_layer=0 + */ +static void +nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta, + struct nfp_net_rxq *rxq, + struct rte_mbuf *mb) +{ + struct nfp_hw *hw = &rxq->hw->super; + + if ((hw->ctrl & NFP_NET_CFG_CTRL_RXQINQ) == 0 || + (hw->cap & NFP_NET_CFG_CTRL_RXQINQ) == 0) + return; + + if (meta->vlan_layer < NFP_META_MAX_VLANS) + return; + + if (meta->vlan[0].offload == 0) + mb->vlan_tci = rte_cpu_to_le_16(meta->vlan[0].tci); + + mb->vlan_tci_outer = rte_cpu_to_le_16(meta->vlan[1].tci); + PMD_RX_LOG(DEBUG, "Received outer vlan TCI is %u inner vlan TCI is %u", + mb->vlan_tci_outer, mb->vlan_tci); + mb->ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED; +} + +/* + * Set mbuf IPsec Offload features based on metadata info. + * + * The IPsec Offload features is prepended to the mbuf ol_flags. + * Extract and decode metadata info and set the mbuf ol_flags. + */ +static void +nfp_net_parse_meta_ipsec(struct nfp_meta_parsed *meta, + struct nfp_net_rxq *rxq, + struct rte_mbuf *mbuf) +{ + int offset; + uint32_t sa_idx; + struct nfp_net_hw *hw; + struct nfp_tx_ipsec_desc_msg *desc_md; + + hw = rxq->hw; + sa_idx = meta->sa_idx; + + if (meta->ipsec_type != NFP_NET_META_IPSEC) + return; + + if (sa_idx >= NFP_NET_IPSEC_MAX_SA_CNT) { + mbuf->ol_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED; + } else { + mbuf->ol_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD; + offset = hw->ipsec_data->pkt_dynfield_offset; + desc_md = RTE_MBUF_DYNFIELD(mbuf, offset, struct nfp_tx_ipsec_desc_msg *); + desc_md->sa_idx = sa_idx; + desc_md->enc = 0; + } +} + +static void +nfp_net_parse_meta_mark(const struct nfp_meta_parsed *meta, + struct rte_mbuf *mbuf) +{ + if (((meta->flags >> NFP_NET_META_MARK) & 0x1) == 0) + return; + + mbuf->hash.fdir.hi = meta->mark_id; + mbuf->ol_flags |= RTE_MBUF_F_RX_FDIR | RTE_MBUF_F_RX_FDIR_ID; +} + +/* Parse the metadata from packet */ +void +nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, + struct nfp_net_rxq *rxq, + struct nfp_net_hw *hw, + struct rte_mbuf *mb, + struct nfp_meta_parsed *meta) +{ + uint8_t *meta_base; + rte_be32_t meta_header; + + if (unlikely(NFP_DESC_META_LEN(rxds) == 0)) + return; + + meta_base = rte_pktmbuf_mtod_offset(mb, uint8_t *, -NFP_DESC_META_LEN(rxds)); + meta_header = *(rte_be32_t *)meta_base; + + switch (hw->meta_format) { + case NFP_NET_METAFORMAT_CHAINED: + if (nfp_net_parse_chained_meta(meta_base, meta_header, meta)) { + nfp_net_parse_meta_hash(meta, rxq, mb); + nfp_net_parse_meta_vlan(meta, rxds, rxq, mb); + nfp_net_parse_meta_qinq(meta, rxq, mb); + nfp_net_parse_meta_ipsec(meta, rxq, mb); + nfp_net_parse_meta_mark(meta, mb); + } else { + PMD_RX_LOG(DEBUG, "RX chained metadata format is wrong!"); + } + break; + case NFP_NET_METAFORMAT_SINGLE: + if ((rxds->rxd.flags & PCIE_DESC_RX_RSS) != 0) { + nfp_net_parse_single_meta(meta_base, meta_header, meta); + nfp_net_parse_meta_hash(meta, rxq, mb); + } + break; + default: + PMD_RX_LOG(DEBUG, "RX metadata do not exist."); + } +} + +void +nfp_net_init_metadata_format(struct nfp_net_hw *hw) +{ + /* + * ABI 4.x and ctrl vNIC always use chained metadata, in other cases we allow use of + * single metadata if only RSS(v1) is supported by hw capability, and RSS(v2) + * also indicate that we are using chained metadata. + */ + if (hw->ver.major == 4) { + hw->meta_format = NFP_NET_METAFORMAT_CHAINED; + } else if ((hw->super.cap & NFP_NET_CFG_CTRL_CHAIN_META) != 0) { + hw->meta_format = NFP_NET_METAFORMAT_CHAINED; + /* + * RSS is incompatible with chained metadata. hw->super.cap just represents + * firmware's ability rather than the firmware's configuration. We decide + * to reduce the confusion to allow us can use hw->super.cap to identify RSS later. + */ + hw->super.cap &= ~NFP_NET_CFG_CTRL_RSS; + } else { + hw->meta_format = NFP_NET_METAFORMAT_SINGLE; + } +} + +void +nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, + struct rte_mbuf *pkt, + uint8_t layer) +{ + uint16_t tpid; + uint16_t vlan_tci; + + tpid = RTE_ETHER_TYPE_VLAN; + vlan_tci = pkt->vlan_tci; + + meta_data->data[layer] = rte_cpu_to_be_32(tpid << 16 | vlan_tci); +} + +void +nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, + struct nfp_net_txq *txq, + struct rte_mbuf *pkt, + uint8_t layer, + uint8_t ipsec_layer) +{ + int offset; + struct nfp_net_hw *hw; + struct nfp_tx_ipsec_desc_msg *desc_md; + + hw = txq->hw; + offset = hw->ipsec_data->pkt_dynfield_offset; + desc_md = RTE_MBUF_DYNFIELD(pkt, offset, struct nfp_tx_ipsec_desc_msg *); + + switch (ipsec_layer) { + case NFP_IPSEC_META_SAIDX: + meta_data->data[layer] = desc_md->sa_idx; + break; + case NFP_IPSEC_META_SEQLOW: + meta_data->data[layer] = desc_md->esn.low; + break; + case NFP_IPSEC_META_SEQHI: + meta_data->data[layer] = desc_md->esn.hi; + break; + default: + break; + } +} diff --git a/drivers/net/nfp/nfp_net_meta.h b/drivers/net/nfp/nfp_net_meta.h new file mode 100644 index 0000000000..da2091ce9f --- /dev/null +++ b/drivers/net/nfp/nfp_net_meta.h @@ -0,0 +1,108 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2014, 2015 Netronome Systems, Inc. + * All rights reserved. + */ + +#ifndef __NFP_NET_META_H__ +#define __NFP_NET_META_H__ + +#include "nfp_rxtx.h" + +/* Hash type prepended when a RSS hash was computed */ +#define NFP_NET_RSS_NONE 0 +#define NFP_NET_RSS_IPV4 1 +#define NFP_NET_RSS_IPV6 2 +#define NFP_NET_RSS_IPV6_EX 3 +#define NFP_NET_RSS_IPV4_TCP 4 +#define NFP_NET_RSS_IPV6_TCP 5 +#define NFP_NET_RSS_IPV6_EX_TCP 6 +#define NFP_NET_RSS_IPV4_UDP 7 +#define NFP_NET_RSS_IPV6_UDP 8 +#define NFP_NET_RSS_IPV6_EX_UDP 9 +#define NFP_NET_RSS_IPV4_SCTP 10 +#define NFP_NET_RSS_IPV6_SCTP 11 + +/* Offset in Freelist buffer where packet starts on RX */ +#define NFP_NET_RX_OFFSET 32 + +/* Working with metadata api (NFD version > 3.0) */ +#define NFP_NET_META_FIELD_SIZE 4 +#define NFP_NET_META_FIELD_MASK ((1 << NFP_NET_META_FIELD_SIZE) - 1) +#define NFP_NET_META_HEADER_SIZE 4 +#define NFP_NET_META_NFDK_LENGTH 8 + +/* Working with metadata vlan api (NFD version >= 2.0) */ +#define NFP_NET_META_VLAN_INFO 16 +#define NFP_NET_META_VLAN_OFFLOAD 31 +#define NFP_NET_META_VLAN_TPID 3 +#define NFP_NET_META_VLAN_MASK ((1 << NFP_NET_META_VLAN_INFO) - 1) +#define NFP_NET_META_VLAN_TPID_MASK ((1 << NFP_NET_META_VLAN_TPID) - 1) +#define NFP_NET_META_TPID(d) (((d) >> NFP_NET_META_VLAN_INFO) & \ + NFP_NET_META_VLAN_TPID_MASK) + +/* Prepend field types */ +#define NFP_NET_META_HASH 1 /* Next field carries hash type */ +#define NFP_NET_META_MARK 2 +#define NFP_NET_META_VLAN 4 +#define NFP_NET_META_PORTID 5 +#define NFP_NET_META_IPSEC 9 + +#define NFP_META_PORT_ID_CTRL ~0U + +#define NFP_DESC_META_LEN(d) ((d)->rxd.meta_len_dd & PCIE_DESC_RX_META_LEN_MASK) + +/* Maximum number of NFP packet metadata fields. */ +#define NFP_META_MAX_FIELDS 8 + +/* Maximum number of supported VLANs in parsed form packet metadata. */ +#define NFP_META_MAX_VLANS 2 + +enum nfp_net_meta_format { + NFP_NET_METAFORMAT_SINGLE, + NFP_NET_METAFORMAT_CHAINED, +}; + +/* Describe the raw metadata format. */ +struct nfp_net_meta_raw { + uint32_t header; /**< Field type header (see format in nfp.rst) */ + uint32_t data[NFP_META_MAX_FIELDS]; /**< Array of each fields data member */ + uint8_t length; /**< Number of valid fields in @header */ +}; + +/* Record metadata parsed from packet */ +struct nfp_meta_parsed { + uint32_t port_id; /**< Port id value */ + uint32_t sa_idx; /**< IPsec SA index */ + uint32_t hash; /**< RSS hash value */ + uint32_t mark_id; /**< Mark id value */ + uint16_t flags; /**< Bitmap to indicate if meta exist */ + uint8_t hash_type; /**< RSS hash type */ + uint8_t ipsec_type; /**< IPsec type */ + uint8_t vlan_layer; /**< The valid number of value in @vlan[] */ + /** + * Holds information parses from NFP_NET_META_VLAN. + * The inner most vlan starts at position 0 + */ + struct { + uint8_t offload; /**< Flag indicates whether VLAN is offloaded */ + uint8_t tpid; /**< Vlan TPID */ + uint16_t tci; /**< Vlan TCI (PCP + Priority + VID) */ + } vlan[NFP_META_MAX_VLANS]; +}; + +void nfp_net_init_metadata_format(struct nfp_net_hw *hw); +void nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, + struct nfp_net_rxq *rxq, + struct nfp_net_hw *hw, + struct rte_mbuf *mb, + struct nfp_meta_parsed *meta); +void nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, + struct rte_mbuf *pkt, + uint8_t layer); +void nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, + struct nfp_net_txq *txq, + struct rte_mbuf *pkt, + uint8_t layer, + uint8_t ipsec_layer); + +#endif /* __NFP_NET_META_H__ */ diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index cbcf57d769..0256eba456 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -16,30 +16,7 @@ #include "nfp_ipsec.h" #include "nfp_logs.h" - -/* Maximum number of supported VLANs in parsed form packet metadata. */ -#define NFP_META_MAX_VLANS 2 - -/* Record metadata parsed from packet */ -struct nfp_meta_parsed { - uint32_t port_id; /**< Port id value */ - uint32_t sa_idx; /**< IPsec SA index */ - uint32_t hash; /**< RSS hash value */ - uint32_t mark_id; /**< Mark id value */ - uint16_t flags; /**< Bitmap to indicate if meta exist */ - uint8_t hash_type; /**< RSS hash type */ - uint8_t ipsec_type; /**< IPsec type */ - uint8_t vlan_layer; /**< The valid number of value in @vlan[] */ - /** - * Holds information parses from NFP_NET_META_VLAN. - * The inner most vlan starts at position 0 - */ - struct { - uint8_t offload; /**< Flag indicates whether VLAN is offloaded */ - uint8_t tpid; /**< Vlan TPID */ - uint16_t tci; /**< Vlan TCI (PCP + Priority + VID) */ - } vlan[NFP_META_MAX_VLANS]; -}; +#include "nfp_net_meta.h" /* * The bit format and map of nfp packet type for rxd.offload_info in Rx descriptor. @@ -254,242 +231,6 @@ nfp_net_rx_queue_count(void *rx_queue) return count; } -/* Parse the chained metadata from packet */ -static bool -nfp_net_parse_chained_meta(uint8_t *meta_base, - rte_be32_t meta_header, - struct nfp_meta_parsed *meta) -{ - uint32_t meta_info; - uint32_t vlan_info; - uint8_t *meta_offset; - - meta_info = rte_be_to_cpu_32(meta_header); - meta_offset = meta_base + 4; - - for (; meta_info != 0; meta_info >>= NFP_NET_META_FIELD_SIZE, meta_offset += 4) { - switch (meta_info & NFP_NET_META_FIELD_MASK) { - case NFP_NET_META_PORTID: - meta->port_id = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); - break; - case NFP_NET_META_HASH: - /* Next field type is about the hash type */ - meta_info >>= NFP_NET_META_FIELD_SIZE; - /* Hash value is in the data field */ - meta->hash = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); - meta->hash_type = meta_info & NFP_NET_META_FIELD_MASK; - break; - case NFP_NET_META_VLAN: - vlan_info = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); - meta->vlan[meta->vlan_layer].offload = - vlan_info >> NFP_NET_META_VLAN_OFFLOAD; - meta->vlan[meta->vlan_layer].tci = - vlan_info & NFP_NET_META_VLAN_MASK; - meta->vlan[meta->vlan_layer].tpid = NFP_NET_META_TPID(vlan_info); - meta->vlan_layer++; - break; - case NFP_NET_META_IPSEC: - meta->sa_idx = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); - meta->ipsec_type = meta_info & NFP_NET_META_FIELD_MASK; - break; - case NFP_NET_META_MARK: - meta->flags |= (1 << NFP_NET_META_MARK); - meta->mark_id = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); - break; - default: - /* Unsupported metadata can be a performance issue */ - return false; - } - } - - return true; -} - -/* Set mbuf hash data based on the metadata info */ -static void -nfp_net_parse_meta_hash(const struct nfp_meta_parsed *meta, - struct nfp_net_rxq *rxq, - struct rte_mbuf *mbuf) -{ - struct nfp_net_hw *hw = rxq->hw; - - if ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) - return; - - mbuf->hash.rss = meta->hash; - mbuf->ol_flags |= RTE_MBUF_F_RX_RSS_HASH; -} - -/* - * Parse the single metadata - * - * The RSS hash and hash-type are prepended to the packet data. - * Get it from metadata area. - */ -static inline void -nfp_net_parse_single_meta(uint8_t *meta_base, - rte_be32_t meta_header, - struct nfp_meta_parsed *meta) -{ - meta->hash_type = rte_be_to_cpu_32(meta_header); - meta->hash = rte_be_to_cpu_32(*(rte_be32_t *)(meta_base + 4)); -} - -/* Set mbuf vlan_strip data based on metadata info */ -static void -nfp_net_parse_meta_vlan(const struct nfp_meta_parsed *meta, - struct nfp_net_rx_desc *rxd, - struct nfp_net_rxq *rxq, - struct rte_mbuf *mb) -{ - uint32_t ctrl = rxq->hw->super.ctrl; - - /* Skip if hardware don't support setting vlan. */ - if ((ctrl & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2)) == 0) - return; - - /* - * The firmware support two ways to send the VLAN info (with priority) : - * 1. Using the metadata when NFP_NET_CFG_CTRL_RXVLAN_V2 is set, - * 2. Using the descriptor when NFP_NET_CFG_CTRL_RXVLAN is set. - */ - if ((ctrl & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0) { - if (meta->vlan_layer > 0 && meta->vlan[0].offload != 0) { - mb->vlan_tci = rte_cpu_to_le_32(meta->vlan[0].tci); - mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; - } - } else if ((ctrl & NFP_NET_CFG_CTRL_RXVLAN) != 0) { - if ((rxd->rxd.flags & PCIE_DESC_RX_VLAN) != 0) { - mb->vlan_tci = rte_cpu_to_le_32(rxd->rxd.offload_info); - mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; - } - } -} - -/* - * Set mbuf qinq_strip data based on metadata info - * - * The out VLAN tci are prepended to the packet data. - * Extract and decode it and set the mbuf fields. - * - * If both RTE_MBUF_F_RX_VLAN and NFP_NET_CFG_CTRL_RXQINQ are set, the 2 VLANs - * have been stripped by the hardware and their TCIs are saved in - * mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer). - * If NFP_NET_CFG_CTRL_RXQINQ is set and RTE_MBUF_F_RX_VLAN is unset, only the - * outer VLAN is removed from packet data, but both tci are saved in - * mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer). - * - * qinq set & vlan set : meta->vlan_layer>=2, meta->vlan[0].offload=1, meta->vlan[1].offload=1 - * qinq set & vlan not set: meta->vlan_layer>=2, meta->vlan[1].offload=1,meta->vlan[0].offload=0 - * qinq not set & vlan set: meta->vlan_layer=1, meta->vlan[0].offload=1 - * qinq not set & vlan not set: meta->vlan_layer=0 - */ -static void -nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta, - struct nfp_net_rxq *rxq, - struct rte_mbuf *mb) -{ - struct nfp_hw *hw = &rxq->hw->super; - - if ((hw->ctrl & NFP_NET_CFG_CTRL_RXQINQ) == 0) - return; - - if (meta->vlan_layer < NFP_META_MAX_VLANS) - return; - - if (meta->vlan[0].offload == 0) - mb->vlan_tci = rte_cpu_to_le_16(meta->vlan[0].tci); - - mb->vlan_tci_outer = rte_cpu_to_le_16(meta->vlan[1].tci); - PMD_RX_LOG(DEBUG, "Received outer vlan TCI is %u inner vlan TCI is %u", - mb->vlan_tci_outer, mb->vlan_tci); - mb->ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED; -} - -/* - * Set mbuf IPsec Offload features based on metadata info. - * - * The IPsec Offload features is prepended to the mbuf ol_flags. - * Extract and decode metadata info and set the mbuf ol_flags. - */ -static void -nfp_net_parse_meta_ipsec(struct nfp_meta_parsed *meta, - struct nfp_net_rxq *rxq, - struct rte_mbuf *mbuf) -{ - int offset; - uint32_t sa_idx; - struct nfp_net_hw *hw; - struct nfp_tx_ipsec_desc_msg *desc_md; - - hw = rxq->hw; - sa_idx = meta->sa_idx; - - if (meta->ipsec_type != NFP_NET_META_IPSEC) - return; - - if (sa_idx >= NFP_NET_IPSEC_MAX_SA_CNT) { - mbuf->ol_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED; - } else { - mbuf->ol_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD; - offset = hw->ipsec_data->pkt_dynfield_offset; - desc_md = RTE_MBUF_DYNFIELD(mbuf, offset, struct nfp_tx_ipsec_desc_msg *); - desc_md->sa_idx = sa_idx; - desc_md->enc = 0; - } -} - -static void -nfp_net_parse_meta_mark(const struct nfp_meta_parsed *meta, - struct rte_mbuf *mbuf) -{ - if (((meta->flags >> NFP_NET_META_MARK) & 0x1) == 0) - return; - - mbuf->hash.fdir.hi = meta->mark_id; - mbuf->ol_flags |= RTE_MBUF_F_RX_FDIR | RTE_MBUF_F_RX_FDIR_ID; -} - -/* Parse the metadata from packet */ -static void -nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, - struct nfp_net_rxq *rxq, - struct nfp_net_hw *hw, - struct rte_mbuf *mb, - struct nfp_meta_parsed *meta) -{ - uint8_t *meta_base; - rte_be32_t meta_header; - - if (unlikely(NFP_DESC_META_LEN(rxds) == 0)) - return; - - meta_base = rte_pktmbuf_mtod_offset(mb, uint8_t *, -NFP_DESC_META_LEN(rxds)); - meta_header = *(rte_be32_t *)meta_base; - - switch (hw->meta_format) { - case NFP_NET_METAFORMAT_CHAINED: - if (nfp_net_parse_chained_meta(meta_base, meta_header, meta)) { - nfp_net_parse_meta_hash(meta, rxq, mb); - nfp_net_parse_meta_vlan(meta, rxds, rxq, mb); - nfp_net_parse_meta_qinq(meta, rxq, mb); - nfp_net_parse_meta_ipsec(meta, rxq, mb); - nfp_net_parse_meta_mark(meta, mb); - } else { - PMD_RX_LOG(DEBUG, "RX chained metadata format is wrong!"); - } - break; - case NFP_NET_METAFORMAT_SINGLE: - if ((rxds->rxd.flags & PCIE_DESC_RX_RSS) != 0) { - nfp_net_parse_single_meta(meta_base, meta_header, meta); - nfp_net_parse_meta_hash(meta, rxq, mb); - } - break; - default: - PMD_RX_LOG(DEBUG, "RX metadata do not exist."); - } -} - /** * Set packet type to mbuf based on parsed structure. * @@ -1038,50 +779,6 @@ nfp_net_reset_tx_queue(struct nfp_net_txq *txq) txq->rd_p = 0; } -void -nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, - struct rte_mbuf *pkt, - uint8_t layer) -{ - uint16_t tpid; - uint16_t vlan_tci; - - tpid = RTE_ETHER_TYPE_VLAN; - vlan_tci = pkt->vlan_tci; - - meta_data->data[layer] = rte_cpu_to_be_32(tpid << 16 | vlan_tci); -} - -void -nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, - struct nfp_net_txq *txq, - struct rte_mbuf *pkt, - uint8_t layer, - uint8_t ipsec_layer) -{ - int offset; - struct nfp_net_hw *hw; - struct nfp_tx_ipsec_desc_msg *desc_md; - - hw = txq->hw; - offset = hw->ipsec_data->pkt_dynfield_offset; - desc_md = RTE_MBUF_DYNFIELD(pkt, offset, struct nfp_tx_ipsec_desc_msg *); - - switch (ipsec_layer) { - case NFP_IPSEC_META_SAIDX: - meta_data->data[layer] = desc_md->sa_idx; - break; - case NFP_IPSEC_META_SEQLOW: - meta_data->data[layer] = desc_md->esn.low; - break; - case NFP_IPSEC_META_SEQHI: - meta_data->data[layer] = desc_md->esn.hi; - break; - default: - break; - } -} - int nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index 5695a31636..6ecabc232c 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -8,18 +8,6 @@ #include -#define NFP_DESC_META_LEN(d) ((d)->rxd.meta_len_dd & PCIE_DESC_RX_META_LEN_MASK) - -/* Maximum number of NFP packet metadata fields. */ -#define NFP_META_MAX_FIELDS 8 - -/* Describe the raw metadata format. */ -struct nfp_net_meta_raw { - uint32_t header; /**< Field type header (see format in nfp.rst) */ - uint32_t data[NFP_META_MAX_FIELDS]; /**< Array of each fields data member */ - uint8_t length; /**< Number of valid fields in @header */ -}; - /* Descriptor alignment */ #define NFP_ALIGN_RING_DESC 128 @@ -238,13 +226,5 @@ int nfp_net_tx_queue_setup(struct rte_eth_dev *dev, unsigned int socket_id, const struct rte_eth_txconf *tx_conf); uint32_t nfp_net_tx_free_bufs(struct nfp_net_txq *txq); -void nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, - struct rte_mbuf *pkt, - uint8_t layer); -void nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, - struct nfp_net_txq *txq, - struct rte_mbuf *pkt, - uint8_t layer, - uint8_t ipsec_layer); #endif /* __NFP_RXTX_H__ */ From patchwork Tue Mar 5 02:29:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 137956 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 6245843B80; Tue, 5 Mar 2024 03:30:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 512AB40C35; Tue, 5 Mar 2024 03:29:50 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2117.outbound.protection.outlook.com [40.107.94.117]) by mails.dpdk.org (Postfix) with ESMTP id 287B1402EC for ; Tue, 5 Mar 2024 03:29:48 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CdLjU9+nUZguJdbzukeiOHOGs+kaMJQTA2Tp50qHUK8Cc1g3qdm3VnL5Xb6hcToRY+hydU2LaF9wGAlCU5Gf6Eo+CtXmM8B7oz41I/Svwd8wlFTtpk5NurTjSwBXHFyOHNH2TQEtigxzWj7MoTz0a/pgi6xeC+KCGNtbELYFh2ow5RNpdjTtgQZLLJR+Ig1I2Px1O1FRk8igWmttR+tpElJO/iNwoYBflm2ob2Vt3Qw3Nxu+Tw/Afj004BFbyznfO6BMB/3JnfqXc1BAo6zt4JTOT8wEqFkg6P5Fto0tHxLnjqPpJiUVo3ZQwLw4Cz3i0gGTVK20zpa4ks3UTZP+Lg== 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=9DrHVg/opc8LrqKrDIq7kHeq8OpJHWghRCi3NmOkcy4=; b=YucSOnNzQnKwVScPuSz0rC8033U1iLe2wgUTgL/yuBJ4wnyDGMni4fFubNQsFCFK3gda+3Zi2RmSLuw0mxfNIfmKEW6pwVMZ/8OsdxZXQdQFpWdMgyH7HKn1QLB5pG62W6tg+Wuo7dR8qcQlPn7s4d/l0+3+vwBcRcnYNBHe5Ur5EPr1bPLzWklZbAmevkxMD23B3MP3AV737623eE/amiHHlyC4iSub8C+2RjEraWXwpd2J8dcsKSW6j3hsKvSoDiczc9yJMLcux7OSkzHuEP5CkIpsw+ov+OtsaaUr/Ob7M4jv2KaAawH53nGvTc+RBfreBplVLLC7cBjkqqFUCw== 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=9DrHVg/opc8LrqKrDIq7kHeq8OpJHWghRCi3NmOkcy4=; b=UJI85nLq5b4jId4xEFO1Cyfvo72tSZGdugdon/ARWQW1b/D7QgCInBPAw0zA7sw5VyLudKdMKAeXYYDyY3epujr6QaGNTvQpQjfW4KVRcvkXfKu7Othio3YUVA+bbzG6RmgIhkZwAr4rOMLTIaTQ74IZv+/rcQ2Zm16fPNtY3TY= 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 PH0PR13MB5780.namprd13.prod.outlook.com (2603:10b6:510:11b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.37; Tue, 5 Mar 2024 02:29:46 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7339.035; Tue, 5 Mar 2024 02:29:46 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , Chaoyong He Subject: [PATCH 2/5] net/nfp: uniform variable name format Date: Tue, 5 Mar 2024 10:29:20 +0800 Message-Id: <20240305022923.891544-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240305022923.891544-1-chaoyong.he@corigine.com> References: <20240305022923.891544-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY5PR04CA0028.namprd04.prod.outlook.com (2603:10b6:a03:1d0::38) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5780:EE_ X-MS-Office365-Filtering-Correlation-Id: 10e395ea-c4b8-4343-ab32-08dc3cbc1f6c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A4+awEIneNWB5EFy4fEg8O4l2mugTJq0ldkQL6haNcppRmwEJ2askcblfX7NTUAflOnwAVwrJIKjlHJiLCAnWH4WITKV5u/FGhH4Huyw/3JhjDgZdl+ZpJL4qJxSlXOoKzsoBAbm8XdQh0bLBB1alkKJmcz6hYsbSpKye9UqCSNOYC8++PPBpuGHAOn/+cbK8EV6cweG9N4dNmX506QFKj37x7pblgIbbOt6NmqP/+0LSzAtbLWO2G6dWDrG6zWl1nwEUt3DZinkeLslbL80AcS1nC9yqaT4regrsrgO3S2dwTOBcmuGZyfjGlWV6c59U6Y65ZYoBLJ7+7rp0PsK2j9ZYskJW7REjnQrtMLN8Z29j0H4WDvVKlP73wxAbdtBI3H1AkxiIfwsHeY7L8Z84ClJLR8y1tuc/PzS99n8P+M0swTpVRBnpGzrwaZ84vfFbCnpCanmnwAWvURx2pAumVJI6ro2CA0ix29FjCmhIduN5lTmkbvKAixhWF/5pbo+wT+tmJgAZ9DvGr/Qav+jRovtHxGs2MQ5je4kbq4qsJX/+fDCpsCb0TXNvcp11MxwygjyRiGv59BE5DnFYLt066UNKwjMvidQSvtTE1TJOc8jFWUHy6ZiaJ47d8iWrhvbbXtRdpcCMewTOXaTijoAb865BfSfCaNzyXKVv9nVdklVuo25Ha+9dIsa60h70khI91w62b5ynQbBLER3T38rFVL7/NGqW/SddHK4U5Wr7wA= 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:(13230031)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n37RL3vkBQGNw4vEnddXzw8KDdqIJ4HalCEA5HrzhduMWufL7k59ktJEi9ngx3oWMMx23EuQftWHbg5tQBCw5yUURP0+/Ij4Rr+gpCa4W1CmEe48NMh2BOa6gVT7Q1dx9VIsw6aVYzBd7PaEMH+nHxs+HjCw5h78cRQlRfDH5o0BRtVASnNIbHATGfY/3Q+oSKmKume6D0JHV4v0C7Q8gX6vEOQmCFmHE62o0ZXxSlLFFXjRGK1DTBsyzdGn2jAn7CQIQBY9Jc9HZZ+LnWmwl1jnPRBRDG7yQmjOgM7fhxYxztrQ346EkTbg++fk0y+qvR3FJrn7INX2C1rCp+zjDokLAE/Sf3nxmmLKIt7sN/O6Cul519mfafS6jjA3eWKuhoL+24zetUbnE4Ti7XMXHFDugOwTmnG5gN6vJdf48T8zDZM8l3YcTzBJGwCkEe46cp14AQb/Tm65Rid6jta1a83rDWKFglf25KmMJQdXF7THS8jxC4XFTkeP/hHUEvFBFVbUSAX+O61zs+lSg8vtOYXY66NR6uOcLxBuHmwQKFhWOv9pRv6Ni3c4QPIDwUsjCIJwwSwEW9zGX+hNWoGq0JShDY8WQQpGDrPRT/J+P6gf19EPoIqSlmcPIgoMDoJf7vBozgxm2FlIZtUE4leo4QFBLVN1J4JnEBwAHR/APImilnLtlJYMvaYBhV898mn9xodBUD4G+RIc/XBWieG9VSBmCN05FRbC3eCOVoTQeBrpxls/kgEit4qvfmkgR/u5DEwnpnsbiQMRKGq2Uhy2cVodaXKvt3SP/G7wKddJ57NXdXW+E5zS+apOd55vRnJX1hN5hO/wLQWxjsfjXr/AeLO3RQEp9MbrB6QVuYQsbf65hwVF09Mn1JgHu1mpX/VmVC+P9I6BhbEE1kIw8i1t8J4MergnkWxvrM1NMjxqwBowqcaCg+BvaTqoyYCg/DGtjcAb/n3cYW0/YK0rvqW6Kz14/gzha+NtaScDeAkSpjcyn7C4gdvk7kv2unskEhWM8FiDDPTwArNwokbVNs8rxlGXN6njEPlQGpf3X9Qrjj9h+DDg0sRHQVykI94FuJYFkP5gW/IfLTiQHBikiYeXnf5HnjjRjz1LsRFa7o6D9Yj+O12crC+4c8/l+3zdIiVSxVKK6YgwT22vqVsdvVzVcKdSx6Z9LmpkaipRpqwl9bk4jb+/h/Y9ax57vrGSpJZEAWFBwuTz5Y3bdh6d//BhvdMpuzWN3+prPGsl/kIvaaWCo+vZm0tdDQ1hKErMGtfnl9O8Q1h2jIOP6u3sYlA1+OMEgf9BOUtkwuDWyvuF2TvLQcLjK6BiMa3Yj0tc4b7rElOPqRv1Nx1p9birueHHn7ueObqS8oJ3E0a8eo1PcGpixukuPjGSPz1lU9AUl8EiuBd3djB5mRO1BpCcv4FJ1/9tjUgYCVKzHmDdYnfaggsAfutneK3b9KEpDqUe/CowmYiiKomUKJULDcXhbRWsL6/KXngY3cX9seN34KlE8fd0jv1O9ng+zi5s2l56wXDOMTJY/C8hyr8P46f6vHCd+1DbnyFmLgodZf1aRXsaSm11mtD0d8ywlLyCpB2Uj7NYADnLN05FmukIV1OvWGnyGQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10e395ea-c4b8-4343-ab32-08dc3cbc1f6c X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 02:29:46.1394 (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: FJ0LjI90rQjSCNy8E+TMENqLz/6nyuD5WS78bBFWOK0mJ+hdK5r9nrO/cMjgyMT5RsveTOq+Bl6S8O4eDUpMv+qiClQBQsIy3GDZyvhhGBU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5780 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: Long Wu Uniform variable name format by add the same prefix. Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower_cmsg.c | 2 +- drivers/net/nfp/flower/nfp_flower_ctrl.c | 2 +- drivers/net/nfp/nfp_net_meta.c | 32 ++++++++++---------- drivers/net/nfp/nfp_net_meta.h | 38 ++++++++++++------------ drivers/net/nfp/nfp_rxtx.c | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c index f78bfba332..eefeb0d887 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.c +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c @@ -31,7 +31,7 @@ nfp_flower_cmsg_init(struct nfp_app_fw_flower *app_fw_flower, pkt = rte_pktmbuf_mtod(m, char *); PMD_DRV_LOG(DEBUG, "flower_cmsg_init using pkt at %p", pkt); - new_size += nfp_flower_pkt_add_metadata(app_fw_flower, m, NFP_META_PORT_ID_CTRL); + new_size += nfp_flower_pkt_add_metadata(app_fw_flower, m, NFP_NET_META_PORT_ID_CTRL); /* Now the ctrl header */ hdr = (struct nfp_flower_cmsg_hdr *)pkt; diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index 720a0d9495..4c2aeb9849 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -475,7 +475,7 @@ nfp_flower_cmsg_rx(struct nfp_app_fw_flower *app_fw_flower, meta_type = rte_be_to_cpu_32(*(uint32_t *)(meta - 8)); meta_info = rte_be_to_cpu_32(*(uint32_t *)(meta - 4)); if (meta_type != NFP_NET_META_PORTID || - meta_info != NFP_META_PORT_ID_CTRL) { + meta_info != NFP_NET_META_PORT_ID_CTRL) { PMD_DRV_LOG(ERR, "Incorrect metadata for ctrl packet!"); rte_pktmbuf_free(pkts_burst[i]); continue; diff --git a/drivers/net/nfp/nfp_net_meta.c b/drivers/net/nfp/nfp_net_meta.c index 0bc22b2f88..0fd5ba17a0 100644 --- a/drivers/net/nfp/nfp_net_meta.c +++ b/drivers/net/nfp/nfp_net_meta.c @@ -9,17 +9,17 @@ #include "nfp_ipsec.h" #include "nfp_logs.h" -enum nfp_ipsec_meta_layer { - NFP_IPSEC_META_SAIDX, /**< Order of SA index in metadata */ - NFP_IPSEC_META_SEQLOW, /**< Order of Sequence Number (low 32bits) in metadata */ - NFP_IPSEC_META_SEQHI, /**< Order of Sequence Number (high 32bits) in metadata */ +enum nfp_net_meta_ipsec_layer { + NFP_NET_META_IPSEC_SAIDX, /**< Order of SA index in metadata */ + NFP_NET_META_IPSEC_SEQLOW, /**< Order of Sequence Number (low 32bits) in metadata */ + NFP_NET_META_IPSEC_SEQHI, /**< Order of Sequence Number (high 32bits) in metadata */ }; /* Parse the chained metadata from packet */ static bool nfp_net_parse_chained_meta(uint8_t *meta_base, rte_be32_t meta_header, - struct nfp_meta_parsed *meta) + struct nfp_net_meta_parsed *meta) { uint32_t meta_info; uint32_t vlan_info; @@ -75,7 +75,7 @@ nfp_net_parse_chained_meta(uint8_t *meta_base, static inline void nfp_net_parse_single_meta(uint8_t *meta_base, rte_be32_t meta_header, - struct nfp_meta_parsed *meta) + struct nfp_net_meta_parsed *meta) { meta->hash_type = rte_be_to_cpu_32(meta_header); meta->hash = rte_be_to_cpu_32(*(rte_be32_t *)(meta_base + 4)); @@ -83,7 +83,7 @@ nfp_net_parse_single_meta(uint8_t *meta_base, /* Set mbuf hash data based on the metadata info */ static void -nfp_net_parse_meta_hash(const struct nfp_meta_parsed *meta, +nfp_net_parse_meta_hash(const struct nfp_net_meta_parsed *meta, struct nfp_net_rxq *rxq, struct rte_mbuf *mbuf) { @@ -98,7 +98,7 @@ nfp_net_parse_meta_hash(const struct nfp_meta_parsed *meta, /* Set mbuf vlan_strip data based on metadata info */ static void -nfp_net_parse_meta_vlan(const struct nfp_meta_parsed *meta, +nfp_net_parse_meta_vlan(const struct nfp_net_meta_parsed *meta, struct nfp_net_rx_desc *rxd, struct nfp_net_rxq *rxq, struct rte_mbuf *mb) @@ -146,7 +146,7 @@ nfp_net_parse_meta_vlan(const struct nfp_meta_parsed *meta, * qinq not set & vlan not set: meta->vlan_layer=0 */ static void -nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta, +nfp_net_parse_meta_qinq(const struct nfp_net_meta_parsed *meta, struct nfp_net_rxq *rxq, struct rte_mbuf *mb) { @@ -156,7 +156,7 @@ nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta, (hw->cap & NFP_NET_CFG_CTRL_RXQINQ) == 0) return; - if (meta->vlan_layer < NFP_META_MAX_VLANS) + if (meta->vlan_layer < NFP_NET_META_MAX_VLANS) return; if (meta->vlan[0].offload == 0) @@ -175,7 +175,7 @@ nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta, * Extract and decode metadata info and set the mbuf ol_flags. */ static void -nfp_net_parse_meta_ipsec(struct nfp_meta_parsed *meta, +nfp_net_parse_meta_ipsec(struct nfp_net_meta_parsed *meta, struct nfp_net_rxq *rxq, struct rte_mbuf *mbuf) { @@ -202,7 +202,7 @@ nfp_net_parse_meta_ipsec(struct nfp_meta_parsed *meta, } static void -nfp_net_parse_meta_mark(const struct nfp_meta_parsed *meta, +nfp_net_parse_meta_mark(const struct nfp_net_meta_parsed *meta, struct rte_mbuf *mbuf) { if (((meta->flags >> NFP_NET_META_MARK) & 0x1) == 0) @@ -218,7 +218,7 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, struct nfp_net_rxq *rxq, struct nfp_net_hw *hw, struct rte_mbuf *mb, - struct nfp_meta_parsed *meta) + struct nfp_net_meta_parsed *meta) { uint8_t *meta_base; rte_be32_t meta_header; @@ -305,13 +305,13 @@ nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, desc_md = RTE_MBUF_DYNFIELD(pkt, offset, struct nfp_tx_ipsec_desc_msg *); switch (ipsec_layer) { - case NFP_IPSEC_META_SAIDX: + case NFP_NET_META_IPSEC_SAIDX: meta_data->data[layer] = desc_md->sa_idx; break; - case NFP_IPSEC_META_SEQLOW: + case NFP_NET_META_IPSEC_SEQLOW: meta_data->data[layer] = desc_md->esn.low; break; - case NFP_IPSEC_META_SEQHI: + case NFP_NET_META_IPSEC_SEQHI: meta_data->data[layer] = desc_md->esn.hi; break; default: diff --git a/drivers/net/nfp/nfp_net_meta.h b/drivers/net/nfp/nfp_net_meta.h index da2091ce9f..46caa777da 100644 --- a/drivers/net/nfp/nfp_net_meta.h +++ b/drivers/net/nfp/nfp_net_meta.h @@ -9,18 +9,18 @@ #include "nfp_rxtx.h" /* Hash type prepended when a RSS hash was computed */ -#define NFP_NET_RSS_NONE 0 -#define NFP_NET_RSS_IPV4 1 -#define NFP_NET_RSS_IPV6 2 -#define NFP_NET_RSS_IPV6_EX 3 -#define NFP_NET_RSS_IPV4_TCP 4 -#define NFP_NET_RSS_IPV6_TCP 5 -#define NFP_NET_RSS_IPV6_EX_TCP 6 -#define NFP_NET_RSS_IPV4_UDP 7 -#define NFP_NET_RSS_IPV6_UDP 8 -#define NFP_NET_RSS_IPV6_EX_UDP 9 -#define NFP_NET_RSS_IPV4_SCTP 10 -#define NFP_NET_RSS_IPV6_SCTP 11 +#define NFP_NET_META_RSS_NONE 0 +#define NFP_NET_META_RSS_IPV4 1 +#define NFP_NET_META_RSS_IPV6 2 +#define NFP_NET_META_RSS_IPV6_EX 3 +#define NFP_NET_META_RSS_IPV4_TCP 4 +#define NFP_NET_META_RSS_IPV6_TCP 5 +#define NFP_NET_META_RSS_IPV6_EX_TCP 6 +#define NFP_NET_META_RSS_IPV4_UDP 7 +#define NFP_NET_META_RSS_IPV6_UDP 8 +#define NFP_NET_META_RSS_IPV6_EX_UDP 9 +#define NFP_NET_META_RSS_IPV4_SCTP 10 +#define NFP_NET_META_RSS_IPV6_SCTP 11 /* Offset in Freelist buffer where packet starts on RX */ #define NFP_NET_RX_OFFSET 32 @@ -47,15 +47,15 @@ #define NFP_NET_META_PORTID 5 #define NFP_NET_META_IPSEC 9 -#define NFP_META_PORT_ID_CTRL ~0U +#define NFP_NET_META_PORT_ID_CTRL ~0U #define NFP_DESC_META_LEN(d) ((d)->rxd.meta_len_dd & PCIE_DESC_RX_META_LEN_MASK) /* Maximum number of NFP packet metadata fields. */ -#define NFP_META_MAX_FIELDS 8 +#define NFP_NET_META_MAX_FIELDS 8 /* Maximum number of supported VLANs in parsed form packet metadata. */ -#define NFP_META_MAX_VLANS 2 +#define NFP_NET_META_MAX_VLANS 2 enum nfp_net_meta_format { NFP_NET_METAFORMAT_SINGLE, @@ -65,12 +65,12 @@ enum nfp_net_meta_format { /* Describe the raw metadata format. */ struct nfp_net_meta_raw { uint32_t header; /**< Field type header (see format in nfp.rst) */ - uint32_t data[NFP_META_MAX_FIELDS]; /**< Array of each fields data member */ + uint32_t data[NFP_NET_META_MAX_FIELDS]; /**< Array of each fields data member */ uint8_t length; /**< Number of valid fields in @header */ }; /* Record metadata parsed from packet */ -struct nfp_meta_parsed { +struct nfp_net_meta_parsed { uint32_t port_id; /**< Port id value */ uint32_t sa_idx; /**< IPsec SA index */ uint32_t hash; /**< RSS hash value */ @@ -87,7 +87,7 @@ struct nfp_meta_parsed { uint8_t offload; /**< Flag indicates whether VLAN is offloaded */ uint8_t tpid; /**< Vlan TPID */ uint16_t tci; /**< Vlan TCI (PCP + Priority + VID) */ - } vlan[NFP_META_MAX_VLANS]; + } vlan[NFP_NET_META_MAX_VLANS]; }; void nfp_net_init_metadata_format(struct nfp_net_hw *hw); @@ -95,7 +95,7 @@ void nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, struct nfp_net_rxq *rxq, struct nfp_net_hw *hw, struct rte_mbuf *mb, - struct nfp_meta_parsed *meta); + struct nfp_net_meta_parsed *meta); void nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, struct rte_mbuf *pkt, uint8_t layer); diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 0256eba456..e863c42039 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -497,7 +497,7 @@ nfp_net_recv_pkts(void *rx_queue, mb->next = NULL; mb->port = rxq->port_id; - struct nfp_meta_parsed meta = {}; + struct nfp_net_meta_parsed meta = {}; nfp_net_parse_meta(rxds, rxq, hw, mb, &meta); nfp_net_parse_ptype(rxq, rxds, mb); From patchwork Tue Mar 5 02:29:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 137957 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 1C61243B80; Tue, 5 Mar 2024 03:30:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5FDE54111C; Tue, 5 Mar 2024 03:29:52 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2134.outbound.protection.outlook.com [40.107.94.134]) by mails.dpdk.org (Postfix) with ESMTP id 4940F406FF for ; Tue, 5 Mar 2024 03:29:49 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SlgGK6yGsYZiT4DbdQZBBcvkvxc9nRcgKFNOtdGufexFqwkGcSJTDL69GVfar9JyMk8yQ5UR+wPva6d9CpaDBpV49nHZ+F6iQ7ruqdmKrQ+pEIOiIiRInIARdF0MT4o/YoCZOQwi7exDXL9m1o0ByUpKKcUSFpYFpLD1MeWKlTS1DdRsL0AzpmMRFg50dvg3cbk5XEv4nh9QiJZI0PSHBkUFXhD+Z75b/q9DRb4DfaTB+eHvxJl2ivIlOTPYGdX0LFQMDRL8e1K7X69Zuh7/udubLbi1kGD6Tf4B+9RwuWuD00vdnIr5dGveQKcZZM4k7bZ+cS97wss/ojdiF843zw== 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=NTY3xhrxOthZTzmeP1ULD/bo38h3H6/AsHrOEuCLiTs=; b=hMRfPg4zHeA73g9lq4OSpi6vLRrbi/4ZTjnGxctbo94xjI/Imn4MV2I5L+gdc6aBeLQNZdgsZRreoSocYCUC7JzhsIUZmMmdDLeA9CwmC7Ox+aU1+7w/9PImg/L3mht3BFXqE0n1zN9TiCrgXEafaoGEsU00koDAnKaRIVj7c+94DU8xCcIe+ULROs1wgujPIXUxYUDSW5AELsTwbfh+BdW2ovCCTuPaTrosHV5hsAEG3rAmQx4W++yNtOLWEG1g/ic6UkhpjlcbtKEMz+Z9hbdyAiD5CVaXh/m4175adTkXlJ/z3uw7b67V4wVDXcEhvxZM/CI1TQcQtm7V8xBRKg== 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=NTY3xhrxOthZTzmeP1ULD/bo38h3H6/AsHrOEuCLiTs=; b=PqTudemnblxtSS6ZGqklk0bcAd1fO2OSttoi9o/Aneq80HrPw1C9/yIPidq4qgmJIXWHue3U1scllaAkl5IFi8g8Qm3EXjdNALGubUPVeL6sQuXsj+HO6CKuA4AVBjmE2OfkBtN30bVuj8SAELhGvFloTdcy9pDpEy8dQ1tDgTE= 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 PH0PR13MB5780.namprd13.prod.outlook.com (2603:10b6:510:11b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.37; Tue, 5 Mar 2024 02:29:47 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7339.035; Tue, 5 Mar 2024 02:29:47 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , Chaoyong He Subject: [PATCH 3/5] net/nfp: uniform function name format Date: Tue, 5 Mar 2024 10:29:21 +0800 Message-Id: <20240305022923.891544-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240305022923.891544-1-chaoyong.he@corigine.com> References: <20240305022923.891544-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY5PR04CA0028.namprd04.prod.outlook.com (2603:10b6:a03:1d0::38) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5780:EE_ X-MS-Office365-Filtering-Correlation-Id: adfeaac0-0da1-4e83-c5cc-08dc3cbc2069 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i+a6p895hGfceIc6AiLdpBHFpTyuZ0xVsDcNfXlZcofXohykL8BVm4A/ZA4vldBugr59dwQl6ZaTEp5LcEjmvXJ3uZCVe5AyS+fxgcxZSgz5jLo6xevj+P012MAMhlt9BfNEvd8/zuOTm4OcLHxZOknYTSomUUrDMeHwKfkPyOoCdvy1M1c1BTSHhRu+exuGXU/k/+D0Tb/1wPTYiLmVEEjW8Rh44KJOf9/muF0qLdQpA9t6e5E1a4hTygHQccRVm6bJvdPOqH2aJ2HezemnJiuhU/d35YQPUDqyZrQNAOI7/ba+1atzRis7vjwAz1BnNGEbEu8Y9OA567uFkrqVsdAMPxaFp1HIhMZTGB/e28f3PuU4yf80yD+x6o1BzvGACq/mkchYdgCsEo0ljQ54K0ugQF6nTPH+uSvOa06tg2cCZWHNEjXpDYZetURdkI3aLEjTlDo6UBKi3KC2KiGapUZThJAxyaEVeKJSS1XGhLmiJP3IuyMjJcOYqL4SFXJHLWyywo1qv1mM5m66ZwaBgGFVVa0+xd3D1x9mXVWmHaSLKMODYB6NimXah5/cOmqRl4CjeBXzbgwBvDHr0EnAGKV7UzRRBDBL+plaAgGDF+YxB8GfVxL4nd74xRzOIuOZE9ZAz/BBrn6Cb/rIBgzJbav4xPmsHk/FqOaibxByBHhC5zrpWpum/y12lEKbVBjW+F7gOnMysVmzY8kaZ09gcKT+cec99a14uoOBnQu63aw= 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:(13230031)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kp+FHlAsVG7RN5xWVypDSXQ/7ipjzaH7sVf3OlnOLHUBkT/q3QJMf2ZXVhXCOYshR8eX5V0SrBT0Ll5zCO2htvBiNene+8KdpMnrMlDYPFTe85L5BhM7lbpGBAuRIIUYJTnRW5BH1uio8DEbWFd/dvQm3ssiY4rlGAIOSXH1ZDsducnw96PVD1utxCZqGKhxyWBLbsIr2y+6v3adlIEeDyAzkZPw//itJ2iw6T3gHj34JLc3I+z5ZPnaFzSNQ9urawOxYtIiVygIsFNUYUu2pRrNeRppkDe6lt1Q55avCOMWZkDZAX6z2bbbf40qJVKZ7mDEBlE7fw/lMFZOth1QMSYafXPeU7pXCaI0jmjPLEw+KO1A2zQqvyMEAgHgDlZ1gKZpIIFBX6hLOwVvQ3szyX3Tncbm2Gdr1SOZ0YplUWDWcilpW7Cowxz7s1cueX9YVSOZ5ThRAccSZdiO0vGVDfCxznBKDgPEXhhvQuBnObk2z8JGV+nUAJRIsv9CAAiOmiz+TSwNeVwBikNFyMV6CFrnNh/hoBHwB/mw2GaTR1MYTzvkZi9eCtA+blD7CACwBrOu4XD52H5RSriEbxPGK7pSi/Bt5Ov25IH6RfvXlcomTCub4vi39yZfvXgcerse/nFgFatbkM8HB5Z6VRRNB2ahWpm2CNzKjBGZU9FWIOKqKNu7KID53GfTHT0oUmTx+Un4agwciA9RgDACjMFtWVigcdaOD9k2ZVSb5kzPvxGR2lcGD49/vmTIOc6Q3wLiLxdKa3jDCLPyrIsHvka1fufS7MLF4lklsiK640J936V27SJpe0WCE6CRItxf9zENPGb4ANY5E8UAjbMOE5QFg0HGau0z2eA+x3PqwblqdYkls5UZKM1vs0ifulKvdidDF657C0dm9DyE4oXhkZ5XjTao4hJ9wd/TBA81IhNxJ2zHdU4g0AKnc4MyO8nPBK52dDLplYp+hy8BGpTEqBmPU+NVX1lAV5OV0ngfqKyiEXmmurPCImFvwZhmX7Njjzq3U79i51KH/j7I7YJ3QbZnjkB2oMDhjGx8UzEj5FiPFjlWlubEH0z0eHn8f/4eRnjj68HLh7AbHdHI/G+YjT1CbR96WPQ3yMYJMoWbhW8eTfipkUgkiVWEp/mAHlJuofXKSkQ6chP6voj6YQCXWqLk2ZhyW9p0YhpxJfxPxKcj2PresRp8eVmNg3O19wvCV+eYJpSAkboHCEKlgIip/CvO648AmlMsVpYzMjOdu/E1VPTZPlwAh3Hupsyaouc2K+c8QD0iysM59n7gJYOJRcai6kYu8lW4TtMhbFxMgREcBplYHlckKD/SJr2Lt62WhotXoSLLKAy2QsPj/s+Mi9RdAcLqYEOj3587PaGcqe4+alML0Br7cRvRS0W/CYz6QulJSFjMUQw8xs/NzHpnuOep8+eBAza2gbhO9jck14Dj5w91yfFpiw46Zxo6rOXSSC+lWuchHEDNdBp2PpsrPjXwNdm73gj0pGqlmzVayL3iNn2yNNDIngJ+qZAQuVRgUwBa9iU6PEb5s0j7OsESxzzg7bwmO40CyaJB8rg4sofxwfOgMhjbgsNMdedFWe+jlBf9q3zUFmLbZLFhGgqpL5BoQQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: adfeaac0-0da1-4e83-c5cc-08dc3cbc2069 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 02:29:47.7787 (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: vM9LQDg4Biju4wIy2SPYGJcKy9lygAiAM2gn78uOaHEaqq5GhHm+i+xg1EgimA0AaBoAU4sSA1hmkU2tPJjB+J9I9klqgLLQcQczaxqCV5I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5780 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: Long Wu Uniform function name format and add the same prefix. Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 5 ++-- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 5 ++-- drivers/net/nfp/nfp_net_common.c | 2 +- drivers/net/nfp/nfp_net_meta.c | 38 +++++++++++++++--------------- drivers/net/nfp/nfp_net_meta.h | 8 +++---- drivers/net/nfp/nfp_rxtx.c | 2 +- 6 files changed, 29 insertions(+), 31 deletions(-) diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index 5fb76ae9d7..7e281ae498 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -194,8 +194,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, PMD_DRV_LOG(ERR, "At most 1 layers of vlan is supported"); return -EINVAL; } - - nfp_net_set_meta_vlan(meta_data, pkt, layer); + nfp_net_meta_set_vlan(meta_data, pkt, layer); vlan_layer++; break; case NFP_NET_META_IPSEC: @@ -204,7 +203,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, return -EINVAL; } - nfp_net_set_meta_ipsec(meta_data, txq, pkt, layer, ipsec_layer); + nfp_net_meta_set_ipsec(meta_data, txq, pkt, layer, ipsec_layer); ipsec_layer++; break; default: diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 8bdab5d463..b8592b1767 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -228,8 +228,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, PMD_DRV_LOG(ERR, "At most 1 layers of vlan is supported"); return -EINVAL; } - - nfp_net_set_meta_vlan(&meta_data, pkt, layer); + nfp_net_meta_set_vlan(&meta_data, pkt, layer); vlan_layer++; break; case NFP_NET_META_IPSEC: @@ -238,7 +237,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, return -EINVAL; } - nfp_net_set_meta_ipsec(&meta_data, txq, pkt, layer, ipsec_layer); + nfp_net_meta_set_ipsec(&meta_data, txq, pkt, layer, ipsec_layer); ipsec_layer++; break; default: diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 384e042dfd..71038d6be9 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -1312,7 +1312,7 @@ nfp_net_common_init(struct rte_pci_device *pci_dev, hw->max_mtu = nn_cfg_readl(&hw->super, NFP_NET_CFG_MAX_MTU); hw->flbufsz = DEFAULT_FLBUF_SIZE; - nfp_net_init_metadata_format(hw); + nfp_net_meta_init_format(hw); /* Read the Rx offset configured from firmware */ if (hw->ver.major < 2) diff --git a/drivers/net/nfp/nfp_net_meta.c b/drivers/net/nfp/nfp_net_meta.c index 0fd5ba17a0..2ec20aba7d 100644 --- a/drivers/net/nfp/nfp_net_meta.c +++ b/drivers/net/nfp/nfp_net_meta.c @@ -17,7 +17,7 @@ enum nfp_net_meta_ipsec_layer { /* Parse the chained metadata from packet */ static bool -nfp_net_parse_chained_meta(uint8_t *meta_base, +nfp_net_meta_parse_chained(uint8_t *meta_base, rte_be32_t meta_header, struct nfp_net_meta_parsed *meta) { @@ -73,7 +73,7 @@ nfp_net_parse_chained_meta(uint8_t *meta_base, * Get it from metadata area. */ static inline void -nfp_net_parse_single_meta(uint8_t *meta_base, +nfp_net_meta_parse_single(uint8_t *meta_base, rte_be32_t meta_header, struct nfp_net_meta_parsed *meta) { @@ -83,7 +83,7 @@ nfp_net_parse_single_meta(uint8_t *meta_base, /* Set mbuf hash data based on the metadata info */ static void -nfp_net_parse_meta_hash(const struct nfp_net_meta_parsed *meta, +nfp_net_meta_parse_hash(const struct nfp_net_meta_parsed *meta, struct nfp_net_rxq *rxq, struct rte_mbuf *mbuf) { @@ -98,7 +98,7 @@ nfp_net_parse_meta_hash(const struct nfp_net_meta_parsed *meta, /* Set mbuf vlan_strip data based on metadata info */ static void -nfp_net_parse_meta_vlan(const struct nfp_net_meta_parsed *meta, +nfp_net_meta_parse_vlan(const struct nfp_net_meta_parsed *meta, struct nfp_net_rx_desc *rxd, struct nfp_net_rxq *rxq, struct rte_mbuf *mb) @@ -146,7 +146,7 @@ nfp_net_parse_meta_vlan(const struct nfp_net_meta_parsed *meta, * qinq not set & vlan not set: meta->vlan_layer=0 */ static void -nfp_net_parse_meta_qinq(const struct nfp_net_meta_parsed *meta, +nfp_net_meta_parse_qinq(const struct nfp_net_meta_parsed *meta, struct nfp_net_rxq *rxq, struct rte_mbuf *mb) { @@ -175,7 +175,7 @@ nfp_net_parse_meta_qinq(const struct nfp_net_meta_parsed *meta, * Extract and decode metadata info and set the mbuf ol_flags. */ static void -nfp_net_parse_meta_ipsec(struct nfp_net_meta_parsed *meta, +nfp_net_meta_parse_ipsec(struct nfp_net_meta_parsed *meta, struct nfp_net_rxq *rxq, struct rte_mbuf *mbuf) { @@ -202,7 +202,7 @@ nfp_net_parse_meta_ipsec(struct nfp_net_meta_parsed *meta, } static void -nfp_net_parse_meta_mark(const struct nfp_net_meta_parsed *meta, +nfp_net_meta_parse_mark(const struct nfp_net_meta_parsed *meta, struct rte_mbuf *mbuf) { if (((meta->flags >> NFP_NET_META_MARK) & 0x1) == 0) @@ -214,7 +214,7 @@ nfp_net_parse_meta_mark(const struct nfp_net_meta_parsed *meta, /* Parse the metadata from packet */ void -nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, +nfp_net_meta_parse(struct nfp_net_rx_desc *rxds, struct nfp_net_rxq *rxq, struct nfp_net_hw *hw, struct rte_mbuf *mb, @@ -231,20 +231,20 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, switch (hw->meta_format) { case NFP_NET_METAFORMAT_CHAINED: - if (nfp_net_parse_chained_meta(meta_base, meta_header, meta)) { - nfp_net_parse_meta_hash(meta, rxq, mb); - nfp_net_parse_meta_vlan(meta, rxds, rxq, mb); - nfp_net_parse_meta_qinq(meta, rxq, mb); - nfp_net_parse_meta_ipsec(meta, rxq, mb); - nfp_net_parse_meta_mark(meta, mb); + if (nfp_net_meta_parse_chained(meta_base, meta_header, meta)) { + nfp_net_meta_parse_hash(meta, rxq, mb); + nfp_net_meta_parse_vlan(meta, rxds, rxq, mb); + nfp_net_meta_parse_qinq(meta, rxq, mb); + nfp_net_meta_parse_ipsec(meta, rxq, mb); + nfp_net_meta_parse_mark(meta, mb); } else { PMD_RX_LOG(DEBUG, "RX chained metadata format is wrong!"); } break; case NFP_NET_METAFORMAT_SINGLE: if ((rxds->rxd.flags & PCIE_DESC_RX_RSS) != 0) { - nfp_net_parse_single_meta(meta_base, meta_header, meta); - nfp_net_parse_meta_hash(meta, rxq, mb); + nfp_net_meta_parse_single(meta_base, meta_header, meta); + nfp_net_meta_parse_hash(meta, rxq, mb); } break; default: @@ -253,7 +253,7 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, } void -nfp_net_init_metadata_format(struct nfp_net_hw *hw) +nfp_net_meta_init_format(struct nfp_net_hw *hw) { /* * ABI 4.x and ctrl vNIC always use chained metadata, in other cases we allow use of @@ -276,7 +276,7 @@ nfp_net_init_metadata_format(struct nfp_net_hw *hw) } void -nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, +nfp_net_meta_set_vlan(struct nfp_net_meta_raw *meta_data, struct rte_mbuf *pkt, uint8_t layer) { @@ -290,7 +290,7 @@ nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, } void -nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, +nfp_net_meta_set_ipsec(struct nfp_net_meta_raw *meta_data, struct nfp_net_txq *txq, struct rte_mbuf *pkt, uint8_t layer, diff --git a/drivers/net/nfp/nfp_net_meta.h b/drivers/net/nfp/nfp_net_meta.h index 46caa777da..1d26b089d5 100644 --- a/drivers/net/nfp/nfp_net_meta.h +++ b/drivers/net/nfp/nfp_net_meta.h @@ -90,16 +90,16 @@ struct nfp_net_meta_parsed { } vlan[NFP_NET_META_MAX_VLANS]; }; -void nfp_net_init_metadata_format(struct nfp_net_hw *hw); -void nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, +void nfp_net_meta_init_format(struct nfp_net_hw *hw); +void nfp_net_meta_parse(struct nfp_net_rx_desc *rxds, struct nfp_net_rxq *rxq, struct nfp_net_hw *hw, struct rte_mbuf *mb, struct nfp_net_meta_parsed *meta); -void nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, +void nfp_net_meta_set_vlan(struct nfp_net_meta_raw *meta_data, struct rte_mbuf *pkt, uint8_t layer); -void nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, +void nfp_net_meta_set_ipsec(struct nfp_net_meta_raw *meta_data, struct nfp_net_txq *txq, struct rte_mbuf *pkt, uint8_t layer, diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index e863c42039..716a6af34f 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -498,7 +498,7 @@ nfp_net_recv_pkts(void *rx_queue, mb->port = rxq->port_id; struct nfp_net_meta_parsed meta = {}; - nfp_net_parse_meta(rxds, rxq, hw, mb, &meta); + nfp_net_meta_parse(rxds, rxq, hw, mb, &meta); nfp_net_parse_ptype(rxq, rxds, mb); From patchwork Tue Mar 5 02:29:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 137958 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 28CF043B80; Tue, 5 Mar 2024 03:30:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EFEA410E8; Tue, 5 Mar 2024 03:29:56 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2132.outbound.protection.outlook.com [40.107.212.132]) by mails.dpdk.org (Postfix) with ESMTP id 1AF5740EE1 for ; Tue, 5 Mar 2024 03:29:55 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A8//e1Cor/P4IG3lXIVrcnysMjaIhiclQgZQpTF13XQEzAYQuY8cPydjr1UKY9Q2z+hvx54NjLpebQk0xsNSM1MTn2dMhuWWfpv9KBaeddb2bfl5bgvPkQNJesUbtQkXUTQ6JboCsGKl7Jkhyosjh2+Qb+Cp19Che3FJc+jJH/6qmJhdVdo0Xgl/JBUDFC4i3wzbfGDFfS57QxyytqHq4WUv9MECMOTRTBGNuKwqNmfCEJRYXdae39FbdkyRjXJaXjfjALeB9MjaNHjbRX3onwakzFlHDl6oKaM5tcMjbg8CZvT+lk14M50aj1tZbOxavUNyuz3CHmgRonn9gMHwww== 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=Zhs+EXiXL5KKr667LOIpymup/c2ewlCO1yQ++P/1Fj0=; b=R1u0B13tYPpXDq/aWheAOtrrYcbP2pmY1txOFqMoEdg1XZEqd5pokYgTQKVc80TrkrFCQzhVJ4hDQTEQxUlpCpPZ36ebyTPKDxkYBYOhRY2bftnfWldSCvYtgbC2/1lD/hkWFvXr5LCh9zmOIjO6/ok9uov2b491lx+5yYqmqDsnUmlPaLS/+sL3E/VgXe7WSfab+VVOkM/TqDnUAwgP+46NAYkZdflOJimg84J7uUX4J6YcfWLuIF0WnctNP1eV59dyt0n6SE4M30CyServoDY6NTrunMSGCKB2MkuPqvfoTw25BiSXzwjyRwb1YEK4HNccardfueDh8pMtYOR+mA== 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=Zhs+EXiXL5KKr667LOIpymup/c2ewlCO1yQ++P/1Fj0=; b=XbLgTesWMquySXnhevzDCFDGaGM0VMNLk3AzqKrtap7POCdLp9zTudTB+7SLHAXVLH1Rk+nU8uQzRvzBB5KzDfF6WfDMm+FqILX30qzWNe+w75LBiZgF58wOvRSRTRCj2KdjzaGYhTect2oyADqmQ97pH+xDToWoUP0N2E6Gv8Q= 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 DS7PR13MB4768.namprd13.prod.outlook.com (2603:10b6:5:3a6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 02:29:51 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7339.035; Tue, 5 Mar 2024 02:29:49 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , Chaoyong He Subject: [PATCH 4/5] net/nfp: use flag bits to control parsing meta data Date: Tue, 5 Mar 2024 10:29:22 +0800 Message-Id: <20240305022923.891544-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240305022923.891544-1-chaoyong.he@corigine.com> References: <20240305022923.891544-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY5PR04CA0028.namprd04.prod.outlook.com (2603:10b6:a03:1d0::38) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DS7PR13MB4768:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a64f537-329b-428d-1f16-08dc3cbc2166 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KestRzBuWvtHPV/3OmOM6ZVXKv2zpvtNncXVkDso51enr6y2Bgu6EuUdOI1fEwfqelwb5BhNFIgLWcSEvicLyU1KLIpGMnbgoN9hr2lGEFe5LxdmBqaKAzJjt501cTpQDTnPhGBtVkHQPOOlE7x9mEfasnyF3LakVAvzSbKnyunuClFhQqLUR3gXXbMWaLXxGZUp54J892s2dBDwVjPCOhUGzyd51Dk2EVrKR2dwqPzQLwAszLwsAfFUyWolKz6GOXjNYeTGkZQw/nSUfmNyFAaUobkMoBYW8itS5F5iBj0ClB8jM7VbOkzbaRmY+7ecEXq75h6R6a0DF4pE6yR4kam/QVj2sEYoBSaK8blzD48DkUZ/Yem4wH/A84WD3495otcGCnVc36HnU8WXFMj/nCb+d8dEh8GyYaCt+9MSqHLZxNk+kh13rYEQNF+Jm7k23RspTmOW2uuw0FNoL8VURRL4I6RRVkLN1E05jCIx/JS7axXniGeiq5UTzk+wcUC/nGUA6QPr8aGWlxWVt4xPLrw3PNjSfbVh+w2J6mvtyQp7kEpS4os19X18RYhdZHGzKq7ZQ1e6Zr6scpIeGgzcAanV4EYO792rP/9fUex/9b43AL5Zhts/3/cJeDYYlYS1ftj/XRRP+HZ8/8ThYabq8xfE/Eh8+5A1vHoqEb0de9LpumSTBsqCmgStGWmtS75q+u3G+U9NLjnp49vp3GMwpFWO6Po4CsjwyjVigP8ABnQ= 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:(13230031)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M0+XvwdUHS+oVd9rZjLIIcsJgrdI4Vumv3cG+JbEim6LjIuy1VVyHV2uAFZWlP1BSdCDRq9MPZuuB2yBYvbqIvJDKaH6QTEFAA6AC8T2NAdg6jUq+RbVGuFOod261JjSqZIcJHYceeptGnESGULzabkL6igBul0FpJJQNBUL9nnSboFhMSKHTQ5vMEQ4GD2yHSQnwqB0Z4BLYoIU4g6PkQLnQ31IpbWr65Y8pMvMBvS8FsLAwHdVd1or3UOGEXt3wPXXFuaKyKUroMfaBI9+xU/Cgxgi1psSN0KSwjwuVsI6/7eYBWAGweU2YLZWQmRZihT2sto1hMMk4fb1VWcQTop+fy5Yhzye1+nsQlmijbQm3SsenuFpi1OOu9tC3ZLG/itALHBcT97EGMRseauNufesqcXuAY5+Cd/zPniuzwCyibvakQbk/NRC40Jw/cKRu2UtYXpce5K8LlgBBz/+HJ2yhqcLVC9gcolZqVAcwEBttMyl7vYASOFET5Wz64ohfYrTbXpGoVXPR1qlUEy8kJHDrSUS72pvSbvV4aF96ZXJ32gm4Zh8DQOFCpFHj16mrTIJan27gqoK2/tDmTBRcXJP+aYjmQKx/iIF7ukavDQKCjZBXHgc+AfW7w35bcOhJjs3qKEsnCr6YTojx4PVHsECOgQxTouV8R6q/wwHhGItyoC2mWkQAzTnsfE2AtDG+3/mk5qsnNG7ES/Pobd2Uviw0kjHx6H4TMc/gvxWqX5MyN1cBbBo/kSI3pt9/UO4VkckKB0/8ecTN5CaX2cU8xncpSKeCvXzhyd3a9gkI1MVgIP6QPnybnun05ypqeLhlUTNsUQpArnHuiFV9ww0NlgMtE4Pl7QMq22NMb9qCAYPfLLdVHTNB0CCu35Gb/uaZCE/m+Ez8HKZymlZb8ikXGAYLjahkoimnvpxZKtHovt9v0bDQdT/LFzHj29qxX1ZZiIRn8M0v2HnwJc97KMPolRUtwhr8yH4xHD/AV88cKf9HhSyhkcDDePhPvfzbjW7Laj/+20D2Q6VP77x3GTWKleealoW5kwnCk/zFgh5yc3saZiJ9DtwS6srG37+N3Souhz9cQ6KDKhr6NtgsUieh06/95MkS0rzhhamLl8uDDWL7gYFhyBjALpTTkvKazUi/PU9rstIGtSy3cIX448Jz9fngHRFigh7x3Tw6+lztlNpBEocrSnfDoJhmyZlnn+zQE4BKqGbmN1+KkAHxPayw9RsbnL6YiFFXAJdcRoWoD4lUxU81qW91jgCgMln2TH1MRhG69vVrIYJxb7mtPrX3Lf7sqt9B1ptIWi8Gr7FqjaDTVftxuwEfRFJBXG1ZJoClLqfT5rgP87WghhPbhrcvw5pjlADXkB8QpJBQgyywp2bTuRJO24S0/mS5QxHHKwZoBoYnzVIC117SCzDsXZcbJ4HUUnPe/Nfx4jbO1xTPomcRQmIcaWOXpARFojG0pOHhjJFZ1vNXFu+w/4KCjlnJ3iElT/UDwzllsSuQT36Bh1kpoLY8Fzi1uIkaTW9UIRrrq0EYtWDkGoS8j/Rok6nkf/iahKgsb5cfICbb/RSZZ/Td1GYcIDa4GYsGWNonlCduMgHF66ySAlFvr2J1Z+NxQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a64f537-329b-428d-1f16-08dc3cbc2166 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 02:29:49.4254 (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: bV0KTwjESWyxkRijO4dM2tP3HGdIrH9Ci24A977WeGm5yNXsRl5nSfXOK4cSEikMC/XVCFbjD6jJ5yHwdFmhMertIhWuh1dipeZCsCNRMpc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR13MB4768 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: Long Wu Use flag bits to indicate whether meta data exists and determine whether it needs to be parsed. Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_net_meta.c | 22 ++++++++++++++++++---- drivers/net/nfp/nfp_net_meta.h | 1 - drivers/net/nfp/nfp_rxtx.c | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_net_meta.c b/drivers/net/nfp/nfp_net_meta.c index 2ec20aba7d..b39c55a868 100644 --- a/drivers/net/nfp/nfp_net_meta.c +++ b/drivers/net/nfp/nfp_net_meta.c @@ -27,13 +27,16 @@ nfp_net_meta_parse_chained(uint8_t *meta_base, meta_info = rte_be_to_cpu_32(meta_header); meta_offset = meta_base + 4; + meta->flags = 0; for (; meta_info != 0; meta_info >>= NFP_NET_META_FIELD_SIZE, meta_offset += 4) { switch (meta_info & NFP_NET_META_FIELD_MASK) { case NFP_NET_META_PORTID: + meta->flags |= (1 << NFP_NET_META_PORTID); meta->port_id = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); break; case NFP_NET_META_HASH: + meta->flags |= (1 << NFP_NET_META_HASH); /* Next field type is about the hash type */ meta_info >>= NFP_NET_META_FIELD_SIZE; /* Hash value is in the data field */ @@ -41,6 +44,7 @@ nfp_net_meta_parse_chained(uint8_t *meta_base, meta->hash_type = meta_info & NFP_NET_META_FIELD_MASK; break; case NFP_NET_META_VLAN: + meta->flags |= (1 << NFP_NET_META_VLAN); vlan_info = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); meta->vlan[meta->vlan_layer].offload = vlan_info >> NFP_NET_META_VLAN_OFFLOAD; @@ -50,8 +54,8 @@ nfp_net_meta_parse_chained(uint8_t *meta_base, meta->vlan_layer++; break; case NFP_NET_META_IPSEC: + meta->flags |= (1 << NFP_NET_META_IPSEC); meta->sa_idx = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); - meta->ipsec_type = meta_info & NFP_NET_META_FIELD_MASK; break; case NFP_NET_META_MARK: meta->flags |= (1 << NFP_NET_META_MARK); @@ -77,6 +81,7 @@ nfp_net_meta_parse_single(uint8_t *meta_base, rte_be32_t meta_header, struct nfp_net_meta_parsed *meta) { + meta->flags |= (1 << NFP_NET_META_HASH); meta->hash_type = rte_be_to_cpu_32(meta_header); meta->hash = rte_be_to_cpu_32(*(rte_be32_t *)(meta_base + 4)); } @@ -92,6 +97,9 @@ nfp_net_meta_parse_hash(const struct nfp_net_meta_parsed *meta, if ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) return; + if (((meta->flags >> NFP_NET_META_HASH) & 0x1) == 0) + return; + mbuf->hash.rss = meta->hash; mbuf->ol_flags |= RTE_MBUF_F_RX_RSS_HASH; } @@ -109,6 +117,9 @@ nfp_net_meta_parse_vlan(const struct nfp_net_meta_parsed *meta, if ((ctrl & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2)) == 0) return; + if (((meta->flags >> NFP_NET_META_VLAN) & 0x1) == 0) + return; + /* * The firmware support two ways to send the VLAN info (with priority) : * 1. Using the metadata when NFP_NET_CFG_CTRL_RXVLAN_V2 is set, @@ -156,6 +167,9 @@ nfp_net_meta_parse_qinq(const struct nfp_net_meta_parsed *meta, (hw->cap & NFP_NET_CFG_CTRL_RXQINQ) == 0) return; + if (((meta->flags >> NFP_NET_META_VLAN) & 0x1) == 0) + return; + if (meta->vlan_layer < NFP_NET_META_MAX_VLANS) return; @@ -184,12 +198,12 @@ nfp_net_meta_parse_ipsec(struct nfp_net_meta_parsed *meta, struct nfp_net_hw *hw; struct nfp_tx_ipsec_desc_msg *desc_md; + if (((meta->flags >> NFP_NET_META_IPSEC) & 0x1) == 0) + return; + hw = rxq->hw; sa_idx = meta->sa_idx; - if (meta->ipsec_type != NFP_NET_META_IPSEC) - return; - if (sa_idx >= NFP_NET_IPSEC_MAX_SA_CNT) { mbuf->ol_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED; } else { diff --git a/drivers/net/nfp/nfp_net_meta.h b/drivers/net/nfp/nfp_net_meta.h index 1d26b089d5..69d08cf3a7 100644 --- a/drivers/net/nfp/nfp_net_meta.h +++ b/drivers/net/nfp/nfp_net_meta.h @@ -77,7 +77,6 @@ struct nfp_net_meta_parsed { uint32_t mark_id; /**< Mark id value */ uint16_t flags; /**< Bitmap to indicate if meta exist */ uint8_t hash_type; /**< RSS hash type */ - uint8_t ipsec_type; /**< IPsec type */ uint8_t vlan_layer; /**< The valid number of value in @vlan[] */ /** * Holds information parses from NFP_NET_META_VLAN. diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 716a6af34f..65ae19212d 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -497,7 +497,7 @@ nfp_net_recv_pkts(void *rx_queue, mb->next = NULL; mb->port = rxq->port_id; - struct nfp_net_meta_parsed meta = {}; + struct nfp_net_meta_parsed meta; nfp_net_meta_parse(rxds, rxq, hw, mb, &meta); nfp_net_parse_ptype(rxq, rxds, mb); From patchwork Tue Mar 5 02:29:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 137959 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 E056643B80; Tue, 5 Mar 2024 03:30:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 141C6410E7; Tue, 5 Mar 2024 03:29:57 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2132.outbound.protection.outlook.com [40.107.212.132]) by mails.dpdk.org (Postfix) with ESMTP id 5AA15410E8 for ; Tue, 5 Mar 2024 03:29:55 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hXNcEs8I8GcVatzAaaCJhHVvlw/JMggr9oCmgF+/XyPHqeUXLL7/1eu3kdNo3F9rh9qnISFRst8yJ35QNtOcND56dHB8LnV3PMNA/ubiOB4a7GK7JsrRk7xv4BePdY99TIubHrYB0NHNaJNSYqpRS+ClM7RjJbmxQ1Sitct/uD7+C2JLm+NYrqfaXbbdBTF5upOsKICWMP9TWLr3yJuoUTz5IzmGCfquf6p9dU2HqCLJBshMccafGI4eWw9FKHIfEthI9Zb1arNSIYIGII3huc5rJCQGandchr0Of9RO4n9qTUS3+IamqZ8GMktyMSGxS7csnFUM9yLX1JKiYFOdgQ== 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=ND9/gJ4ecdeLd2q0AeUvLFJCkG98Vt0QyJqYU3Wjrm4=; b=MamOXv1fXpbtI+UvdJGftGgXIzFcKOudxuYAn1c7KufrHH8jcnwgre8yKpA/p6v7v+qsW0UKcbpEfgY/nHn/3M6wMySCPbUdythPF41sPFA1BqQY0rF2hkllOXAlyjBqZQ1HBuZUg5td4dshjkkltvCO4Yp9LFhJT40cNBfAQyGNZv7tu61WfdNAWxPGgl59n+hkCjOyQol1sm6gk1M6RRXPLZYj3q8s4fSYp9R7GK3dKUhLfZ0bIWWwLhaOhNVN96q1TkEsD0G1DsZwox9smzLBBi941qHxl4Ob/AOp97506JMpiPcHWtKYg93BSTbPXCmLcubNeCU5WMhb9kL1xg== 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=ND9/gJ4ecdeLd2q0AeUvLFJCkG98Vt0QyJqYU3Wjrm4=; b=cJl+PKbwfFxKCL8UTczlhm1/2MadV2E/d0hk83KPE/PhuvkMOsXtphkhlfeLT/Rpik/nKkZ1yPJ4dyi2+BIASWYFZJwwdaz9bJEqDE1bIOM0cPrFLWPKbskMsC9Bx/dYSpHClaEiektuz4EAzrenU1oPVQjaMpL9gIlQ9ved4IA= 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 DS7PR13MB4768.namprd13.prod.outlook.com (2603:10b6:5:3a6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 02:29:52 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7339.035; Tue, 5 Mar 2024 02:29:52 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , Chaoyong He Subject: [PATCH 5/5] net/nfp: use big-endian meta data for packet Date: Tue, 5 Mar 2024 10:29:23 +0800 Message-Id: <20240305022923.891544-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240305022923.891544-1-chaoyong.he@corigine.com> References: <20240305022923.891544-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY5PR04CA0028.namprd04.prod.outlook.com (2603:10b6:a03:1d0::38) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DS7PR13MB4768:EE_ X-MS-Office365-Filtering-Correlation-Id: 7b0ce773-ca41-4c79-7779-08dc3cbc2260 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jVSUUBNySLCrqZh34p8oo10xPGR+WxCo/cl2kta66QFn1FqXsGrL35mqhO8T8Ys7tmpUTGNjBZTzeXt2+Qfdx4yGpeEEKan/Cg1Bm/PSdteaEg+tYpglvAeXVmbqKWzdFz/JOAmVufgj99Nwb08B+T5y/pHtsNlb4cQJwsJ/xsJ07CnD/jR01Vq7TfBrYraDaeI+CGPb1QrKlPf9Q96YixNZSIlK3UyI8daY3THQ6LQipQHzMyydGTAQcjgP7j+le9h4LaQ8/k3dn189zsK7rI7S7HfrXJft5HJVguCaIqWLKgywSRrNeX/Es/IyeJHeY7/tacHItJSSKTLV2OZ9zcIuMifKytd510UcIBRQ5kBWeiT2BcsFhmnI/D0wDsMTmjAOG4FbyBBeYthwvy+nfhMhA+Sq7Sit7pUxpN4asoXqifeZq4+jIt8gR6K1WX/BKfOIExjZIGrzuXDBJU9UmsOu/6wy6Ha7hOJ9QlCLx0NsCEKwnPsYW6lnQoDxuowCjIdLggAbOS5JDulFf54pm36p6hrHqLJKu9yHkY+sEWRgvl8HGJWvmvxd3iYZq0zglg/u1s0WFHRhpSGlGQN0UHQCF0AH7qmIRnCLe1s7u09avoBUfvOkfxLIVyySlNZxgzRTxh6xkZ+kOS12aeJjUDyUIoMWOGVZGkJjThENULaS21s84EIneCOR4Yt2atzndsVeSXkm5SD4HA/Yp7w22OrZCMVRBbvqysfTUhLMfcg= 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:(13230031)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XA1BwcO1J91AaaZbMZNrfSwLyvW9DT8AiB/0B771mt2NATBKKWF7PEjQzGqO0prZN6997trE62vr8Ym5oNSRZJcq6lE1NFjpEuP3jptR/5wQPQZPEH2jalE/mzbFP19ippqNRKNMllo3QZ4DDgtZpjQTxHgtXjRneWaBN/lXI5HnCs2xcTfpFPXBVJrf7YqDGmag6AMNtaHAEGMH9WV1lTEACHvvoMmV5/VuTiRbzy3GujrOYl03HuMxbuzgr/tzcp0wSNVW0ux/wW67ESwToMEjRmV+ap3V5Kq6aR729fGVZSTOq0ZMSHH0pui+GVHlu0Li3rHKpKDcWfCOCEhUd8H1uXILrJKoRh3gDmJBRqKSmgUaYynnM1InBvzJUm7OQ//bgGqSi+CvcCahNo04zn2/EuxZSx2pfwTmirkdps1hkEaYajX9K4aiXmLyCfqUHRl5HkpsxOoqAiXMcgOxAgZQDI1n2q+olLkgeeoMu0zaJfRvXq8Up07MEUGtEg6TKE4JHxInGYQ1ZYfmGAT6IcBp0mOdwVwezncgru7TynmQ60zOxCBcSYQ/WV112cF109XKpE+V6fRsJTYxJO+BPQXHhq7yPcSOt1O0HeyMdgAE526sH5kz6BJr8qi4GCJIE/gYS73HbKg+xdhG0wGw2EbNj+orGSF1BvNP6QEIlrgPg7ipACNeMjmxw6RDTBwaklweOerGp8v80zyVWHz3RpK++F1/jXBxnUcq/tOoHyaOHs4QBq9NJmqjkD+IOIVkuaDiLBB1k8MhbyuzHHSIshrZ2xZRb2KkGwUuVjjdFUBTFBAQ2QX0/BiBew/49vj+ki9MIEyIpIYsnAS9zl3U/4RWhgbsUOVXAlkTpLEi4ZpkqQ1rb5nfpMJ01QAELMTW9X6yP77zmOnTB5uqVOAV31mHq+rpCq0L04k9MW90Teb/z3bj3oNIYGQaSqJPXBk38UjRgVugIlhlrwDckv7YD+5nqvSoPNGq5SyXXFL/WeoBbb/tmCIg5+geMPR5dzWpSN79Dh2E8oAl657feR2oNnikzeyKxR3pinZL0Wmt635SFD8SIWuMIJT17w4KD7zNAi/m7GWBx1Z2A0v6OJooIZWHjL/6aVkCK2HGFzQMvaeV8yfMENBwm6YyOv0OGN5HaQ60KJfVCLyEy65Eb9wAc8HjLireCfptr94OIFQ7N4XxMP5CfoFuO/b/hwfRbGSq3niee3ctiUSqSnwJP/rGWnbfaxkliOMzwdaGYIpnItyQueJL8MaQaqCa41sie6NYbSxRywhB1fDCGempI23AOKAQOzln5aJUmarU9Asd1PiCHSoqPtGs5G2DOsoiE6EepXF68RBUvdaBZ5Smu2EnfPCLl49sa174Xy6gMSqA56Dbm5A+fwBGetQ3wLAV7WLgYf9YnWe/3P2JGENShkNgjDWUNkjsJ3H0w6QyKwjJR7qdZlglS8tNHgoYmUV37Hw6P/ERHKvATv4CPVPM6dtSM3Axr7vWqb9q9KU6KKkhEh2MwlQMgaF4Xys9i5fyfGkvJ7ep/VXe1OzVTfHfx1QCjkV0bkSGXexRNkY6XKnU9yjyPb706IyA29xk4Jg+vEICqQahQq5j3t/cqsqpf7WeyA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b0ce773-ca41-4c79-7779-08dc3cbc2260 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 02:29:51.1044 (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: AJjFDqhBN07IwZ/M8b/j6o8oTSS06JT+q5bHhxeml6t+HkFh7Tp3MIp1NiBqxmL5/w3pnxTQMYMC6POvJV0DRNszOWGVBbhLsCc/zgLf3WU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR13MB4768 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: Long Wu Make sure all kinds of meta data are CPU-endian in process logic and transform them to big-endian when prepend into packet. Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 5 ++--- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 5 ++--- drivers/net/nfp/nfp_net_meta.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index 7e281ae498..253872f4a1 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -181,9 +181,8 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, return 0; meta_info = meta_data->header; - meta_data->header = rte_cpu_to_be_32(meta_data->header); meta = rte_pktmbuf_prepend(pkt, meta_data->length); - memcpy(meta, &meta_data->header, sizeof(meta_data->header)); + *(rte_be32_t *)meta = rte_cpu_to_be_32(meta_data->header); meta += NFP_NET_META_HEADER_SIZE; for (; meta_info != 0; meta_info >>= NFP_NET_META_FIELD_SIZE, layer++, @@ -211,7 +210,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, return -ENOTSUP; } - memcpy(meta, &meta_data->data[layer], sizeof(meta_data->data[layer])); + *(rte_be32_t *)meta = rte_cpu_to_be_32(meta_data->data[layer]); } return 0; diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index b8592b1767..1911736e2b 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -215,9 +215,8 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, meta_type = meta_data.header; header_offset = meta_type << NFP_NET_META_NFDK_LENGTH; meta_data.header = header_offset | meta_data.length; - meta_data.header = rte_cpu_to_be_32(meta_data.header); meta = rte_pktmbuf_prepend(pkt, meta_data.length); - memcpy(meta, &meta_data.header, sizeof(meta_data.header)); + *(rte_be32_t *)meta = rte_cpu_to_be_32(meta_data.header); meta += NFP_NET_META_HEADER_SIZE; for (; meta_type != 0; meta_type >>= NFP_NET_META_FIELD_SIZE, layer++, @@ -245,7 +244,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, return -ENOTSUP; } - memcpy(meta, &meta_data.data[layer], sizeof(meta_data.data[layer])); + *(rte_be32_t *)meta = rte_cpu_to_be_32(meta_data.data[layer]); } *metadata = NFDK_DESC_TX_CHAIN_META; diff --git a/drivers/net/nfp/nfp_net_meta.c b/drivers/net/nfp/nfp_net_meta.c index b39c55a868..fa7e0d3d00 100644 --- a/drivers/net/nfp/nfp_net_meta.c +++ b/drivers/net/nfp/nfp_net_meta.c @@ -300,7 +300,7 @@ nfp_net_meta_set_vlan(struct nfp_net_meta_raw *meta_data, tpid = RTE_ETHER_TYPE_VLAN; vlan_tci = pkt->vlan_tci; - meta_data->data[layer] = rte_cpu_to_be_32(tpid << 16 | vlan_tci); + meta_data->data[layer] = tpid << 16 | vlan_tci; } void