2023-04-17 01:36:12

by Gilad Itzkovitch

Subject: [PATCH v5 1/2] wifi: cfg80211: Add short_beacon_tail/head/period

From: Kieran Frewen <[email protected]>

Support variables to handle short beacon period and adding a
separate tail/head for them. Also, add short beacon period,
head and tail attributes for user configuration.

Reported-by: kernel test robot <[email protected]>
Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
Signed-off-by: Kieran Frewen <[email protected]>
Co-developed-by: Gilad Itzkovitch <[email protected]>
Signed-off-by: Gilad Itzkovitch <[email protected]>

v5:
- initialise s1g beacon variables to false
v4:
- squash cfg80211 commits together
- add protection for short head/tail with S1G band check
- better validation rule for short_beacon_period
and align its types
---
include/net/cfg80211.h | 10 +++-
include/uapi/linux/nl80211.h | 10 ++++
net/wireless/nl80211.c | 103 ++++++++++++++++++++++++++---------
3 files changed, 97 insertions(+), 26 deletions(-)

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 9e04f69712b1..6d0a31d85888 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1211,8 +1211,13 @@ struct cfg80211_rnr_elems {
* or %NULL if not changed
* @tail: tail portion of beacon (after TIM IE)
* or %NULL if not changed
+ * @short_head: head portion of short beacon or %NULL if not changed
+ * @short_tail: short tail portion of beacon (after TIM IE)
+ * or %NULL if not changed
* @head_len: length of @head
* @tail_len: length of @tail
+ * @short_head_len: length of @short_head
+ * @short_tail_len: length of @short_tail
* @beacon_ies: extra information element(s) to add into Beacon frames or %NULL
* @beacon_ies_len: length of beacon_ies in octets
* @proberesp_ies: extra information element(s) to add into Probe Response
@@ -1241,6 +1246,7 @@ struct cfg80211_beacon_data {
unsigned int link_id;

const u8 *head, *tail;
+ const u8 *short_head, *short_tail;
const u8 *beacon_ies;
const u8 *proberesp_ies;
const u8 *assocresp_ies;
@@ -1252,6 +1258,7 @@ struct cfg80211_beacon_data {
s8 ftm_responder;

size_t head_len, tail_len;
+ size_t short_head_len, short_tail_len;
size_t beacon_ies_len;
size_t proberesp_ies_len;
size_t assocresp_ies_len;
@@ -1324,6 +1331,7 @@ struct cfg80211_unsol_bcast_probe_resp {
* @beacon: beacon data
* @beacon_interval: beacon interval
* @dtim_period: DTIM period
+ * @short_beacon_period: S1G short beacon period
* @ssid: SSID to be used in the BSS (note: may be %NULL if not provided from
* user space)
* @ssid_len: length of @ssid
@@ -1365,7 +1373,7 @@ struct cfg80211_ap_settings {

struct cfg80211_beacon_data beacon;

- int beacon_interval, dtim_period;
+ int beacon_interval, dtim_period, short_beacon_period;
const u8 *ssid;
size_t ssid_len;
enum nl80211_hidden_ssid hidden_ssid;
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index c59fec406da5..09ff24ed30ff 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2787,6 +2787,12 @@ enum nl80211_commands {
* indicates that the sub-channel is punctured. Higher 16 bits are
* reserved.
*
+ * @NL80211_ATTR_SHORT_BEACON_PERIOD: (u16) period for S1G long beacon
+ * @NL80211_ATTR_SHORT_BEACON_HEAD: portion of the S1G short beacon before
+ * the TIM element
+ * @NL80211_ATTR_SHORT_BEACON_TAIL: portion of the S1G short beacon after
+ * the TIM element
+ *
* @NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS: Maximum number of peers that HW
* timestamping can be enabled for concurrently (u16), a wiphy attribute.
* A value of 0xffff indicates setting for all peers (i.e. not specifying
@@ -3336,6 +3342,10 @@ enum nl80211_attrs {

NL80211_ATTR_PUNCT_BITMAP,

+ NL80211_ATTR_SHORT_BEACON_PERIOD,
+ NL80211_ATTR_SHORT_BEACON_HEAD,
+ NL80211_ATTR_SHORT_BEACON_TAIL,
+
NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS,
NL80211_ATTR_HW_TIMESTAMP_ENABLED,

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 2c9edb015652..5b28ef35ffe3 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -230,13 +230,19 @@ static int validate_beacon_head(const struct nlattr *attr,
const struct element *elem;
const struct ieee80211_mgmt *mgmt = (void *)data;
unsigned int fixedlen, hdrlen;
- bool s1g_bcn;
+ bool s1g_bcn = false;
+ bool s1g_short_bcn = false;

if (len < offsetofend(typeof(*mgmt), frame_control))
goto err;

s1g_bcn = ieee80211_is_s1g_beacon(mgmt->frame_control);
- if (s1g_bcn) {
+ s1g_short_bcn = ieee80211_is_s1g_short_beacon(mgmt->frame_control);
+ if (s1g_short_bcn) {
+ fixedlen = offsetof(struct ieee80211_ext,
+ u.s1g_short_beacon.variable);
+ hdrlen = offsetof(struct ieee80211_ext, u.s1g_short_beacon);
+ } else if (s1g_bcn) {
fixedlen = offsetof(struct ieee80211_ext,
u.s1g_beacon.variable);
hdrlen = offsetof(struct ieee80211_ext, u.s1g_beacon);
@@ -263,7 +269,12 @@ static int validate_beacon_head(const struct nlattr *attr,
return 0;

err:
- NL_SET_ERR_MSG_ATTR(extack, attr, "malformed beacon head");
+ if (s1g_short_bcn)
+ NL_SET_ERR_MSG_ATTR(extack, attr, "malformed S1G short beacon head");
+ else if (s1g_bcn)
+ NL_SET_ERR_MSG_ATTR(extack, attr, "malformed S1G beacon head");
+ else
+ NL_SET_ERR_MSG_ATTR(extack, attr, "malformed beacon head");
return -EINVAL;
}

@@ -810,6 +821,12 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
[NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS] = { .type = NLA_U16 },
[NL80211_ATTR_HW_TIMESTAMP_ENABLED] = { .type = NLA_FLAG },
[NL80211_ATTR_EMA_RNR_ELEMS] = { .type = NLA_NESTED },
+
+ [NL80211_ATTR_SHORT_BEACON_PERIOD] = NLA_POLICY_MIN(NLA_U16, 1),
+ [NL80211_ATTR_SHORT_BEACON_HEAD] =
+ NLA_POLICY_VALIDATE_FN(NLA_BINARY, validate_beacon_head, IEEE80211_MAX_DATA_LEN),
+ [NL80211_ATTR_SHORT_BEACON_TAIL] =
+ NLA_POLICY_VALIDATE_FN(NLA_BINARY, validate_ie_attr, IEEE80211_MAX_DATA_LEN),
};

/* policy for the key attributes */
@@ -5495,7 +5512,8 @@ static int nl80211_parse_he_bss_color(struct nlattr *attrs,
static int nl80211_parse_beacon(struct cfg80211_registered_device *rdev,
struct nlattr *attrs[],
struct cfg80211_beacon_data *bcn,
- struct netlink_ext_ack *extack)
+ struct netlink_ext_ack *extack,
+ bool is_s1g_band)
{
bool haveinfo = false;
int err;
@@ -5505,10 +5523,18 @@ static int nl80211_parse_beacon(struct cfg80211_registered_device *rdev,
bcn->link_id = nl80211_link_id(attrs);

if (attrs[NL80211_ATTR_BEACON_HEAD]) {
+ struct ieee80211_mgmt *mgmt;
+
bcn->head = nla_data(attrs[NL80211_ATTR_BEACON_HEAD]);
bcn->head_len = nla_len(attrs[NL80211_ATTR_BEACON_HEAD]);
if (!bcn->head_len)
return -EINVAL;
+
+ mgmt = (void *)bcn->head;
+ if (ieee80211_is_s1g_beacon(mgmt->frame_control) && !is_s1g_band)
+ return -EINVAL;
+ else if (ieee80211_is_beacon(mgmt->frame_control) && is_s1g_band)
+ return -EINVAL;
haveinfo = true;
}

@@ -5518,6 +5544,22 @@ static int nl80211_parse_beacon(struct cfg80211_registered_device *rdev,
haveinfo = true;
}

+ if (attrs[NL80211_ATTR_SHORT_BEACON_HEAD]) {
+ if (!is_s1g_band)
+ return -EINVAL;
+ bcn->short_head = nla_data(attrs[NL80211_ATTR_SHORT_BEACON_HEAD]);
+ bcn->short_head_len = nla_len(attrs[NL80211_ATTR_SHORT_BEACON_HEAD]);
+ haveinfo = true;
+ }
+
+ if (attrs[NL80211_ATTR_SHORT_BEACON_TAIL]) {
+ if (!is_s1g_band)
+ return -EINVAL;
+ bcn->short_tail = nla_data(attrs[NL80211_ATTR_SHORT_BEACON_TAIL]);
+ bcn->short_tail_len = nla_len(attrs[NL80211_ATTR_SHORT_BEACON_TAIL]);
+ haveinfo = true;
+ }
+
if (!haveinfo)
return -EINVAL;

@@ -5925,8 +5967,24 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
if (!params)
return -ENOMEM;

+ if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
+ err = nl80211_parse_chandef(rdev, info, &params->chandef);
+ if (err)
+ goto out;
+ } else if (wdev->valid_links) {
+ /* with MLD need to specify the channel configuration */
+ err = -EINVAL;
+ goto out;
+ } else if (wdev->u.ap.preset_chandef.chan) {
+ params->chandef = wdev->u.ap.preset_chandef;
+ } else if (!nl80211_get_ap_channel(rdev, params)) {
+ err = -EINVAL;
+ goto out;
+ }
+
err = nl80211_parse_beacon(rdev, info->attrs, &params->beacon,
- info->extack);
+ info->extack,
+ params->chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
goto out;

@@ -5934,6 +5992,10 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]);
params->dtim_period =
nla_get_u32(info->attrs[NL80211_ATTR_DTIM_PERIOD]);
+ params->short_beacon_period = 1;
+ if (info->attrs[NL80211_ATTR_SHORT_BEACON_PERIOD])
+ params->short_beacon_period =
+ nla_get_u16(info->attrs[NL80211_ATTR_SHORT_BEACON_PERIOD]);

err = cfg80211_validate_beacon_int(rdev, dev->ieee80211_ptr->iftype,
params->beacon_interval);
@@ -6030,21 +6092,6 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
}
}

- if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
- err = nl80211_parse_chandef(rdev, info, &params->chandef);
- if (err)
- goto out;
- } else if (wdev->valid_links) {
- /* with MLD need to specify the channel configuration */
- err = -EINVAL;
- goto out;
- } else if (wdev->u.ap.preset_chandef.chan) {
- params->chandef = wdev->u.ap.preset_chandef;
- } else if (!nl80211_get_ap_channel(rdev, params)) {
- err = -EINVAL;
- goto out;
- }
-
if (info->attrs[NL80211_ATTR_PUNCT_BITMAP]) {
err = nl80211_parse_punct_bitmap(rdev, info,
&params->chandef,
@@ -6227,7 +6274,8 @@ static int nl80211_set_beacon(struct sk_buff *skb, struct genl_info *info)
if (!wdev->links[link_id].ap.beacon_interval)
return -EINVAL;

- err = nl80211_parse_beacon(rdev, info->attrs, &params, info->extack);
+ err = nl80211_parse_beacon(rdev, info->attrs, &params, info->extack,
+ wdev->links[link_id].ap.chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
goto out;

@@ -10098,7 +10146,8 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
goto skip_beacons;

err = nl80211_parse_beacon(rdev, info->attrs, &params.beacon_after,
- info->extack);
+ info->extack,
+ wdev->links[link_id].ap.chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
goto free;

@@ -10116,7 +10165,8 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
goto free;

err = nl80211_parse_beacon(rdev, csa_attrs, &params.beacon_csa,
- info->extack);
+ info->extack,
+ wdev->links[link_id].ap.chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
goto free;

@@ -15931,6 +15981,7 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info)
struct cfg80211_color_change_settings params = {};
struct net_device *dev = info->user_ptr[1];
struct wireless_dev *wdev = dev->ieee80211_ptr;
+ unsigned int link_id = nl80211_link_id(info->attrs);
struct nlattr **tb;
u16 offset;
int err;
@@ -15954,7 +16005,8 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info)
params.color = nla_get_u8(info->attrs[NL80211_ATTR_COLOR_CHANGE_COLOR]);

err = nl80211_parse_beacon(rdev, info->attrs, &params.beacon_next,
- info->extack);
+ info->extack,
+ wdev->links[link_id].ap.chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
return err;

@@ -15969,7 +16021,8 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info)
goto out;

err = nl80211_parse_beacon(rdev, tb, &params.beacon_color_change,
- info->extack);
+ info->extack,
+ wdev->links[link_id].ap.chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
goto out;


base-commit: aa2aa818cd1198cfa2498116d57cd9f13fea80e4
--
2.34.1

2023-04-19 11:45:16

by Kalle Valo

Subject: Re: [PATCH v5 1/2] wifi: cfg80211: Add short_beacon_tail/head/period

Gilad Itzkovitch <[email protected]> writes:

> From: Kieran Frewen <[email protected]>
>
> Support variables to handle short beacon period and adding a
> separate tail/head for them. Also, add short beacon period,
> head and tail attributes for user configuration.
>
> Reported-by: kernel test robot <[email protected]>
> Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> Signed-off-by: Kieran Frewen <[email protected]>
> Co-developed-by: Gilad Itzkovitch <[email protected]>
> Signed-off-by: Gilad Itzkovitch <[email protected]>
>
> v5:
> - initialise s1g beacon variables to false
> v4:
> - squash cfg80211 commits together
> - add protection for short head/tail with S1G band check
> - better validation rule for short_beacon_period
> and align its types
> ---

We (wireless) prefer that the changelog is after the "---" line. Not
sure if Johannes can fix that during commit or not.

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2023-08-08 17:02:51

by Bassem Dawood

Subject: [PATCH v6 1/2] wifi: cfg80211: Add short_beacon_tail/head/period

From: Kieran Frewen <[email protected]>

Support variables to handle short beacon period and adding a
separate tail/head for them. Also, add short beacon period,
head and tail attributes for user configuration.

Reported-by: kernel test robot <[email protected]>
Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
Signed-off-by: Kieran Frewen <[email protected]>
Co-developed-by: Gilad Itzkovitch <[email protected]>
Signed-off-by: Gilad Itzkovitch <[email protected]>
---
v6:
- update to latest wireless-next
v5:
- initialise s1g beacon variables to false
v4:
- squash cfg80211 commits together
- add protection for short head/tail with S1G band check
- better validation rule for short_beacon_period
and align its types
---
include/net/cfg80211.h | 10 +++-
include/uapi/linux/nl80211.h | 10 ++++
net/wireless/nl80211.c | 103 ++++++++++++++++++++++++++---------
3 files changed, 97 insertions(+), 26 deletions(-)

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 7c7d03aa9d06..482f455305aa 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1211,8 +1211,13 @@ struct cfg80211_rnr_elems {
* or %NULL if not changed
* @tail: tail portion of beacon (after TIM IE)
* or %NULL if not changed
+ * @short_head: head portion of short beacon or %NULL if not changed
+ * @short_tail: short tail portion of beacon (after TIM IE)
+ * or %NULL if not changed
* @head_len: length of @head
* @tail_len: length of @tail
+ * @short_head_len: length of @short_head
+ * @short_tail_len: length of @short_tail
* @beacon_ies: extra information element(s) to add into Beacon frames or %NULL
* @beacon_ies_len: length of beacon_ies in octets
* @proberesp_ies: extra information element(s) to add into Probe Response
@@ -1241,6 +1246,7 @@ struct cfg80211_beacon_data {
unsigned int link_id;

const u8 *head, *tail;
+ const u8 *short_head, *short_tail;
const u8 *beacon_ies;
const u8 *proberesp_ies;
const u8 *assocresp_ies;
@@ -1252,6 +1258,7 @@ struct cfg80211_beacon_data {
s8 ftm_responder;

size_t head_len, tail_len;
+ size_t short_head_len, short_tail_len;
size_t beacon_ies_len;
size_t proberesp_ies_len;
size_t assocresp_ies_len;
@@ -1324,6 +1331,7 @@ struct cfg80211_unsol_bcast_probe_resp {
* @beacon: beacon data
* @beacon_interval: beacon interval
* @dtim_period: DTIM period
+ * @short_beacon_period: S1G short beacon period
* @ssid: SSID to be used in the BSS (note: may be %NULL if not provided from
* user space)
* @ssid_len: length of @ssid
@@ -1365,7 +1373,7 @@ struct cfg80211_ap_settings {

struct cfg80211_beacon_data beacon;

- int beacon_interval, dtim_period;
+ int beacon_interval, dtim_period, short_beacon_period;
const u8 *ssid;
size_t ssid_len;
enum nl80211_hidden_ssid hidden_ssid;
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 88eb85c63029..03df70b0238e 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2794,6 +2794,12 @@ enum nl80211_commands {
* indicates that the sub-channel is punctured. Higher 16 bits are
* reserved.
*
+ * @NL80211_ATTR_SHORT_BEACON_PERIOD: (u16) period for S1G long beacon
+ * @NL80211_ATTR_SHORT_BEACON_HEAD: portion of the S1G short beacon before
+ * the TIM element
+ * @NL80211_ATTR_SHORT_BEACON_TAIL: portion of the S1G short beacon after
+ * the TIM element
+ *
* @NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS: Maximum number of peers that HW
* timestamping can be enabled for concurrently (u16), a wiphy attribute.
* A value of 0xffff indicates setting for all peers (i.e. not specifying
@@ -3346,6 +3352,10 @@ enum nl80211_attrs {

NL80211_ATTR_PUNCT_BITMAP,

+ NL80211_ATTR_SHORT_BEACON_PERIOD,
+ NL80211_ATTR_SHORT_BEACON_HEAD,
+ NL80211_ATTR_SHORT_BEACON_TAIL,
+
NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS,
NL80211_ATTR_HW_TIMESTAMP_ENABLED,

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 0da2e6a2a7ea..eedc6f47d74d 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -230,13 +230,19 @@ static int validate_beacon_head(const struct nlattr *attr,
const struct element *elem;
const struct ieee80211_mgmt *mgmt = (void *)data;
unsigned int fixedlen, hdrlen;
- bool s1g_bcn;
+ bool s1g_bcn = false;
+ bool s1g_short_bcn = false;

if (len < offsetofend(typeof(*mgmt), frame_control))
goto err;

s1g_bcn = ieee80211_is_s1g_beacon(mgmt->frame_control);
- if (s1g_bcn) {
+ s1g_short_bcn = ieee80211_is_s1g_short_beacon(mgmt->frame_control);
+ if (s1g_short_bcn) {
+ fixedlen = offsetof(struct ieee80211_ext,
+ u.s1g_short_beacon.variable);
+ hdrlen = offsetof(struct ieee80211_ext, u.s1g_short_beacon);
+ } else if (s1g_bcn) {
fixedlen = offsetof(struct ieee80211_ext,
u.s1g_beacon.variable);
hdrlen = offsetof(struct ieee80211_ext, u.s1g_beacon);
@@ -263,7 +269,12 @@ static int validate_beacon_head(const struct nlattr *attr,
return 0;

err:
- NL_SET_ERR_MSG_ATTR(extack, attr, "malformed beacon head");
+ if (s1g_short_bcn)
+ NL_SET_ERR_MSG_ATTR(extack, attr, "malformed S1G short beacon head");
+ else if (s1g_bcn)
+ NL_SET_ERR_MSG_ATTR(extack, attr, "malformed S1G beacon head");
+ else
+ NL_SET_ERR_MSG_ATTR(extack, attr, "malformed beacon head");
return -EINVAL;
}

@@ -817,6 +828,12 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
[NL80211_ATTR_HW_TIMESTAMP_ENABLED] = { .type = NLA_FLAG },
[NL80211_ATTR_EMA_RNR_ELEMS] = { .type = NLA_NESTED },
[NL80211_ATTR_MLO_LINK_DISABLED] = { .type = NLA_FLAG },
+
+ [NL80211_ATTR_SHORT_BEACON_PERIOD] = NLA_POLICY_MIN(NLA_U16, 1),
+ [NL80211_ATTR_SHORT_BEACON_HEAD] =
+ NLA_POLICY_VALIDATE_FN(NLA_BINARY, validate_beacon_head, IEEE80211_MAX_DATA_LEN),
+ [NL80211_ATTR_SHORT_BEACON_TAIL] =
+ NLA_POLICY_VALIDATE_FN(NLA_BINARY, validate_ie_attr, IEEE80211_MAX_DATA_LEN),
};

/* policy for the key attributes */
@@ -5505,7 +5522,8 @@ static int nl80211_parse_he_bss_color(struct nlattr *attrs,
static int nl80211_parse_beacon(struct cfg80211_registered_device *rdev,
struct nlattr *attrs[],
struct cfg80211_beacon_data *bcn,
- struct netlink_ext_ack *extack)
+ struct netlink_ext_ack *extack,
+ bool is_s1g_band)
{
bool haveinfo = false;
int err;
@@ -5515,10 +5533,18 @@ static int nl80211_parse_beacon(struct cfg80211_registered_device *rdev,
bcn->link_id = nl80211_link_id(attrs);

if (attrs[NL80211_ATTR_BEACON_HEAD]) {
+ struct ieee80211_mgmt *mgmt;
+
bcn->head = nla_data(attrs[NL80211_ATTR_BEACON_HEAD]);
bcn->head_len = nla_len(attrs[NL80211_ATTR_BEACON_HEAD]);
if (!bcn->head_len)
return -EINVAL;
+
+ mgmt = (void *)bcn->head;
+ if (ieee80211_is_s1g_beacon(mgmt->frame_control) && !is_s1g_band)
+ return -EINVAL;
+ else if (ieee80211_is_beacon(mgmt->frame_control) && is_s1g_band)
+ return -EINVAL;
haveinfo = true;
}

@@ -5528,6 +5554,22 @@ static int nl80211_parse_beacon(struct cfg80211_registered_device *rdev,
haveinfo = true;
}

+ if (attrs[NL80211_ATTR_SHORT_BEACON_HEAD]) {
+ if (!is_s1g_band)
+ return -EINVAL;
+ bcn->short_head = nla_data(attrs[NL80211_ATTR_SHORT_BEACON_HEAD]);
+ bcn->short_head_len = nla_len(attrs[NL80211_ATTR_SHORT_BEACON_HEAD]);
+ haveinfo = true;
+ }
+
+ if (attrs[NL80211_ATTR_SHORT_BEACON_TAIL]) {
+ if (!is_s1g_band)
+ return -EINVAL;
+ bcn->short_tail = nla_data(attrs[NL80211_ATTR_SHORT_BEACON_TAIL]);
+ bcn->short_tail_len = nla_len(attrs[NL80211_ATTR_SHORT_BEACON_TAIL]);
+ haveinfo = true;
+ }
+
if (!haveinfo)
return -EINVAL;

@@ -5935,8 +5977,24 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
if (!params)
return -ENOMEM;

+ if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
+ err = nl80211_parse_chandef(rdev, info, &params->chandef);
+ if (err)
+ goto out;
+ } else if (wdev->valid_links) {
+ /* with MLD need to specify the channel configuration */
+ err = -EINVAL;
+ goto out;
+ } else if (wdev->u.ap.preset_chandef.chan) {
+ params->chandef = wdev->u.ap.preset_chandef;
+ } else if (!nl80211_get_ap_channel(rdev, params)) {
+ err = -EINVAL;
+ goto out;
+ }
+
err = nl80211_parse_beacon(rdev, info->attrs, &params->beacon,
- info->extack);
+ info->extack,
+ params->chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
goto out;

@@ -5944,6 +6002,10 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]);
params->dtim_period =
nla_get_u32(info->attrs[NL80211_ATTR_DTIM_PERIOD]);
+ params->short_beacon_period = 1;
+ if (info->attrs[NL80211_ATTR_SHORT_BEACON_PERIOD])
+ params->short_beacon_period =
+ nla_get_u16(info->attrs[NL80211_ATTR_SHORT_BEACON_PERIOD]);

err = cfg80211_validate_beacon_int(rdev, dev->ieee80211_ptr->iftype,
params->beacon_interval);
@@ -6040,21 +6102,6 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
}
}

- if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
- err = nl80211_parse_chandef(rdev, info, &params->chandef);
- if (err)
- goto out;
- } else if (wdev->valid_links) {
- /* with MLD need to specify the channel configuration */
- err = -EINVAL;
- goto out;
- } else if (wdev->u.ap.preset_chandef.chan) {
- params->chandef = wdev->u.ap.preset_chandef;
- } else if (!nl80211_get_ap_channel(rdev, params)) {
- err = -EINVAL;
- goto out;
- }
-
if (info->attrs[NL80211_ATTR_PUNCT_BITMAP]) {
err = nl80211_parse_punct_bitmap(rdev, info,
&params->chandef,
@@ -6237,7 +6284,8 @@ static int nl80211_set_beacon(struct sk_buff *skb, struct genl_info *info)
if (!wdev->links[link_id].ap.beacon_interval)
return -EINVAL;

- err = nl80211_parse_beacon(rdev, info->attrs, &params, info->extack);
+ err = nl80211_parse_beacon(rdev, info->attrs, &params, info->extack,
+ wdev->links[link_id].ap.chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
goto out;

@@ -10131,7 +10179,8 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
goto skip_beacons;

err = nl80211_parse_beacon(rdev, info->attrs, &params.beacon_after,
- info->extack);
+ info->extack,
+ wdev->links[link_id].ap.chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
goto free;

@@ -10149,7 +10198,8 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
goto free;

err = nl80211_parse_beacon(rdev, csa_attrs, &params.beacon_csa,
- info->extack);
+ info->extack,
+ wdev->links[link_id].ap.chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
goto free;

@@ -15976,6 +16026,7 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info)
struct cfg80211_color_change_settings params = {};
struct net_device *dev = info->user_ptr[1];
struct wireless_dev *wdev = dev->ieee80211_ptr;
+ unsigned int link_id = nl80211_link_id(info->attrs);
struct nlattr **tb;
u16 offset;
int err;
@@ -15999,7 +16050,8 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info)
params.color = nla_get_u8(info->attrs[NL80211_ATTR_COLOR_CHANGE_COLOR]);

err = nl80211_parse_beacon(rdev, info->attrs, &params.beacon_next,
- info->extack);
+ info->extack,
+ wdev->links[link_id].ap.chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
return err;

@@ -16014,7 +16066,8 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info)
goto out;

err = nl80211_parse_beacon(rdev, tb, &params.beacon_color_change,
- info->extack);
+ info->extack,
+ wdev->links[link_id].ap.chandef.chan->band == NL80211_BAND_S1GHZ);
if (err)
goto out;

--
2.25.1

2023-08-08 20:38:50

by Jeff Johnson

Subject: Re: [PATCH v6 1/2] wifi: cfg80211: Add short_beacon_tail/head/period

On 8/8/2023 3:27 AM, Bassem Dawood wrote:
[snip]
> diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
> index 88eb85c63029..03df70b0238e 100644
> --- a/include/uapi/linux/nl80211.h
> +++ b/include/uapi/linux/nl80211.h
> @@ -2794,6 +2794,12 @@ enum nl80211_commands {
> * indicates that the sub-channel is punctured. Higher 16 bits are
> * reserved.
> *
> + * @NL80211_ATTR_SHORT_BEACON_PERIOD: (u16) period for S1G long beacon
> + * @NL80211_ATTR_SHORT_BEACON_HEAD: portion of the S1G short beacon before
> + * the TIM element
> + * @NL80211_ATTR_SHORT_BEACON_TAIL: portion of the S1G short beacon after
> + * the TIM element
> + *
> * @NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS: Maximum number of peers that HW
> * timestamping can be enabled for concurrently (u16), a wiphy attribute.
> * A value of 0xffff indicates setting for all peers (i.e. not specifying
> @@ -3346,6 +3352,10 @@ enum nl80211_attrs {
>
> NL80211_ATTR_PUNCT_BITMAP,
>
> + NL80211_ATTR_SHORT_BEACON_PERIOD,
> + NL80211_ATTR_SHORT_BEACON_HEAD,
> + NL80211_ATTR_SHORT_BEACON_TAIL,
> +

This is a UAPI so all additions must go at the end to avoid renumbering
the values of existing enumerations

> NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS,
> NL80211_ATTR_HW_TIMESTAMP_ENABLED,

2023-08-08 20:46:16

by Bassem Dawood

Subject: [PATCH v6 2/2] wifi: mac80211: S1G beacon/short beacon support

From: Kieran Frewen <[email protected]>

With the kernel able to send both short and long S1G beacons, include
the ability for setting the short beacon period. If configured, use
the S1G short beacon format. The S1G short beacon format includes a
limited set of information elements. It also adds the support for
distinguish short beacon head and tail.

Signed-off-by: Kieran Frewen <[email protected]>
Co-developed-by: Gilad Itzkovitch <[email protected]>
Signed-off-by: Gilad Itzkovitch <[email protected]>
---
v6:
- update to latest wireless-next
v4:
- squash mac80211 commits together
- address hitting short head/tail code path in nl80211.c
- update code style
---
include/net/mac80211.h | 2 ++
net/mac80211/cfg.c | 36 ++++++++++++++++++++++++++++++++++--
net/mac80211/ieee80211_i.h | 3 +++
net/mac80211/tx.c | 22 ++++++++++++++++++++--
4 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 3a8a2d2c58c3..912abcc2dec0 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -573,6 +573,7 @@ struct ieee80211_fils_discovery {
* Note also that this is not used with MLD associations, mac80211 doesn't
* know how to track beacons for all of the links for this.
* @beacon_int: beacon interval
+ * @short_beacon_period: S1G short beacon period
* @assoc_capability: capabilities taken from assoc resp
* @basic_rates: bitmap of basic rates, each bit stands for an
* index into the rate table configured by the driver in
@@ -706,6 +707,7 @@ struct ieee80211_bss_conf {
bool enable_beacon;
u8 dtim_period;
u16 beacon_int;
+ u16 short_beacon_period;
u16 assoc_capability;
u64 sync_tsf;
u32 sync_device_ts;
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index e7ac24603892..4925c476b46e 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1119,6 +1119,7 @@ ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
struct cfg80211_rnr_elems *rnr = NULL;
struct beacon_data *new, *old;
int new_head_len, new_tail_len;
+ int new_short_head_len, new_short_tail_len;
int size, err;
u64 _changed = BSS_CHANGED_BEACON;
struct ieee80211_bss_conf *link_conf = link->conf;
@@ -1135,6 +1136,13 @@ ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
else
new_head_len = old->head_len;

+ /* Short head is not a mandatory field */
+ new_short_head_len = 0;
+ if (params->short_head)
+ new_short_head_len = params->short_head_len;
+ else if (old && old->short_head)
+ new_short_head_len = old->short_head_len;
+
/* new or old tail? */
if (params->tail || !old)
/* params->tail_len will be zero for !params->tail */
@@ -1142,7 +1150,14 @@ ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
else
new_tail_len = old->tail_len;

- size = sizeof(*new) + new_head_len + new_tail_len;
+ if (params->short_tail || !old)
+ /* params->short_tail_len will be zero for !params->short_tail */
+ new_short_tail_len = params->short_tail_len;
+ else
+ new_short_tail_len = old->short_tail_len;
+
+ size = sizeof(*new) + new_head_len + new_tail_len +
+ new_short_head_len + new_short_tail_len;

/* new or old multiple BSSID elements? */
if (params->mbssid_ies) {
@@ -1177,11 +1192,16 @@ ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
*/
new->head = ((u8 *) new) + sizeof(*new);
new->tail = new->head + new_head_len;
+ new->short_head = new->tail + new_tail_len;
+ new->short_tail = new->short_head + new_short_head_len;
new->head_len = new_head_len;
new->tail_len = new_tail_len;
+ new->short_head_len = new_short_head_len;
+ new->short_tail_len = new_short_tail_len;
+
/* copy in optional mbssid_ies */
if (mbssid) {
- u8 *pos = new->tail + new->tail_len;
+ u8 *pos = new->short_tail + new->short_tail_len;

new->mbssid_ies = (void *)pos;
pos += struct_size(new->mbssid_ies, elem, mbssid->cnt);
@@ -1213,6 +1233,11 @@ ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
else
memcpy(new->head, old->head, new_head_len);

+ if (params->short_head)
+ memcpy(new->short_head, params->short_head, new_short_head_len);
+ else if (old && old->short_head)
+ memcpy(new->short_head, old->short_head, new_short_head_len);
+
/* copy in optional tail */
if (params->tail)
memcpy(new->tail, params->tail, new_tail_len);
@@ -1220,6 +1245,12 @@ ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
if (old)
memcpy(new->tail, old->tail, new_tail_len);

+ /* copy in optional short tail */
+ if (params->short_tail)
+ memcpy(new->short_tail, params->short_tail, new_short_tail_len);
+ else if (old)
+ memcpy(new->short_tail, old->short_tail, new_short_tail_len);
+
err = ieee80211_set_probe_resp(sdata, params->probe_resp,
params->probe_resp_len, csa, cca, link);
if (err < 0) {
@@ -1418,6 +1449,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
}

link_conf->dtim_period = params->dtim_period;
+ link_conf->short_beacon_period = params->short_beacon_period;
link_conf->enable_beacon = true;
link_conf->allow_p2p_go_ps = sdata->vif.p2p;
link_conf->twt_responder = params->twt_responder;
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 91633a0b723e..bc60384740e0 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -259,10 +259,13 @@ struct ieee80211_color_change_settings {

struct beacon_data {
u8 *head, *tail;
+ u8 *short_head, *short_tail;
int head_len, tail_len;
+ int short_head_len, short_tail_len;
struct ieee80211_meshconf_ie *meshconf;
u16 cntdwn_counter_offsets[IEEE80211_MAX_CNTDWN_COUNTERS_NUM];
u8 cntdwn_current_counter;
+ u8 long_beacon_count;
struct cfg80211_mbssid_elems *mbssid_ies;
struct cfg80211_rnr_elems *rnr_ies;
struct rcu_head rcu_head;
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 7fe7280e8437..f3015941ae80 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -5260,6 +5260,18 @@ ieee80211_beacon_get_ap(struct ieee80211_hw *hw,
struct sk_buff *skb = NULL;
u16 csa_off_base = 0;
int mbssid_len;
+ bool is_short = false;
+
+ if (vif->cfg.s1g) {
+ if (beacon->long_beacon_count == 0) {
+ is_short = false;
+ beacon->long_beacon_count =
+ vif->bss_conf.short_beacon_period - 1;
+ } else {
+ is_short = true;
+ beacon->long_beacon_count--;
+ }
+ }

if (beacon->cntdwn_counter_offsets[0]) {
if (!is_template)
@@ -5282,7 +5294,11 @@ ieee80211_beacon_get_ap(struct ieee80211_hw *hw,
return NULL;

skb_reserve(skb, local->tx_headroom);
- skb_put_data(skb, beacon->head, beacon->head_len);
+
+ if (is_short)
+ skb_put_data(skb, beacon->short_head, beacon->short_head_len);
+ else
+ skb_put_data(skb, beacon->head, beacon->head_len);

ieee80211_beacon_add_tim(sdata, link, &ap->ps, skb, is_template);

@@ -5300,7 +5316,9 @@ ieee80211_beacon_get_ap(struct ieee80211_hw *hw,
csa_off_base = skb->len;
}

- if (beacon->tail)
+ if (beacon->short_tail && is_short)
+ skb_put_data(skb, beacon->short_tail, beacon->short_tail_len);
+ else if (beacon->tail && !is_short)
skb_put_data(skb, beacon->tail, beacon->tail_len);

if (ieee80211_beacon_protect(skb, local, sdata, link) < 0)
--
2.25.1