From patchwork Tue Feb 18 03:14:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JP Kobryn X-Patchwork-Id: 13978860 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 D12CAC021AA for ; Tue, 18 Feb 2025 03:15:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 884702800C3; Mon, 17 Feb 2025 22:15:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 80C342800A4; Mon, 17 Feb 2025 22:15:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 685212800C3; Mon, 17 Feb 2025 22:15:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 471F82800A4 for ; Mon, 17 Feb 2025 22:15:22 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 05A4350025 for ; Tue, 18 Feb 2025 03:15:22 +0000 (UTC) X-FDA: 83131599684.15.A96B1AD Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf23.hostedemail.com (Postfix) with ESMTP id 3CE6A140004 for ; Tue, 18 Feb 2025 03:15:20 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NnAk8Qld; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of inwardvessel@gmail.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=inwardvessel@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739848520; a=rsa-sha256; cv=none; b=3+VMy0iB0KVHS2bU3bYXIyPA2wmonkFUeWkdsTTTj2cAk3+RIaIpKnDyPHGYQKK2Cls8nV QCY2dvQRFFIuH1njCrxX1xEDb+XVdz6wGqhnw74Kg4Tou5zk8aDBgHojRYKvM6MeR1fOaa SHw8SmlWeKE+0yICMkQc9hHGT/CpbO4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NnAk8Qld; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of inwardvessel@gmail.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=inwardvessel@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739848520; 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=LAAYrMp38Dbf1h36ApVAoOaASM18TrELMrU+bZs87zk=; b=8piIoLL23L1Vc8BvJCmXWc4ZKi2Gb4l6nghrwIguBRQWvHDnfZ2PeOEtDdUSgy+CZaaVfy 24DReVb9wXireZuUrgaH7SLTaw71QanTygCxTuZMSunNS3xdnpIMF7+ODUu1ldXoaTPmd9 MT0MseFBnkGHS+rlNTHxQtqI5PcxLs4= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-220d39a5627so71564965ad.1 for ; Mon, 17 Feb 2025 19:15:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739848519; x=1740453319; 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=LAAYrMp38Dbf1h36ApVAoOaASM18TrELMrU+bZs87zk=; b=NnAk8QldNVsD3gsrQdMrBIzHOigu6KQLWbX5NhfK6GjoJyPBGbH/sByIvb0ocjEnFb DylbRSv3ds8Iuim/d45RbaAC4CmmoQ8fPuEm4+AiY/uEZh+uzXfUIRUXTtnfziHUQTYt Y8Y4NxoJT1qhDwZw0vO7vHUngnExKXaO8/6OJiv/ny1voqrnjHCC23QowehzZarvrr8/ BhbcbuIBc5/84qGIRtFImkedK4vJa5qpevCQQq1l+PdHAycTFdMOpfnHZCybWZIO1lXe yNDBni2+MVz1b/8nTE9sL3/hvTJy6hjTK+JyQWdOKPtrj9HTbN6DLCYeao5wFNHynQTF baVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739848519; x=1740453319; 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=LAAYrMp38Dbf1h36ApVAoOaASM18TrELMrU+bZs87zk=; b=PNGOE4S0g8DVF5drXIvByMmreTu7+x5RUjJZVXCqUa3lBj6eknL6pIdnnQdh+9micw Xkv6CcVjQijiiWEtAovpGq79XGMziZbL2BsymZMeyHiH8hF9H/2leUDiuSvJ2neEYaqP 64BVz2y/DKgA5dhYZ+opl2GEH1ReuOxpFKAhLGcYI9qDu7/nEHwrjhV5YZEixOkNy8kQ LdOPzdebha67AcsEK/uwmV6p4RFN8d3vdCTx9/+nf+Ae1kOo9gAsZchAQ6O7x0u+nhL4 6vCv3HXfhdVb6UEB7LoWahzphgOGBQ/WNNvDKAcg63BEiz6SdumuXMuQlgkxJx//T0XN gtfA== X-Gm-Message-State: AOJu0YziNm3ITIu0YsE8ZHo9e3CKmpQhuYGbEA7+9szApbCa9rrqzF8y s8BY0+JmdJMyEFG6cUrQj9i9pO5gW6A31NCOgAw6ZCo7prbB3Rgg X-Gm-Gg: ASbGnct659x122ooRLbqO9GSWFfV9P3BIZlicVv8ekHVlmjKeWqzkhQ35uFDr7c0dUf 741XTKzvqEpXEZVr4B9b623zh9AUlo1JHdQ/YnM1KfbYT826nzDwRrHOa7gShjveR5G+eMbU2dx nIpggZE4almjrMkRV0ga6hL4EfY/Mk6G0u5hTH8cXPflNVEO0ujllGQugYC0OvhCzADaw9g4wLL FieZcRBNvLXPpestdVt7aBc/tgAJ1OCjZupJkY9/Da2oS/0pW6PixaAVbn87aGAydAUqbH3qbQt 4WV4bHctV7ByG+vs2SWhcgtXRsL/w3mFuSYSsjT09LavoyjgbS95 X-Google-Smtp-Source: AGHT+IF+gu3zHN9lsAlpDAPTExtIPOeyPRNrR7IkVwslhKU3Ky0hB0noFRxqnw8wTCYxNUTtfjP8iQ== X-Received: by 2002:a05:6a21:6da7:b0:1ee:5d05:a18f with SMTP id adf61e73a8af0-1ee8cc25a7cmr22443182637.35.1739848519160; Mon, 17 Feb 2025 19:15:19 -0800 (PST) Received: from saturn.. (c-67-188-127-15.hsd1.ca.comcast.net. [67.188.127.15]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-732425466besm8763451b3a.9.2025.02.17.19.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 19:15:18 -0800 (PST) From: JP Kobryn To: shakeel.butt@linux.dev, tj@kernel.org, mhocko@kernel.org, hannes@cmpxchg.org, yosryahmed@google.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, cgroups@vger.kernel.org, kernel-team@meta.com Subject: [PATCH 11/11] cgroup: separate rstat list pointers from base stats Date: Mon, 17 Feb 2025 19:14:48 -0800 Message-ID: <20250218031448.46951-12-inwardvessel@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218031448.46951-1-inwardvessel@gmail.com> References: <20250218031448.46951-1-inwardvessel@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 3CE6A140004 X-Stat-Signature: z45ch4f6krmeaz4u6xm46bq5dpkok8cc X-Rspam-User: X-HE-Tag: 1739848520-447398 X-HE-Meta: U2FsdGVkX19nlzeZ2LFYDCUEI7ZLClD9sxSJArbstud9gA2GAD4FhQjpSK3QJYCu9IPN+MIfgY9jc85esIoq829pvkNQ6kdLp/JBUcBOjQDTD/OhVJOrZLwCDJJ87KTOppu80xQZ2fBgRSH80xj/qfmQYh0ACGs03ZXcSM2DuY7npYeJI5u3IymRnftr58I7ovHh4m4hpwQmYtJMOgKVWhc1ER8LmtBRLdG9+kPfwLSZj20gTWSJSiG4o9gZUbc/TAq2DPlvPYaA4L5Cmt+durAtgC3uhnPwWKv3fUotqquNyNrIo8sQKPM6Vjpaju8XaN73zNGnfNWbdAi/mCDy2TaTJ+xU3yduWeidrlQ4sRggZfhWAHkAl7h8ekknLbF4HnH5S6f7y4IfaGVHse4mXvJbdvuEkogbGiQ30FJ62Yvg6ZCrm6I8Fn3NLTubBLlifKultamESoxjuXJRgzVIV8bMhEnnF9u1zF+AN1c/gAkBf7V7Vr8tPp6dQi1jcFqJDKCF1TEUNCWOJ3Il3dpsAxbSwpe8JKnwM0McOO7mplOuh/9aLWQUB2RG5a4mOfO6NmqJ1cJgQZevC9IhHgcKbe68nk+49vZHKUISQVK1PP+Z658vWz7aMDPrPciqUkAELV58oeZWenKNqfAxY+AqB77g9IVt1go6pQ8AdTZgK1U0dNfdEQYhiy1Lm4zwV50JAkNTj90CR8JD5uBKpeJHlgRVchce/KAn81+ZI18nAcnQ5GzpmNltbCjfJX8QOHW5qVvPaLirOtjYXmq9GEoy0wbtfoOPdoAK3eZdbPdt99/Aa4GnX6IYbRCJLBBkB7vR/i6gbFsWo8qyMGYIKyFFnnBkc0azIsPo/2LqyAAsN3OeU92P+bS2kmDVG29r997OmAcWB0wLMRxTbC0GSxN3N9tB8m7voW3tWjWMmCEoD2Cq7w64Wd2U6jgE06Co2Zh92hFlNGKXVVRThDLBkX9 svojQk+S 0/do5Milo6Gs3MosrXgfVWS4w0Bbut/6nx1j5Cxtj/bSn/jwvznIlaqhAejgUXYM0xBx7uLxqExtOCBiE+8JQfYEehR4DD06G4tUe6Wjfgdwmlx43opwOXOUnbjkn1XifR+ErUgyzRlxeu5qBcRT3wxW1IkwrVp1WYSBZ7ddrRdJxzNG6DvOjWzTuISq44l6sMgELFPJGsL0GOHohi9L6znf2oLFYAspxUQqNP47Vx6vP8H48yFpQpLMZbdbhFJAX4mdH25emvAvUmYaipA+WQQJl+eGONPxYOnRj1vYJ3Yz2BPqvCAf8RkkHNWIOn4S/lePVn+eOJGunYVaW3SbcxVwJyOmK8WKVxFxOCYY7KnnwHYYzoNKo1Fc2kw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.003618, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 the full struct including the base stats. Signed-off-by: JP Kobryn --- include/linux/cgroup_rstat.h | 8 +++++- kernel/cgroup/rstat.c | 55 +++++++++++++++++++++++++++--------- 2 files changed, 48 insertions(+), 15 deletions(-) diff --git a/include/linux/cgroup_rstat.h b/include/linux/cgroup_rstat.h index 780b826ea364..fc26c0aa91ef 100644 --- a/include/linux/cgroup_rstat.h +++ b/include/linux/cgroup_rstat.h @@ -27,7 +27,10 @@ struct cgroup_rstat_cpu; * resource statistics on top of it - bsync, bstat and last_bstat. */ struct cgroup_rstat { - struct cgroup_rstat_cpu __percpu *rstat_cpu; + union { + struct cgroup_rstat_cpu __percpu *rstat_cpu; + struct cgroup_rstat_base_cpu __percpu *rstat_base_cpu; + }; /* * Add padding to separate the read mostly rstat_cpu and @@ -60,7 +63,10 @@ struct cgroup_rstat_cpu { */ struct cgroup_rstat *updated_children; /* terminated by self */ struct cgroup_rstat *updated_next; /* NULL if not on the 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. diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index 93b97bddec9c..6b14241d0924 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -33,6 +33,12 @@ static struct cgroup_rstat_cpu *rstat_cpu(struct cgroup_rstat *rstat, int cpu) return per_cpu_ptr(rstat->rstat_cpu, cpu); } +static struct cgroup_rstat_base_cpu *rstat_base_cpu( + struct cgroup_rstat *rstat, int cpu) +{ + return per_cpu_ptr(rstat->rstat_base_cpu, cpu); +} + static inline bool is_base_css(struct cgroup_subsys_state *css) { /* css for base stats has no subsystem */ @@ -597,6 +603,18 @@ static void __cgroup_rstat_init(struct cgroup_rstat *rstat) struct cgroup_rstat_cpu *rstatc = rstat_cpu(rstat, cpu); rstatc->updated_children = rstat; + } +} + +static void __cgroup_rstat_base_init(struct cgroup_rstat *rstat) +{ + int cpu; + + /* ->updated_children list is self terminated */ + for_each_possible_cpu(cpu) { + struct cgroup_rstat_base_cpu *rstatc = rstat_base_cpu(rstat, cpu); + + rstatc->self.updated_children = rstat; u64_stats_init(&rstatc->bsync); } } @@ -607,13 +625,21 @@ int cgroup_rstat_init(struct cgroup_subsys_state *css) /* the root cgrp has rstat_cpu preallocated */ if (!rstat->rstat_cpu) { - rstat->rstat_cpu = alloc_percpu(struct cgroup_rstat_cpu); - if (!rstat->rstat_cpu) - return -ENOMEM; + if (is_base_css(css)) { + rstat->rstat_base_cpu = alloc_percpu(struct cgroup_rstat_base_cpu); + if (!rstat->rstat_base_cpu) + return -ENOMEM; + + __cgroup_rstat_base_init(rstat); + } else { + rstat->rstat_cpu = alloc_percpu(struct cgroup_rstat_cpu); + if (!rstat->rstat_cpu) + return -ENOMEM; + + __cgroup_rstat_init(rstat); + } } - __cgroup_rstat_init(rstat); - return 0; } @@ -718,9 +744,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 = rstat_cpu(&(cgrp->self.rstat), cpu); + struct cgroup_rstat_base_cpu *rstatc = rstat_base_cpu( + &(cgrp->self.rstat), 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; @@ -748,25 +775,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 = rstat_cpu(&(parent->self.rstat), cpu); + prstatc = rstat_base_cpu(&(parent->self.rstat), 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.rstat_cpu); + rstatc = get_cpu_ptr(cgrp->self.rstat.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); @@ -776,7 +803,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); @@ -787,7 +814,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);