From: Sumit Garg <sumit.garg@linaro.org>
To: daniel.thompson@linaro.org
Cc: kgdb-bugreport@lists.sourceforge.net, jason.wessel@windriver.com,
dianders@chromium.org, pmladek@suse.com,
sergey.senozhatsky@gmail.com, linux-kernel@vger.kernel.org,
Sumit Garg <sumit.garg@linaro.org>
Subject: [PATCH v3 1/4] kdb: Re-factor kdb_printf() message write code
Date: Wed, 27 May 2020 11:55:56 +0530 [thread overview]
Message-ID: <1590560759-21453-2-git-send-email-sumit.garg@linaro.org> (raw)
In-Reply-To: <1590560759-21453-1-git-send-email-sumit.garg@linaro.org>
Re-factor kdb_printf() message write code in order to avoid duplication
of code and thereby increase readability.
Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
---
kernel/debug/kdb/kdb_io.c | 61 +++++++++++++++++++++++++----------------------
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
index 924bc92..f6b4d47 100644
--- a/kernel/debug/kdb/kdb_io.c
+++ b/kernel/debug/kdb/kdb_io.c
@@ -542,6 +542,33 @@ static int kdb_search_string(char *searched, char *searchfor)
return 0;
}
+static void kdb_io_write(char *cp, int len, void (*io_put_char)(u8 ch))
+{
+ if (len <= 0)
+ return;
+
+ while (len--) {
+ io_put_char(*cp);
+ cp++;
+ }
+}
+
+static void kdb_msg_write(char *msg, int msg_len)
+{
+ struct console *c;
+
+ if (msg_len <= 0)
+ return;
+
+ if (dbg_io_ops && !dbg_io_ops->is_console)
+ kdb_io_write(msg, msg_len, dbg_io_ops->write_char);
+
+ for_each_console(c) {
+ c->write(c, msg, msg_len);
+ touch_nmi_watchdog();
+ }
+}
+
int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
{
int diag;
@@ -553,7 +580,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
int this_cpu, old_cpu;
char *cp, *cp2, *cphold = NULL, replaced_byte = ' ';
char *moreprompt = "more> ";
- struct console *c;
unsigned long uninitialized_var(flags);
/* Serialize kdb_printf if multiple cpus try to write at once.
@@ -687,22 +713,11 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
*/
retlen = strlen(kdb_buffer);
cp = (char *) printk_skip_headers(kdb_buffer);
- if (!dbg_kdb_mode && kgdb_connected) {
+ if (!dbg_kdb_mode && kgdb_connected)
gdbstub_msg_write(cp, retlen - (cp - kdb_buffer));
- } else {
- if (dbg_io_ops && !dbg_io_ops->is_console) {
- len = retlen - (cp - kdb_buffer);
- cp2 = cp;
- while (len--) {
- dbg_io_ops->write_char(*cp2);
- cp2++;
- }
- }
- for_each_console(c) {
- c->write(c, cp, retlen - (cp - kdb_buffer));
- touch_nmi_watchdog();
- }
- }
+ else
+ kdb_msg_write(cp, retlen - (cp - kdb_buffer));
+
if (logging) {
saved_loglevel = console_loglevel;
console_loglevel = CONSOLE_LOGLEVEL_SILENT;
@@ -751,19 +766,7 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
moreprompt = "more> ";
kdb_input_flush();
-
- if (dbg_io_ops && !dbg_io_ops->is_console) {
- len = strlen(moreprompt);
- cp = moreprompt;
- while (len--) {
- dbg_io_ops->write_char(*cp);
- cp++;
- }
- }
- for_each_console(c) {
- c->write(c, moreprompt, strlen(moreprompt));
- touch_nmi_watchdog();
- }
+ kdb_msg_write(moreprompt, strlen(moreprompt));
if (logging)
printk("%s", moreprompt);
--
2.7.4
next prev parent reply other threads:[~2020-05-27 6:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 6:25 [PATCH v3 0/4] kdb: Improve console handling Sumit Garg
2020-05-27 6:25 ` Sumit Garg [this message]
2020-05-27 8:29 ` [PATCH v3 1/4] kdb: Re-factor kdb_printf() message write code Daniel Thompson
2020-05-27 10:01 ` Sumit Garg
2020-05-27 6:25 ` [PATCH v3 2/4] kdb: Check status of console prior to invoking handlers Sumit Garg
2020-05-27 14:26 ` Daniel Thompson
2020-05-27 6:25 ` [PATCH v3 3/4] kdb: Make kdb_printf robust to run in NMI context Sumit Garg
2020-05-27 14:26 ` Daniel Thompson
2020-05-28 7:42 ` Sumit Garg
2020-05-27 6:25 ` [PATCH v3 4/4] kdb: Switch kdb_msg_write() to use safer polling I/O Sumit Garg
2020-05-27 13:31 ` Daniel Thompson
2020-05-28 6:18 ` Sumit Garg
2020-05-28 11:26 ` Daniel Thompson
2020-05-28 14:57 ` Petr Mladek
2020-05-29 5:46 ` Sumit Garg
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=1590560759-21453-2-git-send-email-sumit.garg@linaro.org \
--to=sumit.garg@linaro.org \
--cc=daniel.thompson@linaro.org \
--cc=dianders@chromium.org \
--cc=jason.wessel@windriver.com \
--cc=kgdb-bugreport@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--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;
as well as URLs for NNTP newsgroup(s).