All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v5 1/3] wiphy: add beacon bits to RM Enabled Capabilities
@ 2019-11-07  0:59 James Prestwood
  2019-11-07  0:59 ` [PATCH v5 2/3] rrm: add radio resource management module James Prestwood
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: James Prestwood @ 2019-11-07  0:59 UTC (permalink / raw)
  To: iwd

[-- Attachment #1: Type: text/plain, Size: 676 bytes --]

This tells AP's that we support Passive, Active, and Table beacon
measurements.
---
 src/wiphy.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wiphy.c b/src/wiphy.c
index ef22c0d3..eb0dfcc9 100644
--- a/src/wiphy.c
+++ b/src/wiphy.c
@@ -1037,6 +1037,8 @@ static void wiphy_setup_rm_enabled_capabilities(struct wiphy *wiphy)
 
 	wiphy->rm_enabled_capabilities[0] = IE_TYPE_RM_ENABLED_CAPABILITIES;
 	wiphy->rm_enabled_capabilities[1] = 5;
+	/* Bits: Passive (4), Active (5), and Beacon Table (6) capabilities */
+	wiphy->rm_enabled_capabilities[2] = 0x70;
 
 	/*
 	 * TODO: Support at least Link Measurement if TX_POWER_INSERTION is
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH v5 2/3] rrm: add radio resource management module
  2019-11-07  0:59 [PATCH v5 1/3] wiphy: add beacon bits to RM Enabled Capabilities James Prestwood
@ 2019-11-07  0:59 ` James Prestwood
  2019-11-07  0:59 ` [PATCH v5 3/3] auto-t: add RRM autotest James Prestwood
  2019-11-07 18:26 ` [PATCH v5 1/3] wiphy: add beacon bits to RM Enabled Capabilities Denis Kenzior
  2 siblings, 0 replies; 4+ messages in thread
From: James Prestwood @ 2019-11-07  0:59 UTC (permalink / raw)
  To: iwd

[-- Attachment #1: Type: text/plain, Size: 23801 bytes --]

This module takes care of radio measurements which an AP can request.
There are many types of requests, and for now only beacon requests
are supported.

IWD will filter certain types of beacon requests that are NOT
supported:

 - AP channel reports. Only single channel requests will be supported
 - Autonomous measurements. Only direct requests will be supported.
   IWD will not accept requets to trigger reports under certain
   conditions (SNR/RSSI thresholds, etc.)
 - Timed measurements. Only immediate measurements will be performed.
   The accuracy for timed measurements cannot be reliably guaranteed
   due to kernel scheduling/queues.
 - Full reporting detail. The AP can request the STA return the full
   set of IEs in a beacon. IWD does not currently save all IEs, plus
   there is quite a bit of complexity involved as certain IEs get
   truncated, and there are other length limitations.

There are other limitations not specific to beacon requests:

 - IWD will support single measurement requests per report. Multiple
   measurement request IEs can be included, but the reports will be
   sent out separately.

 - IWD will limit the number of requests it responds to in a given
   amount of time. As it stands now this is hard coded to 2 requests
   per second maximum. This will prevent DoS attacks.

 - IWD will not accept any measurement requests from APs it is not
   connected to, and will not accept any requests until connected.
---
 Makefile.am |   1 +
 src/rrm.c   | 787 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 788 insertions(+)
 create mode 100644 src/rrm.c

-v5:
 * Removed scan destroy function and put cleanup after sending the
   report. This makes the active/passive and table measurements all
   cleanup in the same place.

diff --git a/Makefile.am b/Makefile.am
index 9c54cef0..13141848 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -226,6 +226,7 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h src/iwd.h src/missing.h \
 					src/hotspot.c \
 					src/p2putil.h src/p2putil.c \
 					src/module.c \
+					src/rrm.c \
 					$(eap_sources) \
 					$(builtin_sources)
 
diff --git a/src/rrm.c b/src/rrm.c
new file mode 100644
index 00000000..9beada39
--- /dev/null
+++ b/src/rrm.c
@@ -0,0 +1,787 @@
+/*
+ *
+ *  Wireless daemon for Linux
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdint.h>
+#include <math.h>
+#include <linux/if_ether.h>
+
+#include <ell/ell.h>
+
+#include "src/mpdu.h"
+#include "src/netdev.h"
+#include "src/iwd.h"
+#include "src/ie.h"
+#include "src/util.h"
+#include "src/station.h"
+#include "src/scan.h"
+#include "src/nl80211util.h"
+
+#include "linux/nl80211.h"
+
+/* Limit requests per second */
+#define MAX_REQUESTS_PER_SEC		2
+/* Microseconds between requests */
+#define MIN_MICROS_BETWEEN_REQUESTS	(1000000 / MAX_REQUESTS_PER_SEC)
+
+/* 802.11-2016 Table 9-90 */
+#define REPORT_DETAIL_NO_FIELDS_OR_ELEMS		0
+#define REPORT_DETAIL_ALL_FIELDS_AND_ANY_REQUEST_ELEMS	1
+#define REPORT_DETAIL_ALL_FIELDS_AND_ELEMS		2
+
+/* 802.11-2016 Table 9-192 */
+#define REPORT_REJECT_LATE	(1 << 0)
+#define REPORT_REJECT_INCAPABLE	(1 << 1)
+#define REPORT_REJECT_REFUSED	(1 << 2)
+
+/* 802.11-2016 Table 9-87 */
+enum rrm_beacon_req_mode {
+	RRM_BEACON_REQ_MODE_PASSIVE =	0,
+	RRM_BEACON_REQ_MODE_ACTIVE =	1,
+	RRM_BEACON_REQ_MODE_TABLE =	2,
+};
+
+/* 802.11-2016 Table 9-88 */
+enum rrm_beacon_req_subelem_id {
+	RRM_BEACON_REQ_SUBELEM_ID_SSID			= 0,
+	RRM_BEACON_REQ_SUBELEM_ID_BEACON_REPORTING	= 1,
+	RRM_BEACON_REQ_SUBELEM_ID_REPORTING_DETAIL	= 2,
+	/* 3 - 9 reserved */
+	RRM_BEACON_REQ_SUBELEM_ID_REQUEST		= 10,
+	RRM_BEACON_REQ_SUBELEM_ID_EXT_REQUEST		= 11,
+	/* 12 - 50 reserved */
+	RRM_BEACON_REQ_SUBELEM_ID_AP_CHAN_REPORT	= 51,
+	/* 52 - 162 reserved */
+	RRM_BEACON_REQ_SUBELEM_ID_WIDE_BAND_SWITCH	= 163,
+	/* 164 - 220 reserved */
+	RRM_BEACON_REQ_SUBELEM_ID_VENDOR		= 221,
+	/* 222 - 255 reserved */
+};
+
+/* 802.11-2016 Annex C - dot11PHYType */
+enum rrm_phy_type {
+	RRM_PHY_TYPE_DSSS	= 2,
+	RRM_PHY_TYPE_OFDM	= 4,
+	RRM_PHY_TYPE_HRDSSS	= 5,
+	RRM_PHY_TYPE_ERP	= 6,
+	RRM_PHY_TYPE_HT		= 7,
+	RRM_PHY_TYPE_DMG	= 8,
+	RRM_PHY_TYPE_VHT	= 9,
+	RRM_PHY_TYPE_TVHT	= 10,
+};
+
+struct rrm_request_info {
+	uint8_t dialog_token;	/* dialog token in Radio Measurement Request */
+	uint8_t mtoken;		/* token in measurement request element */
+	uint8_t mode;
+	uint8_t type;		/* request type (only beacon supported) */
+};
+
+struct rrm_beacon_req_info {
+	struct rrm_request_info info;
+	uint8_t oper_class;
+	uint8_t channel;	/* The single channel provided in request */
+	uint8_t bssid[6];	/* Request filtered by BSSID */
+	char ssid[33];		/* Request filtered by SSID */
+	bool has_ssid;
+	uint32_t scan_id;
+};
+
+/* Per-netdev state */
+struct rrm_state {
+	struct station *station;
+	uint32_t ifindex;
+	uint64_t wdev_id;
+	struct rrm_request_info *pending;
+
+	uint64_t last_request;
+};
+
+static struct l_queue *states;
+static struct l_genl_family *nl80211;
+static uint32_t netdev_watch;
+
+static void rrm_info_destroy(void *data)
+{
+	struct rrm_request_info *info = data;
+	/* TODO: once more request types are added, check type */
+	struct rrm_beacon_req_info *beacon = l_container_of(info,
+						struct rrm_beacon_req_info,
+						info);
+
+	l_free(beacon);
+}
+
+static uint8_t rrm_phy_type(struct scan_bss *bss)
+{
+	if (bss->vht_capable)
+		return RRM_PHY_TYPE_VHT;
+
+	if (bss->ht_capable)
+		return RRM_PHY_TYPE_HT;
+
+	/*
+	 * Default to 802.11g phy type. You can get quite fancy here determining
+	 * the phy type by looking at the frequency and operator class among
+	 * other things. Since 802.11a/b are so old, defaulting to 802.11g just
+	 * removes a lot of complexity. Above, HT/VHT are easy as all you need
+	 * to look for is the presence of the IE.
+	 */
+	return RRM_PHY_TYPE_ERP;
+}
+
+static void rrm_send_response_cb(struct l_genl_msg *msg, void *user_data)
+{
+	int err = l_genl_msg_get_error(msg);
+
+	if (err < 0)
+		l_error("Error sending response: %d", err);
+}
+
+static bool rrm_send_response(struct rrm_state *rrm,
+				const uint8_t *frame, size_t len)
+{
+	struct netdev *netdev = netdev_find(rrm->ifindex);
+	const uint8_t *own_addr = netdev_get_address(netdev);
+	struct scan_bss *bss = station_get_connected_bss(rrm->station);
+	struct l_genl_msg *msg;
+	struct iovec iov;
+
+	iov.iov_base = (void *)frame;
+	iov.iov_len = len;
+
+	msg = nl80211_build_cmd_frame(rrm->ifindex, own_addr, bss->addr,
+					bss->frequency, &iov, 1);
+
+	if (!l_genl_family_send(nl80211, msg, rrm_send_response_cb,
+					NULL, NULL)) {
+		l_genl_msg_unref(msg);
+		l_error("Failed to send report for "MAC,
+				MAC_STR(bss->addr));
+		return false;
+	}
+
+	return true;
+}
+
+static void rrm_reject_measurement_request(struct rrm_state *rrm,
+						uint8_t mode)
+{
+	struct rrm_request_info *info = rrm->pending;
+	uint8_t frame[8];
+
+	frame[0] = 0x05; /* Category: Radio Measurement */
+	frame[1] = 0x01; /* Action: Radio Measurement Report */
+	frame[2] = info->dialog_token;
+	frame[3] = IE_TYPE_MEASUREMENT_REQUEST;
+	frame[4] = 3;
+	frame[5] = info->mtoken;
+	frame[6] = mode;
+	frame[7] = info->type;
+
+	if (!rrm_send_response(rrm, frame, sizeof(frame)))
+		l_error("failed to send rejection");
+
+	rrm_info_destroy(info);
+	rrm->pending = NULL;
+}
+
+static void rrm_build_measurement_report(struct rrm_request_info *info,
+				const void *report, size_t report_len,
+				uint8_t *to)
+{
+	*to++ = IE_TYPE_MEASUREMENT_REPORT;
+	*to++ = 3 + report_len;
+	*to++ = info->mtoken;
+	*to++ = 0;
+	*to++ = info->type;
+
+	if (report)
+		memcpy(to, report, report_len);
+}
+
+/*
+ * 802.11-2016 11.11.9.1 Beacon report
+ *
+ * "If the stored beacon information is based on a measurement made by
+ *  the reporting STA, and if the actual measurement start time,
+ *  measurement duration, and Parent TSF are available for this
+ *  measurement, then the beacon report shall include the actual
+ *  measurement start time, measurement duration, and Parent TSF;
+ *  otherwise the actual measurement start time, measurement duration,
+ *  and Parent TSF shall be set to 0. The RCPI and RSNI for that stored
+ *  beacon measurement may be included in the beacon report; otherwise
+ *  the beacon report shall indicate that RCPI and RSNI measurements
+ *  are not available"
+ *
+ * Since accurate timing is unreliable we are setting start/duration/TSF time to
+ * zero for all cases (table, passive, active).
+ */
+static size_t build_report_for_bss(struct rrm_beacon_req_info *beacon,
+					struct scan_bss *bss,
+					uint8_t *to)
+{
+	uint8_t *start = to;
+	double dbms = bss->signal_strength / 100;
+
+	*to++ = beacon->oper_class;
+	*to++ = scan_freq_to_channel(bss->frequency, NULL);
+	/* skip start time/duration */
+	memset(to, 0, 10);
+	to += 10;
+	*to++ = rrm_phy_type(bss);
+
+	/* 802.11 Table 9-154 - RCPI values */
+	if (dbms < -109.5)
+		*to++ = 0;
+	else if (dbms >= -109.5 && dbms < 0)
+		*to++ = (uint8_t)floor(2 * (dbms + 110));
+	else
+		*to++ = 220;
+
+	/* RSNI not available (could get this from GET_SURVEY) */
+	*to++ = 255;
+	memcpy(to, bss->addr, 6);
+	to += 6;
+	/* Antenna identifier unknown */
+	*to++ = 0;
+	/* Parent TSF - zero */
+	memset(to, 0, 4);
+	to += 4;
+
+	/*
+	 * TODO: Support optional subelements
+	 *
+	 * (see "TODO: Support Reported Frame Body..." below)
+	 */
+
+	return to - start;
+}
+
+static bool bss_in_request_range(struct rrm_beacon_req_info *beacon,
+					struct scan_bss *bss)
+{
+	uint8_t channel = scan_freq_to_channel(bss->frequency, NULL);
+
+	/* Must be a table measurement */
+	if (beacon->channel == 0 || beacon->channel == 255)
+		return true;
+
+	if (beacon->channel == channel)
+		return true;
+
+	return false;
+}
+
+static bool rrm_report_beacon_results(struct rrm_state *rrm,
+					struct l_queue *bss_list)
+{
+	struct rrm_beacon_req_info *beacon = l_container_of(rrm->pending,
+						struct rrm_beacon_req_info,
+						info);
+	bool wildcard = util_is_broadcast_address(beacon->bssid);
+	const struct l_queue_entry *entry;
+	uint8_t frame[512];
+	uint8_t *ptr = frame;
+
+	*ptr++ = 0x05; /* Category: Radio Measurement */
+	*ptr++ = 0x01; /* Action: Radio Measurement Report */
+	*ptr++ = beacon->info.dialog_token;
+
+	for (entry = l_queue_get_entries(bss_list); entry;
+							entry = entry->next) {
+		struct scan_bss *bss = entry->data;
+		uint8_t report[257];
+		size_t report_len;
+
+		/* If request included a specific BSSID match only this BSS */
+		if (!wildcard && memcmp(bss->addr, beacon->bssid, 6) != 0)
+			continue;
+
+		/* If request was for a certain SSID, match only this SSID */
+		if (beacon->has_ssid && strncmp(beacon->ssid,
+							(const char *)bss->ssid,
+							sizeof(bss->ssid)) != 0)
+			continue;
+
+		/*
+		 * The kernel may have returned a cached scan, so we have to
+		 * sort out any non-matching frequencies before building the
+		 * report
+		 */
+		if (!bss_in_request_range(beacon, bss))
+			continue;
+
+		report_len = build_report_for_bss(beacon, bss, report);
+
+		rrm_build_measurement_report(&beacon->info, report,
+						report_len, ptr);
+
+		ptr += report_len + 5;
+	}
+
+	rrm_info_destroy(&beacon->info);
+	rrm->pending = NULL;
+
+	return rrm_send_response(rrm, frame, ptr - frame);
+}
+
+static void rrm_handle_beacon_table(struct rrm_state *rrm,
+					struct rrm_beacon_req_info *beacon)
+{
+	struct l_queue *bss_list;
+
+	bss_list = station_get_bss_list(rrm->station);
+	if (!bss_list) {
+		rrm_reject_measurement_request(rrm, REPORT_REJECT_INCAPABLE);
+		return;
+	}
+
+	if (!rrm_report_beacon_results(rrm, bss_list))
+		l_error("Error reporting beacon table results");
+}
+
+static bool rrm_scan_results(int err, struct l_queue *bss_list, void *userdata)
+{
+	struct rrm_state *rrm = userdata;
+	struct rrm_beacon_req_info *beacon = l_container_of(rrm->pending,
+						struct rrm_beacon_req_info,
+						info);
+
+	beacon->scan_id = 0;
+
+	l_debug("RRM scan results for %u APs", l_queue_length(bss_list));
+
+	rrm_report_beacon_results(rrm, bss_list);
+	/* We aren't saving this BSS list */
+	return false;
+}
+
+static void rrm_scan_triggered(int err, void *userdata)
+{
+	struct rrm_state *rrm = userdata;
+
+	if (err < 0) {
+		l_error("Could not start RRM scan");
+		rrm_reject_measurement_request(rrm, REPORT_REJECT_INCAPABLE);
+	}
+}
+
+static void rrm_handle_beacon_scan(struct rrm_state *rrm,
+					struct rrm_beacon_req_info *beacon,
+					bool passive)
+{
+	struct scan_freq_set *freqs = scan_freq_set_new();
+	struct scan_parameters params = { .freqs = freqs, .flush = true };
+	enum scan_band band = scan_oper_class_to_band(NULL, beacon->oper_class);
+	uint32_t freq;
+
+	freq = scan_channel_to_freq(beacon->channel, band);
+	scan_freq_set_add(freqs, freq);
+
+	if (passive)
+		beacon->scan_id = scan_passive(rrm->wdev_id, freqs,
+						rrm_scan_triggered,
+						rrm_scan_results, rrm,
+						NULL);
+	else
+		beacon->scan_id = scan_active_full(rrm->wdev_id, &params,
+						rrm_scan_triggered,
+						rrm_scan_results, rrm,
+						NULL);
+
+	scan_freq_set_free(freqs);
+
+	if (beacon->scan_id == 0) {
+		rrm_info_destroy(&beacon->info);
+		rrm->pending = NULL;
+	}
+}
+
+static bool rrm_verify_beacon_request(const uint8_t *request, size_t len)
+{
+	if (len < 13)
+		return false;
+
+	if (request[6] != RRM_BEACON_REQ_MODE_TABLE) {
+		/*
+		 * Rejecting any iterative measurements, only accepting explicit
+		 * channels and operating classes except for table measurements.
+		 */
+		if (request[0] == 0 || request[0] == 255 ||
+					request[1] == 0 || request[1] == 255)
+			return false;
+
+		/*
+		 * Not handling interval/duration requests. We can omit this
+		 * check for table requests since we just return whatever we
+		 * have cached.
+		 */
+		if (!util_mem_is_zero(request + 2, 4))
+			return false;
+	}
+
+	/* Check this is a valid operating class */
+	if (!scan_oper_class_to_band(NULL, request[0]))
+		return false;
+
+	return true;
+}
+
+static void rrm_handle_beacon_request(struct rrm_state *rrm,
+					uint8_t dialog_token,
+					const uint8_t *request, size_t len)
+{
+	struct rrm_beacon_req_info *beacon;
+	struct ie_tlv_iter iter;
+	/*
+	 * 802.11-2016 - Table 9-90
+	 *
+	 * "All fixed-length fields and elements (default, used when Reporting
+	 *  Detail subelement is not included in a Beacon request)"
+	 */
+	uint8_t detail = REPORT_DETAIL_NO_FIELDS_OR_ELEMS;
+
+	beacon = l_new(struct rrm_beacon_req_info, 1);
+
+	beacon->info.dialog_token = dialog_token;
+	beacon->info.mtoken = request[0];
+	beacon->info.mode = request[1];
+	beacon->info.type = request[2];
+
+	rrm->pending = &beacon->info;
+	/*
+	 * 802.11-2016 11.11.8
+	 *
+	 * "A STA may also refuse to enable triggered autonomous
+	 * reporting. In this case a Measurement Report element shall be
+	 * returned to the requesting STA with the refused bit set to 1"
+	 *
+	 * At least for the time being, we will not support autonomous
+	 * reporting, so decline any request to do so.
+	 */
+	if (util_is_bit_set(beacon->info.mode, 1))
+		goto reject_refused;
+
+	/* advance to beacon request */
+	request += 3;
+	len -= 3;
+
+	if (!rrm_verify_beacon_request(request, len))
+		goto reject_refused;
+
+	beacon->oper_class = request[0];
+	beacon->channel = request[1];
+	memcpy(beacon->bssid, request + 7, 6);
+
+	ie_tlv_iter_init(&iter, request + 13, len - 13);
+
+	while (ie_tlv_iter_next(&iter)) {
+		uint8_t length = ie_tlv_iter_get_length(&iter);
+		const unsigned char *data = ie_tlv_iter_get_data(&iter);
+
+		switch (ie_tlv_iter_get_tag(&iter)) {
+		case RRM_BEACON_REQ_SUBELEM_ID_SSID:
+			if (beacon->has_ssid)
+				continue;
+			/*
+			 * Zero length is wildcard SSID, which has the same
+			 * effect as no SSID.
+			 */
+			if (length > 0 && length <= 32) {
+				memcpy(beacon->ssid, data, length);
+				beacon->has_ssid = true;
+			}
+
+			break;
+		case RRM_BEACON_REQ_SUBELEM_ID_REPORTING_DETAIL:
+			if (length != 1) {
+				l_error("Invalid length in reporting detail");
+				goto reject_refused;
+			}
+
+			detail = l_get_u8(data);
+			break;
+		case RRM_BEACON_REQ_SUBELEM_ID_BEACON_REPORTING:
+			/*
+			 * 802.11-2016 9.4.2.21.7
+			 *
+			 * "The Beacon reporting subelement is optionally
+			 *  present in a Beacon request for repeated
+			 *  measurements; otherwise it is not present"
+			 *
+			 * Since repeated measurements are not supported we can
+			 * reject this request now.
+			 */
+		case RRM_BEACON_REQ_SUBELEM_ID_AP_CHAN_REPORT:
+			/*
+			 * Only supporting single channel requests
+			 */
+			goto reject_incapable;
+		}
+	}
+
+	/*
+	 * TODO: Support Reported Frame Body of 1 and 2. This requires that all
+	 * fixed length fields are available from the scan request. Currently
+	 * scan.c parses out only the details we care about. There is also
+	 * limitations on length, and some IEs are treated specially and
+	 * truncated. This adds quite a bit of complexity. For now skip these
+	 * types of frame body reports.
+	 */
+	if (detail != REPORT_DETAIL_NO_FIELDS_OR_ELEMS) {
+		l_debug("Unsupported report detail");
+		goto reject_incapable;
+	}
+
+	/* Mode */
+	switch (request[6]) {
+	case RRM_BEACON_REQ_MODE_PASSIVE:
+		rrm_handle_beacon_scan(rrm, beacon, true);
+		return;
+	case RRM_BEACON_REQ_MODE_ACTIVE:
+		rrm_handle_beacon_scan(rrm, beacon, false);
+		return;
+	case RRM_BEACON_REQ_MODE_TABLE:
+		rrm_handle_beacon_table(rrm, beacon);
+		return;
+	default:
+		l_error("Unknown beacon mode %u", request[6]);
+		/* fall through to refused */
+	}
+
+reject_refused:
+	rrm_reject_measurement_request(rrm, REPORT_REJECT_REFUSED);
+	return;
+
+reject_incapable:
+	rrm_reject_measurement_request(rrm, REPORT_REJECT_INCAPABLE);
+}
+
+static void rrm_cancel_pending(struct rrm_state *rrm)
+{
+	if (rrm->pending) {
+		struct rrm_beacon_req_info *beacon;
+
+		beacon = l_container_of(rrm->pending,
+						struct rrm_beacon_req_info,
+						info);
+		if (beacon->scan_id)
+			scan_cancel(rrm->wdev_id, beacon->scan_id);
+
+		rrm_info_destroy(rrm->pending);
+		rrm->pending = NULL;
+	}
+}
+
+static void rrm_station_watch_cb(enum station_state state, void *userdata)
+{
+	struct rrm_state *rrm = userdata;
+
+	switch (state) {
+	case STATION_STATE_DISCONNECTING:
+	case STATION_STATE_DISCONNECTED:
+		rrm_cancel_pending(rrm);
+		break;
+	default:
+		return;
+	}
+}
+
+static void rrm_frame_watch_cb(struct netdev *netdev,
+				const struct mmpdu_header *mpdu,
+				const void *body, size_t body_len,
+				void *user_data)
+{
+	struct rrm_state *rrm = user_data;
+	const uint8_t *request = body;
+	uint8_t dialog_token;
+	struct ie_tlv_iter iter;
+	struct scan_bss *bss;
+
+	if (!rrm->station) {
+		/*
+		 * Just in case the station interface was not found during init
+		 * we can try and find it here. If found, we also setup the
+		 * station watch and set the correct enabled state.
+		 */
+		rrm->station = station_find(rrm->ifindex);
+
+		if (!rrm->station) {
+			l_error("station interface could not be found");
+			return;
+		}
+
+		station_add_state_watch(rrm->station, rrm_station_watch_cb,
+						rrm, NULL);
+	}
+
+	/*
+	 * Ignore if not connected or already have an outstanding request
+	 */
+	if (station_get_state(rrm->station) != STATION_STATE_CONNECTED ||
+				rrm->pending)
+		return;
+
+	bss = station_get_connected_bss(rrm->station);
+
+	if (memcmp(bss->addr, mpdu->address_2, 6))
+		return;
+
+	if (body_len < 5)
+		return;
+
+	if (request[0] != 0x05)
+		return;
+
+	if (request[1] != 0x00)
+		return;
+
+	/*
+	 * We have reached our max requests per second, no point in continuing
+	 */
+	if (l_time_now() - rrm->last_request < MIN_MICROS_BETWEEN_REQUESTS) {
+		l_debug("Max requests per second reached, ignoring request");
+		return;
+	}
+
+	dialog_token = request[2];
+
+	/* Update time regardless of success */
+	rrm->last_request = l_time_now();
+
+	ie_tlv_iter_init(&iter, request + 5, body_len - 5);
+
+	while (ie_tlv_iter_next(&iter)) {
+		const uint8_t *req;
+		size_t req_len;
+
+		if (ie_tlv_iter_get_tag(&iter) != IE_TYPE_MEASUREMENT_REQUEST)
+			continue;
+
+		req = ie_tlv_iter_get_data(&iter);
+		req_len = ie_tlv_iter_get_length(&iter);
+
+		if (req_len < 3)
+			return;
+
+		switch (req[2]) {
+		case 5: /* beacon */
+			rrm_handle_beacon_request(rrm, dialog_token, req,
+							req_len);
+			break;
+		default:
+			return;
+		}
+	}
+}
+
+static void rrm_state_destroy(void *data)
+{
+	struct rrm_state *rrm = data;
+
+	l_warn("RRM states still exist on exit!");
+
+	l_free(rrm);
+}
+
+static void rrm_new_state(struct netdev *netdev)
+{
+	struct rrm_state *rrm;
+	uint16_t frame_type = 0x00d0;
+	uint8_t prefix[] = { 0x05, 0x00 };
+
+	if (netdev_get_iftype(netdev) != NETDEV_IFTYPE_STATION)
+		return;
+
+	rrm = l_new(struct rrm_state, 1);
+
+	rrm->last_request = l_time_now();
+	rrm->ifindex = netdev_get_ifindex(netdev);
+	rrm->wdev_id = netdev_get_wdev_id(netdev);
+
+	netdev_frame_watch_add(netdev, frame_type, prefix, sizeof(prefix),
+					rrm_frame_watch_cb, rrm);
+
+	l_queue_push_head(states, rrm);
+}
+
+static bool match_ifindex(const void *a, const void *b)
+{
+	const struct rrm_state *rrm = a;
+	uint32_t ifindex = L_PTR_TO_UINT(b);
+
+	return rrm->ifindex == ifindex;
+}
+
+static void rrm_netdev_watch(struct netdev *netdev,
+				enum netdev_watch_event event, void *user_data)
+{
+	struct rrm_state *rrm;
+	uint32_t ifindex = netdev_get_ifindex(netdev);
+
+	switch (event) {
+	case NETDEV_WATCH_EVENT_NEW:
+		rrm_new_state(netdev);
+		return;
+	case NETDEV_WATCH_EVENT_DEL:
+		rrm = l_queue_remove_if(states, match_ifindex,
+						L_UINT_TO_PTR(ifindex));
+		if (rrm) {
+			rrm_cancel_pending(rrm);
+			l_free(rrm);
+		}
+
+		return;
+	default:
+		break;
+	}
+}
+
+static int rrm_init(void)
+{
+	struct l_genl *genl = iwd_get_genl();
+
+	states = l_queue_new();
+
+	nl80211 = l_genl_family_new(genl, NL80211_GENL_NAME);
+
+	netdev_watch = netdev_watch_add(rrm_netdev_watch, NULL, NULL);
+
+	return 0;
+}
+
+static void rrm_exit(void)
+{
+	l_genl_family_free(nl80211);
+	nl80211 = NULL;
+
+	netdev_watch_remove(netdev_watch);
+
+	l_queue_destroy(states, rrm_state_destroy);
+}
+
+IWD_MODULE(rrm, rrm_init, rrm_exit);
+IWD_MODULE_DEPENDS(rrm, netdev);
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH v5 3/3] auto-t: add RRM autotest
  2019-11-07  0:59 [PATCH v5 1/3] wiphy: add beacon bits to RM Enabled Capabilities James Prestwood
  2019-11-07  0:59 ` [PATCH v5 2/3] rrm: add radio resource management module James Prestwood
@ 2019-11-07  0:59 ` James Prestwood
  2019-11-07 18:26 ` [PATCH v5 1/3] wiphy: add beacon bits to RM Enabled Capabilities Denis Kenzior
  2 siblings, 0 replies; 4+ messages in thread
From: James Prestwood @ 2019-11-07  0:59 UTC (permalink / raw)
  To: iwd

[-- Attachment #1: Type: text/plain, Size: 5393 bytes --]

This test merely verifies hostapd receieved our measurement reports
and verified they were valid. Hostapd does not verify the actual
beacon report body. Really, the only way to test this is on an
actual network which makes these requests.
---
 autotests/testRRM/connection_test.py | 114 +++++++++++++++++++++++++++
 autotests/testRRM/hw.conf            |   8 ++
 autotests/testRRM/ssidOther.conf     |  10 +++
 autotests/testRRM/ssidRRM.conf       |  13 +++
 4 files changed, 145 insertions(+)
 create mode 100644 autotests/testRRM/connection_test.py
 create mode 100644 autotests/testRRM/hw.conf
 create mode 100644 autotests/testRRM/ssidOther.conf
 create mode 100644 autotests/testRRM/ssidRRM.conf

diff --git a/autotests/testRRM/connection_test.py b/autotests/testRRM/connection_test.py
new file mode 100644
index 00000000..93fd6cb8
--- /dev/null
+++ b/autotests/testRRM/connection_test.py
@@ -0,0 +1,114 @@
+#!/usr/bin/python3
+
+import unittest
+import sys
+
+sys.path.append('../util')
+import iwd
+from iwd import IWD
+from iwd import PSKAgent
+from iwd import NetworkType
+from hostapd import HostapdCLI
+import testutil
+
+from time import sleep
+
+# Table beacon with wildcard BSSID
+basic_beacon = '51000000000002ffffffffffff020100'
+# Table beacon with wildcard BSSID and SSID filter
+beacon_with_ssid = '51000000000002ffffffffffff02010000077373696452524d'
+# Passive beacon with wildcard BSSID
+beacon_passive = '510b0000000000ffffffffffff020100'
+# Active beacon with wildcard BSSID
+beacon_active = '510b0000000001ffffffffffff020100'
+
+class Test(unittest.TestCase):
+
+    def test_connection_success(self):
+        hapd = HostapdCLI(config='ssidRRM.conf')
+        wd = IWD()
+
+        psk_agent = PSKAgent("secret123")
+        wd.register_psk_agent(psk_agent)
+
+        devices = wd.list_devices(1)
+        device = devices[0]
+
+        condition = 'not obj.scanning'
+        wd.wait_for_object_condition(device, condition)
+
+        device.scan()
+
+        condition = 'not obj.scanning'
+        wd.wait_for_object_condition(device, condition)
+
+        ordered_network = device.get_ordered_network('ssidRRM')
+
+        self.assertEqual(ordered_network.type, NetworkType.psk)
+
+        condition = 'not obj.connected'
+        wd.wait_for_object_condition(ordered_network.network_object, condition)
+
+        ordered_network.network_object.connect()
+
+        condition = 'obj.connected'
+        wd.wait_for_object_condition(ordered_network.network_object, condition)
+
+        testutil.test_iface_operstate()
+        testutil.test_ifaces_connected()
+
+        hapd.wait_for_event('AP-STA-CONNECTED')
+
+        # This should return both APs
+        hapd.req_beacon(device.address, basic_beacon)
+
+        for e in ['BEACON-RESP-RX', 'BEACON-RESP-RX']:
+            event = hapd.wait_for_event(e)
+            if event:
+                print(event)
+
+        sleep(0.5)
+
+        # This should return just ssidRRM
+        hapd.req_beacon(device.address, beacon_with_ssid)
+        event = hapd.wait_for_event('BEACON-RESP-RX')
+        if event:
+            print(event)
+
+        sleep(0.5)
+
+        # This should passive scan on channel 11, returning otherSSID
+        hapd.req_beacon(device.address, beacon_passive)
+        # TODO: See if we are scanning here (scan not initiated from station)
+
+        event = hapd.wait_for_event('BEACON-RESP-RX')
+        if event:
+            print(event)
+
+        sleep(0.5)
+
+        # This should active scan on channel 11, returning otherSSID
+        hapd.req_beacon(device.address, beacon_active)
+        # TODO: See if we are scanning here (scan not initiated from station)
+
+        event = hapd.wait_for_event('BEACON-RESP-RX')
+        if event:
+            print(event)
+
+        device.disconnect()
+
+        condition = 'not obj.connected'
+        wd.wait_for_object_condition(ordered_network.network_object, condition)
+
+        wd.unregister_psk_agent(psk_agent)
+
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    @classmethod
+    def tearDownClass(cls):
+        IWD.clear_storage()
+
+if __name__ == '__main__':
+    unittest.main(exit=True)
diff --git a/autotests/testRRM/hw.conf b/autotests/testRRM/hw.conf
new file mode 100644
index 00000000..91c757ce
--- /dev/null
+++ b/autotests/testRRM/hw.conf
@@ -0,0 +1,8 @@
+[SETUP]
+num_radios=3
+max_test_exec_interval_sec=40
+reg_domain=US
+
+[HOSTAPD]
+rad0=ssidRRM.conf
+rad1=ssidOther.conf
diff --git a/autotests/testRRM/ssidOther.conf b/autotests/testRRM/ssidOther.conf
new file mode 100644
index 00000000..e0f0fd40
--- /dev/null
+++ b/autotests/testRRM/ssidOther.conf
@@ -0,0 +1,10 @@
+ctrl_interface=/var/run/hostapd
+
+hw_mode=g
+channel=11
+ssid=ssidOther
+
+wpa=2
+wpa_pairwise=CCMP
+wpa_passphrase=secret123
+rrm_beacon_report=1
diff --git a/autotests/testRRM/ssidRRM.conf b/autotests/testRRM/ssidRRM.conf
new file mode 100644
index 00000000..233392f9
--- /dev/null
+++ b/autotests/testRRM/ssidRRM.conf
@@ -0,0 +1,13 @@
+ctrl_interface=/var/run/hostapd
+
+hw_mode=a
+ssid=ssidRRM
+
+wpa=2
+wpa_pairwise=CCMP
+wpa_passphrase=secret123
+rrm_beacon_report=1
+ht_capab=[HT40+]
+
+ieee80211n=1
+channel=36
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v5 1/3] wiphy: add beacon bits to RM Enabled Capabilities
  2019-11-07  0:59 [PATCH v5 1/3] wiphy: add beacon bits to RM Enabled Capabilities James Prestwood
  2019-11-07  0:59 ` [PATCH v5 2/3] rrm: add radio resource management module James Prestwood
  2019-11-07  0:59 ` [PATCH v5 3/3] auto-t: add RRM autotest James Prestwood
@ 2019-11-07 18:26 ` Denis Kenzior
  2 siblings, 0 replies; 4+ messages in thread
From: Denis Kenzior @ 2019-11-07 18:26 UTC (permalink / raw)
  To: iwd

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

Hi James,

On 11/6/19 6:59 PM, James Prestwood wrote:
> This tells AP's that we support Passive, Active, and Table beacon
> measurements.
> ---
>   src/wiphy.c | 2 ++
>   1 file changed, 2 insertions(+)
> 

All applied, thanks.

Regards,
-Denis

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-11-07 18:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-07  0:59 [PATCH v5 1/3] wiphy: add beacon bits to RM Enabled Capabilities James Prestwood
2019-11-07  0:59 ` [PATCH v5 2/3] rrm: add radio resource management module James Prestwood
2019-11-07  0:59 ` [PATCH v5 3/3] auto-t: add RRM autotest James Prestwood
2019-11-07 18:26 ` [PATCH v5 1/3] wiphy: add beacon bits to RM Enabled Capabilities Denis Kenzior

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.