Unverified Commit 0c40785a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1578 Backport 5.10.160 - 5.10.162 LTS patches from upstream. 

Merge Pull Request from: @sanglipeng 
 
Backport 5.10.160 - 5.10.162 LTS patches from upstream.

Conflicts:

Already merged(29):
75454b4bbfc7： io_uring: add missing item types for splice request
eb6313c12955： nfp: fix use-after-free in area_cache_get()
f3fe6817156a： Bluetooth: L2CAP: Fix u8 overflow
1500fed00878： kernel: provide create_io_thread() helper
e86db87191d8： iov_iter: add helper to save iov_iter state
c1fe7bd3e1aa： fs: add support for LOOKUP_CACHED
146fe79fff13： fix handling of nd->depth on LOOKUP_CACHED failures in try_to_unlazy*
0cf0ce8fb5b1： Make sure nd->path.mnt and nd->path.dentry are always valid pointers
5683caa7350f： fs: expose LOOKUP_CACHED through openat2() RESOLVE_CACHED
069ac28d9243： net: provide __sys_shutdown_sock() that takes a socket
ad0b0137953a： net: add accept helper not installing fd
52cfde6bbf64： signal: Add task_sigpending() helper
214f80e25176： fs: make do_renameat2() take struct filename
57b20530363d： file: Rename __close_fd_get_file close_fd_get_file
d2136fc145be： fs: provide locked helper variant of close_fd_get_file()
3c295bd2ddae： entry: Add support for TIF_NOTIFY_SIGNAL
4b1dcf8ec9b2： x86: Wire up TIF_NOTIFY_SIGNAL
79a9991e87fe： arm64: add support for TIF_NOTIFY_SIGNAL
abab3d4444b5： powerpc: add support for TIF_NOTIFY_SIGNAL
1bee9dbbcabb： arm: add support for TIF_NOTIFY_SIGNAL
78a53ff02656： riscv: add support for TIF_NOTIFY_SIGNAL
90a2c3821bbf： kernel: remove checking for TIF_NOTIFY_SIGNAL
4b4d2c79921：  Limit what can interrupt coredumps
320c8057eceb： arch: setup PF_IO_WORKER threads like PF_KTHREAD
dd26e2cec74f： arch: ensure parisc/powerpc handle PF_IO_WORKER in copy_thread()
f0a5f0dc0131： x86/process: setup io_threads more like normal user space threads
831cb78a2a5e： kernel: don't call do_exit() for PF_IO_WORKER threads
ed3005032993： task_work: add helper for more targeted task_work canceling
788d0824269b： io_uring: import 5.15-stable io_uring

Kabi change(1):
a3025359ffa7 net: remove cmsg restriction from io_uring based send/recvmsg calls

Total patches: 96 - 29 - 1  = 66 
 
Link:https://gitee.com/openeuler/kernel/pulls/1578

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents b4105458 e77823c7

arch/alpha/include/asm/thread_info.h

+3 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define TIF_SIGPENDING		2	/* signal pending */

#define TIF_NEED_RESCHED	3	/* rescheduling necessary */

#define TIF_SYSCALL_AUDIT	4	/* syscall audit active */

#define TIF_NOTIFY_SIGNAL	5	/* signal notifications exist */

#define TIF_DIE_IF_KERNEL	9	/* dik recursion lock */

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

#define TIF_POLLING_NRFLAG	14	/* idle is polling for TIF_NEED_RESCHED */
@@ -71,11 +72,12 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)

#define _TIF_NOTIFY_RESUME	(1<<TIF_NOTIFY_RESUME)

#define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)

#define _TIF_NOTIFY_SIGNAL	(1<<TIF_NOTIFY_SIGNAL)

#define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)



/* Work to do on interrupt/exception return.  */

#define _TIF_WORK_MASK		(_TIF_SIGPENDING | _TIF_NEED_RESCHED | \

				 _TIF_NOTIFY_RESUME)

				 _TIF_NOTIFY_RESUME | _TIF_NOTIFY_SIGNAL)



/* Work to do on any return to userspace.  */

#define _TIF_ALLWORK_MASK	(_TIF_WORK_MASK		\

arch/alpha/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ $ret_success: 
	.align	4

	.type	work_pending, @function

work_pending:

	and	$17, _TIF_NOTIFY_RESUME | _TIF_SIGPENDING, $2

	and	$17, _TIF_NOTIFY_RESUME | _TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL, $2

	bne	$2, $work_notifysig



$work_resched:

arch/alpha/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ do_work_pending(struct pt_regs *regs, unsigned long thread_flags, 
			schedule();

		} else {

			local_irq_enable();

			if (thread_flags & _TIF_SIGPENDING) {

			if (thread_flags & (_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL)) {

				do_signal(regs, r0, r19);

				r0 = 0;

			} else {

arch/arc/include/asm/thread_info.h

+3 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void) 
#define TIF_SIGPENDING		2	/* signal pending */

#define TIF_NEED_RESCHED	3	/* rescheduling necessary */

#define TIF_SYSCALL_AUDIT	4	/* syscall auditing active */

#define TIF_NOTIFY_SIGNAL	5	/* signal notifications exist */

#define TIF_SYSCALL_TRACE	15	/* syscall trace active */



/* true if poll_idle() is polling TIF_NEED_RESCHED */
@@ -89,11 +90,12 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void) 
#define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)

#define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)

#define _TIF_NOTIFY_SIGNAL	(1<<TIF_NOTIFY_SIGNAL)

#define _TIF_MEMDIE		(1<<TIF_MEMDIE)



/* work to do on interrupt/exception return */

#define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | \

				 _TIF_NOTIFY_RESUME)

				 _TIF_NOTIFY_RESUME | _TIF_NOTIFY_SIGNAL)



/*

 * _TIF_ALLWORK_MASK includes SYSCALL_TRACE, but we don't need it.

arch/arc/kernel/entry.S

+2 −1
Original line number Diff line number Diff line
@@ -308,7 +308,8 @@ resume_user_mode_begin: 
	mov r0, sp	; pt_regs for arg to do_signal()/do_notify_resume()



	GET_CURR_THR_INFO_FLAGS   r9

	bbit0  r9, TIF_SIGPENDING, .Lchk_notify_resume

	and.f  0,  r9, _TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL

	bz .Lchk_notify_resume



	; Normal Trap/IRQ entry only saves Scratch (caller-saved) regs

	; in pt_reg since the "C" ABI (kernel code) will automatically