Re: [PATCH v10 1/3] ath11k: switch to using ieee80211_tx_status_ext()

[Kalle Valo <kvalo@kernel.org>]

Pradeep Kumar Chitrapu <pradeepc@codeaurora.org> writes:

> This allows us to pass HE rates down into the stack.
>
> Co-developed-by: Miles Hu <milehu@codeaurora.org>
> Signed-off-by: Miles Hu <milehu@codeaurora.org>
> Signed-off-by: John Crispin <john@phrozen.org>
> Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> ---
>  drivers/net/wireless/ath/ath11k/dp_tx.c | 32 +++++++++++++++++++++----
>  1 file changed, 27 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c
> index c7d7631efa5a..6f553a870e70 100644
> --- a/drivers/net/wireless/ath/ath11k/dp_tx.c
> +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c
> @@ -519,9 +519,13 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,
>  				       struct sk_buff *msdu,
>  				       struct hal_tx_status *ts)
>  {
> +	struct ieee80211_tx_status status = { 0 };
>  	struct ath11k_base *ab = ar->ab;
>  	struct ieee80211_tx_info *info;
>  	struct ath11k_skb_cb *skb_cb;
> +	struct ath11k_peer *peer;
> +	struct ath11k_sta *arsta;
> +	struct rate_info rate;
>  
>  	if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) {
>  		/* Must not happen */
> @@ -584,12 +588,30 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,
>  		ath11k_dp_tx_cache_peer_stats(ar, msdu, ts);
>  	}
>  
> -	/* NOTE: Tx rate status reporting. Tx completion status does not have
> -	 * necessary information (for example nss) to build the tx rate.
> -	 * Might end up reporting it out-of-band from HTT stats.
> -	 */
> +	spin_lock_bh(&ab->base_lock);
> +	peer = ath11k_peer_find_by_id(ab, ts->peer_id);
> +	if (!peer || !peer->sta) {
> +		ath11k_dbg(ab, ATH11K_DBG_DATA,
> +			   "dp_tx: failed to find the peer with peer_id %d\n",
> +			    ts->peer_id);
> +		spin_unlock_bh(&ab->base_lock);
> +		dev_kfree_skb_any(msdu);
> +		goto exit;
> +	}
> +	arsta = (struct ath11k_sta *)peer->sta->drv_priv;
> +	status.sta = peer->sta;
> +	status.skb = msdu;
> +	status.info = info;
> +	rate = arsta->last_txrate;
> +	status.rate = &rate;
>  
> -	ieee80211_tx_status(ar->hw, msdu);
> +	spin_unlock_bh(&ab->base_lock);
> +	rcu_read_unlock();
> +
> +	ieee80211_tx_status_ext(ar->hw, &status);
> +	return;
> +exit:
> +	rcu_read_unlock();
>  }

This patch gives a warning:

drivers/net/wireless/ath/ath11k/dp_tx.c:600:9: warning: context imbalance in 'ath11k_dp_tx_complete_msdu' - unexpected unlock

I don't understand why there's rcu_read_unlock() so in the pending
branch I removed both of the calls and also the exit label.

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=cb63b88dca170d9de9ff30a546e08917e91c6f05

Please check my changes.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k