From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753610AbdDDJxp (ORCPT ); Tue, 4 Apr 2017 05:53:45 -0400 Received: from terminus.zytor.com ([65.50.211.136]:41537 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753300AbdDDJwg (ORCPT ); Tue, 4 Apr 2017 05:52:36 -0400 Date: Tue, 4 Apr 2017 02:50:02 -0700 From: tip-bot for Xunlei Pang Message-ID: Cc: peterz@infradead.org, hpa@zytor.com, rostedt@goodmis.org, tglx@linutronix.de, xlpang@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, xlpang@redhat.com, tglx@linutronix.de, hpa@zytor.com, rostedt@goodmis.org, peterz@infradead.org In-Reply-To: <20170323150216.206577901@infradead.org> References: <1460633827-345-7-git-send-email-xlpang@redhat.com> <20170323150216.206577901@infradead.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] sched/deadline/rtmutex: Dont miss the dl_runtime/dl_period update Git-Commit-ID: 85e2d4f992868ad78dc8bb2c077b652fcfb3661a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 85e2d4f992868ad78dc8bb2c077b652fcfb3661a Gitweb: http://git.kernel.org/tip/85e2d4f992868ad78dc8bb2c077b652fcfb3661a Author: Xunlei Pang AuthorDate: Thu, 23 Mar 2017 15:56:09 +0100 Committer: Thomas Gleixner CommitDate: Tue, 4 Apr 2017 11:44:05 +0200 sched/deadline/rtmutex: Dont miss the dl_runtime/dl_period update Currently dl tasks will actually return at the very beginning of rt_mutex_adjust_prio_chain() in !detect_deadlock cases: if (waiter->prio == task->prio) { if (!detect_deadlock) goto out_unlock_pi; // out here else requeue = false; } As the deadline value of blocked deadline tasks(waiters) without changing their sched_class(thus prio doesn't change) never changes, this seems reasonable, but it actually misses the chance of updating rt_mutex_waiter's "dl_runtime(period)_copy" if a waiter updates its deadline parameters(dl_runtime, dl_period) or boosted waiter changes to !deadline class. Thus, force deadline task not out by adding the !dl_prio() condition. Signed-off-by: Xunlei Pang Signed-off-by: Peter Zijlstra (Intel) Acked-by: Steven Rostedt Reviewed-by: Thomas Gleixner Cc: juri.lelli@arm.com Cc: bigeasy@linutronix.de Cc: mathieu.desnoyers@efficios.com Cc: jdesfossez@efficios.com Cc: bristot@redhat.com Link: http://lkml.kernel.org/r/1460633827-345-7-git-send-email-xlpang@redhat.com Link: http://lkml.kernel.org/r/20170323150216.206577901@infradead.org Signed-off-by: Thomas Gleixner --- kernel/locking/rtmutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index bc05b10..8faf472 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -605,7 +605,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, * enabled we continue, but stop the requeueing in the chain * walk. */ - if (waiter->prio == task->prio) { + if (waiter->prio == task->prio && !dl_task(task)) { if (!detect_deadlock) goto out_unlock_pi; else