linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next 1/2] devlink: fix build error for CONFIG_MODULES=n
@ 2016-07-13 21:03 Arnd Bergmann
  2016-07-13 21:03 ` [PATCH net-next 2/2] devlink: fix trace format string Arnd Bergmann
  2016-07-14  6:21 ` [PATCH net-next 1/2] devlink: fix build error for CONFIG_MODULES=n Jiri Pirko
  0 siblings, 2 replies; 9+ messages in thread
From: Arnd Bergmann @ 2016-07-13 21:03 UTC (permalink / raw)
  To: Jiri Pirko
  Cc: netdev, Steven Rostedt, Ingo Molnar, David S . Miller,
	linux-kernel, Arnd Bergmann

A driver calling trace_devlink_hwmsg cannot be built when modules are disabled:

include/trace/events/devlink.h: In function 'trace_event_get_offsets_devlink_hwmsg':
include/trace/events/devlink.h:25:51: error: dereferencing pointer to incomplete type 'struct module'
   __string(owner_name, devlink->dev->driver->owner->name)

This changes the code to only print the module name when modules are actually
enabled, otherwise we hardcode the string "built-in".

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: e5224f0fe2ac ("devlink: add hardware messages tracing facility")
---
 include/trace/events/devlink.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/trace/events/devlink.h b/include/trace/events/devlink.h
index 333c32ac9bfa..26f92d3c7e9c 100644
--- a/include/trace/events/devlink.h
+++ b/include/trace/events/devlink.h
@@ -22,7 +22,11 @@ TRACE_EVENT(devlink_hwmsg,
 	TP_STRUCT__entry(
 		__string(bus_name, devlink->dev->bus->name)
 		__string(dev_name, dev_name(devlink->dev))
+#ifdef CONFIG_MODULES
 		__string(owner_name, devlink->dev->driver->owner->name)
+#else
+		__string(owner_name, "built-in")
+#endif
 		__field(bool, incoming)
 		__field(unsigned long, type)
 		__dynamic_array(u8, buf, len)
@@ -32,7 +36,11 @@ TRACE_EVENT(devlink_hwmsg,
 	TP_fast_assign(
 		__assign_str(bus_name, devlink->dev->bus->name);
 		__assign_str(dev_name, dev_name(devlink->dev));
+#ifdef CONFIG_MODULES
 		__assign_str(owner_name, devlink->dev->driver->owner->name);
+#else
+		__assign_str(owner_name, "built-in");
+#endif
 		__entry->incoming = incoming;
 		__entry->type = type;
 		memcpy(__get_dynamic_array(buf), buf, len);
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [patch net-next 1/2] tracing: change owner name to driver name for devlink hwmsg tracepoint
@ 2016-07-14  9:37 Jiri Pirko
  2016-07-14  9:37 ` [patch net-next 2/2] devlink: fix trace format string Jiri Pirko
  0 siblings, 1 reply; 9+ messages in thread
From: Jiri Pirko @ 2016-07-14  9:37 UTC (permalink / raw)
  To: netdev
  Cc: davem, arnd, rdunlap, linux-kernel, idosch, yotamg, eladr,
	nogahf, ogerlitz, ivecera, rostedt, mingo, jolsa

From: Jiri Pirko <jiri@mellanox.com>

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>
---
 include/trace/events/devlink.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/trace/events/devlink.h b/include/trace/events/devlink.h
index 333c32a..77dce71 100644
--- a/include/trace/events/devlink.h
+++ b/include/trace/events/devlink.h
@@ -22,7 +22,7 @@ TRACE_EVENT(devlink_hwmsg,
 	TP_STRUCT__entry(
 		__string(bus_name, devlink->dev->bus->name)
 		__string(dev_name, dev_name(devlink->dev))
-		__string(owner_name, devlink->dev->driver->owner->name)
+		__string(driver_name, devlink->dev->driver->name)
 		__field(bool, incoming)
 		__field(unsigned long, type)
 		__dynamic_array(u8, buf, len)
@@ -32,16 +32,16 @@ TRACE_EVENT(devlink_hwmsg,
 	TP_fast_assign(
 		__assign_str(bus_name, devlink->dev->bus->name);
 		__assign_str(dev_name, dev_name(devlink->dev));
-		__assign_str(owner_name, devlink->dev->driver->owner->name);
+		__assign_str(driver_name, devlink->dev->driver->name);
 		__entry->incoming = incoming;
 		__entry->type = type;
 		memcpy(__get_dynamic_array(buf), buf, len);
 		__entry->len = len;
 	),
 
-	TP_printk("bus_name=%s dev_name=%s owner_name=%s incoming=%d type=%lu buf=0x[%*phD] len=%lu",
+	TP_printk("bus_name=%s dev_name=%s driver_name=%s incoming=%d type=%lu buf=0x[%*phD] len=%lu",
 		  __get_str(bus_name), __get_str(dev_name),
-		  __get_str(owner_name), __entry->incoming, __entry->type,
+		  __get_str(driver_name), __entry->incoming, __entry->type,
 		  (int) __entry->len, __get_dynamic_array(buf), __entry->len)
 );
 
-- 
2.5.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-07-15  5:16 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-13 21:03 [PATCH net-next 1/2] devlink: fix build error for CONFIG_MODULES=n Arnd Bergmann
2016-07-13 21:03 ` [PATCH net-next 2/2] devlink: fix trace format string Arnd Bergmann
2016-07-14  6:21 ` [PATCH net-next 1/2] devlink: fix build error for CONFIG_MODULES=n Jiri Pirko
2016-07-14  8:12   ` Arnd Bergmann
2016-07-14  8:51     ` Jiri Pirko
2016-07-14  9:37 [patch net-next 1/2] tracing: change owner name to driver name for devlink hwmsg tracepoint Jiri Pirko
2016-07-14  9:37 ` [patch net-next 2/2] devlink: fix trace format string Jiri Pirko
2016-07-14 17:07   ` Randy Dunlap
2016-07-14 17:18     ` Steven Rostedt
2016-07-15  5:16   ` David Miller

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).