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 749B9C71157 for ; Tue, 17 Jun 2025 15:44:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2173D6B00A9; Tue, 17 Jun 2025 11:44:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A0CE6B00AA; Tue, 17 Jun 2025 11:44:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0678E6B00AB; Tue, 17 Jun 2025 11:44:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E26286B00A9 for ; Tue, 17 Jun 2025 11:44:16 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AD55EC053D for ; Tue, 17 Jun 2025 15:44:16 +0000 (UTC) X-FDA: 83565314112.25.DC042D7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 66CB218000C for ; Tue, 17 Jun 2025 15:44:14 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gqjfiU0b; spf=pass (imf16.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=1750175054; 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=8nQwds7Yyk6JA3H6HqbSBsBU+gjLOchhVzRWSpa3UwQ=; b=U7p/tCFKu6h/NFB4Jb9BauCNhH5psv/UZyTGW2B0cVpArZ1PacdjjjMCgutiqtP+crMx8s NrEfz9Pz/llhl/31gzhyBQxLERX61oVu/Mwg6UF8cLiZBhkFMG+aB2aALxCguJqRA9BuMX 0ukA8dDc8zmaKmGgZfNMk5AkVLdiYLc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750175054; a=rsa-sha256; cv=none; b=AfoopFxE0t0v5o7fcL9tL1NzjA+TGykiAuC+r1vxW6tWyFSbPJr5kGGXcEcqUNJlbkqqs6 qevd0r8L+6GV8IhgYP+s0iQ4Qbdu5c7PExyufb9OXRzHyNp0uxrOT2cA+jUd+Wr1brRYYf /yNRZrigmTzBKiV0mMqbY0EzugK1jCc= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gqjfiU0b; spf=pass (imf16.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750175053; 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=8nQwds7Yyk6JA3H6HqbSBsBU+gjLOchhVzRWSpa3UwQ=; b=gqjfiU0bKi9CTv19ZGiJ4MV7HrN9cK8Ix0M4U7ziShux3+DNNu3HsrMwToaxbSqeJNCP6q 89ZmMA5nffjaVySVu3D9W0hLUZie09UNMnLRuQOM5djNZ2y9fZW41+t2eTFsYLYApaRolS T0H7GAvROmMeTKyYNAHISwOOGzEkbEE= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-205-FSL4_E3oPn2oLCGS27nSEA-1; Tue, 17 Jun 2025 11:44:12 -0400 X-MC-Unique: FSL4_E3oPn2oLCGS27nSEA-1 X-Mimecast-MFC-AGG-ID: FSL4_E3oPn2oLCGS27nSEA_1750175051 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3a4e713e05bso2687278f8f.3 for ; Tue, 17 Jun 2025 08:44:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750175051; x=1750779851; 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=8nQwds7Yyk6JA3H6HqbSBsBU+gjLOchhVzRWSpa3UwQ=; b=EHverZB+S5RE4VhNaG9kyqSkPPOTB8PhMLQjcKhlkfxErY1UlbAcPJfBV/6dvIgVS8 dyksUJX3oFfmv++VBzkXxG4IyKIGaq6TySrcdCblYvlKJOctMpHefPN+W5eoTvwSrgV0 +f6sY5eAD55bjeLe6g3dhcppLHgQDajPqVbdrUYIlNP1YRQac4431cU6NYd3dn6Omo4f SP4akxtFrVk+VBxy2YYcQuwmFcUm2FJU7Os2UCw7VfuazPDSao+SHEMky0+rzxQlHfr0 Qa9MS9YzA3BQ7jpapF6DyK341xwGDVveNsqOSsdgwaNgpf2r0oWUFUwi/Jz8xFgsyn+o Wr0A== X-Forwarded-Encrypted: i=1; AJvYcCVEhQMompKXHvZo1qFktbTl9cRBBjMavDxr/blclWiLNIS1alkSCidT/867dM633YZinfA7pSCPHA==@kvack.org X-Gm-Message-State: AOJu0YzJ+M9P+xGjdLGow4ik3QmQJDy9oXAVN/K6m4OioiZ+F9c2AcIh nUqD9YaUAv6QZp4h40Uy8uKOLXAykIr0Tdb2J9fxIIE4m/UDLVPpUpo9Dpv/GS/otX2bYssSBbt Rhn883Q9TQEJ45ssHeGRxcdgwhwMRKmQ9uofJyV/TSnvOE8mdHzQm X-Gm-Gg: ASbGncuka7cCSSOGwwGd3b4dQtPFgEIqnrLZfs6IfP1duZ1zEJjwZrLgIl0eBXnAVem LhiYpsNSF31Gl4uKcycDNpYJTEmihWBumC7QBB3WJ3whSKL3znJIiYfKmQ33YtjOx8pp8vMndMh t9tccSS4AXpSa8P9Tjqv215P5GtWk5MH3XrNIPZgDqN9YwsajQcM0jttnZ3pQb+McD74e3PeViN RtK91iSumMU+nmCWR9igtZCrg7sL61znx/oIp0Lzor08QxZcjv42TOdnxEuE1hIzFiywGzijkO4 spcf9KZaUo9ab+MczbpGZbg5fUZ9ZZKBDYEyvxBITlkklGCAcqKFaFB7z5cZ82dO6vcacZuZVVt zMQfHLQ== X-Received: by 2002:a05:6000:4282:b0:3a4:fefb:c8d3 with SMTP id ffacd0b85a97d-3a5723af0aamr11566051f8f.40.1750175051252; Tue, 17 Jun 2025 08:44:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/V6oFuqHOfr5zNP3xy/su55zH7TFZMZO7NjqgYAqVSSsBW8t2gqFSXD3CPoL3K9BbxYOdvQ== X-Received: by 2002:a05:6000:4282:b0:3a4:fefb:c8d3 with SMTP id ffacd0b85a97d-3a5723af0aamr11566020f8f.40.1750175050826; Tue, 17 Jun 2025 08:44:10 -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 ffacd0b85a97d-3a568b087f8sm14566243f8f.53.2025.06.17.08.44.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jun 2025 08:44:10 -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 10/14] mm/memory: factor out common code from vm_normal_page_*() Date: Tue, 17 Jun 2025 17:43:41 +0200 Message-ID: <20250617154345.2494405-11-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: PN5KF1zBU8ddtVtp-wCAWHNLcSxdi4ZHrdih9Tqdk7s_1750175051 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam03 X-Stat-Signature: qhn1wbnxzu6fcrdoir7hyiuce16oxfso X-Rspam-User: X-Rspamd-Queue-Id: 66CB218000C X-HE-Tag: 1750175054-33715 X-HE-Meta: U2FsdGVkX1+hnqumVgSM1Gc5lLIgaPZqIroetG7fr+C6UmxHrx8Dw83jCx9EBEQPxcnlPA9eTaY39c9eWOtfZSlf3zJcirXJYZeIDqcgg6NU2nmck92odWbhfJH9a6G4IrA6Fpo4vcZZQ+yF3wGPcWyjckCx9103rmDBtoktSB7R5xbHgzmzz8EpljpjIIDhjHDG0Lam8O+LP3/+w9ZF1JrBZ7wMi69ez1G4haC3JawQvtajckroNwWl9HP7C1D4Fq7YqiE69H10y6n/WldZQuNRpjPJrMHlM7bXNIlZBWef8FlmnLqvleRIJNf6rxHm4xKYluSGxtIn3euhaggKgfX1GkTb66LBlBjEioJY+DWZpTYsHC/Isd/qmO/MbDMRiW+VlDEx7emE0v3zZknJQExDEZSPyQn/Kpiy1qq9QRi1xN4wtusWSuGhJPVdYbKNfT5m/OutVivZFSl7esJVBZQbauuJdbQmDKrJadrFEt6XMvq9A8+qIgaWpGLCvYvWddTSw8RGbxuIL4ctzyLgnBCs7qb5J4sOBmt/EEs7YalVjjld122j7yzrg2DKYp0ccIgVrZwodTBnO5uxbS/eBeJ88mbwAoXLQZ65OpO2hHZrClFMvSBHppBrLpavonkG4IvStKcuPqqNsOb3dZ1mYcSeFmuuiL86NAzjQ9X+ANqP+9tDiDwrLg6+KYOpEjVrNtzlunJ211S4Uf97eePHaGUTRIvJLMbgJ8wumvmtzAtEvP/ySZBvBATfo0gd3q3030xPDtXEpBou5bjlF0geaPJZ2BzKGy49kiMxYnSmHeX9x2GSNDFKym6Zms1ORMKezkXo2Siv1anOdOC2KLYHg0C9Qg9EHmzJg0Rpy2WZA1GtVaqREUgyZlnB16QxybX74CTwu2HwCq4LGTf83TMIS2Fnr+KTHNEmcZbIrg/Wcu5asbaP85G/ZQkD0E+hvl/72hFvmHwRrjWxESUTA+C ZmiFOMOa Rt6WOeSBbpB/RRtMCmjtlpLcBIZWUwn59rGc3EkOQO/wLFLr3Bh95G70WwN4yM3shf7y+L3Fgs2Bya1BNgvV1Gw5a2lxJW0yZz9mMmhkCKA8V1j5Cu5f9QJHXHnGDAJ7v24TTjDJosh3Auv/PXJgg0bFDWw+BgIZb0YumLnD9bPDOYQ7xWkLMs9upEP8fsk1+q0m/Q+TQJ8jyA8naPIzz3o+3ysC242CHtbHZKv/mg/BC6EYwX+HAEIrg+bSbzMUV+SVvSt22Lqlh5Zo/WdkrAcm4KJt/9eipmhxnszPb2SggmsmPv8MWmZGMdmMH18PnV9dUnBUYQ8qDeMClrQx3jwVnIcsLTH5h4KuZsT4duIOBMNeDY8X9rnHjTYSbbVlQCymbCAr5Kfxx4yurVYoO3OfZCIDfVFF3olMCSgo0MtomjWSSsE2LtOfiBkD3uQHX+RZOGxwZwdIxW9bbdrGRCI4rIq3erhKT4nzbzgGWesLT98HWd9XiyCuDwbZz8vfS0ov25VtHdlAyluYB6q/W4W1/mKIZHxItoZDS 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 reduce the code duplication and factor out the non-pte/pmd related magic into vm_normal_page_pfn(). To keep it simpler, check the pfn against both zero folios. We could optimize this, but as it's only for the !CONFIG_ARCH_HAS_PTE_SPECIAL case, it's not a compelling micro-optimization. With CONFIG_ARCH_HAS_PTE_SPECIAL we don't have to check anything else, really. It's a good question if we can even hit the !CONFIG_ARCH_HAS_PTE_SPECIAL scenario in the PMD case in practice: but doesn't really matter, as it's now all unified in vm_normal_page_pfn(). While at it, add a check that pmd_special() is really only set where we would expect it. No functional change intended. Signed-off-by: David Hildenbrand --- mm/memory.c | 104 +++++++++++++++++++++++----------------------------- 1 file changed, 46 insertions(+), 58 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index b6c069f4ad11f..3d3fa01cd217e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -536,6 +536,46 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr, add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); } +/* Called only if the page table entry is not marked special. */ +static inline struct page *vm_normal_page_pfn(struct vm_area_struct *vma, + unsigned long addr, unsigned long pfn) +{ + /* + * With CONFIG_ARCH_HAS_PTE_SPECIAL, any special page table mappings + * (incl. shared zero folios) are marked accordingly. + */ + if (IS_ENABLED(CONFIG_ARCH_HAS_PTE_SPECIAL)) + goto normal_page; + + if (unlikely(vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP))) { + if (vma->vm_flags & VM_MIXEDMAP) { + /* If it has a "struct page", it's "normal". */ + if (!pfn_valid(pfn)) + return NULL; + } else { + unsigned long off = (addr - vma->vm_start) >> PAGE_SHIFT; + + /* Only CoW'ed anon folios are "normal". */ + if (pfn == vma->vm_pgoff + off) + return NULL; + if (!is_cow_mapping(vma->vm_flags)) + return NULL; + } + } + + if (is_zero_pfn(pfn) || is_huge_zero_pfn(pfn)) + return NULL; + +normal_page: + /* + * NOTE! We still have PageReserved() pages in the page tables. + * For example, VDSO mappings can cause them to exist. + */ + VM_WARN_ON_ONCE(!pfn_valid(pfn)); + VM_WARN_ON_ONCE(is_zero_pfn(pfn) || is_huge_zero_pfn(pfn)); + return pfn_to_page(pfn); +} + /* * vm_normal_page -- This function gets the "struct page" associated with a pte. * @@ -591,9 +631,7 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, { unsigned long pfn = pte_pfn(pte); - if (IS_ENABLED(CONFIG_ARCH_HAS_PTE_SPECIAL)) { - if (likely(!pte_special(pte))) - goto out; + if (unlikely(pte_special(pte))) { if (vma->vm_ops && vma->vm_ops->find_special_page) return vma->vm_ops->find_special_page(vma, addr); if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP)) @@ -604,34 +642,7 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, print_bad_pte(vma, addr, pte, NULL); return NULL; } - - /* !CONFIG_ARCH_HAS_PTE_SPECIAL case follows: */ - - if (unlikely(vma->vm_flags & (VM_PFNMAP|VM_MIXEDMAP))) { - if (vma->vm_flags & VM_MIXEDMAP) { - if (!pfn_valid(pfn)) - return NULL; - } else { - unsigned long off; - off = (addr - vma->vm_start) >> PAGE_SHIFT; - if (pfn == vma->vm_pgoff + off) - return NULL; - if (!is_cow_mapping(vma->vm_flags)) - return NULL; - } - } - - if (is_zero_pfn(pfn)) - return NULL; - - /* - * NOTE! We still have PageReserved() pages in the page tables. - * eg. VDSO mappings can cause them to exist. - */ -out: - VM_WARN_ON_ONCE(!pfn_valid(pfn)); - VM_WARN_ON_ONCE(is_zero_pfn(pfn)); - return pfn_to_page(pfn); + return vm_normal_page_pfn(vma, addr, pfn); } struct folio *vm_normal_folio(struct vm_area_struct *vma, unsigned long addr, @@ -650,35 +661,12 @@ struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr, { unsigned long pfn = pmd_pfn(pmd); - /* Currently it's only used for huge pfnmaps */ - if (unlikely(pmd_special(pmd))) + if (unlikely(pmd_special(pmd))) { + VM_WARN_ON_ONCE(!(vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP)) && + !is_huge_zero_pfn(pfn)); return NULL; - - if (unlikely(vma->vm_flags & (VM_PFNMAP|VM_MIXEDMAP))) { - if (vma->vm_flags & VM_MIXEDMAP) { - if (!pfn_valid(pfn)) - return NULL; - goto out; - } else { - unsigned long off; - off = (addr - vma->vm_start) >> PAGE_SHIFT; - if (pfn == vma->vm_pgoff + off) - return NULL; - if (!is_cow_mapping(vma->vm_flags)) - return NULL; - } } - - if (is_huge_zero_pfn(pfn)) - return NULL; - - /* - * NOTE! We still have PageReserved() pages in the page tables. - * eg. VDSO mappings can cause them to exist. - */ -out: - VM_WARN_ON_ONCE(!pfn_valid(pfn)); - return pfn_to_page(pfn); + return vm_normal_page_pfn(vma, addr, pfn); } struct folio *vm_normal_folio_pmd(struct vm_area_struct *vma, -- 2.49.0