From patchwork Sat Feb 17 04:51:01 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: 202565 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp149239dyc; Fri, 16 Feb 2024 20:52:06 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUyWOkmHVO2DefBaZK/SONhze9VTijLlFrq9Bg2z+LqWUet33k5lD1WfGQuZnQunV/RxWJfhIgt45sgxu4yu0/twr/ShA== X-Google-Smtp-Source: AGHT+IGveMX0oHj+CfPQtICq55syNKmqONwBUCGZoGL3hFH+RrOVP6006KpwWjFxdPGwgaqZdk89 X-Received: by 2002:a17:906:57d2:b0:a3d:916d:caba with SMTP id u18-20020a17090657d200b00a3d916dcabamr4510575ejr.58.1708145526359; Fri, 16 Feb 2024 20:52:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708145526; cv=pass; d=google.com; s=arc-20160816; b=J89eQkH+45qXzqZ9s5VLzuMJa3uSF+tL1/jEGjuKkl40sP+R01CZcEbzAR440BUOUK BsXhaZLxc9yjxg4O5Xeg/hyysWLQg7LA03gqT3ZnNCLqoFRp4kWt+Tj+MgpvPpU5ZAqA TfgLpF3BpTODS/2xFN1rTyrmaIY3KmfzNcBVWaMUupuAUVuBDUiyhAcwzGxBtnzjX/3z O860LSqS1GKJcE8gg7X10txVoZ84zp+Q2m4T2t/DHKz1j5ROkCIg4PTL4pH6LSB5pXjJ tzzUculJ1IBTxqxfXElC19T1FE2U1jdo9StQon0XsgbblAOWGePSTG/ceBkHbGK0UmWT OUKw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=evwrpqE1Hiz2u5sFXh0svc6RdlbtMXnztqrxU8YZhPQ=; fh=NF6UJfMnwIRqEQMUVUinZ70FD8ZpqfwNbzKI8Uls590=; b=CYTO2H6cnJlJtK/TW422xjYrYHEjwih5AX5XuzeE2m7PqWOWnYGvO+70fiixnpjRCb l9DJnaOY1WHa4Ow6ckNK0j++ksOcR24H/b9pzbsYkfRx+xrPoMGypKKKr8OymOJsr8H2 lUQHQqv+yBzr+dlD4zrUQ8pg+3yYcG8N9YxY17mIkgZb5tyC6tdJHJfqencpmB/b5tLS ftZ+oImIsdVyckChs/jm9NWXl4is/bPO11ZA6zt2Z0oxdCunaxMYLsnu5SpnefRbfSeJ NfouhNU3vcWZpnu/7mdEhS188ZJMLLj9GVYnU6OQzGf14UbwRpqSz0aJhOv6QXSx/qyv ErFw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=E+pVfu5D; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-69681-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-69681-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id ss26-20020a170907039a00b00a3e0bd23acdsi475883ejb.124.2024.02.16.20.52.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 20:52:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-69681-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=E+pVfu5D; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-69681-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-69681-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id F393D1F21DDD for ; Sat, 17 Feb 2024 04:52:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8FC731CF94; Sat, 17 Feb 2024 04:51:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="E+pVfu5D" Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 67C1D1CD0B; Sat, 17 Feb 2024 04:51:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708145496; cv=none; b=Q9w/gnEr3yPcTwxio7VtV+PYZ1CNUHhdPPWf7TT8JwpOtQDMhXA9VHy7/Ih1527DKJd4aMS8ld705cf5pR3Rh1JAJc9NqKrEiNcR+WJ6HK6F+tW/SQ/QC+OsJqbx9q+8Ap6MzXh7JZmVhw3CSUU9m9VtI7nKqV0n1ZitKjgv2sY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708145496; c=relaxed/simple; bh=RaujQfpbxxDx841ddUw9WtlW0oC4ty8/luxjiNzGCf4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=r8P2GRzR02SQ9VH4MMYdLC2qHnB1C6QkpWl6fEGZNQxxboJCfGhcQZet49Jb+D9aTrPJWoPgebAPs7YDOSBNCDRfaJgzV4MC/4w5xY/iHDMrPk9M+w/Qwmk4UHAkg718piHYuD4UReEbBrKxfBEIF5CgPE3I5+7CHaQseeKAgpc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=E+pVfu5D; arc=none smtp.client-ip=209.85.161.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-598699c0f1eso980948eaf.2; Fri, 16 Feb 2024 20:51:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708145494; x=1708750294; darn=vger.kernel.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=evwrpqE1Hiz2u5sFXh0svc6RdlbtMXnztqrxU8YZhPQ=; b=E+pVfu5D0HJFR4naP45XBuYDA2xqPtKQiR7CktDgUyEkEpy9oLTOtxJM+47IdknSlT JFKPd7r74MEXUB9KrNtg+I2nL/V0BesK//sW9dpBWWsD6RCKi6qAeIIkTrM0hZJp/vlx FLQ3dO86wGDeIzVgyaGIzgcofUwY3+sVAh9LJupuM9Uj/0eR+o4t7d72Oa10TZRPTl07 Kfxd081WMU8xw8A65AVUknUWMxxG5KUv04s1/wgm53wp0YRKVLOnl00k6W0e6xLUHBAu /a5O1FASb8zDyGw04j4VSgPX1Pnnjh5rpLLBonDbgI1IZ6t/QKfUllp4ihtRJAqlHagT d9Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708145494; x=1708750294; 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=evwrpqE1Hiz2u5sFXh0svc6RdlbtMXnztqrxU8YZhPQ=; b=sF2AIadDbPibjy8j5RphFzOPoAZfOdbEc4pakgWhC1d8LvrUY/O45F83c5qeeBfeWo LUizVVSpd8lmc01/FnNms+EH+HbNrIuFoF8+Hx61Uj1v96AaB3/1UaacNOXtWBf3r0d4 XzfZ6UQubYJ8rnsU7C6aw2VfiDN4dSJ774JVsfk4GN8HsYzI/ao7v7U7SvQsJjCc22/B Frui2R9BYrWeB0zBP1tiQ5BQgxRaVE3B1IjEUCJ34LxgHqpGewIqn29o16de55fOq/Ma F/FwDLNvXQPGMymfbqpnNskamocIZOY2GDySytYIIOUEn+tp0x4CSLtLC5AZfdz6TPrP x41A== X-Forwarded-Encrypted: i=1; AJvYcCUNhLY7e0lu85wdyLpebscElEzq1selaBC5UeIpPMNaUtrwpkS/+SoKIgChPkzKi6StUzS0cTFFHzVY7INKQC4ZgGxmhdYre/3Y+6223SM2XSKGWIbZMWpoznE9Zak6+RIvAa3p1uBkcFT1 X-Gm-Message-State: AOJu0Yy/Kf5VoWP4fij/grGw9EJUT/vTc4TsCzGRJCnRxYqsXag3ox7i Dp+BL1p/1yziSvfXsXCNKeDf/whN5OAkmPyleVTbWuZY1q2MH9tt X-Received: by 2002:a05:6358:3a04:b0:178:f895:5978 with SMTP id g4-20020a0563583a0400b00178f8955978mr9891587rwe.10.1708145494362; Fri, 16 Feb 2024 20:51:34 -0800 (PST) Received: from barry-desktop.hub ([2407:7000:8942:5500:e82e:22f2:1bdb:989f]) by smtp.gmail.com with ESMTPSA id n14-20020a635c4e000000b005dc2ca5b667sm610703pgm.10.2024.02.16.20.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 20:51:34 -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 v3 2/3] mm/zswap: remove the memcpy if acomp is not sleepable Date: Sat, 17 Feb 2024 17:51:01 +1300 Message-Id: <20240217045102.55339-3-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240217045102.55339-1-21cnbao@gmail.com> References: <20240217045102.55339-1-21cnbao@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791120403891242923 X-GMAIL-MSGID: 1791120403891242923 From: Barry Song Most compressors are actually CPU-based and won't sleep during compression and decompression. We should remove the redundant memcpy for them. Signed-off-by: Barry Song Tested-by: Chengming Zhou Reviewed-by: Nhat Pham Acked-by: Yosry Ahmed Reviewed-by: Chengming Zhou --- mm/zswap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 350dd2fc8159..6319d2281020 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -168,6 +168,7 @@ struct crypto_acomp_ctx { struct crypto_wait wait; u8 *buffer; struct mutex mutex; + bool is_sleepable; }; /* @@ -716,6 +717,7 @@ static int zswap_cpu_comp_prepare(unsigned int cpu, struct hlist_node *node) goto acomp_fail; } acomp_ctx->acomp = acomp; + acomp_ctx->is_sleepable = acomp_is_sleepable(acomp); req = acomp_request_alloc(acomp_ctx->acomp); if (!req) { @@ -1368,7 +1370,7 @@ static void __zswap_load(struct zswap_entry *entry, struct page *page) mutex_lock(&acomp_ctx->mutex); src = zpool_map_handle(zpool, entry->handle, ZPOOL_MM_RO); - if (!zpool_can_sleep_mapped(zpool)) { + if (acomp_ctx->is_sleepable && !zpool_can_sleep_mapped(zpool)) { memcpy(acomp_ctx->buffer, src, entry->length); src = acomp_ctx->buffer; zpool_unmap_handle(zpool, entry->handle); @@ -1382,7 +1384,7 @@ static void __zswap_load(struct zswap_entry *entry, struct page *page) BUG_ON(acomp_ctx->req->dlen != PAGE_SIZE); mutex_unlock(&acomp_ctx->mutex); - if (zpool_can_sleep_mapped(zpool)) + if (!acomp_ctx->is_sleepable || zpool_can_sleep_mapped(zpool)) zpool_unmap_handle(zpool, entry->handle); }