cfg80211/mac80211: better channel handling
Currently (all tested with hwsim) you can do stupid
things like setting up an AP on a certain channel,
then adding another virtual interface and making
that associate on another channel -- this will make
the beaconing to move channel but obviously without
the necessary IEs data update.
In order to improve this situation, first make the
configuration APIs (cfg80211 and nl80211) aware of
multi-channel operation -- we'll eventually need
that in the future anyway. There's one userland API
change and one API addition. The API change is that
now SET_WIPHY must be called with virtual interface
index rather than only wiphy index in order to take
effect for that interface -- luckily all current
users (hostapd) do that. For monitor interfaces, the
old setting is preserved, but monitors are always
slaved to other devices anyway so no guarantees.
The second userland API change is the introduction
of a per virtual interface SET_CHANNEL command, that
hostapd should use going forward to make it easier
to understand what's going on (it can automatically
detect a kernel with this command).
Other than mac80211, no existing cfg80211 drivers
are affected by this change because they only allow
a single virtual interface.
mac80211, however, now needs to be aware that the
channel settings are per interface now, and needs
to disallow (for now) real multi-channel operation,
which is another important part of this patch.
One of the immediate benefits is that you can now
start hostapd to operate on a hardware that already
has a connection on another virtual interface, as
long as you specify the same channel.
Note that two things are left unhandled (this is an
improvement -- not a complete fix):
* different HT/no-HT modes
currently you could start an HT AP and then
connect to a non-HT network on the same channel
which would configure the hardware for no HT;
that can be fixed fairly easily
* CSA
An AP we're connected to on a virtual interface
might indicate switching channels, and in that
case we would follow it, regardless of how many
other interfaces are operating; this requires
more effort to fix but is pretty rare after all
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2010-05-05 21:25:02 +08:00
|
|
|
/*
|
|
|
|
* mac80211 - channel management
|
|
|
|
*/
|
|
|
|
|
2010-05-05 21:28:27 +08:00
|
|
|
#include <linux/nl80211.h>
|
2012-09-11 23:57:42 +08:00
|
|
|
#include <linux/export.h>
|
2012-12-12 03:38:41 +08:00
|
|
|
#include <linux/rtnetlink.h>
|
mac80211: Don't let regulatory make us deaf
When regulatory information changes our HT behavior (e.g,
when we get a country code from the AP we have just associated
with), we should use this information to change the power with
which we transmit, and what channels we transmit. Sometimes
the channel parameters we derive from regulatory information
contradicts the parameters we used in association. For example,
we could have associated specifying HT40, but the regulatory
rules we apply may forbid HT40 operation.
In the situation above, we should reconfigure ourselves to
transmit in HT20 only, however it makes no sense for us to
disable receive in HT40, since if we associated with these
parameters, the AP has every reason to expect we can and
will receive packets this way. The code in mac80211 does
not have the capability of sending the appropriate action
frames to signal a change in HT behaviour so the AP has
no clue we can no longer receive frames encoded this way.
In some broken AP implementations, this can leave us
effectively deaf if the AP never retries in lower HT rates.
This change breaks up the channel_type parameter in the
ieee80211_enable_ht function into a separate receive and
transmit part. It honors the channel flags set by regulatory
in order to configure the rate control algorithm, but uses
the capability flags to configure the channel on the radio,
since these were used in association to set the AP's transmit
rate.
Signed-off-by: Paul Stewart <pstew@chromium.org>
Cc: Sam Leffler <sleffler@chromium.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Luis R Rodriguez <mcgrof@frijolero.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2012-03-13 22:46:18 +08:00
|
|
|
#include <net/cfg80211.h>
|
cfg80211/mac80211: better channel handling
Currently (all tested with hwsim) you can do stupid
things like setting up an AP on a certain channel,
then adding another virtual interface and making
that associate on another channel -- this will make
the beaconing to move channel but obviously without
the necessary IEs data update.
In order to improve this situation, first make the
configuration APIs (cfg80211 and nl80211) aware of
multi-channel operation -- we'll eventually need
that in the future anyway. There's one userland API
change and one API addition. The API change is that
now SET_WIPHY must be called with virtual interface
index rather than only wiphy index in order to take
effect for that interface -- luckily all current
users (hostapd) do that. For monitor interfaces, the
old setting is preserved, but monitors are always
slaved to other devices anyway so no guarantees.
The second userland API change is the introduction
of a per virtual interface SET_CHANNEL command, that
hostapd should use going forward to make it easier
to understand what's going on (it can automatically
detect a kernel with this command).
Other than mac80211, no existing cfg80211 drivers
are affected by this change because they only allow
a single virtual interface.
mac80211, however, now needs to be aware that the
channel settings are per interface now, and needs
to disallow (for now) real multi-channel operation,
which is another important part of this patch.
One of the immediate benefits is that you can now
start hostapd to operate on a hardware that already
has a connection on another virtual interface, as
long as you specify the same channel.
Note that two things are left unhandled (this is an
improvement -- not a complete fix):
* different HT/no-HT modes
currently you could start an HT AP and then
connect to a non-HT network on the same channel
which would configure the hardware for no HT;
that can be fixed fairly easily
* CSA
An AP we're connected to on a virtual interface
might indicate switching channels, and in that
case we would follow it, regardless of how many
other interfaces are operating; this requires
more effort to fix but is pretty rare after all
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2010-05-05 21:25:02 +08:00
|
|
|
#include "ieee80211_i.h"
|
2012-06-26 20:37:20 +08:00
|
|
|
#include "driver-ops.h"
|
cfg80211/mac80211: better channel handling
Currently (all tested with hwsim) you can do stupid
things like setting up an AP on a certain channel,
then adding another virtual interface and making
that associate on another channel -- this will make
the beaconing to move channel but obviously without
the necessary IEs data update.
In order to improve this situation, first make the
configuration APIs (cfg80211 and nl80211) aware of
multi-channel operation -- we'll eventually need
that in the future anyway. There's one userland API
change and one API addition. The API change is that
now SET_WIPHY must be called with virtual interface
index rather than only wiphy index in order to take
effect for that interface -- luckily all current
users (hostapd) do that. For monitor interfaces, the
old setting is preserved, but monitors are always
slaved to other devices anyway so no guarantees.
The second userland API change is the introduction
of a per virtual interface SET_CHANNEL command, that
hostapd should use going forward to make it easier
to understand what's going on (it can automatically
detect a kernel with this command).
Other than mac80211, no existing cfg80211 drivers
are affected by this change because they only allow
a single virtual interface.
mac80211, however, now needs to be aware that the
channel settings are per interface now, and needs
to disallow (for now) real multi-channel operation,
which is another important part of this patch.
One of the immediate benefits is that you can now
start hostapd to operate on a hardware that already
has a connection on another virtual interface, as
long as you specify the same channel.
Note that two things are left unhandled (this is an
improvement -- not a complete fix):
* different HT/no-HT modes
currently you could start an HT AP and then
connect to a non-HT network on the same channel
which would configure the hardware for no HT;
that can be fixed fairly easily
* CSA
An AP we're connected to on a virtual interface
might indicate switching channels, and in that
case we would follow it, regardless of how many
other interfaces are operating; this requires
more effort to fix but is pretty rare after all
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2010-05-05 21:25:02 +08:00
|
|
|
|
2014-04-09 21:29:33 +08:00
|
|
|
static int ieee80211_chanctx_num_assigned(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
int num = 0;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
list_for_each_entry(sdata, &ctx->assigned_vifs, assigned_chanctx_list)
|
|
|
|
num++;
|
|
|
|
|
|
|
|
return num;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ieee80211_chanctx_num_reserved(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
int num = 0;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
list_for_each_entry(sdata, &ctx->reserved_vifs, reserved_chanctx_list)
|
|
|
|
num++;
|
|
|
|
|
|
|
|
return num;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ieee80211_chanctx_refcount(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx)
|
|
|
|
{
|
|
|
|
return ieee80211_chanctx_num_assigned(local, ctx) +
|
|
|
|
ieee80211_chanctx_num_reserved(local, ctx);
|
|
|
|
}
|
|
|
|
|
2014-04-09 21:29:24 +08:00
|
|
|
static int ieee80211_num_chanctx(struct ieee80211_local *local)
|
|
|
|
{
|
|
|
|
struct ieee80211_chanctx *ctx;
|
|
|
|
int num = 0;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
list_for_each_entry(ctx, &local->chanctx_list, list)
|
|
|
|
num++;
|
|
|
|
|
|
|
|
return num;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool ieee80211_can_create_new_chanctx(struct ieee80211_local *local)
|
|
|
|
{
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
return ieee80211_num_chanctx(local) < ieee80211_max_num_channels(local);
|
|
|
|
}
|
|
|
|
|
2014-04-09 21:29:28 +08:00
|
|
|
static const struct cfg80211_chan_def *
|
|
|
|
ieee80211_chanctx_reserved_chandef(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx,
|
|
|
|
const struct cfg80211_chan_def *compat)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
list_for_each_entry(sdata, &ctx->reserved_vifs,
|
|
|
|
reserved_chanctx_list) {
|
|
|
|
if (!compat)
|
|
|
|
compat = &sdata->reserved_chandef;
|
|
|
|
|
|
|
|
compat = cfg80211_chandef_compatible(&sdata->reserved_chandef,
|
|
|
|
compat);
|
|
|
|
if (!compat)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return compat;
|
|
|
|
}
|
|
|
|
|
2014-04-09 21:29:29 +08:00
|
|
|
static const struct cfg80211_chan_def *
|
|
|
|
ieee80211_chanctx_non_reserved_chandef(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx,
|
|
|
|
const struct cfg80211_chan_def *compat)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
list_for_each_entry(sdata, &ctx->assigned_vifs,
|
|
|
|
assigned_chanctx_list) {
|
|
|
|
if (sdata->reserved_chanctx != NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!compat)
|
|
|
|
compat = &sdata->vif.bss_conf.chandef;
|
|
|
|
|
|
|
|
compat = cfg80211_chandef_compatible(
|
|
|
|
&sdata->vif.bss_conf.chandef, compat);
|
|
|
|
if (!compat)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return compat;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct cfg80211_chan_def *
|
|
|
|
ieee80211_chanctx_combined_chandef(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx,
|
|
|
|
const struct cfg80211_chan_def *compat)
|
|
|
|
{
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
compat = ieee80211_chanctx_reserved_chandef(local, ctx, compat);
|
|
|
|
if (!compat)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
compat = ieee80211_chanctx_non_reserved_chandef(local, ctx, compat);
|
|
|
|
if (!compat)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return compat;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
ieee80211_chanctx_can_reserve_chandef(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx,
|
|
|
|
const struct cfg80211_chan_def *def)
|
|
|
|
{
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
if (ieee80211_chanctx_combined_chandef(local, ctx, def))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (!list_empty(&ctx->reserved_vifs) &&
|
|
|
|
ieee80211_chanctx_reserved_chandef(local, ctx, def))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ieee80211_chanctx *
|
|
|
|
ieee80211_find_reservation_chanctx(struct ieee80211_local *local,
|
|
|
|
const struct cfg80211_chan_def *chandef,
|
|
|
|
enum ieee80211_chanctx_mode mode)
|
|
|
|
{
|
|
|
|
struct ieee80211_chanctx *ctx;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
if (mode == IEEE80211_CHANCTX_EXCLUSIVE)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
list_for_each_entry(ctx, &local->chanctx_list, list) {
|
|
|
|
if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!ieee80211_chanctx_can_reserve_chandef(local, ctx,
|
|
|
|
chandef))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
return ctx;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-11-12 02:14:01 +08:00
|
|
|
static enum nl80211_chan_width ieee80211_get_sta_bw(struct ieee80211_sta *sta)
|
|
|
|
{
|
|
|
|
switch (sta->bandwidth) {
|
|
|
|
case IEEE80211_STA_RX_BW_20:
|
|
|
|
if (sta->ht_cap.ht_supported)
|
|
|
|
return NL80211_CHAN_WIDTH_20;
|
|
|
|
else
|
|
|
|
return NL80211_CHAN_WIDTH_20_NOHT;
|
|
|
|
case IEEE80211_STA_RX_BW_40:
|
|
|
|
return NL80211_CHAN_WIDTH_40;
|
|
|
|
case IEEE80211_STA_RX_BW_80:
|
|
|
|
return NL80211_CHAN_WIDTH_80;
|
|
|
|
case IEEE80211_STA_RX_BW_160:
|
|
|
|
/*
|
|
|
|
* This applied for both 160 and 80+80. since we use
|
|
|
|
* the returned value to consider degradation of
|
|
|
|
* ctx->conf.min_def, we have to make sure to take
|
|
|
|
* the bigger one (NL80211_CHAN_WIDTH_160).
|
|
|
|
* Otherwise we might try degrading even when not
|
|
|
|
* needed, as the max required sta_bw returned (80+80)
|
|
|
|
* might be smaller than the configured bw (160).
|
|
|
|
*/
|
|
|
|
return NL80211_CHAN_WIDTH_160;
|
|
|
|
default:
|
|
|
|
WARN_ON(1);
|
|
|
|
return NL80211_CHAN_WIDTH_20;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static enum nl80211_chan_width
|
|
|
|
ieee80211_get_max_required_bw(struct ieee80211_sub_if_data *sdata)
|
|
|
|
{
|
|
|
|
enum nl80211_chan_width max_bw = NL80211_CHAN_WIDTH_20_NOHT;
|
|
|
|
struct sta_info *sta;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(sta, &sdata->local->sta_list, list) {
|
|
|
|
if (sdata != sta->sdata &&
|
|
|
|
!(sta->sdata->bss && sta->sdata->bss == sdata->bss))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!sta->uploaded)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
max_bw = max(max_bw, ieee80211_get_sta_bw(&sta->sta));
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return max_bw;
|
|
|
|
}
|
|
|
|
|
|
|
|
static enum nl80211_chan_width
|
|
|
|
ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx_conf *conf)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
enum nl80211_chan_width max_bw = NL80211_CHAN_WIDTH_20_NOHT;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
|
|
|
|
struct ieee80211_vif *vif = &sdata->vif;
|
|
|
|
enum nl80211_chan_width width = NL80211_CHAN_WIDTH_20_NOHT;
|
|
|
|
|
|
|
|
if (!ieee80211_sdata_running(sdata))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (rcu_access_pointer(sdata->vif.chanctx_conf) != conf)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
switch (vif->type) {
|
|
|
|
case NL80211_IFTYPE_AP:
|
|
|
|
case NL80211_IFTYPE_AP_VLAN:
|
|
|
|
width = ieee80211_get_max_required_bw(sdata);
|
|
|
|
break;
|
|
|
|
case NL80211_IFTYPE_P2P_DEVICE:
|
|
|
|
continue;
|
|
|
|
case NL80211_IFTYPE_STATION:
|
|
|
|
case NL80211_IFTYPE_ADHOC:
|
|
|
|
case NL80211_IFTYPE_WDS:
|
|
|
|
case NL80211_IFTYPE_MESH_POINT:
|
|
|
|
width = vif->bss_conf.chandef.width;
|
|
|
|
break;
|
|
|
|
case NL80211_IFTYPE_UNSPECIFIED:
|
|
|
|
case NUM_NL80211_IFTYPES:
|
|
|
|
case NL80211_IFTYPE_MONITOR:
|
|
|
|
case NL80211_IFTYPE_P2P_CLIENT:
|
|
|
|
case NL80211_IFTYPE_P2P_GO:
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
}
|
|
|
|
max_bw = max(max_bw, width);
|
|
|
|
}
|
2014-03-03 19:37:14 +08:00
|
|
|
|
|
|
|
/* use the configured bandwidth in case of monitor interface */
|
|
|
|
sdata = rcu_dereference(local->monitor_sdata);
|
|
|
|
if (sdata && rcu_access_pointer(sdata->vif.chanctx_conf) == conf)
|
|
|
|
max_bw = max(max_bw, conf->def.width);
|
|
|
|
|
2013-11-12 02:14:01 +08:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return max_bw;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* recalc the min required chan width of the channel context, which is
|
|
|
|
* the max of min required widths of all the interfaces bound to this
|
|
|
|
* channel context.
|
|
|
|
*/
|
|
|
|
void ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx)
|
|
|
|
{
|
|
|
|
enum nl80211_chan_width max_bw;
|
|
|
|
struct cfg80211_chan_def min_def;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
/* don't optimize 5MHz, 10MHz, and radar_enabled confs */
|
|
|
|
if (ctx->conf.def.width == NL80211_CHAN_WIDTH_5 ||
|
|
|
|
ctx->conf.def.width == NL80211_CHAN_WIDTH_10 ||
|
|
|
|
ctx->conf.radar_enabled) {
|
|
|
|
ctx->conf.min_def = ctx->conf.def;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
max_bw = ieee80211_get_chanctx_max_required_bw(local, &ctx->conf);
|
|
|
|
|
|
|
|
/* downgrade chandef up to max_bw */
|
|
|
|
min_def = ctx->conf.def;
|
|
|
|
while (min_def.width > max_bw)
|
|
|
|
ieee80211_chandef_downgrade(&min_def);
|
|
|
|
|
|
|
|
if (cfg80211_chandef_identical(&ctx->conf.min_def, &min_def))
|
|
|
|
return;
|
|
|
|
|
|
|
|
ctx->conf.min_def = min_def;
|
|
|
|
if (!ctx->driver_present)
|
|
|
|
return;
|
|
|
|
|
|
|
|
drv_change_chanctx(local, ctx, IEEE80211_CHANCTX_CHANGE_MIN_WIDTH);
|
|
|
|
}
|
|
|
|
|
2013-02-08 04:30:37 +08:00
|
|
|
static void ieee80211_change_chanctx(struct ieee80211_local *local,
|
2012-11-09 18:39:59 +08:00
|
|
|
struct ieee80211_chanctx *ctx,
|
|
|
|
const struct cfg80211_chan_def *chandef)
|
2012-06-26 20:37:21 +08:00
|
|
|
{
|
2012-11-09 18:39:59 +08:00
|
|
|
if (cfg80211_chandef_identical(&ctx->conf.def, chandef))
|
2012-06-26 20:37:22 +08:00
|
|
|
return;
|
2010-05-05 21:28:27 +08:00
|
|
|
|
2012-11-09 18:39:59 +08:00
|
|
|
WARN_ON(!cfg80211_chandef_compatible(&ctx->conf.def, chandef));
|
|
|
|
|
|
|
|
ctx->conf.def = *chandef;
|
|
|
|
drv_change_chanctx(local, ctx, IEEE80211_CHANCTX_CHANGE_WIDTH);
|
2013-11-12 02:14:01 +08:00
|
|
|
ieee80211_recalc_chanctx_min_def(local, ctx);
|
2012-07-26 23:24:39 +08:00
|
|
|
|
|
|
|
if (!local->use_chanctx) {
|
2013-03-25 23:26:57 +08:00
|
|
|
local->_oper_chandef = *chandef;
|
2012-07-26 23:24:39 +08:00
|
|
|
ieee80211_hw_config(local, 0);
|
|
|
|
}
|
2010-05-05 21:28:27 +08:00
|
|
|
}
|
2012-06-26 20:37:16 +08:00
|
|
|
|
|
|
|
static struct ieee80211_chanctx *
|
|
|
|
ieee80211_find_chanctx(struct ieee80211_local *local,
|
2012-11-09 18:39:59 +08:00
|
|
|
const struct cfg80211_chan_def *chandef,
|
2012-06-26 20:37:16 +08:00
|
|
|
enum ieee80211_chanctx_mode mode)
|
|
|
|
{
|
|
|
|
struct ieee80211_chanctx *ctx;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
if (mode == IEEE80211_CHANCTX_EXCLUSIVE)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
list_for_each_entry(ctx, &local->chanctx_list, list) {
|
2012-11-09 18:39:59 +08:00
|
|
|
const struct cfg80211_chan_def *compat;
|
2012-06-26 20:37:22 +08:00
|
|
|
|
2012-06-26 20:37:16 +08:00
|
|
|
if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE)
|
|
|
|
continue;
|
2012-11-09 18:39:59 +08:00
|
|
|
|
|
|
|
compat = cfg80211_chandef_compatible(&ctx->conf.def, chandef);
|
|
|
|
if (!compat)
|
2012-06-26 20:37:16 +08:00
|
|
|
continue;
|
|
|
|
|
2014-04-09 21:29:28 +08:00
|
|
|
compat = ieee80211_chanctx_reserved_chandef(local, ctx,
|
|
|
|
compat);
|
|
|
|
if (!compat)
|
|
|
|
continue;
|
|
|
|
|
2013-02-08 04:30:37 +08:00
|
|
|
ieee80211_change_chanctx(local, ctx, compat);
|
2012-06-26 20:37:22 +08:00
|
|
|
|
2012-06-26 20:37:16 +08:00
|
|
|
return ctx;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-04-09 04:43:16 +08:00
|
|
|
static bool ieee80211_is_radar_required(struct ieee80211_local *local)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
|
2014-01-29 14:56:20 +08:00
|
|
|
lockdep_assert_held(&local->mtx);
|
|
|
|
|
2013-04-09 04:43:16 +08:00
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
|
|
|
|
if (sdata->radar_required) {
|
|
|
|
rcu_read_unlock();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-06-26 20:37:16 +08:00
|
|
|
static struct ieee80211_chanctx *
|
2014-04-09 21:29:30 +08:00
|
|
|
ieee80211_alloc_chanctx(struct ieee80211_local *local,
|
|
|
|
const struct cfg80211_chan_def *chandef,
|
|
|
|
enum ieee80211_chanctx_mode mode)
|
2012-06-26 20:37:16 +08:00
|
|
|
{
|
|
|
|
struct ieee80211_chanctx *ctx;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
ctx = kzalloc(sizeof(*ctx) + local->hw.chanctx_data_size, GFP_KERNEL);
|
|
|
|
if (!ctx)
|
2014-04-09 21:29:30 +08:00
|
|
|
return NULL;
|
2012-06-26 20:37:16 +08:00
|
|
|
|
2014-04-09 21:29:26 +08:00
|
|
|
INIT_LIST_HEAD(&ctx->assigned_vifs);
|
2014-04-09 21:29:27 +08:00
|
|
|
INIT_LIST_HEAD(&ctx->reserved_vifs);
|
2012-11-09 18:39:59 +08:00
|
|
|
ctx->conf.def = *chandef;
|
2012-09-11 20:34:12 +08:00
|
|
|
ctx->conf.rx_chains_static = 1;
|
|
|
|
ctx->conf.rx_chains_dynamic = 1;
|
2012-06-26 20:37:16 +08:00
|
|
|
ctx->mode = mode;
|
2013-04-09 04:43:16 +08:00
|
|
|
ctx->conf.radar_enabled = ieee80211_is_radar_required(local);
|
2013-11-12 02:14:01 +08:00
|
|
|
ieee80211_recalc_chanctx_min_def(local, ctx);
|
2014-04-09 21:29:30 +08:00
|
|
|
|
|
|
|
return ctx;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ieee80211_add_chanctx(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx)
|
|
|
|
{
|
|
|
|
u32 changed;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->mtx);
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
2013-04-09 04:43:16 +08:00
|
|
|
if (!local->use_chanctx)
|
|
|
|
local->hw.conf.radar_enabled = ctx->conf.radar_enabled;
|
2012-06-26 20:37:16 +08:00
|
|
|
|
2013-03-23 05:30:09 +08:00
|
|
|
/* turn idle off *before* setting channel -- some drivers need that */
|
|
|
|
changed = ieee80211_idle_off(local);
|
|
|
|
if (changed)
|
|
|
|
ieee80211_hw_config(local, changed);
|
|
|
|
|
2012-07-26 23:24:39 +08:00
|
|
|
if (!local->use_chanctx) {
|
2014-04-09 21:29:30 +08:00
|
|
|
local->_oper_chandef = ctx->conf.def;
|
2014-04-04 19:02:43 +08:00
|
|
|
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
|
2012-07-26 23:24:39 +08:00
|
|
|
} else {
|
|
|
|
err = drv_add_chanctx(local, ctx);
|
|
|
|
if (err) {
|
2013-03-23 05:30:09 +08:00
|
|
|
ieee80211_recalc_idle(local);
|
2014-04-09 21:29:30 +08:00
|
|
|
return err;
|
2012-07-26 23:24:39 +08:00
|
|
|
}
|
2012-06-26 20:37:20 +08:00
|
|
|
}
|
|
|
|
|
2014-04-09 21:29:30 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ieee80211_chanctx *
|
|
|
|
ieee80211_new_chanctx(struct ieee80211_local *local,
|
|
|
|
const struct cfg80211_chan_def *chandef,
|
|
|
|
enum ieee80211_chanctx_mode mode)
|
|
|
|
{
|
|
|
|
struct ieee80211_chanctx *ctx;
|
|
|
|
int err;
|
2012-06-26 20:37:16 +08:00
|
|
|
|
2014-04-09 21:29:30 +08:00
|
|
|
lockdep_assert_held(&local->mtx);
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
2012-06-26 20:37:16 +08:00
|
|
|
|
2014-04-09 21:29:30 +08:00
|
|
|
ctx = ieee80211_alloc_chanctx(local, chandef, mode);
|
|
|
|
if (!ctx)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
|
|
|
err = ieee80211_add_chanctx(local, ctx);
|
|
|
|
if (err) {
|
|
|
|
kfree(ctx);
|
|
|
|
return ERR_PTR(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
list_add_rcu(&ctx->list, &local->chanctx_list);
|
2012-06-26 20:37:16 +08:00
|
|
|
return ctx;
|
|
|
|
}
|
|
|
|
|
2014-04-09 21:29:31 +08:00
|
|
|
static void ieee80211_del_chanctx(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx)
|
2012-06-26 20:37:16 +08:00
|
|
|
{
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
2012-07-26 23:24:39 +08:00
|
|
|
if (!local->use_chanctx) {
|
2013-03-25 23:26:57 +08:00
|
|
|
struct cfg80211_chan_def *chandef = &local->_oper_chandef;
|
|
|
|
chandef->width = NL80211_CHAN_WIDTH_20_NOHT;
|
|
|
|
chandef->center_freq1 = chandef->chan->center_freq;
|
|
|
|
chandef->center_freq2 = 0;
|
2013-04-09 04:43:16 +08:00
|
|
|
|
|
|
|
/* NOTE: Disabling radar is only valid here for
|
|
|
|
* single channel context. To be sure, check it ...
|
|
|
|
*/
|
2014-04-09 21:29:31 +08:00
|
|
|
WARN_ON(local->hw.conf.radar_enabled &&
|
|
|
|
!list_empty(&local->chanctx_list));
|
|
|
|
|
2013-04-09 04:43:16 +08:00
|
|
|
local->hw.conf.radar_enabled = false;
|
|
|
|
|
2014-04-04 19:02:43 +08:00
|
|
|
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
|
2012-07-26 23:24:39 +08:00
|
|
|
} else {
|
|
|
|
drv_remove_chanctx(local, ctx);
|
|
|
|
}
|
2012-06-26 20:37:20 +08:00
|
|
|
|
2013-02-07 07:14:51 +08:00
|
|
|
ieee80211_recalc_idle(local);
|
2012-06-26 20:37:16 +08:00
|
|
|
}
|
|
|
|
|
2014-04-09 21:29:31 +08:00
|
|
|
static void ieee80211_free_chanctx(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx)
|
2012-06-26 20:37:16 +08:00
|
|
|
{
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
2014-04-09 21:29:33 +08:00
|
|
|
WARN_ON_ONCE(ieee80211_chanctx_refcount(local, ctx) != 0);
|
2013-02-13 20:50:51 +08:00
|
|
|
|
2014-04-09 21:29:31 +08:00
|
|
|
list_del_rcu(&ctx->list);
|
|
|
|
ieee80211_del_chanctx(local, ctx);
|
|
|
|
kfree_rcu(ctx, rcu_head);
|
2012-06-26 20:37:16 +08:00
|
|
|
}
|
|
|
|
|
2012-11-09 18:39:59 +08:00
|
|
|
static void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *ctx)
|
2012-06-26 20:37:22 +08:00
|
|
|
{
|
|
|
|
struct ieee80211_chanctx_conf *conf = &ctx->conf;
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
2012-11-09 18:39:59 +08:00
|
|
|
const struct cfg80211_chan_def *compat = NULL;
|
2012-06-26 20:37:22 +08:00
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
|
2012-11-09 18:39:59 +08:00
|
|
|
|
2012-06-26 20:37:22 +08:00
|
|
|
if (!ieee80211_sdata_running(sdata))
|
|
|
|
continue;
|
|
|
|
if (rcu_access_pointer(sdata->vif.chanctx_conf) != conf)
|
|
|
|
continue;
|
|
|
|
|
2012-11-09 18:39:59 +08:00
|
|
|
if (!compat)
|
|
|
|
compat = &sdata->vif.bss_conf.chandef;
|
|
|
|
|
|
|
|
compat = cfg80211_chandef_compatible(
|
|
|
|
&sdata->vif.bss_conf.chandef, compat);
|
|
|
|
if (!compat)
|
|
|
|
break;
|
2012-06-26 20:37:22 +08:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
2012-11-09 18:39:59 +08:00
|
|
|
if (WARN_ON_ONCE(!compat))
|
|
|
|
return;
|
2012-06-26 20:37:22 +08:00
|
|
|
|
2013-02-08 04:30:37 +08:00
|
|
|
ieee80211_change_chanctx(local, ctx, compat);
|
2012-06-26 20:37:22 +08:00
|
|
|
}
|
|
|
|
|
2013-12-18 16:36:09 +08:00
|
|
|
static void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *chanctx)
|
|
|
|
{
|
|
|
|
bool radar_enabled;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
mac80211: fix iflist_mtx/mtx locking in radar detection
The scan code creates an iflist_mtx -> mtx locking dependency,
and a few other places, notably radar detection, were creating
the opposite dependency, causing lockdep to complain. As scan
and radar detection are mutually exclusive, the deadlock can't
really happen in practice, but it's still bad form.
A similar issue exists in the monitor mode code, but this is
only used by channel-context drivers right now and those have
to have hardware scan, so that also can't happen.
Still, fix these issues by making some of the channel context
code require the mtx to be held rather than acquiring it, thus
allowing the monitor/radar callers to keep the iflist_mtx->mtx
lock ordering.
While at it, also fix access to the local->scanning variable
in the radar code, and document that radar_detect_enabled is
now properly protected by the mtx.
All this would now introduce an ABBA deadlock between the DFS
work cancelling and local->mtx, so change the locking there a
bit to not need to use cancel_delayed_work_sync() but be able
to just use cancel_delayed_work(). The work is also safely
stopped/removed when the interface is stopped, so no extra
changes are needed.
Reported-by: Kalle Valo <kvalo@qca.qualcomm.com>
Tested-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2013-12-18 16:43:33 +08:00
|
|
|
/* for setting local->radar_detect_enabled */
|
|
|
|
lockdep_assert_held(&local->mtx);
|
2013-12-18 16:36:09 +08:00
|
|
|
|
|
|
|
radar_enabled = ieee80211_is_radar_required(local);
|
|
|
|
|
|
|
|
if (radar_enabled == chanctx->conf.radar_enabled)
|
|
|
|
return;
|
|
|
|
|
|
|
|
chanctx->conf.radar_enabled = radar_enabled;
|
|
|
|
local->radar_detect_enabled = chanctx->conf.radar_enabled;
|
|
|
|
|
|
|
|
if (!local->use_chanctx) {
|
|
|
|
local->hw.conf.radar_enabled = chanctx->conf.radar_enabled;
|
|
|
|
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
|
|
|
|
}
|
|
|
|
|
|
|
|
drv_change_chanctx(local, chanctx, IEEE80211_CHANCTX_CHANGE_RADAR);
|
|
|
|
}
|
|
|
|
|
2014-03-12 00:24:12 +08:00
|
|
|
static int ieee80211_assign_vif_chanctx(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct ieee80211_chanctx *new_ctx)
|
2012-06-26 20:37:16 +08:00
|
|
|
{
|
2012-06-26 20:37:20 +08:00
|
|
|
struct ieee80211_local *local = sdata->local;
|
2014-03-12 00:24:12 +08:00
|
|
|
struct ieee80211_chanctx_conf *conf;
|
|
|
|
struct ieee80211_chanctx *curr_ctx = NULL;
|
|
|
|
int ret = 0;
|
2012-06-26 20:37:16 +08:00
|
|
|
|
2014-03-12 00:24:12 +08:00
|
|
|
conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
|
|
|
|
lockdep_is_held(&local->chanctx_mtx));
|
2012-06-26 20:37:16 +08:00
|
|
|
|
2014-03-12 00:24:12 +08:00
|
|
|
if (conf) {
|
|
|
|
curr_ctx = container_of(conf, struct ieee80211_chanctx, conf);
|
2012-06-26 20:37:20 +08:00
|
|
|
|
2014-03-12 00:24:12 +08:00
|
|
|
drv_unassign_vif_chanctx(local, sdata, curr_ctx);
|
|
|
|
conf = NULL;
|
2014-04-09 21:29:26 +08:00
|
|
|
list_del(&sdata->assigned_chanctx_list);
|
2014-03-12 00:24:12 +08:00
|
|
|
}
|
2013-02-13 20:50:51 +08:00
|
|
|
|
2014-03-12 00:24:12 +08:00
|
|
|
if (new_ctx) {
|
|
|
|
ret = drv_assign_vif_chanctx(local, sdata, new_ctx);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2013-02-07 07:14:51 +08:00
|
|
|
|
2014-03-12 00:24:12 +08:00
|
|
|
conf = &new_ctx->conf;
|
2014-04-09 21:29:26 +08:00
|
|
|
list_add(&sdata->assigned_chanctx_list,
|
|
|
|
&new_ctx->assigned_vifs);
|
2014-03-12 00:24:12 +08:00
|
|
|
}
|
2012-06-26 20:37:22 +08:00
|
|
|
|
2014-03-12 00:24:12 +08:00
|
|
|
out:
|
|
|
|
rcu_assign_pointer(sdata->vif.chanctx_conf, conf);
|
2013-02-07 07:14:51 +08:00
|
|
|
|
2014-03-12 00:24:12 +08:00
|
|
|
sdata->vif.bss_conf.idle = !conf;
|
|
|
|
|
2014-04-09 21:29:33 +08:00
|
|
|
if (curr_ctx && ieee80211_chanctx_num_assigned(local, curr_ctx) > 0) {
|
2014-03-12 00:24:12 +08:00
|
|
|
ieee80211_recalc_chanctx_chantype(local, curr_ctx);
|
|
|
|
ieee80211_recalc_smps_chanctx(local, curr_ctx);
|
|
|
|
ieee80211_recalc_radar_chanctx(local, curr_ctx);
|
|
|
|
ieee80211_recalc_chanctx_min_def(local, curr_ctx);
|
2012-09-11 20:34:12 +08:00
|
|
|
}
|
2012-06-26 20:37:22 +08:00
|
|
|
|
2014-04-09 21:29:33 +08:00
|
|
|
if (new_ctx && ieee80211_chanctx_num_assigned(local, new_ctx) > 0) {
|
2014-03-12 00:24:12 +08:00
|
|
|
ieee80211_recalc_txpower(sdata);
|
|
|
|
ieee80211_recalc_chanctx_min_def(local, new_ctx);
|
2012-09-11 20:34:12 +08:00
|
|
|
}
|
2014-03-12 00:24:12 +08:00
|
|
|
|
|
|
|
if (sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE &&
|
|
|
|
sdata->vif.type != NL80211_IFTYPE_MONITOR)
|
|
|
|
ieee80211_bss_info_change_notify(sdata,
|
|
|
|
BSS_CHANGED_IDLE);
|
|
|
|
|
|
|
|
return ret;
|
2012-06-26 20:37:16 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct ieee80211_chanctx_conf *conf;
|
|
|
|
struct ieee80211_chanctx *ctx;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
|
|
|
|
lockdep_is_held(&local->chanctx_mtx));
|
|
|
|
if (!conf)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ctx = container_of(conf, struct ieee80211_chanctx, conf);
|
|
|
|
|
2013-10-30 19:09:39 +08:00
|
|
|
if (sdata->reserved_chanctx)
|
|
|
|
ieee80211_vif_unreserve_chanctx(sdata);
|
|
|
|
|
2014-03-12 00:24:12 +08:00
|
|
|
ieee80211_assign_vif_chanctx(sdata, NULL);
|
2014-04-09 21:29:33 +08:00
|
|
|
if (ieee80211_chanctx_refcount(local, ctx) == 0)
|
2012-06-26 20:37:16 +08:00
|
|
|
ieee80211_free_chanctx(local, ctx);
|
|
|
|
}
|
|
|
|
|
2012-09-11 20:34:12 +08:00
|
|
|
void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
|
|
|
|
struct ieee80211_chanctx *chanctx)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
u8 rx_chains_static, rx_chains_dynamic;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
rx_chains_static = 1;
|
|
|
|
rx_chains_dynamic = 1;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
|
|
|
|
u8 needed_static, needed_dynamic;
|
|
|
|
|
|
|
|
if (!ieee80211_sdata_running(sdata))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (rcu_access_pointer(sdata->vif.chanctx_conf) !=
|
|
|
|
&chanctx->conf)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
switch (sdata->vif.type) {
|
|
|
|
case NL80211_IFTYPE_P2P_DEVICE:
|
|
|
|
continue;
|
|
|
|
case NL80211_IFTYPE_STATION:
|
|
|
|
if (!sdata->u.mgd.associated)
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
case NL80211_IFTYPE_AP_VLAN:
|
|
|
|
continue;
|
|
|
|
case NL80211_IFTYPE_AP:
|
|
|
|
case NL80211_IFTYPE_ADHOC:
|
|
|
|
case NL80211_IFTYPE_WDS:
|
|
|
|
case NL80211_IFTYPE_MESH_POINT:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (sdata->smps_mode) {
|
|
|
|
default:
|
|
|
|
WARN_ONCE(1, "Invalid SMPS mode %d\n",
|
|
|
|
sdata->smps_mode);
|
|
|
|
/* fall through */
|
|
|
|
case IEEE80211_SMPS_OFF:
|
|
|
|
needed_static = sdata->needed_rx_chains;
|
|
|
|
needed_dynamic = sdata->needed_rx_chains;
|
|
|
|
break;
|
|
|
|
case IEEE80211_SMPS_DYNAMIC:
|
|
|
|
needed_static = 1;
|
|
|
|
needed_dynamic = sdata->needed_rx_chains;
|
|
|
|
break;
|
|
|
|
case IEEE80211_SMPS_STATIC:
|
|
|
|
needed_static = 1;
|
|
|
|
needed_dynamic = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
rx_chains_static = max(rx_chains_static, needed_static);
|
|
|
|
rx_chains_dynamic = max(rx_chains_dynamic, needed_dynamic);
|
|
|
|
}
|
2014-03-24 15:55:45 +08:00
|
|
|
|
|
|
|
/* Disable SMPS for the monitor interface */
|
|
|
|
sdata = rcu_dereference(local->monitor_sdata);
|
|
|
|
if (sdata &&
|
|
|
|
rcu_access_pointer(sdata->vif.chanctx_conf) == &chanctx->conf)
|
|
|
|
rx_chains_dynamic = rx_chains_static = local->rx_chains;
|
|
|
|
|
2012-09-11 20:34:12 +08:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
if (!local->use_chanctx) {
|
|
|
|
if (rx_chains_static > 1)
|
|
|
|
local->smps_mode = IEEE80211_SMPS_OFF;
|
|
|
|
else if (rx_chains_dynamic > 1)
|
|
|
|
local->smps_mode = IEEE80211_SMPS_DYNAMIC;
|
|
|
|
else
|
|
|
|
local->smps_mode = IEEE80211_SMPS_STATIC;
|
|
|
|
ieee80211_hw_config(local, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rx_chains_static == chanctx->conf.rx_chains_static &&
|
|
|
|
rx_chains_dynamic == chanctx->conf.rx_chains_dynamic)
|
|
|
|
return;
|
|
|
|
|
|
|
|
chanctx->conf.rx_chains_static = rx_chains_static;
|
|
|
|
chanctx->conf.rx_chains_dynamic = rx_chains_dynamic;
|
|
|
|
drv_change_chanctx(local, chanctx, IEEE80211_CHANCTX_CHANGE_RX_CHAINS);
|
|
|
|
}
|
|
|
|
|
2012-06-26 20:37:16 +08:00
|
|
|
int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,
|
2012-11-09 18:39:59 +08:00
|
|
|
const struct cfg80211_chan_def *chandef,
|
2012-06-26 20:37:16 +08:00
|
|
|
enum ieee80211_chanctx_mode mode)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct ieee80211_chanctx *ctx;
|
2014-02-13 17:31:59 +08:00
|
|
|
u8 radar_detect_width = 0;
|
2012-06-26 20:37:16 +08:00
|
|
|
int ret;
|
|
|
|
|
mac80211: fix iflist_mtx/mtx locking in radar detection
The scan code creates an iflist_mtx -> mtx locking dependency,
and a few other places, notably radar detection, were creating
the opposite dependency, causing lockdep to complain. As scan
and radar detection are mutually exclusive, the deadlock can't
really happen in practice, but it's still bad form.
A similar issue exists in the monitor mode code, but this is
only used by channel-context drivers right now and those have
to have hardware scan, so that also can't happen.
Still, fix these issues by making some of the channel context
code require the mtx to be held rather than acquiring it, thus
allowing the monitor/radar callers to keep the iflist_mtx->mtx
lock ordering.
While at it, also fix access to the local->scanning variable
in the radar code, and document that radar_detect_enabled is
now properly protected by the mtx.
All this would now introduce an ABBA deadlock between the DFS
work cancelling and local->mtx, so change the locking there a
bit to not need to use cancel_delayed_work_sync() but be able
to just use cancel_delayed_work(). The work is also safely
stopped/removed when the interface is stopped, so no extra
changes are needed.
Reported-by: Kalle Valo <kvalo@qca.qualcomm.com>
Tested-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2013-12-18 16:43:33 +08:00
|
|
|
lockdep_assert_held(&local->mtx);
|
|
|
|
|
2012-07-26 23:24:39 +08:00
|
|
|
WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev));
|
|
|
|
|
2012-06-26 20:37:16 +08:00
|
|
|
mutex_lock(&local->chanctx_mtx);
|
2014-02-13 17:31:59 +08:00
|
|
|
|
|
|
|
ret = cfg80211_chandef_dfs_required(local->hw.wiphy,
|
|
|
|
chandef,
|
|
|
|
sdata->wdev.iftype);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
if (ret > 0)
|
|
|
|
radar_detect_width = BIT(chandef->width);
|
|
|
|
|
|
|
|
sdata->radar_required = ret;
|
|
|
|
|
|
|
|
ret = ieee80211_check_combinations(sdata, chandef, mode,
|
|
|
|
radar_detect_width);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
|
2012-06-26 20:37:16 +08:00
|
|
|
__ieee80211_vif_release_channel(sdata);
|
|
|
|
|
2012-11-09 18:39:59 +08:00
|
|
|
ctx = ieee80211_find_chanctx(local, chandef, mode);
|
2012-06-26 20:37:16 +08:00
|
|
|
if (!ctx)
|
2012-11-09 18:39:59 +08:00
|
|
|
ctx = ieee80211_new_chanctx(local, chandef, mode);
|
2012-06-26 20:37:16 +08:00
|
|
|
if (IS_ERR(ctx)) {
|
|
|
|
ret = PTR_ERR(ctx);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-11-09 18:39:59 +08:00
|
|
|
sdata->vif.bss_conf.chandef = *chandef;
|
2012-07-26 23:24:39 +08:00
|
|
|
|
2012-06-26 20:37:16 +08:00
|
|
|
ret = ieee80211_assign_vif_chanctx(sdata, ctx);
|
|
|
|
if (ret) {
|
|
|
|
/* if assign fails refcount stays the same */
|
2014-04-09 21:29:33 +08:00
|
|
|
if (ieee80211_chanctx_refcount(local, ctx) == 0)
|
2012-06-26 20:37:16 +08:00
|
|
|
ieee80211_free_chanctx(local, ctx);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-09-11 20:34:12 +08:00
|
|
|
ieee80211_recalc_smps_chanctx(local, ctx);
|
2013-02-09 01:16:20 +08:00
|
|
|
ieee80211_recalc_radar_chanctx(local, ctx);
|
2012-06-26 20:37:16 +08:00
|
|
|
out:
|
|
|
|
mutex_unlock(&local->chanctx_mtx);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-01-31 04:08:16 +08:00
|
|
|
static int __ieee80211_vif_change_channel(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct ieee80211_chanctx *ctx,
|
|
|
|
u32 *changed)
|
2013-07-11 22:09:06 +08:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
2013-11-12 02:34:54 +08:00
|
|
|
const struct cfg80211_chan_def *chandef = &sdata->csa_chandef;
|
2013-07-11 22:09:06 +08:00
|
|
|
u32 chanctx_changed = 0;
|
|
|
|
|
|
|
|
if (!cfg80211_chandef_usable(sdata->local->hw.wiphy, chandef,
|
|
|
|
IEEE80211_CHAN_DISABLED))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2014-04-09 21:29:33 +08:00
|
|
|
if (ieee80211_chanctx_refcount(local, ctx) != 1)
|
2014-01-31 04:08:16 +08:00
|
|
|
return -EINVAL;
|
2013-07-11 22:09:06 +08:00
|
|
|
|
|
|
|
if (sdata->vif.bss_conf.chandef.width != chandef->width) {
|
|
|
|
chanctx_changed = IEEE80211_CHANCTX_CHANGE_WIDTH;
|
|
|
|
*changed |= BSS_CHANGED_BANDWIDTH;
|
|
|
|
}
|
|
|
|
|
|
|
|
sdata->vif.bss_conf.chandef = *chandef;
|
|
|
|
ctx->conf.def = *chandef;
|
|
|
|
|
|
|
|
chanctx_changed |= IEEE80211_CHANCTX_CHANGE_CHANNEL;
|
|
|
|
drv_change_chanctx(local, ctx, chanctx_changed);
|
|
|
|
|
|
|
|
ieee80211_recalc_chanctx_chantype(local, ctx);
|
|
|
|
ieee80211_recalc_smps_chanctx(local, ctx);
|
|
|
|
ieee80211_recalc_radar_chanctx(local, ctx);
|
2013-11-12 02:14:01 +08:00
|
|
|
ieee80211_recalc_chanctx_min_def(local, ctx);
|
2013-07-11 22:09:06 +08:00
|
|
|
|
2014-01-31 04:08:16 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-11 22:09:06 +08:00
|
|
|
int ieee80211_vif_change_channel(struct ieee80211_sub_if_data *sdata,
|
|
|
|
u32 *changed)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct ieee80211_chanctx_conf *conf;
|
|
|
|
struct ieee80211_chanctx *ctx;
|
|
|
|
int ret;
|
|
|
|
|
mac80211: fix iflist_mtx/mtx locking in radar detection
The scan code creates an iflist_mtx -> mtx locking dependency,
and a few other places, notably radar detection, were creating
the opposite dependency, causing lockdep to complain. As scan
and radar detection are mutually exclusive, the deadlock can't
really happen in practice, but it's still bad form.
A similar issue exists in the monitor mode code, but this is
only used by channel-context drivers right now and those have
to have hardware scan, so that also can't happen.
Still, fix these issues by making some of the channel context
code require the mtx to be held rather than acquiring it, thus
allowing the monitor/radar callers to keep the iflist_mtx->mtx
lock ordering.
While at it, also fix access to the local->scanning variable
in the radar code, and document that radar_detect_enabled is
now properly protected by the mtx.
All this would now introduce an ABBA deadlock between the DFS
work cancelling and local->mtx, so change the locking there a
bit to not need to use cancel_delayed_work_sync() but be able
to just use cancel_delayed_work(). The work is also safely
stopped/removed when the interface is stopped, so no extra
changes are needed.
Reported-by: Kalle Valo <kvalo@qca.qualcomm.com>
Tested-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2013-12-18 16:43:33 +08:00
|
|
|
lockdep_assert_held(&local->mtx);
|
|
|
|
|
2013-07-11 22:09:06 +08:00
|
|
|
/* should never be called if not performing a channel switch. */
|
|
|
|
if (WARN_ON(!sdata->vif.csa_active))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2014-01-31 04:08:16 +08:00
|
|
|
mutex_lock(&local->chanctx_mtx);
|
|
|
|
conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
|
|
|
|
lockdep_is_held(&local->chanctx_mtx));
|
|
|
|
if (!conf) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx = container_of(conf, struct ieee80211_chanctx, conf);
|
|
|
|
|
|
|
|
ret = __ieee80211_vif_change_channel(sdata, ctx, changed);
|
2013-07-11 22:09:06 +08:00
|
|
|
out:
|
|
|
|
mutex_unlock(&local->chanctx_mtx);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-10-30 19:09:39 +08:00
|
|
|
static void
|
|
|
|
__ieee80211_vif_copy_chanctx_to_vlans(struct ieee80211_sub_if_data *sdata,
|
|
|
|
bool clear)
|
|
|
|
{
|
2014-04-10 03:31:13 +08:00
|
|
|
struct ieee80211_local *local __maybe_unused = sdata->local;
|
2013-10-30 19:09:39 +08:00
|
|
|
struct ieee80211_sub_if_data *vlan;
|
|
|
|
struct ieee80211_chanctx_conf *conf;
|
|
|
|
|
|
|
|
if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_AP))
|
|
|
|
return;
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->mtx);
|
|
|
|
|
|
|
|
/* Check that conf exists, even when clearing this function
|
|
|
|
* must be called with the AP's channel context still there
|
|
|
|
* as it would otherwise cause VLANs to have an invalid
|
|
|
|
* channel context pointer for a while, possibly pointing
|
|
|
|
* to a channel context that has already been freed.
|
|
|
|
*/
|
|
|
|
conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
|
2014-04-10 03:31:13 +08:00
|
|
|
lockdep_is_held(&local->chanctx_mtx));
|
2013-10-30 19:09:39 +08:00
|
|
|
WARN_ON(!conf);
|
|
|
|
|
|
|
|
if (clear)
|
|
|
|
conf = NULL;
|
|
|
|
|
|
|
|
list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
|
|
|
|
rcu_assign_pointer(vlan->vif.chanctx_conf, conf);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ieee80211_vif_copy_chanctx_to_vlans(struct ieee80211_sub_if_data *sdata,
|
|
|
|
bool clear)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
|
|
|
|
mutex_lock(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
__ieee80211_vif_copy_chanctx_to_vlans(sdata, clear);
|
|
|
|
|
|
|
|
mutex_unlock(&local->chanctx_mtx);
|
|
|
|
}
|
|
|
|
|
|
|
|
int ieee80211_vif_unreserve_chanctx(struct ieee80211_sub_if_data *sdata)
|
|
|
|
{
|
2014-04-09 21:29:27 +08:00
|
|
|
struct ieee80211_chanctx *ctx = sdata->reserved_chanctx;
|
|
|
|
|
2013-10-30 19:09:39 +08:00
|
|
|
lockdep_assert_held(&sdata->local->chanctx_mtx);
|
|
|
|
|
2014-04-09 21:29:27 +08:00
|
|
|
if (WARN_ON(!ctx))
|
2013-07-11 22:09:06 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2014-04-09 21:29:27 +08:00
|
|
|
list_del(&sdata->reserved_chanctx_list);
|
2013-10-30 19:09:39 +08:00
|
|
|
sdata->reserved_chanctx = NULL;
|
|
|
|
|
2014-04-09 21:29:33 +08:00
|
|
|
if (ieee80211_chanctx_refcount(sdata->local, ctx) == 0)
|
2014-04-09 21:29:27 +08:00
|
|
|
ieee80211_free_chanctx(sdata->local, ctx);
|
|
|
|
|
2013-10-30 19:09:39 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata,
|
|
|
|
const struct cfg80211_chan_def *chandef,
|
2014-04-09 21:29:25 +08:00
|
|
|
enum ieee80211_chanctx_mode mode,
|
|
|
|
bool radar_required)
|
2013-10-30 19:09:39 +08:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct ieee80211_chanctx_conf *conf;
|
|
|
|
struct ieee80211_chanctx *new_ctx, *curr_ctx;
|
|
|
|
int ret = 0;
|
|
|
|
|
2013-07-11 22:09:06 +08:00
|
|
|
mutex_lock(&local->chanctx_mtx);
|
2013-10-30 19:09:39 +08:00
|
|
|
|
2013-07-11 22:09:06 +08:00
|
|
|
conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
|
|
|
|
lockdep_is_held(&local->chanctx_mtx));
|
|
|
|
if (!conf) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-10-30 19:09:39 +08:00
|
|
|
curr_ctx = container_of(conf, struct ieee80211_chanctx, conf);
|
|
|
|
|
2014-04-09 21:29:29 +08:00
|
|
|
new_ctx = ieee80211_find_reservation_chanctx(local, chandef, mode);
|
2013-10-30 19:09:39 +08:00
|
|
|
if (!new_ctx) {
|
2014-04-09 21:29:33 +08:00
|
|
|
if (ieee80211_chanctx_refcount(local, curr_ctx) == 1 &&
|
2014-02-27 20:33:47 +08:00
|
|
|
(local->hw.flags & IEEE80211_HW_CHANGE_RUNNING_CHANCTX)) {
|
|
|
|
/* if we're the only users of the chanctx and
|
|
|
|
* the driver supports changing a running
|
|
|
|
* context, reserve our current context
|
|
|
|
*/
|
|
|
|
new_ctx = curr_ctx;
|
2014-04-09 21:29:24 +08:00
|
|
|
} else if (ieee80211_can_create_new_chanctx(local)) {
|
2014-02-27 20:33:47 +08:00
|
|
|
/* create a new context and reserve it */
|
|
|
|
new_ctx = ieee80211_new_chanctx(local, chandef, mode);
|
|
|
|
if (IS_ERR(new_ctx)) {
|
|
|
|
ret = PTR_ERR(new_ctx);
|
|
|
|
goto out;
|
|
|
|
}
|
2014-04-09 21:29:24 +08:00
|
|
|
} else {
|
|
|
|
ret = -EBUSY;
|
|
|
|
goto out;
|
2013-10-30 19:09:39 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-09 21:29:27 +08:00
|
|
|
list_add(&sdata->reserved_chanctx_list, &new_ctx->reserved_vifs);
|
2013-10-30 19:09:39 +08:00
|
|
|
sdata->reserved_chanctx = new_ctx;
|
|
|
|
sdata->reserved_chandef = *chandef;
|
2014-04-09 21:29:25 +08:00
|
|
|
sdata->reserved_radar_required = radar_required;
|
2013-10-30 19:09:39 +08:00
|
|
|
out:
|
|
|
|
mutex_unlock(&local->chanctx_mtx);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata,
|
|
|
|
u32 *changed)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct ieee80211_chanctx *ctx;
|
|
|
|
struct ieee80211_chanctx *old_ctx;
|
|
|
|
struct ieee80211_chanctx_conf *conf;
|
|
|
|
int ret;
|
|
|
|
u32 tmp_changed = *changed;
|
|
|
|
|
|
|
|
/* TODO: need to recheck if the chandef is usable etc.? */
|
|
|
|
|
|
|
|
lockdep_assert_held(&local->mtx);
|
|
|
|
|
|
|
|
mutex_lock(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
ctx = sdata->reserved_chanctx;
|
|
|
|
if (WARN_ON(!ctx)) {
|
2013-07-11 22:09:06 +08:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-10-30 19:09:39 +08:00
|
|
|
conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
|
|
|
|
lockdep_is_held(&local->chanctx_mtx));
|
|
|
|
if (!conf) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
2013-07-11 22:09:06 +08:00
|
|
|
}
|
|
|
|
|
2013-10-30 19:09:39 +08:00
|
|
|
old_ctx = container_of(conf, struct ieee80211_chanctx, conf);
|
2013-07-11 22:09:06 +08:00
|
|
|
|
2013-10-30 19:09:39 +08:00
|
|
|
if (sdata->vif.bss_conf.chandef.width != sdata->reserved_chandef.width)
|
|
|
|
tmp_changed |= BSS_CHANGED_BANDWIDTH;
|
|
|
|
|
|
|
|
sdata->vif.bss_conf.chandef = sdata->reserved_chandef;
|
|
|
|
|
2014-02-27 20:33:47 +08:00
|
|
|
/* unref our reservation */
|
2013-10-30 19:09:39 +08:00
|
|
|
sdata->reserved_chanctx = NULL;
|
2014-04-09 21:29:25 +08:00
|
|
|
sdata->radar_required = sdata->reserved_radar_required;
|
2014-04-09 21:29:27 +08:00
|
|
|
list_del(&sdata->reserved_chanctx_list);
|
2013-10-30 19:09:39 +08:00
|
|
|
|
2014-02-27 20:33:47 +08:00
|
|
|
if (old_ctx == ctx) {
|
|
|
|
/* This is our own context, just change it */
|
|
|
|
ret = __ieee80211_vif_change_channel(sdata, old_ctx,
|
|
|
|
&tmp_changed);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
} else {
|
|
|
|
ret = ieee80211_assign_vif_chanctx(sdata, ctx);
|
2014-04-09 21:29:33 +08:00
|
|
|
if (ieee80211_chanctx_refcount(local, old_ctx) == 0)
|
2014-02-27 20:33:47 +08:00
|
|
|
ieee80211_free_chanctx(local, old_ctx);
|
|
|
|
if (ret) {
|
|
|
|
/* if assign fails refcount stays the same */
|
2014-04-09 21:29:33 +08:00
|
|
|
if (ieee80211_chanctx_refcount(local, ctx) == 0)
|
2014-02-27 20:33:47 +08:00
|
|
|
ieee80211_free_chanctx(local, ctx);
|
|
|
|
goto out;
|
|
|
|
}
|
2013-10-30 19:09:39 +08:00
|
|
|
|
2014-02-27 20:33:47 +08:00
|
|
|
if (sdata->vif.type == NL80211_IFTYPE_AP)
|
|
|
|
__ieee80211_vif_copy_chanctx_to_vlans(sdata, false);
|
|
|
|
}
|
2013-10-30 19:09:39 +08:00
|
|
|
|
|
|
|
*changed = tmp_changed;
|
2013-07-11 22:09:06 +08:00
|
|
|
|
|
|
|
ieee80211_recalc_chanctx_chantype(local, ctx);
|
|
|
|
ieee80211_recalc_smps_chanctx(local, ctx);
|
|
|
|
ieee80211_recalc_radar_chanctx(local, ctx);
|
2013-11-12 02:14:01 +08:00
|
|
|
ieee80211_recalc_chanctx_min_def(local, ctx);
|
2013-10-30 19:09:39 +08:00
|
|
|
out:
|
2013-07-11 22:09:06 +08:00
|
|
|
mutex_unlock(&local->chanctx_mtx);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-02-08 04:37:29 +08:00
|
|
|
int ieee80211_vif_change_bandwidth(struct ieee80211_sub_if_data *sdata,
|
|
|
|
const struct cfg80211_chan_def *chandef,
|
|
|
|
u32 *changed)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct ieee80211_chanctx_conf *conf;
|
|
|
|
struct ieee80211_chanctx *ctx;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!cfg80211_chandef_usable(sdata->local->hw.wiphy, chandef,
|
|
|
|
IEEE80211_CHAN_DISABLED))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
mutex_lock(&local->chanctx_mtx);
|
|
|
|
if (cfg80211_chandef_identical(chandef, &sdata->vif.bss_conf.chandef)) {
|
|
|
|
ret = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (chandef->width == NL80211_CHAN_WIDTH_20_NOHT ||
|
|
|
|
sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
|
|
|
|
lockdep_is_held(&local->chanctx_mtx));
|
|
|
|
if (!conf) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx = container_of(conf, struct ieee80211_chanctx, conf);
|
|
|
|
if (!cfg80211_chandef_compatible(&conf->def, chandef)) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
sdata->vif.bss_conf.chandef = *chandef;
|
|
|
|
|
|
|
|
ieee80211_recalc_chanctx_chantype(local, ctx);
|
|
|
|
|
|
|
|
*changed |= BSS_CHANGED_BANDWIDTH;
|
|
|
|
ret = 0;
|
|
|
|
out:
|
|
|
|
mutex_unlock(&local->chanctx_mtx);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-06-26 20:37:16 +08:00
|
|
|
void ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)
|
|
|
|
{
|
2012-07-26 23:24:39 +08:00
|
|
|
WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev));
|
|
|
|
|
mac80211: fix iflist_mtx/mtx locking in radar detection
The scan code creates an iflist_mtx -> mtx locking dependency,
and a few other places, notably radar detection, were creating
the opposite dependency, causing lockdep to complain. As scan
and radar detection are mutually exclusive, the deadlock can't
really happen in practice, but it's still bad form.
A similar issue exists in the monitor mode code, but this is
only used by channel-context drivers right now and those have
to have hardware scan, so that also can't happen.
Still, fix these issues by making some of the channel context
code require the mtx to be held rather than acquiring it, thus
allowing the monitor/radar callers to keep the iflist_mtx->mtx
lock ordering.
While at it, also fix access to the local->scanning variable
in the radar code, and document that radar_detect_enabled is
now properly protected by the mtx.
All this would now introduce an ABBA deadlock between the DFS
work cancelling and local->mtx, so change the locking there a
bit to not need to use cancel_delayed_work_sync() but be able
to just use cancel_delayed_work(). The work is also safely
stopped/removed when the interface is stopped, so no extra
changes are needed.
Reported-by: Kalle Valo <kvalo@qca.qualcomm.com>
Tested-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2013-12-18 16:43:33 +08:00
|
|
|
lockdep_assert_held(&sdata->local->mtx);
|
|
|
|
|
2012-06-26 20:37:16 +08:00
|
|
|
mutex_lock(&sdata->local->chanctx_mtx);
|
|
|
|
__ieee80211_vif_release_channel(sdata);
|
|
|
|
mutex_unlock(&sdata->local->chanctx_mtx);
|
|
|
|
}
|
2012-09-11 23:57:42 +08:00
|
|
|
|
2012-12-12 03:38:41 +08:00
|
|
|
void ieee80211_vif_vlan_copy_chanctx(struct ieee80211_sub_if_data *sdata)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct ieee80211_sub_if_data *ap;
|
|
|
|
struct ieee80211_chanctx_conf *conf;
|
|
|
|
|
|
|
|
if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_AP_VLAN || !sdata->bss))
|
|
|
|
return;
|
|
|
|
|
|
|
|
ap = container_of(sdata->bss, struct ieee80211_sub_if_data, u.ap);
|
|
|
|
|
|
|
|
mutex_lock(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
conf = rcu_dereference_protected(ap->vif.chanctx_conf,
|
|
|
|
lockdep_is_held(&local->chanctx_mtx));
|
|
|
|
rcu_assign_pointer(sdata->vif.chanctx_conf, conf);
|
|
|
|
mutex_unlock(&local->chanctx_mtx);
|
|
|
|
}
|
|
|
|
|
2012-09-11 23:57:42 +08:00
|
|
|
void ieee80211_iter_chan_contexts_atomic(
|
|
|
|
struct ieee80211_hw *hw,
|
|
|
|
void (*iter)(struct ieee80211_hw *hw,
|
|
|
|
struct ieee80211_chanctx_conf *chanctx_conf,
|
|
|
|
void *data),
|
|
|
|
void *iter_data)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
struct ieee80211_chanctx *ctx;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(ctx, &local->chanctx_list, list)
|
2012-12-14 00:42:30 +08:00
|
|
|
if (ctx->driver_present)
|
|
|
|
iter(hw, &ctx->conf, iter_data);
|
2012-09-11 23:57:42 +08:00
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ieee80211_iter_chan_contexts_atomic);
|