| Message ID | 1414046257-22184-3-git-send-email-arik@wizery.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, Oct 22, 2014 at 11:37 PM, Arik Nemtsov <arik@wizery.com> wrote: > +static bool reg_wdev_chan_valid(struct wiphy *wiphy, struct wireless_dev *wdev) > +{ > + struct ieee80211_channel *ch; > + struct cfg80211_chan_def chandef; > + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); > + bool ret = true; > + > + wdev_lock(wdev); > + > + if (!wdev->netdev || !netif_running(wdev->netdev)) > + goto out; > + > + switch (wdev->iftype) { > + case NL80211_IFTYPE_AP: > + case NL80211_IFTYPE_P2P_GO: > + if (!wdev->beacon_interval) > + goto out; > + > + ret = cfg80211_reg_can_beacon(wiphy, > + &wdev->chandef, wdev->iftype); > + break; > + case NL80211_IFTYPE_STATION: > + case NL80211_IFTYPE_P2P_CLIENT: > + if (!wdev->current_bss || > + !wdev->current_bss->pub.channel) > + goto out; > + > + ch = wdev->current_bss->pub.channel; > + if (rdev->ops->get_channel && > + !rdev_get_channel(rdev, wdev, &chandef)) > + ret = cfg80211_chandef_usable(wiphy, &chandef, > + IEEE80211_CHAN_DISABLED); > + else > + ret = !(ch->flags & IEEE80211_CHAN_DISABLED); > + break; > + default: > + /* others not implemented for now */ Looks good to me except this of course, since its a flag that will enable this per wiphy might as well WARN() if you really do not want to think about this. That means that once someone does enable this on a wiphy with the other type of interfaces they'll have to think about this, likewise one could warn if a wiphy interface is registered with the flag to follow this but supports a mode not handled here yet. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Nov 5, 2014 at 5:16 AM, Luis R. Rodriguez <mcgrof@do-not-panic.com> wrote: > On Wed, Oct 22, 2014 at 11:37 PM, Arik Nemtsov <arik@wizery.com> wrote: >> +static bool reg_wdev_chan_valid(struct wiphy *wiphy, struct wireless_dev *wdev) >> +{ >> + struct ieee80211_channel *ch; >> + struct cfg80211_chan_def chandef; >> + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); >> + bool ret = true; >> + >> + wdev_lock(wdev); >> + >> + if (!wdev->netdev || !netif_running(wdev->netdev)) >> + goto out; >> + >> + switch (wdev->iftype) { >> + case NL80211_IFTYPE_AP: >> + case NL80211_IFTYPE_P2P_GO: >> + if (!wdev->beacon_interval) >> + goto out; >> + >> + ret = cfg80211_reg_can_beacon(wiphy, >> + &wdev->chandef, wdev->iftype); >> + break; >> + case NL80211_IFTYPE_STATION: >> + case NL80211_IFTYPE_P2P_CLIENT: >> + if (!wdev->current_bss || >> + !wdev->current_bss->pub.channel) >> + goto out; >> + >> + ch = wdev->current_bss->pub.channel; >> + if (rdev->ops->get_channel && >> + !rdev_get_channel(rdev, wdev, &chandef)) >> + ret = cfg80211_chandef_usable(wiphy, &chandef, >> + IEEE80211_CHAN_DISABLED); >> + else >> + ret = !(ch->flags & IEEE80211_CHAN_DISABLED); >> + break; >> + default: >> + /* others not implemented for now */ > > Looks good to me except this of course, since its a flag that will > enable this per wiphy might as well WARN() if you really do not want > to think about this. That means that once someone does enable this on > a wiphy with the other type of interfaces they'll have to think about > this, likewise one could warn if a wiphy interface is registered with > the flag to follow this but supports a mode not handled here yet. But I do want to support a wiphy that has other modes (NL80211_IFTYPE_ADHOC), but I don't want people to get warnings every time they use IBSS. Maybe I'll rename the flag to REGULATORY_ENFORCE_AP_STA_CHANNELS? Arik -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Nov 5, 2014 at 1:18 AM, Arik Nemtsov <arik@wizery.com> wrote: > On Wed, Nov 5, 2014 at 5:16 AM, Luis R. Rodriguez > <mcgrof@do-not-panic.com> wrote: >> On Wed, Oct 22, 2014 at 11:37 PM, Arik Nemtsov <arik@wizery.com> wrote: >>> +static bool reg_wdev_chan_valid(struct wiphy *wiphy, struct wireless_dev *wdev) >>> +{ >>> + struct ieee80211_channel *ch; >>> + struct cfg80211_chan_def chandef; >>> + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); >>> + bool ret = true; >>> + >>> + wdev_lock(wdev); >>> + >>> + if (!wdev->netdev || !netif_running(wdev->netdev)) >>> + goto out; >>> + >>> + switch (wdev->iftype) { >>> + case NL80211_IFTYPE_AP: >>> + case NL80211_IFTYPE_P2P_GO: >>> + if (!wdev->beacon_interval) >>> + goto out; >>> + >>> + ret = cfg80211_reg_can_beacon(wiphy, >>> + &wdev->chandef, wdev->iftype); >>> + break; >>> + case NL80211_IFTYPE_STATION: >>> + case NL80211_IFTYPE_P2P_CLIENT: >>> + if (!wdev->current_bss || >>> + !wdev->current_bss->pub.channel) >>> + goto out; >>> + >>> + ch = wdev->current_bss->pub.channel; >>> + if (rdev->ops->get_channel && >>> + !rdev_get_channel(rdev, wdev, &chandef)) >>> + ret = cfg80211_chandef_usable(wiphy, &chandef, >>> + IEEE80211_CHAN_DISABLED); >>> + else >>> + ret = !(ch->flags & IEEE80211_CHAN_DISABLED); >>> + break; >>> + default: >>> + /* others not implemented for now */ >> >> Looks good to me except this of course, since its a flag that will >> enable this per wiphy might as well WARN() if you really do not want >> to think about this. That means that once someone does enable this on >> a wiphy with the other type of interfaces they'll have to think about >> this, likewise one could warn if a wiphy interface is registered with >> the flag to follow this but supports a mode not handled here yet. > > But I do want to support a wiphy that has other modes > (NL80211_IFTYPE_ADHOC), but I don't want people to get warnings every > time they use IBSS. > Maybe I'll rename the flag to REGULATORY_ENFORCE_AP_STA_CHANNELS? Then it depends on how important this feature is for your regulatory requirements. If its important then I'd wait until its properly implemented, if its not required for the other modes then a simple information message would suffice. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Nov 13, 2014 at 12:53 AM, Luis R. Rodriguez <mcgrof@do-not-panic.com> wrote: > On Wed, Nov 5, 2014 at 1:18 AM, Arik Nemtsov <arik@wizery.com> wrote: >> On Wed, Nov 5, 2014 at 5:16 AM, Luis R. Rodriguez >> <mcgrof@do-not-panic.com> wrote: >>> On Wed, Oct 22, 2014 at 11:37 PM, Arik Nemtsov <arik@wizery.com> wrote: >>>> +static bool reg_wdev_chan_valid(struct wiphy *wiphy, struct wireless_dev *wdev) >>>> +{ >>>> + struct ieee80211_channel *ch; >>>> + struct cfg80211_chan_def chandef; >>>> + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); >>>> + bool ret = true; >>>> + >>>> + wdev_lock(wdev); >>>> + >>>> + if (!wdev->netdev || !netif_running(wdev->netdev)) >>>> + goto out; >>>> + >>>> + switch (wdev->iftype) { >>>> + case NL80211_IFTYPE_AP: >>>> + case NL80211_IFTYPE_P2P_GO: >>>> + if (!wdev->beacon_interval) >>>> + goto out; >>>> + >>>> + ret = cfg80211_reg_can_beacon(wiphy, >>>> + &wdev->chandef, wdev->iftype); >>>> + break; >>>> + case NL80211_IFTYPE_STATION: >>>> + case NL80211_IFTYPE_P2P_CLIENT: >>>> + if (!wdev->current_bss || >>>> + !wdev->current_bss->pub.channel) >>>> + goto out; >>>> + >>>> + ch = wdev->current_bss->pub.channel; >>>> + if (rdev->ops->get_channel && >>>> + !rdev_get_channel(rdev, wdev, &chandef)) >>>> + ret = cfg80211_chandef_usable(wiphy, &chandef, >>>> + IEEE80211_CHAN_DISABLED); >>>> + else >>>> + ret = !(ch->flags & IEEE80211_CHAN_DISABLED); >>>> + break; >>>> + default: >>>> + /* others not implemented for now */ >>> >>> Looks good to me except this of course, since its a flag that will >>> enable this per wiphy might as well WARN() if you really do not want >>> to think about this. That means that once someone does enable this on >>> a wiphy with the other type of interfaces they'll have to think about >>> this, likewise one could warn if a wiphy interface is registered with >>> the flag to follow this but supports a mode not handled here yet. >> >> But I do want to support a wiphy that has other modes >> (NL80211_IFTYPE_ADHOC), but I don't want people to get warnings every >> time they use IBSS. >> Maybe I'll rename the flag to REGULATORY_ENFORCE_AP_STA_CHANNELS? > > Then it depends on how important this feature is for your regulatory > requirements. If its important then I'd wait until its properly > implemented, if its not required for the other modes then a simple > information message would suffice. Let's settle for the pr_info then. Arik -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/net/regulatory.h b/include/net/regulatory.h index dad7ab2..701177c 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h @@ -136,6 +136,11 @@ struct regulatory_request { * otherwise initiating radiation is not allowed. This will enable the * relaxations enabled under the CFG80211_REG_RELAX_NO_IR configuration * option + * @REGULATORY_ENFORCE_CHANNELS: the regulatory core will make sure all + * interfaces on this wiphy reside on allowed channels. Upon a regdomain + * change, the interfaces are given a grace period to disconnect or move + * to an allowed channels. Interfaces on forbidden channels are forcibly + * disconnected. */ enum ieee80211_regulatory_flags { REGULATORY_CUSTOM_REG = BIT(0), @@ -144,6 +149,7 @@ enum ieee80211_regulatory_flags { REGULATORY_COUNTRY_IE_FOLLOW_POWER = BIT(3), REGULATORY_COUNTRY_IE_IGNORE = BIT(4), REGULATORY_ENABLE_RELAX_NO_IR = BIT(5), + REGULATORY_ENFORCE_CHANNELS = BIT(6), }; struct ieee80211_freq_range { diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 7449a8c..efbdff0 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -56,6 +56,7 @@ #include <net/cfg80211.h> #include "core.h" #include "reg.h" +#include "rdev-ops.h" #include "regdb.h" #include "nl80211.h" @@ -66,6 +67,12 @@ #define REG_DBG_PRINT(args...) #endif +/* + * Grace period we give before making sure all current interfaces reside on + * channels allowed by the current regulatory domain. + */ +#define REG_ENFORCE_GRACE_MS 60000 + /** * enum reg_request_treatment - regulatory request treatment * @@ -210,6 +217,9 @@ struct reg_beacon { struct ieee80211_channel chan; }; +static void reg_check_chans_work(struct work_struct *work); +static DECLARE_DELAYED_WORK(reg_check_chans, reg_check_chans_work); + static void reg_todo(struct work_struct *work); static DECLARE_WORK(reg_work, reg_todo); @@ -1518,6 +1528,88 @@ static void reg_call_notifier(struct wiphy *wiphy, wiphy->reg_notifier(wiphy, request); } +static bool reg_wdev_chan_valid(struct wiphy *wiphy, struct wireless_dev *wdev) +{ + struct ieee80211_channel *ch; + struct cfg80211_chan_def chandef; + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + bool ret = true; + + wdev_lock(wdev); + + if (!wdev->netdev || !netif_running(wdev->netdev)) + goto out; + + switch (wdev->iftype) { + case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_P2P_GO: + if (!wdev->beacon_interval) + goto out; + + ret = cfg80211_reg_can_beacon(wiphy, + &wdev->chandef, wdev->iftype); + break; + case NL80211_IFTYPE_STATION: + case NL80211_IFTYPE_P2P_CLIENT: + if (!wdev->current_bss || + !wdev->current_bss->pub.channel) + goto out; + + ch = wdev->current_bss->pub.channel; + if (rdev->ops->get_channel && + !rdev_get_channel(rdev, wdev, &chandef)) + ret = cfg80211_chandef_usable(wiphy, &chandef, + IEEE80211_CHAN_DISABLED); + else + ret = !(ch->flags & IEEE80211_CHAN_DISABLED); + break; + default: + /* others not implemented for now */ + break; + } + +out: + wdev_unlock(wdev); + return ret; +} + +static void reg_leave_invalid_chans(struct wiphy *wiphy) +{ + struct wireless_dev *wdev; + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + + ASSERT_RTNL(); + + list_for_each_entry(wdev, &rdev->wdev_list, list) + if (!reg_wdev_chan_valid(wiphy, wdev)) + cfg80211_leave(rdev, wdev); +} + +static void reg_check_chans_work(struct work_struct *work) +{ + struct cfg80211_registered_device *rdev; + + REG_DBG_PRINT("Verifying active interfaces after reg change\n"); + rtnl_lock(); + + list_for_each_entry(rdev, &cfg80211_rdev_list, list) + if (rdev->wiphy.regulatory_flags & REGULATORY_ENFORCE_CHANNELS) + reg_leave_invalid_chans(&rdev->wiphy); + + rtnl_unlock(); +} + +static void reg_check_channels(void) +{ + /* + * Give usermode a chance to do something nicer (move to another + * channel, orderly disconnection), before forcing a disconnection. + */ + mod_delayed_work(system_power_efficient_wq, + ®_check_chans, + msecs_to_jiffies(REG_ENFORCE_GRACE_MS)); +} + static void wiphy_update_regulatory(struct wiphy *wiphy, enum nl80211_reg_initiator initiator) { @@ -1557,6 +1649,8 @@ static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator) wiphy = &rdev->wiphy; wiphy_update_regulatory(wiphy, initiator); } + + reg_check_channels(); } static void handle_channel_custom(struct wiphy *wiphy, @@ -1963,8 +2057,10 @@ static void reg_process_hint(struct regulatory_request *reg_request) /* This is required so that the orig_* parameters are saved */ if (treatment == REG_REQ_ALREADY_SET && wiphy && - wiphy->regulatory_flags & REGULATORY_STRICT_REG) + wiphy->regulatory_flags & REGULATORY_STRICT_REG) { wiphy_update_regulatory(wiphy, reg_request->initiator); + reg_check_channels(); + } return; @@ -2845,6 +2941,7 @@ void regulatory_exit(void) cancel_work_sync(®_work); cancel_delayed_work_sync(®_timeout); + cancel_delayed_work_sync(®_check_chans); /* Lock to suppress warnings */ rtnl_lock();
When the regulatory settings change, some channels might become invalid. Disconnect interfaces acting on these channels, after giving userspace code a grace period to leave them. Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com> --- include/net/regulatory.h | 6 +++ net/wireless/reg.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 1 deletion(-)