| Message ID | 20200604105901.1.I5b8b0c7ee0d3e51a73248975a9da61401b8f3900@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ath10k: Acquire tx_lock in tx error paths | expand |
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.
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
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
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; }
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(+)