cfg80211: trace more information in assoc trace event

Add more information to the assoc trace event so we can see
more precisely what's going on and what options were used.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210618133832.86c58fca486d.Iabd8f036d2ef1d770fd20ed3ccd149f32154f430@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
index 8b1358d..b1d37f5 100644 (file)
--- a/net/wireless/rdev-ops.h
+++ b/net/wireless/rdev-ops.h
@@ -464,8 +464,18 @@ static inline int rdev_assoc(struct cfg80211_registered_device *rdev,
                             struct net_device *dev,
                             struct cfg80211_assoc_request *req)
 {
+       const struct cfg80211_bss_ies *bss_ies;
        int ret;
-       trace_rdev_assoc(&rdev->wiphy, dev, req);
+
+       /*
+        * Note: we might trace not exactly the data that's processed,
+        * due to races and the driver/mac80211 getting a newer copy.
+        */
+       rcu_read_lock();
+       bss_ies = rcu_dereference(req->bss->ies);
+       trace_rdev_assoc(&rdev->wiphy, dev, req, bss_ies);
+       rcu_read_unlock();
+
        ret = rdev->ops->assoc(&rdev->wiphy, dev, req);
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;

diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index 76b777d..440bce5 100644 (file)
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -1195,8 +1195,9 @@ TRACE_EVENT(rdev_auth,
 
 TRACE_EVENT(rdev_assoc,
        TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
-                struct cfg80211_assoc_request *req),
-       TP_ARGS(wiphy, netdev, req),
+                struct cfg80211_assoc_request *req,
+                const struct cfg80211_bss_ies *bss_ies),
+       TP_ARGS(wiphy, netdev, req, bss_ies),
        TP_STRUCT__entry(
                WIPHY_ENTRY
                NETDEV_ENTRY
@@ -1204,6 +1205,17 @@ TRACE_EVENT(rdev_assoc,
                MAC_ENTRY(prev_bssid)
                __field(bool, use_mfp)
                __field(u32, flags)
+               __dynamic_array(u8, bss_elements, bss_ies->len)
+               __field(bool, bss_elements_bcon)
+               __field(u64, bss_elements_tsf)
+               __dynamic_array(u8, elements, req->ie_len)
+               __array(u8, ht_capa, sizeof(struct ieee80211_ht_cap))
+               __array(u8, ht_capa_mask, sizeof(struct ieee80211_ht_cap))
+               __array(u8, vht_capa, sizeof(struct ieee80211_vht_cap))
+               __array(u8, vht_capa_mask, sizeof(struct ieee80211_vht_cap))
+               __dynamic_array(u8, fils_kek, req->fils_kek_len)
+               __dynamic_array(u8, fils_nonces,
+                               req->fils_nonces ? 2 * FILS_NONCE_LEN : 0)
        ),
        TP_fast_assign(
                WIPHY_ASSIGN;
@@ -1215,6 +1227,26 @@ TRACE_EVENT(rdev_assoc,
                MAC_ASSIGN(prev_bssid, req->prev_bssid);
                __entry->use_mfp = req->use_mfp;
                __entry->flags = req->flags;
+               if (bss_ies->len)
+                       memcpy(__get_dynamic_array(bss_elements),
+                              bss_ies->data, bss_ies->len);
+               __entry->bss_elements_bcon = bss_ies->from_beacon;
+               __entry->bss_elements_tsf = bss_ies->tsf;
+               if (req->ie)
+                       memcpy(__get_dynamic_array(elements),
+                              req->ie, req->ie_len);
+               memcpy(__entry->ht_capa, &req->ht_capa, sizeof(req->ht_capa));
+               memcpy(__entry->ht_capa_mask, &req->ht_capa_mask,
+                      sizeof(req->ht_capa_mask));
+               memcpy(__entry->vht_capa, &req->vht_capa, sizeof(req->vht_capa));
+               memcpy(__entry->vht_capa_mask, &req->vht_capa_mask,
+                      sizeof(req->vht_capa_mask));
+               if (req->fils_kek)
+                       memcpy(__get_dynamic_array(fils_kek),
+                              req->fils_kek, req->fils_kek_len);
+               if (req->fils_nonces)
+                       memcpy(__get_dynamic_array(fils_nonces),
+                              req->fils_nonces, 2 * FILS_NONCE_LEN);
        ),
        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", bssid: " MAC_PR_FMT
                  ", previous bssid: " MAC_PR_FMT ", use mfp: %s, flags: %u",