Better zswap config

Author: bigbruno

include/swap-default.conf

@@ -16,14 +16,14 @@ swap_mode=auto
 
 ################################################################################
 # Zswap - Compressed RAM cache for swap pages
-# Only used when swap_mode=zswap+swapfc or manual with zswap_enabled=1
 #
-# zswap compresses pages before writing to swap, reducing I/O
-# Requires a backing swap device (swap file or partition)
+# zswap compresses pages before writing to swap, reducing I/O.
+# Automatically enabled in zswap+swapfc mode. Use zswap_enabled=0 to disable.
+# Requires a backing swap device (swap file or partition).
 ################################################################################
 
 zswap_compressor=zstd       # lzo lz4 zstd lzo-rle lz4hc
-zswap_max_pool_percent=35   # Max % of RAM for compressed pool
+zswap_max_pool_percent=45   # Max % of RAM for compressed pool
 zswap_zpool=zsmalloc        # Memory allocator
 
 ################################################################################
@@ -56,10 +56,13 @@ swapfc_path=/swapfc/swapfile     # Path for swap files (must be btrfs)
 swapfc_frequency=1               # Check interval in seconds
 
 ################################################################################
-# Manual mode settings (only when swap_mode=manual)
+# Enable/disable settings
+# zswap_enabled: Set to 0 to disable zswap (default: 1, enabled when not using zram)
+# zram_enabled: Only used in manual mode
+# swapfc_enabled: Only used in manual mode
 ################################################################################
 
-zswap_enabled=0
+zswap_enabled=1
 zram_enabled=0
 swapfc_enabled=0
 swapd_auto_swapon=0

src/zswap.rs

@@ -96,7 +96,8 @@ pub fn start(config: &Config) -> Result<ZswapBackup> {
     info!("Zswap: backup current configuration: complete");
 
     // Get config values
-    let enabled = config.get("zswap_enabled").unwrap_or("0");
+    // Default to "1" because if start() is called, zswap should be enabled
+    let enabled = config.get("zswap_enabled").unwrap_or("1");
     let compressor = config.get("zswap_compressor").unwrap_or("lzo");
     let max_pool_percent = config.get("zswap_max_pool_percent").unwrap_or("20");
     let zpool = config.get("zswap_zpool").unwrap_or("zbud");