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 07/17] printk: nbcon: Relocate nbcon_atomic_emit_one()
Date: Tue, 27 Aug 2024 06:49:23 +0206 [thread overview]
Message-ID: <20240827044333.88596-8-john.ogness@linutronix.de> (raw)
In-Reply-To: <20240827044333.88596-1-john.ogness@linutronix.de>
Move nbcon_atomic_emit_one() so that it can be used by
nbcon_kthread_func() in a follow-up commit.
Signed-off-by: John Ogness <john.ogness@linutronix.de>
---
kernel/printk/nbcon.c | 78 +++++++++++++++++++++----------------------
1 file changed, 39 insertions(+), 39 deletions(-)
diff --git a/kernel/printk/nbcon.c b/kernel/printk/nbcon.c
index 64ddb038f205..16e7d992b054 100644
--- a/kernel/printk/nbcon.c
+++ b/kernel/printk/nbcon.c
@@ -1042,6 +1042,45 @@ static bool nbcon_emit_next_record(struct nbcon_write_context *wctxt, bool use_a
return nbcon_context_exit_unsafe(ctxt);
}
+/*
+ * nbcon_atomic_emit_one - Print one record for an nbcon console using the
+ * write_atomic() callback
+ * @wctxt: An initialized write context struct to use for this context
+ *
+ * Return: True, when a record has been printed and there are still
+ * pending records. The caller might want to continue flushing.
+ *
+ * False, when there is no pending record, or when the console
+ * context cannot be acquired, or the ownership has been lost.
+ * The caller should give up. Either the job is done, cannot be
+ * done, or will be handled by the owning context.
+ *
+ * This is an internal helper to handle the locking of the console before
+ * calling nbcon_emit_next_record().
+ */
+static bool nbcon_atomic_emit_one(struct nbcon_write_context *wctxt)
+{
+ struct nbcon_context *ctxt = &ACCESS_PRIVATE(wctxt, ctxt);
+
+ if (!nbcon_context_try_acquire(ctxt))
+ return false;
+
+ /*
+ * nbcon_emit_next_record() returns false when the console was
+ * handed over or taken over. In both cases the context is no
+ * longer valid.
+ *
+ * The higher priority printing context takes over responsibility
+ * to print the pending records.
+ */
+ if (!nbcon_emit_next_record(wctxt, true))
+ return false;
+
+ nbcon_context_release(ctxt);
+
+ return ctxt->backlog;
+}
+
/**
* nbcon_kthread_should_wakeup - Check whether a printer thread should wakeup
* @con: Console to operate on
@@ -1311,45 +1350,6 @@ enum nbcon_prio nbcon_get_default_prio(void)
return NBCON_PRIO_NORMAL;
}
-/*
- * nbcon_atomic_emit_one - Print one record for an nbcon console using the
- * write_atomic() callback
- * @wctxt: An initialized write context struct to use for this context
- *
- * Return: True, when a record has been printed and there are still
- * pending records. The caller might want to continue flushing.
- *
- * False, when there is no pending record, or when the console
- * context cannot be acquired, or the ownership has been lost.
- * The caller should give up. Either the job is done, cannot be
- * done, or will be handled by the owning context.
- *
- * This is an internal helper to handle the locking of the console before
- * calling nbcon_emit_next_record().
- */
-static bool nbcon_atomic_emit_one(struct nbcon_write_context *wctxt)
-{
- struct nbcon_context *ctxt = &ACCESS_PRIVATE(wctxt, ctxt);
-
- if (!nbcon_context_try_acquire(ctxt))
- return false;
-
- /*
- * nbcon_emit_next_record() returns false when the console was
- * handed over or taken over. In both cases the context is no
- * longer valid.
- *
- * The higher priority printing context takes over responsibility
- * to print the pending records.
- */
- if (!nbcon_emit_next_record(wctxt, true))
- return false;
-
- nbcon_context_release(ctxt);
-
- return ctxt->backlog;
-}
-
/**
* nbcon_legacy_emit_next_record - Print one record for an nbcon console
* in legacy contexts
--
2.39.2
next prev parent reply other threads:[~2024-08-27 4:43 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-27 4:43 [PATCH printk v4 00/17] add threaded printing + the rest John Ogness
2024-08-27 4:43 ` [PATCH printk v4 01/17] printk: nbcon: Add function for printers to reacquire ownership John Ogness
2024-08-27 11:57 ` Petr Mladek
2024-08-27 4:43 ` [PATCH printk v4 02/17] printk: Fail pr_flush() if before SYSTEM_SCHEDULING John Ogness
2024-08-27 12:00 ` Petr Mladek
2024-08-27 4:43 ` [PATCH printk v4 03/17] printk: Flush console on unregister_console() John Ogness
2024-08-27 4:43 ` [PATCH printk v4 04/17] printk: nbcon: Add context to usable() and emit() John Ogness
2024-08-27 12:21 ` Petr Mladek
2024-08-27 4:43 ` [PATCH printk v4 05/17] printk: nbcon: Init @nbcon_seq to highest possible John Ogness
2024-08-27 12:29 ` Petr Mladek
2024-08-27 4:43 ` [PATCH printk v4 06/17] printk: nbcon: Introduce printer kthreads John Ogness
2024-08-27 14:48 ` Petr Mladek
2024-08-28 17:33 ` John Ogness
2024-08-27 4:43 ` John Ogness [this message]
2024-08-27 14:50 ` [PATCH printk v4 07/17] printk: nbcon: Relocate nbcon_atomic_emit_one() Petr Mladek
2024-08-27 4:43 ` [PATCH printk v4 08/17] printk: nbcon: Use thread callback if in task context for legacy John Ogness
2024-08-27 15:09 ` Petr Mladek
2024-08-27 4:43 ` [PATCH printk v4 09/17] printk: nbcon: Rely on kthreads for normal operation John Ogness
2024-08-27 15:50 ` Petr Mladek
2024-08-27 21:13 ` John Ogness
2024-08-27 4:43 ` [PATCH printk v4 10/17] printk: Provide helper for message prepending John Ogness
2024-08-27 4:43 ` [PATCH printk v4 11/17] printk: nbcon: Show replay message on takeover John Ogness
2024-08-27 4:43 ` [PATCH printk v4 12/17] proc: consoles: Add notation to c_start/c_stop John Ogness
2024-08-27 4:43 ` [PATCH printk v4 13/17] proc: Add nbcon support for /proc/consoles John Ogness
2024-08-27 4:43 ` [PATCH printk v4 14/17] tty: sysfs: Add nbcon support for 'active' John Ogness
2024-08-27 4:43 ` [PATCH printk v4 15/17] printk: Implement legacy printer kthread for PREEMPT_RT John Ogness
2024-08-27 4:43 ` [PATCH printk v4 16/17] printk: nbcon: Assign nice -20 for printing threads John Ogness
2024-08-27 4:43 ` [PATCH printk v4 17/17] printk: Avoid false positive lockdep report for legacy printing 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=20240827044333.88596-8-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox