From patchwork Wed Jan 3 09:50:05 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: 13509817 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 60A96C3DA6E for ; Wed, 3 Jan 2024 09:50:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DA1118D005E; Wed, 3 Jan 2024 04:50:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D50A78D0053; Wed, 3 Jan 2024 04:50:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF0C78D005E; Wed, 3 Jan 2024 04:50:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id AB5198D0053 for ; Wed, 3 Jan 2024 04:50:43 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 829011401B8 for ; Wed, 3 Jan 2024 09:50:43 +0000 (UTC) X-FDA: 81637530366.16.7AA1C31 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by imf26.hostedemail.com (Postfix) with ESMTP id ABF78140006 for ; Wed, 3 Jan 2024 09:50:41 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XEmvYvgS; spf=pass (imf26.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704275441; 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=HF2P2SEmq7vRAtkf5d5h6lFP1PY7Yzig5CUd/10AwIg=; b=ztcVnnj1BXaCzBXCggzMY3oN5XeK4CpCgN2Xkdt8V/wFeyLgfRjqwYIZjPjUjdOgKhTT/A DzmfMeoXses6BSVsdZEwMjroY/J1hPqqz67/iuNZkXm+wVgRV2Yp/a64hj0lwu2uzpdn0n rZ9kazyD47ctZ71v9pzfzl/yNsBQEYY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XEmvYvgS; spf=pass (imf26.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704275441; a=rsa-sha256; cv=none; b=zVvwjG5c4QvB5NDM44VUb1Tb7ICvGM3DRzI3SxFB0ZwN7QAEKyJLq+8DNGBFdhK8NsgdVe /0sb0KCtN+0o193IwXQbf+6C1XdJ1bz8/e+bHIHP3roOplGZlYaE8BXOQmewlpNUBVEKxC mOpgbFn9x76XP4pYvcq4a+Vt8RuGEXk= Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-5ce2aada130so1792242a12.1 for ; Wed, 03 Jan 2024 01:50:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704275440; x=1704880240; 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=HF2P2SEmq7vRAtkf5d5h6lFP1PY7Yzig5CUd/10AwIg=; b=XEmvYvgSOEGK29w8i4yQoL0SJpk6bsU0KDOVgfZCrNlx2btGpJPNLaKA62kqMKXgpB 1CUGD0MLvvkb0GtaTs5f7O/i6n3Ez7dCO/OT/gvDW5Cx6bqJBUPy6nqCxfrC06DJb/Sr DsqSKoy+Kih+SA+kiP1IsK0HASxNyJaVtioP2AYVB5IwYaIqlpbtBjSjDZhTTjxoWX8x HFpu9+F8t5W9DG4JEwfTRQx+BdRV2L33n3Rqo+ytOJZS0ZWVKFwG6g2+ID6FFFqFRGAY PI5oGW7mXMgPpOT1I6MMV7KF0UjiTKx6KfOG8SBuCzl5o27OpHDSVR82KOiWQUGiS7ip t3uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704275440; x=1704880240; 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=HF2P2SEmq7vRAtkf5d5h6lFP1PY7Yzig5CUd/10AwIg=; b=wTjuPF2QWO6g22VNzhgnAOXpzUbI9ARy3uMa1Pc3f9Pw3vqFEFM1p3AXC54p6hhx7M qItUNfXIiIF+qleRF/yLLFODgZwFow3lAhlMlPePhpZ6FR/n+A4CwoKQoc/7MXV+NlAI q6d8nuEayNUhBwcUHpd8UTFWxDJNW/kz9rGtOOdNDfxIXBHloG38THWV3SDGV8Z9J0nu Qo/tJqek6uKqPOKR42/PelvfjCfcI3uvnDovTTQ+j/Pb1MF3lw1zupR8KH18/UxkYnfz uLAAGNfcBVnJ/jPWGs1le/CEGshcVOxYZ7Z3M2CO8ca+XSgujvU4Pu06ciszWuTWGIQ8 TRhA== X-Gm-Message-State: AOJu0Yyrc0Q96N8fgSCduue0F+/RR7cHM4JH5Q0CKiitPv+BFBr3p8JB SBLwp5TlTLqIaoB89CiM1eM= X-Google-Smtp-Source: AGHT+IFhQWnb8yS8UAuFwFy8vb78sg6hucpOXjJ6Kq+ulrOpwt7NgLV10YadMn0i2Bik7OAWQ2a24g== X-Received: by 2002:a05:6a21:a585:b0:197:7997:b69 with SMTP id gd5-20020a056a21a58500b0019779970b69mr296409pzc.69.1704275440398; Wed, 03 Jan 2024 01:50:40 -0800 (PST) Received: from barry-desktop.hub ([2407:7000:8942:5500:a7d6:f37a:9130:cd96]) by smtp.gmail.com with ESMTPSA id a34-20020a631a22000000b005c65e82a0cbsm21823483pga.17.2024.01.03.01.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 01:50:40 -0800 (PST) From: Barry Song <21cnbao@gmail.com> To: herbert@gondor.apana.org.au, davem@davemloft.net, akpm@linux-foundation.org, ddstreet@ieee.org, sjenning@redhat.com, vitaly.wool@konsulko.com, linux-crypto@vger.kernel.org Cc: chriscli@google.com, chrisl@kernel.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, nphamcs@gmail.com, yosryahmed@google.com, zhouchengming@bytedance.com, Barry Song Subject: [PATCH 2/3] mm/zswap: remove the memcpy if acomp is not asynchronous Date: Wed, 3 Jan 2024 22:50:05 +1300 Message-Id: <20240103095006.608744-3-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240103095006.608744-1-21cnbao@gmail.com> References: <20240103095006.608744-1-21cnbao@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: ABF78140006 X-Rspam-User: X-Stat-Signature: z3o11yn3nnm5nf9ma6iguxugxkooyiuu X-Rspamd-Server: rspam01 X-HE-Tag: 1704275441-175269 X-HE-Meta: U2FsdGVkX1/GnyUlqSxobWGsVhN6Czq/Xo7MLF/4j7tSw1NH543n04kzE3mCaJS1eeEXN432xn0bqvIjQO0yWsFmORSWO9CIJVe+iyQt7iSjQZmb4ckEuMaUVMAiUV4FwRBcXT7MwUcXHcHJ5JyJmKuvR3vdx1hnbjBPPg1xBT/t/GA5B+uHzq0NkTSDH5OSqABlR99zP07bvcpG+/wDd9s9/vvPe15DnlbJhG8090/3WsK7hI9BitXRsHGzxuxu1DW/ZOJnxIEeJY/QBpPE9jeFWd9q4dhtymFBWiXHVQbypP2BEPfx38Z9Mv8fNxvR3g01pr2Nwrt7PWoeCnhMwx2886dyb4xLaq2KlB7q/vOvB7uwgvukK9y/IPzOrO3o/Z5XA2Ebu/lAeHpanr0HaS6YVtAYYt5lwmqt0X5GDDloSd4st7PmnIhUkLxLclN5+qwz/FTrNYyzbYSrBqrmhtzvPcQgZpwxMe7i7o1hbFbYL4M4uQk/oSykJycL9luH6j8CU2jGKc9K81IzrnxK6hm4XF7oDywSwZvDPDgJni0By8wjK5fx9UbjjyT+0c6L/lhqBA4gjGlf+Wmlh9dUphni8eEPHIj0UQkSK/zw+HsVnRzBmJAsUuHxZzDdTx0MU6Totdb/FFfCTnC+xkcLzQwqUyRBoDnJKt7xLvic+ImFhwNJHhFLeHVSU0EOQNHZ3A6nnHkS5Rccj33NYHVIiQfSP9RWmVcc5l/oay5TtdW/lxFQc6zYhTiLmTaxK0y2fR7tb7p+9LSKBepAbVh2y7aPqMGg9IVyo8aZD62po0HpMKBtyy1RqG70CsJPZc1oPiuF/cQIXpao3fRX2lNqWWsBABQpR98QTeXvSertjSJMvwKTY+NFCMHlUWAMd6BQNz6y6t0cAQoJ7cxsZSuT0Q908LuqVabU4T6EGvCxh9N/EzjkXSuyN5lNaQzdhFuKIdC32tv/U7QVrfXJtNl x52XIoRM 9GoEXfcEhg7entI8NhR4EwuFHs/bGEb1KDNWHYsznw1vEyFm0oxPPDzhf075GahvHRy3vNOvfsWg1+3IsdIkPnKdQ8emDvwz01G9SNVnRObDj+MGGDeNfGwzzFxHTWX0z+rXk3VMG74B7ggw36evkBIYYt5jwPtkTgc0mrBljFafW9Pt7U2QmSElzxW+qbvyJoJs0Via8z0XQ1RenkSimb5+h0hw6H7QHWKmoj9Bl/UVhWUAql2zghH1wiL9ZXYu6K5RTQ+6jM/wo9VtVErf7HoTUtGOg0DgDTcLqhWVGZ+MzwRUXdZHz+ZapgC48Gr4bBe0zi9RtfnqiFdTYDzh7lmM/6ZdybG1EvqJ9TUzbY6tXO8/QhvF8+sXBjAKWmMJ2RmLoWUnpzFrB8L81h6yhVBF/zxLS34qc3snpnrpYg48vE0++d8MWjEANxBmcBdvg0rhk5Zdiu+o0BhkbXFP7otJ5Ohwys1AXSsSx4L3OznUH+9YD8dEqjD0ENAkLbhQ7A8t5XR08KekDqYncbJdGtWjoDHgVCaSfqFmM8WshiDRpltPXH0WC2LRUeo2QaGoyDhfNBBVE2O1ydjM= 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 --- mm/zswap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index ca25b676048e..36898614ebcc 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_async; /* if acomp can sleep */ }; /* @@ -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_async = acomp_is_async(acomp); req = acomp_request_alloc(acomp_ctx->acomp); if (!req) { @@ -1370,7 +1372,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_async && !zpool_can_sleep_mapped(zpool)) { memcpy(acomp_ctx->buffer, src, entry->length); src = acomp_ctx->buffer; zpool_unmap_handle(zpool, entry->handle); @@ -1384,7 +1386,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_async || zpool_can_sleep_mapped(zpool)) zpool_unmap_handle(zpool, entry->handle); }