From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 762E02F3C1E for ; Fri, 4 Jul 2025 10:26:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624800; cv=none; b=EKdlt9mQPq/PaWuA5lbLXO26LU3m7ZJ5GBC4bUCTBixfOqES1lDFW93416bJSkkQ94cKGp5gQd8FxxQE3U29hrnIZDB7jjh/Y7wJiqoFazIYH/cdAKvxrWYMPBrPjv5FcB4SO7XlQrKGvASrz7CJML1skU0LI61PTd0QkE+UWjY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624800; c=relaxed/simple; bh=s9je96qO6r5yAAE/tRQstaImZtvw0D0SBMiOehTSPeA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NxAFtliuESAZdgkzwX1hnLG2pzpMoV/5WYUrBHDGEC/abl6r4nwXqxPJSVvKWCjhxrGl0LiBWKJI0noRi+tuG0aHN1WmM/eYgyUu6cSuT/pyofUo0AptNEUVKQKWz0RtbqqZyeZDT2W/Fl9/0enPMXtwTaRDbkEtEnnu2xcMdvs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Eb0leDh3; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Eb0leDh3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751624796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fs/e8+Swpq2YGTbmX8ig9Uwxi9FIgSmYum8BwX+79CI=; b=Eb0leDh3vnxoajmPejIxQqniasqUmcEQXIYNzfZQ5dtpcZNcgqQfzDvdlZhxHO3XPgEJvC D4vuRydR/ySvMiQSwHZNyhvcS64GYZhcNPmpVtfYGbpdDvGAiVxc12123VzU3MJg7tpXNV OwlxsJ0de8u6JpljIkteFlzY3/K/jvc= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-614-gO5UvdRXN1qL8yO7VGmOOQ-1; Fri, 04 Jul 2025 06:26:35 -0400 X-MC-Unique: gO5UvdRXN1qL8yO7VGmOOQ-1 X-Mimecast-MFC-AGG-ID: gO5UvdRXN1qL8yO7VGmOOQ_1751624794 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a4f858bc5eso538295f8f.0 for ; Fri, 04 Jul 2025 03:26:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751624794; x=1752229594; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fs/e8+Swpq2YGTbmX8ig9Uwxi9FIgSmYum8BwX+79CI=; b=OHmtwd2y4KrUQiaCcCYXBZmij0/cke3zUXBUbWd2oDTvZs7coCV91vSUEfzObNY51c u5/Hh6tVn7Bwg2Gn/QlKLvKz1yV2D05qQhTXezVjzOvZ2uEKPh51zYUqIlxxBuheCLTg 57cPcbBH67JV7Y38/gsL4JpAaUncPuABE5cYwjgf3C765sDmPk8ioGh/Gi3niofwPkSI FOmkv05taecLTkAkiZOX8ED3Quli/yQvlEbSIMRG1BQjqAmceRgWBrEQA5mXPy1nJsaF BKS8CE99HgwRTL9wiJ8uSPEBlLxzUkkNW0DcqHanjTP2kGMypSv0fbcczK8MaGXtUWpl JzEw== X-Forwarded-Encrypted: i=1; AJvYcCXWp1T76ivqL+F8/s0Th4kpZpCB2vr6eUJQapts55VqlvyYAiM0gDJcwqlGfmIKCE/u3yYLRHniDHobMhLM@vger.kernel.org X-Gm-Message-State: AOJu0YwGVZFSqQOiz72NIVl6QyT08fQJur+OjZWCgaMbnbaqn92mXWAo f9EF8u5Ln3WEXig9yDA3lYmY8cK5yPbfkbcmLFMDU/YHkaAcDpiIfe7NInWgdrhWFs2wq3ukf42 JJFW1wSEdD4FEtLBhO2HWys9R8b+l/wOpP8IYtQ5hxZc/Os1SlJwqM9fU7EXLvJhk6EY= X-Gm-Gg: ASbGncuk51UZXQpesEp086vKtoab9Y1n0P4WdtgvYF53xwDkzG/WNQaTAQ+ytOBjcct BZYcQFoX7bodYHvcBm2zvMlpTwb/SR88PDVl5iVFUz9U7WyMzGvAnU/uR9UsGTKgwgB3uAzF6Ty NstMNan/szkUk/99QcqKvOtLUqqHFlVv65dcjSDvAhXEN9R8pggNB+ahNcI9sV4dKFclUtdbpw9 wqyiqR+EqkDSNwrpohxFTNy7f5sEcE3P/WsKnLA+OQgWhMtpZTTxYwvzCexufxUvK4yq//6AuyN V1c7Vi7opTzkcGXjVo+ZEUeQWtYgLLYAWMvX/Vl80HWIfErk6+WAv6gtm/i4b4Ws8w+niKPSYu3 j9rcKTQ== X-Received: by 2002:a05:6000:24c9:b0:3a4:e667:922e with SMTP id ffacd0b85a97d-3b49700c540mr1015594f8f.4.1751624793960; Fri, 04 Jul 2025 03:26:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFv4//fTRSt2GT11U1TkRjsS9jXLC3kcU+xe7g60I+SsSxP4GVJGQoWX7WuUGQypypw/2H7pw== X-Received: by 2002:a05:6000:24c9:b0:3a4:e667:922e with SMTP id ffacd0b85a97d-3b49700c540mr1015567f8f.4.1751624793449; Fri, 04 Jul 2025 03:26:33 -0700 (PDT) Received: from localhost (p200300d82f2c5500098823f9faa07232.dip0.t-ipconnect.de. [2003:d8:2f2c:5500:988:23f9:faa0:7232]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3b47285c6c9sm2093397f8f.89.2025.07.04.03.26.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jul 2025 03:26:32 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, virtualization@lists.linux.dev, linux-fsdevel@vger.kernel.org, David Hildenbrand , Andrew Morton , Jonathan Corbet , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Jerrin Shaji George , Arnd Bergmann , Greg Kroah-Hartman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Alexander Viro , Christian Brauner , Jan Kara , Zi Yan , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , "Matthew Wilcox (Oracle)" , Minchan Kim , Sergey Senozhatsky , Brendan Jackman , Johannes Weiner , Jason Gunthorpe , John Hubbard , Peter Xu , Xu Xin , Chengming Zhou , Miaohe Lin , Naoya Horiguchi , Oscar Salvador , Rik van Riel , Harry Yoo , Qi Zheng , Shakeel Butt Subject: [PATCH v2 23/29] mm/page-alloc: remove PageMappingFlags() Date: Fri, 4 Jul 2025 12:25:17 +0200 Message-ID: <20250704102524.326966-24-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250704102524.326966-1-david@redhat.com> References: <20250704102524.326966-1-david@redhat.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit As PageMappingFlags() now only indicates anon (incl. KSM) folios, we can now simply check for PageAnon() and remove PageMappingFlags(). ... and while at it, use the folio instead and operate on folio->mapping. Reviewed-by: Zi Yan Reviewed-by: Lorenzo Stoakes Reviewed-by: Harry Yoo Signed-off-by: David Hildenbrand --- include/linux/page-flags.h | 5 ----- mm/page_alloc.c | 7 +++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 094c8605a879e..fc159fa945351 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -723,11 +723,6 @@ static __always_inline bool folio_mapping_flags(const struct folio *folio) return ((unsigned long)folio->mapping & PAGE_MAPPING_FLAGS) != 0; } -static __always_inline bool PageMappingFlags(const struct page *page) -{ - return ((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) != 0; -} - static __always_inline bool folio_test_anon(const struct folio *folio) { return ((unsigned long)folio->mapping & PAGE_MAPPING_ANON) != 0; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 4aefeb2ae927f..78ddf1d43c6c1 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1375,10 +1375,9 @@ __always_inline bool free_pages_prepare(struct page *page, (page + i)->flags &= ~PAGE_FLAGS_CHECK_AT_PREP; } } - if (PageMappingFlags(page)) { - if (PageAnon(page)) - mod_mthp_stat(order, MTHP_STAT_NR_ANON, -1); - page->mapping = NULL; + if (folio_test_anon(folio)) { + mod_mthp_stat(order, MTHP_STAT_NR_ANON, -1); + folio->mapping = NULL; } if (unlikely(page_has_type(page))) /* Reset the page_type (which overlays _mapcount) */ -- 2.49.0