On Wed, Sep 17, 2025 at 07:58:00PM +0000, Zecheng Li wrote:
> TSR_KIND_POINTER only represents percpu pointers currently. Rename it to
> TSR_KIND_PERCPU_POINTER so we can use the TSR_KIND_POINTER to represent
> pointer to a type.
>
> Signed-off-by: Zecheng Li <zecheng@google.com>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Thanks,
Namhyung
> ---
> tools/perf/arch/x86/annotate/instructions.c | 4 ++--
> tools/perf/util/annotate-data.c | 6 +++---
> tools/perf/util/annotate-data.h | 2 +-
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/arch/x86/annotate/instructions.c b/tools/perf/arch/x86/annotate/instructions.c
> index c6d403eae744..da98a4e3c52c 100644
> --- a/tools/perf/arch/x86/annotate/instructions.c
> +++ b/tools/perf/arch/x86/annotate/instructions.c
> @@ -301,7 +301,7 @@ static void update_insn_state_x86(struct type_state *state,
> * as a pointer.
> */
> tsr->type = type_die;
> - tsr->kind = TSR_KIND_POINTER;
> + tsr->kind = TSR_KIND_PERCPU_POINTER;
> tsr->ok = true;
>
> pr_debug_dtp("add [%x] percpu %#"PRIx64" -> reg%d",
> @@ -521,7 +521,7 @@ static void update_insn_state_x86(struct type_state *state,
> }
> /* 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 &&
> + state->regs[sreg].kind == TSR_KIND_PERCPU_POINTER &&
> die_get_member_type(&state->regs[sreg].type,
> src->offset, &type_die)) {
> tsr->type = type_die;
> diff --git a/tools/perf/util/annotate-data.c b/tools/perf/util/annotate-data.c
> index 258157cc43c2..903027a6fb7d 100644
> --- a/tools/perf/util/annotate-data.c
> +++ b/tools/perf/util/annotate-data.c
> @@ -58,7 +58,7 @@ void pr_debug_type_name(Dwarf_Die *die, enum type_state_kind kind)
> case TSR_KIND_CONST:
> pr_info(" constant\n");
> return;
> - case TSR_KIND_POINTER:
> + case TSR_KIND_PERCPU_POINTER:
> pr_info(" pointer");
> /* it also prints the type info */
> break;
> @@ -591,7 +591,7 @@ void set_stack_state(struct type_state_stack *stack, int offset, u8 kind,
> switch (tag) {
> case DW_TAG_structure_type:
> case DW_TAG_union_type:
> - stack->compound = (kind != TSR_KIND_POINTER);
> + stack->compound = (kind != TSR_KIND_PERCPU_POINTER);
> break;
> default:
> stack->compound = false;
> @@ -1116,7 +1116,7 @@ static enum type_match_result check_matching_type(struct type_state *state,
> return PERF_TMR_OK;
> }
>
> - if (state->regs[reg].kind == TSR_KIND_POINTER) {
> + if (state->regs[reg].kind == TSR_KIND_PERCPU_POINTER) {
> pr_debug_dtp("percpu ptr");
>
> /*
> diff --git a/tools/perf/util/annotate-data.h b/tools/perf/util/annotate-data.h
> index 541fee1a5f0a..dd3807b55208 100644
> --- a/tools/perf/util/annotate-data.h
> +++ b/tools/perf/util/annotate-data.h
> @@ -34,7 +34,7 @@ enum type_state_kind {
> TSR_KIND_TYPE,
> TSR_KIND_PERCPU_BASE,
> TSR_KIND_CONST,
> - TSR_KIND_POINTER,
> + TSR_KIND_PERCPU_POINTER,
> TSR_KIND_CANARY,
> };
>
> --
> 2.51.0.384.g4c02a37b29-goog
>