Skip to content

Commit

Permalink
mac80211: clean up debugging
Browse files Browse the repository at this point in the history 
There are a few things that make the logging and
debugging in mac80211 less useful than it should
be right now:
 * a lot of messages should be pr_info, not pr_debug
 * wholesale use of pr_debug makes it require *both*
   Kconfig and dynamic configuration
 * there are still a lot of ifdefs
 * the style is very inconsistent, sometimes the
   sdata->name is printed in front

Clean up everything, introducing new macros and
separating out the station MLME debugging into
a new Kconfig symbol.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Jun 24, 2012
1 parent d3b2fb5 commit bdcbd8e
Show file tree
Hide file tree
Showing 23 changed files with 519 additions and 453 deletions.
24 changes: 0 additions & 24 deletions include/net/mac80211.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3842,28 +3842,4 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_vif *vif,
*/
int ieee80211_ave_rssi(struct ieee80211_vif *vif);

/* Extra debugging macros */

#ifdef CONFIG_MAC80211_HT_DEBUG
#define ht_vdbg(fmt, ...) \
pr_debug(fmt, ##__VA_ARGS__)
#else
#define ht_vdbg(fmt, ...) \
do { \
if (0) \
pr_debug(fmt, ##__VA_ARGS__); \
} while (0)
#endif

#ifdef CONFIG_MAC80211_IBSS_DEBUG
#define ibss_vdbg(fmt, ...) \
pr_debug(fmt, ##__VA_ARGS__)
#else
#define ibss_vdbg(fmt, ...) \
do { \
if (0) \
pr_debug(fmt, ##__VA_ARGS__); \
} while (0)
#endif

#endif /* MAC80211_H */
32 changes: 26 additions & 6 deletions net/mac80211/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,26 @@ config MAC80211_VERBOSE_DEBUG

Do not select this option.

config MAC80211_MLME_DEBUG
bool "Verbose managed MLME output"
depends on MAC80211_DEBUG_MENU
---help---
Selecting this option causes mac80211 to print out
debugging messages for the managed-mode MLME. It
should not be selected on production systems as some
of the messages are remotely triggerable.

Do not select this option.

config MAC80211_STA_DEBUG
bool "Verbose station debugging"
depends on MAC80211_DEBUG_MENU
---help---
Selecting this option causes mac80211 to print out
debugging messages for station addition/removal.

Do not select this option.

config MAC80211_HT_DEBUG
bool "Verbose HT debugging"
depends on MAC80211_DEBUG_MENU
Expand All @@ -163,7 +183,7 @@ config MAC80211_IBSS_DEBUG

Do not select this option.

config MAC80211_VERBOSE_PS_DEBUG
config MAC80211_PS_DEBUG
bool "Verbose powersave mode debugging"
depends on MAC80211_DEBUG_MENU
---help---
Expand All @@ -175,7 +195,7 @@ config MAC80211_VERBOSE_PS_DEBUG

Do not select this option.

config MAC80211_VERBOSE_MPL_DEBUG
config MAC80211_MPL_DEBUG
bool "Verbose mesh peer link debugging"
depends on MAC80211_DEBUG_MENU
depends on MAC80211_MESH
Expand All @@ -188,7 +208,7 @@ config MAC80211_VERBOSE_MPL_DEBUG

Do not select this option.

config MAC80211_VERBOSE_MPATH_DEBUG
config MAC80211_MPATH_DEBUG
bool "Verbose mesh path debugging"
depends on MAC80211_DEBUG_MENU
depends on MAC80211_MESH
Expand All @@ -201,7 +221,7 @@ config MAC80211_VERBOSE_MPATH_DEBUG

Do not select this option.

config MAC80211_VERBOSE_MHWMP_DEBUG
config MAC80211_MHWMP_DEBUG
bool "Verbose mesh HWMP routing debugging"
depends on MAC80211_DEBUG_MENU
depends on MAC80211_MESH
Expand All @@ -214,7 +234,7 @@ config MAC80211_VERBOSE_MHWMP_DEBUG

Do not select this option.

config MAC80211_VERBOSE_MESH_SYNC_DEBUG
config MAC80211_MESH_SYNC_DEBUG
bool "Verbose mesh mesh synchronization debugging"
depends on MAC80211_DEBUG_MENU
depends on MAC80211_MESH
Expand All @@ -225,7 +245,7 @@ config MAC80211_VERBOSE_MESH_SYNC_DEBUG

Do not select this option.

config MAC80211_VERBOSE_TDLS_DEBUG
config MAC80211_TDLS_DEBUG
bool "Verbose TDLS debugging"
depends on MAC80211_DEBUG_MENU
---help---
Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ mac80211-$(CONFIG_MAC80211_RC_PID) += $(rc80211_pid-y)
mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y)
mac80211-$(CONFIG_MAC80211_RC_MINSTREL_HT) += $(rc80211_minstrel_ht-y)

ccflags-y += -D__CHECK_ENDIAN__
ccflags-y += -D__CHECK_ENDIAN__ -DDEBUG
34 changes: 17 additions & 17 deletions net/mac80211/agg-rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,17 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,

RCU_INIT_POINTER(sta->ampdu_mlme.tid_rx[tid], NULL);

ht_vdbg("Rx BA session stop requested for %pM tid %u %s reason: %d\n",
sta->sta.addr, tid,
initiator == WLAN_BACK_RECIPIENT ? "recipient" : "inititator",
(int)reason);
ht_dbg(sta->sdata,
"Rx BA session stop requested for %pM tid %u %s reason: %d\n",
sta->sta.addr, tid,
initiator == WLAN_BACK_RECIPIENT ? "recipient" : "inititator",
(int)reason);

if (drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_STOP,
&sta->sta, tid, NULL, 0))
pr_debug("HW problem - can not stop rx aggregation for tid %d\n",
tid);
sdata_info(sta->sdata,
"HW problem - can not stop rx aggregation for tid %d\n",
tid);

/* check if this is a self generated aggregation halt */
if (initiator == WLAN_BACK_RECIPIENT && tx)
Expand Down Expand Up @@ -157,7 +159,7 @@ static void sta_rx_agg_session_timer_expired(unsigned long data)
}
rcu_read_unlock();

ht_vdbg("rx session timer expired on tid %d\n", (u16)*ptid);
ht_dbg(sta->sdata, "rx session timer expired on tid %d\n", (u16)*ptid);

set_bit(*ptid, sta->ampdu_mlme.tid_rx_timer_expired);
ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work);
Expand Down Expand Up @@ -245,7 +247,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
status = WLAN_STATUS_REQUEST_DECLINED;

if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
ht_vdbg("Suspend in progress - Denying ADDBA request\n");
ht_dbg(sta->sdata, "Suspend in progress - Denying ADDBA request\n");
goto end_no_lock;
}

Expand All @@ -257,10 +259,9 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
(!(sta->sta.ht_cap.cap & IEEE80211_HT_CAP_DELAY_BA))) ||
(buf_size > IEEE80211_MAX_AMPDU_BUF)) {
status = WLAN_STATUS_INVALID_QOS_PARAM;
#ifdef CONFIG_MAC80211_HT_DEBUG
net_dbg_ratelimited("AddBA Req with bad params from %pM on tid %u. policy %d, buffer size %d\n",
mgmt->sa, tid, ba_policy, buf_size);
#endif /* CONFIG_MAC80211_HT_DEBUG */
ht_dbg_ratelimited(sta->sdata,
"AddBA Req with bad params from %pM on tid %u. policy %d, buffer size %d\n",
mgmt->sa, tid, ba_policy, buf_size);
goto end_no_lock;
}
/* determine default buffer size */
Expand All @@ -275,10 +276,9 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
mutex_lock(&sta->ampdu_mlme.mtx);

if (sta->ampdu_mlme.tid_rx[tid]) {
#ifdef CONFIG_MAC80211_HT_DEBUG
net_dbg_ratelimited("unexpected AddBA Req from %pM on tid %u\n",
mgmt->sa, tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */
ht_dbg_ratelimited(sta->sdata,
"unexpected AddBA Req from %pM on tid %u\n",
mgmt->sa, tid);

/* delete existing Rx BA session on the same tid */
___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
Expand Down Expand Up @@ -317,7 +317,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,

ret = drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_START,
&sta->sta, tid, &start_seq_num, 0);
ht_vdbg("Rx A-MPDU request on tid %d result %d\n", tid, ret);
ht_dbg(sta->sdata, "Rx A-MPDU request on tid %d result %d\n", tid, ret);
if (ret) {
kfree(tid_agg_rx->reorder_buf);
kfree(tid_agg_rx->reorder_time);
Expand Down
Loading

0 comments on commit bdcbd8e

Please sign in to comment.