From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C09CF70831; Tue, 27 May 2025 17:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365683; cv=none; b=FW9nDCHrAD8elCV/4w5uJlRy0/e6+7zZFhJgnyDiun7wgJXdrmFxXm9l8rtIjWQalxXTt1cv5bSr879ELuujSbEp6dtW/koVxRTZncX7j5DcQbNnVdrYpdlCgANCeS4+GOtjWr7BUs9dK/wjtfGI5FDarhPKsU09Qk2nXeHVKeI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365683; c=relaxed/simple; bh=hBQe8Kvglo6vywBP/7OgwooN3ftPItXruRz327BSjHA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nSjlwb6LTavVqdaCUpjgUdQ0jRib/47GtwIpAUzIuv8P66eAn6ym6ZC1pSYioxFIFjdfa1nhydIO7QcoyiXerghq9rDVeAOWGQS9FoKA3PDEvOWGErH05HkPspLsHUK3IISZkSagGM0IzgtBqWUDptE6mFGEzeCrV/iCQoG04Rg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yU2dBdO9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yU2dBdO9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E021C4CEE9; Tue, 27 May 2025 17:08:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748365683; bh=hBQe8Kvglo6vywBP/7OgwooN3ftPItXruRz327BSjHA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yU2dBdO98bSx6O20cegZJfBETqQmDufR0qS1Bp3yVyAr9Ph3kZNOi8TfonYgLNrcG l4U8lWv9fjqTsjVolHbNFi3Pq3JsVsGpdpUOWcAE64UmxOONFu9PY5jQDTx+O5YMQs weFVYXNX0yK/6faxqjkWV0p6HtndUlOzzFKWIyj8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Frederic Weisbecker , Ankur Arora , "Paul E. McKenney" , Boqun Feng , Sasha Levin Subject: [PATCH 6.12 456/626] rcu: handle unstable rdp in rcu_read_unlock_strict() Date: Tue, 27 May 2025 18:25:49 +0200 Message-ID: <20250527162503.522685283@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ankur Arora [ Upstream commit fcf0e25ad4c8d14d2faab4d9a17040f31efce205 ] rcu_read_unlock_strict() can be called with preemption enabled which can make for an unstable rdp and a racy norm value. Fix this by dropping the preempt-count in __rcu_read_unlock() after the call to rcu_read_unlock_strict(), adjusting the preempt-count check appropriately. Suggested-by: Frederic Weisbecker Signed-off-by: Ankur Arora Reviewed-by: Frederic Weisbecker Signed-off-by: Paul E. McKenney Signed-off-by: Boqun Feng Signed-off-by: Sasha Levin --- include/linux/rcupdate.h | 2 +- kernel/rcu/tree_plugin.h | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index bd69ddc102fbc..0844ab3288519 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -95,9 +95,9 @@ static inline void __rcu_read_lock(void) static inline void __rcu_read_unlock(void) { - preempt_enable(); if (IS_ENABLED(CONFIG_RCU_STRICT_GRACE_PERIOD)) rcu_read_unlock_strict(); + preempt_enable(); } static inline int rcu_preempt_depth(void) diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index 75ba4d5788c0f..304e3405e6ec7 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h @@ -832,8 +832,17 @@ void rcu_read_unlock_strict(void) { struct rcu_data *rdp; - if (irqs_disabled() || preempt_count() || !rcu_state.gp_kthread) + if (irqs_disabled() || in_atomic_preempt_off() || !rcu_state.gp_kthread) return; + + /* + * rcu_report_qs_rdp() can only be invoked with a stable rdp and + * from the local CPU. + * + * The in_atomic_preempt_off() check ensures that we come here holding + * the last preempt_count (which will get dropped once we return to + * __rcu_read_unlock(). + */ rdp = this_cpu_ptr(&rcu_data); rdp->cpu_no_qs.b.norm = false; rcu_report_qs_rdp(rdp); -- 2.39.5