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

arm64: add support for TIF_NOTIFY_SIGNAL 

stable inclusion
from stable-v5.10.162
commit 79a9991e87fe61ff2a8b5ac8c112b3ce3544cb53
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=79a9991e87fe61ff2a8b5ac8c112b3ce3544cb53



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

Wire up TIF_NOTIFY_SIGNAL handling for arm64.

Cc: linux-arm-kernel@lists.infradead.org
Acked-by: default avatarWill Deacon <will@kernel.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>

Conflicts:
	arch/arm64/include/asm/thread_info.h

Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: default avatartanghui <tanghui20@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent d6b6a363

arch/arm64/include/asm/thread_info.h

+4 −1
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ void arch_release_task_struct(struct task_struct *tsk); 
#define TIF_FOREIGN_FPSTATE	3	/* CPU's FP state is not current's */

#define TIF_UPROBE		4	/* uprobe breakpoint or singlestep */

#define TIF_MTE_ASYNC_FAULT	5	/* MTE Asynchronous Tag Check Fault */

#define TIF_NOTIFY_SIGNAL	6	/* signal notifications exist */

#define TIF_SYSCALL_TRACE	8	/* syscall trace active */

#define TIF_SYSCALL_AUDIT	9	/* syscall auditing */

#define TIF_SYSCALL_TRACEPOINT	10	/* syscall tracepoint for ftrace */
@@ -101,13 +102,15 @@ void arch_release_task_struct(struct task_struct *tsk); 
#define _TIF_32BIT		(1 << TIF_32BIT)

#define _TIF_SVE		(1 << TIF_SVE)

#define _TIF_MTE_ASYNC_FAULT	(1 << TIF_MTE_ASYNC_FAULT)

#define _TIF_NOTIFY_SIGNAL	(1 << TIF_NOTIFY_SIGNAL)

#define _TIF_32BIT_AARCH64	(1 << TIF_32BIT_AARCH64)

#define _TIF_PATCH_PENDING	(1 << TIF_PATCH_PENDING)

#define _TIF_POLLING_NRFLAG	(1 << TIF_POLLING_NRFLAG)



#define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | \

				 _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \

				 _TIF_UPROBE | _TIF_MTE_ASYNC_FAULT)

				 _TIF_UPROBE | _TIF_MTE_ASYNC_FAULT | \

				 _TIF_NOTIFY_SIGNAL)



#define _TIF_SYSCALL_WORK	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \

				 _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \

arch/arm64/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, 
					       (void __user *)NULL, current);

			}



			if (thread_flags & _TIF_SIGPENDING)

			if (thread_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL))

				do_signal(regs);



			if (thread_flags & _TIF_NOTIFY_RESUME) {