Skip to content

test/integration: add target module reload test case - #1534

Draft
usebeforefree wants to merge 1 commit into
dynup:masterfrom
usebeforefree:target-module-reload-9.8
Draft

usebeforefree wants to merge 1 commit into
dynup:masterfrom
usebeforefree:target-module-reload-9.8

Conversation

@usebeforefree

Copy link
Copy Markdown
Contributor

This is a regression test for an upstream kernel fix commit 37251c7114e1b743b077ca74b93557c1ad92a97e:

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 instructionhad 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

Not sure if this is the best place for this, but let's see if the tests work in the first place.

This is a regression test for an upstream kernel fix commit
37251c7114e1b743b077ca74b93557c1ad92a97e:

	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 instructionhad 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

Signed-off-by: Marko Kostić <mkostic@redhat.com>
@usebeforefree
usebeforefree force-pushed the target-module-reload-9.8 branch from 092c583 to 611c044 Compare November 6, 2026 15:16
@usebeforefree

Copy link
Copy Markdown
Contributor Author

The test should pass on x86_64 but fail on ppc64le

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant