From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2F0A1BED67 for ; Tue, 30 Apr 2024 08:39:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714466377; cv=none; b=IbcOKjR6dI3JKt6LiaGprSFG1DXvmj8/8xoZQO8773l2jRzhbQnHxQELCBwyowu5nWYMxw84Y4AsMV2OartCGlqUoNfmOLOHSXB6yWew3FTL9MXTKaqH807naRKq81r8RzLpKGbv/bLYnaKlGTXDn7/WdAiTWkfizIPhGlX4aZM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714466377; c=relaxed/simple; bh=AZ7bJN28bdKI/0zm+6x+lt73hzJcqsNEWS3ssBq0sFo=; h=Subject:To:CC:References:From:Message-ID:Date:MIME-Version: In-Reply-To:Content-Type; b=rWxt1aQkGaBQD92S36eulljHgycKKbU9m2mFDokVIpo97i+QAQLGTNkTyjmXmriByWAxmH17HQoqYsL1js46dHGQhrm06MjIsANyacJQrioW2lb5posxS4rRJKaxeAiZTz7I9W4d2l4wsR+q4W6/+P0vzTu1UYi6il8rUhYxf4E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4VTD7D1WSWzxNdX; Tue, 30 Apr 2024 16:36:08 +0800 (CST) Received: from canpemm500002.china.huawei.com (unknown [7.192.104.244]) by mail.maildlp.com (Postfix) with ESMTPS id 74250140485; Tue, 30 Apr 2024 16:39:25 +0800 (CST) Received: from [10.173.135.154] (10.173.135.154) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Tue, 30 Apr 2024 16:39:25 +0800 Subject: Re: [PATCH 6.1.y] mm/hugetlb: fix DEBUG_LOCKS_WARN_ON(1) when dissolve_free_hugetlb_folio() To: Greg KH CC: , Oscar Salvador , Andrew Morton References: <2024042912-visibly-carpool-70bd@gregkh> <20240430074146.2489498-1-linmiaohe@huawei.com> <2024043004-entwine-violation-9545@gregkh> From: Miaohe Lin Message-ID: Date: Tue, 30 Apr 2024 16:39:24 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <2024043004-entwine-violation-9545@gregkh> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500002.china.huawei.com (7.192.104.244) On 2024/4/30 16:19, Greg KH wrote: > On Tue, Apr 30, 2024 at 03:41:46PM +0800, Miaohe Lin wrote: >> When I did memory failure tests recently, below warning occurs: >> >> DEBUG_LOCKS_WARN_ON(1) >> WARNING: CPU: 8 PID: 1011 at kernel/locking/lockdep.c:232 __lock_acquire+0xccb/0x1ca0 >> Modules linked in: mce_inject hwpoison_inject >> CPU: 8 PID: 1011 Comm: bash Kdump: loaded Not tainted 6.9.0-rc3-next-20240410-00012-gdb69f219f4be #3 >> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 >> RIP: 0010:__lock_acquire+0xccb/0x1ca0 >> RSP: 0018:ffffa7a1c7fe3bd0 EFLAGS: 00000082 >> RAX: 0000000000000000 RBX: eb851eb853975fcf RCX: ffffa1ce5fc1c9c8 >> RDX: 00000000ffffffd8 RSI: 0000000000000027 RDI: ffffa1ce5fc1c9c0 >> RBP: ffffa1c6865d3280 R08: ffffffffb0f570a8 R09: 0000000000009ffb >> R10: 0000000000000286 R11: ffffffffb0f2ad50 R12: ffffa1c6865d3d10 >> R13: ffffa1c6865d3c70 R14: 0000000000000000 R15: 0000000000000004 >> FS: 00007ff9f32aa740(0000) GS:ffffa1ce5fc00000(0000) knlGS:0000000000000000 >> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >> CR2: 00007ff9f3134ba0 CR3: 00000008484e4000 CR4: 00000000000006f0 >> Call Trace: >> >> lock_acquire+0xbe/0x2d0 >> _raw_spin_lock_irqsave+0x3a/0x60 >> hugepage_subpool_put_pages.part.0+0xe/0xc0 >> free_huge_folio+0x253/0x3f0 >> dissolve_free_huge_page+0x147/0x210 >> __page_handle_poison+0x9/0x70 >> memory_failure+0x4e6/0x8c0 >> hard_offline_page_store+0x55/0xa0 >> kernfs_fop_write_iter+0x12c/0x1d0 >> vfs_write+0x380/0x540 >> ksys_write+0x64/0xe0 >> do_syscall_64+0xbc/0x1d0 >> entry_SYSCALL_64_after_hwframe+0x77/0x7f >> RIP: 0033:0x7ff9f3114887 >> RSP: 002b:00007ffecbacb458 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 >> RAX: ffffffffffffffda RBX: 000000000000000c RCX: 00007ff9f3114887 >> RDX: 000000000000000c RSI: 0000564494164e10 RDI: 0000000000000001 >> RBP: 0000564494164e10 R08: 00007ff9f31d1460 R09: 000000007fffffff >> R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000000c >> R13: 00007ff9f321b780 R14: 00007ff9f3217600 R15: 00007ff9f3216a00 >> >> Kernel panic - not syncing: kernel: panic_on_warn set ... >> CPU: 8 PID: 1011 Comm: bash Kdump: loaded Not tainted 6.9.0-rc3-next-20240410-00012-gdb69f219f4be #3 >> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 >> Call Trace: >> >> panic+0x326/0x350 >> check_panic_on_warn+0x4f/0x50 >> __warn+0x98/0x190 >> report_bug+0x18e/0x1a0 >> handle_bug+0x3d/0x70 >> exc_invalid_op+0x18/0x70 >> asm_exc_invalid_op+0x1a/0x20 >> RIP: 0010:__lock_acquire+0xccb/0x1ca0 >> RSP: 0018:ffffa7a1c7fe3bd0 EFLAGS: 00000082 >> RAX: 0000000000000000 RBX: eb851eb853975fcf RCX: ffffa1ce5fc1c9c8 >> RDX: 00000000ffffffd8 RSI: 0000000000000027 RDI: ffffa1ce5fc1c9c0 >> RBP: ffffa1c6865d3280 R08: ffffffffb0f570a8 R09: 0000000000009ffb >> R10: 0000000000000286 R11: ffffffffb0f2ad50 R12: ffffa1c6865d3d10 >> R13: ffffa1c6865d3c70 R14: 0000000000000000 R15: 0000000000000004 >> lock_acquire+0xbe/0x2d0 >> _raw_spin_lock_irqsave+0x3a/0x60 >> hugepage_subpool_put_pages.part.0+0xe/0xc0 >> free_huge_folio+0x253/0x3f0 >> dissolve_free_huge_page+0x147/0x210 >> __page_handle_poison+0x9/0x70 >> memory_failure+0x4e6/0x8c0 >> hard_offline_page_store+0x55/0xa0 >> kernfs_fop_write_iter+0x12c/0x1d0 >> vfs_write+0x380/0x540 >> ksys_write+0x64/0xe0 >> do_syscall_64+0xbc/0x1d0 >> entry_SYSCALL_64_after_hwframe+0x77/0x7f >> RIP: 0033:0x7ff9f3114887 >> RSP: 002b:00007ffecbacb458 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 >> RAX: ffffffffffffffda RBX: 000000000000000c RCX: 00007ff9f3114887 >> RDX: 000000000000000c RSI: 0000564494164e10 RDI: 0000000000000001 >> RBP: 0000564494164e10 R08: 00007ff9f31d1460 R09: 000000007fffffff >> R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000000c >> R13: 00007ff9f321b780 R14: 00007ff9f3217600 R15: 00007ff9f3216a00 >> >> >> After git bisecting and digging into the code, I believe the root cause is >> that _deferred_list field of folio is unioned with _hugetlb_subpool field. >> In __update_and_free_hugetlb_folio(), folio->_deferred_list is >> initialized leading to corrupted folio->_hugetlb_subpool when folio is >> hugetlb. Later free_huge_folio() will use _hugetlb_subpool and above >> warning happens. >> >> But it is assumed hugetlb flag must have been cleared when calling >> folio_put() in update_and_free_hugetlb_folio(). This assumption is broken >> due to below race: >> >> CPU1 CPU2 >> dissolve_free_huge_page update_and_free_pages_bulk >> update_and_free_hugetlb_folio hugetlb_vmemmap_restore_folios >> folio_clear_hugetlb_vmemmap_optimized >> clear_flag = folio_test_hugetlb_vmemmap_optimized >> if (clear_flag) <-- False, it's already cleared. >> __folio_clear_hugetlb(folio) <-- Hugetlb is not cleared. >> folio_put >> free_huge_folio <-- free_the_page is expected. >> list_for_each_entry() >> __folio_clear_hugetlb <-- Too late. >> >> Fix this issue by checking whether folio is hugetlb directly instead of >> checking clear_flag to close the race window. >> >> Link: https://lkml.kernel.org/r/20240419085819.1901645-1-linmiaohe@huawei.com >> Fixes: 32c877191e02 ("hugetlb: do not clear hugetlb dtor until allocating vmemmap") >> Signed-off-by: Miaohe Lin >> Reviewed-by: Oscar Salvador >> Cc: >> Signed-off-by: Andrew Morton >> (cherry picked from commit 52ccdde16b6540abe43b6f8d8e1e1ec90b0983af) >> Signed-off-by: Miaohe Lin >> --- >> mm/hugetlb.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/mm/hugetlb.c b/mm/hugetlb.c >> index 37288a7f0fa6..8573da127939 100644 >> --- a/mm/hugetlb.c >> +++ b/mm/hugetlb.c >> @@ -1796,7 +1796,7 @@ static void __update_and_free_page(struct hstate *h, struct page *page) >> * If vmemmap pages were allocated above, then we need to clear the >> * hugetlb destructor under the hugetlb lock. >> */ >> - if (clear_dtor) { >> + if (folio_test_hugetlb(folio)) { >> spin_lock_irq(&hugetlb_lock); >> __clear_hugetlb_destructor(h, page); >> spin_unlock_irq(&hugetlb_lock); >> -- >> 2.33.0 >> >> > > You failed to at least test-build this change, why? :( Oh, sorry for lost my mind! I didn't see the conflict when I cherry-pick the commit so I thought the problem have been resolved in some other way. I should have a rest before doing this. :( Will reproduce the issue and test the both patches before sending them out. Sorry for make noise. Thanks. . > > . >