diff options
author | Jiri Pirko <jiri@mellanox.com> | 2016-07-14 05:37:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-07-15 01:16:05 -0400 |
commit | 0e1824c98a0ffd7fd9ffb2a3da01ec49ff1348a2 (patch) | |
tree | 71c362aa8e23aa87aa600dda979478fa4864501f | |
parent | a1e3e7372c54fb74994a9cb72965d6e9b4c2efda (diff) |
tracing: change owner name to driver name for devlink hwmsg tracepoint
Turned on that driver->owner which is struct module is not available when
modules are disabled. Better to depend on a driver name which is
always available.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Fixes: e5224f0fe2 ("devlink: add hardware messages tracing facility")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/trace/events/devlink.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/trace/events/devlink.h b/include/trace/events/devlink.h index 333c32ac9bfa..77dce71df42a 100644 --- a/include/trace/events/devlink.h +++ b/include/trace/events/devlink.h | |||
@@ -22,7 +22,7 @@ TRACE_EVENT(devlink_hwmsg, | |||
22 | TP_STRUCT__entry( | 22 | TP_STRUCT__entry( |
23 | __string(bus_name, devlink->dev->bus->name) | 23 | __string(bus_name, devlink->dev->bus->name) |
24 | __string(dev_name, dev_name(devlink->dev)) | 24 | __string(dev_name, dev_name(devlink->dev)) |
25 | __string(owner_name, devlink->dev->driver->owner->name) | 25 | __string(driver_name, devlink->dev->driver->name) |
26 | __field(bool, incoming) | 26 | __field(bool, incoming) |
27 | __field(unsigned long, type) | 27 | __field(unsigned long, type) |
28 | __dynamic_array(u8, buf, len) | 28 | __dynamic_array(u8, buf, len) |
@@ -32,16 +32,16 @@ TRACE_EVENT(devlink_hwmsg, | |||
32 | TP_fast_assign( | 32 | TP_fast_assign( |
33 | __assign_str(bus_name, devlink->dev->bus->name); | 33 | __assign_str(bus_name, devlink->dev->bus->name); |
34 | __assign_str(dev_name, dev_name(devlink->dev)); | 34 | __assign_str(dev_name, dev_name(devlink->dev)); |
35 | __assign_str(owner_name, devlink->dev->driver->owner->name); | 35 | __assign_str(driver_name, devlink->dev->driver->name); |
36 | __entry->incoming = incoming; | 36 | __entry->incoming = incoming; |
37 | __entry->type = type; | 37 | __entry->type = type; |
38 | memcpy(__get_dynamic_array(buf), buf, len); | 38 | memcpy(__get_dynamic_array(buf), buf, len); |
39 | __entry->len = len; | 39 | __entry->len = len; |
40 | ), | 40 | ), |
41 | 41 | ||
42 | TP_printk("bus_name=%s dev_name=%s owner_name=%s incoming=%d type=%lu buf=0x[%*phD] len=%lu", | 42 | TP_printk("bus_name=%s dev_name=%s driver_name=%s incoming=%d type=%lu buf=0x[%*phD] len=%lu", |
43 | __get_str(bus_name), __get_str(dev_name), | 43 | __get_str(bus_name), __get_str(dev_name), |
44 | __get_str(owner_name), __entry->incoming, __entry->type, | 44 | __get_str(driver_name), __entry->incoming, __entry->type, |
45 | (int) __entry->len, __get_dynamic_array(buf), __entry->len) | 45 | (int) __entry->len, __get_dynamic_array(buf), __entry->len) |
46 | ); | 46 | ); |
47 | 47 | ||