powerpc/module_64: Fix "expected nop" error on module re-patching
authorJosh Poimboeuf <jpoimboe@kernel.org>
Wed, 25 Jan 2023 03:38:05 +0000 (19:38 -0800)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 26 Jan 2023 10:08:04 +0000 (21:08 +1100)
commit37251c7114e1b743b077ca74b93557c1ad92a97e
tree3dec562d7cc985bc6263301af47dc00619675c0e
parentbc2c6f5695ffa05c838b8b6fc5cd581a672151a1
powerpc/module_64: Fix "expected nop" error on module re-patching

When a module with a livepatched function is unloaded and then reloaded,
klp attempts to dynamically re-patch it.  On ppc64, that fails with the
following error:

  module_64: livepatch_nfsd: Expected nop after call, got e8410018 at e_show+0x60/0x548 [livepatch_nfsd]
  livepatch: failed to initialize patch 'livepatch_nfsd' for module 'nfsd' (-8)
  livepatch: patch 'livepatch_nfsd' failed for module 'nfsd', refusing to load module 'nfsd'

The error happens because the restore r2 instruction had already
previously been written into the klp module's replacement function when
the original function was patched the first time.  So the instruction
wasn't a nop as expected.

When the restore r2 instruction has already been patched in, detect that
and skip the warning and the instruction write.

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Acked-by: Song Liu <song@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/2f6329ffd9674df6ff57e03edeb2ca54414770ab.1674617130.git.jpoimboe@kernel.org
arch/powerpc/kernel/module_64.c