From nobody Thu Oct 9 16:29:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BF112F362C for ; Tue, 17 Jun 2025 15:44:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750175045; cv=none; b=Kqjt/3zmtK+dBJcn6PlW+jmC0rV+1Y5q1wL2V4EvNORKsCuAyo7YaFjwq91ZnMxvdrh2H8V5vlWy/u5kO7GK1E8TqMGqPV/BroU4e+cubSGZhlQpKThog7m/2EhmojkF2QXwKLs2siamNk3+heu+BX9TqLMDTlTwE2/1gXZ2xCM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750175045; c=relaxed/simple; bh=Lmnd5ZdzMmI5UAgfdf1SJgbeKDVj30wC0SI7xpkFiMk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JDTX3jK/yAFynCcCdp4/pdp6XbetqiGxhdM6c/Kc4MhhS+8QMRdbv/F2CmNGRiMblAHHxCwfRspTn/nO5nr2iElpe9UIcRkhPACEtp6dnUgJVgrE7umyDG1kvoz8JJ5xq7FdHOA1oXTaD1LOj68P+ta3X+RA9PYyDIrkcR3PrFE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=J3vsOxw4; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="J3vsOxw4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750175042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5L8RMUDCiRiYUMLt7aYvOaTdy74+EjgVDuyzYaNy+k8=; b=J3vsOxw4T6/7W98lteezdAZpJffa86VAE9b+YbyloGvxcK46PzZ4hDhQHMxr1SZ34IdLO5 JcGSdhWfUKIs/TXtoLmq1MFiOjAjPhuqTiqv9EEFRwiu4TGUJxu9J3t78+FZD+Xa/9Hy+C unkN3XWQFfWabztB3L0OH+5EZhq9JSU= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-37-BUtSATPSOcOwPt-u2o-YRA-1; Tue, 17 Jun 2025 11:44:01 -0400 X-MC-Unique: BUtSATPSOcOwPt-u2o-YRA-1 X-Mimecast-MFC-AGG-ID: BUtSATPSOcOwPt-u2o-YRA_1750175040 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-451d2037f1eso36347315e9.0 for ; Tue, 17 Jun 2025 08:44:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750175040; x=1750779840; 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=5L8RMUDCiRiYUMLt7aYvOaTdy74+EjgVDuyzYaNy+k8=; b=JXEqw2k+WU257YbDzxyWss8bvJ1HrVrjx0U9I+354K5bOra3sSykTDj6C7XdK35oWs PgTaswyYL5wP0n3KL/qaPedn54Oy+nsdDzCLIutfNGS+9j3q13jXKU5QvKlLTnKUgBTv IvvlRDZ/iqLvygWM4oPAvokLlGESsPrQJ+kla4KTdvL3rITU67Poa6l0bYUR7ssCAHwh ltb/hc9AamTNI0mqWuaZc4xYyQQr0SZspaTwOhgzRgAyznMg5P8nCUO3ftCHdJ7eZFbZ yzqr4LpP9qIEiYobnhPJZilj1OQtrgIDNuJhQJ30qBdLZ0t0H10Vy/bfjjFtQDnDbgjt 5gZw== X-Gm-Message-State: AOJu0YxrFml+JlHzts4xt0l7QujJn4TEwDfozOy3CVVrh5vITwYA5szB /bGsYMYk/FasCUcYIEjKXeJl8emY0OqRrLoq1ZxuWWQn11KQ1E0POj4D9io9TZNFSbdtueEVVdK 3eHOzDjqewNg8C0S1izcgX5fa/KGhmxweLYkOa/hSaBlVu5sha5I0cBrhfMEvGppLGOT6L7U39U 4D9cepKN5pZkjLgw1Gm0zatBuFS5L4GhxwmU4I9TRNXpReq/n6 X-Gm-Gg: ASbGnctB4swKkAaIxbjsUQUIsSnbFO6c/3OfauufaxrQCKQ6hFA+uSeywz6Vy0PsbLo 3tTc9ZR4zi9y5soqO7EVadwfZHg4gEROnA4FbXaAFadGmypBbbuz71TNUU4ufNMfkavdwfyQRVN rY7NqADwNc4Z332BdqE5xaRXKmfSgUIOgk1nFmu4n32UjN97MBksrXmFXbIFfY3IN6km6savGwy PKt+L3frvYJitOLo4rgEeBegoQNQo5iNXh/b4jOUBQgokbMHy9a5Ef1JKiLJt4dGtlUpKTkpZ4U 8S7zOGPsmPrrkfoSf4AP3Bz1D/s+juu9Pe0f2Yu6nZh8I/RCOGeUZT7/FNLC//jo0aQjfV19eCl cFpEoUw== X-Received: by 2002:a05:600c:8710:b0:44a:775d:b5e8 with SMTP id 5b1f17b1804b1-4533cadf840mr119660395e9.1.1750175039997; Tue, 17 Jun 2025 08:43:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6BFmn+0lN3d+8pZJ+Q6QIbSjyAC/18B9P+xMU7OTx196gniDr43GvtKhKD3/WRsO3OGi0Uw== X-Received: by 2002:a05:600c:8710:b0:44a:775d:b5e8 with SMTP id 5b1f17b1804b1-4533cadf840mr119659825e9.1.1750175039526; Tue, 17 Jun 2025 08:43:59 -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-4532e25f207sm178703705e9.35.2025.06.17.08.43.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jun 2025 08:43:59 -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 05/14] mm/huge_memory: move more common code into insert_pud() Date: Tue, 17 Jun 2025 17:43:36 +0200 Message-ID: <20250617154345.2494405-6-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Let's clean it all further up. Signed-off-by: David Hildenbrand Reviewed-by: Alistair Popple Reviewed-by: Oscar Salvador --- 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 a85e0cd455109..1ea23900b5adb 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1507,25 +1507,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 && pud_present(*pud)) { 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) { @@ -1544,6 +1549,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 /** @@ -1565,7 +1573,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, @@ -1577,16 +1584,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 @@ -1603,25 +1603,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.49.0