Commit d6b6a363 authored by Jens Axboe's avatar Jens Axboe Committed by Jialin Zhang
Browse files

riscv: add support for TIF_NOTIFY_SIGNAL 

stable inclusion
from stable-v5.10.162
commit 78a53ff02656da3c1e6a3e11e30ab23cf4bcb0f7
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6BTWC
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.168&id=78a53ff02656da3c1e6a3e11e30ab23cf4bcb0f7



--------------------------------

[ Upstream commit 24a31b81 ]

Wire up TIF_NOTIFY_SIGNAL handling for riscv.

Cc: linux-riscv@lists.infradead.org
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent b9418d58

arch/riscv/include/asm/thread_info.h

+4 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct thread_info { 
#define TIF_SYSCALL_TRACEPOINT  6       /* syscall tracepoint instrumentation */

#define TIF_SYSCALL_AUDIT	7	/* syscall auditing */

#define TIF_SECCOMP		8	/* syscall secure computing */

#define TIF_NOTIFY_SIGNAL	9	/* signal notifications exist */



#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
@@ -88,9 +89,11 @@ struct thread_info { 
#define _TIF_SYSCALL_TRACEPOINT	(1 << TIF_SYSCALL_TRACEPOINT)

#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)

#define _TIF_SECCOMP		(1 << TIF_SECCOMP)

#define _TIF_NOTIFY_SIGNAL	(1 << TIF_NOTIFY_SIGNAL)



#define _TIF_WORK_MASK \

	(_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | _TIF_NEED_RESCHED)

	(_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | _TIF_NEED_RESCHED | \

	 _TIF_NOTIFY_SIGNAL)



#define _TIF_SYSCALL_WORK \

	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_AUDIT | \

arch/riscv/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ asmlinkage __visible void do_notify_resume(struct pt_regs *regs, 
					   unsigned long thread_info_flags)

{

	/* Handle pending signal delivery */

	if (thread_info_flags & _TIF_SIGPENDING)

	if (thread_info_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL))

		do_signal(regs);



	if (thread_info_flags & _TIF_NOTIFY_RESUME)