Skip to contentSkip to conversation

cfg80211/mac80211: Add support to configure and monitor station's rssi threshold

PATCH Superseded Tamizh chelvam 2 participants 5 messages Feb 5, 2019 – Apr 8, 2019

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover cfg80211/mac80211: Add support to configure and monitor station's rssi threshold

This patchsets introduced new NL command and api to support configuring rssi for the connected stations and api to notify userspace application upon crossing the configured threshold. This will be useful for the application which requires station's current signal strength change information. Monitoring station's signal strength through station dump command will unnecessarily increase the system overhead. This event based mechanism will reduce the system overhead and helps application to take a decision for the station for which event received.

Tamizh chelvam (2):
cfg80211: Add support to configure station specific RSSI threshold
for AP mode
mac80211: Implement API to configure station specific rssi threshold

v2:
* Combined patchset 2 and 3 as single patch and addressed Johannes comments.

 include/net/cfg80211.h       |   39 ++++++++++
 include/net/mac80211.h       |    7 ++
 include/uapi/linux/nl80211.h |   21 ++++++
 net/mac80211/cfg.c           |  103 +++++++++++++++++++++++++
 net/mac80211/rx.c            |   56 +++++++++++++-
 net/mac80211/sta_info.c      |    1 +
 net/mac80211/sta_info.h      |   30 ++++++++
 net/wireless/nl80211.c       |  169 +++++++++++++++++++++++++++++++++++-------
 net/wireless/rdev-ops.h      |   13 ++++
 net/wireless/trace.h         |   22 ++++++
 10 files changed, 433 insertions(+), 28 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/2 cfg80211: Add support to configure station specific RSSI threshold for AP mode

Add infrastructure to configure station specific RSSI threshold configuration to monitor station's signal strength variation. This configuration will be useful for the application like steering which requires change in the station's current signal strength.

New NL80211_CMD_STA_MON introduced to configure the RSSI threshold using NL80211_ATTR_CQM nested attributes. The MAC address of
a station is passed in NL80211_ATTR_MAC. And NL80211_ATTR_STA_MON_FIXED_THOLD introduced to have this RSSI threshold as a fixed(not modifying the low and high threshold upon crossing the threshold) or moving(modifying low and high threshold upon crossing the threshold) thresholds. Depends on the application's use case user can have either fixed or moving RSSI range thresholds.

cfg80211_sta_mon_rssi_notify introduced to notify change in the station's signal stregnth cross event using NL80211_CMD_NOTIFY_STA_MON. Driver supporting this feature should advertise NL80211_EXT_FEATURE_STA_MON_RSSI_CONFIG feature flag.

---
 include/net/cfg80211.h       |   39 ++++++++++
 include/uapi/linux/nl80211.h |   21 ++++++
 net/wireless/nl80211.c       |  169 +++++++++++++++++++++++++++++++++++-------
 net/wireless/rdev-ops.h      |   13 ++++
 net/wireless/trace.h         |   22 ++++++
 5 files changed, 237 insertions(+), 27 deletions(-)
include/net/cfg80211.h +39 -0
index 7f2739a..a8838d7 100644
@@ -3075,6 +3075,20 @@ struct cfg80211_pmsr_request {
 };
 
 /**
+ * struct cfg80211_sta_mon - Configure station monitor parameters
+ * @rssi_tholds - array of RSSI thresholds for the station
+ * @rssi_hyst - RSSI hysterisis
+ * @n_rssi_tholds - Number of RSSI thresholds
+ * @fixed_thold - Fixed thresholds limit used for the station
+ */
+struct cfg80211_sta_mon {
+	s32 *rssi_tholds;
+	u32 rssi_hyst;
+	int n_rssi_tholds;
+	u8 fixed_thold;
+};
+
+/**
  * struct cfg80211_ops - backend description for wireless configuration
  *
  * This struct is registered by fullmac card drivers and/or wireless stacks
@@ -3411,6 +3425,12 @@ struct cfg80211_pmsr_request {
  *	Statistics should be cumulative, currently no way to reset is provided.
  * @start_pmsr: start peer measurement (e.g. FTM)
  * @abort_pmsr: abort peer measurement
+ *
+ * @set_sta_mon_rssi_config: Configure  RSSI threshold for a station.
+ *     After configuration, the driver should (soon) send an event indicating
+ *     the current level of a station is above/below the configured threshold;
+ *     this may need some care when the configuration is changed
+ *     (without first being disabled.)
  */
 struct cfg80211_ops {
 	int	(*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -3725,6 +3745,9 @@ struct cfg80211_ops {
 			      struct cfg80211_pmsr_request *request);
 	void	(*abort_pmsr)(struct wiphy *wiphy, struct wireless_dev *wdev,
 			      struct cfg80211_pmsr_request *request);
+	int	(*set_sta_mon_rssi_config)(struct wiphy *wiphy,
+				struct net_device *dev, const u8 *addr,
+				const struct cfg80211_sta_mon *sta_mon_cfg);
 };
 
 /*
@@ -6322,6 +6345,22 @@ bool cfg80211_rx_control_port(struct net_device *dev,
 			      struct sk_buff *skb, bool unencrypted);
 
 /**
+ * cfg80211_sta_mon_rssi_notify - Station's rssi out of range event
+ * @dev: network device
+ * @peer: Station's mac address
+ * @rssi_event: the triggered RSSI event
+ * @rssi_level: new RSSI level value or 0 if not available
+ * @gfp: context flags
+ *
+ * This function is called when a configured rssi threshold reached event
+ * occurs for a station.
+ */
+void
+cfg80211_sta_mon_rssi_notify(struct net_device *dev, const u8 *peer,
+			     enum nl80211_cqm_rssi_threshold_event rssi_event,
+			     s32 rssi_level, gfp_t gfp);
+
+/**
  * cfg80211_cqm_rssi_notify - connection quality monitoring rssi event
  * @dev: network device
  * @rssi_event: the triggered RSSI event
include/uapi/linux/nl80211.h +21 -0
index dd4f86e..4b0586b 100644
@@ -1065,6 +1065,12 @@
  *	indicated by %NL80211_ATTR_WIPHY_FREQ and other attributes
  *	determining the width and type.
  *
+ * @NL80211_CMD_SET_STA_MON: This command is used to configure station's
+ *	connection monitoring notification trigger levels. This uses nested
+ *	attribute %NL80211_ATTR_CQM with %NL80211_ATTR_CQM_* sub-attributes.
+ * @NL80211_CMD_NOTIFY_STA_MON: This is used as an event to notify
+ *	the user space that a trigger level was reached for a station.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -1285,6 +1291,9 @@ enum nl80211_commands {
 
 	NL80211_CMD_NOTIFY_RADAR,
 
+	NL80211_CMD_SET_STA_MON,
+	NL80211_CMD_NOTIFY_STA_MON,
+
 	/* add new commands above here */
 
 	/* used to define NL80211_CMD_MAX below */
@@ -2308,6 +2317,12 @@ enum nl80211_commands {
  * @NL80211_ATTR_AIRTIME_WEIGHT: Station's weight when scheduled by the airtime
  *	scheduler.
  *
+ * @NL80211_ATTR_STA_MON_FIXED_THOLD: This u8 attribute is used with
+ *	%NL80211_CMD_SET_STA_MON to indicate driver that the monitoring
+ *	threshold is fixed(not modifying the low and high threshold upon
+ *	crossing the threshold) or moving(modifying low and high threshold
+ *	upon crossing the threshold) thresholds.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2759,6 +2774,8 @@ enum nl80211_attrs {
 
 	NL80211_ATTR_AIRTIME_WEIGHT,
 
+	NL80211_ATTR_STA_MON_FIXED_THOLD,
+
 	/* add attributes here, update the policy in nl80211.c */
 
 	__NL80211_ATTR_AFTER_LAST,
@@ -5343,6 +5360,9 @@ enum nl80211_feature_flags {
  * @NL80211_EXT_FEATURE_AP_PMKSA_CACHING: Driver/device supports PMKSA caching
  *	(set/del PMKSA operations) in AP mode.
  *
+ * @NL80211_EXT_FEATURE_STA_MON_RSSI_CONFIG: Driver supports monitoring
+ *	station's RSSI threshold value should adveritise this flag.
+ *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
  */
@@ -5384,6 +5404,7 @@ enum nl80211_ext_feature_index {
 	NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER,
 	NL80211_EXT_FEATURE_AIRTIME_FAIRNESS,
 	NL80211_EXT_FEATURE_AP_PMKSA_CACHING,
+	NL80211_EXT_FEATURE_STA_MON_RSSI_CONFIG,
 
 	/* add new features before the definition below */
 	NUM_NL80211_EXT_FEATURES,
net/wireless/nl80211.c +142 -27

268 lines not on this page · raw message

net/wireless/rdev-ops.h +13 -0
index 5cb48d1..aec2811 100644
@@ -1272,4 +1272,17 @@ static inline int rdev_del_pmk(struct cfg80211_registered_device *rdev,
 	trace_rdev_return_void(&rdev->wiphy);
 }
 
+static inline int
+rdev_set_sta_mon_rssi_config(struct cfg80211_registered_device *rdev,
+			     struct net_device *dev, const u8 *addr,
+			     const struct cfg80211_sta_mon *sta_mon_config)
+{
+	int ret = -EOPNOTSUPP;
+
+	ret = rdev->ops->set_sta_mon_rssi_config(&rdev->wiphy, dev,
+						 addr, sta_mon_config);
+	trace_rdev_return_int(&rdev->wiphy, ret);
+	return ret;
+}
+
 #endif /* __CFG80211_RDEV_OPS */
net/wireless/trace.h +22 -0
index 44b2ce1..48b81e5 100644
@@ -3362,6 +3362,28 @@
 		  WIPHY_PR_ARG, WDEV_PR_ARG,
 		  (unsigned long long)__entry->cookie)
 );
+
+TRACE_EVENT(cfg80211_sta_mon_rssi_notify,
+	TP_PROTO(struct net_device *netdev, const u8 *addr,
+		 enum nl80211_cqm_rssi_threshold_event rssi_event,
+		 s32 rssi_level),
+	TP_ARGS(netdev, addr, rssi_event, rssi_level),
+	TP_STRUCT__entry(
+		NETDEV_ENTRY
+		MAC_ENTRY(addr)
+		__field(enum nl80211_cqm_rssi_threshold_event, rssi_event)
+		__field(s32, rssi_level)
+	),
+	TP_fast_assign(
+		NETDEV_ASSIGN;
+		MAC_ASSIGN(addr, addr);
+		__entry->rssi_event = rssi_event;
+		__entry->rssi_level = rssi_level;
+	),
+	TP_printk(NETDEV_PR_FMT ", station mac: " MAC_PR_FMT
+		  ", rssi event: %d, level: %d", NETDEV_PR_ARG,
+		  MAC_PR_ARG(addr), __entry->rssi_event, __entry->rssi_level)
+);
 #endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */
 
 #undef TRACE_INCLUDE_PATH
Signature · 1 line
1.7.9.5
maintainer
#2 lore raw

Re: [PATCHv2 1/2] cfg80211: Add support to configure station specific RSSI threshold for AP mode

net/wireless/nl80211.c static int validate_ie_attr(const struct nlattr *attr, · line 419

Quoted 5 lines · Tamizh chelvam
net/wireless/nl80211.c +4 -0
+	[NL80211_ATTR_CQM] = {
+		.type = NLA_NESTED,
+		.validation_data = nl80211_attr_cqm_policy,
+	 },

This is wrong, you need to use NLA_POLICY_NESTED().

net/wireless/nl80211.c static int validate_ie_attr(const struct nlattr *attr, · line 570

Quoted 1 line
net/wireless/nl80211.c +1 -0
+	[NL80211_ATTR_STA_MON_FIXED_THOLD] = { .type = NLA_U8 },

Please use NLA_POLICY_RANGE(NLA_U8, 0, 1).

Also, I'm not sure I really understand the documentation for this value.

net/wireless/nl80211.c static int cfg80211_cqm_rssi_update(struct cfg80211_registered_device *rdev, · line 10486

Quoted 3 lines
net/wireless/nl80211.c +1 -1
 	/* Check all values negative and sorted */
-	for (i = 0; i < n_thresholds; i++) {
+	for (i = 0; i < n_tholds; i++) {

Why rename the perfectly fine variable to some abbreviation?

johannes

#3 lore raw

PATCH v2 2/2 mac80211: Implement API to configure station specific rssi threshold

In reply to Tamizh chelvam

Implement set_sta_mon_rssi_config API to configure station specific rssi threshold value to monitor change in connected station's signal strength. RSSI low and high threshold values will be calculated as per the station's current signal strength, if the configuration needs to be a fixed threshold then the user given value will be chosen as low and high threshold.

And this patch triggers cfg80211_sta_mon_rssi_notify with the corresponding event when station signal goes out of configured threshold. It uses rx data signal to check against rssi threshold configured by the user. And update the lower and upper RSSI threshold for the station if it is not configured as a fixed threshold.

This event will be useful for the application like steering to take decision on any station depends on its current link quality.

---
 include/net/mac80211.h  |    7 ++++
 net/mac80211/cfg.c      |  105 +++++++++++++++++++++++++++++++++++++++++++++++
 net/mac80211/rx.c       |   56 ++++++++++++++++++++++++-
 net/mac80211/sta_info.c |    1 +
 net/mac80211/sta_info.h |   30 ++++++++++++++
 5 files changed, 198 insertions(+), 1 deletion(-)
include/net/mac80211.h +7 -0
index de866a7..007850d 100644
@@ -858,6 +858,13 @@ enum mac80211_rate_control_flags {
 };
 
 
+/*
+ * How many frames need to have been used in average station's
+ * signal strength before checking against the threshold
+ */
+#define IEEE80211_STA_SIGNAL_AVE_MIN_COUNT	4
+
+
 /* there are 40 bytes if you don't need the rateset to be kept */
 #define IEEE80211_TX_INFO_DRIVER_DATA_SIZE 40
 
net/mac80211/cfg.c +105 -0

115 lines not on this page · raw message

net/mac80211/rx.c +55 -1

76 lines not on this page · raw message

net/mac80211/sta_info.c +1 -0
index 11f0589..db5e3b6 100644
@@ -1020,6 +1020,7 @@ static void __sta_info_destroy_part2(struct sta_info *sta)
 
 	rate_control_remove_sta_debugfs(sta);
 	ieee80211_sta_debugfs_remove(sta);
+	sta_mon_rssi_config_free(sta);
 
 	cleanup_single_sta(sta);
 }
net/mac80211/sta_info.h +30 -0
index 71f7e49..b8af534 100644
@@ -427,6 +427,33 @@ struct ieee80211_sta_rx_stats {
 	u64 msdu[IEEE80211_NUM_TIDS + 1];
 };
 
+/**
+ * struct sta_mon_rssi_config - Monitor station's signal strength
+ * @rcu_head: rcu head for freeing structure
+ * @n_rssi_tholds: Number of thresholds passed by user
+ * @low: RSSI lower threshold for this station, a zero value implies
+ *	disabled
+ * @high: RSSI upper threshold for this station
+ * @hyst: RSSI hysteresis for this station
+ * @last_value: Last RSSI value for this station triggered the
+ *	RSSI cross event
+ * @fixed_thold - Indicate whether to use fixed thresholds limit or not
+ * @threholds: RSSI threshold limit passed by the user
+ * @count_rx_signal: Number of data frames used in averaging station signal.
+ *	This can be used to avoid generating less reliable station rssi cross
+ *	events that would be based only on couple of received frames
+ */
+struct sta_mon_rssi_config {
+	struct rcu_head rcu_head;
+	int n_thresholds;
+	s32 low, high;
+	u32 hyst;
+	s32 last_value;
+	u8 fixed_thold;
+	unsigned int count_rx_signal;
+	s32 thresholds[0];
+};
+
 /*
  * The bandwidth threshold below which the per-station CoDel parameters will be
  * scaled to be more lenient (to prevent starvation of slow stations). This
@@ -623,6 +650,7 @@ struct sta_info {
 
 	struct cfg80211_chan_def tdls_chandef;
 
+	struct sta_mon_rssi_config *rssi_config;
 	/* keep last! */
 	struct ieee80211_sta sta;
 };
@@ -760,6 +788,7 @@ int sta_info_destroy_addr(struct ieee80211_sub_if_data *sdata,
 			  const u8 *addr);
 int sta_info_destroy_addr_bss(struct ieee80211_sub_if_data *sdata,
 			      const u8 *addr);
+void sta_mon_rssi_config_free(struct sta_info *sta);
 
 void sta_info_recalc_tim(struct sta_info *sta);
 
@@ -792,6 +821,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
 void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
 			  unsigned long exp_time);
 u8 sta_info_tx_streams(struct sta_info *sta);
+void ieee80211_update_rssi_config(struct sta_info *sta);
 
 void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta);
 void ieee80211_sta_ps_deliver_poll_response(struct sta_info *sta);
Signature · 1 line
1.7.9.5
maintainer
#4 lore raw

Re: [PATCHv2 2/2] mac80211: Implement API to configure station specific rssi threshold

net/mac80211/cfg.c static int ieee80211_get_txq_stats(struct wiphy *wiphy, · line 3898

Quoted 13 lines

+++ b/net/mac80211/cfg.c

net/mac80211/cfg.c +7 -0
@@ -3889,6 +3889,110 @@ static int ieee80211_get_txq_stats(struct wiphy *wiphy,
 	return drv_abort_pmsr(local, sdata, request);
 }
 
+void sta_mon_rssi_config_free(struct sta_info *sta)
+{
+	if (sta->rssi_config) {
+		kfree_rcu(sta->rssi_config, rcu_head);
+		sta->rssi_config = NULL;
+	}
+}

This looks wrong, you should use RCU_INIT_POINTER()?

And you should do it the other way around I think? I.e.

old = sta->rssi_config;
RCU_INIT_POINTER(sta->rssi_config, NULL);
kfree_rcu(old, rcu_head);

net/mac80211/sta_info.h struct sta_info { · line 653

Quoted 8 lines
net/mac80211/sta_info.h +1 -0
 /*
  * The bandwidth threshold below which the per-station CoDel parameters will be
  * scaled to be more lenient (to prevent starvation of slow stations). This
@@ -623,6 +650,7 @@ struct sta_info {
 
 	struct cfg80211_chan_def tdls_chandef;
 
+	struct sta_mon_rssi_config *rssi_config;

Please add documentation (as built bot pointed out shortly after patch posting!)

johannes