powerpc: make kernel module helper endian-safe.
PATCH 1/2 powerpc: make kernel module helper endian-safe.
Signed-off-by Eugene Surovegin <[email protected]>
--- arch/powerpc/kernel/module_64.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/powerpc/kernel/module_64.c +16 -0
@@ -62,6 +62,16 @@ struct ppc64_stub_entryr2) into the stub. */ static struct ppc64_stub_entry ppc64_stub = { .jump = { +#ifdef __LITTLE_ENDIAN__ +0x00 ,0x00 ,0x82 ,0x3d ,/* addis r12,r2, <high> */ +0x00 ,0x00 ,0x8c ,0x39 ,/* addi r12,r12, <low> */ +/* Save current r2 value in magic place on the stack. */ +0x28 ,0x00 ,0x41 ,0xf8 ,/* std r2,40(r1) */ +0x20 ,0x00 ,0x6c ,0xe9 ,/* ld r11,32(r12) */ +0x28 ,0x00 ,0x4c ,0xe8 ,/* ld r2,40(r12) */ +0xa6 ,0x03 ,0x69 ,0x7d ,/* mtctr r11 */ +0x20 ,0x04 ,0x80 ,0x4e /* bctr */ +#else 0x3d, 0x82, 0x00, 0x00, /* addis r12,r2, <high> */0x39 ,0x8c ,0x00 ,0x00 ,/* addi r12,r12, <low> */ /* Save current r2 value in magic place on the stack. */
@@ -70,6 +80,7 @@ static struct ppc64_stub_entry ppc64_stub =0xe8 ,0x4c ,0x00 ,0x28 ,/* ld r2,40(r12) */ 0x7d ,0x69 ,0x03 ,0xa6 ,/* mtctr r11 */ 0x4e ,0x80 ,0x04 ,0x20 /* bctr */ +#endif } };/* Count how many different 24-bit relocations (different symbol,
@@ -269,8 +280,13 @@ static inline int create_stub(Elf64_Shdr *sechdrs, *entry = ppc64_stub; +#ifdef __LITTLE_ENDIAN__ + loc1 = (Elf64_Half *)&entry->jump[0 ]; + loc2 = (Elf64_Half *)&entry->jump[4 ]; +#else loc1 = (Elf64_Half *)&entry->jump[2 ]; loc2 = (Elf64_Half *)&entry->jump[6 ]; +#endif /* Stub uses address relative to r2. */ reladdr = (unsigned long )entry -my_r2 (sechdrs, me);
Signature · 1 line
1.8.1.5
PATCH 2/2 powerpc: make ftrace endian-safe.
Signed-off-by Eugene Surovegin <[email protected]>
--- arch/powerpc/kernel/ftrace.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/ftrace.c +4 -0
@@ -174,7 +174,11 @@ __ftrace_make_nop(struct module *mod,pr_devel (" %08x %08x\n" , jmp[0 ], jmp[1 ]); +#ifdef __LITTLE_ENDIAN__ + ptr = ((unsigned long )jmp[1 ] <<32 ) + jmp[0 ]; +#else ptr = ((unsigned long )jmp[0 ] <<32 ) + jmp[1 ]; +#endif /* This should match what was called */ if (ptr !=ppc_function_entry ((void *)addr)) {
Signature · 1 line
1.8.1.5
RE: [PATCH 2/2] powerpc: make ftrace endian-safe.
Quoted 11 lines
arch/powerpc/kernel/ftrace.c +0
-0@@ -174,7 +174,11 @@ __ftrace_make_nop(struct module *mod,=20
pr_devel(" %08x %08x\n", jmp[0], jmp[1]);
=20arch/powerpc/kernel/ftrace.c +4
-0+#ifdef __LITTLE_ENDIAN__ + ptr =3D ((unsigned long )jmp[1 ] <<32 ) + jmp[0 ]; +#else ptr =3D ((unsigned long )jmp[0 ] <<32 ) + jmp[1 ]; +#endif
Quoted 1 line
=20
Why not just:
ptr =3D *(__u64 *)jmp;
Or, if alignment isn't guaranteed, something that is equivalent to:
ptr =3D *(__u64 __attribute__((aligned(4))) *)jmp; David
Quoted 20 lines
arch/powerpc/kernel/module_64.c +10
-0@@ -62,6 +62,16 @@ struct ppc64_stub_entryr2) into the stub. */ static struct ppc64_stub_entry ppc64_stub =3D { .jump =3D { +#ifdef __LITTLE_ENDIAN__ +0x00 ,0x00 ,0x82 ,0x3d ,/* addis r12,r2, <high> */ +0x00 ,0x00 ,0x8c ,0x39 ,/* addi r12,r12, <low> */ +/* Save current r2 value in magic place on the stack. */ +0x28 ,0x00 ,0x41 ,0xf8 ,/* std r2,40(r1) */ +0x20 ,0x00 ,0x6c ,0xe9 ,/* ld r11,32(r12) */ +0x28 ,0x00 ,0x4c ,0xe8 ,/* ld r2,40(r12) */ +0xa6 ,0x03 ,0x69 ,0x7d ,/* mtctr r11 */ +0x20 ,0x04 ,0x80 ,0x4e /* bctr */ +#else 0x3d, 0x82, 0x00, 0x00, /* addis r12,r2, <high> */0x39 ,0x8c ,0x00 ,0x00 ,/* addi r12,r12, <low> */ /* Save current r2 value in magic place on the stack. */
arch/powerpc/kernel/module_64.c static struct ppc64_stub_entry ppc64_stub =3D · line 83
Quoted 4 lines
arch/powerpc/kernel/module_64.c +1
-0@@ -70,6 +80,7 @@ static struct ppc64_stub_entry ppc64_stub =3D0xe8 ,0x4c ,0x00 ,0x28 ,/* ld r2,40(r12) */ 0x7d ,0x69 ,0x03 ,0xa6 ,/* mtctr r11 */ 0x4e ,0x80 ,0x04 ,0x20 /* bctr */ +#endif
Seems to me that should be a list of 32bit constants.
David