From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753619AbbBZCi3 (ORCPT ); Wed, 25 Feb 2015 21:38:29 -0500 Received: from mga09.intel.com ([134.134.136.24]:41311 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753572AbbBZCi2 (ORCPT ); Wed, 25 Feb 2015 21:38:28 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,649,1418112000"; d="scan'208";a="657336005" From: Wanpeng Li To: Ingo Molnar , Peter Zijlstra Cc: Juri Lelli , linux-kernel@vger.kernel.org, Wanpeng Li Subject: [PATCH RESEND] sched/deadline: fix pull if dl task who's prio changed is not on queue Date: Thu, 26 Feb 2015 10:38:05 +0800 Message-Id: <1424918285-94574-1-git-send-email-wanpeng.li@linux.intel.com> X-Mailer: git-send-email 1.7.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dl task who is not on queue and it is also the curr task simultaneously can not happen. In addition, pull since the priority of a not on queue dl task doesn't make any sense. This patch fix it by don't pull if dl task who's prio changed is not on queue. Signed-off-by: Wanpeng Li --- kernel/sched/deadline.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 49f92c8..ca391c0 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -1728,7 +1728,10 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p) static void prio_changed_dl(struct rq *rq, struct task_struct *p, int oldprio) { - if (task_on_rq_queued(p) || rq->curr == p) { + if (!task_on_rq_queued(p)) + return; + + if (rq->curr == p) { #ifdef CONFIG_SMP /* * This might be too much, but unfortunately -- 1.9.1