diff mbox series

[5/5] net/nfp: use big-endian meta data for packet

Message ID 20240305022923.891544-6-chaoyong.he@corigine.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series add new meta data module |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/github-robot: build success github build: passed
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-unit-amd64-testing success Testing PASS
ci/iol-abi-testing success Testing PASS
ci/intel-Functional success Functional PASS
ci/iol-compile-amd64-testing success Testing PASS
ci/iol-unit-arm64-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-sample-apps-testing success Testing PASS

Commit Message

Chaoyong He March 5, 2024, 2:29 a.m. UTC 
  From: Long Wu <long.wu@corigine.com>

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 <long.wu@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
---
 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 mbox series

Patch

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