History

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

Ingo Molnar committed 14 years ago

Commit 09bda442 parents d1e169d 47b0edc15 files · +118 −44Browse files

Showing the changes to kernel (7 of 15 files). Show all

Unified · Split

7 files
  1. kernel/irq/chip.c +2 −0
  2. kernel/printk.c +5 −0
  3. kernel/softirq.c +6 −0
  4. kernel/trace/ftrace.c +10 −7
  5. kernel/trace/trace.c +3 −3
  6. kernel/trace/trace_events_filter.c +3 −4
  7. kernel/trace/trace_syscalls.c +2 −2
kernel/irq/chip.c+2−0
@@ -16,6 +16,8 @@ · 15 unmodified lines
1616 #include <linux/interrupt.h>
1717 #include <linux/kernel_stat.h>
1818
19+#include <trace/events/irq.h>
20+
1921 #include "internals.h"
2022
2123 /**
kernel/printk.c+5−0
@@ -44,6 +44,9 @@ · 43 unmodified lines
4444
4545 #include <asm/uaccess.h>
4646
47+#define CREATE_TRACE_POINTS
48+#include <trace/events/printk.h>
49+
4750 /*
4851 * Architectures can override it:
4952 */
@@ -542,6 +545,8 @@ MODULE_PARM_DESC(ignore_loglevel, "ignore loglevel setting, to" · 492 unmodified lines
542545 static void _call_console_drivers(unsigned start,
543546 unsigned end, int msg_log_level)
544547 {
548+ trace_console(&LOG_BUF(0), start, end, log_buf_len);
549+
545550 if ((msg_log_level < console_loglevel || ignore_loglevel) &&
546551 console_drivers && start != end) {
547552 if ((start & LOG_BUF_MASK) > (end & LOG_BUF_MASK)) {
kernel/softirq.c+6−0
@@ -385,6 +385,12 @@ void raise_softirq(unsigned int nr) · 384 unmodified lines
385385 local_irq_restore(flags);
386386 }
387387
388+void __raise_softirq_irqoff(unsigned int nr)
389+{
390+ trace_softirq_raise(nr);
391+ or_softirq_pending(1UL << nr);
392+}
393+
388394 void open_softirq(int nr, void (*action)(struct softirq_action *))
389395 {
390396 softirq_vec[nr].action = action;
kernel/trace/ftrace.c+10−7
@@ -1129,7 +1129,7 @@ static struct ftrace_hash *alloc_ftrace_hash(int size_bits) · 1128 unmodified lines
11291129 return NULL;
11301130
11311131 size = 1 << size_bits;
1132− hash->buckets = kzalloc(sizeof(*hash->buckets) * size, GFP_KERNEL);
1132+ hash->buckets = kcalloc(size, sizeof(*hash->buckets), GFP_KERNEL);
11331133
11341134 if (!hash->buckets) {
11351135 kfree(hash);
@@ -3146,8 +3146,10 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len, · 2010 unmodified lines
31463146 mutex_lock(&ftrace_regex_lock);
31473147 if (reset)
31483148 ftrace_filter_reset(hash);
3149− if (buf)
3150− ftrace_match_records(hash, buf, len);
3149+ if (buf && !ftrace_match_records(hash, buf, len)) {
3150+ ret = -EINVAL;
3151+ goto out_regex_unlock;
3152+ }
31513153
31523154 mutex_lock(&ftrace_lock);
31533155 ret = ftrace_hash_move(ops, enable, orig_hash, hash);
@@ -3157,6 +3159,7 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len, · 3 unmodified lines
31573159
31583160 mutex_unlock(&ftrace_lock);
31593161
3162+ out_regex_unlock:
31603163 mutex_unlock(&ftrace_regex_lock);
31613164
31623165 free_ftrace_hash(hash);
@@ -3173,10 +3176,10 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len, · 10 unmodified lines
31733176 * Filters denote which functions should be enabled when tracing is enabled.
31743177 * If @buf is NULL and reset is set, all functions will be enabled for tracing.
31753178 */
3176−void ftrace_set_filter(struct ftrace_ops *ops, unsigned char *buf,
3179+int ftrace_set_filter(struct ftrace_ops *ops, unsigned char *buf,
31773180 int len, int reset)
31783181 {
3179− ftrace_set_regex(ops, buf, len, reset, 1);
3182+ return ftrace_set_regex(ops, buf, len, reset, 1);
31803183 }
31813184 EXPORT_SYMBOL_GPL(ftrace_set_filter);
31823185
@@ -3191,10 +3194,10 @@ EXPORT_SYMBOL_GPL(ftrace_set_filter); · 8 unmodified lines
31913194 * is enabled. If @buf is NULL and reset is set, all functions will be enabled
31923195 * for tracing.
31933196 */
3194−void ftrace_set_notrace(struct ftrace_ops *ops, unsigned char *buf,
3197+int ftrace_set_notrace(struct ftrace_ops *ops, unsigned char *buf,
31953198 int len, int reset)
31963199 {
3197− ftrace_set_regex(ops, buf, len, reset, 0);
3200+ return ftrace_set_regex(ops, buf, len, reset, 0);
31983201 }
31993202 EXPORT_SYMBOL_GPL(ftrace_set_notrace);
32003203 /**
kernel/trace/trace.c+3−3
@@ -2764,12 +2764,12 @@ static const char readme_msg[] = · 2763 unmodified lines
27642764 "tracing mini-HOWTO:\n\n"
27652765 "# mount -t debugfs nodev /sys/kernel/debug\n\n"
27662766 "# cat /sys/kernel/debug/tracing/available_tracers\n"
2767− "wakeup preemptirqsoff preemptoff irqsoff function sched_switch nop\n\n"
2767+ "wakeup wakeup_rt preemptirqsoff preemptoff irqsoff function nop\n\n"
27682768 "# cat /sys/kernel/debug/tracing/current_tracer\n"
27692769 "nop\n"
2770− "# echo sched_switch > /sys/kernel/debug/tracing/current_tracer\n"
2770+ "# echo wakeup > /sys/kernel/debug/tracing/current_tracer\n"
27712771 "# cat /sys/kernel/debug/tracing/current_tracer\n"
2772− "sched_switch\n"
2772+ "wakeup\n"
27732773 "# cat /sys/kernel/debug/tracing/trace_options\n"
27742774 "noprint-parent nosym-offset nosym-addr noverbose\n"
27752775 "# echo print-parent > /sys/kernel/debug/tracing/trace_options\n"
kernel/trace/trace_events_filter.c+3−4
@@ -685,7 +685,7 @@ find_event_field(struct ftrace_event_call *call, char *name) · 684 unmodified lines
685685
686686 static int __alloc_pred_stack(struct pred_stack *stack, int n_preds)
687687 {
688− stack->preds = kzalloc(sizeof(*stack->preds)*(n_preds + 1), GFP_KERNEL);
688+ stack->preds = kcalloc(n_preds + 1, sizeof(*stack->preds), GFP_KERNEL);
689689 if (!stack->preds)
690690 return -ENOMEM;
691691 stack->index = n_preds;
@@ -826,8 +826,7 @@ static int __alloc_preds(struct event_filter *filter, int n_preds) · 134 unmodified lines
826826 if (filter->preds)
827827 __free_preds(filter);
828828
829− filter->preds =
830− kzalloc(sizeof(*filter->preds) * n_preds, GFP_KERNEL);
829+ filter->preds = kcalloc(n_preds, sizeof(*filter->preds), GFP_KERNEL);
831830
832831 if (!filter->preds)
833832 return -ENOMEM;
@@ -1486,7 +1485,7 @@ static int fold_pred(struct filter_pred *preds, struct filter_pred *root) · 652 unmodified lines
14861485 children = count_leafs(preds, &preds[root->left]);
14871486 children += count_leafs(preds, &preds[root->right]);
14881487
1489− root->ops = kzalloc(sizeof(*root->ops) * children, GFP_KERNEL);
1488+ root->ops = kcalloc(children, sizeof(*root->ops), GFP_KERNEL);
14901489 if (!root->ops)
14911490 return -ENOMEM;
14921491
kernel/trace/trace_syscalls.c+2−2
@@ -468,8 +468,8 @@ int __init init_ftrace_syscalls(void) · 467 unmodified lines
468468 unsigned long addr;
469469 int i;
470470
471− syscalls_metadata = kzalloc(sizeof(*syscalls_metadata) *
472− NR_syscalls, GFP_KERNEL);
471+ syscalls_metadata = kcalloc(NR_syscalls, sizeof(*syscalls_metadata),
472+ GFP_KERNEL);
473473 if (!syscalls_metadata) {
474474 WARN_ON(1);
475475 return -ENOMEM;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t