From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>,
stable@vger.kernel.org, Vincent Donnefort <vdonnefort@google.com>
Subject: [for-linus][PATCH 01/13] ring-buffer: Clean ring_buffer_poll_wait() error return
Date: Thu, 01 Feb 2024 21:30:00 -0500 [thread overview]
Message-ID: <20240202023022.088387401@goodmis.org> (raw)
In-Reply-To: 20240202022959.515961549@goodmis.org
From: Vincent Donnefort <vdonnefort@google.com>
The return type for ring_buffer_poll_wait() is __poll_t. This is behind
the scenes an unsigned where we can set event bits. In case of a
non-allocated CPU, we do return instead -EINVAL (0xffffffea). Lucky us,
this ends up setting few error bits (EPOLLERR | EPOLLHUP | EPOLLNVAL), so
user-space at least is aware something went wrong.
Nonetheless, this is an incorrect code. Replace that -EINVAL with a
proper EPOLLERR to clean that output. As this doesn't change the
behaviour, there's no need to treat this change as a bug fix.
Link: https://lore.kernel.org/linux-trace-kernel/20240131140955.3322792-1-vdonnefort@google.com
Cc: stable@vger.kernel.org
Fixes: 6721cb6002262 ("ring-buffer: Do not poll non allocated cpu buffers")
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/ring_buffer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 13aaf5e85b81..fd4bfe3ecf01 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -944,7 +944,7 @@ __poll_t ring_buffer_poll_wait(struct trace_buffer *buffer, int cpu,
full = 0;
} else {
if (!cpumask_test_cpu(cpu, buffer->cpumask))
- return -EINVAL;
+ return EPOLLERR;
cpu_buffer = buffer->buffers[cpu];
work = &cpu_buffer->irq_work;
--
2.43.0
next prev parent reply other threads:[~2024-02-02 2:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-02 2:29 [for-linus][PATCH 00/13] tracing/eventfs: Updates for v6.8 Steven Rostedt
2024-02-02 2:30 ` Steven Rostedt [this message]
2024-02-02 2:30 ` [for-linus][PATCH 02/13] tracefs: Zero out the tracefs_inode when allocating it Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 03/13] eventfs: Initialize the tracefs inode properly Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 04/13] tracefs: Avoid using the ei->dentry pointer unnecessarily Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 05/13] tracefs: dentry lookup crapectomy Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 06/13] eventfs: Remove unused d_parent pointer field Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 07/13] eventfs: Clean up dentry ops and add revalidate function Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 08/13] eventfs: Get rid of dentry pointers without refcounts Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 09/13] tracing/timerlat: Move hrtimer_init to timerlat_fd open() Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 10/13] eventfs: Warn if an eventfs_inode is freed without is_freed being set Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 11/13] eventfs: Restructure eventfs_inode structure to be more condensed Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 12/13] eventfs: Remove fsnotify*() functions from lookup() Steven Rostedt
2024-02-02 2:30 ` [for-linus][PATCH 13/13] eventfs: Keep all directory links at 1 Steven Rostedt
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=20240202023022.088387401@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=stable@vger.kernel.org \
--cc=vdonnefort@google.com \
/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