From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACBAFC43219 for ; Tue, 30 Apr 2019 12:04:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DAE92075E for ; Tue, 30 Apr 2019 12:04:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556625853; bh=4+zyDSwdpa4cX6pZkHP3f8wx9+V065dfKkPmkd2vNzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t+5zIzdP6Doe9VWNx1fQFV/WhHgGK7xIYAPFPMm8IKIWrE2ps489cNhYMU8p/2dJd 5vDNMCaIxXOmmV/346gxwzsag/gXK5ycpvLfKvqh1NspFtUBC9fd/UNFiOxWD3J2hh 3L5VsBdPyL9nljw86EloEi+jQ8UweD9jSvjMmkFM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727573AbfD3MEH (ORCPT ); Tue, 30 Apr 2019 08:04:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:53034 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729755AbfD3LnI (ORCPT ); Tue, 30 Apr 2019 07:43:08 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8A8312173E; Tue, 30 Apr 2019 11:43:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624588; bh=4+zyDSwdpa4cX6pZkHP3f8wx9+V065dfKkPmkd2vNzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iNY1OUMpRG0k1FbuRnC6jDtFKCMZ2mpPfv8ocxV+mS+kHa8Umj+m2EV44PJzOS8PZ oPA8Z87xCdbepvrl5wLU2+Q2PRawKwGE+5ZFimjH0h9sc3mJGUaCLUcbkBcsNvAtVJ tLlDhRwgEoMwFFDBm77J4WB8ASrxVoA39rOmL9bE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, luca abeni , "Peter Zijlstra (Intel)" , Juri Lelli , Linus Torvalds , Thomas Gleixner , "chengjian (D)" , Ingo Molnar Subject: [PATCH 4.14 33/53] sched/deadline: Correctly handle active 0-lag timers Date: Tue, 30 Apr 2019 13:38:40 +0200 Message-Id: <20190430113557.087736333@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113549.400132183@linuxfoundation.org> References: <20190430113549.400132183@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: luca abeni commit 1b02cd6a2d7f3e2a6a5262887d2cb2912083e42f upstream. syzbot reported the following warning: [ ] WARNING: CPU: 4 PID: 17089 at kernel/sched/deadline.c:255 task_non_contending+0xae0/0x1950 line 255 of deadline.c is: WARN_ON(hrtimer_active(&dl_se->inactive_timer)); in task_non_contending(). Unfortunately, in some cases (for example, a deadline task continuosly blocking and waking immediately) it can happen that a task blocks (and task_non_contending() is called) while the 0-lag timer is still active. In this case, the safest thing to do is to immediately decrease the running bandwidth of the task, without trying to re-arm the 0-lag timer. Signed-off-by: luca abeni Signed-off-by: Peter Zijlstra (Intel) Acked-by: Juri Lelli Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: chengjian (D) Link: https://lkml.kernel.org/r/20190325131530.34706-1-luca.abeni@santannapisa.it Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- kernel/sched/deadline.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -217,7 +217,6 @@ static void task_non_contending(struct t if (dl_se->dl_runtime == 0) return; - WARN_ON(hrtimer_active(&dl_se->inactive_timer)); WARN_ON(dl_se->dl_non_contending); zerolag_time = dl_se->deadline - @@ -234,7 +233,7 @@ static void task_non_contending(struct t * If the "0-lag time" already passed, decrease the active * utilization now, instead of starting a timer */ - if (zerolag_time < 0) { + if ((zerolag_time < 0) || hrtimer_active(&dl_se->inactive_timer)) { if (dl_task(p)) sub_running_bw(dl_se->dl_bw, dl_rq); if (!dl_task(p) || p->state == TASK_DEAD) {