Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp6418615pxb; Wed, 17 Feb 2021 04:10:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJzC5UdsACiYfAaab7Ah0xuPOchPrcd7OO+TAdNooVUAMBNqhHAuRmyTi3iKsfqMOeDw+ZiY X-Received: by 2002:aa7:c9cf:: with SMTP id i15mr25624301edt.296.1613563845884; Wed, 17 Feb 2021 04:10:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613563845; cv=none; d=google.com; s=arc-20160816; b=S1aJu35FxTT19CzppapsO5rCnckRin0zdA9WawZWExTNGt+niUy3qttZaLmWzc7M8E ELX0iurIFleBQeTleUnbBlfsuJu0M4AT2mg09VClhgjaTUwnU0Wrhov35nmn7RO2b17n 513pzlyN1WKV3hUH0UgzhEtSP/D2wKUM1SScXVdGxXJvX0qmmDoNg/zIUKTuu6t4bbq9 Ylg1Qui2fItNaw2kQKQc6v98Q5OpBaov/ExrZvvB80GBtnZ4X1TwD/hkBvFEkwFvHSCh w2RWk8Q30YsDBV37Wu1xR6Xkz6Z9fzK/qevhYUnuuhEsQF6l+xadn3csL0Nqs4ty9U52 wOLA== 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=LuoQeMQQrtl1XmsM4uDiGZRevLihMSflRpO6W5fFyf0=; b=nrL3Z1sNZ5isz2WQGN/sZJOZlX7+Ht7rQBEhDGgwIdpe4d/Ow0p/yFXbJWJjzrKUf0 a+jwaYw7HZ7G0u9HppAw0WhTykJbVC6G0HJ6XK4n/qacu7nA4N5ERS+lOT6LaxvwN2Pt 55NzafIDRbtAh3HwB+EpYAOpdoWxaoKmtfCxs2sThGOOP2MEQsi0FcvuPkqMv2PNpIhQ AIxvmIxBpMEvBHNFYDWDIYQ+YHDebYj63mGQDwoWdUj4SDdxr2z+FAuGG/IPFeUwT6M3 zQBDdzDFd7dF1s+6zax9oyJv6P91iZQTsK6Sq2SMJiH6ug6pVsbOaCCO6T3FAnd2Qvnk RcFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex-team.com header.s=default header.b=iybY8AoB; 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 h11si1131270edb.93.2021.02.17.04.10.22; Wed, 17 Feb 2021 04:10:45 -0800 (PST) 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=iybY8AoB; 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 S232760AbhBQMIH (ORCPT + 99 others); Wed, 17 Feb 2021 07:08:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232641AbhBQMDL (ORCPT ); Wed, 17 Feb 2021 07:03:11 -0500 X-Greylist: delayed 138 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 17 Feb 2021 04:02:31 PST Received: from forwardcorp1o.mail.yandex.net (forwardcorp1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::193]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 774A3C061786; Wed, 17 Feb 2021 04:02:31 -0800 (PST) Received: from iva8-d077482f1536.qloud-c.yandex.net (iva8-d077482f1536.qloud-c.yandex.net [IPv6:2a02:6b8:c0c:2f26:0:640:d077:482f]) by forwardcorp1o.mail.yandex.net (Yandex) with ESMTP id 778F12E1541; Wed, 17 Feb 2021 14:58:56 +0300 (MSK) Received: from iva4-f06c35e68a0a.qloud-c.yandex.net (iva4-f06c35e68a0a.qloud-c.yandex.net [2a02:6b8:c0c:152e:0:640:f06c:35e6]) by iva8-d077482f1536.qloud-c.yandex.net (mxbackcorp/Yandex) with ESMTP id XlXJk3ag59-wtxeY82n; Wed, 17 Feb 2021 14:58:56 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.com; s=default; t=1613563136; bh=LuoQeMQQrtl1XmsM4uDiGZRevLihMSflRpO6W5fFyf0=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From:Cc; b=iybY8AoBRftH99ramFuGRb5GUmT6U/wQcK1Gi1xbBbUU7TBa1/tc/Ot7KuEvV1pO7 U1ZgzNTf7n/OF1Tz1XJKJxD3U16PrTGUMlORyWBJcO2nEEnj+PX6ELkP/rOjz7qyA6 7ICJfly+A12/+0hR2VwnVkUsWxW9eq3lehDr9Q8A= Authentication-Results: iva8-d077482f1536.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.com Received: from dynamic-vpn.dhcp.yndx.net (dynamic-vpn.dhcp.yndx.net [2a02:6b8:b080:7222::1:5]) by iva4-f06c35e68a0a.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id GINHK1nK2P-wsnW8SHi; Wed, 17 Feb 2021 14:58:55 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Andrey Ryabinin To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Tejun Heo , Zefan Li , Johannes Weiner , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira Cc: Boris Burkov , Bharata B Rao , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Andrey Ryabinin , stable@vger.kernel.org Subject: [PATCH 2/4] cgroup: Fix 'usage_usec' time in root's cpu.stat Date: Wed, 17 Feb 2021 15:00:02 +0300 Message-Id: <20210217120004.7984-2-arbn@yandex-team.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210217120004.7984-1-arbn@yandex-team.com> References: <20210217120004.7984-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: --- kernel/cgroup/rstat.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index d51175cedfca..89ca9b61aa0d 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -421,8 +421,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.26.2