From nobody Thu Oct 9 16:28:14 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 0B71D2F2C46 for ; Tue, 17 Jun 2025 15:44:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750175042; cv=none; b=cVDUP7hYOIxr80AtSzLWInRCCdj4ozgy1k8Orudr7yU6giAyqdF+GatSThWDrjWpJhIks9EayZFz2v4BevAmL4hsjVUeDeAdpoiHHbvIyujsFUHwSV562QII6E0rk7rJPvHH4AkRn0PGZbeN19o/wJfu3zFrLKqqleFLT/5EwsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750175042; c=relaxed/simple; bh=iM0Xdm4e3e5wygmWbk96k2XyIm1O0G4shrhlooh7yec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WumohrcTsK7FPRZB9dJHJgf1i/5rgh/zMAZ3PzX3CP5gXp228+7oB6I6EZFhv0O83OaoNrHtt9rjGkN5quWfSPPVPDkPDNGJlBmJv1qGcpQXxSVssYqGBqzCn0RZ3t6D3c3yf6POfcIaQQTW/UsPyxJihSCdFdzzKJphOTEUIDY= 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=Zcdmn5eN; arc=none smtp.client-ip=170.10.133.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="Zcdmn5eN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750175040; 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=5t+2oURhuR4fay2j7MSZreHj5RBEUrxIhgwh9uqVL44=; b=Zcdmn5eNXyUO57DWLH9o+eH/vggx9e39YSufqXEqw7b0UnpEv19qttJ5e9P/aEXMd6xL47 dkQkIRQftKWI8pHR3HSiEeiloeWHjyS5j+Dvbe1KzDy6V3O5tuaHPjF3k8x/hZSmqISG2a csVVNIvZjWVL+Cb4rCZSwh3+7Zybhr0= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-2-DkXR1qRjOY-9L5I5Wt0mQQ-1; Tue, 17 Jun 2025 11:43:58 -0400 X-MC-Unique: DkXR1qRjOY-9L5I5Wt0mQQ-1 X-Mimecast-MFC-AGG-ID: DkXR1qRjOY-9L5I5Wt0mQQ_1750175037 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4532ff43376so45620825e9.3 for ; Tue, 17 Jun 2025 08:43:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750175037; x=1750779837; 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=5t+2oURhuR4fay2j7MSZreHj5RBEUrxIhgwh9uqVL44=; b=bssWAquhvxA2gYjcShqyh5cP/FSpGNgk3PEToXQmqiEGEdr0hqrbxzMTvnjGBGW5/I LOyBOD41tZuimb0OIMLIOYQnZC59OUo32SJChNNHkxDdl1IX2hDWmXyrcvGs+VV3MFuE 6Iy2NQfS1qI4JPv1KwXgk+fPyrB3alqJsOkT98c7L/RdcSEaSBCqbOb7Qmn5xHecfPLj r3rDM/qgB7UTnUVGr3Powe29ABWbkNmjElHd65zWMUeMufGp8DHRLk7+57cAgfb7nL6X nFRbsV9MWjXIhEOBmVDtkjS2S/+UBgSfyPr7XoZmQETUltypwYjyzwy0+rGm9hrDHm+K tc5Q== X-Gm-Message-State: AOJu0Yy23HHgU2XriNfTwHca7otNGZxHEuQYjmfXwY6/332MLBeLbjRA O5kA1fdB9AXkCHeuEdsTDSXFTSo2Ep9rCU0WZNSO6vIxUEajW+wyjji3TieI045naDkkUxQKM3B 2ZQhFcI3ph8akHsn/nGj1vfM/ZknWf5I41p5a11OIY5cn4CrN9kMFxxq0SxspV9uGKgFcmoyZkk EvEOLdco9i/z990QRUSI1tsr4WpAkeVLgWD97/VOgdVuqf7DDz X-Gm-Gg: ASbGncswkwlOxid5Yi0mtvzp3ovC0DfHVe9TR9ZcvucOIdj0PHZmb98UZqXkdwomGfj 250jGRyjKH3JUPAK+QDZqqDCik9x/q35vypSO7p3uCwZ3NldxGBNDx5OrC9plARSx8k7kDPznt3 ei/tf7nKQnNmloGnxfea4zHwrndBY9Sz8Yo0UVdSv9rVxttHQRGTfyCDidpKNSFS3h29544yRFP +1eddnylCmPcNRur+xbp6fAL8LXptoOOjtWnovJvOEy1DNSKZQvVEkXX1vq058Bf8jqyrnXM5tQ IbU3a7+hBi9N7yPK9nmtRJbESBT3TnuXAl5kfbUpDFxp4PO6wQ== X-Received: by 2002:a05:600c:8509:b0:441:b19c:96fe with SMTP id 5b1f17b1804b1-4533caa3d54mr172176645e9.10.1750175037130; Tue, 17 Jun 2025 08:43:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKe6joB8XUUUHr9L6o0Yf1elMxRlblx8Zso9tX4QaAEAaXQGULg7L379TE9a6MvFpj5CfDTQ== X-Received: by 2002:a05:600c:8509:b0:441:b19c:96fe with SMTP id 5b1f17b1804b1-4533caa3d54mr172175925e9.10.1750175036588; Tue, 17 Jun 2025 08:43:56 -0700 (PDT) Received: from localhost (p57a1a266.dip0.t-ipconnect.de. [87.161.162.102]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4534226aa44sm108387495e9.13.2025.06.17.08.43.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jun 2025 08:43:56 -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 04/14] mm/huge_memory: move more common code into insert_pmd() Date: Tue, 17 Jun 2025 17:43:35 +0200 Message-ID: <20250617154345.2494405-5-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 | 72 ++++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 48 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index e52360df87d15..a85e0cd455109 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1379,15 +1379,25 @@ struct folio_or_pfn { bool is_folio; }; =20 -static int insert_pmd(struct vm_area_struct *vma, unsigned long addr, +static vm_fault_t insert_pmd(struct vm_area_struct *vma, unsigned long add= r, pmd_t *pmd, struct folio_or_pfn fop, pgprot_t prot, - bool write, pgtable_t pgtable) + bool write) { struct mm_struct *mm =3D vma->vm_mm; + pgtable_t pgtable =3D NULL; + spinlock_t *ptl; pmd_t entry; =20 - lockdep_assert_held(pmd_lockptr(mm, pmd)); + if (addr < vma->vm_start || addr >=3D vma->vm_end) + return VM_FAULT_SIGBUS; =20 + if (arch_needs_pgtable_deposit()) { + pgtable =3D pte_alloc_one(vma->vm_mm); + if (!pgtable) + return VM_FAULT_OOM; + } + + ptl =3D pmd_lock(mm, pmd); if (!pmd_none(*pmd)) { const unsigned long pfn =3D fop.is_folio ? folio_pfn(fop.folio) : fop.pfn; @@ -1395,15 +1405,14 @@ static int insert_pmd(struct vm_area_struct *vma, u= nsigned long addr, if (write && pmd_present(*pmd)) { if (pmd_pfn(*pmd) !=3D pfn) { WARN_ON_ONCE(!is_huge_zero_pmd(*pmd)); - return -EEXIST; + goto out_unlock; } entry =3D pmd_mkyoung(*pmd); entry =3D maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); if (pmdp_set_access_flags(vma, addr, pmd, entry, 1)) update_mmu_cache_pmd(vma, addr, pmd); } - - return -EEXIST; + goto out_unlock; } =20 if (fop.is_folio) { @@ -1424,11 +1433,17 @@ static int insert_pmd(struct vm_area_struct *vma, u= nsigned long addr, if (pgtable) { pgtable_trans_huge_deposit(mm, pmd, pgtable); mm_inc_nr_ptes(mm); + pgtable =3D NULL; } =20 set_pmd_at(mm, addr, pmd, entry); update_mmu_cache_pmd(vma, addr, pmd); - return 0; + +out_unlock: + spin_unlock(ptl); + if (pgtable) + pte_free(mm, pgtable); + return VM_FAULT_NOPAGE; } =20 /** @@ -1450,9 +1465,6 @@ vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, u= nsigned long pfn, struct folio_or_pfn fop =3D { .pfn =3D pfn, }; - pgtable_t pgtable =3D NULL; - spinlock_t *ptl; - int error; =20 /* * If we had pmd_special, we could avoid all these restrictions, @@ -1464,25 +1476,9 @@ vm_fault_t vmf_insert_pfn_pmd(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; - - if (arch_needs_pgtable_deposit()) { - pgtable =3D pte_alloc_one(vma->vm_mm); - if (!pgtable) - return VM_FAULT_OOM; - } - pfnmap_setup_cachemode_pfn(pfn, &pgprot); =20 - ptl =3D pmd_lock(vma->vm_mm, vmf->pmd); - error =3D insert_pmd(vma, addr, vmf->pmd, fop, pgprot, write, - pgtable); - spin_unlock(ptl); - if (error && pgtable) - pte_free(vma->vm_mm, pgtable); - - return VM_FAULT_NOPAGE; + return insert_pmd(vma, addr, vmf->pmd, fop, pgprot, write); } EXPORT_SYMBOL_GPL(vmf_insert_pfn_pmd); =20 @@ -1491,35 +1487,15 @@ vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vm= f, struct folio *folio, { struct vm_area_struct *vma =3D vmf->vma; unsigned long addr =3D vmf->address & PMD_MASK; - struct mm_struct *mm =3D vma->vm_mm; struct folio_or_pfn fop =3D { .folio =3D folio, .is_folio =3D true, }; - spinlock_t *ptl; - pgtable_t pgtable =3D NULL; - int error; - - if (addr < vma->vm_start || addr >=3D vma->vm_end) - return VM_FAULT_SIGBUS; =20 if (WARN_ON_ONCE(folio_order(folio) !=3D PMD_ORDER)) return VM_FAULT_SIGBUS; =20 - if (arch_needs_pgtable_deposit()) { - pgtable =3D pte_alloc_one(vma->vm_mm); - if (!pgtable) - return VM_FAULT_OOM; - } - - ptl =3D pmd_lock(mm, vmf->pmd); - error =3D insert_pmd(vma, addr, vmf->pmd, fop, vma->vm_page_prot, - write, pgtable); - spin_unlock(ptl); - if (error && pgtable) - pte_free(mm, pgtable); - - return VM_FAULT_NOPAGE; + return insert_pmd(vma, addr, vmf->pmd, fop, vma->vm_page_prot, write); } EXPORT_SYMBOL_GPL(vmf_insert_folio_pmd); =20 --=20 2.49.0