[dpdk-stable] patch 'examples/bpf: fix build' 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/60954fdd1099995a1150ce8ef4bc3bf2a2d976b1

Thanks.

Kevin Traynor

---
From 60954fdd1099995a1150ce8ef4bc3bf2a2d976b1 Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: Tue, 30 Jul 2019 11:19:27 +0100
Subject: [PATCH] examples/bpf: fix build

[ upstream commit 9a710863decb1cdb98efbdd5e11df3ebcfcc37b6 ]

Example BPF programs t2.c, t3.c in folder examples/bpf are
failing to compile with latest dpdk.org master.
The reason is changes in some core DPDK header files, that causes
now inclusion of x86 specific headers.
To overcome the issue, minimize inclusion of DPDK header files
into BPF source code.

Bugzilla ID: 321

Fixes: 9dfc06c26a8b ("test/bpf: add samples")

Reported-by: Michel Machado <michel@digirati.com.br>
Suggested-by: Michel Machado <michel@digirati.com.br>
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 test/bpf/mbuf.h | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/test/bpf/mbuf.h b/test/bpf/mbuf.h
index f24f908d7..3059e7963 100644
--- a/test/bpf/mbuf.h
+++ b/test/bpf/mbuf.h
@@ -14,5 +14,4 @@
 #include <stdint.h>
 #include <rte_common.h>
-#include <rte_memory.h>
 
 #ifdef __cplusplus
@@ -365,4 +364,21 @@ typedef struct {
 } rte_atomic16_t;
 
+#define RTE_CACHE_LINE_MIN_SIZE 64      /**< Minimum Cache line size. */
+
+/**
+ * Force minimum cache line alignment.
+ */
+#define __rte_cache_min_aligned __rte_aligned(RTE_CACHE_LINE_MIN_SIZE)
+
+/**
+ * IO virtual address type.
+ * When the physical addressing mode (IOVA as PA) is in use,
+ * the translation from an IO virtual address (IOVA) to a physical address
+ * is a direct mapping, i.e. the same value.
+ * Otherwise, in virtual mode (IOVA as VA), an IOMMU may do the translation.
+ */
+typedef uint64_t rte_iova_t;
+#define RTE_BAD_IOVA ((rte_iova_t)-1)
+
 /**
  * The generic rte_mbuf, containing a packet mbuf.
@@ -378,5 +394,9 @@ struct rte_mbuf {
 	 * working on vector drivers easier.
 	 */
-	phys_addr_t buf_physaddr __rte_aligned(sizeof(phys_addr_t));
+	RTE_STD_C11
+	union {
+		rte_iova_t buf_iova;
+		rte_iova_t buf_physaddr; /**< deprecated */
+	} __rte_aligned(sizeof(rte_iova_t));
 
 	/* next 8 bytes are initialised on RX descriptor rearm */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-09-05 10:36:50.053726472 +0100
+++ 0042-examples-bpf-fix-build.patch	2019-09-05 10:36:47.546699660 +0100
@@ -1 +1 @@
-From 9a710863decb1cdb98efbdd5e11df3ebcfcc37b6 Mon Sep 17 00:00:00 2001
+From 60954fdd1099995a1150ce8ef4bc3bf2a2d976b1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9a710863decb1cdb98efbdd5e11df3ebcfcc37b6 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
- examples/bpf/mbuf.h | 24 ++++++++++++++++++++++--
+ test/bpf/mbuf.h | 24 ++++++++++++++++++++++--
@@ -25,4 +26,4 @@
-diff --git a/examples/bpf/mbuf.h b/examples/bpf/mbuf.h
-index b623d8694..e41c3d26e 100644
---- a/examples/bpf/mbuf.h
-+++ b/examples/bpf/mbuf.h
+diff --git a/test/bpf/mbuf.h b/test/bpf/mbuf.h
+index f24f908d7..3059e7963 100644
+--- a/test/bpf/mbuf.h
++++ b/test/bpf/mbuf.h