All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Ogness <john.ogness@linutronix.de>
To: Petr Mladek <pmladek@suse.com>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	linux-kernel@vger.kernel.org
Subject: [PATCH printk v4 10/14] printk: ringbuffer: Skip non-finalized records in panic
Date: Wed,  7 Feb 2024 14:46:59 +0106	[thread overview]
Message-ID: <20240207134103.1357162-11-john.ogness@linutronix.de> (raw)
In-Reply-To: <20240207134103.1357162-1-john.ogness@linutronix.de>

Normally a reader will stop once reaching a non-finalized
record. However, when a panic happens, writers from other CPUs
(or an interrupted context on the panic CPU) may have been
writing a record and were unable to finalize it. The panic CPU
will reserve/commit/finalize its panic records, but these will
be located after the non-finalized records. This results in
panic() not flushing the panic messages.

Extend _prb_read_valid() to skip over non-finalized records if
on the panic CPU.

Fixes: 896fbe20b4e2 ("printk: use the lockless ringbuffer")
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Petr Mladek <pmladek@suse.com>
---
 kernel/printk/printk_ringbuffer.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/kernel/printk/printk_ringbuffer.c b/kernel/printk/printk_ringbuffer.c
index 24b484c221e8..88e8f3a61922 100644
--- a/kernel/printk/printk_ringbuffer.c
+++ b/kernel/printk/printk_ringbuffer.c
@@ -2099,6 +2099,10 @@ u64 prb_next_reserve_seq(struct printk_ringbuffer *rb)
  *
  * On failure @seq is updated to a record that is not yet available to the
  * reader, but it will be the next record available to the reader.
+ *
+ * Note: When the current CPU is in panic, this function will skip over any
+ *       non-existent/non-finalized records in order to allow the panic CPU
+ *       to print any and all records that have been finalized.
  */
 static bool _prb_read_valid(struct printk_ringbuffer *rb, u64 *seq,
 			    struct printk_record *r, unsigned int *line_count)
@@ -2121,8 +2125,28 @@ static bool _prb_read_valid(struct printk_ringbuffer *rb, u64 *seq,
 			(*seq)++;
 
 		} else {
-			/* Non-existent/non-finalized record. Must stop. */
-			return false;
+			/*
+			 * Non-existent/non-finalized record. Must stop.
+			 *
+			 * For panic situations it cannot be expected that
+			 * non-finalized records will become finalized. But
+			 * there may be other finalized records beyond that
+			 * need to be printed for a panic situation. If this
+			 * is the panic CPU, skip this
+			 * non-existent/non-finalized record unless it is
+			 * at or beyond the head, in which case it is not
+			 * possible to continue.
+			 *
+			 * Note that new messages printed on panic CPU are
+			 * finalized when we are here. The only exception
+			 * might be the last message without trailing newline.
+			 * But it would have the sequence number returned
+			 * by "prb_next_reserve_seq() - 1".
+			 */
+			if (this_cpu_in_panic() && ((*seq + 1) < prb_next_reserve_seq(rb)))
+				(*seq)++;
+			else
+				return false;
 		}
 	}
 
-- 
2.39.2


  parent reply	other threads:[~2024-02-07 13:41 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-07 13:40 [PATCH printk v4 00/14] fix console flushing John Ogness
2024-02-07 13:40 ` [PATCH printk v4 01/14] printk: nbcon: Relocate 32bit seq macros John Ogness
2024-02-07 13:40 ` [PATCH printk v4 02/14] printk: Adjust mapping for " John Ogness
2024-02-07 13:40 ` [PATCH printk v4 03/14] printk: Use prb_first_seq() as base " John Ogness
2024-02-07 13:40 ` [PATCH printk v4 04/14] printk: ringbuffer: Do not skip non-finalized records with prb_next_seq() John Ogness
2024-02-07 16:00   ` Petr Mladek
2024-02-07 13:40 ` [PATCH printk v4 05/14] printk: ringbuffer: Clarify special lpos values John Ogness
2024-02-07 13:40 ` [PATCH printk v4 06/14] printk: For @suppress_panic_printk check for other CPU in panic John Ogness
2024-02-07 13:40 ` [PATCH printk v4 07/14] printk: Add this_cpu_in_panic() John Ogness
2024-02-07 13:40 ` [PATCH printk v4 08/14] printk: ringbuffer: Cleanup reader terminology John Ogness
2024-02-07 13:40 ` [PATCH printk v4 09/14] printk: Wait for all reserved records with pr_flush() John Ogness
2024-02-07 13:40 ` John Ogness [this message]
2024-02-07 13:41 ` [PATCH printk v4 11/14] printk: Disable passing console lock owner completely during panic() John Ogness
2024-02-07 13:41 ` [PATCH printk v4 12/14] printk: Avoid non-panic CPUs writing to ringbuffer John Ogness
2024-02-07 13:41 ` [PATCH printk v4 13/14] panic: Flush kernel log buffer at the end John Ogness
2024-02-07 13:41 ` [PATCH printk v4 14/14] dump_stack: Do not get cpu_sync for panic CPU John Ogness
2024-02-07 16:16   ` Petr Mladek
2024-02-07 16:18 ` [PATCH printk v4 00/14] fix console flushing Petr Mladek
2024-02-07 16:53   ` 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=20240207134103.1357162-11-john.ogness@linutronix.de \
    --to=john.ogness@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmladek@suse.com \
    --cc=rostedt@goodmis.org \
    --cc=senozhatsky@chromium.org \
    --cc=tglx@linutronix.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.