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=-5.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS, USER_AGENT_MUTT autolearn=ham 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 BCAA4C169C4 for ; Fri, 8 Feb 2019 15:40:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CF5B20844 for ; Fri, 8 Feb 2019 15:40:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="bWfo7PNl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727846AbfBHPkX (ORCPT ); Fri, 8 Feb 2019 10:40:23 -0500 Received: from merlin.infradead.org ([205.233.59.134]:53062 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727411AbfBHPkW (ORCPT ); Fri, 8 Feb 2019 10:40:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=xqMZ9xrJ2PZHdQ5jtidEV7yoEqOjuBsVJVNlx6xEDFw=; b=bWfo7PNlACFhIONoiVPlGGV09 5Jauo1gjKSrP0g2OCFA20FYqI4MZpwktTq6ZgaBrFbnFKJAZiyP0MnsKlvagCE/WgR2pldUgGy1Ee RWd0s81jgQGwxvp98ED3BGTC7N7EH2AdcdA5dSEijiQiGpI9YpSM4XXSp8qaTffVXRgWQLgNndd+E g77UlbYQHmhEQHjfiVKwTj3bTzd+Pikx23PNfnwexJ6T2+GXhh6pwzXyOi5u6UbKJwiIr1heIOeRo KzzZoCzw03CY2h4Snp3UJcZ4WGCVYarXkoeEv6pDXXepw4z0Rt8byrNcs5qLDRMCKfQCPBXpgjgvo 31fb+P7AA==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=hirez.programming.kicks-ass.net) by merlin.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gs8GB-0004T8-W8; Fri, 08 Feb 2019 15:40:12 +0000 Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 9727921406573; Fri, 8 Feb 2019 16:40:09 +0100 (CET) Date: Fri, 8 Feb 2019 16:40:09 +0100 From: Peter Zijlstra To: Vincent Guittot Cc: linux-kernel@vger.kernel.org, mingo@redhat.com, tj@kernel.org, sargun@sargun.me, xiexiuqi@huawei.com, xiezhipeng1@huawei.com, torvalds@linux-foundation.org Subject: Re: [PATCH 1/2] sched/fair: optimization of update_blocked_averages() Message-ID: <20190208154009.GK32511@hirez.programming.kicks-ass.net> References: <1549469662-13614-1-git-send-email-vincent.guittot@linaro.org> <1549469662-13614-2-git-send-email-vincent.guittot@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1549469662-13614-2-git-send-email-vincent.guittot@linaro.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Argh head hurts!! On Wed, Feb 06, 2019 at 05:14:21PM +0100, Vincent Guittot wrote: > @@ -4438,6 +4450,10 @@ static int tg_unthrottle_up(struct task_group *tg, void *data) > /* adjust cfs_rq_clock_task() */ > cfs_rq->throttled_clock_task_time += rq_clock_task(rq) - > cfs_rq->throttled_clock_task; > + > + /* Add cfs_rq with already running entity in the list */ > + if (cfs_rq->nr_running >= 1) > + list_add_leaf_cfs_rq(cfs_rq); > } > > return 0; Do we want the below to go with the above change? diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 38d4669aa2ef..0bd80a891025 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4536,6 +4536,8 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) /* update hierarchical throttle state */ walk_tg_tree_from(cfs_rq->tg, tg_nop, tg_unthrottle_up, (void *)rq); + assert_list_leaf_cfs_rq(rq); + if (!cfs_rq->load.weight) return;