Commit d244b6bd authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt

Merge branch 'tip/perf/urgent-3' of...

Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4

Conflicts:
	kernel/trace/trace_events.c
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parents da5cabf8 1aa54bca
...@@ -3846,6 +3846,9 @@ int ring_buffer_read_page(struct ring_buffer *buffer, ...@@ -3846,6 +3846,9 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
rpos = reader->read; rpos = reader->read;
pos += size; pos += size;
if (rpos >= commit)
break;
event = rb_reader_event(cpu_buffer); event = rb_reader_event(cpu_buffer);
size = rb_event_length(event); size = rb_event_length(event);
} while (len > size); } while (len > size);
......
...@@ -3463,6 +3463,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, ...@@ -3463,6 +3463,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
size_t cnt, loff_t *fpos) size_t cnt, loff_t *fpos)
{ {
char *buf; char *buf;
size_t written;
if (tracing_disabled) if (tracing_disabled)
return -EINVAL; return -EINVAL;
...@@ -3484,11 +3485,15 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, ...@@ -3484,11 +3485,15 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
} else } else
buf[cnt] = '\0'; buf[cnt] = '\0';
cnt = mark_printk("%s", buf); written = mark_printk("%s", buf);
kfree(buf); kfree(buf);
*fpos += cnt; *fpos += written;
return cnt; /* don't tell userspace we wrote more - it might confuse them */
if (written > cnt)
written = cnt;
return written;
} }
static int tracing_clock_show(struct seq_file *m, void *v) static int tracing_clock_show(struct seq_file *m, void *v)
......
...@@ -598,88 +598,165 @@ system_enable_write(struct file *filp, const char __user *ubuf, size_t cnt, ...@@ -598,88 +598,165 @@ system_enable_write(struct file *filp, const char __user *ubuf, size_t cnt,
return ret; return ret;
} }
static void print_event_fields(struct trace_seq *s, struct list_head *head) enum {
FORMAT_HEADER = 1,
FORMAT_PRINTFMT = 2,
};
static void *f_next(struct seq_file *m, void *v, loff_t *pos)
{ {
struct ftrace_event_call *call = m->private;
struct ftrace_event_field *field; struct ftrace_event_field *field;
struct list_head *head;
list_for_each_entry_reverse(field, head, link) { (*pos)++;
/*
* Smartly shows the array type(except dynamic array).
* Normal:
* field:TYPE VAR
* If TYPE := TYPE[LEN], it is shown:
* field:TYPE VAR[LEN]
*/
const char *array_descriptor = strchr(field->type, '[');
if (!strncmp(field->type, "__data_loc", 10)) switch ((unsigned long)v) {
array_descriptor = NULL; case FORMAT_HEADER:
head = &ftrace_common_fields;
if (!array_descriptor) { if (unlikely(list_empty(head)))
trace_seq_printf(s, "\tfield:%s %s;\toffset:%u;" return NULL;
"\tsize:%u;\tsigned:%d;\n",
field->type, field->name, field->offset, field = list_entry(head->prev, struct ftrace_event_field, link);
field->size, !!field->is_signed); return field;
} else {
trace_seq_printf(s, "\tfield:%.*s %s%s;\toffset:%u;" case FORMAT_PRINTFMT:
"\tsize:%u;\tsigned:%d;\n", /* all done */
(int)(array_descriptor - field->type), return NULL;
field->type, field->name, }
array_descriptor, field->offset,
field->size, !!field->is_signed); head = trace_get_fields(call);
}
/*
* To separate common fields from event fields, the
* LSB is set on the first event field. Clear it in case.
*/
v = (void *)((unsigned long)v & ~1L);
field = v;
/*
* If this is a common field, and at the end of the list, then
* continue with main list.
*/
if (field->link.prev == &ftrace_common_fields) {
if (unlikely(list_empty(head)))
return NULL;
field = list_entry(head->prev, struct ftrace_event_field, link);
/* Set the LSB to notify f_show to print an extra newline */
field = (struct ftrace_event_field *)
((unsigned long)field | 1);
return field;
} }
/* If we are done tell f_show to print the format */
if (field->link.prev == head)
return (void *)FORMAT_PRINTFMT;
field = list_entry(field->link.prev, struct ftrace_event_field, link);
return field;
} }
static ssize_t static void *f_start(struct seq_file *m, loff_t *pos)
event_format_read(struct file *filp, char __user *ubuf, size_t cnt,
loff_t *ppos)
{ {
struct ftrace_event_call *call = filp->private_data; loff_t l = 0;
struct list_head *head; void *p;
struct trace_seq *s;
char *buf;
int r;
if (*ppos) /* Start by showing the header */
if (!*pos)
return (void *)FORMAT_HEADER;
p = (void *)FORMAT_HEADER;
do {
p = f_next(m, p, &l);
} while (p && l < *pos);
return p;
}
static int f_show(struct seq_file *m, void *v)
{
struct ftrace_event_call *call = m->private;
struct ftrace_event_field *field;
const char *array_descriptor;
switch ((unsigned long)v) {
case FORMAT_HEADER:
seq_printf(m, "name: %s\n", call->name);
seq_printf(m, "ID: %d\n", call->event.type);
seq_printf(m, "format:\n");
return 0; return 0;
s = kmalloc(sizeof(*s), GFP_KERNEL); case FORMAT_PRINTFMT:
if (!s) seq_printf(m, "\nprint fmt: %s\n",
return -ENOMEM; call->print_fmt);
return 0;
}
trace_seq_init(s); /*
* To separate common fields from event fields, the
* LSB is set on the first event field. Clear it and
* print a newline if it is set.
*/
if ((unsigned long)v & 1) {
seq_putc(m, '\n');
v = (void *)((unsigned long)v & ~1L);
}
trace_seq_printf(s, "name: %s\n", call->name); field = v;
trace_seq_printf(s, "ID: %d\n", call->event.type);
trace_seq_printf(s, "format:\n");
/* print common fields */ /*
print_event_fields(s, &ftrace_common_fields); * Smartly shows the array type(except dynamic array).
* Normal:
* field:TYPE VAR
* If TYPE := TYPE[LEN], it is shown:
* field:TYPE VAR[LEN]
*/
array_descriptor = strchr(field->type, '[');
trace_seq_putc(s, '\n'); if (!strncmp(field->type, "__data_loc", 10))
array_descriptor = NULL;
/* print event specific fields */ if (!array_descriptor)
head = trace_get_fields(call); seq_printf(m, "\tfield:%s %s;\toffset:%u;\tsize:%u;\tsigned:%d;\n",
print_event_fields(s, head); field->type, field->name, field->offset,
field->size, !!field->is_signed);
else
seq_printf(m, "\tfield:%.*s %s%s;\toffset:%u;\tsize:%u;\tsigned:%d;\n",
(int)(array_descriptor - field->type),
field->type, field->name,
array_descriptor, field->offset,
field->size, !!field->is_signed);
r = trace_seq_printf(s, "\nprint fmt: %s\n", call->print_fmt); return 0;
}
if (!r) { static void f_stop(struct seq_file *m, void *p)
/* {
* ug! The format output is bigger than a PAGE!! }
*/
buf = "FORMAT TOO BIG\n";
r = simple_read_from_buffer(ubuf, cnt, ppos,
buf, strlen(buf));
goto out;
}
r = simple_read_from_buffer(ubuf, cnt, ppos, static const struct seq_operations trace_format_seq_ops = {
s->buffer, s->len); .start = f_start,
out: .next = f_next,
kfree(s); .stop = f_stop,
return r; .show = f_show,
};
static int trace_format_open(struct inode *inode, struct file *file)
{
struct ftrace_event_call *call = inode->i_private;
struct seq_file *m;
int ret;
ret = seq_open(file, &trace_format_seq_ops);
if (ret < 0)
return ret;
m = file->private_data;
m->private = call;
return 0;
} }
static ssize_t static ssize_t
...@@ -877,8 +954,10 @@ static const struct file_operations ftrace_enable_fops = { ...@@ -877,8 +954,10 @@ static const struct file_operations ftrace_enable_fops = {
}; };
static const struct file_operations ftrace_event_format_fops = { static const struct file_operations ftrace_event_format_fops = {
.open = tracing_open_generic, .open = trace_format_open,
.read = event_format_read, .read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
}; };
static const struct file_operations ftrace_event_id_fops = { static const struct file_operations ftrace_event_id_fops = {
......
...@@ -507,7 +507,15 @@ get_return_for_leaf(struct trace_iterator *iter, ...@@ -507,7 +507,15 @@ get_return_for_leaf(struct trace_iterator *iter,
* if the output fails. * if the output fails.
*/ */
data->ent = *curr; data->ent = *curr;
data->ret = *next; /*
* If the next event is not a return type, then
* we only care about what type it is. Otherwise we can
* safely copy the entire event.
*/
if (next->ent.type == TRACE_GRAPH_RET)
data->ret = *next;
else
data->ret.ent.type = next->ent.type;
} }
} }
......
...@@ -159,6 +159,7 @@ my $section_regex; # Find the start of a section ...@@ -159,6 +159,7 @@ my $section_regex; # Find the start of a section
my $function_regex; # Find the name of a function my $function_regex; # Find the name of a function
# (return offset and func name) # (return offset and func name)
my $mcount_regex; # Find the call site to mcount (return offset) my $mcount_regex; # Find the call site to mcount (return offset)
my $mcount_adjust; # Address adjustment to mcount offset
my $alignment; # The .align value to use for $mcount_section my $alignment; # The .align value to use for $mcount_section
my $section_type; # Section header plus possible alignment command my $section_type; # Section header plus possible alignment command
my $can_use_local = 0; # If we can use local function references my $can_use_local = 0; # If we can use local function references
...@@ -213,6 +214,7 @@ $section_regex = "Disassembly of section\\s+(\\S+):"; ...@@ -213,6 +214,7 @@ $section_regex = "Disassembly of section\\s+(\\S+):";
$function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:"; $function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:";
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount\$"; $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount\$";
$section_type = '@progbits'; $section_type = '@progbits';
$mcount_adjust = 0;
$type = ".long"; $type = ".long";
if ($arch eq "x86_64") { if ($arch eq "x86_64") {
...@@ -351,6 +353,9 @@ if ($arch eq "x86_64") { ...@@ -351,6 +353,9 @@ if ($arch eq "x86_64") {
} elsif ($arch eq "microblaze") { } elsif ($arch eq "microblaze") {
# Microblaze calls '_mcount' instead of plain 'mcount'. # Microblaze calls '_mcount' instead of plain 'mcount'.
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
} elsif ($arch eq "blackfin") {
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$";
$mcount_adjust = -4;
} else { } else {
die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD"; die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD";
} }
...@@ -511,7 +516,7 @@ while (<IN>) { ...@@ -511,7 +516,7 @@ while (<IN>) {
} }
# is this a call site to mcount? If so, record it to print later # is this a call site to mcount? If so, record it to print later
if ($text_found && /$mcount_regex/) { if ($text_found && /$mcount_regex/) {
push(@offsets, hex $1); push(@offsets, (hex $1) + $mcount_adjust);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment