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 E3A0FC83F1A for ; Thu, 17 Jul 2025 11:52:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8200D6B00B1; Thu, 17 Jul 2025 07:52:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D0676B00B3; Thu, 17 Jul 2025 07:52:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C02B6B00B4; Thu, 17 Jul 2025 07:52:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 5B0C96B00B1 for ; Thu, 17 Jul 2025 07:52:23 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1150B5AE9D for ; Thu, 17 Jul 2025 11:52:23 +0000 (UTC) X-FDA: 83673593766.22.89F7781 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id D7BAB40004 for ; Thu, 17 Jul 2025 11:52:20 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VC8Yj1n3; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752753140; a=rsa-sha256; cv=none; b=gO3LQjB+LGx5eJq2ZLK0ION1gIssxn/HTozizIi/mJqyBrcFypg8PGRNu1dQg3kbaAz83+ HfytSmuQ6MphRrIc/xSL3Hd0JZv0YuPbtsOsoINN+fIMhptJY3oFqBhQeQpyVH6bI4721C lTzCQfl6h/2kCeqiJD3/MKj3vQ5UMyU= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VC8Yj1n3; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1752753140; 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=zIbOZw1x2GVZdwaR5iaeVsCQGMgTtSbEtHQ5YhAco0w=; b=UAb3t5MzayxeicD1Ga+vXqtggSZss9Pm+ton9LdpncyrUNlaQPVn7FFS2D5zZypMACxnqP yAFI9FoSirekI7R4ec/URAuKuxnTPetKAF8FmrmBSY9V5lFdSfFsvE44xI0GGUEHvehs14 n+bbOSPxmMu7uu4cjX8uoWAkP34/sBA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752753140; 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=zIbOZw1x2GVZdwaR5iaeVsCQGMgTtSbEtHQ5YhAco0w=; b=VC8Yj1n3/Go+9z1CzVsNtaR+4LPZsJzQl8V7yrDX62sXKGX7GSxO9Zlh7B5ayjVYp/920X aY/MRFOVSzCKSIGAl/bgf0+5BecZsmCAPzz8V5rgUfoAsNFEgqC9lUz/Zudec3N9m+oIyG svFuYeHKDJINkC+Zv5PPwDAGS4nq7xc= 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-81-Qf7rfjBjMuW0LPofeAtoEA-1; Thu, 17 Jul 2025 07:52:19 -0400 X-MC-Unique: Qf7rfjBjMuW0LPofeAtoEA-1 X-Mimecast-MFC-AGG-ID: Qf7rfjBjMuW0LPofeAtoEA_1752753138 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-455eda09c57so5373105e9.2 for ; Thu, 17 Jul 2025 04:52:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752753138; x=1753357938; 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=zIbOZw1x2GVZdwaR5iaeVsCQGMgTtSbEtHQ5YhAco0w=; b=h2OPxCzliRzaOx1YggvbBvmdzlC+hwOK7JXTmFQsDEIdYMAeoj2KXl3URtgNHriver ldrd3GqR3w9vbTJDIx2Fk7y3iAZMB3kV41FJ5ehYJ4IYlI8ZMQEMWvE9iUaL6OgxMlqy zA8yje2pEfZfGht5zmY7Zi2yrrW46Mk5iIqqHJTdLrg3anNSi2zPC7om9AfzWmKtMaVJ 2/Hk5/KNrPV7f66lJd2MnnCjPO5rZgQ8yhQjrs/x9dG9hxDVhIxoWlZVa+3I/38sbawT bwMLE91N7gv0CUvQA057DN5lTj11K1+iDoZdKWPzKSi1QUYLywiZLfhsP/zXAnXtI10H 87Zg== X-Gm-Message-State: AOJu0YxOGpDbJubyDpFOF/OCk8cAyaGPuE5lMcHTSzbcv3koOQGLG2HL m28pnDB0OAt0dz4qgY/1iBRXiCl4QLwGX4C7QQlA53+kiXbseWTvFcc7PA4Wp/PAJLC/N0nMBCV qYHXq/QweWDeHm2J8Sik14ESMXigNl6yq5YLPH/yGJlWqL0vA6hvn X-Gm-Gg: ASbGncvkhuRDA1/W8HNvsWh/mGC6HcIYogTEPEf1YSv8r7d8bBqts98y0vx5kYE16Lp W5jSgvmUKFAnaW8MO3poClUB1i9vvJPoTfcpGTKypcxwGmPeiSaHbgs18kIaNPbukZ1nX3v7jKO Y2epGGZT7jWulMV+J3zkRi54Y/6SOLk0qsVzL7y5sTgSUgOTaxRXNe4FVOLQ9iQD6pTshBKtA+r wz2uK6JFQ7tHa1myCCxp1B1cxDT3lUNWi0nEcXRscX1MOw/HAcciMj3wfFBxu+AFUwg5MxGzxJL S3g4rBK5zuRz5cEpI2GszT1aS+W6RtB+F0r/hKTBeZp8d2qdCVG0aZDC39rpUvbVJO7qMDi04xk GemR52Krbz0ZKIPrlAOBCCnU= X-Received: by 2002:a05:600c:3e15:b0:439:86fb:7340 with SMTP id 5b1f17b1804b1-4562e39865dmr69602025e9.30.1752753137827; Thu, 17 Jul 2025 04:52:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IExNej71yyxo4EvVsey/pvqYl543s0okqsAtiv/nbzqOk+Nei3ADHbojZnjuyE7SwluE3g0Pw== X-Received: by 2002:a05:600c:3e15:b0:439:86fb:7340 with SMTP id 5b1f17b1804b1-4562e39865dmr69601365e9.30.1752753137339; Thu, 17 Jul 2025 04:52:17 -0700 (PDT) Received: from localhost (p200300d82f1f36000dc826ee9aa9fdc7.dip0.t-ipconnect.de. [2003:d8:2f1f:3600:dc8:26ee:9aa9:fdc7]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-45634f8cc6esm20532295e9.26.2025.07.17.04.52.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 17 Jul 2025 04:52:16 -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 v2 1/9] mm/huge_memory: move more common code into insert_pmd() Date: Thu, 17 Jul 2025 13:52:04 +0200 Message-ID: <20250717115212.1825089-2-david@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717115212.1825089-1-david@redhat.com> References: <20250717115212.1825089-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: x6PnHgOWwJZ5boFBcyLHrrBAxTuLBbi5xlOmhNObivE_1752753138 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: t5z6sem45e4sbsodurfg97hhb91hp8zb X-Rspam-User: X-Rspamd-Queue-Id: D7BAB40004 X-Rspamd-Server: rspam02 X-HE-Tag: 1752753140-866561 X-HE-Meta: U2FsdGVkX192FZfEGbX00972gY8mSB/oJw1MkaN+dYrc+15kDCKm9ysfBOGZR92iNesw+FHHHEEAaaRVZXTXLJKIS3swCU8AgM7XH6XcfRrApkp45iOYWYtv3X6QLkRUCq8pBfM/pHxOG57p8+PJqCGWAWWo/STM5WaIex1tyhO26IsAXS+9rnAa+sKGllSE/J1g9tc9XCN4HSg6UV6uOwNkPEHYTXiQi4guhKXZvghPeiEKnUJQ3G4rgk7EaW2aeg9r/4ypFZVy4+YrHXdBeNZtHc5SZvnWFYCsmlWR+zcDZBqhGoN1VQQSTaDH94z3kKqXwilEOX87qK5ekkW44oH21AUE7gnPMtW/yIMRIAR60izqNsTKjSRHcB/3Uq9HZRlPNpO5NjFxseixvUuTB1QjX5gvQt4GcMXGobIE8BAiGoaXCKioCULQ/ZVwcEHudaRAbsr07sgWp+RadfkFrF3ShR4iLkX1PnBtK1HMcURvSAfTF3t4py0zNasYgOdQVTXeElRvPVU/nhgrdu6Zg/7g+D9GJfVdoLgzD6YVjcJCMixADGW87atyHM/A7jIFmsrgJp3Rr1IahrVcIUBGMTJsBZKTcCJw6IiJ0oyCpceOjZsa/ET/lbXcRDumXP6d9pSSzl8RJZg1JLsS9p1XxConc/FJELNOQ74S2TzMdV9eaxGpqzQX4/wSBdEJ0P1bI8ilXtvq0WwaE+FUp2Kj0lq3kjPwr3TT2e9cgZcH62Wly29ctXdy6pKedIGAs1H8t+xlnqVGV1HWUnTB3srsXf5f9tyIJ4zzp6ApJqi0JKfErLJgTKPxFWTvpsCgjzN0Elm0kRrC1XRITGeUmSaY1wKA3K+91HOZA/EbF6qOv+9UK0wM9qa6jtj8yyKW4fI2mu9GZQsDqoMeRFrWsFyG2K7pEgC9/5xrKH1e5l/gxRjxHJ3++IJPcHeJgAVlds6WJAIBz61LgMyMsDxf3rx uM4eYQcR U1MGpBdsb/JTdKmVStjASXMWUWccrH5rI9cYTtRTgucgUpsd93cNAPk9lSvbYRE2YMa7afDm3mPMcDUpaPtv9zKAlkFLN0TpU4ohtAmFhq5iLHB/uP/4cT2G6DnN6+elhjFD5DPjQg4bhYETwiogs58fMFr1R6p1n8xwc8b1ktFDsJI7UiZvHdN6ccs2xGiQUKkT2UMT5Lx2tZwLhFie7FSN10IJplmjsKfEc6PHPWTu5WYn+6eLyJMrlkVVP/mGht3tp+QQst9peSsnMUrVugHzI/myz0lcYn8GyTK2gtN3fATgmIliHHsMKGh+r6T3lNacHbBEQZXwPiF/+HAwqaFaOPUGAE8ZEPKBouv0qiattKVAWvsPfCRe9g8BtBWK8PTzwZE3t6XVxgd+qi+yNFF1Z8/LQcbNJ+2OAmzNgmd0csblWI2n7fsMNaf8AzKDHlo4itsqhZUTosqriiDHUkcuvsZc6/l5gzZtWez8ZAy6i5uRu1EZ5HJ5/gkyvDEogscahrE5SByaZ4J5aSr4k4mMgK0BH5F0BYzttKQAh7ceJtH8DXQwTk7LMHEgec4VJqp2hHhnRqAu+6m5zCfoHKcBYvfHJ1v5NO9lQqP5WE0EjfEYlp8OH7e7drw== 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 fe17b0a157cda..1178760d2eda4 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