From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752208AbbCJOKv (ORCPT ); Tue, 10 Mar 2015 10:10:51 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:44769 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752019AbbCJOKt (ORCPT ); Tue, 10 Mar 2015 10:10:49 -0400 Message-ID: <54FEFB66.1070606@canonical.com> Date: Tue, 10 Mar 2015 15:10:46 +0100 From: Maarten Lankhorst User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Peter Zijlstra , Sebastian Andrzej Siewior CC: linux-kernel@vger.kernel.org, Ingo Molnar , Mike Galbraith Subject: Re: [PATCH 2/3] locking: ww_mutex: Allow to use rt_mutex instead of mutex for the baselock References: <1425056229-22326-1-git-send-email-bigeasy@linutronix.de> <1425056229-22326-3-git-send-email-bigeasy@linutronix.de> <20150310123740.GA2896@worktop.programming.kicks-ass.net> In-Reply-To: <20150310123740.GA2896@worktop.programming.kicks-ass.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Op 10-03-15 om 13:37 schreef Peter Zijlstra: > On Fri, Feb 27, 2015 at 05:57:08PM +0100, Sebastian Andrzej Siewior wrote: >> +static int __sched __mutex_lock_check_stamp(struct rt_mutex *lock, >> + struct ww_acquire_ctx *ctx) >> +{ >> +#ifdef CONFIG_WW_MUTEX_RTMUTEX >> + struct ww_mutex *ww = container_of(lock, struct ww_mutex, base.lock); >> + struct ww_acquire_ctx *hold_ctx = ACCESS_ONCE(ww->ctx); >> + >> + if (!hold_ctx) >> + return 0; >> + >> + if (unlikely(ctx == hold_ctx)) >> + return -EALREADY; >> + >> + if (ctx->stamp - hold_ctx->stamp <= LONG_MAX && >> + (ctx->stamp != hold_ctx->stamp || ctx > hold_ctx)) { >> +#ifdef CONFIG_DEBUG_MUTEXES >> + DEBUG_LOCKS_WARN_ON(ctx->contending_lock); >> + ctx->contending_lock = ww; >> +#endif >> + return -EDEADLK; >> + } >> +#endif >> + return 0; >> +} > So IIRC this is the function that checks who gets wounded (and gets to > do the whole retry thing), right? > > So for the RT case, I think we should extend it to not (primarily) be a > FIFO thing, but also consider the priority of the tasks involved. > > Maybe a little something like: > > if (hold_ctx->task->prio < ctx->task->prio) > return -EDEADLOCK; > > before the timestamp check; although I suppose we should also add a > deadline test in case both prios are -1. I think that's useful but if you implement -EDEADLK based on thread priority, any boosted thread should receive -EDEADLK when it tries to acquire a new lock in the same context, to force it to back off.. I'm not sure how you'd implement it though.. ~Maarten