]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
mm/swap: fix swap cache memcg accounting
authorAlexandre Ghiti <alex@ghiti.fr>
Fri, 20 Mar 2026 05:05:59 +0000 (06:05 +0100)
committerAndrew Morton <akpm@linux-foundation.org>
Sat, 28 Mar 2026 03:48:37 +0000 (20:48 -0700)
commit9e0d0ddfbc0e3491da7e2db73faa08d8d4f322b2
tree5f4c11b634ccb9e518bdc5e0d3794dbbfeeb2a2a
parent26d3dca201f3662e51d25022cfce0f642a150a90
mm/swap: fix swap cache memcg accounting

The swap readahead path was recently refactored and while doing this, the
order between the charging of the folio in the memcg and the addition of
the folio in the swap cache was inverted.

Since the accounting of the folio is done while adding the folio to the
swap cache and the folio is not charged in the memcg yet, the accounting
is then done at the node level, which is wrong.

Fix this by charging the folio in the memcg before adding it to the swap cache.

Link: https://lkml.kernel.org/r/20260320050601.1833108-1-alex@ghiti.fr
Fixes: 2732acda82c9 ("mm, swap: use swap cache as the swap in synchronize layer")
Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
Acked-by: Kairui Song <kasong@tencent.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Nhat Pham <nphamcs@gmail.com>
Acked-by: Chris Li <chrisl@kernel.org>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Baoquan He <bhe@redhat.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Kemeng Shi <shikemeng@huaweicloud.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/swap_state.c