From patchwork Wed Feb 21 19:40:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13566206 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 012A2C5478B for ; Wed, 21 Feb 2024 19:42:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58E756B00B8; Wed, 21 Feb 2024 14:41:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5197F6B00B9; Wed, 21 Feb 2024 14:41:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 258BA6B00BA; Wed, 21 Feb 2024 14:41:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 0095B6B00B8 for ; Wed, 21 Feb 2024 14:41:56 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 922C6140B43 for ; Wed, 21 Feb 2024 19:41:56 +0000 (UTC) X-FDA: 81816831432.03.8AE49D5 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf24.hostedemail.com (Postfix) with ESMTP id C8558180007 for ; Wed, 21 Feb 2024 19:41:54 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=zMRI4Ae5; spf=pass (imf24.hostedemail.com: domain of 3AVLWZQYKCDQikhUdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3AVLWZQYKCDQikhUdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708544514; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SBIp7l6FYh66kLRcBRL71yRbl3V2EKRiwuHeAcwsTzw=; b=Qoalu7H+wZiVrt7PNA0qYo0KIq9ijtAhET9+HRWyi8vFv6+tE4BFwouPeT3ullAG3Ni6NL fIwlHyRxbO4APfx3Ishhbz3uPC4fYnwUrErZgY6C4gk4256mgEI/ZEFMTUTfp/SJKz2xkj 86WqV6Ajg5k1fE+L0OVjZKaVeKLYaNw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708544514; a=rsa-sha256; cv=none; b=bO7n0+6chJ1MDlmNzBkj+dHMgamwWLsCAYNnWWtAQC8wLUdsktBwExqcqd7Oj4ndkGaFwY 4u75hPfW1cZH0TqXIvorcfYN1XkhMNb/reDUYG9KNKfVZvJ8KokULaGwQ570kbYxU9VlPT limHxXNgQ92glBD1la0eV2t3tbhdAuI= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=zMRI4Ae5; spf=pass (imf24.hostedemail.com: domain of 3AVLWZQYKCDQikhUdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3AVLWZQYKCDQikhUdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6087e575573so22039637b3.1 for ; Wed, 21 Feb 2024 11:41:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708544514; x=1709149314; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=SBIp7l6FYh66kLRcBRL71yRbl3V2EKRiwuHeAcwsTzw=; b=zMRI4Ae5/o1RViZDLr1InOQ/OzdjWN5eXGOMhvqV8vLq+ETan1yW+HmbRCurn3eMLg 47WBpc76+cxniSfqlGI3wmmSJpJOaOuIiarpTGwQKlJ4AK/ScXmZW57uVyX1wHI27w04 QxlNpT9xLZNW7PbpYkNjR2100FezHFd5WTo89zsV0WiVdrSl6RLI0H59aH3j89B+s+YL nUCMpC9eNvHZXjvy/x2p9WVxxLMd0f6hydFtlvT56dPWzq+G1i6ZyjLlHa0fZvzWuI7b Lecu/EuHrQSxcBZlwK4WYvzEre0vXzjGB6OZiVK0T9f5FsHlF11tTdoG2U9SRthhcAjN 8UKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708544514; x=1709149314; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SBIp7l6FYh66kLRcBRL71yRbl3V2EKRiwuHeAcwsTzw=; b=SeRTHTL51G0mYzIKVOBMea/6QsrT1PUrlXcIbkaB5WJwLCsri95WsayWOAOnoWQU25 9Bh0zO3FhPbMB1Luf2nWeAZ0DaOVu6BmiwtimaE73S2bb1x1qXW3kL26EfJdu+et8GsY 8vQ1YZjZmKQ1ZEY68a5k7c+udXYtpvpqUhAA60VXdSY/aw3Xz7bSmQdX7FwPkP3vlCCk Mt/ahA0gRaOET/oWA4HRXziPNwgk4cssoTGgAM9QApZqzJHH+4XCV5mUgU4M2Lt5xbD/ C/3p3yTymWpQh1jfJXHN0ebmomuevaxo5SaqFiB4qykGvyJHbGagbZWmp4+xC+ShVfFx x7Rw== X-Forwarded-Encrypted: i=1; AJvYcCVRzGzuX3xyMBNG0bluF9l/cQzQ7KDMkIkdyFFOgzVW8Bgv6R+Bmoq6Gwcwc508t7f66tY58BNDb9PbjIWWzGIcZjU= X-Gm-Message-State: AOJu0Yx4RKwEADA19YIqTZAKUEkOfA4r8NTplHIUUfm2w3EZe+fnIxIL 6NXm9g2Cnk8jQP1OBEd0OObOKtDxJL/PnSm9sl8IwrOltPocczS/9BF+j7jxSCHXstVnTrUxJ4k upg== X-Google-Smtp-Source: AGHT+IHLKaXp7N9l8d01o/qA3LkmgVnAKUksSqDfIHvWiz4IkTdB0wq71PyEfTle+YY/8d+F4iJoyhChRR4= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:953b:9a4e:1e10:3f07]) (user=surenb job=sendgmr) by 2002:a05:690c:3388:b0:608:40e4:d05e with SMTP id fl8-20020a05690c338800b0060840e4d05emr2214356ywb.7.1708544513792; Wed, 21 Feb 2024 11:41:53 -0800 (PST) Date: Wed, 21 Feb 2024 11:40:39 -0800 In-Reply-To: <20240221194052.927623-1-surenb@google.com> Mime-Version: 1.0 References: <20240221194052.927623-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240221194052.927623-27-surenb@google.com> Subject: [PATCH v4 26/36] mm: percpu: Introduce pcpuobj_ext From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, penguin-kernel@i-love.sakura.ne.jp, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, vvvvvv@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, shakeelb@google.com, songmuchun@bytedance.com, jbaron@akamai.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, surenb@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org X-Rspamd-Queue-Id: C8558180007 X-Rspam-User: X-Stat-Signature: 4gtb4zini1swz99kzqniem1fm91zzxez X-Rspamd-Server: rspam03 X-HE-Tag: 1708544514-974090 X-HE-Meta: U2FsdGVkX18RfGIqgo6uqqzCSM6o/k3wBSFUixQ5GoVBWqzMmp5mmrSZVhg2P1JUZV2XoP9lsGnxOkUbrpjZGldN/3mgbZ/lr2I049dF5CoJUhi+Vo5UyX71hM1KyBwoHxxFJZLtamtGw6iMhN2PV5tCZCUUdNsk1TAwhUtoSAd20HAdjf37ZV/iqRGIbfPKHm6emndWxTZ+YGVey5Fgr0vbrwOKl8t5TziF6Rn4tWTiidKyjDRn3tcsoMEIRIy0FHeUjskYiGa0iit4UiUm/s0zyRBA3Ejc4NM6v4v1j89pBCHEaRlFsflOO+ZFbG2jYQ0r2FH1Gx7zSX7E6hIFkHB6vDKeZ1RDZgUZ6wVX9HQ7Q3tMsbwcLBcUnFfbJeaprjEV8sKcPvKVCin8flrMxxGKWQ1+q2RX5cMiZownJbFIRrGAdWhxkZ3M31c9NyvqaMlPyiUtO37JrE4/TnEkh/SI+qerJ2HD8mrCaswMNycZvcUU85LG+JFGubSdQaFMF4F2UMq4vzjC+RobCauowVDZDbsb8GTR6KRZ9rHaZ+7dDQ3TqwCKMBNmK5xjrwiIkn1WUtQ2KsvU8EjhIsIdEOzxg1kaoBAPPgTj4nfJyhtNmcG5hs9hpH1zJAnd+CZbMQ+FXhuYrRVHFP6eQPJI9i1fQQzOAFn+WtriIOYHo4fXASkN60l7FPlCvp4qqZuiPndya92O3MvPP7Op81LbAIUXEICgJvaAaSCleOjeCA2LJRoq5yqovrMLbbZnnFCzaCoWZghIaks/N8PXaV+qFU0kaKKBWAdsBOCoRYeOvR3UEtSKyevVdDfSuD5Wfnhu96mwIpXmscTMxP0Q0uWIAUsTu+sO3R2qnxEYxsZXWQrHNhp5rkYQrVZ0Feo6pFg4xgLT4b8VFJ8aCtkq49I+sFLNuo/fgQLjIesEmwNKJk5GAMD17qgYPpnVxy79a4e+4crLb0kqanUniKd2cNx nR2dNJOK OnnpzTTJhsouCqGgHAO6IHd73lE57J3CDm+meocfJ18aRAiE7lmvG4AxwDFkCevG4GW6iaxI/yhdbcRqmuIzWbFoeC+26tO5duPWFpSqEoNQCGTKXeMna/f+1GXPH4fHozW0OKrQreFrWQh1ekqgrk15nhieihZNkV7fyQXhJ9DdiEXALv46AdpFO3NsEvPrXFvlsI6LRya3sauHbNWRL7n/hxuZrnBFuXDrwwX42QHYiBb+h1wvxBpAbAe7hNa8E3I1K1Hh/O95+HPOQ5iBenZh7TKUns3jcWhMbADCsfo2J41E9Hnf0zkW+XpKSY5Th9akwLjxbsTmQ50nrDhgextjmDhN1ruoVzsX/MSLr59KZ0G+SPgwSovXF0kTIEAP0jcBL3Zs0uppsw4yy9tnV/8zORQgmHgSIMuMv5XR+yzZX/1KdldVynJjE+cjqGN1bxsu4DbB6LgP3JvvbpofUB4GXIGpKXda8uCQV0UKX/00Arrm9JDzQBP8Q6JrpZwV7PkgEo9WoDBQxa3l/l4dp1bSRhuui40hGclD/CYBp9hWUgXjbmSDY6LCivFm16vxHYN7mojinoW4Mo3IwNrxRsa6uHPmRpBmMv6R65TDpk89ZlIpNSBAZHt1wCqUMbcuWTTMMbde2YY/tve7TSzrrhX3OLdBnos4O5CU7Oxs9ZtBoabzVPB4aRDJTHw2932tcoeG55azquUxqP5A/xCRcF/R5YL+L5xhkjfkH2CLR1THYFsksEvn7l9QZ+XaKeH7JtewDiVe3EN5cAl9WtSFUpiENR3zkObqLhJduG9HSswl+jgAAeH4D4QaAzcOvXoM7qIv7zli4454xCia6q4W5Y6eItGQNiT0cp4Vs0u6/SE9B1xPMGD4k8lwa5fzWySYmCjZj9wUY4ImhdVkrL+DlQ1sk49WvaMrNElVrRuZCRfgVZW38KLOalLDuYB4d59d1chMif320uZFN6qY= 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: Kent Overstreet Upcoming alloc tagging patches require a place to stash per-allocation metadata. We already do this when memcg is enabled, so this patch generalizes the obj_cgroup * vector in struct pcpu_chunk by creating a pcpu_obj_ext type, which we will be adding to in an upcoming patch - similarly to the previous slabobj_ext patch. Signed-off-by: Kent Overstreet Signed-off-by: Suren Baghdasaryan Cc: Andrew Morton Cc: Dennis Zhou Cc: Tejun Heo Cc: Christoph Lameter Cc: linux-mm@kvack.org --- mm/percpu-internal.h | 19 +++++++++++++++++-- mm/percpu.c | 30 +++++++++++++++--------------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/mm/percpu-internal.h b/mm/percpu-internal.h index cdd0aa597a81..e62d582f4bf3 100644 --- a/mm/percpu-internal.h +++ b/mm/percpu-internal.h @@ -32,6 +32,16 @@ struct pcpu_block_md { int nr_bits; /* total bits responsible for */ }; +struct pcpuobj_ext { +#ifdef CONFIG_MEMCG_KMEM + struct obj_cgroup *cgroup; +#endif +}; + +#ifdef CONFIG_MEMCG_KMEM +#define NEED_PCPUOBJ_EXT +#endif + struct pcpu_chunk { #ifdef CONFIG_PERCPU_STATS int nr_alloc; /* # of allocations */ @@ -64,8 +74,8 @@ struct pcpu_chunk { int end_offset; /* additional area required to have the region end page aligned */ -#ifdef CONFIG_MEMCG_KMEM - struct obj_cgroup **obj_cgroups; /* vector of object cgroups */ +#ifdef NEED_PCPUOBJ_EXT + struct pcpuobj_ext *obj_exts; /* vector of object cgroups */ #endif int nr_pages; /* # of pages served by this chunk */ @@ -74,6 +84,11 @@ struct pcpu_chunk { unsigned long populated[]; /* populated bitmap */ }; +static inline bool need_pcpuobj_ext(void) +{ + return !mem_cgroup_kmem_disabled(); +} + extern spinlock_t pcpu_lock; extern struct list_head *pcpu_chunk_lists; diff --git a/mm/percpu.c b/mm/percpu.c index 4e11fc1e6def..2e5edaad9cc3 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1392,9 +1392,9 @@ static struct pcpu_chunk * __init pcpu_alloc_first_chunk(unsigned long tmp_addr, panic("%s: Failed to allocate %zu bytes\n", __func__, alloc_size); -#ifdef CONFIG_MEMCG_KMEM +#ifdef NEED_PCPUOBJ_EXT /* first chunk is free to use */ - chunk->obj_cgroups = NULL; + chunk->obj_exts = NULL; #endif pcpu_init_md_blocks(chunk); @@ -1463,12 +1463,12 @@ static struct pcpu_chunk *pcpu_alloc_chunk(gfp_t gfp) if (!chunk->md_blocks) goto md_blocks_fail; -#ifdef CONFIG_MEMCG_KMEM - if (!mem_cgroup_kmem_disabled()) { - chunk->obj_cgroups = +#ifdef NEED_PCPUOBJ_EXT + if (need_pcpuobj_ext()) { + chunk->obj_exts = pcpu_mem_zalloc(pcpu_chunk_map_bits(chunk) * - sizeof(struct obj_cgroup *), gfp); - if (!chunk->obj_cgroups) + sizeof(struct pcpuobj_ext), gfp); + if (!chunk->obj_exts) goto objcg_fail; } #endif @@ -1480,7 +1480,7 @@ static struct pcpu_chunk *pcpu_alloc_chunk(gfp_t gfp) return chunk; -#ifdef CONFIG_MEMCG_KMEM +#ifdef NEED_PCPUOBJ_EXT objcg_fail: pcpu_mem_free(chunk->md_blocks); #endif @@ -1498,8 +1498,8 @@ static void pcpu_free_chunk(struct pcpu_chunk *chunk) { if (!chunk) return; -#ifdef CONFIG_MEMCG_KMEM - pcpu_mem_free(chunk->obj_cgroups); +#ifdef NEED_PCPUOBJ_EXT + pcpu_mem_free(chunk->obj_exts); #endif pcpu_mem_free(chunk->md_blocks); pcpu_mem_free(chunk->bound_map); @@ -1646,9 +1646,9 @@ static void pcpu_memcg_post_alloc_hook(struct obj_cgroup *objcg, if (!objcg) return; - if (likely(chunk && chunk->obj_cgroups)) { + if (likely(chunk && chunk->obj_exts)) { obj_cgroup_get(objcg); - chunk->obj_cgroups[off >> PCPU_MIN_ALLOC_SHIFT] = objcg; + chunk->obj_exts[off >> PCPU_MIN_ALLOC_SHIFT].cgroup = objcg; rcu_read_lock(); mod_memcg_state(obj_cgroup_memcg(objcg), MEMCG_PERCPU_B, @@ -1663,13 +1663,13 @@ static void pcpu_memcg_free_hook(struct pcpu_chunk *chunk, int off, size_t size) { struct obj_cgroup *objcg; - if (unlikely(!chunk->obj_cgroups)) + if (unlikely(!chunk->obj_exts)) return; - objcg = chunk->obj_cgroups[off >> PCPU_MIN_ALLOC_SHIFT]; + objcg = chunk->obj_exts[off >> PCPU_MIN_ALLOC_SHIFT].cgroup; if (!objcg) return; - chunk->obj_cgroups[off >> PCPU_MIN_ALLOC_SHIFT] = NULL; + chunk->obj_exts[off >> PCPU_MIN_ALLOC_SHIFT].cgroup = NULL; obj_cgroup_uncharge(objcg, pcpu_obj_full_size(size));