From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AA5A2A0556 for ; Thu, 9 Jun 2022 13:37:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80A0B40220; Thu, 9 Jun 2022 13:37:17 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id A888640220 for ; Thu, 9 Jun 2022 13:37:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MSttPz+hkIllX2Ga5okfPSB6w+fegtNZ9cYjOg4KL7w=; b=NfAL7pBx1G96oM9Me2QOwgxDDAXJGj8P1uUbLNXRYHq11lPey9VuvS/xtC034G7XuB+5Eg AYRleLfKymXvToOMAhx3KPaSuItJ+Np6HVmAFIxY/d5ZdBdlFSottZsQ/zSX74rAXxYAdL L+V/VkXeIAgtNUTqR78P8RPdKmR5p5A= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-215-JXYYy2y_NgCUXt5HLPlyhg-1; Thu, 09 Jun 2022 07:37:11 -0400 X-MC-Unique: JXYYy2y_NgCUXt5HLPlyhg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8F9B7801756; Thu, 9 Jun 2022 11:37:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0D7C18EA3; Thu, 9 Jun 2022 11:37:10 +0000 (UTC) From: Kevin Traynor To: Stanislaw Kardach Cc: David Marchand , dpdk stable Subject: patch 'examples/l3fwd: fix scalar LPM' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:35:48 +0100 Message-Id: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/8ce6cfe851152ad08d15dbce591ba5241e138608 Thanks. Kevin --- >From 8ce6cfe851152ad08d15dbce591ba5241e138608 Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Wed, 11 May 2022 16:56:50 +0200 Subject: [PATCH] examples/l3fwd: fix scalar LPM [ upstream commit a137eb2b2512c202eb01ba96bb592a24cffc72c8 ] 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 exercised/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") Signed-off-by: Stanislaw Kardach Reviewed-by: David Marchand --- examples/l3fwd/l3fwd_lpm.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index a5b476ced3..5f5c22705c 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -29,4 +29,5 @@ #include "l3fwd.h" +#include "l3fwd_common.h" #include "l3fwd_event.h" @@ -238,22 +239,5 @@ 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]; @@ -262,4 +246,8 @@ lpm_process_event_pkt(const struct lcore_conf *lconf, struct rte_mbuf *mbuf) 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.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:29.832557114 +0100 +++ 0001-examples-l3fwd-fix-scalar-LPM.patch 2022-06-09 12:34:29.605980402 +0100 @@ -1 +1 @@ -From a137eb2b2512c202eb01ba96bb592a24cffc72c8 Mon Sep 17 00:00:00 2001 +From 8ce6cfe851152ad08d15dbce591ba5241e138608 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a137eb2b2512c202eb01ba96bb592a24cffc72c8 ] + @@ -24 +26 @@ -index 501fc5db5e..d1b850dd5b 100644 +index a5b476ced3..5f5c22705c 100644