* [for-linus][PATCH 0/2] ring-buffer: Minor fixes for 5.10
@ 2020-10-23 14:16 Steven Rostedt
2020-10-23 14:16 ` [for-linus][PATCH 1/2] ring-buffer: Return 0 on success from ring_buffer_resize() Steven Rostedt
2020-10-23 14:16 ` [for-linus][PATCH 2/2] ring-buffer: Update the description for ring_buffer_wait Steven Rostedt
0 siblings, 2 replies; 3+ messages in thread
From: Steven Rostedt @ 2020-10-23 14:16 UTC (permalink / raw
To: linux-kernel; +Cc: Ingo Molnar, Andrew Morton, Qiujun Huang
The success return value of ring_buffer_resize() is stated to be zero,
and checked that way. But it is incorrectly returning the size allocade.
Also, a documentation fix.
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: e1981f75d398c0afe83c8ffa4e5864f037967409
Qiujun Huang (2):
ring-buffer: Return 0 on success from ring_buffer_resize()
ring-buffer: Update the description for ring_buffer_wait
----
kernel/trace/ring_buffer.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [for-linus][PATCH 1/2] ring-buffer: Return 0 on success from ring_buffer_resize()
2020-10-23 14:16 [for-linus][PATCH 0/2] ring-buffer: Minor fixes for 5.10 Steven Rostedt
@ 2020-10-23 14:16 ` Steven Rostedt
2020-10-23 14:16 ` [for-linus][PATCH 2/2] ring-buffer: Update the description for ring_buffer_wait Steven Rostedt
1 sibling, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2020-10-23 14:16 UTC (permalink / raw
To: linux-kernel; +Cc: Ingo Molnar, Andrew Morton, Qiujun Huang, stable
From: Qiujun Huang <hqjagain@gmail.com>
We don't need to check the new buffer size, and the return value
had confused resize_buffer_duplicate_size().
...
ret = ring_buffer_resize(trace_buf->buffer,
per_cpu_ptr(size_buf->data,cpu_id)->entries, cpu_id);
if (ret == 0)
per_cpu_ptr(trace_buf->data, cpu_id)->entries =
per_cpu_ptr(size_buf->data, cpu_id)->entries;
...
Link: https://lkml.kernel.org/r/20201019142242.11560-1-hqjagain@gmail.com
Cc: stable@vger.kernel.org
Fixes: d60da506cbeb3 ("tracing: Add a resize function to make one buffer equivalent to another buffer")
Signed-off-by: Qiujun Huang <hqjagain@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/ring_buffer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 15bf28b13e50..5c6a9c6a058f 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1952,18 +1952,18 @@ int ring_buffer_resize(struct trace_buffer *buffer, unsigned long size,
{
struct ring_buffer_per_cpu *cpu_buffer;
unsigned long nr_pages;
- int cpu, err = 0;
+ int cpu, err;
/*
* Always succeed at resizing a non-existent buffer:
*/
if (!buffer)
- return size;
+ return 0;
/* Make sure the requested buffer exists */
if (cpu_id != RING_BUFFER_ALL_CPUS &&
!cpumask_test_cpu(cpu_id, buffer->cpumask))
- return size;
+ return 0;
nr_pages = DIV_ROUND_UP(size, BUF_PAGE_SIZE);
@@ -2119,7 +2119,7 @@ int ring_buffer_resize(struct trace_buffer *buffer, unsigned long size,
}
mutex_unlock(&buffer->mutex);
- return size;
+ return 0;
out_err:
for_each_buffer_cpu(buffer, cpu) {
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [for-linus][PATCH 2/2] ring-buffer: Update the description for ring_buffer_wait
2020-10-23 14:16 [for-linus][PATCH 0/2] ring-buffer: Minor fixes for 5.10 Steven Rostedt
2020-10-23 14:16 ` [for-linus][PATCH 1/2] ring-buffer: Return 0 on success from ring_buffer_resize() Steven Rostedt
@ 2020-10-23 14:16 ` Steven Rostedt
1 sibling, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2020-10-23 14:16 UTC (permalink / raw
To: linux-kernel; +Cc: Ingo Molnar, Andrew Morton, Qiujun Huang
From: Qiujun Huang <hqjagain@gmail.com>
The function changed at some point, but the description was not
updated.
Link: https://lkml.kernel.org/r/20201017095246.5170-1-hqjagain@gmail.com
Signed-off-by: Qiujun Huang <hqjagain@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <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 5c6a9c6a058f..7f45fd9d5a45 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -793,7 +793,7 @@ static void rb_wake_up_waiters(struct irq_work *work)
* ring_buffer_wait - wait for input to the ring buffer
* @buffer: buffer to wait on
* @cpu: the cpu buffer to wait on
- * @full: wait until a full page is available, if @cpu != RING_BUFFER_ALL_CPUS
+ * @full: wait until the percentage of pages are available, if @cpu != RING_BUFFER_ALL_CPUS
*
* If @cpu == RING_BUFFER_ALL_CPUS then the task will wake up as soon
* as data is added to any of the @buffer's cpu buffers. Otherwise
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-23 14:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-23 14:16 [for-linus][PATCH 0/2] ring-buffer: Minor fixes for 5.10 Steven Rostedt
2020-10-23 14:16 ` [for-linus][PATCH 1/2] ring-buffer: Return 0 on success from ring_buffer_resize() Steven Rostedt
2020-10-23 14:16 ` [for-linus][PATCH 2/2] ring-buffer: Update the description for ring_buffer_wait Steven Rostedt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.