Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22c91aa2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/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: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents fad01e86 082f96a9

tools/perf/util/dwarf-aux.c

+5 −2
Original line number Diff line number Diff line
@@ -747,14 +747,17 @@ struct __find_variable_param { 
static int __die_find_variable_cb(Dwarf_Die *die_mem, void *data)

{

	struct __find_variable_param *fvp = data;

	Dwarf_Attribute attr;

	int tag;



	tag = dwarf_tag(die_mem);

	if ((tag == DW_TAG_formal_parameter ||

	     tag == DW_TAG_variable) &&

	    die_compare_name(die_mem, fvp->name))

	    die_compare_name(die_mem, fvp->name) &&

	/* Does the DIE have location information or external instance? */

	    (dwarf_attr(die_mem, DW_AT_external, &attr) ||

	     dwarf_attr(die_mem, DW_AT_location, &attr)))

		return DIE_FIND_CB_END;



	if (dwarf_haspc(die_mem, fvp->addr))

		return DIE_FIND_CB_CONTINUE;

	else

tools/perf/util/probe-finder.c

+2 −2
Original line number Diff line number Diff line
@@ -511,12 +511,12 @@ static int convert_variable(Dwarf_Die *vr_die, struct probe_finder *pf) 


	ret = convert_variable_location(vr_die, pf->addr, pf->fb_ops,

					&pf->sp_die, pf->tvar);

	if (ret == -ENOENT)

	if (ret == -ENOENT || ret == -EINVAL)

		pr_err("Failed to find the location of %s at this address.\n"

		       " Perhaps, it has been optimized out.\n", pf->pvar->var);

	else if (ret == -ENOTSUP)

		pr_err("Sorry, we don't support this variable location yet.\n");

	else if (pf->pvar->field) {

	else if (ret == 0 && pf->pvar->field) {

		ret = convert_variable_fields(vr_die, pf->pvar->var,

					      pf->pvar->field, &pf->tvar->ref,

					      &die_mem);