[PATCH RESEND] powerpc/perf: Update perf_regs structure to include SIER

[Christophe LEROY]

Le 26/11/2018 à 19:04, Madhavan Srinivasan a écrit :
> On each sample, Sample Instruction Event Register (SIER) content
> is saved in pt_regs. SIER does not have a entry as-is in the pt_regs
> but instead, SIER content is saved in the "dar" register of pt_regs.
> 
> Patch adds another entry to the perf_regs structure to include the "SIER"
> printing which internally maps to the "dar" of pt_regs.
> 
> Cc: Jiri Olsa <jolsa at redhat.com>
> Cc: Namhyung Kim <namhyung at kernel.org>
> Cc: Alexander Shishkin <alexander.shishkin at linux.intel.com>
> Cc: Anju T Sudhakar <anju at linux.vnet.ibm.com>
> Cc: Ravi Bangoria <ravi.bangoria at linux.vnet.ibm.com>
> Tested-by: Ravi Bangoria <ravi.bangoria at linux.ibm.com>
> Signed-off-by: Madhavan Srinivasan <maddy at linux.vnet.ibm.com>
> ---

I see this patch is already in patchwork 
https://patchwork.ozlabs.org/patch/941908/ and I can't spot any 
difference between the two. Please say here (under the ---) the reason 
for resending.

Christophe


>   arch/powerpc/include/uapi/asm/perf_regs.h       | 1 +
>   arch/powerpc/perf/perf_regs.c                   | 1 +
>   tools/arch/powerpc/include/uapi/asm/perf_regs.h | 1 +
>   tools/perf/arch/powerpc/include/perf_regs.h     | 3 ++-
>   tools/perf/arch/powerpc/util/perf_regs.c        | 1 +
>   5 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/include/uapi/asm/perf_regs.h b/arch/powerpc/include/uapi/asm/perf_regs.h
> index 9e52c86ccbd3..ff91192407d1 100644
> --- a/arch/powerpc/include/uapi/asm/perf_regs.h
> +++ b/arch/powerpc/include/uapi/asm/perf_regs.h
> @@ -46,6 +46,7 @@ enum perf_event_powerpc_regs {
>   	PERF_REG_POWERPC_TRAP,
>   	PERF_REG_POWERPC_DAR,
>   	PERF_REG_POWERPC_DSISR,
> +	PERF_REG_POWERPC_SIER,
>   	PERF_REG_POWERPC_MAX,
>   };
>   #endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */
> diff --git a/arch/powerpc/perf/perf_regs.c b/arch/powerpc/perf/perf_regs.c
> index 09ceea6175ba..c262aea22ad9 100644
> --- a/arch/powerpc/perf/perf_regs.c
> +++ b/arch/powerpc/perf/perf_regs.c
> @@ -69,6 +69,7 @@ static unsigned int pt_regs_offset[PERF_REG_POWERPC_MAX] = {
>   	PT_REGS_OFFSET(PERF_REG_POWERPC_TRAP, trap),
>   	PT_REGS_OFFSET(PERF_REG_POWERPC_DAR, dar),
>   	PT_REGS_OFFSET(PERF_REG_POWERPC_DSISR, dsisr),
> +	PT_REGS_OFFSET(PERF_REG_POWERPC_SIER, dar),
>   };
>   
>   u64 perf_reg_value(struct pt_regs *regs, int idx)
> diff --git a/tools/arch/powerpc/include/uapi/asm/perf_regs.h b/tools/arch/powerpc/include/uapi/asm/perf_regs.h
> index 9e52c86ccbd3..ff91192407d1 100644
> --- a/tools/arch/powerpc/include/uapi/asm/perf_regs.h
> +++ b/tools/arch/powerpc/include/uapi/asm/perf_regs.h
> @@ -46,6 +46,7 @@ enum perf_event_powerpc_regs {
>   	PERF_REG_POWERPC_TRAP,
>   	PERF_REG_POWERPC_DAR,
>   	PERF_REG_POWERPC_DSISR,
> +	PERF_REG_POWERPC_SIER,
>   	PERF_REG_POWERPC_MAX,
>   };
>   #endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */
> diff --git a/tools/perf/arch/powerpc/include/perf_regs.h b/tools/perf/arch/powerpc/include/perf_regs.h
> index 00e37b106913..1076393e6f43 100644
> --- a/tools/perf/arch/powerpc/include/perf_regs.h
> +++ b/tools/perf/arch/powerpc/include/perf_regs.h
> @@ -62,7 +62,8 @@ static const char *reg_names[] = {
>   	[PERF_REG_POWERPC_SOFTE] = "softe",
>   	[PERF_REG_POWERPC_TRAP] = "trap",
>   	[PERF_REG_POWERPC_DAR] = "dar",
> -	[PERF_REG_POWERPC_DSISR] = "dsisr"
> +	[PERF_REG_POWERPC_DSISR] = "dsisr",
> +	[PERF_REG_POWERPC_SIER] = "sier"
>   };
>   
>   static inline const char *perf_reg_name(int id)
> diff --git a/tools/perf/arch/powerpc/util/perf_regs.c b/tools/perf/arch/powerpc/util/perf_regs.c
> index ec50939b0418..07fcd977d93e 100644
> --- a/tools/perf/arch/powerpc/util/perf_regs.c
> +++ b/tools/perf/arch/powerpc/util/perf_regs.c
> @@ -52,6 +52,7 @@ const struct sample_reg sample_reg_masks[] = {
>   	SMPL_REG(trap, PERF_REG_POWERPC_TRAP),
>   	SMPL_REG(dar, PERF_REG_POWERPC_DAR),
>   	SMPL_REG(dsisr, PERF_REG_POWERPC_DSISR),
> +	SMPL_REG(sier, PERF_REG_POWERPC_SIER),
>   	SMPL_REG_END
>   };
>   
>