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 D356DC83F17 for ; Tue, 15 Jul 2025 13:24:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5913B8D0008; Tue, 15 Jul 2025 09:24:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 568798D0001; Tue, 15 Jul 2025 09:24:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 457B58D0008; Tue, 15 Jul 2025 09:24:03 -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 312878D0001 for ; Tue, 15 Jul 2025 09:24:03 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DA6E71A0496 for ; Tue, 15 Jul 2025 13:24:02 +0000 (UTC) X-FDA: 83666567124.16.60A117A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id B20CB20003 for ; Tue, 15 Jul 2025 13:24:00 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Oamsumjz; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf13.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=1752585840; a=rsa-sha256; cv=none; b=3Qw+VU5OSk7r1PWw6N55J8G9EepGeAoB4W1Y/GRQeaNH99+Cg+MOR9rWrkYntECogxQkWJ 1Tyd7LOXSByvVu2lJUBoUK6XfGUmzCNOnMUa5ysXKaWDhB508i8KZ9nHI0Pfd1SW2nL16Y 2owJklNHjfQVzuMkmTCsADrnQdCgZhU= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Oamsumjz; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf13.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=1752585840; 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=oD0dyDm8lg70iaRDQ2YlIByz/7M92Pfar0orAStmNLA=; b=rMskcJ5LVQa95uZ2vDuyXG8pVNRCtZoeuiWgK1VKatZCiHtVIYi4/TyKohsBPf2EcvbB1d dd72eLQgC2XJB9N55cVyXDS4N9QlozomzryNqUWxz6Nr8jhmOZd2Hu+Ur5otACc+LhXu8Q ltgJWeNzunrTzn0iEyEy/eS7ONQGHO8= 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= 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-302-MPxBpp5JOvymInqRDYeBkg-1; Tue, 15 Jul 2025 09:23:58 -0400 X-MC-Unique: MPxBpp5JOvymInqRDYeBkg-1 X-Mimecast-MFC-AGG-ID: MPxBpp5JOvymInqRDYeBkg_1752585837 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a6d1394b07so3949159f8f.3 for ; Tue, 15 Jul 2025 06:23:58 -0700 (PDT) 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=Q/Q/z0TQWfyJdOz1Q7WGlr4vx2QREY7X9FCFBcN5uGwlLdxhtqwNGadqBT0a+LzYdg sR6lt89HSW6Y2DA58WIzS3IMlgefX3ECLAHgD+mitKIdF8HCFPnhxEq4ASi1kl15LnTh U4+tlLY2z61uv58jsPIKBxizNEgX4Xu6CYlMRAiQsfOd2/T+cZXyuYMIh021DVSOHORS aAprq6UEF1uvZ9Fn55nHN/yVm7tdDYcQXLFtHQ277bj7t4Kz8QZbVu6ofNtQdOotyqu4 l9wj+ZLGZNb/P4PlUwk32GZXEU9Q/4nu78zSZk82AHltr1koU3WK7dBkPk4xk3JAPoc9 FUeQ== X-Gm-Message-State: AOJu0YzdqFY04lM6J1ISjwmy4qVEPNWL5p9QZVDOwgrJ/T0x30Ma5Wws /7S5egBNylG+TFWEfkaqI38I8vH6AoSgDaFPi0Yu4gqpFiAEYqrJyy//Wneu16b74LAOyiA5cPf 24LGU8L070LWTcR6vnxDkzTDy8272keNctIw/ihS3K3TTC53dj0aM X-Gm-Gg: ASbGnctAo4jRMBFSFf5h2ylb1Eiwie2L/LjtXZEZPCSKMhJAa8qMX+Hat5nCGFdhfBO F7TegEtD2fv67uFnWb8ZLcs1K4X8Z6HX4NQqcjYm7zkizzntHKiGshmrZ6pxC2y21jxgmq6rX8v lKjsM56iwVBTL5EpwM4xYnNJbDP6vYPKHVPeIChTuvJaypAKkHQ8tTeM58yeeIHUjEStdWRLopT +vVp7Z2nQATRbcYv5xtI4TZLcZVtHP1E+EN3U6iF3a0G6VaSwSH32v5g8PzQBZoP2Ze/423bY/2 q6hyMkqqMm/+cB9In33+EFDOOn5xk+MR2E5MY/voFE7idqDAaMrIuBl4zL12WrceGQtSj05vSLD sDQhNbuTpeynckXo9uR9XPY0q X-Received: by 2002:a5d:6f1c:0:b0:3a5:527b:64c6 with SMTP id ffacd0b85a97d-3b60a144d0emr2333541f8f.1.1752585837420; 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) 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) 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: o0BZ_p3wbUGfva6QaDmJye_JQ5ojoGdWFhnrONVCNhk_1752585837 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: B20CB20003 X-Stat-Signature: 151wbeaa3rworuyshni4s3yn4ekseobp X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1752585840-810164 X-HE-Meta: U2FsdGVkX1/j+h9ETZ8hZw2pKkATc81Eig/m0g3CtbLdPJnMxlU8UmAmY1EE0j0wskr0Yu4Bi30cE/2i2231Q4tV9hCo2c2UYCLoSq4eh250HtPHP+cKMBxOtzyZRgEyt+f7efhOQZCr19a2i7QWDm1WLzuhdWvkS9WM8gQ7g/vaCVVh9BTD+7yUu/bUsPlEvfCjNBjk25PUfeoZQ0NMl8RNktzyJTCZ3cWteE0IzlHBqCa5GCAazdUHtk8iz0HCHClg5GLQF+GXPF+9jcmI58u2TsVHJPSf5YgKGjQMxrENuiMwIR9T6heguILpkEvPYZQlwVsdiJwMiYfFbRqBSD1mzuyQjH8DnEy9x5rRlDM/KdqtYbQ9VVzDUM7UA79nfdu/lovvEWyPEnhEnJCJd2NuqZ8fqbwmkwwDWWqMo4xkumOA32s/Xk2Ftqcthq8kkiBU80ETj4ZkBB8+87jpAEJyZQQf7FBIMbZtXa73XnXn68p8smTRjewv5VJag5JIuWlmVTvYyqNCBJKzwLEJkKXSnkTDsGxoVdvO/neUsfYwCbvKb2vIfUOMXyd4nNJbbmy3bVnXWpQ6FzgZvMyPnfro6lafI52WbWbFLtDeMAGHg0S1S7oYbH4X6D6b3MIM8cjmD79pg0q93wrNMJNYSmW81tc0OLYcS8eqs2peUEFnLEN2xEBpS6a8u2uRYuR35cPTtem3KgAeXAFCOJV7jJL745KtW8QPUC0CogDKTRu+/l7+tyn2yAPRrkEcrDF0yIJhWWJ25fnnm3FNixd+fcvOQm5QTbMsC4gwT1ddy7gv5cjMVx/Bux0sDTkpmCtkqaT481ndzPQqflXgg9c4Vz8AvuFIqMmZdMdDmEKFpaQwmjPw+YHCMNPoMCHMtiBDCSnFHS5kRPqav5thYDv+rYlo4CaRdZovl+4A537AJt/5e9gVDyBUxr7j6F+/aUYJxvDZpwNkoSaFwkLJK2x TTYL59v7 Vcej3Ok5SuYSDAzAmavsFf0sqzYOw8ZYaqh/UoDlUbCMOjbClUqN7bZWKGddDb0rII1IawPAwA1nbFDKIUdYjbN9G6jwY1jdfOSzHAGtF+NQIs8Fdn3joIjKADZ2QBjQyPok5Skz5f77wDj27PF1jv4mG6jcOUjNuSHiPDaU31Wr9DdGgXeb6baBAPri2TT+x6VBePtvj548shD2SIX5lsLXQE7y9MrF0oAWal4J+MJA2xyKKSGNWWfYA5CfRjrXl8fec63kKLe5KUgyfaDYuu65WVkk7XLlK+vuACf9jp+bincla2olIv+0DFnhfCwAMdzUbFg10KGkvlYzBih8HWOsu9FuKUJOcIgURxzYuSIwrBsTV5tqD5prOvXpHp14hMFTxFNjVE6LRx2Qb+W1Ds25dAZdLKrmziEVTBfB6RAbO3wkR+hpK/F7Xtuom1Fm7/PZJiqMTuJvP6GPoQTJ1l153RwfJ+gBSwddRDqHysJvuQvnvE0zLv5k3NPLdG/ibYac0V4VJfTvVjCJEo2dLRBZ+Mj6Y4CXKHMikOKuq39VDhQRWWY9J2UD4FKAV+jWl+RhhCM9yJyTUTOk4pNnPHjMbS5FJxpCwxf3PxCrUcO6RybQd8Cqje7XX+Q== 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 | 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; } -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) { 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) { @@ -1555,6 +1560,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; } /** @@ -1576,7 +1584,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, @@ -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)); - 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); @@ -1614,25 +1614,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.50.1