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

xtensa: add support for TIF_NOTIFY_SIGNAL 

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



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

[ Upstream commit bec58f40 ]

Wire up TIF_NOTIFY_SIGNAL handling for xtensa.

Thanks to Max Filippov <jcmvbkbc@gmail.com> for making the asm correct.

Cc: linux-xtensa@linux-xtensa.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 0a1c0c0a

arch/xtensa/include/asm/thread_info.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -111,18 +111,21 @@ static inline struct thread_info *current_thread_info(void) 
#define TIF_NEED_RESCHED	2	/* rescheduling necessary */

#define TIF_NEED_RESCHED	2	/* rescheduling necessary */

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

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

#define TIF_SYSCALL_TRACEPOINT	4	/* syscall tracepoint instrumentation */

#define TIF_SYSCALL_TRACEPOINT	4	/* syscall tracepoint instrumentation */

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

#define TIF_NOTIFY_SIGNAL	5	/* signal notifications exist */

#define TIF_RESTORE_SIGMASK	6	/* restore signal mask in do_signal() */

#define TIF_RESTORE_SIGMASK	6	/* restore signal mask in do_signal() */

#define TIF_NOTIFY_RESUME	7	/* callback before returning to user */

#define TIF_NOTIFY_RESUME	7	/* callback before returning to user */

#define TIF_DB_DISABLED		8	/* debug trap disabled for syscall */

#define TIF_DB_DISABLED		8	/* debug trap disabled for syscall */

#define TIF_SYSCALL_AUDIT	9	/* syscall auditing active */

#define TIF_SYSCALL_AUDIT	9	/* syscall auditing active */

#define TIF_SECCOMP		10	/* secure computing */

#define TIF_SECCOMP		10	/* secure computing */

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





#define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)

#define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)

#define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)

#define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)

#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)

#define _TIF_SINGLESTEP		(1<<TIF_SINGLESTEP)

#define _TIF_SINGLESTEP		(1<<TIF_SINGLESTEP)

#define _TIF_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)

#define _TIF_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)

#define _TIF_NOTIFY_SIGNAL	(1<<TIF_NOTIFY_SIGNAL)

#define _TIF_NOTIFY_RESUME	(1<<TIF_NOTIFY_RESUME)

#define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)

#define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)

#define _TIF_SECCOMP		(1<<TIF_SECCOMP)

#define _TIF_SECCOMP		(1<<TIF_SECCOMP)

arch/xtensa/kernel/entry.S

+2 −2
Original line number Original line Diff line number Diff line
@@ -500,8 +500,8 @@ common_exception_return: 
	 */

	 */





	_bbsi.l	a4, TIF_NEED_RESCHED, 3f

	_bbsi.l	a4, TIF_NEED_RESCHED, 3f

	_bbsi.l	a4, TIF_NOTIFY_RESUME, 2f

	movi	a2, _TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NOTIFY_SIGNAL

	_bbci.l	a4, TIF_SIGPENDING, 5f

	bnone	a4, a2, 5f





2:	l32i	a4, a1, PT_DEPC

2:	l32i	a4, a1, PT_DEPC

	bgeui	a4, VALID_DOUBLE_EXCEPTION_ADDRESS, 4f

	bgeui	a4, VALID_DOUBLE_EXCEPTION_ADDRESS, 4f

arch/xtensa/kernel/signal.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -498,7 +498,8 @@ static void do_signal(struct pt_regs *regs) 




void do_notify_resume(struct pt_regs *regs)

void do_notify_resume(struct pt_regs *regs)

{

{

	if (test_thread_flag(TIF_SIGPENDING))

	if (test_thread_flag(TIF_SIGPENDING) ||

	    test_thread_flag(TIF_NOTIFY_SIGNAL))

		do_signal(regs);

		do_signal(regs);





	if (test_thread_flag(TIF_NOTIFY_RESUME))

	if (test_thread_flag(TIF_NOTIFY_RESUME))