Skip to content

[ciqcbr7_9] Multiple patches tested (2 commits) #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ciq-kernel-automation wants to merge 2 commits into
base: ciqcbr7_9
Choose a base branch
from
+11 −5
Open

[ciqcbr7_9] Multiple patches tested (2 commits) #1426

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
341efdc
rtmutex: Use waiter::task instead of current in remove_waiter()
Niebelungen-D Apr 8, 2026
4c55a26
locking/rtmutex: Skip remove_waiter() when waiter is not enqueued
May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions kernel/rtmutex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,19 +604,25 @@ static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
*
* Must be called with lock->wait_lock held and
* have just failed to try_to_take_rt_mutex().
*
* When invoked from rt_mutex_start_proxy_lock() waiter::task != current !
*/
static void remove_waiter(struct rt_mutex *lock,
struct rt_mutex_waiter *waiter)
{
int first = (waiter == rt_mutex_top_waiter(lock));
struct task_struct *owner = rt_mutex_owner(lock);
struct task_struct *waiter_task = waiter->task;
unsigned long flags;
int chain_walk = 0;

raw_spin_lock_irqsave(&current->pi_lock, flags);
if (!waiter_task) /* never enqueued */
return;

raw_spin_lock_irqsave(&waiter_task->pi_lock, flags);
rt_mutex_dequeue(lock, waiter);
current->pi_blocked_on = NULL;
raw_spin_unlock_irqrestore(&current->pi_lock, flags);
waiter_task->pi_blocked_on = NULL;
raw_spin_unlock_irqrestore(&waiter_task->pi_lock, flags);

if (!owner)
return;
Expand Down Expand Up @@ -649,7 +655,7 @@ static void remove_waiter(struct rt_mutex *lock,

raw_spin_unlock(&lock->wait_lock);

rt_mutex_adjust_prio_chain(owner, 0, lock, NULL, current);
rt_mutex_adjust_prio_chain(owner, 0, lock, NULL, waiter_task);

raw_spin_lock(&lock->wait_lock);
}
Expand Down Expand Up @@ -1093,7 +1099,7 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
ret = 0;
}

if (unlikely(ret))
if (unlikely(ret < 0))
remove_waiter(lock, waiter);

raw_spin_unlock(&lock->wait_lock);
Expand Down