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 8D599C25B5C for ; Mon, 6 May 2024 19:25:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15C556B00A0; Mon, 6 May 2024 15:25:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10CA16B00A1; Mon, 6 May 2024 15:25:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F3DDF6B00A2; Mon, 6 May 2024 15:25:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D615D6B00A0 for ; Mon, 6 May 2024 15:25:25 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 927F81C1219 for ; Mon, 6 May 2024 19:25:25 +0000 (UTC) X-FDA: 82088949810.03.E577CB0 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) by imf23.hostedemail.com (Postfix) with ESMTP id 98E9114001D for ; Mon, 6 May 2024 19:25:23 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=T9cbPrAc; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf23.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715023524; 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=gxbtAlVeF1/sUOU5uEW9t+ZyL4fh7ysXOylZq3pXva4=; b=M8i7GZ8gkLAqro3+fpUVwmUGJJpJbj8fRJ6nh6jyeg29depnYy6+iYetZVZlY/yp9kTN4Q uGaoUqo7ac5HfhvHvRtf8GRMUvd3OuvyaIENmo0PkQyYN1010pUW/93DB1/7XYtvWgA2a8 XV692Aj74aYNDdj/4GlCoi6RSqaMYcE= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=T9cbPrAc; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf23.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715023524; a=rsa-sha256; cv=none; b=jABsBDGEaU0zlimGlrGaJa/HuqBzf6HSKPxR7lwgmBtQODO4enKyz4A/Cmg2GdliyIZqLa JcSou5EWRgLV0QFV7IEA5aGqGdTv4NYbFvHPdNm0mufRDURA9jdpSnY8U3xdSHjyTUc4b2 zwuqzy0H6W55oMKf8V4jLsI1ibQ941o= Date: Mon, 6 May 2024 12:25:15 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1715023521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=gxbtAlVeF1/sUOU5uEW9t+ZyL4fh7ysXOylZq3pXva4=; b=T9cbPrAcYBtaXsosnsqLQXaQuAZ+LPyXYpdVTa780mNBy7ZSsC/zltH2S8h0boDI8LfmXy sYcDHXn7NMzZ/dlEFAT3/vWtFvdyybg5Lm7dAwyNVsC+0AncWVvtNaY/QUEVU4t9kiA8TM QIlxXVrydo0sNa2WAvWZF0Z6pIfVM0M= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Shakeel Butt To: Yosry Ahmed Cc: Andrew Morton , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, syzbot+9319a4268a640e26b72b@syzkaller.appspotmail.com Subject: Re: [PATCH] mm: do not update memcg stats for NR_{FILE/SHMEM}_PMDMAPPED Message-ID: References: <20240506170024.202111-1-yosryahmed@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240506170024.202111-1-yosryahmed@google.com> X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam01 X-Stat-Signature: num5j4ubwagsanhy8fimmrymhua14kkq X-Rspam-User: X-Rspamd-Queue-Id: 98E9114001D X-HE-Tag: 1715023523-159504 X-HE-Meta: U2FsdGVkX1/B438NVTpMTDfX7BTPBww0BXerW8ib66p9rxgE7ZMoDI15CKk6a0KkjphBcttaFGr6OFtuk14PwJmdiV3yMNUB7eJ9Ywiq4FZY+JI8/Vi4WtsCuY6V424e9ui+fmuNIqZ5pXr2zcY6z1+htHw3SFWoYUOuSWNk4EPsWYPk4QRGTxx1uMSJPWFYEHAEL88s/tXgtRnMidisXbz5SicP1ksotVmGDA/YAnRMo6yYF+jUjJdRpgFUbcFTVPmd11GvPQM1XDmm3nKLLRLkyvZ/+sp+Tkh6sNkurdLpI3p6KNTuGPcm8UoTAVuPDIHW50NK/7jZ26RsjKmfHO1qLX8rLSGx/+9Eew8hQ90t3BUHR638ehvaqxaFJ2fQpyjoQtOXCd4M6yBHUIlTlI9YmXQIy++Ei0bbfTwjfr7X+olJmGyYJt+ymUweezRps8wbJY4XT+S+oJ99FGvt/543JZUGiUA53nOseaaFQWcYmTPA9MEhrV9NnPkwHk9sRgm5qFG7AeL22X9gCyoKZuERKZT7KTqCR3hHlnEgARDOkq6JVCHmICZY6JqMO1Hw+daz602lzJWaKadrDuES81s666kQY4PbK8I9K+40m02dwvSjDofzcrNPCpCoazRCxr8YmhJ5hD8mGNwqrcm1/WJDp7TvQOh2zH96hMyd3Q9S2rD/Hts0umaKeYk/v+qdpjt4N0PxktwVaYkU6yAHlRiFZSzmjAT9KIunZ4ydtW9wYuIMMejbx0OqM/dWcPW1O13voyxe+8C6eP0POzEBRHo1bnWE0fVwj6eyTZvx0mkx2oF5KyDJK46XD33L+ZZaXn14NzIE2GTCtn6Xf8ObMklGw51gklYRy6n5/O6NBdgm1KxJn/6ZuG3ea8pmkF4GEY0cdsUZdtVcgAbhtPfgbqBGrNHVa79bplR49E2SJqu4mT7bkHlVPxTeWlo27WG3mRiV4/CO0p2Zln99001 fCOKjq8o yeEuRNZwoKNnJ8xcaYWfdO/XcMh/jib8F4zhc8Kagv4sFG3cHCp7yhYahY+UNqDbGgi3XmoNQaTMKh1b9li8UwBaMkxvBMUwNJJTTzDZSGsCLYW57Fm1pSUhNfMt8QQAc2NwqGhNfsuUFvfHGWrsodFktL/Qly8hsoE4C2XSHKDA41HnniRQZdHhsKKCROCX5aoR/iwk4Y1+0Qk31L3Yp2Y1vVtR4caqk+5OucGqJdzR3K5W/6/tRFDVjX1YFm+17a9K8SwDdEFF8w45ZbqgY9IpNeoTub8xjUtk75ClhGsnmp1x29nbxdnHZNPTEpQyrVDcSpDNhsb+KFTOfgXNBbjdVXml+B1f3dJ3fIrJyqNztxCk= 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: List-Subscribe: List-Unsubscribe: On Mon, May 06, 2024 at 05:00:24PM +0000, Yosry Ahmed wrote: > Do not use __lruvec_stat_mod_folio() when updating NR_FILE_PMDMAPPED and > NR_SHMEM_PMDMAPPED as these stats are not maintained per-memcg. Use > __mod_node_page_state() instead, which updates the global per-node stats > only. > > Reported-by: syzbot+9319a4268a640e26b72b@syzkaller.appspotmail.com > Closes: https://lore.kernel.org/lkml/0000000000001b9d500617c8b23c@google.com > Signed-off-by: Yosry Ahmed I think we can put Fixes either for 443c077dc2ec ("memcg: cleanup __mod_memcg_lruvec_state") or ad86c0f0e089 ("memcg: warn for unexpected events and stats"). > --- > mm/rmap.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/mm/rmap.c b/mm/rmap.c > index 12be4241474ab..c2cfb750d2535 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -1435,13 +1435,14 @@ static __always_inline void __folio_add_file_rmap(struct folio *folio, > struct page *page, int nr_pages, struct vm_area_struct *vma, > enum rmap_level level) > { > + pg_data_t *pgdat = folio_pgdat(folio); > int nr, nr_pmdmapped = 0; > > VM_WARN_ON_FOLIO(folio_test_anon(folio), folio); > > nr = __folio_add_rmap(folio, page, nr_pages, level, &nr_pmdmapped); > if (nr_pmdmapped) > - __lruvec_stat_mod_folio(folio, folio_test_swapbacked(folio) ? > + __mod_node_page_state(pgdat, folio_test_swapbacked(folio) ? > NR_SHMEM_PMDMAPPED : NR_FILE_PMDMAPPED, nr_pmdmapped); > if (nr) > __lruvec_stat_mod_folio(folio, NR_FILE_MAPPED, nr); > @@ -1493,6 +1494,7 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, > enum rmap_level level) > { > atomic_t *mapped = &folio->_nr_pages_mapped; > + pg_data_t *pgdat = folio_pgdat(folio); > int last, nr = 0, nr_pmdmapped = 0; > bool partially_mapped = false; > enum node_stat_item idx; > @@ -1540,13 +1542,14 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, > } > > if (nr_pmdmapped) { > + /* NR_{FILE/SHMEM}_PMDMAPPED are not maintained per-memcg */ > if (folio_test_anon(folio)) > - idx = NR_ANON_THPS; > - else if (folio_test_swapbacked(folio)) > - idx = NR_SHMEM_PMDMAPPED; > + __lruvec_stat_mod_folio(folio, NR_ANON_THPS, -nr_pmdmapped); > else > - idx = NR_FILE_PMDMAPPED; > - __lruvec_stat_mod_folio(folio, idx, -nr_pmdmapped); > + __mod_node_page_state(pgdat, > + folio_test_swapbacked(folio) ? > + NR_SHMEM_PMDMAPPED : NR_FILE_PMDMAPPED, > + nr_pmdmapped); After the above fixed, you can add: Acked-by: Shakeel Butt