Message ID | 20220325150420.725344004@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <stable-owner@kernel.org> 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 03674C433EF for <stable@archiver.kernel.org>; Fri, 25 Mar 2022 15:14:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355052AbiCYPPl (ORCPT <rfc822;stable@archiver.kernel.org>); Fri, 25 Mar 2022 11:15:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376888AbiCYPNm (ORCPT <rfc822;stable@vger.kernel.org>); Fri, 25 Mar 2022 11:13:42 -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 2D72BDBD0D; Fri, 25 Mar 2022 08:10:38 -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 2E7EE61CC3; Fri, 25 Mar 2022 15:10:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0276DC340F7; Fri, 25 Mar 2022 15:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1648221036; bh=TbviTT1gEaBSf9w3IlmduynszDOLzbE1OJdh2sS618w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ejxo8NdhfJUYrrD1Jojj4FtpHUEceCgREMDICZd3FJRZ3FDngnbvHlT+Kel5VaQmX fgjpk4tTeAjO+J5DK9HAQzV35ZE+gTxi/a/OSxhn20qBfdyerMqCSN13JjJU1GDuST hHSAR0JcHZQ18VCcil1wmv5iC0laDUrf+5NEaTWY= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Tim Murray <timmurray@google.com>, Joel Fernandes <joelaf@google.com>, Neeraj Upadhyay <quic_neeraju@quicinc.com>, "Uladzislau Rezki (Sony)" <urezki@gmail.com>, Todd Kjos <tkjos@google.com>, Sandeep Patil <sspatil@google.com>, "Paul E. McKenney" <paulmck@kernel.org> Subject: [PATCH 5.10 34/38] rcu: Dont deboost before reporting expedited quiescent state Date: Fri, 25 Mar 2022 16:05:18 +0100 Message-Id: <20220325150420.725344004@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325150419.757836392@linuxfoundation.org> References: <20220325150419.757836392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h @@ -531,16 +531,17 @@ rcu_preempt_deferred_qs_irqrestore(struc raw_spin_unlock_irqrestore_rcu_node(rnp, flags); } - /* Unboost if we were boosted. */ - if (IS_ENABLED(CONFIG_RCU_BOOST) && drop_boost_mutex) - rt_mutex_futex_unlock(&rnp->boost_mtx); - /* * If this was the last task on the expedited lists, * then we need to report up the rcu_node hierarchy. */ if (!empty_exp && empty_exp_now) rcu_report_exp_rnp(rnp, true); + + /* Unboost if we were boosted. */ + if (IS_ENABLED(CONFIG_RCU_BOOST) && drop_boost_mutex) + rt_mutex_futex_unlock(&rnp->boost_mtx); + } else { local_irq_restore(flags); }