From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
To: Petr Mladek <pmladek@suse.com>, Steven Rostedt <rostedt@goodmis.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Subject: [PATCHv2 2/4] printk: remove invalid register_console() comment
Date: Fri, 26 Apr 2019 14:33:00 +0900 [thread overview]
Message-ID: <20190426053302.4332-3-sergey.senozhatsky@gmail.com> (raw)
In-Reply-To: <20190426053302.4332-1-sergey.senozhatsky@gmail.com>
We don't iterate consoles twice, since commit 8259cf434202
("printk: Ensure that "console enabled" messages are printed
on the console"), so the comment is not valid anymore, and
can be removed, as was suggested by Petr.
The patch also invokes pr_info("%sconsole [%s%d] enabled\n")
before we unlock_consoles(), just to make sure that we really
print that message on every registered and enabled console.
Suggested-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
kernel/printk/printk.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index b0e361ca1bea..3ac71701afa3 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2806,9 +2806,22 @@ void register_console(struct console *newcon)
exclusive_console_stop_seq = console_seq;
logbuf_unlock_irqrestore(flags);
}
+
+ /*
+ * We are still under console_sem, pr_info() will only add the message
+ * to the kernel's log buffer. console_unlock() will print it on all
+ * registered and enabled consoles.
+ */
+ pr_info("%sconsole [%s%d] enabled\n",
+ (newcon->flags & CON_BOOT) ? "boot" : "",
+ newcon->name, newcon->index);
+
console_unlock();
console_sysfs_notify();
+ if (keep_bootcon)
+ return;
+
/*
* By unregistering the bootconsoles after we enable the real console
* we get the "console xxx enabled" message on all the consoles -
@@ -2816,19 +2829,8 @@ void register_console(struct console *newcon)
* users know there might be something in the kernel's log buffer that
* went to the bootconsole (that they do not see on the real console)
*/
- pr_info("%sconsole [%s%d] enabled\n",
- (newcon->flags & CON_BOOT) ? "boot" : "" ,
- newcon->name, newcon->index);
-
- if (keep_bootcon)
- return;
-
if (bcon && (newcon->flags & (CON_CONSDEV|CON_BOOT)) == CON_CONSDEV) {
console_lock();
- /*
- * We need to iterate through all boot consoles, to make
- * sure we print everything out, before we unregister them.
- */
for_each_console(bcon)
if (bcon->flags & CON_BOOT)
__unregister_console(bcon);
--
2.21.0
next prev parent reply other threads:[~2019-04-26 5:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-26 5:32 [PATCHv2 0/4] Access console drivers list under console_sem Sergey Senozhatsky
2019-04-26 5:32 ` [PATCHv2 1/4] printk: factor out __unregister_console() code Sergey Senozhatsky
2019-05-15 13:34 ` Petr Mladek
2019-04-26 5:33 ` Sergey Senozhatsky [this message]
2019-05-15 13:38 ` [PATCHv2 2/4] printk: remove invalid register_console() comment Petr Mladek
2019-04-26 5:33 ` [PATCHv2 3/4] printk: factor out register_console() code Sergey Senozhatsky
2019-05-15 14:36 ` Petr Mladek
2019-05-23 6:51 ` Sergey Senozhatsky
2019-05-27 11:42 ` Petr Mladek
2019-04-26 5:33 ` [PATCHv2 4/4] printk: make sure we always print console disabled message Sergey Senozhatsky
2019-04-26 5:44 ` Sergey Senozhatsky
2019-05-15 14:47 ` Petr Mladek
2019-05-23 6:59 ` Sergey Senozhatsky
2019-05-27 12:45 ` 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=20190426053302.4332-3-sergey.senozhatsky@gmail.com \
--to=sergey.senozhatsky.work@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®