Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <b8b96ee0-1e1e-85f8-df97-c82a11d7cd14@google.com>
In-Reply-To: <b8b96ee0-1e1e-85f8-df97-c82a11d7cd14@google.com>
From:   Shakeel Butt <shakeelb@google.com>
Date:   Sun, 4 Dec 2022 21:03:54 -0800
Message-ID: <CALvZod6Np0uqpSCVL-x=pS7uq6FDVUfBstTZE3fYwK4=WvfdFQ@mail.gmail.com>
Subject: Re: [PATCH] mm: memcg: fix swapcached stat accounting
To:     Hugh Dickins <hughd@google.com>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Michal Hocko <mhocko@suse.com>,
        Roman Gushchin <roman.gushchin@linux.dev>,
        Johannes Weiner <hannes@cmpxchg.org>,
        Yu Zhao <yuzhao@google.com>, linux-kernel@vger.kernel.org,
        linux-mm@kvack.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Sun, Dec 4, 2022 at 5:01 PM Hugh Dickins <hughd@google.com> wrote:
>
> I'd been worried by high "swapcached" counts in memcg OOM reports,
> thought we had a problem freeing swapcache, but it was just the
> accounting that was wrong.
>
> Two issues:
>
> 1. When __remove_mapping() removes swapcache, __delete_from_swap_cache()
> relies on memcg_data for the right counts to be updated; but that had
> already been reset by mem_cgroup_swapout().  Swap those calls around -
> mem_cgroup_swapout() does not require the swapcached flag to be set.
>
> 6.1 commit ac35a4902374 ("mm: multi-gen LRU: minimal implementation")
> already made a similar swap for workingset_eviction(), but not for this.
>
> 2. memcg's "swapcached" count was added for memcg v2 stats, but displayed
> on OOM even for memcg v1: so mem_cgroup_move_account() ought to move it.
>
> Fixes: b6038942480e ("mm: memcg: add swapcache stat for memcg v2")
> Signed-off-by: Hugh Dickins <hughd@google.com>

Acked-by: Shakeel Butt <shakeelb@google.com>