Arnaldo Carvalho de Melo d008d5258e perf: Fix up MMAP2 buffer space reservation ...

The ino_generation field was added in the PERF_RECORD_MMAP2 record in
the 13d7a24 cset but no space for it was allocated, corrupting the
PERF_FORMAT_{TIME,CPU,TID,etc} area (sample_type/sample_id_all), fix it.

Detected with one of the regression tests done by 'perf test':

  [root@sandy ~]# perf test -v 7
   7: Validate PERF_RECORD_* events & perf_sample fields     :
  --- start ---
  61315294449606 0 PERF_RECORD_SAMPLE
  61315294453161 0 PERF_RECORD_SAMPLE
  61315294454441 0 PERF_RECORD_SAMPLE
  61315294455709 0 PERF_RECORD_SAMPLE
  61315295600899 0 PERF_RECORD_COMM: sleep:6500
  27917287430500 342521613 PERF_RECORD_MMAP2 6500/6500: [0x400000(0x7000) @ 0 00:1d 311442 9016]: /usr/bin/sleep
  MMAP2 going backwards in time, prev=61315295600899, curr=27917287430500
  MMAP2 with unexpected cpu, expected 0, got 342521613
  MMAP2 with unexpected pid, expected 6500, got 1701606191
  MMAP2 with unexpected tid, expected 6500, got 28773
  27917287430500 342561333 PERF_RECORD_MMAP2 6500/6500: [0x3b7e000000(0x223000) @ 0 00:1d 309186 9016]: /usr/lib64/ld-2.16.so
  MMAP2 with unexpected cpu, expected 0, got 342561333
  MMAP2 with unexpected pid, expected 6500, got 1932408369
  MMAP2 with unexpected tid, expected 6500, got 111
  27917287430500 342600095 PERF_RECORD_MMAP2 6500/6500: [0x7fffbd7dc000(0x1000) @ 0x7fffbd7dc000 00:00 0 0]: [vdso]
  MMAP2 with unexpected cpu, expected 0, got 342600095
  MMAP2 with unexpected pid, expected 6500, got 1935963739
  MMAP2 with unexpected tid, expected 6500, got 23919
  27917287430500 342882834 PERF_RECORD_MMAP2 6500/6500: [0x3b7e400000(0x3b8000) @ 0 00:1d 309187 9016]: /usr/lib64/libc-2.16.so
  MMAP2 with unexpected cpu, expected 0, got 342882834
  MMAP2 with unexpected pid, expected 6500, got 909192754
  MMAP2 with unexpected tid, expected 6500, got 7303982
  61316297195411 0 PERF_RECORD_EXIT(6500:6500):(6500:6500)
  ---- end ----
  Validate PERF_RECORD_* events & perf_sample fields: FAILED!
  [root@sandy ~]#

After this patch:

  [root@sandy ~]# perf test 7
   7: Validate PERF_RECORD_* events & perf_sample fields     : Ok
  [root@sandy ~]#

Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Stephane Eranian <eranian@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-heeuv986b8ha7whqg4o3he7c@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

2013-09-11 10:11:46 -03:00

..

cpu

idle: Enable interrupts in the weak arch_cpu_idle() implementation

2013-06-14 23:01:05 +02:00

debug

kgdb/sysrq: fix inconstistent help message of sysrq key

2013-04-30 17:04:10 -07:00

events

perf: Fix up MMAP2 buffer space reservation

2013-09-11 10:11:46 -03:00

gcov

kernel/gcov: remove depends on CONFIG_EXPERIMENTAL

2013-01-11 11:39:33 -08:00

irq

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-07-13 15:37:30 -07:00

power

Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 08:42:44 -07:00

printk

Merge tag 'tty-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2013-09-03 11:38:36 -07:00

sched

Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 09:36:54 -07:00

time

Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 09:36:54 -07:00

trace

Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu

2013-09-03 07:41:11 +02:00

.gitignore

kernel/hz.bc: ignore.

2013-04-22 07:09:06 -07:00

acct.c

fs: Fix hang with BSD accounting on frozen filesystem

2013-05-04 14:57:58 -04:00

async.c

async: rename and redefine async_func_ptr

2013-03-12 13:59:14 -07:00

audit_tree.c

kernel/audit_tree.c:audit_add_tree_rule(): protect `rule' from kill_rules()

2013-06-12 16:29:46 -07:00

audit_watch.c

audit: catch possible NULL audit buffers

2013-01-11 14:54:55 -08:00

audit.c

audit: wait_for_auditd() should use TASK_UNINTERRUPTIBLE

2013-06-12 16:29:45 -07:00

audit.h

audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record

2013-07-09 10:33:19 -07:00

auditfilter.c

audit: Fix decimal constant description

2013-07-09 10:33:19 -07:00

auditsc.c

audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record

2013-07-09 10:33:19 -07:00

backtracetest.c

…

bounds.c

…

capability.c

Add file_ns_capable() helper function for open-time capability checking

2013-04-14 10:06:31 -07:00

cgroup_freezer.c

cgroup: make css_for_each_descendant() and friends include the origin css in the iteration

2013-08-08 20:11:27 -04:00

cgroup.c

Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

2013-09-03 18:25:03 -07:00

compat.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-05-01 07:21:43 -07:00

configs.c

proc: Supply PDE attribute setting accessor functions

2013-05-01 17:29:18 -04:00

context_tracking.c

context_tracking: User/kernel broundary cross trace events

2013-08-14 17:14:48 +02:00

cpu_pm.c

kernel/cpu_pm.c: fix various typos

2012-05-31 17:49:27 -07:00

cpu.c

ACPI / processor: Acquire writer lock to update CPU maps

2013-08-13 12:20:16 +02:00

cpuset.c

Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

2013-09-03 18:25:03 -07:00

crash_dump.c

…

cred.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-12-18 10:55:28 -08:00

delayacct.c

cputime: Use accessors to read task cputime stats

2013-01-27 19:23:31 +01:00

dma.c

…

elfcore.c

…

exec_domain.c

…

exit.c

ptrace: revert "Prepare to fix racy accesses on task breakpoints"

2013-07-09 10:33:26 -07:00

extable.c

extable: Flip the sorting message

2013-04-15 13:25:16 +02:00

fork.c

Rename nsproxy.pid_ns to nsproxy.pid_ns_for_children

2013-08-27 13:52:52 -04:00

freezer.c

freezer: set PF_SUSPEND_TASK flag on tasks that call freeze_processes

2013-07-30 14:05:06 +02:00

futex_compat.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-02-23 18:50:11 -08:00

futex.c

futex: Use freezable blocking call

2013-06-25 23:11:19 +02:00

groups.c

…

hrtimer.c

kernel: delete __cpuinit usage from all core kernel files

2013-07-14 19:36:59 -04:00

hung_task.c

hung_task debugging: Print more info when reporting the problem

2013-08-02 11:02:42 +02:00

irq_work.c

Merge branch 'nohz/printk-v8' into irq/core

2013-02-05 00:48:46 +01:00

itimer.c

…

jump_label.c

jump_label: Split jumplabel ratelimit

2013-08-09 07:53:54 -07:00

kallsyms.c

kernel: kallsyms: memory override issue, need check destination buffer length

2013-04-15 15:17:26 +09:30

kcmp.c

kcmp: include linux/ptrace.h

2012-12-20 17:40:19 -08:00

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

locking: Fix copy/paste errors of "ARCH_INLINE_*_UNLOCK_BH"

2013-05-28 08:50:00 +02:00

Kconfig.preempt

…

kexec.c

kexec: Use min() and min_t() to simplify logic

2013-04-30 17:04:07 -07:00

kmod.c

usermodehelper: kill the sub_info->path[0] check

2013-07-03 16:08:02 -07:00

kprobes.c

kprobes/x86: Call out into INT3 handler directly instead of using notifier

2013-07-23 10:12:57 +02:00

ksysfs.c

Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-12-11 18:10:49 -08:00

kthread.c

kthread: implement probe_kthread_data()

2013-04-30 17:04:02 -07:00

latencytop.c

…

lglock.c

lglock: Update lockdep annotations to report recursive local locks

2013-07-12 13:51:19 +02:00

lockdep_internals.h

…

lockdep_proc.c

lockdep: Use KSYM_NAME_LEN'ed buffer for __get_key_name()

2012-10-24 12:39:09 +02:00

lockdep_states.h

…

lockdep.c

lockdep: remove task argument from debug_check_no_locks_held

2013-05-12 14:16:21 +02:00

Makefile

printk: move to separate directory for easier modification

2013-07-31 14:41:03 -07:00

modsign_certificate.S

CONFIG_SYMBOL_PREFIX: cleanup.

2013-03-15 15:09:43 +10:30

modsign_pubkey.c

keys: use keyring_alloc() to create module signing keyring

2012-12-20 17:40:21 -08:00

module_signing.c

MODSIGN: Don't use enum-type bitfields in module signature info block

2012-12-05 11:27:24 +10:30

module-internal.h

MODSIGN: Move the magic string to the end of a module and eliminate the search

2012-10-19 17:30:40 -07:00

module.c

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2013-07-10 14:51:41 -07:00

mutex-debug.c

…

mutex-debug.h

…

mutex.c

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 08:18:19 -07:00

mutex.h

…

notifier.c

…

nsproxy.c

Rename nsproxy.pid_ns to nsproxy.pid_ns_for_children

2013-08-27 13:52:52 -04:00

padata.c

padata: use __this_cpu_read per-cpu helper

2012-12-06 17:16:23 +08:00

panic.c

Merge tag 'trace-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2013-07-11 09:02:09 -07:00

params.c

There is no /sys/parameters

2013-07-02 15:38:19 +09:30

pid_namespace.c

Rename nsproxy.pid_ns to nsproxy.pid_ns_for_children

2013-08-27 13:52:52 -04:00

pid.c

kernel/pid.c: move statement

2013-07-03 16:08:05 -07:00

posix-cpu-timers.c

posix_timers: fix racy timer delta caching on task exit

2013-07-03 16:54:42 +02:00

posix-timers.c

posix-timers: Remove unused variable

2013-04-18 12:51:19 +02:00

profile.c

kernel: delete __cpuinit usage from all core kernel files

2013-07-14 19:36:59 -04:00

ptrace.c

Revert "ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child)"

2013-08-06 13:16:32 -07:00

range.c

range: Do not add new blank slot with add_range_with_merge

2013-06-18 11:32:10 -05:00

rcu.h

rcu: Make call_rcu() leak callbacks for debug-object errors

2013-08-18 17:40:03 -07:00

rcupdate.c

rcu: Simplify debug-objects fixups

2013-08-18 17:39:45 -07:00

rcutiny_plugin.h

rcu: Add const annotation to char * for RCU tracepoints and functions

2013-07-29 17:07:49 -04:00

rcutiny.c

rcu: Add const annotation to char * for RCU tracepoints and functions

2013-07-29 17:07:49 -04:00

rcutorture.c

rcu: Make rcutorture emit online failures if verbose

2013-08-20 11:38:45 -07:00

rcutree_plugin.h

nohz_full: Force RCU's grace-period kthreads onto timekeeping CPU

2013-08-31 14:44:02 -07:00

rcutree_trace.c

rcutrace: single_open() leaks

2013-05-05 00:16:35 -04:00

rcutree.c

Merge branches 'doc.2013.08.19a', 'fixes.2013.08.20a', 'sysidle.2013.08.31a' and 'torture.2013.08.20a' into HEAD

2013-08-31 14:44:45 -07:00

rcutree.h

nohz_full: Force RCU's grace-period kthreads onto timekeeping CPU

2013-08-31 14:44:02 -07:00

reboot.c

reboot: move arch/x86 reboot= handling to generic kernel

2013-07-09 10:33:29 -07:00

relay.c

kernel: delete __cpuinit usage from all core kernel files

2013-07-14 19:36:59 -04:00

res_counter.c

res_counter: return amount of charges after res_counter_uncharge()

2012-12-18 15:02:12 -08:00

resource.c

kernel/resource.c: remove the unneeded assignment in function __find_resource

2013-07-03 16:08:06 -07:00

rtmutex_common.h

…

rtmutex-debug.c

sched/rt: Move rt specific bits into new header file

2013-02-07 20:51:08 +01:00

rtmutex-debug.h

…

rtmutex-tester.c

locking/rtmutex/tester: Set correct permissions on sysfs files

2013-04-10 14:48:37 +02:00

rtmutex.c

rtmutex: Document rt_mutex_adjust_prio_chain()

2013-05-28 09:23:52 +02:00

rtmutex.h

…

rwsem.c

Revert "rw_semaphore: remove up/down_read_non_owner"

2013-03-23 15:53:52 -07:00

seccomp.c

seccomp: allow BPF_XOR based ALU instructions.

2013-03-26 11:07:19 +11:00

semaphore.c

semaphore: use `bool' type for semaphore_waiter's up

2013-04-30 17:04:08 -07:00

signal.c

sigtimedwait: use freezable blocking call

2013-05-12 14:16:23 +02:00

smp.c

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 08:36:35 -07:00

smpboot.c

kernel: delete __cpuinit usage from all core kernel files

2013-07-14 19:36:59 -04:00

smpboot.h

smpboot: Provide infrastructure for percpu hotplug threads

2012-08-13 17:01:07 +02:00

softirq.c

kernel: delete __cpuinit usage from all core kernel files

2013-07-14 19:36:59 -04:00

spinlock.c

…

srcu.c

srcu: use ACCESS_ONCE() to access sp->completed in srcu_read_lock()

2013-02-07 15:19:36 -08:00

stacktrace.c

…

stop_machine.c

stop_machine: Mark per cpu stopper enabled early

2013-02-26 22:25:17 +01:00

sys_ni.c

unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE

2013-05-09 13:46:38 -04:00

sys.c

reboot: move shutdown/reboot related functions to kernel/reboot.c

2013-07-09 10:33:29 -07:00

sysctl_binary.c

kernel: remove unnecessary head file

2013-06-26 18:01:46 +09:00

sysctl.c

sysctl: range checking in do_proc_dointvec_ms_jiffies_conv

2013-07-26 14:22:10 -07:00

task_work.c

task_work: task_work_add() should not succeed after exit_task_work()

2012-09-13 16:47:34 +02:00

taskstats.c

taskstats: cgroupstats_user_cmd() may leak on error

2012-10-06 03:05:31 +09:00

test_kprobes.c

kernel/: rename random32() to prandom_u32()

2013-04-29 18:28:42 -07:00

time.c

sched: Rename sched.c as sched/core.c in comments and Documentation

2013-06-19 12:58:42 +02:00

timeconst.bc

kernel: Replace timeconst.pl with a bc script

2013-02-16 23:17:25 +01:00

timer.c

kernel: delete __cpuinit usage from all core kernel files

2013-07-14 19:36:59 -04:00

tracepoint.c

Merge tag 'trace-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2013-04-29 13:55:38 -07:00

tsacct.c

cputime: Use accessors to read task cputime stats

2013-01-27 19:23:31 +01:00

uid16.c

make SYSCALL_DEFINE<n>-generated wrappers do asmlinkage_protect

2013-03-03 22:58:33 -05:00

up.c

…

user_namespace.c

userns: limit the maximum depth of user_namespace->parent chain

2013-08-08 13:11:39 -07:00

user-return-notifier.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

user.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-01 17:51:54 -07:00

utsname_sysctl.c

kernel/utsname_sysctl.c: put get/get_uts() into CONFIG_PROC_SYSCTL code block

2013-02-27 19:10:22 -08:00

utsname.c

proc: Split the namespace stuff out into linux/proc_ns.h

2013-05-01 17:29:39 -04:00

wait.c

kernel: fix new kernel-doc warning in wait.c

2013-08-19 09:08:54 -07:00

watchdog.c

watchdog: Make it work under full dynticks

2013-07-30 22:29:15 +02:00

workqueue_internal.h

sched: Rename sched.c as sched/core.c in comments and Documentation

2013-06-19 12:58:42 +02:00

workqueue.c

Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2013-09-03 18:19:21 -07:00