@@ -262,6 +262,94 @@ update_insn_state_arm64(struct type_state *state, struct data_loc_info *dloc,
struct type_state_reg *tsr;
Dwarf_Die type_die;
int sreg, dreg;
+ u32 insn_offset = dl->al.offset;
+
+ /* Access global variables via PC relative addressing, for example:
+ *
+ * adrp x19, ffff800082074000
+ * add x19, x19, #0x380
+ *
+ * The adrp instruction locates the page base address, and the add
+ * instruction adds the offset within the page.
+ */
+ if (!strncmp(dl->ins.name, "adrp", 4)) {
+ sreg = get_arm64_regnum(dl->ops.source.raw);
+ if (sreg < 0 || !has_reg_type(state, sreg))
+ return;
+
+ tsr = &state->regs[sreg];
+ tsr->ok = true;
+ tsr->kind = TSR_KIND_GLOBAL_ADDR;
+ /*
+ * The default arm64_mov_ops has already parsed the adrp
+ * instruction and saved the target address.
+ */
+ tsr->addr = dl->ops.target.addr;
+
+ pr_debug_dtp("adrp [%x] global addr=%#"PRIx64" -> reg%d\n",
+ insn_offset, tsr->addr, sreg);
+ return;
+ }
+
+ /* Add the offset within the page. */
+ if (!strncmp(dl->ins.name, "add", 3)) {
+ regmatch_t match[4];
+ char *ops = strdup(dl->ops.raw);
+ u64 offset;
+ static regex_t add_regex;
+ static bool regex_compiled;
+
+ /*
+ * Matching the operand assembly syntax of the add instruction:
+ *
+ * <Xd|SP>, <Xn|SP>, #<imm>
+ */
+ if (!regex_compiled) {
+ regcomp(&add_regex,
+ "^([xw][0-9]{1,2}|sp), ([xw][0-9]{1,2}|sp), #(0x[0-9a-f]+)",
+ REG_EXTENDED);
+ regex_compiled = true;
+ }
+
+ if (!ops)
+ return;
+
+ if (regexec(&add_regex, dl->ops.raw, 4, match, 0))
+ return;
+
+ /*
+ * Parse the source register first. If it is not of the type
+ * TSR_KIND_GLOBAL_ADDR, further parsing is not required.
+ */
+ ops[match[2].rm_eo] = '\0';
+ sreg = get_arm64_regnum(ops + match[2].rm_so);
+ if (sreg < 0 || !has_reg_type(state, sreg) ||
+ state->regs[sreg].kind != TSR_KIND_GLOBAL_ADDR) {
+ free(ops);
+ return;
+ }
+
+ ops[match[1].rm_eo] = '\0';
+ dreg = get_arm64_regnum(ops + match[1].rm_so);
+ if (dreg < 0 || !has_reg_type(state, dreg)) {
+ free(ops);
+ return;
+ }
+
+ ops[match[3].rm_eo] = '\0';
+ offset = strtoul(ops + match[3].rm_so, NULL, 16);
+
+ tsr = &state->regs[dreg];
+ tsr->ok = true;
+ tsr->kind = TSR_KIND_GLOBAL_ADDR;
+ tsr->addr = state->regs[sreg].addr + offset;
+
+ pr_debug_dtp("add [%x] global addr=%#"PRIx64"(reg%d) -> reg%d\n",
+ insn_offset, tsr->addr, sreg, dreg);
+
+ free(ops);
+ return;
+ }
if (strncmp(dl->ins.name, "ld", 2))
return;
@@ -287,7 +375,7 @@ update_insn_state_arm64(struct type_state *state, struct data_loc_info *dloc,
tsr->ok = true;
pr_debug_dtp("load [%x] %#x(reg%d) -> reg%d",
- (u32)dl->al.offset, dst->offset, dreg, sreg);
+ insn_offset, dst->offset, dreg, sreg);
pr_debug_type_name(&tsr->type, tsr->kind);
}
}
@@ -65,6 +65,9 @@ void pr_debug_type_name(Dwarf_Die *die, enum type_state_kind kind)
case TSR_KIND_CANARY:
pr_info(" stack canary\n");
return;
+ case TSR_KIND_GLOBAL_ADDR:
+ pr_info(" global address\n");
+ return;
case TSR_KIND_TYPE:
default:
break;
@@ -1087,6 +1090,23 @@ static enum type_match_result check_matching_type(struct type_state *state,
return PERF_TMR_OK;
}
+ if (state->regs[reg].kind == TSR_KIND_GLOBAL_ADDR) {
+ int var_offset;
+ u64 var_addr;
+
+ pr_debug_dtp("global var by address");
+
+ var_addr = state->regs[reg].addr + dloc->op->offset;
+
+ if (get_global_var_type(cu_die, dloc, dloc->ip, var_addr,
+ &var_offset, type_die)) {
+ dloc->type_offset = var_offset;
+ return PERF_TMR_OK;
+ }
+
+ return PERF_TMR_BAIL_OUT;
+ }
+
if (state->regs[reg].kind == TSR_KIND_CANARY) {
pr_debug_dtp("stack canary");
@@ -36,6 +36,7 @@ enum type_state_kind {
TSR_KIND_CONST,
TSR_KIND_POINTER,
TSR_KIND_CANARY,
+ TSR_KIND_GLOBAL_ADDR,
};
/**
@@ -177,6 +178,7 @@ struct type_state_reg {
bool caller_saved;
u8 kind;
u8 copied_from;
+ u64 addr;
};
/* Type information in a stack location, dynamically allocated */
Arm64 uses the 'adrp' and 'add' instructions to load the address of a global variable. For example: adrp x19, ffff8000819c3000 add x19, x19, #0x3e8 <<after some sequence>> ldr x22, [x19, #8] Here, 'adrp' retrieves the base address of the page where the global variable is located, and 'add' adds the offset within the page. If PMU sampling occurs at the instruction 'ldr x22, [x19, #8]', we need to trace the preceding 'adrp' and 'add' instructions to obtain the status information of x19. A new register status type 'TSR_KIND_GLOBAL_ADDR' is introduced, indicating that the register holds the address of a global variable, and this address is also stored in the 'type_state_reg' structure. After obtaining the status information of x19, we use get_global_var_type() to search for a matching global variable and verify whether the returned offset is equal to 8. If it is, then we have identified the data type and offset of the accessed global variable. Signed-off-by: Li Huafei <lihuafei1@huawei.com> --- tools/perf/arch/arm64/annotate/instructions.c | 90 ++++++++++++++++++- tools/perf/util/annotate-data.c | 20 +++++ tools/perf/util/annotate-data.h | 2 + 3 files changed, 111 insertions(+), 1 deletion(-)