[ GIT PULL] tracing: Allow poll() and select() to not block

From: Steven Rostedt
Date: Tue Feb 07 2023 - 10:06:20 EST



Linus,

Tracing: Fix small regression in poll() and select()

With the fix that made poll() and select() block if read would block
caused a slight regression in rasdaemon, as it needed that kind
of behavior. Add a way to make that behavior come back by writing
zero into the "buffer_percentage", which means to never block on read,
poll or select.


Please pull the latest trace-v6.2-rc6 tree, which can be found at:


git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
trace-v6.2-rc6

Tag SHA1: d35c826e198a367e8eda280b42dc0b408bd2ccef
Head SHA1: 3e46d910d8acf94e5360126593b68bf4fee4c4a1


Shiju Jose (1):
tracing: Fix poll() and select() do not work on per_cpu trace_pipe and trace_pipe_raw

----
kernel/trace/trace.c | 3 ---
1 file changed, 3 deletions(-)
---------------------------
commit 3e46d910d8acf94e5360126593b68bf4fee4c4a1
Author: Shiju Jose <shiju.jose@xxxxxxxxxx>
Date: Thu Feb 2 18:23:09 2023 +0000

tracing: Fix poll() and select() do not work on per_cpu trace_pipe and trace_pipe_raw

poll() and select() on per_cpu trace_pipe and trace_pipe_raw do not work
since kernel 6.1-rc6. This issue is seen after the commit
42fb0a1e84ff525ebe560e2baf9451ab69127e2b ("tracing/ring-buffer: Have
polling block on watermark").

This issue is firstly detected and reported, when testing the CXL error
events in the rasdaemon and also erified using the test application for poll()
and select().

This issue occurs for the per_cpu case, when calling the ring_buffer_poll_wait(),
in kernel/trace/ring_buffer.c, with the buffer_percent > 0 and then wait until the
percentage of pages are available. The default value set for the buffer_percent is 50
in the kernel/trace/trace.c.

As a fix, allow userspace application could set buffer_percent as 0 through
the buffer_percent_fops, so that the task will wake up as soon as data is added
to any of the specific cpu buffer.

Link: https://lore.kernel.org/linux-trace-kernel/20230202182309.742-2-shiju.jose@xxxxxxxxxx

Cc: <mhiramat@xxxxxxxxxx>
Cc: <mchehab@xxxxxxxxxx>
Cc: <linux-edac@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Fixes: 42fb0a1e84ff5 ("tracing/ring-buffer: Have polling block on watermark")
Signed-off-by: Shiju Jose <shiju.jose@xxxxxxxxxx>
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 78ed5f1baa8c..c9e40f692650 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -9148,9 +9148,6 @@ buffer_percent_write(struct file *filp, const char __user *ubuf,
if (val > 100)
return -EINVAL;

- if (!val)
- val = 1;
-
tr->buffer_percent = val;

(*ppos)++;