From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7CBBCA2E1B for ; Thu, 5 Sep 2019 12:18:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 743881EF82; Thu, 5 Sep 2019 12:18:45 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 639D21EF82 for ; Thu, 5 Sep 2019 12:18:44 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D4677308A98C; Thu, 5 Sep 2019 10:18:43 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF34A19C6A; Thu, 5 Sep 2019 10:18:40 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Bernard Iremonger , dpdk stable Date: Thu, 5 Sep 2019 11:17:18 +0100 Message-Id: <20190905101754.21933-18-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 05 Sep 2019 10:18:43 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: fix eth packet dump for small buffers' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/12/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/87a3fc75855fc2b5e296bd8c75d78b5b22828f85 Thanks. Kevin Traynor --- >From 87a3fc75855fc2b5e296bd8c75d78b5b22828f85 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 24 Jul 2019 12:58:56 +0200 Subject: [PATCH] app/testpmd: fix eth packet dump for small buffers [ upstream commit 3e6b0d5f69da2130e60b535e57fd065746b932a8 ] In the rather unlikely case where the first segment is too small to contain an ethernet header, we can't go and directly dereference the mbuf data buffer. Using rte_pktmbuf_read is a little more expensive but this is still acceptable for a debugging feature. Fixes: af75078fece3 ("first public release") Signed-off-by: David Marchand Acked-by: Bernard Iremonger --- app/test-pmd/util.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index 687bfa496..042dc6fb9 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -15,5 +15,5 @@ static inline void -print_ether_addr(const char *what, struct ether_addr *eth_addr) +print_ether_addr(const char *what, const struct ether_addr *eth_addr) { char buf[ETHER_ADDR_FMT_SIZE]; @@ -27,5 +27,6 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], { struct rte_mbuf *mb; - struct ether_hdr *eth_hdr; + const struct ether_hdr *eth_hdr; + struct ether_hdr _eth_hdr; uint16_t eth_type; uint64_t ol_flags; @@ -46,5 +47,5 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], for (i = 0; i < nb_pkts; i++) { mb = pkts[i]; - eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *); + eth_hdr = rte_pktmbuf_read(mb, 0, sizeof(_eth_hdr), &_eth_hdr); eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type); ol_flags = mb->ol_flags; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:48.606036384 +0100 +++ 0018-app-testpmd-fix-eth-packet-dump-for-small-buffers.patch 2019-09-05 10:36:47.495700881 +0100 @@ -1 +1 @@ -From 3e6b0d5f69da2130e60b535e57fd065746b932a8 Mon Sep 17 00:00:00 2001 +From 87a3fc75855fc2b5e296bd8c75d78b5b22828f85 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3e6b0d5f69da2130e60b535e57fd065746b932a8 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index a1164b705..18dfdca08 100644 +index 687bfa496..042dc6fb9 100644 @@ -29,2 +30,2 @@ --print_ether_addr(const char *what, struct rte_ether_addr *eth_addr) -+print_ether_addr(const char *what, const struct rte_ether_addr *eth_addr) +-print_ether_addr(const char *what, struct ether_addr *eth_addr) ++print_ether_addr(const char *what, const struct ether_addr *eth_addr) @@ -32 +33 @@ - char buf[RTE_ETHER_ADDR_FMT_SIZE]; + char buf[ETHER_ADDR_FMT_SIZE]; @@ -36,3 +37,3 @@ -- struct rte_ether_hdr *eth_hdr; -+ const struct rte_ether_hdr *eth_hdr; -+ struct rte_ether_hdr _eth_hdr; +- struct ether_hdr *eth_hdr; ++ const struct ether_hdr *eth_hdr; ++ struct ether_hdr _eth_hdr; @@ -41 +42 @@ -@@ -47,5 +48,5 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], +@@ -46,5 +47,5 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], @@ -44 +45 @@ -- eth_hdr = rte_pktmbuf_mtod(mb, struct rte_ether_hdr *); +- eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);