When updating the instruction states, it also needs to handle global
variable accesses. Same as it does for PC-relative addressing, it can
look up the type by address (if it's defined in the same file), or by
name after finding the symbol by address (for declarations).
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
---
tools/perf/util/annotate-data.c | 45 ++++++++++++++++++++++++++++++---
tools/perf/util/annotate-data.h | 10 ++++++--
tools/perf/util/annotate.c | 45 ++++++++++++++++++++-------------
tools/perf/util/annotate.h | 5 ++++
4 files changed, 83 insertions(+), 22 deletions(-)
diff --git a/tools/perf/util/annotate-data.c b/tools/perf/util/annotate-data.c
index b1e921663452..e46e162c783f 100644
--- a/tools/perf/util/annotate-data.c
+++ b/tools/perf/util/annotate-data.c
@@ -396,6 +396,7 @@ void update_var_state(struct type_state *state, struct data_loc_info *dloc,
* update_insn_state - Update type state for an instruction
* @state: type state table
* @dloc: data location info
+ * @cu_die: compile unit debug entry
* @dl: disasm line for the instruction
*
* This function updates the @state table for the target operand of the
@@ -407,7 +408,7 @@ void update_var_state(struct type_state *state, struct data_loc_info *dloc,
* are true.
*/
void update_insn_state(struct type_state *state, struct data_loc_info *dloc,
- struct disasm_line *dl)
+ void *cu_die, struct disasm_line *dl)
{
struct annotated_insn_loc loc;
struct annotated_op_loc *src = &loc.ops[INSN_OP_SOURCE];
@@ -449,8 +450,46 @@ void update_insn_state(struct type_state *state, struct data_loc_info *dloc,
return;
retry:
- /* Check stack variables with offset */
- if (sreg == fbreg) {
+ /* Check if it's a global variable */
+ if (sreg == DWARF_REG_PC) {
+ Dwarf_Die var_die;
+ struct map_symbol *ms = dloc->ms;
+ int offset = src->offset;
+ u64 ip = ms->sym->start + dl->al.offset;
+ u64 pc, addr;
+ const char *var_name = NULL;
+
+ addr = annotate_calc_pcrel(ms, ip, offset, dl);
+ pc = map__rip_2objdump(ms->map, ip);
+
+ if (die_find_variable_by_addr(cu_die, pc, addr,
+ &var_die, &offset) &&
+ check_variable(&var_die, &type_die, offset,
+ /*is_pointer=*/false) == 0 &&
+ die_get_member_type(&type_die, offset, &type_die)) {
+ state->regs[dst->reg1].type = type_die;
+ state->regs[dst->reg1].ok = true;
+ return;
+ }
+
+ /* Try to get the name of global variable */
+ offset = src->offset;
+ get_global_var_info(dloc->thread, ms, ip, dl,
+ dloc->cpumode, &addr,
+ &var_name, &offset);
+
+ if (var_name && die_find_variable_at(cu_die, var_name,
+ pc, &var_die) &&
+ check_variable(&var_die, &type_die, offset,
+ /*is_pointer=*/false) == 0 &&
+ die_get_member_type(&type_die, offset, &type_die)) {
+ state->regs[dst->reg1].type = type_die;
+ state->regs[dst->reg1].ok = true;
+ } else
+ state->regs[dst->reg1].ok = false;
+ }
+ /* And check stack variables with offset */
+ else if (sreg == fbreg) {
struct type_state_stack *stack;
int offset = src->offset - fboff;
diff --git a/tools/perf/util/annotate-data.h b/tools/perf/util/annotate-data.h
index ff9acf6ea808..0bfef29fa52c 100644
--- a/tools/perf/util/annotate-data.h
+++ b/tools/perf/util/annotate-data.h
@@ -14,6 +14,7 @@ struct die_var_type;
struct disasm_line;
struct evsel;
struct map_symbol;
+struct thread;
struct type_state;
/**
@@ -79,11 +80,13 @@ extern struct annotated_data_type stackop_type;
/**
* struct data_loc_info - Data location information
- * @arch: architecture info
+ * @arch: CPU architecture info
+ * @thread: Thread info
* @ms: Map and Symbol info
* @ip: Instruction address
* @var_addr: Data address (for global variables)
* @var_name: Variable name (for global variables)
+ * @cpumode: CPU execution mode
* @op: Instruction operand location (regs and offset)
* @di: Debug info
* @fbreg: Frame base register
@@ -94,8 +97,10 @@ struct data_loc_info {
/* These are input field, should be filled by caller */
struct arch *arch;
struct map_symbol *ms;
+ struct thread *thread;
u64 ip;
u64 var_addr;
+ u8 cpumode;
const char *var_name;
struct annotated_op_loc *op;
@@ -164,7 +169,7 @@ void update_var_state(struct type_state *state, struct data_loc_info *dloc,
/* Update type state table for an instruction */
void update_insn_state(struct type_state *state, struct data_loc_info *dloc,
- struct disasm_line *dl);
+ void *cu_die, struct disasm_line *dl);
#else /* HAVE_DWARF_SUPPORT */
@@ -206,6 +211,7 @@ static inline void update_var_state(struct type_state *state __maybe_unused,
static inline void update_insn_state(struct type_state *state __maybe_unused,
struct data_loc_info *dloc __maybe_unused,
+ void *cu_die __maybe_unused,
struct disasm_line *dl __maybe_unused)
{
}
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 44574056d4bd..89a8d57b1bf7 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -3771,6 +3771,28 @@ u64 annotate_calc_pcrel(struct map_symbol *ms, u64 ip, int offset,
return map__rip_2objdump(ms->map, addr);
}
+void get_global_var_info(struct thread *thread, struct map_symbol *ms, u64 ip,
+ struct disasm_line *dl, u8 cpumode, u64 *var_addr,
+ const char **var_name, int *poffset)
+{
+ struct addr_location al;
+ struct symbol *var;
+ u64 map_addr;
+
+ *var_addr = annotate_calc_pcrel(ms, ip, *poffset, dl);
+ /* Kernel symbols might be relocated */
+ map_addr = *var_addr + map__reloc(ms->map);
+
+ addr_location__init(&al);
+ var = thread__find_symbol_fb(thread, cpumode, map_addr, &al);
+ if (var) {
+ *var_name = var->name;
+ /* Calculate type offset from the start of variable */
+ *poffset = map_addr - map__unmap_ip(al.map, var->start);
+ }
+ addr_location__exit(&al);
+}
+
/**
* hist_entry__get_data_type - find data type for given hist entry
* @he: hist entry
@@ -3845,6 +3867,8 @@ struct annotated_data_type *hist_entry__get_data_type(struct hist_entry *he)
for_each_insn_op_loc(&loc, i, op_loc) {
struct data_loc_info dloc = {
.arch = arch,
+ .thread = he->thread,
+ .cpumode = he->cpumode,
.ms = ms,
/* Recalculate IP for LOCK prefix or insn fusion */
.ip = ms->sym->start + dl->al.offset,
@@ -3859,23 +3883,10 @@ struct annotated_data_type *hist_entry__get_data_type(struct hist_entry *he)
/* PC-relative addressing */
if (op_loc->reg1 == DWARF_REG_PC) {
- struct addr_location al;
- struct symbol *var;
- u64 map_addr;
-
- dloc.var_addr = annotate_calc_pcrel(ms, ip, op_loc->offset, dl);
- /* Kernel symbols might be relocated */
- map_addr = dloc.var_addr + map__reloc(ms->map);
-
- addr_location__init(&al);
- var = thread__find_symbol_fb(he->thread, he->cpumode,
- map_addr, &al);
- if (var) {
- dloc.var_name = var->name;
- /* Calculate type offset from the start of variable */
- dloc.type_offset = map_addr - map__unmap_ip(al.map, var->start);
- }
- addr_location__exit(&al);
+ dloc.type_offset = op_loc->offset;
+ get_global_var_info(he->thread, ms, ip, dl, he->cpumode,
+ &dloc.var_addr, &dloc.var_name,
+ &dloc.type_offset);
}
mem_type = find_data_type(&dloc);
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 83afbe294ab7..b460785111a1 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -23,6 +23,7 @@ struct option;
struct perf_sample;
struct evsel;
struct symbol;
+struct thread;
struct annotated_data_type;
struct ins {
@@ -495,6 +496,10 @@ extern struct list_head ann_insn_stat;
u64 annotate_calc_pcrel(struct map_symbol *ms, u64 ip, int offset,
struct disasm_line *dl);
+void get_global_var_info(struct thread *thread, struct map_symbol *ms, u64 ip,
+ struct disasm_line *dl, u8 cpumode, u64 *var_addr,
+ const char **var_name, int *poffset);
+
/**
* struct annotated_basic_block - Basic block of instructions
* @list: List node
--
2.43.0.594.gd9cf4e227d-goog
|