On Thu, Jun 1, 2023 at 1:25 PM Yosry Ahmed <yosryahmed@xxxxxxxxxx> wrote: > > On Thu, Jun 1, 2023 at 1:20 PM Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > > > > > The patch titled > > Subject: zswap-do-not-shrink-if-cgroup-may-not-zswap-fix > > has been added to the -mm mm-hotfixes-unstable branch. Its filename is > > zswap-do-not-shrink-if-cgroup-may-not-zswap-fix.patch > > > > This patch will shortly appear at > > https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/zswap-do-not-shrink-if-cgroup-may-not-zswap-fix.patch > > > > This patch will later appear in the mm-hotfixes-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-do-not-shrink-if-cgroup-may-not-zswap-fix > > Date: Thu Jun 1 01:17:06 PM PDT 2023 > > > > fix return of unintialized value > > > > Reported-by: kernel test robot <lkp@xxxxxxxxx> > > Closes: https://lore.kernel.org/oe-kbuild-all/202306011435.2BxsHFUE-lkp@xxxxxxxxx/ > > Cc: Dan Streetman <ddstreet@xxxxxxxx> > > Cc: Domenico Cerasuolo <cerasuolodomenico@xxxxxxxxx> > > Cc: Johannes Weiner <hannes@xxxxxxxxxxx> > > Cc: Nhat Pham <nphamcs@xxxxxxxxx> > > Cc: Seth Jennings <sjenning@xxxxxxxxxx> > > Cc: Vitaly Wool <vitaly.wool@xxxxxxxxxxxx> > > Cc: Yosry Ahmed <yosryahmed@xxxxxxxxxx> > > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > > --- > > > > mm/zswap.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > --- a/mm/zswap.c~zswap-do-not-shrink-if-cgroup-may-not-zswap-fix > > +++ a/mm/zswap.c > > @@ -1180,8 +1180,10 @@ static int zswap_frontswap_store(unsigne > > * local cgroup limits. > > */ > > objcg = get_obj_cgroup_from_page(page); > > - if (objcg && !obj_cgroup_may_zswap(objcg)) > > + if (objcg && !obj_cgroup_may_zswap(objcg)) { > > + ret = -ENOSPC; > > Hey Andrew, > > I thought we agreed this should be -ENOMEM (as in Nathan's patch). Am > I missing something? Oh I just realized what happened. You got a separate report about this, independent from Nathan's patch. Here is the patch I am referring to: https://lore.kernel.org/llvm/20230601-zswap-cgroup-wsometimes-uninitialized-v2-1-84912684ac35@xxxxxxxxxx/ > > > > goto reject; > > + } > > > > /* reclaim space if needed */ > > if (zswap_is_full()) { > > _ > > > > Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are > > > > zswap-do-not-shrink-if-cgroup-may-not-zswap-fix.patch > > mm-compaction-optimize-compact_memory-to-comply-with-the-admin-guide-fix.patch > > mm-page_owner-add-page_owner_stacks-file-to-print-out-only-stacks-and-their-counte-fix.patch > > mm-page_owner-add-page_owner_stacks-file-to-print-out-only-stacks-and-their-counte-fix-fix.patch > > mmpage_owner-filter-out-stacks-by-a-threshold-counter-fix.patch > > mm-mlock-rename-mlock_future_check-to-mlock_future_ok.patch > > mm-zswap-multiple-zpools-support-fix.patch > > fork-optimize-memcg_charge_kernel_stack-a-bit-fix.patch > > squashfs-cache-partial-compressed-blocks-fix.patch > > squashfs-cache-partial-compressed-blocks-fix-3-fix.patch > > init-add-bdev-fs-printk-if-mount_block_root-failed-fix.patch > > kexec-add-helper-__crash_shrink_memory-fix.patch > >
