leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/inst: ppc_inst_as_u64() becomes ppc_inst_as_ulong()

Browse Source 
In order to simplify use on PPC32, change ppc_inst_as_u64()
into ppc_inst_as_ulong() that returns the 32 bits instruction
on PPC32.

Will be used when porting OPTPROBES to PPC32.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/22cadf29620664b600b82026d2a72b8b23351777.1618927318.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy
2021-04-20 14:02:06 +00:00
committed by Michael Ellerman
parent e522331173
commit 693557ebf4
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/powerpc/include/asm/inst.h
View File

@@ -147,13 +147,14 @@ static inline struct ppc_inst *ppc_inst_next(void *location, struct ppc_inst *va
return location + ppc_inst_len(tmp); return location + ppc_inst_len(tmp);
} }
static inline u64 ppc_inst_as_u64(struct ppc_inst x) static inline unsigned long ppc_inst_as_ulong(struct ppc_inst x)
{ {
#ifdef CONFIG_CPU_LITTLE_ENDIAN if (IS_ENABLED(CONFIG_PPC32))
return (u64)ppc_inst_suffix(x) << 32 | ppc_inst_val(x); return ppc_inst_val(x);
#else else if (IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN))
return (u64)ppc_inst_val(x) << 32 | ppc_inst_suffix(x); return (u64)ppc_inst_suffix(x) << 32 | ppc_inst_val(x);
#endif else
return (u64)ppc_inst_val(x) << 32 | ppc_inst_suffix(x);
} }
#define PPC_INST_STR_LEN sizeof("00000000 00000000") #define PPC_INST_STR_LEN sizeof("00000000 00000000")

2
arch/powerpc/kernel/optprobes.c
View File

@@ -264,7 +264,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *p)
* 3. load instruction to be emulated into relevant register, and * 3. load instruction to be emulated into relevant register, and
*/ */
temp = ppc_inst_read((struct ppc_inst *)p->ainsn.insn); temp = ppc_inst_read((struct ppc_inst *)p->ainsn.insn);
patch_imm64_load_insns(ppc_inst_as_u64(temp), 4, buff + TMPL_INSN_IDX); patch_imm64_load_insns(ppc_inst_as_ulong(temp), 4, buff + TMPL_INSN_IDX);
/* /*
* 4. branch back from trampoline * 4. branch back from trampoline

2
arch/powerpc/lib/code-patching.c
View File

@@ -26,7 +26,7 @@ static int __patch_instruction(struct ppc_inst *exec_addr, struct ppc_inst instr
__put_kernel_nofault(patch_addr, &val, u32, failed); __put_kernel_nofault(patch_addr, &val, u32, failed);
} else { } else {
u64 val = ppc_inst_as_u64(instr); u64 val = ppc_inst_as_ulong(instr);
__put_kernel_nofault(patch_addr, &val, u64, failed); __put_kernel_nofault(patch_addr, &val, u64, failed);
} }

2
arch/powerpc/xmon/xmon.c
View File

@@ -2953,7 +2953,7 @@ generic_inst_dump(unsigned long adr, long count, int praddr,
if (!ppc_inst_prefixed(inst)) if (!ppc_inst_prefixed(inst))
dump_func(ppc_inst_val(inst), adr); dump_func(ppc_inst_val(inst), adr);
else else
dump_func(ppc_inst_as_u64(inst), adr); dump_func(ppc_inst_as_ulong(inst), adr);
printf("\n"); printf("\n");
} }
return adr - first_adr; return adr - first_adr;