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 B2376A051C for ; Tue, 11 Feb 2020 12:22:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A5B5F2BF4; Tue, 11 Feb 2020 12:22:25 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 6898B2BF4 for ; Tue, 11 Feb 2020 12:22:24 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id m10so2038543wmc.0 for ; Tue, 11 Feb 2020 03:22:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aCygfOPPJg7MDxmKEtnB/5sZG95dPr4KrOwfv0blGvA=; b=p7REkq1ZW/pxGA/PiHvWdh6b4DiUJrJoqJ9+t22D5exts/wHsgMR1mSKdjQJM0ktaU KNuU27qtkPVOEu6JTnjYVF7FVbNobmcx45CKIS9DjZkSly/QBX/oxDg8Nj7YaM7jN56Q 2WDrADCCrG6MtfHni0A8alZAiTNMfsefbeVnR+a9cfjB0sOhTQJnPSNF3GU0dZYO80Xb U4YLNk+cB53StMqCCcobe797wYtDPir5Y7JojoiRtKh4Y/3UYsIDZob7DDxLAQbPBk3z 6pk55Vb7GoZQ94eB13dPdeH2vZMeqFGXhays4OCFa5hC1UYOim/ahcKaVd/prGaencxh iW9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aCygfOPPJg7MDxmKEtnB/5sZG95dPr4KrOwfv0blGvA=; b=EkQj7CrlthTIRWBDU+gqV6UxtebANRgtFeFDehdeVdGbDOZHuGx0kTLqF7JSBH+9uu jm3AAeyL25nzfQ5/QkFVm4DH+edEmNGF0I8ihPHsJ5Yt+Eg/N/Y6tNmzA2G/NMCPbAF4 jQDc5dGnuSFGHWvHoyaFmC6lJxFgE85SJUpk6CXOEYpEaHaghvSnxOfE+7iT1o/T5KSB apq/RmPICMpBM1Cg2gkORU+H3qyQkytDVl3cMFdaYIPkyxBQD805uIEvrzIYZCqA+iSK NM0z9R0czHUP/RA/EMuF+oaw9N4xcMQucNRSIiyPqFE9N+sQ01W7YeIXEHOUcTSblCiQ IzBA== X-Gm-Message-State: APjAAAUGKdWMfCoCvs7JzI4KqKyq9w4/BOUclx35Qk1u9I2uVOyd4bSB rwdSzC7QOYvsadYS7uAyKLc= X-Google-Smtp-Source: APXvYqx/jd8VQYVGWJZRUaktlaZpZqaHqAZWHzHf7Vx5HT17AkquwfSdS0WRKJ+nSf0vonmBNO56vg== X-Received: by 2002:a7b:c119:: with SMTP id w25mr5292001wmi.112.1581420144129; Tue, 11 Feb 2020 03:22:24 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i16sm4899054wrr.71.2020.02.11.03.22.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:22:23 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Andrew Rybchenko , dpdk stable Date: Tue, 11 Feb 2020 11:19:08 +0000 Message-Id: <20200211112216.3929-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal/linux: fix build error on RHEL 7.6' has been queued to stable release 19.11.1 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 stable release 19.11.1 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. Thanks. Luca Boccassi --- >From 202ec22ea3bec11baeaddd6a3648aa487313e00e 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=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 Signed-off-by: David Marchand --- lib/librte_eal/linux/eal/eal_interrupts.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 @@ -1045,8 +1045,6 @@ eal_intr_handle_interrupts(int pfd, unsigned totalfds) static __attribute__((noreturn)) void * eal_intr_thread_main(__rte_unused void *arg) { - struct epoll_event ev = { }; - /* host thread, never break out */ for (;;) { /* build up the epoll fd with all descriptors we are to @@ -1078,8 +1076,11 @@ eal_intr_thread_main(__rte_unused void *arg) rte_spinlock_lock(&intr_lock); 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:38.946327562 +0000 +++ 0002-eal-linux-fix-build-error-on-RHEL-7.6.patch 2020-02-11 11:17:38.299999477 +0000 @@ -1,4 +1,4 @@ -From aef1d0733179afb56916e95058a4f1398b81af04 Mon Sep 17 00:00:00 2001 +From 202ec22ea3bec11baeaddd6a3648aa487313e00e 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 @@ -6,6 +6,8 @@ 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 @@ -27,7 +29,6 @@ cc1: all warnings being treated as errors Fixes: e0ab8020ac2a ("eal/linux: fix uninitialized data valgrind warning") -Cc: stable@dpdk.org Reported-by: Andrew Rybchenko Signed-off-by: David Marchand