[dpdk-stable] patch 'app/testpmd: fix eth packet dump for small buffers' has been queued to LTS release 18.11.3

[Kevin Traynor <ktraynor@redhat.com>]

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 <david.marchand@redhat.com>
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 <david.marchand@redhat.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 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 *);