From patchwork Tue Feb 18 17:24:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13980311 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 4D759C021AA for ; Tue, 18 Feb 2025 17:25:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5E77280163; Tue, 18 Feb 2025 12:25:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9ADA028015D; Tue, 18 Feb 2025 12:25:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80083280163; Tue, 18 Feb 2025 12:25:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5C24E28015D for ; Tue, 18 Feb 2025 12:25:08 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 05C4347D02 for ; Tue, 18 Feb 2025 17:25:08 +0000 (UTC) X-FDA: 83133741096.23.1DF9611 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf24.hostedemail.com (Postfix) with ESMTP id 254D8180016 for ; Tue, 18 Feb 2025 17:25:05 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=t07yuQpG; spf=pass (imf24.hostedemail.com: domain of 3cMK0ZwUKCA06noont11tyr.p1zyv07A-zzx8npx.14t@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3cMK0ZwUKCA06noont11tyr.p1zyv07A-zzx8npx.14t@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=1739899506; 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=uH+fBcfhHBnIgnx24Za2RqEfoW93YGim4l7wHxezgLs=; b=SbtFjtQJaDHIXlrwuZnt5Aq/Mf8S2Obs6ZuTz79CSrJwoivut/ksRXXu7K5Pi+PK897PmV hPZQ2M8Kt6xK5HIEOk/8i9D8wPLKBB93cj5ZkXf3WWD9xGs339u1+L8Ekpm/SrEL9+OXtJ SWjX92UucP3zJcVgI6v+TXZj+BGIUu8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=t07yuQpG; spf=pass (imf24.hostedemail.com: domain of 3cMK0ZwUKCA06noont11tyr.p1zyv07A-zzx8npx.14t@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3cMK0ZwUKCA06noont11tyr.p1zyv07A-zzx8npx.14t@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739899506; a=rsa-sha256; cv=none; b=wGMR3rVYEjuMiwoKiLtibJcBiBZvMVxZuNkmaULE2VwMw6qXN0ZAqLjjpPbu46U1FoM0yB S4vhLAJ/qel9HarFZy14NDVhy+iYGiT4PHQ+uz3VEbfvaVbDP2IApI6y3AMMyvCdA+r1kk cEyaXnEGL+ynNyP/bXPr1iu7XtC2qgw= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43935bcec0aso47133305e9.3 for ; Tue, 18 Feb 2025 09:25:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739899505; x=1740504305; 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=uH+fBcfhHBnIgnx24Za2RqEfoW93YGim4l7wHxezgLs=; b=t07yuQpGp8QFtnGrcY7cLdp1zUC0n2QyWy74d+SQ2ONvORgXUl9LZbsVyU7YdGszi1 xMqxJ1cpmY8ALLg+L+qg8darTaUq3Sp2jhrFZfpvqx+gI3kgdR6W3MMEoZ2OTPZPMeRz RH7anXW13LfPGInVCbteet/hWWK9Yq1MrRJkCupDcVQQJ9Bz8T56uL8HhPCculKsv2aT 2vYsaFPfpx9kt7K9OmjVhOGwIzVXZ42FV2S+3vNXDepeZy5iurxy1jP/Yv0ymPjvG/4Y 5uF61M6Hg1kd0boozGiNSWnCB8JYMspBRuevmQFFnuLPiNiJw2VjYqsbdY61Mucu1VpZ pogg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739899505; x=1740504305; 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=uH+fBcfhHBnIgnx24Za2RqEfoW93YGim4l7wHxezgLs=; b=cai8TJOZJzw00wzp9RAGaQafjvr4mtGe0crzDhrl9tCL1z+DeBbuUSPV32eU1E1NxC rG1se29tDP3/h8QzfszBIO/NuYE4sGJeSuXIjOc2KkufQzeEJJdAM7zA0TrD5zXqFTiK YS94/TOlEeuyKlye/9/DpDJPd4eo0/pVOMURLFShQafXNu/gwkex4dFSW7KJD2MTmdJ/ GGLcuYyp47uHxSOUUrjns/AnCOzJ6d6YjN4WvqFtbgIWsYofxVKdlKz4+LFE+82vqP4Z /tVkdiV/wTuA2sfKXjfejRXRukHpylxxdjeG1QsR/7BkQSpI/X+3TvGu35xvf90/edSD QP0w== X-Forwarded-Encrypted: i=1; AJvYcCVvm8XlrOJaME9+Smut3Q5kg++qO2ABEqxpJ6Jaw+oatIcW/FlaLHmWRBWkEc/nT5jnoTXy9EvRew==@kvack.org X-Gm-Message-State: AOJu0YwAChTduvwFLDbVUMZroZSZIHfpjgSvCrFo4CFCgus1UVQI8NVy ZSg9enLwIxccV07GdU4mi3wOPFf5nCMECHsnKXCFTkjjrKTWASz40lc7MtPdYUSMgtRaV7DHXA= = X-Google-Smtp-Source: AGHT+IEO+Q4R/pkJYt43fJfT5ZiB8RQT6Y+1MuFVz/324xaxqgmgHccN+PjmLq2lzd6582it0nkgtuGjWw== X-Received: from wmsd12.prod.google.com ([2002:a05:600c:3acc:b0:439:9541:1cf5]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:6547:0:b0:38f:2073:14a7 with SMTP id ffacd0b85a97d-38f33f56437mr10419463f8f.47.1739899504782; Tue, 18 Feb 2025 09:25:04 -0800 (PST) Date: Tue, 18 Feb 2025 17:24:51 +0000 In-Reply-To: <20250218172500.807733-1-tabba@google.com> Mime-Version: 1.0 References: <20250218172500.807733-1-tabba@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250218172500.807733-2-tabba@google.com> Subject: [PATCH v4 01/10] 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, tabba@google.com X-Rspamd-Queue-Id: 254D8180016 X-Stat-Signature: qpqajfpsqai91iw8y9txt4wntuz5txqt X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1739899505-526733 X-HE-Meta: U2FsdGVkX1+8EmYCCoNNJ/1/wz2mfYOc9yAV41d4tNnR83TUpMI31lxdXu4mB8zZolGVe0mRZFDySx5L1yokjP6QdTw6Il40HkEuteoSmDXedGeqcBfvcuN67T6ElnwlutiJPdHhl5+Oplbbo00LrwmyR1WY1nwoTDiwXcdPkiQPWoCle+MnlLwyi0fH0vt3kYWM4KJ29fb9qAJikIzddi9g9Lg8p/tO4b5QXBqRBVY5bepjDsqXae2DB4jaoVMJ+Gd1EEIzt3dTSPwcblUFIYQFE3JS98fZhGe94bjzsI8d5sh9gpPG/hHNW3TU5X1hih3oKspVmd51IYOqKK83jU8KeSnZ18Fd5DtsIxJ+bCgyqnn17A7jPSz88Go7WrD5LBa3KlwGxprRXoM9zK/EwWFH+wUF55GRMB/IqFp1qOSovok2cmEUuug1qP307GV5so+WuBLdIzQbTvoXjUY/pNxOjqBk/G12/orq91+/5DstqOnNjth00bii2HZP80pGxXgibXB0+nmdfdOLlo7Ph75tqFU1XhpnxMf+Or8mlPXrDsE8gwHx7aZKUF0wUazWOkv+P7IpBl7Zyw0al3/rie6AxK3y9AY9/2RQU/vqurndRaHC8MkHKzCg2VTyfRoxLhQCOPultImBkGP1GEFrGzo0fMYVD+JqzxDsByt0flNwchhKUV8IIINGovar3He7FjvBaTpjHRNA28YE3OHVuAlXZbTrI9S5EnWWstWQOyXxWRcViKX+t4mIIzNm3FajnCu8bKQ59ltRX7of3QjKT34qfiebhggxlzqj8DoPwZMPsQhITQ4yP9G6K7UQsCkMFfLLfsaxsFHwxTULDMhjUZpQDyMdLSDFTeQPLwN0MpmYytorl6D6s+kp8VCyVuHnPDp1warWGIwlrL5MsLtvY8hvrJmlLsQakjcAPuzGcsTk8Xvv+nKDn++VEinzbfJa/aQ5gRqsVpMJmRR0b96 CMy50rft xim+8V6nlBbqSdnmPbIkNJK5X2jP5bMAItsZ9+uP814T2fWbKddhWe63YyCmOtFP/L9ysaki0dDhDjYBP8FDLVlzGnSjUcPmunYDaBOWgHvF7tTbPcspQtsNv4tBuI1SZO/ZBY59sFJiDjE2l41Xh19e1gx4WmTG8mngB4MF9zghLSftuoJw8mEqBKlLHo+VlOYSq80WjYlrrxnhwjV5kGjc9mjycH0iZPaYrYvYiqGA7DVwMfDvMAwBULlGVIlY1YAD7dmy81PA1UMo9dU1LyJeQotHEzMlovxXQEVNx43s+ncPa8BmnCojCIy5jD4Qq1uzxYNmuolQy9k7y2aQ7V4HeaM31ahBlhGH2nt6Iw4K7HBM1Q1wQ5shTpWP1RR5qYXmwBM/7BkAKlF2p/QNx/hV9nRkYUqrCtdHNbrldK+GO+aaX2yzcTbw/FuD66V7o5cjPrzfoMJt6kld4tNYjS5D4nuXHbM7MOw3uOwQwUMV9jAW+uD4SOeokZHxyk5OTYDLPGsplPR4Yy/FsnUEQmLXj6PF1xi8ygakPAENWRi2AmnorVAkYpxQIlKUGLl7kScGIalX9sqnFWBPgURpdj0pbQbu1qTokthxcxkiULsMrCBpM9po+Fr7fIruX81KoGQ6BpaahEC/X6MKjmZMgCvOQDHM1FfsYuiOH0tUL0451oNU= 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 Signed-off-by: Fuad Tabba 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);