From patchwork Sat Mar 25 07:14:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 13187626 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 981AFC6FD1F for ; Sat, 25 Mar 2023 06:24:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC088900002; Sat, 25 Mar 2023 02:24:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AD1276B008A; Sat, 25 Mar 2023 02:24:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 94B9B900002; Sat, 25 Mar 2023 02:24:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 775AA6B0089 for ; Sat, 25 Mar 2023 02:24:34 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 463571C0252 for ; Sat, 25 Mar 2023 06:24:34 +0000 (UTC) X-FDA: 80606431668.27.21BCE9D Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf08.hostedemail.com (Postfix) with ESMTP id 35CFE160009 for ; Sat, 25 Mar 2023 06:24:30 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf08.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 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=1679725472; 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=uZrLSQ+dlYXGdfXxFGzfu38Xy78bR4XTsSHXkxqHFuc=; b=UcDShG/fUbIgD3D4iD/C1V/c9nmLqmtSSIemL/JaWMZ27TDidgh/fy2SMKdXcMxqgN3q+R K09PfZ2yfXgQ1FJZWRQbgTcz8ahP/5KViapJbyJBhuk3lQuD6YZFBdHzNSTRVLBzbIdIfl nAGxI9OXRG978NtYsQ0ixv/8jXdMlc0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf08.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679725472; a=rsa-sha256; cv=none; b=tWcv3BEbU3ofKsrU9Og1FfKp6BqbtpkoMvkM+odXGlhZk4Rfd1h1blKkK4lihQlbHCHKWD 4WoKbsoGolFtXyeTZ3H2baqpInkeKpuJRXb+i602yHRL99P/GF8oh3UI0rfZwA5wPFzQ7i 5l+DMzZpoE5s6iN4/mo8fxqVp0igHGA= Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Pk8CX0DgNzrVx1; Sat, 25 Mar 2023 14:23:20 +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; Sat, 25 Mar 2023 14:24:23 +0800 From: Liu Shixin To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , Nathan Chancellor , Christoph Hellwig CC: , , Liu Shixin Subject: [PATCH -next v7 4/4] mm/zswap: delay the initializaton of zswap Date: Sat, 25 Mar 2023 15:14:20 +0800 Message-ID: <20230325071420.2246461-5-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230325071420.2246461-1-liushixin2@huawei.com> References: <20230325071420.2246461-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100009.china.huawei.com (7.185.36.113) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 35CFE160009 X-Stat-Signature: kubpgr8xk5x7w6ayzf5zp6yaszoxzsz4 X-Rspam-User: X-HE-Tag: 1679725470-673591 X-HE-Meta: U2FsdGVkX1+rk06BBbCbMy1yAR9K7Rc0UXs26weKmx1Bfg3i1HTiFLpMShELbVwyE/3fzcHqTOYYMDOF7LAU3x4Hqkpo8QDrVILmFclwcIwMUDReqB9iCeZIq84s8FY2Zg/4WNfLtv/rWwxwIVSqSt50eXkcDLIWpXyp7FT4AZrIGZlOR09vzjAcpFdsHIgDTWMzwNQXniaQEq7BOIT4zOgmr6xtoYqMMo2ZVVk8Wv4M5R9jWSCuLJ2f55l9j2bfvmTqibFqXpX72N77mLxzxLvQRDFEZuT2/2e+PfMC2Y6h9kgwaLionMm71Y6kLMpg1tCpH37B/xTn+qCMruo7qCUvMQyi26QW63yGnjhCMl6eujg4u/7KxYHLi//farcWQrxxVEwp1oqYIjSJqcMJJMwqcrdQHLdliHjLzUONglk98/7BxLDoOinNTBA0mCnwNGBoQXQtNNX0Tt4DD4/3UskHBDouSTr0SnX6CD7hHb6j5/Xrm84Cyw+EN0jWYoy3uyt1IAArVF1l3AEyQ6Ug+MjrzdUh9d47DBcML0xfQIwYNfG62645CiuEnxygSh54yHjGkbLrG2JsYGLw6t9r8iY3ufR43qc/q1pI3y9F/f6qkTHF9baTCECCreD46yp8rhq59gssVZffohroRxb1dRfCAbstdkV7WkBJ/2+PR566u0MBQ71PyGxugD3tH0IjCOFXe7TvPi12t/oF5fV1RYv42PnM7DqQmJ4I31un4t02OWxAIlgGIYv/wJIXbAJj5dSi0nCrDpafYuh9Pmk/1fyFfwm3sYMC3N8aPMh4xg9d7lGHE5bP+wCejtXZTwcYE9MGaBOXl+vdxB1IrgXAYkMRdXnac3yHDq0WREB9xClLX2ezuyUKfDbFuBQphAmYr3pXsBQ/Lcm62dl/JiPooYxzrM20tKmrvjhD+dO6fUT+7VIChNspNf/WksIMV7BQmWvimiV3ZzWLg9EbZ4W 7tD/FFzO 0TcWgnbOfpBN6d8vzpscdCMtc/oYUMb+zRSALGXOdwARB/dbmH+p23ZPmOg5XCtn44vFj3cbkjKEoX0cese3DDz14Ouqlf7JZcIiTAfeqVnoGMZuFXJS4lDJeOAhSunlQ2j0/d4ZoczLg7Gt3UXjdloZzqmkYiR6UmWC9tCcfGztmAo3BJqjsWaQkNwWIF9S15vFo5F4PA/FxRXh9cD0auBYCWwY9RGssHYNV 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 | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 9eda48c8b8dc..af98bd8d4b79 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 atomic_t zswap_pools_count = ATOMIC_INIT(0); static int zswap_init_state; +/* 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; @@ -652,7 +657,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; @@ -765,16 +770,22 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, if (!strcmp(s, *(char **)kp->arg) && zswap_has_pool) return 0; + mutex_lock(&zswap_init_lock); if (zswap_init_state == ZSWAP_INIT_FAILED) { pr_err("can't set param, initialization failed\n"); + mutex_unlock(&zswap_init_lock); return -ENODEV; } /* if this is load-time (pre-init) param setting, * don't create a pool; that's done during init. */ - if (zswap_init_state == ZSWAP_UNINIT) - return param_set_charp(s, kp); + if (zswap_init_state == ZSWAP_UNINIT) { + 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)) { @@ -873,14 +884,23 @@ static int zswap_enabled_param_set(const char *val, if (res == *(bool *)kp->arg) return 0; + mutex_lock(&zswap_init_lock); + if (system_state == SYSTEM_RUNNING && zswap_setup()) { + mutex_unlock(&zswap_init_lock); + return -ENODEV; + } + if (zswap_init_state == ZSWAP_INIT_FAILED) { pr_err("can't enable, initialization failed\n"); + mutex_unlock(&zswap_init_lock); return -ENODEV; } if (!zswap_has_pool && (zswap_init_state == ZSWAP_INIT_SUCCEED)) { pr_err("can't enable, no pool configured\n"); + mutex_unlock(&zswap_init_lock); return -ENODEV; } + mutex_unlock(&zswap_init_lock); return param_set_bool(val, kp); } @@ -1440,7 +1460,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; @@ -1471,7 +1491,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; } @@ -1480,11 +1500,14 @@ 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; + if (zswap_init_state != ZSWAP_UNINIT) + return 0; + zswap_entry_cache = KMEM_CACHE(zswap_entry, 0); if (!zswap_entry_cache) { pr_err("entry cache creation failed\n"); @@ -1543,8 +1566,15 @@ static int __init init_zswap(void) 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 ");