From patchwork Wed Mar 22 10:20:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 13183738 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 3406AC6FD1F for ; Wed, 22 Mar 2023 09:29:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 392086B007B; Wed, 22 Mar 2023 05:29:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 342B36B007D; Wed, 22 Mar 2023 05:29:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E2326B007E; Wed, 22 Mar 2023 05:29:33 -0400 (EDT) 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 0C6736B007B for ; Wed, 22 Mar 2023 05:29:33 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CF720120170 for ; Wed, 22 Mar 2023 09:29:32 +0000 (UTC) X-FDA: 80596011384.05.AC7B28A Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf27.hostedemail.com (Postfix) with ESMTP id 1358840011 for ; Wed, 22 Mar 2023 09:29:29 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=liushixin2@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679477370; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2mIRmQyiGiObfoPYPqZEaWOlxvFbPX7ld9n5Ye1NHB4=; b=BR/RsAYTT45IICTMPfQyYchHkQLg5+aHngqkxleWFfRTUpkmBC9HUsTpbtzKs2cxPe9aSu G26eGuNLwk9VKBq/Sp0YcXunpRIMSJGampMvrPEOslzVkF2OUWaeBJpdz9djKEytaLJ3E4 Q8SyWr+YhtpVHZq4LFpMchtEgogvnKg= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=liushixin2@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679477370; a=rsa-sha256; cv=none; b=lfehNGNh5gf3+T48ovbLNf9z2s3jBpK0YLxi0AZ7PKZZ8XbVEY5gDX38CBAY2ga3eJWV2H TMJa0F0ve7kUrPmtNJqZm8j519Ixt9Vsl0kOES7nCjmHSJG+Ya1J+Tsj7e8Zszl5BSDJbZ GOMCoufUq/cuubE7xI8dN8/FmP219mw= Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PhNQ32plkz17MRb; Wed, 22 Mar 2023 17:26:19 +0800 (CST) Received: from huawei.com (10.175.113.32) by dggpemm100009.china.huawei.com (7.185.36.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 22 Mar 2023 17:29:25 +0800 From: Liu Shixin To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , Nathan Chancellor , Christoph Hellwig CC: , , Liu Shixin Subject: [PATCH -next v6 2/2] mm/zswap: delay the initializaton of zswap Date: Wed, 22 Mar 2023 18:20:06 +0800 Message-ID: <20230322102006.780624-3-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230322102006.780624-1-liushixin2@huawei.com> References: <20230322102006.780624-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm100009.china.huawei.com (7.185.36.113) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 1358840011 X-Stat-Signature: 1hjh9cfgth1c6u9rsd84wyp53so7ifrf X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1679477369-329543 X-HE-Meta: U2FsdGVkX1/1mpvwRW5fMAhR2uV8ACFgNWhvmMQzcipVuCnjLPH/gGZmKP75ovhDGIgkrPOVYHSbBaN1hYTicGX4h8FvMsYPSywB9XJjKQ96O5zPhxkK/ANT0KcJRojVG8Y1+HeoIZSDQegouBI30ix+zEtPq72HWLQk+bv7/w3dp/RhBfaAr7JPlKCxbTBABSRtqCcZYKb6fzUGbNks1UINntNPlzc3NDB8rElekmNUXL1jr3pj3HG7MSYGxjfQcwn3A92MYJfaiPI+5GmOeFfvMacxJkvHlxdOFNSIG9JLC+PptcKB5X4Z81gdreM8SbwZRwL6IkiM0uJyhGwOyUM3vbOnuRQQ4ezwowEDpFVh0PxEYQtcva3apZ7KryjUI9tfAPyMgOhvLOMPy/ib8opTXIJwRVR45rvLBl7/CYR8YrHW3DUhGGus6xvc+5h+LEeRJdiFi6a6erxL/1eV9hpcuXR2tmHKt4Vlp2TItG4jJGF4Dw3wdOLhsABvHh5IpH3HLkG2kQ2gRIw04XIP2NiepmRdqMZEUqVdETZ5fM20nyWpfChejVTl4sdT9dDFEJs74pQsuQz83RlK0zouYiWZjBpdKu6/yFjpT7jneSy9faE7QwOrONEskCx4+9J/zgcnQe1xAupW+TygOVPVbFGnw4rg8ApssLMn0o6WFQRlWfHDvETivRFPVntZvM7BrdGGlVfC1M2mLGGMbyD8dMRCqiFQ21fFeaGGTnRgCibfyzQpFHHjCUUZTGkp9VVXk6UJSB8SWxXYASMIP0I3Guc0NE+z4sqp/N9QexZboXpfH1/WBNNQKIEeLbKqe1WDtEGOtkdYM36knyAobwFC0/GFtlCO4yDy6aXTKzfvBx/FyVmMxBpq9TOxUgbsyYPanJMUl9GdbZvw7obHz3uN1RgXgbfS0oxmbmczULwsY2eTZeeFQJYHmvl1g5BUt9BdM/+yR+pN7m+nIB/ZBgB cGUiAHfO 8ztf1lmENpCxvV+dyg0NB4yTrtr7vSt3Vj6cCDHnSAS8AEtWpfrdlMXgoJwiR071Ydjw9Ku+fVBBiT/rdFPQsSOfOJlcCXTnaTK6AToYFj6ToMw7KQFbYmLV3fWdgOJUgCFyT1bp3pwdyNW0t03ho7Okiu7M6eMbt/Q7vLtG5faJ4KRTdPhMteanvwD6UREVGTG+9MAZrkiAqEn9ZVmh3RjE6xg== 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: Since some users may not use zswap, the zswap_pool is wasted. Save memory by delaying the initialization of zswap until enabled. Signed-off-by: Liu Shixin --- mm/zswap.c | 51 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 09fa956920fa..3aed3b26524a 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -81,6 +81,8 @@ static bool zswap_pool_reached_full; #define ZSWAP_PARAM_UNSET "" +static int zswap_setup(void); + /* Enable/disable zswap */ static bool zswap_enabled = IS_ENABLED(CONFIG_ZSWAP_DEFAULT_ON); static int zswap_enabled_param_set(const char *, @@ -220,6 +222,9 @@ static bool zswap_init_started; /* fatal error during init */ static bool zswap_init_failed; +/* used to ensure the integrity of initialization */ +static DEFINE_MUTEX(zswap_init_lock); + /* init completed, but couldn't create the initial pool */ static bool zswap_has_pool; @@ -272,13 +277,13 @@ static void zswap_update_total_size(void) **********************************/ static struct kmem_cache *zswap_entry_cache; -static int __init zswap_entry_cache_create(void) +static int zswap_entry_cache_create(void) { zswap_entry_cache = KMEM_CACHE(zswap_entry, 0); return zswap_entry_cache == NULL; } -static void __init zswap_entry_cache_destroy(void) +static void zswap_entry_cache_destroy(void) { kmem_cache_destroy(zswap_entry_cache); } @@ -663,7 +668,7 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) return NULL; } -static __init struct zswap_pool *__zswap_pool_create_fallback(void) +static struct zswap_pool *__zswap_pool_create_fallback(void) { bool has_comp, has_zpool; @@ -784,8 +789,15 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, /* if this is load-time (pre-init) param setting, * don't create a pool; that's done during init. */ - if (!zswap_init_started) - return param_set_charp(s, kp); + if (!zswap_init_started) { + mutex_lock(&zswap_init_lock); + if (!zswap_init_started) { + ret = param_set_charp(s, kp); + mutex_unlock(&zswap_init_lock); + return ret; + } + mutex_unlock(&zswap_init_lock); + } if (!type) { if (!zpool_has_pool(s)) { @@ -884,6 +896,15 @@ static int zswap_enabled_param_set(const char *val, if (res == *(bool *)kp->arg) return 0; + if (!zswap_init_started && (system_state == SYSTEM_RUNNING)) { + mutex_lock(&zswap_init_lock); + if (zswap_setup()) { + mutex_unlock(&zswap_init_lock); + return -ENODEV; + } + mutex_unlock(&zswap_init_lock); + } + if (zswap_init_failed) { pr_err("can't enable, initialization failed\n"); return -ENODEV; @@ -1451,7 +1472,7 @@ static const struct frontswap_ops zswap_frontswap_ops = { static struct dentry *zswap_debugfs_root; -static int __init zswap_debugfs_init(void) +static int zswap_debugfs_init(void) { if (!debugfs_initialized()) return -ENODEV; @@ -1482,7 +1503,7 @@ static int __init zswap_debugfs_init(void) return 0; } #else -static int __init zswap_debugfs_init(void) +static int zswap_debugfs_init(void) { return 0; } @@ -1491,12 +1512,13 @@ static int __init zswap_debugfs_init(void) /********************************* * module init and exit **********************************/ -static int __init init_zswap(void) +static int zswap_setup(void) { struct zswap_pool *pool; int ret; - zswap_init_started = true; + if (zswap_init_started) + return 0; if (zswap_entry_cache_create()) { pr_err("entry cache creation failed\n"); @@ -1537,6 +1559,7 @@ static int __init init_zswap(void) goto destroy_wq; if (zswap_debugfs_init()) pr_warn("debugfs initialization failed\n"); + zswap_init_started = true; return 0; destroy_wq: @@ -1551,11 +1574,19 @@ static int __init init_zswap(void) cache_fail: /* if built-in, we aren't unloaded on failure; don't allow use */ zswap_init_failed = true; + zswap_init_started = true; zswap_enabled = false; return -ENOMEM; } + +static int __init zswap_init(void) +{ + if (!zswap_enabled) + return 0; + return zswap_setup(); +} /* must be late so crypto has time to come up */ -late_initcall(init_zswap); +late_initcall(zswap_init); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Seth Jennings ");