[dpdk-stable] patch 'eal/linux: fix build error on RHEL 7.6' has been queued to LTS release 18.11.7

Kevin Traynor ktraynor at redhat.com
Fri Feb 7 16:12:14 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. 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/5519591f1f7fa31c5d4644865ac3675f79f99eb3

Thanks.

Kevin.

---
>From 5519591f1f7fa31c5d4644865ac3675f79f99eb3 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Wed, 4 Dec 2019 14:16:22 +0100
Subject: [PATCH] eal/linux: fix build error on RHEL 7.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit aef1d0733179afb56916e95058a4f1398b81af04 ]

Previous fix gives hiccups to gcc on RHEL 7.6:

== Build lib/librte_eal/linux/eal
  CC eal_interrupts.o
...lib/librte_eal/linux/eal/eal_interrupts.c: In function
  ‘eal_intr_thread_main’:
...lib/librte_eal/linux/eal/eal_interrupts.c:1048:9: error: missing
  initializer for field ‘events’ of ‘struct epoll_event’
  [-Werror=missing-field-initializers]
  struct epoll_event ev = { };
         ^
In file included from ...lib/librte_eal/linux/eal/eal_interrupts.c:15:0:
/usr/include/sys/epoll.h:89:12: note: ‘events’ declared here
   uint32_t events; /* Epoll events */
            ^
...lib/librte_eal/linux/eal/eal_interrupts.c: At top level:
cc1: error: unrecognized command line option
  "-Wno-address-of-packed-member" [-Werror]
cc1: all warnings being treated as errors

Fixes: e0ab8020ac2a ("eal/linux: fix uninitialized data valgrind warning")

Reported-by: Andrew Rybchenko <arybchenko at solarflare.com>
Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_eal/linuxapp/eal/eal_interrupts.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
index c2517a9a0a..0ba3e93f4c 100644
--- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
@@ -965,6 +965,4 @@ static __attribute__((noreturn)) void *
 eal_intr_thread_main(__rte_unused void *arg)
 {
-	struct epoll_event ev = { };
-
 	/* host thread, never break out */
 	for (;;) {
@@ -998,6 +996,9 @@ eal_intr_thread_main(__rte_unused void *arg)
 
 		TAILQ_FOREACH(src, &intr_sources, next) {
+			struct epoll_event ev;
+
 			if (src->callbacks.tqh_first == NULL)
 				continue; /* skip those with no callbacks */
+			memset(&ev, 0, sizeof(ev));
 			ev.events = EPOLLIN | EPOLLPRI | EPOLLRDHUP | EPOLLHUP;
 			ev.data.fd = src->intr_handle.fd;
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-07 15:08:17.665511439 +0000
+++ 0002-eal-linux-fix-build-error-on-RHEL-7.6.patch	2020-02-07 15:08:17.490063268 +0000
@@ -1 +1 @@
-From aef1d0733179afb56916e95058a4f1398b81af04 Mon Sep 17 00:00:00 2001
+From 5519591f1f7fa31c5d4644865ac3675f79f99eb3 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit aef1d0733179afb56916e95058a4f1398b81af04 ]
+
@@ -30 +31,0 @@
-Cc: stable at dpdk.org
@@ -35 +36 @@
- lib/librte_eal/linux/eal/eal_interrupts.c | 5 +++--
+ lib/librte_eal/linuxapp/eal/eal_interrupts.c | 5 +++--
@@ -38,5 +39,5 @@
-diff --git a/lib/librte_eal/linux/eal/eal_interrupts.c b/lib/librte_eal/linux/eal/eal_interrupts.c
-index 2cd537ba44..14ebb108ce 100644
---- a/lib/librte_eal/linux/eal/eal_interrupts.c
-+++ b/lib/librte_eal/linux/eal/eal_interrupts.c
-@@ -1046,6 +1046,4 @@ static __attribute__((noreturn)) void *
+diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+index c2517a9a0a..0ba3e93f4c 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c
++++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+@@ -965,6 +965,4 @@ static __attribute__((noreturn)) void *
@@ -49 +50 @@
-@@ -1079,6 +1077,9 @@ eal_intr_thread_main(__rte_unused void *arg)
+@@ -998,6 +996,9 @@ eal_intr_thread_main(__rte_unused void *arg)



More information about the stable mailing list