diff mbox series

[-next,v7,3/4] mm/zswap: replace zswap_init_{started/failed} with zswap_init_state

Message ID 20230325071420.2246461-4-liushixin2@huawei.com
State New
Headers
Series Delay the initialization of zswap |

Commit Message

Liu Shixin March 25, 2023, 7:14 a.m. UTC 
  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 <liushixin2@huawei.com>
---
 mm/zswap.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Comments

Christoph Hellwig March 26, 2023, 11:26 p.m. UTC | #1 
On Sat, Mar 25, 2023 at 03:14:19PM +0800, Liu Shixin wrote:
> -/* used by param callback function */
> -static bool zswap_init_started;
> +#define ZSWAP_UNINIT		0x0
> +#define ZSWAP_INIT_SUCCEED	0x1
> +#define ZSWAP_INIT_FAILED	0x2

This should be a (named) enum.
diff mbox series

Patch

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;
 }