From patchwork Mon Mar 3 17:10:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13999221 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 5FCEAC282D2 for ; Mon, 3 Mar 2025 17:10:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA73B280026; Mon, 3 Mar 2025 12:10:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E554F280016; Mon, 3 Mar 2025 12:10:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF585280026; Mon, 3 Mar 2025 12:10:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B4375280016 for ; Mon, 3 Mar 2025 12:10:21 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6A50CB673E for ; Mon, 3 Mar 2025 17:10:21 +0000 (UTC) X-FDA: 83180878242.15.46035DB Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf01.hostedemail.com (Postfix) with ESMTP id 48E0640021 for ; Mon, 3 Mar 2025 17:10:19 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=adY5CRQf; spf=pass (imf01.hostedemail.com: domain of 3eeLFZwUKCJoN4554AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3eeLFZwUKCJoN4554AIIAF8.6IGFCHOR-GGEP46E.ILA@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=1741021819; 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=w5p1u51hDu4RIdVFXU2+a7I5FQFTXTH5HXvwkoJ+/VY=; b=RKh9lCwDBTzGmKdZlnDi/CFomXWjMbYJvG+kIyc9iqeb1px2CjYuUi3OAVHSwcfrfHnrRT Rio5gYlBFDmgaw5y0SNrn8esU82qSmN8x44zwuHh6wMGtHk6j/IXyMJNuT/SrxV503+wFY OPFv+X8VivQr0BLhfyouLwC5xtjagcQ= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=adY5CRQf; spf=pass (imf01.hostedemail.com: domain of 3eeLFZwUKCJoN4554AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3eeLFZwUKCJoN4554AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741021819; a=rsa-sha256; cv=none; b=rfCF18pBU8q1tIoQK566dFqtHwXq/Vap8FNOqqgu3VSDkRDxI/4jC2U9Bp75V2cE5hhCnX 9f2Jc0DcB1I4oZDgzvjiscwog6wZ2oytf3Pbp/1mJLHQQL5nWByeu+sWTmhGjiHEpycOb8 FlfHNqvSawFmhaDtbQ/i4gaSgX8Y1Eo= Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-390f7db84faso1812109f8f.2 for ; Mon, 03 Mar 2025 09:10:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741021818; x=1741626618; 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=w5p1u51hDu4RIdVFXU2+a7I5FQFTXTH5HXvwkoJ+/VY=; b=adY5CRQfMIKLmar3wrjOm8gI1yuPRSZt5OC03FsGV0ktfBb33s9ULdKmGNqo157RLe qKmqWpTzoiMppP/QCDVhVHwcgHSNVBAT78s13jiD2QrTXdYN9n1cHznFUzzGe/JkB0x3 XUlNJVvkPHFNDtzWQ4obXZj524Y00IAghbZ/5MJXRg2LA0O/zIIwA6wKTDHSF1pLiBv4 +f2ZiW/mRPakNeFR8KSvpTGRu7qil+Ye74j59bHed9BwRo3L1ekXL2R7vcjTw6kHX9VS Kw/fFZD3Uw93qfID1lIuiGrcdNH6eCl43YpwDK7gt9s1+mokfBsz+91D6xlWplxPyLtx CWhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741021818; x=1741626618; 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=w5p1u51hDu4RIdVFXU2+a7I5FQFTXTH5HXvwkoJ+/VY=; b=RG/OXhdTLZCz61+qjUpuE1gQH/cDJSZ4BmL+JytFCJWynmip6ai1awfN7kLtM1cZUY odfkn2vlaCnv1sXp/KuPHjHe6ompp0WXODa9car7IH9e5rL4ZPrqvjzp3Cya+MGQnAb+ FaUGKBZnMQA+3KDsO2gTyATM1qhwAysM9+5D0tcp6rkcZCtpXmE+yTluPRrjZSdD8AM8 6xp+MOY1JefWeS//MpuiTvje88pJjIbo+1dQHzueSNwkKYr4kBcwT99lETdTaQZhp0Wb sVHYmeBQbYHHJ/cnuNG9dBWXb4cNZ5KJVEwiTYmU0s5nlzarU/kdKCM3uYh2Rle9bbe7 fr0Q== X-Forwarded-Encrypted: i=1; AJvYcCXtGd7otT4o3lDRkHnnQPyatu8UWwLX44xd/gRfvEVR1481NSYL1fnwLiybcT8tq2KwNfdjrhqRJg==@kvack.org X-Gm-Message-State: AOJu0YxYBW4078FJpuVvRh1kp81+jmgMQo6ivBEHYm7sOmiyW9THt+IJ G11QTgm5Lszlqys8jlM36h0S+ev6VAaPf2DiVo+nrIDlC+2DVMap7kYun0t//x3DWYML7jzZTg= = X-Google-Smtp-Source: AGHT+IHrIQRTSbIxQusEzSVfIPDJzKXN0UjZRRQHhWJRv/ncbjwRbNznaVOzH4GMAzYPY56lQvuMR1QBGw== X-Received: from wre13.prod.google.com ([2002:a05:6000:4b0d:b0:390:e0e3:e8cd]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:186d:b0:391:13ef:1b35 with SMTP id ffacd0b85a97d-39113ef1da9mr1259620f8f.29.1741021817721; Mon, 03 Mar 2025 09:10:17 -0800 (PST) Date: Mon, 3 Mar 2025 17:10:05 +0000 In-Reply-To: <20250303171013.3548775-1-tabba@google.com> Mime-Version: 1.0 References: <20250303171013.3548775-1-tabba@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250303171013.3548775-2-tabba@google.com> Subject: [PATCH v5 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-Queue-Id: 48E0640021 X-Rspamd-Server: rspam09 X-Stat-Signature: ke8h4tpi6n86md8ubs8owgzp5p3qimcu X-HE-Tag: 1741021819-33552 X-HE-Meta: U2FsdGVkX1+1WEzgJLzmw8wlVyX8D03EmmNuAseZp0jORKaS+ZCojA8YWmC3LOv/vaLHgjvyrBAj1Nb83hG0LdXBl0qDWx3c8yd1cfz0hz/BQEqM6PhKSIy0RlMUMKLq7UgO+FtJk6cVu4o4ssRIKSZyil0wwZAUuhNVPB55Jo1f8UYHK2M3SvuYojnxbvn0z0yar+LWzteOZC2/slkPQ58Vzm81GkNNQlVg0GzoEIx2gJkdH1Czf8PpHofgAR8hTDVdotCYwST0FnrYkS6FLr2kFYHRNX7/aVgcKA83XftDRfbLPUbci3/7oEXz8x5Xx1zLuCzJrrqUilS5zDCFki7Yu8vqLVB7Ka1c2EYa9Cr7vg2wnaduiYOktn6epEglF+wXqG6FJSqnaa54VRWol1rzhCXaPUt3Q4wUTiR8DVRBcRSGTxHTTsUsxHuVCE5wKULCwXxHBcmxSsIzS+/I+n+X8rUx+lVXBDaQM6pDlY/NiLCROeVBxk+Svu9961CtFZA53l447utH4qRXpJ2uNUFdPNIk0EJ3RFK7BNHX2IwjPWs2s99giSwjZ9vy/0PM3BnuRc/yyqxg7ntfy7UgtWb+GyeyUG0Zz3IG+Jn9ihdFJs1hyQJt5Rjjb4MOHOHWRYLbuSo18/2eguqyqRZzqMKDZk8LdZXMD4Ei9PJhUfk0A0LTDPb84wD/AeEZh00vq4BydzhsNpqdqSOm6uuThKjIpFi9S8yqcSWSs2q6pV8gJD5Gd/fznRj2VgzMsL/Vg8q1906qvsIrNOey6mDW4vlpS97V1rT1kitWqEJOW/mDCP5rFhBqQeQwDrfZZk+gDE33N5w5Wk0cClsfh/fJozTOSpe796CuyIkhH8o/IF+KBAJYQBI4LWy1Iivou9G2Sp6LZjmyPGmJVw2KDeKP/FhailwuEqBU8MEBlI4bdiEPkE0EB2pi6enqDERp/ARg9uq98jzJZRmjEe/B6BE wjE1NaTZ VzB4JDg2ND60WN/rdF9IkpHoUl8tUU47Diw9/Vqd/uToi0+9noKsq/P540j0I1zMVFpEKwMbJV/p1aSfUXm0JxMJI29oFcAVEEJ3YwktioEi5NCr0AHYyFtEhKCs9vbMNqiVrRxZG2ayCOXFK2y+mcHtuLJCatQAO2J1jog/PflwcxjrzHasAs7+PnmMbwg3pRrpvzVZOh3C2uW0WyQ5mkg0hAQ1hnoI7M1H+SMRCC1zpK/7Z0ZYtPU8VNXYWnAjpVTM5c3zRZusL0HIfRLSheZH4wEQEPZ7iwcZf/AgqklK/t4RPYZdIm1dbenyJW5NiWTopk37Id6PxtzOh7z4IZpAdQe5q08uNt88fWxftCfFgZ6R3nsDDK80LfTsVN4bj0Mt0m2STp83ue2OvEL/bHyr5tHBko2SGf4SPPKKyqZNSiTDfkEd3Jo8GhpeHkluhtrPLR5h56iPUJ8mSh8MzdvRw5fX4Xb7g4vbN6AuMKRISgni/S8keBH00Vp4Hub2y3HmLq+dBr1RaK4us2WuCdHvxPnfpK8kgEnET/PorjqDLc7AUvXgAUWgc4eijciEPXnjkLleis/U45h2Si9x6jdV6fJVC4J8B5hzCH7GlZjT+mT2wofTkwYBvJtOPx6R2xq+uu742rKMFAcT/M0+M1ZGSzf1VJ8j4uzS5LYcMWHrZBz4= 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);