s390x: fix building with latest Linux kernel #2232
Closed
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
Building on the latest Linux kernel (6.5-rc1) fails with:
In file included from compel/include/uapi/compel/asm/infect-types.h:7,
from compel/arch/s390/src/lib/infect.c:12:
compel/arch/s390/src/lib/infect.c: In function 'rewind_psw':
compel/arch/s390/src/lib/infect.c:157:29: error: 'UL' undeclared (first use in this function)
157 | mask = (psw->mask & PSW_MASK_EA) ? -1UL : (psw->mask & PSW_MASK_BA) ? (1UL << 31) - 1 : (1UL << 24) - 1;
| ^~~~~~~~~~~
compel/arch/s390/src/lib/infect.c:157:29: note: each undeclared identifier is reported only once for each function it appears in
compel/arch/s390/src/lib/infect.c: In function 'get_ri_cb':
compel/arch/s390/src/lib/infect.c:272:25: error: 'UL' undeclared (first use in this function)
272 | if (psw->mask & PSW_MASK_RI)
| ^~~~~~~~~~~
compel/arch/s390/src/lib/infect.c: In function 's390_disable_ri_bit':
compel/arch/s390/src/lib/infect.c:289:23: error: 'UL' undeclared (first use in this function)
289 | psw->mask &= ~PSW_MASK_RI;
| ^~~~~~~~~~~
compel/arch/s390/src/lib/infect.c: In function 'arch_can_dump_task':
compel/arch/s390/src/lib/infect.c:523:25: error: 'UL' undeclared (first use in this function)
523 | if (psw->mask & PSW_MASK_RI) {
|
This is caused by:
torvalds/linux@b8af599
This is fixed with this patch.
Signed-off-by: Adrian Reber <[email protected]>
yselkowitz
suggested changes
Jul 31, 2023
| @@ -9,6 +9,7 @@ | |||
| #include <errno.h> | |||
| #include <elf.h> | |||
| #include <compel/plugins/std/syscall-codes.h> | |||
| #include <linux/const.h> | |||
There was a problem hiding this comment.
Shouldn't this be in compel/arch/s390/src/lib/include/uapi/asm/infect-types.h which contains the #include <asm/ptrace.h>?
| @@ -4,6 +4,7 @@ | |||
| #include <sys/user.h> | |||
| #include <asm/unistd.h> | |||
| #include <sys/uio.h> | |||
| #include <linux/const.h> | |||
There was a problem hiding this comment.
Wouldn't criu/arch/s390/include/asm/restorer.h which contains the #include <asm/ptrace.h> be a better place for this?
|
I also reached out to the original authors of that kernel change. |
|
It seems the kernel fix will make it into rc5. No need to fix it in CRIU then I think. |
akiyks
pushed a commit
to akiyks/linux
that referenced
this pull request
Aug 2, 2023
Adrian Reber reported the following CRIU build bug after commit b8af599 ("s390/ptrace: make all psw related defines also available for asm"): compel/arch/s390/src/lib/infect.c: In function 'arch_can_dump_task': compel/arch/s390/src/lib/infect.c:523:25: error: 'UL' undeclared (first use in this function) 523 | if (psw->mask & PSW_MASK_RI) { | ^~~~~~~~~~~ Add the missing linux/const.h include to fix this. Reported-by: Adrian Reber <[email protected]> Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2225745 Link: checkpoint-restore/criu#2232 Tested-by: Adrian Reber <[email protected]> Fixes: b8af599 ("s390/ptrace: make all psw related defines also available for asm") Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Carstens <[email protected]>
LegoLivesMatter
pushed a commit
to LegoLivesMatter/linux
that referenced
this pull request
Aug 5, 2023
Adrian Reber reported the following CRIU build bug after commit b8af599 ("s390/ptrace: make all psw related defines also available for asm"): compel/arch/s390/src/lib/infect.c: In function 'arch_can_dump_task': compel/arch/s390/src/lib/infect.c:523:25: error: 'UL' undeclared (first use in this function) 523 | if (psw->mask & PSW_MASK_RI) { | ^~~~~~~~~~~ Add the missing linux/const.h include to fix this. Reported-by: Adrian Reber <[email protected]> Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2225745 Link: checkpoint-restore/criu#2232 Tested-by: Adrian Reber <[email protected]> Fixes: b8af599 ("s390/ptrace: make all psw related defines also available for asm") Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Carstens <[email protected]>
|
If the fix has landed in a 6.5 RC then I think this can be closed. |
|
A friendly reminder that this PR had no activity for 30 days. |
|
Closed as it was fixed in the kernel. |
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.
Building on the latest Linux kernel (6.5-rc1) fails with:
This is caused by:
torvalds/linux@b8af599
This is fixed with this patch.