From: "Matthew Wilcox (Oracle)" <wi...@infradead.org>
Leave the ->data_lock locking in place; it may be possible to remove it,
but err on the side of double-locking for now.
Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
---
drivers/net/wireless/ath/ath10k/core.h | 2 +-
drivers/net/wireless/ath/ath10k/wmi-tlv.c | 8 +++--
drivers/net/wireless/ath/ath10k/wmi.c | 43 ++++++++++-------------
3 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.h
b/drivers/net/wireless/ath/ath10k/core.h
index 4d7db07db6ba..89b94322aeb1 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -175,7 +175,7 @@ struct ath10k_wmi {
u32 mgmt_max_num_pending_tx;
/* Protected by data_lock */
- struct idr mgmt_pending_tx;
+ struct xarray mgmt_pending_tx;
u32 num_mem_chunks;
u32 rx_decap_mode;
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
index 2985bb17decd..6144d6d9c539 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
@@ -2843,7 +2843,7 @@ ath10k_wmi_mgmt_tx_alloc_msdu_id(struct ath10k *ar,
struct sk_buff *skb,
{
struct ath10k_wmi *wmi = &ar->wmi;
struct ath10k_mgmt_tx_pkt_addr *pkt_addr;
- int ret;
+ int ret, id;
pkt_addr = kmalloc(sizeof(*pkt_addr), GFP_ATOMIC);
if (!pkt_addr)
@@ -2853,9 +2853,11 @@ ath10k_wmi_mgmt_tx_alloc_msdu_id(struct ath10k *ar,
struct sk_buff *skb,
pkt_addr->paddr = paddr;
spin_lock_bh(&ar->data_lock);
- ret = idr_alloc(&wmi->mgmt_pending_tx, pkt_addr, 0,
- wmi->mgmt_max_num_pending_tx, GFP_ATOMIC);
+ ret = xa_alloc(&wmi->mgmt_pending_tx, &id, pkt_addr,
+ XA_LIMIT(0, wmi->mgmt_max_num_pending_tx), GFP_ATOMIC);
spin_unlock_bh(&ar->data_lock);
+ if (ret == 0)
+ ret = id;
ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi mgmt tx alloc msdu_id ret %d\n",
ret);
return ret;
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c
b/drivers/net/wireless/ath/ath10k/wmi.c
index 4f707c6394bb..280220c4fe3b 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -2353,7 +2353,7 @@ wmi_process_mgmt_tx_comp(struct ath10k *ar, struct
mgmt_tx_compl_params *param)
spin_lock_bh(&ar->data_lock);
- pkt_addr = idr_find(&wmi->mgmt_pending_tx, param->desc_id);
+ pkt_addr = xa_load(&wmi->mgmt_pending_tx, param->desc_id);
if (!pkt_addr) {
ath10k_warn(ar, "received mgmt tx completion for invalid
msdu_id: %d\n",
param->desc_id);
@@ -2380,7 +2380,7 @@ wmi_process_mgmt_tx_comp(struct ath10k *ar, struct
mgmt_tx_compl_params *param)
ret = 0;
out:
- idr_remove(&wmi->mgmt_pending_tx, param->desc_id);
+ xa_erase(&wmi->mgmt_pending_tx, param->desc_id);
spin_unlock_bh(&ar->data_lock);
return ret;
}
@@ -9389,7 +9389,7 @@ int ath10k_wmi_attach(struct ath10k *ar)
if (test_bit(ATH10K_FW_FEATURE_MGMT_TX_BY_REF,
ar->running_fw->fw_file.fw_features)) {
- idr_init(&ar->wmi.mgmt_pending_tx);
+ xa_init_flags(&ar->wmi.mgmt_pending_tx, XA_FLAGS_ALLOC);
}
return 0;
@@ -9410,32 +9410,27 @@ void ath10k_wmi_free_host_mem(struct ath10k *ar)
ar->wmi.num_mem_chunks = 0;
}
-static int ath10k_wmi_mgmt_tx_clean_up_pending(int msdu_id, void *ptr,
- void *ctx)
-{
- struct ath10k_mgmt_tx_pkt_addr *pkt_addr = ptr;
- struct ath10k *ar = ctx;
- struct sk_buff *msdu;
-
- ath10k_dbg(ar, ATH10K_DBG_WMI,
- "force cleanup mgmt msdu_id %hu\n", msdu_id);
-
- msdu = pkt_addr->vaddr;
- dma_unmap_single(ar->dev, pkt_addr->paddr,
- msdu->len, DMA_FROM_DEVICE);
- ieee80211_free_txskb(ar->hw, msdu);
-
- return 0;
-}
-
void ath10k_wmi_detach(struct ath10k *ar)
{
if (test_bit(ATH10K_FW_FEATURE_MGMT_TX_BY_REF,
ar->running_fw->fw_file.fw_features)) {
+ struct ath10k_mgmt_tx_pkt_addr *pkt_addr;
+ unsigned long index;
+
spin_lock_bh(&ar->data_lock);
- idr_for_each(&ar->wmi.mgmt_pending_tx,
- ath10k_wmi_mgmt_tx_clean_up_pending, ar);
- idr_destroy(&ar->wmi.mgmt_pending_tx);
+ xa_for_each(&ar->wmi.mgmt_pending_tx, index, pkt_addr) {
+ struct sk_buff *msdu;
+
+ ath10k_dbg(ar, ATH10K_DBG_WMI,
+ "force cleanup mgmt msdu_id %lu\n",
+ index);
+
+ msdu = pkt_addr->vaddr;
+ dma_unmap_single(ar->dev, pkt_addr->paddr, msdu->len,
+ DMA_FROM_DEVICE);
+ ieee80211_free_txskb(ar->hw, msdu);
+ }
+ xa_destroy(&ar->wmi.mgmt_pending_tx);
spin_unlock_bh(&ar->data_lock);
}
--
2.23.0.rc1
