Skip to content

Commit

Permalink
wifi: cfg80211: use a struct for inform_single_bss data
Browse files Browse the repository at this point in the history 
The argument is getting quite large, so use a struct internally to pass
around the information.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230618214436.831ab8a87b6f.I3bcc83d90f41d6f8a47b39528575dad0a9ec3564@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
@benzea @jmberg-intel
benzea authored and jmberg-intel committed Jun 19, 2023
1 parent 66d9c57 commit eb14260
Showing 1 changed file with 112 additions and 97 deletions.
209 changes: 112 additions & 97 deletions net/wireless/scan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1644,12 +1644,6 @@ static bool cfg80211_combine_bsses(struct cfg80211_registered_device *rdev,
return true;
}

struct cfg80211_non_tx_bss {
struct cfg80211_bss *tx_bss;
u8 max_bssid_indicator;
u8 bssid_index;
};

static void cfg80211_update_hidden_bsses(struct cfg80211_internal_bss *known,
const struct cfg80211_bss_ies *new_ies,
const struct cfg80211_bss_ies *old_ies)
Expand Down Expand Up @@ -1977,17 +1971,30 @@ cfg80211_get_bss_channel(struct wiphy *wiphy, const u8 *ie, size_t ielen,
return alt_channel;
}

struct cfg80211_inform_single_bss_data {
struct cfg80211_inform_bss *drv_data;
enum cfg80211_bss_frame_type ftype;
u8 bssid[ETH_ALEN];
u64 tsf;
u16 capability;
u16 beacon_interval;
const u8 *ie;
size_t ielen;

/* Set for nontransmitted BSSIDs */
struct cfg80211_bss *source_bss;
u8 max_bssid_indicator;
u8 bssid_index;
};

/* Returned bss is reference counted and must be cleaned up appropriately. */
static struct cfg80211_bss *
cfg80211_inform_single_bss_data(struct wiphy *wiphy,
struct cfg80211_inform_bss *data,
enum cfg80211_bss_frame_type ftype,
const u8 *bssid, u64 tsf, u16 capability,
u16 beacon_interval, const u8 *ie, size_t ielen,
struct cfg80211_non_tx_bss *non_tx_data,
struct cfg80211_inform_single_bss_data *data,
gfp_t gfp)
{
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
struct cfg80211_inform_bss *drv_data = data->drv_data;
struct cfg80211_bss_ies *ies;
struct ieee80211_channel *channel;
struct cfg80211_internal_bss tmp = {}, *res;
Expand All @@ -1999,40 +2006,41 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy,
return NULL;

if (WARN_ON(wiphy->signal_type == CFG80211_SIGNAL_TYPE_UNSPEC &&
(data->signal < 0 || data->signal > 100)))
(drv_data->signal < 0 || drv_data->signal > 100)))
return NULL;

channel = cfg80211_get_bss_channel(wiphy, ie, ielen, data->chan,
data->scan_width);
channel = cfg80211_get_bss_channel(wiphy, data->ie, data->ielen,
drv_data->chan, drv_data->scan_width);
if (!channel)
return NULL;

memcpy(tmp.pub.bssid, bssid, ETH_ALEN);
memcpy(tmp.pub.bssid, data->bssid, ETH_ALEN);
tmp.pub.channel = channel;
tmp.pub.scan_width = data->scan_width;
tmp.pub.signal = data->signal;
tmp.pub.beacon_interval = beacon_interval;
tmp.pub.capability = capability;
tmp.ts_boottime = data->boottime_ns;
tmp.parent_tsf = data->parent_tsf;
ether_addr_copy(tmp.parent_bssid, data->parent_bssid);

if (non_tx_data) {
tmp.pub.transmitted_bss = non_tx_data->tx_bss;
ts = bss_from_pub(non_tx_data->tx_bss)->ts;
tmp.pub.bssid_index = non_tx_data->bssid_index;
tmp.pub.max_bssid_indicator = non_tx_data->max_bssid_indicator;
tmp.pub.scan_width = drv_data->scan_width;
tmp.pub.signal = drv_data->signal;
tmp.pub.beacon_interval = data->beacon_interval;
tmp.pub.capability = data->capability;
tmp.ts_boottime = drv_data->boottime_ns;
tmp.parent_tsf = drv_data->parent_tsf;
ether_addr_copy(tmp.parent_bssid, drv_data->parent_bssid);

if (data->source_bss) {
tmp.pub.transmitted_bss = data->source_bss;
ts = bss_from_pub(data->source_bss)->ts;
tmp.pub.bssid_index = data->bssid_index;
tmp.pub.max_bssid_indicator = data->max_bssid_indicator;
} else {
ts = jiffies;

if (channel->band == NL80211_BAND_60GHZ) {
bss_type = capability & WLAN_CAPABILITY_DMG_TYPE_MASK;
bss_type = data->capability &
WLAN_CAPABILITY_DMG_TYPE_MASK;
if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP ||
bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS)
regulatory_hint_found_beacon(wiphy, channel,
gfp);
} else {
if (capability & WLAN_CAPABILITY_ESS)
if (data->capability & WLAN_CAPABILITY_ESS)
regulatory_hint_found_beacon(wiphy, channel,
gfp);
}
Expand All @@ -2046,15 +2054,15 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy,
* override the IEs pointer should we have received an earlier
* indication of Probe Response data.
*/
ies = kzalloc(sizeof(*ies) + ielen, gfp);
ies = kzalloc(sizeof(*ies) + data->ielen, gfp);
if (!ies)
return NULL;
ies->len = ielen;
ies->tsf = tsf;
ies->len = data->ielen;
ies->tsf = data->tsf;
ies->from_beacon = false;
memcpy(ies->data, ie, ielen);
memcpy(ies->data, data->ie, data->ielen);

switch (ftype) {
switch (data->ftype) {
case CFG80211_BSS_FTYPE_BEACON:
ies->from_beacon = true;
fallthrough;
Expand All @@ -2067,20 +2075,19 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy,
}
rcu_assign_pointer(tmp.pub.ies, ies);

signal_valid = data->chan == channel;
signal_valid = drv_data->chan == channel;
spin_lock_bh(&rdev->bss_lock);
res = __cfg80211_bss_update(rdev, &tmp, signal_valid, ts);
if (!res)
goto drop;

rdev_inform_bss(rdev, &res->pub, ies, data->drv_data);

if (non_tx_data) {
if (data->source_bss) {
/* this is a nontransmitting bss, we need to add it to
* transmitting bss' list if it is not there
*/
if (cfg80211_add_nontrans_list(non_tx_data->tx_bss,
&res->pub)) {
if (cfg80211_add_nontrans_list(data->source_bss, &res->pub)) {
if (__cfg80211_unlink_bss(rdev, res)) {
rdev->bss_generation++;
res = NULL;
Expand Down Expand Up @@ -2173,43 +2180,47 @@ size_t cfg80211_merge_profile(const u8 *ie, size_t ielen,
}
EXPORT_SYMBOL(cfg80211_merge_profile);

static void cfg80211_parse_mbssid_data(struct wiphy *wiphy,
struct cfg80211_inform_bss *data,
enum cfg80211_bss_frame_type ftype,
const u8 *bssid, u64 tsf,
u16 beacon_interval, const u8 *ie,
size_t ielen,
struct cfg80211_non_tx_bss *non_tx_data,
gfp_t gfp)
{
static void
cfg80211_parse_mbssid_data(struct wiphy *wiphy,
struct cfg80211_inform_single_bss_data *tx_data,
struct cfg80211_bss *source_bss,
gfp_t gfp)
{
struct cfg80211_inform_single_bss_data data = {
.drv_data = tx_data->drv_data,
.ftype = tx_data->ftype,
.tsf = tx_data->tsf,
.beacon_interval = tx_data->beacon_interval,
.source_bss = source_bss,
};
const u8 *mbssid_index_ie;
const struct element *elem, *sub;
size_t new_ie_len;
u8 new_bssid[ETH_ALEN];
u8 *new_ie, *profile;
u64 seen_indices = 0;
u16 capability;
struct cfg80211_bss *bss;

if (!non_tx_data)
if (!source_bss)
return;
if (!cfg80211_find_elem(WLAN_EID_MULTIPLE_BSSID, ie, ielen))
if (!cfg80211_find_elem(WLAN_EID_MULTIPLE_BSSID,
tx_data->ie, tx_data->ielen))
return;
if (!wiphy->support_mbssid)
return;
if (wiphy->support_only_he_mbssid &&
!cfg80211_find_ext_elem(WLAN_EID_EXT_HE_CAPABILITY, ie, ielen))
!cfg80211_find_ext_elem(WLAN_EID_EXT_HE_CAPABILITY,
tx_data->ie, tx_data->ielen))
return;

new_ie = kmalloc(IEEE80211_MAX_DATA_LEN, gfp);
if (!new_ie)
return;

profile = kmalloc(ielen, gfp);
profile = kmalloc(tx_data->ielen, gfp);
if (!profile)
goto out;

for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID, ie, ielen) {
for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID,
tx_data->ie, tx_data->ielen) {
if (elem->datalen < 4)
continue;
if (elem->data[0] < 1 || (int)elem->data[0] > 8)
Expand All @@ -2231,12 +2242,13 @@ static void cfg80211_parse_mbssid_data(struct wiphy *wiphy,
continue;
}

memset(profile, 0, ielen);
profile_len = cfg80211_merge_profile(ie, ielen,
memset(profile, 0, tx_data->ielen);
profile_len = cfg80211_merge_profile(tx_data->ie,
tx_data->ielen,
elem,
sub,
profile,
ielen);
tx_data->ielen);

/* found a Nontransmitted BSSID Profile */
mbssid_index_ie = cfg80211_find_ie
Expand All @@ -2256,31 +2268,27 @@ static void cfg80211_parse_mbssid_data(struct wiphy *wiphy,

seen_indices |= BIT_ULL(mbssid_index_ie[2]);

non_tx_data->bssid_index = mbssid_index_ie[2];
non_tx_data->max_bssid_indicator = elem->data[0];
data.bssid_index = mbssid_index_ie[2];
data.max_bssid_indicator = elem->data[0];

cfg80211_gen_new_bssid(tx_data->bssid,
data.max_bssid_indicator,
data.bssid_index,
data.bssid);

cfg80211_gen_new_bssid(bssid,
non_tx_data->max_bssid_indicator,
non_tx_data->bssid_index,
new_bssid);
memset(new_ie, 0, IEEE80211_MAX_DATA_LEN);
new_ie_len = cfg80211_gen_new_ie(ie, ielen,
data.ie = new_ie;
data.ielen = cfg80211_gen_new_ie(tx_data->ie,
tx_data->ielen,
profile,
profile_len, new_ie,
profile_len,
new_ie,
IEEE80211_MAX_DATA_LEN);
if (!new_ie_len)
if (!data.ielen)
continue;

capability = get_unaligned_le16(profile + 2);
bss = cfg80211_inform_single_bss_data(wiphy, data,
ftype,
new_bssid, tsf,
capability,
beacon_interval,
new_ie,
new_ie_len,
non_tx_data,
gfp);
data.capability = get_unaligned_le16(profile + 2);
bss = cfg80211_inform_single_bss_data(wiphy, &data, gfp);
if (!bss)
break;
cfg80211_put_bss(wiphy, bss);
Expand Down Expand Up @@ -2360,18 +2368,24 @@ cfg80211_inform_bss_data(struct wiphy *wiphy,
u16 beacon_interval, const u8 *ie, size_t ielen,
gfp_t gfp)
{
struct cfg80211_inform_single_bss_data inform_data = {
.drv_data = data,
.ftype = ftype,
.tsf = tsf,
.capability = capability,
.beacon_interval = beacon_interval,
.ie = ie,
.ielen = ielen,
};
struct cfg80211_bss *res;
struct cfg80211_non_tx_bss non_tx_data;

res = cfg80211_inform_single_bss_data(wiphy, data, ftype, bssid, tsf,
capability, beacon_interval, ie,
ielen, NULL, gfp);
memcpy(inform_data.bssid, bssid, ETH_ALEN);

res = cfg80211_inform_single_bss_data(wiphy, &inform_data, gfp);
if (!res)
return NULL;
non_tx_data.tx_bss = res;
cfg80211_parse_mbssid_data(wiphy, data, ftype, bssid, tsf,
beacon_interval, ie, ielen, &non_tx_data,
gfp);

cfg80211_parse_mbssid_data(wiphy, &inform_data, res, gfp);
return res;
}
EXPORT_SYMBOL(cfg80211_inform_bss_data);
Expand Down Expand Up @@ -2517,12 +2531,13 @@ cfg80211_inform_bss_frame_data(struct wiphy *wiphy,
struct ieee80211_mgmt *mgmt, size_t len,
gfp_t gfp)
{
struct cfg80211_inform_single_bss_data inform_data = {
.drv_data = data,
.ie = mgmt->u.probe_resp.variable,
.ielen = len - offsetof(struct ieee80211_mgmt,
u.probe_resp.variable),
};
struct cfg80211_bss *res;
const u8 *ie = mgmt->u.probe_resp.variable;
size_t ielen = len - offsetof(struct ieee80211_mgmt,
u.probe_resp.variable);
enum cfg80211_bss_frame_type ftype;
struct cfg80211_non_tx_bss non_tx_data = {};

res = cfg80211_inform_single_bss_frame_data(wiphy, data, mgmt,
len, gfp);
Expand All @@ -2533,15 +2548,15 @@ cfg80211_inform_bss_frame_data(struct wiphy *wiphy,
if (ieee80211_is_s1g_beacon(mgmt->frame_control))
return res;

ftype = ieee80211_is_beacon(mgmt->frame_control) ?
inform_data.ftype = ieee80211_is_beacon(mgmt->frame_control) ?
CFG80211_BSS_FTYPE_BEACON : CFG80211_BSS_FTYPE_PRESP;
non_tx_data.tx_bss = res;
memcpy(inform_data.bssid, mgmt->bssid, ETH_ALEN);
inform_data.tsf = le64_to_cpu(mgmt->u.probe_resp.timestamp);
inform_data.beacon_interval =
le16_to_cpu(mgmt->u.probe_resp.beacon_int);

/* process each non-transmitting bss */
cfg80211_parse_mbssid_data(wiphy, data, ftype, mgmt->bssid,
le64_to_cpu(mgmt->u.probe_resp.timestamp),
le16_to_cpu(mgmt->u.probe_resp.beacon_int),
ie, ielen, &non_tx_data, gfp);
cfg80211_parse_mbssid_data(wiphy, &inform_data, res, gfp);

return res;
}
Expand Down

0 comments on commit eb14260

Please sign in to comment.