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 000ABC7115B for ; Tue, 17 Jun 2025 15:44:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD6886B00A0; Tue, 17 Jun 2025 11:44:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D60CE6B00A1; Tue, 17 Jun 2025 11:44:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B8B6F6B00A2; Tue, 17 Jun 2025 11:44:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A0C2B6B00A0 for ; Tue, 17 Jun 2025 11:44:05 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4EBA3100AFE for ; Tue, 17 Jun 2025 15:44:05 +0000 (UTC) X-FDA: 83565313650.02.9D01B48 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 186FB4000A for ; Tue, 17 Jun 2025 15:44:02 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Z2BF0een; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750175043; a=rsa-sha256; cv=none; b=OpNPLBGzW2ZO2sXdYrfIWoj4dRm+li6ZmyGNNUAnzb4O5EQUUtnoRX+/U1jODg+03I3RLa gw/r8Qf40dSCp+mZp4YwKg4jI9zm99s8lwur7KVgwaNSNy2rFJONx6LwqAbyxkxy08AleF ds7sE3FHfn8M73rIIAm8CpeLi9+kqG0= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Z2BF0een; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750175043; 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=5L8RMUDCiRiYUMLt7aYvOaTdy74+EjgVDuyzYaNy+k8=; b=bimOJnBklW9lvZctl0dC7+AVvv4uhjHQQxpN3P5sspVE6llJCJI28Z90EFUtlir7kmIGL3 C3DSZ8X5aOTG29YH8Ffbz/PY2VIu03UZdmPBz1QY6EWC42DcWLqSf/lUR6m1KhmlPZrqPS XhczjL33l29UEFPX3aA49ddnfTgkD7s= 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-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5L8RMUDCiRiYUMLt7aYvOaTdy74+EjgVDuyzYaNy+k8=; b=Z2BF0eennX6h7j9dbtsk867MowDhomB0E6oMP/hvKlsRvu2bTBO/sWvebic2WyqWgXTkeh 00GO+AqYerPeRHatU02s5SOhkrarvWWJT7HPAz8yVeVR2IxTEfBI/xRwWO5d2j9ZtTU1pG 2UKmW7zXeaf8UvLjAmaRm8H07TWtvEE= 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-558-PgR4F2Z2MxqG24D2ppZNzQ-1; Tue, 17 Jun 2025 11:44:01 -0400 X-MC-Unique: PgR4F2Z2MxqG24D2ppZNzQ-1 X-Mimecast-MFC-AGG-ID: PgR4F2Z2MxqG24D2ppZNzQ_1750175040 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-450787c8626so44759405e9.1 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=Ypqimnbfe4NMJg24RFuKQiBKcK6Xvrf75opfA0aqC7gouwop5rMg6wbRLpCNX80aDs gFeK+J1z30EVhsH2I57OjoXdhSyVsFbztZLYsbtXQWXfhJfE0DlbEWrE22Ucifaij5N1 1XPR0hE/AiyAaDSUDISvEO04uFQ0kC++GCwvhmm+QdLBQD1oa5JhrFysqWsSZ5+KnAEZ Nq9L3DZWx/GFXelq3IL+Mh0uVPoCg0x1xpwxWz/3dAyBW1PC0plex2+NO1HTrvuQq50H utxPBTkuUWP47Yj5wjas1mplLVWnAywf6g2qYZDcu3HDrSZj89278RqE/yxBQcWH9XjO zUwg== X-Forwarded-Encrypted: i=1; AJvYcCXeUh5QmgXdlrFk0nWw8g1R0D1OvtnQDKIRSyfNPbvN1M5KhiVEmRpnIBo28OCwnAp3qVwbMfrx5A==@kvack.org X-Gm-Message-State: AOJu0YyGHoJlxal/U6ys9Q3PBY7CTWOAfG7xIoTwTu/ztWZYHebLaCSw VN1ynnt3GChIPXh5eID9D6xfcFYdlKAmYrn+6HfdVQWfUJ6Z7sMLdtfRf1Zxl8Zt3wC9ys1ALN5 ECgGHe7eDyx0L7euRhIz+3MJyuZV9bmbKV7CMmWpsSoYPsHppURwC X-Gm-Gg: ASbGnctMhoac4aFtAfe7Vs/tXJQXWbPW/3FMZw8gofvOMhiPABlBOLpOyKxhg7X9aDs cRTz/hrGLdtPorbgDfwFr5gBNbwKDD+gjvoh0PGQ9bp16529S5pTN7hsVWz0gbPd2hpZ+By+pfG +nO74WI//RbhFw6CGxIRFpW+2yg3zj/KdcCGlCxXatX/4Nqj5CCVITJR5AN3R5lPEnaP0CiFZ+A AOEMpkoa+p8/h1ywpzmsvEJHxZG9rRzcAmN9ORsoam/W6Rv75XLHPJTOVaK925BD+SUaVy5g0If 63PQmibiLA9dVXFv5avnyFlJl509/L0KRacXF/5K+DYoQ9UkQwEWboIXEttyiIkF6HOMmI82XC8 LReOJmA== X-Received: by 2002:a05:600c:8710:b0:44a:775d:b5e8 with SMTP id 5b1f17b1804b1-4533cadf840mr119660115e9.1.1750175039948; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: U-w1_7zxBL8d0Tv52Ne0sF8X7ASDDc-k4qjHmkWgZYw_1750175040 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Queue-Id: 186FB4000A X-Rspamd-Server: rspam02 X-Stat-Signature: r5z61agaf5s4qn9wt5zfgi3kgmzf71e5 X-HE-Tag: 1750175042-670818 X-HE-Meta: U2FsdGVkX18cYyiNTQBWQL2/JyxWcckGWKpFRJOqJLX7sNBbUV4PHSOII8FPH/eZb2Br4y43xyS0sxCGFtXzKHSWqC0D3lGEGjpaineKLe+ZK6GEFTwgyQ0BdMei8Qphus1yxOv4KDBP1p43Iz76sBJpcjEjVl2+wBrbCwj/dkRCFgVWoXGsewZ8KBv8C5ZJftt8uo5Bm/awM3UAdAuhVXwu+68RX2I1CnRAjtMITS3FYH8cqCyxl22+8qH7H4iUijbocwiyk9VO/r5OmOY2wXoire5gL77ZOPkf68AM8yPCUfAmR+pE4/nnPXBkMyF+cdDSGwdYYohgcG/9ahUof9n/8Aj9dFYN4VI1pw39/Vho+DA5at8XkWLAxflheZFj/6qhdawJVA1ENumpU0DQZ2C78xKmpFS2jknKapfk1SxwPOIT+kvRQbICGlBEtBACUjdK3GHqRs9QH+tLjU8BbXTX1JrkZKttDtKLP233gRql95Ht0A1IoFhMDIxMuELUG9znp6ZteEjgQwPW87I2cCLWz2TgbPX8q3TgbNoWjGL26oofgxmGz1qZNBIo/g4u8d9fJ7pMLlCj/EGlxGWkPHIFB47WBQlHVzesmrpqCqxuuVm72jiVTMtLHoOd3AhPdUZunt25lU/zsHYNGhAcipk3D/xfJ/nsggDJ/1fV4AiU0uyQWY7NdwJBsnRX/Zr88embVtDOwZrMUZ4lmp2GvkCUZVeY/P7FMcw7BaL6pONrTFeCLZvs2NT3m3VC/rn2IxQiEHKTmy6J0QOlH2HO/D2UIJOT4b5GjutvdZFzL86GAz6n9IU8pnaA9XG+zl54tAp+RNWB2Z+fVxgdlmd9Ez/pxXeganiXiTAzMsNQ4joEF3qaoBc1zeEsVvnz6MhQhW8C88k/WR730+CzPJm8mR5y2gyQdrNIGVFSrZvocCPMzBXCNQN20MQJ2ZERcCnoZ+7KzBOCFqIjsnV35b4 1rJ4ao1O iD2h+GUCx5W1qe/MfDhIR7O/IucLDSZqT+s0Jmyq4hw6GXeoVcbf58gP/kyNJzwKFFS9rXAvaIsYHr4EZd6WoDIpSDJDvefu6Ntni9UvD28nJikQoDxLk9bDA3ew/hPUdOOOvYBMTmWzLcl82xbbywuYTeXbl4+GChXJRtFOBlx9oD47aMeOs7YNQwPFcA4b+IaTrd6Y6qUI12+g3Lmna3yRA/BRZFHl6l7TlnNHH1b0f2LBEDm0gw3vcV1OOfjoeGHAdw9EfpfwFkYNTTXhVVaqrrb2A5K36rqN0nBUk8QgSexoHUJlwVmCtXQNNGuzYc2GVXRAb9rs+r5v2/bnmvwQC08YmbwemkgiK3ScOYr2PK0ycwdGBip3cyJd3YFs5KlDzA2gFvAkw+FdpgRrVhc81culCVbPNJcous8WS1eoG8u/XPTSbIuFLAEYaFMvZG0RZNW/R7gHNrr5/K45KPIif/+HvJPFb4yU7AjSiXe/LI/26w9ESu1l3eXeYCqJN035nCIZnC2JgoLHrc385nL7vDtt+0LlQtJjO 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 clean it all further up. 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 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; } -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 addr, pud_t *pud, struct folio_or_pfn fop, pgprot_t prot, bool write) { struct mm_struct *mm = vma->vm_mm; + spinlock_t *ptl; pud_t entry; + if (addr < vma->vm_start || addr >= vma->vm_end) + return VM_FAULT_SIGBUS; + + ptl = pud_lock(mm, pud); if (!pud_none(*pud)) { const unsigned long pfn = fop.is_folio ? folio_pfn(fop.folio) : fop.pfn; if (write && pud_present(*pud)) { if (WARN_ON_ONCE(pud_pfn(*pud) != pfn)) - return; + goto out_unlock; entry = pud_mkyoung(*pud); entry = 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; } if (fop.is_folio) { @@ -1544,6 +1549,9 @@ static void insert_pud(struct vm_area_struct *vma, unsigned 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; } /** @@ -1565,7 +1573,6 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, unsigned long pfn, struct folio_or_pfn fop = { .pfn = pfn, }; - spinlock_t *ptl; /* * 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)); - if (addr < vma->vm_start || addr >= vma->vm_end) - return VM_FAULT_SIGBUS; - pfnmap_setup_cachemode_pfn(pfn, &pgprot); - ptl = 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); @@ -1603,25 +1603,15 @@ vm_fault_t vmf_insert_folio_pud(struct vm_fault *vmf, struct folio *folio, { struct vm_area_struct *vma = vmf->vma; unsigned long addr = vmf->address & PUD_MASK; - pud_t *pud = vmf->pud; - struct mm_struct *mm = vma->vm_mm; struct folio_or_pfn fop = { .folio = folio, .is_folio = true, }; - spinlock_t *ptl; - - if (addr < vma->vm_start || addr >= vma->vm_end) - return VM_FAULT_SIGBUS; if (WARN_ON_ONCE(folio_order(folio) != PUD_ORDER)) return VM_FAULT_SIGBUS; - ptl = 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 */ -- 2.49.0