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 34E10C25B10 for ; Mon, 6 May 2024 19:50:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6D036B00A1; Mon, 6 May 2024 15:50:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A1D5A6B00A3; Mon, 6 May 2024 15:50:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86F6F6B00A4; Mon, 6 May 2024 15:50:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 69F106B00A1 for ; Mon, 6 May 2024 15:50:19 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E8A68A0737 for ; Mon, 6 May 2024 19:50:18 +0000 (UTC) X-FDA: 82089012516.12.CF6E522 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 85D37140007 for ; Mon, 6 May 2024 19:50:16 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Pb15iywg; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715025016; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=43neyGYicA9em02DzDluHTB7rZaBqEtPcJZfV5lNzv4=; b=X+zUel1Ka8g/UEMTamoPMwfeaz4/sNGg4ibVP416aJmx0zS3NvgCt0qaS079/8xmlxNmFe 6/wTwKp9/XzQ44ZHVwZzDRWtAzf3xAq1EdmnLF/LZzV6zCvh98Ngw0M++BC9q8mEeXlWgO LZ7rBxtN/kSVXdk3/3zkSRYvWrbPIhY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715025016; a=rsa-sha256; cv=none; b=dsPproecW6r9kPALxEMn4K9Sisvn+XcuMddYsSoFWmfmxDBqhecdeSCkvjY4F5SWwLV5ts j1eFG+4IWlF9DgeXqKrN/hlSwqGAEugPCBWBEqwrX3d2hx7LpgaIV9QlAKf05YlmyCgavT xqGu1kmgntX+DOVNeAegi57ViSaoSTM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Pb15iywg; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715025015; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=43neyGYicA9em02DzDluHTB7rZaBqEtPcJZfV5lNzv4=; b=Pb15iywgaiFDh8Ev5bCbacxL/Z4PHLJYeatmDo3IHwhVQTVLbwstZYmyfxHnUwGf/aTpgW NT2C/ApGV5vhOoGggHKrc2hjPrOGzHiIAKu+7z4PUiP3sggx9cyorCAFPAdXJ0QCJ5gbOI jwrnhQdBPKqNu8p9g7caLNmaA9OEn4U= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-140-beG-3Si9MiuuiXotgGCRkA-1; Mon, 06 May 2024 15:50:14 -0400 X-MC-Unique: beG-3Si9MiuuiXotgGCRkA-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-41f092f7275so5001565e9.3 for ; Mon, 06 May 2024 12:50:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715025013; x=1715629813; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=43neyGYicA9em02DzDluHTB7rZaBqEtPcJZfV5lNzv4=; b=U7AooJdJDBftaMomYEPSKv1HMG7s2FwQjqlDCB4ifMWC0XJZAtWU41Ji7LjTGJXDUz lfV7opmDqozy4yPx3xInGTlggpV7X26btdRS1rancpY9u9cZd5omPUieevFs6u5dviog Lecncctzn3ewDTK3XREBWOkM47NG6J6WLOcsIlVqpl8DSJwcSIoggqZ6FiBq1OcMpnmi sbR0kMlU52Z09jf+FNPmc64Tg9BIdX4SD82j/Poeeg56bA46KTnkQdp8WGqLpw8cXlrv r/Jw7LJOWhaz7NH2jq6LIduz65JX2O3y/oVD2gbTJ8Ho0etGAmLtZ4Az3Ml8V6X3DsQy oSGg== X-Forwarded-Encrypted: i=1; AJvYcCUCQqeGBALDpGXC1mtvIiUznFkPl4vkq7Rbhgd7imFW7qnWMUNTxKHaA0j/EJbt2EJn7uH3dkrG9o+hppK/HM5tAos= X-Gm-Message-State: AOJu0Yx3FY5iKNYqIZLw9ZCWA/9OBRTYKimr9KWK8tkGIHq92rgcYVFP oM3+8zPX18IMh1O2ZClzm4CzX70bfDZM+yOyxoKX6J2uCSWluqKiaos7W2x6Uz0E7Em1Tif3i95 kWVDjOEEW4iEUMH6CoARe3LSb9aEny87sGg7YmOMPPDVAO2jk X-Received: by 2002:a05:600c:1e0b:b0:41a:f936:5326 with SMTP id ay11-20020a05600c1e0b00b0041af9365326mr9691244wmb.15.1715025013215; Mon, 06 May 2024 12:50:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENNtNGUdZTGJY68HgN3RKZQR6LLY8lKJI77l/pO1a3Q0O4OYmrLWSXO0gjFG9wVxBPfKqt1w== X-Received: by 2002:a05:600c:1e0b:b0:41a:f936:5326 with SMTP id ay11-20020a05600c1e0b00b0041af9365326mr9691228wmb.15.1715025012753; Mon, 06 May 2024 12:50:12 -0700 (PDT) Received: from [192.168.3.108] (p5b0c6c2e.dip0.t-ipconnect.de. [91.12.108.46]) by smtp.gmail.com with ESMTPSA id gb30-20020a056000459e00b0034e0346317dsm11349632wrb.13.2024.05.06.12.50.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 06 May 2024 12:50:12 -0700 (PDT) Message-ID: Date: Mon, 6 May 2024 21:50:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] mm: do not update memcg stats for NR_{FILE/SHMEM}_PMDMAPPED To: Yosry Ahmed , Andrew Morton Cc: Shakeel Butt , 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 References: <20240506192924.271999-1-yosryahmed@google.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240506192924.271999-1-yosryahmed@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 85D37140007 X-Stat-Signature: tdnrkukxm58ti73gihmeeufya39swxih X-Rspam-User: X-HE-Tag: 1715025016-772454 X-HE-Meta: U2FsdGVkX18pRaUEUs54JvfYSf8XtLVnkQVwgoNinVNv8R3snTbGFyYaRTELdgmUUug/AF84XAD7sYaFLjtouwh8vWRaaYWOV4/TVST6uFAwoh/zoDC0LRfy0KSQYKP8AgcrkeaqWTv2SiQVAsBurJPNAHjm6sccgFTtFZudkHfzSW3Patg0gKt4YCZ4x5lttPgCIoTTSN0fwxurD1uczrHRN7m2mdLEqh0PeD97ZVj3c37wtVuP1vbZkCBK1VI67fDRN+fDxcbl2ublJAy4N3NsWiWZT+wJNlXG3dOq6A9VCEHsquX8NVezxRGH4B55qdpp5LYcR/B3UkyteRjAvdg3w+jb5jAC7QTvai8sM2i0Idc2LLkEmMdQxcqx1GAeoQrFHCjg5PKO9xUQ1Of5kp9YEknSCf07CswcW2dTJHQRkh961jHOylfxfyInUJTXY2dN6UMzFSR9vmDkYGFrLkdnjSaic4mom1/vU6fk984ElbMHXtcdh/IsayooQXGlSHh8n3KJO/U3G062LpRYpd9vkNePTKmKMIB7R0IkjIhvtRHG8pI/ymKRkhIVRiHcgzagv7eSe9+D6o98DeV2aVeBKH1+L4hiG3dYyJsVJjyCOnzgbRvdEz6FCYbPlfovzHe6i7D7NDW14M4WRNu6SvFBb3+z90/2zf21xccEIapUKBSwxW+17cqhKkua4Suw7YnhmXXY5QZXRtlHuC9uB5YXQWNfkOageiuVfb2ygZzqCkgA6jl4v36+ALsm+LKyovM5ghIiCoyjU7QFkjwVBdtWpVcJGV5tyV0Qa6cXScVXQUOq1qhTi1HTeXlssIG3ap9CKJpkEhnMvOgPSmO98t8WHyCX4V/MCDFSexy6TPy1FVhhE/Y4531c7SHw5wac4F5txaJhn+oGborKIQygYtJt0oJbTgDb1o57erI3dcFDCLozQKK8y/G3c4vM16BDejTd9dkVVngSpc6yVDA AGv50Z6z Sc7UzgNxrEkv9zAnRTbttz2fBere+rCS7Xwa6W2Iu3NKJT14hPY7TWmTags9tzZXdiqKv6BNSyOv6MYH9/2+9dPU06hwmtuyYJNwba6KCKgGi3a8MfyCLw5ZIUdkp6At5fJq7tz9XCQ0SVH+HTVVGv49Wgm3JC0Xwy+7m0BSFQnaCRS+Hhw3Z9NPJSjNUWUJMXJhPb2OhdDAqkopSjsuy6KLykyX6pFWrRCBFM6OAVPgusyajRWIHA6NR2xJ6bOqfXt5dHvBoe3pZn50xIbhnHwQAIoyageH50aJw/53cQJyJoqv431Gj9quKLMsQ5Wh4CaiyqbzvSSYPSex1Z4TT2xY6hZYgHsfofzJfJ9GVNfXApsk/HdWO8YaUiT0UIJdqBnwQYX7f838nP6VnRTFMZmwKO6y5xblwM/YmT2DRXgH0tYEIYsUY1uOGZTz+YpQzPct1Ma55t5DvlyrgioiO0Py44op/WRduCoWwRzdauWJwvDgmr+6SIj3zs2EpFFPkkrUAdS/+gvj/c6/XUMkWgWyPA9EOgUQkovW7LI5u0nlyMJWlUi6LSpk444mke4w9DmuV2Kgg/sd7FGCv4staKU27OS2RupMwbnl87PGtlyTZnTlFxgDZg/IzHOLhWPOmFOLQ7j9WamgM4TtQd7JILtPLYFEf+DZzzy/zMLQ3hCvcsKWKndcTGAh5t9A8+/nlf6P5JjizRSti3AmqKWyk34bO3Dim1GzhuglwqbAHVKXpECM/PRZpPWKSa+MUYincWiKhzol2NZ2BWOZifIpeo7TIdZtHm4w3/aJM 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 06.05.24 21:29, Yosry Ahmed wrote: > Previously, all NR_VM_EVENT_ITEMS stats were maintained per-memcg, > although some of those fields are not exposed anywhere. Commit > 14e0f6c957e39 ("memcg: reduce memory for the lruvec and memcg stats") > changed this such that we only maintain the stats we actually expose > per-memcg via a translation table. > > Additionally, commit 514462bbe927b ("memcg: warn for unexpected events > and stats") added a warning if a per-memcg stat update is attempted for > a stat that is not in the translation table. The warning started firing > for the NR_{FILE/SHMEM}_PMDMAPPED stat updates in the rmap code. These > stats are not maintained per-memcg, and hence are not in the translation > table. > > Do not use __lruvec_stat_mod_folio() when updating NR_FILE_PMDMAPPED and > NR_SHMEM_PMDMAPPED. 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 > Fixes: 514462bbe927 ("memcg: warn for unexpected events and stats") > Acked-by: Shakeel Butt > Signed-off-by: Yosry Ahmed > --- > mm/rmap.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/mm/rmap.c b/mm/rmap.c > index 12be4241474ab..ed7f820369864 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_pgdat(folio) should fit here easily. :) But I would actually suggest something like the following in mm/rmap.c static void __folio_mod_node_file_state(folio, int nr_pages) { enum node_stat_item idx = NR_FILE_PMDMAPPED; if (folio_test_swapbacked(folio)) idx = NR_SHMEM_PMDMAPPED; __mod_node_page_state(folio_pgdat(folio), idx, nr_pages); } And then simply calling here __folio_mod_node_file_state(folio, -nr_pmdmapped); And likewise in __folio_add_file_rmap() ... will be cleaner. In any case Acked-by: David Hildenbrand -- Cheers, David / dhildenb