Skip to contentSkip to conversation

Patch "perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jul 25, 2017

Subsystems (2)
Stable branch perf events
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
perf-annotate-fix-broken-arrow-at-row-0-connecting-jmp-instruction-to-its-target.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 80f62589fa52f530cffc50e78c0b5a2ae572d61e Mon Sep 17 00:00:00 2001

From: Jin Yao <[email protected]>
Date: Thu, 8 Jun 2017 14:01:44 +0800
Subject: perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Jin Yao <[email protected]>

commit 80f62589fa52f530cffc50e78c0b5a2ae572d61e upstream.

When the jump instruction is displayed at the row 0 in annotate view, the arrow is broken. An example:

 16.86 │   ┌──je     82
  0.01 │      movsd  (%rsp),%xmm0
       │      movsd  0x8(%rsp),%xmm4
       │      movsd  0x8(%rsp),%xmm1
       │      movsd  (%rsp),%xmm3
       │      divsd  %xmm4,%xmm0
       │      divsd  %xmm3,%xmm1
       │      movsd  (%rsp),%xmm2
       │      addsd  %xmm1,%xmm0
       │      addsd  %xmm2,%xmm0
       │      movsd  %xmm0,(%rsp)
       │82:   sub    $0x1,%ebx
 83.03 │    ↑ jne    38
       │      add    $0x10,%rsp
       │      xor    %eax,%eax
       │      pop    %rbx
       │    ← retq

The patch increments the row number before checking with 0.

Signed-off-by Yao Jin <[email protected]>
Tested-by Arnaldo Carvalho de Melo <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kan Liang <[email protected]>
Cc Peter Zijlstra <[email protected]>
Fixes 944e1abed9e1 ("perf ui browser: Add method to draw up/down arrow line")
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 tools/perf/ui/browser.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/browser.c +1 -1
@@ -702,7 +702,7 @@ static void __ui_browser__line_arrow_dow
 		ui_browser__gotorc(browser, row, column + 1);
 		SLsmg_draw_hline(2);
 
-		if (row++ == 0)
+		if (++row == 0)
 			goto out;
 	} else
 		row = 0;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/perf-annotate-fix-broken-arrow-at-row-0-connecting-jmp-instruction-to-its-target.patch queue-4.9/revert-perf-core-drop-kernel-samples-even-though-u-is-specified.patch