examples/l3fwd: fix scalar LPM compilation
PATCH 1/1 examples/l3fwd: fix scalar LPM compilation
The lpm_process_event_pkt() can either process a packet using an architecture specific (defined for X86/SSE, ARM/Neon and PPC64/Altivec) path or a scalar one. The choice is however done using an ifdef pre-processor macro. Because of that the scalar version was apparently not widely excersized/compiled.
Due to some copy/paste errors, the scalar logic in lpm_process_event_pkt() retained a "continue" statement where a BAD_PORT should be returned after refactoring of the LPM logic in the l3fwd example.
--- examples/l3fwd/l3fwd_lpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
examples/l3fwd/l3fwd_lpm.c +1 -1
@@ -248,7 +248,7 @@ lpm_process_event_pkt(const struct lcore_conf *lconf, struct rte_mbuf *mbuf)if (is_valid_ipv4_pkt (ipv4_hdr, mbuf->pkt_len) <0 ) { mbuf->port =BAD_PORT ; -continue ; +return mbuf->port; }/* Update time to live and header checksum */ --(ipv4_hdr->time_to_live);
Signature · 1 line
2.30.2
Hello Stanislaw,
Quoted 24 lines · Stanislaw Kardach
The
lpm_process_event_pkt()can either process a packet using an architecture specific (defined for X86/SSE, ARM/Neon and PPC64/Altivec) path or a scalar one. The choice is however done using an ifdef pre-processor macro. Because of that the scalar version was apparently not widely excersized/compiled.
Due to some copy/paste errors, the scalar logic inlpm_process_event_pkt()retained a "continue" statement where aBAD_PORTshould be returned after refactoring of the LPM logic in the l3fwd example.Fixes 99fc91d18082 ("examples/l3fwd: add event lpm main loop")Signed-off-by Stanislaw Kardach <[email protected]>--- examples/l3fwd/l3fwd_lpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)examples/l3fwd/l3fwd_lpm.c +0
-0
examples/l3fwd/l3fwd_lpm.c lpm_process_event_pkt(const struct lcore_conf *lconf, struct rte_mbuf *mbuf) · line 254
Quoted 8 lines
examples/l3fwd/l3fwd_lpm.c +1
-1@@ -248,7 +248,7 @@ lpm_process_event_pkt(const struct lcore_conf *lconf, struct rte_mbuf *mbuf)if (is_valid_ipv4_pkt (ipv4_hdr, mbuf->pkt_len) <0 ) { mbuf->port =BAD_PORT ; -continue ; +return mbuf->port; }/* Update time to live and header checksum */ --(ipv4_hdr->time_to_live);
Based on the vector specific implemtations of process_packet in this example, this code could be replaced with a call to rfc1812_process(). Eth macs updates can be moved prior to rfc1812_process.
What do you think of (untested):
examples/l3fwd/l3fwd_lpm.c +0 -0
@@ -234,33 +234,18 @@ lpm_process_event_pkt(const struct lcore_conf
*lconf, struct rte_mbuf *mbuf)
|| defined RTE_ARCH_PPC_64
process_packet(mbuf, &mbuf->port); #else
-
struct rte_ether_hdr *eth_hdr = rte_pktmbuf_mtod(mbuf,
struct rte_ether_hdr *);
-#ifdef DO_RFC_1812_CHECKS
- struct rte_ipv4_hdr *ipv4_hdr;
- if (RTE_ETH_IS_IPV4_HDR(mbuf->packet_type)) {
- /* Handle IPv4 headers.*/
- ipv4_hdr = rte_pktmbuf_mtod_offset(mbuf,
- struct rte_ipv4_hdr *,
- sizeof(struct rte_ether_hdr));
-
- if (is_valid_ipv4_pkt(ipv4_hdr, mbuf->pkt_len)
- < 0) {
- mbuf->port = BAD_PORT;
- continue;
- }
- /* Update time to live and header checksum */
- --(ipv4_hdr->time_to_live);
- ++(ipv4_hdr->hdr_checksum);
- }
-#endif
+
/* dst addr */
*(uint64_t *)ð_hdr->dst_addr = dest_eth_addr[mbuf->port];
/* src addr */
rte_ether_addr_copy(&ports_eth_addr[mbuf->port],
ð_hdr->src_addr);
+
+ rfc1812_process((struct rte_ipv4_hdr *)(eth_hdr + 1), &mbuf->port,
+ mbuf->packet_type);
#endif
return mbuf->port;}
On Wed, May 11, 2022 at 1:39 PM David Marchand
<[email protected]> wrote:
<snip>
Quoted 5 lines
Based on the vector specific implemtations of
process_packetin this example, this code could be replaced with a call torfc1812_process(). Eth macs updates can be moved prior torfc1812_process.What do you think of (untested):
That actually looks a lot better! Though it seems safer to use rte_pktmbuf_mtod_offset() for getting the ipv4_hdr. I'll post V2 with this update.
PATCH v2 1/1 examples/l3fwd: fix scalar LPM compilation
In reply to Stanislaw KardachThe lpm_process_event_pkt() can either process a packet using an architecture specific (defined for X86/SSE, ARM/Neon and PPC64/Altivec) path or a scalar one. The choice is however done using an ifdef pre-processor macro. Because of that the scalar version was apparently not widely excersized/compiled.
Due to some copy/paste errors, the scalar logic in lpm_process_event_pkt() retained a "continue" statement where it should utilize rfc1812_process() and return the port/BAD_PORT.
---
v2: Replace existing logic with rfc1812_process().
--- examples/l3fwd/l3fwd_lpm.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
examples/l3fwd/l3fwd_lpm.c +6 -18
@@ -28,6 +28,7 @@#include <rte_lpm6.h> #include "l3fwd.h" +#include "l3fwd_common.h" #include "l3fwd_event.h" #include "lpm_route_parse.c"
@@ -237,30 +238,17 @@ lpm_process_event_pkt(const struct lcore_conf *lconf, struct rte_mbuf *mbuf)struct rte_ether_hdr *eth_hdr =rte_pktmbuf_mtod (mbuf, struct rte_ether_hdr *); -#ifdef DO_RFC_1812_CHECKS -struct rte_ipv4_hdr *ipv4_hdr; -if (RTE_ETH_IS_IPV4_HDR (mbuf->packet_type)) { -/* Handle IPv4 headers.*/ - ipv4_hdr =rte_pktmbuf_mtod_offset (mbuf, - struct rte_ipv4_hdr *, -sizeof (struct rte_ether_hdr )); - -if (is_valid_ipv4_pkt (ipv4_hdr, mbuf->pkt_len) - <0 ) { - mbuf->port =BAD_PORT ; -continue ; - } -/* Update time to live and header checksum */ - --(ipv4_hdr->time_to_live); - ++(ipv4_hdr->hdr_checksum); - } -#endif +/* dst addr */ *(uint64_t *)ð_hdr->dst_addr = dest_eth_addr[mbuf->port];/* src addr */ rte_ether_addr_copy (&ports_eth_addr[mbuf->port], ð_hdr->src_addr); + + rfc1812_process(rte_pktmbuf_mtod_offset(mbuf, struct rte_ipv4_hdr *, + sizeof(struct rte_ether_hdr)), + &mbuf->port, mbuf->packet_type);#endif return mbuf->port; }
Signature · 1 line
2.30.2
Quoted 10 lines · Stanislaw Kardach
The
lpm_process_event_pkt()can either process a packet using an architecture specific (defined for X86/SSE, ARM/Neon and PPC64/Altivec) path or a scalar one. The choice is however done using an ifdef pre-processor macro. Because of that the scalar version was apparently not widely excersized/compiled.
Due to some copy/paste errors, the scalar logic inlpm_process_event_pkt()retained a "continue" statement where it should utilizerfc1812_process()and return the port/BAD_PORT.
Quoted 4 lines
Fixes 99fc91d18082 ("examples/l3fwd: add event lpm main loop")Signed-off-by Stanislaw Kardach <[email protected]>
Signature · 1 line
David Marchand
David Marchand
AppliedQuoted 11 lines · David Marchand
Quoted 10 lines · Stanislaw Kardach
The
lpm_process_event_pkt()can either process a packet using an architecture specific (defined for X86/SSE, ARM/Neon and PPC64/Altivec) path or a scalar one. The choice is however done using an ifdef pre-processor macro. Because of that the scalar version was apparently not widely excersized/compiled.
Due to some copy/paste errors, the scalar logic inlpm_process_event_pkt()retained a "continue" statement where it should utilizerfc1812_process()and return the port/BAD_PORT.
Quoted 1 line
Quoted 1 line
Fixes 99fc91d18082 ("examples/l3fwd: add event lpm main loop")
Quoted 3 lines
Quoted 2 lines
Signed-off-by Stanislaw Kardach <[email protected]>Reviewed-by David Marchand <[email protected]>
Applied, thanks.
Signature · 1 line
David Marchand