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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 654C6C433EF for ; Tue, 19 Oct 2021 00:08:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 51C3C61350 for ; Tue, 19 Oct 2021 00:08:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234152AbhJSALA (ORCPT ); Mon, 18 Oct 2021 20:11:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:50568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233660AbhJSAKw (ORCPT ); Mon, 18 Oct 2021 20:10:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D2A0A6134F; Tue, 19 Oct 2021 00:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634602120; bh=I+rVJpf+l1B5EnX9zpT8Iiz5pGuAum2s2T1xTvDidjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PJFej3vJ3xwgg99D96oVDOMsuubw3nEVSaLWkdqkKwLgroKhsrzJdMYDpaULgVw6/ WlrqVAG5yLoc34nxBEMzstj98Yf8TUrpD3sq1xfdeeB8E6ppploqYr+tmT7w4f3bed I/XmA+0xqy9iI09wEHwsiNmz5GB/psh3qyozRJ0gzbpQxYtoa7dyIK0FB+tnN0R/E1 rqkAFYqxB0TUumsy/CEC/Td9TZ9O5s65CZo+3Mbw09PeYCKET/P8EzfA1C8lYht4a/ shZ6jDoKh84JqlpkceIWTtlu3NJTFg/IZm2/zlIZ0Icqi97oE0ZSSV06kx4L8WNiHI cLXc0v3ZjGx/A== From: Frederic Weisbecker To: "Paul E . McKenney" Cc: LKML , Frederic Weisbecker , Sebastian Andrzej Siewior , Valentin Schneider , Peter Zijlstra , Uladzislau Rezki , Thomas Gleixner , Valentin Schneider , Boqun Feng , Neeraj Upadhyay , Josh Triplett , Joel Fernandes Subject: [PATCH 06/10] rcu/nocb: Use appropriate rcu_nocb_lock_irqsave() Date: Tue, 19 Oct 2021 02:08:12 +0200 Message-Id: <20211019000816.455375-7-frederic@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019000816.455375-1-frederic@kernel.org> References: <20211019000816.455375-1-frederic@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of hardcoding IRQ save and nocb lock, use the consolidated API (and fix a comment as per Valentin Schneider's suggestion). Reviewed-by: Valentin Schneider Tested-by: Valentin Schneider Tested-by: Sebastian Andrzej Siewior Signed-off-by: Frederic Weisbecker Cc: Valentin Schneider Cc: Peter Zijlstra Cc: Sebastian Andrzej Siewior Cc: Josh Triplett Cc: Joel Fernandes Cc: Boqun Feng Cc: Neeraj Upadhyay Cc: Uladzislau Rezki Cc: Thomas Gleixner Signed-off-by: Paul E. McKenney --- kernel/rcu/tree.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 27500981d4b1..eaa9c7ce91bb 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -2488,12 +2488,11 @@ static void rcu_do_batch(struct rcu_data *rdp) } /* - * Extract the list of ready callbacks, disabling to prevent + * Extract the list of ready callbacks, disabling IRQs to prevent * races with call_rcu() from interrupt handlers. Leave the * callback counts, as rcu_barrier() needs to be conservative. */ - local_irq_save(flags); - rcu_nocb_lock(rdp); + rcu_nocb_lock_irqsave(rdp, flags); WARN_ON_ONCE(cpu_is_offline(smp_processor_id())); pending = rcu_segcblist_n_cbs(&rdp->cblist); div = READ_ONCE(rcu_divisor); @@ -2556,8 +2555,7 @@ static void rcu_do_batch(struct rcu_data *rdp) } } - local_irq_save(flags); - rcu_nocb_lock(rdp); + rcu_nocb_lock_irqsave(rdp, flags); rdp->n_cbs_invoked += count; trace_rcu_batch_end(rcu_state.name, count, !!rcl.head, need_resched(), is_idle_task(current), rcu_is_callbacks_kthread()); -- 2.25.1