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 311BDC3ABC9 for ; Tue, 13 May 2025 09:37:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 897BF6B000A; Tue, 13 May 2025 05:37:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 846C06B0083; Tue, 13 May 2025 05:37:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70D7B6B0085; Tue, 13 May 2025 05:37:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 507F86B000A for ; Tue, 13 May 2025 05:37:44 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 31C4412038E for ; Tue, 13 May 2025 09:37:46 +0000 (UTC) X-FDA: 83437382532.06.803E1FF Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by imf15.hostedemail.com (Postfix) with ESMTP id 045DFA000D for ; Tue, 13 May 2025 09:37:43 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=b1G4n0ea; spf=pass (imf15.hostedemail.com: domain of gavinguo@igalia.com designates 213.97.179.56 as permitted sender) smtp.mailfrom=gavinguo@igalia.com; dmarc=pass (policy=none) header.from=igalia.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747129064; 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: references:dkim-signature; bh=U+ZpehvvcmTWohtGykE+UckJpfgRzUA5dFrpuO4vHVM=; b=xRk/dI9R3KYIRa8ifavmyDYsHP312hMIBfN2CEAazGJtMDipGW+HIxG9XZGTi8FEN2mNkR dRJD7UbW+/Oi1KzlbyW1GhRH9Xtq25I8X/bpXoN2wt8Z6Pm8Dwek67yUpN+76om6ri9fiM MiESUTM+Nq0uPsdZpjmmSvy33Su4vEI= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=b1G4n0ea; spf=pass (imf15.hostedemail.com: domain of gavinguo@igalia.com designates 213.97.179.56 as permitted sender) smtp.mailfrom=gavinguo@igalia.com; dmarc=pass (policy=none) header.from=igalia.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747129064; a=rsa-sha256; cv=none; b=oTAU/QzOPhEwhnsCsPkRAYLarcu3qu3KfzhrRx62w6R81pvCy/8RnMxI71pB24sYUv2uQR EaLol/YcYouV587/fhgJt5CrJv8IGOhDB5Cyi9xeuPMPd74H4HeCrphp1CKU74NwjgESew KM+HwSqurfdKkOzz1Bt54fnpeqqHt9I= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=U+ZpehvvcmTWohtGykE+UckJpfgRzUA5dFrpuO4vHVM=; b=b1G4n0eatkpZAY1YkpVSyef3Wy yEEPzvleFgxMeSQJcqryWn9d24a0vhRPv+6/lQ997vs4oQsK8YdAVODxhMJS/IsjbkWfqwTMQSDar llHOU5MsNmGUE7PHu32IW0z8M3qhUHUMliBLKc/W/RPT5uCnt2p1UQEiPiErmG9XO3t0kRz6W9XUL i47tbrH935VZCJ5x3sS1deLfsQUo9xt58zpn0liLUiUnzfdDfClPTgRCPgU0h+16xPbfN1i1F+iq+ uskJgUv/LvSjB+Zkn3LbzzbPelGcOpOw7gnXF4wbVpQjnQVRHJe3WzSNYQGxkynzqLhfHy0Ca02Ay GnIIEPWg==; Received: from 114-44-249-145.dynamic-ip.hinet.net ([114.44.249.145] helo=gavin-HP-Z840-Workstation..) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1uElzc-007Wrp-9M; Tue, 13 May 2025 11:37:40 +0200 From: Gavin Guo To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, muchun.song@linux.dev, osalvador@suse.de, akpm@linux-foundation.org, mike.kravetz@oracle.com, kernel-dev@igalia.com, Gavin Guo , stable@vger.kernel.org, Hugh Dickins , Florent Revest , Gavin Shan Subject: [PATCH] mm/hugetlb: fix a deadlock with pagecache_folio and hugetlb_fault_mutex_table Date: Tue, 13 May 2025 17:34:48 +0800 Message-ID: <20250513093448.592150-1-gavinguo@igalia.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 045DFA000D X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: ckferkw4y63ouqdwjqcho5nnf6mo6u3c X-HE-Tag: 1747129063-513623 X-HE-Meta: U2FsdGVkX1/kbKoIrSneBL6qSREAZo4jbngqR6wKFk40rgJ2G3vVh+67uxNKUsc1MXf61JUg8DlSgEkK5bPdazRrL4Cy+iR+IYacnzFvgw06DYQiiT/ffqtjTEFB3W8/Ib174gM+Ch4LKuvQ0wJxqSfLYTMM8ybZsOlOrvKOGNANi47x0W9oud5RwWcH6vs09lvy8BKI3yibuKpQmvcxydkRSi/o772hUh5iC5fztYVoACB3GAFr6SuAT4r9R6+ztkQ2EO4Wt1P1Hy7mLPaUGeyGbbWeQ3+kv2au4ivHQWu+DwPQ5b2Y53wwf5lo7rIHjh5DJsR55DM+LvaTlTA8BNcs/uFERXeF8M1h8OkXzKxPdNnUEo2OkW7TkbRxLiuoprPXmX/5gG8BRDYF2g1y5ddU4ntKgVZZuQjkhMF2gQZfpFAkHtbHdh8wYOQA3Sng04LlfiyO5E8sXjqKeg7AXiTc6Bu079nGbQefXfRDluSibRGABEAnHxDVpnorAoKg0wztq0/twVufB8B4TCqPnQhxUYOoxJYi+9AzC4wT5f+McS3/MXwiySJ6fkonLGoAhKVhnQB4ACiYeDt5vV1QS3ZvVi24V2H0PduYoMGQkWaek1llx7ZjyhuudFIJM4+vNCIRcRt6IsFwl/3Vkcn4LKWvTqAUikKtLhrNYbPmeJFzKv635DD3ng2fxBBoPxIsB+v4XeAw4GPYqxjRaXhRRDZgo+zR1+y1yrNYkFQ2EUVn/tcaFM7IhfeyRWpuULpH+amgUZXtl2k90YtEMZktBWNrlPnFAjuYhkw7FuT4xbHMFahEYuKXWbrAhkAt9GTl5ldUu83FVPoQ5KESplhtZO+PDwWNnObwSnLR5gLfta5Uz+Ppo4i/VMTfy5QjQ5QwjiyxCh5tfJ3Uvagv6qszzWhAhVi8Zqa3GC/8M6jE1HUQL06H29rhhU8044gHeCemGy29m0LsIz3VxTaJgUq fQu/JZfE ePeH9lghoRBGxagq6qGSyWGOEr0j+NVQ2I/D+pykb7CL8fMUPA9Jc2DxgWEOzY4gaudkYyLlOjODCmi/BWPVGzx8YgXBGag2KIXua9Gu3uNg/LDCBjZhRLqwD6t5n4qKWe5KfZQiykDgX0QNxr8Zp8E0K/JPdYh7R8Le6rjBi+lBSd1mXrgTywcb0M6Lw8OzOnUmiIHMvZB6cw7F0Y6Q89CTTUpUwPj3Z0TvDBDlnAsZouC2eNT0g0aS69TYRqDxslu8e9+KuKEdC//4h6d2nPca8IG8lZ4mQTq3p7RKw24Q4Z8uBiDgmCaObucIXvyTO+CVOq3NqvC8TQxLhEkTNWN5rq+wxvtsGkshgo+bUGk62XJlFwBQezf6bbGxcgNVtC6H73L+MzaBqOR0PxbtNc55MuKNsktHufUwxA6lX1FYy2TvAIqNnEcqDaAXLe/oX/bdyuAxoyZfjmtc4VkEM23kiAWUJ0ntt1tKyWQJmA0e3QPlXOMMDykuCYg== 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: The patch fixes a deadlock which can be triggered by an internal syzkaller [1] reproducer and captured by bpftrace script [2] and its log [3] in this scenario: Process 1 Process 2 --- --- hugetlb_fault mutex_lock(B) // take B filemap_lock_hugetlb_folio filemap_lock_folio __filemap_get_folio folio_lock(A) // take A hugetlb_wp mutex_unlock(B) // release B ... hugetlb_fault ... mutex_lock(B) // take B filemap_lock_hugetlb_folio filemap_lock_folio __filemap_get_folio folio_lock(A) // blocked unmap_ref_private ... mutex_lock(B) // retake and blocked This is a ABBA deadlock involving two locks: - Lock A: pagecache_folio lock - Lock B: hugetlb_fault_mutex_table lock The deadlock occurs between two processes as follows: 1. The first process (let’s call it Process 1) is handling a copy-on-write (COW) operation on a hugepage via hugetlb_wp. Due to insufficient reserved hugetlb pages, Process 1, owner of the reserved hugetlb page, attempts to unmap a hugepage owned by another process (non-owner) to satisfy the reservation. Before unmapping, Process 1 acquires lock B (hugetlb_fault_mutex_table lock) and then lock A (pagecache_folio lock). To proceed with the unmap, it releases Lock B but retains Lock A. After the unmap, Process 1 tries to reacquire Lock B. However, at this point, Lock B has already been acquired by another process. 2. The second process (Process 2) enters the hugetlb_fault handler during the unmap operation. It successfully acquires Lock B (hugetlb_fault_mutex_table lock) that was just released by Process 1, but then attempts to acquire Lock A (pagecache_folio lock), which is still held by Process 1. As a result, Process 1 (holding Lock A) is blocked waiting for Lock B (held by Process 2), while Process 2 (holding Lock B) is blocked waiting for Lock A (held by Process 1), constructing a ABBA deadlock scenario. The solution here is to unlock the pagecache_folio and provide the pagecache_folio_unlocked variable to the caller to have the visibility over the pagecache_folio status for subsequent handling. The error message: INFO: task repro_20250402_:13229 blocked for more than 64 seconds. Not tainted 6.15.0-rc3+ #24 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:repro_20250402_ state:D stack:25856 pid:13229 tgid:13228 ppid:3513 task_flags:0x400040 flags:0x00004006 Call Trace: __schedule+0x1755/0x4f50 schedule+0x158/0x330 schedule_preempt_disabled+0x15/0x30 __mutex_lock+0x75f/0xeb0 hugetlb_wp+0xf88/0x3440 hugetlb_fault+0x14c8/0x2c30 trace_clock_x86_tsc+0x20/0x20 do_user_addr_fault+0x61d/0x1490 exc_page_fault+0x64/0x100 asm_exc_page_fault+0x26/0x30 RIP: 0010:__put_user_4+0xd/0x20 copy_process+0x1f4a/0x3d60 kernel_clone+0x210/0x8f0 __x64_sys_clone+0x18d/0x1f0 do_syscall_64+0x6a/0x120 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0033:0x41b26d INFO: task repro_20250402_:13229 is blocked on a mutex likely owned by task repro_20250402_:13250. task:repro_20250402_ state:D stack:28288 pid:13250 tgid:13228 ppid:3513 task_flags:0x400040 flags:0x00000006 Call Trace: __schedule+0x1755/0x4f50 schedule+0x158/0x330 io_schedule+0x92/0x110 folio_wait_bit_common+0x69a/0xba0 __filemap_get_folio+0x154/0xb70 hugetlb_fault+0xa50/0x2c30 trace_clock_x86_tsc+0x20/0x20 do_user_addr_fault+0xace/0x1490 exc_page_fault+0x64/0x100 asm_exc_page_fault+0x26/0x30 RIP: 0033:0x402619 INFO: task repro_20250402_:13250 blocked for more than 65 seconds. Not tainted 6.15.0-rc3+ #24 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:repro_20250402_ state:D stack:28288 pid:13250 tgid:13228 ppid:3513 task_flags:0x400040 flags:0x00000006 Call Trace: __schedule+0x1755/0x4f50 schedule+0x158/0x330 io_schedule+0x92/0x110 folio_wait_bit_common+0x69a/0xba0 __filemap_get_folio+0x154/0xb70 hugetlb_fault+0xa50/0x2c30 trace_clock_x86_tsc+0x20/0x20 do_user_addr_fault+0xace/0x1490 exc_page_fault+0x64/0x100 asm_exc_page_fault+0x26/0x30 RIP: 0033:0x402619 Showing all locks held in the system: 1 lock held by khungtaskd/35: #0: ffffffff879a7440 (rcu_read_lock){....}-{1:3}, at: debug_show_all_locks+0x30/0x180 2 locks held by repro_20250402_/13229: #0: ffff888017d801e0 (&mm->mmap_lock){++++}-{4:4}, at: lock_mm_and_find_vma+0x37/0x300 #1: ffff888000fec848 (&hugetlb_fault_mutex_table[i]){+.+.}-{4:4}, at: hugetlb_wp+0xf88/0x3440 3 locks held by repro_20250402_/13250: #0: ffff8880177f3d08 (vm_lock){++++}-{0:0}, at: do_user_addr_fault+0x41b/0x1490 #1: ffff888000fec848 (&hugetlb_fault_mutex_table[i]){+.+.}-{4:4}, at: hugetlb_fault+0x3b8/0x2c30 #2: ffff8880129500e8 (&resv_map->rw_sema){++++}-{4:4}, at: hugetlb_fault+0x494/0x2c30 Link: https://drive.google.com/file/d/1DVRnIW-vSayU5J1re9Ct_br3jJQU6Vpb/view?usp=drive_link [1] Link: https://github.com/bboymimi/bpftracer/blob/master/scripts/hugetlb_lock_debug.bt [2] Link: https://drive.google.com/file/d/1bWq2-8o-BJAuhoHWX7zAhI6ggfhVzQUI/view?usp=sharing [3] Fixes: 40549ba8f8e0 ("hugetlb: use new vma_lock for pmd sharing synchronization") Cc: Cc: Hugh Dickins Cc: Florent Revest Cc: Gavin Shan Signed-off-by: Gavin Guo --- mm/hugetlb.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e3e6ac991b9c..ad54a74aa563 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6115,7 +6115,8 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma, * Keep the pte_same checks anyway to make transition from the mutex easier. */ static vm_fault_t hugetlb_wp(struct folio *pagecache_folio, - struct vm_fault *vmf) + struct vm_fault *vmf, + bool *pagecache_folio_unlocked) { struct vm_area_struct *vma = vmf->vma; struct mm_struct *mm = vma->vm_mm; @@ -6212,6 +6213,22 @@ static vm_fault_t hugetlb_wp(struct folio *pagecache_folio, u32 hash; folio_put(old_folio); + /* + * The pagecache_folio needs to be unlocked to avoid + * deadlock and we won't re-lock it in hugetlb_wp(). The + * pagecache_folio could be truncated after being + * unlocked. So its state should not be relied + * subsequently. + * + * Setting *pagecache_folio_unlocked to true allows the + * caller to handle any necessary logic related to the + * folio's unlocked state. + */ + if (pagecache_folio) { + folio_unlock(pagecache_folio); + if (pagecache_folio_unlocked) + *pagecache_folio_unlocked = true; + } /* * Drop hugetlb_fault_mutex and vma_lock before * unmapping. unmapping needs to hold vma_lock @@ -6566,7 +6583,7 @@ static vm_fault_t hugetlb_no_page(struct address_space *mapping, hugetlb_count_add(pages_per_huge_page(h), mm); if ((vmf->flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { /* Optimization, do the COW without a second fault */ - ret = hugetlb_wp(folio, vmf); + ret = hugetlb_wp(folio, vmf, NULL); } spin_unlock(vmf->ptl); @@ -6638,6 +6655,7 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, struct hstate *h = hstate_vma(vma); struct address_space *mapping; int need_wait_lock = 0; + bool pagecache_folio_unlocked = false; struct vm_fault vmf = { .vma = vma, .address = address & huge_page_mask(h), @@ -6792,7 +6810,8 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, if (flags & (FAULT_FLAG_WRITE|FAULT_FLAG_UNSHARE)) { if (!huge_pte_write(vmf.orig_pte)) { - ret = hugetlb_wp(pagecache_folio, &vmf); + ret = hugetlb_wp(pagecache_folio, &vmf, + &pagecache_folio_unlocked); goto out_put_page; } else if (likely(flags & FAULT_FLAG_WRITE)) { vmf.orig_pte = huge_pte_mkdirty(vmf.orig_pte); @@ -6809,10 +6828,14 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, out_ptl: spin_unlock(vmf.ptl); - if (pagecache_folio) { + /* + * If the pagecache_folio is unlocked in hugetlb_wp(), we skip + * folio_unlock() here. + */ + if (pagecache_folio && !pagecache_folio_unlocked) folio_unlock(pagecache_folio); + if (pagecache_folio) folio_put(pagecache_folio); - } out_mutex: hugetlb_vma_unlock_read(vma); base-commit: d76bb1ebb5587f66b0f8b8099bfbb44722bc08b3 -- 2.43.0