[dpdk-stable] patch 'eal/linux: fix handling of error events from epoll' has been queued to stable release 19.11.7

[Christian Ehrhardt]

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 <christian.ehrhardt at canonical.com>

---
>From 51a78a3d3f7b04df98373afb5eb1b6b0fc3e6648 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
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 <wangyunjian at huawei.com>
Acked-by: Harman Kalra <hkalra at marvell.com>
---
 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 at 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,