From mboxrd@z Thu Jan 1 00:00:00 1970 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 0DA76C5AD4C for ; Fri, 17 Nov 2023 00:39:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C1EC6B0490; Thu, 16 Nov 2023 19:39:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 471496B0499; Thu, 16 Nov 2023 19:39:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 312A36B04A7; Thu, 16 Nov 2023 19:39:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 20F1D6B0490 for ; Thu, 16 Nov 2023 19:39:44 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EFAAB1CAFAF for ; Fri, 17 Nov 2023 00:39:43 +0000 (UTC) X-FDA: 81465588246.17.E1B4023 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf22.hostedemail.com (Postfix) with ESMTP id D17C6C0009 for ; Fri, 17 Nov 2023 00:39:41 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=YxfJ5YdX; spf=pass (imf22.hostedemail.com: domain of chrisl@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700181582; a=rsa-sha256; cv=none; b=UzT1cqBCUymmCL5YNf3b8/UcE35E9DQCoNJxYBkNVnMsCjwVDGmp6/SdciJapXOItkBTsp XNJOBaIBcjGzVIL/ZJ6vObzO4SFf8AhYmLCR6zMfBaEvHymKQHWtE/6l+7WCk8pV1Hxpnt WgGl/rjA+ps87IN9amdmut70As5PMCY= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=YxfJ5YdX; spf=pass (imf22.hostedemail.com: domain of chrisl@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700181582; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WPxrmOnPh3pXwDACD/1Wq1X7N2NrWCtYUwHvj99pa2U=; b=doy5UNk9Ogy9A0d4eZ6LqCtwiAfxIG6+plLcStKTKZVCubqID60IGNYd5SnkdflP5XbAHZ fRM36G/321RzB1tHlVPaxNJShzlypV5VDfDReRmAV4/NjpZ9z1BM/VzQOKX13g3ptW8ReB fMVix9vfKkvM3tA1pAusOyVBc6WCijY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id B132AB81E12 for ; Fri, 17 Nov 2023 00:39:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85E31C433A9 for ; Fri, 17 Nov 2023 00:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700181578; bh=NjGvRcLEeA3H+9/q9WzbK1yEl6UBJEOS14fPBtjWgNo=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=YxfJ5YdXL0SCg5nv48ktTcXIUgq3T4wHnQg0bnzv+SseR/idiymOlAOl7qq2PUNea iwXHKcwD85e+MfjSGrlJDqMlv+SreLdJgxJHx/HVQ1hdyIHV4p7vNs49S0zmBXcbcm wsbqFgWWCmPSxv0iydudAaAdyB3XuNRWOU8//5bSDcuNngN+pwzE0fHhLVbDIbdGan e3YAgm4uM5gt8HgdgY3WIjHAdmsz8tuJ6X8pNkofWtS5wLnkMxpe28T3FlzyPu4a9h 70Wyr9y6GcvaO2AjvFlCdwaw/MenQ+Rn9BpBK0whq9ZXDMqjePMzx+qtKHP1za9lcT AneptcdLMGBqg== Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-28396255b81so393427a91.0 for ; Thu, 16 Nov 2023 16:39:38 -0800 (PST) X-Gm-Message-State: AOJu0Yz36uwShTHYpcnxsxg/z9Tz4lpHcpM2OciKmsOS3tmCUcXJVbI9 2ab4tGSX0e+wCbK8/s2VujazDYS3encyvlcq/1OyMQ== X-Google-Smtp-Source: AGHT+IEWKvmM8IaUhTzWCQLsoPMvQLmXbfiAQIojPtNicKD2pbT11DSy6FrfD85inUbA+Bw1ecbDqGg57/e0aZkIGM8= X-Received: by 2002:a17:90b:1646:b0:27d:1538:e324 with SMTP id il6-20020a17090b164600b0027d1538e324mr16282475pjb.32.1700181577611; Thu, 16 Nov 2023 16:39:37 -0800 (PST) MIME-Version: 1.0 References: <20231115172344.4155593-1-nphamcs@gmail.com> In-Reply-To: From: Chris Li Date: Thu, 16 Nov 2023 16:39:26 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v5] zswap: memcontrol: implement zswap writeback disabling To: Yosry Ahmed Cc: Nhat Pham , Andrew Morton , tj@kernel.org, lizefan.x@bytedance.com, Johannes Weiner , Domenico Cerasuolo , Seth Jennings , Dan Streetman , Vitaly Wool , mhocko@kernel.org, roman.gushchin@linux.dev, Shakeel Butt , muchun.song@linux.dev, Hugh Dickins , corbet@lwn.net, Konrad Rzeszutek Wilk , senozhatsky@chromium.org, rppt@kernel.org, linux-mm , kernel-team@meta.com, LKML , linux-doc@vger.kernel.org, david@ixit.cz Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: D17C6C0009 X-Stat-Signature: pg6bkq443wn69uztkiakifskzjczdfkg X-Rspam-User: X-HE-Tag: 1700181581-237491 X-HE-Meta: U2FsdGVkX18HoQ+S8dczp7C57TtpdXYRzqGGTNewQ7sKsI+80k7LyxBENpj+4aVAPTHpC8KX2EF1Z40xVTw1EqoHnKMD/2g1lBEFAKBE5eGAn0VBaDXs9htux3OGsf+CSZkpQ9UwCK9V0rHav3eKqFXoWGHZ9cNgwFSpSAgG+XmOeLsgI7Ti4xAREc6zJy0SYBVVVWtKs6icOgd8Tlh38DI5ZdKNgpgKqMIw9cESkg1XnDokQOceO3Mt7wUKW0fH6pmCcGgGzljpb+cX+BTIaEXdZzWA4GeFxDLIW/xr7vJPE+k8RWkTzPVFvjZONxwR6K5v2NDJFsh/MEW9RvGUuYWJVELrMMj8Hbu+oyVAXobQVs3QzRhUZhxOF1soOHlICf9k98+ZQI01x1h3xG2POpvqR2TbTQo8mSLJMTJXwY0LJYTNLhoGCBSC7k3FjTH0rDk5FAWH0tE9ZuCX2dlCb3wg66v/lfUUJlfCsI7W6u54zompS0PyYdOhnpLDru89qkAsr/xm72i2sj2F2BuQdwRIht5bFR0/InvMssx5cLVYREwTVxMZSkp4Q/dvcEOxhaJSj/Ff9ybdXwZjyRerykwhhoR9WxwWKeFOzQy7gVFoNK44v7VwNZ54Z8s85tapO/0ffLKxX4C2KPUd+QaUIS8jwI9CA5CqxFufE0qa8a63EdjqG8dYCDYzuUbeskeh8HbfEYKHTLILFmQIPB/AB7Ha283EUrQ0IB1fdRwV/Kt0QVPfk02coW1z04TWs4ayrkWHF7ELO+uzYQjC4Maa7N3ebVXrrJ++1OHVCH6avEx4ukFi3zTWyB8N0QuEIekvjp4Ayd1CZZKg0/adAlVV/vpfOWgYWxiMh6gUE9BvSN0w5oWMxBSam2Gs3SoKkW+QlJjY98NxCwG+zp1JPG50QDDisLkrtmk8cVRBkwf/NYqcZeuvvCQvPO6bzSbumb3MOADhzGIsKlZk2Zs4WMp /rc78Nke VR5V3RoOP/2zSFP03ZueUe0IbYklIWf2pAVl5RqZcXD8DZsd7IOiWFKSMuFYwBjjnHDXhsLCsIYNWP/QwTXWsxGlHEoQO+Bsyi7ldvA4CSKsqWMXg/h6zNEql+2JcifJFVvgOh7M6/ue+l5bVtOqEUWroJNNr1gsVu2xVrHF3zsZDt9ieMyi4/SqC62Ivz+0WOjqdeGnIUaq3vIHy3JbuaVIT8IuYuckBYs2e1OGaGqYUSTSm2BanLa/bd3msDR7k1NJ11wZJxCrjgbeb0Rybo245OSrPVuQ0ilz4yUKtvscvLsi2/9nRKcQ1oRyHjs7/YR/XzGLFF0D3OIm1rwg215+BjpuymCt0D3lVYbrXk5kH8iBClMuSLVJ64zm6RRTTT3/izhMw3qGb1k27w2gCPL4n0SWrt/KF5nq+sA/v4ZOsda9vW/4drbNcn7NiJy2l22be7gnpIppxTxY= 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: Hi Yosry, I think we are in agreement here. I am already Acked on the previous version of this patch. Consider this version as well because the change suggestion is from me. I am fine with merging the zswap.writeback. It is also good to get some discussion on the more general ABI as well. Just like you said, we can also explore the zswap + swapfile using the more general API. Because obsoleting user-visible ABI is much harder. Chris On Thu, Nov 16, 2023 at 1:01=E2=80=AFPM Yosry Ahmed = wrote: > > On Thu, Nov 16, 2023 at 12:53=E2=80=AFPM Chris Li wro= te: > > > > Hi Nhat, > > > > As we discussed, I just want to bounce some alternative ideas related > > to this write back disabled feature. > > > > Currently, the common usage case is zswap alone or zswap + SSD. We > > treat zswap and > > SSD as two different tiers with different swap in performance character= istics. > > If we make it more generic, we can also have more than two swap tiers. > > e.g. we can have zswap, SSD, network swap or HDD swap. > > The disable flag is just one bit of information, it can't describe > > what is the next tier.if it is not the current swap file > > implementation . > > > > One idea is that we can have a more general swap_tier_list object to > > describe the order of the swap device, The system can have more than > > one such list to describe different combinations of the tier > > selection. > > > > Each memcg can have a pointer point to one of such swap_tier_list > > objects, replacing the disabled write back flag in this patch. > > When you swap out, it will just go through each tier in the list, try > > to swap it out. > > This has some implications for the zswap shrink as well. It becomes a > > more generic "move swap out data to another tier". Generally need to > > load into the swap cache then write to another tier. > > > > Open question is how we deal with the swap cache index across > > different tiers. The zswap.writeback_disable will not be needed if we > > have a more generic swap tier framework. > > I agree that this should be the long-term goal, and I suggested that > we make the interface more future-proof by making it more generic to > accept the types or tiers of swap allowed by the memcg: > > https://lore.kernel.org/lkml/CAJD7tkY8iPBo99+1gdsSRMNDu4jkVKz8rb=3DW+xk9= =3DGE0y=3DkSuw@mail.gmail.com/ > > Since we only have swap and zswap now, the implementation can be > similar to this code and basically just disable writeback if zswap is > the only allowed swapping mechanism. So we don't necessarily need to > have a full swap tiering implementation, but I agree with Chris that > at least having a future-proof interface to work with generic swap > tiering is preferrable. > > > > > > > Chris > > > > > > On Wed, Nov 15, 2023 at 9:24=E2=80=AFAM Nhat Pham w= rote: > > > > > > During our experiment with zswap, we sometimes observe swap IOs due t= o > > > occasional zswap store failures and writebacks-to-swap. These swappin= g > > > IOs prevent many users who cannot tolerate swapping from adopting zsw= ap > > > to save memory and improve performance where possible. > > > > > > This patch adds the option to disable this behavior entirely: do not > > > writeback to backing swapping device when a zswap store attempt fail, > > > and do not write pages in the zswap pool back to the backing swap > > > device (both when the pool is full, and when the new zswap shrinker i= s > > > called). > > > > > > This new behavior can be opted-in/out on a per-cgroup basis via a new > > > cgroup file. By default, writebacks to swap device is enabled, which = is > > > the previous behavior. Initially, writeback is enabled for the root > > > cgroup, and a newly created cgroup will inherit the current setting o= f > > > its parent. > > > > > > Note that this is subtly different from setting memory.swap.max to 0,= as > > > it still allows for pages to be stored in the zswap pool (which itsel= f > > > consumes swap space in its current form). > > > > > > This patch should be applied on top of the zswap shrinker series: > > > > > > https://lore.kernel.org/lkml/20231106183159.3562879-1-nphamcs@gmail.c= om/ > > > > > > as it also disables the zswap shrinker, a major source of zswap > > > writebacks. > > > > > > Suggested-by: Johannes Weiner > > > Signed-off-by: Nhat Pham > > > --- > > > Documentation/admin-guide/cgroup-v2.rst | 12 ++++++++ > > > Documentation/admin-guide/mm/zswap.rst | 6 ++++ > > > include/linux/memcontrol.h | 12 ++++++++ > > > include/linux/zswap.h | 6 ++++ > > > mm/memcontrol.c | 38 +++++++++++++++++++++++= ++ > > > mm/page_io.c | 6 ++++ > > > mm/shmem.c | 3 +- > > > mm/zswap.c | 14 +++++++++ > > > 8 files changed, 95 insertions(+), 2 deletions(-) > > > > > > diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/= admin-guide/cgroup-v2.rst > > > index 3f85254f3cef..2b4ac43efdc8 100644 > > > --- a/Documentation/admin-guide/cgroup-v2.rst > > > +++ b/Documentation/admin-guide/cgroup-v2.rst > > > @@ -1679,6 +1679,18 @@ PAGE_SIZE multiple when read back. > > > limit, it will refuse to take any more stores before existing > > > entries fault back in or are written out to disk. > > > > > > + memory.zswap.writeback > > > + A read-write single value file. The default value is "1". The > > > + initial value of the root cgroup is 1, and when a new cgroup = is > > > + created, it inherits the current value of its parent. > > > + > > > + When this is set to 0, all swapping attempts to swapping devi= ces > > > + are disabled. This included both zswap writebacks, and swappi= ng due > > > + to zswap store failure. > > > + > > > + Note that this is subtly different from setting memory.swap.m= ax to > > > + 0, as it still allows for pages to be written to the zswap po= ol. > > > + > > > memory.pressure > > > A read-only nested-keyed file. > > > > > > diff --git a/Documentation/admin-guide/mm/zswap.rst b/Documentation/a= dmin-guide/mm/zswap.rst > > > index 522ae22ccb84..b987e58edb70 100644 > > > --- a/Documentation/admin-guide/mm/zswap.rst > > > +++ b/Documentation/admin-guide/mm/zswap.rst > > > @@ -153,6 +153,12 @@ attribute, e. g.:: > > > > > > Setting this parameter to 100 will disable the hysteresis. > > > > > > +Some users cannot tolerate the swapping that comes with zswap store = failures > > > +and zswap writebacks. Swapping can be disabled entirely (without dis= abling > > > +zswap itself) on a cgroup-basis as follows: > > > + > > > + echo 0 > /sys/fs/cgroup//memory.zswap.writeback > > > + > > > 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 an= d reclaim > > > the memory for other use cases. By default, the zswap shrinker is di= sabled. > > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > > > index 83590fd0d6d1..3901ff4dae63 100644 > > > --- a/include/linux/memcontrol.h > > > +++ b/include/linux/memcontrol.h > > > @@ -219,6 +219,12 @@ struct mem_cgroup { > > > > > > #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) > > > unsigned long zswap_max; > > > + > > > + /* > > > + * Prevent pages from this memcg from being written back from= zswap to > > > + * swap, and from being swapped out on zswap store failures. > > > + */ > > > + bool zswap_writeback; > > > #endif > > > > > > unsigned long soft_limit; > > > @@ -1931,6 +1937,7 @@ static inline void count_objcg_event(struct obj= _cgroup *objcg, > > > bool obj_cgroup_may_zswap(struct obj_cgroup *objcg); > > > void obj_cgroup_charge_zswap(struct obj_cgroup *objcg, size_t size); > > > void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size= ); > > > +bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg); > > > #else > > > static inline bool obj_cgroup_may_zswap(struct obj_cgroup *objcg) > > > { > > > @@ -1944,6 +1951,11 @@ static inline void obj_cgroup_uncharge_zswap(s= truct obj_cgroup *objcg, > > > size_t size) > > > { > > > } > > > +static inline bool mem_cgroup_zswap_writeback_enabled(struct mem_cgr= oup *memcg) > > > +{ > > > + /* if zswap is disabled, do not block pages going to the swap= ping device */ > > > + return true; > > > +} > > > #endif > > > > > > #endif /* _LINUX_MEMCONTROL_H */ > > > diff --git a/include/linux/zswap.h b/include/linux/zswap.h > > > index cbd373ba88d2..b4997e27a74b 100644 > > > --- a/include/linux/zswap.h > > > +++ b/include/linux/zswap.h > > > @@ -35,6 +35,7 @@ void zswap_swapoff(int type); > > > void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg); > > > void zswap_lruvec_state_init(struct lruvec *lruvec); > > > void zswap_lruvec_swapin(struct page *page); > > > +bool is_zswap_enabled(void); > > > #else > > > > > > struct zswap_lruvec_state {}; > > > @@ -55,6 +56,11 @@ static inline void zswap_swapoff(int type) {} > > > static inline void zswap_memcg_offline_cleanup(struct mem_cgroup *me= mcg) {} > > > static inline void zswap_lruvec_init(struct lruvec *lruvec) {} > > > static inline void zswap_lruvec_swapin(struct page *page) {} > > > + > > > +static inline bool is_zswap_enabled(void) > > > +{ > > > + return false; > > > +} > > > #endif > > > > > > #endif /* _LINUX_ZSWAP_H */ > > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > > index 786c7edf5836..5ad71ce31c74 100644 > > > --- a/mm/memcontrol.c > > > +++ b/mm/memcontrol.c > > > @@ -5522,6 +5522,8 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state= *parent_css) > > > WRITE_ONCE(memcg->soft_limit, PAGE_COUNTER_MAX); > > > #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) > > > memcg->zswap_max =3D PAGE_COUNTER_MAX; > > > + WRITE_ONCE(memcg->zswap_writeback, > > > + !parent || READ_ONCE(parent->zswap_writeback)); > > > #endif > > > page_counter_set_high(&memcg->swap, PAGE_COUNTER_MAX); > > > if (parent) { > > > @@ -8146,6 +8148,12 @@ void obj_cgroup_uncharge_zswap(struct obj_cgro= up *objcg, size_t size) > > > rcu_read_unlock(); > > > } > > > > > > +bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg) > > > +{ > > > + /* if zswap is disabled, do not block pages going to the swap= ping device */ > > > + return !is_zswap_enabled() || !memcg || READ_ONCE(memcg->zswa= p_writeback); > > > +} > > > + > > > static u64 zswap_current_read(struct cgroup_subsys_state *css, > > > struct cftype *cft) > > > { > > > @@ -8176,6 +8184,31 @@ static ssize_t zswap_max_write(struct kernfs_o= pen_file *of, > > > return nbytes; > > > } > > > > > > +static int zswap_writeback_show(struct seq_file *m, void *v) > > > +{ > > > + struct mem_cgroup *memcg =3D mem_cgroup_from_seq(m); > > > + > > > + seq_printf(m, "%d\n", READ_ONCE(memcg->zswap_writeback)); > > > + return 0; > > > +} > > > + > > > +static ssize_t zswap_writeback_write(struct kernfs_open_file *of, > > > + char *buf, size_t nbytes, loff_t off) > > > +{ > > > + struct mem_cgroup *memcg =3D mem_cgroup_from_css(of_css(of)); > > > + int zswap_writeback; > > > + ssize_t parse_ret =3D kstrtoint(strstrip(buf), 0, &zswap_writ= eback); > > > + > > > + if (parse_ret) > > > + return parse_ret; > > > + > > > + if (zswap_writeback !=3D 0 && zswap_writeback !=3D 1) > > > + return -EINVAL; > > > + > > > + WRITE_ONCE(memcg->zswap_writeback, zswap_writeback); > > > + return nbytes; > > > +} > > > + > > > static struct cftype zswap_files[] =3D { > > > { > > > .name =3D "zswap.current", > > > @@ -8188,6 +8221,11 @@ static struct cftype zswap_files[] =3D { > > > .seq_show =3D zswap_max_show, > > > .write =3D zswap_max_write, > > > }, > > > + { > > > + .name =3D "zswap.writeback", > > > + .seq_show =3D zswap_writeback_show, > > > + .write =3D zswap_writeback_write, > > > + }, > > > { } /* terminate */ > > > }; > > > #endif /* CONFIG_MEMCG_KMEM && CONFIG_ZSWAP */ > > > diff --git a/mm/page_io.c b/mm/page_io.c > > > index cb559ae324c6..5e606f1aa2f6 100644 > > > --- a/mm/page_io.c > > > +++ b/mm/page_io.c > > > @@ -201,6 +201,12 @@ int swap_writepage(struct page *page, struct wri= teback_control *wbc) > > > folio_end_writeback(folio); > > > return 0; > > > } > > > + > > > + if (!mem_cgroup_zswap_writeback_enabled(folio_memcg(folio))) = { > > > + 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 0d1ce70bce38..ccbaaa5f1c16 100644 > > > --- a/mm/shmem.c > > > +++ b/mm/shmem.c > > > @@ -1514,8 +1514,7 @@ static int shmem_writepage(struct page *page, s= truct writeback_control *wbc) > > > > > > mutex_unlock(&shmem_swaplist_mutex); > > > BUG_ON(folio_mapped(folio)); > > > - swap_writepage(&folio->page, wbc); > > > - return 0; > > > + return swap_writepage(&folio->page, wbc); > > > } > > > > > > mutex_unlock(&shmem_swaplist_mutex); > > > diff --git a/mm/zswap.c b/mm/zswap.c > > > index 943090dfe793..caa467e40009 100644 > > > --- a/mm/zswap.c > > > +++ b/mm/zswap.c > > > @@ -152,6 +152,11 @@ module_param_named(exclusive_loads, zswap_exclus= ive_loads_enabled, bool, 0644); > > > static bool zswap_shrinker_enabled; > > > module_param_named(shrinker_enabled, zswap_shrinker_enabled, bool, 0= 644); > > > > > > +bool is_zswap_enabled(void) > > > +{ > > > + return zswap_enabled; > > > +} > > > + > > > /********************************* > > > * data structures > > > **********************************/ > > > @@ -589,6 +594,9 @@ static unsigned long zswap_shrinker_scan(struct s= hrinker *shrinker, > > > struct zswap_pool *pool =3D shrinker->private_data; > > > bool encountered_page_in_swapcache =3D false; > > > > > > + if (!mem_cgroup_zswap_writeback_enabled(sc->memcg)) > > > + return SHRINK_STOP; > > > + > > > nr_protected =3D > > > atomic_long_read(&lruvec->zswap_lruvec_state.nr_zswap= _protected); > > > lru_size =3D list_lru_shrink_count(&pool->list_lru, sc); > > > @@ -619,6 +627,9 @@ static unsigned long zswap_shrinker_count(struct = shrinker *shrinker, > > > struct lruvec *lruvec =3D mem_cgroup_lruvec(memcg, NODE_DATA(= sc->nid)); > > > unsigned long nr_backing, nr_stored, nr_freeable, nr_protecte= d; > > > > > > + if (!mem_cgroup_zswap_writeback_enabled(memcg)) > > > + return 0; > > > + > > > #ifdef CONFIG_MEMCG_KMEM > > > cgroup_rstat_flush(memcg->css.cgroup); > > > nr_backing =3D memcg_page_state(memcg, MEMCG_ZSWAP_B) >> PAGE= _SHIFT; > > > @@ -934,6 +945,9 @@ static int shrink_memcg(struct mem_cgroup *memcg) > > > struct zswap_pool *pool; > > > int nid, shrunk =3D 0; > > > > > > + if (!mem_cgroup_zswap_writeback_enabled(memcg)) > > > + return -EINVAL; > > > + > > > /* > > > * Skip zombies because their LRUs are reparented and we woul= d be > > > * reclaiming from the parent instead of the dead memcg. > > > -- > > > 2.34.1 >