From mboxrd@z Thu Jan 1 00:00:00 1970 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 E1B19C6379F for ; Tue, 14 Feb 2023 19:02:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A83DB6B007E; Tue, 14 Feb 2023 14:02:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A09E26B0080; Tue, 14 Feb 2023 14:02:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 883536B0081; Tue, 14 Feb 2023 14:02:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 712A06B007E for ; Tue, 14 Feb 2023 14:02:41 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3804F1608D9 for ; Tue, 14 Feb 2023 19:02:41 +0000 (UTC) X-FDA: 80466818922.04.21813CD Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by imf12.hostedemail.com (Postfix) with ESMTP id 3ED9940009 for ; Tue, 14 Feb 2023 19:02:39 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=maTfyp8N; spf=pass (imf12.hostedemail.com: domain of shy828301@gmail.com designates 209.85.166.181 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676401359; a=rsa-sha256; cv=none; b=siK1iQvbsbABkOIPrtYXkTQcCfD7dw6Ue+ZfD+wmJ5Ty25O+1t0Labsq08VLQbnWs0EhCe NUnq7kl4aQVdQrvgZXRNdXXSHpMJvGV+v7h/xkvIjUdRYCY7Bwq7K94Ybn+mR7W1ArpFLK iNmk6C5frswsC7eMt7WnkE8KDxDNwEI= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=maTfyp8N; spf=pass (imf12.hostedemail.com: domain of shy828301@gmail.com designates 209.85.166.181 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676401359; 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=MPPamIyRpbGBQ5ryZF3ausqPZtq/gq8Gwr+ekJX0vLw=; b=loJCU4VAvT60E61HSMeFnNDYMaIbESgyoXD3hOGSMB2Xe05LMIP3SZllu3Y6Q9gJq3iufh 8EHy3BcZ2ID967alSWi/PFBORJwpXu2ZfYliMBOrDvnDMxwwe/3qqo3rpNH0F3HqzwwsrT JLV+rcZtMA0B4TQeH+8r9yZoTvpGmWU= Received: by mail-il1-f181.google.com with SMTP id v13so5098153iln.4 for ; Tue, 14 Feb 2023 11:02:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MPPamIyRpbGBQ5ryZF3ausqPZtq/gq8Gwr+ekJX0vLw=; b=maTfyp8N7g3NFmHY2zeN8YjUoTVcYuR7ajHYTMcSRQzHkFYDHmJhx9ivtMUdBVF71L GQn4jY6oHeJqVgK7GJEF9aLjpgWkCTqjGs3hbIXrso1oVFzSV1eo9609BfFbuuuBBCuI ZyGyKx8aU7z1Om3ICTXa1KR7/JLA9jQTSprAIC8dEz7zaymZt3th4EEmYbwsrXXlC+p1 sxZ7SNbSVNo/pkS61yMLbC5HX9no9qZGegY9IG9qe3Rj+1PzQlqNTBYxeczquNnk6ooA Oc5s7X0SnOx68eQv4KuSVtS35HYPX7X0fqe6ZVipE81nnvy/AAEtYche0HnA6lbxB56E CXSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MPPamIyRpbGBQ5ryZF3ausqPZtq/gq8Gwr+ekJX0vLw=; b=ZS1GDPli13lsNKKKDkyYCJkg6tPy0dsGxEaNU34JbEvOIvUF/MS3zZPVFIllsjH+o2 DRZhjuMeehnV1PP5U8I6BR2oL5kFzPdzO+Zz9OIW35E0z2QYvzX+/CEQguv9iDh7oEOo +6yiek+oMvzgWs3gmP9oD5CBzK2e0EQEuaISLPhNFpZ50LDUGxj+jXX4rBW4YNXXTxdL ggSMosoQvEYjhpAitxjrxUNmQChmMLVPPLjhBgUUj8w6e85Bkgw5EYB2tC01y3tofa99 EzwFX+JjGhKVmyTlS6qdf3KgBzzocOpQqe5lih3Q6Ny33t4oxjb6kJ5/2lnTgN2FOHMv Ub1A== X-Gm-Message-State: AO0yUKXJ++jvMvpDukJipeDjoF1+Xd0ULnmqsJtj87jQWd2B19YlqGPG CnOLbDP6LPa5KNILbnqDpfE= X-Google-Smtp-Source: AK7set+eY5XAwZXkOnW0qFOv85zlppyeV5NeG8+1WBt2UYlWnui6VEDbC+TuErm7ZvFyUGKQs5ccQQ== X-Received: by 2002:a92:c241:0:b0:310:fa45:ac78 with SMTP id k1-20020a92c241000000b00310fa45ac78mr2181236ilo.29.1676401358385; Tue, 14 Feb 2023 11:02:38 -0800 (PST) Received: from localhost.localdomain (c-67-174-241-145.hsd1.ca.comcast.net. [67.174.241.145]) by smtp.gmail.com with ESMTPSA id r11-20020a056e0219cb00b0030c27c9eea4sm3608770ill.33.2023.02.14.11.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 11:02:38 -0800 (PST) From: Yang Shi To: mgorman@techsingularity.net, agk@redhat.com, snitzer@kernel.org, dm-devel@redhat.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v2 PATCH 2/5] mm: mempool: extract the common initialization and alloc code Date: Tue, 14 Feb 2023 11:02:18 -0800 Message-Id: <20230214190221.1156876-3-shy828301@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230214190221.1156876-1-shy828301@gmail.com> References: <20230214190221.1156876-1-shy828301@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 3ED9940009 X-Rspamd-Server: rspam01 X-Stat-Signature: u46iipbpsaz8p5j1bb6a55cgthqww3ac X-HE-Tag: 1676401359-995478 X-HE-Meta: U2FsdGVkX1/B4VdwH1U/yRctu85YVKBEw9pL2Cs/nK+LPezzcTmJP0U+hyWdKNyvbnBqhjTpN6lvT5umq3jzDhxe3oR5m4C3b1VWiMt7F34Gwygtu6To+zSxEkcscrgp3R+2VEOjrC1cNWAWC4vfF+klor4u3DRSOCTdCyqZd0EzM6yZhMy3+u5VOzeayXZ+wj8Xco7XezonqelCAyL+maDpoSHuMZEIh+ZTxQ0sWU89RLZ8iZDiH1n5gMjiM09QLGAtqFgV6TmLwS4KrgJmJMmlQWXxntNLjawPR7vmIvYUXoucJgNczsXo5rX7FiwQg+G2ml4AQL1v9F7SkRAo3vYZT1ORV70rQw5wsMISRkSbfGWmUceEHVSYFhf9VCmDvapLnvF00ab8UtTrlRoI2s8ZkQqZx6wXRpVt/Jn/D4WWlf7BDilMsxgenW/x6OKtbaY8aLIleWRSRWtiLm3SHtvxKMpJMGv55nx4LU34wj25xbUkP1QhMUINBGe6r3gGp1yxfOnVSRDS26emePXTt4izu6RtFaMWLuon5QfYTXAjFY4gMsYiarEoacjWqPqNg1uwS4KTGJqbIQjOtNrkdFFdB7vO5x4UKOeG6Ieeoh4KKl+mQcneLpBlG9vgnDBzNWfpOKPwd2zT/tX4oRcIbKRFkBquu79+i0r/GswCM7K6NXVz8TIh9y0mpB8RDhffQk+7/ECaHOfDcYanYaqBygCwxB9Dlzc8lfVXT9PMBzSZ5Uiq87oglPKqMJ000wNzq2Kg7l4ktH67ByCP4Npm09QsE3PyGcgEYfXZInXLoqFN8LA776OnJdaii/Vpw7u1rev9WSibeKQObonj2x9m5qKYV3s5jI37yygrTPqtNBEy+8pMxSAs0mDqqVvTPoL3jfzQ/8j+TK98o5txJn+dYASQpo5ktrYP7ynSpT+4qrYcuAYEX7ffpgz8EFHw08QJY8LN41XN1nJbKIx4rHc phT0C+yc t5L/T7ivnhEhZIr7WPfz2iWDTlH5roNkJ9fnUl5aJP4rfm34tHSCAyQbg+0mgJ3YjvoUU/AhJrVXvUKliVxREtGxFjF72d6mLYSsSj3nGHJYC7uWlBsn/SzaUe0IP37knWuZrMAkz0JvPPnrJrCVbB2JFW7+fZeeCzMAgEeu/GkMDWg4WYTSxEFzEDNSVemH/aqC0KWKolbTil/l2KDUO4O6j0KAbi88VnA+SB71G880Lb3NhPSAzbOZy6SRlS3t+B0BHwScyx5IJ6qPgLbcwzHHsZ5sq3X32yiLJcRLO/pYreqsbc7G0YWTuApbVMXSVkv/ly+vJLrazxxnmgeyRqsrxJ/5cXW3fOow5IBXXjHBpflHMZDgMKsw13tsfV+vqXCgXCisCalChLVdkHr52q+aMTctbib7XnlJ2cl2V3a/S4LWdtlM01xWuDFfyGG19de/PMlycNsEjjvQ= 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: Extract the common initialization code to __mempool_init() and __mempool_create(). And extract the common alloc code into an internal function. This will make the following patch easier and avoid duplicate code. Signed-off-by: Yang Shi --- mm/mempool.c | 93 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 36 deletions(-) diff --git a/mm/mempool.c b/mm/mempool.c index 734bcf5afbb7..975c9d1491b6 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -182,9 +182,10 @@ void mempool_destroy(mempool_t *pool) } EXPORT_SYMBOL(mempool_destroy); -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) +static inline int __mempool_init(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) { spin_lock_init(&pool->lock); pool->min_nr = min_nr; @@ -214,6 +215,14 @@ int mempool_init_node(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn, return 0; } + +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) +{ + return __mempool_init(pool, min_nr, alloc_fn, free_fn, pool_data, + gfp_mask, node_id); +} EXPORT_SYMBOL(mempool_init_node); /** @@ -233,12 +242,30 @@ EXPORT_SYMBOL(mempool_init_node); int mempool_init(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); - + return __mempool_init(pool, min_nr, alloc_fn, free_fn, + pool_data, GFP_KERNEL, NUMA_NO_NODE); } EXPORT_SYMBOL(mempool_init); +static mempool_t *__mempool_create(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; + + pool = kzalloc_node(sizeof(*pool), gfp_mask, node_id); + if (!pool) + return NULL; + + if (__mempool_init(pool, min_nr, alloc_fn, free_fn, pool_data, + gfp_mask, node_id)) { + kfree(pool); + return NULL; + } + + return pool; +} + /** * mempool_create - create a memory pool * @min_nr: the minimum number of elements guaranteed to be @@ -258,8 +285,8 @@ EXPORT_SYMBOL(mempool_init); 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); + return __mempool_create(min_nr, alloc_fn, free_fn, pool_data, + GFP_KERNEL, NUMA_NO_NODE); } EXPORT_SYMBOL(mempool_create); @@ -267,19 +294,8 @@ 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 *pool; - - pool = kzalloc_node(sizeof(*pool), gfp_mask, node_id); - if (!pool) - return NULL; - - if (mempool_init_node(pool, min_nr, alloc_fn, free_fn, pool_data, - gfp_mask, node_id)) { - kfree(pool); - return NULL; - } - - return pool; + return __mempool_create(min_nr, alloc_fn, free_fn, pool_data, + gfp_mask, node_id); } EXPORT_SYMBOL(mempool_create_node); @@ -363,21 +379,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 - * @pool: pointer to the memory pool which was allocated via - * mempool_create(). - * @gfp_mask: the usual allocation bitmask. - * - * this function only sleeps if the alloc_fn() function sleeps or - * returns NULL. Note that due to preallocation, this function - * *never* fails when called from process contexts. (it might - * fail if called from an IRQ context.) - * Note: using __GFP_ZERO is not supported. - * - * Return: pointer to the allocated element or %NULL on error. - */ -void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) +static void *__mempool_alloc(mempool_t *pool, gfp_t gfp_mask) { void *element; unsigned long flags; @@ -444,6 +446,25 @@ void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) finish_wait(&pool->wait, &wait); goto repeat_alloc; } + +/** + * mempool_alloc - 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. + * + * this function only sleeps if the alloc_fn() function sleeps or + * returns NULL. Note that due to preallocation, this function + * *never* fails when called from process contexts. (it might + * fail if called from an IRQ context.) + * Note: using __GFP_ZERO is not supported. + * + * Return: pointer to the allocated element or %NULL on error. + */ +void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) +{ + return __mempool_alloc(pool, gfp_mask); +} EXPORT_SYMBOL(mempool_alloc); /** -- 2.39.0