* [PATCH 1/4] perf tools: Fix spelling mistakes
2017-05-04 17:23 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
@ 2017-05-04 17:23 ` Arnaldo Carvalho de Melo
2017-05-04 17:23 ` [PATCH 2/4] perf annotate: Fix AArch64 comment char Arnaldo Carvalho de Melo
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2017-05-04 17:23 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Kim Phillips, Alexander Shishkin, Peter Zijlstra,
Arnaldo Carvalho de Melo
From: Kim Phillips <kim.phillips@arm.com>
Mostly in the documentation.
Signed-off-by: Kim Phillips <kim.phillips@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170503131350.cebeecd8bd0f2968417626ab@arm.com
[ Fix spelling of "parameter" in one of the spell-checked lines ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Documentation/perf-c2c.txt | 4 ++--
tools/perf/Documentation/perf-record.txt | 2 +-
tools/perf/Documentation/perf-report.txt | 6 +++---
tools/perf/Documentation/perf.data-file-format.txt | 4 ++--
tools/perf/Documentation/tips.txt | 2 +-
tools/perf/util/event.h | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/perf/Documentation/perf-c2c.txt b/tools/perf/Documentation/perf-c2c.txt
index 2da07e51e119..822414235170 100644
--- a/tools/perf/Documentation/perf-c2c.txt
+++ b/tools/perf/Documentation/perf-c2c.txt
@@ -76,7 +76,7 @@ REPORT OPTIONS
-c::
--coalesce::
- Specify sorintg fields for single cacheline display.
+ Specify sorting fields for single cacheline display.
Following fields are available: tid,pid,iaddr,dso
(see COALESCE)
@@ -106,7 +106,7 @@ REPORT OPTIONS
-d::
--display::
- Siwtch to HITM type (rmt, lcl) to display and sort on. Total HITMs as default.
+ Switch to HITM type (rmt, lcl) to display and sort on. Total HITMs as default.
C2C RECORD
----------
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index ea3789d05e5e..b0e9e921d534 100644
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -225,7 +225,7 @@ OPTIONS
the libunwind or libdw library) should be used instead.
Using the "lbr" method doesn't require any compiler options. It
will produce call graphs from the hardware LBR registers. The
- main limition is that it is only available on new Intel
+ main limitation is that it is only available on new Intel
platforms, such as Haswell. It can only get user call chain. It
doesn't work with branch stack sampling at the same time.
diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt
index 37a175914157..9fa84617181e 100644
--- a/tools/perf/Documentation/perf-report.txt
+++ b/tools/perf/Documentation/perf-report.txt
@@ -182,7 +182,7 @@ OPTIONS
--parent=<regex>::
A regex filter to identify parent. The parent is a caller of this
function and searched through the callchain, thus it requires callchain
- information recorded. The pattern is in the exteneded regex format and
+ information recorded. The pattern is in the extended regex format and
defaults to "\^sys_|^do_page_fault", see '--sort parent'.
-x::
@@ -207,8 +207,8 @@ OPTIONS
-g::
--call-graph=<print_type,threshold[,print_limit],order,sort_key[,branch],value>::
Display call chains using type, min percent threshold, print limit,
- call order, sort key, optional branch and value. Note that ordering of
- parameters is not fixed so any parement can be given in an arbitraty order.
+ call order, sort key, optional branch and value. Note that ordering
+ is not fixed so any parameter can be given in an arbitrary order.
One exception is the print_limit which should be preceded by threshold.
print_type can be either:
diff --git a/tools/perf/Documentation/perf.data-file-format.txt b/tools/perf/Documentation/perf.data-file-format.txt
index fa2a9132f0a9..de8b39dda7b8 100644
--- a/tools/perf/Documentation/perf.data-file-format.txt
+++ b/tools/perf/Documentation/perf.data-file-format.txt
@@ -270,7 +270,7 @@ When the event stream contains multiple events each event is identified
by an ID. This can be either through the PERF_SAMPLE_ID or the
PERF_SAMPLE_IDENTIFIER header. The PERF_SAMPLE_IDENTIFIER header is
at a fixed offset from the event header, which allows reliable
-parsing of the header. Relying on ID may be ambigious.
+parsing of the header. Relying on ID may be ambiguous.
IDENTIFIER is only supported by newer Linux kernels.
Perf record specific events:
@@ -288,7 +288,7 @@ struct attr_event {
uint64_t id[];
};
- PERF_RECORD_HEADER_EVENT_TYPE = 65, /* depreceated */
+ PERF_RECORD_HEADER_EVENT_TYPE = 65, /* deprecated */
#define MAX_EVENT_NAME 64
diff --git a/tools/perf/Documentation/tips.txt b/tools/perf/Documentation/tips.txt
index 170b0289a7bc..db0ca3063eae 100644
--- a/tools/perf/Documentation/tips.txt
+++ b/tools/perf/Documentation/tips.txt
@@ -23,7 +23,7 @@ For memory address profiling, try: perf mem record / perf mem report
For tracepoint events, try: perf report -s trace_fields
To record callchains for each sample: perf record -g
To record every process run by a user: perf record -u <user>
-Skip collecing build-id when recording: perf record -B
+Skip collecting build-id when recording: perf record -B
To change sampling frequency to 100 Hz: perf record -F 100
See assembly instructions with percentage: perf annotate <symbol>
If you prefer Intel style assembly, try: perf annotate -M intel
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 27ac047490c3..7c3fa1c8cbcd 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -229,7 +229,7 @@ struct build_id_event {
enum perf_user_event_type { /* above any possible kernel type */
PERF_RECORD_USER_TYPE_START = 64,
PERF_RECORD_HEADER_ATTR = 64,
- PERF_RECORD_HEADER_EVENT_TYPE = 65, /* depreceated */
+ PERF_RECORD_HEADER_EVENT_TYPE = 65, /* deprecated */
PERF_RECORD_HEADER_TRACING_DATA = 66,
PERF_RECORD_HEADER_BUILD_ID = 67,
PERF_RECORD_FINISHED_ROUND = 68,
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] perf annotate: Fix AArch64 comment char
2017-05-04 17:23 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
2017-05-04 17:23 ` [PATCH 1/4] perf tools: Fix spelling mistakes Arnaldo Carvalho de Melo
@ 2017-05-04 17:23 ` Arnaldo Carvalho de Melo
2017-05-04 17:23 ` [PATCH 3/4] perf tests kmod-path: Don't fail if compressed modules aren't supported Arnaldo Carvalho de Melo
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2017-05-04 17:23 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Kim Phillips, Alexander Shishkin, Chris Riyder,
Peter Zijlstra, Arnaldo Carvalho de Melo
From: Kim Phillips <kim.phillips@arm.com>
The commit 0fcb1da4aba "perf annotate: AArch64 support" blindly copied
the comment character from the original:
https://lkml.org/lkml/2016/5/19/461
whereas that same commit shows objdump output utilizing the C++ style
"//" as the comment delimeter. Since '/' doesn't occur elsewhere in
objdump output, we retain the single character check, but fix it to be
'/'.
Signed-off-by: Kim Phillips <kim.phillips@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Chris Riyder <chris.ryder@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 0fcb1da4aba6 ("perf annotate: AArch64 support")
Link: http://lkml.kernel.org/r/20170503131356.be88f977094fb3fa0f49b99d@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/arch/arm64/annotate/instructions.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/arch/arm64/annotate/instructions.c b/tools/perf/arch/arm64/annotate/instructions.c
index 44eafd6f2d50..8f1908756cb6 100644
--- a/tools/perf/arch/arm64/annotate/instructions.c
+++ b/tools/perf/arch/arm64/annotate/instructions.c
@@ -50,7 +50,7 @@ static int arm64__annotate_init(struct arch *arch)
arch->initialized = true;
arch->priv = arm;
arch->associate_instruction_ops = arm64__associate_instruction_ops;
- arch->objdump.comment_char = ';';
+ arch->objdump.comment_char = '/';
arch->objdump.skip_functions_char = '+';
return 0;
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] perf tests kmod-path: Don't fail if compressed modules aren't supported
2017-05-04 17:23 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
2017-05-04 17:23 ` [PATCH 1/4] perf tools: Fix spelling mistakes Arnaldo Carvalho de Melo
2017-05-04 17:23 ` [PATCH 2/4] perf annotate: Fix AArch64 comment char Arnaldo Carvalho de Melo
@ 2017-05-04 17:23 ` Arnaldo Carvalho de Melo
2017-05-04 17:23 ` [PATCH 4/4] tools build: Fixup sched_getcpu feature test Arnaldo Carvalho de Melo
2017-05-04 17:44 ` [GIT PULL 0/4] perf/urgent fixes Ingo Molnar
4 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2017-05-04 17:23 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Kim Phillips, Alexander Shishkin, Jiri Olsa,
Peter Zijlstra, Arnaldo Carvalho de Melo
From: Kim Phillips <kim.phillips@arm.com>
__kmod_path__parse() uses is_supported_compression() to determine and
parse out compressed module file extensions. On systems without zlib,
this test fails and __kmod_path__parse() continues to strcmp "ko" with
"gz". Don't do this on those systems.
Signed-off-by: Kim Phillips <kim.phillips@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 3c8a67f50a1e ("perf tools: Add kmod_path__parse function")
Link: http://lkml.kernel.org/r/20170503131402.c66e314460026c80cd787b34@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/tests/kmod-path.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/perf/tests/kmod-path.c b/tools/perf/tests/kmod-path.c
index 76f41f249944..6cd9e5107f77 100644
--- a/tools/perf/tests/kmod-path.c
+++ b/tools/perf/tests/kmod-path.c
@@ -61,6 +61,7 @@ int test__kmod_path__parse(int subtest __maybe_unused)
M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_KERNEL, true);
M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_USER, false);
+#ifdef HAVE_ZLIB_SUPPORT
/* path alloc_name alloc_ext kmod comp name ext */
T("/xxxx/xxxx/x.ko.gz", true , true , true, true, "[x]", "gz");
T("/xxxx/xxxx/x.ko.gz", false , true , true, true, NULL , "gz");
@@ -96,6 +97,7 @@ int test__kmod_path__parse(int subtest __maybe_unused)
M("x.ko.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);
M("x.ko.gz", PERF_RECORD_MISC_KERNEL, true);
M("x.ko.gz", PERF_RECORD_MISC_USER, false);
+#endif
/* path alloc_name alloc_ext kmod comp name ext */
T("[test_module]", true , true , true, false, "[test_module]", NULL);
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] tools build: Fixup sched_getcpu feature test
2017-05-04 17:23 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
` (2 preceding siblings ...)
2017-05-04 17:23 ` [PATCH 3/4] perf tests kmod-path: Don't fail if compressed modules aren't supported Arnaldo Carvalho de Melo
@ 2017-05-04 17:23 ` Arnaldo Carvalho de Melo
2017-05-04 17:44 ` [GIT PULL 0/4] perf/urgent fixes Ingo Molnar
4 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2017-05-04 17:23 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, Adrian Hunter,
David Ahern, Jiri Olsa, Namhyung Kim, Wang Nan
From: Arnaldo Carvalho de Melo <acme@redhat.com>
We have tools/build/feature/test-all.c to speed up feature testing,
doing all tests at once, but then all tests in this file should normally
pass.
That is not the case with the sched-getcpu one, that wasn't passing when
included from test-all.c because it needs to have _GNU_SOURCE defined
before including sched.h, but _GNU_SOURCE is defined by a header
included from another feature test included earlier in test-all.d,
test-libpython.c, resulting in:
$ cat /tmp/build/perf/feature/test-all.make.output
In file included from test-all.c:121:0:
test-sched_getcpu.c:1:0: error: "_GNU_SOURCE" redefined [-Werror]
#define _GNU_SOURCE
In file included from /usr/include/python2.7/pyconfig.h:6:0,
from /usr/include/python2.7/Python.h:8,
from test-libpython.c:1,
from test-all.c:13:
/usr/include/python2.7/pyconfig-64.h:1177:0: note: this is the location of the previous definition
#define _GNU_SOURCE 1
cc1: all warnings being treated as errors
Which would trigger testing the tests individually, when that
_GNU_SOURCE redefinition would not take place, and the whole process
would continue, just slower... Fix it.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 120010cb1eea ("tools build: Add test for sched_getcpu()")
Link: http://lkml.kernel.org/n/tip-3qp1it69xsc4w8gnuu1e9ayh@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/build/feature/test-sched_getcpu.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/build/feature/test-sched_getcpu.c b/tools/build/feature/test-sched_getcpu.c
index c4a148dd7104..9c6b4cbffb1c 100644
--- a/tools/build/feature/test-sched_getcpu.c
+++ b/tools/build/feature/test-sched_getcpu.c
@@ -1,4 +1,6 @@
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <sched.h>
int main(void)
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [GIT PULL 0/4] perf/urgent fixes
2017-05-04 17:23 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
` (3 preceding siblings ...)
2017-05-04 17:23 ` [PATCH 4/4] tools build: Fixup sched_getcpu feature test Arnaldo Carvalho de Melo
@ 2017-05-04 17:44 ` Ingo Molnar
4 siblings, 0 replies; 6+ messages in thread
From: Ingo Molnar @ 2017-05-04 17:44 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-kernel, Adrian Hunter, Alexander Shishkin, Chris Riyder,
David Ahern, Jiri Olsa, Kim Phillips, Namhyung Kim,
Peter Zijlstra, Wang Nan, Arnaldo Carvalho de Melo
* Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> Hi Ingo,
>
> Please consider pulling,
>
> - Arnaldo
>
> Test results at the end of this message, as usual.
>
> The following changes since commit 12c1c2fd780a9a5581105fcb6f251466cf35af2a:
>
> Merge tag 'perf-core-for-mingo-4.12-20170503' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2017-05-03 19:28:27 +0200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-4.12-20170504
>
> for you to fetch changes up to 1e6e7eae8a3a66f5fee4f44ef165ffcf31f0c40e:
>
> tools build: Fixup sched_getcpu feature test (2017-05-04 10:30:40 -0300)
>
> ----------------------------------------------------------------
> perf/urgent fixes:
>
> User visible:
>
> - Fix AArch64 objdump disasm comment char in 'perf annotate' (Kim Phillips)
>
> - Fix documentation spelling mistakes (Kim Phillips)
>
> - Don't fail 'perf test kmod-path' if compressed modules aren't
> supported (Kim Phillips)
>
> Infrastructure:
>
> - Fix sched_getcpu feature test when included in test-all.c redefining
> _GNU_SOURCE (Arnaldo Carvalho de Melo)
>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> ----------------------------------------------------------------
> Arnaldo Carvalho de Melo (1):
> tools build: Fixup sched_getcpu feature test
>
> Kim Phillips (3):
> perf tools: Fix spelling mistakes
> perf annotate: Fix AArch64 comment char
> perf tests kmod-path: Don't fail if compressed modules aren't supported
>
> tools/build/feature/test-sched_getcpu.c | 2 ++
> tools/perf/Documentation/perf-c2c.txt | 4 ++--
> tools/perf/Documentation/perf-record.txt | 2 +-
> tools/perf/Documentation/perf-report.txt | 6 +++---
> tools/perf/Documentation/perf.data-file-format.txt | 4 ++--
> tools/perf/Documentation/tips.txt | 2 +-
> tools/perf/arch/arm64/annotate/instructions.c | 2 +-
> tools/perf/tests/kmod-path.c | 2 ++
> tools/perf/util/event.h | 2 +-
> 9 files changed, 15 insertions(+), 11 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo
^ permalink raw reply [flat|nested] 6+ messages in thread