* [PATCH] ath10k: Acquire tx_lock in tx error paths
@ 2020-06-04 17:59 ` Evan Green
0 siblings, 0 replies; 8+ messages in thread
From: Evan Green @ 2020-06-04 17:59 UTC (permalink / raw)
To: Kalle Valo
Cc: kuabhs, sujitka, Evan Green, David S. Miller, Govind Singh,
Jakub Kicinski, Michal Kazior, ath10k, linux-kernel,
linux-wireless, netdev
ath10k_htt_tx_free_msdu_id() has a lockdep assertion that htt->tx_lock
is held. Acquire the lock in a couple of error paths when calling that
function to ensure this condition is met.
Fixes: 6421969f248fd ("ath10k: refactor tx pending management")
Fixes: e62ee5c381c59 ("ath10k: Add support for htt_data_tx_desc_64
descriptor")
Signed-off-by: Evan Green <evgreen@chromium.org>
---
drivers/net/wireless/ath/ath10k/htt_tx.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index e9d12ea708b62..e8c00af2cce1d 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -1545,7 +1545,9 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt,
err_unmap_msdu:
dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE);
err_free_msdu_id:
+ spin_lock_bh(&htt->tx_lock);
ath10k_htt_tx_free_msdu_id(htt, msdu_id);
+ spin_unlock_bh(&htt->tx_lock);
err:
return res;
}
@@ -1752,7 +1754,9 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt,
err_unmap_msdu:
dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE);
err_free_msdu_id:
+ spin_lock_bh(&htt->tx_lock);
ath10k_htt_tx_free_msdu_id(htt, msdu_id);
+ spin_unlock_bh(&htt->tx_lock);
err:
return res;
}
--
2.24.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] ath10k: Acquire tx_lock in tx error paths
@ 2020-06-04 17:59 ` Evan Green
0 siblings, 0 replies; 8+ messages in thread
From: Evan Green @ 2020-06-04 17:59 UTC (permalink / raw)
To: Kalle Valo
Cc: Govind Singh, kuabhs, sujitka, netdev, linux-wireless,
linux-kernel, Evan Green, ath10k, Michal Kazior, Jakub Kicinski,
David S. Miller
ath10k_htt_tx_free_msdu_id() has a lockdep assertion that htt->tx_lock
is held. Acquire the lock in a couple of error paths when calling that
function to ensure this condition is met.
Fixes: 6421969f248fd ("ath10k: refactor tx pending management")
Fixes: e62ee5c381c59 ("ath10k: Add support for htt_data_tx_desc_64
descriptor")
Signed-off-by: Evan Green <evgreen@chromium.org>
---
drivers/net/wireless/ath/ath10k/htt_tx.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index e9d12ea708b62..e8c00af2cce1d 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -1545,7 +1545,9 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt,
err_unmap_msdu:
dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE);
err_free_msdu_id:
+ spin_lock_bh(&htt->tx_lock);
ath10k_htt_tx_free_msdu_id(htt, msdu_id);
+ spin_unlock_bh(&htt->tx_lock);
err:
return res;
}
@@ -1752,7 +1754,9 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt,
err_unmap_msdu:
dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE);
err_free_msdu_id:
+ spin_lock_bh(&htt->tx_lock);
ath10k_htt_tx_free_msdu_id(htt, msdu_id);
+ spin_unlock_bh(&htt->tx_lock);
err:
return res;
}
--
2.24.1
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] ath10k: Acquire tx_lock in tx error paths
2020-06-04 17:59 ` Evan Green
@ 2020-06-08 11:38 ` Kalle Valo
-1 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2020-06-08 11:38 UTC (permalink / raw)
To: Evan Green
Cc: Govind Singh, kuabhs, sujitka, netdev, linux-wireless,
linux-kernel, ath10k, Michal Kazior, Jakub Kicinski,
David S. Miller
Evan Green <evgreen@chromium.org> writes:
> ath10k_htt_tx_free_msdu_id() has a lockdep assertion that htt->tx_lock
> is held. Acquire the lock in a couple of error paths when calling that
> function to ensure this condition is met.
>
> Fixes: 6421969f248fd ("ath10k: refactor tx pending management")
> Fixes: e62ee5c381c59 ("ath10k: Add support for htt_data_tx_desc_64
> descriptor")
Fixes tag should be in one line, I fixed that in the pending branch.
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ath10k: Acquire tx_lock in tx error paths
@ 2020-06-08 11:38 ` Kalle Valo
0 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2020-06-08 11:38 UTC (permalink / raw)
To: Evan Green
Cc: Govind Singh, kuabhs, sujitka, netdev, linux-wireless,
linux-kernel, ath10k, Michal Kazior, Jakub Kicinski,
David S. Miller
Evan Green <evgreen@chromium.org> writes:
> ath10k_htt_tx_free_msdu_id() has a lockdep assertion that htt->tx_lock
> is held. Acquire the lock in a couple of error paths when calling that
> function to ensure this condition is met.
>
> Fixes: 6421969f248fd ("ath10k: refactor tx pending management")
> Fixes: e62ee5c381c59 ("ath10k: Add support for htt_data_tx_desc_64
> descriptor")
Fixes tag should be in one line, I fixed that in the pending branch.
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ath10k: Acquire tx_lock in tx error paths
2020-06-08 11:38 ` Kalle Valo
@ 2020-06-08 16:07 ` Evan Green
-1 siblings, 0 replies; 8+ messages in thread
From: Evan Green @ 2020-06-08 16:07 UTC (permalink / raw)
To: Kalle Valo
Cc: Govind Singh, sujitka, netdev, linux-wireless, LKML, ath10k,
Michal Kazior, Jakub Kicinski, David S. Miller, kuabhs
On Mon, Jun 8, 2020 at 4:39 AM Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Evan Green <evgreen@chromium.org> writes:
>
> > ath10k_htt_tx_free_msdu_id() has a lockdep assertion that htt->tx_lock
> > is held. Acquire the lock in a couple of error paths when calling that
> > function to ensure this condition is met.
> >
> > Fixes: 6421969f248fd ("ath10k: refactor tx pending management")
> > Fixes: e62ee5c381c59 ("ath10k: Add support for htt_data_tx_desc_64
> > descriptor")
>
> Fixes tag should be in one line, I fixed that in the pending branch.
Ah, got it. Thanks Kalle!
-Evan
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ath10k: Acquire tx_lock in tx error paths
@ 2020-06-08 16:07 ` Evan Green
0 siblings, 0 replies; 8+ messages in thread
From: Evan Green @ 2020-06-08 16:07 UTC (permalink / raw)
To: Kalle Valo
Cc: Govind Singh, kuabhs, sujitka, netdev, linux-wireless, LKML,
ath10k, Michal Kazior, Jakub Kicinski, David S. Miller
On Mon, Jun 8, 2020 at 4:39 AM Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Evan Green <evgreen@chromium.org> writes:
>
> > ath10k_htt_tx_free_msdu_id() has a lockdep assertion that htt->tx_lock
> > is held. Acquire the lock in a couple of error paths when calling that
> > function to ensure this condition is met.
> >
> > Fixes: 6421969f248fd ("ath10k: refactor tx pending management")
> > Fixes: e62ee5c381c59 ("ath10k: Add support for htt_data_tx_desc_64
> > descriptor")
>
> Fixes tag should be in one line, I fixed that in the pending branch.
Ah, got it. Thanks Kalle!
-Evan
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ath10k: Acquire tx_lock in tx error paths
2020-06-04 17:59 ` Evan Green
(?)
(?)
@ 2020-06-09 6:23 ` Kalle Valo
-1 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2020-06-09 6:23 UTC (permalink / raw)
To: Evan Green
Cc: kuabhs, sujitka, Evan Green, David S. Miller, Govind Singh,
Jakub Kicinski, Michal Kazior, ath10k, linux-kernel,
linux-wireless, netdev
Evan Green <evgreen@chromium.org> wrote:
> ath10k_htt_tx_free_msdu_id() has a lockdep assertion that htt->tx_lock
> is held. Acquire the lock in a couple of error paths when calling that
> function to ensure this condition is met.
>
> Fixes: 6421969f248fd ("ath10k: refactor tx pending management")
> Fixes: e62ee5c381c59 ("ath10k: Add support for htt_data_tx_desc_64 descriptor")
> Signed-off-by: Evan Green <evgreen@chromium.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Patch applied to ath-next branch of ath.git, thanks.
a738e766e3ed ath10k: Acquire tx_lock in tx error paths
--
https://patchwork.kernel.org/patch/11588229/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ath10k: Acquire tx_lock in tx error paths
2020-06-04 17:59 ` Evan Green
` (2 preceding siblings ...)
(?)
@ 2020-06-09 6:23 ` Kalle Valo
-1 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2020-06-09 6:23 UTC (permalink / raw)
To: Evan Green
Cc: Govind Singh, kuabhs, sujitka, netdev, linux-wireless,
linux-kernel, ath10k, Michal Kazior, Jakub Kicinski,
David S. Miller
Evan Green <evgreen@chromium.org> wrote:
> ath10k_htt_tx_free_msdu_id() has a lockdep assertion that htt->tx_lock
> is held. Acquire the lock in a couple of error paths when calling that
> function to ensure this condition is met.
>
> Fixes: 6421969f248fd ("ath10k: refactor tx pending management")
> Fixes: e62ee5c381c59 ("ath10k: Add support for htt_data_tx_desc_64 descriptor")
> Signed-off-by: Evan Green <evgreen@chromium.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Patch applied to ath-next branch of ath.git, thanks.
a738e766e3ed ath10k: Acquire tx_lock in tx error paths
--
https://patchwork.kernel.org/patch/11588229/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-06-09 6:23 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-04 17:59 [PATCH] ath10k: Acquire tx_lock in tx error paths Evan Green
2020-06-04 17:59 ` Evan Green
2020-06-08 11:38 ` Kalle Valo
2020-06-08 11:38 ` Kalle Valo
2020-06-08 16:07 ` Evan Green
2020-06-08 16:07 ` Evan Green
2020-06-09 6:23 ` Kalle Valo
2020-06-09 6:23 ` Kalle Valo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.