From patchwork Sat Mar 25 07:14:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 74835 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp243941vqo; Fri, 24 Mar 2023 23:58:10 -0700 (PDT) X-Google-Smtp-Source: AKy350ZUOCA1skAm40Wy+CmIZFTJ2a2Max/12FQF/696gurLeeWiaUrBVjv7Rq3JrJKdOlLNUxXT X-Received: by 2002:a17:902:eecc:b0:1a0:6bd4:ea78 with SMTP id h12-20020a170902eecc00b001a06bd4ea78mr4630386plb.31.1679727489812; Fri, 24 Mar 2023 23:58:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679727489; cv=none; d=google.com; s=arc-20160816; b=m2OKRR5SiBf1JKVIdgfaqEz7UxlIn0FSF13OPRYV75htaxObSVAjZJB4Xlbel7LWGs GuQAJBhBGiM/GdMYc6vVNwpHKpb5kA7RcmtVmtUcB7aXfWVXTbVuj0y3NtEumfM9uWlN LESyajKTG2Ij5iOda7omUlLMsYxhsGI3GSHRcFhxMVTCDBs1l7ixzp+ChMKg/PmAauD4 MaRmZUTz1vEmkpW5STqgebB9ak39yKJiIQhVFQq+JwJSyU+kGK5flNHtU9vtfl174Feo RtbzdBT5N14/ENRVOWlwHjiZorG16/NS5EbTUYEBnwsY5M4dx6W7sDKrcruKTULzIDac u/Nw== 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=U7CqCTNQHay2aKHt+sTOdDg19RKnNNYVYFzk04pG8XQ=; b=ZJZjMaHKIXHQYBQKBPcSizGskuYDD5pfk9vxCs5BLoAM6M5QxkVpiVdZ9yE95HPcDU 97nuL6QRxfY/OC6G/5sGUuqkdwJ5EWH8vA50gsDYiviZ8ykFJL1HLx6AM9MVB8K4rm+P s9pD0Z9NMrd2fonUbVcZIaP+rzO30QFBBuXkyf1mh/3N7A/+ZvwVG10/PZKqbooJMpJA ilVL14nqm/ffCD4eNdappDIJvYy21M62rR2NPsWgzQtnM/PHkNzY8TiOhA+cxiwWqy2K ln+Z0r7hj/AMPPLJQa2OhfhBKwj1nD3KJZJlrq5TL70aGC4f4PZvEZhY9yTAaV4Yc8iv 7vcQ== 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 v63-20020a638942000000b0050bef4fcb58si23427199pgd.320.2023.03.24.23.57.57; Fri, 24 Mar 2023 23:58:09 -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 S232154AbjCYGYi (ORCPT + 99 others); Sat, 25 Mar 2023 02:24:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231473AbjCYGYb (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 C865115541 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 4Pk8CW3lQwzrVts; Sat, 25 Mar 2023 14:23: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; 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 3/4] mm/zswap: replace zswap_init_{started/failed} with zswap_init_state Date: Sat, 25 Mar 2023 15:14:19 +0800 Message-ID: <20230325071420.2246461-4-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?1761321932342267266?= X-GMAIL-MSGID: =?utf-8?q?1761321932342267266?= The zswap_init_started variable name has a bit confusing. Actually, there are three state: uninitialized, initial failed and initial succeed. Add a new variable zswap_init_state to replace zswap_init_{started/failed}. Signed-off-by: Liu Shixin --- mm/zswap.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index d2adc1ffe47d..9eda48c8b8dc 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -214,11 +214,11 @@ static DEFINE_SPINLOCK(zswap_pools_lock); /* pool counter to provide unique names to zpool */ static atomic_t zswap_pools_count = ATOMIC_INIT(0); -/* used by param callback function */ -static bool zswap_init_started; +#define ZSWAP_UNINIT 0x0 +#define ZSWAP_INIT_SUCCEED 0x1 +#define ZSWAP_INIT_FAILED 0x2 -/* fatal error during init */ -static bool zswap_init_failed; +static int zswap_init_state; /* init completed, but couldn't create the initial pool */ static bool zswap_has_pool; @@ -765,7 +765,7 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, if (!strcmp(s, *(char **)kp->arg) && zswap_has_pool) return 0; - if (zswap_init_failed) { + if (zswap_init_state == ZSWAP_INIT_FAILED) { pr_err("can't set param, initialization failed\n"); return -ENODEV; } @@ -773,7 +773,7 @@ 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) + if (zswap_init_state == ZSWAP_UNINIT) return param_set_charp(s, kp); if (!type) { @@ -873,11 +873,11 @@ static int zswap_enabled_param_set(const char *val, if (res == *(bool *)kp->arg) return 0; - if (zswap_init_failed) { + if (zswap_init_state == ZSWAP_INIT_FAILED) { pr_err("can't enable, initialization failed\n"); return -ENODEV; } - if (!zswap_has_pool && zswap_init_started) { + if (!zswap_has_pool && (zswap_init_state == ZSWAP_INIT_SUCCEED)) { pr_err("can't enable, no pool configured\n"); return -ENODEV; } @@ -1485,8 +1485,6 @@ static int __init init_zswap(void) struct zswap_pool *pool; int ret; - zswap_init_started = true; - zswap_entry_cache = KMEM_CACHE(zswap_entry, 0); if (!zswap_entry_cache) { pr_err("entry cache creation failed\n"); @@ -1527,6 +1525,7 @@ static int __init init_zswap(void) goto destroy_wq; if (zswap_debugfs_init()) pr_warn("debugfs initialization failed\n"); + zswap_init_state = ZSWAP_INIT_SUCCEED; return 0; destroy_wq: @@ -1540,7 +1539,7 @@ static int __init init_zswap(void) kmem_cache_destroy(zswap_entry_cache); cache_fail: /* if built-in, we aren't unloaded on failure; don't allow use */ - zswap_init_failed = true; + zswap_init_state = ZSWAP_INIT_FAILED; zswap_enabled = false; return -ENOMEM; }