From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 773C4C4321E for ; Mon, 5 Dec 2022 05:04:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A2EEE8E0002; Mon, 5 Dec 2022 00:04:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9DF9B8E0001; Mon, 5 Dec 2022 00:04:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8A72F8E0002; Mon, 5 Dec 2022 00:04:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7C0B98E0001 for ; Mon, 5 Dec 2022 00:04:07 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4B27A404D2 for ; Mon, 5 Dec 2022 05:04:07 +0000 (UTC) X-FDA: 80207060934.13.0E23E2B Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) by imf07.hostedemail.com (Postfix) with ESMTP id E1BAD40014 for ; Mon, 5 Dec 2022 05:04:06 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=HZsN7G7Y; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of shakeelb@google.com designates 209.85.128.170 as permitted sender) smtp.mailfrom=shakeelb@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670216646; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CDW880diX7mHRZdhC0FMBpf8ZaAd6FKghQ3113HgW4I=; b=TJdFrF3QUvBhBNA5tg3ombwhRAb9f+St5A2hHwtjk9I5sJNDEKhifcP0+Zc7LrTit6gRGt yWNXzGzwMwZgYWBUcTC5+AHiL3KHWHBnknhO4DdMxv8CVsZvkdM5lZ8ONO3WK/05wZ2hJC dGPy/AozYYFOt/H9uLE4m66saK8wSfY= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=HZsN7G7Y; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of shakeelb@google.com designates 209.85.128.170 as permitted sender) smtp.mailfrom=shakeelb@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670216646; a=rsa-sha256; cv=none; b=asinq/UEiS/8c+e15obIGD0lxEWuzg6FWAR9heGVUr3ysji5w9/xZgxrSYdt5PKlcRoLEK yKHvytyZtcp5roL73TGnWvP+T3qTMScMgiIfdraKGYaGGm7kLXFjCx+iyuWniXrs5uD00v DL/OgCoqkuEXqr02LtVxoIiWrQfQVFQ= Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-381662c78a9so106665017b3.7 for ; Sun, 04 Dec 2022 21:04:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=CDW880diX7mHRZdhC0FMBpf8ZaAd6FKghQ3113HgW4I=; b=HZsN7G7YvTSC26S5K6Yc3T/p6JpRuK7WTPsGnqOVEkU67s3G9u58fjA0Ju52+XQPee 0wtlIqpD29Jb5oMkjmUw7r4PTbkUHz0zGYsrBrbebm1Hnznf6dpL/Wu2aZoUxTnZfUE5 YOpz+AK/fiqDRVlAul2Qw4w2J3vh+q7jYnVI7OSGxj2q5cGMAFfrmn5OoaYaqkee77me JsLJnN8tX0ZfqKRhGfrd7+3h7IZ/SeUaNkNBsd8iq6UU0LGqo511zTMNjDAq5Fsg+Llq ASQxILTct11B2nBufTkQkHPC1tKLpaY1u4/oFFv94244gH2c5babP+gj7eeuna705F5/ TWiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CDW880diX7mHRZdhC0FMBpf8ZaAd6FKghQ3113HgW4I=; b=bDgoywD918rY3nS6hBqeSB4CRe2aHY1Q9dYfE72oKMXf3OWd7GEJMGb6MAgF772tNV 72md7G3Tc8p/yyz4SXvm8jJ64pGCXX3MpCMu5gsAADm0XT9m7UQ5FsYBdbirr0dFRcOD Ei4tgB5Ib/YleZI1pvOQ1QGqtoO7XHf76qk3K89RujSLlbe6z1qTle7Wz1hD/efl2KVo PEcf9hZMg2xdsAgDiP5Iwaf+4mYlw2HULdD/DPKd3+hm+Bqm5RTH4whidTOy4PPzKuP+ 8sUkz2Wd9odK5gBNssQqERSNpYfvrfcuEw8BEhHM1HdDEqG/hGQSa1+Xken8HxTmmTAW CZ/w== X-Gm-Message-State: ANoB5pmCwar66+VRxxzQrpDMKGiJFiJ4A/muVtuwolE4sgr4P5c/+iFI y6kr+IPNoFF85c81ZNVcI3KK0/xia0dlWBZdSC0pdw== X-Google-Smtp-Source: AA0mqf5XyktmFCkM1RUHPDrxXx11hDtfGD9Cpd/rThn1uHWbRRKsqVnJdRq+WlWAOPBHJxXnEHDHzLJxZH9FOxhKRJw= X-Received: by 2002:a0d:d5ce:0:b0:3ba:29f1:1ddc with SMTP id x197-20020a0dd5ce000000b003ba29f11ddcmr42585153ywd.311.1670216645962; Sun, 04 Dec 2022 21:04:05 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Shakeel Butt Date: Sun, 4 Dec 2022 21:03:54 -0800 Message-ID: Subject: Re: [PATCH] mm: memcg: fix swapcached stat accounting To: Hugh Dickins Cc: Andrew Morton , Michal Hocko , Roman Gushchin , Johannes Weiner , Yu Zhao , linux-kernel@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [3.10 / 9.00]; SORBS_IRL_BL(3.00)[209.85.128.170:from]; BAD_REP_POLICIES(0.10)[]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; BAYES_HAM(-0.00)[41.01%]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; DMARC_POLICY_ALLOW(0.00)[google.com,reject]; RCPT_COUNT_SEVEN(0.00)[8]; DKIM_TRACE(0.00)[google.com:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; R_DKIM_ALLOW(0.00)[google.com:s=20210112]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: E1BAD40014 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 4sdh9rdwt7ynhqs8dffp4mmkeikksh8e X-HE-Tag: 1670216646-385908 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Sun, Dec 4, 2022 at 5:01 PM Hugh Dickins 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 Acked-by: Shakeel Butt