From patchwork Tue Feb 20 06:44:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 13563468 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 08D94C48BC4 for ; Tue, 20 Feb 2024 06:44:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B73D6B0098; Tue, 20 Feb 2024 01:44:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 868EE6B0099; Tue, 20 Feb 2024 01:44:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 708456B009A; Tue, 20 Feb 2024 01:44:55 -0500 (EST) 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 5DD5D6B0098 for ; Tue, 20 Feb 2024 01:44:55 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 2EC331403E8 for ; Tue, 20 Feb 2024 06:44:55 +0000 (UTC) X-FDA: 81811244550.23.81D0E09 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf23.hostedemail.com (Postfix) with ESMTP id 4C3C214000C for ; Tue, 20 Feb 2024 06:44:53 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nnkdO20+; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.216.51 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708411493; 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=kW/qQndLj7MYeSMYgAPMliKXg25U647vW1M3U8+Bgew=; b=YFYQ3v0ZGCEIX7V+o+HPJEP0SYcnSeNVx11vdaS6780nPZ0U13IbYuy3tSmkfZweVCnd+r UviDA3Da9MJ9TcI7QVl3Ia/fiQdNtKH6vt51UsNGH6IOydO65kof/OMCZrTO8SfyxOILsV 4bspq7kzomB7bTntY8+VS17ZYoeeQKI= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nnkdO20+; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.216.51 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708411493; a=rsa-sha256; cv=none; b=s3hLDOv84breQ6rnxiyro6eu9okdU8e2PrXF7zr6uMSnZROtBvBdQ56FOZSY3dN40Q9aJK +FYKtoBxfSlXNirRlPmoo9WxQBTvqtIcieAhyQdR0lJo+mWnj2i0l5dFu/SjgRAxNT/KnB 4M/aqqspOrfQPvoEEJS7utAbalrHUBo= Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2995185dbbbso2582079a91.3 for ; Mon, 19 Feb 2024 22:44:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708411492; x=1709016292; darn=kvack.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=kW/qQndLj7MYeSMYgAPMliKXg25U647vW1M3U8+Bgew=; b=nnkdO20+HWsnEtTpflkmaf6MCsV2K8xye8fX//80v23vL2TW6ibRBDi9Lszai6RX9r aB/tvRsY5nGrZfC4mrr5wOLDaKhOCn7noCam9+u8DQi12uAWmRmJI/SK1W1wrgf5F2eB tj/JqkBM76n+SEu7cSAKuyLP/RNAGNOENCEGbJgkiEM8FFhfJqgYGNrs7dLWgfW3JHm2 2UtkaxP5blbzAuDkGN7QYPnrq2NeZdwbvR82hZcueH2ARjL64kp9/NkXVSNzOGTVmfVG oGb4iN1Uszq10VhoNyPYnnpGT+twVkFlha/I9P/e0rAd0zEE6gO8FNpFqbC7Gj1NfUth LsAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708411492; x=1709016292; 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=kW/qQndLj7MYeSMYgAPMliKXg25U647vW1M3U8+Bgew=; b=FkBMzDZuc9rR1R5EehNbi5c87JPGVlY3bcr561H1NHdOT2hlRRZXJWLsm37Y0tLJPE UZ6St8dbY6DSjy+B18I/YGuu0ZdHdZtZvgR5C/QxyJUJLuc4Zqar7UqhzTxJ1ZX+/mfe YTAjY8qnQMPm6MXEZ8IXK7wsMBlBaX7PbWYmCWvr3Zoz7kO1qMnEnpbDmQvubw+6Y+eO 2gYebL9Nv0o7J71tGe9hA5DhmdLDEiszacY/XNry8HTuNiBe+htCWhi/wcwXRbnp96tV +M3Fsdp//dJs4pYFfkjAvTrgNDG9uoMUvWgysuRSVqvC5K0ZG7CVBvJe5j7KPNLW3SSf tPDA== X-Forwarded-Encrypted: i=1; AJvYcCUa6FU65KbssEChonVDcEIPDVK37OWkGpKEajsxUwKQgScD1dhr9P+gTQuK4Qya8jtpLjeNZ8CIR3lHkFQliKRVo+0= X-Gm-Message-State: AOJu0Yya3h9vCMg/Yaj9derSd4vt3Mbq11fkAQ9SAjRbfFmiUa3dmD3w Eg82IsklcjNl3berWkhyh95VAQpF5syD9rIbqrG4QN3aPLE8MSUX X-Google-Smtp-Source: AGHT+IFy6i7+4k/jye/gmwuX1sSdiY9dP1qorrai79dHWwgMgxT8+F/EE4GSmEybEa4pgheMKtFkLg== X-Received: by 2002:a17:90b:4a08:b0:299:951f:e7de with SMTP id kk8-20020a17090b4a0800b00299951fe7demr4537779pjb.14.1708411492102; Mon, 19 Feb 2024 22:44:52 -0800 (PST) Received: from barry-desktop.hub ([2407:7000:8942:5500:a5bd:9c11:af2b:aecf]) by smtp.gmail.com with ESMTPSA id w16-20020a1709029a9000b001db60446abdsm5419090plp.262.2024.02.19.22.44.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 22:44:51 -0800 (PST) From: Barry Song <21cnbao@gmail.com> To: akpm@linux-foundation.org, davem@davemloft.net, hannes@cmpxchg.org, herbert@gondor.apana.org.au, linux-crypto@vger.kernel.org, linux-mm@kvack.org, nphamcs@gmail.com, yosryahmed@google.com, zhouchengming@bytedance.com Cc: chriscli@google.com, chrisl@kernel.org, ddstreet@ieee.org, linux-kernel@vger.kernel.org, sjenning@redhat.com, vitaly.wool@konsulko.com, Barry Song Subject: [PATCH v5 3/3] crypto: scompress: remove memcpy if sg_nents is 1 Date: Tue, 20 Feb 2024 19:44:14 +1300 Message-Id: <20240220064414.262582-4-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220064414.262582-1-21cnbao@gmail.com> References: <20240220064414.262582-1-21cnbao@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: tahyj69cujmphzsdqfrpxquqisdem5ke X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4C3C214000C X-HE-Tag: 1708411493-104503 X-HE-Meta: U2FsdGVkX18P4IcH7S448IHbvZ3syGcf60vtKEsxNvZzlOtp4uiA27jAu+gvxu0kuG8azdBS3S1nBwTBggOUOyzVVQWYFxpQRv/qVkG1cAT9cDdgIJyswwTdMJfLGSNke0qL4SQy/nBJwAFm4mPsFgW5H02ntjtJ/WaRppb6BXxhWsY6uDdzRZFxDCeTPscoDOSxVIuYh7GKw32ruGSSkLD4hsL/9YPuJKzH7BZqYIX60zV418SFBow5svdaNhFT2MYQRuwbYex2kfLV4QyLDwpE5UG0mK+lmz7mQzG6pZM16V/OWaKSiOsPs9WxXmtIqQgj3sV69RiGQ/wkBIbb9INkxLMc8oU+1FulYdYV5VjxdWGIPaNSWXS0eOol0/eiHc+LznSPXRVzi+r55rf7mzT9xdKTutRlMORrh2ocCF7bLZIXI4XCLopZ5oJE+8mbD2AZGVLrknM1do6/hnK9cMdAyvLMIJzjSxR1eZ4z2mVL9VPMOBqotfLQ/XimshcbLIY1rqiGVMHTxsk8kH2g0sTOg3RRaPrPnN3B0ogbGbzdTxksnUZTvu4ZFTfWlPPjsshI9CNiRP0hJFkaYeYAiBwRT9mCtDP5vTu9wCr4cwUI4buKMWwjJB3wbioTi+J1fV+ygJek8ukF4AU2/QwaY9Y+XuTUWTstUAcTvXsTKpeKhOilcyU/S4XZbCtID0eMA6l/W89G5TQWko7XXCdUuwKtSRDhV8sfYUKWdjrAGEM+3cMXWsdHtByyF/HDiCyxyufalxHVlFP3969uY6bcY7GIW7P7NlwlAenohj4AJ40bfMNELj/jX36uMFw2NWfaZNRSOqsr1scMCP1SOZmvB/dZpcsGiMGEd1XEeH1VlglVFZsnAJCKWffSxCqktKzGqdD2QLlac2ZCw3zkIfUenZtwfuZNFHCyoAxynF0zlO67FQHfp00KbBTxHs51fqrNNzErHhotBZDicwUGvD1 OKeGmtNn LP8z13EkKRWR3jYQeyOxy7+CfYBFyFCByZnyT0wq0ccpbhSGOVJCGk1snpPga5FVdvotczHCg8/4jUZBzUHlNKuMRSHbJs9V9k/NU80NMDeKdW0W5mCyjrNkv9bErvFnZSSM2NZpGmDmnlVqALtu7CWCuOch7z1H7klk5BpnsCE/qZm//xzQ5cG3lAmc2PICPAGT32iYa+Cxk5JULUhB/9WRjuoGpqCIeoDOk5m8AU+3pe1EkLQu8/pEJtt4wjubZ5uNCN5qg/g+3s666tweNoczzdMQhlAyCHq9zjukPCW+jO8sb5fjdI4Ki7roNesYh2XzV0blfUQpYe1sv83uvH3s/0q71Gd4NifTIV0FHq8twtoOIRIRkWD3vzlifQWhkH/CpoCPJt6cFof0hAT4fhuAQ2RG+7dvB74ScxAThvBQx0n8bqnCmfrcdcmGZ7bnEJCsM2bxOYdILTi3g8aU5mNdCABmOSkM/4sWgE7wOq52Ds0hssMmmM++XG2rhB55VCnQTQj7DlIAxWjcUKZq97hIEVLnO+BIgtZ4p5vgSYDNIVhxUKZesx78je5QB4QVl44Ob7SpjRzJoEMoKZLitf1XU2vbtPSkFhK6JFxU/IE3Yscn9qSNLCrr+uqfbhjvWBCj8HQAnq/u220bbdK7ARmN4fkk7o87df6yb 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: From: Barry Song while sg_nents is 1 which is always true for the current kernel as the only user - zswap is the case, we should remove two big memcpy. Signed-off-by: Barry Song Tested-by: Chengming Zhou --- crypto/scompress.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/crypto/scompress.c b/crypto/scompress.c index b108a30a7600..50a487eac792 100644 --- a/crypto/scompress.c +++ b/crypto/scompress.c @@ -117,6 +117,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) struct crypto_scomp *scomp = *tfm_ctx; void **ctx = acomp_request_ctx(req); struct scomp_scratch *scratch; + void *src, *dst; unsigned int dlen; int ret; @@ -134,13 +135,25 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) scratch = raw_cpu_ptr(&scomp_scratch); spin_lock(&scratch->lock); - scatterwalk_map_and_copy(scratch->src, req->src, 0, req->slen, 0); + if (sg_nents(req->src) == 1) { + src = kmap_local_page(sg_page(req->src)) + req->src->offset; + } else { + scatterwalk_map_and_copy(scratch->src, req->src, 0, + req->slen, 0); + src = scratch->src; + } + + if (req->dst && sg_nents(req->dst) == 1) + dst = kmap_local_page(sg_page(req->dst)) + req->dst->offset; + else + dst = scratch->dst; + if (dir) - ret = crypto_scomp_compress(scomp, scratch->src, req->slen, - scratch->dst, &req->dlen, *ctx); + ret = crypto_scomp_compress(scomp, src, req->slen, + dst, &req->dlen, *ctx); else - ret = crypto_scomp_decompress(scomp, scratch->src, req->slen, - scratch->dst, &req->dlen, *ctx); + ret = crypto_scomp_decompress(scomp, src, req->slen, + dst, &req->dlen, *ctx); if (!ret) { if (!req->dst) { req->dst = sgl_alloc(req->dlen, GFP_ATOMIC, NULL); @@ -152,10 +165,19 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) ret = -ENOSPC; goto out; } - scatterwalk_map_and_copy(scratch->dst, req->dst, 0, req->dlen, - 1); + if (dst == scratch->dst) { + scatterwalk_map_and_copy(scratch->dst, req->dst, 0, + req->dlen, 1); + } else { + flush_dcache_page(sg_page(req->dst)); + } } out: + if (src != scratch->src) + kunmap_local(src); + if (dst != scratch->dst) + kunmap_local(dst); + spin_unlock(&scratch->lock); return ret; }