Unverified Commit 63c40ef2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12009 rtmutex: Drop rt_mutex::wait_lock before scheduling 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiongfeng Wang <wangxiongfeng2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5ICNMZ24NQEQY7HPN4SJ4JUSAGMVLERB/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAU9M4 
 
Link:https://gitee.com/openeuler/kernel/pulls/12009

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents fb512ada c50ba0cf

kernel/locking/rtmutex.c

+5 −4
Original line number Diff line number Diff line
@@ -1624,6 +1624,7 @@ static int __sched rt_mutex_slowlock_block(struct rt_mutex_base *lock, 
}



static void __sched rt_mutex_handle_deadlock(int res, int detect_deadlock,

					     struct rt_mutex_base *lock,

					     struct rt_mutex_waiter *w)

{

	/*
@@ -1636,10 +1637,10 @@ static void __sched rt_mutex_handle_deadlock(int res, int detect_deadlock, 
	if (build_ww_mutex() && w->ww_ctx)

		return;



	/*

	 * Yell loudly and stop the task right here.

	 */

	raw_spin_unlock_irq(&lock->wait_lock);



	WARN(1, "rtmutex deadlock detected\n");



	while (1) {

		set_current_state(TASK_INTERRUPTIBLE);

		schedule();
@@ -1693,7 +1694,7 @@ static int __sched __rt_mutex_slowlock(struct rt_mutex_base *lock, 
	} else {

		__set_current_state(TASK_RUNNING);

		remove_waiter(lock, waiter);

		rt_mutex_handle_deadlock(ret, chwalk, waiter);

		rt_mutex_handle_deadlock(ret, chwalk, lock, waiter);

	}



	/*