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 DD4CAC71136 for ; Tue, 17 Jun 2025 15:44:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9DE9F6B00AE; Tue, 17 Jun 2025 11:44:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 966F06B00AF; Tue, 17 Jun 2025 11:44:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 808C46B00B0; Tue, 17 Jun 2025 11:44:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 6C59C6B00AE for ; Tue, 17 Jun 2025 11:44:23 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 223D81D3EC1 for ; Tue, 17 Jun 2025 15:44:23 +0000 (UTC) X-FDA: 83565314406.15.5A20C69 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf17.hostedemail.com (Postfix) with ESMTP id CDA5C4000C for ; Tue, 17 Jun 2025 15:44:20 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Sn1vmxwO; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750175060; a=rsa-sha256; cv=none; b=sl3aXAQ8U52m+ro8EHdwXPwVx9Lr5ES/vRHtV/LKo1EBmhLpc4LhWBqVLyIWJuvd/GMZMk Yw9VHPF56WxAn0ImHYV4tHCWfKEP5DbeT510GMvJ4ojiKrLD0EwWfPUGN2auUe6pYdt05E 2kIW8WqH9jQrgM55zm9pVsRjtmDcxCw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Sn1vmxwO; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750175060; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Lq97cexcfDQMKZRu4/MkS8aw3BkFIIdya9sxYwoOveM=; b=7Kz+/2d1TYRi2CzCOU/MJUBkmfFEAqV6rBGC97P6gbESIPfHQDADEGlb4mlKl85n6hhpx9 3HmcJUAKlQ8HXjHDdGLe1Qm0dPf56AuwA4+qeCyCTViGeOafKf9HQ8o2LiiOh848Km3X3n jUoJ5mXVyZ8vJfxQRv3bWCNrf591wYQ= 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-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lq97cexcfDQMKZRu4/MkS8aw3BkFIIdya9sxYwoOveM=; b=Sn1vmxwOE8Z9DeQaIHkFZDrGLFbhh7uLDpq/Ss6XMXytO2CfqgcWsLdYdBJbzxyWL1zqnE BgjiFMSXK/RSKWbdhnjcuGU+nc/xlXkHWVrzI1LnF5OJ8aQhRuXEEh3sqGBz51su5kwKG9 p69ArPU5rP7kfrNHh8WYD5EMlN20HWA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-400-X_vPVlaCPqyGmUoE_4SkXQ-1; Tue, 17 Jun 2025 11:44:18 -0400 X-MC-Unique: X_vPVlaCPqyGmUoE_4SkXQ-1 X-Mimecast-MFC-AGG-ID: X_vPVlaCPqyGmUoE_4SkXQ_1750175058 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4530ec2c87cso30250305e9.0 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=In4QOkOznAc9xCyMnTEKy1ak/CWja5hujTl0j5zXPOGQwu0JB1SxmPCCrQzQZa12hC J4hxlkhAMijaREbTtdmMoqD8PfaBPvpSghOXhuVeLB2ZYLD2zFErwDjZxfCkRqg++4kM vH8iogIbM6k+IyCN/mdh2XIbPyy8GMVyGO7tF6UgoWt+b5XlQXNN8mV7XmIYAZyAurLG sYdd+oeq1wQk5MYYhJxadgeJW9h3dtSPRGKumYQ0iaKwdL47FnCqP4CHl+Dop/QyaT/k RZ5dDuYeSqdWHu4Up8PYQpF132CnRSuIHL0IfMREVVSeCwMEh0BiyoQhl1VcEUG5uK1D hOVw== X-Forwarded-Encrypted: i=1; AJvYcCVcQnplRSGsiMRh9r99skjvNXWyc4CuvfyYONv6XvH8wXnQUDe6lGDblW5lg9ZRbqifJjojBE3d6A==@kvack.org X-Gm-Message-State: AOJu0YxOfpcLAUB+olzT2G3ofg9foJ7z2MlW7miQlQ5LQqvmqUKnza/y zIOY3EIZGCnzgAcU7QtdMNlCVOKkMH4iX3wVc+nKUNijPL1QzkGCCIp8k1iabQCt32MqiLavzim rI2JPgjzR3Eau12QvXvGkf/yIXekGSPKP0hvLfjC2LyOSvokW207p X-Gm-Gg: ASbGnct106m5nngTpi6UVcvTzixGPgSDXPtlCxBcF4LVkuXrG3FMGwETOYLsKENneNw 9NQEfoPZZgKg6EWmdL/v6BRlU17ejx1GzpoMc4j9YuQ+Ll4EInIwlhFJ9hx2GCyIcbjCZNaItRk Q9y/i6vrYcvBxzdCfozWC4XJXQ+Bcc/ogP6F0YyCMN4/Uw4m8mL0Ch/0VZIkENqxwcw58koYcyQ ucv3IEiw3BpKiIfPpt5ReGy6MHfn1EOFxK78H4vN5M63tT5AVyogT4FnaWEEejfgnI9M0GN/N5A NF4Ek87lfojldtx5ncog74KerB4wZzk0Yg8vxn5aPG2MRTrgIRJvZOEUNv2viYhdMrS/G5ZpNq/ cfXxT1g== X-Received: by 2002:a05:600c:1e02:b0:43d:b85:1831 with SMTP id 5b1f17b1804b1-4533c9dbbfemr142092975e9.0.1750175057508; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6RRYHPGa7cIN6YAdV54oRpm39V7Hk_Y0aCshIWbeKy8_1750175058 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: CDA5C4000C X-Stat-Signature: 331kyfoarpbb8io6s935rwh7mtswn5i5 X-Rspam-User: X-HE-Tag: 1750175060-24372 X-HE-Meta: U2FsdGVkX1+sfvXbsoZGDpmjPpshOwJ2QHP2Z7Z52snOTY0Zpt9XOvajaXfnIZJVoQYQ9GTchoFbRa5r4pa3K5PetOTfAGqLCnOdhi3lW9u5RRp8vP01dmU+9RANmyFY5WwO/ALsMOV//ZzGP/u15Dj7F3ZkW4as54yi6j0lwX7O+Sz694WGpVjkJ2GMtI/OiCupSzF+NZZVKu3cupUctoznm73zhzgQSI2DxnRw5xrCEvO1485wfPCIgBYODXD7vf8iowN50eGtzvEWTKn+gIQiBKIfoR12YdPJoust56mOPsRhgphuZ4QUtEXvkJeP85QsWX7MTcxHSyodWXeVnsT0QMuAHEyovWAjNQPFnv+uzDHdLFddAlkUp3swz1OocjAn3q6QZrLbc+W+9Aoo2M00SKlZFp2umNwH7Z9d4Qpn1MIWuY9e32fG1iyBj3VnsjE9eibGp2UK42JxjNVZwhm1qNnvGAXdtIEYHLEHNl92omeodqGy/I9ekKo0wmXkbZzX2GOxe0IwqX9FkzLiGFezEnBaCWjRCc0MuwOxKZttyesQ/psg5SxRxkOo6+vJAS25IOp6lxvyiDZUiqxrxsTMVTVsyctEnUPn0BR0tdBlTsrhsRnqv9o/qqM3ZI2qVescRsQG/xqC1Nhw+xt22UspJi/bu0JS11yju50WYrEpQdJthc/9btDyG2aCZLJohrEkvf3zN4ZnzcLN+WTSX03buLR1687+t7Zc7nQ87AyEoPRx7feBoYI1XkXm9RDvZ+HlbFE9ESMOgj45b3uHo85v8U/cQKuK7GH5RR5NS4SxDLd/4BpsPYIRqB5zSDFF/8LbYwMGz+JbEQeY+ijYKvGzu8JIoQNLfp/1SYd4etYv5vyAkdYUVvjhcAN4XQJnYuMDAuGyMyH73Dqfw2IOC1lHJMSJtN/18QLPtnnYADugopZBz7cVJPmc9/gBgHL4z0PGzH/l4m8dyAO0krt ig5A6DKI H0I4h8+FDriFrf4PrULX9Q+9oWbHAW4qBIPnrQe0FLAeC11ksUTvEb8q59NxOTNdQKzeSTtK1NAjnj9HocuG2gHwe9DvWG0CZzpJeBT/mvWSqUmWELFWvi/GZ6XIr9swpesYzf0kHNUlAC1/QZs0Ryef3lQ2RqROJDtqFfFISA47/Rpa4JVcjdIg6xHklPyVezhdk7AHTOctm9WqO/FwfaWBvev+SITrrjjLczDO7O931L/yBlp7vFjb54fwHFQqaaC9b5S2Xd/MDr6WRtJUWSy+YljyH5qHpvBn2ITPin8ezHvVmmOOTlbPCVVW9WgSJuu3sei6bnQ5DiDYHhkIAbUbPshahMKEI1kNvIX03Hmq2uEg3mXB4Ttyl6Nu/EeCJbCocVTn7Q6WtiFACAsQ9tZ4ftlP8rpIKJFM8uaEd6IZIMXYYTe3uj/8FiYIfBroq2uy2JHTXa0HhqgFqifHcUtUqgKC/JANtYaR7pamo6zbyKIdQd30MQsmfXFHmRJb2xtvZGZKc9U3BLDpkftlxNV5R22fdFWPYJhNS 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: 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 --- 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 *vma, 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); 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_struct *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 = 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 /** 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 = pudp; fw->pud = pud; - /* - * 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 = 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 = pud_page(pud); - goto found; + spin_unlock(ptl); + goto not_found; } pmd_table: -- 2.49.0