From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>,
Tzvetomir Stoyanov <tz.stoyanov@gmail.com>,
Vincent Donnefort <vdonnefort@google.com>,
Kent Overstreet <kent.overstreet@gmail.com>
Subject: Re: [PATCH v5 01/15] ring-buffer: Refactor ring buffer implementation
Date: Wed, 20 Dec 2023 18:48:43 +0900 [thread overview]
Message-ID: <20231220184843.163d60de46f82b7b4ee01d3d@kernel.org> (raw)
In-Reply-To: <20231219185627.723857541@goodmis.org>
On Tue, 19 Dec 2023 13:54:15 -0500
Steven Rostedt <rostedt@goodmis.org> wrote:
> From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
>
> In order to introduce sub-buffer size per ring buffer, some internal
> refactoring is needed. As ring_buffer_print_page_header() will depend on
> the trace_buffer structure, it is moved after the structure definition.
>
> Link: https://lore.kernel.org/linux-trace-devel/20211213094825.61876-2-tz.stoyanov@gmail.com
>
OK, but the title is too generic. Something like
"Move ring_buffer_print_page_header() after ring_buffer_iter"
will be preferable.
Thank you,
> Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> ---
> kernel/trace/ring_buffer.c | 60 +++++++++++++++++++-------------------
> 1 file changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
> index f7dc74e45ebf..2400c8e68fd3 100644
> --- a/kernel/trace/ring_buffer.c
> +++ b/kernel/trace/ring_buffer.c
> @@ -379,36 +379,6 @@ static inline bool test_time_stamp(u64 delta)
> /* Max payload is BUF_PAGE_SIZE - header (8bytes) */
> #define BUF_MAX_DATA_SIZE (BUF_PAGE_SIZE - (sizeof(u32) * 2))
>
> -int ring_buffer_print_page_header(struct trace_seq *s)
> -{
> - struct buffer_data_page field;
> -
> - trace_seq_printf(s, "\tfield: u64 timestamp;\t"
> - "offset:0;\tsize:%u;\tsigned:%u;\n",
> - (unsigned int)sizeof(field.time_stamp),
> - (unsigned int)is_signed_type(u64));
> -
> - trace_seq_printf(s, "\tfield: local_t commit;\t"
> - "offset:%u;\tsize:%u;\tsigned:%u;\n",
> - (unsigned int)offsetof(typeof(field), commit),
> - (unsigned int)sizeof(field.commit),
> - (unsigned int)is_signed_type(long));
> -
> - trace_seq_printf(s, "\tfield: int overwrite;\t"
> - "offset:%u;\tsize:%u;\tsigned:%u;\n",
> - (unsigned int)offsetof(typeof(field), commit),
> - 1,
> - (unsigned int)is_signed_type(long));
> -
> - trace_seq_printf(s, "\tfield: char data;\t"
> - "offset:%u;\tsize:%u;\tsigned:%u;\n",
> - (unsigned int)offsetof(typeof(field), data),
> - (unsigned int)BUF_PAGE_SIZE,
> - (unsigned int)is_signed_type(char));
> -
> - return !trace_seq_has_overflowed(s);
> -}
> -
> struct rb_irq_work {
> struct irq_work work;
> wait_queue_head_t waiters;
> @@ -556,6 +526,36 @@ struct ring_buffer_iter {
> int missed_events;
> };
>
> +int ring_buffer_print_page_header(struct trace_seq *s)
> +{
> + struct buffer_data_page field;
> +
> + trace_seq_printf(s, "\tfield: u64 timestamp;\t"
> + "offset:0;\tsize:%u;\tsigned:%u;\n",
> + (unsigned int)sizeof(field.time_stamp),
> + (unsigned int)is_signed_type(u64));
> +
> + trace_seq_printf(s, "\tfield: local_t commit;\t"
> + "offset:%u;\tsize:%u;\tsigned:%u;\n",
> + (unsigned int)offsetof(typeof(field), commit),
> + (unsigned int)sizeof(field.commit),
> + (unsigned int)is_signed_type(long));
> +
> + trace_seq_printf(s, "\tfield: int overwrite;\t"
> + "offset:%u;\tsize:%u;\tsigned:%u;\n",
> + (unsigned int)offsetof(typeof(field), commit),
> + 1,
> + (unsigned int)is_signed_type(long));
> +
> + trace_seq_printf(s, "\tfield: char data;\t"
> + "offset:%u;\tsize:%u;\tsigned:%u;\n",
> + (unsigned int)offsetof(typeof(field), data),
> + (unsigned int)BUF_PAGE_SIZE,
> + (unsigned int)is_signed_type(char));
> +
> + return !trace_seq_has_overflowed(s);
> +}
> +
> static inline void rb_time_read(rb_time_t *t, u64 *ret)
> {
> *ret = local64_read(&t->time);
> --
> 2.42.0
>
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
next prev parent reply other threads:[~2023-12-20 9:48 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-19 18:54 [PATCH v5 00/15] ring-buffer/tracing: Allow ring buffer to have bigger sub buffers Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 01/15] ring-buffer: Refactor ring buffer implementation Steven Rostedt
2023-12-20 9:48 ` Masami Hiramatsu [this message]
2023-12-20 12:53 ` Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 02/15] ring-buffer: Page size per ring buffer Steven Rostedt
2023-12-20 8:48 ` David Laight
2023-12-20 13:01 ` Steven Rostedt
2023-12-21 9:17 ` David Laight
2023-12-21 14:19 ` Steven Rostedt
2023-12-21 14:51 ` David Laight
2023-12-21 14:57 ` Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 03/15] ring-buffer: Add interface for configuring trace sub buffer size Steven Rostedt
2023-12-20 14:26 ` Masami Hiramatsu
2023-12-20 14:40 ` Steven Rostedt
2023-12-21 0:10 ` Masami Hiramatsu
2023-12-19 18:54 ` [PATCH v5 04/15] ring-buffer: Set new size of the ring buffer sub page Steven Rostedt
2023-12-20 16:34 ` Masami Hiramatsu
2023-12-20 16:56 ` Steven Rostedt
2023-12-21 0:11 ` Masami Hiramatsu
2023-12-19 18:54 ` [PATCH v5 05/15] ring-buffer: Read and write to ring buffers with custom sub buffer size Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 06/15] ring-buffer: Clear pages on error in ring_buffer_subbuf_order_set() failure Steven Rostedt
2023-12-20 16:23 ` Masami Hiramatsu
2023-12-20 16:30 ` Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 07/15] ring-buffer: Do no swap cpu buffers if order is different Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 08/15] ring-buffer: Make sure the spare sub buffer used for reads has same size Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 09/15] tracing: Update snapshot order along with main buffer order Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 10/15] tracing: Stop the tracing while changing the ring buffer subbuf size Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 11/15] ring-buffer: Keep the same size when updating the order Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 12/15] ring-buffer: Just update the subbuffers when changing their allocation order Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 13/15] ring-buffer: Add documentation on the buffer_subbuf_order file Steven Rostedt
2023-12-19 18:54 ` [PATCH v5 14/15] ringbuffer/selftest: Add basic selftest to test changing subbuf order Steven Rostedt
2023-12-21 0:23 ` Masami Hiramatsu
2023-12-19 18:54 ` [PATCH v5 15/15] tracing: Update subbuffer with kilobytes not page order Steven Rostedt
2023-12-21 0:26 ` Masami Hiramatsu
2023-12-21 1:57 ` Steven Rostedt
2023-12-19 22:38 ` [PATCH v5 16/15] ring-buffer: Use subbuf_order for buffer page masking 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=20231220184843.163d60de46f82b7b4ee01d3d@kernel.org \
--to=mhiramat@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=kent.overstreet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=rostedt@goodmis.org \
--cc=tz.stoyanov@gmail.com \
--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 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.