[GIT PULL 0/1] perf/urgent fix

[GIT PULL 0/1] perf/urgent fix

[Arnaldo Carvalho de Melo]

Hi Ingo,

	Please consider pulling,

- Arnaldo

The following changes since commit 3b10ea7f922b538ba5dcb3d979a6b6b4d07daae2:

  Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2014-10-18 09:04:02 +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

for you to fetch changes up to 9ab1f50876dbb8b962db058259be7aae920d4c25:

  perf diff: Add missing hists__init() call at tool start (2014-10-22 16:31:06 -0300)

----------------------------------------------------------------
perf/urgent fix:

* Fix 'perf diff' initialization, calling the recently added hists__init()
  function so that extra space is allocated per perf_evsel for the hists storage
  that it also uses, just like report and top.  (Kan Liang)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

----------------------------------------------------------------
Kan Liang (1):
      perf diff: Add missing hists__init() call at tool start

 tools/perf/builtin-diff.c | 5 +++++
 1 file changed, 5 insertions(+)

[PATCH 1/1] perf diff: Add missing hists__init() call at tool start

[Arnaldo Carvalho de Melo]

From: Kan Liang <kan.liang@intel.com>

It also uses hists/hist_entries, hists__init() should be called before
creating any evsels.

Otherwise no extra space will be allocated per perf_evsel nor this space
will be initialized when allocating a new perf_evsel instance, resulting
in reads/writes to non allocated space, oops. Fix it.

Signed-off-by: Kan Liang <kan.liang@intel.com>
Link: http://lkml.kernel.org/r/1414004561-22096-1-git-send-email-kan.liang@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-diff.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 8c5c11ca8c53..25114c9a6801 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -1142,6 +1142,11 @@ static int data_init(int argc, const char **argv)
 
 int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused)
 {
+	int ret = hists__init();
+
+	if (ret < 0)
+		return ret;
+
 	perf_config(perf_default_config, NULL);
 
 	argc = parse_options(argc, argv, options, diff_usage, 0);
-- 
1.9.3

Re: [GIT PULL 0/1] perf/urgent fix

[Ingo Molnar]

* Arnaldo Carvalho de Melo <acme@kernel.org> wrote:

> Hi Ingo,
> 
> 	Please consider pulling,
> 
> - Arnaldo
> 
> The following changes since commit 3b10ea7f922b538ba5dcb3d979a6b6b4d07daae2:
> 
>   Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2014-10-18 09:04:02 +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
> 
> for you to fetch changes up to 9ab1f50876dbb8b962db058259be7aae920d4c25:
> 
>   perf diff: Add missing hists__init() call at tool start (2014-10-22 16:31:06 -0300)
> 
> ----------------------------------------------------------------
> perf/urgent fix:
> 
> * Fix 'perf diff' initialization, calling the recently added hists__init()
>   function so that extra space is allocated per perf_evsel for the hists storage
>   that it also uses, just like report and top.  (Kan Liang)
> 
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> ----------------------------------------------------------------
> Kan Liang (1):
>       perf diff: Add missing hists__init() call at tool start
> 
>  tools/perf/builtin-diff.c | 5 +++++
>  1 file changed, 5 insertions(+)

Pulled, thanks a lot Arnaldo!

	Ingo