From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:43827 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751149AbbEBSBa (ORCPT ); Sat, 2 May 2015 14:01:30 -0400 Subject: Patch "sched/deadline: Always enqueue on previous rq when dl_task_timer() fires" has been added to the 4.0-stable tree To: juri.lelli@arm.com, gregkh@linuxfoundation.org, juri.lelli@gmail.com, ktkhai@parallels.com, mingo@kernel.org, peterz@infradead.org, wanpeng.li@linux.intel.com Cc: , From: Date: Sat, 02 May 2015 19:59:35 +0200 Message-ID: <1430589575234179@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled sched/deadline: Always enqueue on previous rq when dl_task_timer() fires to the 4.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: sched-deadline-always-enqueue-on-previous-rq-when-dl_task_timer-fires.patch and it can be found in the queue-4.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 4cd57f97135840f637431c92380c8da3edbe44ed Mon Sep 17 00:00:00 2001 From: Juri Lelli Date: Tue, 31 Mar 2015 09:53:36 +0100 Subject: sched/deadline: Always enqueue on previous rq when dl_task_timer() fires From: Juri Lelli commit 4cd57f97135840f637431c92380c8da3edbe44ed upstream. 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 Signed-off-by: Greg Kroah-Hartman --- kernel/sched/deadline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -514,7 +514,7 @@ static enum hrtimer_restart dl_task_time 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_time push_dl_task(rq); #endif unlock: - task_rq_unlock(rq, current, &flags); + task_rq_unlock(rq, p, &flags); return HRTIMER_NORESTART; } Patches currently in stable-queue which might be from juri.lelli@arm.com are queue-4.0/sched-deadline-always-enqueue-on-previous-rq-when-dl_task_timer-fires.patch