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 06C1AC4167B for ; Wed, 8 Nov 2023 17:38:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77B4C80023; Wed, 8 Nov 2023 12:38:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 72ACB8D0073; Wed, 8 Nov 2023 12:38:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5CB6380023; Wed, 8 Nov 2023 12:38:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4E7A78D0073 for ; Wed, 8 Nov 2023 12:38:51 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 13EFA1A0855 for ; Wed, 8 Nov 2023 17:38:51 +0000 (UTC) X-FDA: 81435497262.12.CB6A425 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id C1DBF1A001C for ; Wed, 8 Nov 2023 17:38:48 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Hd2iZXAa; spf=pass (imf19.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699465128; a=rsa-sha256; cv=none; b=CD7+v7h1WDJnLaAUI4MMEjpkTf78E129csxKwwgbqRNJvQSBO5Cp2DKkGQ/O0xmOYye3ba 6tVxcqcZ7MQCTt7xh84K+qZD3uYnGCGllI1o1BBSTzakNjU5XX78oSZTYMS0EWEL/o2b8X jHFDCfwPiV0ZWboHFg1Mj+iX833/1rI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Hd2iZXAa; spf=pass (imf19.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699465128; 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=nSCtCbyHMnF6JFI8adpt+DXBLzsY60+au4G0WAaEdvY=; b=2kpF/3MXM5oiZDZcBb7mfhpqiyyXMrGv/rad1dzlG99mMFv7hep49DnEWoXQcsY3AoXoXR KsEd/uxnn4v5XMv7NixasSxTivyt8czjlcyul199iXbwxM2wPGlyHnNb3UW1eSXj33zf/a 3ZlMVEzUMCempn3V9rNaMlSlGa7dpZM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699465128; 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=nSCtCbyHMnF6JFI8adpt+DXBLzsY60+au4G0WAaEdvY=; b=Hd2iZXAajJzg+mzXZWD7y0UaqtVQGbQ+uMdemYAodxaZmScP5Nmr5xinCPf2ckiPm5P/ht 0iapUe7mCkZOwt7dtvbdM9Mi55hZMuD6FzwR6sRoOZbFYuGDSagCOGFKolkU5l6aisrHBP bwK8GSb+2iPT6cynN1bam9kp+EPLgG4= 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-621-86z5a_K2NNySA4Sl1LInvA-1; Wed, 08 Nov 2023 12:38:46 -0500 X-MC-Unique: 86z5a_K2NNySA4Sl1LInvA-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-408695c377dso46191215e9.2 for ; Wed, 08 Nov 2023 09:38:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699465125; x=1700069925; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language: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=nSCtCbyHMnF6JFI8adpt+DXBLzsY60+au4G0WAaEdvY=; b=k9HoR7LLJ9WN8J1oKF73NKY886MAYT3wWnHdck7E9o3AkZLwGjKuDRAmmjTAS/uol0 9NpZxEKX/2/UDXa4/6hAZ8Ow2IFPJoa70Fbt69qjRN0MB1Yw2pOxbg8oI2deYSaxgogh K9+kHOIiUJfhKGP4Ri/HYcVplSIFlC+SceXIC8LsT3waQiDBOMrgtQL7nUiUqmC8cC3h O2ZGmF7LOGPE+g8PpqalkJetboUG0r0WWs724ytcHuRuXpqj1hTYxeZsQ74PAobtexzt nYvqgEsVmjbyR+frwjCwCpHxyjSEOwML0dM8hiu48DTe8klHN3t26qMpGknumstzyyzB TSIw== X-Gm-Message-State: AOJu0YyD8GYrjl/nemW2zcNT1Ta36bzBT3SSDBqFdyfSFXH9NAAdYlaU mMl8rYkyulVrur+Xs5lyDRb6gcTNmfw6Pm6/5VKWTPAVk/zqVnJrP6sH7rDdklOnv1g26IiMaEF aSlhrrwJ6R3k= X-Received: by 2002:a05:600c:1f84:b0:409:404e:5b9a with SMTP id je4-20020a05600c1f8400b00409404e5b9amr2258251wmb.33.1699465125356; Wed, 08 Nov 2023 09:38:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IF+Z6a00/hgMXAxPLvE7vBVK4NKGT2M4vzBYtwq67VEVG6qWmFrmi8XUsY/BgdAvKt2H6ibuQ== X-Received: by 2002:a05:600c:1f84:b0:409:404e:5b9a with SMTP id je4-20020a05600c1f8400b00409404e5b9amr2258229wmb.33.1699465124947; Wed, 08 Nov 2023 09:38:44 -0800 (PST) Received: from ?IPV6:2003:cb:c712:c800:c9f8:7b16:67ce:ff2a? (p200300cbc712c800c9f87b1667ceff2a.dip0.t-ipconnect.de. [2003:cb:c712:c800:c9f8:7b16:67ce:ff2a]) by smtp.gmail.com with ESMTPSA id p1-20020a5d68c1000000b0032da022855fsm5428790wrw.111.2023.11.08.09.38.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Nov 2023 09:38:44 -0800 (PST) Message-ID: Date: Wed, 8 Nov 2023 18:38:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] mm: Fix for negative counter: nr_file_hugepages To: Stefan Roesch , kernel-team@fb.com Cc: akpm@linux-foundation.org, hannes@cmpxchg.org, riel@surriel.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org, willy@infradead.org References: <20231108171517.2436103-1-shr@devkernel.io> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20231108171517.2436103-1-shr@devkernel.io> 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: C1DBF1A001C X-Stat-Signature: 34odar85537e1334s891nzo58ccokcu3 X-Rspam-User: X-HE-Tag: 1699465128-592377 X-HE-Meta: U2FsdGVkX1+LNxMcpjIZdnRbigFeVQKINsArC6dZtZEwdNij5giivEXDxJZOLCxaNJo4kZnBEgDAgFKT/i7TrF2xAi023dGFx771Jn3x/ApWlnjdIQsUsgqWhqqh1dWBRWM98ZtopHJmsS28pCSslQRq5GuTvxe+kchtjFw+3YcUoc5YFquGGasIxR28fEJPgO3hYyxxRyn8t+/83F/e46HnWpSOlcvrg1S2j07WAL9/w463x6NDji3TfFzDel7I1B3egTjFewh/BX2ajCj4uGctNBobj0rgk3Q9kAZz+iTtG74nviYFYyb5ARp/78w6jxWUPcyX0cSW5XD2AfUKhbpPcEoJHmF4m7wcgnyWJCpgRQ1jdA7adpmI+819r738zLRltb4UQ9as6/fJDniVGOiPlnFPwcummB+vIzZr51GMn7bVRtAoZBINdTxItZ/EfjvZuNanuEBERKvhkL0HjcbHv2YSXG7RNVWqk/idCdhszuH0hH8htH1E33U7l8L2YHZyH2aVe37STrSFGZRfDJtC73HAiJ+ApP1Y4shW5kvBpT4/aOHNwHCP/2k/YHrV7RmVLbMSSsO8wS6GQq6xVyU98JZr3Okx5NoXlHg18+GHskI+oSkNe7+kQh5CVeahs90eEPup2YtUn3mQcAKePJNPMVxa5iiEL21JCIF7+i85ilmDVchLqnoTRkTAqq0xzlukRywfApwJifF1mkCU7Q1jj1rkCguGP9yCDTMgViET1MYDPKllyixtPHY7Bzs32CX0VuqLBdD7/uShRjL3ICHDNpAFogPpf2dbbyYI+SBUg6AHq4/cGRwe7jt1XzXT3SvBKNPTaYSvZ6YCZAuT96fLe6cxOM54x5TGnUK2h5mgP31neXT8G7y1Q92jPA+T/SIi2UT25yP7xj8Jlr6V4JfiYABUswUhi5NCVp9HWXGbsbMZpLPUqwgGRKKulqbZIIcvWnvWcaIRTJ2UcH2 ibVtAVV2 rLsqYWKh5Hh3GhPMX45xhJ7QA3E3CVr4hB+5bmUyge5RAk1c3YvwUPQ0YshqSD4Pgt8u1kvNhg+Z3ZOWIXyp2MrSi6CD2YrdlpaARmdNnfPTlyKl6IBpOwLSZ4pR+n9TOi+uU5zguXDuF+27+RfLqOoQ2crb0S1jtPccfdvWvLmdMc3hj7N/JMPOmWf9tCX8t72Mb+WQpegQGurqA9PtFZ2grnO7vfLf4PbNrI0cqVVx9GdawFrTP5cS6LMzGal1j2fzFwlxBE5s4VMxVeYhYoS2zj4ASqrC/NI3r1yod2hTfqUd6oGf/A8dxwnsR6HqK6QVGBvHbKQ+SrsGupTWXlZGqcX/z9hhQ9iDDsJTMkZUpf7SNedMMrUVcr2JePkNRBLPuDpBg7e9hk3WIv/nJmZJeg/Nv2ZL7F/JqlWHJ8SFh3PIfO+nJxd0VObU56fJCFtowxkGp0XDsTSjsApEqACUngq6PR9o8ermMSdCF5Ysu4Bu/UB5GABFAL9sjibyVN8q4DwPm/K4Lfa/r38R3psZNfkq8Yzf43z/jzUYYGpAp4qT8gB2vUCMMCqGK+TweFaTDhx0TT5AFhExII6AgGbqXyXkDXPrgNhZhsxuz98NshgXcT8FHUCiGCda38FRpwZCA 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 08.11.23 18:15, Stefan Roesch wrote: > While qualifiying the 6.4 release, the following warning was detected in > messages: > > vmstat_refresh: nr_file_hugepages -15664 > > The warning is caused by the incorrect updating of the NR_FILE_THPS > counter in the function split_huge_page_to_list. The if case is checking > for folio_test_swapbacked, but the else case is missing the check for > folio_test_pmd_mappable. The other functions that manipulate the counter > like __filemap_add_folio and filemap_unaccount_folio have the > corresponding check. > > I have a test case, which reproduces the problem. It can be found here: > https://github.com/sroeschus/testcase/blob/main/vmstat_refresh/madv.c > > The test case reproduces on an XFS filesystem. Running the same test > case on a BTRFS filesystem does not reproduce the problem. > > AFAIK version 6.1 until 6.6 are affected by this problem. > > Signed-off-by: Stefan Roesch > Co-debugged-by: Johannes Weiner > Acked-by: Johannes Weiner > Cc: stable@vger.kernel.org > --- > mm/huge_memory.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 064fbd90822b4..874000f97bfc1 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -2737,13 +2737,15 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) > int nr = folio_nr_pages(folio); > > xas_split(&xas, folio, folio_order(folio)); > - if (folio_test_swapbacked(folio)) { > - __lruvec_stat_mod_folio(folio, NR_SHMEM_THPS, > - -nr); > - } else { > - __lruvec_stat_mod_folio(folio, NR_FILE_THPS, > - -nr); > - filemap_nr_thps_dec(mapping); > + if (folio_test_pmd_mappable(folio)) { > + if (folio_test_swapbacked(folio)) { > + __lruvec_stat_mod_folio(folio, > + NR_SHMEM_THPS, -nr); > + } else { > + __lruvec_stat_mod_folio(folio, > + NR_FILE_THPS, -nr); > + filemap_nr_thps_dec(mapping); > + } Reviewed-by: David Hildenbrand Yes, that's the current state: update these counters only for (traditional, IOW PMD-sized) THP. What we'll do with non-pmd-sized THP remains to be discussed (Ryan had some ideas). -- Cheers, David / dhildenb