From patchwork Tue Feb 6 21:50:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 13547802 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 B6A82C4828D for ; Tue, 6 Feb 2024 21:50:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6BDC68D0002; Tue, 6 Feb 2024 16:50:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 61EC58D0001; Tue, 6 Feb 2024 16:50:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 471B28D0002; Tue, 6 Feb 2024 16:50:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 225C88D0001 for ; Tue, 6 Feb 2024 16:50:38 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D0009802CB for ; Tue, 6 Feb 2024 21:50:37 +0000 (UTC) X-FDA: 81762723714.01.DA0C536 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) by imf09.hostedemail.com (Postfix) with ESMTP id 1B8C9140020 for ; Tue, 6 Feb 2024 21:50:35 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=njyZS2S1; spf=pass (imf09.hostedemail.com: domain of kent.overstreet@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707256236; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lhFR/wbOdeCSFwsNHKkPjNcdJPS60NDD1V/4AxNlPWM=; b=ef7YQ01KKiRlK+7PNnFQkF9PBeqdzZK4wc+SQcUisMi1PPfNNNd7lqGb+YEkesbm8AdBGV YBx/Zj79RvUN6M3qJOXvvEj0Wk+hsmV5Nx8dPMKgHvBCgwmM5Wv47c0TL8MKFQfs9Yot4q ua/GQEY8u+rI7Oxz+1VFRWk9/uim8rI= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=njyZS2S1; spf=pass (imf09.hostedemail.com: domain of kent.overstreet@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707256236; a=rsa-sha256; cv=none; b=OebJHR6TDgpDc2CuaUvxXjQwTAktrWif+H0tf42WjZX5csz9Um4mUCiNhjyN1BcXn0zZ94 SwkUq85lO/s5ochFJUWq2Q40CrZeth64yH2bvaZTQIvqloZJ02qKBfw5KX0BT6TBc/YCqZ aFucBuKdIVdw5UZN9prmal4406Chanc= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1707256234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lhFR/wbOdeCSFwsNHKkPjNcdJPS60NDD1V/4AxNlPWM=; b=njyZS2S1hI5M7S33TRsxwRlJbSxbJufYZnbtKSdgdF22dU1WQVz37csOfkSfvWpqOpbvbM hPKT2AfkvTB4dABGyMplO6l6rli+BIGFqYki85vQVcaN7CAhAvhr5tN/7R558wsMIDfgN7 kKeagKkyNAWs922DQ4r63oHjHhwZGhU= From: Kent Overstreet To: linux-mm@kvack.org Cc: Kent Overstreet Subject: [PATCH 3/3] mempool: kvmalloc pool Date: Tue, 6 Feb 2024 16:50:16 -0500 Message-ID: <20240206215016.961253-4-kent.overstreet@linux.dev> In-Reply-To: <20240206215016.961253-1-kent.overstreet@linux.dev> References: <20240206215016.961253-1-kent.overstreet@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 1B8C9140020 X-Rspam-User: X-Stat-Signature: micykq1znqynzkr8bdjsu5abi3ekkshj X-Rspamd-Server: rspam01 X-HE-Tag: 1707256235-545656 X-HE-Meta: U2FsdGVkX1+6odNQCx34dQ4jLjq3JtoL4k2253Tb14GlqFD9ZiOD2fZFeBjiITWc3yLoJsigofO78S36ae2jjT9B6R2D+iIvJCvieaz7RyQjjxbyH+kCV8YkvQzcoTugaQqNzxjVDGcVZqP6DsVc2UOnSedZHao58NWC+ffBdpz1MQAKm/DhzFFXUgVLcD84fgYKJjCmFjuqRRZzAFXG0i1EiJBNeKaM21QqrbcGThJf2YDFbI551bkyg77U4dfyqsqwTwS73FqV1HTPH3Mbx95yJj9/mGOGJ6ByEegh9gdI3Aw9vX3V00ouVCaJOWF7oO3fHJTVzmS84ndoEQMNqnDf6+exqMkK8PMCsX1EmNeKwvHxeXQFVyL/5CfZtqEWz/0TtzeCdQoKpQaZ1e9j+CKM6oNYbKm2jDM0pDIm2E6lJagQqLYNQB9tb3J/DRkIPnp7Uv/xsD0stgZLNwVdvVoc0QjpjZXbAblW6XzZufMjqxjorqagwiL09uEItK4/gvIW/Ph02cut6JpYP5lHqL782OBp5ApL3k9eSy0+vli7NTPGrr9I5Z9+DkKUmB7EcvSzj+nPz0Lnpz/tfsLBd9M9stX+gksA7W97teiwLLvgtm02W3U61hybHLFjt7M6DBAKIEDKf65Ql5NqwBxgbImBUeqd8KiQliEGlpGIbmE5Bmu8GcIqovDhSepJweTYenncjEvxWa1yxr7dHYKtwjvPy2Tiu5kYCXfUQsSvAJWn4XUlMQGfTxFmP9OQCiRfETGQMOaa+Y0TOADn1oKTZuOJwE17WlP+Uu1unxlnpRuzxaefw/PDvRRMBItloFN6gWC+jb8QsPWa35pLeGMRQhRCwfnfOn7toIvqzhVl4rFdmPVuytGgvM31jfX9j4uOs/hqq13Xq7IGzzWT22O4QdGUmCqh3+uDlaeqiIPYh9597YNW1+R0AeUZBCXoTt02eFIdlFfPrLXRaDpQVrG trHXjUy1 eXzoP7ZQzxWIU6ZkjVvOBZzr3sSd8rp/PNjgTd0Bbrc2jBY2T92ltfM2AFJYzhZ3Ejsn16/vh7Yd0XUeZzB3ykZ3f9Qm+vlUU+pvQC1MREcvWPKkMeko1G5E+9CYIGpE2Cbz6 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: Add mempool_init_kvmalloc_pool() and mempool_create_kvmalloc_pool(), which wrap kvmalloc() instead of kmalloc() - kmalloc() with a vmalloc() fallback. This is part of a bcachefs cleanup - dropping an internal kvpmalloc() helper (which predates kvmalloc()) along with mempool helpers; this replaces the bcachefs-private kvpmalloc_pool. Signed-off-by: Kent Overstreet Cc: linux-mm@kvack.org --- include/linux/mempool.h | 13 +++++++++++++ mm/mempool.c | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/linux/mempool.h b/include/linux/mempool.h index 4aae6c06c5f2..92181401ea96 100644 --- a/include/linux/mempool.h +++ b/include/linux/mempool.h @@ -94,6 +94,19 @@ static inline mempool_t *mempool_create_kmalloc_pool(int min_nr, size_t size) (void *) size); } +void *mempool_kvmalloc(gfp_t gfp_mask, void *pool_data); +void mempool_kvfree(void *element, void *pool_data); + +static inline int mempool_init_kvmalloc_pool(mempool_t *pool, int min_nr, size_t size) +{ + return mempool_init(pool, min_nr, mempool_kvmalloc, mempool_kvfree, (void *) size); +} + +static inline mempool_t *mempool_create_kvmalloc_pool(int min_nr, size_t size) +{ + return mempool_create(min_nr, mempool_kvmalloc, mempool_kvfree, (void *) size); +} + /* * A mempool_alloc_t and mempool_free_t for a simple page allocator that * allocates pages of the order specified by pool_data diff --git a/mm/mempool.c b/mm/mempool.c index 734bcf5afbb7..343f0ef6b69c 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -543,6 +543,19 @@ void mempool_kfree(void *element, void *pool_data) } EXPORT_SYMBOL(mempool_kfree); +void *mempool_kvmalloc(gfp_t gfp_mask, void *pool_data) +{ + size_t size = (size_t)pool_data; + return kvmalloc(size, gfp_mask); +} +EXPORT_SYMBOL(mempool_kvmalloc); + +void mempool_kvfree(void *element, void *pool_data) +{ + kvfree(element); +} +EXPORT_SYMBOL(mempool_kvfree); + /* * A simple mempool-backed page allocator that allocates pages * of the order specified by pool_data.