From patchwork Thu Dec 1 14:06:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nicolai_H=C3=A4hnle?= X-Patchwork-Id: 9456223 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 63BE460235 for ; Thu, 1 Dec 2016 14:07:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56C13284D9 for ; Thu, 1 Dec 2016 14:07:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B9FE284DE; Thu, 1 Dec 2016 14:07:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D3302284D9 for ; Thu, 1 Dec 2016 14:07:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BD016E7F8; Thu, 1 Dec 2016 14:07:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wj0-x244.google.com (mail-wj0-x244.google.com [IPv6:2a00:1450:400c:c01::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB51B6E7D9 for ; Thu, 1 Dec 2016 14:07:07 +0000 (UTC) Received: by mail-wj0-x244.google.com with SMTP id kp2so26510745wjc.0 for ; Thu, 01 Dec 2016 06:07:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mJlr+ab11+PEq44B+fYO+65smuTn6yhk4OpwIOUci44=; b=XT7FOq/RqSnMUnKDVA+75ODJyTjTd9TdQl0THWrSP8SsNHvwx/BqtbA3LDjfg9INvJ kMfeH60yWB1ah1JbrM8/1Chc9hJl83ZWXwcAYSBomxtWM/KxNiWgT+E6LWt42dwz2mUg juXp7z9mvpQcbesaDp5f9SROHNLqXlFgzhIr5GRLokG2hJcKtBziofiQ+/yLxEYWR7fU L8j+ynoxQ3uZtebvrZYhvETLDPexzOLouLAR1N+k9w0lwmegCqZ4f8p3yTkAKk1UQIW0 DxyJg3X6H3ZjZ4G+FxbjHwTLZXzmRSP3GFlyHhrzTn/+2GgkCrflzPtTEb8EdTrmkmZb yq3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mJlr+ab11+PEq44B+fYO+65smuTn6yhk4OpwIOUci44=; b=XWwWXxsDGL9ZEMi+pGR6Po+bJ3D9tR5dcyMrD4E14hiMHSIKccbjZADUcjKvr+poZb EZzEukECJx0PD58SO0kF+BY0QNCVX6ve1++jInocpaKiUYZ//Mq2OSHbe29iPAI9o6Fp +qa6VKiJ6QUEFuYXM9LhXKZ5pfV39eGFNMem3oO3tJDQpO7Hd2AVSQpHjFV65vcfAEIy LQQou+RVkXHoUIp/3K2qk1brF7WqjDd9+F0zvfyaHu6pz6u5c4Ex8qSGytjy6j5YhIPh 9JMWSkzREdwICnUMCi6r8iKYSPX9gkPe79W9eCNjv3AxSqaJw7hW9SOXkkNFdKeo48qR h2pw== X-Gm-Message-State: AKaTC032VdcrjmfyNgeG87iWDIk/7WD28NSFyPooHJ8S0xphja7bFFrAFwCXCn5PSJ10Xg== X-Received: by 10.194.146.131 with SMTP id tc3mr34316696wjb.129.1480601226013; Thu, 01 Dec 2016 06:07:06 -0800 (PST) Received: from cassiopeia.fritz.box ([2001:a61:116e:7d01:dc12:8e88:ab9d:8694]) by smtp.gmail.com with ESMTPSA id vr9sm411514wjc.35.2016.12.01.06.07.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Dec 2016 06:07:05 -0800 (PST) From: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= To: linux-kernel@vger.kernel.org Subject: [PATCH v2 05/11] locking/ww_mutex: Add waiters in stamp order Date: Thu, 1 Dec 2016 15:06:48 +0100 Message-Id: <1480601214-26583-6-git-send-email-nhaehnle@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480601214-26583-1-git-send-email-nhaehnle@gmail.com> References: <1480601214-26583-1-git-send-email-nhaehnle@gmail.com> MIME-Version: 1.0 Cc: Maarten Lankhorst , =?UTF-8?q?Nicolai=20H=C3=A4hnle?= , Peter Zijlstra , dri-devel@lists.freedesktop.org, Ingo Molnar X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Nicolai Hähnle Add regular waiters in stamp order. Keep adding waiters that have no context in FIFO order and take care not to starve them. While adding our task as a waiter, back off if we detect that there is a waiter with a lower stamp in front of us. Make sure to call lock_contended even when we back off early. v2: - rein in the indentation of __ww_mutex_add_waiter a bit - set contending_lock in __ww_mutex_add_waiter (Chris Wilson) Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Maarten Lankhorst Cc: Daniel Vetter Cc: Chris Wilson Cc: dri-devel@lists.freedesktop.org Signed-off-by: Nicolai Hähnle --- include/linux/mutex.h | 3 ++ kernel/locking/mutex.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 83 insertions(+), 7 deletions(-) diff --git a/include/linux/mutex.h b/include/linux/mutex.h index b97870f..118a3b6 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -20,6 +20,8 @@ #include #include +struct ww_acquire_ctx; + /* * Simple, straightforward mutexes with strict semantics: * @@ -75,6 +77,7 @@ static inline struct task_struct *__mutex_owner(struct mutex *lock) struct mutex_waiter { struct list_head list; struct task_struct *task; + struct ww_acquire_ctx *ww_ctx; #ifdef CONFIG_DEBUG_MUTEXES void *magic; #endif diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index 585627f..d63eebb 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -628,6 +628,51 @@ __ww_mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx) return 0; } +static inline int __sched +__ww_mutex_add_waiter(struct mutex_waiter *waiter, + struct mutex *lock, + struct ww_acquire_ctx *ww_ctx) +{ + struct mutex_waiter *cur; + + if (!ww_ctx) { + list_add_tail(&waiter->list, &lock->wait_list); + return 0; + } + + /* + * Add the waiter before the first waiter with a higher stamp. + * Waiters without a context are skipped to avoid starving + * them. + */ + list_for_each_entry(cur, &lock->wait_list, list) { + if (!cur->ww_ctx) + continue; + + if (__ww_mutex_stamp_after(ww_ctx, cur->ww_ctx)) { + /* Back off immediately if necessary. */ + if (ww_ctx->acquired > 0) { +#ifdef CONFIG_DEBUG_MUTEXES + struct ww_mutex *ww; + + ww = container_of(lock, struct ww_mutex, base); + DEBUG_LOCKS_WARN_ON(ww_ctx->contending_lock); + ww_ctx->contending_lock = ww; +#endif + return -EDEADLK; + } + + continue; + } + + list_add_tail(&waiter->list, &cur->list); + return 0; + } + + list_add_tail(&waiter->list, &lock->wait_list); + return 0; +} + /* * Lock a mutex (possibly interruptible), slowpath: */ @@ -677,15 +722,25 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, debug_mutex_lock_common(lock, &waiter); debug_mutex_add_waiter(lock, &waiter, task); - /* add waiting tasks to the end of the waitqueue (FIFO): */ - list_add_tail(&waiter.list, &lock->wait_list); + lock_contended(&lock->dep_map, ip); + + if (!use_ww_ctx) { + /* add waiting tasks to the end of the waitqueue (FIFO): */ + list_add_tail(&waiter.list, &lock->wait_list); + } else { + /* Add in stamp order, waking up waiters that must back off. */ + ret = __ww_mutex_add_waiter(&waiter, lock, ww_ctx); + if (ret) + goto err_early_backoff; + + waiter.ww_ctx = ww_ctx; + } + waiter.task = task; if (__mutex_waiter_is_first(lock, &waiter)) __mutex_set_flag(lock, MUTEX_FLAG_WAITERS); - lock_contended(&lock->dep_map, ip); - set_task_state(task, state); for (;;) { /* @@ -693,8 +748,12 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, * mutex_unlock() handing the lock off to us, do a trylock * before testing the error conditions to make sure we pick up * the handoff. + * + * For w/w locks, we always need to do this even if we're not + * currently the first waiter, because we may have been the + * first waiter during the unlock. */ - if (__mutex_trylock(lock, first)) + if (__mutex_trylock(lock, use_ww_ctx || first)) goto acquired; /* @@ -716,7 +775,20 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, spin_unlock_mutex(&lock->wait_lock, flags); schedule_preempt_disabled(); - if (!first && __mutex_waiter_is_first(lock, &waiter)) { + if (use_ww_ctx && ww_ctx) { + /* + * Always re-check whether we're in first position. We + * don't want to spin if another task with a lower + * stamp has taken our position. + * + * We also may have to set the handoff flag again, if + * our position at the head was temporarily taken away. + */ + first = __mutex_waiter_is_first(lock, &waiter); + + if (first) + __mutex_set_flag(lock, MUTEX_FLAG_HANDOFF); + } else if (!first && __mutex_waiter_is_first(lock, &waiter)) { first = true; __mutex_set_flag(lock, MUTEX_FLAG_HANDOFF); } @@ -728,7 +800,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, * or we must see its unlock and acquire. */ if ((first && mutex_optimistic_spin(lock, ww_ctx, use_ww_ctx, true)) || - __mutex_trylock(lock, first)) + __mutex_trylock(lock, use_ww_ctx || first)) break; spin_lock_mutex(&lock->wait_lock, flags); @@ -761,6 +833,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, err: __set_task_state(task, TASK_RUNNING); mutex_remove_waiter(lock, &waiter, task); +err_early_backoff: spin_unlock_mutex(&lock->wait_lock, flags); debug_mutex_free_waiter(&waiter); mutex_release(&lock->dep_map, 1, ip);