s390: add support for TIF_NOTIFY_SIGNAL
Subsystems (2)
PATCH 1/1 s390: add support for TIF_NOTIFY_SIGNAL
Wire up TIF_NOTIFY_SIGNAL handling for s390.
---
5.11 has support queued up for TIF_NOTIFY_SIGNAL, see this posting for details:
https://lore.kernel.org/io-uring/[email protected]/
As part of that work, I'm adding TIF_NOTIFY_SIGNAL support to all archs, as that will enable a set of cleanups once all of them support it. I'm happy carrying this patch if need be, or it can be funelled through the arch tree. Let me know.
arch/s390/include/asm/thread_info.h | 2 ++ arch/s390/kernel/entry.S | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-)
arch/s390/include/asm/thread_info.h +2 -0
@@ -65,6 +65,7 @@ void arch_setup_new_exec(void);#define TIF_GUARDED_STORAGE 4/* load guarded storage control block */ #define TIF_PATCH_PENDING 5/* pending live patching update */ #define TIF_PGSTE 6/* New mm's will use 4K page tables */ +#define TIF_NOTIFY_SIGNAL 7/* signal notifications exist */ #define TIF_ISOLATE_BP 8/* Run process with isolated BP */ #define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */
@@ -82,6 +83,7 @@ void arch_setup_new_exec(void);#define TIF_SYSCALL_TRACEPOINT 27/* syscall tracepoint instrumentation */ #define _TIF_NOTIFY_RESUME BIT(TIF_NOTIFY_RESUME) +#define _TIF_NOTIFY_SIGNAL BIT(TIF_NOTIFY_SIGNAL)#define _TIF_SIGPENDING BIT(TIF_SIGPENDING)#define _TIF_NEED_RESCHED BIT(TIF_NEED_RESCHED)#define _TIF_UPROBE BIT(TIF_UPROBE)
arch/s390/kernel/entry.S +6 -1
@@ -52,7 +52,8 @@ STACK_SIZE = 1 << STACK_SHIFT STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE _TIF_WORK = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ - _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING) + _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING | \ + _TIF_NOTIFY_SIGNAL) _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ _TIF_SYSCALL_TRACEPOINT) _CIF_WORK = (_CIF_ASCE_PRIMARY | _CIF_ASCE_SECONDARY | _CIF_FPU)
@@ -463,6 +464,8 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME
@@ -857,6 +860,8 @@ ENTRY(io_int_handler) #endif TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lio_sigpending + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume TSTMSK __TI_flags(%r12),_TIF_GUARDED_STORAGE
Signature · 4 lines
2.29.0 -- Jens Axboe
Quoted 64 lines · Jens Axboe
Wire up
TIF_NOTIFY_SIGNALhandling for s390.Signed-off-by Jens Axboe <[email protected]>---
5.11 has support queued up for
TIF_NOTIFY_SIGNAL, see this posting for details:https://lore.kernel.org/io-uring/[email protected]/
As part of that work, I'm adding
TIF_NOTIFY_SIGNALsupport to all archs, as that will enable a set of cleanups once all of them support it. I'm happy carrying this patch if need be, or it can be funelled through the arch tree. Let me know.arch/s390/include/asm/thread_info.h | 2 ++ arch/s390/kernel/entry.S | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-)arch/s390/include/asm/thread_info.h +2
-0@@ -65,6 +65,7 @@ void arch_setup_new_exec(void);#define TIF_GUARDED_STORAGE 4/* load guarded storage control block */ #define TIF_PATCH_PENDING 5/* pending live patching update */ #define TIF_PGSTE 6/* New mm's will use 4K page tables */ +#define TIF_NOTIFY_SIGNAL 7/* signal notifications exist */ #define TIF_ISOLATE_BP 8/* Run process with isolated BP */ #define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */ @@ -82,6 +83,7 @@ void arch_setup_new_exec(void);#define TIF_SYSCALL_TRACEPOINT 27/* syscall tracepoint instrumentation */ #define _TIF_NOTIFY_RESUME BIT(TIF_NOTIFY_RESUME) +#define _TIF_NOTIFY_SIGNAL BIT(TIF_NOTIFY_SIGNAL)#define _TIF_SIGPENDING BIT(TIF_SIGPENDING)#define _TIF_NEED_RESCHED BIT(TIF_NEED_RESCHED)#define _TIF_UPROBE BIT(TIF_UPROBE)arch/s390/kernel/entry.S +4
-1@@ -52,7 +52,8 @@ STACK_SIZE = 1 << STACK_SHIFT STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE _TIF_WORK = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ - _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING) + _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING | \ + _TIF_NOTIFY_SIGNAL) _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ _TIF_SYSCALL_TRACEPOINT) _CIF_WORK = (_CIF_ASCE_PRIMARY | _CIF_ASCE_SECONDARY | _CIF_FPU)@@ -463,6 +464,8 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME
arch/s390/kernel/entry.S ENTRY(io_int_handler) · line 867
Quoted 8 lines
arch/s390/kernel/entry.S +2
-0@@ -857,6 +860,8 @@ ENTRY(io_int_handler) #endif TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lio_sigpending + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume TSTMSK __TI_flags(%r12),_TIF_GUARDED_STORAGE
(full quote so you can make sense of the patch below).
Please merge the patch below into this one. With that:
arch/s390/kernel/entry.S +2 -6
@@ -464,9 +464,7 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart - TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL - jo .Lsysc_sigpending - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lsysc_notify_resume
@@ -858,9 +856,7 @@ ENTRY(io_int_handler) TSTMSK __TI_flags(%r12),_TIF_PATCH_PENDING jo .Lio_patch_pending #endif - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING - jo .Lio_sigpending - TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) jo .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume
Quoted 76 lines · Heiko Carstens
Quoted 64 lines · Jens Axboe
Wire up
TIF_NOTIFY_SIGNALhandling for s390.Signed-off-by Jens Axboe <[email protected]>---
5.11 has support queued up for
TIF_NOTIFY_SIGNAL, see this posting for details:https://lore.kernel.org/io-uring/[email protected]/
As part of that work, I'm adding
TIF_NOTIFY_SIGNALsupport to all archs, as that will enable a set of cleanups once all of them support it. I'm happy carrying this patch if need be, or it can be funelled through the arch tree. Let me know.arch/s390/include/asm/thread_info.h | 2 ++ arch/s390/kernel/entry.S | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-)arch/s390/include/asm/thread_info.h +2
-0@@ -65,6 +65,7 @@ void arch_setup_new_exec(void);#define TIF_GUARDED_STORAGE 4/* load guarded storage control block */ #define TIF_PATCH_PENDING 5/* pending live patching update */ #define TIF_PGSTE 6/* New mm's will use 4K page tables */ +#define TIF_NOTIFY_SIGNAL 7/* signal notifications exist */ #define TIF_ISOLATE_BP 8/* Run process with isolated BP */ #define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */ @@ -82,6 +83,7 @@ void arch_setup_new_exec(void);#define TIF_SYSCALL_TRACEPOINT 27/* syscall tracepoint instrumentation */ #define _TIF_NOTIFY_RESUME BIT(TIF_NOTIFY_RESUME) +#define _TIF_NOTIFY_SIGNAL BIT(TIF_NOTIFY_SIGNAL)#define _TIF_SIGPENDING BIT(TIF_SIGPENDING)#define _TIF_NEED_RESCHED BIT(TIF_NEED_RESCHED)#define _TIF_UPROBE BIT(TIF_UPROBE)arch/s390/kernel/entry.S +4
-1@@ -52,7 +52,8 @@ STACK_SIZE = 1 << STACK_SHIFT STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE _TIF_WORK = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ - _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING) + _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING | \ + _TIF_NOTIFY_SIGNAL) _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ _TIF_SYSCALL_TRACEPOINT) _CIF_WORK = (_CIF_ASCE_PRIMARY | _CIF_ASCE_SECONDARY | _CIF_FPU)@@ -463,6 +464,8 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUMEarch/s390/kernel/entry.S ENTRY(io_int_handler) · line 867
Quoted 8 lines
arch/s390/kernel/entry.S +2
-0@@ -857,6 +860,8 @@ ENTRY(io_int_handler) #endif TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lio_sigpending + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume TSTMSK __TI_flags(%r12),_TIF_GUARDED_STORAGE(full quote so you can make sense of the patch below).
Quoted 1 line
Please merge the patch below into this one. With that:
Thanks Heiko, I merged that in, does look better. And I've added your acked-by.
Signature · 1 line
Jens Axboe
Sven Schnelle
reviewerHi Jens,
Quoted 85 lines · Heiko Carstens
Quoted 64 lines · Jens Axboe
Wire up
TIF_NOTIFY_SIGNALhandling for s390.Signed-off-by Jens Axboe <[email protected]>---
5.11 has support queued up for
TIF_NOTIFY_SIGNAL, see this posting for details:https://lore.kernel.org/io-uring/[email protected]/
As part of that work, I'm adding
TIF_NOTIFY_SIGNALsupport to all archs, as that will enable a set of cleanups once all of them support it. I'm happy carrying this patch if need be, or it can be funelled through the arch tree. Let me know.arch/s390/include/asm/thread_info.h | 2 ++ arch/s390/kernel/entry.S | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-)arch/s390/include/asm/thread_info.h +2
-0@@ -65,6 +65,7 @@ void arch_setup_new_exec(void);#define TIF_GUARDED_STORAGE 4/* load guarded storage control block */ #define TIF_PATCH_PENDING 5/* pending live patching update */ #define TIF_PGSTE 6/* New mm's will use 4K page tables */ +#define TIF_NOTIFY_SIGNAL 7/* signal notifications exist */ #define TIF_ISOLATE_BP 8/* Run process with isolated BP */ #define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */ @@ -82,6 +83,7 @@ void arch_setup_new_exec(void);#define TIF_SYSCALL_TRACEPOINT 27/* syscall tracepoint instrumentation */ #define _TIF_NOTIFY_RESUME BIT(TIF_NOTIFY_RESUME) +#define _TIF_NOTIFY_SIGNAL BIT(TIF_NOTIFY_SIGNAL)#define _TIF_SIGPENDING BIT(TIF_SIGPENDING)#define _TIF_NEED_RESCHED BIT(TIF_NEED_RESCHED)#define _TIF_UPROBE BIT(TIF_UPROBE)arch/s390/kernel/entry.S +4
-1@@ -52,7 +52,8 @@ STACK_SIZE = 1 << STACK_SHIFT STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE _TIF_WORK = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ - _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING) + _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING | \ + _TIF_NOTIFY_SIGNAL) _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ _TIF_SYSCALL_TRACEPOINT) _CIF_WORK = (_CIF_ASCE_PRIMARY | _CIF_ASCE_SECONDARY | _CIF_FPU)@@ -463,6 +464,8 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUMEarch/s390/kernel/entry.S ENTRY(io_int_handler) · line 867
Quoted 8 lines
arch/s390/kernel/entry.S +2
-0@@ -857,6 +860,8 @@ ENTRY(io_int_handler) #endif TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lio_sigpending + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume TSTMSK __TI_flags(%r12),_TIF_GUARDED_STORAGE(full quote so you can make sense of the patch below).
Please merge the patch below into this one. With that:
Acked-by Heiko Carstens <[email protected]>arch/s390/kernel/entry.S +0
-0
arch/s390/kernel/entry.S ENTRY(system_call) · line 468
Quoted 8 lines
arch/s390/kernel/entry.S +1
-3@@ -464,9 +464,7 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart - TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL - jo .Lsysc_sigpending - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) jo .Lsysc_sigpending
We need to also change the jo to jnz - in combination with tm, jo means 'jump if all tested bits are set' while jnz means 'jump if at least one bit is set'
arch/s390/kernel/entry.S ENTRY(io_int_handler) · line 859
Quoted 10 lines
arch/s390/kernel/entry.S +1
-3TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lsysc_notify_resume@@ -858,9 +856,7 @@ ENTRY(io_int_handler) TSTMSK __TI_flags(%r12),_TIF_PATCH_PENDING jo .Lio_patch_pending #endif - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING - jo .Lio_sigpending - TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL)
Same here.
arch/s390/kernel/entry.S ENTRY(io_int_handler) · line 862
Quoted 3 lines
arch/s390/kernel/entry.S +0
-0jo .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume
PS: I didn't get the previous emails, so i replied to a raw download from marc.info. Not sure whether Threading will work out.
Jens Axboe
Acked-by Heiko CarstensQuoted 93 lines · Sven Schnelle
Hi Jens,
Quoted 89 lines · Heiko Carstens
Quoted 64 lines · Jens Axboe
Wire up
TIF_NOTIFY_SIGNALhandling for s390.Signed-off-by Jens Axboe <[email protected]>---
5.11 has support queued up for
TIF_NOTIFY_SIGNAL, see this posting for details:https://lore.kernel.org/io-uring/[email protected]/
As part of that work, I'm adding
TIF_NOTIFY_SIGNALsupport to all archs, as that will enable a set of cleanups once all of them support it. I'm happy carrying this patch if need be, or it can be funelled through the arch tree. Let me know.arch/s390/include/asm/thread_info.h | 2 ++ arch/s390/kernel/entry.S | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-)arch/s390/include/asm/thread_info.h +2
-0@@ -65,6 +65,7 @@ void arch_setup_new_exec(void);#define TIF_GUARDED_STORAGE 4/* load guarded storage control block */ #define TIF_PATCH_PENDING 5/* pending live patching update */ #define TIF_PGSTE 6/* New mm's will use 4K page tables */ +#define TIF_NOTIFY_SIGNAL 7/* signal notifications exist */ #define TIF_ISOLATE_BP 8/* Run process with isolated BP */ #define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */ @@ -82,6 +83,7 @@ void arch_setup_new_exec(void);#define TIF_SYSCALL_TRACEPOINT 27/* syscall tracepoint instrumentation */ #define _TIF_NOTIFY_RESUME BIT(TIF_NOTIFY_RESUME) +#define _TIF_NOTIFY_SIGNAL BIT(TIF_NOTIFY_SIGNAL)#define _TIF_SIGPENDING BIT(TIF_SIGPENDING)#define _TIF_NEED_RESCHED BIT(TIF_NEED_RESCHED)#define _TIF_UPROBE BIT(TIF_UPROBE)arch/s390/kernel/entry.S +4
-1@@ -52,7 +52,8 @@ STACK_SIZE = 1 << STACK_SHIFT STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE _TIF_WORK = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ - _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING) + _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING | \ + _TIF_NOTIFY_SIGNAL) _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ _TIF_SYSCALL_TRACEPOINT) _CIF_WORK = (_CIF_ASCE_PRIMARY | _CIF_ASCE_SECONDARY | _CIF_FPU)@@ -463,6 +464,8 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUMEarch/s390/kernel/entry.S ENTRY(io_int_handler) · line 867
Quoted 8 lines
arch/s390/kernel/entry.S +2
-0@@ -857,6 +860,8 @@ ENTRY(io_int_handler) #endif TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lio_sigpending + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume TSTMSK __TI_flags(%r12),_TIF_GUARDED_STORAGE(full quote so you can make sense of the patch below).
Please merge the patch below into this one. With that:
Acked-by Heiko Carstens <[email protected]>arch/s390/kernel/entry.S +0
-1@@ -464,9 +464,7 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart - TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL
Quoted 8 lines
arch/s390/kernel/entry.S ENTRY(system_call) · line 468
Quoted 4 lines
arch/s390/kernel/entry.S +1
-2- jo .Lsysc_sigpending - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) jo .Lsysc_sigpendingWe need to also change the jo to jnz - in combination with tm, jo means 'jump if all tested bits are set' while jnz means 'jump if at least one bit is set'
Ah thanks, good catch. And you also caught the braino in signal.c, here's the end result:
commit 0eb7d372d5319970bd15f2dbc18264ea576214d4
Author: Jens Axboe <[email protected]> Date: Fri Oct 9 15:34:12 2020 -0600
s390: add support for TIF_NOTIFY_SIGNAL
Wire up TIF_NOTIFY_SIGNAL handling for s390.
arch/s390/include/asm/thread_info.h +2 -0
@@ -65,6 +65,7 @@ void arch_setup_new_exec(void);#define TIF_GUARDED_STORAGE 4/* load guarded storage control block */ #define TIF_PATCH_PENDING 5/* pending live patching update */ #define TIF_PGSTE 6/* New mm's will use 4K page tables */ +#define TIF_NOTIFY_SIGNAL 7/* signal notifications exist */ #define TIF_ISOLATE_BP 8/* Run process with isolated BP */ #define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */
@@ -82,6 +83,7 @@ void arch_setup_new_exec(void);#define TIF_SYSCALL_TRACEPOINT 27/* syscall tracepoint instrumentation */ #define _TIF_NOTIFY_RESUME BIT(TIF_NOTIFY_RESUME) +#define _TIF_NOTIFY_SIGNAL BIT(TIF_NOTIFY_SIGNAL)#define _TIF_SIGPENDING BIT(TIF_SIGPENDING)#define _TIF_NEED_RESCHED BIT(TIF_NEED_RESCHED)#define _TIF_UPROBE BIT(TIF_UPROBE)
arch/s390/kernel/entry.S +6 -5
@@ -52,7 +52,8 @@ STACK_SIZE = 1 << STACK_SHIFT STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE _TIF_WORK = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ - _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING) + _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING | \ + _TIF_NOTIFY_SIGNAL) _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ _TIF_SYSCALL_TRACEPOINT) _CIF_WORK = (_CIF_ASCE_PRIMARY | _CIF_ASCE_SECONDARY | _CIF_FPU)
@@ -463,8 +464,8 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING - jo .Lsysc_sigpending + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) + jnz .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lsysc_notify_resume TSTMSK __LC_CPU_FLAGS,(_CIF_ASCE_PRIMARY|_CIF_ASCE_SECONDARY)
@@ -855,8 +856,8 @@ ENTRY(io_int_handler) TSTMSK __TI_flags(%r12),_TIF_PATCH_PENDING jo .Lio_patch_pending #endif - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING - jo .Lio_sigpending + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) + jnz .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume TSTMSK __TI_flags(%r12),_TIF_GUARDED_STORAGE
arch/s390/kernel/signal.c +1 -1
@@ -472,7 +472,7 @@ void do_signal(struct pt_regs *regs) current->thread.system_call =test_pt_regs_flag (regs,PIF_SYSCALL ) ? regs->int_code :0 ; -if (get_signal (&ksig)) { +if (test_thread_flag (TIF_SIGPENDING ) &&get_signal (&ksig)) {/* Whee! Actually deliver the signal. */ if (current->thread.system_call) { regs->int_code = current->thread.system_call;
Signature · 1 line
Jens Axboe
Sven Schnelle
reviewerHi Jens,
Quoted 180 lines · Jens Axboe
Quoted 93 lines · Sven Schnelle
Hi Jens,
Quoted 89 lines · Heiko Carstens
Quoted 64 lines · Jens Axboe
Wire up
TIF_NOTIFY_SIGNALhandling for s390.Signed-off-by Jens Axboe <[email protected]>---
5.11 has support queued up for
TIF_NOTIFY_SIGNAL, see this posting for details:https://lore.kernel.org/io-uring/[email protected]/
As part of that work, I'm adding
TIF_NOTIFY_SIGNALsupport to all archs, as that will enable a set of cleanups once all of them support it. I'm happy carrying this patch if need be, or it can be funelled through the arch tree. Let me know.arch/s390/include/asm/thread_info.h | 2 ++ arch/s390/kernel/entry.S | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-)arch/s390/include/asm/thread_info.h +2
-0@@ -65,6 +65,7 @@ void arch_setup_new_exec(void);#define TIF_GUARDED_STORAGE 4/* load guarded storage control block */ #define TIF_PATCH_PENDING 5/* pending live patching update */ #define TIF_PGSTE 6/* New mm's will use 4K page tables */ +#define TIF_NOTIFY_SIGNAL 7/* signal notifications exist */ #define TIF_ISOLATE_BP 8/* Run process with isolated BP */ #define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */ @@ -82,6 +83,7 @@ void arch_setup_new_exec(void);#define TIF_SYSCALL_TRACEPOINT 27/* syscall tracepoint instrumentation */ #define _TIF_NOTIFY_RESUME BIT(TIF_NOTIFY_RESUME) +#define _TIF_NOTIFY_SIGNAL BIT(TIF_NOTIFY_SIGNAL)#define _TIF_SIGPENDING BIT(TIF_SIGPENDING)#define _TIF_NEED_RESCHED BIT(TIF_NEED_RESCHED)#define _TIF_UPROBE BIT(TIF_UPROBE)arch/s390/kernel/entry.S +4
-1@@ -52,7 +52,8 @@ STACK_SIZE = 1 << STACK_SHIFT STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE _TIF_WORK = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ - _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING) + _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING | \ + _TIF_NOTIFY_SIGNAL) _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ _TIF_SYSCALL_TRACEPOINT) _CIF_WORK = (_CIF_ASCE_PRIMARY | _CIF_ASCE_SECONDARY | _CIF_FPU)@@ -463,6 +464,8 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUMEarch/s390/kernel/entry.S ENTRY(io_int_handler) · line 867
Quoted 8 lines
arch/s390/kernel/entry.S +2
-0@@ -857,6 +860,8 @@ ENTRY(io_int_handler) #endif TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lio_sigpending + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume TSTMSK __TI_flags(%r12),_TIF_GUARDED_STORAGE(full quote so you can make sense of the patch below).
Please merge the patch below into this one. With that:
Acked-by Heiko Carstens <[email protected]>arch/s390/kernel/entry.S +0
-1@@ -464,9 +464,7 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart - TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNALQuoted 8 lines
arch/s390/kernel/entry.S ENTRY(system_call)
Quoted 4 lines
arch/s390/kernel/entry.S +1
-2- jo .Lsysc_sigpending - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) jo .Lsysc_sigpendingWe need to also change the jo to jnz - in combination with tm, jo means 'jump if all tested bits are set' while jnz means 'jump if at least one bit is set'
Ah thanks, good catch. And you also caught the braino in
signal.c, here's the end result:commit
0eb7d372d5319970bd15f2dbc18264ea576214d4Author: Jens Axboe <[email protected]> Date: Fri Oct 9 15:34:12 2020 -0600s390: add support for
TIF_NOTIFY_SIGNALWire up
TIF_NOTIFY_SIGNALhandling for s390.Acked-by Heiko Carstens <[email protected]>Signed-off-by Jens Axboe <[email protected]>arch/s390/include/asm/thread_info.h +2
-0@@ -65,6 +65,7 @@ void arch_setup_new_exec(void);#define TIF_GUARDED_STORAGE 4/* load guarded storage control block */ #define TIF_PATCH_PENDING 5/* pending live patching update */ #define TIF_PGSTE 6/* New mm's will use 4K page tables */ +#define TIF_NOTIFY_SIGNAL 7/* signal notifications exist */ #define TIF_ISOLATE_BP 8/* Run process with isolated BP */ #define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */ @@ -82,6 +83,7 @@ void arch_setup_new_exec(void);#define TIF_SYSCALL_TRACEPOINT 27/* syscall tracepoint instrumentation */ #define _TIF_NOTIFY_RESUME BIT(TIF_NOTIFY_RESUME) +#define _TIF_NOTIFY_SIGNAL BIT(TIF_NOTIFY_SIGNAL)#define _TIF_SIGPENDING BIT(TIF_SIGPENDING)#define _TIF_NEED_RESCHED BIT(TIF_NEED_RESCHED)#define _TIF_UPROBE BIT(TIF_UPROBE)arch/s390/kernel/entry.S +6
-5@@ -52,7 +52,8 @@ STACK_SIZE = 1 << STACK_SHIFT STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE _TIF_WORK = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ - _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING) + _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING | \ + _TIF_NOTIFY_SIGNAL) _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ _TIF_SYSCALL_TRACEPOINT) _CIF_WORK = (_CIF_ASCE_PRIMARY | _CIF_ASCE_SECONDARY | _CIF_FPU)@@ -463,8 +464,8 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING - jo .Lsysc_sigpending + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) + jnz .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lsysc_notify_resume TSTMSK __LC_CPU_FLAGS,(_CIF_ASCE_PRIMARY|_CIF_ASCE_SECONDARY)@@ -855,8 +856,8 @@ ENTRY(io_int_handler) TSTMSK __TI_flags(%r12),_TIF_PATCH_PENDING jo .Lio_patch_pending #endif - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING - jo .Lio_sigpending + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) + jnz .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume TSTMSK __TI_flags(%r12),_TIF_GUARDED_STORAGEarch/s390/kernel/signal.c +0
-0
arch/s390/kernel/signal.c void do_signal(struct pt_regs *regs) · line 478
Quoted 8 lines
arch/s390/kernel/signal.c +1
-1@@ -472,7 +472,7 @@ void do_signal(struct pt_regs *regs) current->thread.system_call =test_pt_regs_flag (regs,PIF_SYSCALL ) ? regs->int_code :0 ; -if (get_signal (&ksig)) { +if (test_thread_flag (TIF_SIGPENDING ) &&get_signal (&ksig)) {/* Whee! Actually deliver the signal. */ if (current->thread.system_call) { regs->int_code = current->thread.system_call;
Looks good, feel free to add my Acked-by.
Thanks
Sven
Quoted 187 lines · Sven Schnelle
Hi Jens,
Quoted 183 lines · Jens Axboe
Quoted 93 lines · Sven Schnelle
Hi Jens,
Quoted 89 lines · Heiko Carstens
Quoted 64 lines · Jens Axboe
Wire up
TIF_NOTIFY_SIGNALhandling for s390.Signed-off-by Jens Axboe <[email protected]>---
5.11 has support queued up for
TIF_NOTIFY_SIGNAL, see this posting for details:https://lore.kernel.org/io-uring/[email protected]/
As part of that work, I'm adding
TIF_NOTIFY_SIGNALsupport to all archs, as that will enable a set of cleanups once all of them support it. I'm happy carrying this patch if need be, or it can be funelled through the arch tree. Let me know.arch/s390/include/asm/thread_info.h | 2 ++ arch/s390/kernel/entry.S | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-)arch/s390/include/asm/thread_info.h +2
-0@@ -65,6 +65,7 @@ void arch_setup_new_exec(void);#define TIF_GUARDED_STORAGE 4/* load guarded storage control block */ #define TIF_PATCH_PENDING 5/* pending live patching update */ #define TIF_PGSTE 6/* New mm's will use 4K page tables */ +#define TIF_NOTIFY_SIGNAL 7/* signal notifications exist */ #define TIF_ISOLATE_BP 8/* Run process with isolated BP */ #define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */ @@ -82,6 +83,7 @@ void arch_setup_new_exec(void);#define TIF_SYSCALL_TRACEPOINT 27/* syscall tracepoint instrumentation */ #define _TIF_NOTIFY_RESUME BIT(TIF_NOTIFY_RESUME) +#define _TIF_NOTIFY_SIGNAL BIT(TIF_NOTIFY_SIGNAL)#define _TIF_SIGPENDING BIT(TIF_SIGPENDING)#define _TIF_NEED_RESCHED BIT(TIF_NEED_RESCHED)#define _TIF_UPROBE BIT(TIF_UPROBE)arch/s390/kernel/entry.S +4
-1@@ -52,7 +52,8 @@ STACK_SIZE = 1 << STACK_SHIFT STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE _TIF_WORK = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ - _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING) + _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING | \ + _TIF_NOTIFY_SIGNAL) _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ _TIF_SYSCALL_TRACEPOINT) _CIF_WORK = (_CIF_ASCE_PRIMARY | _CIF_ASCE_SECONDARY | _CIF_FPU)@@ -463,6 +464,8 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUMEarch/s390/kernel/entry.S ENTRY(io_int_handler) · line 867
Quoted 8 lines
arch/s390/kernel/entry.S +2
-0@@ -857,6 +860,8 @@ ENTRY(io_int_handler) #endif TSTMSK __TI_flags(%r12),_TIF_SIGPENDING jo .Lio_sigpending + TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNAL + jo .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume TSTMSK __TI_flags(%r12),_TIF_GUARDED_STORAGE(full quote so you can make sense of the patch below).
Please merge the patch below into this one. With that:
Acked-by Heiko Carstens <[email protected]>arch/s390/kernel/entry.S +0
-1@@ -464,9 +464,7 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart - TSTMSK __TI_flags(%r12),_TIF_NOTIFY_SIGNALQuoted 8 lines
arch/s390/kernel/entry.S ENTRY(system_call)
Quoted 4 lines
arch/s390/kernel/entry.S +1
-2- jo .Lsysc_sigpending - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) jo .Lsysc_sigpendingWe need to also change the jo to jnz - in combination with tm, jo means 'jump if all tested bits are set' while jnz means 'jump if at least one bit is set'
Ah thanks, good catch. And you also caught the braino in
signal.c, here's the end result:commit
0eb7d372d5319970bd15f2dbc18264ea576214d4Author: Jens Axboe <[email protected]> Date: Fri Oct 9 15:34:12 2020 -0600s390: add support for
TIF_NOTIFY_SIGNALWire up
TIF_NOTIFY_SIGNALhandling for s390.Acked-by Heiko Carstens <[email protected]>Signed-off-by Jens Axboe <[email protected]>arch/s390/include/asm/thread_info.h +2
-0@@ -65,6 +65,7 @@ void arch_setup_new_exec(void);#define TIF_GUARDED_STORAGE 4/* load guarded storage control block */ #define TIF_PATCH_PENDING 5/* pending live patching update */ #define TIF_PGSTE 6/* New mm's will use 4K page tables */ +#define TIF_NOTIFY_SIGNAL 7/* signal notifications exist */ #define TIF_ISOLATE_BP 8/* Run process with isolated BP */ #define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */ @@ -82,6 +83,7 @@ void arch_setup_new_exec(void);#define TIF_SYSCALL_TRACEPOINT 27/* syscall tracepoint instrumentation */ #define _TIF_NOTIFY_RESUME BIT(TIF_NOTIFY_RESUME) +#define _TIF_NOTIFY_SIGNAL BIT(TIF_NOTIFY_SIGNAL)#define _TIF_SIGPENDING BIT(TIF_SIGPENDING)#define _TIF_NEED_RESCHED BIT(TIF_NEED_RESCHED)#define _TIF_UPROBE BIT(TIF_UPROBE)arch/s390/kernel/entry.S +6
-5@@ -52,7 +52,8 @@ STACK_SIZE = 1 << STACK_SHIFT STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE _TIF_WORK = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ - _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING) + _TIF_UPROBE | _TIF_GUARDED_STORAGE | _TIF_PATCH_PENDING | \ + _TIF_NOTIFY_SIGNAL) _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ _TIF_SYSCALL_TRACEPOINT) _CIF_WORK = (_CIF_ASCE_PRIMARY | _CIF_ASCE_SECONDARY | _CIF_FPU)@@ -463,8 +464,8 @@ ENTRY(system_call) #endif TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART jo .Lsysc_syscall_restart - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING - jo .Lsysc_sigpending + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) + jnz .Lsysc_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lsysc_notify_resume TSTMSK __LC_CPU_FLAGS,(_CIF_ASCE_PRIMARY|_CIF_ASCE_SECONDARY)@@ -855,8 +856,8 @@ ENTRY(io_int_handler) TSTMSK __TI_flags(%r12),_TIF_PATCH_PENDING jo .Lio_patch_pending #endif - TSTMSK __TI_flags(%r12),_TIF_SIGPENDING - jo .Lio_sigpending + TSTMSK __TI_flags(%r12),(_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL) + jnz .Lio_sigpending TSTMSK __TI_flags(%r12),_TIF_NOTIFY_RESUME jo .Lio_notify_resume TSTMSK __TI_flags(%r12),_TIF_GUARDED_STORAGEarch/s390/kernel/signal.c +0
-0@@ -472,7 +472,7 @@ void do_signal(struct pt_regs *regs) current->thread.system_call =test_pt_regs_flag (regs,PIF_SYSCALL ) ? regs->int_code :0 ;
Quoted 7 lines
arch/s390/kernel/signal.c void do_signal(struct pt_regs *regs) · line 478
Quoted 5 lines
arch/s390/kernel/signal.c +1
-1-if (get_signal (&ksig)) { +if (test_thread_flag (TIF_SIGPENDING ) &&get_signal (&ksig)) {/* Whee! Actually deliver the signal. */ if (current->thread.system_call) { regs->int_code = current->thread.system_call;Looks good, feel free to add my Acked-by.
Thanks for your help! Added.
Signature · 1 line
Jens Axboe