From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751959AbdFHJc5 (ORCPT ); Thu, 8 Jun 2017 05:32:57 -0400 Received: from terminus.zytor.com ([65.50.211.136]:54595 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751871AbdFHJcz (ORCPT ); Thu, 8 Jun 2017 05:32:55 -0400 Date: Thu, 8 Jun 2017 02:29:14 -0700 From: tip-bot for Xunlei Pang Message-ID: Cc: tglx@linutronix.de, efault@gmx.de, juri.lelli@arm.com, bristot@redhat.com, xlpang@redhat.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, peterz@infradead.org, luca.abeni@santannapisa.it, rostedt@goodmis.org, mingo@kernel.org Reply-To: rostedt@goodmis.org, mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, luca.abeni@santannapisa.it, torvalds@linux-foundation.org, bristot@redhat.com, juri.lelli@arm.com, efault@gmx.de, tglx@linutronix.de, linux-kernel@vger.kernel.org, xlpang@redhat.com In-Reply-To: <1494421417-27550-1-git-send-email-xlpang@redhat.com> References: <1494421417-27550-1-git-send-email-xlpang@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/deadline: Zero out positive runtime after throttling constrained tasks Git-Commit-ID: ae83b56a56f8d9643dedbee86b457fa1c5d42f59 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: ae83b56a56f8d9643dedbee86b457fa1c5d42f59 Gitweb: http://git.kernel.org/tip/ae83b56a56f8d9643dedbee86b457fa1c5d42f59 Author: Xunlei Pang AuthorDate: Wed, 10 May 2017 21:03:37 +0800 Committer: Ingo Molnar CommitDate: Thu, 8 Jun 2017 10:31:58 +0200 sched/deadline: Zero out positive runtime after throttling constrained tasks When a contrained task is throttled by dl_check_constrained_dl(), it may carry the remaining positive runtime, as a result when dl_task_timer() fires and calls replenish_dl_entity(), it will not be replenished correctly due to the positive dl_se->runtime. This patch assigns its runtime to 0 if positive after throttling. Signed-off-by: Xunlei Pang Signed-off-by: Peter Zijlstra (Intel) Acked-by: Daniel Bristot de Oliveira Cc: Juri Lelli Cc: Linus Torvalds Cc: Luca Abeni Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Fixes: df8eac8cafce ("sched/deadline: Throttle a constrained deadline task activated after the deadline) Link: http://lkml.kernel.org/r/1494421417-27550-1-git-send-email-xlpang@redhat.com Signed-off-by: Ingo Molnar --- kernel/sched/deadline.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index e3b25df..54302cf 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -941,6 +941,8 @@ static inline void dl_check_constrained_dl(struct sched_dl_entity *dl_se) if (unlikely(dl_se->dl_boosted || !start_dl_timer(p))) return; dl_se->dl_throttled = 1; + if (dl_se->runtime > 0) + dl_se->runtime = 0; } }