Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 22c91aa23547a4363fd2a9ffddde95c899ac8aa0

Authored by Ingo Molnar
2 parents fad01e866a 082f96a93e
Exists in ti-lsk-linux-4.1.y and in 12 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/g… 

…it/jolsa/perf into perf/urgent

Pull perf/urgent fixes from Jiri Olsa:

 * Fix perf probe to find correct variable DIE (Masami Hiramatsu)

 * Fix a segfault in perf probe if asked for variable it doesn't find (Masami Hiramatsu)

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Showing 2 changed files Side-by-side Diff

tools/perf/util/dwarf-aux.c
Diff comments   View file @ 22c91aa
... ... @@ -747,14 +747,17 @@
747 747 static int __die_find_variable_cb(Dwarf_Die *die_mem, void *data)
748 748 {
749 749 struct __find_variable_param *fvp = data;
  750 + Dwarf_Attribute attr;
750 751 int tag;
751 752  
752 753 tag = dwarf_tag(die_mem);
753 754 if ((tag == DW_TAG_formal_parameter ||
754 755 tag == DW_TAG_variable) &&
755   - die_compare_name(die_mem, fvp->name))
  756 + die_compare_name(die_mem, fvp->name) &&
  757 + /* Does the DIE have location information or external instance? */
  758 + (dwarf_attr(die_mem, DW_AT_external, &attr) ||
  759 + dwarf_attr(die_mem, DW_AT_location, &attr)))
756 760 return DIE_FIND_CB_END;
757   -
758 761 if (dwarf_haspc(die_mem, fvp->addr))
759 762 return DIE_FIND_CB_CONTINUE;
760 763 else
tools/perf/util/probe-finder.c
Diff comments   View file @ 22c91aa
... ... @@ -511,12 +511,12 @@
511 511  
512 512 ret = convert_variable_location(vr_die, pf->addr, pf->fb_ops,
513 513 &pf->sp_die, pf->tvar);
514   - if (ret == -ENOENT)
  514 + if (ret == -ENOENT || ret == -EINVAL)
515 515 pr_err("Failed to find the location of %s at this address.\n"
516 516 " Perhaps, it has been optimized out.\n", pf->pvar->var);
517 517 else if (ret == -ENOTSUP)
518 518 pr_err("Sorry, we don't support this variable location yet.\n");
519   - else if (pf->pvar->field) {
  519 + else if (ret == 0 && pf->pvar->field) {
520 520 ret = convert_variable_fields(vr_die, pf->pvar->var,
521 521 pf->pvar->field, &pf->tvar->ref,
522 522 &die_mem);