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 E03EAC4332F for ; Tue, 7 Nov 2023 20:08:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 783F86B0085; Tue, 7 Nov 2023 15:08:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 735796B0092; Tue, 7 Nov 2023 15:08:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D6016B0096; Tue, 7 Nov 2023 15:08:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4ABE36B0085 for ; Tue, 7 Nov 2023 15:08:13 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 18BB21A07B6 for ; Tue, 7 Nov 2023 20:08:13 +0000 (UTC) X-FDA: 81432244866.23.9EAA680 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 597C84001B for ; Tue, 7 Nov 2023 20:08:08 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=CI7nr3Md; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699387690; 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=u01JIqVzaSf8TF8G4BYOMmURcC23GrYXwrlghebzjfQ=; b=ZXyU2ELl9Wg70NgWP5cxFCZS7oL3YpqK0kEEVEnoj8Ru6+poN3EFRAh/+E9IRz9XiE5Qzl 09y3+TQ0RDu/mWYgZD1kQvd0o/Kx9omc87gcXyZve7El30n5PKOjvyAgjte1Abt9ULoEGW asWBhXI589hdQbPXReWK19t5gDpukJE= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=CI7nr3Md; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699387690; a=rsa-sha256; cv=none; b=7gXB/MF/Jescp9O3o3+Jh+ug2Tl48Jq4zoO4xk4d0H1aJWRuZDiQK2kAgqYj1mTTAxPSE1 BNlJyf7PJ3xTMzWowvCpxWZ8E98D1D0SYIMAYsf45zXZGNZVi1843DTq+zpqha0X7xet23 +8w5NN0JJVQucF4ZC4Ljmxr+DL8XfpQ= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=u01JIqVzaSf8TF8G4BYOMmURcC23GrYXwrlghebzjfQ=; b=CI7nr3Mdn1TfJDk6UKyDLm5nec het5KZgVo64urTH2eiMoc6tK4DwIIR9kc+R78QDpAdMOOU2qxnNiyJ/DegmZFq+O1bQfZoYFpaHr6 Hhfx+QIq8PGImFUefq6+UPK4PQ2yAfZP5xT8UVGRG0dDAHAmAkhoDKSl9K+8WkWNTSXKmKVHje1qw Rt4DzJEoBRBUmqK0rt/gPohq1y709lkgz021U0mCSOZrPQgPY2OMnKklxAK0wwLCSPYleAy8jMtBW JJcS4ywoBxVvM/EkHeCuQ/s/Z2bPLHWdxbyC0l02vHMzI8ar/OaM9RNGrWgqIm2m0AJjtxR4IsPh/ O4KeMOTg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1r0SMh-00EHv8-LH; Tue, 07 Nov 2023 20:07:59 +0000 Date: Tue, 7 Nov 2023 20:07:59 +0000 From: Matthew Wilcox To: Johannes Weiner 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: 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: <20231107200616.GA3797353@cmpxchg.org> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 597C84001B X-Stat-Signature: j9ep6jbe9sz1xze7s95mskxnqkraixm8 X-Rspam-User: X-HE-Tag: 1699387688-494050 X-HE-Meta: U2FsdGVkX18L6jAkyU3J1bauhLRPRBeaGy0kFack9XeTBLsihppOyfzfpeycHGLinV1MOJralx+miT6LeVAvG8GkBYZ/Jp/2lcHXEGu27ilKVOqdVgVl6chvFJx8W7ON2wj35cnlhcylNew9jL6tnQLkDDDLbkgCjh2iH/otyfAW+4tZ7WAII/3PUuKhkxLQ0U9JF7upt95If7XfYL34rMwQd+vytgKfv/8PoKbnJpQOpMjLD8A+WIExdYqQFHetbnos9qsg20YNuRSe4ETk3FccKzDmzI1UMchU9rjFuoK2LEgkoLo3Njd3DwtNOYEWvvAJIw5CgYy3xaag/Eq0Oh1krmkLVC+F07gbzVDvBGhnrx0lYNIEg1/wMVQ6mXy2pMRw8/9G8OIMiQoqyPSBEvFcoHV7hErq+S0L4wrSKMqAm+l/Jl18PI/DOUbqwYsEjkYarkW9AyYQu1wdjgf0LO9N1bnO7DIoaciFHJEeyW/ysYEGu8Z3uVzKPbUgwiS8SUJ8cX7EkMc/IvecHKK6lzD/XC3QGlj67ozIt3QzO9mXa0rq/7ARb5LK/TAZfCE/Zb3QnfuH+IgbIG3VpdVkrki5xbvIW9s3W395bv+mierMhNGU31hkArF4nOQzik9v/JGRlVGkIWR32wGryLH3hI4j4RoJdmrtcHkmQOkqHdYOvcSUs7EnEjfFA/jkqnYwLEBoTocTJtUjcZ5mglU+SSmiPQCGtaqLWmVu7d6b3bC5I627QUWUD+bn81V4RDNDqvFpUOtytWPs35h0wWhehZ0poxv5dOV2Q9bMfJoPU1xUWh8qLEtPkNRR581KbfkX9rXtFuKnlCFWHEVCWBwkumUTiyCyw5x9S+eUcfm///DQThZxULmrrj9+NBvP5j0wkGdOfzzw23iNF+UB8q+mJ2N6D3/JUglSzBY0N61OPW2SqmM8J9JkS5LfLtgElt/8EAn1FmTkj0gLNcZlL53 YlzqXt1t aPQp5BcEKa4w1po5wLpeHxzWCmf1v9NODyOqdp2W68hm/M/aIW7g8wqOIFksYKOthvfyJKSi2QAesT5wMPtW2Zrtf81GFZYuEOvxsihvi0UMPVECePLVPVH3FUV7X4g2MQXu+kHUOChyFRXgbYJbti0zdoFytcgeIm63KEZIUkhG+xR0+FvXY8RS+aw== 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 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); }