From patchwork Mon Feb 12 21:39:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13554066 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 9C93EC4829F for ; Mon, 12 Feb 2024 21:41:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1602D6B00B0; Mon, 12 Feb 2024 16:40:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 072746B00B2; Mon, 12 Feb 2024 16:40:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DDD4B6B00B3; Mon, 12 Feb 2024 16:40:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id CAD0E6B00B0 for ; Mon, 12 Feb 2024 16:40:35 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A0140A04E7 for ; Mon, 12 Feb 2024 21:40:35 +0000 (UTC) X-FDA: 81784471230.19.0798FFF Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf01.hostedemail.com (Postfix) with ESMTP id ED8AA4000C for ; Mon, 12 Feb 2024 21:40:33 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=W9N0fCgf; spf=pass (imf01.hostedemail.com: domain of 3UJDKZQYKCM8DFCz8w19916z.x97638FI-775Gvx5.9C1@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3UJDKZQYKCM8DFCz8w19916z.x97638FI-775Gvx5.9C1@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=1707774034; 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=z8tkEzFiQHW4+OeWkbnef4rwrjbu90Cr9IgJj7MTk7I=; b=YbXvqPOL7LAYVXPZt95BccLI9ZF0aHqQ9pw1d8cOhPIq80+9LvSKeZ9YnDo2lqqmPTuZd6 Pp0oAGW+FTsz2UtpDEp5nw9g5PNKz31ixGzJvJ15eAScj1A5IljhMQynS8A0H+azqlJeui mPym+twtiWwKlNv+hkd9iMarr9ReJ4c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707774034; a=rsa-sha256; cv=none; b=utfSncRLv2idEHnzhtAphqpn5aMb7rxJdt9/yLt7KY2sv3gzKyjYNuObS6mrsa5jw572Ed benY2WB54Po0xaJsIbWpWWxZSp7t/NeKRs/gLCrdTiZVvmOKXKk1wiMLcn09ShgGpI/QNs IRs2NX5aPBXtfwWwYioVdkvYKBGKEBo= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=W9N0fCgf; spf=pass (imf01.hostedemail.com: domain of 3UJDKZQYKCM8DFCz8w19916z.x97638FI-775Gvx5.9C1@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3UJDKZQYKCM8DFCz8w19916z.x97638FI-775Gvx5.9C1@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-5fc6463b0edso62942457b3.0 for ; Mon, 12 Feb 2024 13:40:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707774033; x=1708378833; 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=z8tkEzFiQHW4+OeWkbnef4rwrjbu90Cr9IgJj7MTk7I=; b=W9N0fCgfk4Dv7eb2tvtw3WR8+r7uzgCHAxM/lOlLfFxT9rZz+iH4Pqex3woYgcAKeq GzOCSfILQi9tF8lT+Yn4sjyJ4qBChKGHMPef18dcVOkbVmVHKQ0nxDw6qqKyMjQA+Kbi 7gN/TOIAnt+Cu5/n7kPPspfCrLqRViXqOmmvCpKY5WCqG8hGUVhDXk6U6xf5qsFWw8Dm YGlu9RPE07s7ZkvoZKUDSMof8ki0+kOmNdvDGvfj8vAYJ8qdgcHwKiwUNDwnXk64revu KtsQqqJaS19i52M7rycr1pGYRpabcPMxRZ7MlNK/PBHQZx/LPxDdW6CVCCsgvT/EpngM QPKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707774033; x=1708378833; 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=z8tkEzFiQHW4+OeWkbnef4rwrjbu90Cr9IgJj7MTk7I=; b=bj5SGzCjVdMFutEnnsfIKmcUrPEkly0KDdwGk64nXsf9bKuzpTwARxhaqar70redfy 9KNzdYjT65UpnbK+XMz0CNlN45IwH2WWB/nM1P5tTe7M5BakJbOTCzVvCtiQfhPfD6Fh iijsyn3CmEkZs/Iw7jmyesBEazKbZmn4qpLRmVXQSLaLYqzuNUOtMh8VlV3AjfFQeE+w jSIkIx0EL8H3mJ2AzW+bOE0ctiIMs88Ld1PLyYgZAzMfSyM9lUHwZRKJWXBrJgagsRHo QZ+K/AyOQZrljQgbQqYfvVrFSxqpfQGeAGs385iT4kUx/gmIe0Cn6WOuAmFyklVlMPoE GKzQ== X-Forwarded-Encrypted: i=1; AJvYcCXo4/MPdjjL1kK5lb1AuHIMiqcWPqub/Kme5bdSogysN/5S7UcZ1LzIG9UzaX0vnFfE4gh/+pDJkKYMTIP146nNj+g= X-Gm-Message-State: AOJu0Yz3+AqHUL5Yjryv/Tp9g4+bxFiAqREU9jWpL8PCOZ12XNQHoVHB UNkAq3ahQi0bgOYvClmDg2Jfq2VFZPfg+UzM+m0xGg4oSo2r55/JKZskps1nxn80CXWTUTB5IZ6 APw== X-Google-Smtp-Source: AGHT+IHm6015U/EcZR8Woa1htECUFmOLxos5kLFwlm3ImstqT3JjQx2GwcIf2KWvuAyJVMYRK/0LWLgINsI= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:b848:2b3f:be49:9cbc]) (user=surenb job=sendgmr) by 2002:a81:a010:0:b0:607:7dee:a7fa with SMTP id x16-20020a81a010000000b006077deea7famr162033ywg.2.1707774032997; Mon, 12 Feb 2024 13:40:32 -0800 (PST) Date: Mon, 12 Feb 2024 13:39:14 -0800 In-Reply-To: <20240212213922.783301-1-surenb@google.com> Mime-Version: 1.0 References: <20240212213922.783301-1-surenb@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240212213922.783301-29-surenb@google.com> Subject: [PATCH v3 28/35] mm: percpu: enable per-cpu allocation tagging 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, 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: ED8AA4000C X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: en43uyj35qbkzk45k1jt91e8p7kr7w8b X-HE-Tag: 1707774033-769991 X-HE-Meta: U2FsdGVkX1/GDMuqVIhdXY0Tzr2GddhE1yXPTSl12UNPIHYTL7iVVbg0znXc6KUhvckNTfimXnGrTXahvROE9Re8o+r81ZT5FhoYsxTJl37AQP3W+ymTFX5L3keChmeJBdImAT4DqhMZaonmOiFXuLmycc9S9lmuB3m2kKTBhidVazL5QW5gsCwEv5rIF+PWbR/qZ+qcBQ4WnUVFRUqMTy94V6aVNsZ2Bn4z0bGN0APDKkT19nGefA7Btr15HAsW515KlnKC2FMXZT6FIqCpIW2ncCHMLWaVH1C8n6Ye9b6N0EiqvqAnT5K7ZQSoalse1nQenCvkR88YBCSOdyldXwInq967gGobLvQPwBy2EffpumdStyFl+A4/jBDGoCEOO8eJsBMxUXzPNmZgHjBjcaAaRv8v/zERqj5EAoiO4578LWMDRHNR182WS+Mvk8933tT61dL3TZcDXZEdUCMJgopk8gETNmUqjfuUNbXXg69EuBpQQpmrImSBZsbM4brtjTE7Key+buJtWFCUNZQY4FYhAVHLgp5N1ImOxV9Yl3P0rffTfbXFwi9OxUaz+TXF6RL3B9CSAbYeklAT+KLe9LOyk0hJ74yf4uRc4PyiJ7f2t+ZicUEPQCaIpO3B2UngwhP06zC8d71848l7/zAp9++geuTDfY0cR/nKDdfCepy1P1T2ZG6Yit5F1YKM4mBIraDorE4Gg8CZf8emzo29OK1cxYe8z+vPrdJBLlCEvUelT68742jMXzmS+TFeSBZJRP2ai1HgTdZ4AI4qvT0CLA5yjYh8ZEg/txM0Ws24uC6D6D+EE8p5hI59fv0vOLSGl9IX6CxIlk7yDrGxYgrph70Ge1vnJU2t0aydD6zrdMo2kcSAJwZmlnHoJF4TX6TPQo0BVnf0Fvx9/KIDcvmkrWtdvInsiBzd7oK1SZof/56VYWEVZ/e4MH1xOUKhyp3Lof9b5vU2bX7NqwFRrPL O6Y/c9nz TscQMPjmFuosXKzLmenKEiw25+b6is13hUllxdpfwqU6qtsXEO2YqBO4X/x+HysKS0KNT1RrE0fYLip/RApvABjhMDEb3PDdmfGNyi7kNqWmIRmdT16zh+ePXng7ChBohKyZ02azn2CeffqnFiYN4lV6EijFdohkR7xf+D/F4R1WpNgnWsnAcl0JIxWCvp0XkKJ53mvUypIPjZ0x+sn64tzpJY3vFUs6p8ahTt0v2YbplA/4WBzKD5MvEWQ7wsdGAMuYEyFNu6q5rmD0im7hH3eZm//OGv08IZ79VQT8hkq60UPC54hBnHMlJPRWyvBCEE19p1wo3UIV1Tet9sLmyNs2QMv9A5kfXBCNuvOYXnDg1WGsE20aQgnIk/pGMaXqwSf8IZJ9Xkb8ogXkDKwFZVzpiEGYZ3okFXIgFSHnNm/AFTqs= 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: Redefine __alloc_percpu, __alloc_percpu_gfp and __alloc_reserved_percpu to record allocations and deallocations done by these functions. Signed-off-by: Kent Overstreet Signed-off-by: Suren Baghdasaryan --- include/linux/alloc_tag.h | 15 +++++++++ include/linux/percpu.h | 23 +++++++++----- mm/percpu.c | 64 +++++---------------------------------- 3 files changed, 38 insertions(+), 64 deletions(-) diff --git a/include/linux/alloc_tag.h b/include/linux/alloc_tag.h index 6fa8a94d8bc1..3fe51e67e231 100644 --- a/include/linux/alloc_tag.h +++ b/include/linux/alloc_tag.h @@ -140,4 +140,19 @@ static inline void alloc_tag_add(union codetag_ref *ref, struct alloc_tag *tag, _res; \ }) +/* + * workaround for a sparse bug: it complains about res_type_to_err() when + * typeof(_do_alloc) is a __percpu pointer, but gcc won't let us add a separate + * __percpu case to res_type_to_err(): + */ +#define alloc_hooks_pcpu(_do_alloc) \ +({ \ + typeof(_do_alloc) _res; \ + DEFINE_ALLOC_TAG(_alloc_tag, _old); \ + \ + _res = _do_alloc; \ + alloc_tag_restore(&_alloc_tag, _old); \ + _res; \ +}) + #endif /* _LINUX_ALLOC_TAG_H */ diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 62b5eb45bd89..eb4eb264136f 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -2,6 +2,7 @@ #ifndef __LINUX_PERCPU_H #define __LINUX_PERCPU_H +#include #include #include #include @@ -9,6 +10,7 @@ #include #include #include +#include #include @@ -125,7 +127,6 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size, pcpu_fc_cpu_to_node_fn_t cpu_to_nd_fn); #endif -extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align) __alloc_size(1); extern bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr); extern bool is_kernel_percpu_address(unsigned long addr); @@ -133,14 +134,16 @@ extern bool is_kernel_percpu_address(unsigned long addr); extern void __init setup_per_cpu_areas(void); #endif -extern void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp) __alloc_size(1); -extern void __percpu *__alloc_percpu(size_t size, size_t align) __alloc_size(1); -extern void free_percpu(void __percpu *__pdata); +extern void __percpu *pcpu_alloc_noprof(size_t size, size_t align, bool reserved, + gfp_t gfp) __alloc_size(1); extern size_t pcpu_alloc_size(void __percpu *__pdata); -DEFINE_FREE(free_percpu, void __percpu *, free_percpu(_T)) - -extern phys_addr_t per_cpu_ptr_to_phys(void *addr); +#define __alloc_percpu_gfp(_size, _align, _gfp) \ + alloc_hooks_pcpu(pcpu_alloc_noprof(_size, _align, false, _gfp)) +#define __alloc_percpu(_size, _align) \ + alloc_hooks_pcpu(pcpu_alloc_noprof(_size, _align, false, GFP_KERNEL)) +#define __alloc_reserved_percpu(_size, _align) \ + alloc_hooks_pcpu(pcpu_alloc_noprof(_size, _align, true, GFP_KERNEL)) #define alloc_percpu_gfp(type, gfp) \ (typeof(type) __percpu *)__alloc_percpu_gfp(sizeof(type), \ @@ -149,6 +152,12 @@ extern phys_addr_t per_cpu_ptr_to_phys(void *addr); (typeof(type) __percpu *)__alloc_percpu(sizeof(type), \ __alignof__(type)) +extern void free_percpu(void __percpu *__pdata); + +DEFINE_FREE(free_percpu, void __percpu *, free_percpu(_T)) + +extern phys_addr_t per_cpu_ptr_to_phys(void *addr); + extern unsigned long pcpu_nr_pages(void); #endif /* __LINUX_PERCPU_H */ diff --git a/mm/percpu.c b/mm/percpu.c index 578531ea1f43..2badcc5e0e71 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1726,7 +1726,7 @@ static void pcpu_alloc_tag_free_hook(struct pcpu_chunk *chunk, int off, size_t s #endif /** - * pcpu_alloc - the percpu allocator + * pcpu_alloc_noprof - the percpu allocator * @size: size of area to allocate in bytes * @align: alignment of area (max PAGE_SIZE) * @reserved: allocate from the reserved chunk if available @@ -1740,7 +1740,7 @@ static void pcpu_alloc_tag_free_hook(struct pcpu_chunk *chunk, int off, size_t s * RETURNS: * Percpu pointer to the allocated area on success, NULL on failure. */ -static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved, +void __percpu *pcpu_alloc_noprof(size_t size, size_t align, bool reserved, gfp_t gfp) { gfp_t pcpu_gfp; @@ -1907,6 +1907,8 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved, pcpu_memcg_post_alloc_hook(objcg, chunk, off, size); + pcpu_alloc_tag_alloc_hook(chunk, off, size); + return ptr; fail_unlock: @@ -1935,61 +1937,7 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved, return NULL; } - -/** - * __alloc_percpu_gfp - allocate dynamic percpu area - * @size: size of area to allocate in bytes - * @align: alignment of area (max PAGE_SIZE) - * @gfp: allocation flags - * - * Allocate zero-filled percpu area of @size bytes aligned at @align. If - * @gfp doesn't contain %GFP_KERNEL, the allocation doesn't block and can - * be called from any context but is a lot more likely to fail. If @gfp - * has __GFP_NOWARN then no warning will be triggered on invalid or failed - * allocation requests. - * - * RETURNS: - * Percpu pointer to the allocated area on success, NULL on failure. - */ -void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp) -{ - return pcpu_alloc(size, align, false, gfp); -} -EXPORT_SYMBOL_GPL(__alloc_percpu_gfp); - -/** - * __alloc_percpu - allocate dynamic percpu area - * @size: size of area to allocate in bytes - * @align: alignment of area (max PAGE_SIZE) - * - * Equivalent to __alloc_percpu_gfp(size, align, %GFP_KERNEL). - */ -void __percpu *__alloc_percpu(size_t size, size_t align) -{ - return pcpu_alloc(size, align, false, GFP_KERNEL); -} -EXPORT_SYMBOL_GPL(__alloc_percpu); - -/** - * __alloc_reserved_percpu - allocate reserved percpu area - * @size: size of area to allocate in bytes - * @align: alignment of area (max PAGE_SIZE) - * - * Allocate zero-filled percpu area of @size bytes aligned at @align - * from reserved percpu area if arch has set it up; otherwise, - * allocation is served from the same dynamic area. Might sleep. - * Might trigger writeouts. - * - * CONTEXT: - * Does GFP_KERNEL allocation. - * - * RETURNS: - * Percpu pointer to the allocated area on success, NULL on failure. - */ -void __percpu *__alloc_reserved_percpu(size_t size, size_t align) -{ - return pcpu_alloc(size, align, true, GFP_KERNEL); -} +EXPORT_SYMBOL_GPL(pcpu_alloc_noprof); /** * pcpu_balance_free - manage the amount of free chunks @@ -2328,6 +2276,8 @@ void free_percpu(void __percpu *ptr) spin_lock_irqsave(&pcpu_lock, flags); size = pcpu_free_area(chunk, off); + pcpu_alloc_tag_free_hook(chunk, off, size); + pcpu_memcg_free_hook(chunk, off, size); /*