From patchwork Thu Feb 27 10:15:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 13994056 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 A6875C19F2E for ; Thu, 27 Feb 2025 10:15:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 071FF280004; Thu, 27 Feb 2025 05:15:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F37C428000A; Thu, 27 Feb 2025 05:15:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2550280004; Thu, 27 Feb 2025 05:15:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9E5D5280008 for ; Thu, 27 Feb 2025 05:15:13 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 47BC7A07D1 for ; Thu, 27 Feb 2025 10:15:13 +0000 (UTC) X-FDA: 83165316906.17.267EB83 Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) by imf11.hostedemail.com (Postfix) with ESMTP id 7BCD940052 for ; Thu, 27 Feb 2025 10:15:11 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=hmeau.com header.s=formenos header.b=iAONUVb0; spf=pass (imf11.hostedemail.com: domain of herbert@gondor.apana.org.au designates 144.6.53.87 as permitted sender) smtp.mailfrom=herbert@gondor.apana.org.au; dmarc=pass (policy=quarantine) header.from=apana.org.au ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740651311; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:dkim-signature; bh=ilEUmOuJANO5dYUHK6+31dmZkztFgxSS5iQ9gGn3/Q8=; b=ke3V91IGjtf9TP/LZe0nyJJNmQH35W+7nbP8Yz6k3d7paGZEhrA62wdCCeGctWh7dOfU6y bSlUM/4/UbyKNgyhSYf3v8PW6agT19FzC+hNoh4TEIiVqhGIdDh4jnH77qv2Htd0s4aiD5 46h3OjfeVY470YExnyw9ERGKL1rB9po= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=hmeau.com header.s=formenos header.b=iAONUVb0; spf=pass (imf11.hostedemail.com: domain of herbert@gondor.apana.org.au designates 144.6.53.87 as permitted sender) smtp.mailfrom=herbert@gondor.apana.org.au; dmarc=pass (policy=quarantine) header.from=apana.org.au ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740651311; a=rsa-sha256; cv=none; b=YfALJvMGRhUi7Y1fjedClndu5/62ItAd3URLEXJ+larYSdMEpWIV08WCNvfuPUMuZj5GK9 F8mGyY0TMP63qu9hFhysoWEfIzF9oRGJdqRE4LyWQYH9DkmO3AdWuw4H5o5aRjJ9PNxS+e sVuthXWSJ7LHoxiOrXW4BWrVYxfFUVs= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hmeau.com; s=formenos; h=Cc:To:Subject:From:References:In-Reply-To:Message-Id:Date: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ilEUmOuJANO5dYUHK6+31dmZkztFgxSS5iQ9gGn3/Q8=; b=iAONUVb0h3CbuPNKOX0ujTia2G YLBdZRAGx1POwTLzZCEAW3gweMXf3M6/GT8nzhYlrV1aFlDelzPMYcoRHpupZByvwSN7O3BkA/gDa 8EtkM5M5IRIWjQcW/KO1fx2dg6gBCsrwbJRUyOarfnCdJraHq7jghYoceHbFwLhOLtLFGlL86w3Q3 ysRx4etPOnaO1CAzOrwVW+q7WWYD6rmxiOtDnr4uJiPHywXT8Vhlph1wBziPsNakoha0zw75mcmo2 XsNUwHHcyCVnQ9MwxrZThD1lg76JUz0UgZzu1Gv3LrCZMHqysCrXadKJadAzm2/hbeQ3+tnXOkFhO 6RD1NXkw==; Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.96 #2 (Debian)) id 1tnav5-002Drd-0Y; Thu, 27 Feb 2025 18:15:08 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Thu, 27 Feb 2025 18:15:07 +0800 Date: Thu, 27 Feb 2025 18:15:07 +0800 Message-Id: In-Reply-To: References: From: Herbert Xu Subject: [PATCH 6/7] crypto: scomp - Add chaining and virtual address support To: Linux Crypto Mailing List Cc: linux-mm@kvack.org, Yosry Ahmed X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7BCD940052 X-Stat-Signature: 17zeyjcb3xgiuoyr3r6cj5opd7m8cyp7 X-Rspam-User: X-HE-Tag: 1740651310-558118 X-HE-Meta: U2FsdGVkX189hEgDmGm5UQGDShuRvsxFSnXY2KRpwI3hZSNw5d1z7UOHFydmU+3LQeTqdRHKuj5+9w/uPglMTcRlkVlE2vzrZoPvGWz1hFO3bRZuHdvzbOzDFztJJRE0B5+wqdbrWoscx7ZFtlWN9C+NRjj0eYTvHFvxCOZ6ksj79DSfqIRzTZIvvWpUDyp8sdIT187edTjlsJTzOWnsF/RVBbRnsIaEri6PMBJd1DMHgpe4kcV1mdpxSiHU+8n8fwxJHLIEd1idwg9p3ucfNgqHbBvJ6qqj0JOI9F49QLra+G+4h7iyuDFb6Fv2/Fna+SjwmQqxda65MEnpnW4OLQfbbycsb9lgXy+HqbIdze0MBpIB/1nz4E7DoUyWTLmxMnme3N7RsDpz+MXkflTgBW5mkvZNSjeAw8L0ty2YRrzXiFQuRgFD3m4y0IBcZBSJ4aTRLnB0EuLuOelT0ek09ca7xEAVsmYhX+9PqNlrCmiuhr8hyeb78wVvPkQ+wV6Qs5Vq4NASU2lmmNZOLu4ugOLWKNlKMg+hkY69rOJdWnLnnsBSNQbKxSoOfEuixRS6yRT+shBdAY7m3SFfuIoIVitEfVTDnPUdwOsIfga7SMH/b25KQDd0LuxMck+1zpwL0Ou2T0yFa/s/cFZ52fcanXv+jC/G0ClP84YF3AhfE4RXBjMDYpz0C/kdArqtCODhssluFSHFNYOa6+2OE+YwCi9wZ76NjKuSNoXi5PVilhsBQXkvFdX+4u/zQLr7Yrcc/3trDZDbriwd78zVfb0n7DHqdBLSVElmBT4tGx7zeQ7NKg1MM3QSm2Ut+2NKAY5vpHCc1B8AXHu860yEVe715Q+W06YJQAOsYgjhhg3HOdFq53vGK6R4Zra09xJVFom4iiF4B2ic7kA0sbYGj2ShTtYsc2ZyQjG8BWlxqWd3A3+aCn1lgZc8P61msDUoQ6fCwewO6jQmxksxXZI/V3v p2agtxoG vvYCsSamLEiRzUz2rMWgrLBWe5aYCUtbyYP8+4AxTw7HlN/v1O9E8KpYBS5XUMSI4sSe5lHkNWtRgzKXYwrF0kZUpLCV1SjYAN++eCG2R+V4dhhBbUWEV1sUyLUhbAYIL+lTsSCTiXImIooBL3Rb3bQeozyAImcgbfN0w08/Exy3W3GecwOMVkKR8n0zu21FfCDYVEhIExmI5i8hw156UbqCgmQ== 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: List-Subscribe: List-Unsubscribe: Add chaining and virtual address support to all scomp algorithms. Signed-off-by: Herbert Xu --- crypto/scompress.c | 62 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/crypto/scompress.c b/crypto/scompress.c index ffc8e7f4862c..e94ea9c1685b 100644 --- a/crypto/scompress.c +++ b/crypto/scompress.c @@ -58,7 +58,8 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) void **ctx = acomp_request_ctx(req); unsigned int slen = req->slen; unsigned int dlen = req->dlen; - void *src, *dst; + const u8 *src; + u8 *dst; int ret; if (!req->src || !slen) @@ -70,20 +71,24 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) if (!req->dst || !dlen) return -ENOSYS; - if (sg_nents(req->src) > 1 || req->src->offset + slen > PAGE_SIZE) + if (acomp_request_isvirt(req)) { + src = req->svirt; + dst = req->dvirt; + } else if (sg_nents(req->src) > 1 || + req->src->offset + slen > PAGE_SIZE) return -ENOSYS; - - if (sg_nents(req->dst) > 1) + else if (sg_nents(req->dst) > 1) return -ENOSYS; - - if (req->dst->offset >= PAGE_SIZE) + else if (req->dst->offset >= PAGE_SIZE) return -ENOSYS; + else { - if (req->dst->offset + dlen > PAGE_SIZE) - dlen = PAGE_SIZE - req->dst->offset; + if (req->dst->offset + dlen > PAGE_SIZE) + dlen = PAGE_SIZE - req->dst->offset; - src = kmap_local_page(sg_page(req->src)) + req->src->offset; - dst = kmap_local_page(sg_page(req->dst)) + req->dst->offset; + src = kmap_local_page(sg_page(req->src)) + req->src->offset; + dst = kmap_local_page(sg_page(req->dst)) + req->dst->offset; + } if (dir) ret = crypto_scomp_compress(scomp, src, slen, @@ -92,21 +97,37 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) ret = crypto_scomp_decompress(scomp, src, slen, dst, &req->dlen, *ctx); - kunmap_local(src); - kunmap_local(dst); - flush_dcache_page(sg_page(req->dst)); + if (!acomp_request_isvirt(req)) { + kunmap_local(src); + kunmap_local(dst); + flush_dcache_page(sg_page(req->dst)); + } return ret; } +static int scomp_acomp_chain(struct acomp_req *req, int dir) +{ + struct acomp_req *r2; + int err; + + err = scomp_acomp_comp_decomp(req, dir); + req->base.err = err; + + list_for_each_entry(r2, &req->base.list, base.list) + r2->base.err = scomp_acomp_comp_decomp(r2, dir); + + return err; +} + static int scomp_acomp_compress(struct acomp_req *req) { - return scomp_acomp_comp_decomp(req, 1); + return scomp_acomp_chain(req, 1); } static int scomp_acomp_decompress(struct acomp_req *req) { - return scomp_acomp_comp_decomp(req, 0); + return scomp_acomp_chain(req, 0); } static void crypto_exit_scomp_ops_async(struct crypto_tfm *tfm) @@ -188,12 +209,21 @@ static const struct crypto_type crypto_scomp_type = { .tfmsize = offsetof(struct crypto_scomp, base), }; -int crypto_register_scomp(struct scomp_alg *alg) +static void scomp_prepare_alg(struct scomp_alg *alg) { struct crypto_alg *base = &alg->calg.base; comp_prepare_alg(&alg->calg); + base->cra_flags |= CRYPTO_ALG_REQ_CHAIN; +} + +int crypto_register_scomp(struct scomp_alg *alg) +{ + struct crypto_alg *base = &alg->calg.base; + + scomp_prepare_alg(alg); + base->cra_type = &crypto_scomp_type; base->cra_flags |= CRYPTO_ALG_TYPE_SCOMPRESS;