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 D926FA0542 for ; Fri, 7 Feb 2020 16:13:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CF6321C02E; Fri, 7 Feb 2020 16:13:27 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 9FC881C02E for ; Fri, 7 Feb 2020 16:13:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088406; 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: in-reply-to:in-reply-to:references:references; bh=ofyilF8yCQJXFH//fKpKKlc750snsnSv9iLUqE9am/A=; b=UTMe3e2af3Bzqp0JpBD/V7FjepBbyAPI1NCglPXRNXieLqR8QNJafwLpYZdS99CjVZVAvh UAmXvqUXIBbrSznELFjmNMnQH2Dv4gjDh7l68FALh8rqIilJThrt6EreyakB+8dP5NDZ34 6xKE9tzM/6w041bFaB7+PpBJLvykGC4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-79-fggZsZdiOASNJ3IxnQapmg-1; Fri, 07 Feb 2020 10:13:13 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7299C802B80; Fri, 7 Feb 2020 15:13:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67F9710016DA; Fri, 7 Feb 2020 15:13:11 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Andrew Rybchenko , dpdk stable Date: Fri, 7 Feb 2020 15:12:14 +0000 Message-Id: <20200207151248.29804-2-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: fggZsZdiOASNJ3IxnQapmg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'eal/linux: fix build error on RHEL 7.6' has been queued to LTS release 18.11.7 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.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 rebasi= ng (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/5519591f1f7fa31c5d= 4644865ac3675f79f99eb3 Thanks. Kevin. --- >From 5519591f1f7fa31c5d4644865ac3675f79f99eb3 Mon Sep 17 00:00:00 2001 From: David Marchand 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=3DUTF-8 Content-Transfer-Encoding: 8bit [ upstream commit aef1d0733179afb56916e95058a4f1398b81af04 ] Previous fix gives hiccups to gcc on RHEL 7.6: =3D=3D Build lib/librte_eal/linux/eal CC eal_interrupts.o ...lib/librte_eal/linux/eal/eal_interrupts.c: In function =E2=80=98eal_intr_thread_main=E2=80=99: ...lib/librte_eal/linux/eal/eal_interrupts.c:1048:9: error: missing initializer for field =E2=80=98events=E2=80=99 of =E2=80=98struct epoll_e= vent=E2=80=99 [-Werror=3Dmissing-field-initializers] struct epoll_event ev =3D { }; ^ In file included from ...lib/librte_eal/linux/eal/eal_interrupts.c:15:0: /usr/include/sys/epoll.h:89:12: note: =E2=80=98events=E2=80=99 declared her= e 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 Signed-off-by: David Marchand --- 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) { -=09struct epoll_event ev =3D { }; - =09/* host thread, never break out */ =09for (;;) { @@ -998,6 +996,9 @@ eal_intr_thread_main(__rte_unused void *arg) =20 =09=09TAILQ_FOREACH(src, &intr_sources, next) { +=09=09=09struct epoll_event ev; + =09=09=09if (src->callbacks.tqh_first =3D=3D NULL) =09=09=09=09continue; /* skip those with no callbacks */ +=09=09=09memset(&ev, 0, sizeof(ev)); =09=09=09ev.events =3D EPOLLIN | EPOLLPRI | EPOLLRDHUP | EPOLLHUP; =09=09=09ev.data.fd =3D src->intr_handle.fd; --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:17.665511439 +0000 +++ 0002-eal-linux-fix-build-error-on-RHEL-7.6.patch=092020-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@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/li= nux/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)