From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751342AbcCHSU6 (ORCPT ); Tue, 8 Mar 2016 13:20:58 -0500 Received: from smtp2.provo.novell.com ([137.65.250.81]:52061 "EHLO smtp2.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751172AbcCHSUh (ORCPT ); Tue, 8 Mar 2016 13:20:37 -0500 From: Davidlohr Bueso To: tglx@linutronix.de, mingo@kernel.org Cc: peterz@infradead.org, bigeasy@linutronix.de, umgwanakikbuti@gmail.com, paulmck@linux.vnet.ibm.com, dave@stgolabs.net, linux-kernel@vger.kernel.org, Davidlohr Bueso Subject: [PATCH 2/3] rtmutex: Add rt_mutex_init_waiter helper Date: Tue, 8 Mar 2016 10:20:22 -0800 Message-Id: <1457461223-4301-3-git-send-email-dave@stgolabs.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1457461223-4301-1-git-send-email-dave@stgolabs.net> References: <1457461223-4301-1-git-send-email-dave@stgolabs.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Davidlohr Bueso ... encapsulates debug and regular waiter initialization. In the case of rtmutexes, we now also set the waiter to nil until later explicitly set to whatever task. This is safe as the waiter is on the stack and we are doing very basic initialization anyway. Signed-off-by: Davidlohr Bueso --- kernel/futex.c | 5 +---- kernel/locking/rtmutex.c | 4 +--- kernel/locking/rtmutex_common.h | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index bae542e..0ff94a7 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2778,10 +2778,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, * The waiter is allocated on our stack, manipulated by the requeue * code while we sleep on uaddr. */ - debug_rt_mutex_init_waiter(&rt_waiter); - RB_CLEAR_NODE(&rt_waiter.pi_tree_entry); - RB_CLEAR_NODE(&rt_waiter.tree_entry); - rt_waiter.task = NULL; + rt_mutex_init_waiter(&rt_waiter); ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE); if (unlikely(ret != 0)) diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 3e74660..60fa79a 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1171,9 +1171,7 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state, unsigned long flags; int ret = 0; - debug_rt_mutex_init_waiter(&waiter); - RB_CLEAR_NODE(&waiter.pi_tree_entry); - RB_CLEAR_NODE(&waiter.tree_entry); + rt_mutex_init_waiter(&waiter); /* * Technically we could use raw_spin_[un]lock_irq() here, but this can diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h index 4f5f83c..c714737 100644 --- a/kernel/locking/rtmutex_common.h +++ b/kernel/locking/rtmutex_common.h @@ -119,4 +119,19 @@ extern void rt_mutex_adjust_prio(struct task_struct *task); # include "rtmutex.h" #endif +/* + * Waiter structure basic initialization. A waiter is not considered + * actually usable until it after calling task_blocks_on_rt_mutex() + * which setups up the relevant entries. + */ +static inline void +rt_mutex_init_waiter(struct rt_mutex_waiter *waiter) +{ + debug_rt_mutex_init_waiter(waiter); + + RB_CLEAR_NODE(&waiter->pi_tree_entry); + RB_CLEAR_NODE(&waiter->tree_entry); + waiter->task = NULL; +} + #endif -- 2.1.4