5:18 p.m.
Hi,
These are update patches to have crash extract the trace_bprintk()
formats from a kernel core dump. It handles the current format
and a new format that I'll be pushing out after the merge window
has closed for Linux 2.6.40. The new format is required for the
kernel debugfs to export the same bprintk data as well.
This means that crash will be able to extract more information than
trace-cmd itself can on a running kernel :)
-- Steve
5:18 p.m.
New subject: [PATCH 1/3] crash-trace-command: Fix help for trace extension
The help on trace shows that -s is not implemented.
As it is implemented, change the help message not to say it
isn't.
Signed-off-by: Steven Rostedt <rostedt(a)goodmis.org>
Index: crash-5.1.3/extensions/trace.c
===================================================================
--- crash-5.1.3.orig/extensions/trace.c
+++ crash-5.1.3/extensions/trace.c
@@ -2969,7 +2969,7 @@ static char *help_ftrace[] = {
" by other tracing tools. The dirs and files are generated",
" the same as debugfs/tracing.",
" -m: also dump metadata of ftrace.",
-" -s: also dump symbols of the kernel <not implemented>.",
+" -s: also dump symbols of the kernel.",
"trace dump -t [output-file-name]",
" dump ring_buffers and all meta data to a file that can",
" be parsed by trace-cmd. Default output file name is
\"trace.dat\".",
5:18 p.m.
New subject: [PATCH 2/3] crash-trace-command: Include trace_printk() formats for modules
If a module has a trace_printk() and it is optimized to be a
trace_bprintk() then we want to save the format for that as well.
The trace_bprintk() just saves the pointer of the format in the
ftrace ring buffer, thus trace-cmd requires the mapping of that
address to the format.
Signed-off-by: Steven Rostedt <rostedt(a)goodmis.org>
Index: crash-5.1.3/extensions/trace.c
===================================================================
--- crash-5.1.3.orig/extensions/trace.c
+++ crash-5.1.3/extensions/trace.c
@@ -3341,13 +3341,48 @@ static int save_proc_kallsyms(int fd)
return tmp_file_flush(fd);
}
+static int add_print_address(long address)
+{
+ char string[4096];
+ size_t len;
+ int i;
+
+ len = read_string(address, string, sizeof(string));
+ if (!len)
+ return -1;
+
+ tmp_fprintf("0x%lx : \"", address);
+
+ for (i = 0; string[i]; i++) {
+ switch (string[i]) {
+ case '\n':
+ tmp_fprintf("\\n");
+ break;
+ case '\t':
+ tmp_fprintf("\\t");
+ break;
+ case '\\':
+ tmp_fprintf("\\\\");
+ break;
+ case '"':
+ tmp_fprintf("\\\"");
+ break;
+ default:
+ tmp_fprintf("%c", string[i]);
+ }
+ }
+ tmp_fprintf("\"\n");
+
+ return 0;
+}
+
static int save_ftrace_printk(int fd)
{
- struct syment *s, *e;
+ struct kernel_list_head *mod_fmt;
+ struct syment *s, *e, *b;
long bprintk_fmt_s, bprintk_fmt_e;
- char string[4096];
long *address;
- size_t i, count;
+ size_t i, count, len;
s = symbol_search("__start___trace_bprintk_fmt");
e = symbol_search("__stop___trace_bprintk_fmt");
@@ -3374,37 +3409,43 @@ static int save_ftrace_printk(int fd)
}
for (i = 0; i < count; i++) {
- size_t len = read_string(address[i], string, sizeof(string));
- if (!len) {
+ if (add_print_address(address[i]) < 0) {
free(address);
return -1;
}
+ }
- tmp_fprintf("0x%lx : \"", address[i]);
+ free(address);
- for (i = 0; string[i]; i++) {
- switch (string[i]) {
- case '\n':
- tmp_fprintf("\\n");
- break;
- case '\t':
- tmp_fprintf("\\t");
- break;
- case '\\':
- tmp_fprintf("\\\\");
- break;
- case '"':
- tmp_fprintf("\\\"");
- break;
- default:
- tmp_fprintf("%c", string[i]);
- }
- }
- tmp_fprintf("\"\n");
+ /* Add modules */
+ b = symbol_search("trace_bprintk_fmt_list");
+ if (!b)
+ goto out;
+
+ mod_fmt = (struct kernel_list_head *)GETBUF(SIZE(list_head));
+ if (!readmem(b->value, KVADDR, mod_fmt,
+ SIZE(list_head), "trace_bprintk_fmt_list contents",
+ RETURN_ON_ERROR))
+ goto out_free;
+
+ while ((unsigned long)mod_fmt->next != b->value) {
+ unsigned long addr;
+
+ addr = (unsigned long)mod_fmt->next + SIZE(list_head);
+
+ if (!readmem((unsigned long)mod_fmt->next, KVADDR, mod_fmt,
+ SIZE(list_head), "trace_bprintk_fmt_list contents",
+ RETURN_ON_ERROR))
+ goto out_free;
+
+ if (add_print_address(addr) < 0)
+ goto out_free;
}
- free(address);
+ out_free:
+ FREEBUF(mod_fmt);
+ out:
if (tmp_file_record_size4(fd))
return -1;
return tmp_file_flush(fd);
5:21 a.m.
New subject: [PATCH 2/3] crash-trace-command: Include trace_printk() formats for modules
On 03/23/2011 06:18 AM, Steven Rostedt wrote:
If a module has a trace_printk() and it is optimized to be a
trace_bprintk() then we want to save the format for that as well.
The trace_bprintk() just saves the pointer of the format in the
ftrace ring buffer, thus trace-cmd requires the mapping of that
address to the format.
Signed-off-by: Steven Rostedt <rostedt(a)goodmis.org>
Thanks you for your contribution.
All the patches are reviewed and tested, they are good!
+
static int save_ftrace_printk(int fd)
{
- struct syment *s, *e;
+ struct kernel_list_head *mod_fmt;
+ struct syment *s, *e, *b;
long bprintk_fmt_s, bprintk_fmt_e;
- char string[4096];
long *address;
- size_t i, count;
+ size_t i, count, len;
This "len" is unused and cause the compiler warning:
gcc -Wall -I/usr/include/crash -nostartfiles -shared -rdynamic -o trace.so trace.c -fPIC
-DX86_64
trace.c: In function ‘save_ftrace_printk’:
trace.c:1918:19: warning: unused variable ‘len’
I can fix it and apply the patches to the crash-trace-command git tree,
but these patches will be also applied to the upstream crash utility by Dave,
Could you resend the patches with the fix.
Thanks you very much.
Lai.
6:52 a.m.
New subject: [PATCH 2/3] crash-trace-command: Include trace_printk() formats for modules
On Wed, 2011-03-23 at 18:21 +0800, Lai Jiangshan wrote:
O
> +
> static int save_ftrace_printk(int fd)
> {
> - struct syment *s, *e;
> + struct kernel_list_head *mod_fmt;
> + struct syment *s, *e, *b;
> long bprintk_fmt_s, bprintk_fmt_e;
> - char string[4096];
> long *address;
> - size_t i, count;
> + size_t i, count, len;
>
This "len" is unused and cause the compiler warning:
gcc -Wall -I/usr/include/crash -nostartfiles -shared -rdynamic -o trace.so trace.c -fPIC
-DX86_64
trace.c: In function ‘save_ftrace_printk’:
trace.c:1918:19: warning: unused variable ‘len’
Hmm, that must have been left over from one of my "variations".
I can fix it and apply the patches to the crash-trace-command git tree,
but these patches will be also applied to the upstream crash utility by Dave,
Could you resend the patches with the fix.
I'll fix it. As I also found that patch 3 fixes a bug in patch 2. That
fix belongs in patch 2.
I'll resend later today.
Thanks for the review!
-- Steve
5:18 p.m.
New subject: [PATCH 3/3] crash-trace-command: Update crash to handle new bprintk format structure
The bprintk format structure may change in the near future. Update the
reading of the structure to comply with the change.
Signed-off-by: Steven Rostedt <rostedt(a)goodmis.org>
Index: crash-5.1.3/extensions/trace.c
===================================================================
--- crash-5.1.3.orig/extensions/trace.c
+++ crash-5.1.3/extensions/trace.c
@@ -3383,6 +3383,7 @@ static int save_ftrace_printk(int fd)
long bprintk_fmt_s, bprintk_fmt_e;
long *address;
size_t i, count, len;
+ int addr_is_array = 0;
s = symbol_search("__start___trace_bprintk_fmt");
e = symbol_search("__stop___trace_bprintk_fmt");
@@ -3393,10 +3394,8 @@ static int save_ftrace_printk(int fd)
bprintk_fmt_e = e->value;
count = (bprintk_fmt_e - bprintk_fmt_s) / sizeof(long);
- if (count == 0) {
- unsigned int size = 0;
- return write_and_check(fd, &size, 4);
- }
+ if (count == 0)
+ goto do_mods;
address = malloc(count * sizeof(long));
if (address == NULL)
@@ -3417,11 +3416,23 @@ static int save_ftrace_printk(int fd)
free(address);
+ do_mods:
+
/* Add modules */
b = symbol_search("trace_bprintk_fmt_list");
if (!b)
goto out;
+ switch (MEMBER_TYPE("trace_bprintk_fmt", "fmt")) {
+ case TYPE_CODE_ARRAY:
+ addr_is_array = 1;
+ break;
+ case TYPE_CODE_PTR:
+ default:
+ /* default not array */
+ break;
+ }
+
mod_fmt = (struct kernel_list_head *)GETBUF(SIZE(list_head));
if (!readmem(b->value, KVADDR, mod_fmt,
SIZE(list_head), "trace_bprintk_fmt_list contents",
@@ -3432,6 +3443,12 @@ static int save_ftrace_printk(int fd)
unsigned long addr;
addr = (unsigned long)mod_fmt->next + SIZE(list_head);
+ if (!addr_is_array) {
+ if (!readmem(addr, KVADDR, &addr, sizeof(addr),
+ "trace_bprintk_fmt_list fmt field",
+ RETURN_ON_ERROR))
+ goto out_free;
+ }
if (!readmem((unsigned long)mod_fmt->next, KVADDR, mod_fmt,
SIZE(list_head), "trace_bprintk_fmt_list contents",
@@ -3440,15 +3457,20 @@ static int save_ftrace_printk(int fd)
if (add_print_address(addr) < 0)
goto out_free;
+ count++;
}
out_free:
-
FREEBUF(mod_fmt);
out:
+ if (count == 0) {
+ unsigned int size = 0;
+ return write_and_check(fd, &size, 4);
+ }
if (tmp_file_record_size4(fd))
return -1;
return tmp_file_flush(fd);
+
}
static int save_ftrace_cmdlines(int fd)
4917
days inactive
4918
days old
devel@lists.crash-utility.osci.io
5 comments
2 participants
participants (2)
-
Lai Jiangshan -
Steven Rostedt