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 21031C48BF8 for ; Tue, 20 Feb 2024 02:56:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AEAF36B008A; Mon, 19 Feb 2024 21:56:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A9B876B008C; Mon, 19 Feb 2024 21:56:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93C9B6B0092; Mon, 19 Feb 2024 21:56:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 836246B008A for ; Mon, 19 Feb 2024 21:56:28 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8AC4E160537 for ; Tue, 20 Feb 2024 02:56:27 +0000 (UTC) X-FDA: 81810668814.11.B797BE6 Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) by imf10.hostedemail.com (Postfix) with ESMTP id A17E4C0019 for ; Tue, 20 Feb 2024 02:56:25 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=OLHOxZ70; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.161.48 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=1708397785; 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=AMI3a9/cENujLJJ4gE0vKKiimDbTY+w9WwnmXqJqorPMs0Itcg97d/scaJ0V7kbtDjJJWt KueDOrbCfHpRoaGIrW2RtT0lqRtmtoU9LGvOWtR9CLeb0yMVbTSP9hED1rVT7IP3c5+Rq3 UYAFGJrBarcOWlN3S+27h1Q1kp39Rgs= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=OLHOxZ70; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.161.48 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708397785; a=rsa-sha256; cv=none; b=RvpTCyjjwiAoh02Mi9sEOAsy7RQgg1dbw6QjUZuDxVwSIFJnD04rTNr2WivHfXYzbsxdjs XgHEyygaPnhd5WCJBvFSMWSNhSjaQYl6St3Hp+F6sqEBH5GmFCDbVQdHtGcFOaCD3VDiRu T8DQH3hg0R+TAp80rwvo3GGQhZqxrXY= Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-59883168a83so2209047eaf.2 for ; Mon, 19 Feb 2024 18:56:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708397785; x=1709002585; 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=OLHOxZ70pjinIX/jXni28PBBXizvgm6SFw3lAa3gQBFRmcReQa/SJ4evF1euRrp3Pl aQNjR16roFmrouA1/HWB89233Pu80f4AZi2kbrIeBkfqCdSzYv8c/2KFaXZtmZywS0N4 GQQWzAh3S5nuwFEzIUqD5mwXGEsTnr/ysdhMogvhNIKHcflu/zab9BFzCWF9YGpAVSkM TfJIayeoPYn9bVXSPMxjd6lL8xc1PQE89AjWZJiKJdmo55ZE4unkmQDEqx8krMtbfZh6 cUDkc6V6aI1x7AJCy+76+BoyK7Xu+Hr36Naq+yX+gYx5CdNXxw6EM/q1SIEeAa7q0fV0 XMjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708397785; x=1709002585; 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=ocaDqJNkohS1jsxPVZVT8RyUcpvGeItMB8FWy+P6qg2L2srTCcWe/YWhzILlGoh9DX 7RvB1UUilPH5dNNp8nszDgzSbMpg38Hxnp38m6J5ZuA/AmywZPftQp72dV98KZIOUL/f zvL6ixMoXlAjSeSEW7zkBLJQKT1IDNPgmcLKOEBL8Qh4JD2d6Lg+Lr/sy8xs77EsYXWI JHcVsQLEY2DpNBg+MrNx73MlUlRVcoxar3ySGbVy1FShDLl65tYyR0Vry6ARGSZF1cps OWaj5tviKWm1PmIoMQ16Vxl6yyhzOY19EDuPMKd+zDRgLHF003p8IjMv6XQ2NJb2FTLe jk3Q== X-Forwarded-Encrypted: i=1; AJvYcCWowaYf/AziKpOqhhqVBL/5g2qUSfLOIpfmmU7l+Wc3CWS5EAAnTyB8guJdzrnpXXDEszEJjMa90atf0HqnXJmbJqc= X-Gm-Message-State: AOJu0YzVmKq93rbDs3SYVw9WvxSQvcIesj27dCYQFp/mTMzUrmS+ogeo B/f0KurE85Ufkzvg+CdNg+MfVSqCRbYuGoIrvozuV6RKfmAdWGEf X-Google-Smtp-Source: AGHT+IHm1nRrDZtEWW28L4x2rAgwEL50c0JazukXW93V03ZXEqdBNo20ZbIjvDpQgzMenUad5lxqAw== X-Received: by 2002:a05:6358:6584:b0:176:8472:800f with SMTP id x4-20020a056358658400b001768472800fmr9579507rwh.31.1708397784669; Mon, 19 Feb 2024 18:56:24 -0800 (PST) Received: from barry-desktop.hub ([2407:7000:8942:5500:a5bd:9c11:af2b:aecf]) by smtp.gmail.com with ESMTPSA id j34-20020a63fc22000000b005dc1edf7371sm5500047pgi.9.2024.02.19.18.56.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 18:56:24 -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 v4 3/3] crypto: scompress: remove memcpy if sg_nents is 1 Date: Tue, 20 Feb 2024 15:55:45 +1300 Message-Id: <20240220025545.194886-4-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220025545.194886-1-21cnbao@gmail.com> References: <20240220025545.194886-1-21cnbao@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A17E4C0019 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: df3qt5ah65si43hasry3us5t688brwf3 X-HE-Tag: 1708397785-439057 X-HE-Meta: U2FsdGVkX1/54RTZhpvpah7ycwuBbAPX1NRXT7CcIEXVbu+irPe7lDXOZKtfb2F+Mej8gmjG7lKEvqlNbNXUHmJlxNa3L9jQm5xLL5IkEu2ftzXSko8lQoHoUg9NxrVHzP2byhU259JNtYDq2W0hHLkUcKObyGxgKjwOUc0NksXOyUuxSbEnLlCICJNqXFicwFbPWud5QB8ZYUhhEsYuMId7eIgh9d7b+X/WlEQJH76ABV3gLCfeV8bJhSNBhUbm5EOwPXk7duyqcnlxBZShI3kfi0CZodZDdqQljT/DXDAwy8gAkCCLhZa0kE9qTMWc3ESyyK/FNWRDJTAL2Gk69nJx58DnLym5xGqlnEWgNnX5UMvalCSgKYYTtGswK3wNkaVXa3P3tWlzB8mIQBrEZYogC6avi7w6QCOZIv8fbplikEm1/IQoklxm/NXhi44ctmJO0/TPbTfBHqBtFeiUcb11lCm+vndXYVzrMDP5V2l8AQh4lBx+KLPdELNp/8UftF7r1R7RGT/eRBfO+rVLpT09k9GY7Bq1o8yIb1uErZRXJ0JR9zW6reKCll0VU7vDxy9Ubr3Ka1gojLMkEJkGAo3Kwti509Ij8Bov18IHej7nhjjPNQGNX3aRxHgBaX7H/4xV2WmiYmfilkypKh8lZuUDgjwXOWBX6RSMmOGQg4JAgZUWdeMCjxpjRKNto02d+D38e5BCn+KdFnSz5/UP+j/kMJrSNNN14oxrmBzfj7VBQYIzheO9tAHVI6gLwR9osu5v+JzMd8CvTS49AIqqfllpsMFoBWCnjONbop8jwv9a08kkiMlJZXchwJJYKBz7jkVqPYy9oq+9MIUVt7/nKBJtvsZBYK3MkOsZq3vYPqGTHMS8gNWwUjvzHrL4meEPFmWXMRC/37Q+d4v4n/9aQg/KCf9frLruamKSefKVKQvyKK+o/s8/cfwZBok+/EgoV+jrvaCEUdZmpkC5Cyu sp9nhbFw dPY4fA6OalaQr0eK1c7SrqyiChor6OnjDKUwWUM8sKfwUfNyrSkZe1bc7I98TnCuOxc5oHSB9YxhDIfhirn60NWoc3RnUcZ9OkuXriqBZCmWcDpGDbpxyPOiqyn6jS1WZm6EmevZO52gzF0Q4bMmybN00WjkYL6pOv6UZfIBQwElMteEv4nSYQ6UFGFbuQShmt8IGrJ6AkuN1sChUOKcA5Gz+zd6oEgM/jnUODhy7XLKgJuj/i44Pm5TsQFo/4srao6R2RE3iCcNwlDZHQem1opd+zRjvr9/iWlKN7SxC3VUhKfE6Q/HCskcsmIvGoAsvAlisRyMdc2+uSFcELtTqeR8VpLI3u1P/23S+7Czc39HUThbC7nRU63SLviESmdtctbbUi9pp6IqS1S/2GND9HFdiP4FYKwm6Cm40JlKZA2/ny5prHCeNkh52Ps+IhTE4Qy2hGCWNn0ld9JAs6SXbT6CIr7Up/A9g3dzLoo0n3coGh4GJ6pPGTRMDX+gGIrtXzTNnKJbYvkeveP3LxhH2Pw8hf7lSMQT07w6rKJOcHgrxV20ciEN0sbsfrG68HbP+dSejU7H0FHEk/guNNZFoATrdkOAcHN0+oITObaq5CKo72EHhiVThnCwHVwJypMWOgNPsKPgGJyTfsBMAYbYEHTdIw19wTNcfKosNQpzIabkS+r6R7vZvR6g6sTMyhg4u4Sm2CrhPJuX2VIE= 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; } -- 2.34.1