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: 74829 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp236713vqo; Fri, 24 Mar 2023 23:34:02 -0700 (PDT) X-Google-Smtp-Source: AKy350YXuDY0DJzubKYZxOmaxlfVvYJh8BM98jSUgXG7Y1ni4zc1dARRiHujLCk3e2qM4lMuTgZS X-Received: by 2002:aa7:96b0:0:b0:626:24b2:cd6c with SMTP id g16-20020aa796b0000000b0062624b2cd6cmr5770585pfk.7.1679726041998; Fri, 24 Mar 2023 23:34:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679726041; cv=none; d=google.com; s=arc-20160816; b=zSrnrJ4OLDy5ADsUKrLi5/GXksJe9X1r1Esz9XOTAVGHSn57qfhIZagPI2D4groPZi QMHFgvnYyQmsHJ9j/YdlkDnXGfQ2CZBUAo5WRLrss+dWYG0dtdyS9z9jkSg6O0haQBji bUe4F7UTy4km8/RhLOSHdA/vGDJlAviwGfSrgtujCHJQnpPOXW4erd0JavJQDQ/BdfU8 oBm4GD8DHePaK9CUBWjxRotJfC0zfE9YLwH/wrnyk80LXqCxvZeUiuYoBpIhnXW/gtYg 0cjwvR5JTkVTr+wX5XACKnVqypAONRrVUgvdFVX2WOwZX0thpu7Tc31vpHzG14/wDJtq bMVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=uZrLSQ+dlYXGdfXxFGzfu38Xy78bR4XTsSHXkxqHFuc=; b=SVx4KR+Yd7CQtm2Y3Q+fI52xJo9wP8TVDef+5xQSUY309dMIYzpQ1LU0cInw2mCNcr 3dufWb1qXnJgLXyZTIFUzT7HZjNtOQ7yBFIsrmz/QtVvi3ySNQWKx8dzZFhtn9kZc/k1 COlyLTcnrBZINWnmfkGHt0aKRaw1h+sTqKGUOPUdBfEHoCTnAfk77nUPZD+RPsiFyrhw 2M3puwF+r2SuZZ31d6sSGESFx2edoGtjatUhMq11h52VTBVUvEqyCzijgXYPIJ6HNhEo rqukEFV2iATp9/60gRYhTr3ZrXv0HTAuz8Zl8nVH8VZaVOZFjxgZy4TGeQUFitx1uFf7 WAeA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f204-20020a6238d5000000b0062a4fb857easi5360053pfa.366.2023.03.24.23.33.49; Fri, 24 Mar 2023 23:34:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232183AbjCYGYk (ORCPT + 99 others); Sat, 25 Mar 2023 02:24:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231659AbjCYGYb (ORCPT ); Sat, 25 Mar 2023 02:24:31 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 756C41517A for ; Fri, 24 Mar 2023 23:24:26 -0700 (PDT) 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-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761320414089872758?= X-GMAIL-MSGID: =?utf-8?q?1761320414089872758?= 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 ");