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 AAF8FC4167D for ; Tue, 7 Nov 2023 20:06:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A4FA6B0174; Tue, 7 Nov 2023 15:06:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 02DC96B0175; Tue, 7 Nov 2023 15:06:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E12996B0176; Tue, 7 Nov 2023 15:06:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CCE4D6B0174 for ; Tue, 7 Nov 2023 15:06:20 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9B6FD40B08 for ; Tue, 7 Nov 2023 20:06:20 +0000 (UTC) X-FDA: 81432240120.28.52AE18D Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by imf21.hostedemail.com (Postfix) with ESMTP id A7E961C001C for ; Tue, 7 Nov 2023 20:06:18 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=wLUHk2Th; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf21.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.160.180 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=1699387578; 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=55lKD58CSWiBTKri8vJYjhibnCHFWQzcAQZlaP1nFrQ=; b=5gLaZoAn9nKAiyeohWdS8pCVxIJo4qIBnrvDqiEUVGmC5rOljNBPKKYjKlP1AZ5foAO/kQ LpFYHi54GKhPV4sMLcwShjLRhKJCHLcM5p0FnxmhbklK3x6twh9IGxbCdnoUcJVBm1XCpK vMZfj/u0OYGFQdkZEITU0zKJBZoef54= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=wLUHk2Th; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf21.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.160.180 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699387578; a=rsa-sha256; cv=none; b=0pYqFkZYwORG69Xz2iFTl8mI8iAUpoLNhAgW2QcW1ZCpn8bm3wB6TjXuy4Vgy7j1VgOpGJ noPYIy+441Kyva0x940p0VGUxC5HT+kMqf6g43UIWshSWourVp9Yaiyr0za5Koou+PVQ1l HgdyATDKiDqXRkdbOQ5/bYd3brIwCXQ= Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-41cb615c6fbso38727821cf.1 for ; Tue, 07 Nov 2023 12:06:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1699387577; x=1699992377; 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=55lKD58CSWiBTKri8vJYjhibnCHFWQzcAQZlaP1nFrQ=; b=wLUHk2ThmtDEBbu+q8t/VyhVEzDJvUlbLswcCLLoyC7/5tp6QeW44ae4AlTEC7Ntpa KeMx+wOhCRXUxUUJqgbGEr/okg2IorQ/uXV5TTkzdLnTuZtG9Ub34MwYIvU7jdo+ub+s dwo5j/22nBPRhFew6aictwEn7lEOaPq4iNIAoVczBix04wIBjsZTC13Z2NNJm67e4vOj FLllUz4JxSSdwTlQikNdpOdDuO2tiC96At8QfUiwLMUlUVw6zvl+qGNuvyfb32TuQiQy 9zcV19iM/J6L0pA2UErOTGrCsHfC7X48rIugK9fpc2e8VOg9caQWmUzmPV+bvmbDLV7O 4t7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699387577; x=1699992377; 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=55lKD58CSWiBTKri8vJYjhibnCHFWQzcAQZlaP1nFrQ=; b=gUYgdNZvI1HZ3gyfEueMlVJ8KL6xB7VCPuZeuG2gdBmCbh6N8xEOS4ai6vagQNx51h /ft+EvxyYkzjXL9emfN+8WNFXHVtBuNWbrlgdfqpNHYg6ZhwzdS1oFGTv/1EvZcaQdiJ otVYYr29NoHZigFNJlJjrkG+zRAdtWgCmE8fb29Fp3TCaskcvutEKigxN2FaXVsSzmXD PE4C4yPaD7mvlfpbEU4S++Wk8BgGrs4f85zkKupZvEiObYr0AU9VVzqC7lHeZOJAtzTh x2NaeT25O3CVIU0U3KcVuacE99SgTbemh79CsqdSyHEM9IKX/QYnNwhs8jm+ORnswKaB PLIQ== X-Gm-Message-State: AOJu0YzknqJqWUII2g2j18A4YK35qFqvSb+yy33JBAfGgUaEL9iQYqPg zsc8wEglIYkbNGU7YrI098zYYA== X-Google-Smtp-Source: AGHT+IHNGyiB71fHv3CuAu7RO94OVfUQtCEaLhqImk34eBJ7oT5XoYlB7MvDeInK08DfY8GkHNDOFw== X-Received: by 2002:a05:622a:2cd:b0:41c:bbbc:2ede with SMTP id a13-20020a05622a02cd00b0041cbbbc2edemr36123938qtx.14.1699387577691; Tue, 07 Nov 2023 12:06:17 -0800 (PST) Received: from localhost ([2620:10d:c091:400::5:86b7]) by smtp.gmail.com with ESMTPSA id k16-20020ac84750000000b004033c3948f9sm16296qtp.42.2023.11.07.12.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 12:06:17 -0800 (PST) Date: Tue, 7 Nov 2023 15:06:16 -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: <20231107200616.GA3797353@cmpxchg.org> References: <20231107181805.4188397-1-shr@devkernel.io> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Stat-Signature: tehy1fzixt83zefi5aqj7pxhynych6my X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A7E961C001C X-HE-Tag: 1699387578-89707 X-HE-Meta: U2FsdGVkX1/LP6TJzYfMEKNNh1L86HsA79jDo3Z55DeLbU/r6YzMmcHA6jImgxPY7Uv6vzROeeCXLjMf70Pu8OLXzF6vQ/+ZAJMu1tCauPYJNJ1TefASUDSAr0Mxq0g8hPXF8NyOx1ojxKE/EJ3r1viOjWTtY24JhVQXgKIqBsjSG9ubYGXQ4i/195uYHwFSKJGValFrP6ugYn0gtvYpmegv02xnXbHTIvv74elRZXwl/ENKnaaUqT03yv6F6bF3QekEH5sW9Y3SqVzCA5WtELSXTbfl6s1VJI8VKUR27TjCLPt2/iW0TXcuC0+38YBYvcHTE4pYyWOgiWgcrJKBakaAl3dmoNtkouUzS1wf5N/MBz2BX8aubysi/uO2V9Cr1TdiFfSvZEPn9/C+bSxUV1AahR7UT7HrnKvsK187GCjqaMDpR3wEoHTuqSujGkCgh9uJXxR3XoKHeQvX465nqqx+HWreV5UmVvXPnfYjz+oCHo76+dYRGir0TRb2yerSL5w4Z8jCgKAtcsfG5ywBQ816crBAGYChEIaduKdaNDvTRoDNqNq1GN6rmh2lMU9W7oINs1RHng1Oi7ml33iw7dF6n3xDzThNfFbKN4V3VNF9jF3UJ9pqBKkx7ITAnW9M3xI0RrUg5qUxkQYEEoUncRbbit395xwiQo3sAoqNiKb3f0mL3Vsy8jgDywOqsoONy+MKHR9lLZpMGljOf/QEXomLQhjZPAJNyl6YEU30aWW5ceaMkpp/udSdPuCp5v8O3UKSaJy8HK2KatoJKqoVBlATm1UHSo4uCn0JTtuZzkD4f4ewvprsl5wkoqIj/I/fvAk32E6s39gqgFrfxlDOKz0E2xLFRBi1FApc//uhgaA8sZa88hGWnyqowCnOr4rkret84DNvqgCivXQ55UycPPY5Vfq91ulDcskCZ6xEClhUG89UgYF/xIft+uN/0YNEVuptzJu0QEqpHwG+cpr TnEOFWTL vsyXyqGkQlcM0wS8DYv9DZqyoQAao3Yg9OuojzT1sfMZ7EWosyj55IeiGk+DYKEEl8vqH9Qa6xND3xqu3ICm3EvyXmyKBG4Cas1ykJ3hb55J52H6lcn3HB+OM7tCOvTYmWu+7fwaaHYWK74X0hyiLf8xxBq1MW/GbkmuvdGb+18jaipeRvDMn8opHl7fo60FDM3QnK5W4eDGXjgk6LPURtgFV3ei+yF3ci7XOTXav+NgewBHbGNsMVM3+x7Rk+ThDKxXdvbODExf6AfaG+NSDTB0/sp6HmXepvaiJDttDjySf+R9U9M5+BeGVcAmk39DydPfG7BHyAnKqF5IHMx5ztox50dLPblbFVIPM5VW2chld1kGfrRnMG46cTX6/PKOFKIRFjvlicDvt4aHhN+Ubfbk+W/gbW2a/lCwbavDnq6DKCObQ+6RXp/2WYEHuiOTTyEZL X-Bogosity: Ham, tests=bogofilter, spamicity=0.000646, 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 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?