From patchwork Mon Jun 14 10:28:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 459833 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp3190886jae; Mon, 14 Jun 2021 04:24:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/1bh/zTytG4nwJ1y7h5n5BxobOaG2HPgXRjDXe9CpEkCNpXYKNGBrHXo16IYkj4T4hXFb X-Received: by 2002:a50:ee16:: with SMTP id g22mr16757455eds.27.1623669870517; Mon, 14 Jun 2021 04:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623669870; cv=none; d=google.com; s=arc-20160816; b=unLWTub69M32OGlkyPeb7w8mFeFyyMM/fYsgg3JF/gETbIZun9jP0jO8waavpmTurd 2G0fKj5Yi/p+VYOKJ6HpNh6cPc+ygv7qBhUJjw+fFj6VK0aUTIhPvRpKcKbqW34lhfO7 K5rr+55guL+sOdVdbe2PqD5hfDKDJb2WpvDpO3tS14+x8wTOuxImZnr/xm8lkTuLzWnp 186Ef9DK5WKyasHV1Mpj1jeQ1/tXdzliVF8ec3XSueB8g/1DlJhA0vxnt5QPQ5hNQNp2 MhNP9XfYMj/s9EcVT1ONxAIs8aO/UWdJ61xGava1iCy9/gzBbuTpaMPn/fwhtcJIXBQM c2sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=doDTVEuw1CnKf9XMew0ES/y79XIc/6OPAxUX6sl5/ok=; b=HSUhAScQn8m9LdVYohrOKTPkJxbNHxAsEzvN7knCkqJEasU3Ecy/2xvyKUFIsi72sm 8U3fEl8nNPFtqm6D1R0u7/Y+5yWaMXP0SpiwK9GphN5QKOFb8hpL+uv9/9h/oFb/3gr2 GnBtf1/1qZTRORSvmeWhV0Y1c6SR5LMQTwDB5crCv4Zh/fVS2XAuJvuasDFyd8hI1+8P 7sfeF/aatJVTFLRMwq/fN8rI1s8l+f8XChYL+0h9NQyCqmQKBYJU6g+Eipo6qmCV/M/e Gt8ylQ1F47xRwqe/y4vdp7d8aU2fq/kWEEYf/QcR98conp6n7W+25esRWEW+uT6IvEq6 B+Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RQetFahZ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i9si7011152ejc.423.2021.06.14.04.24.30; Mon, 14 Jun 2021 04:24:30 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RQetFahZ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235321AbhFNL0I (ORCPT + 12 others); Mon, 14 Jun 2021 07:26:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:52248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235917AbhFNLYB (ORCPT ); Mon, 14 Jun 2021 07:24:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DB425619A7; Mon, 14 Jun 2021 10:53:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623667995; bh=xQasJXoVujPa56MbKuyaLQzvLXZxPivhwoPvLlnTKvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RQetFahZuNXDKxqgQKtk1Hk3rC/MW7YFPTvanUxShcDzq8otYt70b9xQHNxF+J/4Q S2Mv2CJBf2rswhXZkv4WlCypmWyKdVvPo7jzE8H4MlHoddexlzD9xH84T8taIO0sem xvJhnMw5jSl/Pw2QddPeVErUZWYVjBmyA3h/iz/k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Odin Ugedal , Vincent Guittot , "Peter Zijlstra (Intel)" Subject: [PATCH 5.12 154/173] sched/fair: Keep load_avg and load_sum synced Date: Mon, 14 Jun 2021 12:28:06 +0200 Message-Id: <20210614102703.286907102@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102658.137943264@linuxfoundation.org> References: <20210614102658.137943264@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vincent Guittot commit 7c7ad626d9a0ff0a36c1e2a3cfbbc6a13828d5eb upstream. when removing a cfs_rq from the list we only check _sum value so we must ensure that _avg and _sum stay synced so load_sum can't be null whereas load_avg is not after propagating load in the cgroup hierarchy. Use load_avg to compute load_sum similarly to what is done for util_sum and runnable_sum. Fixes: 0e2d2aaaae52 ("sched/fair: Rewrite PELT migration propagation") Reported-by: Odin Ugedal Signed-off-by: Vincent Guittot Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Odin Ugedal Link: https://lkml.kernel.org/r/20210527122916.27683-2-vincent.guittot@linaro.org Signed-off-by: Greg Kroah-Hartman --- kernel/sched/fair.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3494,10 +3494,9 @@ update_tg_cfs_runnable(struct cfs_rq *cf static inline void update_tg_cfs_load(struct cfs_rq *cfs_rq, struct sched_entity *se, struct cfs_rq *gcfs_rq) { - long delta_avg, running_sum, runnable_sum = gcfs_rq->prop_runnable_sum; + long delta, running_sum, runnable_sum = gcfs_rq->prop_runnable_sum; unsigned long load_avg; u64 load_sum = 0; - s64 delta_sum; u32 divider; if (!runnable_sum) @@ -3544,13 +3543,13 @@ update_tg_cfs_load(struct cfs_rq *cfs_rq load_sum = (s64)se_weight(se) * runnable_sum; load_avg = div_s64(load_sum, divider); - delta_sum = load_sum - (s64)se_weight(se) * se->avg.load_sum; - delta_avg = load_avg - se->avg.load_avg; + delta = load_avg - se->avg.load_avg; se->avg.load_sum = runnable_sum; se->avg.load_avg = load_avg; - add_positive(&cfs_rq->avg.load_avg, delta_avg); - add_positive(&cfs_rq->avg.load_sum, delta_sum); + + add_positive(&cfs_rq->avg.load_avg, delta); + cfs_rq->avg.load_sum = cfs_rq->avg.load_avg * divider; } static inline void add_tg_cfs_propagate(struct cfs_rq *cfs_rq, long runnable_sum)