From: Stanislaw Kardach <kda@semihalf.com>
To: dev@dpdk.org
Cc: Stanislaw Kardach <kda@semihalf.com>,
Frank Zhao <Frank.Zhao@starfivetech.com>,
Sam Grove <sam.grove@sifive.com>,
mw@semihalf.com, upstream@semihalf.com, pbhagavatula@marvell.com
Subject: [PATCH v2 1/1] examples/l3fwd: fix scalar LPM compilation
Date: Wed, 11 May 2022 16:56:50 +0200 [thread overview]
Message-ID: <20220511145650.742535-1-kda@semihalf.com> (raw)
In-Reply-To: <20220510115844.458009-1-kda@semihalf.com>
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 it should
utilize rfc1812_process() and return the port/BAD_PORT.
Fixes: 99fc91d18082 ("examples/l3fwd: add event lpm main loop")
Cc: pbhagavatula@marvell.com
Signed-off-by: Stanislaw Kardach <kda@semihalf.com>
---
v2: Replace existing logic with rfc1812_process().
---
examples/l3fwd/l3fwd_lpm.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index bec22c44cd..7a1e60f6b3 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -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;
}
--
2.30.2
next prev parent reply other threads:[~2022-05-11 14:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 11:58 [PATCH " Stanislaw Kardach
2022-05-11 11:38 ` David Marchand
2022-05-11 14:18 ` Stanisław Kardach
2022-05-11 14:56 ` Stanislaw Kardach [this message]
2022-05-19 14:53 ` [PATCH v2 " David Marchand
2022-05-23 13:29 ` David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220511145650.742535-1-kda@semihalf.com \
--to=kda@semihalf.com \
--cc=Frank.Zhao@starfivetech.com \
--cc=dev@dpdk.org \
--cc=mw@semihalf.com \
--cc=pbhagavatula@marvell.com \
--cc=sam.grove@sifive.com \
--cc=upstream@semihalf.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).