Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752420AbbBXJ24 (ORCPT ); Tue, 24 Feb 2015 04:28:56 -0500 Received: from foss-mx-na.foss.arm.com ([217.140.108.86]:44465 "EHLO foss-mx-na.foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752244AbbBXJ2x (ORCPT ); Tue, 24 Feb 2015 04:28:53 -0500 From: Juri Lelli To: linux-kernel@vger.kernel.org Cc: Juri Lelli , Ingo Molnar , Peter Zijlstra , Kirill Tkhai , Juri Lelli Subject: [PATCH 2/2] sched/deadline: always enqueue on previous rq when dl_task_timer fires Date: Tue, 24 Feb 2015 09:28:35 +0000 Message-Id: <1424770115-25343-2-git-send-email-juri.lelli@arm.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1424770115-25343-1-git-send-email-juri.lelli@arm.com> References: <1424770115-25343-1-git-send-email-juri.lelli@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1649 Lines: 52 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. Signed-off-by: Juri Lelli Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Kirill Tkhai Cc: Juri Lelli Cc: linux-kernel@vger.kernel.org Fixes: 3960c8c0c789 ("sched: Make dl_task_time() use task_rq_lock()") --- 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 dbf12a9..519e468 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -538,7 +538,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: @@ -593,7 +593,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; } -- 2.3.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/