From patchwork Thu Feb 27 21:55:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JP Kobryn X-Patchwork-Id: 13995244 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAD4AC197BF for ; Thu, 27 Feb 2025 21:56:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8DDC76B0092; Thu, 27 Feb 2025 16:56:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 88B3F280005; Thu, 27 Feb 2025 16:56:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6BB13280004; Thu, 27 Feb 2025 16:56:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2C4E46B0092 for ; Thu, 27 Feb 2025 16:56:05 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A8B0C1C9A89 for ; Thu, 27 Feb 2025 21:56:04 +0000 (UTC) X-FDA: 83167083048.22.928C897 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf22.hostedemail.com (Postfix) with ESMTP id AF069C0015 for ; Thu, 27 Feb 2025 21:56:02 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=EQ4rubGD; spf=pass (imf22.hostedemail.com: domain of inwardvessel@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=inwardvessel@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740693362; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=IvG0OX+5jTFPX8q84psW6K+/pHLcZfB+bAlB9DXTHr4=; b=Ko+XUe6f1Jo9a556a7zxnOAB+Hdlt2RvJ7WJlcyJRGaOWvF1Pu82GjRTWoHy7WJOnc0I/F il6ACryrpOIACx6gdwIHpMIvo0msUVZquC94OBL7Nl1V9gqK7SPoOSsf333v9K/Jkhb2rK Kd28WolQRmFhIf0gH9k/PetUc8Afb7I= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=EQ4rubGD; spf=pass (imf22.hostedemail.com: domain of inwardvessel@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=inwardvessel@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740693362; a=rsa-sha256; cv=none; b=QFHLmENz5YaBIzHXRrXhJvsuJmeElKeXw43LTw8PuzHZtmWGPigGAofFpD/mvJ8V4rI221 6c66/vHvcp3dL8CEQyGLIZRPDrwCuHOHc2aPHELoPcv5BAwFXB56ZglnUaGi1hLA7SPdgB 1Db2tLQbX51R933jdpShO1T+edrAcF8= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-22185cddbffso45831315ad.1 for ; Thu, 27 Feb 2025 13:56:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740693361; x=1741298161; darn=kvack.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=IvG0OX+5jTFPX8q84psW6K+/pHLcZfB+bAlB9DXTHr4=; b=EQ4rubGDBaw6U9TMdmTW6uukpz1Ygz3uOsVAd39Fgu92/YUvzxBu+I0nbQbrCo3SNK VOGY2GmPlGEavUYhyEXddB/0/ueGtquu901g4CHkcVLvJNY3HfgCfJWjJ4J4gJgkHR3T MMnw9AROxy92SJpO2d2vOyUE5II3OZ9bmWiLNk5wwtkcaSVuGeBycy+EX/b1Uhu04+I1 gDC01gODUpXqnDy85gpT2cxgG36gAXSSplam9HkFfGiPLNW6PjjAGErFZmjAoO9vQL9W jjQgSUxaZhzg48STO67iOfs24gy7MHY5NTR4cCN7vitY1aUjWzF7k0M92v32bsUsHMx6 bZrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740693361; x=1741298161; 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=IvG0OX+5jTFPX8q84psW6K+/pHLcZfB+bAlB9DXTHr4=; b=C2An4aywq3xAOHpu5DEqZSV7Gq9NgqlXCj2m9b7oZycH6ePIx0KzUoy8LvbvzUYTHb 3Kn6LiA5ekyHae4fqKAKU2v0mKJSjOWujThb6kiPBjP1hkncNaeh5JgiCpyEC+wC88Al zIsm4E/hORYDr5SASxVwa6rENeHP/q39JoWUZSilJjFpdiYiblYnXhwEhkhQXOA6wBfv Ma6NVPxW3kzUwPmRGGkg6p/rvhjABn4yDq9CPMviEgChy7tmx1g7tpE0t0KEL3DIS5jh ojoF9PsBXEyqhLp46AslQBgbiOFpVntuI/QoEQOqcHy2sKW5+vG4Kofkq2LBOl9S8SY7 Svnw== X-Gm-Message-State: AOJu0YwU2RAfHbv7nuQPUcu0j2ArD9xs9YdN8OcZZhh+j4LClgYDBbyk 8DFlb7XpCJe/wWULTVl874jOQBpIBuDZK1UyYGovjh6XhrWZn+XK X-Gm-Gg: ASbGncttU+cYR+o/dlhCUwOaOMXl2N9MCPKDxcD8/YTzaZ2deYP4tLmjOrfAesSo01r o+hEjkPGVjHymNf+B94vPcg+BfsR9M3ZhR9sAqrnySky1VY9O4/hq32O7libFqyeekbGtWzo1+V VGu36+5+Xs3au5DF2BcPYIYpPNdbWKwYj0vyyCdEWhp3UXgn8XpjEnRgo2WUoEJbkydrzSRlUhS 8o4fki1cCq9ivoPO6HMMVcIFllySLVxlhpy3YJWO3xcn/2fxwYmDKxJR9eHJOXHMxb5fKbl6zxn PDqAt88tK3CBoCxedCk6LtkWHdP+bg5PUDtU64c7E9Ey7nNIPrzLHw== X-Google-Smtp-Source: AGHT+IGjcfGKUg2ZVaYBK69vGrD7xJHUiP7Dd4hYZ4nUyRcwKvzSQp8A3/7Xj1SqgiBaouRBh9iJAA== X-Received: by 2002:a05:6a00:22c5:b0:732:6a48:22f6 with SMTP id d2e1a72fcca58-7349d2f51cbmr7384522b3a.9.1740693361344; Thu, 27 Feb 2025 13:56:01 -0800 (PST) Received: from jpkobryn-fedora-PF5CFKNC.thefacebook.com ([2620:10d:c090:500::4:4d60]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-734a003eb65sm2301321b3a.149.2025.02.27.13.56.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 13:56:00 -0800 (PST) From: inwardvessel To: tj@kernel.org, shakeel.butt@linux.dev, yosryahmed@google.com, mhocko@kernel.org, hannes@cmpxchg.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, cgroups@vger.kernel.org, kernel-team@meta.com Subject: [PATCH 4/4 v2] cgroup: separate rstat list pointers from base stats Date: Thu, 27 Feb 2025 13:55:43 -0800 Message-ID: <20250227215543.49928-5-inwardvessel@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227215543.49928-1-inwardvessel@gmail.com> References: <20250227215543.49928-1-inwardvessel@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: AF069C0015 X-Stat-Signature: 8tg5p6sz8ydceowq8yyu3n3miuf6ynot X-HE-Tag: 1740693362-851291 X-HE-Meta: U2FsdGVkX19Q9aYWXHPkYNx4npd6D62TS0Ys6zVNjEZUH3urxtP4fKgwEKywaOQ0PQcFpfkGEHaxlBSezRegFYuMdIaup5eDQvo+oYmCuXrJqnaRRqDwn9+X7X8Pw5mkD818Bb50GuWAdRX7coiLB/UfMS1OAmF7dv2Ep59K/XXQGD/K5up4ok69Eqf1hTPqufj3oQgoFcixa0Ie3vON7+DS2cB/8CYJddUqDegrfr5cKnageJRuARfLryj5GwMAWG1L0RxyRQ3VBpXLqv3N++CnaaxjfsoJ4WHsx56O0DhTu/JM/ZZDTLZAdp6e3Qn8abYDI2ZhoBKMfrj+4F84d/V2tj/2uBABGP3rdqzcu2tj4Ymz/VNB1lctcY6tb/eQgk5xPONQU//tZZpGnXbiqUAfW1Z6KHUKgo3LBkK5xs7xNEEHVBZ8muDKnsKlsKDLw+RK2USwyAl5K1RYkmUruZ1+SHeogD97WMVrkCc4UHdQWUvXWc0jleZ81Gt36Yn8PjBniDWCpEEeo98tVDcOaSbHO8CH1Qy6e/xm2+yqMLTNq4UXdaCt9ABvj/Ro2RtgLA92KjXAQ5yH6Nbz0J5Xqq5KpsNjAhWczAWgd+teYZWxJ0YuGTEGqXN7Fektk/h4zsEB7S8/NiUBeGoMBmZW2UJ/EsfE9s5r2BXjooIJJ7Vpr7bjH0v4RWbvU75sl5UoZK4tF/qPDs8/g4LCJCBZAuXg+2icBptJuuwOYUTUAGTXeHc7R8GnekYd5gnfy5Jox/LRkB3JxLplZYhrrfhSdJAqa0aCJoK94feYXeZICxXDMtXuaRYLaEalCKR/mrPCXs9mRsc74rK6oWb5z/M2VhjOOE9v3YKSwdQFuF9KztLv+v2QWk9FyiYEWdZrCPAEr/+wgawcDHwyQ2Mk8K3FM4gpKFrsm8yoN8Tjn1e2+D8v2VcQ9VLIN/b2XsudFZd8eiDpwNkfZMDSyQrdmHn cilMuT+z hrcD1tUsZ0BGlX5GhSdX9gbYn0dg9pMQFYK9jv7BcYZYMu/tV5jyP6BHjIrUk3C4ThABE55SflpT6iH4d+jW03OeKw+Y41WgfOz1p04RwuZHYmBDu4Y8csBgELPO8EJ2yT0UmlmpEwSMM1FFf6SOeQX2PZ6Nnx2bRr+gCLZYSwBjyUe59tKSSYAYMJc17iqocMF/9YSwNAcCPPDnfPuqsRmYIE/URSsAMU6Y3dIpqR44jnouWuowzAgPTr2i8eww2YQqpBlVGSZcFc7ZEiDAAGafug7Sre6fNmtRGRqI149vt2aMEVRgcuUWjcMfRA9Ru55gmqrL6eKT6yywZkefT0Vc6I6FqNyGKuDALwqZv1+wEUYkxclkaLiH1Ur2F2dqxEtmB X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: JP Kobryn A majority of the cgroup_rstat_cpu struct size is made up of the base stat entities. Since only the "self" subsystem state makes use of these, move them into a struct of their own. This allows for a new compact cgroup_rstat_cpu struct that the formal subsystems can make use of. Where applicable, decide on whether to allocate the compact or full struct including the base stats. Signed-off-by: JP Kobryn Reviewed-by: Shakeel Butt --- include/linux/cgroup-defs.h | 37 ++++++++++++++---------- kernel/cgroup/rstat.c | 57 +++++++++++++++++++++++++------------ 2 files changed, 61 insertions(+), 33 deletions(-) diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 1598e1389615..b0a07c63fd46 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -170,7 +170,10 @@ struct cgroup_subsys_state { struct percpu_ref refcnt; /* per-cpu recursive resource statistics */ - struct cgroup_rstat_cpu __percpu *rstat_cpu; + union { + struct cgroup_rstat_cpu __percpu *rstat_cpu; + struct cgroup_rstat_base_cpu __percpu *rstat_base_cpu; + }; /* * siblings list anchored at the parent's ->children @@ -356,6 +359,24 @@ struct cgroup_base_stat { * resource statistics on top of it - bsync, bstat and last_bstat. */ struct cgroup_rstat_cpu { + /* + * Child cgroups with stat updates on this cpu since the last read + * are linked on the parent's ->updated_children through + * ->updated_next. + * + * In addition to being more compact, singly-linked list pointing + * to the cgroup makes it unnecessary for each per-cpu struct to + * point back to the associated cgroup. + * + * Protected by per-cpu cgroup_rstat_cpu_lock. + */ + struct cgroup_subsys_state *updated_children; /* terminated by self */ + struct cgroup_subsys_state *updated_next; /* NULL if not on list */ +}; + +struct cgroup_rstat_base_cpu { + struct cgroup_rstat_cpu self; + /* * ->bsync protects ->bstat. These are the only fields which get * updated in the hot path. @@ -382,20 +403,6 @@ struct cgroup_rstat_cpu { * deltas to propagate to the per-cpu subtree_bstat. */ struct cgroup_base_stat last_subtree_bstat; - - /* - * Child cgroups with stat updates on this cpu since the last read - * are linked on the parent's ->updated_children through - * ->updated_next. - * - * In addition to being more compact, singly-linked list pointing - * to the cgroup makes it unnecessary for each per-cpu struct to - * point back to the associated cgroup. - * - * Protected by per-cpu cgroup_rstat_cpu_lock. - */ - struct cgroup_subsys_state *updated_children; /* terminated by self */ - struct cgroup_subsys_state *updated_next; /* NULL if not on list */ }; struct cgroup_freezer_state { diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index b3eaefc1fd07..c08ebe2f9568 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -24,6 +24,12 @@ static struct cgroup_rstat_cpu *cgroup_rstat_cpu( return per_cpu_ptr(css->rstat_cpu, cpu); } +static struct cgroup_rstat_base_cpu *cgroup_rstat_base_cpu( + struct cgroup_subsys_state *css, int cpu) +{ + return per_cpu_ptr(css->rstat_base_cpu, cpu); +} + static inline bool is_base_css(struct cgroup_subsys_state *css) { return css->ss == NULL; @@ -438,17 +444,31 @@ int cgroup_rstat_init(struct cgroup_subsys_state *css) /* the root cgrp's self css has rstat_cpu preallocated */ if (!css->rstat_cpu) { - css->rstat_cpu = alloc_percpu(struct cgroup_rstat_cpu); - if (!css->rstat_cpu) - return -ENOMEM; - } + if (is_base_css(css)) { + css->rstat_base_cpu = alloc_percpu(struct cgroup_rstat_base_cpu); + if (!css->rstat_base_cpu) + return -ENOMEM; - /* ->updated_children list is self terminated */ - for_each_possible_cpu(cpu) { - struct cgroup_rstat_cpu *rstatc = cgroup_rstat_cpu(css, cpu); + for_each_possible_cpu(cpu) { + struct cgroup_rstat_base_cpu *rstatc; + + rstatc = cgroup_rstat_base_cpu(css, cpu); + rstatc->self.updated_children = css; + u64_stats_init(&rstatc->bsync); + } + } else { + css->rstat_cpu = alloc_percpu(struct cgroup_rstat_cpu); + if (!css->rstat_cpu) + return -ENOMEM; + + for_each_possible_cpu(cpu) { + struct cgroup_rstat_cpu *rstatc; + + rstatc = cgroup_rstat_cpu(css, cpu); + rstatc->updated_children = css; + } + } - rstatc->updated_children = css; - u64_stats_init(&rstatc->bsync); } return 0; @@ -522,9 +542,10 @@ static void cgroup_base_stat_sub(struct cgroup_base_stat *dst_bstat, static void cgroup_base_stat_flush(struct cgroup *cgrp, int cpu) { - struct cgroup_rstat_cpu *rstatc = cgroup_rstat_cpu(&cgrp->self, cpu); + struct cgroup_rstat_base_cpu *rstatc = cgroup_rstat_base_cpu( + &cgrp->self, cpu); struct cgroup *parent = cgroup_parent(cgrp); - struct cgroup_rstat_cpu *prstatc; + struct cgroup_rstat_base_cpu *prstatc; struct cgroup_base_stat delta; unsigned seq; @@ -552,25 +573,25 @@ static void cgroup_base_stat_flush(struct cgroup *cgrp, int cpu) cgroup_base_stat_add(&cgrp->last_bstat, &delta); delta = rstatc->subtree_bstat; - prstatc = cgroup_rstat_cpu(&parent->self, cpu); + prstatc = cgroup_rstat_base_cpu(&parent->self, cpu); cgroup_base_stat_sub(&delta, &rstatc->last_subtree_bstat); cgroup_base_stat_add(&prstatc->subtree_bstat, &delta); cgroup_base_stat_add(&rstatc->last_subtree_bstat, &delta); } } -static struct cgroup_rstat_cpu * +static struct cgroup_rstat_base_cpu * cgroup_base_stat_cputime_account_begin(struct cgroup *cgrp, unsigned long *flags) { - struct cgroup_rstat_cpu *rstatc; + struct cgroup_rstat_base_cpu *rstatc; - rstatc = get_cpu_ptr(cgrp->self.rstat_cpu); + rstatc = get_cpu_ptr(cgrp->self.rstat_base_cpu); *flags = u64_stats_update_begin_irqsave(&rstatc->bsync); return rstatc; } static void cgroup_base_stat_cputime_account_end(struct cgroup *cgrp, - struct cgroup_rstat_cpu *rstatc, + struct cgroup_rstat_base_cpu *rstatc, unsigned long flags) { u64_stats_update_end_irqrestore(&rstatc->bsync, flags); @@ -580,7 +601,7 @@ static void cgroup_base_stat_cputime_account_end(struct cgroup *cgrp, void __cgroup_account_cputime(struct cgroup *cgrp, u64 delta_exec) { - struct cgroup_rstat_cpu *rstatc; + struct cgroup_rstat_base_cpu *rstatc; unsigned long flags; rstatc = cgroup_base_stat_cputime_account_begin(cgrp, &flags); @@ -591,7 +612,7 @@ void __cgroup_account_cputime(struct cgroup *cgrp, u64 delta_exec) void __cgroup_account_cputime_field(struct cgroup *cgrp, enum cpu_usage_stat index, u64 delta_exec) { - struct cgroup_rstat_cpu *rstatc; + struct cgroup_rstat_base_cpu *rstatc; unsigned long flags; rstatc = cgroup_base_stat_cputime_account_begin(cgrp, &flags);