Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1306945pxb; Fri, 20 Aug 2021 02:44:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw494i6rzNhIELkBWka6ytXoJb/HBj1nJRg50RdfwzJJFsyjSGR2XsjBxUDroijLhXnNW1Z X-Received: by 2002:a05:6e02:547:: with SMTP id i7mr12947706ils.102.1629452662999; Fri, 20 Aug 2021 02:44:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629452662; cv=none; d=google.com; s=arc-20160816; b=Ozkgxvwtkr3o6jSoOmkS1h/o9QYhc4Vue+taZUQ2X6fc4lnCrkPWIFygsPwMjGkL4x a++SfWj4nrentbHmn6VzD1itHzPavInQ3dyvwN4iTB/5hk+S8HuzkuBS1pZ6DdGIyiT9 Y8JdYHSO9aaThPJ47HCtxQR4vOyWNgEkA/tE4o8PSpNP9wpe7d2279e5NbIYgaClssF8 v3/VNJIJP2Nb8SMsLx3lRMUSLkTYyDiECHuEEyPqOIHWqzJFwVjpHeSUWR71hmYzIR4p 9wD4dw40dcAZ4PTXTPhoRbP6KrfE7X29XwW9zlvmqxtHCxJzrKczgQRPxA4lzpmyB4hW z1ZQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Si8KE1JJWs1mAy9P/ti0+l+WDdAkm3UF36Akx8W4YOM=; b=oKdHlLScI9LQC1yuUg5cgh907cZJDu036SL2cu46n5GP+eqq6tyPjMSxwrx9fBQGDB EdgCykCYRFABeBB/Bc6UNu6w645yvHZow9fStoHQaNLIae4B37w/wChyqpwLTxF80Zmj PAssqMKmFz8ZDprjRMXEL3DrXx7/CjvcMp/dDfzWI8pwZq5CtvZusY0DB7VRyh13dIsM o5aeiKWH7H+Hh8vbplvrQ5hEp/GDgvXHFnCpVMAtk4ORgTYNtaissVZEHZb89iTkhTIw b8eB540Cw66HGvafst1/xqipinRBxXYqFrSOothIAk/k9aSaE2Hj2bgtVRJK1mUDRetn jfSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex-team.com header.s=default header.b=QXbuP8kz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex-team.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w14si6626574ill.17.2021.08.20.02.44.11; Fri, 20 Aug 2021 02:44:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@yandex-team.com header.s=default header.b=QXbuP8kz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex-team.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237459AbhHTJmm (ORCPT + 99 others); Fri, 20 Aug 2021 05:42:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236843AbhHTJmi (ORCPT ); Fri, 20 Aug 2021 05:42:38 -0400 Received: from forwardcorp1o.mail.yandex.net (forwardcorp1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::193]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9ED6C061575; Fri, 20 Aug 2021 02:42:00 -0700 (PDT) Received: from sas1-3cba3404b018.qloud-c.yandex.net (sas1-3cba3404b018.qloud-c.yandex.net [IPv6:2a02:6b8:c08:bd26:0:640:3cba:3404]) by forwardcorp1o.mail.yandex.net (Yandex) with ESMTP id 6A9172E1647; Fri, 20 Aug 2021 12:40:07 +0300 (MSK) Received: from sas1-9d43635d01d6.qloud-c.yandex.net (sas1-9d43635d01d6.qloud-c.yandex.net [2a02:6b8:c08:793:0:640:9d43:635d]) by sas1-3cba3404b018.qloud-c.yandex.net (mxbackcorp/Yandex) with ESMTP id WRJxvzCyIu-e6ueY01n; Fri, 20 Aug 2021 12:40:07 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.com; s=default; t=1629452407; bh=Si8KE1JJWs1mAy9P/ti0+l+WDdAkm3UF36Akx8W4YOM=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From:Cc; b=QXbuP8kz8GHvwopKbXXt1NV6c1q55sqAepWaAnDLtj8CX/jQEK3BpptH1re2TfJjx iNXzsUpoQuPfry0/uyEzMSN5+A75rs4yXa6i87Lj6xyjK5QHDPd7KQV8G8ZIQAtzZe ZxyoYdcFSUA7y4AHw5KZUiWJ2fE5DuYiwccG5DqQ= Authentication-Results: sas1-3cba3404b018.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.com Received: from dynamic-red3.dhcp.yndx.net (dynamic-red3.dhcp.yndx.net [2a02:6b8:0:107:3e85:844d:5b1d:60a]) by sas1-9d43635d01d6.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id G4f2cCJGSV-e624XJtp; Fri, 20 Aug 2021 12:40:06 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Andrey Ryabinin To: Tejun Heo , Zefan Li , Johannes Weiner , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot Cc: Daniel Jordan , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, bharata@linux.vnet.ibm.com, boris@bur.io, Andrey Ryabinin , stable@vger.kernel.org Subject: [PATCH v2 3/5] cgroup: Fix 'usage_usec' time in root's cpu.stat Date: Fri, 20 Aug 2021 12:40:03 +0300 Message-Id: <20210820094005.20596-3-arbn@yandex-team.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210820094005.20596-1-arbn@yandex-team.com> References: <20210217120004.7984-1-arbn@yandex-team.com> <20210820094005.20596-1-arbn@yandex-team.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Global CPUTIME_USER counter already includes CPUTIME_GUEST Also CPUTIME_NICE already includes CPUTIME_GUEST_NICE. Remove additions of CPUTIME_GUEST[_NICE] to total ->sum_exec_runtime to not account them twice. Fixes: 936f2a70f207 ("cgroup: add cpu.stat file to root cgroup") Signed-off-by: Andrey Ryabinin Cc: Reviewed-by: Daniel Jordan Tested-by: Daniel Jordan --- Changes since v1: - Add review/tested tags in changelog --- kernel/cgroup/rstat.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index b264ab5652ba..1486768f2318 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -433,8 +433,6 @@ static void root_cgroup_cputime(struct task_cputime *cputime) cputime->sum_exec_runtime += user; cputime->sum_exec_runtime += sys; cputime->sum_exec_runtime += cpustat[CPUTIME_STEAL]; - cputime->sum_exec_runtime += cpustat[CPUTIME_GUEST]; - cputime->sum_exec_runtime += cpustat[CPUTIME_GUEST_NICE]; } } -- 2.31.1