Commit e31b7273 authored by Jens Axboe's avatar Jens Axboe Committed by sanglipeng
Browse files

ia64: add support for TIF_NOTIFY_SIGNAL 

stable inclusion
from stable-v5.10.162
commit 751fedb9ba5d4af62196d9b3014d4e62945c6e3f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7P7OH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=751fedb9ba5d4af62196d9b3014d4e62945c6e3f



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

[ Upstream commit b269c229 ]

Wire up TIF_NOTIFY_SIGNAL handling for ia64.

Cc: linux-ia64@vger.kernel.org
[axboe: added fixes from Mike Rapoport <rppt@kernel.org>]
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 5e0b8fdf

arch/ia64/include/asm/thread_info.h

+3 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ struct thread_info { 
#define TIF_SYSCALL_TRACE	2	/* syscall trace active */

#define TIF_SYSCALL_AUDIT	3	/* syscall auditing active */

#define TIF_SINGLESTEP		4	/* restore singlestep on return to user mode */

#define TIF_NOTIFY_SIGNAL	5	/* signal notification exist */

#define TIF_NOTIFY_RESUME	6	/* resumption notification requested */

#define TIF_MEMDIE		17	/* is terminating due to OOM killer */

#define TIF_MCA_INIT		18	/* this task is processing MCA or INIT */
@@ -115,6 +116,7 @@ struct thread_info { 
#define _TIF_SINGLESTEP		(1 << TIF_SINGLESTEP)

#define _TIF_SYSCALL_TRACEAUDIT	(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP)

#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)

#define _TIF_NOTIFY_SIGNAL	(1 << TIF_NOTIFY_SIGNAL)

#define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)

#define _TIF_MCA_INIT		(1 << TIF_MCA_INIT)
@@ -124,7 +126,7 @@ struct thread_info { 


/* "work to do on user-return" bits */

#define TIF_ALLWORK_MASK	(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SYSCALL_AUDIT|\

				 _TIF_NEED_RESCHED|_TIF_SYSCALL_TRACE)

				 _TIF_NEED_RESCHED|_TIF_SYSCALL_TRACE|_TIF_NOTIFY_SIGNAL)

/* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */

#define TIF_WORK_MASK		(TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT))

arch/ia64/kernel/process.c

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall) 
	}



	/* deal with pending signal delivery */

	if (test_thread_flag(TIF_SIGPENDING)) {

	if (test_thread_flag(TIF_SIGPENDING) ||

	    test_thread_flag(TIF_NOTIFY_SIGNAL)) {

		local_irq_enable();	/* force interrupt enable */

		ia64_do_signal(scr, in_syscall);

	}