]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf annotate-data: Update stack slot for the store
authorNamhyung Kim <namhyung@kernel.org>
Wed, 21 Aug 2024 23:26:27 +0000 (16:26 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 22 Aug 2024 15:38:02 +0000 (12:38 -0300)
When checking the match variable at the target instruction, it might not
have any information if it's a first write to a stack slot.  In this
case it could spill a register value into the stack so the type info is
in the source operand.

But currently it's hard to get the operand from the checking function.
Let's process the instruction and retry to get the type info from the
stack if there's no information already.

This is an example of __tcp_transmit_skb().  The instructions are

  <__tcp_transmit_skb>:
   0: nopl   0x0(%rax, %rax, 1)
   5: push   %rbp
   6: mov    %rsp, %rbp
   9: push   %r15
   b: push   %r14
   d: push   %r13
   f: push   %r12
  11: push   %rbx
  12: sub    $0x98, %rsp
  19: mov    %r8d, -0xa8(%rbp)
  ...

It cannot find any variable at -0xa8(%rbp) at this point.
  -----------------------------------------------------------
  find data type for -0xa8(reg6) at __tcp_transmit_skb+0x19
  CU for net/ipv4/tcp_output.c (die:0x817f543)
  frame base: cfa=0 fbreg=6
  scope: [1/1] (die:81aac3e)
  bb: [0 - 19]
  var [0] -0x98(stack) type='struct tcp_out_options' size=0x28 (die:0x81af3df)
  var [5] reg8 type='unsigned int' size=0x4 (die:0x8180ed6)
  var [5] reg2 type='unsigned int' size=0x4 (die:0x8180ed6)
  var [5] reg1 type='int' size=0x4 (die:0x818059e)
  var [5] reg4 type='struct sk_buff*' size=0x8 (die:0x8181360)
  var [5] reg5 type='struct sock*' size=0x8 (die:0x8181a0c)
  chk [19] reg6 offset=-0xa8 ok=0 kind=0 fbreg : no type information
  no type information

And it was able to find the type after processing the 'mov' instruction.
  -----------------------------------------------------------
  find data type for -0xa8(reg6) at __tcp_transmit_skb+0x19
  CU for net/ipv4/tcp_output.c (die:0x817f543)
  frame base: cfa=0 fbreg=6
  scope: [1/1] (die:81aac3e)
  bb: [0 - 19]
  var [0] -0x98(stack) type='struct tcp_out_options' size=0x28 (die:0x81af3df)
  var [5] reg8 type='unsigned int' size=0x4 (die:0x8180ed6)
  var [5] reg2 type='unsigned int' size=0x4 (die:0x8180ed6)
  var [5] reg1 type='int' size=0x4 (die:0x818059e)
  var [5] reg4 type='struct sk_buff*' size=0x8 (die:0x8181360)
  var [5] reg5 type='struct sock*' size=0x8 (die:0x8181a0c)
  chk [19] reg6 offset=-0xa8 ok=0 kind=0 fbreg : retry                    <<<--- here
  mov [19] reg8 -> -0xa8(stack) type='unsigned int' size=0x4 (die:0x8180ed6)
  chk [19] reg6 offset=-0xa8 ok=0 kind=0 fbreg : Good!
  found by insn track: -0xa8(reg6) type-offset=0
  final result:  type='unsigned int' size=0x4 (die:0x8180ed6)

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240821232628.353177-4-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/annotate-data.c

index 7d4b5aaa3b6a4e13c8052f5d70f658f3d22627ef..5d23c30b3a7b31a9f4f4448d0de32edcf67ef676 100644 (file)
@@ -955,19 +955,22 @@ static void setup_stack_canary(struct data_loc_info *dloc)
 static enum type_match_result check_matching_type(struct type_state *state,
                                                  struct data_loc_info *dloc,
                                                  Dwarf_Die *cu_die,
+                                                 struct disasm_line *dl,
                                                  Dwarf_Die *type_die)
 {
        Dwarf_Word size;
-       u32 insn_offset = dloc->ip - dloc->ms->sym->start;
+       u32 insn_offset = dl->al.offset;
        int reg = dloc->op->reg1;
        int offset = dloc->op->offset;
        const char *offset_sign = "";
+       bool retry = true;
 
        if (offset < 0) {
                offset = -offset;
                offset_sign = "-";
        }
 
+again:
        pr_debug_dtp("chk [%x] reg%d offset=%s%#x ok=%d kind=%d ",
                     insn_offset, reg, offset_sign, offset,
                     state->regs[reg].ok, state->regs[reg].kind);
@@ -1079,8 +1082,17 @@ check_non_register:
                pr_debug_dtp("fbreg");
 
                stack = find_stack_state(state, dloc->type_offset);
-               if (stack == NULL)
+               if (stack == NULL) {
+                       if (retry) {
+                               pr_debug_dtp(" : retry\n");
+                               retry = false;
+
+                               /* update type info it's the first store to the stack */
+                               update_insn_state(state, dloc, cu_die, dl);
+                               goto again;
+                       }
                        return PERF_TMR_NO_TYPE;
+               }
 
                if (stack->kind == TSR_KIND_CANARY) {
                        setup_stack_canary(dloc);
@@ -1111,8 +1123,17 @@ check_non_register:
                        return PERF_TMR_NO_TYPE;
 
                stack = find_stack_state(state, dloc->type_offset - fboff);
-               if (stack == NULL)
+               if (stack == NULL) {
+                       if (retry) {
+                               pr_debug_dtp(" : retry\n");
+                               retry = false;
+
+                               /* update type info it's the first store to the stack */
+                               update_insn_state(state, dloc, cu_die, dl);
+                               goto again;
+                       }
                        return PERF_TMR_NO_TYPE;
+               }
 
                if (stack->kind == TSR_KIND_CANARY) {
                        setup_stack_canary(dloc);
@@ -1202,7 +1223,7 @@ static enum type_match_result find_data_type_insn(struct data_loc_info *dloc,
 
                        if (this_ip == dloc->ip) {
                                ret = check_matching_type(&state, dloc,
-                                                         cu_die, type_die);
+                                                         cu_die, dl, type_die);
                                pr_debug_dtp(" : %s\n", match_result_str(ret));
                                goto out;
                        }