From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 30 Dec 2019 11:34:21 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v4.14.161~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dccf89f8282b600be9b867823e4b88ddfc56abf8;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	perf-probe-fix-to-show-function-entry-line-as-probe-able.patch
---

diff --git a/queue-5.4/perf-probe-fix-to-show-function-entry-line-as-probe-able.patch b/queue-5.4/perf-probe-fix-to-show-function-entry-line-as-probe-able.patch
new file mode 100644
index 00000000000..683d9fb1d4f
--- /dev/null
+++ b/queue-5.4/perf-probe-fix-to-show-function-entry-line-as-probe-able.patch
@@ -0,0 +1,85 @@
+From 91e2f539eeda26ab00bd03fae8dc434c128c85ed Mon Sep 17 00:00:00 2001
+From: Masami Hiramatsu <mhiramat@kernel.org>
+Date: Thu, 24 Oct 2019 18:12:54 +0900
+Subject: perf probe: Fix to show function entry line as probe-able
+
+From: Masami Hiramatsu <mhiramat@kernel.org>
+
+commit 91e2f539eeda26ab00bd03fae8dc434c128c85ed upstream.
+
+Fix die_walk_lines() to list the function entry line correctly.  Since
+the dwarf_entrypc() does not return the entry pc if the DIE has only
+range attribute, __die_walk_funclines() fails to list the declaration
+line (entry line) in that case.
+
+To solve this issue, this introduces die_entrypc() which correctly
+returns the entry PC (the first address range) even if the DIE has only
+range attribute. With this fix die_walk_lines() shows the function entry
+line is able to probe correctly.
+
+Fixes: 4cc9cec636e7 ("perf probe: Introduce lines walker interface")
+Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Link: http://lore.kernel.org/lkml/157190837419.1859.4619125803596816752.stgit@devnote2
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Thomas Backlund <tmb@mageia.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/perf/util/dwarf-aux.c |   24 +++++++++++++++++++++++-
+ tools/perf/util/dwarf-aux.h |    3 +++
+ 2 files changed, 26 insertions(+), 1 deletion(-)
+
+--- a/tools/perf/util/dwarf-aux.c
++++ b/tools/perf/util/dwarf-aux.c
+@@ -308,6 +308,28 @@ bool die_is_func_def(Dwarf_Die *dw_die)
+ }
+ 
+ /**
++ * die_entrypc - Returns entry PC (the lowest address) of a DIE
++ * @dw_die: a DIE
++ * @addr: where to store entry PC
++ *
++ * Since dwarf_entrypc() does not return entry PC if the DIE has only address
++ * range, we have to use this to retrieve the lowest address from the address
++ * range attribute.
++ */
++int die_entrypc(Dwarf_Die *dw_die, Dwarf_Addr *addr)
++{
++	Dwarf_Addr base, end;
++
++	if (!addr)
++		return -EINVAL;
++
++	if (dwarf_entrypc(dw_die, addr) == 0)
++		return 0;
++
++	return dwarf_ranges(dw_die, 0, &base, addr, &end) < 0 ? -ENOENT : 0;
++}
++
++/**
+  * die_is_func_instance - Ensure that this DIE is an instance of a subprogram
+  * @dw_die: a DIE
+  *
+@@ -720,7 +742,7 @@ static int __die_walk_funclines(Dwarf_Di
+ 	/* Handle function declaration line */
+ 	fname = dwarf_decl_file(sp_die);
+ 	if (fname && dwarf_decl_line(sp_die, &lineno) == 0 &&
+-	    dwarf_entrypc(sp_die, &addr) == 0) {
++	    die_entrypc(sp_die, &addr) == 0) {
+ 		lw.retval = callback(fname, lineno, addr, data);
+ 		if (lw.retval != 0)
+ 			goto done;
+--- a/tools/perf/util/dwarf-aux.h
++++ b/tools/perf/util/dwarf-aux.h
+@@ -29,6 +29,9 @@ int cu_walk_functions_at(Dwarf_Die *cu_d
+ /* Get DW_AT_linkage_name (should be NULL for C binary) */
+ const char *die_get_linkage_name(Dwarf_Die *dw_die);
+ 
++/* Get the lowest PC in DIE (including range list) */
++int die_entrypc(Dwarf_Die *dw_die, Dwarf_Addr *addr);
++
+ /* Ensure that this DIE is a subprogram and definition (not declaration) */
+ bool die_is_func_def(Dwarf_Die *dw_die);
+ 
diff --git a/queue-5.4/series b/queue-5.4/series
index 2e055f1a9af..5e8fa4b079b 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -331,6 +331,7 @@ x86-insn-add-some-intel-instructions-to-the-opcode-m.patch
 net-af_xdp-use-correct-number-of-channels-from-ethto.patch
 brcmfmac-remove-monitor-interface-when-detaching.patch
 perf-session-fix-decompression-of-perf_record_compre.patch
+perf-probe-fix-to-show-function-entry-line-as-probe-able.patch
 s390-crypto-fix-unsigned-variable-compared-with-zero.patch
 s390-kasan-support-memcpy_real-with-trace_irqflags.patch
 bnxt_en-improve-rx-buffer-error-handling.patch