Linus Torvalds
22d368544b
A few more fixes for ftrace infrastructure. ...
I was cleaning out my INBOX and found two fixes from zhangwei from
a year ago that were lost in my mail. These fix an inconsistency between
trace_puts() and the way trace_printk() works. The reason this is
important to fix is because when trace_printk() doesn't have any
arguments, it turns into a trace_puts(). Not being able to enable a
stack trace against trace_printk() because it does not have any arguments
is quite confusing. Also, the fix is rather trivial and low risk.
While porting some changes to PowerPC I discovered that it still has
the function graph tracer filter bug that if you also enable stack tracing
the function graph tracer filter is ignored. I fixed that up.
Finally, Martin Lau, fixed a bug that would cause readers of the
ftrace ring buffer to block forever even though it was suppose to be
NONBLOCK.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJTxfAHAAoJEKQekfcNnQGueDkH/jQ/FgNPw+GbKuNpZwWqMQds
ivGM8yb6NgmlDQx60oBOL9TduKN2LCqW3HWDoyzduSozuLUxpRTPWtVThKo0Q9Fp
FPHWewdrX7DwWkyEqeG7FAAhjqPedgEZoDOwy7BArzJYpHcpex42trDY4BhjPrlM
ESA+/M+Xm1vGCJzcNSqNHYE/mF/tHptdM1mlLZ3g9ql49MiTbQxEMbHX7lih24sv
AzNP1SlisYN5CkX4hbRGhCYkZdmdVZt/xiyBAQRWCGFx+jsdJbMXDJnevDCdU9Mv
GNtKwqsi1/GeE5nvKxZyQKsDEE98Pd8LyQ0kDqKpAfTutqNE4mpWJkCxUqTmE4Q=
=aFqO
-----END PGP SIGNATURE-----
Merge tag 'trace-fixes-v3.16-rc5-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"A few more fixes for ftrace infrastructure.
I was cleaning out my INBOX and found two fixes from zhangwei from a
year ago that were lost in my mail. These fix an inconsistency
between trace_puts() and the way trace_printk() works. The reason
this is important to fix is because when trace_printk() doesn't have
any arguments, it turns into a trace_puts(). Not being able to enable
a stack trace against trace_printk() because it does not have any
arguments is quite confusing. Also, the fix is rather trivial and low
risk.
While porting some changes to PowerPC I discovered that it still has
the function graph tracer filter bug that if you also enable stack
tracing the function graph tracer filter is ignored. I fixed that up.
Finally, Martin Lau, fixed a bug that would cause readers of the
ftrace ring buffer to block forever even though it was suppose to be
NONBLOCK"
This also includes the fix from an earlier pull request:
"Oleg Nesterov fixed a memory leak that happens if a user creates a
tracing instance, sets up a filter in an event, and then removes that
instance. The filter allocates memory that is never freed when the
instance is destroyed"
* tag 'trace-fixes-v3.16-rc5-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
ring-buffer: Fix polling on trace_pipe
tracing: Add TRACE_ITER_PRINTK flag check in __trace_puts/__trace_bputs
tracing: Fix graph tracer with stack tracer on other archs
tracing: Add ftrace_trace_stack into __trace_puts/__trace_bputs
tracing: instance_rmdir() leaks ftrace_event_file->filter
2014-07-17 07:57:33 -10:00
kernel/printk: use symbolic defines for console loglevels
2014-06-04 16:54:17 -07:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-07-16 10:10:27 -10:00
gcov: add support for GCC 4.9
2014-06-10 15:34:46 -07:00
genirq: Fix memory leak when calling irq_free_hwirqs()
2014-07-05 21:42:08 +02:00
Merge branch 'locking-urgent-for-linus.patch' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-06-21 07:06:02 -10:00
x86, kaslr: boot-time selectable with hibernation
2014-06-16 23:30:44 +02:00
kernel/printk/printk.c: revert "printk: enable interrupts before calling console_trylock_for_printk()"
2014-07-03 09:21:54 -07:00
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-06-12 19:42:15 -07:00
Merge branch 'akpm' (patchbomb from Andrew) into next
2014-06-04 16:55:13 -07:00
ring-buffer: Fix polling on trace_pipe
2014-07-15 17:07:47 -04:00
Ignore generated file kernel/x509_certificate_list
2013-12-10 18:21:34 +00:00
ipc, kernel: clear whitespace
2014-06-06 16:08:14 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
audit: Use struct net not pid_t to remember the network namespce to reply in
2014-03-20 10:10:53 -04:00
inotify: Fix reporting of cookies for inotify events
2014-02-18 11:17:17 +01:00
inotify: Fix reporting of cookies for inotify events
2014-02-18 11:17:17 +01:00
Merge git://git.infradead.org/users/eparis/audit
2014-04-12 12:38:53 -07:00
auditsc: audit_krule mask accesses need bounds checking
2014-06-10 08:44:40 -07:00
kernel/backtracetest.c: replace no level printk by pr_info()
2014-06-04 16:54:14 -07:00
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
fs,userns: Change inode_capable to capable_wrt_inode_uidgid
2014-06-10 13:57:22 -07:00
cgroup: fix a race between cgroup_mount() and cgroup_kill_sb()
2014-06-30 10:16:26 -04:00
cgroup: remove css_parent()
2014-05-16 13:22:48 -04:00
kernel/compat.c: use sizeof() instead of sizeof
2014-06-04 16:54:19 -07:00
x86/kprobes: Fix build errors and blacklist context_track_user
2014-06-14 09:07:44 +02:00
More ACPI and power management updates for 3.16-rc1
2014-06-12 13:14:19 -07:00
cpuset: break kernfs active protection in cpuset_write_resmask()
2014-07-01 16:42:28 -04:00
kernel/delayacct.c: remove redundant checking in __delayacct_add_tsk()
2013-11-13 12:09:12 +09:00
switch elf_core_write_extra_phdrs() to dump_emit()
2013-11-09 00:16:23 -05:00
kernel/exec_domain.c: code clean-up
2014-06-04 16:54:15 -07:00
signals: mv {dis,}allow_signal() from sched.h/exit.c to signal.[ch]
2014-06-06 16:08:11 -07:00
asmlinkage: Make main_extable_sort_needed visible
2014-02-13 18:13:22 -08:00
tracing: Fix syscall_*regfunc() vs copy_process() race
2014-06-21 00:15:12 -04:00
libata, freezer: avoid block device removal while system is frozen
2013-12-19 13:50:32 -05:00
Merge branch 'next' (accumulated 3.16 merge window patches) into master
2014-06-08 11:31:16 -07:00
compat: Get rid of (get|put)_compat_time(val|spec)
2014-02-02 14:09:12 -08:00
kernel/groups.c: remove return value of set_groups
2014-04-03 16:21:05 -07:00
Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches
2014-06-06 07:55:06 +02:00
kernel/hung_task.c: convert simple_strtoul to kstrtouint
2014-06-04 16:54:15 -07:00
perf/x86: Warn to early_printk() in case irq_work is too slow
2014-02-21 21:49:07 +01:00
static_key: WARN on usage before jump_label_init was called
2013-10-19 19:45:35 -04:00
kernel: use macros from compiler.h instead of __attribute__((...))
2014-04-07 16:36:11 -07:00
kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS
2013-11-15 09:32:22 +09:00
locking/rwlocks: Introduce 'qrwlocks' - fair, queued rwlocks
2014-06-06 07:58:28 +02:00
kexec: save PG_head_mask in VMCOREINFO
2014-06-23 16:47:43 -07:00
signals: change wait_for_helper() to use kernel_sigaction()
2014-06-06 16:08:12 -07:00
kprobes: Show blacklist entries via debugfs
2014-04-24 10:26:41 +02:00
kobject: Make support for uevent_helper optional.
2014-04-25 12:00:49 -07:00
kthread: fix return value of kthread_create() upon SIGKILL.
2014-06-04 16:53:51 -07:00
kernel/latencytop.c: convert seq_printf to seq_puts
2014-06-04 16:54:15 -07:00
Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-03-31 14:13:25 -07:00
KEYS: Separate the kernel signature checking keyring from module signing
2013-09-25 17:17:01 +01:00
Most of this is cleaning up various driver sysfs permissions so we can
2014-06-11 16:09:14 -07:00
keys: change asymmetric keys to use common hash definitions
2013-10-25 17:15:18 -04:00
kprobes, notifier: Use NOKPROBE_SYMBOL macro in notifier
2014-04-24 10:26:39 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2013-09-07 14:35:32 -07:00
padata: Fix wrong usage of rcu_dereference()
2013-12-05 21:28:42 +08:00
kernel/panic.c: add "crash_kexec_post_notifiers" option for kdump after panic_notifers
2014-06-06 16:08:12 -07:00
param: hand arguments after -- straight to init
2014-04-28 11:48:34 +09:30
pidns: fix free_pid() to handle the first fork failure
2013-09-30 14:31:03 -07:00
pid_namespace: pidns_get() should check task_active_pid_ns() != NULL
2014-04-02 16:20:21 -07:00
posix-timers: Convert abuses of BUG_ON to WARN_ON
2013-12-09 16:56:29 +01:00
kernel/profile.c: use static const char instead of static char
2014-06-06 16:08:13 -07:00
kernel/compat: convert to COMPAT_SYSCALL_DEFINE
2014-03-06 15:35:10 +01:00
kernel/reboot.c: convert simple_strtoul to kstrtoint
2014-06-04 16:54:15 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
kernel/res_counter.c: replace simple_strtoull by kstrtoull
2014-06-04 16:54:15 -07:00
resources: Clarify sanity check message
2014-05-23 10:47:21 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
signals: introduce kernel_sigaction()
2014-06-06 16:08:12 -07:00
CPU hotplug, smp: flush any pending IPI callbacks before CPU offline
2014-06-23 16:47:43 -07:00
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
2014-05-22 11:36:10 +02:00
kernel/stop_machine.c: kernel-doc warning fix
2014-06-04 16:54:15 -07:00
sched: Consolidate open coded implementations of nice level frobbing into nice_to_rlimit() and rlimit_to_nice()
2014-05-22 11:16:36 +02:00
sys_sgetmask/sys_ssetmask: add CONFIG_SGETMASK_SYSCALL
2014-06-04 16:54:14 -07:00
kernel/watchdog.c: print traces for all cpus on lockup detection
2014-06-23 16:47:44 -07:00
kernel/sysctl_binary.c: use scnprintf() instead of snprintf()
2013-11-13 12:09:33 +09:00
KEYS: correct alignment of system_certificate_list content in assembly file
2013-12-10 18:25:28 +00:00
KEYS: correct alignment of system_certificate_list content in assembly file
2013-12-10 18:25:28 +00:00
task_work: documentation
2013-09-11 15:58:27 -07:00
genetlink: only pass array to genl_register_family_with_ops()
2013-11-19 16:39:05 -05:00
timer: Prevent overflow in apply_slack
2014-04-30 13:46:17 +02:00
torture: Remove __init from torture_init_begin/end
2014-05-14 09:46:30 -07:00
tracing: syscall_regfunc() should not skip kernel threads
2014-06-21 00:15:26 -04:00
userns: Kill nsown_capable it makes the wrong thing easy
2013-08-30 23:44:11 -07:00
smp: Rename __smp_call_function_single() to smp_call_function_single_async()
2014-02-24 14:47:15 -08:00
kernel/user.c: drop unused field 'files' from user_struct
2014-06-04 16:54:16 -07:00
kernel/user_namespace.c: kernel-doc/checkpatch fixes
2014-06-06 16:08:13 -07:00
userns: Kill nsown_capable it makes the wrong thing easy
2013-08-30 23:44:11 -07:00
sysctl: convert use of typedef ctl_table to struct ctl_table
2014-06-06 16:08:16 -07:00
kernel/watchdog.c: print traces for all cpus on lockup detection
2014-06-23 16:47:44 -07:00
workqueue: zero cpumask of wq_numa_possible_cpumask on init
2014-07-07 09:56:48 -04:00
workqueue: rename manager_mutex to attach_mutex
2014-05-20 10:59:32 -04:00
22d368544b