From nobody Tue Oct 7 03:36:19 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=1752585857; cv=none; d=zohomail.com; s=zohoarc; b=jJgBHFJNeVivgA3BoGcWuz1pPE/4pN8u0ITAbu1TYcvs9LSoTivK4euF6wuOAOjIsaRpoYTpnuK01Cih0iBVuLbZJ8zkr3doGodZICxNtYT48rzcJeE+iAvyAwXWyUjBuoa3BXnnHzxE1ZagiX46lqrU/em0/gfgMN3eCnuCaPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752585857; 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=oD0dyDm8lg70iaRDQ2YlIByz/7M92Pfar0orAStmNLA=; b=kDGD6M3YjDRJWsQl3z6rxvrI8FB9qCHMKcgLgWL9KUK8jdY1h5ana5WUYo5Iuy4JzReSeurvzOP5ZTtSiX7hxj0MjQsUKJNg3cDaI5Uk+WQ/MAIy6hJR1fsXfb8e0/cyY+qlHH/25Dvt97XBD+q7E3KZKkeZwapG/cMfNKk5pV8= 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 1752585857659395.17635297632216; Tue, 15 Jul 2025 06:24:17 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1044063.1414123 (Exim 4.92) (envelope-from ) id 1ubfdb-0004Ej-6c; Tue, 15 Jul 2025 13:24:03 +0000 Received: by outflank-mailman (output) from mailman id 1044063.1414123; Tue, 15 Jul 2025 13:24:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubfdb-0004Dq-0O; Tue, 15 Jul 2025 13:24:03 +0000 Received: by outflank-mailman (input) for mailman id 1044063; Tue, 15 Jul 2025 13:24:02 +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 1ubfda-0004Ab-1s for xen-devel@lists.xenproject.org; Tue, 15 Jul 2025 13:24:02 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f7e96911-617e-11f0-a319-13f23c93f187; Tue, 15 Jul 2025 15:24:01 +0200 (CEST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-257-CHdjXuz2N_uSpFBN7VHTRw-1; Tue, 15 Jul 2025 09:23:58 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a4edf5bb4dso3979228f8f.0 for ; Tue, 15 Jul 2025 06:23:58 -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-454d5037fa0sm200348205e9.7.2025.07.15.06.23.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jul 2025 06:23:56 -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: f7e96911-617e-11f0-a319-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752585840; 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=oD0dyDm8lg70iaRDQ2YlIByz/7M92Pfar0orAStmNLA=; b=Oamsumjz1KdFzKkaF2WqnUxUsk0YDoPBI4pQehS74FCjDYknRhUcgCyKlYBWZgzaYWd/Ft Merq/Wpx5zSJLuNSaLbDINSi8NaHt63YGwV6CeKTIXqAOcXlVUpfs+OeCkOKwXvEQ/LGj7 xI3FNbkA+zBZH2nS+nAmZjrU7eX+lpA= X-MC-Unique: CHdjXuz2N_uSpFBN7VHTRw-1 X-Mimecast-MFC-AGG-ID: CHdjXuz2N_uSpFBN7VHTRw_1752585837 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752585837; x=1753190637; 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=oD0dyDm8lg70iaRDQ2YlIByz/7M92Pfar0orAStmNLA=; b=eKX6/WerMVUnb+AD7nAx9+qUYdRs7L37LiPMZ/BdLdrS+l8aUMQiz3xrqmRUF2JKT3 LmkduB14jbWwPMDeJczklhytZCCmRISI4Fm+kG7W07TxZ/7FUSY7gLW+iqvnAAZdWq2y mtEUVmiM/sNbv0NNEPJeIDfSm/6H5I92z4cTWyOUrgxFLAe7eL47Nm2dVZIhIzzbPUg0 M01wmR/pdROLTzz3ViKZzT4i5RcgBc09QZB0RfSfKZVa5zSZRsRTFMecHDXvry82bRyk nxXeXO5Lg1V9N//FXwI06tWpwQfZs9/YxvHhIc6yEDdUHPhalZ3RhviApxgiZ4LHkvq3 y5mg== X-Forwarded-Encrypted: i=1; AJvYcCX/roEm1yiRwGzYa8UoV1phZGFoPzWyWoue0T2zXk9fHkldYdn4neL0WBrrGeldHi1BzBCHlBMJe5U=@lists.xenproject.org X-Gm-Message-State: AOJu0Yyfx0V70NwmXOf1BY0C7zHOi9xu5eMse8QIrwZsGH0j5ICphbgb DUTz37ygyuVYQI8reQTu183+cy3SRK1lQivI4dKDuWcwgEKR46YyPIqYWRhYM7j8IsD3xiuP1As 9lPFYKA4XMro1uvBQsGK/01FqOdn3N8+XObdu3/8BMLCn/oFZ9jtXO/Bn1s4Sn+MkkyfJ X-Gm-Gg: ASbGnctpT9NzBZrdAN07KVTanLCkWQcw6y56h8CKx2knQS/h7PG8vGCo/kp7UwsvIn7 Nn3ahDMAGsAuE8jQHzKQmt1QzL0esnZp5efwcjqDLfMTqTlDFhXKimqyAwRS1UzSoYXix12nDzN KeXu7YLdGavoREjnq7NXnAYl8Oc/CXHb95HBtcSxS7xPeBZARCu0gzlGxhP/0riLTHNaCLqKyRR cZw3BV5K6E4N1MObmqv7OCu968iOChIWvUPGGAyQ/OtWOsT2Tor3IF1y/GGaX64Pmiccg52FitG YzetD26oWlKpstxaBddmOnwf8UgJkqEoTreFbmVRdNJ0FnIp0TSuHN3dVeQuAHzDrLHP3up0fSc aUXDzIG5FErfB/zracs7WmJWL X-Received: by 2002:a5d:6f1c:0:b0:3a5:527b:64c6 with SMTP id ffacd0b85a97d-3b60a144d0emr2333533f8f.1.1752585837417; Tue, 15 Jul 2025 06:23:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFp1q78RzrsyhD1CJX8BXKE4JqnpAS3jXZChO9oe8FS+N0ne3lTOJKZGuzSFKSesdJ2HD0wXw== X-Received: by 2002:a5d:6f1c:0:b0:3a5:527b:64c6 with SMTP id ffacd0b85a97d-3b60a144d0emr2333512f8f.1.1752585836975; Tue, 15 Jul 2025 06:23:56 -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 , Alistair Popple Subject: [PATCH v1 2/9] mm/huge_memory: move more common code into insert_pud() Date: Tue, 15 Jul 2025 15:23:43 +0200 Message-ID: <20250715132350.2448901-3-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: 3n9dH7PqnGXKuDhVDfch_J3sH6QV-Mu0By4lx5znesA_1752585837 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752585859234116600 Content-Type: text/plain; charset="utf-8"; x-default="true" Let's clean it all further up. No functional change intended. Reviewed-by: Oscar Salvador Reviewed-by: Alistair Popple Signed-off-by: David Hildenbrand --- mm/huge_memory.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 154cafec58dcf..1c4a42413042a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1518,25 +1518,30 @@ static pud_t maybe_pud_mkwrite(pud_t pud, struct vm= _area_struct *vma) return pud; } =20 -static void insert_pud(struct vm_area_struct *vma, unsigned long addr, +static vm_fault_t insert_pud(struct vm_area_struct *vma, unsigned long add= r, pud_t *pud, struct folio_or_pfn fop, pgprot_t prot, bool write) { struct mm_struct *mm =3D vma->vm_mm; + spinlock_t *ptl; pud_t entry; =20 + if (addr < vma->vm_start || addr >=3D vma->vm_end) + return VM_FAULT_SIGBUS; + + ptl =3D pud_lock(mm, pud); if (!pud_none(*pud)) { const unsigned long pfn =3D fop.is_folio ? folio_pfn(fop.folio) : fop.pfn; =20 if (write) { if (WARN_ON_ONCE(pud_pfn(*pud) !=3D pfn)) - return; + goto out_unlock; entry =3D pud_mkyoung(*pud); entry =3D maybe_pud_mkwrite(pud_mkdirty(entry), vma); if (pudp_set_access_flags(vma, addr, pud, entry, 1)) update_mmu_cache_pud(vma, addr, pud); } - return; + goto out_unlock; } =20 if (fop.is_folio) { @@ -1555,6 +1560,9 @@ static void insert_pud(struct vm_area_struct *vma, un= signed long addr, } set_pud_at(mm, addr, pud, entry); update_mmu_cache_pud(vma, addr, pud); +out_unlock: + spin_unlock(ptl); + return VM_FAULT_NOPAGE; } =20 /** @@ -1576,7 +1584,6 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, u= nsigned long pfn, struct folio_or_pfn fop =3D { .pfn =3D pfn, }; - spinlock_t *ptl; =20 /* * If we had pud_special, we could avoid all these restrictions, @@ -1588,16 +1595,9 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, = unsigned long pfn, (VM_PFNMAP|VM_MIXEDMAP)); BUG_ON((vma->vm_flags & VM_PFNMAP) && is_cow_mapping(vma->vm_flags)); =20 - if (addr < vma->vm_start || addr >=3D vma->vm_end) - return VM_FAULT_SIGBUS; - pfnmap_setup_cachemode_pfn(pfn, &pgprot); =20 - ptl =3D pud_lock(vma->vm_mm, vmf->pud); - insert_pud(vma, addr, vmf->pud, fop, pgprot, write); - spin_unlock(ptl); - - return VM_FAULT_NOPAGE; + return insert_pud(vma, addr, vmf->pud, fop, pgprot, write); } EXPORT_SYMBOL_GPL(vmf_insert_pfn_pud); =20 @@ -1614,25 +1614,15 @@ vm_fault_t vmf_insert_folio_pud(struct vm_fault *vm= f, struct folio *folio, { struct vm_area_struct *vma =3D vmf->vma; unsigned long addr =3D vmf->address & PUD_MASK; - pud_t *pud =3D vmf->pud; - struct mm_struct *mm =3D vma->vm_mm; struct folio_or_pfn fop =3D { .folio =3D folio, .is_folio =3D true, }; - spinlock_t *ptl; - - if (addr < vma->vm_start || addr >=3D vma->vm_end) - return VM_FAULT_SIGBUS; =20 if (WARN_ON_ONCE(folio_order(folio) !=3D PUD_ORDER)) return VM_FAULT_SIGBUS; =20 - ptl =3D pud_lock(mm, pud); - insert_pud(vma, addr, vmf->pud, fop, vma->vm_page_prot, write); - spin_unlock(ptl); - - return VM_FAULT_NOPAGE; + return insert_pud(vma, addr, vmf->pud, fop, vma->vm_page_prot, write); } EXPORT_SYMBOL_GPL(vmf_insert_folio_pud); #endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */ --=20 2.50.1