Received: by 2002:ab2:7b86:0:b0:1f7:5705:b850 with SMTP id q6csp1237960lqh; Mon, 6 May 2024 01:00:31 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWQGewDPB6Nt8deLJrhl+g9wvryTbRZ4DBMVZ7qJVIob5NfR8Ygmvkef5EyH7ZvJ1Pf0+0FMR7jTsvqA9hJYetmIlqgM4z0T0j+GauwLA== X-Google-Smtp-Source: AGHT+IGQVF0e8LWT3HLJkreag0hPvRIQ1J8bURUa4z+DT9xynIcJgnevXg8ZzOTpRdA0C7aNe6pO X-Received: by 2002:a05:6870:1851:b0:22e:8002:63f1 with SMTP id u17-20020a056870185100b0022e800263f1mr11168761oaf.8.1714982431151; Mon, 06 May 2024 01:00:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714982431; cv=pass; d=google.com; s=arc-20160816; b=HjgIKIGmzuZuIRDn/3SCBlr/rL4giD28O2OPUOTTDe0CPK1+aFLo0bTimxqSMJIedi 0LqiJ+YaCc6w76d7KwRo8hcrLxft6yw/4DdOVM8XtKmjFOxfmC44dQHPyFj/8Hwj+ndL kRpwsdljh6vDCcYQdDBmyMfRw9m8NVTlrRHyFFZj5BmufYWXIU8rHrTm48ogPFpbqBZm u9DsnDEMsfSN5N8sJZozNxxIBKbo9s5L0WruegcKiJs9/q1hKdKYIjoYdv+fSReKlA/6 a14ZWfXVuSHtb/7FzWj1qzmTj/OxV95PfvICXzIT3No9P9uE8RD97wn2C4Tjc3KXR5Rq Kr7Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Xs/oZbuIhbdeWVSnm1Y7/6OB6aLjJFlUrJpqF9jHmLk=; fh=UKstJvjqAQ3P/Vkvglih02Z8FmmRnlaJbql9clnU9dw=; b=wcSN/x/JQUVwRZIk8o6WA4nphdZCHyh2CdCY5ULnCes9pFY3NHhlO8VEPKk1ffVOgX we9SX4tanUsN6viUz5vhlvaab7eJVLESpOKglcCksGAqYTPphCLsxZZACRszZ9U3NfbO iWLJ7K0YjrAqD9HuaTudz1E9LWMrzwmlYqxQ3yejTtUz7dAixc6FuY5JPNOWz8Mmg7SV N4wwtOjKtj+VSFwtDxb1FU1V0OSC5/YUz2ThMoob1c1MvES4Y8UqRUlBnPw5iM1v4x8r fFafeVGJBH/z8l7+V7pJ6ze6SYdT7GzJA1pEJTMWpjcHzAkBqn54ZMXhe4VjSBEGIsH0 N/8w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=NKQQ2C1h; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-169448-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-169448-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id m15-20020a62f20f000000b006f454a5e4dbsi4935430pfh.90.2024.05.06.01.00.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 01:00:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-169448-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=NKQQ2C1h; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-169448-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-169448-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 6D9612827D2 for ; Mon, 6 May 2024 08:00:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D69401420D7; Mon, 6 May 2024 07:59:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="NKQQ2C1h" Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D427514262B for ; Mon, 6 May 2024 07:58:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714982339; cv=none; b=mo4XBKrfDB//wx6C5tD/h2NWlrObglLgtTtDp/yuw+rRGJcHY+BGKGh0M0CWSX6MyfXke+eKuXcvmnDU6hk5vP47Liq96uZ52lUNWVMVQj+vNvpin9fx+fp4AVxdbYL85tDG22gzjvpbHpJYUZUCVG50MKa9ojBb4m9sjj5NdWI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714982339; c=relaxed/simple; bh=UjfGmtLHYc+ZtfDBltxPDecVYYzszPmAvKAkfS30jKk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uHuCTJH/JyNqh45eYbtdfNJ7xZRtB56AtSWwM/p2HZyPEwtuF5DolKIBUN+Mzh9jLiKyle5earQ0nEMRgD4Img8FOaRig7ScZhj1JzQrMIn73C65sgBHTwxm7aCVwSfhxG3sX47EiEhyg211U3QxtrS0cC0yIcENVWRHySGO0ec= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=NKQQ2C1h; arc=none smtp.client-ip=209.85.215.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-5d8b519e438so1322039a12.1 for ; Mon, 06 May 2024 00:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1714982337; x=1715587137; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xs/oZbuIhbdeWVSnm1Y7/6OB6aLjJFlUrJpqF9jHmLk=; b=NKQQ2C1h5hvGqTvKG1hv2Zwv9i/g+7Kn5RkUgFJXp0o7olst5gJRgXDBy0T6uCZTi+ LlSPvg09PSDuYFdzmHexDsar0An9UmSnJi8De/bIP3EajXAYVpJX+0BAT/IpkAvWY2Hf l2OF2xh3Z4+bRVE1YCbwE5TuajaGSEqwV5AvU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714982337; x=1715587137; 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:message-id:reply-to; bh=Xs/oZbuIhbdeWVSnm1Y7/6OB6aLjJFlUrJpqF9jHmLk=; b=iNo9ANupKQaB0kxOqruCwcZJa/Ie3KxhANOx47kXRezZPg/dIFJ1ZO7wM7vSxXGQNq jA5EgUn/LYTmBVf6nCzfl45c48ZGMQQt0PcPo54GUnm8SWIqfyxKfRg6VQdaCChP963M vkT+WnbNlGGNvURShR8cQi/Mhc4MWgh4mc1/EI8fArMCOU7R8edv/IaY8Czmxe6LNWz2 f7lCzWDgrlAJD9vK2z8WVNtIq8pnDKyCReospcVZueY6OgTcj8LVGSh7h5iapgGgxUjB ZOhfmR25oOMK9HebnnIGC0mvQcf93SMjzbwUGoZkklC8GzK1jwggRRyqeTtfdrWn+6w/ g3Ow== X-Gm-Message-State: AOJu0YwFFFbbtgPiY6U5clcaejbN33B5Tyd2YUqmLlTNXvZvAigi3Vmg 6Zf24l5wTFWybf/G1zxxUFsHoup6M7Y1KoqRKO9p+veOdoHaWTyzRCMYBDNPSyeE4/Hpw2UwwdE = X-Received: by 2002:a05:6a20:c90d:b0:1af:9321:8ac3 with SMTP id gx13-20020a056a20c90d00b001af93218ac3mr4829178pzb.36.1714982337219; Mon, 06 May 2024 00:58:57 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:4e24:10c3:4b65:e126]) by smtp.gmail.com with ESMTPSA id h6-20020a170902f54600b001ec64b128dasm7633772plf.129.2024.05.06.00.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:58:56 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv2 05/17] zram: add zstd compression backend support Date: Mon, 6 May 2024 16:58:18 +0900 Message-ID: <20240506075834.302472-6-senozhatsky@chromium.org> X-Mailer: git-send-email 2.45.0.rc1.225.g2a3ae87e7f-goog In-Reply-To: <20240506075834.302472-1-senozhatsky@chromium.org> References: <20240506075834.302472-1-senozhatsky@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/Kconfig | 11 ++++ drivers/block/zram/Makefile | 1 + drivers/block/zram/backend_zstd.c | 97 +++++++++++++++++++++++++++++++ drivers/block/zram/backend_zstd.h | 10 ++++ drivers/block/zram/zcomp.c | 4 ++ 5 files changed, 123 insertions(+) create mode 100644 drivers/block/zram/backend_zstd.c create mode 100644 drivers/block/zram/backend_zstd.h diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig index 0d890a8d2dc4..71cd0d5d8f35 100644 --- a/drivers/block/zram/Kconfig +++ b/drivers/block/zram/Kconfig @@ -32,6 +32,12 @@ config ZRAM_BACKEND_LZ4HC select LZ4HC_COMPRESS select LZ4_DECOMPRESS +config ZRAM_BACKEND_ZSTD + bool "zstd compression support" + depends on ZRAM + select ZSTD_COMPRESS + select ZSTD_DECOMPRESS + choice prompt "Default zram compressor" default ZRAM_DEF_COMP_LZORLE @@ -53,6 +59,10 @@ config ZRAM_DEF_COMP_LZ4HC bool "lz4hc" depends on ZRAM_BACKEND_LZ4HC +config ZRAM_DEF_COMP_ZSTD + bool "zstd" + depends on ZRAM_BACKEND_ZSTD + endchoice config ZRAM_DEF_COMP @@ -61,6 +71,7 @@ config ZRAM_DEF_COMP default "lzo" if ZRAM_DEF_COMP_LZO default "lz4" if ZRAM_DEF_COMP_LZ4 default "lz4hc" if ZRAM_DEF_COMP_LZ4HC + default "zstd" if ZRAM_DEF_COMP_ZSTD default "unset-value" config ZRAM_WRITEBACK diff --git a/drivers/block/zram/Makefile b/drivers/block/zram/Makefile index 815b45471c7d..053fe35e346b 100644 --- a/drivers/block/zram/Makefile +++ b/drivers/block/zram/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_ZRAM_BACKEND_LZO) += backend_lzorle.o backend_lzo.o obj-$(CONFIG_ZRAM_BACKEND_LZ4) += backend_lz4.o obj-$(CONFIG_ZRAM_BACKEND_LZ4HC) += backend_lz4hc.o +obj-$(CONFIG_ZRAM_BACKEND_ZSTD) += backend_zstd.o zram-y := zcomp.o zram_drv.o diff --git a/drivers/block/zram/backend_zstd.c b/drivers/block/zram/backend_zstd.c new file mode 100644 index 000000000000..4da49626f110 --- /dev/null +++ b/drivers/block/zram/backend_zstd.c @@ -0,0 +1,97 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include +#include + +#include "backend_zstd.h" + +struct zstd_ctx { + zstd_cctx *cctx; + zstd_dctx *dctx; + void *cctx_mem; + void *dctx_mem; + s32 level; +}; + +static void zstd_destroy(void *ctx) +{ + struct zstd_ctx *zctx = ctx; + + vfree(zctx->cctx_mem); + vfree(zctx->dctx_mem); + kfree(zctx); +} + +static void *zstd_create(void) +{ + zstd_parameters params; + struct zstd_ctx *ctx; + size_t sz; + + ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); + if (!ctx) + return NULL; + + ctx->level = ZSTD_defaultCLevel(); + params = zstd_get_params(ctx->level, 0); + sz = zstd_cctx_workspace_bound(¶ms.cParams); + ctx->cctx_mem = vzalloc(sz); + if (!ctx->cctx_mem) + goto error; + + ctx->cctx = zstd_init_cctx(ctx->cctx_mem, sz); + if (!ctx->cctx) + goto error; + + sz = zstd_dctx_workspace_bound(); + ctx->dctx_mem = vzalloc(sz); + if (!ctx->dctx_mem) + goto error; + + ctx->dctx = zstd_init_dctx(ctx->dctx_mem, sz); + if (!ctx->dctx) + goto error; + + return ctx; + +error: + zstd_destroy(ctx); + return NULL; +} + +static int zstd_compress(void *ctx, const unsigned char *src, + unsigned char *dst, size_t *dst_len) +{ + struct zstd_ctx *zctx = ctx; + const zstd_parameters params = zstd_get_params(zctx->level, 0); + size_t ret; + + ret = zstd_compress_cctx(zctx->cctx, dst, *dst_len, + src, PAGE_SIZE, ¶ms); + if (zstd_is_error(ret)) + return -EINVAL; + *dst_len = ret; + return 0; +} + +static int zstd_decompress(void *ctx, const unsigned char *src, size_t src_len, + unsigned char *dst) +{ + struct zstd_ctx *zctx = ctx; + size_t ret; + + ret = zstd_decompress_dctx(zctx->dctx, dst, PAGE_SIZE, src, src_len); + if (zstd_is_error(ret)) + return -EINVAL; + return 0; +} + +struct zcomp_backend backend_zstd = { + .compress = zstd_compress, + .decompress = zstd_decompress, + .create_ctx = zstd_create, + .destroy_ctx = zstd_destroy, + .name = "zstd", +}; diff --git a/drivers/block/zram/backend_zstd.h b/drivers/block/zram/backend_zstd.h new file mode 100644 index 000000000000..75d2d2c02768 --- /dev/null +++ b/drivers/block/zram/backend_zstd.h @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#ifndef __BACKEND_ZSTD_H__ +#define __BACKEND_ZSTD_H__ + +#include "zcomp.h" + +extern struct zcomp_backend backend_zstd; + +#endif /* __BACKEND_ZSTD_H__ */ diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c index f04f5844a23c..c16eb038f608 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -19,6 +19,7 @@ #include "backend_lzorle.h" #include "backend_lz4.h" #include "backend_lz4hc.h" +#include "backend_zstd.h" static struct zcomp_backend *backends[] = { #if IS_ENABLED(CONFIG_ZRAM_BACKEND_LZO) @@ -30,6 +31,9 @@ static struct zcomp_backend *backends[] = { #endif #if IS_ENABLED(CONFIG_ZRAM_BACKEND_LZ4HC) &backend_lz4hc, +#endif +#if IS_ENABLED(CONFIG_ZRAM_BACKEND_ZSTD) + &backend_zstd, #endif NULL }; -- 2.45.0.rc1.225.g2a3ae87e7f-goog