From: Johannes Berg <johannes@sipsolutions.net>
To: linux-wireless@vger.kernel.org
Cc: Michal Kazior <michal.kazior@tieto.com>
Subject: [RFC 04/20] mac80211: add chanctx tracing
Date: Fri, 27 Jul 2012 13:16:40 +0200 [thread overview]
Message-ID: <1343387816-9414-5-git-send-email-johannes@sipsolutions.net> (raw)
In-Reply-To: <1343387816-9414-1-git-send-email-johannes@sipsolutions.net>
From: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/driver-ops.h | 10 ++++++
net/mac80211/trace.h | 88 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 98 insertions(+)
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index b38f97d..da0fa69 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -870,22 +870,28 @@ static inline void drv_mgd_prepare_tx(struct ieee80211_local *local,
static inline void drv_add_chanctx(struct ieee80211_local *local,
struct ieee80211_chanctx *ctx)
{
+ trace_drv_add_chanctx(local, ctx);
if (local->ops->add_chanctx)
local->ops->add_chanctx(&local->hw, &ctx->conf);
+ trace_drv_return_void(local);
}
static inline void drv_remove_chanctx(struct ieee80211_local *local,
struct ieee80211_chanctx *ctx)
{
+ trace_drv_remove_chanctx(local, ctx);
if (local->ops->remove_chanctx)
local->ops->remove_chanctx(&local->hw, &ctx->conf);
+ trace_drv_return_void(local);
}
static inline void drv_change_chantype(struct ieee80211_local *local,
struct ieee80211_chanctx *ctx)
{
+ trace_drv_change_chantype(local, ctx);
if (local->ops->change_chantype)
local->ops->change_chantype(&local->hw, &ctx->conf);
+ trace_drv_return_void(local);
}
static inline void drv_assign_vif_chanctx(struct ieee80211_local *local,
@@ -894,10 +900,12 @@ static inline void drv_assign_vif_chanctx(struct ieee80211_local *local,
{
check_sdata_in_driver(sdata);
+ trace_drv_assign_vif_chanctx(local, sdata, ctx);
if (local->ops->assign_vif_chanctx)
local->ops->assign_vif_chanctx(&local->hw,
&sdata->vif,
&ctx->conf);
+ trace_drv_return_void(local);
}
static inline void drv_unassign_vif_chanctx(struct ieee80211_local *local,
@@ -906,10 +914,12 @@ static inline void drv_unassign_vif_chanctx(struct ieee80211_local *local,
{
check_sdata_in_driver(sdata);
+ trace_drv_unassign_vif_chanctx(local, sdata, ctx);
if (local->ops->unassign_vif_chanctx)
local->ops->unassign_vif_chanctx(&local->hw,
&sdata->vif,
&ctx->conf);
+ trace_drv_return_void(local);
}
#endif /* __MAC80211_DRIVER_OPS */
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 65e9a2a..a0cd3cb 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -1253,6 +1253,94 @@ DEFINE_EVENT(local_sdata_evt, drv_mgd_prepare_tx,
TP_ARGS(local, sdata)
);
+DECLARE_EVENT_CLASS(local_chanctx,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_chanctx *ctx),
+
+ TP_ARGS(local, ctx),
+
+ TP_STRUCT__entry(
+ LOCAL_ENTRY
+ __field(void *, ctx)
+ __field(int, freq)
+ __field(int, chantype)
+ ),
+
+ TP_fast_assign(
+ LOCAL_ASSIGN;
+ __entry->ctx = ctx;
+ __entry->freq = ctx->conf.channel->center_freq;
+ __entry->chantype = ctx->conf.channel_type;
+ ),
+
+ TP_printk(
+ LOCAL_PR_FMT " ctx:%p freq:%dMhz chantype:%d",
+ LOCAL_PR_ARG, __entry->ctx, __entry->freq, __entry->chantype
+ )
+);
+
+DEFINE_EVENT(local_chanctx, drv_add_chanctx,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_chanctx *ctx),
+ TP_ARGS(local, ctx)
+);
+
+DEFINE_EVENT(local_chanctx, drv_remove_chanctx,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_chanctx *ctx),
+ TP_ARGS(local, ctx)
+);
+
+DEFINE_EVENT(local_chanctx, drv_change_chantype,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_chanctx *ctx),
+ TP_ARGS(local, ctx)
+);
+
+DECLARE_EVENT_CLASS(local_sdata_chanctx,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
+ struct ieee80211_chanctx *ctx),
+
+ TP_ARGS(local, sdata, ctx),
+
+ TP_STRUCT__entry(
+ LOCAL_ENTRY
+ VIF_ENTRY
+ __field(void *, ctx)
+ __field(int, freq)
+ __field(int, chantype)
+ ),
+
+ TP_fast_assign(
+ LOCAL_ASSIGN;
+ VIF_ASSIGN;
+ __entry->ctx = ctx;
+ __entry->freq = ctx->conf.channel->center_freq;
+ __entry->chantype = ctx->conf.channel_type;
+ ),
+
+ TP_printk(
+ LOCAL_PR_FMT VIF_PR_FMT " ctx:%p freq:%dMhz chantype:%d",
+ LOCAL_PR_ARG, VIF_PR_ARG,
+ __entry->ctx, __entry->freq, __entry->chantype
+ )
+);
+
+DEFINE_EVENT(local_sdata_chanctx, drv_assign_vif_chanctx,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
+ struct ieee80211_chanctx *ctx),
+ TP_ARGS(local, sdata, ctx)
+);
+
+DEFINE_EVENT(local_sdata_chanctx, drv_unassign_vif_chanctx,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
+ struct ieee80211_chanctx *ctx),
+ TP_ARGS(local, sdata, ctx)
+);
+
/*
* Tracing for API calls that drivers call.
*/
--
1.7.10.4
next prev parent reply other threads:[~2012-07-27 11:17 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-27 11:16 [RFC 00/20] mac80211: multi-channel work Johannes Berg
2012-07-27 11:16 ` [RFC 01/20] mac80211: introduce channel context skeleton code Johannes Berg
2012-07-27 11:16 ` [RFC 02/20] mac80211: introduce new ieee80211_ops Johannes Berg
2012-07-27 11:16 ` [RFC 03/20] mac80211: add drv_* wrappers for channel contexts Johannes Berg
2012-07-27 18:08 ` Joe Perches
2012-07-27 21:03 ` Johannes Berg
2012-07-27 11:16 ` Johannes Berg [this message]
2012-07-27 11:16 ` [RFC 05/20] mac80211: use channel context notifications Johannes Berg
2012-07-27 11:16 ` [RFC 06/20] mac80211: refactor set_channel_type Johannes Berg
2012-07-29 9:03 ` Eliad Peller
2012-07-27 11:16 ` [RFC 07/20] mac80211: reuse channels for channel contexts Johannes Berg
2012-07-27 11:16 ` [RFC 08/20] mac80211: mesh: don't use global channel type Johannes Berg
2012-07-27 11:16 ` [RFC 09/20] mac80211: remove almost unused local variable Johannes Berg
2012-07-27 11:16 ` [RFC 10/20] mac80211: remove freq/chantype from debugfs Johannes Berg
2012-07-27 11:16 ` [RFC 11/20] mac80211: use oper_channel in rate init Johannes Berg
2012-07-27 11:16 ` [RFC 12/20] mac80211: don't assume channel is set in tracing Johannes Berg
2012-07-27 11:16 ` [RFC 13/20] mac80211: use RX status band instead of current band Johannes Berg
2012-07-27 11:16 ` [RFC 14/20] mac80211: check operating channel in scan Johannes Berg
2012-07-27 11:16 ` [RFC 15/20] mac80211: convert ops checks to WARN_ON Johannes Berg
2012-07-27 11:16 ` [RFC 16/20] mac80211: check channel context methods Johannes Berg
2012-07-27 11:16 ` [RFC 17/20] mac80211: track whether to use channel contexts Johannes Berg
2012-07-27 11:16 ` [RFC 18/20] mac80211: allow drv_add_chanctx to fail Johannes Berg
2012-07-27 11:42 ` Michal Kazior
2012-07-27 11:42 ` Johannes Berg
2012-07-27 11:45 ` Michal Kazior
2012-07-27 11:16 ` [RFC 19/20] mac80211: return error code from ieee80211_vif_use_channel Johannes Berg
2012-07-27 11:16 ` [RFC 20/20] mac80211: use channel contexts Johannes Berg
2012-07-27 11:46 ` Michal Kazior
2012-07-27 11:55 ` Johannes Berg
2012-08-06 15:21 ` Arik Nemtsov
2012-08-06 15:26 ` Johannes Berg
2012-07-27 12:31 ` [RFC 00/20] mac80211: multi-channel work Johannes Berg
2012-08-24 9:29 ` Johannes Berg
2012-08-26 7:58 ` Eliad Peller
2012-08-26 8:10 ` Johannes Berg
2012-08-26 8:28 ` Eliad Peller
2012-08-26 8:30 ` Johannes Berg
2012-08-26 8:36 ` Eliad Peller
2012-09-05 14:03 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343387816-9414-5-git-send-email-johannes@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=michal.kazior@tieto.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).