macros: tweak syscall patching macros #1279
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Kernel version specific __KPATCH_SYSCALL_DEFINEx macros were added to kpatch-syscall.h for x86, but only single versions for other arches. This works out for s390x, but not ppc64le for which kpatch-build support goes back to kernel versions that require slightly different macros. Reorder the __KPATCH_SYSCALL_DEFINEx macros to define the arch-specific ones first (arch/.../include/asm/syscall_wrapper.h) and then fall back to using generic ones (include/linux/syscalls.h versions). Fixes: dynup#1278 Fixes: 9c0b678621b9 ("macros: add syscall patching macros") Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
|
Internal integration tests passed for most combinations (a few timed out due to unrelated infra issues), so marking this one ready. |
yhcote
approved these changes
Jul 14, 2022
jpoimboe
approved these changes
Jul 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Kernel version specific __KPATCH_SYSCALL_DEFINEx macros were added to
kpatch-syscall.h for x86, but only single versions for other arches.
This works out for s390x, but not ppc64le for which kpatch-build support
goes back to kernel versions that require slightly different macros.
Reorder the __KPATCH_SYSCALL_DEFINEx macros to define the arch-specific
ones first (arch/.../include/asm/syscall_wrapper.h) and then fall back
to using generic ones (include/linux/syscalls.h versions).
Fixes: #1278
Fixes: 9c0b678621b9 ("macros: add syscall patching macros")
Signed-off-by: Joe Lawrence joe.lawrence@redhat.com