support ftm responder configuration/statistics
v3 cover support ftm responder configuration/statistics
Currently ftm_responder parameter in hostapd.conf is only used for fine timing measurement (FTM) capability advertisement and actual control of the functionality is with low-level device/driver. This leads to confusion to the user when the capability advertisement is different from actual FTM responder functionality.
For example, FTM responder capability advertisement is set to 'enabled', but the functionality is disabled or not supported by the driver.
The patch set allows userspace to enable FTM responder functionality with the addition of new Netlink flag attribute NL80211_ATTR_FTM_RESPONDER with configurable lci/civic ocation parameters. Also extended feature flag is added for the drivers to advertise the support. Setting the flag to enable FTM responder would imply that AP responds to all FTM requests. Default is considered to be disabled.
changes in V3:
- fixed the ambiguous ftm responder disable case to be not supported
changes in V2:
- updated version number
- rebased patches
Johannes Berg, Pradeep Kumar Chitrapu (1):
cfg80211: support FTM responder configuration/statistics
David Spinadel, Johannes Berg, Pradeep Kumar Chitrapu (1):
mac80211: support FTM responder configuration/statistics
Pradeep Kumar Chitrapu (1):
ath10k: Add support to configure ftm responder role
drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/mac.c | 29 ++++++++ drivers/net/wireless/ath/ath10k/wmi.c | 4 ++ drivers/net/wireless/ath/ath10k/wmi.h | 10 +++ include/net/cfg80211.h | 66 ++++++++++++++++++ include/net/mac80211.h | 13 ++++ include/uapi/linux/nl80211.h | 81 +++++++++++++++++++++ net/mac80211/cfg.c | 84 ++++++++++++++++++++++ net/mac80211/driver-ops.h | 16 +++++ net/mac80211/trace.h | 23 ++++++ net/mac80211/util.c | 3 + net/wireless/nl80211.c | 124 +++++++++++++++++++++++++++++++-- net/wireless/rdev-ops.h | 15 ++++ net/wireless/trace.h | 44 ++++++++++++ 14 files changed, 508 insertions(+), 5 deletions(-)
Signature · 7 lines
1.9.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v3 1/3 cfg80211: support FTM responder configuration/statistics
Allow userspace to enable fine timing measurement responder functionality with configurable LCI/Civic parameters in AP mode. This can be done at AP start or changing beacon parameters.
A new EXT_FEATURE flag is introduced for drivers to advertise the capability.
Also nl80211 API support for retrieving statistics is added.
---
v3:
- fixed ftm responder disabled case to be not supported.
- changed ftm_responder param from bool to s8.
include/net/cfg80211.h | 66 +++++++++++++++++++++++ include/uapi/linux/nl80211.h | 81 ++++++++++++++++++++++++++++ net/wireless/nl80211.c | 124 +++++++++++++++++++++++++++++++++++++++++-- net/wireless/rdev-ops.h | 15 ++++++ net/wireless/trace.h | 44 +++++++++++++++ 5 files changed, 325 insertions(+), 5 deletions(-)
include/net/cfg80211.h +66 -0
@@ -775,6 +775,11 @@ struct cfg80211_crypto_settings {* @assocresp_ies_len: length of assocresp_ies in octets * @probe_resp_len: length of probe response template (@probe_resp) * @probe_resp: probe response template (AP mode only) +* @ftm_responder: enable FTM responder functionality +* @lci: LCI subelement content +* @civic: CIVIC subelement content +* @lci_len: LCI data length +* @civic_len: Civic data length */ struct cfg80211_beacon_data {const u8 *head, *tail;
@@ -782,12 +787,17 @@ struct cfg80211_beacon_data {const u8 *proberesp_ies;const u8 *assocresp_ies;const u8 *probe_resp; +const u8 *lci; +const u8 *civic; +s8 ftm_responder;size_t head_len, tail_len;size_t beacon_ies_len;size_t proberesp_ies_len;size_t assocresp_ies_len;size_t probe_resp_len; +size_t lci_len; +size_t civic_len; };struct mac_address {
@@ -2795,6 +2805,55 @@ struct cfg80211_external_auth_params { };/** +* cfg80211_ftm_responder_params - FTM responder parameters +* +* @lci: LCI subelement content +* @civic: CIVIC subelement content +* @lci_len: LCI data length +* @civic_len: Civic data length +*/ +struct cfg80211_ftm_responder_params { +const u8 *lci; +const u8 *civic; +size_t lci_len; +size_t civic_len; +}; + +/** +* cfg80211_ftm_responder_stats - FTM responder statistics +* +* @filled: bitflag of flags using the bits of &enum nl80211_ftm_stats to +* indicate the relevant values in this struct for them +* @success_num: number of FTM sessions in which all frames were successfully +* answered +* @partial_num: number of FTM sessions in which part of frames were +* successfully answered +* @failed_num: number of failed FTM sessions +* @asap_num: number of ASAP FTM sessions +* @non_asap_num: number of non-ASAP FTM sessions +* @total_duration_ms: total sessions durations - gives an indication +* of how much time the responder was busy +* @unknown_triggers_num: number of unknown FTM triggers - triggers from +* initiators that didn't finish successfully the negotiation phase with +* the responder +* @reschedule_requests_num: number of FTM reschedule requests - initiator asks +* for a new scheduling although it already has scheduled FTM slot +* @out_of_window_triggers_num: total FTM triggers out of scheduled window +*/ +struct cfg80211_ftm_responder_stats { +u32 filled; +u32 success_num; +u32 partial_num; +u32 failed_num; +u32 asap_num; +u32 non_asap_num; +u64 total_duration_ms; +u32 unknown_triggers_num; +u32 reschedule_requests_num; +u32 out_of_window_triggers_num; +}; + +/** * struct cfg80211_ops - backend description for wireless configuration * * This struct is registered by fullmac card drivers and/or wireless stacks
@@ -3126,6 +3185,9 @@ struct cfg80211_external_auth_params {* * @tx_control_port: TX a control port frame (EAPoL). The noencrypt parameter * tells the driver that the frame should not be encrypted. +* +* @get_ftm_responder_stats: Retrieve FTM responder statistics, if available. +* Statistics should be cumulative, currently no way to reset is provided. */ struct cfg80211_ops {int (*suspend)(struct wiphy *wiphy,struct cfg80211_wowlan *wow);
@@ -3431,6 +3493,10 @@ struct cfg80211_ops { const u8 *buf, size_t len, const u8 *dest, const __be16 proto, const bool noencrypt); + +int (*get_ftm_responder_stats)(struct wiphy *wiphy, +struct net_device *dev, +struct cfg80211_ftm_responder_stats *ftm_stats); };/*
include/uapi/linux/nl80211.h +81 -0
121 lines not on this page · raw message
net/wireless/nl80211.c +119 -5
178 lines not on this page · raw message
net/wireless/rdev-ops.h +15 -0
@@ -1232,4 +1232,19 @@ static inline int rdev_del_pmk(struct cfg80211_registered_device *rdev, return ret; } +static inline int +rdev_get_ftm_responder_stats (struct cfg80211_registered_device *rdev, +struct net_device *dev, +struct cfg80211_ftm_responder_stats *ftm_stats) +{ +int ret = -EOPNOTSUPP ; + +trace_rdev_get_ftm_responder_stats (&rdev->wiphy, dev, ftm_stats); +if (rdev->ops->get_ftm_responder_stats) + ret = rdev->ops->get_ftm_responder_stats (&rdev->wiphy, dev, + ftm_stats); +trace_rdev_return_int (&rdev->wiphy, ret); +return ret; +} +#endif /* __CFG80211_RDEV_OPS */
net/wireless/trace.h +44 -0
50 lines not on this page · raw message
Signature · 7 lines
1.9.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v3 2/3 mac80211: support FTM responder configuration/statistics
In reply to Pradeep Kumar ChitrapuNew bss param ftm_responder is used to notify the driver to enable fine timing request (FTM) responder role in AP mode.
Plumb the new cfg80211 API for FTM responder statistics through to the driver API in mac80211.
---
v3:
- fixed ftm responder disabled case to be not supported.
- changed ftm_responder param from bool to s8.
include/net/mac80211.h | 13 ++++++++ net/mac80211/cfg.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++ net/mac80211/driver-ops.h | 16 +++++++++ net/mac80211/trace.h | 23 +++++++++++++ net/mac80211/util.c | 3 ++ 5 files changed, 139 insertions(+)
include/net/mac80211.h +13 -0
@@ -308,6 +308,8 @@ struct ieee80211_vif_chanctx_switch {* @BSS_CHANGED_KEEP_ALIVE: keep alive options (idle period or protected * keep alive) changed. * @BSS_CHANGED_MCAST_RATE: Multicast Rate setting changed for this interface +* @BSS_CHANGED_FTM_RESPONDER: fime timing reasurement request responder +* functionality changed for this BSS (AP mode). * */ enum ieee80211_bss_change {
@@ -337,6 +339,7 @@ enum ieee80211_bss_change {BSS_CHANGED_MU_GROUPS =1 <<23 ,BSS_CHANGED_KEEP_ALIVE =1 <<24 ,BSS_CHANGED_MCAST_RATE =1 <<25 , + BSS_CHANGED_FTM_RESPONDER = 1<<26, /* when adding here, make sure to change ieee80211_reconfig */ };
@@ -561,6 +564,9 @@ struct ieee80211_mu_group_data {* @protected_keep_alive: if set, indicates that the station should send an RSN * protected frame to the AP to reset the idle timer at the AP for the * station. +* @ftm_responder: whether to enable or disable fine timing measurement FTM +* responder functionality. +* @ftmr_params: configurable lci/civic parameter when enabling FTM responder. */ struct ieee80211_bss_conf {const u8 *bssid;
@@ -611,6 +617,8 @@ struct ieee80211_bss_conf {bool allow_p2p_go_ps;u16 max_idle_period;bool protected_keep_alive; +s8 ftm_responder; +struct cfg80211_ftm_responder_params *ftmr_params; };/**
@@ -3546,6 +3554,8 @@ enum ieee80211_reconfig_type {* @del_nan_func: Remove a NAN function. The driver must call * ieee80211_nan_func_terminated() with * NL80211_NAN_FUNC_TERM_REASON_USER_REQUEST reason code upon removal. +* @get_ftm_responder_stats: Retrieve FTM responder statistics, if available. +* Statistics should be cumulative, currently no way to reset is provided. */ struct ieee80211_ops { void (*tx)(struct ieee80211_hw *hw,
@@ -3828,6 +3838,9 @@ struct ieee80211_ops {void (*del_nan_func)(struct ieee80211_hw *hw,struct ieee80211_vif *vif,u8 instance_id); +int (*get_ftm_responder_stats)(struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct cfg80211_ftm_responder_stats *ftm_stats); };/**
net/mac80211/cfg.c +84 -0
112 lines not on this page · raw message
net/mac80211/driver-ops.h +16 -0
@@ -1173,6 +1173,22 @@ static inline void drv_wake_tx_queue(struct ieee80211_local *local, local->ops->wake_tx_queue (&local->hw, &txq->txq); } +static inline int +drv_get_ftm_responder_stats (struct ieee80211_local *local, +struct ieee80211_sub_if_data *sdata, +struct cfg80211_ftm_responder_stats *ftm_stats) +{ +u32 ret = -EOPNOTSUPP ; + +if (local->ops->get_ftm_responder_stats) + ret = local->ops->get_ftm_responder_stats (&local->hw, + &sdata->vif, + ftm_stats); +trace_drv_get_ftm_responder_stats (local, sdata, ftm_stats); + +return ret; +} +static inline int drv_start_nan (struct ieee80211_local *local,struct ieee80211_sub_if_data *sdata,struct cfg80211_nan_conf *conf)
net/mac80211/trace.h +23 -0
@@ -2600,6 +2600,29 @@ struct trace_switch_entry { ) ); +TRACE_EVENT (drv_get_ftm_responder_stats, + TP_PROTO(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata, + struct cfg80211_ftm_responder_stats *ftm_stats), + +TP_ARGS (local, sdata, ftm_stats), + +TP_STRUCT__entry ( +LOCAL_ENTRY + VIF_ENTRY + ), + +TP_fast_assign ( + LOCAL_ASSIGN; + VIF_ASSIGN; + ), + +TP_printk ( + LOCAL_PR_FMT VIF_PR_FMT, +LOCAL_PR_ARG ,VIF_PR_ARG + ) +); +#endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH
net/mac80211/util.c +3 -0
@@ -2176,6 +2176,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)case NL80211_IFTYPE_AP : changed |=BSS_CHANGED_SSID |BSS_CHANGED_P2P_PS ; +if (sdata->vif.bss_conf.ftm_responder !=-1 ) + changed |=BSS_CHANGED_FTM_RESPONDER ; +if (sdata->vif.type ==NL80211_IFTYPE_AP ) { changed |=BSS_CHANGED_AP_PROBE_RESP ;
Signature · 7 lines
1.9.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v3 3/3 ath10k: Add support to configure ftm responder role
In reply to Pradeep Kumar ChitrapuConfigure fine timing measurement (FTM) responder role from the ftm_responder bss param sent by mac80211. With FTM functionality offloaded to firmware, adding the interface allows userspace to enable FTM responder functionality. ath10k disables it at the time of interface creation.
Supported FW: 10.4
Tested on QCA9984 with firmware: 10.4-3.6-00144
--- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/mac.c | 29 +++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/wmi.c | 4 ++++ drivers/net/wireless/ath/ath10k/wmi.h | 10 ++++++++++ 4 files changed, 44 insertions(+)
drivers/net/wireless/ath/ath10k/core.h +1 -0
@@ -544,6 +544,7 @@ struct ath10k_vif {bool nohwcrypt;int num_legacy_stations;int txpower; +bool ftm_responder;struct wmi_wmm_params_all_arg wmm_params;struct work_struct ap_csa_work;struct delayed_work connection_loss_work;
drivers/net/wireless/ath/ath10k/mac.c +29 -0
@@ -5260,6 +5260,17 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, goto err_peer_delete; } +if (test_bit (WMI_SERVICE_RTT , ar->wmi.svc_map)) { + vdev_param = ar->wmi.vdev_param->rtt_responder_role; + ret =ath10k_wmi_vdev_set_param (ar, arvif->vdev_id, vdev_param, + arvif->ftm_responder); + +/* It is harmless to not set FTM role. Do not warn */ +if (ret && ret != -EOPNOTSUPP ) +ath10k_warn (ar,"failed to set vdev %i FTM Responder: %d\n" , + arvif->vdev_id, ret); + } +if (vif->type ==NL80211_IFTYPE_MONITOR ) { ar->monitor_arvif = arvif; ret =ath10k_monitor_recalc (ar);
@@ -5533,6 +5544,20 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,if (changed &BSS_CHANGED_BSSID && !is_zero_ether_addr (info->bssid))ether_addr_copy (arvif->bssid, info->bssid); +if (changed &BSS_CHANGED_FTM_RESPONDER && + arvif->ftm_responder != info->ftm_responder && +test_bit (WMI_SERVICE_RTT , ar->wmi.svc_map)) { + arvif->ftm_responder = info->ftm_responder; + + vdev_param = ar->wmi.vdev_param->rtt_responder_role; + ret =ath10k_wmi_vdev_set_param (ar, arvif->vdev_id, vdev_param, + arvif->ftm_responder); + +ath10k_dbg (ar,ATH10K_DBG_MAC , +"mac vdev %d ftm_responder %d:ret %d\n" , + arvif->vdev_id, arvif->ftm_responder, ret); + } +if (changed &BSS_CHANGED_BEACON_ENABLED )ath10k_control_beaconing (arvif, info);
@@ -8469,6 +8494,10 @@ int ath10k_mac_register(struct ath10k *ar)wiphy_ext_feature_set (ar->hw->wiphy,NL80211_EXT_FEATURE_SET_SCAN_DWELL ); +if (test_bit (WMI_SERVICE_RTT , ar->wmi.svc_map)) +wiphy_ext_feature_set (ar->hw->wiphy, +NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER ); +/* * on LL hardware queues are managed entirely by the FW * so we only advertise to mac we can do the queues thing
drivers/net/wireless/ath/ath10k/wmi.c +4 -0
@@ -825,6 +825,7 @@ .meru_vc = WMI_VDEV_PARAM_UNSUPPORTED, .rx_decap_type = WMI_VDEV_PARAM_UNSUPPORTED, .bw_nss_ratemask = WMI_VDEV_PARAM_UNSUPPORTED, + .rtt_responder_role = WMI_VDEV_PARAM_UNSUPPORTED, };/* 10.X WMI VDEV param map */
@@ -900,6 +901,7 @@ .meru_vc = WMI_VDEV_PARAM_UNSUPPORTED, .rx_decap_type = WMI_VDEV_PARAM_UNSUPPORTED, .bw_nss_ratemask = WMI_VDEV_PARAM_UNSUPPORTED, + .rtt_responder_role = WMI_VDEV_PARAM_UNSUPPORTED, };static struct wmi_vdev_param_map wmi_10_2_4_vdev_param_map = {
@@ -974,6 +976,7 @@ .meru_vc = WMI_VDEV_PARAM_UNSUPPORTED, .rx_decap_type = WMI_VDEV_PARAM_UNSUPPORTED, .bw_nss_ratemask = WMI_VDEV_PARAM_UNSUPPORTED, + .rtt_responder_role = WMI_VDEV_PARAM_UNSUPPORTED, };static struct wmi_vdev_param_map wmi_10_4_vdev_param_map = {
@@ -1051,6 +1054,7 @@ .bw_nss_ratemask = WMI_10_4_VDEV_PARAM_BW_NSS_RATEMASK, .inc_tsf = WMI_10_4_VDEV_PARAM_TSF_INCREMENT, .dec_tsf = WMI_10_4_VDEV_PARAM_TSF_DECREMENT, + .rtt_responder_role = WMI_10_4_VDEV_PARAM_ENABLE_DISABLE_RTT_RESPONDER_ROLE, };static struct wmi_pdev_param_map wmi_pdev_param_map = {
drivers/net/wireless/ath/ath10k/wmi.h +10 -0
@@ -5035,6 +5035,7 @@ struct wmi_vdev_param_map {u32 bw_nss_ratemask;u32 inc_tsf;u32 dec_tsf; +u32 rtt_responder_role; };#define WMI_VDEV_PARAM_UNSUPPORTED 0
@@ -5374,6 +5375,15 @@ enum wmi_10_4_vdev_param {WMI_10_4_VDEV_PARAM_ATF_SSID_SCHED_POLICY ,WMI_10_4_VDEV_PARAM_DISABLE_DYN_BW_RTS ,WMI_10_4_VDEV_PARAM_TSF_DECREMENT , +WMI_10_4_VDEV_PARAM_SELFGEN_FIXED_RATE , +WMI_10_4_VDEV_PARAM_AMPDU_SUBFRAME_SIZE_PER_AC , +WMI_10_4_VDEV_PARAM_NSS_VHT160 , +WMI_10_4_VDEV_PARAM_NSS_VHT80_80 , +WMI_10_4_VDEV_PARAM_AMSDU_SUBFRAME_SIZE_PER_AC , +WMI_10_4_VDEV_PARAM_DISABLE_CABQ , +WMI_10_4_VDEV_PARAM_SIFS_TRIGGER_RATE , +WMI_10_4_VDEV_PARAM_TX_POWER , + WMI_10_4_VDEV_PARAM_ENABLE_DISABLE_RTT_RESPONDER_ROLE, };#define WMI_VDEV_PARAM_TXBF_SU_TX_BFEE BIT(0)
Signature · 7 lines
1.9.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerQuoted 16 lines · Pradeep Kumar Chitrapu
Currently
ftm_responderparameter in hostapd.conf is only used for fine timing measurement (FTM) capability advertisement and actual control of the functionality is with low-level device/driver. This leads to confusion to the user when the capability advertisement is different from actual FTM responder functionality.For example, FTM responder capability advertisement is set to 'enabled', but the functionality is disabled or not supported by the driver.
The patch set allows userspace to enable FTM responder functionality with the addition of new Netlink flag attribute
NL80211_ATTR_FTM_RESPONDERwith configurable lci/civic ocation parameters. Also extended feature flag is added for the drivers to advertise the support. Setting the flag to enable FTM responder would imply that AP responds to all FTM requests. Default is considered to be disabled.
Quoted 2 lines
changes in V3:
- fixed the ambiguous ftm responder disable case to be not supported
For reasons unknown to me, this patchset made it neither to the list nor, consequently, patchwork. Please resend.
johannes
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 17 lines · Johannes Berg
Quoted 16 lines · Pradeep Kumar Chitrapu
Currently
ftm_responderparameter in hostapd.conf is only used for fine timing measurement (FTM) capability advertisement and actual control of the functionality is with low-level device/driver. This leads to confusion to the user when the capability advertisement is different from actual FTM responder functionality.For example, FTM responder capability advertisement is set to 'enabled', but the functionality is disabled or not supported by the driver.
The patch set allows userspace to enable FTM responder functionality with the addition of new Netlink flag attribute
NL80211_ATTR_FTM_RESPONDERwith configurable lci/civic ocation parameters. Also extended feature flag is added for the drivers to advertise the support. Setting the flag to enable FTM responder would imply that AP responds to all FTM requests. Default is considered to be disabled.
Quoted 5 lines
Quoted 2 lines
changes in V3:
- fixed the ambiguous ftm responder disable case to be not supportedFor reasons unknown to me, this patchset made it neither to the list nor, consequently, patchwork. Please resend.
Actually patch 3 made it:
https://patchwork.kernel.org/patch/10590115/
But it didn't get the rest as it says "Untitled series #15763". Patchwork was timing out for me quite heavily so in that way I'm not surprised that patches are getting lost :(
Signature · 6 lines
Kalle Valo _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerQuoted 8 lines · Kalle Valo
Actually patch 3 made it:
https://patchwork.kernel.org/patch/10590115/
But it didn't get the rest as it says "Untitled series #15763". Patchwork was timing out for me quite heavily so in that way I'm not surprised that patches are getting lost :(
No, it's not patchwork - I didn't get the patches (except for #3) via the list either.
johannes
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 4 lines · Johannes Berg
Quoted 3 lines · Kalle Valo
Actually patch 3 made it:
Quoted 8 lines
Quoted 5 lines
https://patchwork.kernel.org/patch/10590115/
But it didn't get the rest as it says "Untitled series #15763". Patchwork was timing out for me quite heavily so in that way I'm not surprised that patches are getting lost :(
No, it's not patchwork - I didn't get the patches (except for #3) via the list either.
Ah, missed that as the ath10k list did get all the patches. But very good that patchwork was not to blame here.
Signature · 6 lines
Kalle Valo _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k