Merge branch 'perf/urgent' of... (f64fac86) · Commits · e / devices / android_kernel_xiaomi_sm6125

tools/perf/util/probe-event.c

+8 −11

Original line number	Original line	Diff line number	Diff line
	@@ -234,7 +234,6 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev,

	/* Searching trace events corresponding to probe event */		/* Searching trace events corresponding to probe event */
	ntevs = find_probe_trace_events(fd, pev, tevs, max_tevs);		ntevs = find_probe_trace_events(fd, pev, tevs, max_tevs);
	close(fd);

	if (ntevs > 0) { /* Succeeded to find trace events */		if (ntevs > 0) { /* Succeeded to find trace events */
	pr_debug("find %d probe_trace_events.\n", ntevs);		pr_debug("find %d probe_trace_events.\n", ntevs);
	@@ -388,7 +387,6 @@ int show_line_range(struct line_range lr, const char module)
	}		}

	ret = find_line_range(fd, lr);		ret = find_line_range(fd, lr);
	close(fd);
	if (ret == 0) {		if (ret == 0) {
	pr_warning("Specified source line is not found.\n");		pr_warning("Specified source line is not found.\n");
	return -ENOENT;		return -ENOENT;
	@@ -512,19 +510,18 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
	if (ret < 0)		if (ret < 0)
	return ret;		return ret;

			setup_pager();

			for (i = 0; i < npevs && ret >= 0; i++) {
	fd = open_vmlinux(module);		fd = open_vmlinux(module);
	if (fd < 0) {		if (fd < 0) {
	pr_warning("Failed to open debug information file.\n");		pr_warning("Failed to open debug information file.\n");
	return fd;		ret = fd;
			break;
	}		}

	setup_pager();

	for (i = 0; i < npevs && ret >= 0; i++)
	ret = show_available_vars_at(fd, &pevs[i], max_vls, _filter,		ret = show_available_vars_at(fd, &pevs[i], max_vls, _filter,
	externs);		externs);
			}
	close(fd);
	return ret;		return ret;
	}		}

tools/perf/util/probe-finder.c

+105 −54

Original line number	Original line	Diff line number	Diff line
	@@ -273,6 +273,25 @@ static const char cu_get_comp_dir(Dwarf_Die cu_die)
	return dwarf_formstring(&attr);		return dwarf_formstring(&attr);
	}		}

			/* Get a line number and file name for given address */
			static int cu_find_lineinfo(Dwarf_Die *cudie, unsigned long addr,
			const char *fname, int lineno)
			{
			Dwarf_Line *line;
			Dwarf_Addr laddr;

			line = dwarf_getsrc_die(cudie, (Dwarf_Addr)addr);
			if (line && dwarf_lineaddr(line, &laddr) == 0 &&
			addr == (unsigned long)laddr && dwarf_lineno(line, lineno) == 0) {
			*fname = dwarf_linesrc(line, NULL, NULL);
			if (!*fname)
			/* line number is useless without filename */
			*lineno = 0;
			}

			return *lineno ?: -ENOENT;
			}

	/* Compare diename and tname */		/* Compare diename and tname */
	static bool die_compare_name(Dwarf_Die dw_die, const char tname)		static bool die_compare_name(Dwarf_Die dw_die, const char tname)
	{		{
	@@ -497,7 +516,20 @@ static int __die_find_inline_cb(Dwarf_Die die_mem, void data)
	static Dwarf_Die die_find_inlinefunc(Dwarf_Die sp_die, Dwarf_Addr addr,		static Dwarf_Die die_find_inlinefunc(Dwarf_Die sp_die, Dwarf_Addr addr,
	Dwarf_Die *die_mem)		Dwarf_Die *die_mem)
	{		{
	return die_find_child(sp_die, __die_find_inline_cb, &addr, die_mem);		Dwarf_Die tmp_die;

			sp_die = die_find_child(sp_die, __die_find_inline_cb, &addr, &tmp_die);
			if (!sp_die)
			return NULL;

			/* Inlined function could be recursive. Trace it until fail */
			while (sp_die) {
			memcpy(die_mem, sp_die, sizeof(Dwarf_Die));
			sp_die = die_find_child(sp_die, __die_find_inline_cb, &addr,
			&tmp_die);
			}

			return die_mem;
	}		}

	/* Walker on lines (Note: line number will not be sorted) */		/* Walker on lines (Note: line number will not be sorted) */
	@@ -1395,6 +1427,10 @@ static int probe_point_search_cb(Dwarf_Die sp_die, void data)
	!die_compare_name(sp_die, pp->function))		!die_compare_name(sp_die, pp->function))
	return DWARF_CB_OK;		return DWARF_CB_OK;

			/* Check declared file */
			if (pp->file && strtailcmp(pp->file, dwarf_decl_file(sp_die)))
			return DWARF_CB_OK;

	pf->fname = dwarf_decl_file(sp_die);		pf->fname = dwarf_decl_file(sp_die);
	if (pp->line) { /* Function relative line */		if (pp->line) { /* Function relative line */
	dwarf_decl_line(sp_die, &pf->lno);		dwarf_decl_line(sp_die, &pf->lno);
	@@ -1451,6 +1487,7 @@ static int find_probes(int fd, struct probe_finder *pf)
	if (!dbg) {		if (!dbg) {
	pr_warning("No debug information found in the vmlinux - "		pr_warning("No debug information found in the vmlinux - "
	"please rebuild with CONFIG_DEBUG_INFO=y.\n");		"please rebuild with CONFIG_DEBUG_INFO=y.\n");
			close(fd); /* Without dwfl_end(), fd isn't closed. */
	return -EBADF;		return -EBADF;
	}		}

	@@ -1686,11 +1723,9 @@ int find_perf_probe_point(unsigned long addr, struct perf_probe_point *ppt)
	Dwarf_Die cudie, spdie, indie;		Dwarf_Die cudie, spdie, indie;
	Dwarf *dbg = NULL;		Dwarf *dbg = NULL;
	Dwfl *dwfl = NULL;		Dwfl *dwfl = NULL;
	Dwarf_Line *line;		Dwarf_Addr _addr, baseaddr, bias = 0;
	Dwarf_Addr laddr, eaddr, bias = 0;		const char fname = NULL, func = NULL, *tmp;
	const char *tmp;		int baseline = 0, lineno = 0, ret = 0;
	int lineno, ret = 0;
	bool found = false;

	/* Open the live linux kernel */		/* Open the live linux kernel */
	dbg = dwfl_init_live_kernel_dwarf(addr, &dwfl, &bias);		dbg = dwfl_init_live_kernel_dwarf(addr, &dwfl, &bias);
	@@ -1711,68 +1746,79 @@ int find_perf_probe_point(unsigned long addr, struct perf_probe_point *ppt)
	goto end;		goto end;
	}		}

	/* Find a corresponding line */		/* Find a corresponding line (filename and lineno) */
	line = dwarf_getsrc_die(&cudie, (Dwarf_Addr)addr);		cu_find_lineinfo(&cudie, addr, &fname, &lineno);
	if (line) {		/* Don't care whether it failed or not */
	if (dwarf_lineaddr(line, &laddr) == 0 &&
	(Dwarf_Addr)addr == laddr &&
	dwarf_lineno(line, &lineno) == 0) {
	tmp = dwarf_linesrc(line, NULL, NULL);
	if (tmp) {
	ppt->line = lineno;
	ppt->file = strdup(tmp);
	if (ppt->file == NULL) {
	ret = -ENOMEM;
	goto end;
	}
	found = true;
	}
	}
	}

	/* Find a corresponding function */		/* Find a corresponding function (name, baseline and baseaddr) */
	if (die_find_real_subprogram(&cudie, (Dwarf_Addr)addr, &spdie)) {		if (die_find_real_subprogram(&cudie, (Dwarf_Addr)addr, &spdie)) {
			/* Get function entry information */
	tmp = dwarf_diename(&spdie);		tmp = dwarf_diename(&spdie);
	if (!tmp \|\| dwarf_entrypc(&spdie, &eaddr) != 0)		if (!tmp \|\|
	goto end;		dwarf_entrypc(&spdie, &baseaddr) != 0 \|\|
			dwarf_decl_line(&spdie, &baseline) != 0)
	if (ppt->line) {		goto post;
	if (die_find_inlinefunc(&spdie, (Dwarf_Addr)addr,		func = tmp;

			if (addr == (unsigned long)baseaddr)
			/* Function entry - Relative line number is 0 */
			lineno = baseline;
			else if (die_find_inlinefunc(&spdie, (Dwarf_Addr)addr,
	&indie)) {		&indie)) {
	/* addr in an inline function */		if (dwarf_entrypc(&indie, &_addr) == 0 &&
			_addr == addr)
			/*
			* addr is at an inline function entry.
			* In this case, lineno should be the call-site
			* line number.
			*/
			lineno = die_get_call_lineno(&indie);
			else {
			/*
			* addr is in an inline function body.
			* Since lineno points one of the lines
			* of the inline function, baseline should
			* be the entry line of the inline function.
			*/
	tmp = dwarf_diename(&indie);		tmp = dwarf_diename(&indie);
	if (!tmp)		if (tmp &&
	goto end;		dwarf_decl_line(&spdie, &baseline) == 0)
	ret = dwarf_decl_line(&indie, &lineno);		func = tmp;
	} else {
	if (eaddr == addr) { /* Function entry */
	lineno = ppt->line;
	ret = 0;
	} else
	ret = dwarf_decl_line(&spdie, &lineno);
	}		}
	if (ret == 0) {
	/* Make a relative line number */
	ppt->line -= lineno;
	goto found;
	}		}
	}		}
	/* We don't have a line number, let's use offset */
	ppt->offset = addr - (unsigned long)eaddr;		post:
	found:		/* Make a relative line number or an offset */
	ppt->function = strdup(tmp);		if (lineno)
			ppt->line = lineno - baseline;
			else if (func)
			ppt->offset = addr - (unsigned long)baseaddr;

			/* Duplicate strings */
			if (func) {
			ppt->function = strdup(func);
	if (ppt->function == NULL) {		if (ppt->function == NULL) {
	ret = -ENOMEM;		ret = -ENOMEM;
	goto end;		goto end;
	}		}
	found = true;
	}		}
			if (fname) {
			ppt->file = strdup(fname);
			if (ppt->file == NULL) {
			if (ppt->function) {
			free(ppt->function);
			ppt->function = NULL;
			}
			ret = -ENOMEM;
			goto end;
			}
			}
	end:		end:
	if (dwfl)		if (dwfl)
	dwfl_end(dwfl);		dwfl_end(dwfl);
	if (ret >= 0)		if (ret == 0 && (fname \|\| func))
	ret = found ? 1 : 0;		ret = 1; /* Found a point */
	return ret;		return ret;
	}		}

	@@ -1840,6 +1886,10 @@ static int line_range_search_cb(Dwarf_Die sp_die, void data)
	struct line_finder *lf = param->data;		struct line_finder *lf = param->data;
	struct line_range *lr = lf->lr;		struct line_range *lr = lf->lr;

			/* Check declared file */
			if (lr->file && strtailcmp(lr->file, dwarf_decl_file(sp_die)))
			return DWARF_CB_OK;

	if (dwarf_tag(sp_die) == DW_TAG_subprogram &&		if (dwarf_tag(sp_die) == DW_TAG_subprogram &&
	die_compare_name(sp_die, lr->function)) {		die_compare_name(sp_die, lr->function)) {
	lf->fname = dwarf_decl_file(sp_die);		lf->fname = dwarf_decl_file(sp_die);
	@@ -1892,6 +1942,7 @@ int find_line_range(int fd, struct line_range *lr)
	if (!dbg) {		if (!dbg) {
	pr_warning("No debug information found in the vmlinux - "		pr_warning("No debug information found in the vmlinux - "
	"please rebuild with CONFIG_DEBUG_INFO=y.\n");		"please rebuild with CONFIG_DEBUG_INFO=y.\n");
			close(fd); /* Without dwfl_end(), fd isn't closed. */
	return -EBADF;		return -EBADF;
	}		}