OSDN Git Service

powerpc/modules: Don't try to restore r2 after a sibling call
authorJosh Poimboeuf <jpoimboe@redhat.com>
Thu, 16 Nov 2017 17:45:37 +0000 (11:45 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Mar 2018 08:17:57 +0000 (09:17 +0100)
commitf6edf95e54cb18ef12e82298e44eebad2fb9aa7d
tree764e55d9b3876819dac502a80b523ca470d0bf25
parent049cff8555d41211c3dfbdcfc46cbb818d32eeae
powerpc/modules: Don't try to restore r2 after a sibling call

[ Upstream commit b9eab08d012fa093947b230f9a87257c27fb829b ]

When attempting to load a livepatch module, I got the following error:

  module_64: patch_module: Expect noop after relocate, got 3c820000

The error was triggered by the following code in
unregister_netdevice_queue():

  14c:   00 00 00 48     b       14c <unregister_netdevice_queue+0x14c>
                         14c: R_PPC64_REL24      net_set_todo
  150:   00 00 82 3c     addis   r4,r2,0

GCC didn't insert a nop after the branch to net_set_todo() because it's
a sibling call, so it never returns.  The nop isn't needed after the
branch in that case.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Reviewed-and-tested-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/include/asm/code-patching.h
arch/powerpc/kernel/module_64.c
arch/powerpc/lib/code-patching.c