Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0a8f2ad authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.16-20171227' of... 

Merge tag 'perf-core-for-mingo-4.16-20171227' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

- Allow system wide 'perf stat --per-thread', sorting the result (Jin Yao)

  E.g.:

  [root@jouet ~]# perf stat --per-thread --metrics IPC
  ^C
   Performance counter stats for 'system wide':

              make-22229  23,012,094,032  inst_retired.any   #  0.8 IPC
               cc1-22419     692,027,497  inst_retired.any   #  0.8 IPC
               gcc-22418     328,231,855  inst_retired.any   #  0.9 IPC
               cc1-22509     220,853,647  inst_retired.any   #  0.8 IPC
               gcc-22486     199,874,810  inst_retired.any   #  1.0 IPC
                as-22466     177,896,365  inst_retired.any   #  0.9 IPC
               cc1-22465     150,732,374  inst_retired.any   #  0.8 IPC
               gcc-22508     112,555,593  inst_retired.any   #  0.9 IPC
               cc1-22487     108,964,079  inst_retired.any   #  0.7 IPC
   qemu-system-x86-2697       21,330,550  inst_retired.any   #  0.3 IPC
   systemd-journal-551        20,642,951  inst_retired.any   #  0.4 IPC
   docker-containe-17651       9,552,892  inst_retired.any   #  0.5 IPC
   dockerd-current-9809        7,528,586  inst_retired.any   #  0.5 IPC
              make-22153  12,504,194,380  inst_retired.any   #  0.8 IPC
           python2-22429  12,081,290,954  inst_retired.any   #  0.8 IPC
  <SNIP>
           python2-22429  15,026,328,103  cpu_clk_unhalted.thread
               cc1-22419     826,660,193  cpu_clk_unhalted.thread
               gcc-22418     365,321,295  cpu_clk_unhalted.thread
               cc1-22509     279,169,362  cpu_clk_unhalted.thread
               gcc-22486     210,156,950  cpu_clk_unhalted.thread
  <SNIP>

       5.638075538 seconds time elapsed

  [root@jouet ~]#

- Improve shell auto-completion of perf events (Jin Yao)

-  Fix symbol fixup issues in arm64 due to ELF type (Kim Phillips)

- Ignore threads when they vanish after procfs based enumeration and
  before we try to use them with sys_perf_event_open(), i.e. just remove
  them from the thread_map and continue with the rest. This makes, among
  other cases, the previous new feature (perf stat --per-thread for system
  wide, albeit that not seeming to be the motivation for this patch) more
  robust. (Mengting Zhang)

- Generate s390 syscall table from asm/unistd.h, doing like x86,
  removing the dependency on audit-libs to do this id->string translation,
  speeding up the support for newly introducted syscalls (Hendrik Brueckner)

- Fix 'perf test' on filesystems where readdir() returns d_type == DT_UNKNOWN,
  such as XFS (Jiri Olsa)

- Fix PERF_SAMPLE_RAW_DATA endianity handling for cross-arch tracepoint
  processing (Jiri Olsa)

- Add __return suffix for return events in 'perf probe', streamlining
  entry/exit tracing (Masami Hiramatsu)

- Improve support for versioned symbols in 'perf probe" (Masami Hiramatsu)

- Clarify error message about invalid 'perf probe' event names (Masami Hiramatsu)

- Fix check open filename arg using 'perf trace' in a 'perf test' entry for
  systems using glibc >= 2.26, such as some ARM and s390 distros (Michael Petlan)

- Make method for obtaining the (normalized) architecture id for a
  perf.data file or for the running system used by the annotation routines
  generally available, next user will be for generating per arch errno
  string tables to allow for pretty printing errno codes recorded in a
  perf.data file in architecture A to be properly decoded on hardware
  archictecture B.  (Arnaldo Carvalho de Melo)

- Remove duplicate includes, found using scripts/checkincludes.pl (Pravin Shedge)

- s390 needs -fPIC, enable it, also revert a patch that supposedly did
  that but instead enabled -fPIC for x86 (Hendrik Brueckner, Arnaldo Carvalho de Melo)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents faaf9567 5d4fd9c8

tools/arch/s390/include/uapi/asm/unistd.h

0 → 100644
+412 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 *  S390 version

 *

 *  Derived from "include/asm-i386/unistd.h"

 */



#ifndef _UAPI_ASM_S390_UNISTD_H_

#define _UAPI_ASM_S390_UNISTD_H_



/*

 * This file contains the system call numbers.

 */



#define __NR_exit                 1

#define __NR_fork                 2

#define __NR_read                 3

#define __NR_write                4

#define __NR_open                 5

#define __NR_close                6

#define __NR_restart_syscall	  7

#define __NR_creat                8

#define __NR_link                 9

#define __NR_unlink              10

#define __NR_execve              11

#define __NR_chdir               12

#define __NR_mknod               14

#define __NR_chmod               15

#define __NR_lseek               19

#define __NR_getpid              20

#define __NR_mount               21

#define __NR_umount              22

#define __NR_ptrace              26

#define __NR_alarm               27

#define __NR_pause               29

#define __NR_utime               30

#define __NR_access              33

#define __NR_nice                34

#define __NR_sync                36

#define __NR_kill                37

#define __NR_rename              38

#define __NR_mkdir               39

#define __NR_rmdir               40

#define __NR_dup                 41

#define __NR_pipe                42

#define __NR_times               43

#define __NR_brk                 45

#define __NR_signal              48

#define __NR_acct                51

#define __NR_umount2             52

#define __NR_ioctl               54

#define __NR_fcntl               55

#define __NR_setpgid             57

#define __NR_umask               60

#define __NR_chroot              61

#define __NR_ustat               62

#define __NR_dup2                63

#define __NR_getppid             64

#define __NR_getpgrp             65

#define __NR_setsid              66

#define __NR_sigaction           67

#define __NR_sigsuspend          72

#define __NR_sigpending          73

#define __NR_sethostname         74

#define __NR_setrlimit           75

#define __NR_getrusage           77

#define __NR_gettimeofday        78

#define __NR_settimeofday        79

#define __NR_symlink             83

#define __NR_readlink            85

#define __NR_uselib              86

#define __NR_swapon              87

#define __NR_reboot              88

#define __NR_readdir             89

#define __NR_mmap                90

#define __NR_munmap              91

#define __NR_truncate            92

#define __NR_ftruncate           93

#define __NR_fchmod              94

#define __NR_getpriority         96

#define __NR_setpriority         97

#define __NR_statfs              99

#define __NR_fstatfs            100

#define __NR_socketcall         102

#define __NR_syslog             103

#define __NR_setitimer          104

#define __NR_getitimer          105

#define __NR_stat               106

#define __NR_lstat              107

#define __NR_fstat              108

#define __NR_lookup_dcookie     110

#define __NR_vhangup            111

#define __NR_idle               112

#define __NR_wait4              114

#define __NR_swapoff            115

#define __NR_sysinfo            116

#define __NR_ipc                117

#define __NR_fsync              118

#define __NR_sigreturn          119

#define __NR_clone              120

#define __NR_setdomainname      121

#define __NR_uname              122

#define __NR_adjtimex           124

#define __NR_mprotect           125

#define __NR_sigprocmask        126

#define __NR_create_module      127

#define __NR_init_module        128

#define __NR_delete_module      129

#define __NR_get_kernel_syms    130

#define __NR_quotactl           131

#define __NR_getpgid            132

#define __NR_fchdir             133

#define __NR_bdflush            134

#define __NR_sysfs              135

#define __NR_personality        136

#define __NR_afs_syscall        137 /* Syscall for Andrew File System */

#define __NR_getdents           141

#define __NR_flock              143

#define __NR_msync              144

#define __NR_readv              145

#define __NR_writev             146

#define __NR_getsid             147

#define __NR_fdatasync          148

#define __NR__sysctl            149

#define __NR_mlock              150

#define __NR_munlock            151

#define __NR_mlockall           152

#define __NR_munlockall         153

#define __NR_sched_setparam             154

#define __NR_sched_getparam             155

#define __NR_sched_setscheduler         156

#define __NR_sched_getscheduler         157

#define __NR_sched_yield                158

#define __NR_sched_get_priority_max     159

#define __NR_sched_get_priority_min     160

#define __NR_sched_rr_get_interval      161

#define __NR_nanosleep          162

#define __NR_mremap             163

#define __NR_query_module       167

#define __NR_poll               168

#define __NR_nfsservctl         169

#define __NR_prctl              172

#define __NR_rt_sigreturn       173

#define __NR_rt_sigaction       174

#define __NR_rt_sigprocmask     175

#define __NR_rt_sigpending      176

#define __NR_rt_sigtimedwait    177

#define __NR_rt_sigqueueinfo    178

#define __NR_rt_sigsuspend      179

#define __NR_pread64            180

#define __NR_pwrite64           181

#define __NR_getcwd             183

#define __NR_capget             184

#define __NR_capset             185

#define __NR_sigaltstack        186

#define __NR_sendfile           187

#define __NR_getpmsg		188

#define __NR_putpmsg		189

#define __NR_vfork		190

#define __NR_pivot_root         217

#define __NR_mincore            218

#define __NR_madvise            219

#define __NR_getdents64		220

#define __NR_readahead		222

#define __NR_setxattr		224

#define __NR_lsetxattr		225

#define __NR_fsetxattr		226

#define __NR_getxattr		227

#define __NR_lgetxattr		228

#define __NR_fgetxattr		229

#define __NR_listxattr		230

#define __NR_llistxattr		231

#define __NR_flistxattr		232

#define __NR_removexattr	233

#define __NR_lremovexattr	234

#define __NR_fremovexattr	235

#define __NR_gettid		236

#define __NR_tkill		237

#define __NR_futex		238

#define __NR_sched_setaffinity	239

#define __NR_sched_getaffinity	240

#define __NR_tgkill		241

/* Number 242 is reserved for tux */

#define __NR_io_setup		243

#define __NR_io_destroy		244

#define __NR_io_getevents	245

#define __NR_io_submit		246

#define __NR_io_cancel		247

#define __NR_exit_group		248

#define __NR_epoll_create	249

#define __NR_epoll_ctl		250

#define __NR_epoll_wait		251

#define __NR_set_tid_address	252

#define __NR_fadvise64		253

#define __NR_timer_create	254

#define __NR_timer_settime	255

#define __NR_timer_gettime	256

#define __NR_timer_getoverrun	257

#define __NR_timer_delete	258

#define __NR_clock_settime	259

#define __NR_clock_gettime	260

#define __NR_clock_getres	261

#define __NR_clock_nanosleep	262

/* Number 263 is reserved for vserver */

#define __NR_statfs64		265

#define __NR_fstatfs64		266

#define __NR_remap_file_pages	267

#define __NR_mbind		268

#define __NR_get_mempolicy	269

#define __NR_set_mempolicy	270

#define __NR_mq_open		271

#define __NR_mq_unlink		272

#define __NR_mq_timedsend	273

#define __NR_mq_timedreceive	274

#define __NR_mq_notify		275

#define __NR_mq_getsetattr	276

#define __NR_kexec_load		277

#define __NR_add_key		278

#define __NR_request_key	279

#define __NR_keyctl		280

#define __NR_waitid		281

#define __NR_ioprio_set		282

#define __NR_ioprio_get		283

#define __NR_inotify_init	284

#define __NR_inotify_add_watch	285

#define __NR_inotify_rm_watch	286

#define __NR_migrate_pages	287

#define __NR_openat		288

#define __NR_mkdirat		289

#define __NR_mknodat		290

#define __NR_fchownat		291

#define __NR_futimesat		292

#define __NR_unlinkat		294

#define __NR_renameat		295

#define __NR_linkat		296

#define __NR_symlinkat		297

#define __NR_readlinkat		298

#define __NR_fchmodat		299

#define __NR_faccessat		300

#define __NR_pselect6		301

#define __NR_ppoll		302

#define __NR_unshare		303

#define __NR_set_robust_list	304

#define __NR_get_robust_list	305

#define __NR_splice		306

#define __NR_sync_file_range	307

#define __NR_tee		308

#define __NR_vmsplice		309

#define __NR_move_pages		310

#define __NR_getcpu		311

#define __NR_epoll_pwait	312

#define __NR_utimes		313

#define __NR_fallocate		314

#define __NR_utimensat		315

#define __NR_signalfd		316

#define __NR_timerfd		317

#define __NR_eventfd		318

#define __NR_timerfd_create	319

#define __NR_timerfd_settime	320

#define __NR_timerfd_gettime	321

#define __NR_signalfd4		322

#define __NR_eventfd2		323

#define __NR_inotify_init1	324

#define __NR_pipe2		325

#define __NR_dup3		326

#define __NR_epoll_create1	327

#define	__NR_preadv		328

#define	__NR_pwritev		329

#define __NR_rt_tgsigqueueinfo	330

#define __NR_perf_event_open	331

#define __NR_fanotify_init	332

#define __NR_fanotify_mark	333

#define __NR_prlimit64		334

#define __NR_name_to_handle_at	335

#define __NR_open_by_handle_at	336

#define __NR_clock_adjtime	337

#define __NR_syncfs		338

#define __NR_setns		339

#define __NR_process_vm_readv	340

#define __NR_process_vm_writev	341

#define __NR_s390_runtime_instr 342

#define __NR_kcmp		343

#define __NR_finit_module	344

#define __NR_sched_setattr	345

#define __NR_sched_getattr	346

#define __NR_renameat2		347

#define __NR_seccomp		348

#define __NR_getrandom		349

#define __NR_memfd_create	350

#define __NR_bpf		351

#define __NR_s390_pci_mmio_write	352

#define __NR_s390_pci_mmio_read		353

#define __NR_execveat		354

#define __NR_userfaultfd	355

#define __NR_membarrier		356

#define __NR_recvmmsg		357

#define __NR_sendmmsg		358

#define __NR_socket		359

#define __NR_socketpair		360

#define __NR_bind		361

#define __NR_connect		362

#define __NR_listen		363

#define __NR_accept4		364

#define __NR_getsockopt		365

#define __NR_setsockopt		366

#define __NR_getsockname	367

#define __NR_getpeername	368

#define __NR_sendto		369

#define __NR_sendmsg		370

#define __NR_recvfrom		371

#define __NR_recvmsg		372

#define __NR_shutdown		373

#define __NR_mlock2		374

#define __NR_copy_file_range	375

#define __NR_preadv2		376

#define __NR_pwritev2		377

#define __NR_s390_guarded_storage	378

#define __NR_statx		379

#define __NR_s390_sthyi		380

#define NR_syscalls 381



/* 

 * There are some system calls that are not present on 64 bit, some

 * have a different name although they do the same (e.g. __NR_chown32

 * is __NR_chown on 64 bit).

 */

#ifndef __s390x__



#define __NR_time		 13

#define __NR_lchown		 16

#define __NR_setuid		 23

#define __NR_getuid		 24

#define __NR_stime		 25

#define __NR_setgid		 46

#define __NR_getgid		 47

#define __NR_geteuid		 49

#define __NR_getegid		 50

#define __NR_setreuid		 70

#define __NR_setregid		 71

#define __NR_getrlimit		 76

#define __NR_getgroups		 80

#define __NR_setgroups		 81

#define __NR_fchown		 95

#define __NR_ioperm		101

#define __NR_setfsuid		138

#define __NR_setfsgid		139

#define __NR__llseek		140

#define __NR__newselect 	142

#define __NR_setresuid		164

#define __NR_getresuid		165

#define __NR_setresgid		170

#define __NR_getresgid		171

#define __NR_chown		182

#define __NR_ugetrlimit		191	/* SuS compliant getrlimit */

#define __NR_mmap2		192

#define __NR_truncate64		193

#define __NR_ftruncate64	194

#define __NR_stat64		195

#define __NR_lstat64		196

#define __NR_fstat64		197

#define __NR_lchown32		198

#define __NR_getuid32		199

#define __NR_getgid32		200

#define __NR_geteuid32		201

#define __NR_getegid32		202

#define __NR_setreuid32		203

#define __NR_setregid32		204

#define __NR_getgroups32	205

#define __NR_setgroups32	206

#define __NR_fchown32		207

#define __NR_setresuid32	208

#define __NR_getresuid32	209

#define __NR_setresgid32	210

#define __NR_getresgid32	211

#define __NR_chown32		212

#define __NR_setuid32		213

#define __NR_setgid32		214

#define __NR_setfsuid32		215

#define __NR_setfsgid32		216

#define __NR_fcntl64		221

#define __NR_sendfile64		223

#define __NR_fadvise64_64	264

#define __NR_fstatat64		293



#else



#define __NR_select		142

#define __NR_getrlimit		191	/* SuS compliant getrlimit */

#define __NR_lchown  		198

#define __NR_getuid  		199

#define __NR_getgid  		200

#define __NR_geteuid  		201

#define __NR_getegid  		202

#define __NR_setreuid  		203

#define __NR_setregid  		204

#define __NR_getgroups  	205

#define __NR_setgroups  	206

#define __NR_fchown  		207

#define __NR_setresuid  	208

#define __NR_getresuid  	209

#define __NR_setresgid  	210

#define __NR_getresgid  	211

#define __NR_chown  		212

#define __NR_setuid  		213

#define __NR_setgid  		214

#define __NR_setfsuid  		215

#define __NR_setfsgid  		216

#define __NR_newfstatat		293



#endif



#endif /* _UAPI_ASM_S390_UNISTD_H_ */

tools/perf/Documentation/perf-probe.txt

+17 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ Probe points are defined by following syntax. 
     or,

     sdt_PROVIDER:SDTEVENT



'EVENT' specifies the name of new event, if omitted, it will be set the name of the probed function. You can also specify a group name by 'GROUP', if omitted, set 'probe' is used for kprobe and 'probe_<bin>' is used for uprobe.

'EVENT' specifies the name of new event, if omitted, it will be set the name of the probed function, and for return probes, a "\_\_return" suffix is automatically added to the function name. You can also specify a group name by 'GROUP', if omitted, set 'probe' is used for kprobe and 'probe_<bin>' is used for uprobe.

Note that using existing group name can conflict with other events. Especially, using the group name reserved for kernel modules can hide embedded events in the

modules.

'FUNC' specifies a probed function name, and it may have one of the following options; '+OFFS' is the offset from function entry address in bytes, ':RLN' is the relative-line number from function entry line, and '%return' means that it probes function return. And ';PTN' means lazy matching pattern (see LAZY MATCHING). Note that ';PTN' must be the end of the probe point definition.  In addition, '@SRC' specifies a source file which has that function.
@@ -182,6 +182,14 @@ Note that before using the SDT event, the target binary (on which SDT events are 
For details of the SDT, see below.

https://sourceware.org/gdb/onlinedocs/gdb/Static-Probe-Points.html



ESCAPED CHARACTER

-----------------



In the probe syntax, '=', '@', '+', ':' and ';' are treated as a special character. You can use a backslash ('\') to escape the special characters.

This is useful if you need to probe on a specific versioned symbols, like @GLIBC_... suffixes, or also you need to specify a source file which includes the special characters.

Note that usually single backslash is consumed by shell, so you might need to pass double backslash (\\) or wrapping with single quotes (\'AAA\@BBB').

See EXAMPLES how it is used.



PROBE ARGUMENT

--------------

Each probe argument follows below syntax.
@@ -277,6 +285,14 @@ Add a USDT probe to a target process running in a different mount namespace 


 ./perf probe --target-ns <target pid> -x /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el7_3.x86_64/jre/lib/amd64/server/libjvm.so %sdt_hotspot:thread__sleep__end



Add a probe on specific versioned symbol by backslash escape



 ./perf probe -x /lib64/libc-2.25.so 'malloc_get_state\@GLIBC_2.2.5'



Add a probe in a source file using special characters by backslash escape



 ./perf probe -x /opt/test/a.out 'foo\+bar.c:4'





SEE ALSO

--------

tools/perf/Makefile.config

+9 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ include $(srctree)/tools/scripts/Makefile.arch 
$(call detected_var,SRCARCH)



NO_PERF_REGS := 1

NO_SYSCALL_TABLE := 1



# Additional ARCH settings for ppc

ifeq ($(SRCARCH),powerpc)
@@ -33,7 +34,8 @@ endif 
ifeq ($(SRCARCH),x86)

  $(call detected,CONFIG_X86)

  ifeq (${IS_64_BIT}, 1)

    CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT -DHAVE_SYSCALL_TABLE -I$(OUTPUT)arch/x86/include/generated

    NO_SYSCALL_TABLE := 0

    CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT -I$(OUTPUT)arch/x86/include/generated

    ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S

    LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma

    $(call detected,CONFIG_X86_64)
@@ -41,7 +43,6 @@ ifeq ($(SRCARCH),x86) 
    LIBUNWIND_LIBS = -lunwind-x86 -llzma -lunwind

  endif

  NO_PERF_REGS := 0

  CFLAGS += -fPIC

endif



ifeq ($(SRCARCH),arm)
@@ -56,12 +57,18 @@ endif 


ifeq ($(ARCH),s390)

  NO_PERF_REGS := 0

  NO_SYSCALL_TABLE := 0

  CFLAGS += -fPIC -I$(OUTPUT)arch/s390/include/generated

endif



ifeq ($(NO_PERF_REGS),0)

  $(call detected,CONFIG_PERF_REGS)

endif



ifneq ($(NO_SYSCALL_TABLE),1)

  CFLAGS += -DHAVE_SYSCALL_TABLE

endif



# So far there's only x86 and arm libdw unwind support merged in perf.

# Disable it on all other architectures in case libdw unwind

# support is detected in system. Add supported architectures

tools/perf/arch/arm64/util/Build

+1 −0
Original line number Diff line number Diff line 
libperf-y += header.o

libperf-y += sym-handling.o

libperf-$(CONFIG_DWARF)     += dwarf-regs.o

libperf-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o

tools/perf/arch/arm64/util/sym-handling.c

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, version 2, as

 * published by the Free Software Foundation.

 *

 * Copyright (C) 2015 Naveen N. Rao, IBM Corporation

 */



#include "debug.h"

#include "symbol.h"

#include "map.h"

#include "probe-event.h"

#include "probe-file.h"



#ifdef HAVE_LIBELF_SUPPORT

bool elf__needs_adjust_symbols(GElf_Ehdr ehdr)

{

	return ehdr.e_type == ET_EXEC ||

	       ehdr.e_type == ET_REL ||

	       ehdr.e_type == ET_DYN;

}

#endif