From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B97B1C6FA86 for ; Mon, 5 Sep 2022 08:16:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42343801C2; Mon, 5 Sep 2022 04:16:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D370801B3; Mon, 5 Sep 2022 04:16:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 24BD4801C2; Mon, 5 Sep 2022 04:16:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 10E0F801B3 for ; Mon, 5 Sep 2022 04:16:30 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E118014042A for ; Mon, 5 Sep 2022 08:16:29 +0000 (UTC) X-FDA: 79877324898.15.77EBA55 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf17.hostedemail.com (Postfix) with ESMTP id 8F05140062 for ; Mon, 5 Sep 2022 08:16:29 +0000 (UTC) Received: by mail-pl1-f176.google.com with SMTP id l3so7788273plb.10 for ; Mon, 05 Sep 2022 01:16:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=/AdpGVT0N/8ncggFEAw2LdRk7MFt3IthPSmEwk0XZqA=; b=Hw2je1UG8XBw4S6KF2eztarDlGqDR7b6mYLkyxsePPDKfXtIzSyxOrRsC6suIVuFd1 PXhuVKumBnRA+eXRMjTZJYC5M7lGz+HLTNrfyUmbGTig+61BjAs1cc8AVLVBEgCT5G1j isnAh3f2NDdAhhXALa85JKduwraI3xY/CxgU8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=/AdpGVT0N/8ncggFEAw2LdRk7MFt3IthPSmEwk0XZqA=; b=RypzcriIhUM0x4fcofgKtOwwEIC3FRzE6m5663T4FfKZyagHmKaMGxmJruyAf8acOS Q6OrQpLt1HmCSB2T9b0OwSaGjgPvVsswlev5nX7VbBKq+6p4qxQQDeFwiWEFLS4SCA+4 cOYHmW4w7D7KpdPl79HWZB+ATIvRfcE+nUpOJLWb5wh9ujijS0zmETyKvtwVm0YaNJlZ haMCtN3yD7PPPzQLKvi/0dR7yEeEQbt5Bcfv4TmQdyvAYVyyo6fvbjRe6NkhGEINe0vB mOBvF1Y+oSKn1qk4uBlBytnoA2HbnI64EDrAmW9sPs1UNZ7GMlusCEh5BwoXdydrA4A2 HepQ== X-Gm-Message-State: ACgBeo0kA/XW4DM8K8srSZJxP/a7nzPYEnHUIUcz0eVbnGYOaHD4C2eS 7hic5e6HwWd9NLG0msUtrMHwOQ== X-Google-Smtp-Source: AA6agR4niiO1u8IFNIJZJRvYw1HVm7TuxwF5Dj8VtySPmiKR9n2jVVoA+BZnoNvLqcrPIjdizmJkZw== X-Received: by 2002:a17:902:c40a:b0:174:7d05:97cd with SMTP id k10-20020a170902c40a00b001747d0597cdmr41363380plk.34.1662365788696; Mon, 05 Sep 2022 01:16:28 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:71e2:8444:42d9:4bb0]) by smtp.gmail.com with ESMTPSA id w12-20020aa79a0c000000b005363bc65bafsm7075864pfj.57.2022.09.05.01.16.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 01:16:28 -0700 (PDT) From: Sergey Senozhatsky To: Minchan Kim , Andrew Morton Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCH RFC 6/7] zram: Add recompression algorithm choice to Kconfig Date: Mon, 5 Sep 2022 17:15:51 +0900 Message-Id: <20220905081552.2740917-10-senozhatsky@chromium.org> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog In-Reply-To: <20220905081552.2740917-1-senozhatsky@chromium.org> References: <20220905081552.2740917-1-senozhatsky@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Hw2je1UG; spf=pass (imf17.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.176 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662365789; a=rsa-sha256; cv=none; b=P+a4RM8qFzQFVvW4mE4+WqhH2M8a6w/J3ZOrxfoOm8asLjry5ZyGVhTmAkGOFWHspjeubj lr+cQEbk7Nahh8HcBzu6TjklfJMBueIXtm7Ehzr+QZiVYxGqRBSqSsQ14b5Q4EGA2tSjrk fGkUE7uNP1p5xj3Pz6fdGlHhZxh6uP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662365789; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/AdpGVT0N/8ncggFEAw2LdRk7MFt3IthPSmEwk0XZqA=; b=WG9+tlJbBRKYcnSnC7j79w0h5dm0Dh6quaRQuViFIqZtJWhiLioyYPZM7MN/5skGVAzjag cM8v53L5oMR+r1pNFPAuCZiRaaw+jH7EVRdG7mn7ioil+RT5WmRlLctNIHkV7H+9vnHXb4 YOpZExrfGuAtCqoTafP9S/f+G19W7CU= Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Hw2je1UG; spf=pass (imf17.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.176 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam06 X-Stat-Signature: g1oy9wozyc8uz513awtzg9fa5z5g6ifk X-Rspam-User: X-Rspamd-Queue-Id: 8F05140062 X-HE-Tag: 1662365789-660076 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: Make (secondary) recompression algorithm selectable just like we do it for the (primary) default one. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/Kconfig | 40 +++++++++++++++++++++++++++++++++++ drivers/block/zram/zram_drv.c | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig index 81ae4b96ec1a..fc2d4d66c484 100644 --- a/drivers/block/zram/Kconfig +++ b/drivers/block/zram/Kconfig @@ -89,3 +89,43 @@ config ZRAM_MULTI_COMP echo TIMEOUT > /sys/block/zramX/idle echo SIZE > /sys/block/zramX/recompress + +choice + prompt "Default zram recompression algorithm" + default ZRAM_DEF_RECOMP_ZSTD + depends on ZRAM && ZRAM_MULTI_COMP + +config ZRAM_DEF_RECOMP_LZORLE + bool "lzo-rle" + depends on CRYPTO_LZO + +config ZRAM_DEF_RECOMP_ZSTD + bool "zstd" + depends on CRYPTO_ZSTD + +config ZRAM_DEF_RECOMP_LZ4 + bool "lz4" + depends on CRYPTO_LZ4 + +config ZRAM_DEF_RECOMP_LZO + bool "lzo" + depends on CRYPTO_LZO + +config ZRAM_DEF_RECOMP_LZ4HC + bool "lz4hc" + depends on CRYPTO_LZ4HC + +config ZRAM_DEF_RECOMP_842 + bool "842" + depends on CRYPTO_842 + +endchoice + +config ZRAM_DEF_RECOMP + string + default "lzo-rle" if ZRAM_DEF_RECOMP_LZORLE + default "zstd" if ZRAM_DEF_RECOMP_ZSTD + default "lz4" if ZRAM_DEF_RECOMP_LZ4 + default "lzo" if ZRAM_DEF_RECOMP_LZO + default "lz4hc" if ZRAM_DEF_RECOMP_LZ4HC + default "842" if ZRAM_DEF_RECOMP_842 diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 386e49a13806..8ed41514b8f0 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -44,7 +44,7 @@ static int zram_major; static const char *default_comp_algs[ZRAM_MAX_ZCOMPS] = { CONFIG_ZRAM_DEF_COMP, #ifdef CONFIG_ZRAM_MULTI_COMP - "zstd", + CONFIG_ZRAM_DEF_RECOMP, #endif }; -- 2.37.2.789.g6183377224-goog