From patchwork Wed Mar 6 18:24:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13584439 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 62BC3C5475B for ; Wed, 6 Mar 2024 18:26:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D71146B00BB; Wed, 6 Mar 2024 13:25:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C89216B00BC; Wed, 6 Mar 2024 13:25:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92CC56B00BD; Wed, 6 Mar 2024 13:25:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7E7F06B00BB for ; Wed, 6 Mar 2024 13:25:50 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 58FF9A052B for ; Wed, 6 Mar 2024 18:25:50 +0000 (UTC) X-FDA: 81867442860.05.34584E5 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf22.hostedemail.com (Postfix) with ESMTP id BD9E1C001B for ; Wed, 6 Mar 2024 18:25:48 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=vAS4FeYZ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of 3K7XoZQYKCG4egdQZNSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3K7XoZQYKCG4egdQZNSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709749548; a=rsa-sha256; cv=none; b=77+ROHsYjI4zdJtYAwSOd/qR1Zd8QRXL0Bi+F9V8talrJBiEklX+E83j31CKCLTB04FhnE 88P/n6y0PG1oNTjrRTI0Eut1Z0Nh1G6NNdkF5T8UxJQ3j1hBmdhXf8prGyoI+mfWiuhOn+ Y4Srpk+qXosCTA4imiNbg3ehaBoltXw= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=vAS4FeYZ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of 3K7XoZQYKCG4egdQZNSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3K7XoZQYKCG4egdQZNSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709749548; 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=DxoUvKCzEXXEdeRbYveeEvTG3TXaR8hRTTgS3Q5TXls=; b=Iq1mKUCAE3tKVcEjgLFjh/a/zjHjGqGXKa85e6eRprdFEkT1CI2/HqACrurk5luWWjuJFO 5zbBAqNKyp6qM6SpJws7leG9S045bETT+qMmlwsad02r8GA9RjBzFvdlV0+7JmGNa00fvJ RehsmVwK53RsgToUev/j0Evnm2q/aVM= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dcc05887ee9so10099840276.1 for ; Wed, 06 Mar 2024 10:25:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709749548; x=1710354348; 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=DxoUvKCzEXXEdeRbYveeEvTG3TXaR8hRTTgS3Q5TXls=; b=vAS4FeYZw5Hrbaqqr2ZEohfq3iV82GTfiMWUFql0KGlJS/lBguCKud9RPUldaktOyL pvbNJs/htZbLpSRB6cDW+X9SiWg5K9choR9PuZAI5rQ4FvTiNWkLowV82CsPWLkoemJM ur2U4lGrUXHhFWQqREC8XrMtgRiem+c3XSTBid4LDaQzamujAdEC9Y9DGFMDIZcQumwA 03JwNQrv6JgKYzFs9N8tGdqWnbZ/el35g4kbGAW6AvCn3fCPU+aVGNvgDbi8/seWLU/5 S+trWn75r+r8xv/JJHb16eM0ca3wHZqtclippLzuOyIQkUbttTtixHum1PEeKXebHIDa cKmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709749548; x=1710354348; 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=DxoUvKCzEXXEdeRbYveeEvTG3TXaR8hRTTgS3Q5TXls=; b=hTFPAp23BGvudgt3JlYsVSIYGpnSprkMRqZV75sIR/LUEkDIxMypwgnnmFhajEdwlZ TVvflMjNHlVAVQv65t7uJpBChYrBFj1S4nv7lUax0RmZr4+C25ZbVGR+AA6olbZGX3eh bqKyMAyWT8P5/n5yKrFAYdRJ9LMfgFlxclWUzCqYUHAF6dnz4ScJvE2IFtTE2i3j1LTM rfXStxO7olSJsZQGNIXfW0Kcb3361PB5lAakNRC53+a6wH7bpv24NpO7Y6zYJvlxMScW W1+ohabLY+n5CzGoZDZskLtqIX26ez6VaAlpAXTI8+pio4Mc3OOUkhrQMzatmy3r6en+ OLGQ== X-Forwarded-Encrypted: i=1; AJvYcCVSeHd9XzHeN4vRTXTfDPUMEtFIj8DqWZNvIQxTeODMRMc1J0taklwkiakgM8xFHB2qmj2xwmCrba9yQPrQuhsw/w8= X-Gm-Message-State: AOJu0YzVI5j4/swrnjMzI1/pNOQ7mXFk6ug0JQ3fhJfouoG7iKwkEkNG M4a31/MhZ+/dS6LmsFUPqH3ukGCCx3Yq4lHwIiqFdfLDEmlWNShyF18ilHNQZSNPv8SOZelVGp7 3cA== X-Google-Smtp-Source: AGHT+IGiM8eS9ZI/wjAptyo7knt1Z9PGL0v/iP+d+T+GDYu7/A3uBJqs/ZKhwzkikTnjE1CsYg7wV6eZ1JE= 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:10c1:b0:dcd:59a5:7545 with SMTP id w1-20020a05690210c100b00dcd59a57545mr531845ybu.10.1709749547368; Wed, 06 Mar 2024 10:25:47 -0800 (PST) Date: Wed, 6 Mar 2024 10:24:27 -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-30-surenb@google.com> Subject: [PATCH v5 29/37] 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, 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-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: BD9E1C001B X-Stat-Signature: d69spwjuggqemg97rte49wewoibsymox X-HE-Tag: 1709749548-889167 X-HE-Meta: U2FsdGVkX1/bjR5knGxzmEH9+sP34XJ0FXhDUuQr8gHWiyKp4uIHSyTzmo0oGPfYAggG6Vuh7dETw20PuzRe1Oq50Z/WhdeM5MNFPu3oHQkgnTuqsknlu3Mv6mkR9X92a0UuvzbSYImHDgQuB0aCIRhqA1bFSbcs/EVobVpSibQRKzaau19wlawJEIrLuaLtyeg0+ARuwMirAqOVrSvsnVD8ZQqEBuOwHwzxwLvDzKqQlFahNpr5Hwj7YpmDinvU0hbMiXRj92+8xx3SKJqjYRHc6SskSDSgA/KqGrlaNVFUGOGMrsOsTSzztqcb1/T4MvSWpnpnj1PkWivQ/sSgGBgL6kGi3GqYYwVkB57MHtaNQyAp89QWTDOO/mEt52Ffr0udOQXn4RH1+WVk98pL9MKrdFueiGSaCey6pZlt+uSYJgpB5XynJ9IMecuEindgTFrWh9PWHfNmnCRYI2TZDOTuX7JizMxYEiRetOmpzsFeFpqwckWPVsyx2UF8VPVONjshbC+hcdfjJiVwEK0sYRK/djzbR6SV6kN6tUjmB1VHeIgTu6HfSZWnugXTBBURr6XdDYPT6kkMkpobiSmN82EKhdtCcMlRoWaetUp5bTMTwhjiUSzGciVRq/y/qMeU/ZYaoyqvfrA5UmP0eABi4SM6k9ZfLfpdW2oTTsdHL60tEHp9V2ht2uJRCiZkZG0BnK/WPf+ozAl19xc1k9liKRLV7j33pVQ1NF48LWsj2fcJy4WrN+lv9Zts9+yuWqYUTpQHW4FWYz/xf2u45fdNQ6cufxWlpT+nL5aPWXp14H1eI/gVNLk4/Z7yKIsKu81Z9xoKUV5A4MZK++tvtTqKrQpVCH7eLXChcXmq5m4mLjciIO06YM//edDP2tSNp4CISoNdT/dYU/v+C5ANqt4OKvvbcf4zTg4Yko8zuctSj7v/HQO8Hr5kVNLU0SNJLNuATM+APCZdOvllSnMi4lW sL1V3l7B BvLGVjisIZYVjNVWYOkFnC17ux6XE3tCdxzkfIwmDt8c6OXS2xM2Gd4ZGYiRQW11pr8MhToON1xrEJIDFklQI/wvR8koFy7D7dIWHljg4mJ2yey0ng9VSb14hZCM+/THO+k+OwlMVGU2Ni/AJPS6MCv/FgN1Zm4uL9j2bO1NPpCWcyBZArPj7JQ3WMvrKFRY6fre2J9cAdjPVzozbY69+4cQax7pGGQ6AoG7wFkyhbe6J4xLwjRRDF2k8EVeQWsHHii1SuprV1tigelJirFPLhAuTfEOAxiiuGcFsd3jODQNQVLmY3GTp03ojqSL5vU1GeTYqjCRnjLCI82Vu28TXxop7cObxx8N2rUaHJOXziFKuGWfW2wHXM6fHN91mzkwgJ7Ujc77WYzeILg8ClrKu2nnWInu7MOjnqOTB 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/percpu.h | 23 ++++++++++----- mm/percpu.c | 64 +++++------------------------------------- 2 files changed, 23 insertions(+), 64 deletions(-) diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 62b5eb45bd89..e54921c79c9a 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_alloc_noprof(_size, _align, false, _gfp)) +#define __alloc_percpu(_size, _align) \ + alloc_hooks(pcpu_alloc_noprof(_size, _align, false, GFP_KERNEL)) +#define __alloc_reserved_percpu(_size, _align) \ + alloc_hooks(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 90e9e4004ac9..dd7eeb370134 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); /*