The patch titled Subject: zswap-make-shrinking-memcg-aware-fix has been added to the -mm mm-unstable branch. Its filename is zswap-make-shrinking-memcg-aware-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/zswap-make-shrinking-memcg-aware-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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: zswap-make-shrinking-memcg-aware-fix Date: Wed Nov 29 01:50:40 PM PST 2023 temp build fixes Cc: Domenico Cerasuolo <cerasuolodomenico@xxxxxxxxx> Cc: Nhat Pham <nphamcs@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/memcontrol.h | 5 +++++ mm/zswap.c | 3 +++ 2 files changed, 8 insertions(+) --- a/include/linux/memcontrol.h~zswap-make-shrinking-memcg-aware-fix +++ a/include/linux/memcontrol.h @@ -1165,6 +1165,11 @@ unsigned long mem_cgroup_soft_limit_recl #define MEM_CGROUP_ID_SHIFT 0 +static inline struct mem_cgroup *obj_cgroup_memcg(struct obj_cgroup *objcg) +{ + return NULL; +} + static inline struct mem_cgroup *folio_memcg(struct folio *folio) { return NULL; --- a/mm/zswap.c~zswap-make-shrinking-memcg-aware-fix +++ a/mm/zswap.c @@ -32,6 +32,7 @@ #include <linux/mm_types.h> #include <linux/page-flags.h> #include <linux/swapops.h> +#include <linux/memcontrol.h> #include <linux/writeback.h> #include <linux/pagemap.h> #include <linux/workqueue.h> @@ -822,7 +823,9 @@ static void shrink_worker(struct work_st * Acquire an extra reference to the iterated memcg in case the * original reference is dropped by the zswap offlining callback. */ +#ifdef CONFIG_MEMCG css_get(&memcg->css); +#endif spin_unlock(&zswap_pools_lock); ret = shrink_memcg(memcg); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are maintainers-add-andrew-morton-for-lib.patch mm-memoryc-zap_pte_range-print-bad-swap-entry.patch mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix.patch mm-add-folio_zero_tail-and-use-it-in-ext4-fix.patch mm-add-folio_fill_tail-and-use-it-in-iomap-fix.patch zswap-make-shrinking-memcg-aware-fix.patch kernel-reboot-explicitly-notify-if-halt-occurred-instead-of-power-off-fix.patch