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 B4BC4C27C53 for ; Wed, 12 Jun 2024 06:53:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 082026B0157; Wed, 12 Jun 2024 02:53:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 032266B0158; Wed, 12 Jun 2024 02:53:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E14D26B0159; Wed, 12 Jun 2024 02:53:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C37746B0157 for ; Wed, 12 Jun 2024 02:53:18 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BB4ED1A1237 for ; Wed, 12 Jun 2024 06:53:17 +0000 (UTC) X-FDA: 82221320034.07.3B40151 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by imf01.hostedemail.com (Postfix) with ESMTP id E51E940010 for ; Wed, 12 Jun 2024 06:53:15 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=WBXGbnfX; spf=pass (imf01.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.45 as permitted sender) smtp.mailfrom=yosryahmed@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718175196; 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=dmnYbKCYy71ljFO/mUSsSDpLkrZDTOZpbwT5Mhb2Clg=; b=U9v93hFlx+nUIJA03Mog8yTvAsYUeGsXquXB32v67i9q85GjiddYlMp4HxP5AYb4BEHHab IWeyirDnOhF9rnNpEjJIpvV8m9tKsDi+VjUgZDizvn9zehhSVe2Oj+B53ccABbcjvmEvUc NyqD6pGtY/5OGwryudXiMa889IL2ANg= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=WBXGbnfX; spf=pass (imf01.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.45 as permitted sender) smtp.mailfrom=yosryahmed@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718175196; a=rsa-sha256; cv=none; b=4dgc8PvM6Ru4tcydHxweuiUWVfywrbeGmbeQVTfTq09RzDcgIAXTXFzWsDQ7FbuJ3C/Y45 u7BO1Rj1Qe/T59lUb9NNSEWAFRwmyZiQICC0tsoK+Trlf7ge7BDgkDno9vsJ2Q7/oDEYLB wA9feBXGOzhXhUsxS/NnyYJO16S7kRQ= Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a6ef8e62935so244606966b.3 for ; Tue, 11 Jun 2024 23:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718175194; x=1718779994; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=dmnYbKCYy71ljFO/mUSsSDpLkrZDTOZpbwT5Mhb2Clg=; b=WBXGbnfXEMj0eeHAzweW5WvEgiHH5W5VNhL6tQIPTJrC9jI8AoakYqR30C19mdL/IV ERekq1QyIPZjfLxJlvwDQ3uR9zaxhSFVG9dWgANIJjbj0N7pPLA692pGWhAPYDZWRUK1 OVue+fzHU/wuEXxnb+k/sltswHbKaIe8xqntliIe5ZKEzZt9kRZV3BU0PRJtWX5D1x60 F7AZQfk9yih8qYutBvsGkqAl2NYZ6hyKMaC9Jo6e9zZ62rETx4SVjNLvMAIQhIk7tdBS bFtQfMePqb/e6WuBy6Vu62/N2jeRbzTxEdYLzlS4s1UY2irv7q8JQIUjPiEYKQTlogua 3UFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718175194; x=1718779994; h=content-transfer-encoding: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=dmnYbKCYy71ljFO/mUSsSDpLkrZDTOZpbwT5Mhb2Clg=; b=JXBiG99n4W7CU2Ak5NxNF5XSA6EvH12Uoe/9R3poXMEwT9E0tCUNICJ4RphT98rP26 oMs8aEl3cBG7TJzNJIph/AkMSTpxSBoiwcjOKGvNu8hJjcx5bjwtLCVArC/TNnR4Heaj aSOFctd3KT8gYfYsrWIxb4+FqOR65LjcMTdGYq6rz/gie+BHQEh2ndHLFIs4Aat1kKO9 t8jQWe68g3lc6gTW20RxLw7nZ4E7QfgZajzhe+BQCArZWc/66hqEdUps2yRQBuy7y1Vo 5qTV/ERDBD/vmivC5V3X6HqJYkdfc0YXXv21R9WCro2Ara3OZcb7sYJzHphm9s2ASBIk F5yw== X-Forwarded-Encrypted: i=1; AJvYcCVJ+jDw6a757AyW/h20kjN6MBZfpcIWW2KOjXBmPaS4wZZfi2XG9hQeulXbrjyoDwJxiKKllb4YIVEwjehi6dDVHbQ= X-Gm-Message-State: AOJu0YweKxzqh6IdtvtK8uj5xV4GpTRcbHGJ3EmJJnyaKSSc7pylNFSu lrn53XZzTnmxMJZ13N45uH+R5QlABIZXGkaCXrrYjhbAst9aGTPCRLWAtsXSen8/1AFMCUnvcwz W8pyew1Woqsz9u0/ddZJMizpZ+Ih+/Ut11atRAw3C3BddGO7MjbLS8ZrnNA== X-Google-Smtp-Source: AGHT+IEPNM7hqNNuA4wqNEKCQ1azATv5uLGXKGCah993/BTMvOLHlOw2ruKIWAHxB1JAYdurYPKY+L5QptThob//SA4= X-Received: by 2002:a17:906:7c06:b0:a6e:f6b0:c4a9 with SMTP id a640c23a62f3a-a6f47d4ec35mr77459166b.9.1718175193964; Tue, 11 Jun 2024 23:53:13 -0700 (PDT) MIME-Version: 1.0 References: <49914517-dfc7-e784-fde0-0e08fafbecc2@google.com> In-Reply-To: <49914517-dfc7-e784-fde0-0e08fafbecc2@google.com> From: Yosry Ahmed Date: Tue, 11 Jun 2024 23:52:37 -0700 Message-ID: Subject: Re: [PATCH unstable] mm: rmap: abstract updating per-node and per-memcg stats fix To: Hugh Dickins Cc: Andrew Morton , David Hildenbrand , linux-kernel@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: E51E940010 X-Stat-Signature: ns4noa79grimuq96jarhr95h1hwh9fgj X-HE-Tag: 1718175195-580397 X-HE-Meta: U2FsdGVkX19xhjIQpf/953LkAB08OqabPJ4Vri1aRAVxQJ9y4V8WHVB1EbmxP3tnVwzMLVmPqlndI8Ex3DoIn+lbOOhA3UhYK0h1ITHWE+JoFgHdwAXRy7aWFF45W0M7BY3mT0jGSbw0ETOYyH4XHG5fMz9jIPEAAAaXo5ecQFKnp/EwJp0ZA/fGVeZDVA0tfLLqE05U0Cwj7DVgQIgNwCFW016E0YTbwHR86NZSUVfSGolGsUsb9fsyx1BwOfT+ePhsy1t3pJjG2iADGPJHYVKy3K+5hTwBrO69MfTDNn5TKSALgko8bzjtuguLyFgGVfi8YQ8X2SSZGvPOaC6YZgOxROZvtU6hUeI3c+dCJKE83LMN+GSulq1CmIsBGvKqOka5eUZo43Ja8I44sDXirgkPEocum1ob3RzxQN2u8LReIcp1pHb2I9llwYxdVsNXuJMGj3y46hkTc5uqmXlSPUD1RK4q5Eb4cPB9KluwETQL+pwceRd0OP3avyNM/i+H0Y7PcEcNREqiVSLHLrZcSPEWl/r61jEuxS49WOcBgAM2c74GKHS9yBbWihZYS23Y19YPEgBcjEXgsHL+krmBdlm6KLBc2yNvwSiRYG0cPyVcaUajVIcdGFLAqCjM8NIf5GzVJ7KMoADFa5pHZ+6AGGvtPKbo3nk92w8BqVlShm4+WpZiuHA3Kxm4b4LWUfWCg4P0td9xaHrc+lGLklKSX5QaLHHBHPCxngp/wv6PYXdYXbaEBeuVMIpDFFMfzF8yOVbQ6XXnSTW76MrfQoitqrWQkgFAbTwz7IShPmsMo63E2s9nQFSAe8oiQeNnU1ww4tHMsiKSraU1CEEA+VkfI1e2XLMrPuJD12a7CUdHP42GxAdzRRC/hidXTdu6XuueALum+mN0sh0hAPwxL2mxs3bmf3eAxEvyCWNFVXp+4LgeDV3BH330OvxQNHA26tLbfO9rdknQqs8iCcqyMmX 6gCBTocX nDyzx1NLzMxjT8f0GIQ+ZOMW5Fkquo2LRMcsO030LEkLH+c9mFJcVsfNAtj5RXxgIchbpm33OGskOU/jIECpoXLNqDeICof4RrCR8KtDTHRaJnLbXaCRbzvVD6xH9QqmXcpzogTJLLwE2wAj7foU/Gg/xAnDyoLIMDK2g1+pKYLJH1w86NuARDmf4v1itbIUQEO0Eb6rik54s21mB97lxhChY0EFxA1att9IETNpKmEikF/E= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, 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 Tue, Jun 11, 2024 at 10:10=E2=80=AFPM Hugh Dickins wr= ote: > > /proc/meminfo is showing ridiculously large numbers on some lines: > __folio_remove_rmap()'s __folio_mod_stat() should be subtracting! > > Signed-off-by: Hugh Dickins Reviewed-by: Yosry Ahmed Thanks a lot for fixing this! I was just looking at a test failure report by the kernel robot caused by this [1]. Just to document my own stupidity here: 1. In [2], I sent a fix to use __mod_node_page_state() instead of __lruvec_stat_mod_folio() in __folio_remove_rmap(). I made the same mistake of replacing subtraction with addition. 2. In [3], I sent a v2 of that fix that kept the subtraction in __folio_remove_rmap() correctly. 3. In [4], I sent a cleanup on top of the fix, and that cleanup replaced the subtraction in __folio_remove_rmap() with an addition, again. Apparently, I just suck at subtraction :) [1]https://lore.kernel.org/linux-mm/202406121026.579593f2-oliver.sang@intel= .com/ [2]https://lore.kernel.org/lkml/20240506170024.202111-1-yosryahmed@google.c= om/ [3]https://lore.kernel.org/lkml/20240506192924.271999-1-yosryahmed@google.c= om/ [4]https://lore.kernel.org/lkml/20240506211333.346605-1-yosryahmed@google.c= om/ > --- > A fix for folding into mm-unstable, not needed for 6.10-rc. > > mm/rmap.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -1567,7 +1567,7 @@ static __always_inline void __folio_remove_rmap(str= uct folio *folio, > list_empty(&folio->_deferred_list)) > deferred_split_folio(folio); > } > - __folio_mod_stat(folio, nr, nr_pmdmapped); > + __folio_mod_stat(folio, -nr, -nr_pmdmapped); > > /* > * It would be tidy to reset folio_test_anon mapping when fully > -- > 2.35.3 >