From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 6A39220766E for ; Sat, 25 Jan 2025 05:26:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737782779; cv=none; b=rCylzjla0ujtgh0LJ2I6i5F9mjTDxzYg73BaU5/H5bPDQAnCsjLRQzsgxw10MrHAa4uVYGGc8Ex0PnXRUUBfDWxycRHKKtY5nCYKz2IftbkhF7PDGWkKSvf2MV8c7ePs0vcFQwpugvLc0xIm/vl+6sDHsg/J11S7SV41FWVXgaw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737782779; c=relaxed/simple; bh=aEtkYsQ/WkKEeXt9CBXl6mkcKsScO2YS9z/v9JWQHrQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KWAo4SkkIbkqVjeRYnyOG7d36BvHNkoB7lYPZvetPBzazOGn5oD/lD1rXoyHlaZLbu+DhSx6Ef1778l0PEfC7H39rJyI+y9r3GDmhnFsTkcypMbwI7wHD1TPEAGWymhZlm91M0yrkt6ocOiHRVEqmakFaveUXtWdADKUBWXCejg= 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=DzIxWiIn; arc=none smtp.client-ip=209.85.216.53 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="DzIxWiIn" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2f2f5e91393so616800a91.0 for ; Fri, 24 Jan 2025 21:26:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1737782775; x=1738387575; 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=7eCb6/WBehJQZpcvJZGWQL2Hz1Q/N9ND9H1TrdzwNMc=; b=DzIxWiInmrDisvXREsDqjzWkHDWfrq7tGS23EnmmAScOQuoaJiBqeINleOqrGFopon 14EMzUlM5r0++j2u1jBj3G7jnJGy+FxqowcHAYSzNCC677QxBLe37ZJFrhYAmWm7R+6/ HgV/eh7DXiSHaU6VWYS6gDgmlRAxqanv7Cv5bw0ZOKjxp4JRhoxO4X4NuzFf6n7FnXSc in7/alBShe9gaeUZbniYQjXB5f4pyouC/KpWTIiv1KwqQfAcaXCpU/y5q2C99tNULY4q RjsxCkuKheLI6m2vveKQ87LfeHECpjMlQgoJXrytcutmKPFQrzH9PzYtoz3HBp8M5eU1 DQfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737782775; x=1738387575; 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=7eCb6/WBehJQZpcvJZGWQL2Hz1Q/N9ND9H1TrdzwNMc=; b=oVWPHsmcRnZWeZ1xerdgvrI8wUiHCZesQuYkdba9VJ2/1e6Deto8SmVcfW4vBaWTlk XsAtLon3/FlZaUYSQ4PaTIiJ+2o/JkstwpAynJDqApIwWYf9yLRe0SYYGTD3CFXFMGDh EaidyvjmY1RM6B77FjwR9BwQ27FgT+yoZX5ETCo1BP/Ox78LvbroxShCJCYRwdXwwCOl iLAvhW/0Hzc71D0H498S1i8zrlgpDqJL5XYaRoTE+8OBOU58UJwyaXgRnN/3ghuvJ2Pc FwmkOt05Ggq2ydboNmiPEWCXRCzVj695Brqewvj/373Ujyto2aoJVA7Bs35RijtFhBfr 9/Nw== X-Forwarded-Encrypted: i=1; AJvYcCV7Eo9u2FCeW9ZgRFDypeBsKS2YjQdMna1SINgk4r86I/hqDyF+ZmJeahsGxh6r00RQvxG+EtBIGl1vBXs=@vger.kernel.org X-Gm-Message-State: AOJu0YzvF35bwf3uQkcPCw2QosCsQwabWWIRzLcpaWI7m8z2uxJPSxFw thjZ/tiB3HhAIJwuNbOV4hm8TOF/inQThIm92XaofNe4njZ+xk8d0pXOs/Oba8s= X-Gm-Gg: ASbGnctLrSr7cB81J8lvDeJak4AJ2gz/ysGqCTnuOMCZeBefQ3Nre1bzEK6fNuTvPJF iwxoHMoGOoQO9TcgiSJ3WEQvoyh7lzRgoNoX/0gwjc0TskC930wBaHRWNJrBCGHcExS7nF2tpj7 qLjkBx0P8ZmCMuks+fUy3C1itG1pRSDr/0Dwkl28f20xqhQ4/TegrGd2e2cppUmPIpin8rkuaAK ckpwQ3K6K3Hy7CdJ5YCPERVGotMig40tBV+DyTKlqklEIeTWVQMc4MoyEkcp5+P7oQLJatYUYek Z/arXtAfrb/H3Lp0v3VmcZrLv1i/6T37FXOSlSb9Itc= X-Google-Smtp-Source: AGHT+IEF1uRgd/zoHtjikgksLY/feiCQXspGODJ2tSSlRF8u1Tj21NlAQAQEv3+mjbNYZi+a+IWdcA== X-Received: by 2002:a05:6a21:900d:b0:1cf:4dae:224e with SMTP id adf61e73a8af0-1eb21470211mr18598282637.1.1737782775632; Fri, 24 Jan 2025 21:26:15 -0800 (PST) Received: from C02DV8HUMD6R.bytedance.net ([139.177.225.251]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ac496bbdc9esm2563856a12.63.2025.01.24.21.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 21:26:15 -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 , Bitao Hu , Yury Norov , Abel Wu , Thomas Gleixner , 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 v2 2/3] cgroup/rstat: Cleanup cpu.stat once for all Date: Sat, 25 Jan 2025 13:25:11 +0800 Message-Id: <20250125052521.19487-3-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20250125052521.19487-1-wuyun.abel@bytedance.com> References: <20250125052521.19487-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 | 47 ++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index c2784c317cdd..dc6acab00d69 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -599,21 +599,39 @@ 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 cgroup_bstat_entry_show(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 +643,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++) + cgroup_bstat_entry_show(seq, &bstat, e); } /* Add bpf kfuncs for cgroup_rstat_updated() and cgroup_rstat_flush() */ -- 2.37.3