2012-06-06 06:32:44

by Arik Nemtsov

Subject: [PATCH v2] mac80211: stop Rx during HW reconfig

While HW reconfig is in progress, drop all incoming Rx. This prevents
incoming packets from changing the internal state of the driver or
calling callbacks of the low level driver while it is in inconsistent
state.

Signed-off-by: Arik Nemtsov <[email protected]>
---
v2: set in_reconfig when queuing the restart work.

net/mac80211/ieee80211_i.h | 3 +++
net/mac80211/main.c | 7 +++++++
net/mac80211/rx.c | 7 +++++++
net/mac80211/util.c | 3 +++
4 files changed, 20 insertions(+)

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index ae046b5..04e8912 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -912,6 +912,9 @@ struct ieee80211_local {
/* device is started */
bool started;

+ /* device is during a HW reconfig */
+ bool in_reconfig;
+
/* wowlan is enabled -- don't reconfig on resume */
bool wowlan;

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index b70f7f0..073f697 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -345,6 +345,13 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw)
ieee80211_stop_queues_by_reason(hw,
IEEE80211_QUEUE_STOP_REASON_SUSPEND);

+ /*
+ * Stop all Rx during the reconfig. We don't want state changes
+ * or driver callbacks while this is in progress.
+ */
+ local->in_reconfig = true;
+ smp_wmb();
+
schedule_work(&local->restart_work);
}
EXPORT_SYMBOL(ieee80211_restart_hw);
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index d5ac02f..9e45fdf 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3023,6 +3023,9 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
if (WARN_ON(!sband))
goto drop;

+ /* make sure we get the latest values for the next variable checks */
+ smp_rmb();
+
/*
* If we're suspending, it is possible although not too likely
* that we'd be receiving frames after having already partially
@@ -3033,6 +3036,10 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
if (unlikely(local->quiescing || local->suspended))
goto drop;

+ /* We might be during a HW reconfig, prevent Rx for the same reason */
+ if (unlikely(local->in_reconfig))
+ goto drop;
+
/*
* The same happens when we're not even started,
* but that's worth a warning.
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 76f90c1..309acd4 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1399,6 +1399,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
if (ieee80211_sdata_running(sdata))
ieee80211_enable_keys(sdata);

+ local->in_reconfig = false;
+ smp_wmb();
+
wake_up:
/*
* Clear the WLAN_STA_BLOCK_BA flag so new aggregation
--
1.7.9.5

2012-06-06 06:38:28

by Johannes Berg

Subject: Re: [PATCH v2] mac80211: stop Rx during HW reconfig

On Wed, 2012-06-06 at 09:32 +0300, Arik Nemtsov wrote:

> +++ b/net/mac80211/rx.c
> @@ -3023,6 +3023,9 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
> if (WARN_ON(!sband))
> goto drop;
>
> + /* make sure we get the latest values for the next variable checks */
> + smp_rmb();
> +

I still don't think this makes a lot of sense. It's guaranteed racy, so
what does this buy us?

johannes