mac80211 sta info and related changes
Subsystems (2)
Johannes Berg
maintainerPATCH 3/8 mac80211: split ieee80211_key_alloc
In reply to Johannes BergIn order to RCU-ify sta_info, we need to be able to allocate a key without linking it to an sdata/sta structure (because allocation cannot be done in an rcu critical section). This patch splits up ieee80211_key_alloc() and updates all users appropriately.
--- net/mac80211/cfg.c | 13 ++++- net/mac80211/ieee80211_ioctl.c | 91 ++++++++++++++++++++++------------------- net/mac80211/ieee80211_key.h | 11 +++- net/mac80211/key.c | 32 +++++++++----- 4 files changed, 87 insertions(+), 60 deletions(-)
net/mac80211/ieee80211_ioctl.c +49 -42
@@ -33,8 +33,8 @@ static int ieee80211_set_encryption(stru size_t key_len) {struct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr); -int ret =0 ; -struct sta_info *sta; +int ret; +struct sta_info *sta =NULL ;struct ieee80211_key *key;struct ieee80211_sub_if_data *sdata;
@@ -46,58 +46,65 @@ static int ieee80211_set_encryption(strureturn -EINVAL ; } -if (is_broadcast_ether_addr (sta_addr)) { - sta =NULL ; - key = sdata->keys[idx]; - }else { - set_tx_key =0 ; -/* -* According to the standard, the key index of a pairwise -* key must be zero. However, some AP are broken when it -* comes to WEP key indices, so we work around this. -*/ -if (idx !=0 && alg !=ALG_WEP ) { -printk (KERN_DEBUG "%s: set_encrypt - non-zero idx for " -"individual key\n" , dev->name); -return -EINVAL ; +if (remove) { +if (is_broadcast_ether_addr (sta_addr)) { + key = sdata->keys[idx]; + }else { + sta =sta_info_get (local, sta_addr); +if (!sta) { + ret = -ENOENT ; + key =NULL ; + goto err_out; + } + + key = sta->key; } - sta =sta_info_get (local, sta_addr); -if (!sta) { -#ifdef CONFIG_MAC80211_VERBOSE_DEBUG -DECLARE_MAC_BUF (mac); -printk (KERN_DEBUG "%s: set_encrypt - unknown addr " -"%s\n" , - dev->name,print_mac (mac, sta_addr)); -#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ +if (!key) + ret = -ENOENT ; +else + ret =0 ; + }else { + key =ieee80211_key_alloc (alg, idx, key_len, _key); +if (!key) +return -ENOMEM ; + +if (!is_broadcast_ether_addr (sta_addr)) { + set_tx_key =0 ; +/* +* According to the standard, the key index of a +* pairwise key must be zero. However, some AP are +* broken when it comes to WEP key indices, so we +* work around this. +*/ +if (idx !=0 && alg !=ALG_WEP ) { + ret = -EINVAL ; + goto err_out; + } -return -ENOENT ; + sta =sta_info_get (local, sta_addr); +if (!sta) { + ret = -ENOENT ; + goto err_out; + } } - key = sta->key; - } +/* Automatically frees any old key if present. */ +ieee80211_key_link (key, sdata, sta); -if (remove) { -ieee80211_key_free (key); +if (set_tx_key || (!sta && !sdata->default_key && key)) +ieee80211_set_default_key (sdata, idx); + +/* don't free key later */ key =NULL ; - }else { -/* -* Automatically frees any old key if present. -*/ - key =ieee80211_key_alloc (sdata, sta, alg, idx, key_len, _key); -if (!key) { - ret = -ENOMEM ; - goto err_out; - } - } -if (set_tx_key || (!sta && !sdata->default_key && key)) -ieee80211_set_default_key (sdata, idx); + ret =0 ; + } - ret =0 ; err_out:if (sta)sta_info_put (sta); +ieee80211_key_free (key);return ret; }
net/mac80211/ieee80211_key.h +8 -3
@@ -112,12 +112,17 @@ struct ieee80211_key {struct ieee80211_key_conf conf; }; -struct ieee80211_key *ieee80211_key_alloc (struct ieee80211_sub_if_data *sdata, -struct sta_info *sta, -enum ieee80211_key_alg alg, +struct ieee80211_key *ieee80211_key_alloc (enum ieee80211_key_alg alg,int idx,size_t key_len,const u8 *key_data); +/* +* Insert a key into data structures (sdata, sta if necessary) +* to make it used. +*/ +void ieee80211_key_link (struct ieee80211_key *key, +struct ieee80211_sub_if_data *sdata, +struct sta_info *sta);void ieee80211_key_free (struct ieee80211_key *key);void ieee80211_set_default_key (struct ieee80211_sub_if_data *sdata,int idx);void ieee80211_free_keys (struct ieee80211_sub_if_data *sdata);
net/mac80211/key.c +21 -11
@@ -111,9 +111,7 @@ static void ieee80211_key_disable_hw_acc key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE ; } -struct ieee80211_key *ieee80211_key_alloc (struct ieee80211_sub_if_data *sdata, -struct sta_info *sta, -enum ieee80211_key_alg alg, +struct ieee80211_key *ieee80211_key_alloc (enum ieee80211_key_alg alg,int idx,size_t key_len,const u8 *key_data)
@@ -138,10 +136,6 @@ struct ieee80211_key *ieee80211_key_allo key->conf.keylen = key_len;memcpy (key->conf.key, key_data, key_len); - key->local = sdata->local; - key->sdata = sdata; - key->sta = sta; -if (alg ==ALG_CCMP ) {/* * Initialize AES key state here as an optimization so that
@@ -154,6 +148,23 @@ struct ieee80211_key *ieee80211_key_allo } } +return key; +} + +void ieee80211_key_link (struct ieee80211_key *key, +struct ieee80211_sub_if_data *sdata, +struct sta_info *sta) +{ +int idx; + +BUG_ON (!sdata); +BUG_ON (!key); + + idx = key->conf.keyidx; + key->local = sdata->local; + key->sdata = sdata; + key->sta = sta; +ieee80211_debugfs_key_add (key->local, key);/* remove key first */
@@ -196,8 +207,6 @@ struct ieee80211_key *ieee80211_key_allorcu_assign_pointer (sdata->keys[idx], key);list_add (&key->list, &sdata->key_list); - -return key; }void ieee80211_key_free (struct ieee80211_key *key)
@@ -207,7 +216,7 @@ void ieee80211_key_free(struct ieee80211if (key->sta) {rcu_assign_pointer (key->sta->key,NULL ); - }else { + }else if (key->sdata) {if (key->sdata->default_key == key)ieee80211_set_default_key (key->sdata,-1 ); if (key->conf.keyidx >= 0 &&
@@ -228,7 +237,8 @@ void ieee80211_key_free(struct ieee80211ieee80211_aes_key_free (key->u.ccmp.tfm);ieee80211_debugfs_key_remove (key); -list_del (&key->list); +if (key->sdata) +list_del (&key->list);kfree (key); }
net/mac80211/cfg.c +9 -4
@@ -129,6 +129,7 @@ static int ieee80211_add_key(struct wiphstruct sta_info *sta =NULL ;enum ieee80211_key_alg alg;int ret; +struct ieee80211_key *key; sdata =IEEE80211_DEV_TO_SUB_IF (dev);
@@ -147,16 +148,20 @@ static int ieee80211_add_key(struct wiphreturn -EINVAL ; } + key =ieee80211_key_alloc (alg, key_idx, params->key_len, params->key); +if (!key) +return -ENOMEM ; +if (mac_addr) { sta =sta_info_get (sdata->local, mac_addr); -if (!sta) +if (!sta) { +ieee80211_key_free (key);return -ENOENT ; + } } +ieee80211_key_link (key, sdata, sta); ret =0 ; -if (!ieee80211_key_alloc (sdata, sta, alg, key_idx, - params->key_len, params->key)) - ret = -ENOMEM ;if (sta)sta_info_put (sta);
Johannes Berg
maintainerPATCH 8/8 mac80211: clean up sta_info and document locking
In reply to Johannes BergThis patch cleans up the sta_info struct and documents how each set of variables is locked. Notably, flags locking is completely missing. It also adds kernel-doc for some (but not all yet) members of the struct.
--- net/mac80211/debugfs_sta.c | 2 net/mac80211/sta_info.h | 125 +++++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 51 deletions(-)
net/mac80211/sta_info.h +75 -50
@@ -129,79 +129,104 @@ struct sta_ampdu_mlme {#define STA_INFO_PIN_STAT_PINNED 1#define STA_INFO_PIN_STAT_DESTROY 2 - +/** +* struct sta_info - STA information +* +* This structure collects information about a station that +* mac80211 is communicating with. +* +* @list: global linked list entry +* @hnext: hash table linked list pointer +* @local: pointer to the global information +* @addr: MAC address of this STA +* @aid: STA's unique AID (1..2007, 0 = not assigned yet), +* only used in AP (and IBSS?) mode +* @flags: STA flags, see &enum ieee80211_sta_info_flags +* @ps_tx_buf: buffer of frames to transmit to this station +* when it leaves power saving state +* @tx_filtered: buffer of frames we already tried to transmit +* but were filtered by hardware due to STA having entered +* power saving state +* @rx_packets: Number of MSDUs received from this STA +* @rx_bytes: Number of bytes received from this STA +* @supp_rates: Bitmap of supported rates (per band) +* @ht_info: HT capabilities of this STA +*/ struct sta_info { +/* General information, mostly static */ struct list_head list; -struct sta_info *hnext;/* next entry in hash table list */ - +struct sta_info *hnext;struct ieee80211_local *local; - -u8 addr[ETH_ALEN ]; -u16 aid;/* STA's unique AID (1..2007), 0 = not yet assigned */ -u32 flags;/* WLAN_STA_ */ - -struct sk_buff_head ps_tx_buf;/* buffer of TX frames for station in -* power saving state */ -struct sk_buff_head tx_filtered;/* buffer of TX frames that were -* already given to low-level driver, -* but were filtered */ -unsigned long rx_packets, tx_packets;/* number of RX/TX MSDUs */ -unsigned long rx_bytes, tx_bytes; -unsigned long tx_retry_failed, tx_retry_count; -unsigned long tx_filtered_count; - -unsigned int wep_weak_iv_count;/* number of RX frames with weak IV */ - -unsigned long last_rx; -/* bitmap of supported rates per band */ -u64 supp_rates[IEEE80211_NUM_BANDS ]; -int txrate_idx; -/* last rates used to send a frame to this STA */ -int last_txrate_idx, last_nonerp_txrate_idx; - -/* sub_if_data this sta belongs to */ struct ieee80211_sub_if_data *sdata; -struct ieee80211_key *key; - -u32 tx_num_consecutive_failures; -u32 tx_num_mpdu_ok; -u32 tx_num_mpdu_fail; -struct rate_control_ref *rate_ctrl;void *rate_ctrl_priv; +struct ieee80211_ht_info ht_info; +u64 supp_rates[IEEE80211_NUM_BANDS ]; +u8 addr[ETH_ALEN ]; +u16 aid; +u16 listen_interval; -/* last received seq/frag number from this STA (per RX queue) */ -__le16 last_seq_ctrl[NUM_RX_DATA_QUEUES ]; +/* +* for use by the internal lifetime management, +* see __sta_info_unlink +*/ +u8 pin_status; + +/* frequently updated information, needs locking? */ +u32 flags; + +/* +* STA powersave frame queues, no more than the internal +* locking required. +*/ +struct sk_buff_head ps_tx_buf; +struct sk_buff_head tx_filtered; + +/* Updated from RX path only, no locking requirements */ +unsigned long rx_packets, rx_bytes; +unsigned long wep_weak_iv_count; +unsigned long last_rx;unsigned long num_duplicates;/* number of duplicate frames received * from this STA */ -unsigned long tx_fragments;/* number of transmitted MPDUs */ unsigned long rx_fragments;/* number of received MPDUs */ unsigned long rx_dropped;/* number of dropped MPDUs from this STA */ -int last_rssi;/* RSSI of last received frame from this STA */ int last_signal;/* signal of last received frame from this STA */ int last_noise;/* noise of last received frame from this STA */ -int channel_use; -int channel_use_raw; - +/* last received seq/frag number from this STA (per RX queue) */ +__le16 last_seq_ctrl[NUM_RX_DATA_QUEUES ];#ifdef CONFIG_MAC80211_DEBUG_COUNTERS unsigned int wme_rx_queue[NUM_RX_DATA_QUEUES ]; +#endif + +/* Updated from TX status path only, no locking requirements */ +unsigned long tx_filtered_count; +unsigned long tx_retry_failed, tx_retry_count; +/* TODO: update in generic code not rate control */ +u32 tx_num_consecutive_failures; +u32 tx_num_mpdu_ok; +u32 tx_num_mpdu_fail; + +/* Updated from TX path only, no locking requirements */ +unsigned long tx_packets;/* number of RX/TX MSDUs */ +unsigned long tx_bytes; +unsigned long tx_fragments;/* number of transmitted MPDUs */ +int txrate_idx; +int last_txrate_idx; +#ifdef CONFIG_MAC80211_DEBUG_COUNTERS unsigned int wme_tx_queue[NUM_RX_DATA_QUEUES ]; -#endif /* CONFIG_MAC80211_DEBUG_COUNTERS */ +#endif -u16 listen_interval; +/* Debug counters, no locking doesn't matter */ +int channel_use; +int channel_use_raw;/* -* for use by the internal lifetime management, -* see __sta_info_unlink +* Aggregation information, comes with own locking. */ -u8 pin_status; - -struct ieee80211_ht_info ht_info;/* 802.11n HT capabilities -of this STA */ struct sta_ampdu_mlme ampdu_mlme; -u8 timer_to_tid[STA_TID_NUM ];/* convert timer id to tid */ +u8 timer_to_tid[STA_TID_NUM ];/* identity mapping to ID timers */ u8 tid_to_tx_q[STA_TID_NUM ];/* map tid to tx queue */ #ifdef CONFIG_MAC80211_DEBUGFS
net/mac80211/debugfs_sta.c +1 -1
@@ -67,7 +67,7 @@ STA_FILE(last_rssi, last_rssi, D);STA_FILE (last_signal, last_signal,D );STA_FILE (last_noise, last_noise,D );STA_FILE (channel_use, channel_use,D ); -STA_FILE (wep_weak_iv_count, wep_weak_iv_count,D ); +STA_FILE (wep_weak_iv_count, wep_weak_iv_count,LU );static ssize_t sta_flags_read (struct file *file,char __user *userbuf,size_t count,loff_t *ppos)
Johannes Berg
maintainerPATCH 2/8 mac80211: safely free beacon in ieee80211_if_reinit
In reply to Johannes BergIf ieee80211_if_reinit() is called from ieee80211_unregister_hw() then it is possible that the driver will still request a beacon (it is allowed to until ieee80211_unregister_hw() has returned.) This means we need to use an RCU-protected write to the beacon information even in this function.
--- net/mac80211/ieee80211_iface.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/mac80211/ieee80211_iface.c +5 -1
@@ -193,6 +193,7 @@ void ieee80211_if_reinit(struct net_devi/* Remove all virtual interfaces that use this BSS * as their sdata->bss */ struct ieee80211_sub_if_data *tsdata, *n; +struct beacon_data *beacon;list_for_each_entry_safe (tsdata, n, &local->interfaces, list) {if (tsdata != sdata && tsdata->bss == &sdata->u.ap) {
@@ -210,7 +211,10 @@ void ieee80211_if_reinit(struct net_devi } } -kfree (sdata->u.ap.beacon); + beacon = sdata->u.ap.beacon; +rcu_assign_pointer (sdata->u.ap.beacon,NULL ); +synchronize_rcu (); +kfree (beacon);while ((skb =skb_dequeue (&sdata->u.ap.ps_bc_buf))) { local->total_ps_buffered--;
Johannes Berg
maintainerPATCH 1/8 mac80211: clarify use of TX status/RX callbacks
In reply to Johannes BergThis patch clarifies the use of the irqsafe vs. non-irq-safe functions and their respective locking requirements.
--- include/net/mac80211.h | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-)
include/net/mac80211.h +34 -3
@@ -38,7 +38,11 @@* called in hardware interrupt context. The low-level driver must not call any * other functions in hardware interrupt context. If there is a need for such * call, the low-level driver should first ACK the interrupt and perform the -* IEEE 802.11 code call after this, e.g. from a scheduled workqueue function. +* IEEE 802.11 code call after this, e.g. from a scheduled workqueue or even +* tasklet function. +* +* NOTE: If the driver opts to use the _irqsafe() functions, it may not also +* use the non-irqsafe functions! */ /**
@@ -1204,7 +1208,10 @@ void __ieee80211_rx(struct ieee80211_hw* buffer in @skb must start with an IEEE 802.11 header or a radiotap * header if %RX_FLAG_RADIOTAP is set in the @status flags. * -* This function may not be called in IRQ context. +* This function may not be called in IRQ context. Calls to this function +* for a single hardware must be synchronized against each other. Calls +* to this function and ieee80211_rx_irqsafe() may not be mixed for a +* single hardware. * * @hw: the hardware this frame came in on * @skb: the buffer to receive, owned by mac80211 after this call
@@ -1221,7 +1228,10 @@ static inline void ieee80211_rx(struct i* ieee80211_rx_irqsafe - receive frame * * Like ieee80211_rx() but can be called in IRQ context -* (internally defers to a workqueue.) +* (internally defers to a tasklet.) +* +* Calls to this function and ieee80211_rx() may not be mixed for a +* single hardware. * * @hw: the hardware this frame came in on * @skb: the buffer to receive, owned by mac80211 after this call
@@ -1240,6 +1250,11 @@ void ieee80211_rx_irqsafe(struct ieee802* transmitted. It is permissible to not call this function for * multicast frames but this can affect statistics. * +* This function may not be called in IRQ context. Calls to this function +* for a single hardware must be synchronized against each other. Calls +* to this function and ieee80211_tx_status_irqsafe() may not be mixed +* for a single hardware. +* * @hw: the hardware the frame was transmitted by * @skb: the frame that was transmitted, owned by mac80211 after this call * @status: status information for this frame; the status pointer need not
@@ -1249,6 +1264,22 @@ void ieee80211_rx_irqsafe(struct ieee802void ieee80211_tx_status (struct ieee80211_hw *hw,struct sk_buff *skb,struct ieee80211_tx_status *status); + +/** +* ieee80211_tx_status_irqsafe - irq-safe transmit status callback +* +* Like ieee80211_tx_status() but can be called in IRQ context +* (internally defers to a tasklet.) +* +* Calls to this function and ieee80211_tx_status() may not be mixed for a +* single hardware. +* +* @hw: the hardware the frame was transmitted by +* @skb: the frame that was transmitted, owned by mac80211 after this call +* @status: status information for this frame; the status pointer need not +* be valid after this function returns and is not freed by mac80211, +* it is recommended that it points to a stack area +*/ void ieee80211_tx_status_irqsafe (struct ieee80211_hw *hw,struct sk_buff *skb,struct ieee80211_tx_status *status);
Johannes Berg
maintainerPATCH 7/8 mac80211: remove STA infos last_ack stuff
In reply to Johannes BergThese things aren't used and the only possible use is within rate control algorithms, however those can, if they need it, keep track of it in their private data. last_ack_ms isn't even updated so completely useless.
--- net/mac80211/debugfs_sta.c | 29 ----------------------------- net/mac80211/rc80211_pid_algo.c | 3 --- net/mac80211/rc80211_simple.c | 3 --- net/mac80211/sta_info.h | 4 ---- 4 files changed, 39 deletions(-)
net/mac80211/sta_info.h +0 -4
@@ -182,8 +182,6 @@ struct sta_info {int last_rssi;/* RSSI of last received frame from this STA */ int last_signal;/* signal of last received frame from this STA */ int last_noise;/* noise of last received frame from this STA */ -int last_ack_rssi[3 ];/* RSSI of last received ACKs from this STA */ -unsigned long last_ack;int channel_use;int channel_use_raw;
@@ -211,8 +209,6 @@ struct sta_info {struct dentry *dir;struct dentry *flags;struct dentry *num_ps_buf_frames; -struct dentry *last_ack_rssi; -struct dentry *last_ack_ms;struct dentry *inactive_ms;struct dentry *last_seq_ctrl;#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
net/mac80211/debugfs_sta.c +0 -29
@@ -98,31 +98,6 @@ static ssize_t sta_num_ps_buf_frames_rea }STA_OPS (num_ps_buf_frames); -static ssize_t sta_last_ack_rssi_read (struct file *file,char __user *userbuf, -size_t count,loff_t *ppos) -{ -char buf[100 ]; -struct sta_info *sta = file->private_data; -int res =scnprintf (buf,sizeof (buf),"%d %d %d\n" , - sta->last_ack_rssi[0 ], - sta->last_ack_rssi[1 ], - sta->last_ack_rssi[2 ]); -return simple_read_from_buffer (userbuf, count, ppos, buf, res); -} -STA_OPS (last_ack_rssi); - -static ssize_t sta_last_ack_ms_read (struct file *file,char __user *userbuf, -size_t count,loff_t *ppos) -{ -char buf[20 ]; -struct sta_info *sta = file->private_data; -int res =scnprintf (buf,sizeof (buf),"%d\n" , - sta->last_ack ? -jiffies_to_msecs (jiffies - sta->last_ack) :-1 ); -return simple_read_from_buffer (userbuf, count, ppos, buf, res); -} -STA_OPS (last_ack_ms); -static ssize_t sta_inactive_ms_read (struct file *file,char __user *userbuf,size_t count,loff_t *ppos) {
@@ -311,8 +286,6 @@ void ieee80211_sta_debugfs_add(struct stDEBUGFS_ADD (flags);DEBUGFS_ADD (num_ps_buf_frames); -DEBUGFS_ADD (last_ack_rssi); -DEBUGFS_ADD (last_ack_ms);DEBUGFS_ADD (inactive_ms);DEBUGFS_ADD (last_seq_ctrl);#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
@@ -326,8 +299,6 @@ void ieee80211_sta_debugfs_remove(struct {DEBUGFS_DEL (flags);DEBUGFS_DEL (num_ps_buf_frames); -DEBUGFS_DEL (last_ack_rssi); -DEBUGFS_DEL (last_ack_ms);DEBUGFS_DEL (inactive_ms);DEBUGFS_DEL (last_seq_ctrl);#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
net/mac80211/rc80211_pid_algo.c +0 -3
@@ -282,9 +282,6 @@ static void rate_control_pid_tx_status(v sta->tx_num_consecutive_failures++; sta->tx_num_mpdu_fail++; }else { - sta->last_ack_rssi[0 ] = sta->last_ack_rssi[1 ]; - sta->last_ack_rssi[1 ] = sta->last_ack_rssi[2 ]; - sta->last_ack_rssi[2 ] = status->ack_signal; sta->tx_num_consecutive_failures =0 ; sta->tx_num_mpdu_ok++; }
net/mac80211/rc80211_simple.c +0 -3
@@ -133,9 +133,6 @@ static void rate_control_simple_tx_statu sta->tx_num_consecutive_failures++; sta->tx_num_mpdu_fail++; }else { - sta->last_ack_rssi[0 ] = sta->last_ack_rssi[1 ]; - sta->last_ack_rssi[1 ] = sta->last_ack_rssi[2 ]; - sta->last_ack_rssi[2 ] = status->ack_signal; sta->tx_num_consecutive_failures =0 ; sta->tx_num_mpdu_ok++; }
Johannes Berg
maintainerPATCH 4/8 mac80211: RCU-ify STA info structure access
In reply to Johannes BergThis makes access to the STA hash table/list use RCU to protect against freeing of items. However, it's not a true RCU, the copy step is missing: whenever somebody changes a STA item it is simply updated. That will be addressed by a later change.
--- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 31 +- drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 27 +- net/mac80211/cfg.c | 82 ++++-- net/mac80211/debugfs_sta.c | 4 net/mac80211/debugfs_sta.h | 2 net/mac80211/ieee80211.c | 76 ++++-- net/mac80211/ieee80211_i.h | 13 - net/mac80211/ieee80211_iface.c | 11 net/mac80211/ieee80211_ioctl.c | 60 +++- net/mac80211/ieee80211_rate.c | 8 net/mac80211/ieee80211_rate.h | 1 net/mac80211/ieee80211_sta.c | 126 ++++++---- net/mac80211/key.c | 5 net/mac80211/rc80211_pid_algo.c | 23 + net/mac80211/rc80211_simple.c | 18 - net/mac80211/rx.c | 24 - net/mac80211/sta_info.c | 350 +++++++++++++++++------------ net/mac80211/sta_info.h | 58 +++- net/mac80211/tx.c | 48 ++- net/mac80211/wme.c | 8 20 files changed, 612 insertions(+), 363 deletions(-)
net/mac80211/ieee80211_i.h +10 -3
@@ -426,6 +426,7 @@ struct ieee80211_local {unsigned int filter_flags;/* FIF_* */ struct iw_statistics wstats;u8 wstats_flags; +bool tim_in_locked_section;/* see ieee80211_beacon_get() */ int tx_headroom;/* required headroom for hardware/radiotap */ enum {
@@ -443,9 +444,15 @@ struct ieee80211_local {struct sk_buff_head skb_queue;struct sk_buff_head skb_queue_unreliable; -/* Station data structures */ -rwlock_t sta_lock;/* protects STA data structures */ -int num_sta;/* number of stations in sta_list */ +/* Station data */ +/* +* The lock only protects the list, hash, timer and counter +* against manipulation, reads are done in RCU. Additionally, +* the lock protects each BSS's TIM bitmap and a few items +* in a STA info structure. +*/ +spinlock_t sta_lock; +unsigned long num_sta;struct list_head sta_list;struct sta_info *sta_hash[STA_HASH_SIZE ];struct timer_list sta_cleanup;
net/mac80211/ieee80211_sta.c +84 -42
339 lines not on this page · raw message
net/mac80211/sta_info.c +213 -137
560 lines not on this page · raw message
net/mac80211/sta_info.h +39 -19
91 lines not on this page · raw message
net/mac80211/tx.c +26 -22
119 lines not on this page · raw message
net/mac80211/cfg.c +55 -27
199 lines not on this page · raw message
net/mac80211/ieee80211.c +51 -25
224 lines not on this page · raw message
net/mac80211/rc80211_pid_algo.c +13 -10
@@ -77,7 +77,7 @@ static void rate_control_pid_adjust_rateint cur_sorted, new_sorted, probe, tmp, n_bitrates, band;int cur = sta->txrate_idx; - sdata =IEEE80211_DEV_TO_SUB_IF (sta->dev); + sdata = sta->sdata; sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; band = sband->band; n_bitrates = sband->n_bitrates;
@@ -239,23 +239,25 @@ static void rate_control_pid_tx_status(vunsigned long period;struct ieee80211_supported_band *sband; +rcu_read_lock (); + sta =sta_info_get (local, hdr->addr1); sband = local->hw.wiphy->bands[local->hw.conf.channel->band];if (!sta) -return ; + goto unlock;/* Don't update the state if we're not controlling the rate. */ - sdata =IEEE80211_DEV_TO_SUB_IF (sta->dev); + sdata = sta->sdata;if (sdata->bss && sdata->bss->force_unicast_rateidx >-1 ) { sta->txrate_idx = sdata->bss->max_ratectrl_rateidx; -return ; + goto unlock; }/* Ignore all frames that were sent with a different rate than the rate * we currently advise mac80211 to use. */ if (status->control.tx_rate != &sband->bitrates[sta->txrate_idx]) - goto ignore; + goto unlock; spinfo = sta->rate_ctrl_priv; spinfo->tx_num_xmit++;
@@ -296,8 +298,8 @@ static void rate_control_pid_tx_status(vif (time_after (jiffies, spinfo->last_sample + period))rate_control_pid_sample (pinfo, local, sta); -ignore: -sta_info_put (sta); + unlock: +rcu_read_unlock (); } static void rate_control_pid_get_rate(void *priv, struct net_device *dev,
@@ -312,6 +314,8 @@ static void rate_control_pid_get_rate(voint rateidx;u16 fc; +rcu_read_lock (); + sta =sta_info_get (local, hdr->addr1);/* Send management frames and broadcast/multicast data using lowest
@@ -320,8 +324,7 @@ static void rate_control_pid_get_rate(voif ((fc &IEEE80211_FCTL_FTYPE ) !=IEEE80211_FTYPE_DATA ||is_multicast_ether_addr (hdr->addr1) || !sta) { sel->rate =rate_lowest (local, sband, sta); -if (sta) -sta_info_put (sta); +rcu_read_unlock ();return ; }
@@ -337,7 +340,7 @@ static void rate_control_pid_get_rate(vo sta->last_txrate_idx = rateidx; -sta_info_put (sta); +rcu_read_unlock (); sel->rate = &sband->bitrates[rateidx];
net/mac80211/rc80211_simple.c +11 -7
@@ -40,7 +40,7 @@ static void rate_control_rate_inc(structint i = sta->txrate_idx;int maxrate; - sdata =IEEE80211_DEV_TO_SUB_IF (sta->dev); + sdata = sta->sdata;if (sdata->bss && sdata->bss->force_unicast_rateidx >-1 ) {/* forced unicast rate - do not change STA rate */ return ;
@@ -70,7 +70,7 @@ static void rate_control_rate_dec(structstruct ieee80211_supported_band *sband;int i = sta->txrate_idx; - sdata =IEEE80211_DEV_TO_SUB_IF (sta->dev); + sdata = sta->sdata;if (sdata->bss && sdata->bss->force_unicast_rateidx >-1 ) {/* forced unicast rate - do not change STA rate */ return ;
@@ -118,10 +118,12 @@ static void rate_control_simple_tx_statustruct sta_info *sta;struct sta_rate_control *srctrl; +rcu_read_lock (); + sta =sta_info_get (local, hdr->addr1);if (!sta) -return ; + goto unlock; srctrl = sta->rate_ctrl_priv; srctrl->tx_num_xmit++;
@@ -194,7 +196,8 @@ static void rate_control_simple_tx_statu } } -sta_info_put (sta); + unlock: +rcu_read_unlock (); }
@@ -211,6 +214,8 @@ rate_control_simple_get_rate(void *priv,int rateidx;u16 fc; +rcu_read_lock (); + sta =sta_info_get (local, hdr->addr1);/* Send management frames and broadcast/multicast data using lowest
@@ -219,8 +224,7 @@ rate_control_simple_get_rate(void *priv,if ((fc &IEEE80211_FCTL_FTYPE ) !=IEEE80211_FTYPE_DATA ||is_multicast_ether_addr (hdr->addr1) || !sta) { sel->rate =rate_lowest (local, sband, sta); -if (sta) -sta_info_put (sta); +rcu_read_unlock ();return ; }
@@ -236,7 +240,7 @@ rate_control_simple_get_rate(void *priv, sta->last_txrate_idx = rateidx; -sta_info_put (sta); +rcu_read_unlock (); sel->rate = &sband->bitrates[rateidx]; }
net/mac80211/rx.c +8 -16
@@ -574,7 +574,7 @@ static void ap_sta_ps_start(struct net_dstruct ieee80211_sub_if_data *sdata;DECLARE_MAC_BUF (mac); - sdata =IEEE80211_DEV_TO_SUB_IF (sta->dev); + sdata = sta->sdata;if (sdata->bss)atomic_inc (&sdata->bss->num_sta_ps);
@@ -595,7 +595,7 @@ static int ap_sta_ps_end(struct net_devistruct ieee80211_tx_packet_data *pkt_data;DECLARE_MAC_BUF (mac); - sdata =IEEE80211_DEV_TO_SUB_IF (sta->dev); + sdata = sta->sdata;if (sdata->bss)atomic_dec (&sdata->bss->num_sta_ps);
@@ -1212,7 +1212,7 @@ ieee80211_deliver_skb(struct ieee80211_t "multicast frame\n", dev->name); }else { dsta =sta_info_get (local, skb->data); -if (dsta && dsta->dev == dev) { +if (dsta && dsta->sdata->dev == dev) {/* * The destination station is associated to * this AP (in this VLAN), so send the frame
@@ -1222,8 +1222,6 @@ ieee80211_deliver_skb(struct ieee80211_t xmit_skb = skb; skb =NULL ; } -if (dsta) -sta_info_put (dsta); } }
@@ -1786,13 +1784,13 @@ static void __ieee80211_rx_handle_packet rx.sta =sta_info_get (local, hdr->addr2);if (rx.sta) { - rx.dev = rx.sta->dev; - rx.sdata =IEEE80211_DEV_TO_SUB_IF (rx.dev); + rx.sdata = rx.sta->sdata; + rx.dev = rx.sta->sdata->dev; }if ((status->flag &RX_FLAG_MMIC_ERROR )) {ieee80211_rx_michael_mic_report (local->mdev, hdr, &rx); - goto end; +return ; }if (unlikely (local->sta_sw_scanning || local->sta_hw_scanning))
@@ -1851,10 +1849,6 @@ static void __ieee80211_rx_handle_packetieee80211_invoke_rx_handlers (prev, &rx, skb); }else dev_kfree_skb (skb); - - end: -if (rx.sta) -sta_info_put (rx.sta); }#define SEQ_MODULO 0x1000
@@ -2031,7 +2025,7 @@ static u8 ieee80211_rx_reorder_ampdu(str/* if this mpdu is fragmented - terminate rx aggregation session */ sc =le16_to_cpu (hdr->seq_ctrl);if (sc &IEEE80211_SCTL_FRAG ) { -ieee80211_sta_stop_rx_ba_session (sta->dev, sta->addr, +ieee80211_sta_stop_rx_ba_session (sta->sdata->dev, sta->addr, tid,0 ,WLAN_REASON_QSTA_REQUIRE_SETUP ); ret =1 ; goto end_reorder;
@@ -2041,9 +2035,7 @@ static u8 ieee80211_rx_reorder_ampdu(str mpdu_seq_num = (sc &IEEE80211_SCTL_SEQ ) >>4 ; ret =ieee80211_sta_manage_reorder_buf (hw, tid_agg_rx, skb, mpdu_seq_num,0 ); -end_reorder: -if (sta) -sta_info_put (sta); + end_reorder:return ret; }
net/mac80211/ieee80211_ioctl.c +41 -19
133 lines not on this page · raw message
net/mac80211/ieee80211_iface.c +8 -3
@@ -224,16 +224,21 @@ void ieee80211_if_reinit(struct net_devibreak ; }case IEEE80211_IF_TYPE_WDS : +rcu_read_lock (); sta =sta_info_get (local, sdata->u.wds.remote_addr);if (sta) { -sta_info_free (sta); -sta_info_put (sta); +sta_info_unlink (&sta); }else {#ifdef CONFIG_MAC80211_VERBOSE_DEBUG printk (KERN_DEBUG "%s: Someone had deleted my STA " "entry for the WDS link\n" , dev->name);#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ } +rcu_read_unlock (); +if (sta) { +synchronize_rcu (); +sta_info_destroy (sta); + }break ;case IEEE80211_IF_TYPE_STA :case IEEE80211_IF_TYPE_IBSS :
@@ -258,7 +263,7 @@ void ieee80211_if_reinit(struct net_devi }/* remove all STAs that are bound to this virtual interface */ -sta_info_flush (local, dev); +sta_info_flush (local, sdata);memset (&sdata->u,0 ,sizeof (sdata->u));ieee80211_if_sdata_init (sdata);
net/mac80211/ieee80211_rate.c +5 -3
@@ -170,9 +170,12 @@ void rate_control_get_rate(struct net_destruct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr);struct rate_control_ref *ref = local->rate_ctrl;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; -struct sta_info *sta =sta_info_get (local, hdr->addr1); +struct sta_info *sta;int i; +rcu_read_lock (); + sta =sta_info_get (local, hdr->addr1); +memset (sel,0 ,sizeof (struct rate_selection )); ref->ops->get_rate (ref->priv, dev, sband, skb, sel);
@@ -190,8 +193,7 @@ void rate_control_get_rate(struct net_de } } -if (sta) -sta_info_put (sta); +rcu_read_unlock (); }struct rate_control_ref *rate_control_get (struct rate_control_ref *ref)
net/mac80211/ieee80211_rate.h +1 -0
@@ -14,6 +14,7 @@#include <linux/netdevice.h> #include <linux/skbuff.h> #include <linux/types.h> +#include <linux/kref.h> #include <net/mac80211.h> #include "ieee80211_i.h" #include "sta_info.h"
net/mac80211/key.c +4 -1
@@ -186,14 +186,17 @@ void ieee80211_key_link(struct ieee80211if (sdata->vif.type ==IEEE80211_IF_TYPE_STA ) {struct sta_info *ap; +rcu_read_lock (); +/* same here, the AP could be using QoS */ ap =sta_info_get (key->local, key->sdata->u.sta.bssid);if (ap) {if (ap->flags &WLAN_STA_WME ) key->conf.flags |=IEEE80211_KEY_FLAG_WMM_STA ; -sta_info_put (ap); } + +rcu_read_unlock (); } }
net/mac80211/debugfs_sta.c +2 -2
@@ -51,7 +51,7 @@ static const struct file_operations sta_STA_OPS (name)STA_FILE (aid, aid, D); -STA_FILE (dev, dev->name,S ); +STA_FILE (dev, sdata->dev->name,S );STA_FILE (rx_packets, rx_packets,LU );STA_FILE (tx_packets, tx_packets,LU );STA_FILE (rx_bytes, rx_bytes,LU );
@@ -225,7 +225,7 @@ static ssize_t sta_agg_status_write(stru const char __user *user_buf, size_t count, loff_t *ppos) { struct sta_info *sta = file->private_data; -struct net_device *dev = sta->dev; +struct net_device *dev = sta->sdata->dev;struct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;u8 *da = sta->addr;
net/mac80211/wme.c +6 -2
@@ -153,6 +153,7 @@ static int wme_qdiscop_enqueue(struct skif (pkt_data->flags &IEEE80211_TXPD_REQUEUE ) { queue = pkt_data->queue; +rcu_read_lock (); sta =sta_info_get (local, hdr->addr1); tid = skb->priority &QOS_CONTROL_TAG1D_MASK ;if (sta) {
@@ -164,8 +165,8 @@ static int wme_qdiscop_enqueue(struct sk }else { pkt_data->flags &= ~IEEE80211_TXPD_AMPDU ; } -sta_info_put (sta); } +rcu_read_unlock ();skb_queue_tail (&q->requeued[queue], skb); qd->q.qlen++;return 0 ;
@@ -187,6 +188,8 @@ static int wme_qdiscop_enqueue(struct sk p++; *p =0 ; +rcu_read_lock (); + sta =sta_info_get (local, hdr->addr1);if (sta) {int ampdu_queue = sta->tid_to_tx_q[tid];
@@ -197,8 +200,9 @@ static int wme_qdiscop_enqueue(struct sk }else { pkt_data->flags &= ~IEEE80211_TXPD_AMPDU ; } -sta_info_put (sta); } + +rcu_read_unlock (); }if (unlikely (queue >= local->hw.queues)) {
net/mac80211/debugfs_sta.h +2 -0
@@ -1,6 +1,8 @@#ifndef __MAC80211_DEBUGFS_STA_H#define __MAC80211_DEBUGFS_STA_H +#include "sta_info.h" +#ifdef CONFIG_MAC80211_DEBUGFS void ieee80211_sta_debugfs_add (struct sta_info *sta);void ieee80211_sta_debugfs_remove (struct sta_info *sta);
drivers/net/wireless/iwlwifi/iwl-3945-rs.c +18 -13
@@ -471,10 +471,11 @@ static void rs_tx_status(void *priv_ratereturn ; } +rcu_read_lock (); + sta =sta_info_get (local, hdr->addr1);if (!sta || !sta->rate_ctrl_priv) { -if (sta) -sta_info_put (sta); +rcu_read_unlock ();IWL_DEBUG_RATE ("leave: No STA priv data to update!\n" );return ; }
@@ -547,7 +548,7 @@ static void rs_tx_status(void *priv_ratespin_unlock_irqrestore (&rs_sta->lock, flags); -sta_info_put (sta); +rcu_read_unlock ();IWL_DEBUG_RATE ("leave\n" );
@@ -658,6 +659,8 @@ static void rs_get_rate(void *priv_rate,IWL_DEBUG_RATE ("enter\n" ); +rcu_read_lock (); + sta =sta_info_get (local, hdr->addr1);/* Send management frames and broadcast/multicast data using lowest
@@ -668,8 +671,7 @@ static void rs_get_rate(void *priv_rate, !sta || !sta->rate_ctrl_priv) {IWL_DEBUG_RATE ("leave: No STA priv data to update!\n" ); sel->rate =rate_lowest (local, band, sta); -if (sta) -sta_info_put (sta); +rcu_read_unlock ();return ; }
@@ -811,7 +813,7 @@ static void rs_get_rate(void *priv_rate,else sta->txrate_idx = sta->last_txrate_idx; -sta_info_put (sta); +rcu_read_unlock ();IWL_DEBUG_RATE ("leave: %d\n" , index);
@@ -843,13 +845,15 @@ int iwl3945_fill_rs_info(struct ieee8021unsigned long now = jiffies;u32 max_time =0 ; +rcu_read_lock (); + sta =sta_info_get (local, priv->stations[sta_id].sta.sta.addr);if (!sta || !sta->rate_ctrl_priv) { -if (sta) { -sta_info_put (sta); +if (sta)IWL_DEBUG_RATE ("leave - no private rate data!\n" ); - }else +else IWL_DEBUG_RATE ("leave - no station!\n" ); +rcu_read_unlock ();return sprintf (buf,"station %d not found\n" , sta_id); }
@@ -890,7 +894,7 @@ int iwl3945_fill_rs_info(struct ieee8021 i = j; }spin_unlock_irqrestore (&rs_sta->lock, flags); -sta_info_put (sta); +rcu_read_unlock ();/* Display the average rate of all samples taken. *
@@ -927,11 +931,12 @@ void iwl3945_rate_scale_init(struct ieeereturn ; } +rcu_read_lock (); + sta =sta_info_get (local, priv->stations[sta_id].sta.sta.addr);if (!sta || !sta->rate_ctrl_priv) { -if (sta) -sta_info_put (sta);IWL_DEBUG_RATE ("leave - no private rate data!\n" ); +rcu_read_unlock ();return ; }
@@ -958,7 +963,7 @@ void iwl3945_rate_scale_init(struct ieeebreak ; } -sta_info_put (sta); +rcu_read_unlock ();spin_unlock_irqrestore (&rs_sta->lock, flags); rssi = priv->last_rx_rssi;
drivers/net/wireless/iwlwifi/iwl-4965-rs.c +15 -12
@@ -847,12 +847,12 @@ static void rs_tx_status(void *priv_rateif (retries >15 ) retries =15 ; +rcu_read_lock (); sta =sta_info_get (local, hdr->addr1);if (!sta || !sta->rate_ctrl_priv) { -if (sta) -sta_info_put (sta); +rcu_read_unlock ();return ; }
@@ -891,7 +891,7 @@ static void rs_tx_status(void *priv_rateif ((rs_index <0 ) || (rs_index >=IWL_RATE_COUNT )) {IWL_DEBUG_RATE ("bad rate index at: %d rate 0x%X\n" , rs_index, tx_mcs.rate_n_flags); -sta_info_put (sta); +rcu_read_unlock ();return ; }
@@ -909,7 +909,7 @@ static void rs_tx_status(void *priv_rateIWL_DEBUG_RATE ("initial rate does not match 0x%x 0x%x\n" , tx_mcs.rate_n_flags,le32_to_cpu (table->rs_table[0 ].rate_n_flags)); -sta_info_put (sta); +rcu_read_unlock ();return ; }
@@ -1025,7 +1025,7 @@ static void rs_tx_status(void *priv_rate/* See if there's a better rate or modulation mode to try. */ rs_rate_scale_perform (priv, dev, hdr, sta); -sta_info_put (sta); +rcu_read_unlock ();return ; }
@@ -2219,6 +2219,8 @@ static void rs_get_rate(void *priv_rate,IWL_DEBUG_RATE_LIMIT ("rate scale calculate new rate for skb\n" ); +rcu_read_lock (); + sta =sta_info_get (local, hdr->addr1);/* Send management frames and broadcast/multicast data using lowest
@@ -2227,8 +2229,7 @@ static void rs_get_rate(void *priv_rate,if (!ieee80211_is_data (fc) ||is_multicast_ether_addr (hdr->addr1) || !sta || !sta->rate_ctrl_priv) { sel->rate =rate_lowest (local, sband, sta); -if (sta) -sta_info_put (sta); +rcu_read_unlock ();return ; }
@@ -2261,7 +2262,7 @@ static void rs_get_rate(void *priv_rate, sel->rate =rate_lowest (local, sband, sta);return ; } -sta_info_put (sta); +rcu_read_unlock (); sel->rate = &priv->ieee_rates[i]; }
@@ -2735,13 +2736,15 @@ int iwl4965_fill_rs_info(struct ieee8021u32 max_time =0 ;u8 lq_type, antenna; +rcu_read_lock (); + sta =sta_info_get (local, priv->stations[sta_id].sta.sta.addr);if (!sta || !sta->rate_ctrl_priv) { -if (sta) { -sta_info_put (sta); +if (sta)IWL_DEBUG_RATE ("leave - no private rate data!\n" ); - }else +else IWL_DEBUG_RATE ("leave - no station!\n" ); +rcu_read_unlock ();return sprintf (buf,"station %d not found\n" , sta_id); }
@@ -2808,7 +2811,7 @@ int iwl4965_fill_rs_info(struct ieee8021"active_search %d rate index %d\n" , lq_type, antenna, lq_sta->search_better_tbl, sta->last_txrate_idx); -sta_info_put (sta); +rcu_read_unlock ();return cnt; }
Johannes Berg
maintainerPATCH 6/8 mac80211: split sta_info_add
In reply to Johannes Bergsta_info_add() has two functions: allocating a station info structure and inserting it into the hash table/list. Splitting these two functions allows allocating with GFP_KERNEL in many places instead of GFP_ATOMIC which is now required by the RCU protection. Additionally, in many places RCU protection is now no longer needed at all because between sta_info_alloc() and sta_info_insert() the caller owns the structure.
This fixes a few race conditions with setting initial flags and similar, but not all (see comments in ieee80211_sta.c and cfg.c).
--- net/mac80211/cfg.c | 38 ++++++++++++++++------- net/mac80211/ieee80211.c | 18 ++++++----- net/mac80211/ieee80211_sta.c | 44 ++++++++++++++++++++------- net/mac80211/sta_info.c | 69 +++++++++++++++++++++++++++++-------------- net/mac80211/sta_info.h | 17 +++++++--- 5 files changed, 129 insertions(+), 57 deletions(-)
net/mac80211/sta_info.c +47 -22
@@ -29,12 +29,13 @@* for faster lookup and a list for iteration. They are managed using * RCU, i.e. access to the list and hash table is protected by RCU. * -* STA info structures are always "alive" when they are added with -* @sta_info_add() [this may be changed in the future to allow allocating -* outside of a critical section!], they are then added to the hash -* table and list. Therefore, @sta_info_add() must also be RCU protected, -* also, the caller of @sta_info_add() cannot assume that it owns the -* structure. +* Upon allocating a STA info structure with @sta_info_alloc(), the +* caller owns that structure. It must then either destroy it using +* @sta_info_destroy() (which is pretty useless) or insert it into +* the hash table using @sta_info_insert() which demotes the reference +* from ownership to a regular RCU-protected reference, if the function +* is called without protection by an RCU critical section the reference +* is instantly invalidated. * * Because there are debugfs entries for each station, and adding those * must be able to sleep, it is also possible to "pin" a station entry,
@@ -112,6 +113,10 @@ void sta_info_destroy(struct sta_info *sstruct ieee80211_local *local = sta->local;struct sk_buff *skb;int i; +DECLARE_MAC_BUF (mbuf); + +if (!sta) +return ;ieee80211_key_free (sta->key); sta->key =NULL ;
@@ -134,6 +139,11 @@ void sta_info_destroy(struct sta_info *srate_control_free_sta (sta->rate_ctrl, sta->rate_ctrl_priv);rate_control_put (sta->rate_ctrl); +#ifdef CONFIG_MAC80211_VERBOSE_DEBUG +printk (KERN_DEBUG "%s: Destroyed STA %s\n" , +wiphy_name (local->hw.wiphy),print_mac (mbuf, sta->addr)); +#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ +kfree (sta); }
@@ -146,18 +156,17 @@ static void sta_info_hash_add(struct ieercu_assign_pointer (local->sta_hash[STA_HASH (sta->addr)], sta); } -struct sta_info *sta_info_add (struct ieee80211_sub_if_data *sdata, -u8 *addr) +struct sta_info *sta_info_alloc (struct ieee80211_sub_if_data *sdata, +u8 *addr,gfp_t gfp) {struct ieee80211_local *local = sdata->local;struct sta_info *sta;int i; -DECLARE_MAC_BUF (mac); -unsigned long flags; +DECLARE_MAC_BUF (mbuf); - sta =kzalloc (sizeof (*sta),GFP_ATOMIC ); + sta =kzalloc (sizeof (*sta), gfp);if (!sta) -return ERR_PTR (-ENOMEM ); +return NULL ;memcpy (sta->addr, addr,ETH_ALEN ); sta->local = local;
@@ -165,11 +174,11 @@ struct sta_info *sta_info_add(struct iee sta->rate_ctrl =rate_control_get (local->rate_ctrl); sta->rate_ctrl_priv =rate_control_alloc_sta (sta->rate_ctrl, -GFP_ATOMIC ); + gfp);if (!sta->rate_ctrl_priv) {rate_control_put (sta->rate_ctrl);kfree (sta); -return ERR_PTR (-ENOMEM ); +return NULL ; }spin_lock_init (&sta->ampdu_mlme.ampdu_rx);
@@ -196,11 +205,27 @@ struct sta_info *sta_info_add(struct iee }skb_queue_head_init (&sta->ps_tx_buf);skb_queue_head_init (&sta->tx_filtered); + +#ifdef CONFIG_MAC80211_VERBOSE_DEBUG +printk (KERN_DEBUG "%s: Allocated STA %s\n" , +wiphy_name (local->hw.wiphy),print_mac (mbuf, sta->addr)); +#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ + +return sta; +} + +int sta_info_insert (struct sta_info *sta) +{ +struct ieee80211_local *local = sta->local; +struct ieee80211_sub_if_data *sdata = sta->sdata; +unsigned long flags; +DECLARE_MAC_BUF (mac); +spin_lock_irqsave (&local->sta_lock, flags);/* check if STA exists already */ -if (__sta_info_find (local, addr)) { +if (__sta_info_find (local, sta->addr)) {spin_unlock_irqrestore (&local->sta_lock, flags); -return ERR_PTR (-EEXIST ); +return -EEXIST ; }list_add (&sta->list, &local->sta_list); local->num_sta++;
@@ -212,16 +237,16 @@ struct sta_info *sta_info_add(struct iee sdata = sdata->u.vlan.ap; local->ops->sta_notify (local_to_hw (local), &sdata->vif, -STA_NOTIFY_ADD , addr); +STA_NOTIFY_ADD , sta->addr); } -spin_unlock_irqrestore (&local->sta_lock, flags); -#ifdef CONFIG_MAC80211_VERBOSE_DEBUG -printk (KERN_DEBUG "%s: Added STA %s\n" , -wiphy_name (local->hw.wiphy),print_mac (mac, addr)); +printk (KERN_DEBUG "%s: Inserted STA %s\n" , +wiphy_name (local->hw.wiphy),print_mac (mac, sta->addr));#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ +spin_unlock_irqrestore (&local->sta_lock, flags); +#ifdef CONFIG_MAC80211_DEBUGFS /* debugfs entry adding might sleep, so schedule process * context task for adding entry for STAs that do not yet
@@ -229,7 +254,7 @@ struct sta_info *sta_info_add(struct ieequeue_work (local->hw.workqueue, &local->sta_debugfs_add);#endif -return sta; +return 0 ; }static inline void __bss_tim_set (struct ieee80211_if_ap *bss,u16 aid)
net/mac80211/sta_info.h +12 -5
@@ -248,12 +248,19 @@ struct sta_info {*/ struct sta_info *sta_info_get (struct ieee80211_local *local,u8 *addr);/* -* Add a new STA info, must be under RCU read lock -* because otherwise the returned reference isn't -* necessarily valid long enough. +* Create a new STA info, caller owns returned structure +* until sta_info_insert(). */ -struct sta_info *sta_info_add (struct ieee80211_sub_if_data *sdata, -u8 *addr); +struct sta_info *sta_info_alloc (struct ieee80211_sub_if_data *sdata, +u8 *addr,gfp_t gfp); +/* +* Insert STA info into hash table/list, returns zero or a +* -EEXIST if (if the same MAC address is already present). +* +* Calling this without RCU protection makes the caller +* relinquish its reference to @sta. +*/ +int sta_info_insert (struct sta_info *sta);/* * Unlink a STA info from the hash table/list. * This can NULL the STA pointer if somebody else
net/mac80211/cfg.c +26 -12
@@ -533,6 +533,12 @@ static void sta_apply_parameters(structint i, j;struct ieee80211_supported_band *sband; +/* +* FIXME: updating the flags is racy when this function is +* called from ieee80211_change_station(), this will +* be resolved in a future patch. +*/ +if (params->station_flags &STATION_FLAG_CHANGED ) { sta->flags &= ~WLAN_STA_AUTHORIZED ;if (params->station_flags &STATION_FLAG_AUTHORIZED )
@@ -547,6 +553,13 @@ static void sta_apply_parameters(struct sta->flags |=WLAN_STA_WME ; } +/* +* FIXME: updating the following information is racy when this +* function is called from ieee80211_change_station(). +* However, all this information should be static so +* maybe we should just reject attemps to change it. +*/ +if (params->aid) { sta->aid = params->aid;if (sta->aid >IEEE80211_MAX_AID )
@@ -577,6 +590,7 @@ static int ieee80211_add_station(structstruct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr);struct sta_info *sta;struct ieee80211_sub_if_data *sdata; +int err;/* Prevent a race with changing the rate control algorithm */ if (!netif_running (dev))
@@ -591,17 +605,9 @@ static int ieee80211_add_station(struct }else sdata =IEEE80211_DEV_TO_SUB_IF (dev); -rcu_read_lock (); - - sta =sta_info_add (sdata, mac); -if (IS_ERR (sta)) { -rcu_read_unlock (); -return PTR_ERR (sta); - } - -if (sdata->vif.type ==IEEE80211_IF_TYPE_VLAN || - sdata->vif.type ==IEEE80211_IF_TYPE_AP ) -ieee80211_send_layer2_update (sta); + sta =sta_info_alloc (sdata, mac,GFP_KERNEL ); +if (!sta) +return -ENOMEM ; sta->flags =WLAN_STA_AUTH |WLAN_STA_ASSOC ;
@@ -609,7 +615,15 @@ static int ieee80211_add_station(structrate_control_rate_init (sta, local); -rcu_read_unlock (); + err =sta_info_insert (sta); +if (err) { +sta_info_destroy (sta); +return err; + } + +if (sdata->vif.type ==IEEE80211_IF_TYPE_VLAN || + sdata->vif.type ==IEEE80211_IF_TYPE_AP ) +ieee80211_send_layer2_update (sta);return 0 ; }
net/mac80211/ieee80211.c +11 -7
@@ -888,6 +888,7 @@ int ieee80211_if_update_wds(struct net_dstruct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr);struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev);struct sta_info *sta; +int err;DECLARE_MAC_BUF (mac);might_sleep ();
@@ -895,16 +896,19 @@ int ieee80211_if_update_wds(struct net_dif (compare_ether_addr (remote_addr, sdata->u.wds.remote_addr) ==0 )return 0 ; -rcu_read_lock (); -/* Create STA entry for the new peer */ - sta =sta_info_add (sdata, remote_addr); -if (IS_ERR (sta)) { -rcu_read_unlock (); -return PTR_ERR (sta); - } + sta =sta_info_alloc (sdata, remote_addr,GFP_KERNEL ); +if (!sta) +return -ENOMEM ; sta->flags |=WLAN_STA_AUTHORIZED ; + err =sta_info_insert (sta); +if (err) { +sta_info_destroy (sta); +return err; + } + +rcu_read_lock ();/* Remove STA entry for the old peer */ sta =sta_info_get (local, sdata->u.wds.remote_addr);
net/mac80211/ieee80211_sta.c +33 -11
97 lines not on this page · raw message
Johannes Berg
maintainercover mac80211 sta info and related changes
This patch series contains a few loosely related changes in mac80211 I did over the past few days:
* clarify use of TX status/RX callbacks
as per my previous mail, the irqsafe/non-irq-safe stuff
* safely free beacon in ieee80211_if_reinit
This is necessary for reentrancy reasons with ieee80211_beacon_get()
* split ieee80211_key_alloc
Preparation for RCU-ifying STA info, split key allocation into allocation and insertion
* RCU-ify STA info structure access
Remove STA refcount and instead protect them by RCU
* split ieee80211_txrx_data
Mostly unrelated, split up txrx_data and flags into one struct for TX and one for RX
* split sta_info_add
Split sta_info_add into _alloc and _link to resolve a few races and allow GFP_KERNEL allocations in many cases (which was removed by the RCU-ification patch)
* remove STA info's last_ack stuff
Remove some unused stats members
* clean up sta_info and document locking
Document and clean up the definition of struct sta_info and document the locking (deficiencies)
I'd like to have somebody else look over these but I'm confident that the changes do not, at least, introduce regressions.
johannes
Johannes Berg
maintainerPATCH 5/8 mac80211: split ieee80211_txrx_data
Split it into ieee80211_tx_data and ieee80211_rx_data to clarify usage/flag usage and remove the stupid union thing.
--- net/mac80211/ieee80211_i.h | 86 ++++++++------- net/mac80211/rx.c | 159 ++++++++++++++--------------- net/mac80211/tx.c | 244 ++++++++++++++++++++++----------------------- net/mac80211/util.c | 8 - net/mac80211/wep.c | 24 ++-- net/mac80211/wep.h | 4 net/mac80211/wpa.c | 80 +++++++------- net/mac80211/wpa.h | 12 +- 8 files changed, 313 insertions(+), 304 deletions(-)
net/mac80211/ieee80211_i.h +47 -39
@@ -113,26 +113,51 @@ typedef unsigned __bitwise__ ieee80211_t#define TX_DROP ((__force ieee80211_tx_result) 1u)#define TX_QUEUED ((__force ieee80211_tx_result) 2u) +#define IEEE80211_TX_FRAGMENTED BIT(0) +#define IEEE80211_TX_UNICAST BIT(1) +#define IEEE80211_TX_PS_BUFFERED BIT(2) +#define IEEE80211_TX_PROBE_LAST_FRAG BIT(3) +#define IEEE80211_TX_INJECTED BIT(4) + +struct ieee80211_tx_data { +struct sk_buff *skb; +struct net_device *dev; +struct ieee80211_local *local; +struct ieee80211_sub_if_data *sdata; +struct sta_info *sta; +u16 fc, ethertype; +struct ieee80211_key *key; +unsigned int flags; + +struct ieee80211_tx_control *control; +struct ieee80211_channel *channel; +struct ieee80211_rate *rate; +/* use this rate (if set) for last fragment; rate can +* be set to lower rate for the first fragments, e.g., +* when using CTS protection with IEEE 802.11g. */ +struct ieee80211_rate *last_frag_rate; + +/* Extra fragments (in addition to the first fragment +* in skb) */ +int num_extra_frag; +struct sk_buff **extra_frag; +}; + +typedef unsigned __bitwise__ ieee80211_rx_result ;#define RX_CONTINUE ((__force ieee80211_rx_result) 0u)#define RX_DROP_UNUSABLE ((__force ieee80211_rx_result) 1u)#define RX_DROP_MONITOR ((__force ieee80211_rx_result) 2u)#define RX_QUEUED ((__force ieee80211_rx_result) 3u) - -/* flags used in struct ieee80211_txrx_data.flags */ -/* whether the MSDU was fragmented */ -#define IEEE80211_TXRXD_FRAGMENTED BIT(0) -#define IEEE80211_TXRXD_TXUNICAST BIT(1) -#define IEEE80211_TXRXD_TXPS_BUFFERED BIT(2) -#define IEEE80211_TXRXD_TXPROBE_LAST_FRAG BIT(3) -#define IEEE80211_TXRXD_RXIN_SCAN BIT(4) +#define IEEE80211_RX_IN_SCAN BIT(0)/* frame is destined to interface currently processed (incl. multicast frames) */ -#define IEEE80211_TXRXD_RXRA_MATCH BIT(5) -#define IEEE80211_TXRXD_TX_INJECTED BIT(6) -#define IEEE80211_TXRXD_RX_AMSDU BIT(7) -#define IEEE80211_TXRXD_RX_CMNTR_REPORTED BIT(8) -struct ieee80211_txrx_data { +#define IEEE80211_RX_RA_MATCH BIT(1) +#define IEEE80211_RX_AMSDU BIT(2) +#define IEEE80211_RX_CMNTR_REPORTED BIT(3) +#define IEEE80211_RX_FRAGMENTED BIT(4) + +struct ieee80211_rx_data {struct sk_buff *skb;struct net_device *dev;struct ieee80211_local *local;
@@ -141,31 +166,14 @@ struct ieee80211_txrx_data {u16 fc, ethertype;struct ieee80211_key *key;unsigned int flags; -union { -struct { -struct ieee80211_tx_control *control; -struct ieee80211_channel *channel; -struct ieee80211_rate *rate; -/* use this rate (if set) for last fragment; rate can -* be set to lower rate for the first fragments, e.g., -* when using CTS protection with IEEE 802.11g. */ -struct ieee80211_rate *last_frag_rate; - -/* Extra fragments (in addition to the first fragment -* in skb) */ -int num_extra_frag; -struct sk_buff **extra_frag; - } tx; -struct { -struct ieee80211_rx_status *status; -struct ieee80211_rate *rate; -int sent_ps_buffered; -int queue; -int load; -u32 tkip_iv32; -u16 tkip_iv16; - } rx; - } u; + +struct ieee80211_rx_status *status; +struct ieee80211_rate *rate; +int sent_ps_buffered; +int queue; +int load; +u32 tkip_iv32; +u16 tkip_iv16; };/* flags used in struct ieee80211_tx_packet_data.flags */
@@ -658,7 +666,7 @@ static inline int ieee80211_bssid_match(int ieee80211_hw_config (struct ieee80211_local *local);int ieee80211_if_config (struct net_device *dev);int ieee80211_if_config_beacon (struct net_device *dev); -void ieee80211_tx_set_iswep (struct ieee80211_txrx_data *tx); +void ieee80211_tx_set_protected (struct ieee80211_tx_data *tx);int ieee80211_if_update_wds (struct net_device *dev,u8 *remote_addr);void ieee80211_if_setup (struct net_device *dev); int ieee80211_hw_config_ht(struct ieee80211_local *local, int enable_ht,
net/mac80211/rx.c +80 -79
535 lines not on this page · raw message
net/mac80211/tx.c +122 -122
624 lines not on this page · raw message
net/mac80211/wep.c +12 -12
@@ -306,14 +306,14 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_ }ieee80211_rx_result -ieee80211_crypto_wep_decrypt (struct ieee80211_txrx_data *rx) +ieee80211_crypto_wep_decrypt (struct ieee80211_rx_data *rx) {if ((rx->fc &IEEE80211_FCTL_FTYPE ) !=IEEE80211_FTYPE_DATA && ((rx->fc &IEEE80211_FCTL_FTYPE ) !=IEEE80211_FTYPE_MGMT || (rx->fc &IEEE80211_FCTL_STYPE ) !=IEEE80211_STYPE_AUTH ))return RX_CONTINUE ; -if (!(rx->u.rx.status->flag &RX_FLAG_DECRYPTED )) { +if (!(rx->status->flag &RX_FLAG_DECRYPTED )) {if (ieee80211_wep_decrypt (rx->local, rx->skb, rx->key)) {#ifdef CONFIG_MAC80211_DEBUG if (net_ratelimit ())
@@ -322,7 +322,7 @@ ieee80211_crypto_wep_decrypt(struct ieee#endif /* CONFIG_MAC80211_DEBUG */ return RX_DROP_UNUSABLE ; } - }else if (!(rx->u.rx.status->flag &RX_FLAG_IV_STRIPPED )) { + }else if (!(rx->status->flag &RX_FLAG_IV_STRIPPED )) {ieee80211_wep_remove_iv (rx->local, rx->skb, rx->key);/* remove ICV */ skb_trim (rx->skb, rx->skb->len -4 );
@@ -331,13 +331,13 @@ ieee80211_crypto_wep_decrypt(struct ieeereturn RX_CONTINUE ; } -static int wep_encrypt_skb (struct ieee80211_txrx_data *tx,struct sk_buff *skb) +static int wep_encrypt_skb (struct ieee80211_tx_data *tx,struct sk_buff *skb) {if (!(tx->key->flags &KEY_FLAG_UPLOADED_TO_HARDWARE )) {if (ieee80211_wep_encrypt (tx->local, skb, tx->key))return -1 ; }else { - tx->u.tx.control->key_idx = tx->key->conf.hw_key_idx; + tx->control->key_idx = tx->key->conf.hw_key_idx;if (tx->key->conf.flags &IEEE80211_KEY_FLAG_GENERATE_IV ) {if (!ieee80211_wep_add_iv (tx->local, skb, tx->key))return -1 ;
@@ -347,21 +347,21 @@ static int wep_encrypt_skb(struct ieee80 }ieee80211_tx_result -ieee80211_crypto_wep_encrypt (struct ieee80211_txrx_data *tx) +ieee80211_crypto_wep_encrypt (struct ieee80211_tx_data *tx) { - tx->u.tx.control->iv_len =WEP_IV_LEN ; - tx->u.tx.control->icv_len =WEP_ICV_LEN ; -ieee80211_tx_set_iswep (tx); + tx->control->iv_len =WEP_IV_LEN ; + tx->control->icv_len =WEP_ICV_LEN ; +ieee80211_tx_set_protected (tx);if (wep_encrypt_skb (tx, tx->skb) <0 ) {I802_DEBUG_INC (tx->local->tx_handlers_drop_wep);return TX_DROP ; } -if (tx->u.tx.extra_frag) { +if (tx->extra_frag) {int i; -for (i =0 ; i < tx->u.tx.num_extra_frag; i++) { -if (wep_encrypt_skb (tx, tx->u.tx.extra_frag[i]) <0 ) { +for (i =0 ; i < tx->num_extra_frag; i++) { +if (wep_encrypt_skb (tx, tx->extra_frag[i]) <0 ) {I802_DEBUG_INC (tx->local-> tx_handlers_drop_wep);return TX_DROP ;
net/mac80211/wep.h +2 -2
@@ -29,8 +29,8 @@ int ieee80211_wep_decrypt(struct ieee802u8 *ieee80211_wep_is_weak_iv (struct sk_buff *skb,struct ieee80211_key *key);ieee80211_rx_result -ieee80211_crypto_wep_decrypt (struct ieee80211_txrx_data *rx); +ieee80211_crypto_wep_decrypt (struct ieee80211_rx_data *rx);ieee80211_tx_result -ieee80211_crypto_wep_encrypt (struct ieee80211_txrx_data *tx); +ieee80211_crypto_wep_encrypt (struct ieee80211_tx_data *tx);#endif /* WEP_H */
net/mac80211/wpa.c +40 -40
230 lines not on this page · raw message
net/mac80211/wpa.h +6 -6
@@ -14,18 +14,18 @@#include "ieee80211_i.h" ieee80211_tx_result -ieee80211_tx_h_michael_mic_add (struct ieee80211_txrx_data *tx); +ieee80211_tx_h_michael_mic_add (struct ieee80211_tx_data *tx);ieee80211_rx_result -ieee80211_rx_h_michael_mic_verify (struct ieee80211_txrx_data *rx); +ieee80211_rx_h_michael_mic_verify (struct ieee80211_rx_data *rx);ieee80211_tx_result -ieee80211_crypto_tkip_encrypt (struct ieee80211_txrx_data *tx); +ieee80211_crypto_tkip_encrypt (struct ieee80211_tx_data *tx);ieee80211_rx_result -ieee80211_crypto_tkip_decrypt (struct ieee80211_txrx_data *rx); +ieee80211_crypto_tkip_decrypt (struct ieee80211_rx_data *rx);ieee80211_tx_result -ieee80211_crypto_ccmp_encrypt (struct ieee80211_txrx_data *tx); +ieee80211_crypto_ccmp_encrypt (struct ieee80211_tx_data *tx);ieee80211_rx_result -ieee80211_crypto_ccmp_decrypt (struct ieee80211_txrx_data *rx); +ieee80211_crypto_ccmp_decrypt (struct ieee80211_rx_data *rx);#endif /* WPA_H */
net/mac80211/util.c +4 -4
@@ -146,17 +146,17 @@ int ieee80211_get_hdrlen_from_skb(const }EXPORT_SYMBOL (ieee80211_get_hdrlen_from_skb); -void ieee80211_tx_set_iswep (struct ieee80211_txrx_data *tx) +void ieee80211_tx_set_protected (struct ieee80211_tx_data *tx) {struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data; hdr->frame_control |=cpu_to_le16 (IEEE80211_FCTL_PROTECTED ); -if (tx->u.tx.extra_frag) { +if (tx->extra_frag) {struct ieee80211_hdr *fhdr;int i; -for (i =0 ; i < tx->u.tx.num_extra_frag; i++) { +for (i =0 ; i < tx->num_extra_frag; i++) { fhdr = (struct ieee80211_hdr *) - tx->u.tx.extra_frag[i]->data; + tx->extra_frag[i]->data; fhdr->frame_control |=cpu_to_le16 (IEEE80211_FCTL_PROTECTED ); } }
Johannes Berg
maintainerQuoted 7 lines
* split
ieee80211_key_alloc
Preparation for RCU-ifying STA info, split key allocation into allocation and insertion* RCU-ify STA info structure access
Remove STA refcount and instead protect them by RCU
This made key.c spew warnings, sorry, I'm fixing it now. I'll also rebase this on top of the 11s patches.
johannes
RE: [PATCH 4/8] mac80211: RCU-ify STA info structure access
In reply to Johannes BergQuoted 5 lines · Johannes Berg
This makes access to the STA hash table/list use RCU to protect against freeing of items. However, it's not a true RCU, the copy step is missing: whenever somebody changes a STA item it is simply updated. That will be addressed by a later change.
This patch is causing some problems in the iwlwifi driver. Often when one of these RCU locks are held the driver tries to send a command to the device and waits for the response, or it does some other activity requiring sleeping. This causes numerous BUG messages as seen below:
BUG: sleeping function called from invalid context at
/home/rchatre/wifi/repos.git/iwlwifi-2.6/kernel/mutex.c:209
in_atomic():1, irqs_disabled():0
3 locks held by iwl3945/3831:
#0: ((name)){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#1: (&ifsta->work){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#2: (rcu_read_lock){..--}, at: [<dc9d558d>]
ieee80211_rx_mgmt_assoc_resp+0x273/0x773 [mac80211]
Pid: 3831, comm: iwl3945 Not tainted 2.6.25-rc3-wl #7
[<c0118a4d>] __might_sleep+0xc2/0xc9
[<c02ab3f3>] mutex_lock_nested+0x1d/0x231
[<c01300d8>] ? sys_timer_settime+0x2a/0x225
[<c02acae9>] ? _spin_unlock_irqrestore+0x38/0x58
[<dca8e637>] iwl3945_mac_conf_tx+0x1b0/0x234 [iwl3945]
[<dc9d186a>] ieee80211_sta_wmm_params+0x165/0x195 [mac80211]
[<dc9d5a19>] ieee80211_rx_mgmt_assoc_resp+0x6ff/0x773 [mac80211]
[<c01662b7>] ? cache_flusharray+0xdf/0xf2
[<c013c360>] ? __lock_acquire+0xb0c/0xb39
[<dc9d70ab>] ieee80211_sta_work+0x726/0xfde [mac80211]
[<c013c371>] ? __lock_acquire+0xb1d/0xb39
[<c012d841>] ? run_workqueue+0x80/0x18b
[<c012d87c>] run_workqueue+0xbb/0x18b
[<c012d841>] ? run_workqueue+0x80/0x18b
[<dc9d6985>] ? ieee80211_sta_work+0x0/0xfde [mac80211]
[<c012e21f>] worker_thread+0xb6/0xc2
[<c013076e>] ? autoremove_wake_function+0x0/0x30
[<c012e169>] ? worker_thread+0x0/0xc2
[<c01306b0>] kthread+0x3b/0x63
[<c0130675>] ? kthread+0x0/0x63
[<c01057af>] kernel_thread_helper+0x7/0x10
=======================
BUG: scheduling while atomic: iwl3945/3831/0x00000002
4 locks held by iwl3945/3831:
#0: ((name)){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#1: (&ifsta->work){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#2: (rcu_read_lock){..--}, at: [<dc9d558d>]
ieee80211_rx_mgmt_assoc_resp+0x273/0x773 [mac80211]
#3: (&priv->mutex){--..}, at: [<dca8e637>]
iwl3945_mac_conf_tx+0x1b0/0x234 [iwl3945]
Pid: 3831, comm: iwl3945 Not tainted 2.6.25-rc3-wl #7
[<c011af81>] __schedule_bug+0x59/0x60
[<c02aa617>] schedule+0x91/0x5f7
[<c013b2dc>] ? mark_held_locks+0x4e/0x66
[<c02ab50b>] ? mutex_lock_nested+0x135/0x231
[<c02ab520>] mutex_lock_nested+0x14a/0x231
[<dca8e637>] ? iwl3945_mac_conf_tx+0x1b0/0x234 [iwl3945]
[<dca8e637>] iwl3945_mac_conf_tx+0x1b0/0x234 [iwl3945]
[<dc9d186a>] ieee80211_sta_wmm_params+0x165/0x195 [mac80211]
[<dc9d5a19>] ieee80211_rx_mgmt_assoc_resp+0x6ff/0x773 [mac80211]
[<c01662b7>] ? cache_flusharray+0xdf/0xf2
[<c013c360>] ? __lock_acquire+0xb0c/0xb39
[<dc9d70ab>] ieee80211_sta_work+0x726/0xfde [mac80211]
[<c013c371>] ? __lock_acquire+0xb1d/0xb39
[<c012d841>] ? run_workqueue+0x80/0x18b
[<c012d87c>] run_workqueue+0xbb/0x18b
[<c012d841>] ? run_workqueue+0x80/0x18b
[<dc9d6985>] ? ieee80211_sta_work+0x0/0xfde [mac80211]
[<c012e21f>] worker_thread+0xb6/0xc2
[<c013076e>] ? autoremove_wake_function+0x0/0x30
[<c012e169>] ? worker_thread+0x0/0xc2
[<c01306b0>] kthread+0x3b/0x63
[<c0130675>] ? kthread+0x0/0x63
[<c01057af>] kernel_thread_helper+0x7/0x10
=======================
BUG: scheduling while atomic: iwl3945/3831/0x00000002
4 locks held by iwl3945/3831:
#0: ((name)){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#1: (&ifsta->work){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#2: (rcu_read_lock){..--}, at: [<dc9d558d>]
ieee80211_rx_mgmt_assoc_resp+0x273/0x773 [mac80211]
#3: (&priv->mutex){--..}, at: [<dca8e637>]
iwl3945_mac_conf_tx+0x1b0/0x234 [iwl3945]
Pid: 3831, comm: iwl3945 Not tainted 2.6.25-rc3-wl #7
[<c011af81>] __schedule_bug+0x59/0x60
[<c02aa617>] schedule+0x91/0x5f7
[<c02acaf3>] ? _spin_unlock_irqrestore+0x42/0x58
[<c0127b22>] ? __mod_timer+0xa5/0xb0
[<c02aad57>] schedule_timeout+0x6d/0x8b
[<c0127703>] ? process_timeout+0x0/0xa
[<c02aad52>] ? schedule_timeout+0x68/0x8b
[<dca86643>] iwl3945_send_cmd_sync+0x5e9/0x1180 [iwl3945]
[<c013076e>] ? autoremove_wake_function+0x0/0x30
[<dca87302>] iwl3945_send_cmd_pdu+0x2f/0x37 [iwl3945]
[<dca875c7>] iwl3945_activate_qos+0xce/0xd7 [iwl3945]
[<dca8e661>] iwl3945_mac_conf_tx+0x1da/0x234 [iwl3945]
[<dc9d186a>] ieee80211_sta_wmm_params+0x165/0x195 [mac80211]
[<dc9d5a19>] ieee80211_rx_mgmt_assoc_resp+0x6ff/0x773 [mac80211]
[<c01662b7>] ? cache_flusharray+0xdf/0xf2
[<c013c360>] ? __lock_acquire+0xb0c/0xb39
[<dc9d70ab>] ieee80211_sta_work+0x726/0xfde [mac80211]
[<c013c371>] ? __lock_acquire+0xb1d/0xb39
[<c012d841>] ? run_workqueue+0x80/0x18b
[<c012d87c>] run_workqueue+0xbb/0x18b
[<c012d841>] ? run_workqueue+0x80/0x18b
[<dc9d6985>] ? ieee80211_sta_work+0x0/0xfde [mac80211]
[<c012e21f>] worker_thread+0xb6/0xc2
[<c013076e>] ? autoremove_wake_function+0x0/0x30
[<c012e169>] ? worker_thread+0x0/0xc2
[<c01306b0>] kthread+0x3b/0x63
[<c0130675>] ? kthread+0x0/0x63
[<c01057af>] kernel_thread_helper+0x7/0x10
=======================
BUG: scheduling while atomic: iwl3945/3831/0x00000002
4 locks held by iwl3945/3831:
#0: ((name)){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#1: (&ifsta->work){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#2: (rcu_read_lock){..--}, at: [<dc9d558d>]
ieee80211_rx_mgmt_assoc_resp+0x273/0x773 [mac80211]
#3: (&priv->mutex){--..}, at: [<dca8e637>]
iwl3945_mac_conf_tx+0x1b0/0x234 [iwl3945]
Pid: 3831, comm: iwl3945 Not tainted 2.6.25-rc3-wl #7
[<c011af81>] __schedule_bug+0x59/0x60
[<c02aa617>] schedule+0x91/0x5f7
[<c02acaf3>] ? _spin_unlock_irqrestore+0x42/0x58
[<c0127b22>] ? __mod_timer+0xa5/0xb0
[<c02aad57>] schedule_timeout+0x6d/0x8b
[<c0127703>] ? process_timeout+0x0/0xa
[<c02aad52>] ? schedule_timeout+0x68/0x8b
[<dca86643>] iwl3945_send_cmd_sync+0x5e9/0x1180 [iwl3945]
[<c013076e>] ? autoremove_wake_function+0x0/0x30
[<dca87302>] iwl3945_send_cmd_pdu+0x2f/0x37 [iwl3945]
[<dca875c7>] iwl3945_activate_qos+0xce/0xd7 [iwl3945]
[<dca8e661>] iwl3945_mac_conf_tx+0x1da/0x234 [iwl3945]
[<dc9d186a>] ieee80211_sta_wmm_params+0x165/0x195 [mac80211]
[<dc9d5a19>] ieee80211_rx_mgmt_assoc_resp+0x6ff/0x773 [mac80211]
[<c01662b7>] ? cache_flusharray+0xdf/0xf2
[<c013c360>] ? __lock_acquire+0xb0c/0xb39
[<dc9d70ab>] ieee80211_sta_work+0x726/0xfde [mac80211]
[<c013c371>] ? __lock_acquire+0xb1d/0xb39
[<c012d841>] ? run_workqueue+0x80/0x18b
[<c012d87c>] run_workqueue+0xbb/0x18b
[<c012d841>] ? run_workqueue+0x80/0x18b
[<dc9d6985>] ? ieee80211_sta_work+0x0/0xfde [mac80211]
[<c012e21f>] worker_thread+0xb6/0xc2
[<c013076e>] ? autoremove_wake_function+0x0/0x30
[<c012e169>] ? worker_thread+0x0/0xc2
[<c01306b0>] kthread+0x3b/0x63
[<c0130675>] ? kthread+0x0/0x63
[<c01057af>] kernel_thread_helper+0x7/0x10
=======================
BUG: scheduling while atomic: iwl3945/3831/0x00000002
4 locks held by iwl3945/3831:
#0: ((name)){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#1: (&ifsta->work){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#2: (rcu_read_lock){..--}, at: [<dc9d558d>]
ieee80211_rx_mgmt_assoc_resp+0x273/0x773 [mac80211]
#3: (&priv->mutex){--..}, at: [<dca8e637>]
iwl3945_mac_conf_tx+0x1b0/0x234 [iwl3945]
Pid: 3831, comm: iwl3945 Not tainted 2.6.25-rc3-wl #7
[<c011af81>] __schedule_bug+0x59/0x60
[<c02aa617>] schedule+0x91/0x5f7
[<c02acaf3>] ? _spin_unlock_irqrestore+0x42/0x58
[<c0127b22>] ? __mod_timer+0xa5/0xb0
[<c02aad57>] schedule_timeout+0x6d/0x8b
[<c0127703>] ? process_timeout+0x0/0xa
[<c02aad52>] ? schedule_timeout+0x68/0x8b
[<dca86643>] iwl3945_send_cmd_sync+0x5e9/0x1180 [iwl3945]
[<c013076e>] ? autoremove_wake_function+0x0/0x30
[<dca87302>] iwl3945_send_cmd_pdu+0x2f/0x37 [iwl3945]
[<dca875c7>] iwl3945_activate_qos+0xce/0xd7 [iwl3945]
[<dca8e661>] iwl3945_mac_conf_tx+0x1da/0x234 [iwl3945]
[<dc9d186a>] ieee80211_sta_wmm_params+0x165/0x195 [mac80211]
[<dc9d5a19>] ieee80211_rx_mgmt_assoc_resp+0x6ff/0x773 [mac80211]
[<c01662b7>] ? cache_flusharray+0xdf/0xf2
[<c013c360>] ? __lock_acquire+0xb0c/0xb39
[<dc9d70ab>] ieee80211_sta_work+0x726/0xfde [mac80211]
[<c013c371>] ? __lock_acquire+0xb1d/0xb39
[<c012d841>] ? run_workqueue+0x80/0x18b
[<c012d87c>] run_workqueue+0xbb/0x18b
[<c012d841>] ? run_workqueue+0x80/0x18b
[<dc9d6985>] ? ieee80211_sta_work+0x0/0xfde [mac80211]
[<c012e21f>] worker_thread+0xb6/0xc2
[<c013076e>] ? autoremove_wake_function+0x0/0x30
[<c012e169>] ? worker_thread+0x0/0xc2
[<c01306b0>] kthread+0x3b/0x63
[<c0130675>] ? kthread+0x0/0x63
[<c01057af>] kernel_thread_helper+0x7/0x10
=======================
BUG: scheduling while atomic: iwl3945/3831/0x00000002
4 locks held by iwl3945/3831:
#0: ((name)){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#1: (&ifsta->work){--..}, at: [<c012d841>] run_workqueue+0x80/0x18b
#2: (rcu_read_lock){..--}, at: [<dc9d558d>]
ieee80211_rx_mgmt_assoc_resp+0x273/0x773 [mac80211]
#3: (&priv->mutex){--..}, at: [<dca8e637>]
iwl3945_mac_conf_tx+0x1b0/0x234 [iwl3945]
Pid: 3831, comm: iwl3945 Not tainted 2.6.25-rc3-wl #7
[<c011af81>] __schedule_bug+0x59/0x60
[<c02aa617>] schedule+0x91/0x5f7
[<c02acaf3>] ? _spin_unlock_irqrestore+0x42/0x58
[<c0127b22>] ? __mod_timer+0xa5/0xb0
[<c02aad57>] schedule_timeout+0x6d/0x8b
[<c0127703>] ? process_timeout+0x0/0xa
[<c02aad52>] ? schedule_timeout+0x68/0x8b
[<dca86643>] iwl3945_send_cmd_sync+0x5e9/0x1180 [iwl3945]
[<c013076e>] ? autoremove_wake_function+0x0/0x30
[<dca87302>] iwl3945_send_cmd_pdu+0x2f/0x37 [iwl3945]
[<dca875c7>] iwl3945_activate_qos+0xce/0xd7 [iwl3945]
[<dca8e661>] iwl3945_mac_conf_tx+0x1da/0x234 [iwl3945]
[<dc9d186a>] ieee80211_sta_wmm_params+0x165/0x195 [mac80211]
[<dc9d5a19>] ieee80211_rx_mgmt_assoc_resp+0x6ff/0x773 [mac80211]
[<c01662b7>] ? cache_flusharray+0xdf/0xf2
[<c013c360>] ? __lock_acquire+0xb0c/0xb39
[<dc9d70ab>] ieee80211_sta_work+0x726/0xfde [mac80211]
[<c013c371>] ? __lock_acquire+0xb1d/0xb39
[<c012d841>] ? run_workqueue+0x80/0x18b
[<c012d87c>] run_workqueue+0xbb/0x18b
[<c012d841>] ? run_workqueue+0x80/0x18b
[<dc9d6985>] ? ieee80211_sta_work+0x0/0xfde [mac80211]
[<c012e21f>] worker_thread+0xb6/0xc2
[<c013076e>] ? autoremove_wake_function+0x0/0x30
[<c012e169>] ? worker_thread+0x0/0xc2
[<c01306b0>] kthread+0x3b/0x63
[<c0130675>] ? kthread+0x0/0x63
[<c01057af>] kernel_thread_helper+0x7/0x10
=======================Johannes Berg
maintainerRE: [PATCH 4/8] mac80211: RCU-ify STA info structure access
Quoted 6 lines
This patch is causing some problems in the iwlwifi driver. Often when one of these RCU locks are held the driver tries to send a command to the device and waits for the response, or it does some other activity requiring sleeping. This causes numerous BUG messages as seen below:
Quoted 6 lines
BUG: sleeping function called from invalid context at
/home/rchatre/wifi/repos.git/iwlwifi-2.6/kernel/mutex.c:209[<dca8e637>] iwl3945_mac_conf_tx+0x1b0/0x234 [iwl3945] [<dc9d186a>] ieee80211_sta_wmm_params+0x165/0x195 [mac80211]
Ouch, sorry. Try this patch please.
johannes
--- net/mac80211/ieee80211_sta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/mac80211/ieee80211_sta.c +3 -3
@@ -1930,16 +1930,16 @@ static void ieee80211_rx_mgmt_assoc_respif (elems.wmm_param && (ifsta->flags &IEEE80211_STA_WMM_ENABLED )) { sta->flags |=WLAN_STA_WME ; +rcu_read_unlock ();ieee80211_sta_wmm_params (dev, ifsta, elems.wmm_param, elems.wmm_param_len); - } + }else +rcu_read_unlock ();/* set AID, ieee80211_set_associated() will tell the driver */ bss_conf->aid = aid;ieee80211_set_associated (dev, ifsta,1 ); -rcu_read_unlock (); -ieee80211_associated (dev, ifsta); }
Chatre, Reinette
Tested-byRE: [PATCH 4/8] mac80211: RCU-ify STA info structure access
Quoted 5 lines · Johannes Berg
Quoted 5 lines
This patch is causing some problems in the iwlwifi driver. Often when one of these RCU locks are held the driver tries to send a command to the device and waits for the response, or it does some other activity requiring sleeping. This causes numerous BUG messages as seen below:
Quoted 8 lines
Quoted 6 lines
BUG: sleeping function called from invalid context at
/home/rchatre/wifi/repos.git/iwlwifi-2.6/kernel/mutex.c:209[<dca8e637>] iwl3945_mac_conf_tx+0x1b0/0x234 [iwl3945] [<dc9d186a>] ieee80211_sta_wmm_params+0x165/0x195 [mac80211]Ouch, sorry. Try this patch please.
This patch made those BUG messages disappear. Thank you very much.
Reinette