Skip to content

Instantly share code, notes, and snippets.

@larsks

larsks/0001-Trace-netdev_hold-and-netdev_put.patch Secret

Last active May 4, 2024 22:15
Show Gist options
  • Save larsks/b658c0bd766648b16c31c8ed0fc1dc1f to your computer and use it in GitHub Desktop.
Save larsks/b658c0bd766648b16c31c8ed0fc1dc1f to your computer and use it in GitHub Desktop.
Download ZIP
Raw
0001-Trace-netdev_hold-and-netdev_put.patch
From 49811c9b16cb2495d7f6f16066288ca982936168 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@oddbit.com>
Date: Fri, 3 May 2024 19:44:34 -0400
Subject: [PATCH] Trace netdev_hold and netdev_put
---
include/linux/netdevice.h | 3 +++
include/trace/events/netdev.h | 28 ++++++++++++++++++++++++++++
net/core/net-traces.c | 1 +
3 files changed, 32 insertions(+)
create mode 100644 include/trace/events/netdev.h
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index cb37817d638..c05525ae51e 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -52,6 +52,7 @@
#include <net/net_trackers.h>
#include <net/net_debug.h>
#include <net/dropreason-core.h>
+#include <trace/events/netdev.h>
struct netpoll_info;
struct device;
@@ -4089,6 +4090,7 @@ static inline void netdev_hold(struct net_device *dev,
netdevice_tracker *tracker, gfp_t gfp)
{
if (dev) {
+ trace_netdev_hold(dev);
__dev_hold(dev);
__netdev_tracker_alloc(dev, tracker, gfp);
}
@@ -4098,6 +4100,7 @@ static inline void netdev_put(struct net_device *dev,
netdevice_tracker *tracker)
{
if (dev) {
+ trace_netdev_put(dev);
netdev_tracker_free(dev, tracker);
__dev_put(dev);
}
diff --git a/include/trace/events/netdev.h b/include/trace/events/netdev.h
new file mode 100644
index 00000000000..320c262bdb9
--- /dev/null
+++ b/include/trace/events/netdev.h
@@ -0,0 +1,28 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM netdev
+
+#if !defined(_TRACE_NETDEV_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_NETDEV_H
+
+#include <linux/netdevice.h>
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(netdev_put,
+ TP_PROTO(struct net_device *dev),
+ TP_ARGS(dev),
+ TP_STRUCT__entry(__string(name, dev->name)),
+ TP_fast_assign(__assign_str(name, dev->name)),
+ TP_printk("dev=%s", __get_str(name))
+);
+
+TRACE_EVENT(netdev_hold,
+ TP_PROTO(struct net_device *dev), TP_ARGS(dev),
+ TP_STRUCT__entry(__string(name, dev->name)),
+ TP_fast_assign(__assign_str(name, dev->name)),
+ TP_printk("dev=%s", __get_str(name))
+);
+
+#endif // _TRACE_NETDEV_H
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/net/core/net-traces.c b/net/core/net-traces.c
index 6aef976bc1d..493f2ffa3ce 100644
--- a/net/core/net-traces.c
+++ b/net/core/net-traces.c
@@ -29,6 +29,7 @@
#define CREATE_TRACE_POINTS
#include <trace/events/skb.h>
#include <trace/events/net.h>
+#include <trace/events/netdev.h>
#include <trace/events/napi.h>
#include <trace/events/sock.h>
#include <trace/events/udp.h>
--
2.44.0
Raw
trace1-inbound.txt
# tracer: function_graph
#
# CPU TASK/PID DURATION FUNCTION CALLS
# | | | | | | | | |
------------------------------------------
0) <idle>-0 => kworker-29
------------------------------------------
0) kworker-29 | | ax25_kiss_rcv() {
0) kworker-29 | | ax25_rcv.isra.0() {
0) kworker-29 | 0.168 us | ax25_addr_parse();
0) kworker-29 | 0.094 us | ax25_addr_size();
0) kworker-29 | 0.136 us | ax25cmp();
0) kworker-29 | 0.137 us | ax25_digi_invert();
0) kworker-29 | | ax25_find_cb() {
0) kworker-29 | 0.223 us | ax25cmp();
0) kworker-29 | 0.194 us | ax25cmp();
0) kworker-29 | 0.087 us | ax25cmp();
0) kworker-29 | 0.975 us | }
0) kworker-29 | | ax25_find_listener() {
0) kworker-29 | 0.092 us | ax25cmp();
0) kworker-29 | 0.084 us | ax25cmp();
0) kworker-29 | 0.526 us | }
0) kworker-29 | | ax25_make_new() {
0) kworker-29 | | ax25_create_cb() {
0) kworker-29 | 0.117 us | ax25_setup_timers();
0) kworker-29 | 0.478 us | }
0) kworker-29 | 1.813 us | }
0) kworker-29 | | ax25_send_control() {
0) kworker-29 | | ax25_transmit_buffer() {
0) kworker-29 | 0.086 us | ax25_addr_size();
0) kworker-29 | 0.094 us | ax25_addr_build();
0) kworker-29 | 0.081 us | ax25_fwd_dev();
0) kworker-29 | 4.854 us | }
0) kworker-29 | 5.604 us | }
0) kworker-29 | 0.108 us | ax25_cb_add();
0) kworker-29 | 0.410 us | ax25_start_heartbeat();
0) kworker-29 | 0.218 us | ax25_start_t3timer();
0) kworker-29 | 0.099 us | ax25_start_idletimer();
0) kworker-29 | + 14.957 us | }
0) kworker-29 | + 16.116 us | }
------------------------------------------
1) ax25ipd-63 => ax25d-77
------------------------------------------
1) ax25d-77 | 1.580 us | ax25_accept();
1) ax25d-77 | 0.211 us | ax25_getname();
1) ax25d-77 | 0.275 us | ax25_getname();
------------------------------------------
0) kworker-29 => axwrapp-83
------------------------------------------
0) axwrapp-83 | | ax25_sendmsg() {
0) axwrapp-83 | | ax25_output() {
0) axwrapp-83 | | ax25_kick.part.0() {
0) axwrapp-83 | | ax25_send_iframe() {
0) axwrapp-83 | 0.679 us | ax25_start_idletimer();
0) axwrapp-83 | | ax25_transmit_buffer() {
0) axwrapp-83 | 0.093 us | ax25_addr_size();
0) axwrapp-83 | 0.102 us | ax25_addr_build();
0) axwrapp-83 | 0.145 us | ax25_fwd_dev();
0) axwrapp-83 | 9.311 us | }
0) axwrapp-83 | + 10.464 us | }
0) axwrapp-83 | 0.096 us | ax25_t1timer_running();
0) axwrapp-83 | 0.332 us | ax25_stop_t3timer();
0) axwrapp-83 | 0.093 us | ax25_calculate_t1();
0) axwrapp-83 | 0.439 us | ax25_start_t1timer();
0) axwrapp-83 | + 18.839 us | }
0) axwrapp-83 | + 19.479 us | }
0) axwrapp-83 | + 22.647 us | }
------------------------------------------
0) ax25ipd-63 => axwrapp-83
------------------------------------------
0) axwrapp-83 | | ax25_sendmsg() {
0) axwrapp-83 | | ax25_output() {
0) axwrapp-83 | | ax25_kick.part.0() {
0) axwrapp-83 | | ax25_send_iframe() {
0) axwrapp-83 | 0.339 us | ax25_start_idletimer();
0) axwrapp-83 | | ax25_transmit_buffer() {
0) axwrapp-83 | 0.092 us | ax25_addr_size();
0) axwrapp-83 | 0.097 us | ax25_addr_build();
0) axwrapp-83 | 0.136 us | ax25_fwd_dev();
0) axwrapp-83 | 9.116 us | }
0) axwrapp-83 | 9.908 us | }
0) axwrapp-83 | 0.091 us | ax25_t1timer_running();
0) axwrapp-83 | + 10.810 us | }
0) axwrapp-83 | + 11.168 us | }
0) axwrapp-83 | + 14.362 us | }
------------------------------------------
0) axwrapp-83 => kworker-10
------------------------------------------
0) kworker-10 | | ax25_kiss_rcv() {
0) kworker-10 | | ax25_rcv.isra.0() {
0) kworker-10 | 0.116 us | ax25_addr_parse();
0) kworker-10 | 0.090 us | ax25_addr_size();
0) kworker-10 | 0.144 us | ax25cmp();
0) kworker-10 | 0.091 us | ax25_digi_invert();
0) kworker-10 | | ax25_find_cb() {
0) kworker-10 | 0.091 us | ax25cmp();
0) kworker-10 | 0.087 us | ax25cmp();
0) kworker-10 | 0.550 us | }
0) kworker-10 | | ax25_std_frame_in() {
0) kworker-10 | 0.105 us | ax25_decode();
0) kworker-10 | 0.117 us | ax25_validate_nr();
0) kworker-10 | | ax25_check_iframes_acked() {
0) kworker-10 | 0.670 us | ax25_frames_acked();
0) kworker-10 | | ax25_calculate_rtt() {
0) kworker-10 | 0.086 us | ax25_t1timer_running();
0) kworker-10 | 0.085 us | ax25_display_timer();
0) kworker-10 | 0.465 us | }
0) kworker-10 | 0.185 us | ax25_stop_t1timer();
0) kworker-10 | 0.358 us | ax25_start_t3timer();
0) kworker-10 | 2.186 us | }
0) kworker-10 | | ax25_kick() {
0) kworker-10 | 0.093 us | ax25_kick.part.0();
0) kworker-10 | 0.277 us | }
0) kworker-10 | 3.320 us | }
0) kworker-10 | 5.927 us | }
0) kworker-10 | 6.563 us | }
------------------------------------------
0) kworker-10 => axwrapp-83
------------------------------------------
0) axwrapp-83 | | ax25_release() {
0) axwrapp-83 | 0.158 us | ax25_clear_queues();
0) axwrapp-83 | | ax25_send_control() {
0) axwrapp-83 | | ax25_transmit_buffer() {
0) axwrapp-83 | 0.086 us | ax25_addr_size();
0) axwrapp-83 | 0.086 us | ax25_addr_build();
0) axwrapp-83 | 0.085 us | ax25_fwd_dev();
0) axwrapp-83 | 3.972 us | }
0) axwrapp-83 | 4.356 us | }
0) axwrapp-83 | 0.142 us | ax25_stop_t2timer();
0) axwrapp-83 | 0.145 us | ax25_stop_t3timer();
0) axwrapp-83 | 0.094 us | ax25_stop_idletimer();
0) axwrapp-83 | 0.093 us | ax25_calculate_t1();
0) axwrapp-83 | 0.227 us | ax25_start_t1timer();
0) axwrapp-83 | | /* netdev_put: dev=ax0 */
------------------------------------------
1) ax25d-77 => kworker-10
------------------------------------------
1) kworker-10 | | ax25_kiss_rcv() {
1) kworker-10 | | ax25_rcv.isra.0() {
1) kworker-10 | 0.188 us | ax25_addr_parse();
1) kworker-10 | 0.089 us | ax25_addr_size();
1) kworker-10 | 0.177 us | ax25cmp();
1) kworker-10 | 0.101 us | ax25_digi_invert();
1) kworker-10 | | ax25_find_cb() {
1) kworker-10 | 0.092 us | ax25cmp();
1) kworker-10 | 0.085 us | ax25cmp();
1) kworker-10 | 0.731 us | }
1) kworker-10 | | ax25_std_frame_in() {
1) kworker-10 | 0.098 us | ax25_decode();
1) kworker-10 | | ax25_disconnect() {
1) kworker-10 | 0.311 us | ax25_stop_t1timer();
1) kworker-10 | 0.093 us | ax25_stop_t2timer();
1) kworker-10 | 0.093 us | ax25_stop_t3timer();
1) kworker-10 | 0.086 us | ax25_stop_idletimer();
1) kworker-10 | 0.415 us | ax25_link_failed();
1) kworker-10 | 1.778 us | }
1) kworker-10 | 0.090 us | ax25_kick();
1) kworker-10 | 2.523 us | }
1) kworker-10 | + 10.078 us | }
1) kworker-10 | + 12.054 us | }
0) axwrapp-83 | * 13227.13 us | }
------------------------------------------
0) axwrapp-83 => <idle>-0
------------------------------------------
0) <idle>-0 | | ax25_heartbeat_expiry() {
0) <idle>-0 | | ax25_std_heartbeat_expiry() {
0) <idle>-0 | | ax25_destroy_socket() {
0) <idle>-0 | 0.249 us | ax25_cb_del();
0) <idle>-0 | 0.107 us | ax25_stop_heartbeat();
0) <idle>-0 | 0.140 us | ax25_stop_t1timer();
0) <idle>-0 | 0.090 us | ax25_stop_t2timer();
0) <idle>-0 | 0.146 us | ax25_stop_t3timer();
0) <idle>-0 | 0.089 us | ax25_stop_idletimer();
0) <idle>-0 | 0.740 us | ax25_clear_queues();
0) <idle>-0 | 2.703 us | }
0) <idle>-0 | 0.901 us | ax25_free_sock();
0) <idle>-0 | 5.219 us | }
0) <idle>-0 | 7.220 us | }
Raw
trace2-inbound.txt
# tracer: function_graph
#
# CPU TASK/PID DURATION FUNCTION CALLS
# | | | | | | | | |
------------------------------------------
1) <idle>-0 => kworker-29
------------------------------------------
1) kworker-29 | | ax25_kiss_rcv() {
1) kworker-29 | | ax25_rcv.isra.0() {
1) kworker-29 | 0.152 us | ax25_addr_parse();
1) kworker-29 | 0.111 us | ax25_addr_size();
1) kworker-29 | 0.149 us | ax25cmp();
1) kworker-29 | 0.139 us | ax25_digi_invert();
1) kworker-29 | | ax25_find_cb() {
1) kworker-29 | 0.229 us | ax25cmp();
1) kworker-29 | 0.243 us | ax25cmp();
1) kworker-29 | 0.088 us | ax25cmp();
1) kworker-29 | 1.076 us | }
1) kworker-29 | | ax25_find_listener() {
1) kworker-29 | 0.092 us | ax25cmp();
1) kworker-29 | 0.085 us | ax25cmp();
1) kworker-29 | 0.632 us | }
1) kworker-29 | | ax25_make_new() {
1) kworker-29 | | ax25_create_cb() {
1) kworker-29 | 0.132 us | ax25_setup_timers();
1) kworker-29 | 0.547 us | }
1) kworker-29 | 1.965 us | }
1) kworker-29 | | ax25_send_control() {
1) kworker-29 | | ax25_transmit_buffer() {
1) kworker-29 | 0.090 us | ax25_addr_size();
1) kworker-29 | 0.089 us | ax25_addr_build();
1) kworker-29 | 0.084 us | ax25_fwd_dev();
1) kworker-29 | 5.682 us | }
1) kworker-29 | 6.037 us | }
1) kworker-29 | 0.100 us | ax25_cb_add();
1) kworker-29 | 0.449 us | ax25_start_heartbeat();
1) kworker-29 | 0.200 us | ax25_start_t3timer();
1) kworker-29 | 0.104 us | ax25_start_idletimer();
1) kworker-29 | + 16.757 us | }
1) kworker-29 | + 18.240 us | }
------------------------------------------
0) ax25ipd-63 => ax25d-77
------------------------------------------
0) ax25d-77 | | ax25_accept() {
0) ax25d-77 | | /* netdev_hold: dev=ax0 */
0) ax25d-77 | 2.067 us | }
0) ax25d-77 | 0.140 us | ax25_getname();
0) ax25d-77 | 0.189 us | ax25_getname();
------------------------------------------
1) kworker-29 => axwrapp-82
------------------------------------------
1) axwrapp-82 | | ax25_sendmsg() {
1) axwrapp-82 | | ax25_output() {
1) axwrapp-82 | | ax25_kick.part.0() {
1) axwrapp-82 | | ax25_send_iframe() {
1) axwrapp-82 | 0.343 us | ax25_start_idletimer();
1) axwrapp-82 | | ax25_transmit_buffer() {
1) axwrapp-82 | 0.119 us | ax25_addr_size();
1) axwrapp-82 | 0.118 us | ax25_addr_build();
1) axwrapp-82 | 0.156 us | ax25_fwd_dev();
1) axwrapp-82 | 9.965 us | }
1) axwrapp-82 | + 10.844 us | }
1) axwrapp-82 | 0.107 us | ax25_t1timer_running();
1) axwrapp-82 | 0.345 us | ax25_stop_t3timer();
1) axwrapp-82 | 0.112 us | ax25_calculate_t1();
1) axwrapp-82 | 0.499 us | ax25_start_t1timer();
1) axwrapp-82 | + 21.187 us | }
1) axwrapp-82 | + 21.620 us | }
1) axwrapp-82 | + 25.665 us | }
------------------------------------------
1) ax25ipd-63 => axwrapp-82
------------------------------------------
1) axwrapp-82 | | ax25_sendmsg() {
1) axwrapp-82 | | ax25_output() {
1) axwrapp-82 | | ax25_kick.part.0() {
1) axwrapp-82 | | ax25_send_iframe() {
1) axwrapp-82 | 1.027 us | ax25_start_idletimer();
1) axwrapp-82 | | ax25_transmit_buffer() {
1) axwrapp-82 | 0.505 us | ax25_addr_size();
1) axwrapp-82 | 0.522 us | ax25_addr_build();
1) axwrapp-82 | 0.550 us | ax25_fwd_dev();
1) axwrapp-82 | + 32.110 us | }
1) axwrapp-82 | + 35.118 us | }
1) axwrapp-82 | 0.526 us | ax25_t1timer_running();
1) axwrapp-82 | + 38.770 us | }
1) axwrapp-82 | + 40.359 us | }
1) axwrapp-82 | + 50.019 us | }
------------------------------------------
0) ax25d-77 => kworker-10
------------------------------------------
0) kworker-10 | | ax25_kiss_rcv() {
0) kworker-10 | | ax25_rcv.isra.0() {
0) kworker-10 | 0.632 us | ax25_addr_parse();
0) kworker-10 | 0.467 us | ax25_addr_size();
0) kworker-10 | 0.600 us | ax25cmp();
0) kworker-10 | 0.506 us | ax25_digi_invert();
0) kworker-10 | | ax25_find_cb() {
0) kworker-10 | 0.572 us | ax25cmp();
0) kworker-10 | 0.484 us | ax25cmp();
0) kworker-10 | 2.737 us | }
0) kworker-10 | | ax25_std_frame_in() {
0) kworker-10 | 0.569 us | ax25_decode();
0) kworker-10 | 0.607 us | ax25_validate_nr();
0) kworker-10 | | ax25_check_iframes_acked() {
0) kworker-10 | 4.171 us | ax25_frames_acked();
0) kworker-10 | | ax25_calculate_rtt() {
0) kworker-10 | 0.442 us | ax25_t1timer_running();
0) kworker-10 | 0.500 us | ax25_display_timer();
0) kworker-10 | 2.463 us | }
0) kworker-10 | 0.889 us | ax25_stop_t1timer();
0) kworker-10 | 1.559 us | ax25_start_t3timer();
0) kworker-10 | + 11.534 us | }
0) kworker-10 | | ax25_kick() {
0) kworker-10 | 0.480 us | ax25_kick.part.0();
0) kworker-10 | 1.467 us | }
0) kworker-10 | + 16.917 us | }
0) kworker-10 | + 27.062 us | }
0) kworker-10 | + 30.583 us | }
1) axwrapp-82 | | ax25_release() {
1) axwrapp-82 | 0.932 us | ax25_clear_queues();
1) axwrapp-82 | | ax25_send_control() {
1) axwrapp-82 | | ax25_transmit_buffer() {
1) axwrapp-82 | 0.516 us | ax25_addr_size();
1) axwrapp-82 | 0.484 us | ax25_addr_build();
1) axwrapp-82 | 0.451 us | ax25_fwd_dev();
1) axwrapp-82 | + 91.128 us | }
1) axwrapp-82 | + 94.596 us | }
1) axwrapp-82 | 1.554 us | ax25_stop_t2timer();
1) axwrapp-82 | 1.151 us | ax25_stop_t3timer();
1) axwrapp-82 | 0.758 us | ax25_stop_idletimer();
1) axwrapp-82 | 0.676 us | ax25_calculate_t1();
1) axwrapp-82 | 1.642 us | ax25_start_t1timer();
1) axwrapp-82 | | /* netdev_put: dev=ax0 */
1) axwrapp-82 | ! 123.696 us | }
------------------------------------------
1) axwrapp-82 => kworker-10
------------------------------------------
1) kworker-10 | | ax25_kiss_rcv() {
1) kworker-10 | | ax25_rcv.isra.0() {
1) kworker-10 | 0.568 us | ax25_addr_parse();
1) kworker-10 | 0.428 us | ax25_addr_size();
1) kworker-10 | 0.504 us | ax25cmp();
1) kworker-10 | 0.453 us | ax25_digi_invert();
1) kworker-10 | | ax25_find_cb() {
1) kworker-10 | 0.425 us | ax25cmp();
1) kworker-10 | 0.429 us | ax25cmp();
1) kworker-10 | 2.511 us | }
1) kworker-10 | | ax25_std_frame_in() {
1) kworker-10 | 0.518 us | ax25_decode();
1) kworker-10 | | ax25_disconnect() {
1) kworker-10 | 0.840 us | ax25_stop_t1timer();
1) kworker-10 | 0.459 us | ax25_stop_t2timer();
1) kworker-10 | 0.444 us | ax25_stop_t3timer();
1) kworker-10 | 0.413 us | ax25_stop_idletimer();
1) kworker-10 | 1.123 us | ax25_link_failed();
1) kworker-10 | 6.202 us | }
1) kworker-10 | 0.428 us | ax25_kick();
1) kworker-10 | 9.214 us | }
1) kworker-10 | + 18.606 us | }
1) kworker-10 | + 21.675 us | }
------------------------------------------
0) kworker-10 => <idle>-0
------------------------------------------
0) <idle>-0 | | ax25_heartbeat_expiry() {
0) <idle>-0 | | ax25_std_heartbeat_expiry() {
0) <idle>-0 | | ax25_destroy_socket() {
0) <idle>-0 | 0.202 us | ax25_cb_del();
0) <idle>-0 | 0.116 us | ax25_stop_heartbeat();
0) <idle>-0 | 0.100 us | ax25_stop_t1timer();
0) <idle>-0 | 0.101 us | ax25_stop_t2timer();
0) <idle>-0 | 0.158 us | ax25_stop_t3timer();
0) <idle>-0 | 0.101 us | ax25_stop_idletimer();
0) <idle>-0 | 0.321 us | ax25_clear_queues();
0) <idle>-0 | 2.483 us | }
0) <idle>-0 | 0.531 us | ax25_free_sock();
0) <idle>-0 | 4.912 us | }
0) <idle>-0 | 6.545 us | }
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment