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 65AB6C4345F for ; Fri, 19 Apr 2024 21:11:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DABD86B0098; Fri, 19 Apr 2024 17:11:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D33936B0099; Fri, 19 Apr 2024 17:11:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BD49B6B009A; Fri, 19 Apr 2024 17:11:38 -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 9EE426B0098 for ; Fri, 19 Apr 2024 17:11:38 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 45BF8140444 for ; Fri, 19 Apr 2024 21:11:38 +0000 (UTC) X-FDA: 82027527876.18.A5B0A27 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf14.hostedemail.com (Postfix) with ESMTP id 8B65810000E for ; Fri, 19 Apr 2024 21:11:36 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=Be69wG4e; dmarc=none; spf=pass (imf14.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713561096; 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=ruoGm2t9R6PTKTRtlViKl4QFSCLMTXFvVN6ZUeDpMP0=; b=KEwjkJaGhcwnxP/XBTDQQla2jyJTeqMLVvmkCnq0ivKiNjHzmuaIHlKDcf3RnX5d9KoP/K TKR5tVh+x4XD7EC7g0cqAEf3ONIJPCDfI2v73tCGaXfjOGbdDtE+epIvY8+YmxYuWFV1C8 SXe4uQI9z62fk3wVfk0qI8I5nXHWaqU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=Be69wG4e; dmarc=none; spf=pass (imf14.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713561096; a=rsa-sha256; cv=none; b=URSJD+vP8Q1Qg3iX+zlITRRWxrkn/jFLQHbSpudw2hJFA2ruD1SFPBWhSVGHQNNNj3lBKd pDnpbq3L4v1jkZ6JlqSXu1QGgr1+Hy+AbYUMKgVcnskdOLwhYNn5XoaAl7ZQOF+Qhu1h4w YzdGTrqgTFdXPTxna3NAsZkNq4d83Uk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 663D761A7B; Fri, 19 Apr 2024 21:11:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D809AC072AA; Fri, 19 Apr 2024 21:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1713561095; bh=w8dLaSxgMuSudghS89tIqDLnH8VPQ5WVdoqYlYsDR7g=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Be69wG4ezgeGYP4OVW5eLAmclKIBFx6mIN91Bd7X9P65FmiY+vwfQwtX8jwtWVFBq wk60NWbmL7XNkXjTuR6i2Ezn+O40I1iXFbJuIfHZqA3HtIgt6VpUKj3Z1oqSj2aQeo KkzR3SfHpZ6ZNx9RNtxfzzxHQswatZoTiQTAwFXg= Date: Fri, 19 Apr 2024 14:11:34 -0700 From: Andrew Morton To: Miaohe Lin Cc: , , , , Subject: Re: [PATCH v2] mm/hugetlb: fix DEBUG_LOCKS_WARN_ON(1) when dissolve_free_hugetlb_folio() Message-Id: <20240419141134.464ea3a1ef3d0e93c6711c93@linux-foundation.org> In-Reply-To: <20240419085819.1901645-1-linmiaohe@huawei.com> References: <20240419085819.1901645-1-linmiaohe@huawei.com> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 8B65810000E X-Stat-Signature: ibusf1tfgfdxyx4cay3ujwtouh5im93k X-HE-Tag: 1713561096-136601 X-HE-Meta: U2FsdGVkX18kLfFEIBqKt1H7sFL+MOnI7/NJbyMiHIqU3cQGQs34Ml4YNuF3bElwk181HkIPc3Xv3GwPi4er+HvF7faRTe2VxGxEzOvByxvKaZMxOLiIcnkA8gLycdXRKYzzhtXz/FsE6saBfcHZ3fnvr0QAMqfHi0olOmyBiGQXSFpqQOz2ueX1iAt1yfqcBbtlHyFX3jBSowfNawmWit+6MwRyGFjR4EtkZk6VqZq5ZyxAe050tywrsYCZhDseV33QVuluYsz7DILycPFR3aWTlNYWs3/O3ECu7TKXNZzJRmPfOcLBmeBpbLG+Z4bGss8Kva5qO9BbvMdivYNkUe74OC34hwId3TtycEdVmB+Uhokr96QZsKema8A3ouXPxN3BkSUf7C5Oe8h6RrE2hNZiUq57GdFRMp7tltzVKMwlqbiORdHBQ5yTdbHoWpeJ/NV10/Z29i25fFV9Gn9VPTzENU6W2l9cnz46cgqiEnop9A9/6k7UWIqi/98XRNuj+IBuhDdpSgmqNvebjm+XmzZQKntNwrswn/+8CO3niuxqg9qldHzwaoZTqo2qk2JsHYbJf5gjECdWDGXFOcExrO2C79RRruhL5siQShf9rqgKLklVWva8ifXUFEVYbr3UdsQXwd+6TDdrUHJB2VjGDdndVJjh1L1/GYS2IDsKJBXxcfG2F/tbeYwIPOD+lgjqK1AZRvlTh7letghlAJfp7+etA3Abw++p4b6Q/cppw7YgOFvyS2hmL6KB83tnlLh7fmaKkq3PDrSc31NyDcgclCr77779AQ7QjPi4eUMcr0H25wU+CbYRzK6OU9pQABb95007F88Pd9GMUClV5aEwA18E1gW0efnZk1aqDVShKfgkYh+lqdBhE1INKJKmo4NF8N+Map1+/3RkgNs46qDegNpF41TPPUIHKuj9lQ5oVTjUPEcLWeOQkTPxXESVOMPRf4bB5kyR/IcIbksRIJd 9Y8qvOld iwOcOwgcRC/vTVhC0qiwxnzV8KO42H6UqrYpPZ1wOQHS4QZ+ij43UheLHON1nn2IX6Mgitru4bycJJCmkv40b3/ZdBSosUSAc0DpPpi9cUwZ08mLmaufgBoZsoDHuOh1gFQgqFyVIgJ6j4yPWA7pXliy7bCfqrSFpBBTocCZQORwYogySZLJhphaMiqGu2V1URn1CX4i2PwumjDv7ahGubnAYkCdpTqTXrtEFJs55deyq5bUyE9tzM2QH4iXlbDN9GAVlhjMFcJIRc+nYq3bIvUVxvPUa5gy5gezl6n+jS/mkdPE= 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: On Fri, 19 Apr 2024 16:58:19 +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 > > ... > > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1773,7 +1773,7 @@ static void __update_and_free_hugetlb_folio(struct hstate *h, > * If vmemmap pages were allocated above, then we need to clear the > * hugetlb flag under the hugetlb lock. > */ > - if (clear_flag) { > + if (folio_test_hugetlb(folio)) { > spin_lock_irq(&hugetlb_lock); > __folio_clear_hugetlb(folio); > spin_unlock_irq(&hugetlb_lock); Please let's prepare backportable fixes against current mainline, not mm-unstable. Because fixes against current -rcX and earlier will be upstreamed ahead of the mm-unstable and mm-stable material. I did this: --- a/mm/hugetlb.c~mm-hugetlb-fix-debug_locks_warn_on1-when-dissolve_free_hugetlb_folio +++ a/mm/hugetlb.c @@ -1781,7 +1781,7 @@ static void __update_and_free_hugetlb_fo * 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, folio); spin_unlock_irq(&hugetlb_lock); _