Hi Greg,
On 7/3/24 2:03 오전, Greg Kroah-Hartman wrote:
> 6.1-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Yunseong Kim <yskelg@xxxxxxxxx>
>
> [ Upstream commit bab4923132feb3e439ae45962979c5d9d5c7c1f1 ]
>
> Fixes: 51270d573a8d ("tracing/net_sched: Fix tracepoints that save qdisc_dev() as a string")
> Link: https://lore.kernel.org/lkml/20240229143432.273b4871@xxxxxxxxxxxxxxxxxx/t/
> Cc: netdev@xxxxxxxxxxxxxxx
> Tested-by: Yunseong Kim <yskelg@xxxxxxxxx>
> Signed-off-by: Yunseong Kim <yskelg@xxxxxxxxx>
> Signed-off-by: Yeoreum Yun <yeoreum.yun@xxxxxxx>
> Link: https://lore.kernel.org/r/20240624173320.24945-4-yskelg@xxxxxxxxx
> Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
> include/trace/events/qdisc.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/trace/events/qdisc.h b/include/trace/events/qdisc.h
> index 1f4258308b967..69453b8de29e6 100644
> --- a/include/trace/events/qdisc.h
> +++ b/include/trace/events/qdisc.h
> @@ -81,7 +81,7 @@ TRACE_EVENT(qdisc_reset,
> TP_ARGS(q),
>
> TP_STRUCT__entry(
> - __string( dev, qdisc_dev(q)->name )
> + __string( dev, qdisc_dev(q) ? qdisc_dev(q)->name : "(null)" )
> __string( kind, q->ops->id )
> __field( u32, parent )
> __field( u32, handle )
Since that code changed in 6.10 and the stable is in an intermediate
state, I had to fix some other things as well.
So, I submit another patch. Please check out.
Link:
https://lore.kernel.org/stable/20240702180146.5126-2-yskelg@xxxxxxxxx/T/#u
Warm regards,
Yunseong Kim
