This patch implements the detailed packet parsing using
the annotation info from the hardware.
decode parser to set RX muf packet type by dpaa_slow_parsing.
Support to identify the IPSec ESP, GRE and SCTP packets.
Signed-off-by: Jun Yang <jun.y...@nxp.com>
Signed-off-by: Hemant Agrawal <hemant.agra...@nxp.com>
---
drivers/net/dpaa/dpaa_ethdev.c | 1 +
drivers/net/dpaa/dpaa_rxtx.c | 35 +++++++-
drivers/net/dpaa/dpaa_rxtx.h | 143 ++++++++++++++-------------------
3 files changed, 93 insertions(+), 86 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 82d1960356..a302b24be6 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -411,6 +411,7 @@ dpaa_supported_ptypes_get(struct rte_eth_dev *dev, size_t
*no_of_elements)
RTE_PTYPE_L4_UDP,
RTE_PTYPE_L4_SCTP,
RTE_PTYPE_TUNNEL_ESP,
+ RTE_PTYPE_TUNNEL_GRE,
};
PMD_INIT_FUNC_TRACE();
diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index e3b4bb14ab..99fc3f1b43 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -110,11 +110,38 @@ static void dpaa_display_frame_info(const struct qm_fd
*fd,
#define dpaa_display_frame_info(a, b, c)
#endif
-static inline void dpaa_slow_parsing(struct rte_mbuf *m __rte_unused,
- uint64_t prs __rte_unused)
+static inline void
+dpaa_slow_parsing(struct rte_mbuf *m,
+ const struct annotations_t *annot)
{
+ const struct dpaa_eth_parse_results_t *parse;
+
DPAA_DP_LOG(DEBUG, "Slow parsing");
- /*TBD:XXX: to be implemented*/
+ parse = &annot->parse;
+
+ if (parse->ethernet)
+ m->packet_type |= RTE_PTYPE_L2_ETHER;
+ if (parse->vlan)
+ m->packet_type |= RTE_PTYPE_L2_ETHER_VLAN;
+ if (parse->first_ipv4)
+ m->packet_type |= RTE_PTYPE_L3_IPV4;
+ if (parse->first_ipv6)
+ m->packet_type |= RTE_PTYPE_L3_IPV6;
+ if (parse->gre)
+ m->packet_type |= RTE_PTYPE_TUNNEL_GRE;
+ if (parse->last_ipv4)
+ m->packet_type |= RTE_PTYPE_L3_IPV4_EXT;
+ if (parse->last_ipv6)
+ m->packet_type |= RTE_PTYPE_L3_IPV6_EXT;
+ if (parse->l4_type == DPAA_PR_L4_TCP_TYPE)
+ m->packet_type |= RTE_PTYPE_L4_TCP;
+ else if (parse->l4_type == DPAA_PR_L4_UDP_TYPE)
+ m->packet_type |= RTE_PTYPE_L4_UDP;
+ else if (parse->l4_type == DPAA_PR_L4_IPSEC_TYPE &&
+ !parse->l4_info_err && parse->esp_sum)
+ m->packet_type |= RTE_PTYPE_TUNNEL_ESP;
+ else if (parse->l4_type == DPAA_PR_L4_SCTP_TYPE)
+ m->packet_type |= RTE_PTYPE_L4_SCTP;
}
static inline void dpaa_eth_packet_info(struct rte_mbuf *m, void *fd_virt_addr)
@@ -228,7 +255,7 @@ static inline void dpaa_eth_packet_info(struct rte_mbuf *m,
void *fd_virt_addr)
break;
/* More switch cases can be added */
default:
- dpaa_slow_parsing(m, prs);
+ dpaa_slow_parsing(m, annot);
}
m->tx_offload = annot->parse.ip_off[0];
diff --git a/drivers/net/dpaa/dpaa_rxtx.h b/drivers/net/dpaa/dpaa_rxtx.h
index 1048e86d41..215bdeaf7f 100644
--- a/drivers/net/dpaa/dpaa_rxtx.h
+++ b/drivers/net/dpaa/dpaa_rxtx.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright 2016 Freescale Semiconductor, Inc. All rights reserved.
- * Copyright 2017,2020-2022 NXP
+ * Copyright 2017,2020-2024 NXP
*
*/
@@ -162,98 +162,77 @@
#define DPAA_PKT_L3_LEN_SHIFT 7
+enum dpaa_parse_result_l4_type {
+ DPAA_PR_L4_TCP_TYPE = 1,
+ DPAA_PR_L4_UDP_TYPE = 2,
+ DPAA_PR_L4_IPSEC_TYPE = 3,
+ DPAA_PR_L4_SCTP_TYPE = 4,
+ DPAA_PR_L4_DCCP_TYPE = 5
+};
+
/**
* FMan parse result array
*/
struct dpaa_eth_parse_results_t {
- uint8_t lpid; /**< Logical port id */
- uint8_t shimr; /**< Shim header result */
- union {
- uint16_t l2r; /**< Layer 2 result */
+ uint8_t lpid; /**< Logical port id */
+ uint8_t shimr; /**< Shim header result */
+ union {
+ uint16_t l2r; /**< Layer 2 result */
struct {
-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- uint16_t ethernet:1;
- uint16_t vlan:1;
- uint16_t llc_snap:1;
- uint16_t mpls:1;
- uint16_t ppoe_ppp:1;
- uint16_t unused_1:3;
- uint16_t unknown_eth_proto:1;
- uint16_t eth_frame_type:2;
- uint16_t l2r_err:5;
+ uint16_t unused_1:3;
+ uint16_t ppoe_ppp:1;
+ uint16_t mpls:1;
+ uint16_t llc_snap:1;
+ uint16_t vlan:1;
+ uint16_t ethernet:1;
+
+ uint16_t l2r_err:5;
+ uint16_t eth_frame_type:2;
/*00-unicast, 01-multicast, 11-broadcast*/
-#else
- uint16_t l2r_err:5;
- uint16_t eth_frame_type:2;
- uint16_t unknown_eth_proto:1;
- uint16_t unused_1:3;
- uint16_t ppoe_ppp:1;
- uint16_t mpls:1;
- uint16_t llc_snap:1;
- uint16_t vlan:1;
- uint16_t ethernet:1;
-#endif
+ uint16_t unknown_eth_proto:1;
} __rte_packed;
- } __rte_packed;
- union {
- uint16_t l3r; /**< Layer 3 result */
+ } __rte_packed;
+ union {
+ uint16_t l3r; /**< Layer 3 result */
struct {
-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- uint16_t first_ipv4:1;
- uint16_t first_ipv6:1;
- uint16_t gre:1;
- uint16_t min_enc:1;
- uint16_t last_ipv4:1;
- uint16_t last_ipv6:1;
- uint16_t first_info_err:1;/*0 info, 1 error*/
- uint16_t first_ip_err_code:5;
- uint16_t last_info_err:1; /*0 info, 1 error*/
- uint16_t last_ip_err_code:3;
-#else
- uint16_t last_ip_err_code:3;
- uint16_t last_info_err:1; /*0 info, 1 error*/
- uint16_t first_ip_err_code:5;
- uint16_t first_info_err:1;/*0 info, 1 error*/
- uint16_t last_ipv6:1;
- uint16_t last_ipv4:1;
- uint16_t min_enc:1;
- uint16_t gre:1;
- uint16_t first_ipv6:1;
- uint16_t first_ipv4:1;
-#endif
+ uint16_t unused_2:1;
+ uint16_t l3_err:1;
+ uint16_t last_ipv6:1;
+ uint16_t last_ipv4:1;
+ uint16_t min_enc:1;
+ uint16_t gre:1;
+ uint16_t first_ipv6:1;
+ uint16_t first_ipv4:1;
+
+ uint16_t unused_3:8;
} __rte_packed;
- } __rte_packed;
- union {
- uint8_t l4r; /**< Layer 4 result */
+ } __rte_packed;
+ union {
+ uint8_t l4r; /**< Layer 4 result */
struct{
-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- uint8_t l4_type:3;
- uint8_t l4_info_err:1;
- uint8_t l4_result:4;
- /* if type IPSec: 1 ESP, 2 AH */
-#else
- uint8_t l4_result:4;
- /* if type IPSec: 1 ESP, 2 AH */
- uint8_t l4_info_err:1;
- uint8_t l4_type:3;
-#endif
+ uint8_t l4cv:1;
+ uint8_t unused_4:1;
+ uint8_t ah:1;
+ uint8_t esp_sum:1;
+ uint8_t l4_info_err:1;
+ uint8_t l4_type:3;
} __rte_packed;
- } __rte_packed;
- uint8_t cplan; /**< Classification plan id */
- uint16_t nxthdr; /**< Next Header */
- uint16_t cksum; /**< Checksum */
- uint32_t lcv; /**< LCV */
- uint8_t shim_off[3]; /**< Shim offset */
- uint8_t eth_off; /**< ETH offset */
- uint8_t llc_snap_off; /**< LLC_SNAP offset */
- uint8_t vlan_off[2]; /**< VLAN offset */
- uint8_t etype_off; /**< ETYPE offset */
- uint8_t pppoe_off; /**< PPP offset */
- uint8_t mpls_off[2]; /**< MPLS offset */
- uint8_t ip_off[2]; /**< IP offset */
- uint8_t gre_off; /**< GRE offset */
- uint8_t l4_off; /**< Layer 4 offset */
- uint8_t nxthdr_off; /**< Parser end point */
+ } __rte_packed;
+ uint8_t cplan; /**< Classification plan id */
+ uint16_t nxthdr; /**< Next Header */
+ uint16_t cksum; /**< Checksum */
+ uint32_t lcv; /**< LCV */
+ uint8_t shim_off[3]; /**< Shim offset */
+ uint8_t eth_off; /**< ETH offset */
+ uint8_t llc_snap_off; /**< LLC_SNAP offset */
+ uint8_t vlan_off[2]; /**< VLAN offset */
+ uint8_t etype_off; /**< ETYPE offset */
+ uint8_t pppoe_off; /**< PPP offset */
+ uint8_t mpls_off[2]; /**< MPLS offset */
+ uint8_t ip_off[2]; /**< IP offset */
+ uint8_t gre_off; /**< GRE offset */
+ uint8_t l4_off; /**< Layer 4 offset */
+ uint8_t nxthdr_off; /**< Parser end point */
} __rte_packed;
/* The structure is the Prepended Data to the Frame which is used by FMAN */
--
2.25.1
