Commit 782959ac authored by Athira Rajeev's avatar Athira Rajeev Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Add "update_insn_state" callback function to handle arch... 


perf annotate: Add "update_insn_state" callback function to handle arch specific instruction tracking

Add "update_insn_state" callback to "struct arch" to handle instruction
tracking. Currently updating instruction state is handled by static
function "update_insn_state_x86" which is defined in "annotate-data.c".

Make this as a callback for specific arch and move to archs specific
file "arch/x86/annotate/instructions.c" . This will help to add helper
function for other platforms in file:
"arch/<platform>/annotate/instructions.c" and make changes/updates
easier.

Define callback "update_insn_state" as part of "struct arch", also make
some of the debug functions non-static so that it can be referenced from
other places.

Reviewed-by: default avatarKajol Jain <kjain@linux.ibm.com>
Reviewed-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarAthira Rajeev <atrajeev@linux.vnet.ibm.com>
Tested-by: default avatarKajol Jain <kjain@linux.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Akanksha J N <akanksha@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Disha Goel <disgoel@linux.vnet.ibm.com>
Cc: Hari Bathini <hbathini@linux.ibm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Segher Boessenkool <segher@kernel.crashing.org>
Link: https://lore.kernel.org/lkml/20240718084358.72242-3-atrajeev@linux.vnet.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1d303dee

tools/perf/arch/x86/annotate/instructions.c

+377 −0
Original line number Diff line number Diff line
@@ -206,3 +206,380 @@ static int x86__annotate_init(struct arch *arch, char *cpuid) 
	arch->initialized = true;

	return err;

}



#ifdef HAVE_DWARF_SUPPORT

static void update_insn_state_x86(struct type_state *state,

				  struct data_loc_info *dloc, Dwarf_Die *cu_die,

				  struct disasm_line *dl)

{

	struct annotated_insn_loc loc;

	struct annotated_op_loc *src = &loc.ops[INSN_OP_SOURCE];

	struct annotated_op_loc *dst = &loc.ops[INSN_OP_TARGET];

	struct type_state_reg *tsr;

	Dwarf_Die type_die;

	u32 insn_offset = dl->al.offset;

	int fbreg = dloc->fbreg;

	int fboff = 0;



	if (annotate_get_insn_location(dloc->arch, dl, &loc) < 0)

		return;



	if (ins__is_call(&dl->ins)) {

		struct symbol *func = dl->ops.target.sym;



		if (func == NULL)

			return;



		/* __fentry__ will preserve all registers */

		if (!strcmp(func->name, "__fentry__"))

			return;



		pr_debug_dtp("call [%x] %s\n", insn_offset, func->name);



		/* Otherwise invalidate caller-saved registers after call */

		for (unsigned i = 0; i < ARRAY_SIZE(state->regs); i++) {

			if (state->regs[i].caller_saved)

				state->regs[i].ok = false;

		}



		/* Update register with the return type (if any) */

		if (die_find_func_rettype(cu_die, func->name, &type_die)) {

			tsr = &state->regs[state->ret_reg];

			tsr->type = type_die;

			tsr->kind = TSR_KIND_TYPE;

			tsr->ok = true;



			pr_debug_dtp("call [%x] return -> reg%d",

				     insn_offset, state->ret_reg);

			pr_debug_type_name(&type_die, tsr->kind);

		}

		return;

	}



	if (!strncmp(dl->ins.name, "add", 3)) {

		u64 imm_value = -1ULL;

		int offset;

		const char *var_name = NULL;

		struct map_symbol *ms = dloc->ms;

		u64 ip = ms->sym->start + dl->al.offset;



		if (!has_reg_type(state, dst->reg1))

			return;



		tsr = &state->regs[dst->reg1];



		if (src->imm)

			imm_value = src->offset;

		else if (has_reg_type(state, src->reg1) &&

			 state->regs[src->reg1].kind == TSR_KIND_CONST)

			imm_value = state->regs[src->reg1].imm_value;

		else if (src->reg1 == DWARF_REG_PC) {

			u64 var_addr = annotate_calc_pcrel(dloc->ms, ip,

							   src->offset, dl);



			if (get_global_var_info(dloc, var_addr,

						&var_name, &offset) &&

			    !strcmp(var_name, "this_cpu_off") &&

			    tsr->kind == TSR_KIND_CONST) {

				tsr->kind = TSR_KIND_PERCPU_BASE;

				imm_value = tsr->imm_value;

			}

		}

		else

			return;



		if (tsr->kind != TSR_KIND_PERCPU_BASE)

			return;



		if (get_global_var_type(cu_die, dloc, ip, imm_value, &offset,

					&type_die) && offset == 0) {

			/*

			 * This is not a pointer type, but it should be treated

			 * as a pointer.

			 */

			tsr->type = type_die;

			tsr->kind = TSR_KIND_POINTER;

			tsr->ok = true;



			pr_debug_dtp("add [%x] percpu %#"PRIx64" -> reg%d",

				     insn_offset, imm_value, dst->reg1);

			pr_debug_type_name(&tsr->type, tsr->kind);

		}

		return;

	}



	if (strncmp(dl->ins.name, "mov", 3))

		return;



	if (dloc->fb_cfa) {

		u64 ip = dloc->ms->sym->start + dl->al.offset;

		u64 pc = map__rip_2objdump(dloc->ms->map, ip);



		if (die_get_cfa(dloc->di->dbg, pc, &fbreg, &fboff) < 0)

			fbreg = -1;

	}



	/* Case 1. register to register or segment:offset to register transfers */

	if (!src->mem_ref && !dst->mem_ref) {

		if (!has_reg_type(state, dst->reg1))

			return;



		tsr = &state->regs[dst->reg1];

		if (dso__kernel(map__dso(dloc->ms->map)) &&

		    src->segment == INSN_SEG_X86_GS && src->imm) {

			u64 ip = dloc->ms->sym->start + dl->al.offset;

			u64 var_addr;

			int offset;



			/*

			 * In kernel, %gs points to a per-cpu region for the

			 * current CPU.  Access with a constant offset should

			 * be treated as a global variable access.

			 */

			var_addr = src->offset;



			if (var_addr == 40) {

				tsr->kind = TSR_KIND_CANARY;

				tsr->ok = true;



				pr_debug_dtp("mov [%x] stack canary -> reg%d\n",

					     insn_offset, dst->reg1);

				return;

			}



			if (!get_global_var_type(cu_die, dloc, ip, var_addr,

						 &offset, &type_die) ||

			    !die_get_member_type(&type_die, offset, &type_die)) {

				tsr->ok = false;

				return;

			}



			tsr->type = type_die;

			tsr->kind = TSR_KIND_TYPE;

			tsr->ok = true;



			pr_debug_dtp("mov [%x] this-cpu addr=%#"PRIx64" -> reg%d",

				     insn_offset, var_addr, dst->reg1);

			pr_debug_type_name(&tsr->type, tsr->kind);

			return;

		}



		if (src->imm) {

			tsr->kind = TSR_KIND_CONST;

			tsr->imm_value = src->offset;

			tsr->ok = true;



			pr_debug_dtp("mov [%x] imm=%#x -> reg%d\n",

				     insn_offset, tsr->imm_value, dst->reg1);

			return;

		}



		if (!has_reg_type(state, src->reg1) ||

		    !state->regs[src->reg1].ok) {

			tsr->ok = false;

			return;

		}



		tsr->type = state->regs[src->reg1].type;

		tsr->kind = state->regs[src->reg1].kind;

		tsr->ok = true;



		pr_debug_dtp("mov [%x] reg%d -> reg%d",

			     insn_offset, src->reg1, dst->reg1);

		pr_debug_type_name(&tsr->type, tsr->kind);

	}

	/* Case 2. memory to register transers */

	if (src->mem_ref && !dst->mem_ref) {

		int sreg = src->reg1;



		if (!has_reg_type(state, dst->reg1))

			return;



		tsr = &state->regs[dst->reg1];



retry:

		/* Check stack variables with offset */

		if (sreg == fbreg) {

			struct type_state_stack *stack;

			int offset = src->offset - fboff;



			stack = find_stack_state(state, offset);

			if (stack == NULL) {

				tsr->ok = false;

				return;

			} else if (!stack->compound) {

				tsr->type = stack->type;

				tsr->kind = stack->kind;

				tsr->ok = true;

			} else if (die_get_member_type(&stack->type,

						       offset - stack->offset,

						       &type_die)) {

				tsr->type = type_die;

				tsr->kind = TSR_KIND_TYPE;

				tsr->ok = true;

			} else {

				tsr->ok = false;

				return;

			}



			pr_debug_dtp("mov [%x] -%#x(stack) -> reg%d",

				     insn_offset, -offset, dst->reg1);

			pr_debug_type_name(&tsr->type, tsr->kind);

		}

		/* And then dereference the pointer if it has one */

		else if (has_reg_type(state, sreg) && state->regs[sreg].ok &&

			 state->regs[sreg].kind == TSR_KIND_TYPE &&

			 die_deref_ptr_type(&state->regs[sreg].type,

					    src->offset, &type_die)) {

			tsr->type = type_die;

			tsr->kind = TSR_KIND_TYPE;

			tsr->ok = true;



			pr_debug_dtp("mov [%x] %#x(reg%d) -> reg%d",

				     insn_offset, src->offset, sreg, dst->reg1);

			pr_debug_type_name(&tsr->type, tsr->kind);

		}

		/* Or check if it's a global variable */

		else if (sreg == DWARF_REG_PC) {

			struct map_symbol *ms = dloc->ms;

			u64 ip = ms->sym->start + dl->al.offset;

			u64 addr;

			int offset;



			addr = annotate_calc_pcrel(ms, ip, src->offset, dl);



			if (!get_global_var_type(cu_die, dloc, ip, addr, &offset,

						 &type_die) ||

			    !die_get_member_type(&type_die, offset, &type_die)) {

				tsr->ok = false;

				return;

			}



			tsr->type = type_die;

			tsr->kind = TSR_KIND_TYPE;

			tsr->ok = true;



			pr_debug_dtp("mov [%x] global addr=%"PRIx64" -> reg%d",

				     insn_offset, addr, dst->reg1);

			pr_debug_type_name(&type_die, tsr->kind);

		}

		/* And check percpu access with base register */

		else if (has_reg_type(state, sreg) &&

			 state->regs[sreg].kind == TSR_KIND_PERCPU_BASE) {

			u64 ip = dloc->ms->sym->start + dl->al.offset;

			u64 var_addr = src->offset;

			int offset;



			if (src->multi_regs) {

				int reg2 = (sreg == src->reg1) ? src->reg2 : src->reg1;



				if (has_reg_type(state, reg2) && state->regs[reg2].ok &&

				    state->regs[reg2].kind == TSR_KIND_CONST)

					var_addr += state->regs[reg2].imm_value;

			}



			/*

			 * In kernel, %gs points to a per-cpu region for the

			 * current CPU.  Access with a constant offset should

			 * be treated as a global variable access.

			 */

			if (get_global_var_type(cu_die, dloc, ip, var_addr,

						&offset, &type_die) &&

			    die_get_member_type(&type_die, offset, &type_die)) {

				tsr->type = type_die;

				tsr->kind = TSR_KIND_TYPE;

				tsr->ok = true;



				if (src->multi_regs) {

					pr_debug_dtp("mov [%x] percpu %#x(reg%d,reg%d) -> reg%d",

						     insn_offset, src->offset, src->reg1,

						     src->reg2, dst->reg1);

				} else {

					pr_debug_dtp("mov [%x] percpu %#x(reg%d) -> reg%d",

						     insn_offset, src->offset, sreg, dst->reg1);

				}

				pr_debug_type_name(&tsr->type, tsr->kind);

			} else {

				tsr->ok = false;

			}

		}

		/* And then dereference the calculated pointer if it has one */

		else if (has_reg_type(state, sreg) && state->regs[sreg].ok &&

			 state->regs[sreg].kind == TSR_KIND_POINTER &&

			 die_get_member_type(&state->regs[sreg].type,

					     src->offset, &type_die)) {

			tsr->type = type_die;

			tsr->kind = TSR_KIND_TYPE;

			tsr->ok = true;



			pr_debug_dtp("mov [%x] pointer %#x(reg%d) -> reg%d",

				     insn_offset, src->offset, sreg, dst->reg1);

			pr_debug_type_name(&tsr->type, tsr->kind);

		}

		/* Or try another register if any */

		else if (src->multi_regs && sreg == src->reg1 &&

			 src->reg1 != src->reg2) {

			sreg = src->reg2;

			goto retry;

		}

		else {

			int offset;

			const char *var_name = NULL;



			/* it might be per-cpu variable (in kernel) access */

			if (src->offset < 0) {

				if (get_global_var_info(dloc, (s64)src->offset,

							&var_name, &offset) &&

				    !strcmp(var_name, "__per_cpu_offset")) {

					tsr->kind = TSR_KIND_PERCPU_BASE;



					pr_debug_dtp("mov [%x] percpu base reg%d\n",

						     insn_offset, dst->reg1);

				}

			}



			tsr->ok = false;

		}

	}

	/* Case 3. register to memory transfers */

	if (!src->mem_ref && dst->mem_ref) {

		if (!has_reg_type(state, src->reg1) ||

		    !state->regs[src->reg1].ok)

			return;



		/* Check stack variables with offset */

		if (dst->reg1 == fbreg) {

			struct type_state_stack *stack;

			int offset = dst->offset - fboff;



			tsr = &state->regs[src->reg1];



			stack = find_stack_state(state, offset);

			if (stack) {

				/*

				 * The source register is likely to hold a type

				 * of member if it's a compound type.  Do not

				 * update the stack variable type since we can

				 * get the member type later by using the

				 * die_get_member_type().

				 */

				if (!stack->compound)

					set_stack_state(stack, offset, tsr->kind,

							&tsr->type);

			} else {

				findnew_stack_state(state, offset, tsr->kind,

						    &tsr->type);

			}



			pr_debug_dtp("mov [%x] reg%d -> -%#x(stack)",

				     insn_offset, src->reg1, -offset);

			pr_debug_type_name(&tsr->type, tsr->kind);

		}

		/*

		 * Ignore other transfers since it'd set a value in a struct

		 * and won't change the type.

		 */

	}

	/* Case 4. memory to memory transfers (not handled for now) */

}

#endif

tools/perf/util/annotate-data.c

+8 −383
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ do { \ 
		pr_debug3(fmt, ##__VA_ARGS__);			\

} while (0)



static void pr_debug_type_name(Dwarf_Die *die, enum type_state_kind kind)

void pr_debug_type_name(Dwarf_Die *die, enum type_state_kind kind)

{

	struct strbuf sb;

	char *str;
@@ -390,7 +390,7 @@ static int check_variable(struct data_loc_info *dloc, Dwarf_Die *var_die, 
	return 0;

}



static struct type_state_stack *find_stack_state(struct type_state *state,

struct type_state_stack *find_stack_state(struct type_state *state,

						 int offset)

{

	struct type_state_stack *stack;
@@ -406,7 +406,7 @@ static struct type_state_stack *find_stack_state(struct type_state *state, 
	return NULL;

}



static void set_stack_state(struct type_state_stack *stack, int offset, u8 kind,

void set_stack_state(struct type_state_stack *stack, int offset, u8 kind,

			    Dwarf_Die *type_die)

{

	int tag;
@@ -433,7 +433,7 @@ static void set_stack_state(struct type_state_stack *stack, int offset, u8 kind, 
	}

}



static struct type_state_stack *findnew_stack_state(struct type_state *state,

struct type_state_stack *findnew_stack_state(struct type_state *state,

						    int offset, u8 kind,

						    Dwarf_Die *type_die)

{
@@ -537,7 +537,7 @@ void global_var_type__tree_delete(struct rb_root *root) 
	}

}



static bool get_global_var_info(struct data_loc_info *dloc, u64 addr,

bool get_global_var_info(struct data_loc_info *dloc, u64 addr,

				const char **var_name, int *var_offset)

{

	struct addr_location al;
@@ -611,7 +611,7 @@ static void global_var__collect(struct data_loc_info *dloc) 
	}

}



static bool get_global_var_type(Dwarf_Die *cu_die, struct data_loc_info *dloc,

bool get_global_var_type(Dwarf_Die *cu_die, struct data_loc_info *dloc,

				u64 ip, u64 var_addr, int *var_offset,

				Dwarf_Die *type_die)

{
@@ -722,381 +722,6 @@ static void update_var_state(struct type_state *state, struct data_loc_info *dlo 
	}

}



static void update_insn_state_x86(struct type_state *state,

				  struct data_loc_info *dloc, Dwarf_Die *cu_die,

				  struct disasm_line *dl)

{

	struct annotated_insn_loc loc;

	struct annotated_op_loc *src = &loc.ops[INSN_OP_SOURCE];

	struct annotated_op_loc *dst = &loc.ops[INSN_OP_TARGET];

	struct type_state_reg *tsr;

	Dwarf_Die type_die;

	u32 insn_offset = dl->al.offset;

	int fbreg = dloc->fbreg;

	int fboff = 0;



	if (annotate_get_insn_location(dloc->arch, dl, &loc) < 0)

		return;



	if (ins__is_call(&dl->ins)) {

		struct symbol *func = dl->ops.target.sym;



		if (func == NULL)

			return;



		/* __fentry__ will preserve all registers */

		if (!strcmp(func->name, "__fentry__"))

			return;



		pr_debug_dtp("call [%x] %s\n", insn_offset, func->name);



		/* Otherwise invalidate caller-saved registers after call */

		for (unsigned i = 0; i < ARRAY_SIZE(state->regs); i++) {

			if (state->regs[i].caller_saved)

				state->regs[i].ok = false;

		}



		/* Update register with the return type (if any) */

		if (die_find_func_rettype(cu_die, func->name, &type_die)) {

			tsr = &state->regs[state->ret_reg];

			tsr->type = type_die;

			tsr->kind = TSR_KIND_TYPE;

			tsr->ok = true;



			pr_debug_dtp("call [%x] return -> reg%d",

				     insn_offset, state->ret_reg);

			pr_debug_type_name(&type_die, tsr->kind);

		}

		return;

	}



	if (!strncmp(dl->ins.name, "add", 3)) {

		u64 imm_value = -1ULL;

		int offset;

		const char *var_name = NULL;

		struct map_symbol *ms = dloc->ms;

		u64 ip = ms->sym->start + dl->al.offset;



		if (!has_reg_type(state, dst->reg1))

			return;



		tsr = &state->regs[dst->reg1];



		if (src->imm)

			imm_value = src->offset;

		else if (has_reg_type(state, src->reg1) &&

			 state->regs[src->reg1].kind == TSR_KIND_CONST)

			imm_value = state->regs[src->reg1].imm_value;

		else if (src->reg1 == DWARF_REG_PC) {

			u64 var_addr = annotate_calc_pcrel(dloc->ms, ip,

							   src->offset, dl);



			if (get_global_var_info(dloc, var_addr,

						&var_name, &offset) &&

			    !strcmp(var_name, "this_cpu_off") &&

			    tsr->kind == TSR_KIND_CONST) {

				tsr->kind = TSR_KIND_PERCPU_BASE;

				imm_value = tsr->imm_value;

			}

		}

		else

			return;



		if (tsr->kind != TSR_KIND_PERCPU_BASE)

			return;



		if (get_global_var_type(cu_die, dloc, ip, imm_value, &offset,

					&type_die) && offset == 0) {

			/*

			 * This is not a pointer type, but it should be treated

			 * as a pointer.

			 */

			tsr->type = type_die;

			tsr->kind = TSR_KIND_POINTER;

			tsr->ok = true;



			pr_debug_dtp("add [%x] percpu %#"PRIx64" -> reg%d",

				     insn_offset, imm_value, dst->reg1);

			pr_debug_type_name(&tsr->type, tsr->kind);

		}

		return;

	}



	if (strncmp(dl->ins.name, "mov", 3))

		return;



	if (dloc->fb_cfa) {

		u64 ip = dloc->ms->sym->start + dl->al.offset;

		u64 pc = map__rip_2objdump(dloc->ms->map, ip);



		if (die_get_cfa(dloc->di->dbg, pc, &fbreg, &fboff) < 0)

			fbreg = -1;

	}



	/* Case 1. register to register or segment:offset to register transfers */

	if (!src->mem_ref && !dst->mem_ref) {

		if (!has_reg_type(state, dst->reg1))

			return;



		tsr = &state->regs[dst->reg1];

		if (dso__kernel(map__dso(dloc->ms->map)) &&

		    src->segment == INSN_SEG_X86_GS && src->imm) {

			u64 ip = dloc->ms->sym->start + dl->al.offset;

			u64 var_addr;

			int offset;



			/*

			 * In kernel, %gs points to a per-cpu region for the

			 * current CPU.  Access with a constant offset should

			 * be treated as a global variable access.

			 */

			var_addr = src->offset;



			if (var_addr == 40) {

				tsr->kind = TSR_KIND_CANARY;

				tsr->ok = true;



				pr_debug_dtp("mov [%x] stack canary -> reg%d\n",

					     insn_offset, dst->reg1);

				return;

			}



			if (!get_global_var_type(cu_die, dloc, ip, var_addr,

						 &offset, &type_die) ||

			    !die_get_member_type(&type_die, offset, &type_die)) {

				tsr->ok = false;

				return;

			}



			tsr->type = type_die;

			tsr->kind = TSR_KIND_TYPE;

			tsr->ok = true;



			pr_debug_dtp("mov [%x] this-cpu addr=%#"PRIx64" -> reg%d",

				     insn_offset, var_addr, dst->reg1);

			pr_debug_type_name(&tsr->type, tsr->kind);

			return;

		}



		if (src->imm) {

			tsr->kind = TSR_KIND_CONST;

			tsr->imm_value = src->offset;

			tsr->ok = true;



			pr_debug_dtp("mov [%x] imm=%#x -> reg%d\n",

				     insn_offset, tsr->imm_value, dst->reg1);

			return;

		}



		if (!has_reg_type(state, src->reg1) ||

		    !state->regs[src->reg1].ok) {

			tsr->ok = false;

			return;

		}



		tsr->type = state->regs[src->reg1].type;

		tsr->kind = state->regs[src->reg1].kind;

		tsr->ok = true;



		pr_debug_dtp("mov [%x] reg%d -> reg%d",

			     insn_offset, src->reg1, dst->reg1);

		pr_debug_type_name(&tsr->type, tsr->kind);

	}

	/* Case 2. memory to register transers */

	if (src->mem_ref && !dst->mem_ref) {

		int sreg = src->reg1;



		if (!has_reg_type(state, dst->reg1))

			return;



		tsr = &state->regs[dst->reg1];



retry:

		/* Check stack variables with offset */

		if (sreg == fbreg) {

			struct type_state_stack *stack;

			int offset = src->offset - fboff;



			stack = find_stack_state(state, offset);

			if (stack == NULL) {

				tsr->ok = false;

				return;

			} else if (!stack->compound) {

				tsr->type = stack->type;

				tsr->kind = stack->kind;

				tsr->ok = true;

			} else if (die_get_member_type(&stack->type,

						       offset - stack->offset,

						       &type_die)) {

				tsr->type = type_die;

				tsr->kind = TSR_KIND_TYPE;

				tsr->ok = true;

			} else {

				tsr->ok = false;

				return;

			}



			pr_debug_dtp("mov [%x] -%#x(stack) -> reg%d",

				     insn_offset, -offset, dst->reg1);

			pr_debug_type_name(&tsr->type, tsr->kind);

		}

		/* And then dereference the pointer if it has one */

		else if (has_reg_type(state, sreg) && state->regs[sreg].ok &&

			 state->regs[sreg].kind == TSR_KIND_TYPE &&

			 die_deref_ptr_type(&state->regs[sreg].type,

					    src->offset, &type_die)) {

			tsr->type = type_die;

			tsr->kind = TSR_KIND_TYPE;

			tsr->ok = true;



			pr_debug_dtp("mov [%x] %#x(reg%d) -> reg%d",

				     insn_offset, src->offset, sreg, dst->reg1);

			pr_debug_type_name(&tsr->type, tsr->kind);

		}

		/* Or check if it's a global variable */

		else if (sreg == DWARF_REG_PC) {

			struct map_symbol *ms = dloc->ms;

			u64 ip = ms->sym->start + dl->al.offset;

			u64 addr;

			int offset;



			addr = annotate_calc_pcrel(ms, ip, src->offset, dl);



			if (!get_global_var_type(cu_die, dloc, ip, addr, &offset,

						 &type_die) ||

			    !die_get_member_type(&type_die, offset, &type_die)) {

				tsr->ok = false;

				return;

			}



			tsr->type = type_die;

			tsr->kind = TSR_KIND_TYPE;

			tsr->ok = true;



			pr_debug_dtp("mov [%x] global addr=%"PRIx64" -> reg%d",

				     insn_offset, addr, dst->reg1);

			pr_debug_type_name(&type_die, tsr->kind);

		}

		/* And check percpu access with base register */

		else if (has_reg_type(state, sreg) &&

			 state->regs[sreg].kind == TSR_KIND_PERCPU_BASE) {

			u64 ip = dloc->ms->sym->start + dl->al.offset;

			u64 var_addr = src->offset;

			int offset;



			if (src->multi_regs) {

				int reg2 = (sreg == src->reg1) ? src->reg2 : src->reg1;



				if (has_reg_type(state, reg2) && state->regs[reg2].ok &&

				    state->regs[reg2].kind == TSR_KIND_CONST)

					var_addr += state->regs[reg2].imm_value;

			}



			/*

			 * In kernel, %gs points to a per-cpu region for the

			 * current CPU.  Access with a constant offset should

			 * be treated as a global variable access.

			 */

			if (get_global_var_type(cu_die, dloc, ip, var_addr,

						&offset, &type_die) &&

			    die_get_member_type(&type_die, offset, &type_die)) {

				tsr->type = type_die;

				tsr->kind = TSR_KIND_TYPE;

				tsr->ok = true;



				if (src->multi_regs) {

					pr_debug_dtp("mov [%x] percpu %#x(reg%d,reg%d) -> reg%d",

						     insn_offset, src->offset, src->reg1,

						     src->reg2, dst->reg1);

				} else {

					pr_debug_dtp("mov [%x] percpu %#x(reg%d) -> reg%d",

						     insn_offset, src->offset, sreg, dst->reg1);

				}

				pr_debug_type_name(&tsr->type, tsr->kind);

			} else {

				tsr->ok = false;

			}

		}

		/* And then dereference the calculated pointer if it has one */

		else if (has_reg_type(state, sreg) && state->regs[sreg].ok &&

			 state->regs[sreg].kind == TSR_KIND_POINTER &&

			 die_get_member_type(&state->regs[sreg].type,

					     src->offset, &type_die)) {

			tsr->type = type_die;

			tsr->kind = TSR_KIND_TYPE;

			tsr->ok = true;



			pr_debug_dtp("mov [%x] pointer %#x(reg%d) -> reg%d",

				     insn_offset, src->offset, sreg, dst->reg1);

			pr_debug_type_name(&tsr->type, tsr->kind);

		}

		/* Or try another register if any */

		else if (src->multi_regs && sreg == src->reg1 &&

			 src->reg1 != src->reg2) {

			sreg = src->reg2;

			goto retry;

		}

		else {

			int offset;

			const char *var_name = NULL;



			/* it might be per-cpu variable (in kernel) access */

			if (src->offset < 0) {

				if (get_global_var_info(dloc, (s64)src->offset,

							&var_name, &offset) &&

				    !strcmp(var_name, "__per_cpu_offset")) {

					tsr->kind = TSR_KIND_PERCPU_BASE;



					pr_debug_dtp("mov [%x] percpu base reg%d\n",

						     insn_offset, dst->reg1);

				}

			}



			tsr->ok = false;

		}

	}

	/* Case 3. register to memory transfers */

	if (!src->mem_ref && dst->mem_ref) {

		if (!has_reg_type(state, src->reg1) ||

		    !state->regs[src->reg1].ok)

			return;



		/* Check stack variables with offset */

		if (dst->reg1 == fbreg) {

			struct type_state_stack *stack;

			int offset = dst->offset - fboff;



			tsr = &state->regs[src->reg1];



			stack = find_stack_state(state, offset);

			if (stack) {

				/*

				 * The source register is likely to hold a type

				 * of member if it's a compound type.  Do not

				 * update the stack variable type since we can

				 * get the member type later by using the

				 * die_get_member_type().

				 */

				if (!stack->compound)

					set_stack_state(stack, offset, tsr->kind,

							&tsr->type);

			} else {

				findnew_stack_state(state, offset, tsr->kind,

						    &tsr->type);

			}



			pr_debug_dtp("mov [%x] reg%d -> -%#x(stack)",

				     insn_offset, src->reg1, -offset);

			pr_debug_type_name(&tsr->type, tsr->kind);

		}

		/*

		 * Ignore other transfers since it'd set a value in a struct

		 * and won't change the type.

		 */

	}

	/* Case 4. memory to memory transfers (not handled for now) */

}



/**

 * update_insn_state - Update type state for an instruction

 * @state: type state table
@@ -1115,8 +740,8 @@ static void update_insn_state_x86(struct type_state *state, 
static void update_insn_state(struct type_state *state, struct data_loc_info *dloc,

			      Dwarf_Die *cu_die, struct disasm_line *dl)

{

	if (arch__is(dloc->arch, "x86"))

		update_insn_state_x86(state, dloc, cu_die, dl);

	if (dloc->arch->update_insn_state)

		dloc->arch->update_insn_state(state, dloc, cu_die, dl);

}



/*

tools/perf/util/annotate-data.h

+23 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/compiler.h>

#include <linux/rbtree.h>

#include <linux/types.h>

#include "dwarf-regs.h"

#include "annotate.h"



#ifdef HAVE_DWARF_SUPPORT
@@ -20,6 +21,14 @@ struct hist_entry; 
struct map_symbol;

struct thread;



#define pr_debug_dtp(fmt, ...)					\

do {								\

	if (debug_type_profile)					\

		pr_info(fmt, ##__VA_ARGS__);			\

	else							\

		pr_debug3(fmt, ##__VA_ARGS__);			\

} while (0)



enum type_state_kind {

	TSR_KIND_INVALID = 0,

	TSR_KIND_TYPE,
@@ -216,6 +225,20 @@ void global_var_type__tree_delete(struct rb_root *root); 
int hist_entry__annotate_data_tty(struct hist_entry *he, struct evsel *evsel);



bool has_reg_type(struct type_state *state, int reg);

struct type_state_stack *findnew_stack_state(struct type_state *state,

						int offset, u8 kind,

						Dwarf_Die *type_die);

void set_stack_state(struct type_state_stack *stack, int offset, u8 kind,

				Dwarf_Die *type_die);

struct type_state_stack *find_stack_state(struct type_state *state,

						int offset);

bool get_global_var_type(Dwarf_Die *cu_die, struct data_loc_info *dloc,

				u64 ip, u64 var_addr, int *var_offset,

				Dwarf_Die *type_die);

bool get_global_var_info(struct data_loc_info *dloc, u64 addr,

				const char **var_name, int *var_offset);

void pr_debug_type_name(Dwarf_Die *die, enum type_state_kind kind);



#else /* HAVE_DWARF_SUPPORT */



static inline struct annotated_data_type *

tools/perf/util/disasm.c

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <subcmd/run-command.h>



#include "annotate.h"

#include "annotate-data.h"

#include "build-id.h"

#include "debug.h"

#include "disasm.h"
@@ -145,6 +146,9 @@ static struct arch architectures[] = { 
			.memory_ref_char = '(',

			.imm_char = '$',

		},

#ifdef HAVE_DWARF_SUPPORT

		.update_insn_state = update_insn_state_x86,

#endif

	},

	{

		.name = "powerpc",

tools/perf/util/disasm.h

+12 −0
Original line number Diff line number Diff line
@@ -4,11 +4,18 @@ 


#include "map_symbol.h"



#ifdef HAVE_DWARF_SUPPORT

#include "dwarf-aux.h"

#endif



struct annotation_options;

struct disasm_line;

struct ins;

struct evsel;

struct symbol;

struct data_loc_info;

struct type_state;

struct disasm_line;



struct arch {

	const char	*name;
@@ -32,6 +39,11 @@ struct arch { 
		char memory_ref_char;

		char imm_char;

	} objdump;

#ifdef HAVE_DWARF_SUPPORT

	void		(*update_insn_state)(struct type_state *state,

				struct data_loc_info *dloc, Dwarf_Die *cu_die,

				struct disasm_line *dl);

#endif

};



struct ins {