blob: 89bb49e7dbb69921d9016b9c431be4b42d1b71f5 [file] [log] [blame]
From c4919b0d1dd5c92c081852be3ef37511f0406475 Mon Sep 17 00:00:00 2001
From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
Date: Mon, 13 Mar 2023 05:23:37 +0800
Subject: [PATCH 11/37] mtk: mac80211: track obss color bitmap
Track OBSS BSS color when receive their beacon.
Adding 2 tracepoint for debug, usage:
echo 1 > /sys/kernel/debug/tracing/events/mac80211/bss_color_bitmap/enable
echo 1 > /sys/kernel/debug/tracing/events/mac80211/bss_color_collision/enable
---
include/net/mac80211.h | 1 +
net/mac80211/rx.c | 6 +++++-
net/mac80211/trace.h | 21 +++++++++++++++++++++
3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 65ba482..1a13d47 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -744,6 +744,7 @@ struct ieee80211_bss_conf {
} he_oper;
struct ieee80211_he_obss_pd he_obss_pd;
struct cfg80211_he_bss_color he_bss_color;
+ u64 used_color_bitmap;
struct ieee80211_fils_discovery fils_discovery;
u32 unsol_bcast_probe_resp_interval;
struct cfg80211_bitrate_mask beacon_tx_rate;
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index c23b74a..2df16de 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3355,9 +3355,13 @@ ieee80211_rx_check_bss_color_collision(struct ieee80211_rx_data *rx)
color = le32_get_bits(he_oper->he_oper_params,
IEEE80211_HE_OPERATION_BSS_COLOR_MASK);
+
+ bss_conf->used_color_bitmap |= BIT_ULL(color);
+
+ // trace_bss_color_bitmap(color, bss_conf->used_color_bitmap);
if (color == bss_conf->he_bss_color.color)
ieee80211_obss_color_collision_notify(&rx->sdata->vif,
- BIT_ULL(color),
+ bss_conf->used_color_bitmap,
GFP_ATOMIC);
}
}
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index b8c53b4..814aed6 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -3060,6 +3060,27 @@ TRACE_EVENT(stop_queue,
)
);
+TRACE_EVENT(bss_color_bitmap,
+ TP_PROTO(u8 color,
+ u64 color_bitmap),
+
+ TP_ARGS(color, color_bitmap),
+
+ TP_STRUCT__entry(
+ __field(u8, color)
+ __field(u64, color_bitmap)
+ ),
+
+ TP_fast_assign(
+ __entry->color = color;
+ __entry->color_bitmap = color_bitmap;
+ ),
+
+ TP_printk(
+ "color=%u color_bitmap=0x%llx", __entry->color, __entry->color_bitmap
+ )
+);
+
#endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */
#undef TRACE_INCLUDE_PATH
--
2.18.0