From patchwork Thu Mar 21 16:36:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13599183 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 9E814C54E58 for ; Thu, 21 Mar 2024 16:38:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E26486B00BB; Thu, 21 Mar 2024 12:38:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DB1026B00BC; Thu, 21 Mar 2024 12:38:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB2486B00BD; Thu, 21 Mar 2024 12:38:09 -0400 (EDT) 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 9C3526B00BB for ; Thu, 21 Mar 2024 12:38:09 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 78B2D1A1624 for ; Thu, 21 Mar 2024 16:38:09 +0000 (UTC) X-FDA: 81921603498.03.DB03057 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf19.hostedemail.com (Postfix) with ESMTP id 9E9251A0003 for ; Thu, 21 Mar 2024 16:38:07 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=kSzzH6Eh; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf19.hostedemail.com: domain of 3bmL8ZQYKCFsLNK7G49HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3bmL8ZQYKCFsLNK7G49HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711039087; 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=kbJXFr2w8KI4PQ3iTaDylf6laxNigfzl4BgVu2a2cxc=; b=PG4ZW4K/Q6S+vNMy2Wz/2nshJI0UnRgC4j2giV8ESC8pDT4WpL8RyIF6ijFTKeERkuG1dz TTmU3SEN2t1geMgsikFnvU6gPaujkI7+akQST3Pt90oBx9jNxgT5Qd4cALd4AIJlFKpIDA UY24YbNgy+naOIDKoygak7NJX4rifH4= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=kSzzH6Eh; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf19.hostedemail.com: domain of 3bmL8ZQYKCFsLNK7G49HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3bmL8ZQYKCFsLNK7G49HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711039087; a=rsa-sha256; cv=none; b=Y2MbucY3NYmJFCP2WLari8l4DtZknb9C+s3T6zrYkkJhmJV7T1BqECyt/5m/jdofv6o7/2 TFGSc6qyhsE/3qWy+uibUW1PTdWIaC2smCgp2RWuqRHdFr5qK72f2Yprz0WVNxWoF1rnWh wVAqh646dzm63D2o531L5F9wAKEOmKY= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60a605154d0so14623377b3.0 for ; Thu, 21 Mar 2024 09:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711039087; x=1711643887; 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=kbJXFr2w8KI4PQ3iTaDylf6laxNigfzl4BgVu2a2cxc=; b=kSzzH6EhDsTp6j4E/RGlXDiJPg8Q0P+Tcwufibr3ubaA+Nvb/36hWwHjwNviOEne8P Ms3IwChgiIL3/LF0Ok3N4xf8OyF5PqOI0J7KWWuYLlJonwgs8c4GmfiSTjUSmEui4fYa z3mMHIV0gLjb57lPlr2UcTzuxNc61mg1P1+u+PHP5hUc00T4YnZ/dWwSd3IGmJ8+BknO KDdQNtS5ro22U8OgQM2MaPOH5hpDqU6Rm+W+LpTGJOZZMgRoSjkv3lPsFqTjU5mrTaDV W/V575eRmhIxzKT1Sw3parn6ml6tsepC2dlsbcih5kDtVbeAj5WLtSIwudaxYRpHPRmv pudA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711039087; x=1711643887; 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=kbJXFr2w8KI4PQ3iTaDylf6laxNigfzl4BgVu2a2cxc=; b=sQ2Ho9EUwv8zGUv4ppA/+rfHFH7rpYWcZrhRoayYgnV7XJEvetnmgxi4IjftJ+74u7 O4e5RDLaEedhuGs/hqOBVZYnrYtSZDD7hjG37OWNJUEQnJ/BXbKqUTbpqy9odpYZmZt4 DmcRSQdzJ1hiJmCReNVWKyPr3O6OOMZfpfNUGZbQsOLio1XIk4AWlKf3YSac7NCaccpC lfxXLzr2Ubgeu3WoVDN2gYIMY0ZE1Obtok1lgi6W6e0WeI2bRZCYPzNKtwKoTwxTq3qi XE55zRwPLozJ9fGpklLiwwWnMAGQJIHndzAuPTOlsDm8RRbMDRDTJlaj4N9xdsv4qRu9 tD8Q== X-Forwarded-Encrypted: i=1; AJvYcCVdzRBLxPUX1XO8XMI+4eNBhZ+l5XzLkMyNn9Z6VGzLn8myRGSsZprkaTasFHR8NizNu+VvcQ/Qq+OnJvFJ11Fr8aU= X-Gm-Message-State: AOJu0YyB8FGNDFDm8NOuL4ysIb5WflbOg60sk8bwq93WV0E7EY5AqMY1 dF6BYdYrj2TeFQJNM47hdWRyPTcKmcm9Y9sONEfJYwhogenWQPGbcmn4AhfiXD8GyIry0Th4lQh mWw== X-Google-Smtp-Source: AGHT+IGAFq37Jmasj0HYRGF5DFuiG3xE73e4VFfbf3VLLmYen1YphSWB2duspGO/poHTwQ+f8dcPx9x7Bl8= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:a489:6433:be5d:e639]) (user=surenb job=sendgmr) by 2002:a81:a1d2:0:b0:610:e44b:acc3 with SMTP id y201-20020a81a1d2000000b00610e44bacc3mr857961ywg.4.1711039086504; Thu, 21 Mar 2024 09:38:06 -0700 (PDT) Date: Thu, 21 Mar 2024 09:36:48 -0700 In-Reply-To: <20240321163705.3067592-1-surenb@google.com> Mime-Version: 1.0 References: <20240321163705.3067592-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.291.gc1ea87d7ee-goog Message-ID: <20240321163705.3067592-27-surenb@google.com> Subject: [PATCH v6 26/37] mempool: Hook up to memory allocation profiling 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, 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-Stat-Signature: cbuh769y1q47xqx58pngfk895ack9mqb X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 9E9251A0003 X-HE-Tag: 1711039087-719297 X-HE-Meta: U2FsdGVkX1+4x6NNpT78o3t5PfJDSinsXerUWUPqtJvypsJy24vVJFSdQefQFTAgt9wFKO+mKi0MW4JYudnRfgmD9pvooN9BV/b7mf+ZJo3vxCopan2t1jUB87OuHDwj3oNdi9gWc7UcHQcb4/Zyllx+SHqYr5I2JS1Xw8H1cqfBBBCTlrHyR0p6LKWuXxITiWG/EPe+6XN1R1Xa5KbCY7BHE7zuNVMiqrl4nokfSI4UBnx++Gd0JYoQNI+tC0nvFkOSIYkUg6DWvUg0r76b6JP660I36Q2aUiiC0yBAZjSQCB6xZabKDBhw4K53xMGzsH96+S3bx+wVhz9CkhzNfGrwzmmNhqJ63r6cJt9jznCt1i8eF60xP+RPsYRGtgJleY8nuM0dB8DerpmjuSid/jlJGwn6imsDboEJAA0lYn0dfvSxOYsTTGe6hyYz1Imf0fdx6RKZ30wgSX6RDrZ3hGrNfl51cDb6mdTdyQ9e+FsFoNEudV4lNQaunY45mKqYm1LNffMvLJjB7hmEerHBTuGWT964BnsIl8rWT2FdEzOekd4h3wyC2/r9B4ePnt6RSuQVSFFLCX9ObBqtENDGdplSLrJ+Ffcqq0fOASa/5/HdLSduxT1LdCbMgmvQ1SsR+XcbU6Ju7DJSwKw5s5+MllvWexoe2M9rsVfX6ltJoNzIi28LusFU/YLLcMpdgUl85Lc3LHweIWufOpcTYR2wQMXP8CmAzvt0LC3WGT+NDMyOhk/S1gvmNYrw2Vt7mPqz+89YAKdHvsgnP2qYOr/I5cbBDSzM3jPJnH1WnqPzGXEOyL9pTj6hMpPAiMRxnpimVS54V7yrHDwx6IXxYeJkPDbIwlePOQqCSbgNujZ+/bcztIAEnO8+lhNENYqro1FHl4af39fNnQqtrdUT+ZYjaROHOiv8TwHoK42ArsMnFPhibmYAnaVFDInaf2TPTnGg+UJ9Ii4IwTzsrYgSz2B Aj88+Er/ uS6GWN5P2Uc0tfPoo52Dcs4+Lmxvjl4kpiEvRjV6fTbPycIB+C0YIc1p426abuPOr2tH3BxnaenZzUAjxgXf+kXAH/UXlnkwLRysSbEAdwyH3jsqmI4Lcz7yuz0JQYm4AruIe+jmfJXyjEO5/dSe7pduQZxNP6zsxIjrB60TyIvJ29WVNmvWlTbC3DkfhdrrtdQ0srvG2BJAZAct+q+GT7dYLF7HR5DYUD+m09QQq1YKP5ExbcNJzLUkFgR+5y5DRbZPxfIFPdYyJmRg68IxKgv6tiPlmoMNo0x0yIlB6ekAXWEMbv5jiMeix7ExquO7XK5pwkde7z6B8ImpRfSjZW/eb6rKiMhVv8W65HFoaFhLfOijghry/b/sJnIepKjr62VmpAGcFOYQCdELq04im61WC5QSdQK+XGkYb9JBmZkCzOEdXTFI1yBd+70873xujezUz5c3RkkU0fuueqC4kzY4WB1DgHz00ZZs56WXLStnbE1A8hXubryytZZXaOjgmr8JBndl/qbtg+UWDWpkpcCgQBHxAN+YJb2N07z5N6GLRTYi7YH9jmZerbMg+con3+CIrojNg12l6vVOY4Kw7C+fgS39cD0vlLgAD08t4sQjVoNyTwGIcQZrJWKpKqs2KOwbSgML7m3GM7W/kJthkF1O7tB9s8OgW70vpIiOoUeaeidU= 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 This adds hooks to mempools for correctly annotating mempool-backed allocations at the correct source line, so they show up correctly in /sys/kernel/debug/allocations. Various inline functions are converted to wrappers so that we can invoke alloc_hooks() in fewer places. Signed-off-by: Kent Overstreet Signed-off-by: Suren Baghdasaryan --- include/linux/mempool.h | 73 ++++++++++++++++++++--------------------- mm/mempool.c | 36 ++++++++------------ 2 files changed, 49 insertions(+), 60 deletions(-) diff --git a/include/linux/mempool.h b/include/linux/mempool.h index 16c5cc807ff6..7b151441341b 100644 --- a/include/linux/mempool.h +++ b/include/linux/mempool.h @@ -5,6 +5,8 @@ #ifndef _LINUX_MEMPOOL_H #define _LINUX_MEMPOOL_H +#include +#include #include #include @@ -39,18 +41,32 @@ void mempool_exit(mempool_t *pool); int mempool_init_node(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn, mempool_free_t *free_fn, void *pool_data, gfp_t gfp_mask, int node_id); -int mempool_init(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn, + +int mempool_init_noprof(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn, mempool_free_t *free_fn, void *pool_data); +#define mempool_init(...) \ + alloc_hooks(mempool_init_noprof(__VA_ARGS__)) extern mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn, mempool_free_t *free_fn, void *pool_data); -extern mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn, + +extern mempool_t *mempool_create_node_noprof(int min_nr, mempool_alloc_t *alloc_fn, mempool_free_t *free_fn, void *pool_data, gfp_t gfp_mask, int nid); +#define mempool_create_node(...) \ + alloc_hooks(mempool_create_node_noprof(__VA_ARGS__)) + +#define mempool_create(_min_nr, _alloc_fn, _free_fn, _pool_data) \ + mempool_create_node(_min_nr, _alloc_fn, _free_fn, _pool_data, \ + GFP_KERNEL, NUMA_NO_NODE) extern int mempool_resize(mempool_t *pool, int new_min_nr); extern void mempool_destroy(mempool_t *pool); -extern void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) __malloc; + +extern void *mempool_alloc_noprof(mempool_t *pool, gfp_t gfp_mask) __malloc; +#define mempool_alloc(...) \ + alloc_hooks(mempool_alloc_noprof(__VA_ARGS__)) + extern void *mempool_alloc_preallocated(mempool_t *pool) __malloc; extern void mempool_free(void *element, mempool_t *pool); @@ -62,19 +78,10 @@ extern void mempool_free(void *element, mempool_t *pool); void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data); void mempool_free_slab(void *element, void *pool_data); -static inline int -mempool_init_slab_pool(mempool_t *pool, int min_nr, struct kmem_cache *kc) -{ - return mempool_init(pool, min_nr, mempool_alloc_slab, - mempool_free_slab, (void *) kc); -} - -static inline mempool_t * -mempool_create_slab_pool(int min_nr, struct kmem_cache *kc) -{ - return mempool_create(min_nr, mempool_alloc_slab, mempool_free_slab, - (void *) kc); -} +#define mempool_init_slab_pool(_pool, _min_nr, _kc) \ + mempool_init(_pool, (_min_nr), mempool_alloc_slab, mempool_free_slab, (void *)(_kc)) +#define mempool_create_slab_pool(_min_nr, _kc) \ + mempool_create((_min_nr), mempool_alloc_slab, mempool_free_slab, (void *)(_kc)) /* * a mempool_alloc_t and a mempool_free_t to kmalloc and kfree the @@ -83,17 +90,12 @@ mempool_create_slab_pool(int min_nr, struct kmem_cache *kc) void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data); void mempool_kfree(void *element, void *pool_data); -static inline int mempool_init_kmalloc_pool(mempool_t *pool, int min_nr, size_t size) -{ - return mempool_init(pool, min_nr, mempool_kmalloc, - mempool_kfree, (void *) size); -} - -static inline mempool_t *mempool_create_kmalloc_pool(int min_nr, size_t size) -{ - return mempool_create(min_nr, mempool_kmalloc, mempool_kfree, - (void *) size); -} +#define mempool_init_kmalloc_pool(_pool, _min_nr, _size) \ + mempool_init(_pool, (_min_nr), mempool_kmalloc, mempool_kfree, \ + (void *)(unsigned long)(_size)) +#define mempool_create_kmalloc_pool(_min_nr, _size) \ + mempool_create((_min_nr), mempool_kmalloc, mempool_kfree, \ + (void *)(unsigned long)(_size)) void *mempool_kvmalloc(gfp_t gfp_mask, void *pool_data); void mempool_kvfree(void *element, void *pool_data); @@ -115,16 +117,11 @@ static inline mempool_t *mempool_create_kvmalloc_pool(int min_nr, size_t size) void *mempool_alloc_pages(gfp_t gfp_mask, void *pool_data); void mempool_free_pages(void *element, void *pool_data); -static inline int mempool_init_page_pool(mempool_t *pool, int min_nr, int order) -{ - return mempool_init(pool, min_nr, mempool_alloc_pages, - mempool_free_pages, (void *)(long)order); -} - -static inline mempool_t *mempool_create_page_pool(int min_nr, int order) -{ - return mempool_create(min_nr, mempool_alloc_pages, mempool_free_pages, - (void *)(long)order); -} +#define mempool_init_page_pool(_pool, _min_nr, _order) \ + mempool_init(_pool, (_min_nr), mempool_alloc_pages, \ + mempool_free_pages, (void *)(long)(_order)) +#define mempool_create_page_pool(_min_nr, _order) \ + mempool_create((_min_nr), mempool_alloc_pages, \ + mempool_free_pages, (void *)(long)(_order)) #endif /* _LINUX_MEMPOOL_H */ diff --git a/mm/mempool.c b/mm/mempool.c index 076c736f5f1f..602e6eba68d3 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -240,17 +240,17 @@ EXPORT_SYMBOL(mempool_init_node); * * Return: %0 on success, negative error code otherwise. */ -int mempool_init(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn, - mempool_free_t *free_fn, void *pool_data) +int mempool_init_noprof(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn, + mempool_free_t *free_fn, void *pool_data) { return mempool_init_node(pool, min_nr, alloc_fn, free_fn, pool_data, GFP_KERNEL, NUMA_NO_NODE); } -EXPORT_SYMBOL(mempool_init); +EXPORT_SYMBOL(mempool_init_noprof); /** - * mempool_create - create a memory pool + * mempool_create_node - create a memory pool * @min_nr: the minimum number of elements guaranteed to be * allocated for this pool. * @alloc_fn: user-defined element-allocation function. @@ -265,17 +265,9 @@ EXPORT_SYMBOL(mempool_init); * * Return: pointer to the created memory pool object or %NULL on error. */ -mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn, - mempool_free_t *free_fn, void *pool_data) -{ - return mempool_create_node(min_nr, alloc_fn, free_fn, pool_data, - GFP_KERNEL, NUMA_NO_NODE); -} -EXPORT_SYMBOL(mempool_create); - -mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn, - mempool_free_t *free_fn, void *pool_data, - gfp_t gfp_mask, int node_id) +mempool_t *mempool_create_node_noprof(int min_nr, mempool_alloc_t *alloc_fn, + mempool_free_t *free_fn, void *pool_data, + gfp_t gfp_mask, int node_id) { mempool_t *pool; @@ -291,7 +283,7 @@ mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn, return pool; } -EXPORT_SYMBOL(mempool_create_node); +EXPORT_SYMBOL(mempool_create_node_noprof); /** * mempool_resize - resize an existing memory pool @@ -374,7 +366,7 @@ int mempool_resize(mempool_t *pool, int new_min_nr) EXPORT_SYMBOL(mempool_resize); /** - * mempool_alloc - allocate an element from a specific memory pool + * mempool_alloc_noprof - allocate an element from a specific memory pool * @pool: pointer to the memory pool which was allocated via * mempool_create(). * @gfp_mask: the usual allocation bitmask. @@ -387,7 +379,7 @@ EXPORT_SYMBOL(mempool_resize); * * Return: pointer to the allocated element or %NULL on error. */ -void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) +void *mempool_alloc_noprof(mempool_t *pool, gfp_t gfp_mask) { void *element; unsigned long flags; @@ -454,7 +446,7 @@ void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) finish_wait(&pool->wait, &wait); goto repeat_alloc; } -EXPORT_SYMBOL(mempool_alloc); +EXPORT_SYMBOL(mempool_alloc_noprof); /** * mempool_alloc_preallocated - allocate an element from preallocated elements @@ -562,7 +554,7 @@ void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data) { struct kmem_cache *mem = pool_data; VM_BUG_ON(mem->ctor); - return kmem_cache_alloc(mem, gfp_mask); + return kmem_cache_alloc_noprof(mem, gfp_mask); } EXPORT_SYMBOL(mempool_alloc_slab); @@ -580,7 +572,7 @@ EXPORT_SYMBOL(mempool_free_slab); void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data) { size_t size = (size_t)pool_data; - return kmalloc(size, gfp_mask); + return kmalloc_noprof(size, gfp_mask); } EXPORT_SYMBOL(mempool_kmalloc); @@ -610,7 +602,7 @@ EXPORT_SYMBOL(mempool_kvfree); void *mempool_alloc_pages(gfp_t gfp_mask, void *pool_data) { int order = (int)(long)pool_data; - return alloc_pages(gfp_mask, order); + return alloc_pages_noprof(gfp_mask, order); } EXPORT_SYMBOL(mempool_alloc_pages);