Skip to content

Commit

Permalink
mac80211: driver operation debugging
Browse files Browse the repository at this point in the history 
This makes mac80211 use the event tracing framework
to log all operations as given to the driver. This
will need to be extended with more information, but
as a start it should be good.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Jul 24, 2009
1 parent 99783e2 commit 0a2b8bb
Show file tree
Hide file tree
Showing 5 changed files with 732 additions and 22 deletions.
12 changes: 12 additions & 0 deletions net/mac80211/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,3 +206,15 @@ config MAC80211_DEBUG_COUNTERS
and show them in debugfs.

If unsure, say N.

config MAC80211_DRIVER_API_TRACER
bool "Driver API tracer"
depends on MAC80211_DEBUG_MENU
depends on EVENT_TRACING
help
Say Y here to make mac80211 register with the ftrace
framework for the driver API -- you can see which
driver methods it is calling then by looking at the
trace.

If unsure, say N.
3 changes: 3 additions & 0 deletions net/mac80211/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ mac80211-$(CONFIG_MAC80211_MESH) += \

mac80211-$(CONFIG_PM) += pm.o

mac80211-$(CONFIG_MAC80211_DRIVER_API_TRACER) += driver-trace.o
CFLAGS_driver-trace.o := -I$(src)

# objects for PID algorithm
rc80211_pid-y := rc80211_pid_algo.o
rc80211_pid-$(CONFIG_MAC80211_DEBUGFS) += rc80211_pid_debugfs.o
Expand Down
85 changes: 63 additions & 22 deletions net/mac80211/driver-ops.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <net/mac80211.h>
#include "ieee80211_i.h"
#include "driver-trace.h"

static inline int drv_tx(struct ieee80211_local *local, struct sk_buff *skb)
{
Expand All @@ -11,29 +12,37 @@ static inline int drv_tx(struct ieee80211_local *local, struct sk_buff *skb)

static inline int drv_start(struct ieee80211_local *local)
{
return local->ops->start(&local->hw);
int ret = local->ops->start(&local->hw);
trace_drv_start(local, ret);
return ret;
}

static inline void drv_stop(struct ieee80211_local *local)
{
local->ops->stop(&local->hw);
trace_drv_stop(local);
}

static inline int drv_add_interface(struct ieee80211_local *local,
struct ieee80211_if_init_conf *conf)
{
return local->ops->add_interface(&local->hw, conf);
int ret = local->ops->add_interface(&local->hw, conf);
trace_drv_add_interface(local, conf->mac_addr, conf->vif, ret);
return ret;
}

static inline void drv_remove_interface(struct ieee80211_local *local,
struct ieee80211_if_init_conf *conf)
{
local->ops->remove_interface(&local->hw, conf);
trace_drv_remove_interface(local, conf->mac_addr, conf->vif);
}

static inline int drv_config(struct ieee80211_local *local, u32 changed)
{
return local->ops->config(&local->hw, changed);
int ret = local->ops->config(&local->hw, changed);
trace_drv_config(local, changed, ret);
return ret;
}

static inline void drv_bss_info_changed(struct ieee80211_local *local,
Expand All @@ -43,6 +52,7 @@ static inline void drv_bss_info_changed(struct ieee80211_local *local,
{
if (local->ops->bss_info_changed)
local->ops->bss_info_changed(&local->hw, vif, info, changed);
trace_drv_bss_info_changed(local, vif, info, changed);
}

static inline void drv_configure_filter(struct ieee80211_local *local,
Expand All @@ -53,22 +63,28 @@ static inline void drv_configure_filter(struct ieee80211_local *local,
{
local->ops->configure_filter(&local->hw, changed_flags, total_flags,
mc_count, mc_list);
trace_drv_configure_filter(local, changed_flags, total_flags,
mc_count);
}

static inline int drv_set_tim(struct ieee80211_local *local,
struct ieee80211_sta *sta, bool set)
{
int ret = 0;
if (local->ops->set_tim)
return local->ops->set_tim(&local->hw, sta, set);
return 0;
ret = local->ops->set_tim(&local->hw, sta, set);
trace_drv_set_tim(local, sta, set, ret);
return ret;
}

static inline int drv_set_key(struct ieee80211_local *local,
enum set_key_cmd cmd, struct ieee80211_vif *vif,
struct ieee80211_sta *sta,
struct ieee80211_key_conf *key)
{
return local->ops->set_key(&local->hw, cmd, vif, sta, key);
int ret = local->ops->set_key(&local->hw, cmd, vif, sta, key);
trace_drv_set_key(local, cmd, vif, sta, key, ret);
return ret;
}

static inline void drv_update_tkip_key(struct ieee80211_local *local,
Expand All @@ -79,47 +95,59 @@ static inline void drv_update_tkip_key(struct ieee80211_local *local,
if (local->ops->update_tkip_key)
local->ops->update_tkip_key(&local->hw, conf, address,
iv32, phase1key);
trace_drv_update_tkip_key(local, conf, address, iv32);
}

static inline int drv_hw_scan(struct ieee80211_local *local,
struct cfg80211_scan_request *req)
{
return local->ops->hw_scan(&local->hw, req);
int ret = local->ops->hw_scan(&local->hw, req);
trace_drv_hw_scan(local, req, ret);
return ret;
}

static inline void drv_sw_scan_start(struct ieee80211_local *local)
{
if (local->ops->sw_scan_start)
local->ops->sw_scan_start(&local->hw);
trace_drv_sw_scan_start(local);
}

static inline void drv_sw_scan_complete(struct ieee80211_local *local)
{
if (local->ops->sw_scan_complete)
local->ops->sw_scan_complete(&local->hw);
trace_drv_sw_scan_complete(local);
}

static inline int drv_get_stats(struct ieee80211_local *local,
struct ieee80211_low_level_stats *stats)
{
if (!local->ops->get_stats)
return -EOPNOTSUPP;
return local->ops->get_stats(&local->hw, stats);
int ret = -EOPNOTSUPP;

if (local->ops->get_stats)
ret = local->ops->get_stats(&local->hw, stats);
trace_drv_get_stats(local, stats, ret);

return ret;
}

static inline void drv_get_tkip_seq(struct ieee80211_local *local,
u8 hw_key_idx, u32 *iv32, u16 *iv16)
{
if (local->ops->get_tkip_seq)
local->ops->get_tkip_seq(&local->hw, hw_key_idx, iv32, iv16);
trace_drv_get_tkip_seq(local, hw_key_idx, iv32, iv16);
}

static inline int drv_set_rts_threshold(struct ieee80211_local *local,
u32 value)
{
int ret = 0;
if (local->ops->set_rts_threshold)
return local->ops->set_rts_threshold(&local->hw, value);
return 0;
ret = local->ops->set_rts_threshold(&local->hw, value);
trace_drv_set_rts_threshold(local, value, ret);
return ret;
}

static inline void drv_sta_notify(struct ieee80211_local *local,
Expand All @@ -129,57 +157,70 @@ static inline void drv_sta_notify(struct ieee80211_local *local,
{
if (local->ops->sta_notify)
local->ops->sta_notify(&local->hw, vif, cmd, sta);
trace_drv_sta_notify(local, vif, cmd, sta);
}

static inline int drv_conf_tx(struct ieee80211_local *local, u16 queue,
const struct ieee80211_tx_queue_params *params)
{
int ret = -EOPNOTSUPP;
if (local->ops->conf_tx)
return local->ops->conf_tx(&local->hw, queue, params);
return -EOPNOTSUPP;
ret = local->ops->conf_tx(&local->hw, queue, params);
trace_drv_conf_tx(local, queue, params, ret);
return ret;
}

static inline int drv_get_tx_stats(struct ieee80211_local *local,
struct ieee80211_tx_queue_stats *stats)
{
return local->ops->get_tx_stats(&local->hw, stats);
int ret = local->ops->get_tx_stats(&local->hw, stats);
trace_drv_get_tx_stats(local, stats, ret);
return ret;
}

static inline u64 drv_get_tsf(struct ieee80211_local *local)
{
u64 ret = -1ULL;
if (local->ops->get_tsf)
return local->ops->get_tsf(&local->hw);
return -1ULL;
ret = local->ops->get_tsf(&local->hw);
trace_drv_get_tsf(local, ret);
return ret;
}

static inline void drv_set_tsf(struct ieee80211_local *local, u64 tsf)
{
if (local->ops->set_tsf)
local->ops->set_tsf(&local->hw, tsf);
trace_drv_set_tsf(local, tsf);
}

static inline void drv_reset_tsf(struct ieee80211_local *local)
{
if (local->ops->reset_tsf)
local->ops->reset_tsf(&local->hw);
trace_drv_reset_tsf(local);
}

static inline int drv_tx_last_beacon(struct ieee80211_local *local)
{
int ret = 1;
if (local->ops->tx_last_beacon)
return local->ops->tx_last_beacon(&local->hw);
return 1;
ret = local->ops->tx_last_beacon(&local->hw);
trace_drv_tx_last_beacon(local, ret);
return ret;
}

static inline int drv_ampdu_action(struct ieee80211_local *local,
enum ieee80211_ampdu_mlme_action action,
struct ieee80211_sta *sta, u16 tid,
u16 *ssn)
{
int ret = -EOPNOTSUPP;
if (local->ops->ampdu_action)
return local->ops->ampdu_action(&local->hw, action,
sta, tid, ssn);
return -EOPNOTSUPP;
ret = local->ops->ampdu_action(&local->hw, action,
sta, tid, ssn);
trace_drv_ampdu_action(local, action, sta, tid, ssn, ret);
return ret;
}


Expand Down
6 changes: 6 additions & 0 deletions net/mac80211/driver-trace.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/* bug in tracepoint.h, it should include this */
#include <linux/module.h>

#include "driver-ops.h"
#define CREATE_TRACE_POINTS
#include "driver-trace.h"
Loading

0 comments on commit 0a2b8bb

Please sign in to comment.