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 8D8BEC83030 for ; Mon, 30 Jun 2025 13:01:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D1436B00C4; Mon, 30 Jun 2025 09:01:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 481AD6B00C5; Mon, 30 Jun 2025 09:01:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 398186B00C6; Mon, 30 Jun 2025 09:01:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 255AE6B00C4 for ; Mon, 30 Jun 2025 09:01:33 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CC8B6C0513 for ; Mon, 30 Jun 2025 13:01:32 +0000 (UTC) X-FDA: 83612078424.29.F2D8C60 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 733612002A for ; Mon, 30 Jun 2025 13:01:30 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KG+fKVZE; spf=pass (imf13.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751288490; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1QasDl39udqF142inQM/Baaw9xGb/E/13xzKchOHRQc=; b=kw6w3JuVvpu1yOOnLxequUtiqtzUdqhJoU+pm6zitCMKJPgxv3LZWen4oA5r0eGLZcJUj8 fCr9PIgshtNQ8J9kvE5TrIFeCtUADu9HLuTlRWjcabkJeUqVwGMYnWxK2cXErvZO1r4969 8M3qB0tKXaJbUGpmnf6dzc2obYD6Wks= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KG+fKVZE; spf=pass (imf13.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751288490; a=rsa-sha256; cv=none; b=Ks5UtHlSM4hbgoYq3ruNlOgrx+kfm3zmLJeHVES1IVqWcA5FeiVI8jvkoAuXQJjMAUy/al KHGVnLbpGa2hCVoYMcmH6O1/qdZZSPn82ToE72fmzCBeCA5vJ5W21+l3xhoudKI4pZfcrn NRnV26Tfbik4GqfoHpclURLZfC3zQBU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288489; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1QasDl39udqF142inQM/Baaw9xGb/E/13xzKchOHRQc=; b=KG+fKVZEpMf5rvayl477QXc7Xu0eWMTzK9n9XYf9zme2iHEMxmRliBIliRW26nM4eNElBn 37jzZMyvOgIZtfZ16J1qtwxYtQ4jb949EHQEzPqjyAFbkE2RazJMPSD6xsyFzYztGEYhgl utvu5Ud4PVpkD5K0HmglahdgQNP5qCg= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-540-uQScjJGYOPuG15lgzbmW_Q-1; Mon, 30 Jun 2025 09:01:28 -0400 X-MC-Unique: uQScjJGYOPuG15lgzbmW_Q-1 X-Mimecast-MFC-AGG-ID: uQScjJGYOPuG15lgzbmW_Q_1751288482 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-450db029f2aso19626685e9.3 for ; Mon, 30 Jun 2025 06:01:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288482; x=1751893282; 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=1QasDl39udqF142inQM/Baaw9xGb/E/13xzKchOHRQc=; b=JgV7XQVNFr0bFGEpwed+1e3kJNsRLE1VmynfK40n68+Qc3ELStCLqW9/MkbBK1Io2h LYeIMw5kAxeAQySZkIfgqcFLu06tlSRqzVssfI7Gv+YB7JftvifjJxLe0e9gudOlp7W+ s0/N1F58Vapnga97X9p9qt6rTiJp2VLvJ3Xeeq937OKFboky15xQVR91NfiOkyCtdGRJ LF2SQYPFIdzzTmBnY8axVStTG3UBeDnkdYhE7l4i9dMTQvtc3r6v5NuFKfkRDIopk7v0 4YWMRaCFIFxzmt6fcoFJKwpUu1zWEFqcS4CxO0lUSG+Npm0FQjXJG6dkDDwkemv1MTfy LogA== X-Gm-Message-State: AOJu0YxjTmCP3oHv8+gBdiS0u993PUH7XCugAstrXVwSpKxa73VpyaqK yNNwhSba1oI0YJdgkMhe0jZz0z8btqFUxtcAIZeV45QzxNhf7mHGv5zJHm3zRHrm5b1X4Znimss b69vSJhsDPjYvupuZOffgUfJfjE+UhHk+gcjspJJPkjQlu6/kWNrd X-Gm-Gg: ASbGncv++Z/69FJBPrvMR2wAR90GG0JUek5N0T9q/+3Ocl7w749SdG6CJFVwbMsq+FY LgUS4rAPAeqKyqiVCT4Xz3axwTF1SCPo8t41jiXPsT9vc0ivtBc29s/TRckkksROrrjZoCVJzlP kI7BKoo74gN2Jsm5cxJdVfktHYdirkwRbpajzfkiahiBlNxCsBdiD3ul5PQGBfB0rpx49KI/Tfi f3XxBplzv5dCt+fJQHx2IEDq8NLXc3/uPMdr9ftS8vCtaTJ7+ax6MuDl20DiIkjd5clgjf7iio5 SG5oITm8p5HmvAGvWzoD8jEMORvfdNMqYKNq8A2kmoQNK7eoWJ01edB7dJ71v4/4gxCTNo4XJb3 6Fn0BiDI= X-Received: by 2002:a05:600c:8b6f:b0:43c:fe15:41dd with SMTP id 5b1f17b1804b1-4538f9b3107mr110835525e9.6.1751288481895; Mon, 30 Jun 2025 06:01:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBR/gPcUn8RUWOgibmcJHz2SRyFZ4ktYe9xvVAqHy7XBBioQHhn6lWeSN3C2mJi+xEdsRK1w== X-Received: by 2002:a05:600c:8b6f:b0:43c:fe15:41dd with SMTP id 5b1f17b1804b1-4538f9b3107mr110833985e9.6.1751288480607; Mon, 30 Jun 2025 06:01:20 -0700 (PDT) Received: from localhost (p200300d82f40b30053f7d260aff47256.dip0.t-ipconnect.de. [2003:d8:2f40:b300:53f7:d260:aff4:7256]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-453823ad0fesm169286405e9.25.2025.06.30.06.01.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:01:20 -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 v1 23/29] mm/page-alloc: remove PageMappingFlags() Date: Mon, 30 Jun 2025 15:00:04 +0200 Message-ID: <20250630130011.330477-24-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250630130011.330477-1-david@redhat.com> References: <20250630130011.330477-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Bbno5lMamYZXQdY_BIbkz33ZRZ1xQZZ8_Ye5iGkaOss_1751288482 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 733612002A X-Stat-Signature: 73qon3nh1wseoyzd7zk8yr8tar8gbxqa X-Rspam-User: X-HE-Tag: 1751288490-429271 X-HE-Meta: U2FsdGVkX1/iaKXfWzM4C/2HVMrzXLVclrN7OXoetHPmWWBmdl0AY4PdHfVYeaiAsuEd7C4VSfzvsNXHe3R9/R9QhBokiFYitF+1hiQWVIPyA/uwjv65iChb2n8ulbYNBGLhZr6/sklhmJFZ8aKV36CRHc4CSo/kwHFJrFVWnyY3JKFWrGp/hNnQBpjE3AvL07U/95FQmXO8phDnQaRgxWSvmXJOV2gq5MpFD4K6JE9W4W60deI7e4QuLrDA+L9/t9YK7iWcm8HyJ6uyVGdVDJTeYCzxvUDHnzabxKVoq2ZGBChQs1mMI8O3KwFdOLsX5bIt0CJx7o+mg1frbkzLQFBHG3fUOXOK5KVBxk9V9F6BO0TeeH2CSN7m1CYWFlrgYwk7uOcWwlkq9qO0/P7ek9FmBsBhXSM85nlrSczWx1TRtYikNCz2HncyKdmWl/r7AYIBSjmbtWknYsgUNv+u6XQZtrmTPGpmxNMRDdwk5JReRL925nHgsM2aMsGBzhcmg+XkGhcborWVLSW/au1Fy3I8hTq7VlVoiV+EZqejExNTHjG5nuXdREWfSr5rbJvhSFXaq26oSZSpDzoQ8ZKm3JbwDEObvscFavRsvJJlkKOcHgpWnIbPizCO8hSsogJIBf9pgW6bH30MdimfApP5nARrg7gQEFH4nAX8n1I42GGJ/oTXeXKEB7gy5+ZU6m2NuQqblq4iWEixEsiHz+XrzxyQxb3N9+BZlMT28OojfyYkcTx7OuJeLQOsx6Y1JXcgk5ItjfncBu0a6KLKdF2tVUYH9Z7drRTcAr3IT/g4InAguHPn54oJlbS6Pqq2arwy/e8unzo0c6eehDOh3t9zmjfmMDpr5KN3ec4TvzXXwnC0Jw6lFrpnFNaVc0xg/JIjip7GgDdyiCLORsJkTPrxEZNJ8zqZ9yYLTMcetL46LopYi7lpXjX4kjqozpHJ0hdfTaGCerchaEZXbAnUsxY HTpwtnPa uTW9vGrDJ85OcL71yC55kga3ktpeelnrBZ0DBU5lbkh251ZW4rP+nOAsRWYZ7SEuUKsaUIBJKz8l69GZXG5gXklsyZFhvRF8jF0YepQ81WIUodpfiL3ardKaJWRxwB0wrOmkfyNwFmrzg97U5Vm4fvsfJy4Pproc3UrP6sbFzvSgZpX2+vDhsXBXr30ZHAS5NHj0czvxeIatvPXs/GH6NY3NEUnWf+2e4m42tnzmQVK9aIDVucyyUw051o+yCAiR0IqDdaLCt6yz/ucF3Cl99krzRo7ypdICxH44UMqqC7ZQ9o/QNqstTYGDSHOJsZFoXJXl1RDrXTAD+NZy8k/XlP92OGpkb//OeoPuZ7zjTV4nQypB0agNKmcccNw2Kiu05Y3zYTyEYs/9/YOWr+UCHeT04ymKLtDD5VsLmBvxt1JhfvbkSS/RBo92W2FSTgH39dTHK+QdLyq9iDXZNBhxRHth9sWHmdpUyCz3efq3EUHrY/zDHtDMbG70SjIdMrhRIoeN1XmleJx03gZ3wg6cA1EwLnSMUiEbPrMCREuIPYlDl7Yb9cjpAbF3FtQ6CKRI17qft7/n9H36oVO888kcCqL6txxnq6ocfgoyigbJCJTYgtf1R6LX7lLeJoipRhu8rHA1ggcdVC0dBRE0= 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: 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 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 abed972e902e1..f539bd5e14200 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 a134b9fa9520e..a0ebcc5f54bb2 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))) page->page_type = UINT_MAX; -- 2.49.0