From: Kent Overstreet <kent.overstreet@gmail.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, pmladek@suse.com
Cc: Kent Overstreet <kent.overstreet@gmail.com>,
rostedt@goodmis.org, enozhatsky@chromium.org,
linux@rasmusvillemoes.dk, willy@infradead.org,
Ingo Molnar <mingo@redhat.com>
Subject: [PATCH v4 30/34] tracing: trace_events_synth: Convert to printbuf
Date: Sun, 19 Jun 2022 20:42:29 -0400 [thread overview]
Message-ID: <20220620004233.3805-31-kent.overstreet@gmail.com> (raw)
In-Reply-To: <20220620004233.3805-1-kent.overstreet@gmail.com>
This converts from seq_buf to printbuf
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
---
kernel/trace/trace_events_synth.c | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c
index 5e8c07aef0..627e0e45f0 100644
--- a/kernel/trace/trace_events_synth.c
+++ b/kernel/trace/trace_events_synth.c
@@ -5,13 +5,14 @@
* Copyright (C) 2015, 2020 Tom Zanussi <tom.zanussi@linux.intel.com>
*/
-#include <linux/module.h>
#include <linux/kallsyms.h>
-#include <linux/security.h>
+#include <linux/module.h>
#include <linux/mutex.h>
+#include <linux/printbuf.h>
+#include <linux/rculist.h>
+#include <linux/security.h>
#include <linux/slab.h>
#include <linux/stacktrace.h>
-#include <linux/rculist.h>
#include <linux/tracefs.h>
/* for gfp flag names */
@@ -611,7 +612,7 @@ static struct synth_field *parse_synth_field(int argc, char **argv,
const char *prefix = NULL, *field_type = argv[0], *field_name, *array;
struct synth_field *field;
int len, ret = -ENOMEM;
- struct seq_buf s;
+ struct printbuf s;
ssize_t size;
if (!strcmp(field_type, "unsigned")) {
@@ -666,17 +667,15 @@ static struct synth_field *parse_synth_field(int argc, char **argv,
if (!field->type)
goto free;
- seq_buf_init(&s, field->type, len);
+ s = PRINTBUF_EXTERN(field->type, len);
if (prefix)
- seq_buf_puts(&s, prefix);
- seq_buf_puts(&s, field_type);
+ prt_str(&s, prefix);
+ prt_str(&s, field_type);
if (array)
- seq_buf_puts(&s, array);
- if (WARN_ON_ONCE(!seq_buf_buffer_left(&s)))
+ prt_str(&s, array);
+ if (WARN_ON_ONCE(!printbuf_remaining(&s)))
goto free;
- s.buffer[s.len] = '\0';
-
size = synth_field_size(field->type);
if (size < 0) {
if (array)
@@ -694,13 +693,12 @@ static struct synth_field *parse_synth_field(int argc, char **argv,
if (!type)
goto free;
- seq_buf_init(&s, type, len);
- seq_buf_puts(&s, "__data_loc ");
- seq_buf_puts(&s, field->type);
+ s = PRINTBUF_EXTERN(type, len);
+ prt_str(&s, "__data_loc ");
+ prt_str(&s, field->type);
- if (WARN_ON_ONCE(!seq_buf_buffer_left(&s)))
+ if (WARN_ON_ONCE(!printbuf_remaining(&s)))
goto free;
- s.buffer[s.len] = '\0';
kfree(field->type);
field->type = type;
--
2.36.1
next prev parent reply other threads:[~2022-06-20 0:43 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 0:41 [PATCH v4 00/34] Printbufs - new data structure for building strings Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 01/34] lib/printbuf: New data structure for printing strings Kent Overstreet
2022-06-20 4:44 ` David Laight
2022-06-20 15:30 ` Kent Overstreet
2022-06-20 15:53 ` David Laight
2022-06-20 16:14 ` Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 02/34] lib/string_helpers: Convert string_escape_mem() to printbuf Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 03/34] vsprintf: Convert " Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 04/34] lib/hexdump: " Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 05/34] vsprintf: %pf(%p) Kent Overstreet
2022-06-21 7:04 ` Rasmus Villemoes
2022-06-21 7:51 ` Kent Overstreet
2022-06-21 8:47 ` Rasmus Villemoes
2022-06-21 11:11 ` David Laight
2022-06-20 0:42 ` [PATCH v4 06/34] lib/string_helpers: string_get_size() now returns characters wrote Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 07/34] lib/printbuf: Heap allocation Kent Overstreet
2022-06-21 7:58 ` Rasmus Villemoes
2022-06-20 0:42 ` [PATCH v4 08/34] lib/printbuf: Tabstops, indenting Kent Overstreet
2022-06-21 8:14 ` Rasmus Villemoes
2022-06-20 0:42 ` [PATCH v4 09/34] lib/printbuf: Unit specifiers Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 10/34] lib/pretty-printers: prt_string_option(), prt_bitflags() Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 11/34] vsprintf: Improve number() Kent Overstreet
2022-06-21 8:33 ` Rasmus Villemoes
2022-06-20 0:42 ` [PATCH v4 12/34] vsprintf: prt_u64_minwidth(), prt_u64() Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 13/34] test_printf: Drop requirement that sprintf not write past nul Kent Overstreet
2022-06-21 7:19 ` Rasmus Villemoes
2022-06-21 7:52 ` Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 14/34] vsprintf: Start consolidating printf_spec handling Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 15/34] vsprintf: Refactor resource_string() Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 16/34] vsprintf: Refactor fourcc_string() Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 17/34] vsprintf: Refactor ip_addr_string() Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 18/34] vsprintf: Refactor mac_address_string() Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 19/34] vsprintf: time_and_date() no longer takes printf_spec Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 20/34] vsprintf: flags_string() " Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 21/34] vsprintf: Refactor device_node_string, fwnode_string Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 22/34] vsprintf: Refactor hex_string, bitmap_string_list, bitmap_string Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 23/34] Input/joystick/analog: Convert from seq_buf -> printbuf Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 24/34] mm/memcontrol.c: Convert to printbuf Kent Overstreet
2022-06-20 11:37 ` Michal Hocko
2022-06-20 15:13 ` Kent Overstreet
2022-06-20 15:52 ` Michal Hocko
2022-06-20 0:42 ` [PATCH v4 25/34] clk: tegra: bpmp: " Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 26/34] tools/testing/nvdimm: " Kent Overstreet
2022-06-24 19:32 ` Dan Williams
2022-06-24 23:42 ` Santosh Sivaraj
2022-07-01 6:32 ` Shivaprasad G Bhat
2022-06-20 0:42 ` [PATCH v4 27/34] powerpc: " Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 28/34] x86/resctrl: " Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 29/34] PCI/P2PDMA: " Kent Overstreet
2022-06-20 0:42 ` Kent Overstreet [this message]
2022-06-20 0:42 ` [PATCH v4 31/34] d_path: prt_path() Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 32/34] ACPI/APEI: Add missing include Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 33/34] tracing: Convert to printbuf Kent Overstreet
2022-06-20 0:42 ` [PATCH v4 34/34] Delete seq_buf Kent Overstreet
2022-06-20 4:19 ` [PATCH v4 00/34] Printbufs - new data structure for building strings David Laight
2022-06-20 4:54 ` Matthew Wilcox
2022-06-20 8:00 ` David Laight
2022-06-20 15:07 ` Kent Overstreet
2022-06-20 15:21 ` David Laight
2022-06-21 0:38 ` Joe Perches
2022-06-21 0:57 ` Kent Overstreet
2022-06-21 1:26 ` Joe Perches
2022-06-21 2:10 ` Joe Perches
2022-06-26 19:53 ` [RFC[ Alloc in vsprintf Joe Perches
2022-06-26 20:06 ` Kent Overstreet
2022-06-26 20:13 ` Joe Perches
2022-06-26 20:19 ` Linus Torvalds
2022-06-26 20:39 ` Joe Perches
2022-06-26 20:51 ` Kent Overstreet
2022-06-26 21:02 ` Joe Perches
2022-06-26 21:10 ` Kent Overstreet
2022-06-26 20:54 ` Linus Torvalds
2022-06-27 8:25 ` David Laight
2022-06-28 2:56 ` Kent Overstreet
2022-06-21 2:31 ` [PATCH v4 00/34] Printbufs - new data structure for building strings Kent Overstreet
2022-06-21 3:11 ` Kent Overstreet
2022-06-21 6:11 ` Rasmus Villemoes
2022-06-21 8:01 ` Kent Overstreet
2022-07-19 23:15 ` Steven Rostedt
2022-07-19 23:43 ` Kent Overstreet
2022-07-20 0:05 ` Steven Rostedt
2022-07-20 0:17 ` Kent Overstreet
2022-07-20 1:11 ` Steven Rostedt
2022-07-20 1:31 ` Kent Overstreet
2022-07-20 1:37 ` 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=20220620004233.3805-31-kent.overstreet@gmail.com \
--to=kent.overstreet@gmail.com \
--cc=enozhatsky@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@rasmusvillemoes.dk \
--cc=mingo@redhat.com \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=willy@infradead.org \
/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