From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
To: Petr Mladek <pmladek@suse.com>, Steven Rostedt <rostedt@goodmis.org>
Cc: Alexander Potapenko <glider@google.com>,
Dmitriy Vyukov <dvyukov@google.com>,
penguin-kernel@i-love.sakura.ne.jp,
kbuild test robot <fengguang.wu@intel.com>,
syzkaller <syzkaller@googlegroups.com>,
LKML <linux-kernel@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Subject: Re: [PATCH] printk: inject caller information into the body of message
Date: Fri, 14 Sep 2018 15:57:28 +0900 [thread overview]
Message-ID: <20180914065728.GA515@jagdpanzerIV> (raw)
In-Reply-To: <20180913142802.GB517@tigerII.localdomain>
On (09/13/18 23:28), Sergey Senozhatsky wrote:
> Not that I see any problems with pr_line_flush(). But can drop it, sure.
> pr_line() is a replacement for pr_cont() and as such it's not for multi-line
> buffering.
OK, attached.
Let me know if anything needs to improved (including broken English).
Will we keep in the printk tree or shall I send a formal patch to Andrew?
===
From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Subject: [PATCH] lib/seq_buf: add pr_line buffering API
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
include/linux/kern_levels.h | 3 ++
include/linux/seq_buf.h | 60 +++++++++++++++++++++++++++++++++++++
lib/seq_buf.c | 57 +++++++++++++++++++++++++++++++++++
3 files changed, 120 insertions(+)
diff --git a/include/linux/kern_levels.h b/include/linux/kern_levels.h
index d237fe854ad9..9c281ac745b3 100644
--- a/include/linux/kern_levels.h
+++ b/include/linux/kern_levels.h
@@ -20,6 +20,9 @@
* Annotation for a "continued" line of log printout (only done after a
* line that had no enclosing \n). Only to be used by core/arch code
* during early bootup (a continued line is not SMP-safe otherwise).
+ *
+ * Please consider pr_line()/vpr_line() functions for SMP-safe continued
+ * line printing.
*/
#define KERN_CONT KERN_SOH "c"
diff --git a/include/linux/seq_buf.h b/include/linux/seq_buf.h
index aa5deb041c25..b33aeea14803 100644
--- a/include/linux/seq_buf.h
+++ b/include/linux/seq_buf.h
@@ -23,6 +23,62 @@ struct seq_buf {
loff_t readpos;
};
+#define __SEQ_BUF_INITIALIZER(buf, length) \
+{ \
+ .buffer = (buf), \
+ .size = (length), \
+ .len = 0, \
+ .readpos = 0, \
+}
+
+#ifdef CONFIG_PRINTK
+#define __PR_LINE_BUF_SZ 80
+#else
+#define __PR_LINE_BUF_SZ 0
+#endif
+
+/**
+ * pr_line - printk() line buffer structure
+ * @sb: underlying seq buffer, which holds the data
+ * @level: printk() log level (KERN_ERR, etc.)
+ */
+struct pr_line {
+ struct seq_buf sb;
+ char *level;
+};
+
+/**
+ * DEFINE_PR_LINE - define a new pr_line variable
+ * @lev: printk() log level
+ * @name: variable name
+ *
+ * Defines a new pr_line varialbe, which would use an implicit
+ * stack buffer of size __PR_LINE_BUF_SZ.
+ */
+#define DEFINE_PR_LINE(lev, name) \
+ char __line_##name[__PR_LINE_BUF_SZ]; \
+ struct pr_line name = { \
+ .sb = __SEQ_BUF_INITIALIZER(__line_##name, \
+ __PR_LINE_BUF_SZ), \
+ .level = lev, \
+ }
+
+/**
+ * DEFINE_PR_LINE_BUF - define a new pr_line variable
+ * @lev: printk() log level
+ * @name: variable name
+ * @buf: external buffer
+ * @sz: external buffer size
+ *
+ * Defines a new pr_line variable, which would use an external
+ * buffer for printk line.
+ */
+#define DEFINE_PR_LINE_BUF(lev, name, buf, sz) \
+ struct pr_line name = { \
+ .sb = __SEQ_BUF_INITIALIZER(buf, (sz)), \
+ .level = lev, \
+ }
+
static inline void seq_buf_clear(struct seq_buf *s)
{
s->len = 0;
@@ -131,4 +187,8 @@ extern int
seq_buf_bprintf(struct seq_buf *s, const char *fmt, const u32 *binary);
#endif
+extern __printf(2, 0)
+int vpr_line(struct pr_line *pl, const char *fmt, va_list args);
+extern __printf(2, 3)
+int pr_line(struct pr_line *pl, const char *fmt, ...);
#endif /* _LINUX_SEQ_BUF_H */
diff --git a/lib/seq_buf.c b/lib/seq_buf.c
index 11f2ae0f9099..fada7623f168 100644
--- a/lib/seq_buf.c
+++ b/lib/seq_buf.c
@@ -324,3 +324,60 @@ int seq_buf_to_user(struct seq_buf *s, char __user *ubuf, int cnt)
s->readpos += cnt;
return cnt;
}
+
+/**
+ * vpr_line - Append data to the printk() line buffer
+ * @pl: the pr_line descriptor
+ * @fmt: printf format string
+ * @args: va_list of arguments from a printf() type function
+ *
+ * Writes a vnprintf() format into the printk() pr_line buffer.
+ * Terminating new-line symbol flushes (prints) the buffer.
+ *
+ * Unlike pr_cont() and printk(KERN_CONT), this function is SMP-safe
+ * and shall be used for continued line printing.
+ *
+ * Returns zero on success, -1 on overflow.
+ */
+int vpr_line(struct pr_line *pl, const char *fmt, va_list args)
+{
+ struct seq_buf *s = &pl->sb;
+ int ret, len;
+
+ ret = seq_buf_vprintf(s, fmt, args);
+
+ len = seq_buf_used(s);
+ if (len && s->buffer[len - 1] == '\n') {
+ printk("%s%.*s", pl->level ? : KERN_DEFAULT, len, s->buffer);
+ seq_buf_clear(s);
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL(vpr_line);
+
+/**
+ * pr_line - Append data to the printk() line buffer
+ * @pl: the pr_line descriptor
+ * @fmt: printf format string
+ *
+ * Writes a printf() format into the printk() pr_line buffer.
+ * Terminating new-line symbol flushes (prints) the buffer.
+ *
+ * Unlike pr_cont() and printk(KERN_CONT), this function is SMP-safe
+ * and shall be used for continued line printing.
+ *
+ * Returns zero on success, -1 on overflow.
+ */
+int pr_line(struct pr_line *pl, const char *fmt, ...)
+{
+ va_list ap;
+ int ret;
+
+ va_start(ap, fmt);
+ ret = vpr_line(pl, fmt, ap);
+ va_end(ap);
+
+ return ret;
+}
+EXPORT_SYMBOL(pr_line);
--
2.19.0
next prev parent reply other threads:[~2018-09-14 6:57 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201804232233.CIC65675.OJSOMFQOFFHVtL@I-love.SAKURA.ne.jp>
[not found] ` <CACT4Y+boyw_Qy=y-iTnsKZrtTgF0Hk3nHN_xtqUdX4etgiYDQw@mail.gmail.com>
2018-04-24 1:33 ` printk feature for syzbot? Sergey Senozhatsky
2018-04-24 14:40 ` Steven Rostedt
2018-04-26 10:06 ` Petr Mladek
2018-05-10 4:22 ` Sergey Senozhatsky
2018-05-10 11:30 ` Petr Mladek
2018-05-10 12:11 ` Sergey Senozhatsky
2018-05-10 14:22 ` Steven Rostedt
2018-05-10 14:50 ` Tetsuo Handa
2018-05-11 1:45 ` Sergey Senozhatsky
[not found] ` <201805110238.w4B2cIGH079602@www262.sakura.ne.jp>
2018-05-11 6:21 ` Sergey Senozhatsky
2018-05-11 9:17 ` Dmitry Vyukov
2018-05-11 9:50 ` Sergey Senozhatsky
2018-05-11 11:58 ` [PATCH] printk: inject caller information into the body of message Tetsuo Handa
2018-05-17 11:21 ` Sergey Senozhatsky
2018-05-17 11:52 ` Sergey Senozhatsky
2018-05-18 12:15 ` Petr Mladek
2018-05-18 12:25 ` Dmitry Vyukov
2018-05-18 12:54 ` Petr Mladek
2018-05-18 13:08 ` Dmitry Vyukov
2018-05-24 2:21 ` Sergey Senozhatsky
2018-05-23 10:19 ` Tetsuo Handa
2018-05-24 2:14 ` Sergey Senozhatsky
2018-05-26 6:36 ` Dmitry Vyukov
2018-06-20 5:44 ` Dmitry Vyukov
2018-06-20 8:31 ` Sergey Senozhatsky
2018-06-20 8:45 ` Dmitry Vyukov
2018-06-20 9:06 ` Sergey Senozhatsky
2018-06-20 9:18 ` Sergey Senozhatsky
2018-06-20 9:31 ` Dmitry Vyukov
2018-06-20 11:07 ` Sergey Senozhatsky
2018-06-20 11:32 ` Dmitry Vyukov
2018-06-20 13:06 ` Sergey Senozhatsky
2018-06-22 13:06 ` Tetsuo Handa
2018-06-25 1:41 ` Sergey Senozhatsky
2018-06-25 9:36 ` Dmitry Vyukov
2018-06-27 10:29 ` Tetsuo Handa
2018-09-10 11:20 ` Alexander Potapenko
2018-09-12 6:53 ` Sergey Senozhatsky
2018-09-12 16:05 ` Steven Rostedt
2018-09-13 7:12 ` Sergey Senozhatsky
2018-09-13 12:26 ` Petr Mladek
2018-09-13 14:28 ` Sergey Senozhatsky
2018-09-14 1:22 ` Steven Rostedt
2018-09-14 2:15 ` Sergey Senozhatsky
2018-09-14 6:57 ` Sergey Senozhatsky [this message]
2018-09-14 10:37 ` Tetsuo Handa
2018-09-14 11:50 ` Sergey Senozhatsky
2018-09-14 12:03 ` Tetsuo Handa
2018-09-14 12:22 ` Sergey Senozhatsky
2018-09-19 11:02 ` Tetsuo Handa
2018-09-24 8:11 ` Tetsuo Handa
2018-09-27 16:10 ` Tetsuo Handa
2018-09-28 9:02 ` Sergey Senozhatsky
2018-09-28 9:09 ` Sergey Senozhatsky
2018-09-28 11:01 ` Tetsuo Handa
2018-09-29 10:51 ` Sergey Senozhatsky
2018-09-29 11:15 ` Tetsuo Handa
2018-10-01 2:37 ` Sergey Senozhatsky
2018-10-01 2:58 ` Sergey Senozhatsky
2018-10-01 11:21 ` Tetsuo Handa
2018-10-02 6:38 ` Sergey Senozhatsky
2018-10-08 10:31 ` Tetsuo Handa
2018-10-08 16:03 ` Petr Mladek
2018-10-08 20:48 ` Tetsuo Handa
2018-10-09 14:52 ` Petr Mladek
2018-10-09 21:19 ` Tetsuo Handa
2018-10-10 10:14 ` Tetsuo Handa
2018-10-11 10:20 ` Tetsuo Handa
2018-10-11 13:47 ` Steven Rostedt
2018-10-08 15:43 ` Petr Mladek
2018-09-28 8:56 ` Sergey Senozhatsky
2018-09-28 11:21 ` Tetsuo Handa
2018-09-29 11:13 ` Sergey Senozhatsky
2018-09-29 11:39 ` Tetsuo Handa
2018-10-01 5:52 ` Sergey Senozhatsky
2018-10-01 8:37 ` Sergey Senozhatsky
2018-10-01 18:06 ` Steven Rostedt
2018-09-14 1:12 ` Steven Rostedt
2018-09-14 1:55 ` Sergey Senozhatsky
2018-06-21 8:29 ` Sergey Senozhatsky
2018-06-20 9:30 ` Dmitry Vyukov
2018-06-20 11:19 ` Sergey Senozhatsky
2018-06-20 11:25 ` Dmitry Vyukov
2018-06-20 11:37 ` Fengguang Wu
2018-06-20 12:31 ` Dmitry Vyukov
2018-06-20 12:41 ` Fengguang Wu
2018-06-20 12:45 ` Dmitry Vyukov
2018-06-20 12:48 ` Fengguang Wu
2018-05-11 13:37 ` printk feature for syzbot? Steven Rostedt
2018-05-15 5:20 ` Sergey Senozhatsky
2018-05-15 14:39 ` Steven Rostedt
2018-05-11 11:02 ` [PATCH] printk: fix possible reuse of va_list variable Tetsuo Handa
2018-05-11 11:27 ` Sergey Senozhatsky
2018-05-17 11:57 ` Petr Mladek
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=20180914065728.GA515@jagdpanzerIV \
--to=sergey.senozhatsky.work@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=dvyukov@google.com \
--cc=fengguang.wu@intel.com \
--cc=glider@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=syzkaller@googlegroups.com \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).