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

kernel: remove checking for TIF_NOTIFY_SIGNAL 

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



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

[ Upstream commit e296dc49 ]

It's available everywhere now, no need to check or add dummy defines.

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 ad404010

include/linux/entry-common.h

+0 −4
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ 
# define _TIF_UPROBE			(0)

#endif



#ifndef _TIF_NOTIFY_SIGNAL

# define _TIF_NOTIFY_SIGNAL		(0)

#endif



/*

 * TIF flags handled in syscall_enter_from_user_mode()

 */

include/linux/sched/signal.h

+0 −2
Original line number Diff line number Diff line
@@ -367,7 +367,6 @@ static inline int task_sigpending(struct task_struct *p) 


static inline int signal_pending(struct task_struct *p)

{

#if defined(TIF_NOTIFY_SIGNAL)

	/*

	 * TIF_NOTIFY_SIGNAL isn't really a signal, but it requires the same

	 * behavior in terms of ensuring that we break out of wait loops
@@ -375,7 +374,6 @@ static inline int signal_pending(struct task_struct *p) 
	 */

	if (unlikely(test_tsk_thread_flag(p, TIF_NOTIFY_SIGNAL)))

		return 1;

#endif

	return task_sigpending(p);

}

include/linux/tracehook.h

+0 −4
Original line number Diff line number Diff line
@@ -209,12 +209,10 @@ static inline void tracehook_notify_resume(struct pt_regs *regs) 
 */

static inline void tracehook_notify_signal(void)

{

#if defined(TIF_NOTIFY_SIGNAL)

	clear_thread_flag(TIF_NOTIFY_SIGNAL);

	smp_mb__after_atomic();

	if (current->task_works)

		task_work_run();

#endif

}



/*
@@ -222,11 +220,9 @@ static inline void tracehook_notify_signal(void) 
 */

static inline void set_notify_signal(struct task_struct *task)

{

#if defined(TIF_NOTIFY_SIGNAL)

	if (!test_and_set_tsk_thread_flag(task, TIF_NOTIFY_SIGNAL) &&

	    !wake_up_state(task, TASK_INTERRUPTIBLE))

		kick_process(task);

#endif

}



#endif	/* <linux/tracehook.h> */

kernel/signal.c

+0 −2
Original line number Diff line number Diff line
@@ -2531,14 +2531,12 @@ bool get_signal(struct ksignal *ksig) 
	 * that the arch handlers don't all have to do it. If we get here

	 * without TIF_SIGPENDING, just exit after running signal work.

	 */

#ifdef TIF_NOTIFY_SIGNAL

	if (!IS_ENABLED(CONFIG_GENERIC_ENTRY)) {

		if (test_thread_flag(TIF_NOTIFY_SIGNAL))

			tracehook_notify_signal();

		if (!task_sigpending(current))

			return false;

	}

#endif



	if (unlikely(uprobe_deny_signal()))

		return false;