From nobody Thu Oct 9 16:29:56 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA0902ED14B for ; Tue, 17 Jun 2025 15:44:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750175062; cv=none; b=X7Ppl4Yz9UiS5hXp/WEgnbll2UxIPiqu9VGQt3pfhns9MVcGrQVNR/dU0z1BfyOGhOsqxxRPUqdTVjl+8vEeAKHyRxfipi0sHnUAejKI6vOfMZV47YSEv4+HZetO85O/Opnyz54JGn0rBTa5Qpb0cxN1Iki2wY0P0oGfDTZyhFI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750175062; c=relaxed/simple; bh=BsU24r5xgG+FQtB1entGNmMfL4hNbq4o2pzMYPuggy8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ceJPxgzCP5D4Y++Fb6yzS7fya7nJEYc34fL7Os4oeYpEGn22gP7onvOjZA9VSJLnEb2YoYo9e5gxvBypAf0q1wnX2QpdrAG2SJHnSJpJEAGzPVyQdFQkYJk0vFs5p9SmAh4QtJYdqKE1R+TyuHDZF+r96UijGhYQFwOTiQbj98k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=OTSEQItz; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OTSEQItz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750175060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lq97cexcfDQMKZRu4/MkS8aw3BkFIIdya9sxYwoOveM=; b=OTSEQItzzDCSl64BFu5ztl+f4vfOA8uC88Az/c01utid7+4pP10fAvtt3L8PrjhggdjXZy B55CqBxPE2uvRUCoQcQYDs3g1N051aqsBBCHRL3DyHaE3CnxKNC3wnCSmyGJuxRvwycGae m13e2e0sBhUtm7p+keZZkRA/5GeQUhE= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-130-fafsi3KYMmetSqwauRBCVA-1; Tue, 17 Jun 2025 11:44:18 -0400 X-MC-Unique: fafsi3KYMmetSqwauRBCVA-1 X-Mimecast-MFC-AGG-ID: fafsi3KYMmetSqwauRBCVA_1750175058 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-450df53d461so48298615e9.1 for ; Tue, 17 Jun 2025 08:44:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750175057; x=1750779857; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lq97cexcfDQMKZRu4/MkS8aw3BkFIIdya9sxYwoOveM=; b=WAx2Ie477fXyv6zE/kIy4Ds8d5V0Lqp0WRkAA9WFN6ELy57VH1W03l9mgKmXBLRuSB kHILiCB1FMGgX2iUr+jctb2yOJrbc5KOQ9+qKeMHkx4FKBWAgwUcvxenb3OqB62XSiDR twsF/OyM4uodwBHcWBtpcshXD9ZjEVhSXknaHP6HG9EdmZHK3WaAbrtDqukWCAKR0fUr /E6ZNj6OGwoNeNvUxC4YdLb7788Vjmts0gXtxH66AmPSiEzhouF4TNhPtb+HD0E7aKYm YcneJBtFLHyL3y2nx99n2toFagiznm4ZUgtc2cyH/sW/70dYA3qWENXwy9TFtqi0g5uv lDJg== X-Gm-Message-State: AOJu0YwNl5cz1mHzFXcp90PGfG2t59nvaUFGzPH3GpjmF5/KVq/xsXMc Q4caYewEJZwH9AmL+8sBSI8OO3Obl4KSJ0RhIIIbMGWXjDChG//IxE8s2qfFNLMpxoofgCueN1D 5KK8uzweba75/SBdQ1UHtjCyRsAv//d/QHfvPFOqP18bQgP6Vn+xiry1un1bl43DWMS4NL51GNR 88xST9F+4SVYOjDjgX90ia4Gv9i3j69kty5v3qtWVXtXKREPEb X-Gm-Gg: ASbGncuUcV5/eDdmkvDz+TzN6XT+n2aVA3M1oHzGekeDYj/Bf9Pxc51Edctu7gIBZn2 ZpWKS4dG8JZ1Ptdmelvq0K4Z8ECjA72NKcHjojOxr+j9wS+UyhrVgd/36NFlIsW7F3aILY0QtEw KLZWoGppFbA3681ZHBRCWyd8dTIrx8VFWpta2BavctZ/t4KxE/X/a88TEqDWqyx3z9n2ztJGV6v 4I0WOBIHxcLV1Cnl7B/KMgT0oAX19QM6woc0OYUT+Ep0lKtNXslU+VvRJrvU5Hm6k9yPAjP15I0 oiYSnWN/WVWmRZFq2EOh+kVV6ViBmts8XOiOHWNmZRM7Tcny6xYMmlxyu/I+iKVQkA+SGxydkU8 6x+uwbQ== X-Received: by 2002:a05:600c:1e02:b0:43d:b85:1831 with SMTP id 5b1f17b1804b1-4533c9dbbfemr142093305e9.0.1750175057555; Tue, 17 Jun 2025 08:44:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFmLbqQvk/KforjobulOMd7Z8HmizRkZJwsjious12VlfKySMsgRFEBQ04fbeKOdJYcWkDwbQ== X-Received: by 2002:a05:600c:1e02:b0:43d:b85:1831 with SMTP id 5b1f17b1804b1-4533c9dbbfemr142092735e9.0.1750175057156; Tue, 17 Jun 2025 08:44:17 -0700 (PDT) Received: from localhost (p200300d82f3107003851c66ab6b93490.dip0.t-ipconnect.de. [2003:d8:2f31:700:3851:c66a:b6b9:3490]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4533fc6578csm110483905e9.19.2025.06.17.08.44.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jun 2025 08:44:16 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, nvdimm@lists.linux.dev, David Hildenbrand , Andrew Morton , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Dan Williams , Alistair Popple , Matthew Wilcox , Jan Kara , Alexander Viro , Christian Brauner , Zi Yan , Baolin Wang , Lorenzo Stoakes , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Jann Horn , Pedro Falcato Subject: [PATCH RFC 13/14] mm: introduce and use vm_normal_page_pud() Date: Tue, 17 Jun 2025 17:43:44 +0200 Message-ID: <20250617154345.2494405-14-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617154345.2494405-1-david@redhat.com> References: <20250617154345.2494405-1-david@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Let's introduce vm_normal_page_pud(), which ends up being fairly simple because of our new common helpers and there not being a PUD-sized zero folio. Use vm_normal_page_pud() in folio_walk_start() to resolve a TODO, structuring the code like the other (pmd/pte) cases. Defer introducing vm_normal_folio_pud() until really used. Signed-off-by: David Hildenbrand Reviewed-by: Oscar Salvador --- include/linux/mm.h | 1 + mm/memory.c | 11 +++++++++++ mm/pagewalk.c | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index ef709457c7076..022e8ef2c78ef 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2361,6 +2361,7 @@ struct page *vm_normal_page(struct vm_area_struct *vm= a, unsigned long addr, pte_t pte); struct folio *vm_normal_folio_pmd(struct vm_area_struct *vma, pmd_t pmd); struct page *vm_normal_page_pmd(struct vm_area_struct *vma, pmd_t pmd); +struct page *vm_normal_page_pud(struct vm_area_struct *vma, pud_t pud); =20 void zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, unsigned long size); diff --git a/mm/memory.c b/mm/memory.c index 34f961024e8e6..6c65f51248250 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -683,6 +683,17 @@ struct folio *vm_normal_folio_pmd(struct vm_area_struc= t *vma, pmd_t pmd) return page_folio(page); return NULL; } + +struct page *vm_normal_page_pud(struct vm_area_struct *vma, pud_t pud) +{ + unsigned long pfn =3D pud_pfn(pud); + + if (unlikely(pud_special(pud))) { + VM_WARN_ON_ONCE(!(vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP))); + return NULL; + } + return vm_normal_page_pfn(vma, pfn); +} #endif =20 /** diff --git a/mm/pagewalk.c b/mm/pagewalk.c index 0edb7240d090c..8bd95cf326872 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -902,23 +902,23 @@ struct folio *folio_walk_start(struct folio_walk *fw, fw->pudp =3D pudp; fw->pud =3D pud; =20 - /* - * TODO: FW_MIGRATION support for PUD migration entries - * once there are relevant users. - */ - if (!pud_present(pud) || pud_special(pud)) { + if (pud_none(pud)) { spin_unlock(ptl); goto not_found; - } else if (!pud_leaf(pud)) { + } else if (pud_present(pud) && !pud_leaf(pud)) { spin_unlock(ptl); goto pmd_table; + } else if (pud_present(pud)) { + page =3D vm_normal_page_pud(vma, pud); + if (page) + goto found; } /* - * TODO: vm_normal_page_pud() will be handy once we want to - * support PUD mappings in VM_PFNMAP|VM_MIXEDMAP VMAs. + * TODO: FW_MIGRATION support for PUD migration entries + * once there are relevant users. */ - page =3D pud_page(pud); - goto found; + spin_unlock(ptl); + goto not_found; } =20 pmd_table: --=20 2.49.0