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 7B23FC8303D for ; Fri, 4 Jul 2025 10:26:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD4966B8037; Fri, 4 Jul 2025 06:26:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B85C36B8035; Fri, 4 Jul 2025 06:26:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A005B6B8037; Fri, 4 Jul 2025 06:26:39 -0400 (EDT) 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 89D186B8035 for ; Fri, 4 Jul 2025 06:26:39 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5967657F37 for ; Fri, 4 Jul 2025 10:26:39 +0000 (UTC) X-FDA: 83626203318.30.CCB7346 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 32F88A0006 for ; Fri, 4 Jul 2025 10:26:37 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KIrrLsaf; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751624797; a=rsa-sha256; cv=none; b=NgHVkFfeLSt34dbsr8f2KnjCk0d3IQ5QRLAoHRfB4GVxkocCXRviagfQW+bj2ZUWUTMytz cT5LwKWYfXP9NS4qvxXRVxKt8WA0dl1YIGKHX/kLXo+N6fTw4FtzJJ6UMD5eTZOaPDjfCd cEHGVdFd5ZqfYLXcRJ6+aWyyIIC3odM= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KIrrLsaf; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751624797; 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=fs/e8+Swpq2YGTbmX8ig9Uwxi9FIgSmYum8BwX+79CI=; b=mow6ewx8APjzH83jSph6vR3RpdXF/wrNMrl1UMncbIeSS1CfZqDueNAhauL1Ff0b3hljDc p/B9BwPgjAnjEi9XuWFr49hLhI6v/pp6LntKbiFwpWOq74aCkOfP4eXqOyIGF0NoBAuTJK y/aUrzlvQ1szLfwPVNMLOWI6jcO6gow= 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-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fs/e8+Swpq2YGTbmX8ig9Uwxi9FIgSmYum8BwX+79CI=; b=KIrrLsafLWEwinb8QBfjpPgA+xsBw/D9IFq/oi+AwHs+dvAY3T4vibKWeoXXMFLpRm01As N7qy+9iPfk7RIoxP0W16eo1345RKrbxMBb95/ZsayCTuyEwEucrp35DDRTELlketcL71Ri MgU4MPOcUQ5P6Qj9bRsMlCVY8R4PUyc= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-614-D3S8h356NUK5t9cVl6NoQg-1; Fri, 04 Jul 2025 06:26:35 -0400 X-MC-Unique: D3S8h356NUK5t9cVl6NoQg-1 X-Mimecast-MFC-AGG-ID: D3S8h356NUK5t9cVl6NoQg_1751624794 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-453a5d50b81so5456545e9.1 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=mqK72osYl2LLplIwPgK32QYwPrqxrKPtHzxEwZW/MF3skmsmXOKK8cD1ggIihoBbEE plz+yKdKyK3DtNW3PCJXMyYnC7e4RXo+thI1VvmnbLGJetbmebX5i3iOvMCxbWAsH3iq WU0jCkGxCCYFZSU5l/P0xdzQVzkKsCJt1Mu8W5mKUGiTkibk2sP97PWzoc5WS0YXlrMs X43nxXgbLu9AsUUPh9eF5wNRF53U8ifNQb05FyjhGZieGgwv107QQ3xuA0ZZqbunlY1+ 5a3sMH0i316cSt17zzGZrO2lKCGyF3WXj12Zvqo0v9QC6sw8xCc4FxyO5nQeidTKJRVg gI/Q== X-Gm-Message-State: AOJu0YySNTMM/BgEEUEpo7qBsBYqlH46t6zbXBntR8dWtxH4OeuL8Cy0 FoFKAHMiqr7x8JvtDjKpZg1YI2gdZ+NZjukzCbHyFe9ecf7OWuXZOi8A9kP83NkwMu5V+0AVdZA KwXsgVOraED9OX7/7CoCwRJK2fjQ26dGz6rGjhbRSczX6OFQG9OuM X-Gm-Gg: ASbGncub9VcpHJ+ORfxq6qTi0tyD+z7Qoc/cfZqv/2zsC02aXC8IuUIN4YpRTk1HrQ4 lT4uVPsTz0RM9YFnUvVq8714enTCxu7YjNsUYRWSMvW50nAk7rdtog1eDLNjRJeNWdvmGb82+qc ZsoW4+eBTdX3llNMC2DlqwM4EC1TdaFu24PJqlbh3X6TcBmW4rRrDSraxG/PNwCq0XmtJGPk96f w4xOy6rSfgfh6GN+dgK+QXSj11t3nG907VMqZdTQ7bdwhm5irzd0kp18VYS9c1Ps4IDvTWvGSH6 ADDRviBUde1EOsGnzi4JESzy+DIep/NgBG27vR1AtSLqU/tGU4Rr859p73oJWbM6YVH9a0gAbzM 0WBmiFg== X-Received: by 2002:a05:6000:24c9:b0:3a4:e667:922e with SMTP id ffacd0b85a97d-3b49700c540mr1015591f8f.4.1751624793952; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ouJWR2udOtnfoBa_tDYFhrL7k7VTrVCMiZFHiGLamB0_1751624794 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 32F88A0006 X-Stat-Signature: czsw98mfa4d74ge3338b7sfzaan8uybs X-Rspam-User: X-HE-Tag: 1751624797-339075 X-HE-Meta: U2FsdGVkX18u0u1WDWCPjmDso+BDcMcQF3ecPn7tQhwDx5MzkbSP/MZdyRrk30UfMfQR7gnoBHMoLu5SMYVOAtcUOPHXhjsCTsZkFMFI40UHxOsCemjV8dEHPeSyuQV2OcGLzmMsJpvNPmvGMEZ6dXCEUAjfDAU3tgnvMfph1oQvzW0hEP/BAmzZny5kvyJbi57Nzu1rb/ORmg86TdPZcNWuy9cFYGLJeeC6u2w9jLGInulh7R+liQ4YVEKiDduY+c/RPIahl81g7OMy2Y8D/3DRDBH6oiT/3Cg+s3gax1Mrys11xRYkqMF4uxrbI1bMZlwQMMhA9sdujhOUfTKEZ4ixtFh3yEM0JylTvyBZC8Y/+RLxSzqdtg2zWuKvuczm1l3FZ/RqkryPRU90Nl5CRbIkuSQlNaGo6FakeWnLYLhs7csHwLCWopp5d7bpukLUOs9JW5l5BuhEfXXSv1DfQnKA33ub8QlsW3/qAz36xG3OJTpqPGsvYrOOkwvLJtxJm3xtpaYdqcCZgrULam8HjAV7PrKw2tEgaQrAwjlenw+59c+zIsQoJCvLoRbvB7lrpLfz/sszmWRd7lVIw41vmxZMvMWbkdA4ISpMAzpnMDCCWFHF13fBy8lIRwlH0eX+nSZXFZLY81GCrkMfSrRpH9KLGc/K4lgT9jdDm1ytLyj8DuaJ0kHBarip9Xr+CsWFWHC35qca0nDjrz9AciqRS4Mgf0aHkR7izmMS7RCHMA7WHFlrHC58okxZKJ+BNxIdr8GlapLnT79iT2PvcYmYPYAA7XA58QdICZx7Ac2wqyBwKTtyOr7tr05XMukAhDrm8qhjxuSBXRYWx1UL7+Cctd1zgB+ZrancOFEsdOcWqQKS97Ztt7E1jwQUOzg1opiIAFFzIrnb3Ta+ORi7dghXhLeJ/FWy74tG5IFisocRBVOyCzp7og1YElFu1QcutwEMe1hg6kJG5aLMJif2bYa AgxNcICE K1y+mE9F22qAQyIhOhDKaRpchxiAhQR9Y/nvPIx8g4SCWTaUDxE9JJ7vcPdg0SzeWllCC0tUm7T+MzjP/hLtTKQNqLf8qAxonnKe/l6zA6zy8XIJJ8fNBuYFQp2B9AIv2IT0vz8KMGIN4OKlE18jv2DafJiOezeWGWK1MBgiyVqU/CUCwq84F41tazp0h9ZtWq0DOfsbkIFuNFUreqCRVnvlTZ+pWLfAHsS2+B7cVzIrhS6cv20YyEM8KcHn7jbM+dzR6oR3i6vQuRxT6GjqTqvLF1oY2vXeV5pb4zSSS3VoOSftCCeRlnk1btj+d7DUQ3Uy2akkJDI55STIqDCGsfVhofqs4sa8vEFcylhNSEwObrdphDPi2yaB8uLx45Q9cJGxE4iQr+NtX3EgzCaPMTw8QZxARG1XuFret0+fRTal+zDmjklRWagtFcoKH9r7JDgqRQeIYGA6EFpurQ2lZrbCU+/WyFs5znxlTY3dfXanIooGKFRPM+QCS1tQO6Rg3sKk2tGO6iJblx6+iyAAbrpPRRLfPWenOWyzZn5nh3qQ8HhLTGhCYr2EjvE5sdnBLsPYSmbZlYTw80sHIgvrpXonbCYbjUEh2BLtOkR1L6AaFx3/ZKef3ADB6Mb3iXK2jz27UcCbLnfgz68V/nQQ7X4hEiV6WYj4lZ/97 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: 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