From nobody Tue Oct 7 03:36:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1752585864; cv=none; d=zohomail.com; s=zohoarc; b=VKKkFBNPavPYzFXXdESAJAlO4i3gu5d/RlKt3q1zekT68UzvY5gBSqHmM4i+MxbU+zIj7AzhWCHDdReXMX21+FbZXctCpjUAJhS6gHrPxOtq99JflTeeNRlSiGerrAiOxBjoVyDXASwNrNYNnFY573d9FwK5J8B4hti724wgIi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752585864; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=80PJLXORrw3H7rwjCmXyFxVPsu/BFZ5pBpUGrZ/8JVA=; b=NmJmweF9ihrA9hHz5N+kG7+4AheSWSx0MjvxA0Z2417sFpeOnGzhEZnRhnOZLdGZOEFboyOWNT9dhgMLTGiEjt/ljbOIJRAFcciUxyWa1dewOK+VHmp/JHoytmnExilmdpCoTqye3Mv3AFrbNbbIuve32a3A85lQRHuoKtZS5do= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1752585864403447.8189692190326; Tue, 15 Jul 2025 06:24:24 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1044065.1414146 (Exim 4.92) (envelope-from ) id 1ubfdf-0004w5-KR; Tue, 15 Jul 2025 13:24:07 +0000 Received: by outflank-mailman (output) from mailman id 1044065.1414146; Tue, 15 Jul 2025 13:24:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubfdf-0004vs-H1; Tue, 15 Jul 2025 13:24:07 +0000 Received: by outflank-mailman (input) for mailman id 1044065; Tue, 15 Jul 2025 13:24:06 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubfde-0004Ab-SJ for xen-devel@lists.xenproject.org; Tue, 15 Jul 2025 13:24:06 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id fb00aabd-617e-11f0-a319-13f23c93f187; Tue, 15 Jul 2025 15:24:06 +0200 (CEST) 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-474-HF9NURg9MTaqfOz4V4eo7w-1; Tue, 15 Jul 2025 09:24:03 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3a4f858bc5eso4181566f8f.0 for ; Tue, 15 Jul 2025 06:24:03 -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 ffacd0b85a97d-3b5e8e0d719sm15297274f8f.54.2025.07.15.06.24.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jul 2025 06:24:01 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: fb00aabd-617e-11f0-a319-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752585845; 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=80PJLXORrw3H7rwjCmXyFxVPsu/BFZ5pBpUGrZ/8JVA=; b=JGqOZEo+oTLb9+6P/0Om5vIyePNysJU41M+u0s5NJxTpa4rTA4HgxgL9JjTniOWyz1yLQI 9MApVInTIQ0r3jU1tZhn3QCL4Vkosdf7RrvBIfsx9kS+2gKGB+4sV3SlnqwMAxr04OpTmu uIHEKUxsCbI7ZpddttgEm+WjAiMltrI= X-MC-Unique: HF9NURg9MTaqfOz4V4eo7w-1 X-Mimecast-MFC-AGG-ID: HF9NURg9MTaqfOz4V4eo7w_1752585843 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752585842; x=1753190642; 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=80PJLXORrw3H7rwjCmXyFxVPsu/BFZ5pBpUGrZ/8JVA=; b=SOZ8APh8nWDnOFjjX2JU/SM+0jzeR5Ejv6rSPOGyH1R4V/NR8mFoDjcjPcLlIWDI+K ghB9ff7ctXPcwi8+3T9avOXJzl14e1TlJRk4igLpAr8N0GReWCheY2RM6LrK3XMPlVbw mWYNx6xqOcOtqIcz9uo1GFNxvOoTfxJRaLAOBNOlLOd4zPo7uHIQlnD/FDtRL5tEljjn BeMN2xQ72odMt39Q4lgwgCUNR8ptoRxUYfj/CwO0ZLKebgxYukGjkWW08/C15ae2im1L F0Dh/G4WuGmxjIyZ5PIdLWaz/xwpxh6gjNASpBpjbWg3BC/4Ojv5b31VUBX/yZ4kc4/j X7ow== X-Forwarded-Encrypted: i=1; AJvYcCUbilP6jXpPRSs0OFjuP8kHkGU3DqNxeB24GYm08sZ0F9PEzQWmn3qzv/uasQQu8bwBiXXosY6Hzvc=@lists.xenproject.org X-Gm-Message-State: AOJu0Yxv4uCcFOC4/e7wvTORx5sAK48m4I9XDUyzTEvWJYJBBMjBZAM4 zvU8W9P3mofzFckm7wxpJ3fjzf5l5Wzg1NxAo3SoTzeQsAcJEQRnlyL01b/RzR1HSs+EA2FuQ85 rQ5TSUuQL8RmHOuARWh0Xo35LQPxyLeoAEMuRZvHuSJsr9jBpQs2RUsUOefTWI9rPqX9p X-Gm-Gg: ASbGncvEbD5hrTYE2tugsjnqgyr8BjEX+yMVcSmvyQOZ0ch+WCDWQ2ti3xOk7cPyMKP 0jpQEKIbSWmLEVaHJGjzztDvXkc2zud95u5IXRgGCAqI1Eqaq05Wpl6tY+QsbBKCSVjm5acyD3Z WxB+/iUxD8vmQwgIVmyB5Xdvj/amXTnHLNqEAWWl2sn+lEhEVFmZymaR+MXxeVSEb5B5I6yr5d4 G0cyj14/YkamsxnfcQl9I3mCVPNsE4GQqsJoa/Pw11jLurI0zQMwerR2X6D9aOpQpL0tJfPM6PB UUwQXz4syFkW9dXlETthDwwYdO/9wqm8LZZSr6zAUeXzHVLpt2hV7soGbAVvEnHm4aFvwQ2gCCT CxFUnHApi4Mve7wRu6kSB4Nmw X-Received: by 2002:a05:6000:230e:b0:3b5:e6f2:9117 with SMTP id ffacd0b85a97d-3b5f2e3083dmr13500633f8f.39.1752585842446; Tue, 15 Jul 2025 06:24:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF4Mv4tTd5MMu5ncCf3BOQ9JFfOJXwaxaOdtEK+d74QRgh71f+xeQhxUGyEq6hfTSErOkM9rA== X-Received: by 2002:a05:6000:230e:b0:3b5:e6f2:9117 with SMTP id ffacd0b85a97d-3b5f2e3083dmr13500595f8f.39.1752585841971; Tue, 15 Jul 2025 06:24:01 -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 4/9] fs/dax: use vmf_insert_folio_pmd() to insert the huge zero folio Date: Tue, 15 Jul 2025 15:23:45 +0200 Message-ID: <20250715132350.2448901-5-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: DftVzNdCgd7nbb0kHaUmfFd-FFeH73VGyvHR4J9cDGw_1752585843 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752585866479116600 Content-Type: text/plain; charset="utf-8"; x-default="true" Let's convert to vmf_insert_folio_pmd(). There is a theoretical change in behavior: in the unlikely case there is already something mapped, we'll now still call trace_dax_pmd_load_hole() and return VM_FAULT_NOPAGE. Previously, we would have returned VM_FAULT_FALLBACK, and the caller would have zapped the PMD to try a PTE fault. However, that behavior was different to other PTE+PMD faults, when there would already be something mapped, and it's not even clear if it could be triggered. Assuming the huge zero folio is already mapped, all good, no need to fallback to PTEs. Assuming there is already a leaf page table ... the behavior would be just like when trying to insert a PMD mapping a folio through dax_fault_iter()->vmf_insert_folio_pmd(). Assuming there is already something else mapped as PMD? It sounds like a BUG, and the behavior would be just like when trying to insert a PMD mapping a folio through dax_fault_iter()->vmf_insert_folio_pmd(). So, it sounds reasonable to not handle huge zero folios differently to inserting PMDs mapping folios when there already is something mapped. Signed-off-by: David Hildenbrand Reviewed-by: Alistair Popple --- fs/dax.c | 47 ++++++++++------------------------------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 4229513806bea..ae90706674a3f 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1375,51 +1375,24 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state= *xas, struct vm_fault *vmf, const struct iomap_iter *iter, void **entry) { struct address_space *mapping =3D vmf->vma->vm_file->f_mapping; - unsigned long pmd_addr =3D vmf->address & PMD_MASK; - struct vm_area_struct *vma =3D vmf->vma; struct inode *inode =3D mapping->host; - pgtable_t pgtable =3D NULL; struct folio *zero_folio; - spinlock_t *ptl; - pmd_t pmd_entry; - unsigned long pfn; + vm_fault_t ret; =20 zero_folio =3D mm_get_huge_zero_folio(vmf->vma->vm_mm); =20 - if (unlikely(!zero_folio)) - goto fallback; - - pfn =3D page_to_pfn(&zero_folio->page); - *entry =3D dax_insert_entry(xas, vmf, iter, *entry, pfn, - DAX_PMD | DAX_ZERO_PAGE); - - if (arch_needs_pgtable_deposit()) { - pgtable =3D pte_alloc_one(vma->vm_mm); - if (!pgtable) - return VM_FAULT_OOM; - } - - ptl =3D pmd_lock(vmf->vma->vm_mm, vmf->pmd); - if (!pmd_none(*(vmf->pmd))) { - spin_unlock(ptl); - goto fallback; + if (unlikely(!zero_folio)) { + trace_dax_pmd_load_hole_fallback(inode, vmf, zero_folio, *entry); + return VM_FAULT_FALLBACK; } =20 - if (pgtable) { - pgtable_trans_huge_deposit(vma->vm_mm, vmf->pmd, pgtable); - mm_inc_nr_ptes(vma->vm_mm); - } - pmd_entry =3D folio_mk_pmd(zero_folio, vmf->vma->vm_page_prot); - set_pmd_at(vmf->vma->vm_mm, pmd_addr, vmf->pmd, pmd_entry); - spin_unlock(ptl); - trace_dax_pmd_load_hole(inode, vmf, zero_folio, *entry); - return VM_FAULT_NOPAGE; + *entry =3D dax_insert_entry(xas, vmf, iter, *entry, folio_pfn(zero_folio), + DAX_PMD | DAX_ZERO_PAGE); =20 -fallback: - if (pgtable) - pte_free(vma->vm_mm, pgtable); - trace_dax_pmd_load_hole_fallback(inode, vmf, zero_folio, *entry); - return VM_FAULT_FALLBACK; + ret =3D vmf_insert_folio_pmd(vmf, zero_folio, false); + if (ret =3D=3D VM_FAULT_NOPAGE) + trace_dax_pmd_load_hole(inode, vmf, zero_folio, *entry); + return ret; } #else static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault = *vmf, --=20 2.50.1