Re: [PATCH 3/4] mwifiex: remove_bss_prio_lock

[Kalle Valo]

Avinash Patil  writes:

> From: Zhaoyang Liu 
>
> This patch does away with spinlock in
> mwifiex_wmm_get_highest_priolist_ptr in order to improve TP.
>
> Signed-off-by: Zhaoyang Liu 
> Signed-off-by: Shengzhen Li 
> Signed-off-by: Cathy Luo 
> Signed-off-by: Amitkumar Karwar 
> Signed-off-by: Avinash Patil 

[...]

> @@ -727,6 +730,25 @@ static int mwifiex_deinit_priv_params(struct 
> mwifiex_private *priv)
>   }
>  
>   mwifiex_deauthenticate(priv, NULL);
> +
> + spin_lock_irqsave(&adapter->main_proc_lock, flags);
> + adapter->main_locked = true;
> + if (adapter->mwifiex_processing) {
> + spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
> + flush_workqueue(adapter->workqueue);
> + } else {
> + spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
> + }
> +
> + spin_lock_irqsave(&adapter->rx_proc_lock, flags);
> + adapter->rx_locked = true;
> + if (adapter->rx_processing) {
> + spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
> + flush_workqueue(adapter->rx_workqueue);
> + } else {
> + spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
> + }

And here the horrible hack just grows to other functions.

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/4] mwifiex: remove_bss_prio_lock

[Avinash Patil]

From: Zhaoyang Liu 

This patch does away with spinlock in
mwifiex_wmm_get_highest_priolist_ptr in order to improve TP.

Signed-off-by: Zhaoyang Liu 
Signed-off-by: Shengzhen Li 
Signed-off-by: Cathy Luo 
Signed-off-by: Amitkumar Karwar 
Signed-off-by: Avinash Patil 
---
 drivers/net/wireless/mwifiex/cfg80211.c | 33 +
 drivers/net/wireless/mwifiex/main.c |  2 +-
 drivers/net/wireless/mwifiex/main.h |  1 +
 drivers/net/wireless/mwifiex/wmm.c  | 11 ++-
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c 
b/drivers/net/wireless/mwifiex/cfg80211.c
index 5f3c1d3..fb55092 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -717,6 +717,9 @@ mwifiex_cfg80211_init_p2p_go(struct mwifiex_private *priv)
 
 static int mwifiex_deinit_priv_params(struct mwifiex_private *priv)
 {
+   struct mwifiex_adapter *adapter = priv->adapter;
+   unsigned long flags;
+
priv->mgmt_frame_mask = 0;
if (mwifiex_send_cmd(priv, HostCmd_CMD_MGMT_FRAME_REG,
 HostCmd_ACT_GEN_SET, 0,
@@ -727,6 +730,25 @@ static int mwifiex_deinit_priv_params(struct 
mwifiex_private *priv)
}
 
mwifiex_deauthenticate(priv, NULL);
+
+   spin_lock_irqsave(&adapter->main_proc_lock, flags);
+   adapter->main_locked = true;
+   if (adapter->mwifiex_processing) {
+   spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+   flush_workqueue(adapter->workqueue);
+   } else {
+   spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+   }
+
+   spin_lock_irqsave(&adapter->rx_proc_lock, flags);
+   adapter->rx_locked = true;
+   if (adapter->rx_processing) {
+   spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
+   flush_workqueue(adapter->rx_workqueue);
+   } else {
+   spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
+   }
+
mwifiex_free_priv(priv);
priv->wdev.iftype = NL80211_IFTYPE_UNSPECIFIED;
priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
@@ -740,6 +762,9 @@ mwifiex_init_new_priv_params(struct mwifiex_private *priv,
 struct net_device *dev,
 enum nl80211_iftype type)
 {
+   struct mwifiex_adapter *adapter = priv->adapter;
+   unsigned long flags;
+
mwifiex_init_priv(priv);
 
priv->bss_mode = type;
@@ -770,6 +795,14 @@ mwifiex_init_new_priv_params(struct mwifiex_private *priv,
return -EOPNOTSUPP;
}
 
+   spin_lock_irqsave(&adapter->main_proc_lock, flags);
+   adapter->main_locked = false;
+   spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+
+   spin_lock_irqsave(&adapter->rx_proc_lock, flags);
+   adapter->rx_locked = false;
+   spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
+
return 0;
 }
 
diff --git a/drivers/net/wireless/mwifiex/main.c 
b/drivers/net/wireless/mwifiex/main.c
index 447eb6f..46e1789 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -217,7 +217,7 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
spin_lock_irqsave(&adapter->main_proc_lock, flags);
 
/* Check if already processing */
-   if (adapter->mwifiex_processing) {
+   if (adapter->mwifiex_processing || adapter->main_locked) {
adapter->more_task_flag = true;
spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
goto exit_main_proc;
diff --git a/drivers/net/wireless/mwifiex/main.h 
b/drivers/net/wireless/mwifiex/main.h
index b47bffa..cc6a623 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -773,6 +773,7 @@ struct mwifiex_adapter {
bool rx_work_enabled;
bool rx_processing;
bool delay_main_work;
+   bool main_locked;
bool rx_locked;
struct mwifiex_bss_prio_tbl bss_prio_tbl[MWIFIEX_MAX_BSS_NUM];
/* spin lock for init/shutdown */
diff --git a/drivers/net/wireless/mwifiex/wmm.c 
b/drivers/net/wireless/mwifiex/wmm.c
index ba75a45..ce747f7 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -944,14 +944,11 @@ mwifiex_wmm_get_highest_priolist_ptr(struct 
mwifiex_adapter *adapter,
struct mwifiex_ra_list_tbl *ptr;
struct mwifiex_tid_tbl *tid_ptr;
atomic_t *hqp;
-   unsigned long flags_bss, flags_ra;
+   unsigned long flags_ra;
int i, j;
 
/* check the BSS with highest priority first */
for (j = adapter->priv_num - 1; j >= 0; --j) {
-   spin_lock_irqsave(&adapter->bss_prio_tbl[j].bss_prio_lock,
- flags_bss);
-
/* iterate over BSS with the equal priority */
list_for_each_entry(adapter->bss_prio_tb