The patch titled
Subject: mm-zswap-add-zswap_never_enabled-fix
has been added to the -mm mm-unstable branch. Its filename is
mm-zswap-add-zswap_never_enabled-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-zswap-add-zswap_never_enabled-fix.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Subject: mm-zswap-add-zswap_never_enabled-fix
Date: Tue, 11 Jun 2024 23:37:52 +0000
Expose zswap_never_enabled() in the header for the swapin work to use
it later.
Link: https://lkml.kernel.org/r/Zmjf0Dr8s9xSW41X@xxxxxxxxxx
Signed-off-by: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Cc: Barry Song <baohua@xxxxxxxxxx>
Cc: Chengming Zhou <chengming.zhou@xxxxxxxxx>
Cc: Chris Li <chrisl@xxxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Cc: Nhat Pham <nphamcs@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/zswap.h | 6 ++++++
mm/zswap.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
--- a/include/linux/zswap.h~mm-zswap-add-zswap_never_enabled-fix
+++ a/include/linux/zswap.h
@@ -36,6 +36,7 @@ void zswap_memcg_offline_cleanup(struct
void zswap_lruvec_state_init(struct lruvec *lruvec);
void zswap_folio_swapin(struct folio *folio);
bool zswap_is_enabled(void);
+bool zswap_never_enabled(void);
#else
struct zswap_lruvec_state {};
@@ -64,6 +65,11 @@ static inline bool zswap_is_enabled(void
{
return false;
}
+
+static inline bool zswap_never_enabled(void)
+{
+ return false;
+}
#endif
--- a/mm/zswap.c~mm-zswap-add-zswap_never_enabled-fix
+++ a/mm/zswap.c
@@ -137,7 +137,7 @@ bool zswap_is_enabled(void)
return zswap_enabled;
}
-static bool zswap_never_enabled(void)
+bool zswap_never_enabled(void)
{
return !static_branch_maybe(CONFIG_ZSWAP_DEFAULT_ON, &zswap_ever_enabled);
}
_
Patches currently in -mm which might be from yosryahmed@xxxxxxxxxx are
mm-zswap-use-sg_set_folio-in-zswap_compress-decompress.patch
mm-zswap-use-kmap_local_folio-in-zswap_load.patch
mm-zswap-make-same_filled-functions-folio-friendly.patch
mm-rmap-abstract-updating-per-node-and-per-memcg-stats.patch
mm-swap-remove-synchronous-argument-to-swap_read_folio.patch
mm-zswap-rename-is_zswap_enabled-to-zswap_is_enabled.patch
mm-zswap-add-zswap_never_enabled.patch
mm-zswap-add-zswap_never_enabled-fix.patch
mm-zswap-handle-incorrect-attempts-to-load-large-folios.patch
