From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754041AbbDBSrc (ORCPT ); Thu, 2 Apr 2015 14:47:32 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37352 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752459AbbDBSr2 (ORCPT ); Thu, 2 Apr 2015 14:47:28 -0400 Date: Thu, 2 Apr 2015 11:46:47 -0700 From: tip-bot for Juri Lelli Message-ID: Cc: peterz@infradead.org, wanpeng.li@linux.intel.com, ktkhai@parallels.com, mingo@kernel.org, juri.lelli@arm.com, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, juri.lelli@gmail.com Reply-To: juri.lelli@arm.com, juri.lelli@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, wanpeng.li@linux.intel.com, peterz@infradead.org, mingo@kernel.org, ktkhai@parallels.com In-Reply-To: <1427792017-7356-1-git-send-email-juri.lelli@arm.com> References: <1427792017-7356-1-git-send-email-juri.lelli@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/deadline: Always enqueue on previous rq when dl_task_timer() fires Git-Commit-ID: 4cd57f97135840f637431c92380c8da3edbe44ed 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: 4cd57f97135840f637431c92380c8da3edbe44ed Gitweb: http://git.kernel.org/tip/4cd57f97135840f637431c92380c8da3edbe44ed Author: Juri Lelli AuthorDate: Tue, 31 Mar 2015 09:53:36 +0100 Committer: Ingo Molnar CommitDate: Thu, 2 Apr 2015 17:42:56 +0200 sched/deadline: Always enqueue on previous rq when dl_task_timer() fires dl_task_timer() may fire on a different rq from where a task was removed after throttling. Since the call path is: dl_task_timer() -> enqueue_task_dl() -> enqueue_dl_entity() -> replenish_dl_entity() and replenish_dl_entity() uses dl_se's rq, we can't use current's rq in dl_task_timer(), but we need to lock the task's previous one. Tested-by: Wanpeng Li Signed-off-by: Juri Lelli Signed-off-by: Peter Zijlstra (Intel) Acked-by: Kirill Tkhai Cc: Juri Lelli Fixes: 3960c8c0c789 ("sched: Make dl_task_time() use task_rq_lock()") Link: http://lkml.kernel.org/r/1427792017-7356-1-git-send-email-juri.lelli@arm.com Signed-off-by: Ingo Molnar --- kernel/sched/deadline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 5e2f99b..9d3ad64 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -514,7 +514,7 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer) unsigned long flags; struct rq *rq; - rq = task_rq_lock(current, &flags); + rq = task_rq_lock(p, &flags); /* * We need to take care of several possible races here: @@ -569,7 +569,7 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer) push_dl_task(rq); #endif unlock: - task_rq_unlock(rq, current, &flags); + task_rq_unlock(rq, p, &flags); return HRTIMER_NORESTART; }