| Message ID | 1481543997-24624-4-git-send-email-arend.vanspriel@broadcom.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
On Mon, 2016-12-12 at 11:59 +0000, Arend van Spriel wrote: > This patch adds support for GScan which is a scan offload feature > used in Android. > > Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com> > Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.co > m> > Reviewed-by: Franky Lin <franky.lin@broadcom.com> > Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> > --- > Changes: > V2 > - remove pr_err() statement from nl80211.c > - get rid of #if 0 code. > V3 > - change and document storage type of gscan attributes. > - remove base period attribute from nl80211. > - bucket periods are changed to be seconds. > - change NO_IR attribute to PASSIVE. > - check for NL80211_ATTR_MAC{,_MASK} if random mac support is > requested. > - remove NL80211_SCAN_FLAG_IE_DATA. > --- > include/net/cfg80211.h | 91 +++++++++++ > include/uapi/linux/nl80211.h | 146 ++++++++++++++++++ > net/wireless/core.c | 31 ++++ > net/wireless/core.h | 4 + > net/wireless/nl80211.c | 356 > ++++++++++++++++++++++++++++++++++++++++++- > net/wireless/rdev-ops.h | 25 +++ > net/wireless/scan.c | 28 ++++ > net/wireless/trace.h | 9 ++ > 8 files changed, 685 insertions(+), 5 deletions(-) > > diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h > index b78377f..8bc8842 100644 > --- a/include/net/cfg80211.h > +++ b/include/net/cfg80211.h > @@ -2453,6 +2453,92 @@ struct cfg80211_nan_func { > }; > > /** > + * struct cfg80211_gscan_channel - GScan channel parameters. > + * > + > + * @ch: specific channel. > + * @dwell_time: hint for dwell time in milliseconds. > + * @passive: indicates passive scan is requested. > + */ > +struct cfg80211_gscan_channel { > + struct ieee80211_channel *ch; > + u8 dwell_time; > + bool passive; > +}; > + > +/** > + * struct cfg80211_gscan_bucket - GScan bucket parameters. > + * > + * @idx: unique bucket index. > + * @band: bit flags for band(s) to use, see %enum > nl80211_bucket_band. > + * @report_events: This is a bit field according %enum > nl80211_bucket_report_event. > + * @period: period in which the bucket is scheduled to be scanned. > If the > + * period is too small for driver it should not fail but > report results > + * as fast as it can. For exponential backoff bucket this is > the minimum > + * period. > + * @max_period: used only for the exponential backoff bucket whose > scan period > + * will grow exponentially to a maximum period of max_period. > + * @exponent: used only for the exponential backoff bucket. > + * @step_count: used only for the exponential backoff bucket. > + * @n_channels: number of channels in @channels array. > + * @channels: channels to scan which may include DFS channels. > + */ > +struct cfg80211_gscan_bucket { > + u32 idx; > + u16 period; > + u8 band; > + u8 report_events; > + u16 max_period; > + u8 exponent; > + u8 step_count; > + u8 n_channels; > + struct cfg80211_gscan_channel *channels; > +}; > + > +/** > + * struct cfg80211_gscan_request - GScan request parameters. > + * > + * @flags: scan request flags according %enum nl80211_scan_flags. > + * @base_period: base timer period in milliseconds. > + * @max_ap_per_scan: number of APs to store in each scan entry in > the BSSID/RSSI > + * history buffer (keep APS with highest RSSI). > + * @report_threshold_percent: wake up system when scan buffer is > filled to this > + * percentage. > + * @report_threshold_num_scans: wake up system when this many scans > are stored > + * in scan buffer. > + * @mac: MAC address used for randomisation. > + * @mac_mask: MAC address mask. bits that are 0 in the mask should > be > + * randomised, bits that are 1 should be taken as is from > @mac. > + * @n_buckets: number of entries in @buckets array. > + * @buckets: array of GScan buckets. > + * > + * @dev: net device for which GScan is requested. > + * @rcu_head: RCU callback used to free the struct. > + * @owner_nlportid: netlink port which initiated this request. > + * @scan_start: start time of this scan in jiffies. > + */ > +struct cfg80211_gscan_request { > + u32 flags; > + u16 base_period; > + u8 max_ap_per_scan; > + u8 report_threshold_percent; > + u8 report_threshold_num_scans; > + u8 mac[ETH_ALEN]; > + u8 mac_mask[ETH_ALEN]; > + > + u8 n_buckets; > + > + /* internal */ > + struct net_device *dev; > + struct rcu_head rcu_head; > + u32 owner_nlportid; > + unsigned long scan_start; > + > + /* keep last */ > + struct cfg80211_gscan_bucket buckets[0]; > +}; > + > +/** > * struct cfg80211_ops - backend description for wireless > configuration > * > * This struct is registered by fullmac card drivers and/or wireless > stacks > @@ -2764,6 +2850,8 @@ struct cfg80211_nan_func { > * All other parameters must be ignored. > * > * @set_multicast_to_unicast: configure multicast to unicast > conversion for BSS > + * @start_gscan: start the GSCAN scanning offload. > + * @stop_gscan: stop the GSCAN scanning offload. > */ > struct cfg80211_ops { > int (*suspend)(struct wiphy *wiphy, struct > cfg80211_wowlan *wow); > @@ -3048,6 +3136,9 @@ struct cfg80211_ops { > int (*set_multicast_to_unicast)(struct wiphy *wiphy, > struct net_device *dev, > const bool enabled); > + int (*start_gscan)(struct wiphy *wiphy, struct > net_device *dev, > + struct cfg80211_gscan_request > *gscan_req); > + int (*stop_gscan)(struct wiphy *wiphy, struct > net_device *dev); > }; > > /* > diff --git a/include/uapi/linux/nl80211.h > b/include/uapi/linux/nl80211.h > index 01ab2f7..5e42383 100644 > --- a/include/uapi/linux/nl80211.h > +++ b/include/uapi/linux/nl80211.h > @@ -894,6 +894,12 @@ > * does not result in a change for the current association. > Currently, > * only the %NL80211_ATTR_IE data is used and updated with > this command. > * > + * @NL80211_CMD_START_GSCAN: start GScan. > + * @NL80211_CMD_STOP_GSCAN: request to stop current GScan. > + * @NL80211_CMD_GSCAN_STOPPED: indicates that the currently running > GScan > + * has stopped. This event is generated upon > @NL80211_CMD_STOP_GSCAN and > + * the driver may issue this event at any time when a GScan > is running. > + * > * @NL80211_CMD_MAX: highest used command number > * @__NL80211_CMD_AFTER_LAST: internal use > */ > @@ -1093,6 +1099,10 @@ enum nl80211_commands { > > NL80211_CMD_UPDATE_CONNECT_PARAMS, > > + NL80211_CMD_START_GSCAN, > + NL80211_CMD_STOP_GSCAN, > + NL80211_CMD_GSCAN_STOPPED, > + > /* add new commands above here */ > > /* used to define NL80211_CMD_MAX below */ > @@ -2389,6 +2399,7 @@ enum nl80211_attrs { > > NL80211_ATTR_BSSID, > NL80211_ATTR_GSCAN_CAPS, > + NL80211_ATTR_GSCAN_PARAMS, > > /* add attributes here, update the policy in nl80211.c */ > > @@ -5246,4 +5257,139 @@ enum nl80211_gscan_caps_attr { > NL80211_GSCAN_CAPS_ATTR_MAX = > __NL80211_GSCAN_CAPS_ATTR_AFTER_LAST - 1 > }; > > +/** > + * enum nl80211_gscan_attr - common GScan parameters. > + * > + * @__NL80211_GSCAN_ATTR_INVALID: reserved. > + * @NL80211_GSCAN_ATTR_MAX_AP_PER_SCAN: number of APs that are kept > per > + * scan. The kept APs are the ones with strongest RSSI level > (u8). > + * @NL80211_GSCAN_ATTR_REPORT_PERC: threshold specifying percentage > of > + * scan cache filled that should trigger event for scan > results (u8). > + * @NL80211_GSCAN_ATTR_REPORT_SCANS: threshold specifying number of > scans > + * after which an event is expected for scan results (u8). > + * @NL80211_GSCAN_ATTR_BUCKETS: nested attribute specifying > + * per-bucket parameters for GScan. See %enum > nl80211_gscan_bucket_attr > + * for description. > + * @NL80211_GSCAN_ATTR_MAX: highest GScan attribute. > + * @__NL80211_GSCAN_ATTR_AFTER_LAST: internal use. > + */ > +enum nl80211_gscan_attr { > + __NL80211_GSCAN_ATTR_INVALID, > + NL80211_GSCAN_ATTR_MAX_AP_PER_SCAN, > + NL80211_GSCAN_ATTR_REPORT_PERC, > + NL80211_GSCAN_ATTR_REPORT_SCANS, > + NL80211_GSCAN_ATTR_BUCKETS, > + > + /* keep last */ > + __NL80211_GSCAN_ATTR_AFTER_LAST, > + NL80211_GSCAN_ATTR_MAX = __NL80211_GSCAN_ATTR_AFTER_LAST - 1 > +}; > + > +/** > + * enum nl80211_gscan_bucket_attr - per-bucket GScan parameters. > + * > + * @__NL80211_GSCAN_BUCKET_ATTR_INVALID, > + * @NL80211_GSCAN_BUCKET_ATTR_ID: unique bucket id (u32). > + * @NL80211_GSCAN_BUCKET_ATTR_BAND: specifies the band to be scanned > + * according %enum nl80211_bucket_band. If specified > + * @NL80211_GSCAN_BUCKET_ATTR_CHANNELS is ignored (u8). > + * @NL80211_GSCAN_BUCKET_ATTR_PERIOD: specifies the period between > consecutive > + * scans of this bucket in seconds. For the backoff bucket > this is > + * period(0) (u16). > + * @NL80211_GSCAN_BUCKET_ATTR_REPORT: specifies reporting flags > according > + * %enum nl80211_bucket_report_event (u8). > + * @NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD: maximum period between > + * consecutive scans. If specified this is a backoff bucket > in > + * which the period increases according formula: > + * period(N) = period(0) * (base ^ (N/step_count)) (u16) > + * @NL80211_GSCAN_BUCKET_ATTR_EXPONENT: exponential base value as > used > + * in given formula. This attribute is required when > + * @NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD is specified (u8). > + * @NL80211_GSCAN_BUCKET_ATTR_STEPS: step count as used in given > formula. > + * This attribute is required when > @NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD > + * is specified (u8). > + * @NL80211_GSCAN_BUCKET_ATTR_CHANNELS: nested attribute specifying > the > + * channels that are to be scanned for this bucket. > + * @NL80211_GSCAN_BUCKET_ATTR_MAX: highest GScan bucket attribute. > + * @__NL80211_GSCAN_BUCKET_ATTR_AFTER_LAST: internal use. > + */ > +enum nl80211_gscan_bucket_attr { > + __NL80211_GSCAN_BUCKET_ATTR_INVALID, > + NL80211_GSCAN_BUCKET_ATTR_ID, > + NL80211_GSCAN_BUCKET_ATTR_BAND, > + NL80211_GSCAN_BUCKET_ATTR_PERIOD, > + NL80211_GSCAN_BUCKET_ATTR_REPORT, > + NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD, > + NL80211_GSCAN_BUCKET_ATTR_EXPONENT, > + NL80211_GSCAN_BUCKET_ATTR_STEPS, > + NL80211_GSCAN_BUCKET_ATTR_CHANNELS, > + > + /* keep last */ > + __NL80211_GSCAN_BUCKET_ATTR_AFTER_LAST, > + NL80211_GSCAN_BUCKET_ATTR_MAX = > __NL80211_GSCAN_BUCKET_ATTR_AFTER_LAST - 1 > +}; > + > +/** > + * enum nl80211_gscan_chan_attr - GScan bucket channel parameters. > + * > + * @__NL80211_GSCAN_CHAN_ATTR_INVALID: reserved. > + * @NL80211_GSCAN_CHAN_ATTR_FREQ: frequency of channel to be scanned > (u32). > + * @NL80211_GSCAN_CHAN_ATTR_DWELL_TIME: dwell time in milliseconds > to stay > + * on this channel during scanning (u8). > + * @NL80211_GSCAN_CHAN_ATTR_PASSIVE: flag attribute indicating that > scanning > + * should be done passive for this channel. > + * @NL80211_GSCAN_CHAN_ATTR_MAX: highest GScan channel attribute. > + * @__NL80211_GSCAN_CHAN_ATTR_AFTER_LAST: internal use. > + * > + * Apart from the channel itself the attributes > %NL80211_GSCAN_CHAN_ATTR_DWELL_TIME > + * and %NL80211_GSCAN_CHAN_ATTR_PASSIVE are advisory values. The > driver may or > + * may not comply. > + */ > +enum nl80211_gscan_chan_attr { > + __NL80211_GSCAN_CHAN_ATTR_INVALID, > + NL80211_GSCAN_CHAN_ATTR_FREQ, > + NL80211_GSCAN_CHAN_ATTR_DWELL_TIME, > + NL80211_GSCAN_CHAN_ATTR_PASSIVE, > + > + /* keep last */ > + __NL80211_GSCAN_CHAN_ATTR_AFTER_LAST, > + NL80211_GSCAN_CHAN_ATTR_MAX = > __NL80211_GSCAN_CHAN_ATTR_AFTER_LAST - 1 > +}; > + > +/** > + * enum nl80211_bucket_band - GScan bucket band selection. Quite possibly this was already covered and somebody requested you to change this to the current name. If that's the case, ignore this. But shouldn't this enum and bucket_event_report include "gscan" in their name, like the other gscan specific stuff does? Are these going to get used for something else too, and will that thing make sense with the word "bucket"? Just "nl80211_bucket_band" is pretty generic. Dan > + * @NL80211_BUCKET_BAND_2GHZ: consider all device supported channels > + * in 2G band. > + * @NL80211_BUCKET_BAND_5GHZ: consider all device supported channels > + * in 5G band, ie. both DFS and non-DFS when > @NL80211_BUCKET_BAND_NODFS > + * and @NL80211_BUCKET_BAND_DFS_ONLY are not set. > + * @NL80211_BUCKET_BAND_NODFS: only consider non-DFS channels. Only > + * applicable when 5G band is selected, otherwise ignored. > + * @NL80211_BUCKET_BAND_DFS_ONLY: only consider DFS channels. Only > + * applicable when 5G band is selected, otherwise ignored. > + * > + * Setting both @NL80211_BUCKET_BAND_NODFS and > @NL80211_BUCKET_BAND_DFS_ONLY > + * is considerd invalid. > + */ > +enum nl80211_bucket_band { > + NL80211_BUCKET_BAND_2GHZ = (1 << 0), > + NL80211_BUCKET_BAND_5GHZ = (1 << 1), > + NL80211_BUCKET_BAND_NODFS = (1 << 2), > + NL80211_BUCKET_BAND_DFS_ONLY = (1 << 3), > +}; > + > +/** > + * enum nl80211_bucket_report_event - GScan bucket report flags. > + * > + * @NL80211_BUCKET_REPORT_EACH_SCAN: report each bucket scan > completion. > + * @NL80211_BUCKET_REPORT_FULL_RESULTS: report full scan results. > + * @NL80211_BUCKET_REPORT_NO_BATCH: no batching required. > + */ > +enum nl80211_bucket_report_event { > + NL80211_BUCKET_REPORT_EACH_SCAN = (1 << 0), > + NL80211_BUCKET_REPORT_FULL_RESULTS = (1 << 1), > + NL80211_BUCKET_REPORT_NO_BATCH = (1 << 2), > +}; > + > #endif /* __LINUX_NL80211_H */ > diff --git a/net/wireless/core.c b/net/wireless/core.c > index 158c59e..760a2fb 100644 > --- a/net/wireless/core.c > +++ b/net/wireless/core.c > @@ -357,6 +357,20 @@ static void cfg80211_sched_scan_stop_wk(struct > work_struct *work) > rtnl_unlock(); > } > > +static void cfg80211_gscan_stop_wk(struct work_struct *work) > +{ > + struct cfg80211_registered_device *rdev; > + > + rdev = container_of(work, struct cfg80211_registered_device, > + gscan_stop_wk); > + > + rtnl_lock(); > + > + __cfg80211_stop_gscan(rdev, false); > + > + rtnl_unlock(); > +} > + > /* exported functions */ > > struct wiphy *wiphy_new_nm(const struct cfg80211_ops *ops, int > sizeof_priv, > @@ -383,6 +397,7 @@ struct wiphy *wiphy_new_nm(const struct > cfg80211_ops *ops, int sizeof_priv, > WARN_ON(ops->remain_on_channel && !ops- > >cancel_remain_on_channel); > WARN_ON(ops->tdls_channel_switch && !ops- > >tdls_cancel_channel_switch); > WARN_ON(ops->add_tx_ts && !ops->del_tx_ts); > + WARN_ON(ops->start_gscan && !ops->stop_gscan); > > alloc_size = sizeof(*rdev) + sizeof_priv; > > @@ -456,6 +471,7 @@ struct wiphy *wiphy_new_nm(const struct > cfg80211_ops *ops, int sizeof_priv, > spin_lock_init(&rdev->destroy_list_lock); > INIT_WORK(&rdev->destroy_work, cfg80211_destroy_iface_wk); > INIT_WORK(&rdev->sched_scan_stop_wk, > cfg80211_sched_scan_stop_wk); > + INIT_WORK(&rdev->gscan_stop_wk, cfg80211_gscan_stop_wk); > > #ifdef CONFIG_CFG80211_DEFAULT_PS > rdev->wiphy.flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT; > @@ -690,6 +706,12 @@ int wiphy_register(struct wiphy *wiphy) > (wiphy->bss_select_support & > ~(BIT(__NL80211_BSS_SELECT_ATTR_AFTER_LAST) - 2)))) > return -EINVAL; > > + /* buckets must have unique index and in nl80211 parsing > + * a u32 is used to verify that hence this limit. > + */ > + if (WARN_ON(wiphy->gscan && wiphy->gscan->max_scan_buckets > > 32)) > + return -EINVAL; > + > if (wiphy->addresses) > memcpy(wiphy->perm_addr, wiphy->addresses[0].addr, > ETH_ALEN); > > @@ -1001,6 +1023,7 @@ void __cfg80211_leave(struct > cfg80211_registered_device *rdev, > { > struct net_device *dev = wdev->netdev; > struct cfg80211_sched_scan_request *sched_scan_req; > + struct cfg80211_gscan_request *gscan_req; > > ASSERT_RTNL(); > ASSERT_WDEV_LOCK(wdev); > @@ -1014,6 +1037,9 @@ void __cfg80211_leave(struct > cfg80211_registered_device *rdev, > sched_scan_req = rtnl_dereference(rdev- > >sched_scan_req); > if (sched_scan_req && dev == sched_scan_req->dev) > __cfg80211_stop_sched_scan(rdev, false); > + gscan_req = rtnl_dereference(rdev->gscan_req); > + if (gscan_req && dev == gscan_req->dev) > + __cfg80211_stop_gscan(rdev, false); > > #ifdef CONFIG_CFG80211_WEXT > kfree(wdev->wext.ie); > @@ -1089,6 +1115,7 @@ static int cfg80211_netdev_notifier_call(struct > notifier_block *nb, > struct wireless_dev *wdev = dev->ieee80211_ptr; > struct cfg80211_registered_device *rdev; > struct cfg80211_sched_scan_request *sched_scan_req; > + struct cfg80211_gscan_request *gscan_req; > > if (!wdev) > return NOTIFY_DONE; > @@ -1160,6 +1187,10 @@ static int > cfg80211_netdev_notifier_call(struct notifier_block *nb, > sched_scan_req->dev == wdev->netdev)) { > __cfg80211_stop_sched_scan(rdev, false); > } > + gscan_req = rtnl_dereference(rdev->gscan_req); > + if (WARN_ON(gscan_req && gscan_req->dev == wdev- > >netdev)) { > + __cfg80211_stop_gscan(rdev, false); > + } > > rdev->opencount--; > wake_up(&rdev->dev_wait); > diff --git a/net/wireless/core.h b/net/wireless/core.h > index ec5f333..ee1d162 100644 > --- a/net/wireless/core.h > +++ b/net/wireless/core.h > @@ -75,6 +75,7 @@ struct cfg80211_registered_device { > struct cfg80211_scan_request *scan_req; /* protected by RTNL > */ > struct sk_buff *scan_msg; > struct cfg80211_sched_scan_request __rcu *sched_scan_req; > + struct cfg80211_gscan_request __rcu *gscan_req; > unsigned long suspend_at; > struct work_struct scan_done_wk; > struct work_struct sched_scan_results_wk; > @@ -96,6 +97,7 @@ struct cfg80211_registered_device { > struct work_struct destroy_work; > > struct work_struct sched_scan_stop_wk; > + struct work_struct gscan_stop_wk; > > /* must be last because of the way we do wiphy_priv(), > * and it should at least be aligned to NETDEV_ALIGN */ > @@ -422,6 +424,8 @@ void ___cfg80211_scan_done(struct > cfg80211_registered_device *rdev, > void __cfg80211_sched_scan_results(struct work_struct *wk); > int __cfg80211_stop_sched_scan(struct cfg80211_registered_device > *rdev, > bool driver_initiated); > +int __cfg80211_stop_gscan(struct cfg80211_registered_device *rdev, > + bool driver_initiated); > void cfg80211_upload_connect_keys(struct wireless_dev *wdev); > int cfg80211_change_iface(struct cfg80211_registered_device *rdev, > struct net_device *dev, enum > nl80211_iftype ntype, > diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c > index 14e1940..4186ece 100644 > --- a/net/wireless/nl80211.c > +++ b/net/wireless/nl80211.c > @@ -9,6 +9,7 @@ > #include <linux/if.h> > #include <linux/module.h> > #include <linux/err.h> > +#include <linux/gcd.h> > #include <linux/slab.h> > #include <linux/list.h> > #include <linux/if_ether.h> > @@ -405,6 +406,7 @@ enum nl80211_multicast_groups { > [NL80211_ATTR_FILS_NONCES] = { .len = 2 * FILS_NONCE_LEN }, > [NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED] = { .type = > NLA_FLAG, }, > [NL80211_ATTR_BSSID] = { .len = ETH_ALEN }, > + [NL80211_ATTR_GSCAN_PARAMS] = { .type = NLA_NESTED }, > }; > > /* policy for the key attributes */ > @@ -11860,6 +11862,322 @@ static int > nl80211_set_multicast_to_unicast(struct sk_buff *skb, > return rdev_set_multicast_to_unicast(rdev, dev, enabled); > } > > +static const > +struct nla_policy nl80211_gscan_policy[NL80211_GSCAN_ATTR_MAX + 1] = > { > + [NL80211_GSCAN_ATTR_MAX_AP_PER_SCAN] = { .type = NLA_U8 }, > + [NL80211_GSCAN_ATTR_REPORT_PERC] = { .type = NLA_U8 }, > + [NL80211_GSCAN_ATTR_REPORT_SCANS] = { .type = NLA_U8 }, > + [NL80211_GSCAN_ATTR_BUCKETS] = { .type = NLA_NESTED }, > +}; > + > +static const struct nla_policy > +nl80211_gscan_bucket_policy[NL80211_GSCAN_BUCKET_ATTR_MAX + 1] = { > + [NL80211_GSCAN_BUCKET_ATTR_ID] = { .type = NLA_U32 }, > + [NL80211_GSCAN_BUCKET_ATTR_BAND] = { .type = NLA_U8 }, > + [NL80211_GSCAN_BUCKET_ATTR_PERIOD] = { .type = NLA_U16 }, > + [NL80211_GSCAN_BUCKET_ATTR_REPORT] = { .type = NLA_U8 }, > + [NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD] = { .type = NLA_U16 > }, > + [NL80211_GSCAN_BUCKET_ATTR_EXPONENT] = { .type = NLA_U8 }, > + [NL80211_GSCAN_BUCKET_ATTR_STEPS] = { .type = NLA_U8 }, > + [NL80211_GSCAN_BUCKET_ATTR_CHANNELS] = { .type = NLA_NESTED > }, > +}; > + > +static const struct nla_policy > +nl80211_gscan_channel_policy[NL80211_GSCAN_CHAN_ATTR_MAX + 1] = { > + [NL80211_GSCAN_CHAN_ATTR_FREQ] = { .type = NLA_U32 }, > + [NL80211_GSCAN_CHAN_ATTR_DWELL_TIME] = { .type = NLA_U8 }, > + [NL80211_GSCAN_CHAN_ATTR_PASSIVE] = { .type = NLA_FLAG }, > +}; > + > +static int nl80211_parse_gscan_channel(struct > cfg80211_registered_device *rdev, > + struct nlattr *nattr, > + struct cfg80211_gscan_channel > *chan) > +{ > + struct nlattr *tb[NL80211_GSCAN_CHAN_ATTR_MAX + 1]; > + struct ieee80211_channel *ch; > + int err; > + > + err = nla_parse(tb, NL80211_GSCAN_CHAN_ATTR_MAX, > nla_data(nattr), > + nla_len(nattr), > nl80211_gscan_channel_policy); > + if (err) > + return err; > + > + if (!tb[NL80211_GSCAN_CHAN_ATTR_FREQ]) > + return -EINVAL; > + > + ch = ieee80211_get_channel(&rdev->wiphy, > + nla_get_u32(tb[NL80211_GSCAN_CHAN > _ATTR_FREQ])); > + if (!ch || (ch->flags & IEEE80211_CHAN_DISABLED)) > + return -EINVAL; > + > + chan->ch = ch; > + > + if (tb[NL80211_GSCAN_CHAN_ATTR_DWELL_TIME]) > + chan->dwell_time = > nla_get_u8(tb[NL80211_GSCAN_CHAN_ATTR_DWELL_TIME]); > + > + chan->passive = > nla_get_flag(tb[NL80211_GSCAN_CHAN_ATTR_PASSIVE]); > + return 0; > +} > + > +static int nl80211_parse_gscan_bucket(struct > cfg80211_registered_device *rdev, > + struct nlattr *nattr, > + struct cfg80211_gscan_bucket > *bucket, > + struct cfg80211_gscan_channel > *channels) > +{ > + struct nlattr *tb[NL80211_GSCAN_BUCKET_ATTR_MAX + 1]; > + struct nlattr *chan; > + struct cfg80211_gscan_channel *ch; > + int err, rem; > + int num_chans = 0; > + u32 band_select = 0; > + u32 dfs_invalid_mask; > + > + err = nla_parse(tb, NL80211_GSCAN_BUCKET_ATTR_MAX, > nla_data(nattr), > + nla_len(nattr), > nl80211_gscan_bucket_policy); > + if (err) > + return err; > + > + if (!tb[NL80211_GSCAN_BUCKET_ATTR_ID] || > + !tb[NL80211_GSCAN_BUCKET_ATTR_PERIOD]) > + return -EINVAL; > + > + bucket->idx = nla_get_u32(tb[NL80211_GSCAN_BUCKET_ATTR_ID]); > + if (tb[NL80211_GSCAN_BUCKET_ATTR_BAND]) { > + band_select = > nla_get_u8(tb[NL80211_GSCAN_BUCKET_ATTR_BAND]); > + > + /* only makes sense if a band is selected */ > + if (!(band_select & (NL80211_BUCKET_BAND_2GHZ | > NL80211_BUCKET_BAND_5GHZ))) > + return -EINVAL; > + } else if (!tb[NL80211_GSCAN_BUCKET_ATTR_CHANNELS]) { > + return -EINVAL; > + } > + > + dfs_invalid_mask = NL80211_BUCKET_BAND_5GHZ | > NL80211_BUCKET_BAND_NODFS | > + NL80211_BUCKET_BAND_DFS_ONLY; > + if ((band_select & dfs_invalid_mask) == dfs_invalid_mask) > + return -EINVAL; > + > + bucket->band = band_select; > + bucket->period = > nla_get_u16(tb[NL80211_GSCAN_BUCKET_ATTR_PERIOD]); > + > + if (tb[NL80211_GSCAN_BUCKET_ATTR_REPORT]) > + bucket->report_events = > nla_get_u8(tb[NL80211_GSCAN_BUCKET_ATTR_REPORT]); > + > + if (tb[NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD]) > + bucket->max_period = > nla_get_u16(tb[NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD]); > + > + if (bucket->max_period) { > + if (bucket->max_period < bucket->period) > + return -EINVAL; > + /* additional attributes required for backoff bucket > */ > + if (bucket->max_period > bucket->period) { > + if (!tb[NL80211_GSCAN_BUCKET_ATTR_EXPONENT] > || > + !tb[NL80211_GSCAN_BUCKET_ATTR_STEPS]) > + return -EINVAL; > + > + bucket->exponent = > nla_get_u8(tb[NL80211_GSCAN_BUCKET_ATTR_EXPONENT]); > + bucket->step_count = > nla_get_u8(tb[NL80211_GSCAN_BUCKET_ATTR_STEPS]); > + } > + } > + > + /* ignore channels if band is specified */ > + if (band_select) > + return 0; > + > + nla_for_each_nested(chan, > tb[NL80211_GSCAN_BUCKET_ATTR_CHANNELS], rem) { > + num_chans++; > + } > + if (num_chans > 16) > + return -EINVAL; > + > + bucket->n_channels = num_chans; > + if (!num_chans) > + return 0; > + > + bucket->channels = channels; > + ch = &bucket->channels[0]; > + nla_for_each_nested(chan, > tb[NL80211_GSCAN_BUCKET_ATTR_CHANNELS], rem) { > + err = nl80211_parse_gscan_channel(rdev, chan, ch); > + if (err) { > + return err; > + } > + ch++; > + } > + > + return 0; > +} > + > +static struct cfg80211_gscan_request * > +nl80211_alloc_gscan_request(struct cfg80211_registered_device *rdev, > + struct nlattr *buckets_attr) > +{ > + struct cfg80211_gscan_request *req; > + struct cfg80211_gscan_bucket *b; > + struct cfg80211_gscan_channel *ch; > + int n_buckets, n_channels; > + struct nlattr *attr, *bucket, *channel; > + int rem, rem_b, rem_c; > + size_t reqsize; > + > + if (!buckets_attr) > + return ERR_PTR(-EINVAL); > + > + n_buckets = 0; > + n_channels = 0; > + nla_for_each_nested(bucket, buckets_attr, rem) { > + n_buckets++; > + if (n_buckets > rdev->wiphy.gscan->max_scan_buckets) > + return ERR_PTR(-EINVAL); > + > + nla_for_each_nested(attr, bucket, rem_b) { > + if (nla_type(attr) == > NL80211_GSCAN_BUCKET_ATTR_CHANNELS) { > + nla_for_each_nested(channel, attr, > rem_c) > + n_channels++; > + } > + } > + } > + > + reqsize = sizeof(*req) + > + sizeof(*b) * n_buckets + > + sizeof(*ch) * n_channels; > + > + req = kzalloc(reqsize, GFP_KERNEL); > + if (!req) > + return ERR_PTR(-ENOMEM); > + > + req->n_buckets = n_buckets; > + return req; > +} > + > +static int nl80211_parse_gscan_params(struct > cfg80211_registered_device *rdev, > + struct nlattr *attrs[], > + struct cfg80211_gscan_request > **request) > +{ > + struct cfg80211_gscan_request *req; > + struct nlattr *tb[NL80211_GSCAN_ATTR_MAX + 1]; > + struct nlattr *bucket; > + struct cfg80211_gscan_bucket *b; > + struct cfg80211_gscan_channel *ch; > + int err, rem, i; > + u32 bucket_map; > + > + if (!attrs[NL80211_ATTR_GSCAN_PARAMS]) > + return -EINVAL; > + > + err = nla_parse(tb, NL80211_GSCAN_ATTR_MAX, > + nla_data(attrs[NL80211_ATTR_GSCAN_PARAMS]), > + nla_len(attrs[NL80211_ATTR_GSCAN_PARAMS]), > + nl80211_gscan_policy); > + if (err) > + return err; > + > + req = nl80211_alloc_gscan_request(rdev, > tb[NL80211_GSCAN_ATTR_BUCKETS]); > + if (IS_ERR(req)) > + return PTR_ERR(req); > + > + if (tb[NL80211_GSCAN_ATTR_MAX_AP_PER_SCAN]) > + req->max_ap_per_scan = > nla_get_u8(tb[NL80211_GSCAN_ATTR_MAX_AP_PER_SCAN]); > + if (tb[NL80211_GSCAN_ATTR_REPORT_PERC]) > + req->report_threshold_percent = > nla_get_u8(tb[NL80211_GSCAN_ATTR_REPORT_PERC]); > + if (tb[NL80211_GSCAN_ATTR_REPORT_SCANS]) > + req->report_threshold_num_scans = > nla_get_u8(tb[NL80211_GSCAN_ATTR_REPORT_SCANS]); > + > + b = &req->buckets[0]; > + ch = (struct cfg80211_gscan_channel *)(&req->buckets[req- > >n_buckets]); > + nla_for_each_nested(bucket, tb[NL80211_GSCAN_ATTR_BUCKETS], > rem) { > + err = nl80211_parse_gscan_bucket(rdev, bucket, b, > ch); > + if (err) > + goto free_req; > + ch += b->n_channels; > + b++; > + } > + bucket_map = 0; > + for (i = 0; i < req->n_buckets; i++) { > + if (BIT(req->buckets[i].idx) & bucket_map) { > + err = -EINVAL; > + goto free_req; > + } > + bucket_map |= BIT(req->buckets[i].idx); > + > + if (req->base_period) > + req->base_period = gcd(req- > >buckets[i].period, > + req->base_period); > + else > + req->base_period = req->buckets[i].period; > + } > + *request = req; > + return 0; > + > +free_req: > + kfree(req); > + return err; > +} > + > +static int nl80211_start_gscan(struct sk_buff *skb, struct genl_info > *info) > +{ > + struct cfg80211_gscan_request *request; > + struct cfg80211_registered_device *rdev = info->user_ptr[0]; > + struct net_device *dev = info->user_ptr[1]; > + struct wireless_dev *wdev = dev->ieee80211_ptr; > + int err; > + > + if (!rdev->wiphy.gscan || > + !rdev->ops->start_gscan) > + return -EOPNOTSUPP; > + > + if (rdev->gscan_req) > + return -EINPROGRESS; > + > + err = nl80211_parse_gscan_params(rdev, info->attrs, > &request); > + if (err) > + return err; > + > + if (info->attrs[NL80211_ATTR_MAC]) > + memcpy(request->mac, nla_data(info- > >attrs[NL80211_ATTR_MAC]), > + ETH_ALEN); > + if (info->attrs[NL80211_ATTR_MAC_MASK]) > + memcpy(request->mac_mask, > + nla_data(info->attrs[NL80211_ATTR_MAC_MASK]), > ETH_ALEN); > + if (info->attrs[NL80211_ATTR_SCAN_FLAGS]) { > + request->flags = nla_get_u32(info- > >attrs[NL80211_ATTR_SCAN_FLAGS]); > + if (request->flags & NL80211_SCAN_FLAG_RANDOM_ADDR > && > + (!info->attrs[NL80211_ATTR_MAC] || > + !info->attrs[NL80211_ATTR_MAC_MASK])) { > + kfree(request); > + return -EINVAL; > + } > + } > + > + wdev_lock(wdev); > + err = rdev_start_gscan(rdev, dev, request); > + wdev_unlock(wdev); > + if (err) { > + kfree(request); > + return err; > + } > + > + request->scan_start = jiffies; > + request->dev = dev; > + if (info->attrs[NL80211_ATTR_SOCKET_OWNER]) > + request->owner_nlportid = info->snd_portid; > + > + rcu_assign_pointer(rdev->gscan_req, request); > + > + nl80211_send_scan_event(rdev, dev, NL80211_CMD_START_GSCAN); > + return 0; > +} > + > +static int nl80211_stop_gscan(struct sk_buff *skb, struct genl_info > *info) > +{ > + struct cfg80211_registered_device *rdev = info->user_ptr[0]; > + > + if (!rdev->wiphy.gscan || > + !rdev->ops->stop_gscan) > + return -EOPNOTSUPP; > + > + return __cfg80211_stop_gscan(rdev, false); > +} > + > #define NL80211_FLAG_NEED_WIPHY 0x01 > #define NL80211_FLAG_NEED_NETDEV 0x02 > #define NL80211_FLAG_NEED_RTNL 0x04 > @@ -12735,6 +13053,22 @@ static void nl80211_post_doit(const struct > genl_ops *ops, struct sk_buff *skb, > .internal_flags = NL80211_FLAG_NEED_NETDEV | > NL80211_FLAG_NEED_RTNL, > }, > + { > + .cmd = NL80211_CMD_START_GSCAN, > + .doit = nl80211_start_gscan, > + .policy = nl80211_policy, > + .flags = GENL_UNS_ADMIN_PERM, > + .internal_flags = NL80211_FLAG_NEED_NETDEV_UP | > + NL80211_FLAG_NEED_RTNL, > + }, > + { > + .cmd = NL80211_CMD_STOP_GSCAN, > + .doit = nl80211_stop_gscan, > + .policy = nl80211_policy, > + .flags = GENL_UNS_ADMIN_PERM, > + .internal_flags = NL80211_FLAG_NEED_NETDEV_UP | > + NL80211_FLAG_NEED_RTNL, > + }, > }; > > static struct genl_family nl80211_fam __ro_after_init = { > @@ -14540,12 +14874,18 @@ static int nl80211_netlink_notify(struct > notifier_block * nb, > list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) { > bool schedule_destroy_work = false; > bool schedule_scan_stop = false; > + bool schedule_gscan_stop = false; > struct cfg80211_sched_scan_request *sched_scan_req = > rcu_dereference(rdev->sched_scan_req); > + struct cfg80211_gscan_request *gscan_req = > + rcu_dereference(rdev->gscan_req); > > if (sched_scan_req && notify->portid && > sched_scan_req->owner_nlportid == notify- > >portid) > schedule_scan_stop = true; > + if (gscan_req && notify->portid && > + gscan_req->owner_nlportid == notify->portid) > + schedule_gscan_stop = true; > > list_for_each_entry_rcu(wdev, &rdev- > >wiphy.wdev_list, list) { > cfg80211_mlme_unregister_socket(wdev, > notify->portid); > @@ -14576,12 +14916,18 @@ static int nl80211_netlink_notify(struct > notifier_block * nb, > spin_unlock(&rdev- > >destroy_list_lock); > schedule_work(&rdev->destroy_work); > } > - } else if (schedule_scan_stop) { > - sched_scan_req->owner_nlportid = 0; > + } else { > + if (schedule_scan_stop) { > + sched_scan_req->owner_nlportid = 0; > > - if (rdev->ops->sched_scan_stop && > - rdev->wiphy.flags & > WIPHY_FLAG_SUPPORTS_SCHED_SCAN) > - schedule_work(&rdev- > >sched_scan_stop_wk); > + if (rdev->ops->sched_scan_stop && > + rdev->wiphy.flags & > WIPHY_FLAG_SUPPORTS_SCHED_SCAN) > + schedule_work(&rdev- > >sched_scan_stop_wk); > + } > + if (schedule_gscan_stop) { > + gscan_req->owner_nlportid = 0; > + schedule_work(&rdev->gscan_stop_wk); > + } > } > } > > diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h > index 2f42507..196e6a7 100644 > --- a/net/wireless/rdev-ops.h > +++ b/net/wireless/rdev-ops.h > @@ -1153,4 +1153,29 @@ static inline int rdev_set_qos_map(struct > cfg80211_registered_device *rdev, > trace_rdev_return_int(&rdev->wiphy, ret); > return ret; > } > + > +static inline int > +rdev_start_gscan(struct cfg80211_registered_device *rdev, > + struct net_device *dev, > + struct cfg80211_gscan_request *request) > +{ > + int ret; > + > + trace_rdev_start_gscan(&rdev->wiphy, dev); > + ret = rdev->ops->start_gscan(&rdev->wiphy, dev, request); > + trace_rdev_return_int(&rdev->wiphy, ret); > + return ret; > +} > + > +static inline int > +rdev_stop_gscan(struct cfg80211_registered_device *rdev, > + struct net_device *dev) > +{ > + int ret; > + > + trace_rdev_stop_gscan(&rdev->wiphy, dev); > + ret = rdev->ops->stop_gscan(&rdev->wiphy, dev); > + trace_rdev_return_int(&rdev->wiphy, ret); > + return ret; > +} > #endif /* __CFG80211_RDEV_OPS */ > diff --git a/net/wireless/scan.c b/net/wireless/scan.c > index 174076b..8c141c2 100644 > --- a/net/wireless/scan.c > +++ b/net/wireless/scan.c > @@ -386,6 +386,34 @@ int __cfg80211_stop_sched_scan(struct > cfg80211_registered_device *rdev, > return 0; > } > > +int __cfg80211_stop_gscan(struct cfg80211_registered_device *rdev, > + bool driver_initiated) > +{ > + struct cfg80211_gscan_request *gscan_req; > + struct net_device *dev; > + > + ASSERT_RTNL(); > + > + if (!rdev->gscan_req) > + return -ENOENT; > + > + gscan_req = rtnl_dereference(rdev->gscan_req); > + dev = gscan_req->dev; > + > + if (!driver_initiated) { > + int err = rdev_stop_gscan(rdev, dev); > + if (err) > + return err; > + } > + > + nl80211_send_scan_event(rdev, dev, > NL80211_CMD_GSCAN_STOPPED); > + > + RCU_INIT_POINTER(rdev->gscan_req, NULL); > + kfree_rcu(gscan_req, rcu_head); > + > + return 0; > +} > + > void cfg80211_bss_age(struct cfg80211_registered_device *rdev, > unsigned long age_secs) > { > diff --git a/net/wireless/trace.h b/net/wireless/trace.h > index ea1b47e..1d0fde9 100644 > --- a/net/wireless/trace.h > +++ b/net/wireless/trace.h > @@ -3067,6 +3067,15 @@ > WIPHY_PR_ARG, NETDEV_PR_ARG, > BOOL_TO_STR(__entry->enabled)) > ); > + > +DEFINE_EVENT(wiphy_netdev_evt, rdev_start_gscan, > + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev), > + TP_ARGS(wiphy, netdev) > +); > +DEFINE_EVENT(wiphy_netdev_evt, rdev_stop_gscan, > + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev), > + TP_ARGS(wiphy, netdev) > +); > #endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */ > > #undef TRACE_INCLUDE_PATH > -- > 1.9.1 >
On 12-12-2016 18:43, Dan Williams wrote: >> + >> +/** >> + * enum nl80211_bucket_band - GScan bucket band selection. > Quite possibly this was already covered and somebody requested you to > change this to the current name. If that's the case, ignore this. Nope. You are the first ;-) > But shouldn't this enum and bucket_event_report include "gscan" in > their name, like the other gscan specific stuff does? Are these going > to get used for something else too, and will that thing make sense with > the word "bucket"? Just "nl80211_bucket_band" is pretty generic. I figured the term bucket was making it gscan specific, but you are right. Will change it. Thanks, Arend
On Mon, 2016-12-12 at 11:59 +0000, Arend van Spriel wrote: > This patch adds support for GScan which is a scan offload feature > used in Android. Found a few places with spaces instead of tabs as indentation, and spurious braces around single-statement things, but other than that it looks fine from a patch/nl80211 POV. Haven't really looked into the details of gscan itself now though, sorry. There's a bit of a weird hard-coded restriction to 16 channels too, that's due to the bucket map? johannes
On 13-12-2016 17:19, Johannes Berg wrote: > On Mon, 2016-12-12 at 11:59 +0000, Arend van Spriel wrote: >> This patch adds support for GScan which is a scan offload feature >> used in Android. > > Found a few places with spaces instead of tabs as indentation, and > spurious braces around single-statement things, but other than that it > looks fine from a patch/nl80211 POV. I added a check in wiphy_register() in this patch which actually is more appropriate with the "gscan capabilities" patch. > Haven't really looked into the details of gscan itself now though, > sorry. > > There's a bit of a weird hard-coded restriction to 16 channels too, > that's due to the bucket map? Uhm. Is there? I will check, but if you can give me a pointer where to look it is appreciated. Regards, Arend
On Tue, 2016-12-13 at 21:09 +0100, Arend Van Spriel wrote: > > > There's a bit of a weird hard-coded restriction to 16 channels too, > > that's due to the bucket map? > > Uhm. Is there? I will check, but if you can give me a pointer where > to look it is appreciated. Just look for "< 16" or "<= 16" or so in the patch. I do think that's because the channel map is a u16 though, not sure we'd want to change that. johannes
On 13-12-2016 23:29, Johannes Berg wrote: > On Tue, 2016-12-13 at 21:09 +0100, Arend Van Spriel wrote: >> >>> There's a bit of a weird hard-coded restriction to 16 channels too, >>> that's due to the bucket map? >> >> Uhm. Is there? I will check, but if you can give me a pointer where >> to look it is appreciated. > > Just look for "< 16" or "<= 16" or so in the patch. I do think that's > because the channel map is a u16 though, not sure we'd want to change > that. Had to look for "> 16" ;-) > + /* ignore channels if band is specified */ > + if (band_select) > + return 0; > + > + nla_for_each_nested(chan, tb[NL80211_GSCAN_BUCKET_ATTR_CHANNELS], rem) { > + num_chans++; > + } Here an instance of the tab vs. space issue you mentioned. Will go over the patch and fix that. > + if (num_chans > 16) > + return -EINVAL; I suspect this is the restriction you were referring to. There is no reason for this although the android wifi hal has max 16 channels in a bucket so I might have picked that up. So could a driver have a similar limit and should we add such to the gscan capabilities? For instance our firmware api has a nasty restriction of 64 channels for all buckets together, eg. can do 4 buckets of 16 channels each. Regards, Arend
On Wed, 2016-12-14 at 10:01 +0100, Arend Van Spriel wrote: > Had to look for "> 16" ;-) Sorry. > Here an instance of the tab vs. space issue you mentioned. Will go > over the patch and fix that. There were a few, not really interesting though - git would probably flag it anyway, or checkpatch :) > > + if (num_chans > 16) > > + return -EINVAL; > > I suspect this is the restriction you were referring to. Yes. > There is no > reason for this although the android wifi hal has max 16 channels in > a bucket so I might have picked that up. I thought I saw something with a u16 bitmap that seemed related, but I don't see that now so I'm probably just confused. > So could a driver have a similar limit and should we add such to the > gscan capabilities? For instance our firmware api has a nasty > restriction of 64 channels for all buckets together, eg. can do 4 > buckets of 16 channels each. We do have a limit of the maximum scan buckets, which seems to be 16 right now. We also have a limit on the number of channels per bucket, which is also 16, but no combined limit afaict (so 16x16 seems fine). Maybe we do need some advertisement in that area then? Right now, wifihal seems to be able to read as capabilities the number of buckets (wifi_gscan_capabilities), but assumes the number of channels: const unsigned MAX_CHANNELS = 16; const unsigned MAX_BUCKETS = 16; I guess we took that and combined it, and you had more negotiation with Google ;-) We may then have to actually advertise the limit you have ("64 channels combined over all buckets"), unless you can get away with just advertising 4 buckets (and us saying 16 channels per bucket is enough?) I'm a bit tempted to make this more forward compatible though and not hard-limit the number of channels per bucket in the code. johannes
On 16-12-2016 11:13, Johannes Berg wrote: > On Wed, 2016-12-14 at 10:01 +0100, Arend Van Spriel wrote: > >> Had to look for "> 16" ;-) > > Sorry. > >> Here an instance of the tab vs. space issue you mentioned. Will go >> over the patch and fix that. > > There were a few, not really interesting though - git would probably > flag it anyway, or checkpatch :) > >>> + if (num_chans > 16) >>> + return -EINVAL; >> >> I suspect this is the restriction you were referring to. > > Yes. > >> There is no >> reason for this although the android wifi hal has max 16 channels in >> a bucket so I might have picked that up. > > I thought I saw something with a u16 bitmap that seemed related, but I > don't see that now so I'm probably just confused. > >> So could a driver have a similar limit and should we add such to the >> gscan capabilities? For instance our firmware api has a nasty >> restriction of 64 channels for all buckets together, eg. can do 4 >> buckets of 16 channels each. > > We do have a limit of the maximum scan buckets, which seems to be 16 > right now. We also have a limit on the number of channels per bucket, > which is also 16, but no combined limit afaict (so 16x16 seems fine). > > Maybe we do need some advertisement in that area then? Right now, > wifihal seems to be able to read as capabilities the number of buckets > (wifi_gscan_capabilities), but assumes the number of channels: > > const unsigned MAX_CHANNELS = 16; > const unsigned MAX_BUCKETS = 16; > > I guess we took that and combined it, and you had more negotiation with > Google ;-) I was not so much involved with the initial gscan effort, but I guess for brcm it might be true. > We may then have to actually advertise the limit you have ("64 channels > combined over all buckets"), unless you can get away with just > advertising 4 buckets (and us saying 16 channels per bucket is enough?) > > I'm a bit tempted to make this more forward compatible though and not > hard-limit the number of channels per bucket in the code. Indeed so I will remove it. Regards, Arend
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index b78377f..8bc8842 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -2453,6 +2453,92 @@ struct cfg80211_nan_func { }; /** + * struct cfg80211_gscan_channel - GScan channel parameters. + * + + * @ch: specific channel. + * @dwell_time: hint for dwell time in milliseconds. + * @passive: indicates passive scan is requested. + */ +struct cfg80211_gscan_channel { + struct ieee80211_channel *ch; + u8 dwell_time; + bool passive; +}; + +/** + * struct cfg80211_gscan_bucket - GScan bucket parameters. + * + * @idx: unique bucket index. + * @band: bit flags for band(s) to use, see %enum nl80211_bucket_band. + * @report_events: This is a bit field according %enum nl80211_bucket_report_event. + * @period: period in which the bucket is scheduled to be scanned. If the + * period is too small for driver it should not fail but report results + * as fast as it can. For exponential backoff bucket this is the minimum + * period. + * @max_period: used only for the exponential backoff bucket whose scan period + * will grow exponentially to a maximum period of max_period. + * @exponent: used only for the exponential backoff bucket. + * @step_count: used only for the exponential backoff bucket. + * @n_channels: number of channels in @channels array. + * @channels: channels to scan which may include DFS channels. + */ +struct cfg80211_gscan_bucket { + u32 idx; + u16 period; + u8 band; + u8 report_events; + u16 max_period; + u8 exponent; + u8 step_count; + u8 n_channels; + struct cfg80211_gscan_channel *channels; +}; + +/** + * struct cfg80211_gscan_request - GScan request parameters. + * + * @flags: scan request flags according %enum nl80211_scan_flags. + * @base_period: base timer period in milliseconds. + * @max_ap_per_scan: number of APs to store in each scan entry in the BSSID/RSSI + * history buffer (keep APS with highest RSSI). + * @report_threshold_percent: wake up system when scan buffer is filled to this + * percentage. + * @report_threshold_num_scans: wake up system when this many scans are stored + * in scan buffer. + * @mac: MAC address used for randomisation. + * @mac_mask: MAC address mask. bits that are 0 in the mask should be + * randomised, bits that are 1 should be taken as is from @mac. + * @n_buckets: number of entries in @buckets array. + * @buckets: array of GScan buckets. + * + * @dev: net device for which GScan is requested. + * @rcu_head: RCU callback used to free the struct. + * @owner_nlportid: netlink port which initiated this request. + * @scan_start: start time of this scan in jiffies. + */ +struct cfg80211_gscan_request { + u32 flags; + u16 base_period; + u8 max_ap_per_scan; + u8 report_threshold_percent; + u8 report_threshold_num_scans; + u8 mac[ETH_ALEN]; + u8 mac_mask[ETH_ALEN]; + + u8 n_buckets; + + /* internal */ + struct net_device *dev; + struct rcu_head rcu_head; + u32 owner_nlportid; + unsigned long scan_start; + + /* keep last */ + struct cfg80211_gscan_bucket buckets[0]; +}; + +/** * struct cfg80211_ops - backend description for wireless configuration * * This struct is registered by fullmac card drivers and/or wireless stacks @@ -2764,6 +2850,8 @@ struct cfg80211_nan_func { * All other parameters must be ignored. * * @set_multicast_to_unicast: configure multicast to unicast conversion for BSS + * @start_gscan: start the GSCAN scanning offload. + * @stop_gscan: stop the GSCAN scanning offload. */ struct cfg80211_ops { int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow); @@ -3048,6 +3136,9 @@ struct cfg80211_ops { int (*set_multicast_to_unicast)(struct wiphy *wiphy, struct net_device *dev, const bool enabled); + int (*start_gscan)(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_gscan_request *gscan_req); + int (*stop_gscan)(struct wiphy *wiphy, struct net_device *dev); }; /* diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 01ab2f7..5e42383 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -894,6 +894,12 @@ * does not result in a change for the current association. Currently, * only the %NL80211_ATTR_IE data is used and updated with this command. * + * @NL80211_CMD_START_GSCAN: start GScan. + * @NL80211_CMD_STOP_GSCAN: request to stop current GScan. + * @NL80211_CMD_GSCAN_STOPPED: indicates that the currently running GScan + * has stopped. This event is generated upon @NL80211_CMD_STOP_GSCAN and + * the driver may issue this event at any time when a GScan is running. + * * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */ @@ -1093,6 +1099,10 @@ enum nl80211_commands { NL80211_CMD_UPDATE_CONNECT_PARAMS, + NL80211_CMD_START_GSCAN, + NL80211_CMD_STOP_GSCAN, + NL80211_CMD_GSCAN_STOPPED, + /* add new commands above here */ /* used to define NL80211_CMD_MAX below */ @@ -2389,6 +2399,7 @@ enum nl80211_attrs { NL80211_ATTR_BSSID, NL80211_ATTR_GSCAN_CAPS, + NL80211_ATTR_GSCAN_PARAMS, /* add attributes here, update the policy in nl80211.c */ @@ -5246,4 +5257,139 @@ enum nl80211_gscan_caps_attr { NL80211_GSCAN_CAPS_ATTR_MAX = __NL80211_GSCAN_CAPS_ATTR_AFTER_LAST - 1 }; +/** + * enum nl80211_gscan_attr - common GScan parameters. + * + * @__NL80211_GSCAN_ATTR_INVALID: reserved. + * @NL80211_GSCAN_ATTR_MAX_AP_PER_SCAN: number of APs that are kept per + * scan. The kept APs are the ones with strongest RSSI level (u8). + * @NL80211_GSCAN_ATTR_REPORT_PERC: threshold specifying percentage of + * scan cache filled that should trigger event for scan results (u8). + * @NL80211_GSCAN_ATTR_REPORT_SCANS: threshold specifying number of scans + * after which an event is expected for scan results (u8). + * @NL80211_GSCAN_ATTR_BUCKETS: nested attribute specifying + * per-bucket parameters for GScan. See %enum nl80211_gscan_bucket_attr + * for description. + * @NL80211_GSCAN_ATTR_MAX: highest GScan attribute. + * @__NL80211_GSCAN_ATTR_AFTER_LAST: internal use. + */ +enum nl80211_gscan_attr { + __NL80211_GSCAN_ATTR_INVALID, + NL80211_GSCAN_ATTR_MAX_AP_PER_SCAN, + NL80211_GSCAN_ATTR_REPORT_PERC, + NL80211_GSCAN_ATTR_REPORT_SCANS, + NL80211_GSCAN_ATTR_BUCKETS, + + /* keep last */ + __NL80211_GSCAN_ATTR_AFTER_LAST, + NL80211_GSCAN_ATTR_MAX = __NL80211_GSCAN_ATTR_AFTER_LAST - 1 +}; + +/** + * enum nl80211_gscan_bucket_attr - per-bucket GScan parameters. + * + * @__NL80211_GSCAN_BUCKET_ATTR_INVALID, + * @NL80211_GSCAN_BUCKET_ATTR_ID: unique bucket id (u32). + * @NL80211_GSCAN_BUCKET_ATTR_BAND: specifies the band to be scanned + * according %enum nl80211_bucket_band. If specified + * @NL80211_GSCAN_BUCKET_ATTR_CHANNELS is ignored (u8). + * @NL80211_GSCAN_BUCKET_ATTR_PERIOD: specifies the period between consecutive + * scans of this bucket in seconds. For the backoff bucket this is + * period(0) (u16). + * @NL80211_GSCAN_BUCKET_ATTR_REPORT: specifies reporting flags according + * %enum nl80211_bucket_report_event (u8). + * @NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD: maximum period between + * consecutive scans. If specified this is a backoff bucket in + * which the period increases according formula: + * period(N) = period(0) * (base ^ (N/step_count)) (u16) + * @NL80211_GSCAN_BUCKET_ATTR_EXPONENT: exponential base value as used + * in given formula. This attribute is required when + * @NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD is specified (u8). + * @NL80211_GSCAN_BUCKET_ATTR_STEPS: step count as used in given formula. + * This attribute is required when @NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD + * is specified (u8). + * @NL80211_GSCAN_BUCKET_ATTR_CHANNELS: nested attribute specifying the + * channels that are to be scanned for this bucket. + * @NL80211_GSCAN_BUCKET_ATTR_MAX: highest GScan bucket attribute. + * @__NL80211_GSCAN_BUCKET_ATTR_AFTER_LAST: internal use. + */ +enum nl80211_gscan_bucket_attr { + __NL80211_GSCAN_BUCKET_ATTR_INVALID, + NL80211_GSCAN_BUCKET_ATTR_ID, + NL80211_GSCAN_BUCKET_ATTR_BAND, + NL80211_GSCAN_BUCKET_ATTR_PERIOD, + NL80211_GSCAN_BUCKET_ATTR_REPORT, + NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD, + NL80211_GSCAN_BUCKET_ATTR_EXPONENT, + NL80211_GSCAN_BUCKET_ATTR_STEPS, + NL80211_GSCAN_BUCKET_ATTR_CHANNELS, + + /* keep last */ + __NL80211_GSCAN_BUCKET_ATTR_AFTER_LAST, + NL80211_GSCAN_BUCKET_ATTR_MAX = __NL80211_GSCAN_BUCKET_ATTR_AFTER_LAST - 1 +}; + +/** + * enum nl80211_gscan_chan_attr - GScan bucket channel parameters. + * + * @__NL80211_GSCAN_CHAN_ATTR_INVALID: reserved. + * @NL80211_GSCAN_CHAN_ATTR_FREQ: frequency of channel to be scanned (u32). + * @NL80211_GSCAN_CHAN_ATTR_DWELL_TIME: dwell time in milliseconds to stay + * on this channel during scanning (u8). + * @NL80211_GSCAN_CHAN_ATTR_PASSIVE: flag attribute indicating that scanning + * should be done passive for this channel. + * @NL80211_GSCAN_CHAN_ATTR_MAX: highest GScan channel attribute. + * @__NL80211_GSCAN_CHAN_ATTR_AFTER_LAST: internal use. + * + * Apart from the channel itself the attributes %NL80211_GSCAN_CHAN_ATTR_DWELL_TIME + * and %NL80211_GSCAN_CHAN_ATTR_PASSIVE are advisory values. The driver may or + * may not comply. + */ +enum nl80211_gscan_chan_attr { + __NL80211_GSCAN_CHAN_ATTR_INVALID, + NL80211_GSCAN_CHAN_ATTR_FREQ, + NL80211_GSCAN_CHAN_ATTR_DWELL_TIME, + NL80211_GSCAN_CHAN_ATTR_PASSIVE, + + /* keep last */ + __NL80211_GSCAN_CHAN_ATTR_AFTER_LAST, + NL80211_GSCAN_CHAN_ATTR_MAX = __NL80211_GSCAN_CHAN_ATTR_AFTER_LAST - 1 +}; + +/** + * enum nl80211_bucket_band - GScan bucket band selection. + * + * @NL80211_BUCKET_BAND_2GHZ: consider all device supported channels + * in 2G band. + * @NL80211_BUCKET_BAND_5GHZ: consider all device supported channels + * in 5G band, ie. both DFS and non-DFS when @NL80211_BUCKET_BAND_NODFS + * and @NL80211_BUCKET_BAND_DFS_ONLY are not set. + * @NL80211_BUCKET_BAND_NODFS: only consider non-DFS channels. Only + * applicable when 5G band is selected, otherwise ignored. + * @NL80211_BUCKET_BAND_DFS_ONLY: only consider DFS channels. Only + * applicable when 5G band is selected, otherwise ignored. + * + * Setting both @NL80211_BUCKET_BAND_NODFS and @NL80211_BUCKET_BAND_DFS_ONLY + * is considerd invalid. + */ +enum nl80211_bucket_band { + NL80211_BUCKET_BAND_2GHZ = (1 << 0), + NL80211_BUCKET_BAND_5GHZ = (1 << 1), + NL80211_BUCKET_BAND_NODFS = (1 << 2), + NL80211_BUCKET_BAND_DFS_ONLY = (1 << 3), +}; + +/** + * enum nl80211_bucket_report_event - GScan bucket report flags. + * + * @NL80211_BUCKET_REPORT_EACH_SCAN: report each bucket scan completion. + * @NL80211_BUCKET_REPORT_FULL_RESULTS: report full scan results. + * @NL80211_BUCKET_REPORT_NO_BATCH: no batching required. + */ +enum nl80211_bucket_report_event { + NL80211_BUCKET_REPORT_EACH_SCAN = (1 << 0), + NL80211_BUCKET_REPORT_FULL_RESULTS = (1 << 1), + NL80211_BUCKET_REPORT_NO_BATCH = (1 << 2), +}; + #endif /* __LINUX_NL80211_H */ diff --git a/net/wireless/core.c b/net/wireless/core.c index 158c59e..760a2fb 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -357,6 +357,20 @@ static void cfg80211_sched_scan_stop_wk(struct work_struct *work) rtnl_unlock(); } +static void cfg80211_gscan_stop_wk(struct work_struct *work) +{ + struct cfg80211_registered_device *rdev; + + rdev = container_of(work, struct cfg80211_registered_device, + gscan_stop_wk); + + rtnl_lock(); + + __cfg80211_stop_gscan(rdev, false); + + rtnl_unlock(); +} + /* exported functions */ struct wiphy *wiphy_new_nm(const struct cfg80211_ops *ops, int sizeof_priv, @@ -383,6 +397,7 @@ struct wiphy *wiphy_new_nm(const struct cfg80211_ops *ops, int sizeof_priv, WARN_ON(ops->remain_on_channel && !ops->cancel_remain_on_channel); WARN_ON(ops->tdls_channel_switch && !ops->tdls_cancel_channel_switch); WARN_ON(ops->add_tx_ts && !ops->del_tx_ts); + WARN_ON(ops->start_gscan && !ops->stop_gscan); alloc_size = sizeof(*rdev) + sizeof_priv; @@ -456,6 +471,7 @@ struct wiphy *wiphy_new_nm(const struct cfg80211_ops *ops, int sizeof_priv, spin_lock_init(&rdev->destroy_list_lock); INIT_WORK(&rdev->destroy_work, cfg80211_destroy_iface_wk); INIT_WORK(&rdev->sched_scan_stop_wk, cfg80211_sched_scan_stop_wk); + INIT_WORK(&rdev->gscan_stop_wk, cfg80211_gscan_stop_wk); #ifdef CONFIG_CFG80211_DEFAULT_PS rdev->wiphy.flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT; @@ -690,6 +706,12 @@ int wiphy_register(struct wiphy *wiphy) (wiphy->bss_select_support & ~(BIT(__NL80211_BSS_SELECT_ATTR_AFTER_LAST) - 2)))) return -EINVAL; + /* buckets must have unique index and in nl80211 parsing + * a u32 is used to verify that hence this limit. + */ + if (WARN_ON(wiphy->gscan && wiphy->gscan->max_scan_buckets > 32)) + return -EINVAL; + if (wiphy->addresses) memcpy(wiphy->perm_addr, wiphy->addresses[0].addr, ETH_ALEN); @@ -1001,6 +1023,7 @@ void __cfg80211_leave(struct cfg80211_registered_device *rdev, { struct net_device *dev = wdev->netdev; struct cfg80211_sched_scan_request *sched_scan_req; + struct cfg80211_gscan_request *gscan_req; ASSERT_RTNL(); ASSERT_WDEV_LOCK(wdev); @@ -1014,6 +1037,9 @@ void __cfg80211_leave(struct cfg80211_registered_device *rdev, sched_scan_req = rtnl_dereference(rdev->sched_scan_req); if (sched_scan_req && dev == sched_scan_req->dev) __cfg80211_stop_sched_scan(rdev, false); + gscan_req = rtnl_dereference(rdev->gscan_req); + if (gscan_req && dev == gscan_req->dev) + __cfg80211_stop_gscan(rdev, false); #ifdef CONFIG_CFG80211_WEXT kfree(wdev->wext.ie); @@ -1089,6 +1115,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, struct wireless_dev *wdev = dev->ieee80211_ptr; struct cfg80211_registered_device *rdev; struct cfg80211_sched_scan_request *sched_scan_req; + struct cfg80211_gscan_request *gscan_req; if (!wdev) return NOTIFY_DONE; @@ -1160,6 +1187,10 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, sched_scan_req->dev == wdev->netdev)) { __cfg80211_stop_sched_scan(rdev, false); } + gscan_req = rtnl_dereference(rdev->gscan_req); + if (WARN_ON(gscan_req && gscan_req->dev == wdev->netdev)) { + __cfg80211_stop_gscan(rdev, false); + } rdev->opencount--; wake_up(&rdev->dev_wait); diff --git a/net/wireless/core.h b/net/wireless/core.h index ec5f333..ee1d162 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -75,6 +75,7 @@ struct cfg80211_registered_device { struct cfg80211_scan_request *scan_req; /* protected by RTNL */ struct sk_buff *scan_msg; struct cfg80211_sched_scan_request __rcu *sched_scan_req; + struct cfg80211_gscan_request __rcu *gscan_req; unsigned long suspend_at; struct work_struct scan_done_wk; struct work_struct sched_scan_results_wk; @@ -96,6 +97,7 @@ struct cfg80211_registered_device { struct work_struct destroy_work; struct work_struct sched_scan_stop_wk; + struct work_struct gscan_stop_wk; /* must be last because of the way we do wiphy_priv(), * and it should at least be aligned to NETDEV_ALIGN */ @@ -422,6 +424,8 @@ void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, void __cfg80211_sched_scan_results(struct work_struct *wk); int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev, bool driver_initiated); +int __cfg80211_stop_gscan(struct cfg80211_registered_device *rdev, + bool driver_initiated); void cfg80211_upload_connect_keys(struct wireless_dev *wdev); int cfg80211_change_iface(struct cfg80211_registered_device *rdev, struct net_device *dev, enum nl80211_iftype ntype, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 14e1940..4186ece 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -9,6 +9,7 @@ #include <linux/if.h> #include <linux/module.h> #include <linux/err.h> +#include <linux/gcd.h> #include <linux/slab.h> #include <linux/list.h> #include <linux/if_ether.h> @@ -405,6 +406,7 @@ enum nl80211_multicast_groups { [NL80211_ATTR_FILS_NONCES] = { .len = 2 * FILS_NONCE_LEN }, [NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED] = { .type = NLA_FLAG, }, [NL80211_ATTR_BSSID] = { .len = ETH_ALEN }, + [NL80211_ATTR_GSCAN_PARAMS] = { .type = NLA_NESTED }, }; /* policy for the key attributes */ @@ -11860,6 +11862,322 @@ static int nl80211_set_multicast_to_unicast(struct sk_buff *skb, return rdev_set_multicast_to_unicast(rdev, dev, enabled); } +static const +struct nla_policy nl80211_gscan_policy[NL80211_GSCAN_ATTR_MAX + 1] = { + [NL80211_GSCAN_ATTR_MAX_AP_PER_SCAN] = { .type = NLA_U8 }, + [NL80211_GSCAN_ATTR_REPORT_PERC] = { .type = NLA_U8 }, + [NL80211_GSCAN_ATTR_REPORT_SCANS] = { .type = NLA_U8 }, + [NL80211_GSCAN_ATTR_BUCKETS] = { .type = NLA_NESTED }, +}; + +static const struct nla_policy +nl80211_gscan_bucket_policy[NL80211_GSCAN_BUCKET_ATTR_MAX + 1] = { + [NL80211_GSCAN_BUCKET_ATTR_ID] = { .type = NLA_U32 }, + [NL80211_GSCAN_BUCKET_ATTR_BAND] = { .type = NLA_U8 }, + [NL80211_GSCAN_BUCKET_ATTR_PERIOD] = { .type = NLA_U16 }, + [NL80211_GSCAN_BUCKET_ATTR_REPORT] = { .type = NLA_U8 }, + [NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD] = { .type = NLA_U16 }, + [NL80211_GSCAN_BUCKET_ATTR_EXPONENT] = { .type = NLA_U8 }, + [NL80211_GSCAN_BUCKET_ATTR_STEPS] = { .type = NLA_U8 }, + [NL80211_GSCAN_BUCKET_ATTR_CHANNELS] = { .type = NLA_NESTED }, +}; + +static const struct nla_policy +nl80211_gscan_channel_policy[NL80211_GSCAN_CHAN_ATTR_MAX + 1] = { + [NL80211_GSCAN_CHAN_ATTR_FREQ] = { .type = NLA_U32 }, + [NL80211_GSCAN_CHAN_ATTR_DWELL_TIME] = { .type = NLA_U8 }, + [NL80211_GSCAN_CHAN_ATTR_PASSIVE] = { .type = NLA_FLAG }, +}; + +static int nl80211_parse_gscan_channel(struct cfg80211_registered_device *rdev, + struct nlattr *nattr, + struct cfg80211_gscan_channel *chan) +{ + struct nlattr *tb[NL80211_GSCAN_CHAN_ATTR_MAX + 1]; + struct ieee80211_channel *ch; + int err; + + err = nla_parse(tb, NL80211_GSCAN_CHAN_ATTR_MAX, nla_data(nattr), + nla_len(nattr), nl80211_gscan_channel_policy); + if (err) + return err; + + if (!tb[NL80211_GSCAN_CHAN_ATTR_FREQ]) + return -EINVAL; + + ch = ieee80211_get_channel(&rdev->wiphy, + nla_get_u32(tb[NL80211_GSCAN_CHAN_ATTR_FREQ])); + if (!ch || (ch->flags & IEEE80211_CHAN_DISABLED)) + return -EINVAL; + + chan->ch = ch; + + if (tb[NL80211_GSCAN_CHAN_ATTR_DWELL_TIME]) + chan->dwell_time = nla_get_u8(tb[NL80211_GSCAN_CHAN_ATTR_DWELL_TIME]); + + chan->passive = nla_get_flag(tb[NL80211_GSCAN_CHAN_ATTR_PASSIVE]); + return 0; +} + +static int nl80211_parse_gscan_bucket(struct cfg80211_registered_device *rdev, + struct nlattr *nattr, + struct cfg80211_gscan_bucket *bucket, + struct cfg80211_gscan_channel *channels) +{ + struct nlattr *tb[NL80211_GSCAN_BUCKET_ATTR_MAX + 1]; + struct nlattr *chan; + struct cfg80211_gscan_channel *ch; + int err, rem; + int num_chans = 0; + u32 band_select = 0; + u32 dfs_invalid_mask; + + err = nla_parse(tb, NL80211_GSCAN_BUCKET_ATTR_MAX, nla_data(nattr), + nla_len(nattr), nl80211_gscan_bucket_policy); + if (err) + return err; + + if (!tb[NL80211_GSCAN_BUCKET_ATTR_ID] || + !tb[NL80211_GSCAN_BUCKET_ATTR_PERIOD]) + return -EINVAL; + + bucket->idx = nla_get_u32(tb[NL80211_GSCAN_BUCKET_ATTR_ID]); + if (tb[NL80211_GSCAN_BUCKET_ATTR_BAND]) { + band_select = nla_get_u8(tb[NL80211_GSCAN_BUCKET_ATTR_BAND]); + + /* only makes sense if a band is selected */ + if (!(band_select & (NL80211_BUCKET_BAND_2GHZ | NL80211_BUCKET_BAND_5GHZ))) + return -EINVAL; + } else if (!tb[NL80211_GSCAN_BUCKET_ATTR_CHANNELS]) { + return -EINVAL; + } + + dfs_invalid_mask = NL80211_BUCKET_BAND_5GHZ | NL80211_BUCKET_BAND_NODFS | + NL80211_BUCKET_BAND_DFS_ONLY; + if ((band_select & dfs_invalid_mask) == dfs_invalid_mask) + return -EINVAL; + + bucket->band = band_select; + bucket->period = nla_get_u16(tb[NL80211_GSCAN_BUCKET_ATTR_PERIOD]); + + if (tb[NL80211_GSCAN_BUCKET_ATTR_REPORT]) + bucket->report_events = nla_get_u8(tb[NL80211_GSCAN_BUCKET_ATTR_REPORT]); + + if (tb[NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD]) + bucket->max_period = nla_get_u16(tb[NL80211_GSCAN_BUCKET_ATTR_MAX_PERIOD]); + + if (bucket->max_period) { + if (bucket->max_period < bucket->period) + return -EINVAL; + /* additional attributes required for backoff bucket */ + if (bucket->max_period > bucket->period) { + if (!tb[NL80211_GSCAN_BUCKET_ATTR_EXPONENT] || + !tb[NL80211_GSCAN_BUCKET_ATTR_STEPS]) + return -EINVAL; + + bucket->exponent = nla_get_u8(tb[NL80211_GSCAN_BUCKET_ATTR_EXPONENT]); + bucket->step_count = nla_get_u8(tb[NL80211_GSCAN_BUCKET_ATTR_STEPS]); + } + } + + /* ignore channels if band is specified */ + if (band_select) + return 0; + + nla_for_each_nested(chan, tb[NL80211_GSCAN_BUCKET_ATTR_CHANNELS], rem) { + num_chans++; + } + if (num_chans > 16) + return -EINVAL; + + bucket->n_channels = num_chans; + if (!num_chans) + return 0; + + bucket->channels = channels; + ch = &bucket->channels[0]; + nla_for_each_nested(chan, tb[NL80211_GSCAN_BUCKET_ATTR_CHANNELS], rem) { + err = nl80211_parse_gscan_channel(rdev, chan, ch); + if (err) { + return err; + } + ch++; + } + + return 0; +} + +static struct cfg80211_gscan_request * +nl80211_alloc_gscan_request(struct cfg80211_registered_device *rdev, + struct nlattr *buckets_attr) +{ + struct cfg80211_gscan_request *req; + struct cfg80211_gscan_bucket *b; + struct cfg80211_gscan_channel *ch; + int n_buckets, n_channels; + struct nlattr *attr, *bucket, *channel; + int rem, rem_b, rem_c; + size_t reqsize; + + if (!buckets_attr) + return ERR_PTR(-EINVAL); + + n_buckets = 0; + n_channels = 0; + nla_for_each_nested(bucket, buckets_attr, rem) { + n_buckets++; + if (n_buckets > rdev->wiphy.gscan->max_scan_buckets) + return ERR_PTR(-EINVAL); + + nla_for_each_nested(attr, bucket, rem_b) { + if (nla_type(attr) == NL80211_GSCAN_BUCKET_ATTR_CHANNELS) { + nla_for_each_nested(channel, attr, rem_c) + n_channels++; + } + } + } + + reqsize = sizeof(*req) + + sizeof(*b) * n_buckets + + sizeof(*ch) * n_channels; + + req = kzalloc(reqsize, GFP_KERNEL); + if (!req) + return ERR_PTR(-ENOMEM); + + req->n_buckets = n_buckets; + return req; +} + +static int nl80211_parse_gscan_params(struct cfg80211_registered_device *rdev, + struct nlattr *attrs[], + struct cfg80211_gscan_request **request) +{ + struct cfg80211_gscan_request *req; + struct nlattr *tb[NL80211_GSCAN_ATTR_MAX + 1]; + struct nlattr *bucket; + struct cfg80211_gscan_bucket *b; + struct cfg80211_gscan_channel *ch; + int err, rem, i; + u32 bucket_map; + + if (!attrs[NL80211_ATTR_GSCAN_PARAMS]) + return -EINVAL; + + err = nla_parse(tb, NL80211_GSCAN_ATTR_MAX, + nla_data(attrs[NL80211_ATTR_GSCAN_PARAMS]), + nla_len(attrs[NL80211_ATTR_GSCAN_PARAMS]), + nl80211_gscan_policy); + if (err) + return err; + + req = nl80211_alloc_gscan_request(rdev, tb[NL80211_GSCAN_ATTR_BUCKETS]); + if (IS_ERR(req)) + return PTR_ERR(req); + + if (tb[NL80211_GSCAN_ATTR_MAX_AP_PER_SCAN]) + req->max_ap_per_scan = nla_get_u8(tb[NL80211_GSCAN_ATTR_MAX_AP_PER_SCAN]); + if (tb[NL80211_GSCAN_ATTR_REPORT_PERC]) + req->report_threshold_percent = nla_get_u8(tb[NL80211_GSCAN_ATTR_REPORT_PERC]); + if (tb[NL80211_GSCAN_ATTR_REPORT_SCANS]) + req->report_threshold_num_scans = nla_get_u8(tb[NL80211_GSCAN_ATTR_REPORT_SCANS]); + + b = &req->buckets[0]; + ch = (struct cfg80211_gscan_channel *)(&req->buckets[req->n_buckets]); + nla_for_each_nested(bucket, tb[NL80211_GSCAN_ATTR_BUCKETS], rem) { + err = nl80211_parse_gscan_bucket(rdev, bucket, b, ch); + if (err) + goto free_req; + ch += b->n_channels; + b++; + } + bucket_map = 0; + for (i = 0; i < req->n_buckets; i++) { + if (BIT(req->buckets[i].idx) & bucket_map) { + err = -EINVAL; + goto free_req; + } + bucket_map |= BIT(req->buckets[i].idx); + + if (req->base_period) + req->base_period = gcd(req->buckets[i].period, + req->base_period); + else + req->base_period = req->buckets[i].period; + } + *request = req; + return 0; + +free_req: + kfree(req); + return err; +} + +static int nl80211_start_gscan(struct sk_buff *skb, struct genl_info *info) +{ + struct cfg80211_gscan_request *request; + struct cfg80211_registered_device *rdev = info->user_ptr[0]; + struct net_device *dev = info->user_ptr[1]; + struct wireless_dev *wdev = dev->ieee80211_ptr; + int err; + + if (!rdev->wiphy.gscan || + !rdev->ops->start_gscan) + return -EOPNOTSUPP; + + if (rdev->gscan_req) + return -EINPROGRESS; + + err = nl80211_parse_gscan_params(rdev, info->attrs, &request); + if (err) + return err; + + if (info->attrs[NL80211_ATTR_MAC]) + memcpy(request->mac, nla_data(info->attrs[NL80211_ATTR_MAC]), + ETH_ALEN); + if (info->attrs[NL80211_ATTR_MAC_MASK]) + memcpy(request->mac_mask, + nla_data(info->attrs[NL80211_ATTR_MAC_MASK]), ETH_ALEN); + if (info->attrs[NL80211_ATTR_SCAN_FLAGS]) { + request->flags = nla_get_u32(info->attrs[NL80211_ATTR_SCAN_FLAGS]); + if (request->flags & NL80211_SCAN_FLAG_RANDOM_ADDR && + (!info->attrs[NL80211_ATTR_MAC] || + !info->attrs[NL80211_ATTR_MAC_MASK])) { + kfree(request); + return -EINVAL; + } + } + + wdev_lock(wdev); + err = rdev_start_gscan(rdev, dev, request); + wdev_unlock(wdev); + if (err) { + kfree(request); + return err; + } + + request->scan_start = jiffies; + request->dev = dev; + if (info->attrs[NL80211_ATTR_SOCKET_OWNER]) + request->owner_nlportid = info->snd_portid; + + rcu_assign_pointer(rdev->gscan_req, request); + + nl80211_send_scan_event(rdev, dev, NL80211_CMD_START_GSCAN); + return 0; +} + +static int nl80211_stop_gscan(struct sk_buff *skb, struct genl_info *info) +{ + struct cfg80211_registered_device *rdev = info->user_ptr[0]; + + if (!rdev->wiphy.gscan || + !rdev->ops->stop_gscan) + return -EOPNOTSUPP; + + return __cfg80211_stop_gscan(rdev, false); +} + #define NL80211_FLAG_NEED_WIPHY 0x01 #define NL80211_FLAG_NEED_NETDEV 0x02 #define NL80211_FLAG_NEED_RTNL 0x04 @@ -12735,6 +13053,22 @@ static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb, .internal_flags = NL80211_FLAG_NEED_NETDEV | NL80211_FLAG_NEED_RTNL, }, + { + .cmd = NL80211_CMD_START_GSCAN, + .doit = nl80211_start_gscan, + .policy = nl80211_policy, + .flags = GENL_UNS_ADMIN_PERM, + .internal_flags = NL80211_FLAG_NEED_NETDEV_UP | + NL80211_FLAG_NEED_RTNL, + }, + { + .cmd = NL80211_CMD_STOP_GSCAN, + .doit = nl80211_stop_gscan, + .policy = nl80211_policy, + .flags = GENL_UNS_ADMIN_PERM, + .internal_flags = NL80211_FLAG_NEED_NETDEV_UP | + NL80211_FLAG_NEED_RTNL, + }, }; static struct genl_family nl80211_fam __ro_after_init = { @@ -14540,12 +14874,18 @@ static int nl80211_netlink_notify(struct notifier_block * nb, list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) { bool schedule_destroy_work = false; bool schedule_scan_stop = false; + bool schedule_gscan_stop = false; struct cfg80211_sched_scan_request *sched_scan_req = rcu_dereference(rdev->sched_scan_req); + struct cfg80211_gscan_request *gscan_req = + rcu_dereference(rdev->gscan_req); if (sched_scan_req && notify->portid && sched_scan_req->owner_nlportid == notify->portid) schedule_scan_stop = true; + if (gscan_req && notify->portid && + gscan_req->owner_nlportid == notify->portid) + schedule_gscan_stop = true; list_for_each_entry_rcu(wdev, &rdev->wiphy.wdev_list, list) { cfg80211_mlme_unregister_socket(wdev, notify->portid); @@ -14576,12 +14916,18 @@ static int nl80211_netlink_notify(struct notifier_block * nb, spin_unlock(&rdev->destroy_list_lock); schedule_work(&rdev->destroy_work); } - } else if (schedule_scan_stop) { - sched_scan_req->owner_nlportid = 0; + } else { + if (schedule_scan_stop) { + sched_scan_req->owner_nlportid = 0; - if (rdev->ops->sched_scan_stop && - rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN) - schedule_work(&rdev->sched_scan_stop_wk); + if (rdev->ops->sched_scan_stop && + rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN) + schedule_work(&rdev->sched_scan_stop_wk); + } + if (schedule_gscan_stop) { + gscan_req->owner_nlportid = 0; + schedule_work(&rdev->gscan_stop_wk); + } } } diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h index 2f42507..196e6a7 100644 --- a/net/wireless/rdev-ops.h +++ b/net/wireless/rdev-ops.h @@ -1153,4 +1153,29 @@ static inline int rdev_set_qos_map(struct cfg80211_registered_device *rdev, trace_rdev_return_int(&rdev->wiphy, ret); return ret; } + +static inline int +rdev_start_gscan(struct cfg80211_registered_device *rdev, + struct net_device *dev, + struct cfg80211_gscan_request *request) +{ + int ret; + + trace_rdev_start_gscan(&rdev->wiphy, dev); + ret = rdev->ops->start_gscan(&rdev->wiphy, dev, request); + trace_rdev_return_int(&rdev->wiphy, ret); + return ret; +} + +static inline int +rdev_stop_gscan(struct cfg80211_registered_device *rdev, + struct net_device *dev) +{ + int ret; + + trace_rdev_stop_gscan(&rdev->wiphy, dev); + ret = rdev->ops->stop_gscan(&rdev->wiphy, dev); + trace_rdev_return_int(&rdev->wiphy, ret); + return ret; +} #endif /* __CFG80211_RDEV_OPS */ diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 174076b..8c141c2 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -386,6 +386,34 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev, return 0; } +int __cfg80211_stop_gscan(struct cfg80211_registered_device *rdev, + bool driver_initiated) +{ + struct cfg80211_gscan_request *gscan_req; + struct net_device *dev; + + ASSERT_RTNL(); + + if (!rdev->gscan_req) + return -ENOENT; + + gscan_req = rtnl_dereference(rdev->gscan_req); + dev = gscan_req->dev; + + if (!driver_initiated) { + int err = rdev_stop_gscan(rdev, dev); + if (err) + return err; + } + + nl80211_send_scan_event(rdev, dev, NL80211_CMD_GSCAN_STOPPED); + + RCU_INIT_POINTER(rdev->gscan_req, NULL); + kfree_rcu(gscan_req, rcu_head); + + return 0; +} + void cfg80211_bss_age(struct cfg80211_registered_device *rdev, unsigned long age_secs) { diff --git a/net/wireless/trace.h b/net/wireless/trace.h index ea1b47e..1d0fde9 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -3067,6 +3067,15 @@ WIPHY_PR_ARG, NETDEV_PR_ARG, BOOL_TO_STR(__entry->enabled)) ); + +DEFINE_EVENT(wiphy_netdev_evt, rdev_start_gscan, + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev), + TP_ARGS(wiphy, netdev) +); +DEFINE_EVENT(wiphy_netdev_evt, rdev_stop_gscan, + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev), + TP_ARGS(wiphy, netdev) +); #endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH