forked from luck/tmp_suning_uos_patched
685429623f
There is a circular locking dependency when configuring the hardware ARP filters on association, occurring when flushing the mac80211 workqueue. This is what happens: [ 92.026800] ======================================================= [ 92.030507] [ INFO: possible circular locking dependency detected ] [ 92.030507] 2.6.34-04781-g2b2c009 #85 [ 92.030507] ------------------------------------------------------- [ 92.030507] modprobe/5225 is trying to acquire lock: [ 92.030507] ((wiphy_name(local->hw.wiphy))){+.+.+.}, at: [<ffffffff8105b5c0>] flush_workq ueue+0x0/0xb0 [ 92.030507] [ 92.030507] but task is already holding lock: [ 92.030507] (rtnl_mutex){+.+.+.}, at: [<ffffffff812b9ce2>] rtnl_lock+0x12/0x20 [ 92.030507] [ 92.030507] which lock already depends on the new lock. [ 92.030507] [ 92.030507] [ 92.030507] the existing dependency chain (in reverse order) is: [ 92.030507] [ 92.030507] -> #2 (rtnl_mutex){+.+.+.}: [ 92.030507] [<ffffffff810761fb>] lock_acquire+0xdb/0x110 [ 92.030507] [<ffffffff81341754>] mutex_lock_nested+0x44/0x300 [ 92.030507] [<ffffffff812b9ce2>] rtnl_lock+0x12/0x20 [ 92.030507] [<ffffffffa022d47c>] ieee80211_assoc_done+0x6c/0xe0 [mac80211] [ 92.030507] [<ffffffffa022f2ad>] ieee80211_work_work+0x31d/0x1280 [mac80211] [ 92.030507] -> #1 ((&local->work_work)){+.+.+.}: [ 92.030507] [<ffffffff810761fb>] lock_acquire+0xdb/0x110 [ 92.030507] [<ffffffff8105a51a>] worker_thread+0x22a/0x370 [ 92.030507] [<ffffffff8105ecc6>] kthread+0x96/0xb0 [ 92.030507] [<ffffffff81003a94>] kernel_thread_helper+0x4/0x10 [ 92.030507] [ 92.030507] -> #0 ((wiphy_name(local->hw.wiphy))){+.+.+.}: [ 92.030507] [<ffffffff81075fdc>] __lock_acquire+0x1c0c/0x1d50 [ 92.030507] [<ffffffff810761fb>] lock_acquire+0xdb/0x110 [ 92.030507] [<ffffffff8105b60e>] flush_workqueue+0x4e/0xb0 [ 92.030507] [<ffffffffa023ff7b>] ieee80211_stop_device+0x2b/0xb0 [mac80211] [ 92.030507] [<ffffffffa0231635>] ieee80211_stop+0x3e5/0x680 [mac80211] The locking in this case is quite complex. Fix the problem by rewriting the way the hardware ARP filter list is handled - i.e. make a copy of the address list to the bss_conf struct, and provide that list to the hardware driver when needed. The current patch will enable filtering also in promiscuous mode. This may need to be changed in the future. Reported-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
413 lines
9.5 KiB
C
413 lines
9.5 KiB
C
#ifndef __MAC80211_DRIVER_OPS
|
|
#define __MAC80211_DRIVER_OPS
|
|
|
|
#include <net/mac80211.h>
|
|
#include "ieee80211_i.h"
|
|
#include "driver-trace.h"
|
|
|
|
static inline int drv_tx(struct ieee80211_local *local, struct sk_buff *skb)
|
|
{
|
|
return local->ops->tx(&local->hw, skb);
|
|
}
|
|
|
|
static inline int drv_start(struct ieee80211_local *local)
|
|
{
|
|
int ret;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_start(local);
|
|
local->started = true;
|
|
smp_mb();
|
|
ret = local->ops->start(&local->hw);
|
|
trace_drv_return_int(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_stop(struct ieee80211_local *local)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_stop(local);
|
|
local->ops->stop(&local->hw);
|
|
trace_drv_return_void(local);
|
|
|
|
/* sync away all work on the tasklet before clearing started */
|
|
tasklet_disable(&local->tasklet);
|
|
tasklet_enable(&local->tasklet);
|
|
|
|
barrier();
|
|
|
|
local->started = false;
|
|
}
|
|
|
|
static inline int drv_add_interface(struct ieee80211_local *local,
|
|
struct ieee80211_vif *vif)
|
|
{
|
|
int ret;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_add_interface(local, vif_to_sdata(vif));
|
|
ret = local->ops->add_interface(&local->hw, vif);
|
|
trace_drv_return_int(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_remove_interface(struct ieee80211_local *local,
|
|
struct ieee80211_vif *vif)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_remove_interface(local, vif_to_sdata(vif));
|
|
local->ops->remove_interface(&local->hw, vif);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline int drv_config(struct ieee80211_local *local, u32 changed)
|
|
{
|
|
int ret;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_config(local, changed);
|
|
ret = local->ops->config(&local->hw, changed);
|
|
trace_drv_return_int(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_bss_info_changed(struct ieee80211_local *local,
|
|
struct ieee80211_sub_if_data *sdata,
|
|
struct ieee80211_bss_conf *info,
|
|
u32 changed)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_bss_info_changed(local, sdata, info, changed);
|
|
if (local->ops->bss_info_changed)
|
|
local->ops->bss_info_changed(&local->hw, &sdata->vif, info, changed);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
|
|
struct netdev_hw_addr_list *mc_list)
|
|
{
|
|
u64 ret = 0;
|
|
|
|
trace_drv_prepare_multicast(local, mc_list->count);
|
|
|
|
if (local->ops->prepare_multicast)
|
|
ret = local->ops->prepare_multicast(&local->hw, mc_list);
|
|
|
|
trace_drv_return_u64(local, ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_configure_filter(struct ieee80211_local *local,
|
|
unsigned int changed_flags,
|
|
unsigned int *total_flags,
|
|
u64 multicast)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_configure_filter(local, changed_flags, total_flags,
|
|
multicast);
|
|
local->ops->configure_filter(&local->hw, changed_flags, total_flags,
|
|
multicast);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline int drv_set_tim(struct ieee80211_local *local,
|
|
struct ieee80211_sta *sta, bool set)
|
|
{
|
|
int ret = 0;
|
|
trace_drv_set_tim(local, sta, set);
|
|
if (local->ops->set_tim)
|
|
ret = local->ops->set_tim(&local->hw, sta, set);
|
|
trace_drv_return_int(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline int drv_set_key(struct ieee80211_local *local,
|
|
enum set_key_cmd cmd,
|
|
struct ieee80211_sub_if_data *sdata,
|
|
struct ieee80211_sta *sta,
|
|
struct ieee80211_key_conf *key)
|
|
{
|
|
int ret;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_set_key(local, cmd, sdata, sta, key);
|
|
ret = local->ops->set_key(&local->hw, cmd, &sdata->vif, sta, key);
|
|
trace_drv_return_int(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_update_tkip_key(struct ieee80211_local *local,
|
|
struct ieee80211_sub_if_data *sdata,
|
|
struct ieee80211_key_conf *conf,
|
|
struct sta_info *sta, u32 iv32,
|
|
u16 *phase1key)
|
|
{
|
|
struct ieee80211_sta *ista = NULL;
|
|
|
|
if (sta)
|
|
ista = &sta->sta;
|
|
|
|
trace_drv_update_tkip_key(local, sdata, conf, ista, iv32);
|
|
if (local->ops->update_tkip_key)
|
|
local->ops->update_tkip_key(&local->hw, &sdata->vif, conf,
|
|
ista, iv32, phase1key);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline int drv_hw_scan(struct ieee80211_local *local,
|
|
struct ieee80211_sub_if_data *sdata,
|
|
struct cfg80211_scan_request *req)
|
|
{
|
|
int ret;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_hw_scan(local, sdata, req);
|
|
ret = local->ops->hw_scan(&local->hw, &sdata->vif, req);
|
|
trace_drv_return_int(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_sw_scan_start(struct ieee80211_local *local)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_sw_scan_start(local);
|
|
if (local->ops->sw_scan_start)
|
|
local->ops->sw_scan_start(&local->hw);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline void drv_sw_scan_complete(struct ieee80211_local *local)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_sw_scan_complete(local);
|
|
if (local->ops->sw_scan_complete)
|
|
local->ops->sw_scan_complete(&local->hw);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline int drv_get_stats(struct ieee80211_local *local,
|
|
struct ieee80211_low_level_stats *stats)
|
|
{
|
|
int ret = -EOPNOTSUPP;
|
|
|
|
might_sleep();
|
|
|
|
if (local->ops->get_stats)
|
|
ret = local->ops->get_stats(&local->hw, stats);
|
|
trace_drv_get_stats(local, stats, ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_get_tkip_seq(struct ieee80211_local *local,
|
|
u8 hw_key_idx, u32 *iv32, u16 *iv16)
|
|
{
|
|
if (local->ops->get_tkip_seq)
|
|
local->ops->get_tkip_seq(&local->hw, hw_key_idx, iv32, iv16);
|
|
trace_drv_get_tkip_seq(local, hw_key_idx, iv32, iv16);
|
|
}
|
|
|
|
static inline int drv_set_rts_threshold(struct ieee80211_local *local,
|
|
u32 value)
|
|
{
|
|
int ret = 0;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_set_rts_threshold(local, value);
|
|
if (local->ops->set_rts_threshold)
|
|
ret = local->ops->set_rts_threshold(&local->hw, value);
|
|
trace_drv_return_int(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline int drv_set_coverage_class(struct ieee80211_local *local,
|
|
u8 value)
|
|
{
|
|
int ret = 0;
|
|
might_sleep();
|
|
|
|
trace_drv_set_coverage_class(local, value);
|
|
if (local->ops->set_coverage_class)
|
|
local->ops->set_coverage_class(&local->hw, value);
|
|
else
|
|
ret = -EOPNOTSUPP;
|
|
|
|
trace_drv_return_int(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_sta_notify(struct ieee80211_local *local,
|
|
struct ieee80211_sub_if_data *sdata,
|
|
enum sta_notify_cmd cmd,
|
|
struct ieee80211_sta *sta)
|
|
{
|
|
trace_drv_sta_notify(local, sdata, cmd, sta);
|
|
if (local->ops->sta_notify)
|
|
local->ops->sta_notify(&local->hw, &sdata->vif, cmd, sta);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline int drv_sta_add(struct ieee80211_local *local,
|
|
struct ieee80211_sub_if_data *sdata,
|
|
struct ieee80211_sta *sta)
|
|
{
|
|
int ret = 0;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_sta_add(local, sdata, sta);
|
|
if (local->ops->sta_add)
|
|
ret = local->ops->sta_add(&local->hw, &sdata->vif, sta);
|
|
|
|
trace_drv_return_int(local, ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_sta_remove(struct ieee80211_local *local,
|
|
struct ieee80211_sub_if_data *sdata,
|
|
struct ieee80211_sta *sta)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_sta_remove(local, sdata, sta);
|
|
if (local->ops->sta_remove)
|
|
local->ops->sta_remove(&local->hw, &sdata->vif, sta);
|
|
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline int drv_conf_tx(struct ieee80211_local *local, u16 queue,
|
|
const struct ieee80211_tx_queue_params *params)
|
|
{
|
|
int ret = -EOPNOTSUPP;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_conf_tx(local, queue, params);
|
|
if (local->ops->conf_tx)
|
|
ret = local->ops->conf_tx(&local->hw, queue, params);
|
|
trace_drv_return_int(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline u64 drv_get_tsf(struct ieee80211_local *local)
|
|
{
|
|
u64 ret = -1ULL;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_get_tsf(local);
|
|
if (local->ops->get_tsf)
|
|
ret = local->ops->get_tsf(&local->hw);
|
|
trace_drv_return_u64(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_set_tsf(struct ieee80211_local *local, u64 tsf)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_set_tsf(local, tsf);
|
|
if (local->ops->set_tsf)
|
|
local->ops->set_tsf(&local->hw, tsf);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline void drv_reset_tsf(struct ieee80211_local *local)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_reset_tsf(local);
|
|
if (local->ops->reset_tsf)
|
|
local->ops->reset_tsf(&local->hw);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline int drv_tx_last_beacon(struct ieee80211_local *local)
|
|
{
|
|
int ret = 1;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_tx_last_beacon(local);
|
|
if (local->ops->tx_last_beacon)
|
|
ret = local->ops->tx_last_beacon(&local->hw);
|
|
trace_drv_return_int(local, ret);
|
|
return ret;
|
|
}
|
|
|
|
static inline int drv_ampdu_action(struct ieee80211_local *local,
|
|
struct ieee80211_sub_if_data *sdata,
|
|
enum ieee80211_ampdu_mlme_action action,
|
|
struct ieee80211_sta *sta, u16 tid,
|
|
u16 *ssn)
|
|
{
|
|
int ret = -EOPNOTSUPP;
|
|
|
|
might_sleep();
|
|
|
|
trace_drv_ampdu_action(local, sdata, action, sta, tid, ssn);
|
|
|
|
if (local->ops->ampdu_action)
|
|
ret = local->ops->ampdu_action(&local->hw, &sdata->vif, action,
|
|
sta, tid, ssn);
|
|
|
|
trace_drv_return_int(local, ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline int drv_get_survey(struct ieee80211_local *local, int idx,
|
|
struct survey_info *survey)
|
|
{
|
|
int ret = -EOPNOTSUPP;
|
|
if (local->ops->get_survey)
|
|
ret = local->ops->get_survey(&local->hw, idx, survey);
|
|
/* trace_drv_get_survey(local, idx, survey, ret); */
|
|
return ret;
|
|
}
|
|
|
|
static inline void drv_rfkill_poll(struct ieee80211_local *local)
|
|
{
|
|
might_sleep();
|
|
|
|
if (local->ops->rfkill_poll)
|
|
local->ops->rfkill_poll(&local->hw);
|
|
}
|
|
|
|
static inline void drv_flush(struct ieee80211_local *local, bool drop)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_flush(local, drop);
|
|
if (local->ops->flush)
|
|
local->ops->flush(&local->hw, drop);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
static inline void drv_channel_switch(struct ieee80211_local *local,
|
|
struct ieee80211_channel_switch *ch_switch)
|
|
{
|
|
might_sleep();
|
|
|
|
trace_drv_channel_switch(local, ch_switch);
|
|
local->ops->channel_switch(&local->hw, ch_switch);
|
|
trace_drv_return_void(local);
|
|
}
|
|
|
|
#endif /* __MAC80211_DRIVER_OPS */
|