From patchwork Tue Oct 17 00:35:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 153831 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3813451vqb; Mon, 16 Oct 2023 17:35:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJbsm2SF3s1NRdyLcY7yEdrftSBVtBockZ/hJ/rBSHS56WX8gCiH4uTMMeOgYzOhxWOBHz X-Received: by 2002:a17:903:340c:b0:1ca:1ce1:bfac with SMTP id ke12-20020a170903340c00b001ca1ce1bfacmr848384plb.1.1697502941576; Mon, 16 Oct 2023 17:35:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697502941; cv=none; d=google.com; s=arc-20160816; b=B/xiMkNo1rfPhD8nvuRCj/oowstZtvPvt/lpMKR+FvmZCJAFbpdSwscRefFGtO7eif E3IO3wW/7gVpBo/XevZMyjcVtyDkDdF3v0gnuBGnTug2t+1DL4MflnCtuJxHSy+6UyBX +VnF7uXBqVbMJbKpBw5bejikKLSh7tAsQbzdbTBCA8V3Zc5AmmAruEglhvYk5Ue+1XvU RCGhsX1CZkvFoR5f8mmytHiCg/bmFB0NtuAy6NQgT+vYnDgvBmHsh9aww8FoQe8Xywib ARUrBrW1AyJ5FA26uiyKevELh6Js9d0DWa4zb1wxL2z/1Qq+ija1lfJvDczBcUmXyiGo qC6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TAwiYt7jZ0jTSch20EJdCPnumHKLIIb6QfY26Jbdiok=; fh=aGHPPSLL3K2AGGkJpMxWSugDWWuqk/0XCAweUUzTYws=; b=U4GxHleQ5M/Fvi+yOL8X6FMeUM+sNfAsWK01GyxiUPzKCygQEUDcY2V8SFlV+Vnf6F IMXUVlrN8OLVrKjNiNQB15Un7DbgVK/ZIEmPLnrUFI619rNiJWes14xfWyrQeLqUzXp5 3IBs1hVEkaWaNglUEnhKmDt5vlxpBCmVShQMhBEYwcvh8W9lgflVfxCaYcVpy7Fb6Nwx Otb+ujbMf6g+ZCG/Rk/1JrkdBW7n76Wmf0YlUe+r93ds23Zn4SRKTqcBPK0Re++sLSob vfdf5grFbsrqmP0mCEcY6vx4sphOF76ulBCsuIh0LODOOv0f9Qt+g5mtmDKF+aT48+Ap Zr6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XXOp45Gw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id l5-20020a170903120500b001c3e732b8casi591804plh.159.2023.10.16.17.35.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 17:35:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XXOp45Gw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 4DE168042D09; Mon, 16 Oct 2023 17:35:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233948AbjJQAfZ (ORCPT + 18 others); Mon, 16 Oct 2023 20:35:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233634AbjJQAfX (ORCPT ); Mon, 16 Oct 2023 20:35:23 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F8E895 for ; Mon, 16 Oct 2023 17:35:21 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1c88b467ef8so34766605ad.0 for ; Mon, 16 Oct 2023 17:35:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697502921; x=1698107721; 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=TAwiYt7jZ0jTSch20EJdCPnumHKLIIb6QfY26Jbdiok=; b=XXOp45Gwy2C7xObjMRPiSi+xfkBoW6tPnUB75Fb4Dt/i3SoaU3tVMQ2fyykv8Oi/X9 Eomh0tU/kONxa+auC3ermrpEaPy1vSMLc2k6SVCV6W81oM2I7fCB1kMeK0/Y5qCxSx7e GblyC4chYcnPOuKvY1kpETtkQO56uWtZOgViSttMZeHvlHz1m7RuqcsUcXHeH44NqRir 1buQg2r8m4ZrpVavIA4St8FLV2psoTQtzgOcYCxIx5qzvkex2add4E/+eN0CgH721Rm5 IF1JNlFzjSxUn+qwptOyXB3QyH3MvnV2BIBdVwcbGssRBM3H49ynr3+/qGrbUsRMqYc0 XAxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697502921; x=1698107721; 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=TAwiYt7jZ0jTSch20EJdCPnumHKLIIb6QfY26Jbdiok=; b=BRQv4FKU4jjNAzqokkYcKg+4i1a+4KZmRVjyw2iwFIk3Tetx47o8jBPIWJvODbz1Ss NevVOocsdDvoxAsL7b4qekXPkoTzQOJhUIkdreUS3Am7KJR6qPArs/BP/LJrt/FSAJPN Xuj0hCRAshZxV/ZxW/kPBWykntZJJefDOXuP9r36hkwjL7/T8Ql9JodRxGh49PT7iSp3 o/Dsw1Q7XrlsY14lw3ZC+IdkGlSd/ZDyxTivKnaXw3AKQVW0kczM4HvDYvV83iAiGW1J 2hYeQaXH+o6SyE/BohSKsg8983hrUxL78gOjiijzUFPnDEDLyktkqXd1bfYu7TlSXn1s QphA== X-Gm-Message-State: AOJu0YzaimTpxXOEX0nucEBuccD0cZ9kVN3ka4ZUEIYF+thIMrdmkoCx 2FXcPvjsavAV9Z1DBZSxogw= X-Received: by 2002:a17:903:23cf:b0:1ca:4ad7:6878 with SMTP id o15-20020a17090323cf00b001ca4ad76878mr763231plh.8.1697502920631; Mon, 16 Oct 2023 17:35:20 -0700 (PDT) Received: from localhost (fwdproxy-prn-119.fbsv.net. [2a03:2880:ff:77::face:b00c]) by smtp.gmail.com with ESMTPSA id u10-20020a17090341ca00b001b7f40a8959sm201875ple.76.2023.10.16.17.35.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 17:35:20 -0700 (PDT) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, cerasuolodomenico@gmail.com, yosryahmed@google.com, sjenning@redhat.com, ddstreet@ieee.org, vitaly.wool@konsulko.com, hughd@google.com, corbet@lwn.net, konrad.wilk@oracle.com, senozhatsky@chromium.org, rppt@kernel.org, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, david@ixit.cz Subject: [PATCH 1/2] swap: allows swap bypassing on zswap store failure Date: Mon, 16 Oct 2023 17:35:18 -0700 Message-Id: <20231017003519.1426574-2-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017003519.1426574-1-nphamcs@gmail.com> References: <20231017003519.1426574-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 16 Oct 2023 17:35:39 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779960844059202492 X-GMAIL-MSGID: 1779960844059202492 During our experiment with zswap, we sometimes observe swap IOs even though the zswap pool limit is never hit. This is due to occasional zswap store failures, in which case the page will be written straight to the swapping device. This prevents many users who cannot tolerate swapping from adopting zswap to save memory where possible. This patch adds the option to bypass swap when a zswap store fails. The feature is disabled by default (to preserve the existing behavior), and can be enabled via a new zswap module parameter. When enabled, swapping is all but prevented (except for when the zswap pool is full and have to write pages back to swap). Suggested-by: Johannes Weiner Signed-off-by: Nhat Pham --- Documentation/admin-guide/mm/zswap.rst | 9 +++++++++ include/linux/zswap.h | 9 +++++++++ mm/page_io.c | 6 ++++++ mm/shmem.c | 8 ++++++-- mm/zswap.c | 4 ++++ 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Documentation/admin-guide/mm/zswap.rst b/Documentation/admin-guide/mm/zswap.rst index ae8597a67804..82fa8148a65a 100644 --- a/Documentation/admin-guide/mm/zswap.rst +++ b/Documentation/admin-guide/mm/zswap.rst @@ -153,6 +153,15 @@ attribute, e. g.:: Setting this parameter to 100 will disable the hysteresis. +Many users cannot tolerate the swapping that comes with zswap store failures, +due to the IO incurred if these pages are needed later on. In this scenario, +users can bypass swapping when zswap store attempts fail (and keep the pages +in memory) as follows: + + echo Y > /sys/module/zswap/parameters/bypass_swap_when_store_fail_enabled + +Note that swapping due to writeback is not disabled with this option. + When there is a sizable amount of cold memory residing in the zswap pool, it can be advantageous to proactively write these cold pages to swap and reclaim the memory for other use cases. By default, the zswap shrinker is disabled. diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 04f80b64a09b..c67da5223894 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -7,6 +7,7 @@ extern u64 zswap_pool_total_size; extern atomic_t zswap_stored_pages; +extern bool zswap_bypass_swap_when_store_fail_enabled; #ifdef CONFIG_ZSWAP @@ -18,6 +19,10 @@ void zswap_swapoff(int type); bool zswap_remove_swpentry_from_lru(swp_entry_t swpentry); void zswap_insert_swpentry_into_lru(swp_entry_t swpentry); +static inline bool zswap_bypass_swap_when_store_fail(void) +{ + return zswap_bypass_swap_when_store_fail_enabled; +} #else static inline bool zswap_store(struct folio *folio) @@ -41,6 +46,10 @@ static inline bool zswap_remove_swpentry_from_lru(swp_entry_t swpentry) static inline void zswap_insert_swpentry_into_lru(swp_entry_t swpentry) {} +static inline bool zswap_bypass_swap_when_store_fail(void) +{ + return false; +} #endif #endif /* _LINUX_ZSWAP_H */ diff --git a/mm/page_io.c b/mm/page_io.c index cb559ae324c6..482f56d27bcd 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -201,6 +201,12 @@ int swap_writepage(struct page *page, struct writeback_control *wbc) folio_end_writeback(folio); return 0; } + + if (zswap_bypass_swap_when_store_fail()) { + folio_mark_dirty(folio); + return AOP_WRITEPAGE_ACTIVATE; + } + __swap_writepage(&folio->page, wbc); return 0; } diff --git a/mm/shmem.c b/mm/shmem.c index 6503910b0f54..8614d7fbe18c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1514,8 +1514,12 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) mutex_unlock(&shmem_swaplist_mutex); BUG_ON(folio_mapped(folio)); - swap_writepage(&folio->page, wbc); - return 0; + /* + * Seeing AOP_WRITEPAGE_ACTIVATE here indicates swapping is disabled on + * zswap store failure. Note that in that case the folio is already + * re-marked dirty by swap_writepage() + */ + return swap_writepage(&folio->page, wbc); } mutex_unlock(&shmem_swaplist_mutex); diff --git a/mm/zswap.c b/mm/zswap.c index d545516fb5de..db2674548670 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -138,6 +138,10 @@ static bool zswap_non_same_filled_pages_enabled = true; module_param_named(non_same_filled_pages_enabled, zswap_non_same_filled_pages_enabled, bool, 0644); +bool zswap_bypass_swap_when_store_fail_enabled; +module_param_named(bypass_swap_when_store_fail_enabled, + zswap_bypass_swap_when_store_fail_enabled, bool, 0644); + static bool zswap_exclusive_loads_enabled = IS_ENABLED( CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON); module_param_named(exclusive_loads, zswap_exclusive_loads_enabled, bool, 0644); From patchwork Tue Oct 17 00:35:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 153832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3813462vqb; Mon, 16 Oct 2023 17:35:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE1xtYFIoU5fQuT4lxlWkR3Q+GzD7Tb8+rzO3cYJs0nENbxjydusGfaWfMWJ6wEWn2OOK91 X-Received: by 2002:a05:6a21:81a1:b0:16e:26fd:7c02 with SMTP id pd33-20020a056a2181a100b0016e26fd7c02mr603819pzb.2.1697502943593; Mon, 16 Oct 2023 17:35:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697502943; cv=none; d=google.com; s=arc-20160816; b=U/5jXMdH815rnd+dm7JUUtgmoSoVlt5PPQSNyiqTG4UxAbGa2RHIwACsuz7B3+BOgp TD4JPYcmWECuejZCMjXHcYfiWEaoei09RBE3xM722k34X6Mjimsr56jtCA7874oDUPi8 Nyv9oTdveATv6FvhK8P2okb7+n6vRbdaAZDFkw4bMZ6ZlutyDUWen26Nt+FtPKWANr9u p9Q65xm9+i5SqCTB9DXxwIU4+PjLykwCp6YV7yj0zYGUwLXSRuPNrFy84MloI5PgDyfe BIbXg5f8l3SL4XxwHxSbgEF4oDY3S5VMuMMBe3xo16VF98FfLe7DpAVsYLTDcPHAypbr 7QvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=T3aXq8VH/Bzp0yHca9sQcxKTmb8CT7p/vnr3DuJfLn4=; fh=aGHPPSLL3K2AGGkJpMxWSugDWWuqk/0XCAweUUzTYws=; b=OtJoosdxPa5HpChXpHedhMZmRsMP4aMv0WVWum6B3tZUBAGD2/GLqOIhh+Nja4RUcd 9NJ4EA7stbXUgxi8+C4mDWi5jETHjhIWY3gNOzkmbiDMM52hkldKxQY7ftJQnIMJ/ENP b+qZzXdPasQZIvwRM9kZDrGDeCh3zSde/O7KUdyIg9EVFWqWob1rWiBOciDLSskOgDsb Ynz1FuApIRTKBUiIT6YvpvnhYKW+m2JP0UifThVcJIclkDNU4gq87+PTbj+XqjIxFE0s ESECOMx1rFQFbppDjF66x8vEYoI2kJciqjRJ582GnuqQ6wWYFgVuM2syxH9pNJqPdOve 1bXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=g2XSbQlZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id v1-20020a17090ac90100b0027762924984si7111236pjt.183.2023.10.16.17.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 17:35:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=g2XSbQlZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 68A4980C5C99; Mon, 16 Oct 2023 17:35:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234236AbjJQAf2 (ORCPT + 18 others); Mon, 16 Oct 2023 20:35:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233835AbjJQAfY (ORCPT ); Mon, 16 Oct 2023 20:35:24 -0400 Received: from mail-oo1-xc2e.google.com (mail-oo1-xc2e.google.com [IPv6:2607:f8b0:4864:20::c2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA93D92 for ; Mon, 16 Oct 2023 17:35:22 -0700 (PDT) Received: by mail-oo1-xc2e.google.com with SMTP id 006d021491bc7-57f0f81b2aeso2846269eaf.3 for ; Mon, 16 Oct 2023 17:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697502922; x=1698107722; 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=T3aXq8VH/Bzp0yHca9sQcxKTmb8CT7p/vnr3DuJfLn4=; b=g2XSbQlZuzSVjz6DkBq4ZQTbhM0RzKS58PMpcHtZhSUvL1rMQ1yD5asfMaBQrjjAUP a1mgVDWXhg6RuXl/AlF0xWzld9dSadEdoU5SfT3yS/9l9IycJAMwGHdeJumsLk0xgWFW E0f4n9/li89wecTtfBv9vVHSS5cy0OJsZbgUWJZoWJNh8fKpBxPSlWJNJKyg7dqMUINv KHu/90H6/xWK1oSC8Bv3LCCsmdnT2j6hpVdrwZcxehZxMimS7h8q7st5XTqmneyr9KtF 2slzUM/8LHoZGRbI57AIyogLmPx2+5cAtbklD8ViLwvLDWzlolXmW66y+lG0+9QAl39i 56lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697502922; x=1698107722; 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=T3aXq8VH/Bzp0yHca9sQcxKTmb8CT7p/vnr3DuJfLn4=; b=dauSIz9DvaquJiIUUR0gxgKnT0fJx8u5iU2DZQ9P3onXKSw/woYkBdSLy6jTSJO6CX 14TiAYIMfeYv4ensWtwgt1TgxZlpheJSDvIkaDbJEKeSl4xQ8qUtQOr7CzE3zx1tg07H Q5f0Y/OzlkZmDttW1hBoXZ9GKfBYgJQ2gpis/grjp1uminB+ichuQlvIbK+pY4qgHHnW EpBLkJWu+JqMxtf2eTKZJtKsQV7bxna6GoG888GBxUruQXdkiIPynG4vY9vxw2sL+7RD 16x24LLLdte9vEMOTlMsoUgxX57in2OaZrRW1OyayOlATqtJwfxRsktuKTYTymvbNf9x eoZw== X-Gm-Message-State: AOJu0YxtYf4+MGCHwXNnC3kTCfpO5QEc5rOb/E7Y70AZCMaJ43/vhY/g J0ZrMBuCMxnQGIPRKUp/Q6Q= X-Received: by 2002:a05:6359:2c45:b0:139:d5f0:c027 with SMTP id qv5-20020a0563592c4500b00139d5f0c027mr862671rwb.30.1697502921618; Mon, 16 Oct 2023 17:35:21 -0700 (PDT) Received: from localhost (fwdproxy-prn-119.fbsv.net. [2a03:2880:ff:77::face:b00c]) by smtp.gmail.com with ESMTPSA id p15-20020aa7860f000000b00690cd981652sm157411pfn.61.2023.10.16.17.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 17:35:21 -0700 (PDT) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, cerasuolodomenico@gmail.com, yosryahmed@google.com, sjenning@redhat.com, ddstreet@ieee.org, vitaly.wool@konsulko.com, hughd@google.com, corbet@lwn.net, konrad.wilk@oracle.com, senozhatsky@chromium.org, rppt@kernel.org, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, david@ixit.cz Subject: [PATCH 2/2] zswap: store uncompressed pages when compression algorithm fails Date: Mon, 16 Oct 2023 17:35:19 -0700 Message-Id: <20231017003519.1426574-3-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017003519.1426574-1-nphamcs@gmail.com> References: <20231017003519.1426574-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 16 Oct 2023 17:35:39 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779960846710195327 X-GMAIL-MSGID: 1779960846710195327 In a zswap store, the compression step could fail, leaving the pages out of the zswap pool. This could happen, for instance, when the pages hold random data (such as /dev/urandom). This behavior can potentially create unnecessary LRU inversion: warm but incompressible pages are swapped out, whereas cold compressible pages reside in the zswap pool. This could incur IO later when the warmer pages are indeed required again. We can instead just store the original page in the zswap pool. Storing PAGE_SIZE objects is already supported by zsmalloc, zswap's default backend allocator. When these pages are needed (either for a zswap load or for writeback), we can simply copy the original content into the desired buffer. This patch allows zswap to store uncompressed pages. The feature can be enabled at runtime via a new parameter. In addition, we add a counter to track the number of times the compression step fails for diagnostics. Signed-off-by: Nhat Pham --- Documentation/admin-guide/mm/zswap.rst | 7 +++ mm/zswap.c | 60 +++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/Documentation/admin-guide/mm/zswap.rst b/Documentation/admin-guide/mm/zswap.rst index 82fa8148a65a..ac1018cb5373 100644 --- a/Documentation/admin-guide/mm/zswap.rst +++ b/Documentation/admin-guide/mm/zswap.rst @@ -162,6 +162,13 @@ in memory) as follows: Note that swapping due to writeback is not disabled with this option. +Compression could also fail during a zswap store attempt. In many cases, it is +nevertheless beneficial to store the page in the zswap pool (in its +uncompressed form) for the sake of maintaining the LRU ordering, which will +be useful for reclaim. This can be enabled as follows: + + echo Y > /sys/module/zswap/parameters/uncompressed_pages_enabled + When there is a sizable amount of cold memory residing in the zswap pool, it can be advantageous to proactively write these cold pages to swap and reclaim the memory for other use cases. By default, the zswap shrinker is disabled. diff --git a/mm/zswap.c b/mm/zswap.c index db2674548670..096266d35602 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -62,6 +62,8 @@ static u64 zswap_pool_limit_hit; static u64 zswap_written_back_pages; /* Store failed due to a reclaim failure after pool limit was reached */ static u64 zswap_reject_reclaim_fail; +/* Compression step fails during store attempt */ +static u64 zswap_reject_compress_fail; /* Compressed page was too big for the allocator to (optimally) store */ static u64 zswap_reject_compress_poor; /* Store failed because underlying allocator could not get memory */ @@ -142,6 +144,10 @@ bool zswap_bypass_swap_when_store_fail_enabled; module_param_named(bypass_swap_when_store_fail_enabled, zswap_bypass_swap_when_store_fail_enabled, bool, 0644); +static bool zswap_uncompressed_pages_enabled; +module_param_named(uncompressed_pages_enabled, + zswap_uncompressed_pages_enabled, bool, 0644); + static bool zswap_exclusive_loads_enabled = IS_ENABLED( CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON); module_param_named(exclusive_loads, zswap_exclusive_loads_enabled, bool, 0644); @@ -224,6 +230,7 @@ struct zswap_pool { * value - value of the same-value filled pages which have same content * objcg - the obj_cgroup that the compressed memory is charged to * lru - handle to the pool's lru used to evict pages. + * is_uncompressed - whether the page is stored in its uncompressed form. */ struct zswap_entry { struct rb_node rbnode; @@ -238,6 +245,7 @@ struct zswap_entry { struct obj_cgroup *objcg; int nid; struct list_head lru; + bool is_uncompressed; }; /* @@ -1307,7 +1315,7 @@ static int zswap_writeback_entry(struct zswap_entry *entry, struct crypto_acomp_ctx *acomp_ctx; struct zpool *pool = zswap_find_zpool(entry); bool page_was_allocated; - u8 *src, *tmp = NULL; + u8 *src, *dst, *tmp = NULL; unsigned int dlen; int ret; struct writeback_control wbc = { @@ -1356,6 +1364,19 @@ static int zswap_writeback_entry(struct zswap_entry *entry, dlen = PAGE_SIZE; src = zpool_map_handle(pool, entry->handle, ZPOOL_MM_RO); + if (entry->is_uncompressed) { + if (!zpool_can_sleep_mapped(pool)) + kfree(tmp); + + dst = kmap_local_page(page); + copy_page(dst, src); + kunmap_local(dst); + zpool_unmap_handle(pool, entry->handle); + + ret = 0; + goto success; + } + if (!zpool_can_sleep_mapped(pool)) { memcpy(tmp, src, entry->length); src = tmp; @@ -1376,6 +1397,7 @@ static int zswap_writeback_entry(struct zswap_entry *entry, else zpool_unmap_handle(pool, entry->handle); +success: BUG_ON(ret); BUG_ON(dlen != PAGE_SIZE); @@ -1454,7 +1476,7 @@ bool zswap_store(struct folio *folio) char *buf; u8 *src, *dst; gfp_t gfp; - int ret; + int ret, compress_ret; VM_WARN_ON_ONCE(!folio_test_locked(folio)); VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); @@ -1569,11 +1591,15 @@ bool zswap_store(struct folio *folio) * but in different threads running on different cpu, we have different * acomp instance, so multiple threads can do (de)compression in parallel. */ - ret = crypto_wait_req(crypto_acomp_compress(acomp_ctx->req), &acomp_ctx->wait); + compress_ret = crypto_wait_req(crypto_acomp_compress(acomp_ctx->req), + &acomp_ctx->wait); dlen = acomp_ctx->req->dlen; - if (ret) - goto put_dstmem; + if (compress_ret) { + zswap_reject_compress_fail++; + if (!zswap_uncompressed_pages_enabled) + goto put_dstmem; + } /* store */ zpool = zswap_find_zpool(entry); @@ -1590,7 +1616,15 @@ bool zswap_store(struct folio *folio) goto put_dstmem; } buf = zpool_map_handle(zpool, handle, ZPOOL_MM_WO); - memcpy(buf, dst, dlen); + + /* Compressor failed. Store the page in its uncompressed form. */ + if (compress_ret) { + dlen = PAGE_SIZE; + src = kmap_local_page(page); + copy_page(buf, src); + kunmap_local(src); + } else + memcpy(buf, dst, dlen); zpool_unmap_handle(zpool, handle); mutex_unlock(acomp_ctx->mutex); @@ -1598,6 +1632,7 @@ bool zswap_store(struct folio *folio) entry->swpentry = swp_entry(type, offset); entry->handle = handle; entry->length = dlen; + entry->is_uncompressed = compress_ret; insert_entry: entry->objcg = objcg; @@ -1687,6 +1722,17 @@ bool zswap_load(struct folio *folio) } zpool = zswap_find_zpool(entry); + + if (entry->is_uncompressed) { + src = zpool_map_handle(zpool, entry->handle, ZPOOL_MM_RO); + dst = kmap_local_page(page); + copy_page(dst, src); + kunmap_local(dst); + zpool_unmap_handle(zpool, entry->handle); + ret = true; + goto stats; + } + if (!zpool_can_sleep_mapped(zpool)) { tmp = kmalloc(entry->length, GFP_KERNEL); if (!tmp) { @@ -1855,6 +1901,8 @@ static int zswap_debugfs_init(void) zswap_debugfs_root, &zswap_reject_alloc_fail); debugfs_create_u64("reject_kmemcache_fail", 0444, zswap_debugfs_root, &zswap_reject_kmemcache_fail); + debugfs_create_u64("reject_compress_fail", 0444, + zswap_debugfs_root, &zswap_reject_compress_fail); debugfs_create_u64("reject_compress_poor", 0444, zswap_debugfs_root, &zswap_reject_compress_poor); debugfs_create_u64("written_back_pages", 0444,