* [PATCH 1/4] perf tests: Remove wrong semicolon in while loop in CQM test
2016-01-26 14:32 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
@ 2016-01-26 14:32 ` Arnaldo Carvalho de Melo
2016-01-26 14:32 ` [PATCH 2/4] perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed Arnaldo Carvalho de Melo
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-01-26 14:32 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Markus Trippelsdorf, Ben Hutchings, Peter Zijlstra,
Arnaldo Carvalho de Melo
From: Markus Trippelsdorf <markus@trippelsdorf.de>
The while loop was spinning. Fix by removing a semicolon.
The issue was pointed out by gcc-6's -Wmisleading-indentation.
Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 035827e9f2bd ("perf tests: Add Intel CQM test")
Link: http://lkml.kernel.org/r/20151214154335.GA1409@x4
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/arch/x86/tests/intel-cqm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c
index 3e89ba825f6b..7f064eb37158 100644
--- a/tools/perf/arch/x86/tests/intel-cqm.c
+++ b/tools/perf/arch/x86/tests/intel-cqm.c
@@ -17,7 +17,7 @@ static pid_t spawn(void)
if (pid)
return pid;
- while(1);
+ while(1)
sleep(5);
return 0;
}
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed
2016-01-26 14:32 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
2016-01-26 14:32 ` [PATCH 1/4] perf tests: Remove wrong semicolon in while loop in CQM test Arnaldo Carvalho de Melo
@ 2016-01-26 14:32 ` Arnaldo Carvalho de Melo
2016-01-26 14:32 ` [PATCH 3/4] perf hists: Fix HISTC_MEM_DCACHELINE width setting Arnaldo Carvalho de Melo
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-01-26 14:32 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Markus Trippelsdorf, Ben Hutchings, Matt Fleming,
Peter Zijlstra, Arnaldo Carvalho de Melo
From: Markus Trippelsdorf <markus@trippelsdorf.de>
The issue was pointed out by gcc-6's -Wmisleading-indentation.
Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: c97cf42219b7 ("perf top: Live TUI Annotation")
Link: http://lkml.kernel.org/r/20151214154403.GB1409@x4
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/browsers/annotate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index d4d7cc27252f..718bd46d47fa 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -755,11 +755,11 @@ static int annotate_browser__run(struct annotate_browser *browser,
nd = browser->curr_hot;
break;
case K_UNTAB:
- if (nd != NULL)
+ if (nd != NULL) {
nd = rb_next(nd);
if (nd == NULL)
nd = rb_first(&browser->entries);
- else
+ } else
nd = browser->curr_hot;
break;
case K_F1:
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] perf hists: Fix HISTC_MEM_DCACHELINE width setting
2016-01-26 14:32 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
2016-01-26 14:32 ` [PATCH 1/4] perf tests: Remove wrong semicolon in while loop in CQM test Arnaldo Carvalho de Melo
2016-01-26 14:32 ` [PATCH 2/4] perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed Arnaldo Carvalho de Melo
@ 2016-01-26 14:32 ` Arnaldo Carvalho de Melo
2016-01-26 14:32 ` [PATCH 4/4] perf stat: Do not clean event's private stats Arnaldo Carvalho de Melo
2016-01-30 8:16 ` [GIT PULL 0/4] perf/urgent fixes Ingo Molnar
4 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-01-26 14:32 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Jiri Olsa, David Ahern, Don Zickus, Namhyung Kim,
Peter Zijlstra, Arnaldo Carvalho de Melo
From: Jiri Olsa <jolsa@kernel.org>
Set correct width for unresolved mem_dcacheline addr.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Fixes: 9b32ba71ba90 ("perf tools: Add dcacheline sort")
Link: http://lkml.kernel.org/r/1453290995-18485-3-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/hist.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index c226303e3da0..68a7612019dc 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -131,6 +131,8 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
symlen = unresolved_col_width + 4 + 2;
hists__new_col_len(hists, HISTC_MEM_DADDR_SYMBOL,
symlen);
+ hists__new_col_len(hists, HISTC_MEM_DCACHELINE,
+ symlen);
}
if (h->mem_info->iaddr.sym) {
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] perf stat: Do not clean event's private stats
2016-01-26 14:32 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
` (2 preceding siblings ...)
2016-01-26 14:32 ` [PATCH 3/4] perf hists: Fix HISTC_MEM_DCACHELINE width setting Arnaldo Carvalho de Melo
@ 2016-01-26 14:32 ` Arnaldo Carvalho de Melo
2016-01-30 8:16 ` [GIT PULL 0/4] perf/urgent fixes Ingo Molnar
4 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-01-26 14:32 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Jiri Olsa, David Ahern, Namhyung Kim,
Peter Zijlstra, stable, #, v4.2+,
Arnaldo Carvalho de Melo
From: Jiri Olsa <jolsa@kernel.org>
Mel reported stddev reporting was broken due to following commit:
106a94a0f8c2 ("perf stat: Introduce read_counters function")
This commit merged interval and overall counters reading into single
read_counters function.
The old interval code cleaned the stddev data for some reason (it's
never displayed in interval mode) and the mentioned commit kept on
cleaning the stddev data in merged function, which resulted in the
stddev not being displayed.
Removing the wrong stddev data cleanup init_stats call.
Reported-and-Tested-by: Mel Gorman <mgorman@techsingularity.net>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: stable@vger.kernel.org # v4.2+
Fixes: 106a94a0f8c2 ("perf stat: Introduce read_counters function")
Link: http://lkml.kernel.org/r/1453290995-18485-4-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/stat.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 2f901d15e063..2b58edccd56f 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -310,7 +310,6 @@ int perf_stat_process_counter(struct perf_stat_config *config,
int i, ret;
aggr->val = aggr->ena = aggr->run = 0;
- init_stats(ps->res_stats);
if (counter->per_pkg)
zero_per_pkg(counter);
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [GIT PULL 0/4] perf/urgent fixes
2016-01-26 14:32 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
` (3 preceding siblings ...)
2016-01-26 14:32 ` [PATCH 4/4] perf stat: Do not clean event's private stats Arnaldo Carvalho de Melo
@ 2016-01-30 8:16 ` Ingo Molnar
4 siblings, 0 replies; 6+ messages in thread
From: Ingo Molnar @ 2016-01-30 8:16 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-kernel, Ben Hutchings, David Ahern, Don Zickus, Jiri Olsa,
Markus Trippelsdorf, Matt Fleming, Namhyung Kim, Peter Zijlstra,
Arnaldo Carvalho de Melo
* Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> Hi Ingo,
>
> Please consider pulling,
>
> - Arnaldo
>
> The following changes since commit 45c815f06b80031659c63d7b93e580015d6024dd:
>
> perf: Synchronously free aux pages in case of allocation failure (2016-01-21 18:54:27 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo
>
> for you to fetch changes up to 3f416f22d1e21709a631189ba169f76fd267b374:
>
> perf stat: Do not clean event's private stats (2016-01-26 11:15:11 -0300)
>
> ----------------------------------------------------------------
> perf/urgent fixes:
>
> User visible:
>
> - Fix 'perf stat' stddev reporting due to mistakenly cleaning event
> private stats (Jiri Olsa)
>
> - Fix 'perf test CQM' endless loop detected by 'gcc6 -Wmisleading-indentation'
> (Markus Trippelsdorf)
>
> - Fix behaviour of Shift-Tab when nothing is focussed in the annotate TUI browser,
> detected with gcc6 -Wmisleading-indentation (Markus Trippelsdorf)
>
> - Fix mem data cacheline hists browser width setting for unresolved
> addresses (Jiri Olsa)
>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> ----------------------------------------------------------------
> Jiri Olsa (2):
> perf hists: Fix HISTC_MEM_DCACHELINE width setting
> perf stat: Do not clean event's private stats
>
> Markus Trippelsdorf (2):
> perf tests: Remove wrong semicolon in while loop in CQM test
> perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed
>
> tools/perf/arch/x86/tests/intel-cqm.c | 2 +-
> tools/perf/ui/browsers/annotate.c | 4 ++--
> tools/perf/util/hist.c | 2 ++
> tools/perf/util/stat.c | 1 -
> 4 files changed, 5 insertions(+), 4 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo
^ permalink raw reply [flat|nested] 6+ messages in thread