ath10k: add dynamic vlan support

Multicast/broadcast traffic destined for a particular vlan group will
always be encrypted in software. To enable dynamic VLANs, it requires
driver support for sending software encrypted packets.

In ath10k, sending software encrypted frames is allowed only when we insmod
the driver with cryptmode param set to 1, this configuration disables
hardware crypto and enables RAW mode implicitly. Since, enabling raw
mode has performance impact, this cannot be considered as an ideal
solution for supporting VLANs in the driver.

As an alternative take, in this approach, cryptographic keys for
unicast traffic (per peer PTKs) and keys for non-vlan group traffic
will be configured in hardware, allowing hardware encryption for unicast
and non-vlan group traffic. Only vlan group traffic will be encrypted in
software and pushed to the target with encap mode set to RAW in the TX
descriptors.

Not all firmwares can support this type of key configuration(having few
keys installed in hardware and few only in software); for this purpose a
new WMI service flag "WMI_SERVICE_PER_PACKET_SW_ENCRYPT" is introduced to
advertise this support.

Also, adding the logic required to send sw encrypted frames in raw mode.

Hardwares Tested : QCA9984, QCA988X
Firmwares Tested : 10.4-3.5.3-00057, 10.2.4-1.0-00042

Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 360842633d208775d9ad4d63642f19e8a4e2eeb9..2f43600717ec062f02deb71ac767eaa344493883 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -119,6 +119,7 @@ enum ath10k_skb_flags {
        ATH10K_SKB_F_DELIVER_CAB = BIT(2),
        ATH10K_SKB_F_MGMT = BIT(3),
        ATH10K_SKB_F_QOS = BIT(4),
+       ATH10K_SKB_F_RAW_TX = BIT(5),
 };
 
 struct ath10k_skb_cb {

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index bf094f44e9ad6a97395f4332ed555684029b353d..22774e12750708991cfecb417747708a4d0c6250 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3397,6 +3397,7 @@ ath10k_mac_tx_h_get_txmode(struct ath10k *ar,
                           struct sk_buff *skb)
 {
        const struct ieee80211_hdr *hdr = (void *)skb->data;
+       const struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
        __le16 fc = hdr->frame_control;
 
        if (!vif || vif->type == NL80211_IFTYPE_MONITOR)
@@ -3438,7 +3439,8 @@ ath10k_mac_tx_h_get_txmode(struct ath10k *ar,
        if (ieee80211_is_data_present(fc) && sta && sta->tdls)
                return ATH10K_HW_TXRX_ETHERNET;
 
-       if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags))
+       if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags) ||
+           skb_cb->flags & ATH10K_SKB_F_RAW_TX)
                return ATH10K_HW_TXRX_RAW;
 
        return ATH10K_HW_TXRX_NATIVE_WIFI;
@@ -3548,6 +3550,9 @@ static void ath10k_mac_tx_h_fill_cb(struct ath10k *ar,
 {
        struct ieee80211_hdr *hdr = (void *)skb->data;
        struct ath10k_skb_cb *cb = ATH10K_SKB_CB(skb);
+       const struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+       bool is_data = ieee80211_is_data(hdr->frame_control) ||
+                       ieee80211_is_data_qos(hdr->frame_control);
 
        cb->flags = 0;
        if (!ath10k_tx_h_use_hwcrypto(vif, skb))
@@ -3559,6 +3564,16 @@ static void ath10k_mac_tx_h_fill_cb(struct ath10k *ar,
        if (ieee80211_is_data_qos(hdr->frame_control))
                cb->flags |= ATH10K_SKB_F_QOS;
 
+       /* Data frames encrypted in software will be posted to firmware
+        * with tx encap mode set to RAW. Ex: Multicast traffic generated
+        * for a specific VLAN group will always be encrypted in software.
+        */
+       if (is_data && ieee80211_has_protected(hdr->frame_control) &&
+           !info->control.hw_key) {
+               cb->flags |= ATH10K_SKB_F_NO_HWCRYPT;
+               cb->flags |= ATH10K_SKB_F_RAW_TX;
+       }
+
        cb->vif = vif;
        cb->txq = txq;
        cb->airtime_est = airtime;
@@ -3668,6 +3683,7 @@ static int ath10k_mac_tx(struct ath10k *ar,
 {
        struct ieee80211_hw *hw = ar->hw;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+       const struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
        int ret;
 
        /* We should disable CCK RATE due to P2P */
@@ -3685,7 +3701,8 @@ static int ath10k_mac_tx(struct ath10k *ar,
                ath10k_tx_h_8023(skb);
                break;
        case ATH10K_HW_TXRX_RAW:
-               if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) {
+               if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags) &&
+                   !(skb_cb->flags & ATH10K_SKB_F_RAW_TX)) {
                        WARN_ON_ONCE(1);
                        ieee80211_free_txskb(hw, skb);
                        return -ENOTSUPP;
@@ -8802,6 +8819,11 @@ int ath10k_mac_register(struct ath10k *ar)
                goto err_dfs_detector_exit;
        }
 
+       if (test_bit(WMI_SERVICE_PER_PACKET_SW_ENCRYPT, ar->wmi.svc_map)) {
+               ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP_VLAN);
+               ar->hw->wiphy->software_iftypes |= BIT(NL80211_IFTYPE_AP_VLAN);
+       }
+
        if (!ath_is_world_regd(&ar->ath_common.regulatory)) {
                ret = regulatory_hint(ar->hw->wiphy,
                                      ar->ath_common.regulatory.alpha2);

diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 85de53af4817f864d43e7ff05e7f5eba08a43de8..5886b4c1b16bf2f98c86ae589910077104da1cc4 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -209,6 +209,7 @@ enum wmi_service {
        WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT,
        WMI_SERVICE_THERM_THROT,
        WMI_SERVICE_RTT_RESPONDER_ROLE,
+       WMI_SERVICE_PER_PACKET_SW_ENCRYPT,
 
        /* keep last */
        WMI_SERVICE_MAX,
@@ -489,6 +490,7 @@ static inline char *wmi_service_name(int service_id)
        SVCSTR(WMI_SERVICE_TX_DATA_ACK_RSSI);
        SVCSTR(WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT);
        SVCSTR(WMI_SERVICE_RTT_RESPONDER_ROLE);
+       SVCSTR(WMI_SERVICE_PER_PACKET_SW_ENCRYPT);
 
        default:
                return NULL;
@@ -586,6 +588,8 @@ static inline void wmi_10x_svc_map(const __le32 *in, unsigned long *out,
               WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS, len);
        SVCMAP(WMI_10X_SERVICE_BB_TIMING_CONFIG_SUPPORT,
               WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT, len);
+       SVCMAP(WMI_10X_SERVICE_PER_PACKET_SW_ENCRYPT,
+              WMI_SERVICE_PER_PACKET_SW_ENCRYPT, len);
 }
 
 static inline void wmi_main_svc_map(const __le32 *in, unsigned long *out,
@@ -808,6 +812,8 @@ static inline void wmi_10_4_svc_map(const __le32 *in, unsigned long *out,
               WMI_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT, len);
        SVCMAP(WMI_10_4_SERVICE_RTT_RESPONDER_ROLE,
               WMI_SERVICE_RTT_RESPONDER_ROLE, len);
+       SVCMAP(WMI_10_4_SERVICE_PER_PACKET_SW_ENCRYPT,
+              WMI_SERVICE_PER_PACKET_SW_ENCRYPT, len);
 }
 
 #undef SVCMAP