Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp841429ybg; Mon, 1 Jun 2020 16:14:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhpGiYAWttAsOZJbSMUbt/Xa0bfNWYL4jPEgZK62jpddxiz5BtdNtOlkGXSLE8BFGTQ6Cn X-Received: by 2002:a17:906:5c0c:: with SMTP id e12mr217342ejq.288.1591053240192; Mon, 01 Jun 2020 16:14:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591053240; cv=none; d=google.com; s=arc-20160816; b=fDaK3+suZYz0/K3FfhcPOyH8toIQ8UABy/hl7hHSY3DWk1CwJ7xSxH6amPB5CKtgF6 YdjJ4c13oN9ivNb5IcDhkLw28QEm/MLGMeZgQ8c4+oS5XdlrzgcegUwI1D9BcqrcT0hY lGfl+KIheFjxLNKI9+i4v1QEmfhMzAsyipep9reeWjFicZ5z9YVYM1ldXKayeuKQhD8U cW/av2uD3GI6QbH8HZw4QMJLAEgKYmLaEBiRvl5hpi4ZlXCgrX4ROiQTotBH9WTPX+WI aVjZ3c0VhVZeZgCPKcEZ9cHH6x49z3+hSVV5mgnbix7CU1SRYSY8y8boPUX0G/sZDZdE AgCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-signature; bh=EJxQtXEmzgFV7qYlHbiD6rvXvAD6+GpjivfAKXYShn8=; b=oVB7h1ISzqdRLvnahlOuzp8wF+fgNBuazxpusRyObHGHFlQXD2TOyQUyDYk6vAhT3z zi/qQzhkMm/e8PUurvXAeB1PkZINB5diT+89RIGMgpbot0n2IK/0zsoiEp/3ptCECcRx toEuecJPOhu8lJxfial1j7mlT/x2kUUn7MGDXecNPtGO1BRRUMKrNrLM+wIpFR9S/ZIB eGNDiROvjehFs0wf+TsmGFr8H45WNM7geSgd+sgFvSSWEPPoY65ZKKEBrypE3lQfZkwa 8U1amcSOL/QQ9ovIEee+bmwq06v8fW0KLZTtjH7qGMomqgXAEZjHPssKqxicS6HYBmKo iNqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bur.io header.s=fm1 header.b="pp/8RPm1"; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=A+2N0452; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m5si504085eds.245.2020.06.01.16.13.36; Mon, 01 Jun 2020 16:14:00 -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=@bur.io header.s=fm1 header.b="pp/8RPm1"; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=A+2N0452; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728374AbgFAXLr (ORCPT + 99 others); Mon, 1 Jun 2020 19:11:47 -0400 Received: from new2-smtp.messagingengine.com ([66.111.4.224]:53589 "EHLO new2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727113AbgFAXLr (ORCPT ); Mon, 1 Jun 2020 19:11:47 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id BF2AB5800DD; Mon, 1 Jun 2020 19:11:45 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 01 Jun 2020 19:11:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bur.io; h=from :to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=EJxQtXEmzgFV7qYlHbiD6rvXvA D6+GpjivfAKXYShn8=; b=pp/8RPm1nMDp8zDWGn+jMh9zTt5XUJaZJT5CvG0dcX JRhtGOWyadjxXEh4fVuAcsq7QZZ+zbesJ2IUYWrXUcVzXmFHd1i3e+L2DhzM/yx5 IQ2i1htYsKcVQtZi6UFEJqUmkGpN21btMEvllx5NFZaCwLJVDDvSZoX5shfxHGzy q9ZSZ6izbtxumf20J6CWzmEWtB/tk53hIAI+g91CvsyVaasvZ7hqTnMr//FEUT1c LrpDWDXjwIwtI/FfH9dtaqpXvLvGGZwkoDzJM5y4fq9KGJK6I4BUrr/hQmYTq9FN 6V9Tya8NxGIILvr9/dwWfuDtlrEQTQtAHfWXb6VmZOmg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=EJxQtXEmzgFV7qYlH biD6rvXvAD6+GpjivfAKXYShn8=; b=A+2N0452c36DE0qjKhBkM9RicotCU+OXG ZRRHrE+KyZdHSShWo/lWsb0ey7SWaUKHObn2xZiTSll0E38D+FBamXZ+hV6MLXFn 1qSTbnPBQJabyiC4iqyPb2BlwizRAIorwWZRQx8oLPD+5IhsVuugofC2/Vw3mhpv /7zfOGE2VnvdDAg1QV5TQZv2q4tDFmhkHcrHtrmvZ5v/ZqV/8HEUmOGt+KLL0+KX gp0WA+ZRhGh0m4opyE5Cc0lmBJNpwKBHCQrC6wIAXyzgSjN6Esp+CH53yWrtxn9U dDSOtDwnI56QVbuUYiSGPP+Yom5QkttwYg08dBWl5odn/JpcWwOGw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudefiedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeeuohhrihhsuceu uhhrkhhovhcuoegsohhrihhssegsuhhrrdhioheqnecuggftrfgrthhtvghrnhepudeitd elueeijeefleffveelieefgfejjeeigeekudduteefkefffeethfdvjeevnecukfhppedu ieefrdduudegrddufedvrdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepsghorhhishessghurhdrihho X-ME-Proxy: Received: from localhost (unknown [163.114.132.3]) by mail.messagingengine.com (Postfix) with ESMTPA id 216D63061CCB; Mon, 1 Jun 2020 19:11:44 -0400 (EDT) From: Boris Burkov To: Tejun Heo , Jens Axboe Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Boris Burkov Subject: [PATCH] blk-cgroup: don't account iostat for root cgroup Date: Mon, 1 Jun 2020 16:11:41 -0700 Message-Id: <20200601231141.2218370-1-boris@bur.io> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This data is never flushed by rstat, so it is never used. We shouldn't bother collecting it. We can access global disk stats to compute io statistics for the root cgroup. Signed-off-by: Boris Burkov --- include/linux/blk-cgroup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h index a57ebe2f00ab..e9de4ec07182 100644 --- a/include/linux/blk-cgroup.h +++ b/include/linux/blk-cgroup.h @@ -591,7 +591,7 @@ static inline bool blkcg_bio_issue_check(struct request_queue *q, throtl = blk_throtl_bio(q, blkg, bio); - if (!throtl) { + if (blkg->parent && !throtl) { struct blkg_iostat_set *bis; int rwd, cpu; -- 2.24.1