From patchwork Thu Aug 19 19:55:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 12447911 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39F34C43216 for ; Thu, 19 Aug 2021 19:54:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CA3DE60720 for ; Thu, 19 Aug 2021 19:54:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CA3DE60720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 4D9136B0072; Thu, 19 Aug 2021 15:53:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 489858D0001; Thu, 19 Aug 2021 15:53:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 305086B0074; Thu, 19 Aug 2021 15:53:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0101.hostedemail.com [216.40.44.101]) by kanga.kvack.org (Postfix) with ESMTP id 0A0B16B0072 for ; Thu, 19 Aug 2021 15:53:59 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A0ECD2A4AD for ; Thu, 19 Aug 2021 19:53:58 +0000 (UTC) X-FDA: 78492880956.23.8BFE092 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by imf20.hostedemail.com (Postfix) with ESMTP id 69DAED0000B1 for ; Thu, 19 Aug 2021 19:53:58 +0000 (UTC) Received: by mail-qk1-f175.google.com with SMTP id az7so8453735qkb.5 for ; Thu, 19 Aug 2021 12:53:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Te7Vtbwf1FWH0SUwrKII1C36E9Z2yXd6HJrJnQpoc3k=; b=FP0ANrLl3UD45GmhfienmSCRtF1dYHDlsGkhvNovLGbUXVXLv34pEYocAPQWTm65TM ZeO0tgubrtGYvnYOgpRZSxJzsdGLl0wmE7bX28IGFK6gHCq7/43IwsXAfuvAY81RqLlX c6Zx98qId4RchnRxj0eo9l09M6qnk6vpUfnbcjxgSpauzo/xxqw0xffzmh0PKPswvgal cQJzy9HCPoNlRNjJpGJBL1khs8rgEdMNaI5/PYf4x93D0xoPj1lyu5odPT8tbueCRHiL SqoqsnTa/+yjV4Io40TGguPNrM0vx0ILBq+kC8lfX/CPK97jKxnAPzs7It1228Lxw+ds 6nxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Te7Vtbwf1FWH0SUwrKII1C36E9Z2yXd6HJrJnQpoc3k=; b=jQ6aOIqYi+XW/ESgE4PtRnfBgQ/F0JBDSPso8N6b+ZrNOdUZPyW7tf42aoEVSBSfSZ LF+c2isWOCbqfwkqWq46RzlRqmqBr/4wgoKQE/vzaR4euUa4G9vRqm1K+EYxY1CggXms ujX9yz9OwRZ1Fm/CLM9sWbsVvNU9QpxRTyMqjPgCS4piVNarWOR4ju0NFT7/6NgWRXfu wg3bIZ7AHMr9gDRwzXA5zvcbByacNp1wRNZ3Omr+9UMVkVmQu41CnSfsALdzNOeDC3aD 5epM+g+Ow0e6cOBzqq3LUVzOZlNQJNfCNut9T81CKib2p9u/0O7idXCzypIho3j+eJDR N7LQ== X-Gm-Message-State: AOAM531paAA/CuZ9JM9/DvaMFwIt+pfoHnbUFqQ+vZq6wROqPXlfN4p6 IkuS2A2xbI5auzBHJJem7rp0SA== X-Google-Smtp-Source: ABdhPJxu3u/NfH1mWdipGRolH4jKp7zgO23gRqOeKD0UyirhOewQ0ol8nkW0R5p1CKnRHg+8dbLtxQ== X-Received: by 2002:a37:c94:: with SMTP id 142mr5381982qkm.78.1629402837838; Thu, 19 Aug 2021 12:53:57 -0700 (PDT) Received: from localhost (cpe-98-15-154-102.hvc.res.rr.com. [98.15.154.102]) by smtp.gmail.com with ESMTPSA id x8sm1649604qts.69.2021.08.19.12.53.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 12:53:57 -0700 (PDT) From: Johannes Weiner To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 3/4] mm: Kconfig: simplify zswap configuration Date: Thu, 19 Aug 2021 15:55:32 -0400 Message-Id: <20210819195533.211756-3-hannes@cmpxchg.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210819195533.211756-1-hannes@cmpxchg.org> References: <20210819195533.211756-1-hannes@cmpxchg.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 69DAED0000B1 Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=FP0ANrLl; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf20.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.222.175 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org X-Rspamd-Server: rspam04 X-Stat-Signature: x7uhukdngyn7pyhhoh1457fureaipzqt X-HE-Tag: 1629402838-794042 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: Clean up option ordering; make prompts and help text more concise and actionable for non-developers; turn depends into selects where possible, so that users can simply select the functionality they want without having to chase down obscure code dependencies. Signed-off-by: Johannes Weiner --- drivers/block/zram/Kconfig | 3 ++- mm/Kconfig | 53 ++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig index 668c6bf2554d..e4163d4b936b 100644 --- a/drivers/block/zram/Kconfig +++ b/drivers/block/zram/Kconfig @@ -1,8 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 config ZRAM tristate "Compressed RAM block device support" - depends on BLOCK && SYSFS && ZSMALLOC && CRYPTO + depends on BLOCK && SYSFS depends on CRYPTO_LZO || CRYPTO_ZSTD || CRYPTO_LZ4 || CRYPTO_LZ4HC || CRYPTO_842 + select ZSMALLOC help Creates virtual block devices called /dev/zramX (X = 0, 1, ...). Pages written to these disks are compressed and stored in memory diff --git a/mm/Kconfig b/mm/Kconfig index dbceaa2a04a4..62c6e6092a0a 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -21,9 +21,13 @@ menuconfig SWAP if SWAP +config ZPOOL + bool + config ZSWAP bool "Compressed cache for swap pages (EXPERIMENTAL)" - depends on FRONTSWAP && CRYPTO=y + select FRONTSWAP + select CRYPTO select ZPOOL help A lightweight compressed cache for swap pages. It takes @@ -39,8 +43,18 @@ config ZSWAP they have not be fully explored on the large set of potential configurations and workloads that exist. +config ZSWAP_DEFAULT_ON + bool "Enable the compressed cache for swap pages by default" + depends on ZSWAP + help + If selected, the compressed cache for swap pages will be enabled + at boot, otherwise it will be disabled. + + The selection made here can be overridden by using the kernel + command line 'zswap.enabled=' option. + choice - prompt "Compressed cache for swap pages default compressor" + prompt "Default compressor" depends on ZSWAP default ZSWAP_COMPRESSOR_DEFAULT_LZO help @@ -106,7 +120,7 @@ config ZSWAP_COMPRESSOR_DEFAULT default "" choice - prompt "Compressed cache for swap pages default allocator" + prompt "Default allocator" depends on ZSWAP default ZSWAP_ZPOOL_DEFAULT_ZBUD help @@ -146,24 +160,9 @@ config ZSWAP_ZPOOL_DEFAULT default "zsmalloc" if ZSWAP_ZPOOL_DEFAULT_ZSMALLOC default "" -config ZSWAP_DEFAULT_ON - bool "Enable the compressed cache for swap pages by default" - depends on ZSWAP - help - If selected, the compressed cache for swap pages will be enabled - at boot, otherwise it will be disabled. - - The selection made here can be overridden by using the kernel - command line 'zswap.enabled=' option. - -config ZPOOL - tristate "Common API for compressed memory storage" - help - Compressed memory storage API. This allows using either zbud or - zsmalloc. - config ZBUD - tristate "Low (Up to 2x) density storage for compressed pages" + tristate "2:1 compression allocator (zbud)" + depends on ZSWAP help A special purpose allocator for storing compressed pages. It is designed to store up to two compressed pages per physical @@ -172,8 +171,8 @@ config ZBUD density approach when reclaim will be used. config Z3FOLD - tristate "Up to 3x density storage for compressed pages" - depends on ZPOOL + tristate "3:1 compression allocator (z3fold)" + depends on ZSWAP help A special purpose allocator for storing compressed pages. It is designed to store up to three compressed pages per physical @@ -181,15 +180,13 @@ config Z3FOLD still there. config ZSMALLOC - tristate "Memory allocator for compressed pages" + tristate + prompt "N:1 compression allocator (zsmalloc)" if ZSWAP depends on MMU help zsmalloc is a slab-based memory allocator designed to store - compressed RAM pages. zsmalloc uses virtual memory mapping - in order to reduce fragmentation. However, this results in a - non-standard allocator interface where a handle, not a pointer, is - returned by an alloc(). This handle must be mapped in order to - access the allocated space. + pages of various compression levels efficiently. It achieves + the highest storage density with the least amount of fragmentation. config ZSMALLOC_STAT bool "Export zsmalloc statistics"