Add a basic set of tracepoints:
- switchdev_defer: Fires whenever an operation is enqueued to the
switchdev workqueue for deferred delivery.
- switchdev_call_{atomic,blocking}: Fires whenever a notification is
sent to the corresponding switchdev notifier chain.
- switchdev_call_replay: Fires whenever a notification is sent to a
specific driver's notifier block, in response to a replay request.
Signed-off-by: Tobias Waldekranz <tobias@xxxxxxxxxxxxxx>
---
include/trace/events/switchdev.h | 74 ++++++++++++++++++++++++++++++++
net/switchdev/switchdev.c | 71 +++++++++++++++++++++++++-----
2 files changed, 135 insertions(+), 10 deletions(-)
create mode 100644 include/trace/events/switchdev.h
diff --git a/include/trace/events/switchdev.h b/include/trace/events/switchdev.h
new file mode 100644
index 000000000000..dcaf6870d017
--- /dev/null
+++ b/include/trace/events/switchdev.h
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM switchdev
+
+#if !defined(_TRACE_SWITCHDEV_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_SWITCHDEV_H
+
+#include <linux/tracepoint.h>
+#include <net/switchdev.h>
+
+#define SWITCHDEV_TRACE_MSG_MAX 128
+
+DECLARE_EVENT_CLASS(switchdev_call,
+ TP_PROTO(unsigned long val,
+ const struct switchdev_notifier_info *info,
+ int err),
+
+ TP_ARGS(val, info, err),
+
+ TP_STRUCT__entry(
+ __field(unsigned long, val)
+ __string(dev, info->dev ? netdev_name(info->dev) : "(null)")
+ __field(const struct switchdev_notifier_info *, info)
+ __field(int, err)
+ __array(char, msg, SWITCHDEV_TRACE_MSG_MAX)
+ ),
+
+ TP_fast_assign(
+ __entry->val = val;
+ __assign_str(dev, info->dev ? netdev_name(info->dev) : "(null)");
+ __entry->info = info;
+ __entry->err = err;
+ switchdev_notifier_str(val, info, __entry->msg, SWITCHDEV_TRACE_MSG_MAX);
+ ),
+
+ TP_printk("dev %s %s -> %d", __get_str(dev), __entry->msg, __entry->err)
+);
+
+DEFINE_EVENT(switchdev_call, switchdev_defer,
+ TP_PROTO(unsigned long val,
+ const struct switchdev_notifier_info *info,
+ int err),
+
+ TP_ARGS(val, info, err)
+);
+
+DEFINE_EVENT(switchdev_call, switchdev_call_atomic,
+ TP_PROTO(unsigned long val,
+ const struct switchdev_notifier_info *info,
+ int err),
+
+ TP_ARGS(val, info, err)
+);
+
+DEFINE_EVENT(switchdev_call, switchdev_call_blocking,
+ TP_PROTO(unsigned long val,
+ const struct switchdev_notifier_info *info,
+ int err),
+
+ TP_ARGS(val, info, err)
+);
+
+DEFINE_EVENT(switchdev_call, switchdev_call_replay,
+ TP_PROTO(unsigned long val,
+ const struct switchdev_notifier_info *info,
+ int err),
+
+ TP_ARGS(val, info, err)
+);
+
+#endif /* _TRACE_SWITCHDEV_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index f73249269a87..74d715166981 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -19,6 +19,9 @@
#include <linux/rtnetlink.h>
#include <net/switchdev.h>
+#define CREATE_TRACE_POINTS
+#include <trace/events/switchdev.h>
+
static bool switchdev_obj_eq(const struct switchdev_obj *a,
const struct switchdev_obj *b)
{
@@ -180,8 +183,20 @@ static void switchdev_port_attr_set_deferred(struct net_device *dev,
static int switchdev_port_attr_set_defer(struct net_device *dev,
const struct switchdev_attr *attr)
{
- return switchdev_deferred_enqueue(dev, attr, sizeof(*attr),
- switchdev_port_attr_set_deferred);
+ int err;
+
+ err = switchdev_deferred_enqueue(dev, attr, sizeof(*attr),
+ switchdev_port_attr_set_deferred);
+
+ if (trace_switchdev_defer_enabled()) {
+ struct switchdev_notifier_port_attr_info attr_info = {
+ .info.dev = dev,
+ .attr = attr,
+ };
+
+ trace_switchdev_defer(SWITCHDEV_PORT_ATTR_SET, &attr_info.info, err);
+ }
+ return err;
}
/**
@@ -263,8 +278,20 @@ static void switchdev_port_obj_add_deferred(struct net_device *dev,
static int switchdev_port_obj_add_defer(struct net_device *dev,
const struct switchdev_obj *obj)
{
- return switchdev_deferred_enqueue(dev, obj, switchdev_obj_size(obj),
- switchdev_port_obj_add_deferred);
+ int err;
+
+ err = switchdev_deferred_enqueue(dev, obj, switchdev_obj_size(obj),
+ switchdev_port_obj_add_deferred);
+
+ if (trace_switchdev_defer_enabled()) {
+ struct switchdev_notifier_port_obj_info obj_info = {
+ .info.dev = dev,
+ .obj = obj,
+ };
+
+ trace_switchdev_defer(SWITCHDEV_PORT_OBJ_ADD, &obj_info.info, err);
+ }
+ return err;
}
/**
@@ -313,8 +340,20 @@ static void switchdev_port_obj_del_deferred(struct net_device *dev,
static int switchdev_port_obj_del_defer(struct net_device *dev,
const struct switchdev_obj *obj)
{
- return switchdev_deferred_enqueue(dev, obj, switchdev_obj_size(obj),
- switchdev_port_obj_del_deferred);
+ int err;
+
+ err = switchdev_deferred_enqueue(dev, obj, switchdev_obj_size(obj),
+ switchdev_port_obj_del_deferred);
+
+ if (trace_switchdev_defer_enabled()) {
+ struct switchdev_notifier_port_obj_info obj_info = {
+ .info.dev = dev,
+ .obj = obj,
+ };
+
+ trace_switchdev_defer(SWITCHDEV_PORT_OBJ_DEL, &obj_info.info, err);
+ }
+ return err;
}
/**
@@ -394,7 +433,11 @@ EXPORT_SYMBOL_GPL(switchdev_port_obj_act_is_deferred);
int switchdev_call_replay(struct notifier_block *nb, unsigned long type,
struct switchdev_notifier_info *info)
{
- return nb->notifier_call(nb, type, info);
+ int ret;
+
+ ret = nb->notifier_call(nb, type, info);
+ trace_switchdev_call_replay(type, info, notifier_to_errno(ret));
+ return ret;
}
EXPORT_SYMBOL_GPL(switchdev_call_replay);
@@ -437,9 +480,13 @@ int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
struct switchdev_notifier_info *info,
struct netlink_ext_ack *extack)
{
+ int ret;
+
info->dev = dev;
info->extack = extack;
- return atomic_notifier_call_chain(&switchdev_notif_chain, val, info);
+ ret = atomic_notifier_call_chain(&switchdev_notif_chain, val, info);
+ trace_switchdev_call_atomic(val, info, notifier_to_errno(ret));
+ return ret;
}
EXPORT_SYMBOL_GPL(call_switchdev_notifiers);
@@ -463,10 +510,14 @@ int call_switchdev_blocking_notifiers(unsigned long val, struct net_device *dev,
struct switchdev_notifier_info *info,
struct netlink_ext_ack *extack)
{
+ int ret;
+
info->dev = dev;
info->extack = extack;
- return blocking_notifier_call_chain(&switchdev_blocking_notif_chain,
- val, info);
+ ret = blocking_notifier_call_chain(&switchdev_blocking_notif_chain,
+ val, info);
+ trace_switchdev_call_blocking(val, info, notifier_to_errno(ret));
+ return ret;
}
EXPORT_SYMBOL_GPL(call_switchdev_blocking_notifiers);
--
2.34.1
