From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Wenshan Lan <jetlan9@163.com>, Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 5.4.y v2] epoll: Add synchronous wakeup support for ep_poll_callback
Date: Thu, 26 Dec 2024 11:44:23 -0500 [thread overview]
Message-ID: <20241226093321-4632481b072a01d6@stable.kernel.org> (raw)
In-Reply-To: <20241226111429.12499-1-jetlan9@163.com>
[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: 900bbaae67e980945dec74d36f8afe0de7556d5a
WARNING: Author mismatch between patch and found commit:
Backport author: Wenshan Lan <jetlan9@163.com>
Commit author: Xuewen Yan <xuewen.yan@unisoc.com>
Status in newer kernel trees:
6.12.y | Not found
6.6.y | Not found
6.1.y | Not found
5.15.y | Not found
5.10.y | Not found
5.4.y | Not found
Note: The patch differs from the upstream commit:
---
1: 900bbaae67e9 ! 1: b90bb7104c43 epoll: Add synchronous wakeup support for ep_poll_callback
@@ Commit message
Reviewed-by: Brian Geffon <bgeffon@google.com>
Reported-by: Benoit Lize <lizeb@google.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
+ (cherry picked from commit 900bbaae67e980945dec74d36f8afe0de7556d5a)
+ [ Redefine wake_up_sync(x) as __wake_up_sync(x, TASK_NORMAL, 1) to
+ make it work on 5.4.y ]
+ Signed-off-by: Wenshan Lan <jetlan9@163.com>
## fs/eventpoll.c ##
@@ fs/eventpoll.c: static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, v
@@ include/linux/wait.h: void __wake_up_pollfree(struct wait_queue_head *wq_head);
#define wake_up_all(x) __wake_up(x, TASK_NORMAL, 0, NULL)
#define wake_up_locked(x) __wake_up_locked((x), TASK_NORMAL, 1)
#define wake_up_all_locked(x) __wake_up_locked((x), TASK_NORMAL, 0)
-+#define wake_up_sync(x) __wake_up_sync(x, TASK_NORMAL)
++#define wake_up_sync(x) __wake_up_sync(x, TASK_NORMAL, 1)
#define wake_up_interruptible(x) __wake_up(x, TASK_INTERRUPTIBLE, 1, NULL)
#define wake_up_interruptible_nr(x, nr) __wake_up(x, TASK_INTERRUPTIBLE, nr, NULL)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y | Success | Success |
prev parent reply other threads:[~2024-12-26 16:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-23 12:44 FAILED: patch "[PATCH] epoll: Add synchronous wakeup support for ep_poll_callback" failed to apply to 5.4-stable tree gregkh
2024-12-26 8:35 ` [PATCH 5.4.y] epoll: Add synchronous wakeup support for ep_poll_callback Wenshan Lan
2024-12-26 10:45 ` Lan, Wenshan
2024-12-26 16:44 ` Sasha Levin
2024-12-26 11:14 ` [PATCH 5.4.y v2] " Wenshan Lan
2024-12-26 16:44 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241226093321-4632481b072a01d6@stable.kernel.org \
--to=sashal@kernel.org \
--cc=jetlan9@163.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox