cfg80211: support RNR for EMA AP

As per IEEE Std 802.11ax-2021, 11.1.3.8.3 Discovery of a nontransmitted BSSID profile, an EMA AP that transmits a Beacon frame carrying a partial list of nontransmitted BSSID profiles should include in the frame a Reduced Neighbor Report element carrying information for at least the nontransmitted BSSIDs that are not present in the Multiple BSSID element carried in that frame. Add new nested attribute NL80211_ATTR_EMA_RNR_ELEMS to support the above. Number of RNR elements must be more than or equal to the number of MBSSID elements. This attribute can be used only when EMA is enabled. Userspace is responsible for splitting the RNR into multiple elements such that each element excludes the non-transmitting profiles already included in the MBSSID element (%NL80211_ATTR_MBSSID_ELEMS) at the same index. Each EMA beacon will be generated by adding MBSSID and RNR elements at the same index. If the userspace provides more RNR elements than the number of MBSSID elements then these will be added in every EMA beacon.

Aloka Dixit committed 3 years ago

Commit dbbb27e1 parent f1024243 files · +104 −7Browse files

Unified · Split

3 files

include/net/cfg80211.h +19 −0
include/uapi/linux/nl80211.h +13 −0
net/wireless/nl80211.c +72 −7

include/net/cfg80211.h+19−0

@@ -1178,6 +1178,23 @@ struct cfg80211_mbssid_elems { · 1177 unmodified lines
1178	} elem[];	1178	} elem[];
1179	};	1179	};
1180		1180
		1181	/**
		1182	* struct cfg80211_rnr_elems - Reduced neighbor report (RNR) elements
		1183	*
		1184	* @cnt: Number of elements in array %elems.
		1185	*
		1186	* @elem: Array of RNR element(s) to be added into Beacon frames.
		1187	* @elem.data: Data for RNR elements.
		1188	* @elem.len: Length of data.
		1189	*/
		1190	struct cfg80211_rnr_elems {
		1191	u8 cnt;
		1192	struct {
		1193	const u8 *data;
		1194	size_t len;
		1195	} elem[];
		1196	};
		1197
1181	/**	1198	/**
1182	* struct cfg80211_beacon_data - beacon data	1199	* struct cfg80211_beacon_data - beacon data
1183	* @link_id: the link ID for the AP MLD link sending this beacon	1200	* @link_id: the link ID for the AP MLD link sending this beacon
@@ -1198,6 +1215,7 @@ struct cfg80211_mbssid_elems { · 14 unmodified lines
1198	* @probe_resp_len: length of probe response template (@probe_resp)	1215	* @probe_resp_len: length of probe response template (@probe_resp)
1199	* @probe_resp: probe response template (AP mode only)	1216	* @probe_resp: probe response template (AP mode only)
1200	* @mbssid_ies: multiple BSSID elements	1217	* @mbssid_ies: multiple BSSID elements
		1218	* @rnr_ies: reduced neighbor report elements
1201	* @ftm_responder: enable FTM responder functionality; -1 for no change	1219	* @ftm_responder: enable FTM responder functionality; -1 for no change
1202	* (which also implies no change in LCI/civic location data)	1220	* (which also implies no change in LCI/civic location data)
1203	* @lci: Measurement Report element content, starting with Measurement Token	1221	* @lci: Measurement Report element content, starting with Measurement Token
@@ -1221,6 +1239,7 @@ struct cfg80211_beacon_data { · 17 unmodified lines
1221	const u8 *lci;	1239	const u8 *lci;
1222	const u8 *civicloc;	1240	const u8 *civicloc;
1223	struct cfg80211_mbssid_elems *mbssid_ies;	1241	struct cfg80211_mbssid_elems *mbssid_ies;
		1242	struct cfg80211_rnr_elems *rnr_ies;
1224	s8 ftm_responder;	1243	s8 ftm_responder;
1225		1244
1226	size_t head_len, tail_len;	1245	size_t head_len, tail_len;

include/uapi/linux/nl80211.h+13−0

@@ -2794,6 +2794,17 @@ enum nl80211_commands { · 2793 unmodified lines
2794	* @NL80211_ATTR_HW_TIMESTAMP_ENABLED: Indicates whether HW timestamping should	2794	* @NL80211_ATTR_HW_TIMESTAMP_ENABLED: Indicates whether HW timestamping should
2795	* be enabled or not (flag attribute).	2795	* be enabled or not (flag attribute).
2796	*	2796	*
		2797	* @NL80211_ATTR_EMA_RNR_ELEMS: Optional nested attribute for
		2798	* reduced neighbor report (RNR) elements. This attribute can be used
		2799	* only when NL80211_MBSSID_CONFIG_ATTR_EMA is enabled.
		2800	* Userspace is responsible for splitting the RNR into multiple
		2801	* elements such that each element excludes the non-transmitting
		2802	* profiles already included in the MBSSID element
		2803	* (%NL80211_ATTR_MBSSID_ELEMS) at the same index. Each EMA beacon
		2804	* will be generated by adding MBSSID and RNR elements at the same
		2805	* index. If the userspace includes more RNR elements than number of
		2806	* MBSSID elements then these will be added in every EMA beacon.
		2807	*
2797	* @NUM_NL80211_ATTR: total number of nl80211_attrs available	2808	* @NUM_NL80211_ATTR: total number of nl80211_attrs available
2798	* @NL80211_ATTR_MAX: highest attribute number currently defined	2809	* @NL80211_ATTR_MAX: highest attribute number currently defined
2799	* @__NL80211_ATTR_AFTER_LAST: internal use	2810	* @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3328,6 +3339,8 @@ enum nl80211_attrs { · 528 unmodified lines
3328	NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS,	3339	NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS,
3329	NL80211_ATTR_HW_TIMESTAMP_ENABLED,	3340	NL80211_ATTR_HW_TIMESTAMP_ENABLED,
3330		3341
		3342	NL80211_ATTR_EMA_RNR_ELEMS,
		3343
3331	/* add attributes here, update the policy in nl80211.c */	3344	/* add attributes here, update the policy in nl80211.c */
3332		3345
3333	__NL80211_ATTR_AFTER_LAST,	3346	__NL80211_ATTR_AFTER_LAST,

net/wireless/nl80211.c+72−7

 	[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 },
 };
 /* policy for the key attributes */
 	return elems;
 }
+static struct cfg80211_rnr_elems *
+nl80211_parse_rnr_elems(struct wiphy *wiphy, struct nlattr *attrs,
+			struct netlink_ext_ack *extack)
+{
+	struct nlattr *nl_elems;
+	struct cfg80211_rnr_elems *elems;
+	int rem_elems;
+	u8 i = 0, num_elems = 0;
+	nla_for_each_nested(nl_elems, attrs, rem_elems) {
+		int ret;
+		ret = validate_ie_attr(nl_elems, extack);
+		if (ret)
+			return ERR_PTR(ret);
+		num_elems++;
+	}
+	elems = kzalloc(struct_size(elems, elem, num_elems), GFP_KERNEL);
+	if (!elems)
+		return ERR_PTR(-ENOMEM);
+	nla_for_each_nested(nl_elems, attrs, rem_elems) {
+		elems->elem[i].data = nla_data(nl_elems);
+		elems->elem[i].len = nla_len(nl_elems);
+		i++;
+	}
+	elems->cnt = num_elems;
+	return elems;
+}
 static int nl80211_parse_he_bss_color(struct nlattr *attrs,
 				      struct cfg80211_he_bss_color *he_bss_color)
 {
 static int nl80211_parse_beacon(struct cfg80211_registered_device *rdev,
 				struct nlattr *attrs[],
-				struct cfg80211_beacon_data *bcn)
+				struct cfg80211_beacon_data *bcn,
+				struct netlink_ext_ack *extack)
 {
 	bool haveinfo = false;
 	int err;
 			return PTR_ERR(mbssid);
 		bcn->mbssid_ies = mbssid;
+		if (bcn->mbssid_ies && attrs[NL80211_ATTR_EMA_RNR_ELEMS]) {
+			struct cfg80211_rnr_elems *rnr =
+				nl80211_parse_rnr_elems(&rdev->wiphy,
+							attrs[NL80211_ATTR_EMA_RNR_ELEMS],
+							extack);
+			if (IS_ERR(rnr))
+				return PTR_ERR(rnr);
+			if (rnr && rnr->cnt < bcn->mbssid_ies->cnt)
+				return -EINVAL;
+			bcn->rnr_ies = rnr;
+		}
 	}
 	return 0;
 	if (!params)
 		return -ENOMEM;
-	err = nl80211_parse_beacon(rdev, info->attrs, &params->beacon);
+	err = nl80211_parse_beacon(rdev, info->attrs, &params->beacon,
+				   info->extack);
 	if (err)
 		goto out;
 			goto out_unlock;
 	}
+	if (!params->mbssid_config.ema && params->beacon.rnr_ies) {
+		err = -EINVAL;
+		goto out_unlock;
+	}
 	err = nl80211_calculate_ap_params(params);
 	if (err)
 		goto out_unlock;
 	    params->mbssid_config.tx_wdev->netdev &&
 	    params->mbssid_config.tx_wdev->netdev != dev)
 		dev_put(params->mbssid_config.tx_wdev->netdev);
+	kfree(params->beacon.rnr_ies);
 	kfree(params);
 	return err;
 	if (!wdev->links[link_id].ap.beacon_interval)
 		return -EINVAL;
-	err = nl80211_parse_beacon(rdev, info->attrs, &params);
+	err = nl80211_parse_beacon(rdev, info->attrs, &params, info->extack);
 	if (err)
 		goto out;
 out:
 	kfree(params.mbssid_ies);
+	kfree(params.rnr_ies);
 	return err;
 }
 	if (!need_new_beacon)
 		goto skip_beacons;
-	err = nl80211_parse_beacon(rdev, info->attrs, &params.beacon_after);
+	err = nl80211_parse_beacon(rdev, info->attrs, &params.beacon_after,
+				   info->extack);
 	if (err)
 		goto free;
 	if (err)
 		goto free;
-	err = nl80211_parse_beacon(rdev, csa_attrs, &params.beacon_csa);
+	err = nl80211_parse_beacon(rdev, csa_attrs, &params.beacon_csa,
+				   info->extack);
 	if (err)
 		goto free;
 free:
 	kfree(params.beacon_after.mbssid_ies);
 	kfree(params.beacon_csa.mbssid_ies);
+	kfree(params.beacon_after.rnr_ies);
+	kfree(params.beacon_csa.rnr_ies);
 	kfree(csa_attrs);
 	return err;
 }
 	params.count = nla_get_u8(info->attrs[NL80211_ATTR_COLOR_CHANGE_COUNT]);
 	params.color = nla_get_u8(info->attrs[NL80211_ATTR_COLOR_CHANGE_COLOR]);
-	err = nl80211_parse_beacon(rdev, info->attrs, &params.beacon_next);
+	err = nl80211_parse_beacon(rdev, info->attrs, &params.beacon_next,
+				   info->extack);
 	if (err)
 		return err;
 	if (err)
 		goto out;
-	err = nl80211_parse_beacon(rdev, tb, &params.beacon_color_change);
+	err = nl80211_parse_beacon(rdev, tb, &params.beacon_color_change,
+				   info->extack);
 	if (err)
 		goto out;
 out:
 	kfree(params.beacon_next.mbssid_ies);
 	kfree(params.beacon_color_change.mbssid_ies);
+	kfree(params.beacon_next.rnr_ies);
+	kfree(params.beacon_color_change.rnr_ies);
 	kfree(tb);
 	return err;
 }

cfg80211: support RNR for EMA AP

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code