From: David Marchand <david.marchand@redhat.com>
To: Stanislaw Kardach <kda@semihalf.com>
Cc: dev <dev@dpdk.org>, Frank Zhao <Frank.Zhao@starfivetech.com>,
Sam Grove <sam.grove@sifive.com>,
Marcin Wojtas <mw@semihalf.com>,
upstream@semihalf.com, Pavan Nikhilesh <pbhagavatula@marvell.com>,
Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>,
Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>
Subject: Re: [PATCH 1/1] examples/l3fwd: fix scalar LPM compilation
Date: Wed, 11 May 2022 13:38:54 +0200 [thread overview]
Message-ID: <CAJFAV8xNBTw2f9L=rp=J8-ovxcO0bFBKRYQFLA3xEg+DXLZGsQ@mail.gmail.com> (raw)
In-Reply-To: <20220510115844.458009-1-kda@semihalf.com>
Hello Stanislaw,
On Tue, May 10, 2022 at 1:59 PM Stanislaw Kardach <kda@semihalf.com> wrote:
>
> 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.
>
> Fixes: 99fc91d18082 ("examples/l3fwd: add event lpm main loop")
> Cc: pbhagavatula@marvell.com
>
> Signed-off-by: Stanislaw Kardach <kda@semihalf.com>
> ---
> examples/l3fwd/l3fwd_lpm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
> index bec22c44cd..6e1defbf7f 100644
> --- a/examples/l3fwd/l3fwd_lpm.c
> +++ b/examples/l3fwd/l3fwd_lpm.c
> @@ -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):
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index bec22c44cd..c73cbda6b5 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -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;
}
next prev parent reply other threads:[~2022-05-11 11:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 11:58 Stanislaw Kardach
2022-05-11 11:38 ` David Marchand [this message]
2022-05-11 14:18 ` Stanisław Kardach
2022-05-11 14:56 ` [PATCH v2 " Stanislaw Kardach
2022-05-19 14:53 ` 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='CAJFAV8xNBTw2f9L=rp=J8-ovxcO0bFBKRYQFLA3xEg+DXLZGsQ@mail.gmail.com' \
--to=david.marchand@redhat.com \
--cc=Frank.Zhao@starfivetech.com \
--cc=Honnappa.Nagarahalli@arm.com \
--cc=dev@dpdk.org \
--cc=kda@semihalf.com \
--cc=konstantin.v.ananyev@yandex.ru \
--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).