| From 71be2e718dc884fb35433338dc21d6547b237819 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 16/61] 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 |
| |
| Change-Id: I24ebcc3181c05476b41107ce8fe7f3d4c8907e81 |
| --- |
| include/net/mac80211.h | 1 + |
| net/mac80211/rx.c | 6 +++++- |
| net/mac80211/trace.h | 22 ++++++++++++++++++++++ |
| 3 files changed, 28 insertions(+), 1 deletion(-) |
| |
| diff --git a/include/net/mac80211.h b/include/net/mac80211.h |
| index 01cfcc0..965a026 100644 |
| --- a/include/net/mac80211.h |
| +++ b/include/net/mac80211.h |
| @@ -762,6 +762,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 89a1199..65982a6 100644 |
| --- a/net/mac80211/rx.c |
| +++ b/net/mac80211/rx.c |
| @@ -3395,9 +3395,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); |
| } |
| } |
| |
| diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h |
| index 8e758b5..9ec45ce 100644 |
| --- a/net/mac80211/trace.h |
| +++ b/net/mac80211/trace.h |
| @@ -3145,6 +3145,28 @@ TRACE_EVENT(drv_neg_ttlm_res, |
| LOCAL_PR_ARG, VIF_PR_ARG, __entry->res |
| ) |
| ); |
| + |
| +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.39.2 |
| |