[PATCH v2 15/16] objtool/powerpc: Enable objtool to be built on ppc

Christophe Leroy christophe.leroy at csgroup.eu
Tue Aug 30 16:41:49 AEST 2022



Le 29/08/2022 à 07:52, Sathvika Vasireddy a écrit :
> This patch adds [stub] implementations for required
> functions, inorder to enable objtool build on powerpc.

Not all powerpc it seems, see below

> 
> Signed-off-by: Sathvika Vasireddy <sv at linux.ibm.com>
> [Christophe Leroy: powerpc: Add missing asm/asm.h for objtool]
> Signed-off-by: Christophe Leroy <christophe.leroy at csgroup.eu>
> ---
>   arch/powerpc/Kconfig                          |  1 +
>   arch/powerpc/include/asm/asm.h                |  7 ++
>   tools/objtool/arch/powerpc/Build              |  2 +
>   tools/objtool/arch/powerpc/decode.c           | 74 +++++++++++++++++++
>   .../arch/powerpc/include/arch/cfi_regs.h      | 11 +++
>   tools/objtool/arch/powerpc/include/arch/elf.h |  8 ++
>   .../arch/powerpc/include/arch/special.h       | 21 ++++++
>   tools/objtool/arch/powerpc/special.c          | 19 +++++
>   8 files changed, 143 insertions(+)
>   create mode 100644 arch/powerpc/include/asm/asm.h
>   create mode 100644 tools/objtool/arch/powerpc/Build
>   create mode 100644 tools/objtool/arch/powerpc/decode.c
>   create mode 100644 tools/objtool/arch/powerpc/include/arch/cfi_regs.h
>   create mode 100644 tools/objtool/arch/powerpc/include/arch/elf.h
>   create mode 100644 tools/objtool/arch/powerpc/include/arch/special.h
>   create mode 100644 tools/objtool/arch/powerpc/special.c
> 
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 4c466acdc70d..dc05cd23c233 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -237,6 +237,7 @@ config PPC
>   	select HAVE_MOD_ARCH_SPECIFIC
>   	select HAVE_NMI				if PERF_EVENTS || (PPC64 && PPC_BOOK3S)
>   	select HAVE_OPTPROBES
> +	select HAVE_OBJTOOL			if PPC32 || MPROFILE_KERNEL

Why restrict it to MPROFILE_KERNEL ? In your RFC it was for all PPC64.

Recent discussion on the list shows new problem with recordmcount, see 
https://lore.kernel.org/all/MW5PR84MB184250EA1CAE04497C1E7CE9AB769@MW5PR84MB1842.NAMPRD84.PROD.OUTLOOK.COM/

Those ones are with ppc64 big endian, so objtool would be welcome here 
as well.

>   	select HAVE_PERF_EVENTS
>   	select HAVE_PERF_EVENTS_NMI		if PPC64
>   	select HAVE_PERF_REGS
> diff --git a/arch/powerpc/include/asm/asm.h b/arch/powerpc/include/asm/asm.h
> new file mode 100644
> index 000000000000..86f46b604e9a
> --- /dev/null
> +++ b/arch/powerpc/include/asm/asm.h
> @@ -0,0 +1,7 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef _ASM_POWERPC_ASM_H
> +#define _ASM_POWERPC_ASM_H
> +
> +#define _ASM_PTR	" .long "
> +
> +#endif /* _ASM_POWERPC_ASM_H */
> diff --git a/tools/objtool/arch/powerpc/Build b/tools/objtool/arch/powerpc/Build
> new file mode 100644
> index 000000000000..d24d5636a5b8
> --- /dev/null
> +++ b/tools/objtool/arch/powerpc/Build
> @@ -0,0 +1,2 @@
> +objtool-y += decode.o
> +objtool-y += special.o
> diff --git a/tools/objtool/arch/powerpc/decode.c b/tools/objtool/arch/powerpc/decode.c
> new file mode 100644
> index 000000000000..8b6a14680da7
> --- /dev/null
> +++ b/tools/objtool/arch/powerpc/decode.c
> @@ -0,0 +1,74 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <objtool/check.h>
> +#include <objtool/elf.h>
> +#include <objtool/arch.h>
> +#include <objtool/warn.h>
> +#include <objtool/builtin.h>
> +#include <objtool/endianness.h>
> +
> +unsigned long arch_dest_reloc_offset(int addend)
> +{
> +	return addend;
> +}
> +
> +bool arch_callee_saved_reg(unsigned char reg)
> +{
> +	return false;
> +}
> +
> +int arch_decode_hint_reg(u8 sp_reg, int *base)
> +{
> +	exit(-1);
> +}
> +
> +const char *arch_nop_insn(int len)
> +{
> +	exit(-1);
> +}
> +
> +const char *arch_ret_insn(int len)
> +{
> +	exit(-1);
> +}
> +
> +int arch_decode_instruction(struct objtool_file *file, const struct section *sec,
> +			    unsigned long offset, unsigned int maxlen,
> +			    unsigned int *len, enum insn_type *type,
> +			    unsigned long *immediate,
> +			    struct list_head *ops_list)
> +{
> +	u32 insn;
> +
> +	*immediate = 0;
> +	insn = bswap_if_needed(file->elf, *(u32 *)(sec->data->d_buf + offset));
> +	*len = 4;
> +	*type = INSN_OTHER;
> +
> +	return 0;
> +}
> +
> +unsigned long arch_jump_destination(struct instruction *insn)
> +{
> +	return insn->offset +  insn->immediate;
> +}
> +
> +void arch_initial_func_cfi_state(struct cfi_init_state *state)
> +{
> +	int i;
> +
> +	for (i = 0; i < CFI_NUM_REGS; i++) {
> +		state->regs[i].base = CFI_UNDEFINED;
> +		state->regs[i].offset = 0;
> +	}
> +
> +	/* initial CFA (call frame address) */
> +	state->cfa.base = CFI_SP;
> +	state->cfa.offset = 0;
> +
> +	/* initial LR (return address) */
> +	state->regs[CFI_RA].base = CFI_CFA;
> +	state->regs[CFI_RA].offset = 0;
> +}
> diff --git a/tools/objtool/arch/powerpc/include/arch/cfi_regs.h b/tools/objtool/arch/powerpc/include/arch/cfi_regs.h
> new file mode 100644
> index 000000000000..59638ebeafc8
> --- /dev/null
> +++ b/tools/objtool/arch/powerpc/include/arch/cfi_regs.h
> @@ -0,0 +1,11 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +
> +#ifndef _OBJTOOL_CFI_REGS_H
> +#define _OBJTOOL_CFI_REGS_H
> +
> +#define CFI_BP 1
> +#define CFI_SP CFI_BP
> +#define CFI_RA 32
> +#define CFI_NUM_REGS 33
> +
> +#endif
> diff --git a/tools/objtool/arch/powerpc/include/arch/elf.h b/tools/objtool/arch/powerpc/include/arch/elf.h
> new file mode 100644
> index 000000000000..3c8ebb7d2a6b
> --- /dev/null
> +++ b/tools/objtool/arch/powerpc/include/arch/elf.h
> @@ -0,0 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +
> +#ifndef _OBJTOOL_ARCH_ELF
> +#define _OBJTOOL_ARCH_ELF
> +
> +#define R_NONE R_PPC_NONE
> +
> +#endif /* _OBJTOOL_ARCH_ELF */
> diff --git a/tools/objtool/arch/powerpc/include/arch/special.h b/tools/objtool/arch/powerpc/include/arch/special.h
> new file mode 100644
> index 000000000000..ffef9ada7133
> --- /dev/null
> +++ b/tools/objtool/arch/powerpc/include/arch/special.h
> @@ -0,0 +1,21 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +#ifndef _PPC_ARCH_SPECIAL_H
> +#define _PPC_ARCH_SPECIAL_H
> +
> +#define EX_ENTRY_SIZE 8
> +#define EX_ORIG_OFFSET 0
> +#define EX_NEW_OFFSET 4
> +
> +#define JUMP_ENTRY_SIZE 16
> +#define JUMP_ORIG_OFFSET 0
> +#define JUMP_NEW_OFFSET 4
> +#define JUMP_KEY_OFFSET 8
> +
> +#define ALT_ENTRY_SIZE 12
> +#define ALT_ORIG_OFFSET 0
> +#define ALT_NEW_OFFSET 4
> +#define ALT_FEATURE_OFFSET 8
> +#define ALT_ORIG_LEN_OFFSET 10
> +#define ALT_NEW_LEN_OFFSET 11
> +
> +#endif /* _PPC_ARCH_SPECIAL_H */
> diff --git a/tools/objtool/arch/powerpc/special.c b/tools/objtool/arch/powerpc/special.c
> new file mode 100644
> index 000000000000..d33868147196
> --- /dev/null
> +++ b/tools/objtool/arch/powerpc/special.c
> @@ -0,0 +1,19 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +#include <string.h>
> +#include <stdlib.h>
> +#include <objtool/special.h>
> +#include <objtool/builtin.h>
> +
> +
> +bool arch_support_alt_relocation(struct special_alt *special_alt,
> +				 struct instruction *insn,
> +				 struct reloc *reloc)
> +{
> +	exit(-1);
> +}
> +
> +struct reloc *arch_find_switch_table(struct objtool_file *file,
> +				    struct instruction *insn)
> +{
> +	exit(-1);
> +}


More information about the Linuxppc-dev mailing list