From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC223156F21 for ; Thu, 23 Jan 2025 17:48:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737654524; cv=none; b=Ob226f4pqsA/XgYMyjv0WScCpCgMDUsuQvw0VoUf7gXRmqBOU0cPOsH7J5G4iT9kRiRFXPGhKH+aZ4s1LXxHzWzjvgoMl/D2wzlS6RrRucP+d9SS3WBE/o6WrnilgQnRafPYgg5GsY/PKuMgSHGutb0sBX2kK+O9/eZzJc33isw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737654524; c=relaxed/simple; bh=XwNrVTH6RspMCBLEZ/5wMEfwaHpU6drBEqIS2KKM5wM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KcO9YD3RiCPhTtM+kUUPwYAnqCT2Vsm2ypghJebADIcLD4lQ14qoiFfS+pqBLq4atJTXewQyK0mKWmcctwTssybsbZyxL7pklrh67QN0V9Knq3Ashmt/vGdmvak17kT4aY+20eGr+zr57Jmxn61j1SI9bozxpvZFjy2gnfGe+JI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=L6DjL5zd; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="L6DjL5zd" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-21644db9f3cso2644295ad.2 for ; Thu, 23 Jan 2025 09:48:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1737654522; x=1738259322; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cx8fUoG+qG925p/xr/d8LpD/h5B1JhsStZuypGEmZQI=; b=L6DjL5zdrc1QnqkaGNFl/4rQG5acwUXjonz5eIBm1+6/9eSxQd6qY4XQelX8c4Pyvp r7f6lkHnpPbXkJZ5M1v8KyzcThJ0Q3INXz27J/c0lmCUG4f2lI4Ti65hZVvNIojBEmnz LApywd05kKUx5+ZY4Mshri5SUNo8DWJNt29aqor6LwJXfFqJXgRZ8AY9Ro9PsxVE1Jmm n7ROryizyiOOUtrYc14foNfXj2pmD1fDQRXBAoW4xykQaDVZyJ2AQaE7c5lQc8QY0VFW 3eMCR2ECkPjrBQXQUN4IA1XeiyHCNTyTPnUdu1MftR04NMbdFrFxw3E0id3qFWVWIodt n1DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737654522; x=1738259322; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cx8fUoG+qG925p/xr/d8LpD/h5B1JhsStZuypGEmZQI=; b=VviUJegrnzIg41qgVGPYqGgKAuxmy0DZFbXnsm/+XqnXtRG3lpZFHIJ75F7c16QOR3 iP/nveIBvQF9lInZXq1EHwWbLkEADtOGUFsyDGDEytgYRLz1eWOG9FT3vRH1FgvaMIyK 093xOKiz/deZJ7Vc/4POkQ4Wau5SlED//6nfp5tOY+zI4TPLaCjekrcCatcMjAv9doVg bF7T1M+z8zyLIHDqAFJBfyIxEXUaeIGH3O8ReaGkpf3ZrOkqxl2VmbAfdUPUs3MMGCmV txolTN/WTBzvrsnfb53CmISJyInCUOH6aIJiGC+YorXyUiuMo3ADeFnrjeEyrVHUF1zE QDcA== X-Forwarded-Encrypted: i=1; AJvYcCXJ6SWz71eEZX4OdWilFGawk7dbxpoRaUF46xkUEwoVe6k//9bUFECY676g62MkH3ELWodWx5DvYlxGwFc=@vger.kernel.org X-Gm-Message-State: AOJu0YzfsxF7wCeS6FIu4h5fud7nyRW7wsi1kCmbTeDYSXE5dfvT8Kkg rtMjso1TEEeoCfS+4qGN42EUc7f0Z8qVHvdWMEQwDaOhuMB70CBNboqc/l7apM0= X-Gm-Gg: ASbGncs8/ImZeJagY0BpQVTOhQtGW1q7yLY37KtOo2bOqMtq/rxVjpS8bVw3t4uCrb2 IyAY3mjSKb/WkjVj1qZNjwiS1lrfp+qJ9EE1BBC4UV7SlLZhZ3IMky3XYWZRiY6lnJCXC5ua1bm 9qSHd0nYjs/zDl931bKbgziC7wyoU0sWfE3I8TybR6WphAut9pM8w97Dq3YU91qJVRJnJiXlNay 3l78kx0aldlRT7oRLuupxGcueoD2ri4PTr5LMK7wQCu4m4/H2Ax2JvvKFa6eY34D2D2umggVvAf oyKzACHIWAj4dWmIuH7hhYUoeyamP4jci9nvZOg1lC0= X-Google-Smtp-Source: AGHT+IFsazWW4fPdtPuxncs3q9P/qmXf4v1U22R2wSi5/Ec7pQyEc+6B2cc7jn1KQB1fA2Ms5Bmetw== X-Received: by 2002:a17:903:1106:b0:20c:f648:e388 with SMTP id d9443c01a7336-21c355c024bmr149310335ad.7.1737654520451; Thu, 23 Jan 2025 09:48:40 -0800 (PST) Received: from C02DV8HUMD6R.bytedance.net ([139.177.225.251]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da4141c4esm1620765ad.110.2025.01.23.09.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 09:48:40 -0800 (PST) From: Abel Wu To: Tejun Heo , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Jonathan Corbet , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Andrew Morton , Abel Wu , Bitao Hu , Thomas Gleixner , Yury Norov , Chen Ridong Cc: cgroups@vger.kernel.org (open list:CONTROL GROUP (CGROUP)), linux-doc@vger.kernel.org (open list:DOCUMENTATION), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/3] cgroup/rstat: Cleanup cpu.stat once for all Date: Fri, 24 Jan 2025 01:47:02 +0800 Message-Id: <20250123174713.25570-3-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20250123174713.25570-1-wuyun.abel@bytedance.com> References: <20250123174713.25570-1-wuyun.abel@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit There were efforts like b824766504e4 ("cgroup/rstat: add force idle show helper") to escape from #ifdef hells, and there could be new stats coming out in the future, let's clean it up once for all. Signed-off-by: Abel Wu --- kernel/cgroup/rstat.c | 46 +++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index c2784c317cdd..6ad647f3e241 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -599,21 +599,38 @@ static void root_cgroup_cputime(struct cgroup_base_stat *bstat) } } +static struct bstat_entry { + const char *name; + const int offset; +} bstats[] = { +#define BSTAT_ENTRY(name, field) \ + { name, offsetof(struct cgroup_base_stat, field) } + BSTAT_ENTRY("usage_usec", cputime.sum_exec_runtime), + BSTAT_ENTRY("user_usec", cputime.utime), + BSTAT_ENTRY("system_usec", cputime.stime), + BSTAT_ENTRY("nice_usec", ntime), +#ifdef CONFIG_SCHED_CORE + BSTAT_ENTRY("core_sched.force_idle_usec", forceidle_sum), +#endif + { NULL } /* must be at end */ +#undef BSTAT_ENTRY +}; -static void cgroup_force_idle_show(struct seq_file *seq, struct cgroup_base_stat *bstat) +static void __append_bstat(struct seq_file *seq, struct cgroup_base_stat *bstat, + struct bstat_entry *entry) { -#ifdef CONFIG_SCHED_CORE - u64 forceidle_time = bstat->forceidle_sum; + u64 *val; - do_div(forceidle_time, NSEC_PER_USEC); - seq_printf(seq, "core_sched.force_idle_usec %llu\n", forceidle_time); -#endif + val = (void *)bstat + entry->offset; + do_div(*val, NSEC_PER_USEC); + seq_printf(seq, "%s %llu\n", entry->name, *val); } void cgroup_base_stat_cputime_show(struct seq_file *seq) { struct cgroup *cgrp = seq_css(seq)->cgroup; struct cgroup_base_stat bstat; + struct bstat_entry *e; if (cgroup_parent(cgrp)) { cgroup_rstat_flush_hold(cgrp); @@ -625,21 +642,8 @@ void cgroup_base_stat_cputime_show(struct seq_file *seq) root_cgroup_cputime(&bstat); } - do_div(bstat.cputime.sum_exec_runtime, NSEC_PER_USEC); - do_div(bstat.cputime.utime, NSEC_PER_USEC); - do_div(bstat.cputime.stime, NSEC_PER_USEC); - do_div(bstat.ntime, NSEC_PER_USEC); - - seq_printf(seq, "usage_usec %llu\n" - "user_usec %llu\n" - "system_usec %llu\n" - "nice_usec %llu\n", - bstat.cputime.sum_exec_runtime, - bstat.cputime.utime, - bstat.cputime.stime, - bstat.ntime); - - cgroup_force_idle_show(seq, &bstat); + for (e = bstats; e->name; e++) + __append_bstat(seq, &bstat, e); } /* Add bpf kfuncs for cgroup_rstat_updated() and cgroup_rstat_flush() */ -- 2.37.3