Skip to content

Commit

Permalink
wifi: cfg80211: drop BSS elements from assoc trace for now
Browse files Browse the repository at this point in the history
For multi-link operation, this cannot work as the req->bss pointer
will be NULL, and we'll need to do more work on this to really add
tracing for the MLO case here. Drop the BSS elements for now as
they're not the most useful thing, and it's hard to size things
correctly for the MLO case (without adding a lot of code that's
also executed when tracing isn't enabled.)

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Jul 15, 2022
1 parent 23cc6d8 commit 1d4c0f0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
11 changes: 1 addition & 10 deletions net/wireless/rdev-ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -469,18 +469,9 @@ 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;

/*
* 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();

trace_rdev_assoc(&rdev->wiphy, dev, req);
ret = rdev->ops->assoc(&rdev->wiphy, dev, req);
trace_rdev_return_int(&rdev->wiphy, ret);
return ret;
Expand Down
13 changes: 2 additions & 11 deletions net/wireless/trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -1232,19 +1232,15 @@ TRACE_EVENT(rdev_auth,

TRACE_EVENT(rdev_assoc,
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
struct cfg80211_assoc_request *req,
const struct cfg80211_bss_ies *bss_ies),
TP_ARGS(wiphy, netdev, req, bss_ies),
struct cfg80211_assoc_request *req),
TP_ARGS(wiphy, netdev, req),
TP_STRUCT__entry(
WIPHY_ENTRY
NETDEV_ENTRY
MAC_ENTRY(bssid)
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))
Expand All @@ -1264,11 +1260,6 @@ 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);
Expand Down

0 comments on commit 1d4c0f0

Please sign in to comment.