From patchwork Tue Mar 18 16:18:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 14021236 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 4F9ACC28B2F for ; Tue, 18 Mar 2025 16:18:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58555280005; Tue, 18 Mar 2025 12:18:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5096D280001; Tue, 18 Mar 2025 12:18:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D154280005; Tue, 18 Mar 2025 12:18:29 -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 21D52280001 for ; Tue, 18 Mar 2025 12:18:29 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4E22F1CC877 for ; Tue, 18 Mar 2025 16:18:30 +0000 (UTC) X-FDA: 83235179580.30.A929C74 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf18.hostedemail.com (Postfix) with ESMTP id 6BAAB1C0011 for ; Tue, 18 Mar 2025 16:18:28 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=S+UTRn8z; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of 30pzZZwUKCLcqXYYXdlldib.Zljifkru-jjhsXZh.lod@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=30pzZZwUKCLcqXYYXdlldib.Zljifkru-jjhsXZh.lod@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742314708; 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=RUG6NztbLFLzDS9xNltsNQX8q/i/r4KDCgmt5mBPitc=; b=llJoZD6FqJ0zunygiBgzBjzNbT+c4c3EGKdMJlT6P52xPWE/heCVUxcq7vAsMGx8Rt5nq/ pKfTIhTJaEcE7wJclPBQ2F7G6EI8cjW0ghR1QYVEmQYk2Gq+7PmwAAmA/6+1jxSAPj7UP+ BG+lwX2+bbNougUZLXE97UAnnsleGCE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742314708; a=rsa-sha256; cv=none; b=j5FAKhHsl1CfppLqtb2a9bD1EzaYsOlX5TT1RPaK6g6FHTkd516oVz2mdaAbmMEe8XzSU1 H1Bktk2hzBEMkrk9Xk9TIgpMkgu/sGIMSfeqEAbYwhatufduDR0d41pJRLCjkteNzG1dbp iWlve7B2HUj/l4LpkkEulJF543Byty4= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=S+UTRn8z; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of 30pzZZwUKCLcqXYYXdlldib.Zljifkru-jjhsXZh.lod@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=30pzZZwUKCLcqXYYXdlldib.Zljifkru-jjhsXZh.lod@flex--tabba.bounces.google.com Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43943bd1409so23508075e9.3 for ; Tue, 18 Mar 2025 09:18:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742314707; x=1742919507; 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=RUG6NztbLFLzDS9xNltsNQX8q/i/r4KDCgmt5mBPitc=; b=S+UTRn8z2ySn0iSmr6gwego8k+K4DefxNU5tGXmJobpTVga9tqJVJYWr6BrLsJzRKI JeJw9XPg7Ze7BYqxsQ+wqN5X2OM+ETiAjm57/sNiimAwZDilKNf38rslxzTqdSxZH8t2 utN3r8u8uBLfvgXiCWNtCduG1ZVtkcOWsaOOpB5V7Pg88aA9bOrUkv9M+gDBnRas3oks uejPskOaNYsLzLTEravdRvCeQcUFyLnceb+w71g2RIj5mO2qT1/ohkK9C7wTHvhjlKqG CjGtCbtNWiU1zBtp2MCN8WOJwFTuoWuHlRjMS4T2pEjufiqDhHRgTLvwCXy+gxlhZLis A7aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742314707; x=1742919507; 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=RUG6NztbLFLzDS9xNltsNQX8q/i/r4KDCgmt5mBPitc=; b=JqxDZnaDQ/zIkmpY9F1mrU6GQ+L/Q5d8QVzyMY91J1EtLT5pDFQHhOpHG/6RWtu6r2 Zb9fiT1rnsXIec4VvP47mrko2yCEeUfM1esJ+tpPjpNnCweCL/Q/Z1qZ7emhMvVsuZ11 YLHABkNQC1WLrajLEN/P2t4nJs02KQee7gUkM+b7ALT4+dgdMhL6THK3firyOJyH4UFI Ha1mQFLIbAdikywEPIkiUn1qbh+7P7XNk5pTAFt6ffN1ohvhtB8hEx58CTXt+xyFaN/V i5r0nmG7HT4+ggjYs0e7JiJ/oYAuwcO9Isba+RG/Xo7UrCInlMg9MLOO0dhhEMxRyWo3 hm5A== X-Forwarded-Encrypted: i=1; AJvYcCXi8ufgOZmqxUj/1vIAeAdzseGBWb4o/jiGnpum7+M+ES9QT3QFAEWVELjIOXwAp2wUoKxEGrqFwQ==@kvack.org X-Gm-Message-State: AOJu0YzgWRCXR2OQz2Pyu4OPaTsfI4HBoBRXVnCa+DGwMVFuVBpuGQ0S E7Y6ibO3g6aoJyDg2K1GXe2AZeC1hl5DJKoMtpMQ46M9gtIGrOEY0qNkFhr1DxWjCddgu1aFqQ= = X-Google-Smtp-Source: AGHT+IGA4buFW8D/i7of1JJ/CaW7suQpBbUbSZuYhIOMvxS1NT2RYw+WVnJcFCNBlIIk3X2ZUVPHPmOwRw== X-Received: from wmgg28.prod.google.com ([2002:a05:600d:1c:b0:43c:fcbd:f2eb]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:468e:b0:43c:f81d:f with SMTP id 5b1f17b1804b1-43d3b986350mr25234125e9.8.1742314706944; Tue, 18 Mar 2025 09:18:26 -0700 (PDT) Date: Tue, 18 Mar 2025 16:18:15 +0000 In-Reply-To: <20250318161823.4005529-1-tabba@google.com> Mime-Version: 1.0 References: <20250318161823.4005529-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318161823.4005529-2-tabba@google.com> Subject: [PATCH v7 1/9] 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, 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, peterx@redhat.com, tabba@google.com X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 6BAAB1C0011 X-Stat-Signature: umbkks7e498kb4z6enpyk9m83dqooty8 X-HE-Tag: 1742314708-466372 X-HE-Meta: U2FsdGVkX19c8tVcv/kzo2h54fslJhXimmtQgpRoJt40OcjMd8K+8pR9zdczdmdpf7c8xyvWpRP5xoc2+rlAOMPL9fHib/jC3z+F6ovPRAdknKg7Kn3u0Beg/4liSSRyIWDm8vJ9q21HVCrxwtF2GelRwkPY2mQGTVbTts1uSCzWZ0pHqj3yL1LoXXcyA3pdxu9xeAH+AQy9m9EkcVGoVRp43eW7ecHEE6MZTmnpCOU10oAmCikJGqKrzgpj1NDshUsqwR526hqwxp93jrwmuYFatgxTHmX8CEuqjBK/z+gZPK7oK1103/4dY5YWiYUPk5/Kt60qtCqCLdENYi2aiD4dgsaH5+2l3PTwsuS+krr6PabgBq2VXXT4hew3kKc2tAYUz5vCuj4UjIWYc0dSmEtIFbgk3dEtB8l67wXQYFGaTVBAgO906ba2hL3DACFUO3POBLy4tDOQqEQhD8S8zFYj6htoWh2X9SqI8/GXAZfPyZeb8djXqDybCPDhsZsQjOylN5/465XTp63gU4E1cA4b5Pg5je9JDqPwgmqWAJu1RdJqys9ydS7tmkyQqXV02hTJVFAisMg7O1fZAKF32cTtMVRkV5a9LcwR038rUeGtF+Ku+QZM7+mHwLLE2ouqcKIhpeXjFFdTlvH8a4+RkOImT7FOGBDKnm7TR7AYxpUeb08M/zlROzG9IpcHhqpiAFpLJTA+4h2hWgJmNvNaR41Pma4xBtJIqEAWUPEMVfDwR/R3PThdH4gdeEF+VXPsmPJiZR4jFM0ozJJl7pyrnrXss6+GpZQMJmZfQqh3qevbidq33Pa06RXhIedqAEmqbb2DiFZDfVPwu/85szmev3IQJZ3Ex2WYGhWSojrkqVLK8Gm3UpvwBuLMJgOlqxgf5GBeep/vAHVObJ5AzBakRu/8x5dBWjvSaZOsUHC+rFdUvIgLZ1xMhrH7jPdNDI/7ZJcrunzx+5oeL0MNv7c z73YVvss lHU6IxOz6biDxP6eLl0x9FDgbfk1DJY+RaCaoCmZYEm+A1RadT3Cb19sucHHzh6Ocy+hm/Bh/zthJSw3ABQMPXaFrHJeBGvPtM+X9SFrMqWt5jXBr92sjhvTKXdJMNBwIoX+rR5KcLxkfm0A74PJKjqpuEDqwN9nC/CFbNwnNC+ISyZkr7T7nGu+GRjpUzpqsHP7zob3PYN9bAQGCLUweffoQEmgwUWHqX334OEnOBFl7I/sXSk+42e7Y1wxySQY1/x5adiGUl3RtlAE/iBfss8d1qixEHgPksJ7WO4C2KYO+G8vhG/H0DBXrIh0EPYd0JqXvLXVgnjrWII5go25JDyiDrbGxQ5u4OBgw3DYy1qmjt/AV9rp/YzoHYer7owBmTHSzx/CShEPyR5GHdPGGC81vqrmADSsO5FiUoczAsbAri4FNRxOqif03mxHoOlaOl75Ck2jRV9uLoIjPyDI6oc0EcpXJQSkLh1dUbALIuljYrmhvW4fI0/VICzLe2adblQeb2aCxN06/gusGuxHk30p54ITj89MpI0Y7KR2wHBSR0UpjWVWuMXqQjY62WpPriCqCSZZqnm7o5lMePwh6MiyZJelXU73bOjMbFXKr9Ek8jlar8xaM0fslOpcIDZGKeWdQsD4xiPYsNpXftc5nnVPdvnCEXORw4GRUN9NrLVZB1N0= 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 Acked-by: Vlastimil Babka Acked-by: David Hildenbrand Signed-off-by: Fuad Tabba --- 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);