From patchwork Mon May 1 16:54:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13227665 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 AD928C7EE26 for ; Mon, 1 May 2023 16:56:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A82C900003; Mon, 1 May 2023 12:56:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 358A5900002; Mon, 1 May 2023 12:56:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21EE3900003; Mon, 1 May 2023 12:56:17 -0400 (EDT) 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 1380D900002 for ; Mon, 1 May 2023 12:56:17 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D93D6C07D3 for ; Mon, 1 May 2023 16:56:16 +0000 (UTC) X-FDA: 80742289152.11.81C831E Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf29.hostedemail.com (Postfix) with ESMTP id 22A52120003 for ; Mon, 1 May 2023 16:56:14 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=DmSOIqXp; spf=pass (imf29.hostedemail.com: domain of 3Lu9PZAYKCHUlnkXgUZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3Lu9PZAYKCHUlnkXgUZhhZeX.Vhfebgnq-ffdoTVd.hkZ@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=1682960175; 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=k4gyiXZ+rLWKPzhf5TCPslUr+ioI4/2asgnCyiPdOEo=; b=5mzWIkopeM2jdaYMOwHluUv+IWoxsNrXLydJrYQQPmqKyhZfAReORps7BFseuRttSGq2oj VL2cfSbhu5+Y/Ej++R3Ng1B08rHibuFTazaPu1735B0BUm/m49dtZteg7RGckY+90S0PYn QELJEDw0KaZAFLJHpFF/tfEWTPxwRpc= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=DmSOIqXp; spf=pass (imf29.hostedemail.com: domain of 3Lu9PZAYKCHUlnkXgUZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3Lu9PZAYKCHUlnkXgUZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682960175; a=rsa-sha256; cv=none; b=0gCJv6z++vsS5vBDxcrpns6s6PymtOp9xebRhvDEXEbYXhrToMXGIsm7yXJTkOf65gYaUa prqB0Xeay7RPI0yiv+dwWD390n8lM/z085KUAhUZtvbSGWBkTWuyQSNM2owOByEcW1G/0H GAob0sYgvowATFAMeItM5Xa7UD0J8bI= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-b9a792ff423so5508328276.1 for ; Mon, 01 May 2023 09:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682960174; x=1685552174; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=k4gyiXZ+rLWKPzhf5TCPslUr+ioI4/2asgnCyiPdOEo=; b=DmSOIqXpDpgOhsbYBtSJd0pE8NBIuLLzTwqet8jr5NLvFjfEu90BXeWtYv7qlPqaG7 S7+D6TPAoWHLs26LhS/oYb03UoMwG4HhBUCufMxi2OXT8Cg0Wg5ZW9rp2ejUU7/dM0E+ g9Ptf/gGhu2ayAN03NAMSR+d1VG5nCdJ9H6WMvt6TJ0j29Cpmun2V6f3j+OoydA/EMqH hhtOdKXFKMT9O6F/RJeaiymHmIAjupnQaY2DJyokZEtCEBhHqOPrpU0cVWh3zhhtOv4w vPFJ1809YCMUcOTdA9cBgXt/0HwdTb2v9IdEptjtwIgtSwcOESs6yl5SKx9kBZVUQ0L8 /sDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682960174; x=1685552174; 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=k4gyiXZ+rLWKPzhf5TCPslUr+ioI4/2asgnCyiPdOEo=; b=bRQVoPHO/P0IpB1+yWBO0WuyxfbrrcJy4D2AGjPR06gAozV0YenqXFa/HKw1e5tP8m dno9Y4Jacbo47pqKtctKLJJfMlUAJTQ0PCP3ePVft79kG6WC16hmgeOO8FASPNk2g+u7 VGCB7RDnc9NppnnCF6sXRi/wdKKRtT/UdUAdx8sjrlcA1075179XXu+BGoT7FPqLwEX7 uf7os32iZhUcKFTXjEAAguUYiyKpSIoO1nEktMej3haVUN1LwYUextq/sLTKI75kXOoG lXF6zrdKjV8l3jicwWG0mOsP2yrj6UwH5J4dNa7t6U4GBsxFdRwuEhcWxH11071O/Xdg 3PdA== X-Gm-Message-State: AC+VfDyzQIBHSxnfQmT2J8K7HnUtI6ZXqgqMbmYKuaiTepIJJlXEqTdr a1XU0peRNVO1nJqm4Y/sYMC2zaEjRHE= X-Google-Smtp-Source: ACHHUZ7aGSgmCsBUI+di96C7Ib72o4O5NVupLg+6oUGpNI3RTseMV4sdkNx3JpSisCExB2ulLnUeWNtVkhg= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:6d24:3efd:facc:7ac4]) (user=surenb job=sendgmr) by 2002:a05:6902:1081:b0:b9d:d5dc:5971 with SMTP id v1-20020a056902108100b00b9dd5dc5971mr3225339ybu.2.1682960174070; Mon, 01 May 2023 09:56:14 -0700 (PDT) Date: Mon, 1 May 2023 09:54:39 -0700 In-Reply-To: <20230501165450.15352-1-surenb@google.com> Mime-Version: 1.0 References: <20230501165450.15352-1-surenb@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Message-ID: <20230501165450.15352-30-surenb@google.com> Subject: [PATCH 29/40] 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, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, ldufour@linux.ibm.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, 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-Stat-Signature: kyg8haym9dm5uzqs65gczgfxcwi5t1fi X-Rspam-User: X-Rspamd-Queue-Id: 22A52120003 X-Rspamd-Server: rspam06 X-HE-Tag: 1682960174-736512 X-HE-Meta: U2FsdGVkX19piwuaOwbxHGP9RPKEI4sreyk/mQSoTdbnNgGOHOP46sC0pptQws3S/SOWshw8NoDPizY35MH5lNy3pJmHfEUgGZNUFn+3C204NHptAcBvo6cCfWApwSIDnJK71BWU+gjNM0xUTryEXIOxmBGDG25EMDXn7DPFufD0TMHwh+vZZMTM+AMgMBrtiOaPkA1Eb9l79JJT2XoVFUE6nVupbdR83AVIRGmfBtPByqx13r9xsTOoDTY+tcGmMlIt9R4QKlsDg4nO8OCxg0GABZyf+CdeK8BMD9Cfw8Iu1sO/yfGqrFc8TIzB2xv0maj/aF2HNDmecsid7HKSJUYI5y0VZXsa0I08nIQyo5hLt9ZdY1iXrPpopwld3VuJYtG/9IiJc2GaqwDAz0wDQp12NrYvphznK86NekAG01HG0DnvqwYEwY1bb5l2ujUELuCSOiBht/lKQRurPEayX0Y+8pvuJ+bvrhwzb8C0Y756HNc9d5Zu3VMl2+G6OBX5XSq4gIQSeQV6DhR3Stc0/RPU8dK7d4Z6LbsHCJXZZc8GFEvqH1UPG36TX7TEfPenyJ2rY3rRMfu+7p/BbVRnf/kybQbegumFL7yDhhAzVqRHrZEpYG3e0wXLhZujr6Sr6ZJ9QpE1VR40bhAVeshckAxR4h0wj1GkDHZHrFZ27OCImdFanqzkJ0FKv62RAFPQyHN8tsUctCf+b89y0dWrk9bmtMY7DmWwyeQIpgXXSzuz1EXzDOt8myUuj4BewOeS8z88LYEp0M0FimnEq2ZiQ62msMP/vpoLGrSmXUB8/B7CqXdWp2Jth2D3MJwMGo1InZC8692FPolqJ3MGR/p8blnlmVbWL3mp+VAfKDAg40VUGncjIW/g6ma1eduXT5Ti1Zxue9NLGifb2zey41yQrLnE4di9N/8FGw0zir+Z7nLc8m97YuVHQHwRcHuN9MrvRoNcA0C0xcWLfDKLMQk 3clgxbxy oLhn8dzwVb8rVzVyHG/RFkjFLOSLZ9BYdyd4npuK2xAd1oPqSsoX8Q7AaeGrebubxtqALmlUdiAOahNBswuqwtPWkIGgAA3qkKD+1HU9wPedk9P7N+Kwe8ZM4GnYkoIERBbWSs0Lki6frn/UlrWiomJ1YuCDz9n4NWAt8ENaRmWhVwzjGL0UyQwY9vLrg7fuZM5d/L1WJeseTtrNhZh5eOD/ns+ew2u9r6Yawh8jeokezFf1GhbOWAfMsnPtvkgVq+A3e2UWwHhyVe5HddW0ckbUogeBTpi4O6mJ7GNzsjjpe7UxiwsOcI/mlkJDDqbGoCpyU+ZW0B1l/gRj0aggQKCWJ2HGpoJlTJCfEdX3EHY6BayiCjKJFKsm5lLI3XwFmuRNSJN36xdH/LiRQnRkV5A4cOtsqfAd/SckxC2JUQCrqEbyyvgohZytgqSEMizcY9h3rG8VkWZzaEaaKrOBYb0KaRkXpMk1FUBL66eFsUrOJKMvYTm9piivq6InGbU2yEZlmHC8RuGSXUZUh3RSJKEMYj3VQwX4iLAzbPvdJo9OkO0bb//58pBHAb1HqPZKr3FQADjp9tj1INDuKnsh6H+GHwRE9odXzGoebW3a3VK1vK8+CEiKEWjMdWm+FJQqOqI2MGXlCfcDaf/R9jglJBy8ax/Y+trDjnBBNbqDiQyeEnt4LQycwuQYD05di4YbNRYYjhHEGPH03dwELOIkCfoVrM4vUA+7I32UxYQmkM3zKc4F5ICtXPd3urTZxGYJek/AsdoCrozIdueFSrKE5JExpvqsrUtNn5Hc/cWOUK08JongiIgRcv//Ah9Rh0RuNLFSQJW+NzOCwhVAZsyChMIyK3RzzgS0tJXkOgicZQ/0m4HoqXjJJ/kcErmbchFD/fmUeHa5J2wQo81oA4cFprIp8/FI+x0oRTahavvPbtpjQNNM5bCwUCUTnG52aupOxZCMvtbjEzgNfuJmwvdp9gz0A4A== 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: 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 f9847c131998..2433e7b24172 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 */ @@ -57,8 +67,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 */ @@ -67,6 +77,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 28e07ede46f6..95b26a6b718d 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); @@ -1648,8 +1648,8 @@ static void pcpu_memcg_post_alloc_hook(struct obj_cgroup *objcg, if (!objcg) return; - if (likely(chunk && chunk->obj_cgroups)) { - chunk->obj_cgroups[off >> PCPU_MIN_ALLOC_SHIFT] = objcg; + if (likely(chunk && chunk->obj_exts)) { + chunk->obj_exts[off >> PCPU_MIN_ALLOC_SHIFT].cgroup = objcg; rcu_read_lock(); mod_memcg_state(obj_cgroup_memcg(objcg), MEMCG_PERCPU_B, @@ -1665,13 +1665,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));