Skip to content

Commit 49ffdc3

Browse files
petrpavluSasha Levin
authored andcommitted
tracing: Wake up poll waiters for hist files when removing an event
[ Upstream commit 9678e53 ] The event_hist_poll() function attempts to verify whether an event file is being removed, but this check may not occur or could be unnecessarily delayed. This happens because hist_poll_wakeup() is currently invoked only from event_hist_trigger() when a hist command is triggered. If the event file is being removed, no associated hist command will be triggered and a waiter will be woken up only after an unrelated hist command is triggered. Fix the issue by adding a call to hist_poll_wakeup() in remove_event_file_dir() after setting the EVENT_FILE_FL_FREED flag. This ensures that a task polling on a hist file is woken up and receives EPOLLERR. Cc: stable@vger.kernel.org Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Tom Zanussi <zanussi@kernel.org> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Link: https://patch.msgid.link/20260219162737.314231-3-petr.pavlu@suse.com Fixes: 1bd13ed ("tracing/hist: Add poll(POLLIN) support on hist file") Signed-off-by: Petr Pavlu <petr.pavlu@suse.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent d4e45ca commit 49ffdc3

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

include/linux/trace_events.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,11 @@ static inline void hist_poll_wakeup(void)
682682

683683
#define hist_poll_wait(file, wait) \
684684
poll_wait(file, &hist_poll_wq, wait)
685+
686+
#else
687+
static inline void hist_poll_wakeup(void)
688+
{
689+
}
685690
#endif
686691

687692
#define __TRACE_EVENT_FLAGS(name, value) \

kernel/trace/trace_events.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,6 +1296,9 @@ static void remove_event_file_dir(struct trace_event_file *file)
12961296
free_event_filter(file->filter);
12971297
file->flags |= EVENT_FILE_FL_FREED;
12981298
event_file_put(file);
1299+
1300+
/* Wake up hist poll waiters to notice the EVENT_FILE_FL_FREED flag. */
1301+
hist_poll_wakeup();
12991302
}
13001303

13011304
/*

0 commit comments

Comments
 (0)