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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC528C7EE29 for ; Fri, 9 Jun 2023 23:29:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232707AbjFIX3y (ORCPT ); Fri, 9 Jun 2023 19:29:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232562AbjFIX2h (ORCPT ); Fri, 9 Jun 2023 19:28:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B23833AAD for ; Fri, 9 Jun 2023 16:28:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 45E7561AE1 for ; Fri, 9 Jun 2023 23:28:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C58DC433D2; Fri, 9 Jun 2023 23:28:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1686353292; bh=a50yaf8+Nnygr72sxglhLSBgZphgdoMfT/nDuwvzFMQ=; h=Date:To:From:Subject:From; b=Go3DAqJRY35mVEkZS2HmaFLBvacliWlRfPXgNacnpGUmul6IdHv9OUIn89wcfzs/E PZE2/h1Q5QLbOcodTe9bW/kqKZuL9B+YMuQmyWpX6FZzVrvYeY/NYb6f0ZuJJc8A36 dT7pfE5QDViDC6Q10MjhpCOQGXvtGfmwfL8b7aXc= Date: Fri, 09 Jun 2023 16:28:12 -0700 To: mm-commits@vger.kernel.org, zhangpeng.00@bytedance.com, vernon2gm@gmail.com, senozhatsky@chromium.org, richard.weiyang@gmail.com, Liam.Howlett@oracle.com, dcb314@hotmail.com, Liam.Howlett@Oracle.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] maple_tree-change-rcu-checks-to-warn_on-instead-of-bug_on.patch removed from -mm tree Message-Id: <20230609232812.9C58DC433D2@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: maple_tree: change RCU checks to WARN_ON() instead of BUG_ON() has been removed from the -mm tree. Its filename was maple_tree-change-rcu-checks-to-warn_on-instead-of-bug_on.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: "Liam R. Howlett" Subject: maple_tree: change RCU checks to WARN_ON() instead of BUG_ON() Date: Thu, 18 May 2023 10:55:17 -0400 If RCU is enabled and the tree isn't locked, just warn the user and avoid crashing the kernel. Link: https://lkml.kernel.org/r/20230518145544.1722059-9-Liam.Howlett@oracle.com Signed-off-by: Liam R. Howlett Cc: David Binderman Cc: Peng Zhang Cc: Sergey Senozhatsky Cc: Vernon Yang Cc: Wei Yang Signed-off-by: Andrew Morton --- include/linux/maple_tree.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/include/linux/maple_tree.h~maple_tree-change-rcu-checks-to-warn_on-instead-of-bug_on +++ a/include/linux/maple_tree.h @@ -616,7 +616,7 @@ static inline void mt_clear_in_rcu(struc return; if (mt_external_lock(mt)) { - BUG_ON(!mt_lock_is_held(mt)); + WARN_ON(!mt_lock_is_held(mt)); mt->ma_flags &= ~MT_FLAGS_USE_RCU; } else { mtree_lock(mt); @@ -635,7 +635,7 @@ static inline void mt_set_in_rcu(struct return; if (mt_external_lock(mt)) { - BUG_ON(!mt_lock_is_held(mt)); + WARN_ON(!mt_lock_is_held(mt)); mt->ma_flags |= MT_FLAGS_USE_RCU; } else { mtree_lock(mt); _ Patches currently in -mm which might be from Liam.Howlett@Oracle.com are