when debug USB gadget issue, it is better to understand
what configuration was done from user space.
add trace in function gadget_dev_desc_UDC_store()
will show when user space enable/disable the gadget.
add trace in function config_usb_cfg_link()
will show which function was added to gadget configuration.
add trace in function config_usb_cfg_unlink()
whill show which function was removed from gadget configuraion.
Signed-off-by: Linyu Yuan <quic_linyyuan@xxxxxxxxxxx>
---
v2->v3: add more change log
v1->v2: fix typo tree -> three of subject line
drivers/usb/gadget/Makefile | 1 +
drivers/usb/gadget/configfs.c | 11 ++++++
drivers/usb/gadget/configfs_trace.c | 7 ++++
drivers/usb/gadget/configfs_trace.h | 73 +++++++++++++++++++++++++++++++++++++
4 files changed, 92 insertions(+)
create mode 100644 drivers/usb/gadget/configfs_trace.c
create mode 100644 drivers/usb/gadget/configfs_trace.h
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 130dad7..8e9c2b8 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -9,5 +9,6 @@ ccflags-y += -I$(srctree)/drivers/usb/gadget/udc
obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o
libcomposite-y := usbstring.o config.o epautoconf.o
libcomposite-y += composite.o functions.o configfs.o u_f.o
+libcomposite-y += configfs_trace.o
obj-$(CONFIG_USB_GADGET) += udc/ function/ legacy/
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 477e72a..4024f9b 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -9,6 +9,7 @@
#include "configfs.h"
#include "u_f.h"
#include "u_os_desc.h"
+#include "configfs_trace.h"
int check_user_usb_string(const char *name,
struct usb_gadget_strings *stringtab_dev)
@@ -270,6 +271,8 @@ static ssize_t gadget_dev_desc_UDC_store(struct config_item *item,
if (name[len - 1] == '\n')
name[len - 1] = '\0';
+ trace_gadget_dev_desc_UDC_store(config_item_name(item), name);
+
mutex_lock(&gi->lock);
if (!strlen(name)) {
@@ -423,6 +426,10 @@ static int config_usb_cfg_link(
struct usb_function *f;
int ret;
+ trace_config_usb_cfg_link(config_item_name(&gi->group.cg_item),
+ config_item_name(usb_cfg_ci),
+ config_item_name(usb_func_ci));
+
mutex_lock(&gi->lock);
/*
* Make sure this function is from within our _this_ gadget and not
@@ -472,6 +479,10 @@ static void config_usb_cfg_unlink(
struct usb_function_instance, group);
struct usb_function *f;
+ trace_config_usb_cfg_unlink(config_item_name(&gi->group.cg_item),
+ config_item_name(usb_cfg_ci),
+ config_item_name(usb_func_ci));
+
/*
* ideally I would like to forbid to unlink functions while a gadget is
* bound to an UDC. Since this isn't possible at the moment, we simply
diff --git a/drivers/usb/gadget/configfs_trace.c b/drivers/usb/gadget/configfs_trace.c
new file mode 100644
index 0000000..b74ff21
--- /dev/null
+++ b/drivers/usb/gadget/configfs_trace.c
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#define CREATE_TRACE_POINTS
+#include "configfs_trace.h"
diff --git a/drivers/usb/gadget/configfs_trace.h b/drivers/usb/gadget/configfs_trace.h
new file mode 100644
index 0000000..82e0121
--- /dev/null
+++ b/drivers/usb/gadget/configfs_trace.h
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM configfs_gadget
+
+#if !defined(__GADGET_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define __GADGET_TRACE_H
+
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(gadget_dev_desc_UDC_store,
+ TP_PROTO(char *name, char *udc),
+ TP_ARGS(name, udc),
+ TP_STRUCT__entry(
+ __string(group_name, name)
+ __string(udc_name, udc)
+ ),
+ TP_fast_assign(
+ __assign_str(group_name, name);
+ __assign_str(udc_name, udc);
+ ),
+ TP_printk("gadget:%s UDC:%s", __get_str(group_name),
+ __get_str(udc_name))
+);
+
+TRACE_EVENT(config_usb_cfg_link,
+ TP_PROTO(char *name, char *cfg, char *func),
+ TP_ARGS(name, cfg, func),
+ TP_STRUCT__entry(
+ __string(group_name, name)
+ __string(cfg_name, cfg)
+ __string(func_name, func)
+ ),
+ TP_fast_assign(
+ __assign_str(group_name, name);
+ __assign_str(cfg_name, cfg);
+ __assign_str(func_name, func)
+ ),
+ TP_printk("gadget:%s cfg:%s link func:%s", __get_str(group_name),
+ __get_str(cfg_name), __get_str(func_name))
+);
+
+TRACE_EVENT(config_usb_cfg_unlink,
+ TP_PROTO(char *name, char *cfg, char *func),
+ TP_ARGS(name, cfg, func),
+ TP_STRUCT__entry(
+ __string(group_name, name)
+ __string(cfg_name, cfg)
+ __string(func_name, func)
+ ),
+ TP_fast_assign(
+ __assign_str(group_name, name);
+ __assign_str(cfg_name, cfg);
+ __assign_str(func_name, func)
+ ),
+ TP_printk("gadget:%s cfg:%s unlink func:%s", __get_str(group_name),
+ __get_str(cfg_name), __get_str(func_name))
+);
+
+#endif /* __GADGET_TRACE_H */
+
+/* this part has to be here */
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH ../../drivers/usb/gadget
+
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE configfs_trace
+
+#include <trace/define_trace.h>
--
2.7.4
