Alexander Wetzel <alexander@xxxxxxxxxxxxxx> writes: > <resend to all, sorry for duplicates > > > On 29.09.22 16:23, Toke Høiland-Jørgensen wrote: > > [...] >>> diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h >>> index 9f4377566c42..cde169038429 100644 >>> --- a/net/mac80211/trace.h >>> +++ b/net/mac80211/trace.h >>> @@ -2301,37 +2301,6 @@ TRACE_EVENT(drv_tdls_recv_channel_switch, >>> ) >>> ); >>> >>> -TRACE_EVENT(drv_wake_tx_queue, >>> - TP_PROTO(struct ieee80211_local *local, >>> - struct ieee80211_sub_if_data *sdata, >>> - struct txq_info *txq), >>> - >>> - TP_ARGS(local, sdata, txq), >>> - >>> - TP_STRUCT__entry( >>> - LOCAL_ENTRY >>> - VIF_ENTRY >>> - STA_ENTRY >>> - __field(u8, ac) >>> - __field(u8, tid) >>> - ), >>> - >>> - TP_fast_assign( >>> - struct ieee80211_sta *sta = txq->txq.sta; >>> - >>> - LOCAL_ASSIGN; >>> - VIF_ASSIGN; >>> - STA_ASSIGN; >>> - __entry->ac = txq->txq.ac; >>> - __entry->tid = txq->txq.tid; >>> - ), >>> - >>> - TP_printk( >>> - LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " ac:%d tid:%d", >>> - LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->ac, __entry->tid >>> - ) >>> -); >>> - >>> TRACE_EVENT(drv_get_ftm_responder_stats, >>> TP_PROTO(struct ieee80211_local *local, >>> struct ieee80211_sub_if_data *sdata, >>> @@ -3026,6 +2995,37 @@ TRACE_EVENT(stop_queue, >>> ) >>> ); >>> >>> +TRACE_EVENT(wake_tx_queue, >> >> I know tracepoints are technically not considered API, but that doesn't >> mean we *have* to break them if there's no reason to. And since the >> actual contents is the same, how about keeping the old name as an alias >> for this? >> > > I don't understand what we would gain by an alias. > For me it looks like an alias would just be confusing and never be used... > > Or why would anyone want to make additional calls to > trace[_drv]_wake_tx_queue() on top what we have in the patch? > > I initially also considered to simply keep trace_drv_wake_tx_queue(). > (But that looked to be misleading.) If there is some reason to keep the > old name I would just switch back to trace_drv_wake_tx_queue(). Well, the tracepoint is something that is read from userspace by programs that want to trace the stack. The current one lives in /sys/kernel/tracing/events/mac80211/drv_wake_tx_queue/ So if you rename it, any debug/tracing tooling that uses this will have to be updated to use the new name. Which is not an ABI problem per se (we exempt tracepoints from that), but it's also annoying if anyone *is* actually using that tracepoint, so no reason to break things unless there's really a compelling reason to... I also thought the tracing subsystem had an alias mechanism built-in to handle this sort of thing, but I think I may be misremembering this part. > But when we are discussing that code anyhow, there is another related issue: > I was not sure if it's ok to keep the renamed wake_tx_queue trace call > in the old position. (In the section otherwise only having driver > calls.) Having a better structured file did seem more desirable than a > shorter patch, so I moved it. I think I would lean towards just keeping it in the old position with the old name for the reasons outlined above... This is not an incredibly strong opinion, though, so if anyone has stronger opinions in the other direction I can probably be convinced ;) -Toke
