From patchwork Tue Mar 4 09:25:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 14000247 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 1C900C282D3 for ; Tue, 4 Mar 2025 09:25:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B42D6280006; Tue, 4 Mar 2025 04:25:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AF3C9280001; Tue, 4 Mar 2025 04:25:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9943A280006; Tue, 4 Mar 2025 04:25:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 772B1280001 for ; Tue, 4 Mar 2025 04:25:21 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 333F0161A3D for ; Tue, 4 Mar 2025 09:25:21 +0000 (UTC) X-FDA: 83183335242.14.09D6004 Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) by imf28.hostedemail.com (Postfix) with ESMTP id 727E6C000D for ; Tue, 4 Mar 2025 09:25:18 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=hmeau.com header.s=formenos header.b=SHf5JXLH; dmarc=pass (policy=quarantine) header.from=apana.org.au; spf=pass (imf28.hostedemail.com: domain of herbert@gondor.apana.org.au designates 144.6.53.87 as permitted sender) smtp.mailfrom=herbert@gondor.apana.org.au ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741080319; 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=gIqcHUXrW/VV9CB31vd0AlriCi6IJXCee7ucb3EsjSo=; b=iKg0ejTC2b3zWM7LPtYLVNkPt1RMtMeKnnQTaCvrvIESfehbt2sxk35tK0dGhK8eZGPkhU eUoJc3KlGj5aKYWIzxfFpO3Tt7qnC80ZKUcbHVWTTNnOE4d5EUGx2DWIHZRbBHz+mJ4gkL yjNSBEbXw3yWxK2WFTKqnIx+ARsFlz8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=hmeau.com header.s=formenos header.b=SHf5JXLH; dmarc=pass (policy=quarantine) header.from=apana.org.au; spf=pass (imf28.hostedemail.com: domain of herbert@gondor.apana.org.au designates 144.6.53.87 as permitted sender) smtp.mailfrom=herbert@gondor.apana.org.au ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741080319; a=rsa-sha256; cv=none; b=bzWphQkh63fTLScaNN9GEYpW9r37qznRRNowaU2JI7kzIfq1BbYVmu3G18V8JMV2gcrM3R FZo3nu3U6Ej2aJ4udU3H5nHe5Y05RlaVeMkybormtbK8Qfv/2CaXW3FDZ8IICw5eY2Mvde e15lU+tDdSM6ugjuUPKkepVNQg9Lo4g= 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=gIqcHUXrW/VV9CB31vd0AlriCi6IJXCee7ucb3EsjSo=; b=SHf5JXLHQMZKrDgv1yUviFGqGV +tUxoSsnOQNrj+h3TcgQ6jwXn3ZDN4qo0MAMCDRPQUintBhiqHM0QkqMB5VW7gszVOJqh/KBOqEPT VwqRZUA88TE9QKQON7+UosLPS8nnuHgbTfVi67vd/CKbI0jfo2CbzLS7NUeLk8FEwVVxExkd8rAM0 1Hr+4YK6pUfHqawcilKRyS1mLgRRvm//py+avvWaZipzGv474xPgy+Fx5j+/K0VsX9NUWfnrjgoUE skQ7GGAff6TlYpoz/+uvkJ1F0H1gePDQcP8OOeEt9cYBRYer2MALM4VfJCsU//okVBEv8p/S6iQAJ OlpQchcg==; Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.96 #2 (Debian)) id 1tpOWZ-003a3P-14; Tue, 04 Mar 2025 17:25:16 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Tue, 04 Mar 2025 17:25:15 +0800 Date: Tue, 04 Mar 2025 17:25:15 +0800 Message-Id: <7fb4bea494ba06ec8c8f7bb3af5af2b478615edd.1741080140.git.herbert@gondor.apana.org.au> In-Reply-To: References: From: Herbert Xu Subject: [v2 PATCH 6/7] crypto: scomp - Add chaining and virtual address support To: Linux Crypto Mailing List Cc: linux-mm@kvack.org, Yosry Ahmed , Kanchana P Sridhar X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 727E6C000D X-Rspam-User: X-Stat-Signature: dauss7n6gdi7pwaijzjcogw5n55b5qja X-HE-Tag: 1741080318-827669 X-HE-Meta: U2FsdGVkX18Hh3rv7fgL2FsA61g99qbHt6ahvHBm/fCW3uPP56qt1u1XVuOOTfmvpb6VTsqzVp4hPorz7pzGPCgOTajxdxKyyUxEnXA8+zfyR33jgQ/leZkB9gipnfmGchFmu936eT7SV4w4xaCJCyFwu+EnLgVp4atJcbvyQTrUZCCJoscLCbDDIaqKiqt9ql5ZEl0a9/ad6netXfltmnA9q82ReQEdJtbMs4DS8zYBRKV13morESiXTD2YblQHSmNTiHdZZnZCh14dWhbmoTIPSXzOXWYdtb6aRWjZDS5lsE22+QqDdxl7CoX8mxLw/5d49iYpW/6bEHbsE2JSEppORW8pI1aOwEiPYwO6Gd19ty4WQnXNmOOGPQIugn58kiG5WZ2IA6uanbRb0augvZo9PhiWhMmF4zS9io628oYElrcvOUjPDAH3tSx1m69JMCxjThdwxsbsOBPS/vyxBdUp1+I6U37DSgpK9pH14UtW0tTTWtnAHXwlneCzCiTTSq78Hl/8aHCIFDi79jUE72hwJYRsMUF+Zb7g7eKZMnS+9i1+bMEQbv6l1t39BsS1Qzu6axe2jdARe8egq3ANJLQnnwa++NWhcjRE3UtrMvzxLyopmPCju50g8m629EZzmf8eDA8saf3gVMx+JDBZrg/jVL/ACeuZ261ChVswtAKLsUXN3zbaMa+kMBcQerup2EnOZgdta2HCDynIaFZFxsZ5TT/MDdcC1buR4D++BCQaPXzUIZuVwp0YD1IDuU/gXvDlY+zv/Q0r+nRbuhYcV+/XfPvvh9Z/Y4EQrFSWzg0xm6FCOilzec6y2GIKRcmWsC+rhgCOAgLxbq5Fol9p2tV+S6OlJHB+PbEZZvs54kU6NOsjS/XqLIN2xtqOOBPfJFWZcAM70Ggvcnq/MzhZdzEIxCxDRETNND8c3mUDlK/gqqtODsQM81hbXF8ghY0Cqe3gweDdA0iygOMh3KA tbgAkFrX dnQAziIcyKp5aYObixYNqiIW6KQzjD+d5ybOpeTaROiAQyaGPp3tLABTyUVLkXQ0vbkXNbEjXxWrSd/dvKDzMsEIHQcOpYQRqgrl0Lo2EfpP2csJUmw+8/DPf+WsE4R8OWdeUuUdqSP+c76MLNMI9CnOHIhUS52DlQirBZ8Vm/2n6Ym9PQFUJdgnx4eS15hZrLTNjEDRMkmgqMFw1hS/1Ojw5mw== 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 | 82 +++++++++++++++++++++++++++++++--------------- 1 file changed, 56 insertions(+), 26 deletions(-) diff --git a/crypto/scompress.c b/crypto/scompress.c index d78f307343ac..8ef2d71ad908 100644 --- a/crypto/scompress.c +++ b/crypto/scompress.c @@ -116,7 +116,8 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) struct scomp_scratch *scratch; unsigned int slen = req->slen; unsigned int dlen = req->dlen; - void *src, *dst; + const u8 *src; + u8 *dst; int ret; if (!req->src || !slen) @@ -125,28 +126,32 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) if (req->dst && !dlen) return -EINVAL; - if (sg_nents(req->dst) > 1) - return -ENOSYS; - - if (req->dst->offset >= PAGE_SIZE) - return -ENOSYS; - - if (req->dst->offset + dlen > PAGE_SIZE) - dlen = PAGE_SIZE - req->dst->offset; - - if (sg_nents(req->src) == 1 && (!PageHighMem(sg_page(req->src)) || - req->src->offset + slen <= PAGE_SIZE)) - src = kmap_local_page(sg_page(req->src)) + req->src->offset; - else - src = scratch->src; - - dst = kmap_local_page(sg_page(req->dst)) + req->dst->offset; - scratch = raw_cpu_ptr(&scomp_scratch); + + if (acomp_request_isvirt(req)) { + src = req->svirt; + dst = req->dvirt; + } else if (sg_nents(req->dst) > 1) + return -ENOSYS; + else if (req->dst->offset >= PAGE_SIZE) + return -ENOSYS; + else { + if (req->dst->offset + dlen > PAGE_SIZE) + dlen = PAGE_SIZE - req->dst->offset; + + src = scratch->src; + if (sg_nents(req->src) == 1 && + (!PageHighMem(sg_page(req->src)) || + req->src->offset + slen <= PAGE_SIZE)) + src = kmap_local_page(sg_page(req->src)) + req->src->offset; + + dst = kmap_local_page(sg_page(req->dst)) + req->dst->offset; + } + spin_lock(&scratch->lock); if (src == scratch->src) - memcpy_from_sglist(src, req->src, 0, req->slen); + memcpy_from_sglist(scratch->src, req->src, 0, req->slen); if (dir) ret = crypto_scomp_compress(scomp, src, slen, @@ -157,22 +162,38 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) spin_unlock(&scratch->lock); - if (src != scratch->src) - kunmap_local(src); - kunmap_local(dst); - flush_dcache_page(sg_page(req->dst)); + if (!acomp_request_isvirt(req)) { + if (src != scratch->src) + 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) @@ -259,12 +280,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;