From: Joe Perches <joe@perches.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Petr Mladek <pmladek@suse.com>,
Steven Rostedt <rostedt@goodmis.org>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>
Subject: [RFC PATCH] vsprintf: Add %pv extension replacement for print_vma_addr
Date: Fri, 14 Aug 2020 10:53:03 -0700 [thread overview]
Message-ID: <09f11651f0e913e159b955ac447cd8cadf36cb0d.camel@perches.com> (raw)
There is a print_vma_addr function used several places
that requires KERN_CONT use.
Add a %pv mechanism to avoid the need for KERN_CONT.
An example conversion is arch/x86/kernel/signal.c
from:
if (show_unhandled_signals && printk_ratelimit()) {
printk("%s"
"%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx",
task_pid_nr(current) > 1 ? KERN_INFO : KERN_EMERG,
me->comm, me->pid, where, frame,
regs->ip, regs->sp, regs->orig_ax);
print_vma_addr(KERN_CONT " in ", regs->ip);
pr_cont("\n");
to:
printk("%s"
"%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx in %pv\n",
task_pid_nr(current) > 1 ? KERN_INFO : KERN_EMERG,
me->comm, me->pid, where, frame,
regs->ip, regs->sp, regs->orig_ax, (void *)regs->ip);
---
lib/vsprintf.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index c155769559ab..654402c43f8d 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -995,6 +995,12 @@ static const struct printf_spec default_dec_spec = {
.precision = -1,
};
+static const struct printf_spec default_hex_spec = {
+ .base = 16,
+ .precision = -1,
+ .flags = SMALL,
+};
+
static const struct printf_spec default_dec02_spec = {
.base = 10,
.field_width = 2,
@@ -2089,6 +2095,50 @@ char *fwnode_string(char *buf, char *end, struct fwnode_handle *fwnode,
return widen_string(buf, buf - buf_start, end, spec);
}
+static noinline_for_stack
+char *vma_addr(char *buf, char *end, void *ip,
+ struct printf_spec spec, const char *fmt)
+{
+#ifdef CONFIG_MMU
+ struct mm_struct *mm = current->mm;
+ struct vm_area_struct *vma;
+
+ /*
+ * we might be running from an atomic context so we cannot sleep
+ */
+ if (!mmap_read_trylock(mm))
+ return buf;
+
+ vma = find_vma(mm, (unsigned long)ip);
+ if (vma && vma->vm_file) {
+ char *p;
+ struct file *f = vma->vm_file;
+ char *page = (char *)__get_free_page(GFP_NOWAIT);
+
+ if (page) {
+ p = file_path(f, page, PAGE_SIZE);
+ if (IS_ERR(p))
+ p = "?";
+ buf = string(buf, end, kbasename(p), default_str_spec);
+ buf = string_nocheck(buf, end, "[", default_str_spec);
+ buf = pointer_string(buf, end,
+ (void *)vma->vm_start,
+ default_hex_spec);
+ buf = string_nocheck(buf, end, "+", default_str_spec);
+ buf = pointer_string(buf, end,
+ (void *)(vma->vm_end - vma->vm_start),
+ default_hex_spec);
+ buf = string_nocheck(buf, end, "]", default_str_spec);
+ free_page((unsigned long)page);
+ }
+ }
+ mmap_read_unlock(mm);
+#else
+ buf = string_nocheck(buf, end, "CONFIG_MMU=n", default_str_spec);
+#endif
+ return buf;
+}
+
/*
* Show a '%p' thing. A kernel extension is that the '%p' is followed
* by an extra set of alphanumeric characters that are extended format
@@ -2254,6 +2304,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
return uuid_string(buf, end, ptr, spec, fmt);
case 'V':
return va_format(buf, end, ptr, spec, fmt);
+ case 'v':
+ return vma_addr(buf, end, ptr, spec, fmt);
case 'K':
return restricted_pointer(buf, end, ptr, spec);
case 'N':
next reply other threads:[~2020-08-14 17:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-14 17:53 Joe Perches [this message]
2020-08-14 18:38 ` [RFC PATCH] vsprintf: Add %pv extension replacement for print_vma_addr Steven Rostedt
2020-08-14 19:24 ` Joe Perches
2020-08-15 3:52 ` Sergey Senozhatsky
2020-08-15 4:18 ` Joe Perches
2020-08-17 11:44 ` Andy Shevchenko
2020-08-17 14:39 ` Joe Perches
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=09f11651f0e913e159b955ac447cd8cadf36cb0d.camel@perches.com \
--to=joe@perches.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--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;
as well as URLs for NNTP newsgroup(s).