* [tip: locking/core] ath10k: Detect conf_mutex held ath10k_drain_tx() calls
@ 2021-03-06 11:54 tip-bot2 for Shuah Khan
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Shuah Khan @ 2021-03-06 11:54 UTC (permalink / raw)
To: linux-tip-commits
Cc: Shuah Khan, Peter Zijlstra (Intel),
Ingo Molnar, Kalle Valo, x86, linux-kernel
The following commit has been merged into the locking/core branch of tip:
Commit-ID: bdb1050ee1faaec1e78c15de8b1959176f26c655
Gitweb: https://git.kernel.org/tip/bdb1050ee1faaec1e78c15de8b1959176f26c655
Author: Shuah Khan <skhan@linuxfoundation.org>
AuthorDate: Fri, 26 Feb 2021 17:07:00 -07:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sat, 06 Mar 2021 12:51:15 +01:00
ath10k: Detect conf_mutex held ath10k_drain_tx() calls
ath10k_drain_tx() must not be called with conf_mutex held as workers can
use that also. Add call to lockdep_assert_not_held() on conf_mutex to
detect if conf_mutex is held by the caller.
The idea for this patch stemmed from coming across the comment block
above the ath10k_drain_tx() while reviewing the conf_mutex holds during
to debug the conf_mutex lock assert in ath10k_debug_fw_stats_request().
Adding detection to assert on conf_mutex hold will help detect incorrect
usages that could lead to locking problems when async worker routines try
to call this routine.
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/linux-wireless/871rdmu9z9.fsf@codeaurora.org/
---
drivers/net/wireless/ath/ath10k/mac.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index bb6c5ee..5ce4f8d 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -4727,6 +4727,8 @@ out:
/* Must not be called with conf_mutex held as workers can use that also. */
void ath10k_drain_tx(struct ath10k *ar)
{
+ lockdep_assert_not_held(&ar->conf_mutex);
+
/* make sure rcu-protected mac80211 tx path itself is drained */
synchronize_net();
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: locking/core] ath10k: Detect conf_mutex held ath10k_drain_tx() calls
@ 2021-03-03 8:15 tip-bot2 for Shuah Khan
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Shuah Khan @ 2021-03-03 8:15 UTC (permalink / raw)
To: linux-tip-commits
Cc: Shuah Khan, Peter Zijlstra (Intel), Kalle Valo, x86, linux-kernel
The following commit has been merged into the locking/core branch of tip:
Commit-ID: de469d82991b905548b5dc6539177f7b881dce1b
Gitweb: https://git.kernel.org/tip/de469d82991b905548b5dc6539177f7b881dce1b
Author: Shuah Khan <skhan@linuxfoundation.org>
AuthorDate: Fri, 26 Feb 2021 17:07:00 -07:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 02 Mar 2021 15:06:35 +01:00
ath10k: Detect conf_mutex held ath10k_drain_tx() calls
ath10k_drain_tx() must not be called with conf_mutex held as workers can
use that also. Add call to lockdep_assert_not_held() on conf_mutex to
detect if conf_mutex is held by the caller.
The idea for this patch stemmed from coming across the comment block
above the ath10k_drain_tx() while reviewing the conf_mutex holds during
to debug the conf_mutex lock assert in ath10k_debug_fw_stats_request().
Adding detection to assert on conf_mutex hold will help detect incorrect
usages that could lead to locking problems when async worker routines try
to call this routine.
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/linux-wireless/871rdmu9z9.fsf@codeaurora.org/
---
drivers/net/wireless/ath/ath10k/mac.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index bb6c5ee..5ce4f8d 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -4727,6 +4727,8 @@ out:
/* Must not be called with conf_mutex held as workers can use that also. */
void ath10k_drain_tx(struct ath10k *ar)
{
+ lockdep_assert_not_held(&ar->conf_mutex);
+
/* make sure rcu-protected mac80211 tx path itself is drained */
synchronize_net();
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-06 11:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-06 11:54 [tip: locking/core] ath10k: Detect conf_mutex held ath10k_drain_tx() calls tip-bot2 for Shuah Khan
-- strict thread matches above, loose matches on Subject: below --
2021-03-03 8:15 tip-bot2 for Shuah Khan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).