From patchwork Wed Mar 6 18:24:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13584437 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 31182C5475B for ; Wed, 6 Mar 2024 18:26:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5AA326B00B7; Wed, 6 Mar 2024 13:25:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 508C96B00B8; Wed, 6 Mar 2024 13:25:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35D2F6B00B9; Wed, 6 Mar 2024 13:25:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1CE5F6B00B7 for ; Wed, 6 Mar 2024 13:25:46 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D0D6C160C1E for ; Wed, 6 Mar 2024 18:25:45 +0000 (UTC) X-FDA: 81867442650.14.D585EE1 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf05.hostedemail.com (Postfix) with ESMTP id 288B8100010 for ; Wed, 6 Mar 2024 18:25:43 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=QS4ZNBQo; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3J7XoZQYKCGoacZMVJOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3J7XoZQYKCGoacZMVJOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709749544; 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=vneHWg8klAgpjQ629hDbHaGhEsZ8DTv1BUkMhsSVPcA=; b=hXdJCii1FcUxOvtqvGDkXPmisDpplsZFAjoxG7ehweEouzJ9nBBoAK1YeHzOWpUp5KWYsT D/2El69cVkPG+3ONVKr0/xfSKXCpKvZ9KLVn0LMS+aqLW/vZkFwbylm/h+9XcFE+ihh+S1 SbPYAZxYgCNM+k8osVAWFjzLx+YdFhc= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=QS4ZNBQo; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3J7XoZQYKCGoacZMVJOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3J7XoZQYKCGoacZMVJOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709749544; a=rsa-sha256; cv=none; b=o8ja5nzJXH04ldF8rl7Gx/ij0b2BkQH8by1AFTUEL6TjF1vSWo6divifo+9GtO3kBYytOo q3ocipiTdgFUG0Cr1PWC0XeNrf/nMBJ+kfzb7zgenIqJqgQIIT5rCd4N1FxbT8KChKejOD aIx2sgYdJX/cVICjHVJBgHQOVCCiwww= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-608e88ca078so345077b3.1 for ; Wed, 06 Mar 2024 10:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709749543; x=1710354343; 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=vneHWg8klAgpjQ629hDbHaGhEsZ8DTv1BUkMhsSVPcA=; b=QS4ZNBQo6AV1uVcgRbvPwrf7PveSTXOohh5Dnzlx5YeDeFVWY2WvJa1xQco2kd1xfY 4f8sIFTgzD0dfRZK58iHMMuejPWVwIV1DwkGaKLesV+kRgzY1WD82DBZ2CO1tKuLjNjO roGKtr23ergx3A4vOpRHpLeGHPdOzRtd+j0Lm2HrGGY5A/xKnJZRYnjfoKY5uYl6RTr9 l55HoTYRxocjG0sS59nQq7ONNZWGLOij4yiB6sSStKWmAZfI2vvwBEox69aq/31oMhyi /FgZHfGTAT6fl8G6MPQ54+DsC1kh+6gvnHcy580hPE/MysoEmM/2UbTtR/41aztfxqIe E3cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709749543; x=1710354343; 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=vneHWg8klAgpjQ629hDbHaGhEsZ8DTv1BUkMhsSVPcA=; b=YJ1Z58M6JngCiX6wJIp72yiemsLVMyciFFu3EMcA6jJXR87F+VxSx2byejO4u/QZbi 0tg2MDF3UvZjPkW/68FR1GG0r621BNb4YHzpxQYT4qxo9ufNtmB5alp3uUXygR1Og233 ZXBgL6W6CIY1uDvU2u+ch+2sdJUOjmRRISkuSwfDgQPVeLySQjfu6efcCa1ItfASVWG6 9vuJdjJ9p/7wioXSnnncIh5PmomD5dmYdLtin00kGcxeHKgNNixBcMwO+CXkg/Rkoemk yF8hmLSX0qyanUlnTejddE58I0A4dHgeiMt09u/vUj6pKDAMAtCZxdWSAqdhptMaPe90 rCCw== X-Forwarded-Encrypted: i=1; AJvYcCWGE/ENxq5/zNQWU9K2ySHXN8YW0+rYzKkzNeaGJirhTbByJZ5vKmX0ChmhOovGKrTSal/9fP8WqD0W4SjFKgUM07A= X-Gm-Message-State: AOJu0Yyd3PjYfd0dFVx8nwBPw/fT696/SQRHEWSj68aQVI+v7uFUZ0b7 MKQIIv25sj4skvv4YaX+WTLjEoD1dzsdPao8CEMEKr7dAed9Tz6gC//8nn2uSzKVb1BajfOP4Bl yUA== X-Google-Smtp-Source: AGHT+IG4AC9xYftpcvIviDBOUGTau4RR94IarG/5rX8rXPHiGDJpcdBjqZ0HayshSXEQB5VUXXEBNI+ragU= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:85f0:e3db:db05:85e2]) (user=surenb job=sendgmr) by 2002:a05:6902:b1c:b0:dcc:e1a6:aca9 with SMTP id ch28-20020a0569020b1c00b00dcce1a6aca9mr3819417ybb.9.1709749543321; Wed, 06 Mar 2024 10:25:43 -0800 (PST) Date: Wed, 6 Mar 2024 10:24:25 -0800 In-Reply-To: <20240306182440.2003814-1-surenb@google.com> Mime-Version: 1.0 References: <20240306182440.2003814-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Message-ID: <20240306182440.2003814-28-surenb@google.com> Subject: [PATCH v5 27/37] 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, jhubbard@nvidia.com, 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, aliceryhl@google.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: 288B8100010 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: zn6z1df7b4emeofibebb5d4gs5oxtrfs X-HE-Tag: 1709749543-17214 X-HE-Meta: U2FsdGVkX1/R4qIdo2UuM7H8OcwDJvVev3sOtSqi3o4l2nHbQyTsXPJu16dZI9lNw4Y4uA6ZT2WsJO9aafwjPbvnU7wIJOKno+4s5yLUZ0wVldBfjEKffSHV62v5IPGyOI5psj9zNyuUBseuhU3fFKEbQ1ejVTfbPiUjINFnQT9LbevELdjZOhlHXR+esFkPy42/qXjRq0yu3gPohIeovRBPRKQLZ6trhLWShWvN0EoYQf/jMpczCB0c3qTgqlRGD0qB6yfwJprcD/9g4K8s0z8ahjZNlqU8CgleaTFChTAS1BTy1NiUQmXCTUka5c2SGYa1e9/ZABr4jxc+4TK+8qGIMSCLvCY/K/1JZd0tOI1tz8yc7/FHQQHBCLdzvB+YkAVUVKmn3zCN2uwK7SbZytq17uSKCn4tdMU2t2s841toWCAw9V/uPedgtg2zYH9UVCYowhsPrnABwSDP6nXhLpcLepzSSTJ81jtuYE/0A8wjVaYUDrZr9vM0bC3Xze/nVyzBT2zmHUYRG0m8nD/wKO/c6CI+JbZXfgnn7lUELmwMFZmyj9jYr3EhMgw/6wVn83Wg6uLtlwWyzEIynTM6vTiq6pLsRlPMMF31tJtgBcMNJAEz8sWfbPt/PZZnH2hZF8hCbNvMJZ7NtkPXoCh8uc4AzIkTbivmmopWqzT9M5lC5SopURC0VQMWT90dUuFi85VVsUEbJD6fGVi8KH1oEYhADJp9vDdky0xnTnCZm+7N8djWIg7omY1hVTfqbxExr+MgXfRat6hugN2EUaaz6SS1/XbCFnpCRhGFVsHEFCIbO3dXnQ3uHjZJcsO7rHkWn5Wj++UjJoGAOk+OPs9MQW6O9T84DrsMtLX17w57G/hTa3+cRhAF/hXLw5j9Ypny7LRTo9SlxWApHrjM9ZqTUuBqqNYPPLyeyjFaaxKlzdSJH6IhFxByNmSqI4+cqZ34WSM2kkjm99DCJqxNTMm N1hPfWAU WSi4WSdolGOg41i8k0d9OxOPhHa8xKAQKrCCsxFt6EofK/a2j86FX71MmecTUCHqOkTOpUqfYVna97DYzPFxTVs2ft84xyCi3vcRgdTWRsUniYviD3u26ryoiSXF5y/Lb7P0+AFJtLeCsD7ME1vVF/geHiBIHhAw3bSVK1HUyXDBOpcHP4J9TU2eQyL4JZm8940klHnT6NR3+HV++XgG0OWqH659LFJSioeGqKY9oe5p6u4iyDWPnkaiUmLfz1QPgP3FxwCCOnFuE/cV2RB8NyDaVwT3i/9oWDYZXakqgz0O2AhoUtSpyubOX95OPNjxrZ+lt3gHbd8nQOHWyoS9SYtJ4I0mVX4RRWUHx2qA4zddwH1bhJkQOwjFCWyEjmVF+Ou0SwwMri6XIYdyyrPVns0KKo33/qNnZfV5KiLEepOax5RYSqCyVOJvrH1Bvvbr0SUT8lKFd9m1KJZqsczwttGdKOg== 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));