mac80211: Trigger disconnect for STA during target hardware restart
Subsystems (2)
v5 cover mac80211: Trigger disconnect for STA during target hardware restart
Currently in case of target hardware restart ,we just reconfig and re-enable the security keys and enable the network queues to start data traffic back from where it was interrupted.
Many ath10k wifi chipsets have sequence numbers for the data packets assigned by firmware and the mac sequence number will restart from zero after target hardware restart leading to mismatch in the sequence number expected by the remote peer vs the sequence number of the frame sent by the target firmware.
This mismatch in sequence number will cause out-of-order packets on the remote peer and all the frames sent by the device are dropped until we reach the sequence number which was sent before we restarted the target hardware
In order to fix this, we trigger a disconnect in case of hardware restart. After this there will be a fresh connection and thereby avoiding the dropping of frames by remote peer.
The right fix would be to pull the entire data path into the host which is not feasible or would need lots of complex/inefficient datapath changes.
---
Changes from v3:
- Fixed commit text errors
- Remove excess space in "hardware restart"
- Removed blank line between the function description and the arguments
Youghandhar Chintala (2):
mac80211: Add support to trigger sta disconnect on hardware restart
ath10k: Trigger sta disconnect on hardware restart
drivers/net/wireless/ath/ath10k/core.c | 25 +++++++++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 2 ++ include/net/mac80211.h | 10 ++++++++ net/mac80211/ieee80211_i.h | 3 +++ net/mac80211/mlme.c | 12 ++++++++++ net/mac80211/util.c | 33 +++++++++++++++++++++++--- 6 files changed, 82 insertions(+), 3 deletions(-)
Signature · 1 line
2.29.0
PATCH v5 1/2 mac80211: Add support to trigger sta disconnect on hardware restart
Currently in case of target hardware restart, we just reconfig and re-enable the security keys and enable the network queues to start data traffic back from where it was interrupted.
Many ath10k wifi chipsets have sequence numbers for the data packets assigned by firmware and the mac sequence number will restart from zero after target hardware restart leading to mismatch in the sequence number expected by the remote peer vs the sequence number of the frame sent by the target firmware.
This mismatch in sequence number will cause out-of-order packets on the remote peer and all the frames sent by the device are dropped until we reach the sequence number which was sent before we restarted the target hardware
In order to fix this, we trigger a sta disconnect, in case of target hw restart. After this there will be a fresh connection and thereby avoiding the dropping of frames by remote peer.
The right fix would be to pull the entire data path into the host which is not feasible or would need lots of complex changes and will still be inefficient.
Tested on ath10k using WCN3990, QCA6174
--- include/net/mac80211.h | 10 ++++++++++ net/mac80211/ieee80211_i.h | 3 +++ net/mac80211/mlme.c | 12 ++++++++++++ net/mac80211/util.c | 33 ++++++++++++++++++++++++++++++--- 4 files changed, 55 insertions(+), 3 deletions(-)
include/net/mac80211.h +10 -0
@@ -6064,6 +6064,16 @@ void ieee80211_disconnect(struct ieee80211_vif *vif, bool reconnect);*/ void ieee80211_resume_disconnect (struct ieee80211_vif *vif); +/** +* ieee80211_hw_restart_disconnect - disconnect from AP after +* hardware restart +* @vif: &struct ieee80211_vif pointer from the add_interface callback. +* +* Instructs mac80211 to disconnect from the AP after +* hardware restart. +*/ +void ieee80211_hw_restart_disconnect (struct ieee80211_vif *vif); +/** * ieee80211_cqm_rssi_notify - inform a configured connection quality monitoring * rssi threshold triggered
net/mac80211/ieee80211_i.h +3 -0
@@ -765,6 +765,8 @@ struct ieee80211_if_mesh {* back to wireless media and to the local net stack. * @IEEE80211_SDATA_DISCONNECT_RESUME: Disconnect after resume. * @IEEE80211_SDATA_IN_DRIVER: indicates interface was added to driver +* @IEEE80211_SDATA_DISCONNECT_HW_RESTART: Disconnect after hardware restart +* recovery */ enum ieee80211_sub_if_data_flags {IEEE80211_SDATA_ALLMULTI =BIT (0 ),
@@ -772,6 +774,7 @@ enum ieee80211_sub_if_data_flags {IEEE80211_SDATA_DONT_BRIDGE_PACKETS =BIT (3 ),IEEE80211_SDATA_DISCONNECT_RESUME =BIT (4 ),IEEE80211_SDATA_IN_DRIVER =BIT (5 ), + IEEE80211_SDATA_DISCONNECT_HW_RESTART = BIT(6), };/**
net/mac80211/mlme.c +12 -0
@@ -4863,6 +4863,18 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)sdata_unlock (sdata); return; } + +if (sdata->flags &IEEE80211_SDATA_DISCONNECT_HW_RESTART ) { + sdata->flags &= ~IEEE80211_SDATA_DISCONNECT_HW_RESTART ; +mlme_dbg (sdata,"driver requested disconnect after hardware restart\n" ); +ieee80211_sta_connection_lost (sdata, + ifmgd->associated->bssid, +WLAN_REASON_UNSPECIFIED , + true); +sdata_unlock (sdata); +return ; + } +sdata_unlock (sdata); }#endif
net/mac80211/util.c +30 -3
@@ -2321,6 +2321,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)struct cfg80211_sched_scan_request *sched_scan_req;bool sched_scan_stopped = false;bool suspended = local->suspended; +bool in_reconfig = false;/* nothing to do if HW shouldn't run */ if (!local->open_count)
@@ -2672,6 +2673,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)drv_reconfig_complete (local,IEEE80211_RECONFIG_TYPE_RESTART );if (local->in_reconfig) { + in_reconfig = local->in_reconfig; local->in_reconfig = false;barrier ();
@@ -2689,6 +2691,15 @@ int ieee80211_reconfig(struct ieee80211_local *local)IEEE80211_QUEUE_STOP_REASON_SUSPEND , false); +if (in_reconfig) { +list_for_each_entry (sdata, &local->interfaces, list) { +if (!ieee80211_sdata_running (sdata)) +continue ; +if (sdata->vif.type ==NL80211_IFTYPE_STATION ) +ieee80211_sta_restart (sdata); + } + } +if (!suspended)return 0 ;
@@ -2718,7 +2729,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)return 0 ; } -void ieee80211_resume_disconnect (struct ieee80211_vif *vif) +static void ieee80211_reconfig_disconnect (struct ieee80211_vif *vif,u8 flag) {struct ieee80211_sub_if_data *sdata;struct ieee80211_local *local;
@@ -2730,19 +2741,35 @@ void ieee80211_resume_disconnect(struct ieee80211_vif *vif) sdata =vif_to_sdata (vif); local = sdata->local; -if (WARN_ON (!local->resuming)) +if (WARN_ON (flag &IEEE80211_SDATA_DISCONNECT_RESUME && + !local->resuming)) +return ; + +if (WARN_ON (flag &IEEE80211_SDATA_DISCONNECT_HW_RESTART && + !local->in_reconfig))return ;if (WARN_ON (vif->type !=NL80211_IFTYPE_STATION ))return ; - sdata->flags |=IEEE80211_SDATA_DISCONNECT_RESUME ; + sdata->flags |= flag;mutex_lock (&local->key_mtx);list_for_each_entry (key, &sdata->key_list, list) key->flags |=KEY_FLAG_TAINTED ;mutex_unlock (&local->key_mtx); } + +void ieee80211_hw_restart_disconnect (struct ieee80211_vif *vif) +{ +ieee80211_reconfig_disconnect (vif,IEEE80211_SDATA_DISCONNECT_HW_RESTART ); +} +EXPORT_SYMBOL_GPL (ieee80211_hw_restart_disconnect); + +void ieee80211_resume_disconnect (struct ieee80211_vif *vif) +{ +ieee80211_reconfig_disconnect (vif,IEEE80211_SDATA_DISCONNECT_RESUME ); +}EXPORT_SYMBOL_GPL (ieee80211_resume_disconnect);void ieee80211_recalc_smps (struct ieee80211_sub_if_data *sdata)
Signature · 1 line
2.29.0
PATCH v5 2/2 ath10k: Trigger sta disconnect on hardware restart
In reply to Youghandhar ChintalaCurrently after the hardware restart triggered from the driver, the station interface connection remains intact, since a disconnect trigger is not sent to userspace. This can lead to a problem in targets where the wifi mac sequence is added by the firmware.
After the target restart, its wifi mac sequence number gets reset to zero. Hence AP to which our device is connected will receive frames with a wifi mac sequence number jump to the past, thereby resulting in the AP dropping all these frames, until the frame arrives with a wifi mac sequence number which AP was expecting.
To avoid such frame drops, its better to trigger a station disconnect upon target hardware restart which can be done with API ieee80211_reconfig_disconnect exposed to mac80211.
The other targets are not affected by this change, since the hardware params flag is not set.
Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00048
--- drivers/net/wireless/ath/ath10k/core.c | 25 +++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 2 ++ 2 files changed, 27 insertions(+)
drivers/net/wireless/ath/ath10k/core.c +25 -0
@@ -94,6 +94,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = true, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA988X_HW_2_0_VERSION,
@@ -131,6 +132,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = true, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA9887_HW_1_0_VERSION,
@@ -169,6 +171,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA6174_HW_3_2_VERSION,
@@ -202,6 +205,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .bmi_large_size_download = true, .supports_peer_stats_info = true, .dynamic_sar_support = true, + .hw_restart_disconnect = false, }, { .id = QCA6174_HW_2_1_VERSION,
@@ -239,6 +243,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA6174_HW_2_1_VERSION,
@@ -276,6 +281,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA6174_HW_3_0_VERSION,
@@ -313,6 +319,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA6174_HW_3_2_VERSION,
@@ -354,6 +361,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .tx_stats_over_pktlog = false, .supports_peer_stats_info = true, .dynamic_sar_support = true, + .hw_restart_disconnect = false, }, { .id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -397,6 +405,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA9984_HW_1_0_DEV_VERSION,
@@ -447,6 +456,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA9888_HW_2_0_DEV_VERSION,
@@ -494,6 +504,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA9377_HW_1_0_DEV_VERSION,
@@ -531,6 +542,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA9377_HW_1_1_DEV_VERSION,
@@ -570,6 +582,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA9377_HW_1_1_DEV_VERSION,
@@ -600,6 +613,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .uart_pin_workaround = true, .credit_size_workaround = true, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = QCA4019_HW_1_0_DEV_VERSION,
@@ -644,6 +658,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, }, { .id = WCN3990_HW_1_0_DEV_VERSION,
@@ -674,6 +689,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = true, + .hw_restart_disconnect = true, }, };
@@ -2442,6 +2458,7 @@ EXPORT_SYMBOL(ath10k_core_napi_sync_disable);static void ath10k_core_restart (struct work_struct *work) { struct ath10k *ar = container_of(work, struct ath10k, restart_work); +struct ath10k_vif *arvif;int ret;set_bit (ATH10K_FLAG_CRASH_FLUSH , &ar->dev_flags);
@@ -2480,6 +2497,14 @@ static void ath10k_core_restart(struct work_struct *work) ar->state =ATH10K_STATE_RESTARTING ;ath10k_halt (ar);ath10k_scan_finish (ar); +if (ar->hw_params.hw_restart_disconnect) { +list_for_each_entry (arvif, &ar->arvifs, list) { +if (arvif->is_up && + arvif->vdev_type ==WMI_VDEV_TYPE_STA ) +ieee80211_hw_restart_disconnect (arvif->vif); + } + } +ieee80211_restart_hw (ar->hw);break ;case ATH10K_STATE_OFF :
drivers/net/wireless/ath/ath10k/hw.h +2 -0
@@ -633,6 +633,8 @@ struct ath10k_hw_params {bool supports_peer_stats_info;bool dynamic_sar_support; + +bool hw_restart_disconnect; };struct htt_resp ;
Signature · 1 line
2.29.0
Quoted 23 lines · Youghandhar Chintala
Currently in case of target hardware restart ,we just reconfig and re-enable the security keys and enable the network queues to start data traffic back from where it was interrupted.
Many ath10k wifi chipsets have sequence numbers for the data packets assigned by firmware and the mac sequence number will restart from zero after target hardware restart leading to mismatch in the sequence number expected by the remote peer vs the sequence number of the frame sent by the target firmware.
This mismatch in sequence number will cause out-of-order packets on the remote peer and all the frames sent by the device are dropped until we reach the sequence number which was sent before we restarted the target hardware
In order to fix this, we trigger a disconnect in case of hardware restart. After this there will be a fresh connection and thereby avoiding the dropping of frames by remote peer.
The right fix would be to pull the entire data path into the host which is not feasible or would need lots of complex/inefficient datapath changes.
Quoted 5 lines
---
Changes from v3:
- Fixed commit text errors
- Remove excess space in "hardware restart"
- Removed blank line between the function description and the arguments
For whatever it's worth, the series looks good to me: