From patchwork Mon Apr 3 12:13:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 13198066 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 232C0C77B60 for ; Mon, 3 Apr 2023 11:23:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 146196B007B; Mon, 3 Apr 2023 07:23:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 11DCD6B0074; Mon, 3 Apr 2023 07:23:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E70B46B007B; Mon, 3 Apr 2023 07:23:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D90636B0074 for ; Mon, 3 Apr 2023 07:23:24 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B04781C5D31 for ; Mon, 3 Apr 2023 11:23:24 +0000 (UTC) X-FDA: 80639843928.27.805D357 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf30.hostedemail.com (Postfix) with ESMTP id 70F998001F for ; Mon, 3 Apr 2023 11:23:21 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680521002; 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=49gRaLrfAwSleyHbIbxUpPycv+s0ZLnpca0XvkjTuak=; b=0dRbkUk6WyTN2WXfUlADadr6KzD4hl3nhjkcZl+mA+Y2o69E/L7jdGP9Ok4oLwiBauNaKv IiuGj+rzXVyW5Mg/mxl062gor8FzQr0uToDdn5MW6/0mr9wmr58Dm/9BR7N/JCEVCLgM/D 95MPxPspYLjNvbRP4nxtueOQxZV1FuE= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680521002; a=rsa-sha256; cv=none; b=g0MeKJA7Y208c26OdvrxfKKWlpJmO6zajJeeJ+3jH6P71PgcTBYr5vSxzJ8YeTa2bqT06q lir/1Y252l9qW+opZChSSa+suoVQ9XhgwCNKEEKm5pWTNyfge38/amL2EzTGZ4NaycGHDu jkZ4UGTIiWu7aEg6PRLZXC8m0bd5D94= Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PqpMZ1sYvznZpl; Mon, 3 Apr 2023 19:19:54 +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.23; Mon, 3 Apr 2023 19:23:16 +0800 From: Liu Shixin To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , Nathan Chancellor , Christoph Hellwig CC: , , Liu Shixin Subject: [PATCH -next v8 3/3] mm/zswap: delay the initialization of zswap Date: Mon, 3 Apr 2023 20:13:18 +0800 Message-ID: <20230403121318.1876082-4-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230403121318.1876082-1-liushixin2@huawei.com> References: <20230403121318.1876082-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm100009.china.huawei.com (7.185.36.113) X-CFilter-Loop: Reflected X-Stat-Signature: ots9pu7fao1cyzb3a8btdic5j4iscmii X-Rspam-User: X-Rspamd-Queue-Id: 70F998001F X-Rspamd-Server: rspam06 X-HE-Tag: 1680521001-358125 X-HE-Meta: U2FsdGVkX1+T0ZWyib7BoLUHfOWs/UiTGx/ZMZ7Pm0Y5ZPkHbqNFyL4tDKS6k7OtK38sYi2YAaJpSSTFCu470ZpwfpMcXOvtb6YXA/V2f3mAD2KBeYZrYoq0buluN01omfJZpzWluuS9opOuRD13fdjkFsBkr89imrajRGuf1/gn0awxmvU6RlVy6CcyD9DJS4HnGw8VWlDwR9xihYKi0En+boRvxYc7rgX5koKCurtNj/+7KiaixzkThlcXSqwSEI3PTL1aBd9ybt/XQ/yQdokYcU8VgcJEMVZEOmfy7aKrrAWH793oTUbgh3jZM5lXyIhVfBMQLUx2Ks47cieOka4mAGlAh+YjVfjPuy4fnYBnz99DcHPidFoIYPhLMBamXeRHbsRUYAqniUz1eV8KSxj+JeQ4/Jf4TVsTzk0uv/FWgOgxl3+PFebos1irJ/w0VcpXHc7avva6wX/hTb+iJs4L7l0sysO8qDUWWqZOS/bcwGZgowHXiGNhJojKW/UFCqwx0qOv2G5O6vgdEySaZ0DVYKL+p/28X/iImicKB4n3cwJJVJTa2P7uPuPUEpDMpk+QQ/hI8yrJAwAoxlVwKs7J6Xy1C1lzrFUZofhhJq5xDRMYQx5pXy1lJoeSeeVKyMcgZ9bq4RxKaKYULOI6zoB0//6m8HZqN2grFaR2mqYKIiU6ZZRxlm4eny4qzvIiNGMwLBwsvx/1SW9YjTczN5CEMuoi2+VQAdlo3acOFyKHjXrYUDjdOvdz/8+cn0iQi4mB0FiJe3kzU7PuEVmYP3MLBVwP86LBcv51HajkL0q18jQHX8lNLBfTMMMC4JH4CN5muHr7gkyi+YTK+fmNq120vZ3px690zfHbdkuFuUkfUux4zSHEDIXt3KGKQmPx66peqwAG2s21IBtL2Sej2tPSau9U8uKsGjMi5jrlHRJJolV0a3lmSce0E7OSbcx9cmHIczIE2zeE0emp/9/ aVtE4c5X fjB9WAHpTKRiBx0ILGJg+PPW+QErbUaqP9wO6CjGO07kYUxUjsGsWqGm9W2sJ7/NsCRYNXeBp1DA4IqYtjYL9L7DpkhasD0N/ieG3kGn27xVi9vc13tcrgH5j7oZaatBz039hwbnvJwvgm1iKLeXYskCOoserDbVdvDjnsJgN4eo0tjSmDo36Zh7Uhr25BpAnXwKgsp0/a1OkvvJSo1Gr8atYq2mv3NubsSre 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 | 56 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 13 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 9169c2baee87..14db57450bfd 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 *, @@ -222,6 +224,9 @@ enum zswap_init_type { static enum zswap_init_type 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; @@ -654,7 +659,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; @@ -763,21 +768,28 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, char *s = strstrip((char *)val); int ret; + mutex_lock(&zswap_init_lock); switch (zswap_init_state) { case ZSWAP_UNINIT: /* if this is load-time (pre-init) param setting, * don't create a pool; that's done during init. */ - return param_set_charp(s, kp); + ret = param_set_charp(s, kp); + mutex_unlock(&zswap_init_lock); + return ret; case ZSWAP_INIT_SUCCEED: /* no change required */ - if (!strcmp(s, *(char **)kp->arg) && zswap_has_pool) + if (!strcmp(s, *(char **)kp->arg) && zswap_has_pool) { + mutex_unlock(&zswap_init_lock); return 0; + } break; case ZSWAP_INIT_FAILED: pr_err("can't set param, initialization failed\n"); + mutex_unlock(&zswap_init_lock); return -ENODEV; } + mutex_unlock(&zswap_init_lock); if (!type) { if (!zpool_has_pool(s)) { @@ -867,19 +879,30 @@ static int zswap_zpool_param_set(const char *val, static int zswap_enabled_param_set(const char *val, const struct kernel_param *kp) { + int ret = -ENODEV; + + /*if this is load-time (pre-init) param setting, only set param.*/ + if (system_state != SYSTEM_RUNNING) + return param_set_bool(val, kp); + + mutex_lock(&zswap_init_lock); switch (zswap_init_state) { case ZSWAP_UNINIT: - return param_set_bool(val, kp); + if (zswap_setup()) + break; + fallthrough; case ZSWAP_INIT_SUCCEED: - if (!zswap_has_pool) { + if (!zswap_has_pool) pr_err("can't enable, no pool configured\n"); - return -ENODEV; - } else - return param_set_bool(val, kp); + else + ret = param_set_bool(val, kp); + break; case ZSWAP_INIT_FAILED: pr_err("can't enable, initialization failed\n"); - return -ENODEV; } + mutex_unlock(&zswap_init_lock); + + return ret; } /********************************* @@ -1437,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; @@ -1468,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; } @@ -1477,7 +1500,7 @@ 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; @@ -1540,8 +1563,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 ");