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 B0327C3ABDA for ; Wed, 14 May 2025 23:44:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BBE608D0007; Wed, 14 May 2025 19:43:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B47C88D0001; Wed, 14 May 2025 19:43:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 973AF8D0007; Wed, 14 May 2025 19:43: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 72FDF8D0001 for ; Wed, 14 May 2025 19:43:39 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 94B915EF4D for ; Wed, 14 May 2025 23:43:40 +0000 (UTC) X-FDA: 83443143000.08.1C95A09 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf06.hostedemail.com (Postfix) with ESMTP id C2A58180006 for ; Wed, 14 May 2025 23:43:38 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=bvsy91Jc; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf06.hostedemail.com: domain of 3qSolaAsKCNo68GANHAUPJCCKKCHA.8KIHEJQT-IIGR68G.KNC@flex--ackerleytng.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3qSolaAsKCNo68GANHAUPJCCKKCHA.8KIHEJQT-IIGR68G.KNC@flex--ackerleytng.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747266218; a=rsa-sha256; cv=none; b=5H7/R1NFKAfqy/jsQCfsZSZAehpJyh6nWwvnQYUNkhEMQ76bh5denfzQD9RbIGqolTXnS0 nAtTxa9zYqk9W3rUEQywfZGkei7rltEwk5FzJZVBX26YLu+FnqUJ7gIlAxWedUVFYak8DS bUzEMTrdcv8hD51rsvN7nAiMZq/4mZs= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=bvsy91Jc; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf06.hostedemail.com: domain of 3qSolaAsKCNo68GANHAUPJCCKKCHA.8KIHEJQT-IIGR68G.KNC@flex--ackerleytng.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3qSolaAsKCNo68GANHAUPJCCKKCHA.8KIHEJQT-IIGR68G.KNC@flex--ackerleytng.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747266218; 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=tTxikc62gZoeyz7SAyFK4qZ9SsMpsyITZnnPziBCTKM=; b=UilcO51V+HM/6MbBAUagKPJfjf1fH3AYHlY42XGwmrkNvGkOshJHb+Qd/w2HnX3Rk0M8CW jxI3kxQukds2TDyQAEI1sPL916wUFNboDX1Z/BnSYJCL9NP/nXnM3T2kM6nC2FrRqxmSLY tQWenLTdaoa7fhQnl55+Degla2elXc0= Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-30a59538b17so323859a91.3 for ; Wed, 14 May 2025 16:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747266218; x=1747871018; 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=tTxikc62gZoeyz7SAyFK4qZ9SsMpsyITZnnPziBCTKM=; b=bvsy91JcUd8RipJQk3bZP5p9/RyMUYCwMXFM5wHQulpcq5rtO17Su2miecrDtYQf8e lbg3PtKN0h8QqvFglMCGGXiFlftoEeAAvnYZdRHcSl7xVnJnbSaBZu+2a0qqj3i8wAGi xl3XbwPxbj+KqDYzHx7ndFE3s/M5AoU7X6T451kgFUBboxorzz36dgL2gRDktdEUnn+r XkovshWI2pEQX8tKYZVqc4p+VGRhgTNruE339vPEViMt3h2/Gw42bBumfN0WFmlEUyBU z4e/kcTMsByg/wPpZiBvQgalt0IOlxYenEOohslupMW8bxPxgHvcbzDO5b/MzEyRLXN8 2mbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266218; x=1747871018; 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=tTxikc62gZoeyz7SAyFK4qZ9SsMpsyITZnnPziBCTKM=; b=Gu/BEwvWje9Y2FIGe9E3C+GH5h3ofHreFEnTd1VVaLDM6+BGU1AcM1hC+7GSTheTga 17fdzHYaW3mGwwTpD3hHS3poDmNLAPyrY4ydzCtm/fzTYJ9jwQg0mv9FI8yCQLDd7Leo WgHXW+KVQNKvXUoZsZ08o0AgoM17xwszejRw3JdMXBqW6WTWPvR3HKZsF5a9PjCy9sJM s+/m8U/bWXc5YUO34cJAhLfdkDuP3yoTVQdx5XMtyT4PaPP2SpRkmPmcZ4ZkRgDMoDwA DDdD6cJ0PJ9vY4zwlV+uLLbfzAthO74WgUD88T2Ona8gtOzsTOL4BRaKuVtkJdtsFZV8 uejg== X-Forwarded-Encrypted: i=1; AJvYcCX0+DIHeVJdLiyfq/EiGVdjFTYc0d5BaE4DT3I9qLATDl3I5nxIOSv4qEZeGbS6j5avvZiwxNx66w==@kvack.org X-Gm-Message-State: AOJu0YwoqGoEntwdcnqykyr9nVcCbqCbEz3XGTqf+ZlueZZyMtCBgE6t rTqm29s/mtgmEecYWGWmPNKyEVrPt46A8rmbCZej2FsTWMFQXSu7P2/fdQL5m+y5bG0Z0KlbBCa QWX9lEcXCMk2QcWIf1QHEiQ== X-Google-Smtp-Source: AGHT+IElJzF9b5y9iQhVl4MWgA/5M09NCf7n3sHbhDGMjoGMq56uDKR3Aes/09IOTbaGDebGEYQU1jlk3yzx6ggjqQ== X-Received: from pjxx15.prod.google.com ([2002:a17:90b:58cf:b0:2f9:c349:2f84]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2d8b:b0:2ee:d371:3227 with SMTP id 98e67ed59e1d1-30e2e616623mr10140667a91.17.1747266217551; Wed, 14 May 2025 16:43:37 -0700 (PDT) Date: Wed, 14 May 2025 16:42:05 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <3a897dc919d25951816cba95dd53bfeb2ea6e581.1747264138.git.ackerleytng@google.com> Subject: [RFC PATCH v2 26/51] mm: Consolidate freeing of typed folios on final folio_put() From: Ackerley Tng To: kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-fsdevel@vger.kernel.org Cc: ackerleytng@google.com, aik@amd.com, ajones@ventanamicro.com, akpm@linux-foundation.org, amoorthy@google.com, anthony.yznaga@oracle.com, anup@brainfault.org, aou@eecs.berkeley.edu, bfoster@redhat.com, binbin.wu@linux.intel.com, brauner@kernel.org, catalin.marinas@arm.com, chao.p.peng@intel.com, chenhuacai@kernel.org, dave.hansen@intel.com, david@redhat.com, dmatlack@google.com, dwmw@amazon.co.uk, erdemaktas@google.com, fan.du@intel.com, fvdl@google.com, graf@amazon.com, haibo1.xu@intel.com, hch@infradead.org, hughd@google.com, ira.weiny@intel.com, isaku.yamahata@intel.com, jack@suse.cz, james.morse@arm.com, jarkko@kernel.org, jgg@ziepe.ca, jgowans@amazon.com, jhubbard@nvidia.com, jroedel@suse.de, jthoughton@google.com, jun.miao@intel.com, kai.huang@intel.com, keirf@google.com, kent.overstreet@linux.dev, kirill.shutemov@intel.com, liam.merwick@oracle.com, maciej.wieczor-retman@intel.com, mail@maciej.szmigiero.name, maz@kernel.org, mic@digikod.net, michael.roth@amd.com, mpe@ellerman.id.au, muchun.song@linux.dev, nikunj@amd.com, nsaenz@amazon.es, oliver.upton@linux.dev, palmer@dabbelt.com, pankaj.gupta@amd.com, paul.walmsley@sifive.com, pbonzini@redhat.com, pdurrant@amazon.co.uk, peterx@redhat.com, pgonda@google.com, pvorel@suse.cz, qperret@google.com, quic_cvanscha@quicinc.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, quic_svaddagi@quicinc.com, quic_tsoni@quicinc.com, richard.weiyang@gmail.com, rick.p.edgecombe@intel.com, rientjes@google.com, roypat@amazon.co.uk, rppt@kernel.org, seanjc@google.com, shuah@kernel.org, steven.price@arm.com, steven.sistare@oracle.com, suzuki.poulose@arm.com, tabba@google.com, thomas.lendacky@amd.com, usama.arif@bytedance.com, vannapurve@google.com, vbabka@suse.cz, viro@zeniv.linux.org.uk, vkuznets@redhat.com, wei.w.wang@intel.com, will@kernel.org, willy@infradead.org, xiaoyao.li@intel.com, yan.y.zhao@intel.com, yilun.xu@intel.com, yuzenghui@huawei.com, zhiquan1.li@intel.com Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: 9t4zruwhja13cfpqkt85q9oz7tijfdc8 X-Rspam-User: X-Rspamd-Queue-Id: C2A58180006 X-Rspamd-Server: rspam06 X-HE-Tag: 1747266218-786166 X-HE-Meta: U2FsdGVkX18qiw5FqelslhwBL1VW/QAbwC0X9SL01uyqcQqXtFpetRWtU1WcEGxuFWDOrJ6QCQEYSTg+hhSXv8CC2arI9l8VMmijElPRUK6JmxcelG514/cmuEPOQZuRvgqUoG6vRtWyKfpKinHJhlBXlQueRt28UrRoHncs5tQ11YQW03ZXeyileNorjSrt4CeTGCMpgGy1drT3lvI4fcwctbHdHlLOA+8zOJM2kWZMIVBNtOBTewKECjS1Y2H0Etq7S27lcAj5HDT1+fK3khM1Xx2N7ykQRj8sT5D3kMAesrPH8/d8TZtTK/e4jdONTHiSCVmxNCCgDbuqoVe9E4giYAFx8a//aIOtG6EMUs0Sq1oZ1Ur/TAGw/O3nCxKCkEpQ9nrbZnv414hI2NXBcYF9kvOxsWA7y+X/hplZOSYaYNKFQyQahIsy7OFcEtWf1bSv++3TRIlMUuTSy3CYmaw22JVoZD7FEFDUv6wxtNuSRvwsoh6+qj9h26DVgcErXZ0RSPxPmh91Dc1qD+WV6eNDCGHMUYowpZkhTVbRNV1sWYkqSPJyxLygA/liK7yiVvCE9a8GeIFcVdgHEYz+RzMFCQCvfeWUNljgsjnqPwotcRZ7/iinOgFXrFFhOoEPfd2mF9WQsMYb4b4a38odA9wRsk6505s98LuLNYZkFHh5gSStvYdjmbYQ7l/iRF4AJ0/vbUvi4V7uzOoVme8uaKmQKxnGIJUI3jdnJ+DulrryrNUzkwfyZWmtbjBeA73Oq3bTRRpFA/r4uTK7bx6FsedtPrcmpOqxSX8wvHlUujM+2SPQop/4OI9Rr6C2bCyVQv0H4AkMRbpidt6pRR2e/XJyVf0ZfRfS+CO1+inmKoHcCbPMBZjJcttl9/1VuUfK+DO+INZve8fyc/AVAwSP6oef879b2c+vFrjo5NXm0ydvzmTqOXhuDWVTzGDYSuyk2Mp/VXo55b2L/gPQ6hI root4/93 oTjPmX3JvDC1P5BTqGnziU7MMlhIdCtjtZtZLjnVE8TUzwBF5mzVK0gD6IlnPKCRCaqXJJ1rIc9zAmr2C9eK/lOPb3eDk4OETn8n95W8TxZakb1TnjGXla68FDsr/e+ai1PSL7WjfTo7YwhSsgXB8n89zd5Ndu/5cI4M8rMDPmXh3CqVTf1rNCN3EH+IC6EbuIbPRajYSPMBqLHJ4eUFw4k8lGEbMNGqyhn1MplGKg6T0K3UxUc9D6o09ZK17QRUnEV+qsEGiJPo16BYbeL1EyDyjl8TIxzSvl92IKRCmnnzIa8uXVD/Ck4LcZ4Yn2g4gWdyYcm3DYh8I7TUx7+VCS8hdP47EHhiDGr5mPAtybkUaghiXhskpGnTXzTXtsKWAYfy14D3Cd7eSWKuBJ+STGW76rc5Mbd7roSl0tSrCmdHjdHHCIKckEOfsGk+zGdOzyuKOQtjP0210oIu1gHmiDgWqK1JukEARjwdYCnZ9ppA1lJgs9BawMGzG8Gbooqqcz2p2R9TdfDeFu7WSqZNb6KLM2EQWh2j8qL3VpDDuXOKyf9O33BW2MxwrotpD1d25pvG1/1Few5hGgIfSmIxOXqzW1Mg0uN52IhNiDTHTyRlvcd1lvPsKsfU7WvHhiaMWpyLO4zVLXLn5VKNW20UbYIDdownW863xwUw7jvykrVxmWVsBxMIS12pc67mBEJRknpZO07CfRsHuX8QWjjWZSn8kX0ylTKnAwP6O 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: From: Fuad Tabba Some folio types, such as hugetlb, handle freeing their own folios. The guestmem_hugetlb folio, to be introduced in a later patch, requires extra handling as part of the freeing process. 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, guestmem_hugetlb will become the second user of this. Suggested-by: David Hildenbrand Acked-by: Vlastimil Babka Acked-by: David Hildenbrand Signed-off-by: Fuad Tabba Signed-off-by: Ackerley Tng Change-Id: I881dc58ca89603ddd1e8e1ccca8f5dbfc80c43be --- 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 e6a21b62dcce..9dd60fb8c33f 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -985,6 +985,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 77b2d5997873..d0a5971787c4 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; } @@ -964,13 +977,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); -- 2.49.0.1045.g170613ef41-goog