Skip to contentSkip to conversation

ft: track FT auth/action response status

PATCH Superseded James Prestwood 2 participants 7 messages Aug 29, 2023 – Aug 31, 2023

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 ft: track FT auth/action response status

Certain return codes, though failures, can indicate that the AP is just confused or booting up and treating it as a full failure may not be the best route.

For example in some production deployments if an AP is rebooted it may take some time for neighboring APs to exchange keys for current associations. If a client roams during that time it will reject saying the PMKID is invalid.

Use the ft_associate call return to communicate the status (if any) that was in the auth/action response. If there was a parsing error or no response -ENOENT is still returned.

---
 src/ft.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

v2:
* Remove 'parsed' and use the status instead. Status is now initialized to -ENOENT and only set to zero if parsing the IEs succeeds. If a non zero status reply comes in this is returned by ft_associate.

src/ft.c +21 -9
index c51a1288..a7655d91 100644
@@ -58,13 +58,14 @@ struct ft_info {
 	uint32_t frequency;
 	uint32_t ds_frequency;
 	uint32_t offchannel_id;
+	/* Status of Authenticate/Action frame response, or error (< 0) */
+	int status;
 
 	struct l_timeout *timeout;
 	struct wiphy_radio_work_item work;
 
 	struct ie_ft_info ft_info;
 
-	bool parsed : 1;
 	bool onchannel : 1;
 };
 
@@ -527,8 +528,6 @@ static int ft_over_ds_parse_action_response(const uint8_t *frame,
 		return -EINVAL;
 
 	status = l_get_le16(frame + 14);
-	if (status != 0)
-		return (int)status;
 
 	if (spa_out)
 		*spa_out = spa;
@@ -541,7 +540,7 @@ static int ft_over_ds_parse_action_response(const uint8_t *frame,
 		*ies_len = frame_len - 16;
 	}
 
-	return 0;
+	return (int)status;
 }
 
 int __ft_rx_associate(uint32_t ifindex, const uint8_t *frame, size_t frame_len)
@@ -825,7 +824,7 @@ void __ft_rx_action(uint32_t ifindex, const uint8_t *frame, size_t frame_len)
 
 	ret = ft_over_ds_parse_action_response(frame, frame_len, &spa, &aa,
 						&ies, &ies_len);
-	if (ret != 0) {
+	if (ret < 0) {
 		l_debug("Could not parse action response");
 		return;
 	}
@@ -836,13 +835,22 @@ void __ft_rx_action(uint32_t ifindex, const uint8_t *frame, size_t frame_len)
 		return;
 	}
 
+
+	if (ret != 0) {
+		l_debug("BSS "MAC" rejected FT action with status=%u",
+				MAC_STR(info->aa), ret);
+		info->status = ret;
+		goto done;
+	}
+
 	if (!ft_parse_ies(info, hs, ies, ies_len)) {
 		l_debug("Could not parse action response IEs");
 		goto ft_error;
 	}
 
-	info->parsed = true;
+	info->status = ret;
 
+done:
 	l_timeout_remove(info->timeout);
 	info->timeout = NULL;
 
@@ -872,6 +880,7 @@ static struct ft_info *ft_info_new(struct handshake_state *hs,
 						target_bss->rsne[1] + 2);
 
 	l_getrandom(info->snonce, 32);
+	info->status = -ENOENT;
 
 	return info;
 }
@@ -1016,6 +1025,7 @@ void __ft_rx_authenticate(uint32_t ifindex, const uint8_t *frame,
 	if (status != 0) {
 		l_debug("BSS "MAC" rejected FT auth with status=%u",
 				MAC_STR(info->aa), status);
+		info->status = status;
 		goto cancel;
 	}
 
@@ -1024,7 +1034,7 @@ void __ft_rx_authenticate(uint32_t ifindex, const uint8_t *frame,
 		goto cancel;
 	}
 
-	info->parsed = true;
+	info->status = status;
 
 cancel:
 	/*
@@ -1164,11 +1174,13 @@ int ft_associate(uint32_t ifindex, const uint8_t *addr)
 	 * Either failed or no response. This may have been an FT-over-DS
 	 * attempt so clear out the entry so FT-over-Air can try again.
 	 */
-	if (!info->parsed) {
+	if (info->status != 0) {
+		int status = info->status;
+
 		l_queue_remove(info_list, info);
 		ft_info_destroy(info);
 
-		return -ENOENT;
+		return status;
 	}
 
 	ft_prepare_handshake(info, hs);
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 2/3 station: fall back to reassociation under certain FT failures

The auth/action status is now tracked in ft.c. If an AP rejects the FT attempt with "Invalid PMKID" we can now assume this AP is either mis-configured for FT or is lagging behind getting the proper keys from neighboring APs (e.g. was just rebooted).

If we see this condition IWD can now fall back to reassociation in an attempt to still roam to the best candidate. The fallback decision is still rank based: if a BSS fails FT it is marked as such, its ranking is re-computed removing the FT factor and it is inserted back into the queue.

The motivation behind this isn't necessarily to always force a roam, but instead to handle two cases where IWD can either make a bad roam decision or get 'stuck' and never roam:

1. If there is one good roam candidate and other bad ones. For example say BSS A is experiencing this FT key pull issue:
Current BSS: -85dbm
BSS A: -55dbm
BSS B: -80dbm
The current logic would fail A, and roam to B. In this case reassociation would have likely succeeded so it makes more sense to reassociate to A as a fallback.

2. If there is only one candidate, but its failing FT. IWD will never try anything other than FT and repeatedly fail.

Both of the above have been seen on real network deployments and result in either poor performance (1) or eventually lead to a full disconnect due to never roaming (2).

---
 src/station.c | 124 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 80 insertions(+), 44 deletions(-)

v2:
* Rather than always falling back to reassociate recompute the rank and insert into the queue. This allows IWD to try similarly ranked BSS's with FT before falling back to reassociation.

src/station.c +80 -44
index 2473de2a..59191baa 100644
@@ -73,6 +73,7 @@ static bool supports_arp_evict_nocarrier;
 static bool supports_ndisc_evict_nocarrier;
 static struct watchlist event_watches;
 static uint32_t known_networks_watch;
+static const double RANK_FT_FACTOR = 1.3;
 
 struct station {
 	enum station_state state;
@@ -147,15 +148,49 @@ struct roam_bss {
 	uint8_t addr[6];
 	uint16_t rank;
 	int32_t signal_strength;
+	bool reassoc: 1;
 };
 
-static struct roam_bss *roam_bss_from_scan_bss(const struct scan_bss *bss)
+static bool station_can_fast_transition(struct handshake_state *hs,
+					const struct scan_bss *bss)
+{
+	uint16_t mdid;
+
+	if (!hs->mde)
+		return false;
+
+	if (ie_parse_mobility_domain_from_data(hs->mde, hs->mde[1] + 2,
+						&mdid, NULL, NULL) < 0)
+		return false;
+
+	if (!(bss->mde_present && l_get_le16(bss->mde) == mdid))
+		return false;
+
+	if (hs->supplicant_ie != NULL) {
+		struct ie_rsn_info rsn_info;
+
+		if (!IE_AKM_IS_FT(hs->akm_suite))
+			return false;
+
+		if (scan_bss_get_rsn_info(bss, &rsn_info) < 0)
+			return false;
+
+		if (!IE_AKM_IS_FT(rsn_info.akm_suites))
+			return false;
+	}
+
+	return true;
+}
+
+static struct roam_bss *roam_bss_from_scan_bss(struct handshake_state *hs,
+						const struct scan_bss *bss)
 {
 	struct roam_bss *rbss = l_new(struct roam_bss, 1);
 
 	memcpy(rbss->addr, bss->addr, 6);
 	rbss->rank = bss->rank;
 	rbss->signal_strength = bss->signal_strength;
+	rbss->reassoc = !station_can_fast_transition(hs, bss);
 
 	return rbss;
 }
@@ -1942,37 +1977,6 @@ static void station_early_neighbor_report_cb(struct netdev *netdev, int err,
 				&station->roam_freqs);
 }
 
-static bool station_can_fast_transition(struct handshake_state *hs,
-					struct scan_bss *bss)
-{
-	uint16_t mdid;
-
-	if (!hs->mde)
-		return false;
-
-	if (ie_parse_mobility_domain_from_data(hs->mde, hs->mde[1] + 2,
-						&mdid, NULL, NULL) < 0)
-		return false;
-
-	if (!(bss->mde_present && l_get_le16(bss->mde) == mdid))
-		return false;
-
-	if (hs->supplicant_ie != NULL) {
-		struct ie_rsn_info rsn_info;
-
-		if (!IE_AKM_IS_FT(hs->akm_suite))
-			return false;
-
-		if (scan_bss_get_rsn_info(bss, &rsn_info) < 0)
-			return false;
-
-		if (!IE_AKM_IS_FT(rsn_info.akm_suites))
-			return false;
-	}
-
-	return true;
-}
-
 static void station_disconnect_on_error_cb(struct netdev *netdev, bool success,
 					void *user_data)
 {
@@ -2169,10 +2173,14 @@ static int station_transition_reassociate(struct station *station,
 	if (ret < 0)
 		return ret;
 
+	l_debug("");
+
 	station->connected_bss = bss;
 	station->preparing_roam = false;
 	station_enter_state(station, STATION_STATE_ROAMING);
 
+	station_debug_event(station, "reassoc-roam");
+
 	return 0;
 }
 
@@ -2264,19 +2272,43 @@ static void station_transition_start(struct station *station);
 static bool station_ft_work_ready(struct wiphy_radio_work_item *item)
 {
 	struct station *station = l_container_of(item, struct station, ft_work);
-	struct roam_bss *rbss = l_queue_pop_head(station->roam_bss_list);
-	struct scan_bss *bss = network_bss_find_by_addr(
-					station->connected_network, rbss->addr);
+	_auto_(l_free) struct roam_bss *rbss = l_queue_pop_head(
+							station->roam_bss_list);
+	struct scan_bss *bss;
 	int ret;
 
-	l_free(rbss);
-
 	/* Very unlikely, but the BSS could have gone away */
+	bss = network_bss_find_by_addr(station->connected_network, rbss->addr);
 	if (!bss)
 		goto try_next;
 
 	ret = ft_associate(netdev_get_ifindex(station->netdev), bss->addr);
-	if (ret == -ENOENT) {
+	if (ret > 0) {
+		if (ret != MMPDU_STATUS_CODE_INVALID_PMKID) {
+			station_debug_event(station, "ft-roam-failed");
+			goto try_next;
+		}
+
+		/*
+		 * Re-insert removing FT from the ranking. If the BSS is still
+		 * the best reassociation will be used, otherwise we'll try
+		 * more FT candidates that are better ranked
+		 */
+		rbss->rank /= RANK_FT_FACTOR;
+		rbss->reassoc = true;
+
+		l_debug("Re-inserting BSS "MAC" forcing reassociation, rank: %u",
+					MAC_STR(rbss->addr), rbss->rank);
+
+		l_queue_insert(station->roam_bss_list, rbss,
+				roam_bss_rank_compare, NULL);
+
+		station_debug_event(station, "ft-fallback-to-reassoc");
+
+		station_transition_start(station);
+		l_steal_ptr(rbss);
+		return true;
+	} else if (ret == -ENOENT) {
 		station_debug_event(station, "ft-roam-failed");
 try_next:
 		station_transition_start(station);
@@ -2288,6 +2320,8 @@ try_next:
 	station->preparing_roam = false;
 	station_enter_state(station, STATION_STATE_FT_ROAMING);
 
+	station_debug_event(station, "ft-roam");
+
 	return true;
 
 assoc_failed:
@@ -2349,7 +2383,8 @@ done:
 }
 
 static bool station_try_next_transition(struct station *station,
-					struct scan_bss *bss)
+					struct scan_bss *bss,
+					bool no_ft)
 {
 	struct handshake_state *hs = netdev_get_handshake(station->netdev);
 	struct network *connected = station->connected_network;
@@ -2364,7 +2399,7 @@ static bool station_try_next_transition(struct station *station,
 	station->ap_directed_roaming = false;
 
 	/* Can we use Fast Transition? */
-	if (station_can_fast_transition(hs, bss))
+	if (station_can_fast_transition(hs, bss) && !no_ft)
 		return station_fast_transition(station, bss);
 
 	/* Non-FT transition */
@@ -2425,7 +2460,8 @@ static void station_transition_start(struct station *station)
 		struct scan_bss *bss = network_bss_find_by_addr(
 					station->connected_network, rbss->addr);
 
-		roaming = station_try_next_transition(station, bss);
+		roaming = station_try_next_transition(station, bss,
+							rbss->reassoc);
 		if (roaming)
 			break;
 
@@ -2490,7 +2526,6 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list,
 	struct scan_bss *current_bss = station->connected_bss;
 	struct scan_bss *bss;
 	double cur_bss_rank = 0.0;
-	static const double RANK_FT_FACTOR = 1.3;
 	uint16_t mdid;
 	enum security orig_security, security;
 
@@ -2581,7 +2616,7 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list,
 		 */
 		station_update_roam_bss(station, bss);
 
-		rbss = roam_bss_from_scan_bss(bss);
+		rbss = roam_bss_from_scan_bss(hs, bss);
 
 		l_queue_insert(station->roam_bss_list, rbss,
 				roam_bss_rank_compare, NULL);
@@ -4584,6 +4619,7 @@ static bool station_force_roam_scan_notify(int err, struct l_queue *bss_list,
 {
 	struct station_roam_data *data = user_data;
 	struct station *station = data->station;
+	struct handshake_state *hs = netdev_get_handshake(station->netdev);
 	struct scan_bss *target;
 	struct l_dbus_message *reply;
 
@@ -4603,7 +4639,7 @@ static bool station_force_roam_scan_notify(int err, struct l_queue *bss_list,
 	/* The various roam routines expect this to be set from scanning */
 	station->preparing_roam = true;
 	l_queue_push_tail(station->roam_bss_list,
-				roam_bss_from_scan_bss(target));
+				roam_bss_from_scan_bss(hs, target));
 
 	station_update_roam_bss(station, target);
 
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH v2 2/3] station: fall back to reassociation under certain FT failures

Hi James,

Quoted 39 lines · James Prestwood

The auth/action status is now tracked in ft.c. If an AP rejects the FT attempt with "Invalid PMKID" we can now assume this AP is either mis-configured for FT or is lagging behind getting the proper keys from neighboring APs (e.g. was just rebooted).

If we see this condition IWD can now fall back to reassociation in an attempt to still roam to the best candidate. The fallback decision is still rank based: if a BSS fails FT it is marked as such, its ranking is re-computed removing the FT factor and it is inserted back into the queue.

The motivation behind this isn't necessarily to always force a roam, but instead to handle two cases where IWD can either make a bad roam decision or get 'stuck' and never roam:

1. If there is one good roam candidate and other bad ones. For example say BSS A is experiencing this FT key pull issue:
Current BSS: -85dbm
BSS A: -55dbm
BSS B: -80dbm
The current logic would fail A, and roam to B. In this case reassociation would have likely succeeded so it makes more sense to reassociate to A as a fallback.

2. If there is only one candidate, but its failing FT. IWD will never try anything other than FT and repeatedly fail.

Both of the above have been seen on real network deployments and result in either poor performance (1) or eventually lead to a full disconnect due to never roaming (2).

---
  src/station.c | 124 ++++++++++++++++++++++++++++++++------------------
  1 file changed, 80 insertions(+), 44 deletions(-)

v2:
* Rather than always falling back to reassociate recompute the rank and insert into the queue. This allows IWD to try similarly ranked BSS's with FT before falling back to reassociation.

<snip>

Quoted 13 lines
src/station.c +1 -0
index 2473de2a..59191baa 100644
@@ -73,6 +73,7 @@ static bool supports_arp_evict_nocarrier;
  static bool supports_ndisc_evict_nocarrier;
  static struct watchlist event_watches;
  static uint32_t known_networks_watch;
+static const double RANK_FT_FACTOR = 1.3;
 
  struct station {
  	enum station_state state;

src/station.c struct roam_bss { · line 149

Quoted 2 lines
src/station.c +0 -0
@@ -147,15 +148,49 @@ struct roam_bss {
  	uint8_t addr[6];
  	uint16_t rank;

I'd store the original (non-FT factored rank here). This lets you get rid of the double division which I think might be expensive on some platforms.

src/station.c struct roam_bss { · line 151

Quoted 2 lines
src/station.c +1 -0
  	int32_t signal_strength;
+	bool reassoc: 1;

I'd name this something like ft_failed.

Quoted 3 lines
src/station.c +0 -1
  };
 
-static struct roam_bss *roam_bss_from_scan_bss(const struct scan_bss *bss)

<snip>

src/station.c struct roam_bss { · line 193

Quoted 9 lines
src/station.c +3 -0
+static struct roam_bss *roam_bss_from_scan_bss(struct handshake_state *hs,
+						const struct scan_bss *bss)
  {
  	struct roam_bss *rbss = l_new(struct roam_bss, 1);
 
  	memcpy(rbss->addr, bss->addr, 6);
  	rbss->rank = bss->rank;
  	rbss->signal_strength = bss->signal_strength;
+	rbss->reassoc = !station_can_fast_transition(hs, bss);

Why would you do this for every candidate up-front? If the first one succeeds, no need to do this for the rest. Also, strictly speaking the scan results might have changed in the meantime. You should be checking this against the fresh bss obtained in station_transition_start.

Quoted 3 lines
  
  	return rbss;
  }

<snip>

Quoted 11 lines
src/station.c +3 -3
@@ -2264,19 +2272,43 @@ static void station_transition_start(struct station *station);
  static bool station_ft_work_ready(struct wiphy_radio_work_item *item)
  {
  	struct station *station = l_container_of(item, struct station, ft_work);
-	struct roam_bss *rbss = l_queue_pop_head(station->roam_bss_list);
-	struct scan_bss *bss = network_bss_find_by_addr(
-					station->connected_network, rbss->addr);
+	_auto_(l_free) struct roam_bss *rbss = l_queue_pop_head(
+							station->roam_bss_list);
+	struct scan_bss *bss;
  	int ret;

src/station.c static void station_transition_start(struct station *station); · line 2279

Quoted 10 lines
src/station.c +1 -3
 
-	l_free(rbss);
-
  	/* Very unlikely, but the BSS could have gone away */
+	bss = network_bss_find_by_addr(station->connected_network, rbss->addr);
  	if (!bss)
  		goto try_next;
 
  	ret = ft_associate(netdev_get_ifindex(station->netdev), bss->addr);
-	if (ret == -ENOENT) {

Okay, but it feels like the resulting if statement is starting to become messy after these changes. Maybe using a switch/case would be better?

src/station.c static void station_transition_start(struct station *station); · line 2298

Quoted 13 lines
src/station.c +13 -0
+	if (ret > 0) {
+		if (ret != MMPDU_STATUS_CODE_INVALID_PMKID) {
+			station_debug_event(station, "ft-roam-failed");
+			goto try_next;
+		}
+
+		/*
+		 * Re-insert removing FT from the ranking. If the BSS is still
+		 * the best reassociation will be used, otherwise we'll try
+		 * more FT candidates that are better ranked
+		 */
+		rbss->rank /= RANK_FT_FACTOR;
+		rbss->reassoc = true;

Here's where saving the original rank would be better. You can simply assign the original rank to the current one and avoid the division.

Quoted 16 lines
src/station.c +13 -0
+
+		l_debug("Re-inserting BSS "MAC" forcing reassociation, rank: %u",
+					MAC_STR(rbss->addr), rbss->rank);
+
+		l_queue_insert(station->roam_bss_list, rbss,
+				roam_bss_rank_compare, NULL);
+
+		station_debug_event(station, "ft-fallback-to-reassoc");
+
+		station_transition_start(station);
+		l_steal_ptr(rbss);
+		return true;
+	} else if (ret == -ENOENT) {
  		station_debug_event(station, "ft-roam-failed");
  try_next:
  		station_transition_start(station);

<snip>

src/station.c static bool station_roam_scan_notify(int err, struct l_queue *bss_list, · line 2493

Quoted 5 lines
src/station.c +0 -1
@@ -2490,7 +2526,6 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list,
  	struct scan_bss *current_bss = station->connected_bss;
  	struct scan_bss *bss;
  	double cur_bss_rank = 0.0;
-	static const double RANK_FT_FACTOR = 1.3;

You probably don't need to move this if you save the original rank.

src/station.c static bool station_roam_scan_notify(int err, struct l_queue *bss_list, · line 2531

Quoted 3 lines
src/station.c +0 -0
  	uint16_t mdid;
  	enum security orig_security, security;
 

<snip>

Regards,
-Denis

#3 lore raw

Re: [PATCH v2 2/3] station: fall back to reassociation under certain FT failures

Hi Denis,

Quoted 105 lines · Denis Kenzior

Hi James,

Quoted 39 lines · James Prestwood

The auth/action status is now tracked in ft.c. If an AP rejects the FT attempt with "Invalid PMKID" we can now assume this AP is either mis-configured for FT or is lagging behind getting the proper keys from neighboring APs (e.g. was just rebooted).

If we see this condition IWD can now fall back to reassociation in an attempt to still roam to the best candidate. The fallback decision is still rank based: if a BSS fails FT it is marked as such, its ranking is re-computed removing the FT factor and it is inserted back into the queue.

The motivation behind this isn't necessarily to always force a roam, but instead to handle two cases where IWD can either make a bad roam decision or get 'stuck' and never roam:

   1. If there is one good roam candidate and other bad ones. For example say BSS A is experiencing this FT key pull issue:
          Current BSS: -85dbm
          BSS A:       -55dbm
          BSS B:       -80dbm
      The current logic would fail A, and roam to B. In this case reassociation would have likely succeeded so it makes more sense to reassociate to A as a fallback.

   2. If there is only one candidate, but its failing FT. IWD will never try anything other than FT and repeatedly fail.

Both of the above have been seen on real network deployments and result in either poor performance (1) or eventually lead to a full disconnect due to never roaming (2).
---
  src/station.c | 124 ++++++++++++++++++++++++++++++++------------------

  1 file changed, 80 insertions(+), 44 deletions(-)

v2:
  * Rather than always falling back to reassociate recompute the rank and insert into the queue. This allows IWD to try similarly ranked BSS's with FT before falling back to reassociation.

<snip>

Quoted 12 lines
src/station.c +1 -0
index 2473de2a..59191baa 100644
@@ -73,6 +73,7 @@ static bool supports_arp_evict_nocarrier;
   static bool supports_ndisc_evict_nocarrier;
   static struct watchlist event_watches;
   static uint32_t known_networks_watch;
+static const double RANK_FT_FACTOR = 1.3;
   struct station {
       enum station_state state;

src/station.c struct roam_bss { · line 149

Quoted 2 lines
src/station.c +0 -0
@@ -147,15 +148,49 @@ struct roam_bss {
       uint8_t addr[6];
       uint16_t rank;

I'd store the original (non-FT factored rank here).  This lets you get rid of the double division which I think might be expensive on some platforms.

src/station.c struct roam_bss { · line 151

Quoted 2 lines
src/station.c +1 -0
       int32_t signal_strength;
+    bool reassoc: 1;

I'd name this something like ft_failed.

Quoted 3 lines
src/station.c +0 -1
   };
-static struct roam_bss *roam_bss_from_scan_bss(const struct scan_bss 
 *bss)

<snip>

Quoted 9 lines

+static struct roam_bss *roam_bss_from_scan_bss(struct handshake_state *hs,
+                        const struct scan_bss *bss)
  {
      struct roam_bss *rbss = l_new(struct roam_bss, 1); memcpy(rbss->addr, bss->addr, 6);
      rbss->rank = bss->rank;
      rbss->signal_strength = bss->signal_strength;
+    rbss->reassoc = !station_can_fast_transition(hs, bss);

Why would you do this for every candidate up-front?  If the first one succeeds, no need to do this for the rest.  Also, strictly speaking the scan results might have changed in the meantime.  You should be checking this against the fresh bss obtained in station_transition_start.

Quoted 2 lines

      return rbss;
  }

<snip>

Quoted 15 lines
src/station.c +3 -5
@@ -2264,19 +2272,43 @@ static void station_transition_start(struct 
 station *station);
   static bool station_ft_work_ready(struct wiphy_radio_work_item *item)
   {
       struct station *station = l_container_of(item, struct station, ft_work);
-    struct roam_bss *rbss = l_queue_pop_head(station->roam_bss_list);
-    struct scan_bss *bss = network_bss_find_by_addr(
-                    station->connected_network, rbss->addr);
+    _auto_(l_free) struct roam_bss *rbss = l_queue_pop_head(
+                            station->roam_bss_list);
+    struct scan_bss *bss;
       int ret;
-    l_free(rbss);
-
       /* Very unlikely, but the BSS could have gone away */
Quoted 8 lines

src/station.c static void station_transition_start(struct station *station); · line 2279

Quoted 6 lines
src/station.c +1 -1
+    bss = network_bss_find_by_addr(station->connected_network, 
 rbss->addr);
       if (!bss)
           goto try_next;
       ret = ft_associate(netdev_get_ifindex(station->netdev), bss->addr);
-    if (ret == -ENOENT) {

Okay, but it feels like the resulting if statement is starting to become messy after these changes.  Maybe using a switch/case would be better?

I'll see what I can do, but with both ret < 0 and ret > 0 checks things don't immediately seem better with a case statement. Maybe I'll contain this re-insert into its own function.

Quoted 15 lines
Quoted 4 lines
src/station.c +3 -0
+    if (ret > 0) {
+        if (ret != MMPDU_STATUS_CODE_INVALID_PMKID) {
+            station_debug_event(station, "ft-roam-failed");

src/station.c static void station_transition_start(struct station *station); · line 2298

Quoted 10 lines
src/station.c +10 -0
+            goto try_next;
+        }
+
+        /*
+         * Re-insert removing FT from the ranking. If the BSS is still
+         * the best reassociation will be used, otherwise we'll try
+         * more FT candidates that are better ranked
+         */
+        rbss->rank /= RANK_FT_FACTOR;
+        rbss->reassoc = true;
Quoted 1 line

Here's where saving the original rank would be better.  You can simply assign the original rank to the current one and avoid the division.

So this actually points something I overlooked. The rbss->rank does not actually take into account FT. RANK_FT_FACTOR is added onto the scan_bss->rank locally and only used to compare against the current BSS. So actually if FT failed we would be ranking those BSS's lower than other non-FT BSS's by dividing.

So instead I think I need to store rbss->ft_rank and use both that and rbss->rank for insertion:

Quoted 37 lines
Quoted 18 lines
src/station.c +13 -0
+
+        l_debug("Re-inserting BSS "MAC" forcing reassociation, rank: 
 %u",
+                    MAC_STR(rbss->addr), rbss->rank);
+
+        l_queue_insert(station->roam_bss_list, rbss,
+                roam_bss_rank_compare, NULL);
+
+        station_debug_event(station, "ft-fallback-to-reassoc");
+
+        station_transition_start(station);
+        l_steal_ptr(rbss);
+        return true;
+    } else if (ret == -ENOENT) {
           station_debug_event(station, "ft-roam-failed");

  try_next:
          station_transition_start(station);

<snip>

src/station.c static bool station_roam_scan_notify(int err, · line 2494

Quoted 6 lines
src/station.c +0 -1
@@ -2490,7 +2526,6 @@ static bool station_roam_scan_notify(int err, 
 struct l_queue *bss_list,
       struct scan_bss *current_bss = station->connected_bss;
       struct scan_bss *bss;
       double cur_bss_rank = 0.0;
-    static const double RANK_FT_FACTOR = 1.3;

You probably don't need to move this if you save the original rank.

src/station.c static bool station_roam_scan_notify(int err, struct l_queue *bss_list, · line 2530

Quoted 2 lines
src/station.c +0 -0
       uint16_t mdid;
       enum security orig_security, security;

<snip>

Regards,
-Denis

#4 lore raw

PATCH v2 3/3 auto-t: add fallback to reassociate test

In reply to James Prestwood
---
 autotests/testPSK-roam/failed_roam_test.py | 90 +++++++++++++++++++++-
 autotests/testPSK-roam/ft-psk-ccmp-1.conf  |  1 +
 autotests/testPSK-roam/ft-psk-ccmp-2.conf  |  1 +
 autotests/testPSK-roam/ft-psk-ccmp-3.conf  |  1 +
 4 files changed, 90 insertions(+), 3 deletions(-)
autotests/testPSK-roam/failed_roam_test.py +87 -3
index 8a3db662..09947705 100644
@@ -41,9 +41,11 @@ class Test(unittest.TestCase):
         self.assertRaises(Exception, testutil.test_ifaces_connected,
                           (prev.ifname, device.name, True, True))
 
-
     # FT-over-Air failure, should stay connected
     def test_ft_over_air_failure(self):
+        self.rule2.enabled = True
+        self.rule3.enabled = True
+
         wd = IWD(True)
 
         device = wd.list_devices(1)[0]
@@ -60,12 +62,85 @@ class Test(unittest.TestCase):
         self.rule0.enabled = False
 
         # IWD should then try BSS 2, and succeed
+        device.wait_for_event('ft-roam', timeout=60)
         self.verify_roam(wd, device, self.bss_hostapd[0], self.bss_hostapd[2])
 
         self.bss_hostapd[2].deauthenticate(device.address)
+
+    # FT-over-Air failure with Invalid PMKID, should reassociate
+    def test_ft_over_air_fallback(self):
+        self.rule_bss0.signal = -8000
+        self.rule_bss0.enabled = True
+        self.rule_bss1.signal = -7500
+        self.rule_bss1.enabled = True
+        self.rule_bss2.signal = -6000
+        self.rule_bss2.enabled = True
+
+        # This will cause this BSS to reject any FT roams as its unable to
+        # get keys from other APs
+        self.bss_hostapd[2].set_value('ft_psk_generate_local', '0')
+        self.bss_hostapd[2].reload()
+
+        wd = IWD(True)
+
+        device = wd.list_devices(1)[0]
+
+        self.connect(wd, device, self.bss_hostapd[0])
+
+        # IWD should connect, then attempt a roam to BSS 1, which should
+        # fail and cause a fallback to reassociation
+        device.wait_for_event('ft-fallback-to-reassoc', timeout=60)
+        device.wait_for_event('reassoc-roam', timeout=60)
+
+        self.verify_roam(wd, device, self.bss_hostapd[0], self.bss_hostapd[2])
+
+        # Trigger another roam
+        self.rule_bss2.signal = -8000
+
+        device.wait_for_event('ft-roam', timeout=60)
+
+        # Ensure an FT roam back to a properly configured AP works.
+        self.verify_roam(wd, device, self.bss_hostapd[2], self.bss_hostapd[1])
+
+        self.bss_hostapd[1].deauthenticate(device.address)
         condition = 'obj.state == DeviceState.disconnected'
         wd.wait_for_object_condition(device, condition)
 
+    # FT-over-Air failure with Invalid PMKID. The ranking is such that other
+    # FT candidates are available so it should FT elsewhere rather than
+    # retry with reassociation
+    def test_ft_over_air_fallback_retry_ft(self):
+        self.rule_bss0.signal = -8000
+        self.rule_bss0.enabled = True
+        self.rule_bss1.signal = -7300
+        self.rule_bss1.enabled = True
+        self.rule_bss2.signal = -7100
+        self.rule_bss2.enabled = True
+
+        # This will cause this BSS to reject any FT roams as its unable to
+        # get keys from other APs
+        self.bss_hostapd[2].set_value('ft_psk_generate_local', '0')
+        self.bss_hostapd[2].reload()
+
+        wd = IWD(True)
+
+        device = wd.list_devices(1)[0]
+
+        self.connect(wd, device, self.bss_hostapd[0])
+
+        # IWD should connect, then attempt a roam to BSS 1, which should
+        # fail and cause the rank to be re-computed. This shoudl then put
+        # bss 1 as the next candidate (since the FT factor is removed)
+        device.wait_for_event('ft-fallback-to-reassoc', timeout=60)
+        device.wait_for_event('ft-roam', timeout=60)
+
+        self.verify_roam(wd, device, self.bss_hostapd[0], self.bss_hostapd[1])
+
+        self.bss_hostapd[1].deauthenticate(device.address)
+        condition = 'obj.state == DeviceState.disconnected'
+        wd.wait_for_object_condition(device, condition)
+
+
     def tearDown(self):
         os.system('ip link set "' + self.bss_hostapd[0].ifname + '" down')
         os.system('ip link set "' + self.bss_hostapd[1].ifname + '" down')
@@ -75,6 +150,10 @@ class Test(unittest.TestCase):
         self.rule0.enabled = False
         self.rule1.enabled = False
         self.rule2.enabled = False
+        self.rule3.enabled = False
+        self.rule_bss0.enabled = False
+        self.rule_bss1.enabled = False
+        self.rule_bss2.enabled = False
 
         for hapd in self.bss_hostapd:
             hapd.default()
@@ -109,13 +188,18 @@ class Test(unittest.TestCase):
         cls.rule2 = hwsim.rules.create()
         cls.rule2.source = hwsim.get_radio('rad0').addresses[0]
         cls.rule2.signal = -8000
-        cls.rule2.enabled = True
 
         # Causes IWD to first prefer BSS 1 to roam, then BSS 2.
         cls.rule3 = hwsim.rules.create()
         cls.rule3.source = hwsim.get_radio('rad2').addresses[0]
         cls.rule3.signal = -7000
-        cls.rule3.enabled = True
+
+        cls.rule_bss0 = hwsim.rules.create()
+        cls.rule_bss0.source = hwsim.get_radio('rad0').addresses[0]
+        cls.rule_bss1 = hwsim.rules.create()
+        cls.rule_bss1.source = hwsim.get_radio('rad1').addresses[0]
+        cls.rule_bss2 = hwsim.rules.create()
+        cls.rule_bss2.source = hwsim.get_radio('rad2').addresses[0]
 
     @classmethod
     def tearDownClass(cls):
autotests/testPSK-roam/ft-psk-ccmp-1.conf +1 -0
index eec8805f..b46d1f27 100644
@@ -33,6 +33,7 @@ pmk_r1_push=0
 # case.  Only works with FT-PSK, otherwise brctl needs to be installed and
 # CONFIG_BRIDGE enabled in the kernel.
 ft_psk_generate_local=1
+rkh_pull_timeout=50
 ft_over_ds=0
 ap_table_expiration_time=36000
 ap_table_max_size=10
autotests/testPSK-roam/ft-psk-ccmp-2.conf +1 -0
index 5992461f..3e215457 100644
@@ -33,6 +33,7 @@ pmk_r1_push=0
 # case.  Only works with FT-PSK, otherwise brctl needs to be installed and
 # CONFIG_BRIDGE enabled in the kernel.
 ft_psk_generate_local=1
+rkh_pull_timeout=50
 ft_over_ds=0
 ap_table_expiration_time=36000
 ap_table_max_size=10
autotests/testPSK-roam/ft-psk-ccmp-3.conf +1 -0
index 5992461f..3e215457 100644
@@ -33,6 +33,7 @@ pmk_r1_push=0
 # case.  Only works with FT-PSK, otherwise brctl needs to be installed and
 # CONFIG_BRIDGE enabled in the kernel.
 ft_psk_generate_local=1
+rkh_pull_timeout=50
 ft_over_ds=0
 ap_table_expiration_time=36000
 ap_table_max_size=10
Signature · 1 line
2.25.1
#5 lore raw

Re: [PATCH v2 3/3] auto-t: add fallback to reassociate test

Hi, Denis,

Quoted 6 lines · James Prestwood
---
  autotests/testPSK-roam/failed_roam_test.py | 90 +++++++++++++++++++++-
  autotests/testPSK-roam/ft-psk-ccmp-1.conf  |  1 +
  autotests/testPSK-roam/ft-psk-ccmp-2.conf  |  1 +
  autotests/testPSK-roam/ft-psk-ccmp-3.conf  |  1 +
  4 files changed, 90 insertions(+), 3 deletions(-)

I should have sent as a single patchset or made it clear in the notes, but this does depend on the 2 prior autotest patches. Sorry about that.

Quoted 172 lines
autotests/testPSK-roam/failed_roam_test.py +87 -3
index 8a3db662..09947705 100644
@@ -41,9 +41,11 @@ class Test(unittest.TestCase):
          self.assertRaises(Exception, testutil.test_ifaces_connected,
                            (prev.ifname, device.name, True, True))
 
-
      # FT-over-Air failure, should stay connected
      def test_ft_over_air_failure(self):
+        self.rule2.enabled = True
+        self.rule3.enabled = True
+
          wd = IWD(True)
 
          device = wd.list_devices(1)[0]
@@ -60,12 +62,85 @@ class Test(unittest.TestCase):
          self.rule0.enabled = False
 
          # IWD should then try BSS 2, and succeed
+        device.wait_for_event('ft-roam', timeout=60)
          self.verify_roam(wd, device, self.bss_hostapd[0], self.bss_hostapd[2])
 
          self.bss_hostapd[2].deauthenticate(device.address)
+
+    # FT-over-Air failure with Invalid PMKID, should reassociate
+    def test_ft_over_air_fallback(self):
+        self.rule_bss0.signal = -8000
+        self.rule_bss0.enabled = True
+        self.rule_bss1.signal = -7500
+        self.rule_bss1.enabled = True
+        self.rule_bss2.signal = -6000
+        self.rule_bss2.enabled = True
+
+        # This will cause this BSS to reject any FT roams as its unable to
+        # get keys from other APs
+        self.bss_hostapd[2].set_value('ft_psk_generate_local', '0')
+        self.bss_hostapd[2].reload()
+
+        wd = IWD(True)
+
+        device = wd.list_devices(1)[0]
+
+        self.connect(wd, device, self.bss_hostapd[0])
+
+        # IWD should connect, then attempt a roam to BSS 1, which should
+        # fail and cause a fallback to reassociation
+        device.wait_for_event('ft-fallback-to-reassoc', timeout=60)
+        device.wait_for_event('reassoc-roam', timeout=60)
+
+        self.verify_roam(wd, device, self.bss_hostapd[0], self.bss_hostapd[2])
+
+        # Trigger another roam
+        self.rule_bss2.signal = -8000
+
+        device.wait_for_event('ft-roam', timeout=60)
+
+        # Ensure an FT roam back to a properly configured AP works.
+        self.verify_roam(wd, device, self.bss_hostapd[2], self.bss_hostapd[1])
+
+        self.bss_hostapd[1].deauthenticate(device.address)
          condition = 'obj.state == DeviceState.disconnected'
          wd.wait_for_object_condition(device, condition)
 
+    # FT-over-Air failure with Invalid PMKID. The ranking is such that other
+    # FT candidates are available so it should FT elsewhere rather than
+    # retry with reassociation
+    def test_ft_over_air_fallback_retry_ft(self):
+        self.rule_bss0.signal = -8000
+        self.rule_bss0.enabled = True
+        self.rule_bss1.signal = -7300
+        self.rule_bss1.enabled = True
+        self.rule_bss2.signal = -7100
+        self.rule_bss2.enabled = True
+
+        # This will cause this BSS to reject any FT roams as its unable to
+        # get keys from other APs
+        self.bss_hostapd[2].set_value('ft_psk_generate_local', '0')
+        self.bss_hostapd[2].reload()
+
+        wd = IWD(True)
+
+        device = wd.list_devices(1)[0]
+
+        self.connect(wd, device, self.bss_hostapd[0])
+
+        # IWD should connect, then attempt a roam to BSS 1, which should
+        # fail and cause the rank to be re-computed. This shoudl then put
+        # bss 1 as the next candidate (since the FT factor is removed)
+        device.wait_for_event('ft-fallback-to-reassoc', timeout=60)
+        device.wait_for_event('ft-roam', timeout=60)
+
+        self.verify_roam(wd, device, self.bss_hostapd[0], self.bss_hostapd[1])
+
+        self.bss_hostapd[1].deauthenticate(device.address)
+        condition = 'obj.state == DeviceState.disconnected'
+        wd.wait_for_object_condition(device, condition)
+
+
      def tearDown(self):
          os.system('ip link set "' + self.bss_hostapd[0].ifname + '" down')
          os.system('ip link set "' + self.bss_hostapd[1].ifname + '" down')
@@ -75,6 +150,10 @@ class Test(unittest.TestCase):
          self.rule0.enabled = False
          self.rule1.enabled = False
          self.rule2.enabled = False
+        self.rule3.enabled = False
+        self.rule_bss0.enabled = False
+        self.rule_bss1.enabled = False
+        self.rule_bss2.enabled = False
 
          for hapd in self.bss_hostapd:
              hapd.default()
@@ -109,13 +188,18 @@ class Test(unittest.TestCase):
          cls.rule2 = hwsim.rules.create()
          cls.rule2.source = hwsim.get_radio('rad0').addresses[0]
          cls.rule2.signal = -8000
-        cls.rule2.enabled = True
 
          # Causes IWD to first prefer BSS 1 to roam, then BSS 2.
          cls.rule3 = hwsim.rules.create()
          cls.rule3.source = hwsim.get_radio('rad2').addresses[0]
          cls.rule3.signal = -7000
-        cls.rule3.enabled = True
+
+        cls.rule_bss0 = hwsim.rules.create()
+        cls.rule_bss0.source = hwsim.get_radio('rad0').addresses[0]
+        cls.rule_bss1 = hwsim.rules.create()
+        cls.rule_bss1.source = hwsim.get_radio('rad1').addresses[0]
+        cls.rule_bss2 = hwsim.rules.create()
+        cls.rule_bss2.source = hwsim.get_radio('rad2').addresses[0]
 
      @classmethod
      def tearDownClass(cls):
autotests/testPSK-roam/ft-psk-ccmp-1.conf +1 -0
index eec8805f..b46d1f27 100644
@@ -33,6 +33,7 @@ pmk_r1_push=0
  # case.  Only works with FT-PSK, otherwise brctl needs to be installed and
  # CONFIG_BRIDGE enabled in the kernel.
  ft_psk_generate_local=1
+rkh_pull_timeout=50
  ft_over_ds=0
  ap_table_expiration_time=36000
  ap_table_max_size=10
autotests/testPSK-roam/ft-psk-ccmp-2.conf +1 -0
index 5992461f..3e215457 100644
@@ -33,6 +33,7 @@ pmk_r1_push=0
  # case.  Only works with FT-PSK, otherwise brctl needs to be installed and
  # CONFIG_BRIDGE enabled in the kernel.
  ft_psk_generate_local=1
+rkh_pull_timeout=50
  ft_over_ds=0
  ap_table_expiration_time=36000
  ap_table_max_size=10
autotests/testPSK-roam/ft-psk-ccmp-3.conf +1 -0
index 5992461f..3e215457 100644
@@ -33,6 +33,7 @@ pmk_r1_push=0
  # case.  Only works with FT-PSK, otherwise brctl needs to be installed and
  # CONFIG_BRIDGE enabled in the kernel.
  ft_psk_generate_local=1
+rkh_pull_timeout=50
  ft_over_ds=0
  ap_table_expiration_time=36000
  ap_table_max_size=10
#6 lore raw
In reply to James Prestwood

Hi James,

Quoted 22 lines · James Prestwood

Certain return codes, though failures, can indicate that the AP is just confused or booting up and treating it as a full failure may not be the best route.

For example in some production deployments if an AP is rebooted it may take some time for neighboring APs to exchange keys for current associations. If a client roams during that time it will reject saying the PMKID is invalid.

Use the ft_associate call return to communicate the status (if any) that was in the auth/action response. If there was a parsing error or no response -ENOENT is still returned.

---
  src/ft.c | 30 +++++++++++++++++++++---------
  1 file changed, 21 insertions(+), 9 deletions(-)

v2:
* Remove 'parsed' and use the status instead. Status is now initialized to -ENOENT and only set to zero if parsing the IEs succeeds. If a non zero status reply comes in this is returned by ft_associate.

<snip>

src/ft.c static int ft_over_ds_parse_action_response(const uint8_t *frame, · line 531

Quoted 6 lines
src/ft.c +0 -2
@@ -527,8 +528,6 @@ static int ft_over_ds_parse_action_response(const uint8_t *frame,
  		return -EINVAL;
 
  	status = l_get_le16(frame + 14);
-	if (status != 0)
-		return (int)status;

Hmm, this should really be kept since we shouldn't be assigning ies or ies_len in this case.

src/ft.c static int ft_over_ds_parse_action_response(const uint8_t *frame, · line 541

Quoted 6 lines
src/ft.c +0 -0
  	if (spa_out)
  		*spa_out = spa;
@@ -541,7 +540,7 @@ static int ft_over_ds_parse_action_response(const uint8_t *frame,
  		*ies_len = frame_len - 16;
  	}

Maybe something like:

if (spa_out)

	...

if (aa_out)

	...

status = l_get_le16(...);
if (status)

	goto done;

if (ies...)

	...

done:

	return (int) status;

This would also match how ft_parse_authentication_resp_frame() works.

src/ft.c static int ft_over_ds_parse_action_response(const uint8_t *frame, · line 545

Quoted 5 lines
src/ft.c +1 -1
-	return 0;
+	return (int)status;
  }
 

Otherwise, LGTM.

Regards,
-Denis