From: Petr Mladek <pmladek@suse.com>
To: John Ogness <john.ogness@linutronix.de>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH next v2 1/3] printk: inline log_output(),log_store() in vprintk_store()
Date: Thu, 3 Dec 2020 16:57:26 +0100 [thread overview]
Message-ID: <X8kK5nC/uWJhc4Z0@alley> (raw)
In-Reply-To: <20201201205341.3871-2-john.ogness@linutronix.de>
On Tue 2020-12-01 21:59:39, John Ogness wrote:
> In preparation for removing logbuf_lock, inline log_output()
> and log_store() into vprintk_store(). This will simplify dealing
> with the various code branches and fallbacks that are possible.
> ---
> kernel/printk/printk.c | 134 +++++++++++++++++------------------------
> 1 file changed, 56 insertions(+), 78 deletions(-)
>
> diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
> index f279d4fbd9dd..fc5e3a7d6d89 100644
> --- a/kernel/printk/printk.c
> +++ b/kernel/printk/printk.c
> @@ -1983,7 +1915,53 @@ int vprintk_store(int facility, int level,
> if (dev_info)
> lflags |= LOG_NEWLINE;
>
> - return log_output(facility, level, lflags, dev_info, text, text_len);
> + if (lflags & LOG_CONT) {
> + prb_rec_init_wr(&r, text_len);
> + if (prb_reserve_in_last(&e, prb, &r, caller_id, LOG_LINE_MAX)) {
> + memcpy(&r.text_buf[r.info->text_len], text, text_len);
> + r.info->text_len += text_len;
> +
> + if (lflags & LOG_NEWLINE) {
> + r.info->flags |= LOG_NEWLINE;
> + prb_final_commit(&e);
> + } else {
> + prb_commit(&e);
> + }
> +
> + return text_len;
> + }
> + }
> +
> + prb_rec_init_wr(&r, text_len);
This is called in both branches. I would do it just once at the
beginning.
> + if (!prb_reserve(&e, prb, &r)) {
> + /* truncate the message if it is too long for empty buffer */
> + truncate_msg(&text_len, &trunc_msg_len);
> +
> + prb_rec_init_wr(&r, text_len + trunc_msg_len);
> + if (!prb_reserve(&e, prb, &r))
> + return 0;
> + }
> +
> + /* fill message */
> + memcpy(&r.text_buf[0], text, text_len);
> + if (trunc_msg_len)
> + memcpy(&r.text_buf[text_len], trunc_msg, trunc_msg_len);
> + r.info->text_len = text_len + trunc_msg_len;
> + r.info->facility = facility;
> + r.info->level = level & 7;
> + r.info->flags = lflags & 0x1f;
> + r.info->ts_nsec = ts_nsec;
This is the only location where ts_nsec is used. I would remove the
variable and call:
r.info->ts_nsec = local_clock();
> + r.info->caller_id = caller_id;
> + if (dev_info)
> + memcpy(&r.info->dev_info, dev_info, sizeof(r.info->dev_info));
> +
> + /* A message without a trailing newline can be continued. */
> + if (!(lflags & LOG_NEWLINE))
> + prb_commit(&e);
> + else
> + prb_final_commit(&e);
> +
> + return (text_len + trunc_msg_len);
> }
Both changes are cosmetic and I do not resist on them. Please, do the changes
if v3 is needed and you agree with them.
Anyway, feel free to use:
Reviewed-by: Petr Mladek <pmladek@suse.com>
Best Regards,
Petr
next prev parent reply other threads:[~2020-12-03 15:58 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 20:53 [PATCH next v2 0/3] printk: remove logbuf_lock John Ogness
2020-12-01 20:53 ` [PATCH next v2 1/3] printk: inline log_output(),log_store() in vprintk_store() John Ogness
2020-12-03 15:57 ` Petr Mladek [this message]
2020-12-03 16:25 ` John Ogness
2020-12-04 6:13 ` Sergey Senozhatsky
2020-12-04 8:26 ` Petr Mladek
2020-12-01 20:53 ` [PATCH next v2 2/3] printk: change @clear_seq to atomic64_t John Ogness
2020-12-04 9:12 ` Petr Mladek
2020-12-06 20:23 ` John Ogness
2020-12-07 9:34 ` Peter Zijlstra
2020-12-07 10:03 ` John Ogness
2020-12-07 12:56 ` Peter Zijlstra
2020-12-07 12:56 ` Petr Mladek
2020-12-07 16:46 ` David Laight
2020-12-08 20:34 ` Sergey Senozhatsky
2020-12-08 22:30 ` John Ogness
2020-12-09 1:04 ` Sergey Senozhatsky
2020-12-09 8:16 ` Peter Zijlstra
2020-12-09 9:22 ` Sergey Senozhatsky
2020-12-09 10:46 ` Sergey Senozhatsky
2020-12-09 11:00 ` Peter Zijlstra
2020-12-09 11:28 ` Sergey Senozhatsky
2020-12-09 12:29 ` Peter Zijlstra
2020-12-09 8:07 ` Peter Zijlstra
2020-12-01 20:53 ` [PATCH next v2 3/3] printk: remove logbuf_lock, add syslog_lock John Ogness
2020-12-04 6:41 ` Sergey Senozhatsky
2020-12-06 20:44 ` John Ogness
2020-12-04 15:52 ` devkmsg: was " Petr Mladek
2020-12-06 20:51 ` John Ogness
2020-12-07 9:56 ` Petr Mladek
2020-12-04 15:57 ` syslog: was: " Petr Mladek
2020-12-06 21:06 ` John Ogness
2020-12-07 10:01 ` Petr Mladek
2020-12-04 16:10 ` recursion handling: " Petr Mladek
2020-12-05 4:25 ` Sergey Senozhatsky
2020-12-06 22:08 ` John Ogness
2020-12-05 9:41 ` Sergey Senozhatsky
2020-12-06 22:17 ` John Ogness
2020-12-06 21:44 ` John Ogness
2020-12-07 11:17 ` Petr Mladek
2020-12-04 16:15 ` vprintk_store: was: " Petr Mladek
2020-12-06 22:30 ` John Ogness
2020-12-07 12:46 ` Petr Mladek
2020-12-04 16:19 ` consoles: " Petr Mladek
2020-12-05 4:39 ` Sergey Senozhatsky
2020-12-07 9:50 ` Petr Mladek
2020-12-08 20:51 ` Sergey Senozhatsky
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=X8kK5nC/uWJhc4Z0@alley \
--to=pmladek@suse.com \
--cc=gregkh@linuxfoundation.org \
--cc=john.ogness@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=sergey.senozhatsky@gmail.com \
--cc=tglx@linutronix.de \
--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).