wiphy: add wiphy_can_offload API
PATCH 1/4 wiphy: add wiphy_can_offload API
This checks if offload is an available extended feature and compatible with the desired BSS. It is also conditional on the [General].PreferOffload setting which, for now, is being added as a 'hidden' developer feature (not documented).
--- src/wiphy.c | 33 +++++++++++++++++++++++++++++++++ src/wiphy.h | 1 + 2 files changed, 34 insertions(+)
src/wiphy.c +33 -0
@@ -412,6 +412,39 @@ bool wiphy_can_randomize_mac_addr(struct wiphy *wiphy)return wiphy_has_feature (wiphy,NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR ); } +bool wiphy_can_offload (struct wiphy *wiphy,struct scan_bss *bss) +{ +struct ie_rsn_info rsn_info; +int r; +bool prefer_offload = false; + +if (!wiphy_has_ext_feature (wiphy, +NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK )) +return false; + +if (!l_settings_get_bool (iwd_get_config (),"General" ,"PreferOffload" , + &prefer_offload) || !prefer_offload) +return false; + +memset (&rsn_info,0 ,sizeof (rsn_info)); + r =scan_bss_get_rsn_info (bss, &rsn_info); + +if (r <0 ) +return false; + +/* +* For now offload is only allowed on PSK networks. +*/ +switch (rsn_info.akm_suites) { +case IE_RSN_AKM_SUITE_PSK : +case IE_RSN_AKM_SUITE_PSK_SHA256 : +return true; +default : +return false; + } +} + +bool wiphy_rrm_capable (struct wiphy *wiphy) { if (wiphy_has_feature(wiphy,
src/wiphy.h +1 -0
@@ -80,6 +80,7 @@ const struct scan_freq_set *wiphy_get_supported_freqs( const struct wiphy *wiphy);bool wiphy_can_connect (struct wiphy *wiphy,struct scan_bss *bss);bool wiphy_can_randomize_mac_addr (struct wiphy *wiphy); +bool wiphy_can_offload (struct wiphy *wiphy,struct scan_bss *bss);bool wiphy_rrm_capable (struct wiphy *wiphy);bool wiphy_has_feature (struct wiphy *wiphy,uint32_t feature);bool wiphy_has_ext_feature (struct wiphy *wiphy,uint32_t feature);
Signature · 1 line
2.26.2
PATCH 2/4 handshake: add offload member
This flag indicates the handshake is being offloaded to the kernel/driver.
--- src/handshake.h | 1 + 1 file changed, 1 insertion(+)
src/handshake.h +1 -0
@@ -116,6 +116,7 @@ struct handshake_state { bool wait_for_gtk : 1; bool no_rekey : 1; bool support_fils : 1; + bool offload_psk : 1;uint8_t ssid[32 ];size_t ssid_len;char *passphrase;
Signature · 1 line
2.26.2
Re: [PATCH 2/4] handshake: add offload member
Hi James,
Quoted 11 lines · James Prestwood
This flag indicates the handshake is being offloaded to the kernel/driver.
--- src/handshake.h | 1 + 1 file changed, 1 insertion(+)src/handshake.h +0
-0
src/handshake.h struct handshake_state { · line 119
Quoted 4 lines
src/handshake.h +1
-0@@ -116,6 +116,7 @@ struct handshake_state { bool wait_for_gtk : 1; bool no_rekey : 1; bool support_fils : 1; + bool offload_psk : 1;
Maybe offloaded_4way would be a more future-proof name?
src/handshake.h struct handshake_state { · line 122
Quoted 4 lines
src/handshake.h +0
-0uint8_t ssid[32 ];size_t ssid_len;char *passphrase;
Regards,
-Denis
PATCH 3/4 station: set handshake offload if supported
In reply to James PrestwoodWhen setting up the handshake check if wiphy supports handshake offload for PSK networks (not including SAE, for now).
--- src/station.c | 2 ++ 1 file changed, 2 insertions(+)
src/station.c +2 -0
@@ -986,6 +986,8 @@ static struct handshake_state *station_handshake_setup(struct station *station, goto no_psk;handshake_state_set_pmk (hs, psk,32 ); + + hs->offload_psk =wiphy_can_offload (wiphy, bss); } }else if (security ==SECURITY_8021X ) handshake_state_set_8021x_config(hs,
Signature · 1 line
2.26.2
Re: [PATCH 3/4] station: set handshake offload if supported
Hi James,
Quoted 11 lines · James Prestwood
When setting up the handshake check if wiphy supports handshake offload for PSK networks (not including SAE, for now).
--- src/station.c | 2 ++ 1 file changed, 2 insertions(+)src/station.c +0
-0
src/station.c static struct handshake_state *station_handshake_setup(struct station *station, · line 990
Quoted 5 lines
src/station.c +2
-0@@ -986,6 +986,8 @@ static struct handshake_state *station_handshake_setup(struct station *station, goto no_psk;handshake_state_set_pmk (hs, psk,32 ); + + hs->offload_psk =wiphy_can_offload (wiphy, bss);
I actually wonder whether we need to put some of the logic from wiphy_can_offload into wiphy_select_akm instead? Maybe the offload bit can be an extra out parameter?
I suspect we need to implement the logic for offloaded SAE to really know what will look best.
src/station.c static struct handshake_state *station_handshake_setup(struct station *station, · line 993
Quoted 4 lines
src/station.c +0
-0} }else if (security ==SECURITY_8021X ) handshake_state_set_8021x_config(hs,
Regards,
-Denis
PATCH 4/4 netdev: offload handshake when requested
In reply to James PrestwoodSet the PMK attribute if offloading the handshake is requested. Since station relies on handshake events the key setting event must be simulated in order to sync the PSK. As of now, no other handshake events are required explicitly.
--- src/netdev.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
src/netdev.c +15 -1
@@ -1958,6 +1958,16 @@ process_resp_ies:return ; } +/* +* In the offload case this handshake is completed, simulate setting +* the keys so station sync's PSK and treats this the same as a +* non-offload connection +*/ +if (netdev->handshake->offload_psk) { +handshake_event (netdev->handshake, +HANDSHAKE_EVENT_SETTING_KEYS ); + } +netdev_connect_ok (netdev);return ;
@@ -2635,6 +2645,10 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,NL80211_ATTR_CONTROL_PORT_OVER_NL80211 , 0, NULL); +if (hs->offload_psk) +l_genl_msg_append_attr (msg,NL80211_ATTR_PMK , hs->pmk_len, + hs->pmk); + rm_enabled_capabilities =wiphy_get_rm_enabled_capabilities (netdev->wiphy);if (rm_enabled_capabilities && bss->capability &IE_BSS_CAP_RM ) {
@@ -3000,7 +3014,7 @@ int netdev_connect(struct netdev *netdev, struct scan_bss *bss,if (!cmd_connect)return -EINVAL ; -if (is_rsn || hs->settings_8021x) +if (!hs->offload_psk && (is_rsn || hs->settings_8021x)) sm =eapol_sm_new (hs); }
Signature · 1 line
2.26.2
Hi James,
Quoted 14 lines · James Prestwood
This checks if offload is an available extended feature and compatible with the desired BSS. It is also conditional on the [General].PreferOffload setting which, for now, is being added as a 'hidden' developer feature (not documented).
--- src/wiphy.c | 33 +++++++++++++++++++++++++++++++++ src/wiphy.h | 1 + 2 files changed, 34 insertions(+)src/wiphy.c +0
-0
src/wiphy.c bool wiphy_can_randomize_mac_addr(struct wiphy *wiphy) · line 415
Quoted 4 lines
src/wiphy.c +1
-0@@ -412,6 +412,39 @@ bool wiphy_can_randomize_mac_addr(struct wiphy *wiphy)return wiphy_has_feature (wiphy,NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR ); } +bool wiphy_can_offload (struct wiphy *wiphy,struct scan_bss *bss)
In theory you're only checking the AKM, which is already available through hs->akm_suite after we setup the handshake_state... So you may as well just pass that in instead of struct scan_bss.
src/wiphy.c bool wiphy_can_randomize_mac_addr(struct wiphy *wiphy) · line 428
Quoted 13 lines
src/wiphy.c +13
-0+{ +struct ie_rsn_info rsn_info; +int r; +bool prefer_offload = false; + +if (!wiphy_has_ext_feature (wiphy, +NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK )) +return false; + +if (!l_settings_get_bool (iwd_get_config (),"General" ,"PreferOffload" , + &prefer_offload) || !prefer_offload) +return false; +
Can we make this more future proof and turn it into something like:
if (!l_settings_get_bool(...))
prefer_offload = false;
if (!prefer_offload)
return false;
Quoted 28 lines
src/wiphy.c +19
-0+memset (&rsn_info,0 ,sizeof (rsn_info)); + r =scan_bss_get_rsn_info (bss, &rsn_info); + +if (r <0 ) +return false; + +/* +* For now offload is only allowed on PSK networks. +*/ +switch (rsn_info.akm_suites) { +case IE_RSN_AKM_SUITE_PSK : +case IE_RSN_AKM_SUITE_PSK_SHA256 : +return true; +default : +return false; + } +} + +bool wiphy_rrm_capable (struct wiphy *wiphy) { if (wiphy_has_feature(wiphy,src/wiphy.h +0
-0
src/wiphy.h const struct scan_freq_set *wiphy_get_supported_freqs( · line 86
Quoted 7 lines
src/wiphy.h +1
-0@@ -80,6 +80,7 @@ const struct scan_freq_set *wiphy_get_supported_freqs( const struct wiphy *wiphy);bool wiphy_can_connect (struct wiphy *wiphy,struct scan_bss *bss);bool wiphy_can_randomize_mac_addr (struct wiphy *wiphy); +bool wiphy_can_offload (struct wiphy *wiphy,struct scan_bss *bss);bool wiphy_rrm_capable (struct wiphy *wiphy);bool wiphy_has_feature (struct wiphy *wiphy,uint32_t feature);bool wiphy_has_ext_feature (struct wiphy *wiphy,uint32_t feature);
Regards,
-Denis