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 70854C83F27 for ; Tue, 15 Jul 2025 13:24:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 56B0D8D000E; Tue, 15 Jul 2025 09:24:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 542A38D0001; Tue, 15 Jul 2025 09:24:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 458DA8D000E; Tue, 15 Jul 2025 09:24:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 334CA8D0001 for ; Tue, 15 Jul 2025 09:24:19 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0FE9080488 for ; Tue, 15 Jul 2025 13:24:19 +0000 (UTC) X-FDA: 83666567838.27.243A663 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id DE139140006 for ; Tue, 15 Jul 2025 13:24:16 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VgxHMDhd; spf=pass (imf23.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752585856; 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=ipu1K94ir7ZDGEwTFYIjfG52vTt/Yk6xgTkmlb9d9g0=; b=euEWwTS5d9d7tAkYIFU7hyH+snoSIySLXpNRa/S2QlU33FSA12qI0UKXDF9YuBUKCc1aVV YYcxnvVQD7NoaSecF1W9xI8vb5ZPM8LVgZk6xqNSEuWcmRu00aOa4IO3LSgSKHObN8hEXO J0EzX8JvAxLwxkqih3f7lVHS/CV/K0g= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VgxHMDhd; spf=pass (imf23.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752585856; a=rsa-sha256; cv=none; b=VAup4VzLrE4HhvQOJ10z1/NEcFugyLzCnGP6MKwT+1gaTZxfwkCR/SAxU/z9+Gixw9gwkq BhHtyplrWHATa8dTm7qiWNtkzydNsqAk/+zv6JbtAgeTfmy/0RDFzGX+H9vTX8UfECpWt8 1DG2fCJInbVfohANdAzPfWtyYjW7G60= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752585856; 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=ipu1K94ir7ZDGEwTFYIjfG52vTt/Yk6xgTkmlb9d9g0=; b=VgxHMDhduKlw9V1lDJWKQvQluhidIxaQ3rAdOHNqBmFHqqkXUe5+9qF6L5aR7QAQNpuMw0 s3rTyxFBBho2Gm/BLvxRdPz5JfGy305E8cYu0vgpG22fv4tcI7XqstdUn36SLSIxYkiKTi 3UflNktZN5c9QpnW0fdp2Ja9Q6vMM2s= 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-223-FprEkxTRN6miD4OcJ4Q7TA-1; Tue, 15 Jul 2025 09:24:13 -0400 X-MC-Unique: FprEkxTRN6miD4OcJ4Q7TA-1 X-Mimecast-MFC-AGG-ID: FprEkxTRN6miD4OcJ4Q7TA_1752585852 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-451d3f03b74so31684835e9.3 for ; Tue, 15 Jul 2025 06:24:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752585852; x=1753190652; 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=ipu1K94ir7ZDGEwTFYIjfG52vTt/Yk6xgTkmlb9d9g0=; b=nQvCFhuUdK1ya4LqM3GPyRxy8nw50TQJO52HTpBVPm+AuVE1w9JnCvn7BhkDchY4ni u4tdJC+WOcHoGryJ7FXpy1NHzjDH/e+gJgq9ZYJ7v6UYFt3l3THz5uwRgdUfRf3IEshp L8+xd4nMUjDV3LsH1CUhjMmusBiODLmB4rNKGQw7eZGWoYAzp5ATrKSNBOcAVjxmmnEk eNQvodhnySATwB8fhxdUOwdGi47xRSUkTKG1Ieyjkd1JPzXQpKqkelHqwoEx7OBQ8lp8 thEKmBBpRUovvPTaC7u0SGeP8Lntca56j5WiXz1P0ukhYnYxKcB3WH5tgN9AgWm97h+r HKqw== X-Gm-Message-State: AOJu0YwQHjmXKpH/PXbil3id18NzmnkrRrnftdah2RpmHyWnQEXxMbpb 19EPqjagORtyWCE7ddvQ9V85xEGumW2IKrUqROj7Cac2e+SaYGF/p2Y8E4MorscH4mwzJeaxNlt DYRnkIYDCLw2YRudfY0vq/r/yDgUClrCACY0CdgA5vKiY4rB3bpmf X-Gm-Gg: ASbGncs9uOjY5KXDIRR4FfRWQmYa2k7PyJJ5n68y42jLcFuUnCOxISLReQRUHO0PhfR LZgWXvM5uqVvPNpHzvb19nCl5uiRPXcwhiir+5SwjBBnyJVd9+/Yv9a0OppxsLYC2G5061F2rAT Ndkyn4Hj73XkIAjuTDjdwZru7hz+SJELR214Pjv6+ZXHuQ/3w5VQd8I6YCHTMBPOodNakuVauQ6 xw27gux9TGuMwbKFrSn+Mj9QkxV5MmH8UooioNgsccWGQk0FoT0mABKQVdDoyo753iTxK2R3bVY 2QXDAPNGROhiZLjhmwcwFKTxVkK3z4tDSwoWwUua9FPIlQbJvbMHzR/SE/iPWyXG2XdwneFPxTm U1H7DYeICRnzsFBhCluYkh2Ki X-Received: by 2002:a05:600c:8b21:b0:43d:42b:e186 with SMTP id 5b1f17b1804b1-454f427c7a3mr171862235e9.8.1752585851876; Tue, 15 Jul 2025 06:24:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEaYqvO7Z17qzgP+gQiOIR1ioSQdxI9NA77sZCIReClJxyu/a9rC4GbIDSj1kdPYM9bqwFuHQ== X-Received: by 2002:a05:600c:8b21:b0:43d:42b:e186 with SMTP id 5b1f17b1804b1-454f427c7a3mr171861965e9.8.1752585851440; Tue, 15 Jul 2025 06:24:11 -0700 (PDT) Received: from localhost (p200300d82f2849002c244e201f219fbd.dip0.t-ipconnect.de. [2003:d8:2f28:4900:2c24:4e20:1f21:9fbd]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-454dd537c6fsm163863975e9.21.2025.07.15.06.24.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jul 2025 06:24:10 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, xen-devel@lists.xenproject.org, linux-fsdevel@vger.kernel.org, nvdimm@lists.linux.dev, David Hildenbrand , Andrew Morton , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Dan Williams , Matthew Wilcox , Jan Kara , Alexander Viro , Christian Brauner , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Zi Yan , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Jann Horn , Pedro Falcato , Hugh Dickins , Oscar Salvador , Lance Yang Subject: [PATCH v1 8/9] mm: introduce and use vm_normal_page_pud() Date: Tue, 15 Jul 2025 15:23:49 +0200 Message-ID: <20250715132350.2448901-9-david@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250715132350.2448901-1-david@redhat.com> References: <20250715132350.2448901-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xitmq1qbI74ufxeTcEIQ9DEQvxvIlya7YtHfET2bKLU_1752585852 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Queue-Id: DE139140006 X-Rspamd-Server: rspam06 X-Stat-Signature: i3rk5ibqmc7c6kwrotawnrnstrxyw6s9 X-HE-Tag: 1752585856-22824 X-HE-Meta: U2FsdGVkX1+HL4xFIgybW/WtAow2tSIDl/ZwfRlpelt8Q7bPmAQClEMfdxXeYwTf7MFOM4JzyY/u/Jflxk8/kQDfmhhjFajmo2S02P6nImwHweXLRxpN/zhg9W6A0zF2apTfC53zaID3aGuDqtunRE5K2nICS3AeYtTFOd174evLr9ApYIBuObc/p3maQyGiAXoIePl6dtcnurzWhOIJan6BB/qNQg3rseNOk8TgB+9QXCQ21tNb61XVIU5lhzOPOofSw5ZUBMb6YUw1vtejlQ0D4K//E3NLH4bajudwhrRuqymqVziJ5VavUA/nkJWlyl10smg17/MASxxTEu66HCgX0jGaxbQDZMyyahu5uOXlAxo2swV5OB/d8+8lNQdQam5PHKAKT6OBVtoo81deW3i48X3r3Z7+OXdwhnBiyl4QG4UwJ4Ax7dYXunIpIXNRuuggF/4FhV9731Z5APSwpVVfgcLoSUKEg9U8uTv3j6mp1xoJ9sqAZa7L9r1yEMobakVdPANSNIp1Y7xeYuCWd3d4r5Dv1xDJRbMuJ2pTsMgdGHvTVUG2yP48aTWjVVd2qbWSIZZLeyQeWlskk1nOSx0HF/xoqrnFniOS75hpLuHxabYwk+QTV4KKDNeZYn30/OpRuuwTJrLGcrjKji9OSOGCHkXZa/F9Nmjn5qT7gR3hM0W2f41Uuqk6NBP8AVRZjVCkDYVQife1XgBZ/dLZMLs1QejefqpADWhZ7fqCgTatpCEANuzpLMxl/XmLC8DmUFbnNgmDBtL4cxJjlIGmk4YePJ+oA9YIM1sArw6lB+JHEpXziy3CShdiKSBCj/FMgqQboGgENmY4ECrz/u7ONhUzvXJ7dTlSDpfyCKC8QTfwhxp3fKuL+uBsTWvJLBapw3RKZ+L8DI2zhuvbLsqKjpnHF/UcEf6oIcG5MAaNojTXRTynhNIqFYnz0wHGwCT7bCn9zlv4F0dLhbZywJD 7q+xVWKZ OTJzAcsPgyraWE4Z5G06A3Iu2UhkSeZGYUJ3miOEPRXekM3MkUif3TCNb6jpHEK4VfEc39zbwf0TbxVG02+9FfQWItBK8lz37MlYDSFwwYJ9cl3EqBdwRMggBbW611Rb/vkoRVcpM4tfdKE+hb4pTXK7WSpm6dRp2UQpgvCOSGM6udoG3dvyErm68K+Ms+kjXWWMoMCglxuLoPjV2io2nv5C9QHPZ3CFCTMyU016co+rjt/qoUBW8zzYWqOOb1EwOONMvmPzDJkOGySN7GAeEkDWgD2P325GHWQRT0PWJOvPyq5qB526L/25biCruYFvx4eM+MF+zxoas5OUthZD4/8oe7pSl3qaL5hgDdIHRwr5C5rVZ3n1ujzAjHdPL+i93cNDQ+PqA2TwTcDr+lKtavYaCsqpG7OuK1E3pNNBYUbW/uMhVeaU465kLhq7y3UeknWA6FnhSu3hfBXRys1aR1V2nmOfHDopfKsJIPVnKSmdag3n8tvgOdCdoDm9HCT2nKsWLg71WVO+27lhj802al1XiWExONw/ZGSHmbvKTz3DN1rv7zflU0OhQqz1vm1zweoBaPFSHt6jPB0Wn9mgZ3WbuAqgIiYzG41g271bcnODsWlNhraeLd76ozuz7XJJNa6/3wVres9LOLLU= 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 | 2 ++ mm/memory.c | 27 +++++++++++++++++++++++++++ mm/pagewalk.c | 20 ++++++++++---------- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 611f337cc36c9..6877c894fe526 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2347,6 +2347,8 @@ struct folio *vm_normal_folio_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t pmd); struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t pmd); +struct page *vm_normal_page_pud(struct vm_area_struct *vma, unsigned long addr, + 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 d5f80419989b9..f1834a19a2f1e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -802,6 +802,33 @@ struct folio *vm_normal_folio_pmd(struct vm_area_struct *vma, return page_folio(page); return NULL; } + +/** + * vm_normal_page_pud() - Get the "struct page" associated with a PUD + * @vma: The VMA mapping the @pud. + * @addr: The address where the @pud is mapped. + * @pud: The PUD. + * + * Get the "struct page" associated with a PUD. See vm_normal_page_pfn() + * for details. + * + * Return: Returns the "struct page" if this is a "normal" mapping. Returns + * NULL if this is a "special" mapping. + */ +struct page *vm_normal_page_pud(struct vm_area_struct *vma, + unsigned long addr, pud_t pud) +{ + unsigned long pfn = pud_pfn(pud); + + if (unlikely(pud_special(pud))) { + if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP)) + return NULL; + + print_bad_page_map(vma, addr, pud_val(pud), NULL); + return NULL; + } + return vm_normal_page_pfn(vma, addr, pfn, pud_val(pud)); +} #endif /** diff --git a/mm/pagewalk.c b/mm/pagewalk.c index 648038247a8d2..c6753d370ff4e 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, addr, 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.50.1