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

kernel: stop masking signals in create_io_thread() 

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



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

[ Upstream commit b16b3855 ]

This is racy - move the blocking into when the task is created and
we're marking it as PF_IO_WORKER anyway. The IO threads are now
prepared to handle signals like SIGSTOP as well, so clear that from
the mask to allow proper stopping of IO threads.

Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Reported-by: default avatarOleg Nesterov <oleg@redhat.com>
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 2fc3f488

kernel/fork.c

+8 −8
Original line number Diff line number Diff line
@@ -2035,8 +2035,14 @@ static __latent_entropy struct task_struct *copy_process( 
	p = dup_task_struct(current, node);

	if (!p)

		goto fork_out;

	if (args->io_thread)

	if (args->io_thread) {

		/*

		 * Mark us an IO worker, and block any signal that isn't

		 * fatal or STOP

		 */

		p->flags |= PF_IO_WORKER;

		siginitsetinv(&p->blocked, sigmask(SIGKILL)|sigmask(SIGSTOP));

	}



	/*

	 * This _must_ happen before we call free_task(), i.e. before we jump
@@ -2546,14 +2552,8 @@ struct task_struct *create_io_thread(int (*fn)(void *), void *arg, int node) 
		.stack_size	= (unsigned long)arg,

		.io_thread	= 1,

	};

	struct task_struct *tsk;



	tsk = copy_process(NULL, 0, node, &args);

	if (!IS_ERR(tsk)) {

		sigfillset(&tsk->blocked);

		sigdelsetmask(&tsk->blocked, sigmask(SIGKILL));

	}

	return tsk;

	return copy_process(NULL, 0, node, &args);

}



/*