From patchwork Tue Feb 11 12:11:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13969533 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 470ABC0219B for ; Tue, 11 Feb 2025 12:11:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC47E280002; Tue, 11 Feb 2025 07:11:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A4D55280001; Tue, 11 Feb 2025 07:11:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C805280002; Tue, 11 Feb 2025 07:11:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 72592280001 for ; Tue, 11 Feb 2025 07:11:35 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 372374AFC9 for ; Tue, 11 Feb 2025 12:11:35 +0000 (UTC) X-FDA: 83107549350.15.DE5C35B Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf03.hostedemail.com (Postfix) with ESMTP id 5ECA120008 for ; Tue, 11 Feb 2025 12:11:33 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=TizCwCla; spf=pass (imf03.hostedemail.com: domain of 3dD6rZwUKCOEWDEEDJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3dD6rZwUKCOEWDEEDJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739275893; 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=jVWwkw4l/C0CQ72V45uYNbZ5qQP6QRpYAD9vOGg0YN8=; b=RqrtNE4gXQeqI35I6RLBgr4sLI98i3lwybt9qlvmJFcqz4pCv5lQ6l+QMaP7BQkbqRYdk5 eJjOyx0k38Lysp+oBu5+YxAteU9KviqmuQb57iuXJE4QcijMkjH7ru9TKc5/9lNjrCcx4n 2SGb9W6TR9LsOWCDh6Z3O1Hc4VJq7Tw= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=TizCwCla; spf=pass (imf03.hostedemail.com: domain of 3dD6rZwUKCOEWDEEDJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3dD6rZwUKCOEWDEEDJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739275893; a=rsa-sha256; cv=none; b=UFINraciOmowWmHzShIDpCCLPYuhVci0QZ6aUV2GPs+vkCGxhmChQNjQ9jYcNHExU2c/TF RYkS3m3IQ81qN41AifIvyxLfmmkL0YjD8LKBanW9rG+hBrQwxEGOCvQ1rhgkmpcw5AddcW 6Yb2JVYrhXRDX6k9SlODNgIuwRkx/3c= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43947979ce8so9215855e9.0 for ; Tue, 11 Feb 2025 04:11:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739275892; x=1739880692; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=jVWwkw4l/C0CQ72V45uYNbZ5qQP6QRpYAD9vOGg0YN8=; b=TizCwClaxCBrdxXBInLdHGzCFsmMxBiTVXpfiJSb3FAbXHmn9RbrbxX9oArcETNjAv 923xq2cFjBZz4jyF2CCxf9Y7s313/k6iLNDklGTMBK3N+RijrM/1wKXumOdNDv/h7yeb SKpUa5uTCi3yTnmdSPDYpWIqRmXGeeUEn0BuqwBslLqnmqnGMDBtrRG1+xptDVknfQby j0XfzlKlF1rD9wyleFzgY0Q+bR5ryHZITcZz9C/BsgdrcajWacNUZNRyrKp5TrhirTRd 82y5xhhnmlio7KPZxpSWT2cEoP4dJcZLlsV3ULwr7zbD7jqZ4Woy9fM7sQouN79gME3L qQ7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739275892; x=1739880692; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jVWwkw4l/C0CQ72V45uYNbZ5qQP6QRpYAD9vOGg0YN8=; b=gh8vHsRdXPGq9vxShhK8yVmDop97NRNxfq7bn5XJ9r3KjSmxl07axBjPgcaamV+FfQ 6Vzdwyq0XyPx3D4m4f2wIvmkSs863o+hVX8rgu/HEPXgmZBmGc2dDlwEInONQZQ2Xaud 8pmf4f5OakqIZ4pMs/+Qc3Q0ea1hEzLEMYZGYFDJABzfpMQ4gGshNKM3zkllLSdfvaVH vGlrESKxt2JlAv7pWrwoHS7fH/tz+Vh1k3hy0rRYPpeQtdsNK8WdxFbeODsO1zSD5f9T cXOPGLYTEcinD4zAhkHeOx0T2dgjXa/D0ICvAy+FSgiFN0+QMvcHHe0bmAqmO0GWYPyB BvqQ== X-Forwarded-Encrypted: i=1; AJvYcCW+DSiDonMKtFpiAa9dql2y1lEmrS29FKk1L86n1//XUe/3U/eCu+s2FVV7gEUiDQSBKatoGx41Tg==@kvack.org X-Gm-Message-State: AOJu0Yx+q3IORAlslLApTI5Ybwe/gR327IGGmJW9F4rZHcg99Oe4o7vs zk01volwAjRUCkThyIQdkFONJ/r0zqyChtp0LkaRfmTqpqztpx2k790x9f/GFg87Lyy0wYhUcA= = X-Google-Smtp-Source: AGHT+IG10/vN0gzRGJ08Wn/qWLjVjCNkXjXTKTCGAHZrBJMQnayK6w5tSeoK7viwOkkpLU5EQQeSBy5Iyw== X-Received: from wmbhc10.prod.google.com ([2002:a05:600c:870a:b0:439:4cf6:9186]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4589:b0:434:f609:1af7 with SMTP id 5b1f17b1804b1-4394c808849mr36671125e9.4.1739275892079; Tue, 11 Feb 2025 04:11:32 -0800 (PST) Date: Tue, 11 Feb 2025 12:11:17 +0000 In-Reply-To: <20250211121128.703390-1-tabba@google.com> Mime-Version: 1.0 References: <20250211121128.703390-1-tabba@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250211121128.703390-2-tabba@google.com> Subject: [PATCH v3 01/11] mm: Consolidate freeing of typed folios on final folio_put() From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org Cc: pbonzini@redhat.com, chenhuacai@kernel.org, mpe@ellerman.id.au, anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, seanjc@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, willy@infradead.org, akpm@linux-foundation.org, xiaoyao.li@intel.com, yilun.xu@intel.com, chao.p.peng@linux.intel.com, jarkko@kernel.org, amoorthy@google.com, dmatlack@google.com, yu.c.zhang@linux.intel.com, isaku.yamahata@intel.com, mic@digikod.net, vbabka@suse.cz, vannapurve@google.com, ackerleytng@google.com, mail@maciej.szmigiero.name, david@redhat.com, michael.roth@amd.com, wei.w.wang@intel.com, liam.merwick@oracle.com, isaku.yamahata@gmail.com, kirill.shutemov@linux.intel.com, suzuki.poulose@arm.com, steven.price@arm.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_tsoni@quicinc.com, quic_svaddagi@quicinc.com, quic_cvanscha@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, catalin.marinas@arm.com, james.morse@arm.com, yuzenghui@huawei.com, oliver.upton@linux.dev, maz@kernel.org, will@kernel.org, qperret@google.com, keirf@google.com, roypat@amazon.co.uk, shuah@kernel.org, hch@infradead.org, jgg@nvidia.com, rientjes@google.com, jhubbard@nvidia.com, fvdl@google.com, hughd@google.com, jthoughton@google.com, tabba@google.com X-Rspam-User: X-Rspamd-Queue-Id: 5ECA120008 X-Stat-Signature: iq8qusncpdbaxg1a7h35yd4o5psta5t3 X-Rspamd-Server: rspam03 X-HE-Tag: 1739275893-298615 X-HE-Meta: U2FsdGVkX18GNhXs7xEvwpWBIR/QYwPbyh/3O1y46H5fV2uWsuwn1Jzlfn0Z1t7ibj6LnB+5bZ/MuPjwfJ+aIa704MqxaX994hNdAxsoW4AzMuIq0MY0CanDpulum5QmlGnPdGHUomnwKTM5zYMYQGWQI0Vwk15op3lqEoza9IwBu6Otj7kBMuudfqzD+upmP8cubQNcxohJwBCj+LMPxHIz8UdaW4vjfAifpSeOUC6uv4K5+VMSNgMSIr05uYvocTF5z7nycN6irzbzvDMk5phqpo0nRPlJywoA8kbn6s00mw/SQaHRRn82t7IslUA+lTsVY6UM/FLz0p5zQqby7otbqB59/tuTjuReaLnaKbBanf6rh29kAQ99yG0+IkTTe5IECTQziRTHdLkGhAfFiYWrxJLiaojRCZgKp8itHs2kavjm2iSk+saZJ6Sz0AemWdiPD+lC9jvZ4USLRd+VxLeR8Rk+6CSlPFUbPyO1faVdPcONuKFwfwm1N/Hx//PnPHaBwJSRdb0fzFpNRclHKh565VIecIXBz+OaUmphfwRsZEDtKgNfsS+SXnSf/0iCy0estohX6KXBbKObDsYkTJ5gdfJPtrLkYEfuM+9lm+iM9M1hflsH9EOePQJCGWyk4SjtbKfLW95fpfoyF/6xpWeBouOrd4TxbsD36PDDfbxuEPFXqIP1FmA6mq0Fp7aBm78SYv7x3mgm3ruUyUcLxYzDatm0vpORRDPyPdo/CguxI2dsxQbb1QlZZsb5f18uvF5dpWfjn5jKS4UdK1TV8taNF5fkotuFXuerCB/mMO4ZettWmocbIQWi7cT4lRVHZ4eXaij40qMCDQubX3oO/6CPRKED8/LKCwO/zvG1Ls5Ios6n4CZWOYhyxu1xdu2f/D/RnnzcwVLeOFgSP/3QpN0sSe/DjNVpfdzRgD+zPs3KuZRp31fZLpqAOcLQkNj8pJ5TNfTWmlg1AQ0P+OI FHgN068A SptfMDXmhgwaEb4cRgM+Abe3XK9wEkpIcO7MGq7JrQ8LFieaTHKj1jEp8194YCxGNbDDofYWgkA4T6fLJrZvsGWy/ZaCn8de4cT56nHEP+aAvbluhpcLmnflc9UK6knOah9NpZ5SyxdrvVsrPmv+UFYBvOmN5xK6BKC03bi3ABnD7IRAd6IrSWij5oqeMT/E89ih/CYd39zoMr+8HHolu3of2LtT2BjopeAddmxAuetrKk98nQvoOkZ9O0Pnd3L4zAUW2PWFlqH9zHc/rMK9tYledQ5vF6mBJ1d88QBBUYE0EgU9g3W1z7wDbi8I3Q3DbyP2jZqwpDtCVj6YaBB6E76HrOTE0hoxVhxkhVeqofYV+8DI1zH9pstp+U3n+4qqOdh08QfJs5Ye2LVRBExMLUNxcOmPtTLNFZcu/jtFtViT2kh/aNPT1ZHk65PcCfvfeGtr66GGHC28tcAA6eDhnFS2Y01SPBTJj0uqBg0/YPktLEDL1s0qnUhGtVoEZM5ld6lgb7MmTD/mmX+erYmPtbVP8ceEFLPSsOYA2N61KjTmD/XBZXyK/4EafPRHyHGNlXXfGW4ZzkU3Q+VLr3qsaYn2MR9zBU+n1Hf5Lvf+YMnaDUqy3T5u3sj2n4NUu4F3ILwQOiFZhgyGy/1mng8VEknG9HQGV8T2XeHTXNppFJ1ouhX4= 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: Some folio types, such as hugetlb, handle freeing their own folios. Moreover, guest_memfd will require being notified once a folio's reference count reaches 0 to facilitate shared to private folio conversion, without the folio actually being freed at that point. As a first step towards that, this patch consolidates freeing folios that have a type. The first user is hugetlb folios. Later in this patch series, guest_memfd will become the second user of this. Suggested-by: David Hildenbrand Signed-off-by: Fuad Tabba Acked-by: Vlastimil Babka Acked-by: David Hildenbrand --- include/linux/page-flags.h | 15 +++++++++++++++ mm/swap.c | 23 ++++++++++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 36d283552f80..6dc2494bd002 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -953,6 +953,21 @@ static inline bool page_has_type(const struct page *page) return page_mapcount_is_type(data_race(page->page_type)); } +static inline int page_get_type(const struct page *page) +{ + return page->page_type >> 24; +} + +static inline bool folio_has_type(const struct folio *folio) +{ + return page_has_type(&folio->page); +} + +static inline int folio_get_type(const struct folio *folio) +{ + return page_get_type(&folio->page); +} + #define FOLIO_TYPE_OPS(lname, fname) \ static __always_inline bool folio_test_##fname(const struct folio *folio) \ { \ diff --git a/mm/swap.c b/mm/swap.c index fc8281ef4241..47bc1bb919cc 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -94,6 +94,19 @@ static void page_cache_release(struct folio *folio) unlock_page_lruvec_irqrestore(lruvec, flags); } +static void free_typed_folio(struct folio *folio) +{ + switch (folio_get_type(folio)) { +#ifdef CONFIG_HUGETLBFS + case PGTY_hugetlb: + free_huge_folio(folio); + return; +#endif + default: + WARN_ON_ONCE(1); + } +} + void __folio_put(struct folio *folio) { if (unlikely(folio_is_zone_device(folio))) { @@ -101,8 +114,8 @@ void __folio_put(struct folio *folio) return; } - if (folio_test_hugetlb(folio)) { - free_huge_folio(folio); + if (unlikely(folio_has_type(folio))) { + free_typed_folio(folio); return; } @@ -966,13 +979,13 @@ void folios_put_refs(struct folio_batch *folios, unsigned int *refs) if (!folio_ref_sub_and_test(folio, nr_refs)) continue; - /* hugetlb has its own memcg */ - if (folio_test_hugetlb(folio)) { + if (unlikely(folio_has_type(folio))) { + /* typed folios have their own memcg, if any */ if (lruvec) { unlock_page_lruvec_irqrestore(lruvec, flags); lruvec = NULL; } - free_huge_folio(folio); + free_typed_folio(folio); continue; } folio_unqueue_deferred_split(folio);