mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for John Ogness" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: John Ogness <john.ogness@linutronix.de>,
	Petr Mladek <pmladek@suse.com>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/rt] printk: Flush console on unregister_console()
Date: Mon, 09 Sep 2024 17:27:46 -0000	[thread overview]
Message-ID: <172590286638.2215.7689151913808015067.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240904120536.115780-4-john.ogness@linutronix.de>

The following commit has been merged into the sched/rt branch of tip:

Commit-ID:     0e53e2d9f72080b7ea1a4003558041fee78cdef9
Gitweb:        https://git.kernel.org/tip/0e53e2d9f72080b7ea1a4003558041fee78cdef9
Author:        John Ogness <john.ogness@linutronix.de>
AuthorDate:    Wed, 04 Sep 2024 14:11:22 +02:06
Committer:     Petr Mladek <pmladek@suse.com>
CommitterDate: Wed, 04 Sep 2024 15:56:32 +02:00

printk: Flush console on unregister_console()

Ensure consoles have flushed pending records before
unregistering. The console should print up to at least its
related "console disabled" record.

Signed-off-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20240904120536.115780-4-john.ogness@linutronix.de
Signed-off-by: Petr Mladek <pmladek@suse.com>
---
 kernel/printk/printk.c |  9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index acf6680..c79e962 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -3771,11 +3771,16 @@ static int unregister_console_locked(struct console *console)
 	if (res > 0)
 		return 0;
 
+	if (!console_is_registered_locked(console))
+		res = -ENODEV;
+	else if (console_is_usable(console, console->flags))
+		__pr_flush(console, 1000, true);
+
 	/* Disable it unconditionally */
 	console_srcu_write_flags(console, console->flags & ~CON_ENABLED);
 
-	if (!console_is_registered_locked(console))
-		return -ENODEV;
+	if (res < 0)
+		return res;
 
 	/*
 	 * Use the driver synchronization to ensure that the hardware is not

  reply	other threads:[~2024-09-09 17:27 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-04 12:05 [PATCH printk v6 00/17] add threaded printing + the rest John Ogness
2024-09-04 12:05 ` [PATCH printk v6 01/17] printk: nbcon: Add function for printers to reacquire ownership John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 02/17] printk: Fail pr_flush() if before SYSTEM_SCHEDULING John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 03/17] printk: Flush console on unregister_console() John Ogness
2024-09-09 17:27   ` tip-bot2 for John Ogness [this message]
2024-09-04 12:05 ` [PATCH printk v6 04/17] printk: nbcon: Add context to usable() and emit() John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 05/17] printk: nbcon: Init @nbcon_seq to highest possible John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 06/17] printk: nbcon: Introduce printer kthreads John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for Thomas Gleixner
2024-09-04 12:05 ` [PATCH printk v6 07/17] printk: nbcon: Relocate nbcon_atomic_emit_one() John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 08/17] printk: nbcon: Use thread callback if in task context for legacy John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 09/17] printk: nbcon: Rely on kthreads for normal operation John Ogness
2024-09-04 13:31   ` Petr Mladek
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 10/17] printk: Provide helper for message prepending John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 11/17] printk: nbcon: Show replay message on takeover John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 12/17] proc: consoles: Add notation to c_start/c_stop John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 13/17] proc: Add nbcon support for /proc/consoles John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 14/17] tty: sysfs: Add nbcon support for 'active' John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 15/17] printk: Implement legacy printer kthread for PREEMPT_RT John Ogness
2024-09-04 13:40   ` Petr Mladek
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 16/17] printk: nbcon: Assign nice -20 for printing threads John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 12:05 ` [PATCH printk v6 17/17] printk: Avoid false positive lockdep report for legacy printing John Ogness
2024-09-09 17:27   ` [tip: sched/rt] " tip-bot2 for John Ogness
2024-09-04 14:30 ` [PATCH printk v6 00/17] add threaded printing + the rest Petr Mladek
2024-09-04 14:55   ` John Ogness

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=172590286638.2215.7689151913808015067.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=john.ogness@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=pmladek@suse.com \
    --cc=x86@kernel.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

all inboxes | Powered by JetHome®