From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1392597-1516610617-2-9128342489955644813 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516610617; b=NN2NRTBrbBbF6beDFepEq6D5n690mph/h2ciDKrDwqF7XNq LRxNcCBKGtQG4hPKL2MTSFpP+/Wj1PdMJ9Pecq2sEfhpRi1napcNNtNpqVh79w9C vfwkqdFkJfMkMjeeWg3oz+cGzJW/UfLj6CM5LhBjgZwRuWxp3n/jICxOWzQZi56z xtDyxzPmNaaFcxoajg/LFR/h7RNeOLE2eUYl8d4KkKqDVuzRv89F+4PPHATGNJLF Y8PQYHl8bcuoHSiEiaRfN66t5cIysorqnDLh8diOLlOC5I+gy3EmvJS1I/paVOlV 7x5UW0P0cz5sifaOKoSPURm2eKzKvuXVcJHSLFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=arctest; t=1516610617; bh=+KaD+gQGI36GFrPIiS3pa86lMs mFEixrKAeSo6DsP8A=; b=u/Hwi+2pVNKoEm+oft3BI0OPV6Y2Nk52QsSRdL0tP7 /0WXoR+LuuYW+hj0pGbfjkzPFbVb1nvU63LfEnWV7xTF1nQjmHatQjSM68/liEB2 7he37aEs7bXRvlWX1giIs5IDEy2hEy1M0zm8tDz34X7J/ZX4O44oDhPSoyTGTxu6 JxZtUSagAXomeHxvG2nRMNSP2rb1udZT6iV/2X1y8RPP+SkKZWtcL9DhmPjZcw+M HGoSfwmr3eijVU3EN0hsfoZLhclwDmJf1iR0RpxHcN6itxFCjJB3AaSmMjStMlzc UYPtyWFelwZ50UXYvxK/DefVckZUN96hUW/OXrNcCalg== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752077AbeAVInU (ORCPT ); Mon, 22 Jan 2018 03:43:20 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:59266 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751747AbeAVInT (ORCPT ); Mon, 22 Jan 2018 03:43:19 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xunlei Pang , "Peter Zijlstra (Intel)" , Daniel Bristot de Oliveira , Juri Lelli , Linus Torvalds , Luca Abeni , Mike Galbraith , Steven Rostedt , Thomas Gleixner , Ingo Molnar , Ben Hutchings Subject: [PATCH 4.4 29/53] sched/deadline: Zero out positive runtime after throttling constrained tasks Date: Mon, 22 Jan 2018 09:40:21 +0100 Message-Id: <20180122083911.578388493@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083910.299610926@linuxfoundation.org> References: <20180122083910.299610926@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xunlei Pang commit ae83b56a56f8d9643dedbee86b457fa1c5d42f59 upstream. 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 Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- kernel/sched/deadline.c | 2 ++ 1 file changed, 2 insertions(+) --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -732,6 +732,8 @@ static inline void dl_check_constrained_ 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; } }