From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 35B9BA0524 for ; Thu, 4 Feb 2021 12:30:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E27324072F; Thu, 4 Feb 2021 12:30:26 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 0F022240725 for ; Thu, 4 Feb 2021 12:30:25 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cq6-00053H-8E; Thu, 04 Feb 2021 11:30:22 +0000 From: Christian Ehrhardt To: Yunjian Wang Cc: Harman Kalra , dpdk stable Date: Thu, 4 Feb 2021 12:27:45 +0100 Message-Id: <20210204112954.2488123-10-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal/linux: fix handling of error events from epoll' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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.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/06/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/51a78a3d3f7b04df98373afb5eb1b6b0fc3e6648 Thanks. Christian Ehrhardt --- >From 51a78a3d3f7b04df98373afb5eb1b6b0fc3e6648 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Wed, 15 Jul 2020 10:40:10 +0800 Subject: [PATCH] eal/linux: fix handling of error events from epoll [ upstream commit e3e9c87c0fc7c8e65e8f13c7bef133a552d0a597 ] The "rev->epdata.event" assigned to "events.epdata.event" directly, which was wrong in case of epoll events. It should be set to the "evs.events". Fixes: 9efe9c6cdcac ("eal/linux: add epoll wrappers") Signed-off-by: Yunjian Wang Acked-by: Harman Kalra --- lib/librte_eal/linux/eal/eal_interrupts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_eal/linux/eal/eal_interrupts.c b/lib/librte_eal/linux/eal/eal_interrupts.c index 5a58f05fae..e570c0684e 100644 --- a/lib/librte_eal/linux/eal/eal_interrupts.c +++ b/lib/librte_eal/linux/eal/eal_interrupts.c @@ -1205,7 +1205,7 @@ eal_epoll_process_event(struct epoll_event *evs, unsigned int n, events[count].status = RTE_EPOLL_VALID; events[count].fd = rev->fd; events[count].epfd = rev->epfd; - events[count].epdata.event = rev->epdata.event; + events[count].epdata.event = evs[i].events; events[count].epdata.data = rev->epdata.data; if (rev->epdata.cb_fun) rev->epdata.cb_fun(rev->fd, -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:28.617851670 +0100 +++ 0010-eal-linux-fix-handling-of-error-events-from-epoll.patch 2021-02-04 12:04:27.810789516 +0100 @@ -1 +1 @@ -From e3e9c87c0fc7c8e65e8f13c7bef133a552d0a597 Mon Sep 17 00:00:00 2001 +From 51a78a3d3f7b04df98373afb5eb1b6b0fc3e6648 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e3e9c87c0fc7c8e65e8f13c7bef133a552d0a597 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - lib/librte_eal/linux/eal_interrupts.c | 2 +- + lib/librte_eal/linux/eal/eal_interrupts.c | 2 +- @@ -18,5 +19,5 @@ -diff --git a/lib/librte_eal/linux/eal_interrupts.c b/lib/librte_eal/linux/eal_interrupts.c -index 2f03a61254..1dd994bd1f 100644 ---- a/lib/librte_eal/linux/eal_interrupts.c -+++ b/lib/librte_eal/linux/eal_interrupts.c -@@ -1241,7 +1241,7 @@ eal_epoll_process_event(struct epoll_event *evs, unsigned int n, +diff --git a/lib/librte_eal/linux/eal/eal_interrupts.c b/lib/librte_eal/linux/eal/eal_interrupts.c +index 5a58f05fae..e570c0684e 100644 +--- a/lib/librte_eal/linux/eal/eal_interrupts.c ++++ b/lib/librte_eal/linux/eal/eal_interrupts.c +@@ -1205,7 +1205,7 @@ eal_epoll_process_event(struct epoll_event *evs, unsigned int n,