From patchwork Fri Feb 16 04:08:15 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: 13559553 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 57167C48BC4 for ; Fri, 16 Feb 2024 05:18:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7B7918D0007; Fri, 16 Feb 2024 00:18:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 767048D0001; Fri, 16 Feb 2024 00:18:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62E448D0007; Fri, 16 Feb 2024 00:18:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5355F8D0001 for ; Fri, 16 Feb 2024 00:18:17 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 17F644A01D for ; Fri, 16 Feb 2024 04:09:14 +0000 (UTC) X-FDA: 81796337028.06.043DE20 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by imf21.hostedemail.com (Postfix) with ESMTP id 6DB1E1C0028 for ; Fri, 16 Feb 2024 04:09:12 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ra0Iysq4; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.216.50 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=1708056552; 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=6XQrWKuCeFB3F5VDKYjMLhXFNrwWfztKdQJEdvSBY3231pbjji2+3QMgum33CYJi+pyATO F4Q5hCeZe9qdfeoJb8QPRywXty7WnZUjFUY/3NCTQy1SN5nnSA3hAM+nWkH9FsDtPbIF/T yYWMt3KZK8sX1Acw3poeaXo3QQDqKVI= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ra0Iysq4; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.216.50 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708056552; a=rsa-sha256; cv=none; b=OldkhAgmVYQSPeRcNAQzMbuK2jOyWDVKv2QTW8V2Z142co+4eckL6hwkRILYVKFJ7cztpM qUABMBw2zNQQQZZnFIe0vtMZ6n9rvh1SqPDvMbda61sz3edkcjHYb3zRA8VAgsK+TdYfyP 7hI1zZ/dX+Z7BBTLtehV0ukLApceisw= Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-296e22f85abso1300706a91.3 for ; Thu, 15 Feb 2024 20:09:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708056551; x=1708661351; 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=Ra0Iysq4tME34L3VwswNWlz9tngbk92gO5P8ugnvM7LtUDuJrqeyxiIJ7d9qLpyRu+ buDk9dPZvujBGgbWQe7oqP62yn8xz89hk6XR7dc377t18hTxaRZYRbOIX6CyvcJdtawL Zjl9+N+ztzHHneUxr9MTIvbJx/H73jtKjWmm1L4WOVnPRqjHIQRpMMK06Q9KeLe5m1Oc Pwt+pt2gVzJUkSlGQme31Vu1lHvV4OfAXbygdUvevX1xD0yS6pbDdeX3NhWRVUnznuCx 56dlwQmSkfiDK9trxDNiROmgoEOZ58LjMQyv6nBOoxotoPViPXu0DL+khE92zLndOBgW sMHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708056551; x=1708661351; 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=fCP7hBR2j5jkTY+2YAZJDCaEog1GrXDtGWdEohqrAyZij0Bpdqh+y857O420TKwH+W Uf3nTjaQZ4lssCkXSqphq/gSt0hGGhyT4e8r/anWraHgWvX8GH+2M6p43vFZHBJDd3wB YgdsAgbJ5cw5uSQVTu8dhggZzqWUwtWXXvg4hrHIlUKBRCgzHMJ8zLqEivDIJWUkWtTG uHUURsECsFezit1z51qZxgVlFU8TRXnQhTUeZwubNLokR1rxVzQPy9H3l3m+Hl9HyXx3 ovamSKG+seoiWZmztE2/PwGdPZfGD2vDdFuBYqHavWnbtCCXNXPXWaw8OBH/3XGxWDq1 eZAw== X-Forwarded-Encrypted: i=1; AJvYcCWTxYuNZvWeLFHlmArHaVT8mpko2ftbA/lQ7kTRZe+Y9jR+PZW8BmNfdE7LP5J30pVnYQnnt1+BjFPn9nXVy5tvTrY= X-Gm-Message-State: AOJu0Yx2G3JRHHdnoGmyZ6sUH30lGjwumGvJ0nHSN7DStsHnx/PAsjV+ e+kZ7TqnIfk2wNn0xM6Nml5BJZNoJRpOj4tOYijtFtj5X1R0Hvm+ X-Google-Smtp-Source: AGHT+IGAI6evbaJJ5nvBvX/krSGwKcXuM/Fjm1hRJ4n+X39jOxzqtqrVSivqkrRIltKTg3jrBP8pEQ== X-Received: by 2002:a17:90a:eac1:b0:298:d1d3:9ef4 with SMTP id ev1-20020a17090aeac100b00298d1d39ef4mr3368864pjb.27.1708056551160; Thu, 15 Feb 2024 20:09:11 -0800 (PST) Received: from barry-desktop.hub ([2407:7000:8942:5500:f28b:3925:777f:45d4]) by smtp.gmail.com with ESMTPSA id pt12-20020a17090b3d0c00b00298ff26e4c8sm2321393pjb.26.2024.02.15.20.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 20:09:10 -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 v2 3/3] crypto: scompress: remove memcpy if sg_nents is 1 Date: Fri, 16 Feb 2024 17:08:15 +1300 Message-Id: <20240216040815.114202-4-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240216040815.114202-1-21cnbao@gmail.com> References: <20240216040815.114202-1-21cnbao@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 6DB1E1C0028 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: tnu3wggk37ott7ei187pr83asx6kgyd8 X-HE-Tag: 1708056552-672159 X-HE-Meta: U2FsdGVkX1++OvzSnJAkqAgip0Wx3IzD/pqKsdeXN5IXUtNjiFJ2DOPa+cSqvtRONl3mqi+mRYXti0OMR0wXVXvyv5ALwGE0exB992Hsul65jA7DhEVgakq/iZnXIfAVNfyIwExUycfWDW9P4l8vaflXH1c20004ND68SnK8Zg57MEyHkp1Wokwhr9vlDH1dR3SHlhDXoIIRr6Q7p+inowYnoKQ6SbTBAYytudMtGnOyCEMZo+ruo+HekWsIwpHx08yQfVaIeSvosq/c6GrHGfOIeEDEH8W2aCC3GX0srK/s6BRYwhz6r0BLh03e2gT2bYGW/Rinq7d6ZYejNhdyrOT4NI/iedftnuHASoR2VDUnmVwOxvZ+n+pWTBTpdo0UP8aJz6oIP3566zX8axCtJ/RLbciKmrPLezYo/rBHqBn5JdGA9B6ihA3wB70dRZED1526Qw79C8Ff4aUs7+CveFvtggNLIA3m7ld7kvI1qHLREwFVRy9TOfdHDnLxUYyZXfmUsWtOlxKjaMvvFQOzrt0qgIUt2zISFLuxorwBnl96+B9Itbu4DeDdveko6s5hf3PgH356zRdix+JhYWKRaqVjCJLaXqlfqcNdGLFK8VgPv9pkkt6UWp0NE/yO6DJ38ffu57YUW0obm5SbXigY9BAK3NOjNl0mBKiWZEn5Cfvgz0g/+GYrTgo2wI+WD8pmJ8edkZMeiodCn/WAcQgoJs5IXFAiOiQZ12jAzGVbYGN1bJRQcr2CDdT6qJetpaV+qXGlzSEVohsUiQIuwnnRkKBT5dcjkRSqx9Ac/PnFEWen0munHH7eBkmvH73xfjVF6lbFmNMEvIkRjnskgViqHq3l1G8EOxSi5613kuEwCIgVum0pO4MUoUVeminPv4iZOQ9k+GkUUTqz4Ig2TABpg5MCZ07B87XfYC0zRDP/Do+T9OmbrDUxfchsRvw2gI5w3x/IEFVspEdpJb3HM7/ foS8ekOQ rbj9lelO9a76z7cldW0HTH2vn0mnNxqN6em40SyWCyJQGEfTZhT8HewG25dE99zp4mWlFoNoJItLCeRi0+F8PFfEct1Ugs3UOvlJS+1KwVb48sN+MPpXMY5DlIkOZxUQXtKPFLaC5955PJzmic5OUA6S/0YXozbAtr6gt 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; }