From patchwork Fri Feb 16 04:08: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: 13559572 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 297F7C48BEC for ; Fri, 16 Feb 2024 06:28:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A101C6B007B; Fri, 16 Feb 2024 01:28:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 997AE8D0006; Fri, 16 Feb 2024 01:28:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 810856B008C; Fri, 16 Feb 2024 01:28:34 -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 68D156B007B for ; Fri, 16 Feb 2024 01:28:34 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id AC1EF146725 for ; Fri, 16 Feb 2024 04:09:07 +0000 (UTC) X-FDA: 81796336776.12.A89CBEC Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by imf11.hostedemail.com (Postfix) with ESMTP id CA7064001B for ; Fri, 16 Feb 2024 04:09:05 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=PM9x79hb; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.215.172 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=1708056545; 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=uQ9C4C07Lh00QdEMEtLL7F2M/Vil3VvFnVKlElC+iJU=; b=GfHnmwL3mjLTi01Mbk6iWzSnD+01BvYg15nLzAA3e3a5zuTfeI22M/BImoYkBMEpJAvDn6 FI4MnsqkvvaEBW/7FqxMkIwMprpT4T7xcVh6BYAlpRAYRSmhFf+vhWMZ/aFOl6l4R1i0tt /c28U0OuQKEhL79erDsgkceryWcIPpc= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=PM9x79hb; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.215.172 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708056545; a=rsa-sha256; cv=none; b=IxZ8GCNKpTSf2VZzZkFQXxp8m3XlHnL3WrOBYwfVEHIgKo6UX+Z5kC5/CzByiper+4Y49q Lq621QBHP/W7n5n4eQBQMsfOj7uVGG247rcdtsIhKkdWQq5h3uznuZfu6UOaOJMGD5Ox8C ibawuaZkc0LF8PxkQBDuuBZYgSV06hM= Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-53fbf2c42bfso302339a12.3 for ; Thu, 15 Feb 2024 20:09:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708056545; x=1708661345; 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=uQ9C4C07Lh00QdEMEtLL7F2M/Vil3VvFnVKlElC+iJU=; b=PM9x79hbNqQEohP3WZNV4dEN6LpnX3glsogVL6HDFlbTgcwDppqK8QKEMF5YxNQDPD QPX+tRFqRkyXYLJzb8bu9m2CIWEX6FxxUW4bDm84WZJg7V+4+dBkm06ftzhqWpXdf0zC lDPA26CfcaH/EF3EvnEKl3I7UWy5sB65p67qdasFXtbPR2XYMiJiPb8qRDmTC/fRIYrV HArLlLezTBcY3U3feihODAATl5bcxBXqvzpA7Yck4oOgpRweTU8N8KkiVgGgvfrBMtws FAM9y78fUM+Q+7znnaEgfTSnGCHrWuRty+KJHKuWK7/SEYRFYblx6Itn/CZnMClJzFl5 XLSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708056545; x=1708661345; 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=uQ9C4C07Lh00QdEMEtLL7F2M/Vil3VvFnVKlElC+iJU=; b=pSkAmuAHuc/M3lnM0CY0RTY/uY017jcMwv0OJfNOwmiw/slhMbYOYTmt20JHmLK187 jDv/BoiZeT8yrK7Z4h87/kHuO8TduDav1U3aXcbp6tMEt+DkkxAtRzxxkzPsevXeS1HK K5Wu6SZjBWOIoY+2QZNXx2Qpcaf/nC66Ig6q+S0Njnj3kmXp1jqRrY4kTdVQfJRbLZRP BCAO/QX2ZZdRjpciyzEc5MvjLVrsgSobEs5eLlgRHu/7daS4kwFugVRmKaH60u7ViXW4 X0fhCDb1jWFZvGhGs2wLyCK0QYMGy6UPGQpMMdVPP3ovUQegGBAYLFFoTp8ttymKORuQ WkUA== X-Forwarded-Encrypted: i=1; AJvYcCVlEff+yKzJnW7rCmkzml72aiqiHAVbY137Vv2wiQmvLv96RmRlAWEddomZX7cAUCXNYrqxXpNUNZ4lv51a4zoJWwE= X-Gm-Message-State: AOJu0Yx2Ceb0bGM2KBohOksYlS1NbkDPNOrShLQlL4PP9LP5maxzPC86 Hmwoqo5FgXu64f32St4/MPd5Odbs0PAya+DIFYbzBCn6CbBKOrZA X-Google-Smtp-Source: AGHT+IGm+c27oE9nV1vTL6DqB17c0WIc/pNE/jU1ctzgiqcPDvRGxQ+m4LGav7LM74bm7qpn24bzHg== X-Received: by 2002:a17:90b:3606:b0:299:3657:4950 with SMTP id ml6-20020a17090b360600b0029936574950mr257715pjb.2.1708056544708; Thu, 15 Feb 2024 20:09:04 -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.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 20:09:04 -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 2/3] mm/zswap: remove the memcpy if acomp is not sleepable Date: Fri, 16 Feb 2024 17:08:14 +1300 Message-Id: <20240216040815.114202-3-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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: CA7064001B X-Stat-Signature: c5ek1frmkcj4ifjj45dfhc7g6rzdnz3s X-HE-Tag: 1708056545-685993 X-HE-Meta: U2FsdGVkX18igVFEcaMrRj/9OiB2JKsz0+VjyfGqGGFEPmZGjMam4yvQEhJMptjsG+qGtY7u97HeK6+myGIbb4fY0gte3f8ibPo09BSJIbG4JbhKsuIHmnczwgjhxQ3SbCIuA9dwAA3w3cWFYzK2Mz9sS//6H5nsB7qleWrrLh7bAC9MaR7EZlfacYzGYKh7oHxnOxPl+LWXt7uCnuvpAf9a0NDlaWc71Hx95NxOiE5XmmY6QkEA2rRu0Lhgoga6GxFP1fG7Nh+gy9D3/9SvDDDIxFPoPZeiv787NzKv00iPTFKH3vMQobOwwcNXKz81ncYw1BNWsGzX0yJZAQCaJUQ3t+IxlLPhW9WFsMnDcryqtyX8jU/cKb5+16yBiJfaTio+ClpDtITmxIMSeyzFYG2+f4t9QeQ7DVSjCXQ4eWlhF2K/qdXGfwK2u4gpWfFU8UkRLT60r46WuWP5DWplVeZJTJ/m+Jgml5/HpXmvMc02yzS70hmEP3fdF1dZWWrVyFyhyZXDtG8gtQTMhhKGVgwtTTYfifYHjBycKAke1Ps+MG3uKQsJGgd8Eryh6kGYp/ddCr0d+4pSbaXv4TB1rk5ZpA+HSFdwjoP6FYsfhb8w8LFYRmXl1bHQm/vHLpS6An2YqO7tpo9PBwtGKIeq5SpyWdksdA8i1FOe0dsjDka0WqOigwTIMiiO1BR4yayPJhv+GCbTYvSTHgyCIYkMFDVGlz39VDnLgiS/dHjry6wGUp/TbWYaWlaS/gE6Zqn1F2CWZrRa8AETXYy1QFQmh5aK8TMVnH5XuReT43+RDLmv3bN+UkJ7Wm9SJ7QtdOmDTwqw1H2e+Ue1qBSIjLmlt/HQPg70S0QGuBwDb5PUEH5+P0W61QYU6mG161s5AaK1n2mKmLEfZj4EkP1HQWSHWcMMmtWTZhJ15uKCqYjurHY90+mtA8hD3ek1C25oT7kVLKRyNowPp6NRUKYgSCb mC58fYw/ i4s9+CKYf1Ocqnt1IwHsF5Cu2X2Uf9v8PclDEwohmj5jj3VyWxI1QIYB5J+fQIjG4lO+MPjEvNau0iOUXneH228jN8b5IExcIQVNX5eFNO97zgmoRLHIB605PkfJMUVwMGMDSGCZNhbYrJZIjYR7q4PNTSTL480OxXIB85ZGEOQp5x4Ps9ooJJFFdvm9PBeNJMDuGH+GdaF2CBRt0+fB3snDsh9usXlAlyG/sc9opqdpkKgQHRUnqIOJgrh94/BYTVfZIj4lZz3WQQMi5kLV8QKZD4F7Mq6Ehj0CUe+j35AGU7oWiWm8OTY+z6yBgllIhsZYZMO4RPfy0xUK/u6VYb+lOTmgLiZzKMIBH/jhgWeQHzqFtcNi5r/Gl4gN172rWYXjb/lUELUH9NQysyx/ZJy2G2UHDEtW9uxMQ0p9JzqQ3eHy0gu2dIVVJ3E4W9PuJQcSmKbcwRVrtPHg5B5gqA4yLC/82X9moYqelH6nU2KTSNH1NWkzTYZSX+TNyVrngjzF4E498pzkVfJaxg2jLUO/fzRj8pH5GyaRKeR5JIgqnrso3UxqEbXP8CEJcx5xl/wD5 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 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); }