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 63A71C4167D for ; Tue, 7 Nov 2023 20:21:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C736F6B0085; Tue, 7 Nov 2023 15:21:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C24DF6B0198; Tue, 7 Nov 2023 15:21:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AEB766B0199; Tue, 7 Nov 2023 15:21:01 -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 9BED96B0085 for ; Tue, 7 Nov 2023 15:21:01 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6C0FFB5CF3 for ; Tue, 7 Nov 2023 20:21:01 +0000 (UTC) X-FDA: 81432277122.07.660393B Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by imf20.hostedemail.com (Postfix) with ESMTP id 42E181C001D for ; Tue, 7 Nov 2023 20:20:59 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=Bbv0faq4; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf20.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.222.170 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699388459; a=rsa-sha256; cv=none; b=bMW8zfviBg53Ah/z9aa+RWddfSjMC8pX7IIE05OOB3UhD2giVadzOdlsrGc37O+d6rqEDn voQFFxgRsBHIqO7bsMpGlegVIMVFuvnfyfH8wFwxTqrq4frL3KMKKlFNKehQ0noSlN6TpH dkPjSeTbEr2WhyDbOKL7QdhiT6Mfu8I= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=Bbv0faq4; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf20.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.222.170 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699388459; 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=hSdfUIdEj0JA4xAkLjr8iNFR7V/inKgzjZ3p1JC+wVI=; b=V/1EWM748mtC/8a9S2W/bI0NJL3WZBMt5QjK0AvwEZi3WpvvH3kI5lOEuKlt6W+WCYqQA9 JUhvwFnG2FHaCb+FT4GKVIkv3L3mwwg+X3kj3T0H/kStPcfjwf9wg6Cup1+mn0UzSv7DTG PfZVWHM2n4FaUk8pp8Ke1P1RICNbxjY= Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-77a277eb084so404599685a.2 for ; Tue, 07 Nov 2023 12:20:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1699388458; x=1699993258; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=hSdfUIdEj0JA4xAkLjr8iNFR7V/inKgzjZ3p1JC+wVI=; b=Bbv0faq40YKOTf3RbcCOjIcqcC5Y0GIe/2lVx7oFPr9PAfkF7cAkbV8TH9ys+bodri wXEHDdKa97UPQfcICZf2Pmgz8gXXE5/vfxW+Nzh5/eLr36xqbiwYOq6gZCpCGeTJ59aL J4ZFB8C4k+3hWmNTVIwy72+X5YFiNz72tH7CSA0bG+sTG9RJ+I1QZZsM8GtB56J1Ki2V VzMd5Bh1ehMF9XrPhp4btoL5hUT3h+HWURbSN3ghULNu2Nl6Nt/uAtH11PQcCjMzKEls ZzxAkjpYUwMRKNRX24xyhivkgwKp804ER9pMyxaOgGIU42oVx1oKMCJZquLGtuz09mYu MCPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699388458; x=1699993258; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=hSdfUIdEj0JA4xAkLjr8iNFR7V/inKgzjZ3p1JC+wVI=; b=Z6JHfsri7Iy3ANLugcoJkksIJAvZFTF0Ee9fVVgfNkCZouAUURlPjBLOqu48eiYuL1 1mxwLeQZ3Peoig++jnKNfjH0py03sRxHvkBMOr9n2WgEZrrT+moZt9TYGIHfBEUoDeZZ jLEHeBZehh35D/+bXudgaMsKpHWY8P7caJ4/JhsWZh98aGVWmKHSIXp3lQWZC6MK988P 7WDbwxfosp2IOdQWSWIFI8ZGhjtpFYon06AxZBRUBpa84/IYsHiB3HyMYgf1gw10KgaZ BQ6EB9Q9LVvV2eUpcy/0V6ELmt1hu7+K8tPp537/jDLgtcQxof5fpdcc2ybtbECny0qZ dX7g== X-Gm-Message-State: AOJu0Yy7GLTM78/QCF4LRPXnsl3nACp6JWTuAk3hKYK7a20oHmSOWibs 6fovAnIu2Eh6DquzeIUKciuhsA== X-Google-Smtp-Source: AGHT+IGAqZDGsu4Irs+7ieqmt9vQpahnugUEkyICW5wIB+nND391lD3smddVlqQSiC/XBVJyLF9xcA== X-Received: by 2002:a05:620a:459f:b0:772:64cb:bc64 with SMTP id bp31-20020a05620a459f00b0077264cbbc64mr36515549qkb.12.1699388458324; Tue, 07 Nov 2023 12:20:58 -0800 (PST) Received: from localhost ([2620:10d:c091:400::5:86b7]) by smtp.gmail.com with ESMTPSA id o4-20020a05620a228400b007678973eaa1sm245681qkh.127.2023.11.07.12.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 12:20:58 -0800 (PST) Date: Tue, 7 Nov 2023 15:20:57 -0500 From: Johannes Weiner To: Matthew Wilcox Cc: Stefan Roesch , kernel-team@fb.com, akpm@linux-foundation.org, riel@surriel.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org Subject: Re: [PATCH v2] mm: Fix for negative counter: nr_file_hugepages Message-ID: <20231107202057.GA3798394@cmpxchg.org> References: <20231107181805.4188397-1-shr@devkernel.io> <20231107200616.GA3797353@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 42E181C001D X-Stat-Signature: 3h366pq8uzhqp4dj57mnjdgqhofhmrk1 X-HE-Tag: 1699388459-254472 X-HE-Meta: U2FsdGVkX18s0uV37iXdPy3uX6/16lABaDgwcHxwc8W4yZirV3f3UavUsUWcmA5CsZW2+FUo18I9P992TGcgBZRjKwSZY8GoV61D+WPncpCS+WXzBe9k1onsUzP6Faz0A70EwVD+q7s+0qR/a7e9JT6qB20deuCFV1pNV8S9m57CxorAbybJJ3YQoHhTiphduYfRsE5gLyl/t1z0YNIHok5r7B/kaT3kpmWUThVuv8f74+CjkFpamg1v9bKTrGrnfVseW8VRMXd6x4ytjBo85TpRHz2nez0hLU66FbpzmV2cpryoj2WhOsy/YtbwuVI12lcA+5LGzigq5A5SSvKskkVDEdHX+sJzgQ2lTTOT1o3toOdV4iuan51ZWD01JXAVHB9roIB6M7ycoZfWkAAUqXpDtEakG8rgC+rSTlzmQP6pqoKChUEGyQGVnyxubG1+hZ40AF0OFztW1W8fk7bt/clwr8BTJGrK6R/IFUdQyAQrccUQs1xvtYdIZ5zts9SdyCLLFVXbL7FL9rXuJ843E3cUggCEgR8nDkLT7sO5MrQoCaQbA+KyO0fbxoUh0GJYs2kdAReY0NM22fmSAxuRvKlugMo/e9kOGQZUqRAHElOakwaE539Q26M4ytdy+9mmmBJClcUIGOjByHVL3g9H48ucH7ZCtpqo8xryzOi6CeiYcjsAVv/8Fo2rIplA4X57B2Yk5jXWfDdDVy9/tinpbI0XjfB5Zor2YV/ZrXcAE64znRMoqjWNhaCI+GMzSYHoHKg5r9OuU+7ijzridvrVdVjWzzeKZ7fAg+lBmexVjj0wX9DuUF0QdwWMI6FK5rL15MmaoEMlorhJkPNwTRPsak212zGwH+76mxIRBIU8+l4aSr2f8yaqnIIi7q8/db8kMKDrUdcGUkhxDjrIpzGMH8yEkKPNWp5O/jWvYaW0H+ZHbHnFVA+ccx2rKsvlJFwPyVq/APRM8dhGjjdt7nt Ty57PkKa 1TpK/MSBXfBhkj+Yr0XdF3wckOkycHtoPqty1zeq2W7bNB+pnKXQD87gzprXIr6/R1JvscADRSaCVkDeZ9VGoil8WMNYnZu/gD2MCfxsD3hgRW0aWOPTIHrnYXX227IFRov4bAUuyEHge5UStVlwZktQ7V9nyC7he4h1e4rGAvX1mCo/tW9kizbhhxqSa5ICW1Y8krdV0tfva7DWgujFm/K6ahDqhdgSA/5Jm64fPIrAOzdMbsl/hBXxOhtI0R9Cw7kQXp+oJFmZd/x8C47PVkxnSTodHSJGNWzdFmKg6P7NG4eyGY3GmuQrPavF7DCa7o3hDpSK4ZaivQ/WS48IWHmVYsZvSUr8N2jv9C9LbWq5CRw4T2hzNa6XwUxmO/DTZENULs42DXKkH3cPzXnuKntVph9yLuLT+/HbyP6J5lrg4pD8WKcRY/Rd21AtcTCBNYffp X-Bogosity: Ham, tests=bogofilter, spamicity=0.000023, 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, Nov 07, 2023 at 08:07:59PM +0000, Matthew Wilcox wrote: > On Tue, Nov 07, 2023 at 03:06:16PM -0500, Johannes Weiner wrote: > > On Tue, Nov 07, 2023 at 07:35:37PM +0000, Matthew Wilcox wrote: > > > On Tue, Nov 07, 2023 at 10:18:05AM -0800, Stefan Roesch wrote: > > > > +++ b/mm/huge_memory.c > > > > @@ -2740,7 +2740,7 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) > > > > if (folio_test_swapbacked(folio)) { > > > > __lruvec_stat_mod_folio(folio, NR_SHMEM_THPS, > > > > -nr); > > > > - } else { > > > > + } else if (folio_test_pmd_mappable(folio)) { > > > > __lruvec_stat_mod_folio(folio, NR_FILE_THPS, > > > > -nr); > > > > filemap_nr_thps_dec(mapping); > > > > > > As I said, we also need the folio_test_pmd_mappable() for swapbacked. > > > Not because there's currently a problem, but because we don't leave > > > landmines for other people to trip over in future! > > > > Do we need to fix filemap_unaccount_folio() as well? > > Looks to me like it is already correct? > > __lruvec_stat_mod_folio(folio, NR_FILE_PAGES, -nr); > if (folio_test_swapbacked(folio)) { > __lruvec_stat_mod_folio(folio, NR_SHMEM, -nr); > if (folio_test_pmd_mappable(folio)) > __lruvec_stat_mod_folio(folio, NR_SHMEM_THPS, -nr); > } else if (folio_test_pmd_mappable(folio)) { > __lruvec_stat_mod_folio(folio, NR_FILE_THPS, -nr); > filemap_nr_thps_dec(mapping); > } Argh, I overlooked it because it's nested further in due to that NR_SHMEM update. Sorry about the noise.