perf/core2 improvements and fixes
Arnaldo Carvalho de Melo
maintainerFrom: Arnaldo Carvalho de Melo <[email protected]>
Hi Ingo,
Please consider pulling, this should have all the issues related to
that 'socket' sort order/filter fixed. I reordered some patches I did to get the right infrastructure in place and merged a few fixes from me, Jiri, so that we have a clean bisect history wrt this feature.
I tested it using old perf.data files with no cpu->socket_id header,
perf top, and the reported problems from you, from Wang, the ones I found seem to be all fixed. I also built tested it in a few systems, fixing problems, for instance with using a 'socket' variable name that was shadowing a glibc decl.
We still have problems tho when there are offline CPUs, but that is a
longstanding problem from the days when Stephane added that code and only affects the perf.data case, i.e. when generating the CPU topology perf.data header it bails out (but doesn't segfaults, its just the mapping that is lost) as soon as it fails to find files that don't exist when a CPU is offline.
I.e.:
perf record -a usleep 1; perf report -s socket
Will show -1 for the socket info, but at least that doesn't cause
a segfault anymore ;-)
perf top -s socket
Works tho when CPUs are offline.
I will try and fix that other problem, but I wanted to get what is
in perf/core2 flushed so that I can process some more outstanding patches, to avoid stalling too many downstreamers.
Some of these other patches I want to process include fixes for
perf/urgent, like some from Wang, etc.
- Arnaldo
The following changes since commit 8f3e5684d3fbd91ead283916676fa3dac22615e5:
perf/core: Drop PERF_EVENT_TXN (2015-09-13 11:27:30 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-core-for-mingo-2
for you to fetch changes up to 92d424ae898e0d04ac34263aa33e40acc1e1f3d1:
perf test: Add entry for hists socket filter (2015-09-14 13:04:10 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:
User visible:
- Add 'socket' sort entry, to sort by the processor socket in 'perf top' and 'perf report' (Kan Liang)
- Introduce --socket-filter to 'perf report', for filtering by processor socket (Kan Liang)
- Add new "Zoom into Processor Socket" operation in the perf hists browser, used in 'perf top' and 'perf report' (Kan Liang)
- Fix the 'CPU' hist browser column width calculation (Arnaldo Carvalho de Melo)
Infrastructure:
- 'perf test' fixes for the object code reading entry (Jan Stancek)
- Add processor socket and cpu topology 'perf test' entries (Kan Liang)
- Introduce more sysfs__read_TYPE() helpers (Arnaldo Carvalho de Melo)
- Group cpu information reading functions in tools/lib/api/cpu.[ch], starting with cpu__get_max_freq() from a patchkit by Kan Liang (Arnaldo Carvalho de Melo)
- Retrieve the MSR PMU type from a perf.data file header and store it in struct perf_env (Kan Liang)
- Add tools/include into CTAGS file list (Jiri Olsa)
- Add iterator function for perf tests (Matt Fleming)
- Switch to tracing_patch interface (Jiri Olsa)
----------------------------------------------------------------
Arnaldo Carvalho de Melo (10):
perf env: Move perf_env out of header.h and session.c into separate object perf env: Rename some leftovers from rename to perf_env
perf env: Adopt perf_header__set_cmdline
perf hists browser: Fixup the "cpu" column width calculation perf evsel: Remove forward declaration of 'struct perf_evlist' tools lib api fs: Introduce sysfs__read_{int,ull}()
tools lib api cpu: Introduce cpu.[ch] to obtain cpu related information perf cpu_map: Use sysfs__read_int in get_{core,socket}_id() perf env: Introduce read_cpu_topology_map() method
perf machine: Add pointer to sample's environment
Jan Stancek (4):
perf tests: Take into account address of each objdump line perf tests: Make objdump disassemble zero blocks perf tests: Stop reading if objdump output crossed sections perf tests: Print objdump/dso buffers if they don't match
Jiri Olsa (5):
tools lib api fs: Make tracing_path_strerror_open message generic tools lib api fs: Replace debugfs/tracefs objects interface with fs.c tools lib api fs: Remove debugfs, tracefs and findfs objects perf tools: Switch to tracing_path interface on appropriate places perf tools: Add tools/include into tags directories
Kan Liang (7):
perf test: Add entry to test cpu topology
perf env: Read msr pmu type from header
perf tools: Add processor socket info to hist_entry and addr_location perf tools: Introduce new sort type "socket" for the processor socket perf report: Introduce --socket-filter option
perf hists browser: Zoom in/out for processor socket
perf test: Add entry for hists socket filter
Matt Fleming (1):
perf tests: Introduce iterator function for tests
tools/lib/api/Build | 1 + tools/lib/api/cpu.c | 18 +++++ tools/lib/api/cpu.h | 6 ++ tools/lib/api/fs/Build | 3 - tools/lib/api/fs/debugfs.c | 77 ------------------- tools/lib/api/fs/debugfs.h | 23 ------ tools/lib/api/fs/findfs.c | 63 ---------------- tools/lib/api/fs/findfs.h | 23 ------ tools/lib/api/fs/fs.c | 46 +++++++++++- tools/lib/api/fs/fs.h | 4 + tools/lib/api/fs/tracefs.c | 78 ------------------- tools/lib/api/fs/tracefs.h | 21 ------ tools/lib/api/fs/tracing_path.c | 35 +++++---- tools/perf/Documentation/perf-report.txt | 6 +- tools/perf/Makefile.perf | 2 +- tools/perf/arch/common.c | 10 +-- tools/perf/arch/common.h | 4 +- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-kvm.c | 1 - tools/perf/builtin-probe.c | 1 - tools/perf/builtin-report.c | 11 +++ tools/perf/builtin-top.c | 17 ++++- tools/perf/perf.c | 2 + tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 36 +++++---- tools/perf/tests/code-reading.c | 74 +++++++++++++++---- tools/perf/tests/hists_filter.c | 55 +++++++++++--- tools/perf/tests/openat-syscall-all-cpus.c | 10 +-- tools/perf/tests/openat-syscall.c | 10 +-- tools/perf/tests/parse-events.c | 19 +---- tools/perf/tests/tests.h | 1 + tools/perf/tests/topology.c | 115 +++++++++++++++++++++++++++++ tools/perf/ui/browsers/hists.c | 61 +++++++++++++-- tools/perf/util/Build | 1 + tools/perf/util/cpumap.c | 46 +++--------- tools/perf/util/env.c | 86 +++++++++++++++++++++ tools/perf/util/env.h | 44 +++++++++++ tools/perf/util/event.c | 8 ++ tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 1 - tools/perf/util/header.c | 76 ++++++------------- tools/perf/util/header.h | 33 +-------- tools/perf/util/hist.c | 38 ++++++++++ tools/perf/util/hist.h | 6 +- tools/perf/util/machine.c | 1 + tools/perf/util/machine.h | 1 + tools/perf/util/parse-options.c | 2 +- tools/perf/util/probe-event.c | 5 +- tools/perf/util/probe-file.c | 15 +--- tools/perf/util/session.c | 22 +----- tools/perf/util/sort.c | 25 +++++++ tools/perf/util/sort.h | 3 + tools/perf/util/symbol.h | 1 + tools/perf/util/util.h | 3 +- 54 files changed, 700 insertions(+), 555 deletions(-) create mode 100644 tools/lib/api/cpu.c create mode 100644 tools/lib/api/cpu.h delete mode 100644 tools/lib/api/fs/debugfs.c delete mode 100644 tools/lib/api/fs/debugfs.h delete mode 100644 tools/lib/api/fs/findfs.c delete mode 100644 tools/lib/api/fs/findfs.h delete mode 100644 tools/lib/api/fs/tracefs.c delete mode 100644 tools/lib/api/fs/tracefs.h create mode 100644 tools/perf/tests/topology.c create mode 100644 tools/perf/util/env.c create mode 100644 tools/perf/util/env.h
Arnaldo Carvalho de Melo
maintainerPATCH 1/27 perf tests: Take into account address of each objdump line
From: Jan Stancek <[email protected]>
objdump output can contain repeated bytes. At the moment test reads all output sequentially, assuming each address is represented in output only once:
ffffffff8164efb3 <retint_swapgs+0x9>:
ffffffff8164efb3: c1 5d 00 eb rcrl $0xeb,0x0(%rbp) ffffffff8164efb7: 00 4c 8b 5c add %cl,0x5c(%rbx,%rcx,4)
ffffffff8164efb8 <restore_c_regs_and_iret>:
ffffffff8164efb8: 4c 8b 5c 24 30 mov 0x30(%rsp),%r11 ffffffff8164efbd: 4c 8b 54 24 38 mov 0x38(%rsp),%r10
Store objdump output to buffer according to offset calculated from address on each line.
--- tools/perf/tests/code-reading.c | 51 ++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 13 deletions(-)
tools/perf/tests/code-reading.c +38 -13
@@ -33,20 +33,20 @@ static unsigned int hex(char c)return c -'A' +10 ; } -static void read_objdump_line (const char *line,size_t line_len,void **buf, -size_t *len) +static size_t read_objdump_line (const char *line,size_t line_len,void *buf, +size_t len) {const char *p; -size_t i; +size_t i, j =0 ;/* Skip to a colon */ p =strchr (line,':' );if (!p) -return ; +return 0 ; i = p +1 - line;/* Read bytes */ -while (*len) { +while (j < len) {char c1, c2;/* Skip spaces */
@@ -65,20 +65,26 @@ static void read_objdump_line(const char *line, size_t line_len, void **buf,if (i < line_len && line[i] && !isspace (line[i]))break ;/* Store byte */ - *(unsigned char *)*buf = (hex (c1) <<4 ) |hex (c2); - *buf +=1 ; - *len -=1 ; + *(unsigned char *)buf = (hex (c1) <<4 ) |hex (c2); + buf +=1 ; + j++; } +/* return number of successfully read bytes */ +return j; } -static int read_objdump_output (FILE *f,void **buf,size_t *len) +static int read_objdump_output (FILE *f,void *buf,size_t *len,u64 start_addr) {char *line =NULL ; -size_t line_len; +size_t line_len, off_last =0 ;ssize_t ret;int err =0 ; +u64 addr; + +while (off_last < *len) { +size_t off, read_bytes, written_bytes; +unsigned char tmp[BUFSZ ]; -while (1 ) { ret =getline (&line, &line_len, f);if (feof (f))break ;
@@ -87,9 +93,28 @@ static int read_objdump_output(FILE *f, void **buf, size_t *len) err =-1 ;break ; } -read_objdump_line (line, ret, buf, len); + +/* read objdump data into temporary buffer */ + read_bytes =read_objdump_line (line, ret, tmp,sizeof (tmp)); +if (!read_bytes) +continue ; + +if (sscanf (line,"%" PRIx64, &addr) !=1 ) +continue ; + +/* copy it from temporary buffer to 'buf' according +* to address on current objdump line */ + off = addr - start_addr; +if (off >= *len) +break ; + written_bytes =MIN (read_bytes, *len - off); +memcpy (buf + off, tmp, written_bytes); + off_last = off + written_bytes; } +/* len returns number of bytes that could not be read */ + *len -= off_last; +free (line);return err;
@@ -120,7 +145,7 @@ static int read_via_objdump(const char *filename, u64 addr, void *buf,return -1 ; } - ret =read_objdump_output (f, &buf, &len); + ret =read_objdump_output (f, buf, &len, addr);if (len) {pr_debug ("objdump read too few bytes\n" );if (!ret)
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 2/27 perf tests: Make objdump disassemble zero blocks
In reply to Arnaldo Carvalho de MeloFrom: Jan Stancek <[email protected]>
Add -z parameter to avoid skipping zero blocks:
ffffffff816704fe <sysret_check+0x4b>:
ffffffff816704fe: 7b 34 jnp ffffffff81670534 <sysret_signal+0x1c>
... ffffffff81670501 <sysret_careful>: ffffffff81670501: 0f ba e2 03 bt $0x3,%edx ffffffff81670505: 73 11 jae ffffffff81670518 <sysret_signal>
--- tools/perf/tests/code-reading.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/code-reading.c +1 -1
@@ -128,7 +128,7 @@ static int read_via_objdump(const char *filename, u64 addr, void *buf,FILE *f;int ret; - fmt ="%s -d --start-address=0x%" PRIx64" --stop-address=0x%" PRIx64" %s" ; + fmt ="%s -z -d --start-address=0x%" PRIx64" --stop-address=0x%" PRIx64" %s" ; ret =snprintf (cmd,sizeof (cmd), fmt,"objdump" , addr, addr + len, filename);if (ret <=0 || (size_t )ret >=sizeof (cmd))
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 3/27 perf tests: Stop reading if objdump output crossed sections
In reply to Arnaldo Carvalho de MeloFrom: Jan Stancek <[email protected]>
objdump output can span across multiple sections:
Disassembly of section .text:
0000000000000008 <crc32c+0x8>:
8: 48 89 e5 mov %rsp,%rbp
b: 53 push %rbx
c: 8b 01 mov (%rcx),%eax
<snip>
6b: 90 nop
Disassembly of section .init.text:
0000000000000008 <init_module+0x8>:
8: 00 00 add %al,(%rax)
a: 00 00 add %al,(%rax)
c: 48 89 e5
Stop further reading if an address starts going backwards, assuming we crossed sections.
--- tools/perf/tests/code-reading.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
tools/perf/tests/code-reading.c +6 -1
@@ -79,7 +79,7 @@ static int read_objdump_output(FILE *f, void *buf, size_t *len, u64 start_addr)size_t line_len, off_last =0 ;ssize_t ret;int err =0 ; -u64 addr; +u64 addr, last_addr = start_addr;while (off_last < *len) {size_t off, read_bytes, written_bytes;
@@ -101,6 +101,11 @@ static int read_objdump_output(FILE *f, void *buf, size_t *len, u64 start_addr)if (sscanf (line,"%" PRIx64, &addr) !=1 )continue ; +if (addr < last_addr) { +pr_debug ("addr going backwards, read beyond section?\n" ); +break ; + } + last_addr = addr;/* copy it from temporary buffer to 'buf' according * to address on current objdump line */
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 4/27 perf tests: Print objdump/dso buffers if they don't match
In reply to Arnaldo Carvalho de MeloFrom: Jan Stancek <[email protected]>
--- tools/perf/tests/code-reading.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
tools/perf/tests/code-reading.c +16 -0
@@ -162,6 +162,18 @@ static int read_via_objdump(const char *filename, u64 addr, void *buf,return ret; } +static void dump_buf (unsigned char *buf,size_t len) +{ +size_t i; + +for (i =0 ; i < len; i++) { +pr_debug ("0x%02x " , buf[i]); +if (i %16 ==15 ) +pr_debug ("\n" ); + } +pr_debug ("\n" ); +} +static int read_object_code (u64 addr,size_t len,u8 cpumode,struct thread *thread,struct state *state) {
@@ -264,6 +276,10 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,/* The results should be identical */ if (memcmp (buf1, buf2, len)) {pr_debug ("Bytes read differ from those read by objdump\n" ); +pr_debug ("buf1 (dso):\n" ); +dump_buf (buf1, len); +pr_debug ("buf2 (objdump):\n" ); +dump_buf (buf2, len);return -1 ; }pr_debug ("Bytes read match those read by objdump\n" );
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 5/27 tools lib api fs: Make tracing_path_strerror_open message generic
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Making tracing_path__strerror_open_tp message generic by mentioning both debugfs/tracefs words in error message plus the tracing_path instead of debugfs_mountpoint.
--- tools/lib/api/fs/tracing_path.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
tools/lib/api/fs/tracing_path.c +16 -10
@@ -90,33 +90,39 @@ static int strerror_open(int err, char *buf, size_t size, const char *filename)switch (err) {case ENOENT : -if (debugfs_configured ()) { +/* +* We will get here if we can't find the tracepoint, but one of +* debugfs or tracefs is configured, which means you probably +* want some tracepoint which wasn't compiled in your kernel. +* - jirka +*/ +if (debugfs_configured () ||tracefs_configured ()) {snprintf (buf, size,"Error:\tFile %s/%s not found.\n" "Hint:\tPerhaps this kernel misses some CONFIG_ setting to enable this feature?.\n" , - debugfs_mountpoint, filename); + tracing_events_path, filename);break ; }snprintf (buf, size,"%s" , -"Error:\tUnable to find debugfs\n" -"Hint:\tWas your kernel compiled with debugfs support?\n" -"Hint:\tIs the debugfs filesystem mounted?\n" +"Error:\tUnable to find debugfs/tracefs\n" +"Hint:\tWas your kernel compiled with debugfs/tracefs support?\n" +"Hint:\tIs the debugfs/tracefs filesystem mounted?\n" "Hint:\tTry 'sudo mount -t debugfs nodev /sys/kernel/debug'" );break ;case EACCES : { -const char *mountpoint = debugfs_mountpoint; +const char *mountpoint =debugfs_find_mountpoint (); -if (!access (debugfs_mountpoint,R_OK ) &&strncmp (filename,"tracing/" ,8 ) ==0 ) { +if (!access (mountpoint,R_OK ) &&strncmp (filename,"tracing/" ,8 ) ==0 ) {const char *tracefs_mntpoint =tracefs_find_mountpoint ();if (tracefs_mntpoint) - mountpoint = tracefs_mntpoint; + mountpoint =tracefs_find_mountpoint (); }snprintf (buf, size,"Error:\tNo permissions to read %s/%s\n" "Hint:\tTry 'sudo mount -o remount,mode=755 %s'\n" , - debugfs_mountpoint, filename, mountpoint); + tracing_events_path, filename, mountpoint); }break ;default :
@@ -131,7 +137,7 @@ int tracing_path__strerror_open_tp(int err, char *buf, size_t size, const char * {char path[PATH_MAX ]; -snprintf (path,PATH_MAX ,"tracing/events/%s/%s" , sys, name ?:"*" ); +snprintf (path,PATH_MAX ,"%s/%s" , sys, name ?:"*" );return strerror_open (err, buf, size, path); }
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 6/27 tools lib api fs: Replace debugfs/tracefs objects interface with fs.c
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Switching to the fs.c related filesystem framework.
--- tools/lib/api/fs/fs.c | 1 - tools/lib/api/fs/tracing_path.c | 15 +++++++-------- tools/perf/builtin-kvm.c | 1 - tools/perf/builtin-probe.c | 1 - tools/perf/tests/openat-syscall-all-cpus.c | 5 +++-- tools/perf/tests/openat-syscall.c | 5 +++-- tools/perf/tests/parse-events.c | 7 +++---- tools/perf/util/evsel.c | 2 +- tools/perf/util/probe-event.c | 5 ++--- tools/perf/util/probe-file.c | 7 +++---- tools/perf/util/util.h | 3 +-- 11 files changed, 23 insertions(+), 29 deletions(-)
tools/lib/api/fs/fs.c +0 -1
@@ -11,7 +11,6 @@#include <unistd.h> #include <sys/mount.h> -#include "debugfs.h" #include "fs.h" #define _STR (x) #x
tools/lib/api/fs/tracing_path.c +7 -8
@@ -7,8 +7,7 @@#include <string.h> #include <errno.h> #include <unistd.h> -#include "debugfs.h" -#include "tracefs.h" +#include "fs.h" #include "tracing_path.h"
@@ -29,7 +28,7 @@ static const char *tracing_path_tracefs_mount(void) {const char *mnt; - mnt =tracefs_mount (NULL ); + mnt =tracefs__mount ();if (!mnt)return NULL ;
@@ -42,7 +41,7 @@ static const char *tracing_path_debugfs_mount(void) {const char *mnt; - mnt =debugfs_mount (NULL ); + mnt =debugfs__mount ();if (!mnt)return NULL ;
@@ -96,7 +95,7 @@ static int strerror_open(int err, char *buf, size_t size, const char *filename)* want some tracepoint which wasn't compiled in your kernel. * - jirka */ -if (debugfs_configured () ||tracefs_configured ()) { +if (debugfs__configured () ||tracefs__configured ()) { snprintf(buf, size, "Error:\tFile %s/%s not found.\n" "Hint:\tPerhaps this kernel misses some CONFIG_ setting to enable this feature?.\n",
@@ -110,13 +109,13 @@ static int strerror_open(int err, char *buf, size_t size, const char *filename) "Hint:\tTry 'sudo mount -t debugfs nodev /sys/kernel/debug'");break ;case EACCES : { -const char *mountpoint =debugfs_find_mountpoint (); +const char *mountpoint =debugfs__mountpoint ();if (!access (mountpoint,R_OK ) &&strncmp (filename,"tracing/" ,8 ) ==0 ) { -const char *tracefs_mntpoint =tracefs_find_mountpoint (); +const char *tracefs_mntpoint =tracefs__mountpoint ();if (tracefs_mntpoint) - mountpoint =tracefs_find_mountpoint (); + mountpoint =tracefs__mountpoint (); } snprintf(buf, size,
tools/perf/builtin-kvm.c +0 -1
@@ -13,7 +13,6 @@#include "util/parse-options.h" #include "util/trace-event.h" #include "util/debug.h" -#include <api/fs/debugfs.h> #include "util/tool.h" #include "util/stat.h" #include "util/top.h"
tools/perf/builtin-probe.c +0 -1
@@ -37,7 +37,6 @@#include "util/strfilter.h" #include "util/symbol.h" #include "util/debug.h" -#include <api/fs/debugfs.h> #include "util/parse-options.h" #include "util/probe-finder.h" #include "util/probe-event.h"
tools/perf/tests/openat-syscall-all-cpus.c +3 -2
@@ -1,3 +1,4 @@ +#include <api/fs/fs.h> #include "evsel.h" #include "tests.h" #include "thread_map.h"
@@ -30,9 +31,9 @@ int test__openat_syscall_event_on_all_cpus(void) evsel =perf_evsel__newtp ("syscalls" ,"sys_enter_openat" );if (evsel ==NULL ) { -if (tracefs_configured ()) +if (tracefs__configured ())pr_debug ("is tracefs mounted on /sys/kernel/tracing?\n" ); -else if (debugfs_configured ()) +else if (debugfs__configured ())pr_debug ("is debugfs mounted on /sys/kernel/debug?\n" );else pr_debug ("Neither tracefs or debugfs is enabled in this kernel\n" );
tools/perf/tests/openat-syscall.c +3 -2
@@ -1,3 +1,4 @@ +#include <api/fs/fs.h> #include "thread_map.h" #include "evsel.h" #include "debug.h"
@@ -18,9 +19,9 @@ int test__openat_syscall_event(void) evsel =perf_evsel__newtp ("syscalls" ,"sys_enter_openat" );if (evsel ==NULL ) { -if (tracefs_configured ()) +if (tracefs__configured ())pr_debug ("is tracefs mounted on /sys/kernel/tracing?\n" ); -else if (debugfs_configured ()) +else if (debugfs__configured ())pr_debug ("is debugfs mounted on /sys/kernel/debug?\n" );else pr_debug ("Neither tracefs or debugfs is enabled in this kernel\n" );
tools/perf/tests/parse-events.c +3 -4
@@ -3,11 +3,10 @@#include "evsel.h" #include "evlist.h" #include <api/fs/fs.h> -#include <api/fs/tracefs.h> -#include <api/fs/debugfs.h> #include "tests.h" #include "debug.h" #include <linux/hw_breakpoint.h> +#include <api/fs/fs.h> #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \ PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD)
@@ -1268,12 +1267,12 @@ static int count_tracepoints(void)DIR *events_dir;int cnt =0 ; - mountpoint =tracefs_find_mountpoint (); + mountpoint =tracefs__mountpoint ();if (mountpoint) {scnprintf (events_path,PATH_MAX ,"%s/events" , mountpoint); }else { - mountpoint =debugfs_find_mountpoint (); + mountpoint =debugfs__mountpoint ();scnprintf (events_path,PATH_MAX ,"%s/tracing/events" , mountpoint); }
tools/perf/util/evsel.c +1 -1
@@ -9,7 +9,7 @@#include <byteswap.h> #include <linux/bitops.h> -#include <api/fs/debugfs.h> +#include <api/fs/tracing_path.h> #include <traceevent/event-parse.h> #include <linux/hw_breakpoint.h> #include <linux/perf_event.h>
tools/perf/util/probe-event.c +2 -3
@@ -40,8 +40,7 @@#include "color.h" #include "symbol.h" #include "thread.h" -#include <api/fs/debugfs.h> -#include <api/fs/tracefs.h> +#include <api/fs/fs.h> #include "trace-event.h" /* For __maybe_unused */ #include "probe-event.h" #include "probe-finder.h"
@@ -2054,7 +2053,7 @@ static void kprobe_blacklist__delete(struct list_head *blacklist)static int kprobe_blacklist__load (struct list_head *blacklist) {struct kprobe_blacklist_node *node; -const char *__debugfs =debugfs_find_mountpoint (); +const char *__debugfs =debugfs__mountpoint ();char buf[PATH_MAX ], *p;FILE *fp;int ret;
tools/perf/util/probe-file.c +3 -4
@@ -22,8 +22,7 @@#include "color.h" #include "symbol.h" #include "thread.h" -#include <api/fs/debugfs.h> -#include <api/fs/tracefs.h> +#include <api/fs/fs.h> #include "probe-event.h" #include "probe-file.h" #include "session.h"
@@ -77,11 +76,11 @@ static int open_probe_events(const char *trace_file, bool readwrite)const char *tracing_dir ="" ;int ret; - __debugfs =tracefs_find_mountpoint (); + __debugfs =tracefs__mountpoint ();if (__debugfs ==NULL ) { tracing_dir ="tracing/" ; - __debugfs =debugfs_find_mountpoint (); + __debugfs =debugfs__mountpoint ();if (__debugfs ==NULL )return -ENOTSUP ; }
tools/perf/util/util.h +1 -2
@@ -74,8 +74,7 @@#include <linux/magic.h> #include <linux/types.h> #include <sys/ttydefaults.h> -#include <api/fs/debugfs.h> -#include <api/fs/tracefs.h> +#include <api/fs/tracing_path.h> #include <termios.h> #include <linux/bitops.h> #include <termios.h>
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 7/27 tools lib api fs: Remove debugfs, tracefs and findfs objects
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
We have all the functionality in fs.c, let's remove unneeded objects.
--- tools/lib/api/fs/Build | 3 -- tools/lib/api/fs/debugfs.c | 77 --------------------------------------------- tools/lib/api/fs/debugfs.h | 23 -------------- tools/lib/api/fs/findfs.c | 63 ------------------------------------- tools/lib/api/fs/findfs.h | 23 -------------- tools/lib/api/fs/tracefs.c | 78 ---------------------------------------------- tools/lib/api/fs/tracefs.h | 21 ------------- 7 files changed, 288 deletions(-) delete mode 100644 tools/lib/api/fs/debugfs.c delete mode 100644 tools/lib/api/fs/debugfs.h delete mode 100644 tools/lib/api/fs/findfs.c delete mode 100644 tools/lib/api/fs/findfs.h delete mode 100644 tools/lib/api/fs/tracefs.c delete mode 100644 tools/lib/api/fs/tracefs.h
tools/lib/api/fs/Build +0 -3
@@ -1,5 +1,2 @@ libapi-y += fs.o libapi-y += tracing_path.o -libapi-y += debugfs.o -libapi-y += findfs.o -libapi-y += tracefs.o
tools/lib/api/fs/debugfs.c deleted +0 -77
77 lines not on this page · raw message
tools/lib/api/fs/debugfs.h deleted +0 -23
@@ -1,23 +0,0 @@ -#ifndef __API_DEBUGFS_H__ -#define __API_DEBUGFS_H__ - -#include "findfs.h" - -#ifndef DEBUGFS_MAGIC -#define DEBUGFS_MAGIC 0x64626720 -#endif - -#ifndef PERF_DEBUGFS_ENVIRONMENT -#define PERF_DEBUGFS_ENVIRONMENT "PERF_DEBUGFS_DIR" -#endif - -bool debugfs_configured (void ); -const char *debugfs_find_mountpoint (void ); -char *debugfs_mount (const char *mountpoint); - -extern char debugfs_mountpoint[]; - -int debugfs__strerror_open (int err,char *buf,size_t size,const char *filename); -int debugfs__strerror_open_tp (int err,char *buf,size_t size,const char *sys,const char *name); - -#endif /* __API_DEBUGFS_H__ */
tools/lib/api/fs/findfs.c deleted +0 -63
63 lines not on this page · raw message
tools/lib/api/fs/findfs.h deleted +0 -23
@@ -1,23 +0,0 @@ -#ifndef __API_FINDFS_H__ -#define __API_FINDFS_H__ - -#include <stdbool.h> - -#define _STR (x) #x -#define STR (x) _STR(x) - -/* -* On most systems <limits.h> would have given us this, but not on some systems -* (e.g. GNU/Hurd). -*/ -#ifndef PATH_MAX -#define PATH_MAX 4096 -#endif - -const char *find_mountpoint (const char *fstype,long magic, -char *mountpoint,int len, -const char *const *known_mountpoints); - -int valid_mountpoint (const char *mount,long magic); - -#endif /* __API_FINDFS_H__ */
tools/lib/api/fs/tracefs.c deleted +0 -78
78 lines not on this page · raw message
tools/lib/api/fs/tracefs.h deleted +0 -21
@@ -1,21 +0,0 @@ -#ifndef __API_TRACEFS_H__ -#define __API_TRACEFS_H__ - -#include "findfs.h" - -#ifndef TRACEFS_MAGIC -#define TRACEFS_MAGIC 0x74726163 -#endif - -#ifndef PERF_TRACEFS_ENVIRONMENT -#define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR" -#endif - -bool tracefs_configured (void ); -const char *tracefs_find_mountpoint (void ); -int tracefs_valid_mountpoint (const char *debugfs); -char *tracefs_mount (const char *mountpoint); - -extern char tracefs_mountpoint[]; - -#endif /* __API_DEBUGFS_H__ */
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 8/27 perf tools: Switch to tracing_path interface on appropriate places
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Using tracing_path interface on several places, that more or less copy the functionality of tracing_path interface.
--- tools/perf/tests/openat-syscall-all-cpus.c | 9 +++------ tools/perf/tests/openat-syscall.c | 11 ++++------- tools/perf/tests/parse-events.c | 16 ++-------------- tools/perf/util/probe-file.c | 14 ++------------ 4 files changed, 11 insertions(+), 39 deletions(-)
tools/perf/tests/openat-syscall-all-cpus.c +3 -6
@@ -15,6 +15,7 @@ int test__openat_syscall_event_on_all_cpus(void)cpu_set_t cpu_set;struct thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX );char sbuf[STRERR_BUFSIZE ]; +char errbuf[BUFSIZ ];if (threads ==NULL ) {pr_debug ("thread_map__new\n" );
@@ -31,12 +32,8 @@ int test__openat_syscall_event_on_all_cpus(void) evsel =perf_evsel__newtp ("syscalls" ,"sys_enter_openat" );if (evsel ==NULL ) { -if (tracefs__configured ()) -pr_debug ("is tracefs mounted on /sys/kernel/tracing?\n" ); -else if (debugfs__configured ()) -pr_debug ("is debugfs mounted on /sys/kernel/debug?\n" ); -else -pr_debug ("Neither tracefs or debugfs is enabled in this kernel\n" ); +tracing_path__strerror_open_tp (errno, errbuf,sizeof (errbuf),"syscalls" ,"sys_enter_openat" ); +pr_err ("%s\n" , errbuf); goto out_thread_map_delete; }
tools/perf/tests/openat-syscall.c +4 -7
@@ -1,4 +1,4 @@ -#include <api/fs/fs.h> +#include <api/fs/tracing_path.h> #include "thread_map.h" #include "evsel.h" #include "debug.h"
@@ -11,6 +11,7 @@ int test__openat_syscall_event(void)unsigned int nr_openat_calls =111 , i;struct thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX );char sbuf[STRERR_BUFSIZE ]; +char errbuf[BUFSIZ ];if (threads ==NULL ) {pr_debug ("thread_map__new\n" );
@@ -19,12 +20,8 @@ int test__openat_syscall_event(void) evsel =perf_evsel__newtp ("syscalls" ,"sys_enter_openat" );if (evsel ==NULL ) { -if (tracefs__configured ()) -pr_debug ("is tracefs mounted on /sys/kernel/tracing?\n" ); -else if (debugfs__configured ()) -pr_debug ("is debugfs mounted on /sys/kernel/debug?\n" ); -else -pr_debug ("Neither tracefs or debugfs is enabled in this kernel\n" ); +tracing_path__strerror_open_tp (errno, errbuf,sizeof (errbuf),"syscalls" ,"sys_enter_openat" ); +pr_err ("%s\n" , errbuf); goto out_thread_map_delete; }
tools/perf/tests/parse-events.c +2 -14
@@ -1261,23 +1261,11 @@ test__checkevent_breakpoint_len_rw_modifier(struct perf_evlist *evlist)static int count_tracepoints (void ) { -char events_path[PATH_MAX ];struct dirent *events_ent; -const char *mountpoint;DIR *events_dir;int cnt =0 ; - mountpoint =tracefs__mountpoint (); -if (mountpoint) { -scnprintf (events_path,PATH_MAX ,"%s/events" , - mountpoint); - }else { - mountpoint =debugfs__mountpoint (); -scnprintf (events_path,PATH_MAX ,"%s/tracing/events" , - mountpoint); - } - - events_dir =opendir (events_path); + events_dir =opendir (tracing_events_path);TEST_ASSERT_VAL ("Can't open events dir" , events_dir);
@@ -1294,7 +1282,7 @@ static int count_tracepoints(void)continue ;scnprintf (sys_path,PATH_MAX ,"%s/%s" , - events_path, events_ent->d_name); + tracing_events_path, events_ent->d_name); sys_dir =opendir (sys_path);TEST_ASSERT_VAL ("Can't open sys dir" , sys_dir);
tools/perf/util/probe-file.c +2 -12
@@ -22,7 +22,7 @@#include "color.h" #include "symbol.h" #include "thread.h" -#include <api/fs/fs.h> +#include <api/fs/tracing_path.h> #include "probe-event.h" #include "probe-file.h" #include "session.h"
@@ -72,21 +72,11 @@ static void print_both_open_warning(int kerr, int uerr)static int open_probe_events (const char *trace_file,bool readwrite) {char buf[PATH_MAX ]; -const char *__debugfs;const char *tracing_dir ="" ;int ret; - __debugfs =tracefs__mountpoint (); -if (__debugfs ==NULL ) { - tracing_dir ="tracing/" ; - - __debugfs =debugfs__mountpoint (); -if (__debugfs ==NULL ) -return -ENOTSUP ; - } - ret =e_snprintf (buf,PATH_MAX ,"%s/%s%s" , - __debugfs, tracing_dir, trace_file); + tracing_path, tracing_dir, trace_file);if (ret >=0 ) {pr_debug ("Opening %s write=%d\n" , buf, readwrite);if (readwrite && !probe_event_dry_run)
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 9/27 perf test: Add entry to test cpu topology
In reply to Arnaldo Carvalho de MeloFrom: Kan Liang <[email protected]>
This patch test cpu core_id and socket_id which are stored in perf_env.
Commiter note:
# perf test topo 40: Test topology in session: Ok
# perf test -v topo 40: Test topology in session: --- start --- test child forked, pid 31767 templ file: /tmp/perf-test-VTZ1PL CPU 0, core 0, socket 0 CPU 1, core 1, socket 0 CPU 2, core 0, socket 0 CPU 3, core 1, socket 0 test child finished with 0 ---- end ---- Test topology in session: Ok #
--- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 4 ++ tools/perf/tests/tests.h | 1 + tools/perf/tests/topology.c | 115 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 tools/perf/tests/topology.c
tools/perf/tests/Build +1 -0
@@ -33,6 +33,7 @@ perf-y += parse-no-sample-id-all.o perf-y += kmod-path.o perf-y += thread-map.o perf-y += llvm.o +perf-y += topology.o perf-$(CONFIG_X86) += perf-time-to-tsc.o ifdef CONFIG_AUXTRACE
tools/perf/tests/builtin-test.c +4 -0
@@ -187,6 +187,10 @@ static struct test {#endif #endif { + .desc = "Test topology in session", + .func = test_session_topology, + }, + { .func = NULL, }, };
tools/perf/tests/tests.h +1 -0
@@ -64,6 +64,7 @@ int test__kmod_path__parse(void);int test__thread_map (void );int test__llvm (void );int test__insn_x86 (void ); +int test_session_topology (void );#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)#ifdef HAVE_DWARF_UNWIND_SUPPORT
tools/perf/tests/topology.c new file +115 -0
115 lines not on this page · raw message
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 10/27 perf tests: Introduce iterator function for tests
In reply to Arnaldo Carvalho de MeloFrom: Matt Fleming <[email protected]>
In preparation for introducing more arrays of tests, e.g. "arch tests" (architecture-specific tests), abstract the code to iterate over the list of tests into a helper function.
This way, code that uses a 'struct test' doesn't need to worry about how the tests are grouped together and changes to the list of tests doesn't require changes to the code using it.
--- tools/perf/tests/builtin-test.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
tools/perf/tests/builtin-test.c +16 -16
@@ -195,7 +195,7 @@ static struct test { }, }; -static bool perf_test__matches (int curr,int argc,const char *argv[]) +static bool perf_test__matches (struct test *test,int curr,int argc,const char *argv[]) {int i;
@@ -212,7 +212,7 @@ static bool perf_test__matches(int curr, int argc, const char *argv[])continue ; } -if (strstr (tests[curr].desc, argv[i])) +if (strstr (test->desc, argv[i]))return true; }
@@ -249,27 +249,28 @@ static int run_test(struct test *test)return err; } +#define for_each_test (t) for (t = &tests[0]; t->func; t++) +static int __cmd_test (int argc,const char *argv[],struct intlist *skiplist) { +struct test *t;int i =0 ;int width =0 ; -while (tests[i].func) { -int len =strlen (tests[i].desc); +for_each_test (t) { +int len =strlen (t->desc);if (width < len) width = len; - ++i; } - i =0 ; -while (tests[i].func) { +for_each_test (t) {int curr = i++, err; -if (!perf_test__matches (curr, argc, argv)) +if (!perf_test__matches (t, curr, argc, argv))continue ; -pr_info ("%2d: %-*s:" , i, width, tests[curr].desc); +pr_info ("%2d: %-*s:" , i, width, t->desc);if (intlist__find (skiplist, i)) {color_fprintf (stderr,PERF_COLOR_YELLOW ," Skip (user override)\n" );
@@ -277,8 +278,8 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) }pr_debug ("\n--- start ---\n" ); - err =run_test (&tests[curr]); -pr_debug ("---- end ----\n%s:" , tests[curr].desc); + err =run_test (t); +pr_debug ("---- end ----\n%s:" , t->desc);switch (err) {case TEST_OK :
@@ -299,15 +300,14 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)static int perf_test__list (int argc,const char **argv) { +struct test *t;int i =0 ; -while (tests[i].func) { -int curr = i++; - -if (argc >1 && !strstr (tests[curr].desc, argv[1 ])) +for_each_test (t) { +if (argc >1 && !strstr (t->desc, argv[1 ]))continue ; -pr_info ("%2d: %s\n" , i, tests[curr].desc); +pr_info ("%2d: %s\n" , ++i, t->desc); }return 0 ;
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 11/27 perf env: Move perf_env out of header.h and session.c into separate object
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Since it can be used separately from 'perf_session' and 'perf_header', move it to separate include file and object, next csets will try to move a perf_env__init() routine.
--- tools/perf/util/Build | 1 + tools/perf/util/env.c | 19 +++++++++++++++++++ tools/perf/util/env.h | 37 +++++++++++++++++++++++++++++++++++++ tools/perf/util/header.h | 33 +-------------------------------- tools/perf/util/session.c | 20 +------------------- 5 files changed, 59 insertions(+), 51 deletions(-) create mode 100644 tools/perf/util/env.c create mode 100644 tools/perf/util/env.h
tools/perf/util/Build +1 -0
@@ -5,6 +5,7 @@ libperf-y += build-id.o libperf-y += config.o libperf-y += ctype.o libperf-y += db-export.o +libperf-y += env.o libperf-y += environment.o libperf-y += event.o libperf-y += evlist.o
tools/perf/util/env.c new file +19 -0
@@ -0,0 +1,19 @@ +#include "env.h" +#include "util.h" + +void perf_env__exit (struct perf_env *env) +{ +zfree (&env->hostname); +zfree (&env->os_release); +zfree (&env->version); +zfree (&env->arch); +zfree (&env->cpu_desc); +zfree (&env->cpuid); +zfree (&env->cmdline); +zfree (&env->cmdline_argv); +zfree (&env->sibling_cores); +zfree (&env->sibling_threads); +zfree (&env->numa_nodes); +zfree (&env->pmu_mappings); +zfree (&env->cpu); +}
tools/perf/util/env.h new file +37 -0
@@ -0,0 +1,37 @@ +#ifndef __PERF_ENV_H +#define __PERF_ENV_H + +struct cpu_topology_map { +int socket_id; +int core_id; +}; + +struct perf_env { +char *hostname; +char *os_release; +char *version; +char *arch; +int nr_cpus_online; +int nr_cpus_avail; +char *cpu_desc; +char *cpuid; +unsigned long long total_mem; + +int nr_cmdline; +int nr_sibling_cores; +int nr_sibling_threads; +int nr_numa_nodes; +int nr_pmu_mappings; +int nr_groups; +char *cmdline; +const char **cmdline_argv; +char *sibling_cores; +char *sibling_threads; +char *numa_nodes; +char *pmu_mappings; +struct cpu_topology_map *cpu; +}; + +void perf_env__exit (struct perf_env *env); + +#endif /* __PERF_ENV_H */
tools/perf/util/header.h +1 -32
@@ -7,7 +7,7 @@#include <linux/bitmap.h> #include <linux/types.h> #include "event.h" - +#include "env.h" enum {HEADER_RESERVED =0 ,/* always cleared */
@@ -66,37 +66,6 @@ struct perf_header;int perf_file_header__read (struct perf_file_header *header,struct perf_header *ph,int fd); -struct cpu_topology_map { -int socket_id; -int core_id; -}; - -struct perf_env { -char *hostname; -char *os_release; -char *version; -char *arch; -int nr_cpus_online; -int nr_cpus_avail; -char *cpu_desc; -char *cpuid; -unsigned long long total_mem; - -int nr_cmdline; -int nr_sibling_cores; -int nr_sibling_threads; -int nr_numa_nodes; -int nr_pmu_mappings; -int nr_groups; -char *cmdline; -const char **cmdline_argv; -char *sibling_cores; -char *sibling_threads; -char *numa_nodes; -char *pmu_mappings; -struct cpu_topology_map *cpu; -}; -struct perf_header {enum perf_header_version version;bool needs_swap;
tools/perf/util/session.c +1 -19
@@ -170,31 +170,13 @@ static void perf_session__delete_threads(struct perf_session *session)machine__delete_threads (&session->machines.host); } -static void perf_session_env__exit (struct perf_env *env) -{ -zfree (&env->hostname); -zfree (&env->os_release); -zfree (&env->version); -zfree (&env->arch); -zfree (&env->cpu_desc); -zfree (&env->cpuid); - -zfree (&env->cmdline); -zfree (&env->cmdline_argv); -zfree (&env->sibling_cores); -zfree (&env->sibling_threads); -zfree (&env->numa_nodes); -zfree (&env->pmu_mappings); -zfree (&env->cpu); -} -void perf_session__delete (struct perf_session *session) {auxtrace__free (session);auxtrace_index__free (&session->auxtrace_index);perf_session__destroy_kernel_maps (session);perf_session__delete_threads (session); -perf_session_env__exit (&session->header.env); +perf_env__exit (&session->header.env);machines__exit (&session->machines);if (session->file)perf_data_file__close (session->file);
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 12/27 perf env: Rename some leftovers from rename to perf_env
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
In ce80d3bef9ff ("perf tools: Rename perf_session_env to perf_env") we forgot to rename a few functions to the "perf_env" prefix, do it now.
--- tools/perf/arch/common.c | 10 ++++------ tools/perf/arch/common.h | 4 ++-- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/ui/browsers/hists.c | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-)
tools/perf/arch/common.c +4 -6
@@ -128,9 +128,8 @@ static const char *normalize_arch(char *arch)return arch; } -static int perf_session_env__lookup_binutils_path (struct perf_env *env, -const char *name, -const char **path) +static int perf_env__lookup_binutils_path (struct perf_env *env, +const char *name,const char **path) {int idx;const char *arch, *cross_env;
@@ -206,7 +205,7 @@ out_error:return -1 ; } -int perf_session_env__lookup_objdump (struct perf_env *env) +int perf_env__lookup_objdump (struct perf_env *env) {/* * For live mode, env->arch will be NULL and we can use
@@ -215,6 +214,5 @@ int perf_session_env__lookup_objdump(struct perf_env *env)if (env->arch ==NULL )return 0 ; -return perf_session_env__lookup_binutils_path (env,"objdump" , - &objdump_path); +return perf_env__lookup_binutils_path (env,"objdump" , &objdump_path); }
tools/perf/arch/common.h +2 -2
@@ -1,10 +1,10 @@#ifndef ARCH_PERF_COMMON_H #define ARCH_PERF_COMMON_H -#include "../util/session.h" +#include "../util/env.h" extern const char *objdump_path; -int perf_session_env__lookup_objdump (struct perf_env *env); +int perf_env__lookup_objdump (struct perf_env *env);#endif /* ARCH_PERF_COMMON_H */
tools/perf/builtin-annotate.c +1 -1
@@ -211,7 +211,7 @@ static int __cmd_annotate(struct perf_annotate *ann) }if (!objdump_path) { - ret =perf_session_env__lookup_objdump (&session->header.env); + ret =perf_env__lookup_objdump (&session->header.env);if (ret) goto out; }
tools/perf/builtin-top.c +1 -1
@@ -952,7 +952,7 @@ static int __cmd_top(struct perf_top *top)machines__set_symbol_filter (&top->session->machines, symbol_filter);if (!objdump_path) { - ret =perf_session_env__lookup_objdump (&top->session->header.env); + ret =perf_env__lookup_objdump (&top->session->header.env);if (ret) goto out_delete; }
tools/perf/ui/browsers/hists.c +1 -1
@@ -1437,7 +1437,7 @@ do_annotate(struct hist_browser *browser, struct popup_action *act)struct hist_entry *he;int err; -if (!objdump_path &&perf_session_env__lookup_objdump (browser->env)) +if (!objdump_path &&perf_env__lookup_objdump (browser->env))return 0 ; notes =symbol__annotation (act->ms.sym);
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 13/27 perf env: Adopt perf_header__set_cmdline
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Move this from two globals to perf_env global, that eventually will be just perf_header->env or something else, to ease the refactoring series, leave it as a global and go on reading more of its fields, not as part of the header writing process but as a perf_env init one that will be used for perf.data-less situations.
--- tools/perf/util/env.c | 39 ++++++++++++++++++++++++++++++++++++ tools/perf/util/env.h | 4 ++++ tools/perf/util/header.c | 44 +++++------------------------------------ tools/perf/util/parse-options.c | 2 +- 4 files changed, 49 insertions(+), 40 deletions(-)
tools/perf/util/env.c +39 -0
@@ -1,6 +1,8 @@#include "env.h" #include "util.h" +struct perf_env perf_env; +void perf_env__exit (struct perf_env *env) {zfree (&env->hostname);
@@ -17,3 +19,40 @@ void perf_env__exit(struct perf_env *env)zfree (&env->pmu_mappings);zfree (&env->cpu); } + +int perf_env__set_cmdline (struct perf_env *env,int argc,const char *argv[]) +{ +int i; + +/* +* If env->cmdline_argv has already been set, do not override it. This allows +* a command to set the cmdline, parse args and then call another +* builtin function that implements a command -- e.g, cmd_kvm calling +* cmd_record. +*/ +if (env->cmdline_argv !=NULL ) +return 0 ; + +/* do not include NULL termination */ + env->cmdline_argv =calloc (argc,sizeof (char *)); +if (env->cmdline_argv ==NULL ) + goto out_enomem; + +/* +* Must copy argv contents because it gets moved around during option +* parsing: +*/ +for (i =0 ; i < argc ; i++) { + env->cmdline_argv[i] = argv[i]; +if (env->cmdline_argv[i] ==NULL ) + goto out_free; + } + + env->nr_cmdline = argc; + +return 0 ; +out_free: +zfree (&env->cmdline_argv); +out_enomem: +return -ENOMEM ; +}
tools/perf/util/env.h +4 -0
@@ -32,6 +32,10 @@ struct perf_env { struct cpu_topology_map *cpu; }; +extern struct perf_env perf_env; +void perf_env__exit (struct perf_env *env); +int perf_env__set_cmdline (struct perf_env *env,int argc,const char *argv[]); +#endif /* __PERF_ENV_H */
tools/perf/util/header.c +5 -39
74 lines not on this page · raw message
tools/perf/util/parse-options.c +1 -1
@@ -496,7 +496,7 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o {struct parse_opt_ctx_t ctx; -perf_header__set_cmdline (argc, argv); +perf_env__set_cmdline (&perf_env, argc, argv);/* build usage string if it's not provided */ if (subcommands && !usagestr[0 ]) {
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 14/27 perf hists browser: Fixup the "cpu" column width calculation
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Since we were not setting it to at least 3 chars ('CPU'), it was being reset to zero when recalculating the columns width when refreshing the screen, in 'perf top'. Fix it.
--- tools/perf/util/hist.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/hist.c +1 -0
@@ -144,6 +144,7 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)hists__set_unres_dso_col_len (hists,HISTC_MEM_DADDR_DSO ); } +hists__new_col_len (hists,HISTC_CPU ,3 );hists__new_col_len (hists,HISTC_MEM_LOCKED ,6 );hists__new_col_len (hists,HISTC_MEM_TLB ,22 );hists__new_col_len (hists,HISTC_MEM_SNOOP ,12 );
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 15/27 perf evsel: Remove forward declaration of 'struct perf_evlist'
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We have no use for it in evsel.h.
--- tools/perf/util/evsel.h | 1 - 1 file changed, 1 deletion(-)
tools/perf/util/evsel.h +0 -1
@@ -129,7 +129,6 @@ union u64_swap {struct cpu_map ;struct target ;struct thread_map ; -struct perf_evlist ;struct record_opts ;static inline struct cpu_map *perf_evsel__cpus (struct perf_evsel *evsel)
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 16/27 perf tools: Add tools/include into tags directories
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Adding tools/include into tags directories, to have include definitions reachable via tags/cscope.
--- tools/perf/Makefile.perf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/Makefile.perf +1 -1
@@ -459,7 +459,7 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html $(DOC_TARGETS): $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:doc=all) -TAG_FOLDERS= . ../lib/traceevent ../lib/api ../lib/symbol +TAG_FOLDERS= . ../lib/traceevent ../lib/api ../lib/symbol ../include TAG_FILES= ../../include/uapi/linux/perf_event.h TAGS:
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 17/27 perf env: Read msr pmu type from header
In reply to Arnaldo Carvalho de MeloFrom: Kan Liang <[email protected]>
Get msr pmu type when processing pmu_mappings
--- tools/perf/util/env.h | 1 + tools/perf/util/header.c | 3 +++ 2 files changed, 4 insertions(+)
tools/perf/util/env.h +1 -0
@@ -16,6 +16,7 @@ struct perf_env {char *cpu_desc;char *cpuid;unsigned long long total_mem; +unsigned int msr_pmu_type;int nr_cmdline;int nr_sibling_cores;
tools/perf/util/header.c +3 -0
@@ -1787,6 +1787,9 @@ static int process_pmu_mappings(struct perf_file_section *section __maybe_unused/* include a NULL character at the end */ strbuf_add (&sb,"" ,1 ); +if (!strcmp (name,"msr" )) + ph->env.msr_pmu_type = type; +free (name); pmu_num--; }
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 18/27 tools lib api fs: Introduce sysfs__read_{int,ull}()
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
To read either an int or an unsigned long long value from the given file.
E.g.:
$ cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq 3200000 $ ./sysfs__read_ull devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq=3200000 $
--- tools/lib/api/fs/fs.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ tools/lib/api/fs/fs.h | 4 ++++ 2 files changed, 49 insertions(+)
tools/lib/api/fs/fs.c +45 -0
@@ -1,5 +1,6 @@#include <ctype.h> #include <errno.h> +#include <limits.h> #include <stdbool.h> #include <stdio.h> #include <stdlib.h>
@@ -281,6 +282,50 @@ int filename__read_int(const char *filename, int *value)return err; } +int filename__read_ull (const char *filename,unsigned long long *value) +{ +char line[64 ]; +int fd =open (filename,O_RDONLY ), err =-1 ; + +if (fd <0 ) +return -1 ; + +if (read (fd, line,sizeof (line)) >0 ) { + *value =strtoull (line,NULL ,10 ); +if (*value !=ULLONG_MAX ) + err =0 ; + } + +close (fd); +return err; +} + +int sysfs__read_ull (const char *entry,unsigned long long *value) +{ +char path[PATH_MAX ]; +const char *sysfs =sysfs__mountpoint (); + +if (!sysfs) +return -1 ; + +snprintf (path,sizeof (path),"%s/%s" , sysfs, entry); + +return filename__read_ull (path, value); +} + +int sysfs__read_int (const char *entry,int *value) +{ +char path[PATH_MAX ]; +const char *sysfs =sysfs__mountpoint (); + +if (!sysfs) +return -1 ; + +snprintf (path,sizeof (path),"%s/%s" , sysfs, entry); + +return filename__read_int (path, value); +} +int sysctl__read_int (const char *sysctl,int *value) {char path[PATH_MAX ];
tools/lib/api/fs/fs.h +4 -0
@@ -25,5 +25,9 @@ FS(tracefs)int filename__read_int (const char *filename,int *value); +int filename__read_ull (const char *filename,unsigned long long *value); +int sysctl__read_int (const char *sysctl,int *value); +int sysfs__read_int (const char *entry,int *value); +int sysfs__read_ull (const char *entry,unsigned long long *value);#endif /* __API_FS__ */
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 19/27 tools lib api cpu: Introduce cpu.[ch] to obtain cpu related information
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
E.g.:
$ ./cpu__get_max_freq 3200000
It does that, as Kan's patch does, by looking at these files:
$ cat /sys/devices/system/cpu/online 0-3 $ ./sysfs__read_ull devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq=3200000 $
I.e. find out the first online CPU, then read its cpufreq info.
But do it in tools/lib/api/, so that other tools/ living code can use it, not just perf.
--- tools/lib/api/Build | 1 + tools/lib/api/cpu.c | 18 ++++++++++++++++++ tools/lib/api/cpu.h | 6 ++++++ 3 files changed, 25 insertions(+) create mode 100644 tools/lib/api/cpu.c create mode 100644 tools/lib/api/cpu.h
tools/lib/api/Build +1 -0
@@ -1,2 +1,3 @@ libapi-y += fd/ libapi-y += fs/ +libapi-y += cpu.o
tools/lib/api/cpu.c new file +18 -0
@@ -0,0 +1,18 @@ +#include <stdio.h> + +#include "cpu.h" +#include "fs/fs.h" + +int cpu__get_max_freq (unsigned long long *freq) +{ +char entry[PATH_MAX ]; +int cpu; + +if (sysfs__read_int ("devices/system/cpu/online" , &cpu) <0 ) +return -1 ; + +snprintf (entry,sizeof (entry), +"devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq" , cpu); + +return sysfs__read_ull (entry, freq); +}
tools/lib/api/cpu.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef __API_CPU__ +#define __API_CPU__ + +int cpu__get_max_freq (unsigned long long *freq); + +#endif /* __API_CPU__ */
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 20/27 perf cpu_map: Use sysfs__read_int in get_{core,socket}_id()
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We have the tools/lib/ sysfs__read_int() for that, avoid code duplication.
--- tools/perf/util/cpumap.c | 46 ++++++++++------------------------------------ 1 file changed, 10 insertions(+), 36 deletions(-)
tools/perf/util/cpumap.c +10 -36
@@ -225,28 +225,20 @@ void cpu_map__put(struct cpu_map *map)cpu_map__delete (map); } -int cpu_map__get_socket_id (int cpu) +static int cpu__get_topology_int (int cpu,const char *name,int *value) { -FILE *fp; -const char *mnt;char path[PATH_MAX ]; -int socket_id, ret; - - mnt =sysfs__mountpoint (); -if (!mnt) -return -1 ;snprintf (path,PATH_MAX , -"%s/devices/system/cpu/cpu%d/topology/physical_package_id" , - mnt, cpu); +"devices/system/cpu/cpu%d/topology/%s" , cpu, name); - fp =fopen (path,"r" ); -if (!fp) -return -1 ; - ret =fscanf (fp,"%d" , &socket_id); -fclose (fp); +return sysfs__read_int (path, value); +} -return ret ==1 ? socket_id :-1 ; +int cpu_map__get_socket_id (int cpu) +{ +int value, ret =cpu__get_topology_int (cpu,"physical_package_id" , &value); +return ret ?: value; }int cpu_map__get_socket (struct cpu_map *map,int idx)
@@ -299,26 +291,8 @@ static int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,int cpu_map__get_core_id (int cpu) { -FILE *fp; -const char *mnt; -char path[PATH_MAX ]; -int core_id, ret; - - mnt =sysfs__mountpoint (); -if (!mnt) -return -1 ; - -snprintf (path,PATH_MAX , -"%s/devices/system/cpu/cpu%d/topology/core_id" , - mnt, cpu); - - fp =fopen (path,"r" ); -if (!fp) -return -1 ; - ret =fscanf (fp,"%d" , &core_id); -fclose (fp); - -return ret ==1 ? core_id :-1 ; +int value, ret =cpu__get_topology_int (cpu,"core_id" , &value); +return ret ?: value; }int cpu_map__get_core (struct cpu_map *map,int idx)
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 21/27 perf env: Introduce read_cpu_topology_map() method
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Out of the code to write the cpu topology map in the perf.data file header.
Now if one needs the CPU topology map for the running machine, one needs to call perf_env__read_cpu_topology_map(perf_env) and the info will be stored in perf_env.cpu.
For now we're using a global perf_env variable, that will have its contents freed after we run a builtin.
v2: Check perf_env__read_cpu_topology_map() return in
write_cpu_topology() (Kan Liang)
--- tools/perf/perf.c | 2 ++ tools/perf/util/env.c | 28 ++++++++++++++++++++++++++++ tools/perf/util/env.h | 2 ++ tools/perf/util/header.c | 28 ++++++++++++---------------- 4 files changed, 44 insertions(+), 16 deletions(-)
tools/perf/perf.c +2 -0
@@ -8,6 +8,7 @@*/ #include "builtin.h" +#include "util/env.h" #include "util/exec_cmd.h" #include "util/cache.h" #include "util/quote.h"
@@ -369,6 +370,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) status = p->fn (argc, argv, prefix);exit_browser (status); +perf_env__exit (&perf_env);if (status)return status &0xff ;
tools/perf/util/env.c +28 -0
@@ -1,3 +1,4 @@ +#include "cpumap.h" #include "env.h" #include "util.h"
@@ -56,3 +57,30 @@ out_free: out_enomem:return -ENOMEM ; } + +int perf_env__read_cpu_topology_map (struct perf_env *env) +{ +int cpu, nr_cpus; + +if (env->cpu !=NULL ) +return 0 ; + +if (env->nr_cpus_avail ==0 ) + env->nr_cpus_avail =sysconf (_SC_NPROCESSORS_CONF); + + nr_cpus = env->nr_cpus_avail; +if (nr_cpus ==-1 ) +return -EINVAL ; + + env->cpu =calloc (nr_cpus,sizeof (env->cpu[0 ])); +if (env->cpu ==NULL ) +return -ENOMEM ; + +for (cpu =0 ; cpu < nr_cpus; ++cpu) { + env->cpu[cpu].core_id =cpu_map__get_core_id (cpu); + env->cpu[cpu].socket_id =cpu_map__get_socket_id (cpu); + } + + env->nr_cpus_avail = nr_cpus; +return 0 ; +}
tools/perf/util/env.h +2 -0
@@ -39,4 +39,6 @@ void perf_env__exit(struct perf_env *env);int perf_env__set_cmdline (struct perf_env *env,int argc,const char *argv[]); +int perf_env__read_cpu_topology_map (struct perf_env *env); +#endif /* __PERF_ENV_H */
tools/perf/util/header.c +12 -16
@@ -415,8 +415,6 @@ struct cpu_topo {u32 thread_sib;char **core_siblings;char **thread_siblings; -int *core_id; -int *phy_pkg_id; };static int build_cpu_topo (struct cpu_topo *tp,int cpu)
@@ -479,9 +477,6 @@ try_threads: } ret =0 ; done: - tp->core_id[cpu] =cpu_map__get_core_id (cpu); - tp->phy_pkg_id[cpu] =cpu_map__get_socket_id (cpu); -if (fp)fclose (fp);free (buf);
@@ -509,7 +504,7 @@ static struct cpu_topo *build_cpu_topology(void)struct cpu_topo *tp;void *addr;u32 nr, i; -size_t sz, sz_id; +size_t sz;long ncpus;int ret =-1 ;
@@ -520,9 +515,8 @@ static struct cpu_topo *build_cpu_topology(void) nr = (u32)(ncpus &UINT_MAX ); sz = nr *sizeof (char *); - sz_id = nr *sizeof (int ); - addr =calloc (1 ,sizeof (*tp) +2 * sz +2 * sz_id); + addr =calloc (1 ,sizeof (*tp) +2 * sz);if (!addr)return NULL ;
@@ -532,10 +526,6 @@ static struct cpu_topo *build_cpu_topology(void) tp->core_siblings = addr; addr += sz; tp->thread_siblings = addr; - addr += sz; - tp->core_id = addr; - addr += sz_id; - tp->phy_pkg_id = addr;for (i =0 ; i < nr; i++) { ret =build_cpu_topo (tp, i);
@@ -554,7 +544,7 @@ static int write_cpu_topology(int fd, struct perf_header *h __maybe_unused, {struct cpu_topo *tp;u32 i; -int ret; +int ret, j; tp =build_cpu_topology ();if (!tp)
@@ -579,11 +569,17 @@ static int write_cpu_topology(int fd, struct perf_header *h __maybe_unused,break ; } -for (i =0 ; i < tp->cpu_nr; i++) { - ret =do_write (fd, &tp->core_id[i],sizeof (int )); + ret =perf_env__read_cpu_topology_map (&perf_env); +if (ret <0 ) + goto done; + +for (j =0 ; j < perf_env.nr_cpus_avail; j++) { + ret =do_write (fd, &perf_env.cpu[j].core_id, +sizeof (perf_env.cpu[j].core_id));if (ret <0 )return ret; - ret =do_write (fd, &tp->phy_pkg_id[i],sizeof (int )); + ret =do_write (fd, &perf_env.cpu[j].socket_id, +sizeof (perf_env.cpu[j].socket_id));if (ret <0 )return ret; }
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 22/27 perf machine: Add pointer to sample's environment
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
The 'struct machine' represents the machine where the samples were/are being collected, and we also have a 'struct perf_env' with extra details about such machine, that we were collecting at 'perf.data' creation time but we also needed when no perf.data file is being used, such as in 'perf top'.
So, get those structs closer together, as they provide a bigger picture of the sample's environment.
In 'perf session', when the file argument is NULL, we can assume that the tool is sampling the running machine, so point machine->env to the global put in place in previous patches, while set it to the perf_header.env one when reading from a file.
This paves the way for machine->env to be used in perf_event__preprocess_sample to populate addr_location.socket.
--- tools/perf/util/header.c | 1 + tools/perf/util/machine.c | 1 + tools/perf/util/machine.h | 1 + tools/perf/util/session.c | 2 ++ 4 files changed, 5 insertions(+)
tools/perf/util/header.c +1 -0
@@ -2564,6 +2564,7 @@ int perf_session__read_header(struct perf_session *session)return -ENOMEM ; session->evlist->env = &header->env; + session->machines.host.env = &header->env;if (perf_data_file__is_pipe (file))return perf_header__read_pipe (session);
tools/perf/util/machine.c +1 -0
@@ -35,6 +35,7 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid) machine->last_match =NULL ; machine->vdso_info =NULL ; + machine->env =NULL ; machine->pid = pid;
tools/perf/util/machine.h +1 -0
@@ -34,6 +34,7 @@ struct machine {struct list_head dead_threads;struct thread *last_match;struct vdso_info *vdso_info; +struct perf_env *env;struct dsos dsos;struct map_groups kmaps;struct map *vmlinux_maps[MAP__NR_TYPES ];
tools/perf/util/session.c +2 -0
@@ -138,6 +138,8 @@ struct perf_session *perf_session__new(struct perf_data_file *file,perf_session__set_id_hdr_size (session);perf_session__set_comm_exec (session); } + }else { + session->machines.host.env = &perf_env; }if (!file ||perf_data_file__is_write (file)) {
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 23/27 perf tools: Add processor socket info to hist_entry and addr_location
In reply to Arnaldo Carvalho de MeloFrom: Kan Liang <[email protected]>
This information will come from perf.data files of from the current system, cached when needed, such as when the 'socket' sort order gets introduced.
--- tools/perf/util/event.c | 8 ++++++++ tools/perf/util/hist.c | 1 + tools/perf/util/sort.h | 1 + tools/perf/util/symbol.h | 1 + 4 files changed, 11 insertions(+)
tools/perf/util/event.c +8 -0
@@ -1021,6 +1021,14 @@ int perf_event__preprocess_sample(const union perf_event *event, al->sym =NULL ; al->cpu = sample->cpu; + al->socket =-1 ; + +if (al->cpu >=0 ) { +struct perf_env *env = machine->env; + +if (env && env->cpu) + al->socket = env->cpu[al->cpu].socket_id; + }if (al->map) {struct dso *dso = al->map->dso;
tools/perf/util/hist.c +1 -0
@@ -453,6 +453,7 @@ struct hist_entry *__hists__add_entry(struct hists *hists, .map = al->map, .sym = al->sym, }, + .socket = al->socket, .cpu = al->cpu, .cpumode = al->cpumode, .ip = al->addr,
tools/perf/util/sort.h +1 -0
@@ -90,6 +90,7 @@ struct hist_entry {struct comm *comm;u64 ip;u64 transaction; +s32 socket;s32 cpu;u8 cpumode;
tools/perf/util/symbol.h +1 -0
@@ -191,6 +191,7 @@ struct addr_location {u8 filtered;u8 cpumode;s32 cpu; +s32 socket; };struct symsrc {
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 24/27 perf tools: Introduce new sort type "socket" for the processor socket
In reply to Arnaldo Carvalho de MeloFrom: Kan Liang <[email protected]>
This patch enable perf report to sort by processor socket:
$ perf report --stdio --sort socket,comm,dso,symbol
# To display the perf.data header info, please use --header/--header-only options.
#
# Total Lost Samples: 0
#
# Samples: 686 of event 'cycles'
# Event count (approx.): 349215462
#
# Overhead SOCKET Command Shared Object Symbol
# ........ ...... ....... ................ ............................
#
97.05% 000 test test [.] plusB_c
0.98% 000 test test [.] plusA_c
0.93% 001 perf [kernel.vmlinux] [k] smp_call_function_single
0.19% 001 perf [kernel.vmlinux] [k] page_fault
0.19% 001 swapper [kernel.vmlinux] [k] pm_qos_request
0.16% 000 test [kernel.vmlinux] [k] add_mm_counter_fast--- tools/perf/Documentation/perf-report.txt | 3 ++- tools/perf/builtin-top.c | 15 +++++++++++++++ tools/perf/util/hist.c | 1 + tools/perf/util/hist.h | 1 + tools/perf/util/sort.c | 25 +++++++++++++++++++++++++ tools/perf/util/sort.h | 2 ++ 6 files changed, 46 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-report.txt +2 -1
@@ -68,7 +68,7 @@ OPTIONS --sort=:: Sort histogram entries by given key(s) - multiple keys can be specified in CSV format. Following sort keys are available: - pid, comm, dso, symbol, parent, cpu, srcline, weight, local_weight. + pid, comm, dso, symbol, parent, cpu, socket, srcline, weight, local_weight. Each key has following meaning:
@@ -79,6 +79,7 @@ OPTIONS - parent: name of function matched to the parent regex filter. Unmatched entries are displayed as "[other]". - cpu: cpu number the task ran at the time of sample + - socket: processor socket number the task ran at the time of sample - srcline: filename and line number executed at the time of sample. The DWARF debugging info must be provided. - srcfile: file name of the source file of the same. Requires dwarf
tools/perf/builtin-top.c +15 -0
@@ -963,6 +963,13 @@ static int __cmd_top(struct perf_top *top)machine__synthesize_threads (&top->session->machines.host, &opts->target, top->evlist->threads, false, opts->proc_map_timeout); + +if (sort__has_socket) { + ret =perf_env__read_cpu_topology_map (&perf_env); +if (ret <0 ) + goto out_err_cpu_topo; + } + ret =perf_top__start_counters (top);if (ret) goto out_delete;
@@ -1020,6 +1027,14 @@ out_delete: top->session =NULL ;return ret; + +out_err_cpu_topo: { +char errbuf[BUFSIZ ]; +const char *err =strerror_r (-ret, errbuf,sizeof (errbuf)); + +ui__error ("Could not read the CPU topology map: %s\n" , err); + goto out_delete; +} } static int
tools/perf/util/hist.c +1 -0
@@ -145,6 +145,7 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h) }hists__new_col_len (hists,HISTC_CPU ,3 ); +hists__new_col_len (hists,HISTC_SOCKET ,6 );hists__new_col_len (hists,HISTC_MEM_LOCKED ,6 );hists__new_col_len (hists,HISTC_MEM_TLB ,22 );hists__new_col_len (hists,HISTC_MEM_SNOOP ,12 );
tools/perf/util/hist.h +1 -0
@@ -29,6 +29,7 @@ enum hist_column {HISTC_COMM ,HISTC_PARENT ,HISTC_CPU , +HISTC_SOCKET ,HISTC_SRCLINE ,HISTC_SRCFILE , HISTC_MISPREDICT,
tools/perf/util/sort.c +25 -0
@@ -21,6 +21,7 @@ int sort__need_collapse = 0;int sort__has_parent =0 ;int sort__has_sym =0 ;int sort__has_dso =0 ; +int sort__has_socket =0 ;enum sort_mode sort__mode =SORT_MODE__NORMAL ;
@@ -421,6 +422,27 @@ struct sort_entry sort_cpu = { .se_width_idx = HISTC_CPU, }; +/* --sort socket */ + +static int64_t +sort__socket_cmp (struct hist_entry *left,struct hist_entry *right) +{ +return right->socket - left->socket; +} + +static int hist_entry__socket_snprintf (struct hist_entry *he,char *bf, +size_t size,unsigned int width) +{ +return repsep_snprintf (bf, size,"%*.*d" , width, width-3 , he->socket); +} + +struct sort_entry sort_socket = { + .se_header ="Socket" , + .se_cmp = sort__socket_cmp, + .se_snprintf = hist_entry__socket_snprintf, + .se_width_idx =HISTC_SOCKET , +}; +/* sort keys for branch stacks */ static int64_t
@@ -1248,6 +1270,7 @@ static struct sort_dimension common_sort_dimensions[] = {DIM (SORT_SYM ,"symbol" , sort_sym),DIM (SORT_PARENT ,"parent" , sort_parent),DIM (SORT_CPU ,"cpu" , sort_cpu), +DIM (SORT_SOCKET ,"socket" , sort_socket),DIM (SORT_SRCLINE ,"srcline" , sort_srcline),DIM (SORT_SRCFILE ,"srcfile" , sort_srcfile), DIM(SORT_LOCAL_WEIGHT, "local_weight", sort_local_weight),
@@ -1550,6 +1573,8 @@ int sort_dimension__add(const char *tok) }else if (sd->entry == &sort_dso) { sort__has_dso =1 ; + }else if (sd->entry == &sort_socket) { + sort__has_socket =1 ; }return __sort_dimension__add (sd);
tools/perf/util/sort.h +2 -0
@@ -34,6 +34,7 @@ extern int have_ignore_callees;extern int sort__need_collapse;extern int sort__has_parent;extern int sort__has_sym; +extern int sort__has_socket;extern enum sort_mode sort__mode;extern struct sort_entry sort_comm;extern struct sort_entry sort_dso;
@@ -173,6 +174,7 @@ enum sort_type {SORT_SYM ,SORT_PARENT ,SORT_CPU , +SORT_SOCKET ,SORT_SRCLINE ,SORT_SRCFILE , SORT_LOCAL_WEIGHT,
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 25/27 perf report: Introduce --socket-filter option
In reply to Arnaldo Carvalho de MeloFrom: Kan Liang <[email protected]>
Introduce --socket-filter option for 'perf report' to only show entries for a processor socket that match this filter.
$ perf report --socket-filter 1 --stdio
# To display the perf.data header info, please use --header/--header-only options.
#
# Total Lost Samples: 0
#
# Samples: 752 of event 'cycles'
# Event count (approx.): 350995599
# Processor Socket: 1
#
# Overhead Command Shared Object Symbol
# ........ ......... ................ .................................
#
97.02% test test [.] plusB_c
0.97% test test [.] plusA_c
0.23% swapper [kernel.vmlinux] [k] acpi_idle_do_entry
0.09% rcu_sched [kernel.vmlinux] [k] dyntick_save_progress_counter
0.01% swapper [kernel.vmlinux] [k] task_waking_fair
0.00% swapper [kernel.vmlinux] [k] run_timer_softirq--- tools/perf/Documentation/perf-report.txt | 3 +++ tools/perf/builtin-report.c | 11 +++++++++++ tools/perf/ui/browsers/hists.c | 4 ++++ tools/perf/util/hist.c | 16 ++++++++++++++++ tools/perf/util/hist.h | 4 +++- 5 files changed, 37 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-report.txt +3 -0
@@ -350,6 +350,9 @@ include::itrace.txt[] This option extends the perf report to show reference callgraphs, which collected by reference event, in no callgraph event. +--socket-filter:: + Only report the samples on the processor socket that match with this filter + include::callchain-overhead-calculation.txt[] SEE ALSO
tools/perf/builtin-report.c +11 -0
@@ -62,6 +62,7 @@ struct report {float min_percent;u64 nr_entries;u64 queue_size; +int socket_filter;DECLARE_BITMAP (cpu_bitmap,MAX_NR_CPUS ); };
@@ -286,6 +287,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct reportstruct perf_evsel *evsel =hists_to_evsel (hists);char buf[512 ];size_t size =sizeof (buf); +int socket = hists->socket_filter;if (symbol_conf.filter_relative) { nr_samples = hists->stats.nr_non_filtered_samples;
@@ -326,6 +328,10 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report ret +=fprintf (fp,"\n# Sort order : %s" , sort_order ? : default_mem_sort_order); }else ret +=fprintf (fp,"\n# Event count (approx.): %" PRIu64, nr_events); + +if (socket >-1 ) + ret +=fprintf (fp,"\n# Processor Socket: %d" , socket); +return ret +fprintf (fp,"\n#\n" ); }
@@ -450,6 +456,8 @@ static void report__collapse_hists(struct report *rep)if (pos->idx ==0 ) hists->symbol_filter_str = rep->symbol_filter_str; + hists->socket_filter = rep->socket_filter; +hists__collapse_resort (hists, &prog);/* Non-group events are considered as leader */
@@ -635,6 +643,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) }, .max_stack = PERF_MAX_STACK_DEPTH, .pretty_printing_style = "normal", + .socket_filter = -1, };const struct option options[] = { OPT_STRING('i', "input", &input_name, "file",
@@ -747,6 +756,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) "Show full source file name path for source lines"),OPT_BOOLEAN (0 ,"show-ref-call-graph" , &symbol_conf.show_ref_callgraph,"Show callgraph from reference event" ), +OPT_INTEGER (0 ,"socket-filter" , &report.socket_filter, +"only show processor socket that match with this filter" ),OPT_END () }; struct perf_data_file file = {
tools/perf/ui/browsers/hists.c +4 -0
@@ -1261,6 +1261,7 @@ static int hists__browser_title(struct hists *hists,int printed;const struct dso *dso = hists->dso_filter;const struct thread *thread = hists->thread_filter; +int socket = hists->socket_filter;unsigned long nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE ];u64 nr_events = hists->stats.total_period;struct perf_evsel *evsel =hists_to_evsel (hists);
@@ -1314,6 +1315,9 @@ static int hists__browser_title(struct hists *hists,if (dso) printed +=scnprintf (bf + printed, size - printed,", DSO: %s" , dso->short_name); +if (socket >-1 ) + printed +=scnprintf (bf + printed, size - printed, +", Processor Socket: %d" , socket);if (!is_report_browser (hbt)) {struct perf_top *top = hbt->arg;
tools/perf/util/hist.c +16 -0
@@ -15,6 +15,8 @@ static bool hists__filter_entry_by_thread(struct hists *hists, struct hist_entry *he);static bool hists__filter_entry_by_symbol (struct hists *hists,struct hist_entry *he); +static bool hists__filter_entry_by_socket (struct hists *hists, +struct hist_entry *he);u16 hists__col_len (struct hists *hists,enum hist_column col) {
@@ -1027,6 +1029,7 @@ static void hists__apply_filters(struct hists *hists, struct hist_entry *he)hists__filter_entry_by_dso (hists, he);hists__filter_entry_by_thread (hists, he);hists__filter_entry_by_symbol (hists, he); +hists__filter_entry_by_socket (hists, he); }void hists__collapse_resort (struct hists *hists,struct ui_progress *prog)
@@ -1295,6 +1298,18 @@ void hists__filter_by_symbol(struct hists *hists) } } +static bool hists__filter_entry_by_socket (struct hists *hists, +struct hist_entry *he) +{ +if ((hists->socket_filter >-1 ) && + (he->socket != hists->socket_filter)) { + he->filtered |= (1 <<HIST_FILTER__SOCKET ); +return true; + } + +return false; +} +void events_stats__inc (struct events_stats *stats,u32 type) { ++stats->nr_events[0 ];
@@ -1520,6 +1535,7 @@ static int hists_evsel__init(struct perf_evsel *evsel) hists->entries_collapsed =RB_ROOT ; hists->entries =RB_ROOT ;pthread_mutex_init (&hists->lock,NULL ); + hists->socket_filter =-1 ;return 0 ; }
tools/perf/util/hist.h +3 -1
@@ -20,6 +20,7 @@ enum hist_filter {HIST_FILTER__SYMBOL ,HIST_FILTER__GUEST ,HIST_FILTER__HOST , + HIST_FILTER__SOCKET, }; enum hist_column {
@@ -71,6 +72,7 @@ struct hists {struct events_stats stats;u64 event_stream;u16 col_len[HISTC_NR_COLS ]; +int socket_filter; };struct hist_entry_iter ;
@@ -149,7 +151,7 @@ void hists__filter_by_symbol(struct hists *hists);static inline bool hists__has_filter (struct hists *hists) {return hists->thread_filter || hists->dso_filter || - hists->symbol_filter_str; + hists->symbol_filter_str || (hists->socket_filter >-1 ); }u16 hists__col_len (struct hists *hists,enum hist_column col);
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 26/27 perf hists browser: Zoom in/out for processor socket
In reply to Arnaldo Carvalho de MeloFrom: Kan Liang <[email protected]>
Currently, users can zoom in/out for threads and dso in 'perf top' and 'perf report'.
This patch extends it for the processor sockets.
'S' is the short key to zoom into current Processor Socket.
[ - Made it elide the Socket column when zooming into it,
just like with the other zoom ops;
- Make it use browser->pstack, to unzoom level by level;
- Rename 'socket' variables to 'socket_id' to make it build on older systems where it shadows a global glibc declaration ]
--- tools/perf/builtin-report.c | 6 ++--- tools/perf/ui/browsers/hists.c | 61 +++++++++++++++++++++++++++++++++++++----- tools/perf/util/hist.c | 19 +++++++++++++ tools/perf/util/hist.h | 1 + 4 files changed, 77 insertions(+), 10 deletions(-)
tools/perf/builtin-report.c +3 -3
@@ -287,7 +287,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct reportstruct perf_evsel *evsel =hists_to_evsel (hists);char buf[512 ];size_t size =sizeof (buf); -int socket = hists->socket_filter; +int socked_id = hists->socket_filter;if (symbol_conf.filter_relative) { nr_samples = hists->stats.nr_non_filtered_samples;
@@ -329,8 +329,8 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report }else ret +=fprintf (fp,"\n# Event count (approx.): %" PRIu64, nr_events); -if (socket >-1 ) - ret +=fprintf (fp,"\n# Processor Socket: %d" , socket); +if (socked_id >-1 ) + ret +=fprintf (fp,"\n# Processor Socket: %d" , socked_id);return ret +fprintf (fp,"\n#\n" ); }
tools/perf/ui/browsers/hists.c +54 -7
129 lines not on this page · raw message
tools/perf/util/hist.c +19 -0
@@ -1310,6 +1310,25 @@ static bool hists__filter_entry_by_socket(struct hists *hists,return false; } +void hists__filter_by_socket (struct hists *hists) +{ +struct rb_node *nd; + + hists->stats.nr_non_filtered_samples =0 ; + +hists__reset_filter_stats (hists); +hists__reset_col_len (hists); + +for (nd =rb_first (&hists->entries); nd; nd =rb_next (nd)) { + struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); + +if (hists__filter_entry_by_socket (hists, h)) +continue ; + +hists__remove_entry_filter (hists, h,HIST_FILTER__SOCKET ); + } +} +void events_stats__inc (struct events_stats *stats,u32 type) { ++stats->nr_events[0 ];
tools/perf/util/hist.h +1 -0
@@ -147,6 +147,7 @@ size_t perf_evlist__fprintf_nr_events(struct perf_evlist *evlist, FILE *fp);void hists__filter_by_dso (struct hists *hists);void hists__filter_by_thread (struct hists *hists);void hists__filter_by_symbol (struct hists *hists); +void hists__filter_by_socket (struct hists *hists);static inline bool hists__has_filter (struct hists *hists) {
Signature · 1 line
2.1.0
Arnaldo Carvalho de Melo
maintainerPATCH 27/27 perf test: Add entry for hists socket filter
In reply to Arnaldo Carvalho de MeloFrom: Kan Liang <[email protected]>
Add test case for hists socket filter.
--- tools/perf/tests/hists_filter.c | 55 +++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 10 deletions(-)
tools/perf/tests/hists_filter.c +45 -10
@@ -16,30 +16,31 @@ struct sample {struct thread *thread;struct map *map;struct symbol *sym; +int socket; };/* For the numbers, see hists_common.c */ static struct sample fake_samples[] = {/* perf [kernel] schedule() */ - { .pid =FAKE_PID_PERF1 , .ip =FAKE_IP_KERNEL_SCHEDULE , }, + { .pid =FAKE_PID_PERF1 , .ip =FAKE_IP_KERNEL_SCHEDULE , .socket =0 },/* perf [perf] main() */ - { .pid =FAKE_PID_PERF1 , .ip =FAKE_IP_PERF_MAIN , }, + { .pid =FAKE_PID_PERF1 , .ip =FAKE_IP_PERF_MAIN , .socket =0 },/* perf [libc] malloc() */ - { .pid =FAKE_PID_PERF1 , .ip =FAKE_IP_LIBC_MALLOC , }, + { .pid =FAKE_PID_PERF1 , .ip =FAKE_IP_LIBC_MALLOC , .socket =0 },/* perf [perf] main() */ - { .pid =FAKE_PID_PERF2 , .ip =FAKE_IP_PERF_MAIN , },/* will be merged */ + { .pid =FAKE_PID_PERF2 , .ip =FAKE_IP_PERF_MAIN , .socket =0 },/* will be merged */ /* perf [perf] cmd_record() */ - { .pid =FAKE_PID_PERF2 , .ip =FAKE_IP_PERF_CMD_RECORD , }, + { .pid =FAKE_PID_PERF2 , .ip =FAKE_IP_PERF_CMD_RECORD , .socket =1 },/* perf [kernel] page_fault() */ - { .pid =FAKE_PID_PERF2 , .ip =FAKE_IP_KERNEL_PAGE_FAULT , }, + { .pid =FAKE_PID_PERF2 , .ip =FAKE_IP_KERNEL_PAGE_FAULT , .socket =1 },/* bash [bash] main() */ - { .pid =FAKE_PID_BASH , .ip =FAKE_IP_BASH_MAIN , }, + { .pid =FAKE_PID_BASH , .ip =FAKE_IP_BASH_MAIN , .socket =2 },/* bash [bash] xmalloc() */ - { .pid =FAKE_PID_BASH , .ip =FAKE_IP_BASH_XMALLOC , }, + { .pid =FAKE_PID_BASH , .ip =FAKE_IP_BASH_XMALLOC , .socket =2 },/* bash [libc] malloc() */ - { .pid =FAKE_PID_BASH , .ip =FAKE_IP_LIBC_MALLOC , }, + { .pid =FAKE_PID_BASH , .ip =FAKE_IP_LIBC_MALLOC , .socket =3 },/* bash [kernel] page_fault() */ - { .pid =FAKE_PID_BASH , .ip =FAKE_IP_KERNEL_PAGE_FAULT , }, + { .pid =FAKE_PID_BASH , .ip =FAKE_IP_KERNEL_PAGE_FAULT , .socket =3 }, }; static int add_hist_entries(struct perf_evlist *evlist,
@@ -83,6 +84,7 @@ static int add_hist_entries(struct perf_evlist *evlist, &sample) < 0) goto out; + al.socket = fake_samples[i].socket;if (hist_entry_iter__add (&iter, &al,PERF_MAX_STACK_DEPTH ,NULL ) <0 ) {addr_location__put (&al);
@@ -253,6 +255,39 @@ int test__hists_filter(void)TEST_ASSERT_VAL ("Unmatched total period for symbol filter" , hists->stats.total_non_filtered_period ==300 ); +/* remove symbol filter first */ + hists->symbol_filter_str =NULL ; +hists__filter_by_symbol (hists); + +/* now applying socket filters */ + hists->socket_filter =2 ; +hists__filter_by_socket (hists); + +if (verbose >2 ) { +pr_info ("Histogram for socket filters\n" ); +print_hists_out (hists); + } + +/* normal stats should be invariant */ +TEST_ASSERT_VAL ("Invalid nr samples" , + hists->stats.nr_events[PERF_RECORD_SAMPLE ] ==10 ); +TEST_ASSERT_VAL ("Invalid nr hist entries" , + hists->nr_entries ==9 ); +TEST_ASSERT_VAL ("Invalid total period" , + hists->stats.total_period ==1000 ); + +/* but filter stats are changed */ +TEST_ASSERT_VAL ("Unmatched nr samples for socket filter" , + hists->stats.nr_non_filtered_samples ==2 ); +TEST_ASSERT_VAL ("Unmatched nr hist entries for socket filter" , + hists->nr_non_filtered_entries ==2 ); +TEST_ASSERT_VAL ("Unmatched total period for socket filter" , + hists->stats.total_non_filtered_period ==200 ); + +/* remove socket filter first */ + hists->socket_filter =-1 ; +hists__filter_by_socket (hists); +/* now applying all filters at once. */ hists->thread_filter = fake_samples[1 ].thread; hists->dso_filter = fake_samples[1 ].map->dso;
Signature · 1 line
2.1.0
Quoted 187 lines · Arnaldo Carvalho de Melo
From: Arnaldo Carvalho de Melo <[email protected]>
Hi Ingo,
Please consider pulling, this should have all the issues related to
that 'socket' sort order/filter fixed. I reordered some patches I did to get the right infrastructure in place and merged a few fixes from me, Jiri, so that we have a clean bisect history wrt this feature.I tested it using old perf.data files with no cpu->socket_id header,perf top, and the reported problems from you, from Wang, the ones I found seem to be all fixed. I also built tested it in a few systems, fixing problems, for instance with using a 'socket' variable name that was shadowing a glibc decl.
We still have problems tho when there are offline CPUs, but that is a
longstanding problem from the days when Stephane added that code and only affects the perf.data case, i.e. when generating the CPU topology perf.data header it bails out (but doesn't segfaults, its just the mapping that is lost) as soon as it fails to find files that don't exist when a CPU is offline.I.e.:perf record -a usleep 1; perf report -s socket
Will show -1 for the socket info, but at least that doesn't cause
a segfault anymore ;-)perf top -s socket
Works tho when CPUs are offline.
I will try and fix that other problem, but I wanted to get what is
in perf/core2 flushed so that I can process some more outstanding patches, to avoid stalling too many downstreamers.Some of these other patches I want to process include fixes for
perf/urgent, like some from Wang, etc.- Arnaldo
The following changes since commit
8f3e5684d3fbd91ead283916676fa3dac22615e5:perf/core: Drop
PERF_EVENT_TXN(2015-09-13 11:27:30 +0200)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.gittags/perf-core-for-mingo-2for you to fetch changes up to
92d424ae898e0d04ac34263aa33e40acc1e1f3d1:perf test: Add entry for hists socket filter (2015-09-14 13:04:10 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:User visible:
- Add 'socket' sort entry, to sort by the processor socket in 'perf top' and 'perf report' (Kan Liang)
- Introduce --socket-filter to 'perf report', for filtering by processor socket (Kan Liang)
- Add new "Zoom into Processor Socket" operation in the perf hists browser, used in 'perf top' and 'perf report' (Kan Liang)
- Fix the 'CPU' hist browser column width calculation (Arnaldo Carvalho de Melo)
Infrastructure:
- 'perf test' fixes for the object code reading entry (Jan Stancek)
- Add processor socket and cpu topology 'perf test' entries (Kan Liang)
- Introduce more
sysfs__read_TYPE()helpers (Arnaldo Carvalho de Melo)- Group cpu information reading functions in tools/lib/api/cpu.[ch], starting with
cpu__get_max_freq()from a patchkit by Kan Liang (Arnaldo Carvalho de Melo)- Retrieve the MSR PMU type from a perf.data file header and store it in struct
perf_env(Kan Liang)- Add
tools/includeinto CTAGS file list (Jiri Olsa)- Add iterator function for perf tests (Matt Fleming)
- Switch to
tracing_patchinterface (Jiri Olsa)Signed-off-by Arnaldo Carvalho de Melo <[email protected]>----------------------------------------------------------------
Arnaldo Carvalho de Melo (10):
perf env: Moveperf_envout ofheader.handsession.cinto separate object perf env: Rename some leftovers from rename toperf_env
perf env: Adoptperf_header__set_cmdline
perf hists browser: Fixup the "cpu" column width calculation perf evsel: Remove forward declaration of 'structperf_evlist' tools lib api fs: Introduce sysfs__read_{int,ull}()
tools lib api cpu: Introduce cpu.[ch] to obtain cpu related information perfcpu_map: Usesysfs__read_intin get_{core,socket}_id() perf env: Introduceread_cpu_topology_map()method
perf machine: Add pointer to sample's environmentJan Stancek (4):
perf tests: Take into account address of each objdump line perf tests: Make objdump disassemble zero blocks perf tests: Stop reading if objdump output crossed sections perf tests: Print objdump/dso buffers if they don't matchJiri Olsa (5):
tools lib api fs: Maketracing_path_strerror_openmessage generic tools lib api fs: Replace debugfs/tracefs objects interface withfs.ctools lib api fs: Remove debugfs, tracefs and findfs objects perf tools: Switch totracing_pathinterface on appropriate places perf tools: Addtools/includeinto tags directoriesKan Liang (7):
perf test: Add entry to test cpu topology
perf env: Read msr pmu type from header
perf tools: Add processor socket info tohist_entryandaddr_locationperf tools: Introduce new sort type "socket" for the processor socket perf report: Introduce --socket-filter option
perf hists browser: Zoom in/out for processor socket
perf test: Add entry for hists socket filterMatt Fleming (1):
perf tests: Introduce iterator function for teststools/lib/api/Build | 1 + tools/lib/api/cpu.c | 18 +++++ tools/lib/api/cpu.h | 6 ++ tools/lib/api/fs/Build | 3 - tools/lib/api/fs/debugfs.c | 77 ------------------- tools/lib/api/fs/debugfs.h | 23 ------ tools/lib/api/fs/findfs.c | 63 ---------------- tools/lib/api/fs/findfs.h | 23 ------ tools/lib/api/fs/fs.c | 46 +++++++++++- tools/lib/api/fs/fs.h | 4 + tools/lib/api/fs/tracefs.c | 78 ------------------- tools/lib/api/fs/tracefs.h | 21 ------ tools/lib/api/fs/tracing_path.c | 35 +++++---- tools/perf/Documentation/perf-report.txt | 6 +- tools/perf/Makefile.perf | 2 +- tools/perf/arch/common.c | 10 +-- tools/perf/arch/common.h | 4 +- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-kvm.c | 1 - tools/perf/builtin-probe.c | 1 - tools/perf/builtin-report.c | 11 +++ tools/perf/builtin-top.c | 17 ++++- tools/perf/perf.c | 2 + tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 36 +++++---- tools/perf/tests/code-reading.c | 74 +++++++++++++++---- tools/perf/tests/hists_filter.c | 55 +++++++++++--- tools/perf/tests/openat-syscall-all-cpus.c | 10 +-- tools/perf/tests/openat-syscall.c | 10 +-- tools/perf/tests/parse-events.c | 19 +---- tools/perf/tests/tests.h | 1 + tools/perf/tests/topology.c | 115 +++++++++++++++++++++++++++++ tools/perf/ui/browsers/hists.c | 61 +++++++++++++-- tools/perf/util/Build | 1 + tools/perf/util/cpumap.c | 46 +++--------- tools/perf/util/env.c | 86 +++++++++++++++++++++ tools/perf/util/env.h | 44 +++++++++++ tools/perf/util/event.c | 8 ++ tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 1 - tools/perf/util/header.c | 76 ++++++------------- tools/perf/util/header.h | 33 +-------- tools/perf/util/hist.c | 38 ++++++++++ tools/perf/util/hist.h | 6 +- tools/perf/util/machine.c | 1 + tools/perf/util/machine.h | 1 + tools/perf/util/parse-options.c | 2 +- tools/perf/util/probe-event.c | 5 +- tools/perf/util/probe-file.c | 15 +--- tools/perf/util/session.c | 22 +----- tools/perf/util/sort.c | 25 +++++++ tools/perf/util/sort.h | 3 + tools/perf/util/symbol.h | 1 + tools/perf/util/util.h | 3 +- 54 files changed, 700 insertions(+), 555 deletions(-) create mode 100644 tools/lib/api/cpu.c create mode 100644 tools/lib/api/cpu.h delete mode 100644 tools/lib/api/fs/debugfs.c
Quoted 8 lines
delete mode 100644 tools/lib/api/fs/debugfs.h delete mode 100644 tools/lib/api/fs/findfs.c delete mode 100644 tools/lib/api/fs/findfs.h delete mode 100644 tools/lib/api/fs/tracefs.c delete mode 100644 tools/lib/api/fs/tracefs.h create mode 100644 tools/perf/tests/topology.c create mode 100644 tools/perf/util/env.c create mode 100644 tools/perf/util/env.h
Pulled, thanks a lot Arnaldo!
Ingo