Skip to contentSkip to conversation

Add FILS discovery support

PATCH Superseded Aloka Dixit 2 participants 5 messages Aug 5, 2020 – Aug 27, 2020

Subsystems (2)

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v5 cover Add FILS discovery support

This patchset adds support for FILS discovery transmission as per IEEE Std 802.11ai-2016.

v5: Addressed review comments from v4.

Aloka Dixit (2):
nl80211: Add FILS discovery support
mac80211: Add FILS discovery support

 include/net/cfg80211.h       | 23 +++++++++++++++
 include/net/mac80211.h       | 31 ++++++++++++++++++++
 include/uapi/linux/nl80211.h | 40 +++++++++++++++++++++++++
 net/mac80211/cfg.c           | 57 ++++++++++++++++++++++++++++++++----
 net/mac80211/debugfs.c       |  1 +
 net/mac80211/ieee80211_i.h   |  7 +++++
 net/mac80211/main.c          |  6 ++++
 net/mac80211/tx.c            | 28 ++++++++++++++++++
 net/wireless/nl80211.c       | 45 ++++++++++++++++++++++++++++
 9 files changed, 232 insertions(+), 6 deletions(-)
Signature · 1 line
2.25.0
#1 lore raw

PATCH v5 1/2 nl80211: Add FILS discovery support

FILS discovery attribute, NL80211_ATTR_FILS_DISCOVERY, is nested which supports following parameters as given in IEEE Std 802.11ai-2016, Annex C.3 MIB detail:
(1) NL80211_FILS_DISCOVERY_INT_MIN - Minimum packet interval
(2) NL80211_FILS_DISCOVERY_INT_MAX - Maximum packet interval
(3) NL0211_FILS_DISCOVERY_TMPL - Template data

---
v5: Made template mandatory. Added new field for FILS discovery
HW support to be used by drivers.

v4: Removed attributes unrelated to FILS discovery -
NL80211_FILS_DISCOVERY_BCN_RESP_WIN, NL80211_FILS_DISCOVERY_OMIT_REPLICATE_PROBE_RESP and member named enabled in struct cfg80211_fils_discovery.

 include/net/cfg80211.h       | 23 ++++++++++++++++++
 include/uapi/linux/nl80211.h | 40 ++++++++++++++++++++++++++++++++
 net/wireless/nl80211.c       | 45 ++++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+)
include/net/cfg80211.h +23 -0
index fc7e8807838d..c23d5b6af7f7 100644
@@ -1047,6 +1047,23 @@ struct cfg80211_acl_data {
 	struct mac_address mac_addrs[];
 };
 
+/**
+ * struct cfg80211_fils_discovery - FILS discovery parameters from
+ * IEEE Std 802.11ai-2016, Annex C.3 MIB detail.
+ *
+ * @min_interval: Minimum packet interval in TUs (0 - 10000)
+ * @max_interval: Maximum packet interval in TUs (0 - 10000)
+ * @tmpl_len: Template length
+ * @tmpl: Template data for FILS discovery frame including the action
+ *	frame headers.
+ */
+struct cfg80211_fils_discovery {
+	u32 min_interval;
+	u32 max_interval;
+	size_t tmpl_len;
+	const u8 *tmpl;
+};
+
 /**
  * enum cfg80211_ap_settings_flags - AP settings flags
  *
@@ -1094,6 +1111,7 @@ enum cfg80211_ap_settings_flags {
  * @he_obss_pd: OBSS Packet Detection settings
  * @he_bss_color: BSS Color settings
  * @he_oper: HE operation IE (or %NULL if HE isn't enabled)
+ * @fils_discovery: FILS discovery transmission parameters
  */
 struct cfg80211_ap_settings {
 	struct cfg80211_chan_def chandef;
@@ -1124,6 +1142,7 @@ struct cfg80211_ap_settings {
 	u32 flags;
 	struct ieee80211_he_obss_pd he_obss_pd;
 	struct cfg80211_he_bss_color he_bss_color;
+	struct cfg80211_fils_discovery fils_discovery;
 };
 
 /**
@@ -4737,6 +4756,8 @@ struct wiphy_iftype_akm_suites {
  *	HE AP, in order to avoid compatibility issues.
  *	@support_mbssid must be set for this to have any effect.
  *
+ * @support_fils_discovery: can HW support FILS discovery transmission
+ *
  * @pmsr_capa: peer measurement capabilities
  *
  * @tid_config_support: describes the per-TID config support that the
@@ -4880,6 +4901,8 @@ struct wiphy {
 	u8 support_mbssid:1,
 	   support_only_he_mbssid:1;
 
+	u8 support_fils_discovery:1;
+
 	const struct cfg80211_pmsr_capabilities *pmsr_capa;
 
 	struct {
include/uapi/linux/nl80211.h +40 -0
index 4e6339ab1fce..fcbe7b74705f 100644
@@ -2505,6 +2505,10 @@ enum nl80211_commands {
  * @NL80211_ATTR_HE_6GHZ_CAPABILITY: HE 6 GHz Band Capability element (from
  *	association request when used with NL80211_CMD_NEW_STATION).
  *
+ * @NL80211_ATTR_FILS_DISCOVERY: Optional parameter to configure FILS
+ *	discovery. It is a nested attribute, see
+ *	&enum nl80211_fils_discovery_attributes.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2987,6 +2991,8 @@ enum nl80211_attrs {
 
 	NL80211_ATTR_HE_6GHZ_CAPABILITY,
 
+	NL80211_ATTR_FILS_DISCOVERY,
+
 	/* add attributes here, update the policy in nl80211.c */
 
 	__NL80211_ATTR_AFTER_LAST,
@@ -6922,4 +6928,38 @@ enum nl80211_iftype_akm_attributes {
 	NL80211_IFTYPE_AKM_ATTR_MAX = __NL80211_IFTYPE_AKM_ATTR_LAST - 1,
 };
 
+/**
+ * enum nl80211_fils_discovery_attributes - FILS discovery configuration
+ * from IEEE Std 802.11ai-2016, Annex C.3 MIB detail.
+ *
+ * @__NL80211_FILS_DISCOVERY_INVALID: Invalid
+ *
+ * @NL80211_FILS_DISCOVERY_INT_MIN: Minimum packet interval (u32, TU).
+ *	Allowed range: 0..10000 (TU = Time Unit)
+ * @NL80211_FILS_DISCOVERY_INT_MAX: Maximum packet interval (u32, TU).
+ *	Allowed range: 0..10000 (TU = Time Unit)
+ * @NL80211_FILS_DISCOVERY_TMPL: Template data for FILS discovery action
+ *	frame including the headers.
+ *
+ * @__NL80211_FILS_DISCOVERY_LAST: Internal
+ * @NL80211_FILS_DISCOVERY_MAX: highest attribute
+ */
+enum nl80211_fils_discovery_attributes {
+	__NL80211_FILS_DISCOVERY_INVALID,
+
+	NL80211_FILS_DISCOVERY_INT_MIN,
+	NL80211_FILS_DISCOVERY_INT_MAX,
+	NL80211_FILS_DISCOVERY_TMPL,
+
+	/* keep last */
+	__NL80211_FILS_DISCOVERY_LAST,
+	NL80211_FILS_DISCOVERY_MAX = __NL80211_FILS_DISCOVERY_LAST - 1
+};
+
+/**
+ * FILS discovery template minimum length with action frame headers and
+ * mandatory fields.
+ */
+#define FILS_DISCOVERY_TMPL_MIN_LEN 42
+
 #endif /* __LINUX_NL80211_H */
net/wireless/nl80211.c +45 -0

69 lines not on this page · raw message

Signature · 1 line
2.25.0
maintainer
#2 lore raw

Re: [PATCH v5 1/2] nl80211: Add FILS discovery support

Quoted 6 lines · Aloka Dixit

FILS discovery attribute, NL80211_ATTR_FILS_DISCOVERY, is nested which supports following parameters as given in IEEE Std 802.11ai-2016, Annex C.3 MIB detail:
(1) NL80211_FILS_DISCOVERY_INT_MIN - Minimum packet interval
(2) NL80211_FILS_DISCOVERY_INT_MAX - Maximum packet interval
(3) NL0211_FILS_DISCOVERY_TMPL - Template data

Please keep _ATTR_ in these names. I've sent you some cleaned up version that you can start working from. I was going to do all the cleanups, but then realized that there are some questions I cannot answer.

include/net/cfg80211.h struct wiphy { · line 4904

Quoted 10 lines

+ * @support_fils_discovery: can HW support FILS discovery transmission
+ *
* @pmsr_capa: peer measurement capabilities
*
* @tid_config_support: describes the per-TID config support that the

include/net/cfg80211.h +1 -0
@@ -4880,6 +4901,8 @@ struct wiphy {
 	u8 support_mbssid:1,
 	   support_only_he_mbssid:1;
 
+	u8 support_fils_discovery:1;

Notably, you never use this.

Actually, you do later, in the mac80211 patch, but that makes no sense. Somehow it should be used in cfg80211 if the information lives there.

I suspect this might actually want to be an extended feature flag to userspace also knows, and also that cfg80211 should reject the operation if not supported?

The rest of my minor comments are about policy use, using NLA_POLICY_RANGE() with NLA_BINARY now, etc. which I've all cleaned up in the versions I just sent you.

johannes

#3 lore raw

PATCH v5 2/2 mac80211: Add FILS discovery support

In reply to Aloka Dixit

This patch adds mac80211 support to configure FILS discovery transmission.
Changes include functions to store and retrieve FILS discovery template, minimum and maximum packet intervals.

---
v5: Made template mandatory.
Added a check for FILS discovery HW support. New label for error cases in ieee80211_start_ap().

v4: Removed attributes unrelated to FILS discovery -
bcn_resp_win, omit_replicate_probe_resp and member named enabled in struct ieee80211_fils_discovery.

 include/net/mac80211.h     | 31 +++++++++++++++++++++
 net/mac80211/cfg.c         | 57 ++++++++++++++++++++++++++++++++++----
 net/mac80211/debugfs.c     |  1 +
 net/mac80211/ieee80211_i.h |  7 +++++
 net/mac80211/main.c        |  6 ++++
 net/mac80211/tx.c          | 28 +++++++++++++++++++
 6 files changed, 124 insertions(+), 6 deletions(-)
include/net/mac80211.h +31 -0
index 11d5610d2ad5..324be75cad3b 100644
@@ -317,6 +317,7 @@ struct ieee80211_vif_chanctx_switch {
  * @BSS_CHANGED_TWT: TWT status changed
  * @BSS_CHANGED_HE_OBSS_PD: OBSS Packet Detection status changed.
  * @BSS_CHANGED_HE_BSS_COLOR: BSS Color has changed
+ * @BSS_CHANGED_FILS_DISCOVERY: FILS discovery status changed.
  *
  */
 enum ieee80211_bss_change {
@@ -350,6 +351,7 @@ enum ieee80211_bss_change {
 	BSS_CHANGED_TWT			= 1<<27,
 	BSS_CHANGED_HE_OBSS_PD		= 1<<28,
 	BSS_CHANGED_HE_BSS_COLOR	= 1<<29,
+	BSS_CHANGED_FILS_DISCOVERY      = 1<<30,
 
 	/* when adding here, make sure to change ieee80211_reconfig */
 };
@@ -490,6 +492,18 @@ struct ieee80211_ftm_responder_params {
 	size_t civicloc_len;
 };
 
+/**
+ * struct ieee80211_fils_discovery - FILS discovery parameters from
+ * IEEE Std 802.11ai-2016, Annex C.3 MIB detail.
+ *
+ * @min_interval: Minimum packet interval in TUs (0 - 10000)
+ * @max_interval: Maximum packet interval in TUs (0 - 10000)
+ */
+struct ieee80211_fils_discovery {
+	u32 min_interval;
+	u32 max_interval;
+};
+
 /**
  * struct ieee80211_bss_conf - holds the BSS's changing parameters
  *
@@ -607,6 +621,7 @@ struct ieee80211_ftm_responder_params {
  * @he_oper: HE operation information of the AP we are connected to
  * @he_obss_pd: OBSS Packet Detection parameters.
  * @he_bss_color: BSS coloring settings, if BSS supports HE
+ * @fils_discovery: FILS discovery configuration
  */
 struct ieee80211_bss_conf {
 	const u8 *bssid;
@@ -674,6 +689,7 @@ struct ieee80211_bss_conf {
 	} he_oper;
 	struct ieee80211_he_obss_pd he_obss_pd;
 	struct cfg80211_he_bss_color he_bss_color;
+	struct ieee80211_fils_discovery fils_discovery;
 };
 
 /**
@@ -2325,6 +2341,9 @@ struct ieee80211_txq {
  *	aggregating MPDUs with the same keyid, allowing mac80211 to keep Tx
  *	A-MPDU sessions active while rekeying with Extended Key ID.
  *
+ *  @IEEE80211_HW_SUPPORTS_FILS_DISCOVERY: Hardware/driver supports FILS
+ *	discovery frame transmission
+ *
  * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
  */
 enum ieee80211_hw_flags {
@@ -2377,6 +2396,7 @@ enum ieee80211_hw_flags {
 	IEEE80211_HW_SUPPORTS_MULTI_BSSID,
 	IEEE80211_HW_SUPPORTS_ONLY_HE_MULTI_BSSID,
 	IEEE80211_HW_AMPDU_KEYBORDER_SUPPORT,
+	IEEE80211_HW_SUPPORTS_FILS_DISCOVERY,
 
 	/* keep last, obviously */
 	NUM_IEEE80211_HW_FLAGS
@@ -6558,4 +6578,15 @@ u32 ieee80211_calc_tx_airtime(struct ieee80211_hw *hw,
  */
 bool ieee80211_set_hw_80211_encap(struct ieee80211_vif *vif, bool enable);
 
+/**
+ * ieee80211_get_fils_discovery_tmpl - Get FILS discovery template.
+ * @hw: pointer obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
+ *
+ * The driver is responsible for freeing the returned skb.
+ *
+ * Return: FILS discovery template. %NULL on error.
+ */
+struct sk_buff *ieee80211_get_fils_discovery_tmpl(struct ieee80211_hw *hw,
+						  struct ieee80211_vif *vif);
 #endif /* MAC80211_H */
net/mac80211/cfg.c +51 -6

104 lines not on this page · raw message

net/mac80211/debugfs.c +1 -0
index 54080290d6e2..8294685bd5af 100644
@@ -408,6 +408,7 @@ static const char *hw_flag_names[] = {
 	FLAG(SUPPORTS_MULTI_BSSID),
 	FLAG(SUPPORTS_ONLY_HE_MULTI_BSSID),
 	FLAG(AMPDU_KEYBORDER_SUPPORT),
+	FLAG(SUPPORTS_FILS_DISCOVERY),
 #undef FLAG
 };
 
net/mac80211/ieee80211_i.h +7 -0
index ec1a71ac65f2..0aabc5e0a522 100644
@@ -272,6 +272,12 @@ struct probe_resp {
 	u8 data[];
 };
 
+struct fils_discovery_data {
+	struct rcu_head rcu_head;
+	int len;
+	u8 data[];
+};
+
 struct ps_data {
 	/* yes, this looks ugly, but guarantees that we can later use
 	 * bitmap_empty :)
@@ -287,6 +293,7 @@ struct ps_data {
 struct ieee80211_if_ap {
 	struct beacon_data __rcu *beacon;
 	struct probe_resp __rcu *probe_resp;
+	struct fils_discovery_data __rcu *fils_discovery;
 
 	/* to be used after channel switch. */
 	struct cfg80211_beacon_data *next_beacon;
net/mac80211/main.c +6 -0
index b4a2efe8e83a..cd1c1444f14c 100644
@@ -1168,6 +1168,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 				WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT;
 	}
 
+	/* mac80211 supports FILS discovery transmission, if the driver
+	 * supports it
+	 */
+	if (ieee80211_hw_check(&local->hw, SUPPORTS_FILS_DISCOVERY))
+		local->hw.wiphy->support_fils_discovery = true;
+
 	local->hw.wiphy->max_num_csa_counters = IEEE80211_MAX_CSA_COUNTERS_NUM;
 
 	/*
net/mac80211/tx.c +28 -0
index e9ce658141f5..626737532a0e 100644
@@ -4998,6 +4998,34 @@ struct sk_buff *ieee80211_proberesp_get(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(ieee80211_proberesp_get);
 
+struct sk_buff *ieee80211_get_fils_discovery_tmpl(struct ieee80211_hw *hw,
+						  struct ieee80211_vif *vif)
+{
+	struct sk_buff *skb = NULL;
+	struct fils_discovery_data *tmpl = NULL;
+	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
+
+	if (sdata->vif.type != NL80211_IFTYPE_AP)
+		return NULL;
+
+	rcu_read_lock();
+	tmpl = rcu_dereference(sdata->u.ap.fils_discovery);
+	if (!tmpl) {
+		rcu_read_unlock();
+		return NULL;
+	}
+
+	skb = dev_alloc_skb(sdata->local->hw.extra_tx_headroom + tmpl->len);
+	if (skb) {
+		skb_reserve(skb, sdata->local->hw.extra_tx_headroom);
+		skb_put_data(skb, tmpl->data, tmpl->len);
+	}
+
+	rcu_read_unlock();
+	return skb;
+}
+EXPORT_SYMBOL(ieee80211_get_fils_discovery_tmpl);
+
 struct sk_buff *ieee80211_pspoll_get(struct ieee80211_hw *hw,
 				     struct ieee80211_vif *vif)
 {
Signature · 1 line
2.25.0
maintainer
#4 lore raw

Re: [PATCH v5 2/2] mac80211: Add FILS discovery support

Quoted 3 lines

+ * @IEEE80211_HW_SUPPORTS_FILS_DISCOVERY: Hardware/driver supports FILS
+ * discovery frame transmission

nit: extra space before the @

but in any case you really ought to just remove this, the driver can set up whatever method you decide to use in cfg80211 (e.g. extended feature flag) - no need for mac80211 to have extra code just to pass it through.

The flags here are intended for things that only mac80211 cares about.

johannes