ath11k: offload PN verification to the HW
v2 cover ath11k: offload PN verification to the HW
This patch series enables PN validation in the HW thereby reducing CPU cycles spent in the host CPU. It also is the basis for other performance improvement patches that follow this series.
TSC (TKIP sequence counter) validation is also offloaded.
Hardware validates PN/TSC only for unicast packets; for group addressed packets, PN validation is done in mac80211.
v2:
- fixed kbuild test robot warnings
Manikanta Pubbisetty (2):
ath11k: handle RX fragments
ath11k: enable PN offload
drivers/net/wireless/ath/ath11k/Kconfig | 1 + drivers/net/wireless/ath/ath11k/core.h | 2 + drivers/net/wireless/ath/ath11k/dp.c | 12 +- drivers/net/wireless/ath/ath11k/dp.h | 12 + drivers/net/wireless/ath/ath11k/dp_rx.c | 870 ++++++++++++++++++++++++++---- drivers/net/wireless/ath/ath11k/dp_rx.h | 8 +- drivers/net/wireless/ath/ath11k/hal.h | 2 +- drivers/net/wireless/ath/ath11k/hal_rx.c | 14 +- drivers/net/wireless/ath/ath11k/mac.c | 41 +- drivers/net/wireless/ath/ath11k/peer.h | 7 + drivers/net/wireless/ath/ath11k/rx_desc.h | 2 +- 11 files changed, 865 insertions(+), 106 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 1/2 ath11k: handle RX fragments
IPQ8074 HW has support to verify the PN of the received frames. For all frames except for fragmented ones, HW checks the PN and delivers them to the driver. For fragmented frames, driver is required to do a little more; it has to reassemble the fragments and then reinject them to the HW for verifying the PN. Currently, to keep the logic simple, PN verifcation is disabled in HW and is handled in mac80211 for all the frames (fragmented and unfragmented).
On the contrary, offloading PN Validation to the HW brings important benefits. It reduces CPU cycles spent on the host CPU for verifying the same; helps in enabling features which improve performance like mac80211 fast RX path, enabling multiple REO rings for parallel RX processing, 802.11 decapsulation offloading. All these features are dependent on PN offload which in turn is dependent on handling of the received fragments in the driver.
When TKIP security is used, additional handling is required while processing the fragments; since MIC is computed on an MSDU in TKIP, only the last fragment has the MIC info. In this case, driver has to compute the MIC after reassembly and compare it against the MIC present in the frame. For this, MICHAEL_MIC kernel crypto library APIs are used and the dependencies are appropriately set.
--- drivers/net/wireless/ath/ath11k/Kconfig | 1 + drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/dp.c | 8 + drivers/net/wireless/ath/ath11k/dp.h | 12 + drivers/net/wireless/ath/ath11k/dp_rx.c | 755 ++++++++++++++++++++++++++---- drivers/net/wireless/ath/ath11k/dp_rx.h | 1 + drivers/net/wireless/ath/ath11k/mac.c | 14 +- drivers/net/wireless/ath/ath11k/peer.h | 7 + drivers/net/wireless/ath/ath11k/rx_desc.h | 2 +- 9 files changed, 709 insertions(+), 92 deletions(-)
drivers/net/wireless/ath/ath11k/Kconfig +1 -0
@@ -3,6 +3,7 @@ config ATH11K tristate "Qualcomm Technologies 802.11ax chipset support" depends on MAC80211 && HAS_DMA depends on REMOTEPROC + depends on CRYPTO_MICHAEL_MIC depends on ARCH_QCOM || COMPILE_TEST select ATH_COMMON select QCOM_QMI_HELPERS
drivers/net/wireless/ath/ath11k/core.h +1 -0
@@ -77,6 +77,7 @@ struct ath11k_skb_rxcb {u8 err_code;u8 mac_id;u8 unmapped; +u8 is_frag; };enum ath11k_hw_rev {
drivers/net/wireless/ath/ath11k/dp.c +8 -0
@@ -3,6 +3,7 @@* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. */ +#include <crypto/hash.h> #include "core.h" #include "dp_tx.h" #include "hal_tx.h"
@@ -33,6 +34,7 @@ void ath11k_dp_peer_cleanup(struct ath11k *ar, int vdev_id, const u8 *addr) }ath11k_peer_rx_tid_cleanup (ar, peer); +crypto_free_shash (peer->tfm_mmic);spin_unlock_bh (&ab->base_lock); }
@@ -65,6 +67,12 @@ int ath11k_dp_peer_setup(struct ath11k *ar, int vdev_id, const u8 *addr) } } + ret =ath11k_peer_rx_frag_setup (ar, addr, vdev_id); +if (ret) { +ath11k_warn (ab,"failed to setup rx defrag context\n" ); +return ret; + } +/* TODO: Setup other peer specific resource used in data path */ return 0 ;
drivers/net/wireless/ath/ath11k/dp.h +12 -0
@@ -22,6 +22,18 @@ struct dp_rx_tid {u32 size;u32 ba_win_sz;bool active; + +/* Info related to rx fragments */ +u32 cur_sn; +u16 last_frag_no; +u16 rx_frag_bitmap; + +struct sk_buff_head rx_frags; +struct hal_reo_dest_ring *dst_ring_desc; + +/* Timer info related to fragments */ +struct timer_list frag_timer; +struct ath11k_base *ab; };#define DP_REO_DESC_FREE_TIMEOUT_MS 1000
drivers/net/wireless/ath/ath11k/dp_rx.c +667 -88
890 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/dp_rx.h +1 -0
@@ -84,5 +84,6 @@ int ath11k_dp_rx_mon_status_bufs_replenish(struct ath11k_base *ab, int mac_id, gfp_t gfp);int ath11k_dp_rx_pdev_mon_detach (struct ath11k *ar);int ath11k_dp_rx_pdev_mon_attach (struct ath11k *ar); +int ath11k_peer_rx_frag_setup (struct ath11k *ar,const u8 *peer_mac,int vdev_id);#endif /* ATH11K_DP_RX_H */
drivers/net/wireless/ath/ath11k/mac.c +11 -3
@@ -2384,11 +2384,19 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,spin_lock_bh (&ab->base_lock); peer =ath11k_peer_find (ab, arvif->vdev_id, peer_addr); -if (peer && cmd ==SET_KEY ) +if (peer && cmd ==SET_KEY ) { peer->keys[key->keyidx] = key; -else if (peer && cmd ==DISABLE_KEY ) +if (key->flags &IEEE80211_KEY_FLAG_PAIRWISE ) + peer->ucast_keyidx = key->keyidx; +else + peer->mcast_keyidx = key->keyidx; + }else if (peer && cmd ==DISABLE_KEY ) { peer->keys[key->keyidx] =NULL ; -else if (!peer) +if (key->flags &IEEE80211_KEY_FLAG_PAIRWISE ) + peer->ucast_keyidx =0 ; +else + peer->mcast_keyidx =0 ; + }else if (!peer)/* impossible unless FW goes crazy */ ath11k_warn (ab,"peer %pM disappeared!\n" , peer_addr);spin_unlock_bh (&ab->base_lock);
drivers/net/wireless/ath/ath11k/peer.h +7 -0
@@ -17,6 +17,13 @@ struct ath11k_peer {/* protected by ab->data_lock */ struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX +1 ];struct dp_rx_tid rx_tid[IEEE80211_NUM_TIDS +1 ]; + +/* Info used in MMIC verification of +* RX fragments +*/ +struct crypto_shash *tfm_mmic; +u8 mcast_keyidx; +u8 ucast_keyidx; };void ath11k_peer_unmap_event (struct ath11k_base *ab,u16 peer_id);
drivers/net/wireless/ath/ath11k/rx_desc.h +1 -1
@@ -342,7 +342,7 @@ struct rx_attention {#define RX_MPDU_START_INFO0_PROTO_VER_ERR BIT(12)#define RX_MPDU_START_INFO0_AST_LOOKUP_VALID BIT(13) -#define RX_MPDU_START_INFO1_MPDU_CTRL_VALID BIT(0) +#define RX_MPDU_START_INFO1_MPDU_FCTRL_VALID BIT(0)#define RX_MPDU_START_INFO1_MPDU_DUR_VALID BIT(1)#define RX_MPDU_START_INFO1_MAC_ADDR1_VALID BIT(2)#define RX_MPDU_START_INFO1_MAC_ADDR2_VALID BIT(3)
Signature · 1 line
2.7.4
PATCH v2 2/2 ath11k: enable PN offload
In reply to Manikanta PubbisettyEnabling PN checking in the hardware; hardware checks the PN of the received packets and reports the errors to the host for further handling; default action is to drop such packets. TSC (TKIP sequence counter) validation is also offloaded.
Hardware validates PN/TSC only for unicast packets; for group addressed packets, PN validation is done in mac80211.
PN errors are reported to the driver via WBM RX release ring and can be dumped by using the following command.
"cat /sys/kernel/debug/ath11k/soc_rx_stats | grep -i pn"
Sample Output:
PN check fail: 210
--- drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/dp.c | 4 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 115 ++++++++++++++++++++++++++++--- drivers/net/wireless/ath/ath11k/dp_rx.h | 7 +- drivers/net/wireless/ath/ath11k/hal.h | 2 +- drivers/net/wireless/ath/ath11k/hal_rx.c | 14 +++- drivers/net/wireless/ath/ath11k/mac.c | 27 ++++++++ 7 files changed, 156 insertions(+), 14 deletions(-)
drivers/net/wireless/ath/ath11k/core.h +1 -0
@@ -333,6 +333,7 @@ struct ath11k_sta {u32 bw;u32 nss;u32 smps; +enum hal_pn_type pn_type;struct work_struct update_wk;struct rate_info txrate;
drivers/net/wireless/ath/ath11k/dp.c +2 -2
@@ -58,8 +58,8 @@ int ath11k_dp_peer_setup(struct ath11k *ar, int vdev_id, const u8 *addr) }for (tid =0 ; tid <=IEEE80211_NUM_TIDS ; tid++) { - ret =ath11k_peer_rx_tid_setup (ar, addr, vdev_id, - tid,1 ,0 ); + ret =ath11k_peer_rx_tid_setup (ar, addr, vdev_id, tid,1 ,0 , +HAL_PN_TYPE_NONE );if (ret) {ath11k_warn (ab,"failed to setup rxd tid queue for tid %d: %d\n" , tid, ret);
drivers/net/wireless/ath/ath11k/dp_rx.c +106 -9
168 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/dp_rx.h +6 -1
@@ -43,11 +43,16 @@ int ath11k_dp_rx_ampdu_start(struct ath11k *ar, struct ieee80211_ampdu_params *params);int ath11k_dp_rx_ampdu_stop (struct ath11k *ar,struct ieee80211_ampdu_params *params); +int ath11k_dp_peer_rx_pn_replay_config (struct ath11k_vif *arvif, +const u8 *peer_addr, +enum set_key_cmd key_cmd, +struct ieee80211_key_conf *key);void ath11k_peer_rx_tid_cleanup (struct ath11k *ar,struct ath11k_peer *peer);void ath11k_peer_rx_tid_delete (struct ath11k *ar,struct ath11k_peer *peer,u8 tid);int ath11k_peer_rx_tid_setup (struct ath11k *ar,const u8 *peer_mac,int vdev_id, -u8 tid,u32 ba_win_sz,u16 ssn); +u8 tid,u32 ba_win_sz,u16 ssn, +enum hal_pn_type pn_type);void ath11k_dp_htt_htc_t2h_msg_handler (struct ath11k_base *ab,struct sk_buff *skb);int ath11k_dp_pdev_reo_setup (struct ath11k_base *ab);
drivers/net/wireless/ath/ath11k/hal.h +1 -1
@@ -847,7 +847,7 @@ struct ath11k_hal {u32 ath11k_hal_reo_qdesc_size (u32 ba_window_size,u8 tid);void ath11k_hal_reo_qdesc_setup (void *vaddr,int tid,u32 ba_window_size, -u32 start_seqtype); +u32 start_seq,enum hal_pn_type type);void ath11k_hal_reo_init_cmd_ring (struct ath11k_base *ab,struct hal_srng *srng);void ath11k_hal_reo_hw_setup (struct ath11k_base *ab);
drivers/net/wireless/ath/ath11k/hal_rx.c +13 -1
@@ -694,7 +694,7 @@ u32 ath11k_hal_reo_qdesc_size(u32 ba_window_size, u8 tid) }void ath11k_hal_reo_qdesc_setup (void *vaddr,int tid,u32 ba_window_size, -u32 start_seq) +u32 start_seq,enum hal_pn_type type) {struct hal_rx_reo_queue *qdesc = (struct hal_rx_reo_queue *)vaddr;struct hal_rx_reo_queue_ext *ext_desc;
@@ -723,6 +723,18 @@ void ath11k_hal_reo_qdesc_setup(void *vaddr, int tid, u32 ba_window_size, qdesc->info0 |=FIELD_PREP (HAL_RX_REO_QUEUE_INFO0_BA_WINDOW_SIZE , ba_window_size -1 ); +switch (type) { +case HAL_PN_TYPE_NONE : +case HAL_PN_TYPE_WAPI_EVEN : +case HAL_PN_TYPE_WAPI_UNEVEN : +break ; +case HAL_PN_TYPE_WPA : + qdesc->info0 |= +FIELD_PREP (HAL_RX_REO_QUEUE_INFO0_PN_CHECK ,1 ) | +FIELD_PREP (HAL_RX_REO_QUEUE_INFO0_PN_SIZE , +HAL_RX_REO_QUEUE_PN_SIZE_48 ); +break ; + }/* TODO: Set Ignore ampdu flags based on BA window size and/or * AMPDU capabilities
drivers/net/wireless/ath/ath11k/mac.c +27 -0
@@ -2325,6 +2325,7 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,struct ath11k_base *ab = ar->ab;struct ath11k_vif *arvif =ath11k_vif_to_arvif (vif);struct ath11k_peer *peer; +struct ath11k_sta *arsta;const u8 *peer_addr;int ret =0 ;u32 flags =0 ;
@@ -2382,6 +2383,12 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, goto exit; } + ret =ath11k_dp_peer_rx_pn_replay_config (arvif, peer_addr, cmd, key); +if (ret) { +ath11k_warn (ab,"failed to offload PN replay detection %d\n" , ret); + goto exit; + } +spin_lock_bh (&ab->base_lock); peer =ath11k_peer_find (ab, arvif->vdev_id, peer_addr);if (peer && cmd ==SET_KEY ) {
@@ -2399,6 +2406,26 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, }else if (!peer)/* impossible unless FW goes crazy */ ath11k_warn (ab,"peer %pM disappeared!\n" , peer_addr); + +if (sta) { + arsta = (struct ath11k_sta *)sta->drv_priv; + +switch (key->cipher) { +case WLAN_CIPHER_SUITE_TKIP : +case WLAN_CIPHER_SUITE_CCMP : +case WLAN_CIPHER_SUITE_CCMP_256 : +case WLAN_CIPHER_SUITE_GCMP : +case WLAN_CIPHER_SUITE_GCMP_256 : +if (cmd ==SET_KEY ) + arsta->pn_type =HAL_PN_TYPE_WPA ; +else + arsta->pn_type =HAL_PN_TYPE_NONE ; +break ; +default : + arsta->pn_type =HAL_PN_TYPE_NONE ; +break ; + } + }spin_unlock_bh (&ab->base_lock); exit:
Signature · 1 line
2.7.4
Re: [PATCH v2 1/2] ath11k: handle RX fragments
In reply to Manikanta PubbisettyQuoted 23 lines · Manikanta Pubbisetty
IPQ8074 HW has support to verify the PN of the received frames. For all frames except for fragmented ones, HW checks the PN and delivers them to the driver. For fragmented frames, driver is required to do a little more; it has to reassemble the fragments and then reinject them to the HW for verifying the PN. Currently, to keep the logic simple, PN verifcation is disabled in HW and is handled in mac80211 for all the frames (fragmented and unfragmented).
On the contrary, offloading PN Validation to the HW brings important benefits. It reduces CPU cycles spent on the host CPU for verifying the same; helps in enabling features which improve performance like mac80211 fast RX path, enabling multiple REO rings for parallel RX processing, 802.11 decapsulation offloading. All these features are dependent on PN offload which in turn is dependent on handling of the received fragments in the driver.
When TKIP security is used, additional handling is required while processing the fragments; since MIC is computed on an MSDU in TKIP, only the last fragment has the MIC info. In this case, driver has to compute the MIC after reassembly and compare it against the MIC present in the frame. For this,
MICHAEL_MICkernel crypto library APIs are used and the dependencies are appropriately set.
Quoted 2 lines
Signed-off-by Manikanta Pubbisetty <[email protected]>Signed-off-by Kalle Valo <[email protected]>
2 patches applied to ath-next branch of ath.git, thanks.
243874c64c81 ath11k: handle RX fragments1441b2f205a7 ath11k: enable PN offload
Signature · 8 lines
https://patchwork.kernel.org/patch/11436249/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH v2 1/2] ath11k: handle RX fragments
In reply to Manikanta PubbisettyQuoted 23 lines · Manikanta Pubbisetty
IPQ8074 HW has support to verify the PN of the received frames. For all frames except for fragmented ones, HW checks the PN and delivers them to the driver. For fragmented frames, driver is required to do a little more; it has to reassemble the fragments and then reinject them to the HW for verifying the PN. Currently, to keep the logic simple, PN verifcation is disabled in HW and is handled in mac80211 for all the frames (fragmented and unfragmented).
On the contrary, offloading PN Validation to the HW brings important benefits. It reduces CPU cycles spent on the host CPU for verifying the same; helps in enabling features which improve performance like mac80211 fast RX path, enabling multiple REO rings for parallel RX processing, 802.11 decapsulation offloading. All these features are dependent on PN offload which in turn is dependent on handling of the received fragments in the driver.
When TKIP security is used, additional handling is required while processing the fragments; since MIC is computed on an MSDU in TKIP, only the last fragment has the MIC info. In this case, driver has to compute the MIC after reassembly and compare it against the MIC present in the frame. For this,
MICHAEL_MICkernel crypto library APIs are used and the dependencies are appropriately set.
Quoted 2 lines
Signed-off-by Manikanta Pubbisetty <[email protected]>Signed-off-by Kalle Valo <[email protected]>
2 patches applied to ath-next branch of ath.git, thanks.
243874c64c81 ath11k: handle RX fragments1441b2f205a7 ath11k: enable PN offload
Signature · 3 lines
https://patchwork.kernel.org/patch/11436249/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches