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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EFE8C4332F for ; Tue, 7 Nov 2023 20:06:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233167AbjKGUGV (ORCPT ); Tue, 7 Nov 2023 15:06:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234473AbjKGUGU (ORCPT ); Tue, 7 Nov 2023 15:06:20 -0500 Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85C2E12F for ; Tue, 7 Nov 2023 12:06:18 -0800 (PST) Received: by mail-qt1-x829.google.com with SMTP id d75a77b69052e-41b7fd8f458so38765691cf.0 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=vger.kernel.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=bSnv5Eku580EiuXUbs0cd0BzNSXL4espHh2AiirJrmY+cKR9pMJxJAV/588lqsOLcZ mJZBrH9TqOkSlp/F/PHAth6WSnWlJ0gNR2nHMHKMBUa+lOMNPeOvRSlcXiCjoBeecozu o70MMbVqBMm2L8QEVn4ATWab17SfmyDE7+X89cpqnurrVgAbN7HgesqEc/GiyeRO2mzT JmjkUyUg/tEPU41dWFTpBSfIGWhtu6BpGacNfFa3tA8f3nLgDQsUjEcKPbHyUpvlfql6 kwF3LKqpILl4T/zqO6P3OQ7Tp72/qlMToKapcyQ4zyX3qnyF8rLrHaWl1sI26bbiIuCv j3nw== 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=O6u2cc8YW3h8bUuGkfoAmaNM0PVEkEPNq+cQzxWhx5wTWlrv7cS2VXHUHpWVnzxuS8 8fX92J3vTWpwZDYSXZumAJIRc+7zoU7+D8KYhMbLUckoYRY3ppzmfbyEFoVpX6D+1ReA yp7UR+cpXE8FbT5a8eRY1GNCeW699FzUwU6C+aJn8GjozO1+wePIPuBkgfRbENfWN7e9 lOfZdNjJNwzmfWI3X+bYBGcdmW965CDbwUtTqU35awMr1XgcD3xYsOyFIrDDOE/UvCaD sg4kURJr8PN5JTcFUX+2Lft/NyJZEXOc1xUcc/pIG4G+VohPxHcXscIK0Hz5kl9CbAKM N1qg== X-Gm-Message-State: AOJu0YyefAWU7I5Y8FV5lvJVXtSeG2pV/ZUSVinqFzcfBhW/ULZsDViz fXUFzl7AKhwc9YiUCYTvCuR0fQ== 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: Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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?