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 5FB10C83F17 for ; Tue, 15 Jul 2025 13:24:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF52B8D0007; Tue, 15 Jul 2025 09:24:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD23F8D0001; Tue, 15 Jul 2025 09:24:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CBC108D0007; Tue, 15 Jul 2025 09:24:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id BD3DE8D0001 for ; Tue, 15 Jul 2025 09:24:00 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8838FC0406 for ; Tue, 15 Jul 2025 13:24:00 +0000 (UTC) X-FDA: 83666567040.04.D54C236 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 8CAA6180004 for ; Tue, 15 Jul 2025 13:23:58 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IZPpMTqD; spf=pass (imf16.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752585838; 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=ykT8pgWXFgvGFNKHweTL3CrCV9vUidi0sNJ9Np/Hvr0=; b=tiXTWOjZUQwHGojeDd0hzAxkQGe7JYdAvwHMuFqJNcoRckrNZTkcQ4jYe0JQrQZr1gFQRe vkvjNayVJvBoRmJa8Dkm7zuXFdQ8j+PqkA6oadEk3F8l1M7UsYfngtHqoVpCnWkvF3A4fF Qk/cAkYGZE/zdT3lytbPijLsoXCnWO4= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IZPpMTqD; spf=pass (imf16.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752585838; a=rsa-sha256; cv=none; b=OGpJxHAgMQNqYpI0AI8xbjL7nYRCN3GHPforqz6valSRczw2wVK10EIl42VsTPQsP8+Oqk JEuNgCwphEjHwGKhZ3zBX0h9KKXhsdqVTBaE2EfW/6I4TARqI9T/LTGmx3/7It06LdGr/f Vb5Py65+e88gEUEDZ2fXcl+M9qFOy0A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752585837; 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=ykT8pgWXFgvGFNKHweTL3CrCV9vUidi0sNJ9Np/Hvr0=; b=IZPpMTqDomoa6gF+zwirufoKmF4ld+UvL1S4wd5mMcjYrutOgPDnlryVCbpWR1LDoFTVQD KNATbFdFwCX1M7JWsxfv9vRUAJPNWYvdrF/SxVBkmBQJvILa79vJBJusGKo0WQLEtbTatd OGW2Zt5K0AztQpD+e0Dbg/1DYDIKf8k= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-599-Zi3PwY7bOJiW9dZSCJ7g_A-1; Tue, 15 Jul 2025 09:23:56 -0400 X-MC-Unique: Zi3PwY7bOJiW9dZSCJ7g_A-1 X-Mimecast-MFC-AGG-ID: Zi3PwY7bOJiW9dZSCJ7g_A_1752585836 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-451ecc3be97so29042255e9.0 for ; Tue, 15 Jul 2025 06:23:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752585835; x=1753190635; 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=ykT8pgWXFgvGFNKHweTL3CrCV9vUidi0sNJ9Np/Hvr0=; b=DbDsRDiwVYRwfmRek9cRBqql5udv7O88jKFnhUn33nhzbK4CMjANB+qS+/a3m7rvaS LM8Vhc5+gOaZBFj/yxUNNnZOXDwAmAO3K3tsKIXMN0a+wpGZg58Jq4T9v51CYB6xmMf3 0DidJ264YYlk5kq8h4OEYGV3I80dfpzus3byZDXyjwqQpQradxhjctPSsR/CymjLxpN/ ICr5YeMVy5wkdmcfJOcK+6pKovDfSXs3HRdIguczeXSqYbvadQrliHTK5PQvOyTtEIKw rHXlTzhgmkYcTw0RoX7OSNoXmGw1KT8b5mqYzBStJkMck0wJdRWp3Y5oXmhoe/Cz04bX dd2g== X-Gm-Message-State: AOJu0YxKmRk6/rTzUR1iF04N51szo6JtrPZw+9wu8x7aMZzwu1F35ICv 5AV/T0MoIStLKEWR9OOiZjWekxmZtkU7xRS0ZwjkIJsaC1jNoCVQJJTTNGoO5CzOJqpXrMdRPw2 wNd5lC9j6E4uiDhTXSmUa5FBi1R5bdY/7iLIqZU4xoqknwpRG9kYd X-Gm-Gg: ASbGncuNGpCoINnRhJ1o/8MaEXRlg3XzXBzwI4UgccVNzOCR7kzwfciQCiWeHu1z8wW C9N3MG/wrf8dPFkCiUeDznH4tVJFUr28zo7ODgtbNEcGDfkSPvKfkEXJqdzhMLYe3rZWZEBDHg5 58sau6vTfYrnQoF2Hel4NE0WOvodavB96gD1v5uxFlmFw5et6rLF3lDup2HqzdwABB/J3gPm00z OJ7bkDJCTgBvqUNEsYwEcYKbEuP/Aic8zzEKJeO2ZWOGHQGAe2Al6oymtwmu17wuTgBex84PSpY SDSZf5ntDxI9FjEItmSBx+cdFN6vdaHhtXKtQuQ1tfAnLNUYIkG0m31jJA97zK5CfPKjBO51CS3 s0eRJgqZkw2SbpJlbu83nuqvO X-Received: by 2002:a05:6000:144e:b0:3a4:cbc6:9db0 with SMTP id ffacd0b85a97d-3b5f3593547mr14507432f8f.51.1752585835296; Tue, 15 Jul 2025 06:23:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKDFYln2JrtTRhld2NwLX7CnQQsSirIV2K0GbAl0c8l2mNgbUwK9i9nFjMxSZj5YkY6MStUw== X-Received: by 2002:a05:6000:144e:b0:3a4:cbc6:9db0 with SMTP id ffacd0b85a97d-3b5f3593547mr14507363f8f.51.1752585834604; Tue, 15 Jul 2025 06:23:54 -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-3b5e8dc23cfsm15410702f8f.37.2025.07.15.06.23.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jul 2025 06:23:53 -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 1/9] mm/huge_memory: move more common code into insert_pmd() Date: Tue, 15 Jul 2025 15:23:42 +0200 Message-ID: <20250715132350.2448901-2-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: sAQk8h8zKXlcgcaO7oNvlL-TQoV2zUVnnI_kyd4yakM_1752585836 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: y13k18momr8rkgq4yjycq6hidnrskzbg X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 8CAA6180004 X-Rspam-User: X-HE-Tag: 1752585838-657413 X-HE-Meta: U2FsdGVkX19Z1ZQZEc87/Q/1xbslyQSRlh+40cVLfC9YDPLV7LDORFfN6bVY0m8UNVUOvnFFzNKvQ0dhe5fjGbRPdqgEBmNDBEjFb44D6ZSJOvSx6zIquvAq5ODs57du0xvfRCol+Psmn6TTxe1rhz5qL5mxelz/FwRtMm1qeaImqBq2/oIinw+vlIDzjU9X/7JIArFo1MDcW3xVvf33Bf2O0s1Y7AH8yv8zyLw9EDR2U7IednxyqE1X/ieja0fiX9kXJ2XHVKGpwPZbKx2/RN4njL1EQxb+r7R/Fgv3kALFwvuSmlEavROKtVnsYDiSXuGwZDtTHE5CsyCFQLqqwkEhlB7Cds2nhbd5xc+8LFkX1AN73SqXmv/WO0UNho8rMY9IDG814RPPyUcHesQ6IYl4bTUsMCxKheMXWzAt4YzVH0S0xpk7HGYWfuwt7ge6QBn94AOgyH6JFldsZpB/IAC4DuILsuV0BD90ghP9iDqxhsNmNr0GQ9+sRcPjdX6+/nptj2YhC7WO0U5fRbOvJeCRRv5lFdof+9/mhzVjDBTvcnUQs2sCoO1k3A7sRIy3y0CfnY3qVv0LwWpkbLUgui8SrPZbcKXeMBgHp8IBftuF9yy0LwgFfw1TKH/IhserQRPO6lhH7ABsWWun2+hMzoaPy2Hf3fxNwXPnLEjvQezFLKaZi3zyW6XWb9ChZPghQNmJRxcZ75sB8cWqRNmsa/NIb4X0r5JdK6ucrRG4+JCptwQmGoeN40WWhOP/Dx2gbODH2C/EfPgyqEZuV2T6xvK1iEwvRY1sxrxF2FvQEWO1T7dVHtLfMFecQDqoaGp3hG9KbLDlnkR+iGZrDNz7y75rL9bKSq9vDExb0tJmWroM8xItfb2hR71HXCoWgxQr/nOo+vtNVd3a0+HLJCRFzGW+u0ohtDdjumYpTXG1/0cdEgLQW//ccjlKeuTEkZ6hZOQC0xwtDO6JsnLAaEn l3J0+4ai oklpAmfLO/JtRF8h6GMn7rBdmFcWUBdnW+3WaQ74zwV9cLUMNfg9mIFO1yYVX77fV40wCpEKG/GwEH8D5m4QlU/PNCf5SUcMo5hyM/CVjb0GqMZoyyrme8wb3aJqx85HDH9TS+nYwD5xXod/hSxO5cqwKHN1XjFLtMcARtMVlG9iNDM9U1r/N0SNCkq/p7CZLod3H/FtxELNXPBpNu6MJkonJV0d5DnDzs+bY 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. No functional change intended. Reviewed-by: Oscar Salvador Reviewed-by: Alistair Popple Signed-off-by: David Hildenbrand --- 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 31b5c4e61a574..154cafec58dcf 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1390,15 +1390,25 @@ struct folio_or_pfn { bool is_folio; }; -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 addr, pmd_t *pmd, struct folio_or_pfn fop, pgprot_t prot, - bool write, pgtable_t pgtable) + bool write) { struct mm_struct *mm = vma->vm_mm; + pgtable_t pgtable = NULL; + spinlock_t *ptl; pmd_t entry; - lockdep_assert_held(pmd_lockptr(mm, pmd)); + if (addr < vma->vm_start || addr >= vma->vm_end) + return VM_FAULT_SIGBUS; + if (arch_needs_pgtable_deposit()) { + pgtable = pte_alloc_one(vma->vm_mm); + if (!pgtable) + return VM_FAULT_OOM; + } + + ptl = pmd_lock(mm, pmd); if (!pmd_none(*pmd)) { const unsigned long pfn = fop.is_folio ? folio_pfn(fop.folio) : fop.pfn; @@ -1406,15 +1416,14 @@ static int insert_pmd(struct vm_area_struct *vma, unsigned long addr, if (write) { if (pmd_pfn(*pmd) != pfn) { WARN_ON_ONCE(!is_huge_zero_pmd(*pmd)); - return -EEXIST; + goto out_unlock; } entry = pmd_mkyoung(*pmd); entry = 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; } if (fop.is_folio) { @@ -1435,11 +1444,17 @@ static int insert_pmd(struct vm_area_struct *vma, unsigned long addr, if (pgtable) { pgtable_trans_huge_deposit(mm, pmd, pgtable); mm_inc_nr_ptes(mm); + pgtable = NULL; } 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; } /** @@ -1461,9 +1476,6 @@ vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, unsigned long pfn, struct folio_or_pfn fop = { .pfn = pfn, }; - pgtable_t pgtable = NULL; - spinlock_t *ptl; - int error; /* * If we had pmd_special, we could avoid all these restrictions, @@ -1475,25 +1487,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)); - if (addr < vma->vm_start || addr >= vma->vm_end) - return VM_FAULT_SIGBUS; - - if (arch_needs_pgtable_deposit()) { - pgtable = pte_alloc_one(vma->vm_mm); - if (!pgtable) - return VM_FAULT_OOM; - } - pfnmap_setup_cachemode_pfn(pfn, &pgprot); - ptl = pmd_lock(vma->vm_mm, vmf->pmd); - error = 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); @@ -1502,35 +1498,15 @@ vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vmf, struct folio *folio, { struct vm_area_struct *vma = vmf->vma; unsigned long addr = vmf->address & PMD_MASK; - struct mm_struct *mm = vma->vm_mm; struct folio_or_pfn fop = { .folio = folio, .is_folio = true, }; - spinlock_t *ptl; - pgtable_t pgtable = NULL; - int error; - - if (addr < vma->vm_start || addr >= vma->vm_end) - return VM_FAULT_SIGBUS; if (WARN_ON_ONCE(folio_order(folio) != PMD_ORDER)) return VM_FAULT_SIGBUS; - if (arch_needs_pgtable_deposit()) { - pgtable = pte_alloc_one(vma->vm_mm); - if (!pgtable) - return VM_FAULT_OOM; - } - - ptl = pmd_lock(mm, vmf->pmd); - error = 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); -- 2.50.1