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 C586AA0524 for ; Fri, 5 Feb 2021 12:20:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBFD84067B; Fri, 5 Feb 2021 12:20:38 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id E3C411606C5 for ; Fri, 5 Feb 2021 12:20:36 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id c4so7227338wru.9 for ; Fri, 05 Feb 2021 03:20:36 -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=ykjjqx2n7hAgoGyCRNDqEX/UPtoRV6SB8VewNwb3Y1Q=; b=DIyEarKdtEeZHPb/vB6O2QddQkBwXQpqntgmqi1eQP6C8nTOq7bigoaP2CYTmoUCTM yZ2JATkNlO0iWl34Fh2VtvgDnxnUvKuSbb1uMp9YazPUt8UzxPhHp1Omx+XnpVyM3ICl SKc+Yc+mmVP1wODhtC2n6mS2yFNqL0gzP16oQ6jYf4f0rquarjgt3w9yEqPQG0x6D3+g 9cpRVT5a2/4c9PdZltEUXpyuNTL7JARn+ksNdO0ptkYLszxFe46qmP3YMbIl+ZzQPIcq +hws/cdoYwONaH9sQDt/31UJv7Ih0yfn90v8XKjrVTHFfEz8MeocGeLF7bg8qdAfFqk6 v2Jw== 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=ykjjqx2n7hAgoGyCRNDqEX/UPtoRV6SB8VewNwb3Y1Q=; b=Z0NcAK26aByrUW3gNd51HGrg2ioJOowv2bSwQElaeCq3LIniMTTiq51Hcqew4fsCdo CQJFLkU0Ic4ohtU4W8zAmDTJM8Ath8hbW1xdy2qucKL5QuWiKihHlxO96eP5W1zfn7lu 6FyJ7w4k9rst9l81moNldZw6Tv2rCU3ft5heu1FGdseJjBaL4jJ+VJ4ejYlrQKbpGhXl HHIgngnQiV1j04jbRqTyU99flQNwRv2AvPC+4mmlycb9BVptN25AZukxnPr6OJ8lNJ3j dgLLsMn0zuHlg0ufJO+xT3aBbQV8P0PtQ27GNmvLvlhmE7ZNKf/giLfsmkpUnz43XOsv TX0g== X-Gm-Message-State: AOAM533DShcTWBhicHP5Hi6sOsfEXCsmaxuKYFamjR6o3I+5uxL2PF1V U+xc0EnkpEcMPiAbhegNgJY= X-Google-Smtp-Source: ABdhPJyjXUOj6PxoDjiqBCdj9vN0Pmxxo/eRcR81QCSZvSORMez1GL9eVRv55qry8iMLwMzP3tAWEw== X-Received: by 2002:a05:6000:1043:: with SMTP id c3mr4552127wrx.140.1612524036692; Fri, 05 Feb 2021 03:20:36 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t18sm11541132wrr.56.2021.02.05.03.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:20:35 -0800 (PST) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Harman Kalra , dpdk stable Date: Fri, 5 Feb 2021 11:15:08 +0000 Message-Id: <20210205111920.1272063-22-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.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 20.11.1 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 20.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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a02a695d54234b33f5d1af05b92f5da6105e3609 Thanks. Luca Boccassi --- >From a02a695d54234b33f5d1af05b92f5da6105e3609 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_interrupts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, 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.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:30.299747703 +0000 +++ 0022-eal-linux-fix-handling-of-error-events-from-epoll.patch 2021-02-05 11:18:28.606687304 +0000 @@ -1 +1 @@ -From e3e9c87c0fc7c8e65e8f13c7bef133a552d0a597 Mon Sep 17 00:00:00 2001 +From a02a695d54234b33f5d1af05b92f5da6105e3609 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e3e9c87c0fc7c8e65e8f13c7bef133a552d0a597 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org