Add API trace_usb_configfs_write_attr() to trace user change gadget or
function attributes.
Signed-off-by: Linyu Yuan <quic_linyyuan@xxxxxxxxxxx>
---
v2: no change
drivers/usb/gadget/configfs.c | 47 ++++++++++++++++++++++++++
drivers/usb/gadget/function/f_acm.c | 1 +
drivers/usb/gadget/function/f_hid.c | 4 +++
drivers/usb/gadget/function/f_loopback.c | 4 +++
drivers/usb/gadget/function/f_mass_storage.c | 16 +++++++++
drivers/usb/gadget/function/f_midi.c | 6 ++++
drivers/usb/gadget/function/f_printer.c | 4 +++
drivers/usb/gadget/function/f_serial.c | 1 +
drivers/usb/gadget/function/f_sourcesink.c | 16 +++++++++
drivers/usb/gadget/function/f_uac1.c | 6 ++++
drivers/usb/gadget/function/f_uac1_legacy.c | 4 +++
drivers/usb/gadget/function/f_uac2.c | 8 +++++
drivers/usb/gadget/function/u_ether_configfs.h | 10 ++++++
drivers/usb/gadget/function/uvc_configfs.c | 18 ++++++++++
include/linux/usb/composite.h | 3 ++
include/linux/usb/gadget_configfs.h | 2 ++
16 files changed, 150 insertions(+)
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 0f85290..c35ad0a 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -149,6 +149,8 @@ static ssize_t gadget_dev_desc_##_name##_store(struct config_item *item, \
{ \
u8 val; \
int ret; \
+ \
+ trace_usb_configfs_write_attr(item, #_name, page); \
ret = kstrtou8(page, 0, &val); \
if (ret) \
return ret; \
@@ -162,6 +164,8 @@ static ssize_t gadget_dev_desc_##_name##_store(struct config_item *item, \
{ \
u16 val; \
int ret; \
+ \
+ trace_usb_configfs_write_attr(item, #_name, page); \
ret = kstrtou16(page, 0, &val); \
if (ret) \
return ret; \
@@ -201,6 +205,8 @@ static ssize_t gadget_dev_desc_bcdDevice_store(struct config_item *item,
u16 bcdDevice;
int ret;
+ trace_usb_configfs_write_attr(item, "bcdDevice", page);
+
ret = kstrtou16(page, 0, &bcdDevice);
if (ret)
return ret;
@@ -218,6 +224,8 @@ static ssize_t gadget_dev_desc_bcdUSB_store(struct config_item *item,
u16 bcdUSB;
int ret;
+ trace_usb_configfs_write_attr(item, "bcdUSB", page);
+
ret = kstrtou16(page, 0, &bcdUSB);
if (ret)
return ret;
@@ -265,6 +273,8 @@ static ssize_t gadget_dev_desc_UDC_store(struct config_item *item,
char *name;
int ret;
+ trace_usb_configfs_write_attr(item, "UDC", page);
+
if (strlen(page) < len)
return -EOVERFLOW;
@@ -314,6 +324,8 @@ static ssize_t gadget_dev_desc_max_speed_store(struct config_item *item,
{
struct gadget_info *gi = to_gadget_info(item);
+ trace_usb_configfs_write_attr(item, "max_speed", page);
+
mutex_lock(&gi->lock);
/* Prevent changing of max_speed after the driver is binded */
@@ -522,6 +534,9 @@ static ssize_t gadget_config_desc_MaxPower_store(struct config_item *item,
struct config_usb_cfg *cfg = to_config_usb_cfg(item);
u16 val;
int ret;
+
+ trace_usb_configfs_write_attr(item, "MaxPower", page);
+
ret = kstrtou16(page, 0, &val);
if (ret)
return ret;
@@ -545,6 +560,9 @@ static ssize_t gadget_config_desc_bmAttributes_store(struct config_item *item,
struct config_usb_cfg *cfg = to_config_usb_cfg(item);
u8 val;
int ret;
+
+ trace_usb_configfs_write_attr(item, "bmAttributes", page);
+
ret = kstrtou8(page, 0, &val);
if (ret)
return ret;
@@ -812,6 +830,8 @@ static ssize_t os_desc_use_store(struct config_item *item, const char *page,
int ret;
bool use;
+ trace_usb_configfs_write_attr(item, "use", page);
+
mutex_lock(&gi->lock);
ret = strtobool(page, &use);
if (!ret) {
@@ -836,6 +856,8 @@ static ssize_t os_desc_b_vendor_code_store(struct config_item *item,
int ret;
u8 b_vendor_code;
+ trace_usb_configfs_write_attr(item, "b_vendor_code", page);
+
mutex_lock(&gi->lock);
ret = kstrtou8(page, 0, &b_vendor_code);
if (!ret) {
@@ -865,6 +887,8 @@ static ssize_t os_desc_qw_sign_store(struct config_item *item, const char *page,
struct gadget_info *gi = os_desc_item_to_gadget_info(item);
int res, l;
+ trace_usb_configfs_write_attr(item, "qw_sign", page);
+
l = min((int)len, OS_STRING_QW_SIGN_LEN >> 1);
if (page[l - 1] == '\n')
--l;
@@ -1806,6 +1830,29 @@ void trace_usb_configfs_unlink_group(struct config_item *dest,
trace_usb_configfs_link_unlink_group(dest, src, "unlink");
}
EXPORT_SYMBOL(trace_usb_configfs_unlink_group);
+
+void trace_usb_configfs_write_attr(struct config_item *item,
+ const char *attr, const char *page)
+{
+ char *info = kzalloc(2 * PAGE_SIZE, GFP_KERNEL);
+ char *group = kzalloc(GROUP_LEN, GFP_KERNEL);
+ int ret;
+
+ if (!info || !group)
+ goto out;
+
+ ret = gadget_configfs_group(group, item);
+ if (ret)
+ goto out;
+
+ snprintf(info, 2 * PAGE_SIZE, "echo %s/%s %s", group, attr, page);
+
+ trace_gadget_configfs(info);
+
+out:
+ kfree(info);
+}
+EXPORT_SYMBOL(trace_usb_configfs_write_attr);
#endif
static int __init gadget_cfs_init(void)
diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index 349945e..d48f666 100644
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -794,6 +794,7 @@ static struct configfs_item_operations acm_item_ops = {
static ssize_t f_acm_console_store(struct config_item *item,
const char *page, size_t count)
{
+ trace_usb_configfs_write_attr(item, "console", page);
return gserial_set_console(to_f_serial_opts(item)->port_num,
page, count);
}
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index ca0a7d9..c54af8d 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -1074,6 +1074,8 @@ static ssize_t f_hid_opts_##name##_store(struct config_item *item, \
int ret; \
u##prec num; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
@@ -1123,6 +1125,8 @@ static ssize_t f_hid_opts_report_desc_store(struct config_item *item,
int ret = -EBUSY;
char *d;
+ trace_usb_configfs_write_attr(item, "report_desc", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt)
diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
index ae41f55..42f6061 100644
--- a/drivers/usb/gadget/function/f_loopback.c
+++ b/drivers/usb/gadget/function/f_loopback.c
@@ -489,6 +489,8 @@ static ssize_t f_lb_opts_qlen_store(struct config_item *item,
int ret;
u32 num;
+ trace_usb_configfs_write_attr(item, "qlen", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
@@ -527,6 +529,8 @@ static ssize_t f_lb_opts_bulk_buflen_store(struct config_item *item,
int ret;
u32 num;
+ trace_usb_configfs_write_attr(item, "bulk_buflen", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index 8bf1f37..edece4f 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -3140,6 +3140,8 @@ static ssize_t fsg_lun_opts_file_store(struct config_item *item,
struct fsg_lun_opts *opts = to_fsg_lun_opts(item);
struct fsg_opts *fsg_opts = to_fsg_opts(opts->group.cg_item.ci_parent);
+ trace_usb_configfs_write_attr(item, "file", page);
+
return fsg_store_file(opts->lun, &fsg_opts->common->filesem, page, len);
}
@@ -3156,6 +3158,8 @@ static ssize_t fsg_lun_opts_ro_store(struct config_item *item,
struct fsg_lun_opts *opts = to_fsg_lun_opts(item);
struct fsg_opts *fsg_opts = to_fsg_opts(opts->group.cg_item.ci_parent);
+ trace_usb_configfs_write_attr(item, "ro", page);
+
return fsg_store_ro(opts->lun, &fsg_opts->common->filesem, page, len);
}
@@ -3170,6 +3174,8 @@ static ssize_t fsg_lun_opts_removable_show(struct config_item *item,
static ssize_t fsg_lun_opts_removable_store(struct config_item *item,
const char *page, size_t len)
{
+ trace_usb_configfs_write_attr(item, "removable", page);
+
return fsg_store_removable(to_fsg_lun_opts(item)->lun, page, len);
}
@@ -3186,6 +3192,8 @@ static ssize_t fsg_lun_opts_cdrom_store(struct config_item *item,
struct fsg_lun_opts *opts = to_fsg_lun_opts(item);
struct fsg_opts *fsg_opts = to_fsg_opts(opts->group.cg_item.ci_parent);
+ trace_usb_configfs_write_attr(item, "cdrom", page);
+
return fsg_store_cdrom(opts->lun, &fsg_opts->common->filesem, page,
len);
}
@@ -3200,6 +3208,8 @@ static ssize_t fsg_lun_opts_nofua_show(struct config_item *item, char *page)
static ssize_t fsg_lun_opts_nofua_store(struct config_item *item,
const char *page, size_t len)
{
+ trace_usb_configfs_write_attr(item, "nofua", page);
+
return fsg_store_nofua(to_fsg_lun_opts(item)->lun, page, len);
}
@@ -3214,6 +3224,8 @@ static ssize_t fsg_lun_opts_inquiry_string_show(struct config_item *item,
static ssize_t fsg_lun_opts_inquiry_string_store(struct config_item *item,
const char *page, size_t len)
{
+ trace_usb_configfs_write_attr(item, "inquiry_string", page);
+
return fsg_store_inquiry_string(to_fsg_lun_opts(item)->lun, page, len);
}
@@ -3352,6 +3364,8 @@ static ssize_t fsg_opts_stall_store(struct config_item *item, const char *page,
int ret;
bool stall;
+ trace_usb_configfs_write_attr(item, "stall", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
@@ -3392,6 +3406,8 @@ static ssize_t fsg_opts_num_buffers_store(struct config_item *item,
int ret;
u8 num;
+ trace_usb_configfs_write_attr(item, "num_buffers", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index fddf539..ebb2d7b 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -1110,6 +1110,8 @@ static ssize_t f_midi_opts_##name##_store(struct config_item *item, \
int ret; \
u32 num; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt > 1) { \
ret = -EBUSY; \
@@ -1154,6 +1156,8 @@ static ssize_t f_midi_opts_##name##_store(struct config_item *item, \
int ret; \
s32 num; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt > 1) { \
ret = -EBUSY; \
@@ -1209,6 +1213,8 @@ static ssize_t f_midi_opts_id_store(struct config_item *item,
int ret;
char *c;
+ trace_usb_configfs_write_attr(item, "id", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt > 1) {
ret = -EBUSY;
diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index abec5c5..c071574 100644
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -1239,6 +1239,8 @@ static ssize_t f_printer_opts_pnp_string_store(struct config_item *item,
char *new_pnp;
int result;
+ trace_usb_configfs_write_attr(item, "pnp_string", page);
+
mutex_lock(&opts->lock);
new_pnp = kstrndup(page, len, GFP_KERNEL);
@@ -1281,6 +1283,8 @@ static ssize_t f_printer_opts_q_len_store(struct config_item *item,
int ret;
u16 num;
+ trace_usb_configfs_write_attr(item, "q_len", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
diff --git a/drivers/usb/gadget/function/f_serial.c b/drivers/usb/gadget/function/f_serial.c
index a9480b9..58f69a7 100644
--- a/drivers/usb/gadget/function/f_serial.c
+++ b/drivers/usb/gadget/function/f_serial.c
@@ -271,6 +271,7 @@ static struct configfs_item_operations serial_item_ops = {
static ssize_t f_serial_console_store(struct config_item *item,
const char *page, size_t count)
{
+ trace_usb_configfs_write_attr(item, "console", page);
return gserial_set_console(to_f_serial_opts(item)->port_num,
page, count);
}
diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
index 6803cd6..4e6acd7 100644
--- a/drivers/usb/gadget/function/f_sourcesink.c
+++ b/drivers/usb/gadget/function/f_sourcesink.c
@@ -907,6 +907,8 @@ static ssize_t f_ss_opts_pattern_store(struct config_item *item,
int ret;
u8 num;
+ trace_usb_configfs_write_attr(item, "pattern", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
@@ -950,6 +952,8 @@ static ssize_t f_ss_opts_isoc_interval_store(struct config_item *item,
int ret;
u8 num;
+ trace_usb_configfs_write_attr(item, "isoc_interval", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
@@ -993,6 +997,8 @@ static ssize_t f_ss_opts_isoc_maxpacket_store(struct config_item *item,
int ret;
u16 num;
+ trace_usb_configfs_write_attr(item, "isoc_maxpacket", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
@@ -1036,6 +1042,8 @@ static ssize_t f_ss_opts_isoc_mult_store(struct config_item *item,
int ret;
u8 num;
+ trace_usb_configfs_write_attr(item, "isoc_mult", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
@@ -1079,6 +1087,8 @@ static ssize_t f_ss_opts_isoc_maxburst_store(struct config_item *item,
int ret;
u8 num;
+ trace_usb_configfs_write_attr(item, "isoc_maxburst", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
@@ -1122,6 +1132,8 @@ static ssize_t f_ss_opts_bulk_buflen_store(struct config_item *item,
int ret;
u32 num;
+ trace_usb_configfs_write_attr(item, "bulk_buflen", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
@@ -1160,6 +1172,8 @@ static ssize_t f_ss_opts_bulk_qlen_store(struct config_item *item,
int ret;
u32 num;
+ trace_usb_configfs_write_attr(item, "bulk_qlen", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
@@ -1198,6 +1212,8 @@ static ssize_t f_ss_opts_iso_qlen_store(struct config_item *item,
int ret;
u32 num;
+ trace_usb_configfs_write_attr(item, "iso_qlen", page);
+
mutex_lock(&opts->lock);
if (opts->refcnt) {
ret = -EBUSY;
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 6f0e1d8..efbf45f 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -1474,6 +1474,8 @@ static ssize_t f_uac1_opts_##name##_store( \
int ret; \
type num; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
@@ -1527,6 +1529,8 @@ static ssize_t f_uac1_opts_##name##_store(struct config_item *item, \
u32 num; \
int i; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
@@ -1573,6 +1577,8 @@ static ssize_t f_uac1_opts_##name##_store(struct config_item *item, \
struct f_uac1_opts *opts = to_f_uac1_opts(item); \
int ret = 0; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c
index e2d7f69..a65917b 100644
--- a/drivers/usb/gadget/function/f_uac1_legacy.c
+++ b/drivers/usb/gadget/function/f_uac1_legacy.c
@@ -837,6 +837,8 @@ static ssize_t f_uac1_opts_##name##_store(struct config_item *item, \
int ret; \
u32 num; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
@@ -882,6 +884,8 @@ static ssize_t f_uac1_opts_##name##_store(struct config_item *item, \
int ret = -EBUSY; \
char *tmp; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) \
goto end; \
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index 1905a8d..1849f3b 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -1886,6 +1886,8 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item, \
int ret; \
type num; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
@@ -1938,6 +1940,8 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item, \
struct f_uac2_opts *opts = to_f_uac2_opts(item); \
int ret = 0; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
@@ -1995,6 +1999,8 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item, \
u32 num; \
int i; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
@@ -2041,6 +2047,8 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item, \
struct f_uac2_opts *opts = to_f_uac2_opts(item); \
int ret = 0; \
\
+ trace_usb_configfs_write_attr(item, #name, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h
index f558c31..05578be 100644
--- a/drivers/usb/gadget/function/u_ether_configfs.h
+++ b/drivers/usb/gadget/function/u_ether_configfs.h
@@ -45,6 +45,8 @@
struct f_##_f_##_opts *opts = to_f_##_f_##_opts(item); \
int ret; \
\
+ trace_usb_configfs_write_attr(item, "dev_addr", page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
mutex_unlock(&opts->lock); \
@@ -80,6 +82,8 @@
struct f_##_f_##_opts *opts = to_f_##_f_##_opts(item); \
int ret; \
\
+ trace_usb_configfs_write_attr(item, "host_addr", page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
mutex_unlock(&opts->lock); \
@@ -115,6 +119,8 @@
u8 val; \
int ret; \
\
+ trace_usb_configfs_write_attr(item, "qmult", page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
@@ -154,6 +160,8 @@ out: \
struct f_##_f_##_opts *opts = to_f_##_f_##_opts(item); \
int ret = -EBUSY; \
\
+ trace_usb_configfs_write_attr(item, "ifname", page); \
+ \
mutex_lock(&opts->lock); \
if (!opts->refcnt) \
ret = gether_set_ifname(opts->net, page, len); \
@@ -185,6 +193,8 @@ out: \
int ret = -EINVAL; \
u8 val; \
\
+ trace_usb_configfs_write_attr(item, #_n_, page); \
+ \
mutex_lock(&opts->lock); \
if (sscanf(page, "%02hhx", &val) > 0) { \
opts->_n_ = val; \
diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index fc139f3..6556e42 100644
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -172,6 +172,8 @@ uvcg_control_header_##cname##_store(struct config_item *item, \
int ret; \
u##bits num; \
\
+ trace_usb_configfs_write_attr(item, #cname, page); \
+ \
mutex_lock(su_mutex); /* for navigating configfs hierarchy */ \
\
opts_item = ch->item.ci_parent->ci_parent->ci_parent; \
@@ -1129,6 +1131,8 @@ static ssize_t uvcg_frame_##cname##_store(struct config_item *item, \
typeof(f->frame.cname) num; \
int ret; \
\
+ trace_usb_configfs_write_attr(item, #aname, page); \
+ \
ret = kstrtou##bits(page, 0, &num); \
if (ret) \
return ret; \
@@ -1288,6 +1292,8 @@ static ssize_t uvcg_frame_dw_frame_interval_store(struct config_item *item,
int ret = 0, n = 0;
u32 *frm_intrv, *tmp;
+ trace_usb_configfs_write_attr(item, "dwFrameInterval", page);
+
mutex_lock(su_mutex); /* for navigating configfs hierarchy */
opts_item = ch->item.ci_parent->ci_parent->ci_parent->ci_parent;
@@ -1484,6 +1490,8 @@ static ssize_t uvcg_uncompressed_guid_format_store(struct config_item *item,
struct mutex *su_mutex = &ch->fmt.group.cg_subsys->su_mutex;
int ret;
+ trace_usb_configfs_write_attr(item, "guidFormat", page);
+
mutex_lock(su_mutex); /* for navigating configfs hierarchy */
opts_item = ch->fmt.group.cg_item.ci_parent->ci_parent->ci_parent;
@@ -1566,6 +1574,8 @@ uvcg_uncompressed_##cname##_store(struct config_item *item, \
int ret; \
u8 num; \
\
+ trace_usb_configfs_write_attr(item, #aname, page); \
+ \
mutex_lock(su_mutex); /* for navigating configfs hierarchy */ \
\
opts_item = u->fmt.group.cg_item.ci_parent->ci_parent->ci_parent;\
@@ -1613,6 +1623,8 @@ uvcg_uncompressed_bma_controls_store(struct config_item *item,
const char *page, size_t len)
{
struct uvcg_uncompressed *unc = to_uvcg_uncompressed(item);
+
+ trace_usb_configfs_write_attr(item, "bmaControls", page);
return uvcg_format_bma_controls_store(&unc->fmt, page, len);
}
@@ -1761,6 +1773,8 @@ uvcg_mjpeg_##cname##_store(struct config_item *item, \
int ret; \
u8 num; \
\
+ trace_usb_configfs_write_attr(item, #aname, page); \
+ \
mutex_lock(su_mutex); /* for navigating configfs hierarchy */ \
\
opts_item = u->fmt.group.cg_item.ci_parent->ci_parent->ci_parent;\
@@ -1808,6 +1822,8 @@ uvcg_mjpeg_bma_controls_store(struct config_item *item,
const char *page, size_t len)
{
struct uvcg_mjpeg *u = to_uvcg_mjpeg(item);
+
+ trace_usb_configfs_write_attr(item, "bmaControls", page);
return uvcg_format_bma_controls_store(&u->fmt, page, len);
}
@@ -2420,6 +2436,8 @@ f_uvc_opts_##cname##_store(struct config_item *item, \
unsigned int num; \
int ret; \
\
+ trace_usb_configfs_write_attr(item, #aname, page); \
+ \
mutex_lock(&opts->lock); \
if (opts->refcnt) { \
ret = -EBUSY; \
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index a90e626..491e693 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -612,11 +612,14 @@ void trace_usb_configfs_link_group(struct config_item *pitem,
struct config_item *item);
void trace_usb_configfs_unlink_group(struct config_item *pitem,
struct config_item *item);
+void trace_usb_configfs_write_attr(struct config_item *item,
+ const char *attr, const char *page);
#else
#define trace_usb_configfs_make_group(pitem, item) do {} while(0)
#define trace_usb_configfs_drop_group(pitem, item) do {} while(0)
#define trace_usb_configfs_link_group(pitem, item) do {} while(0)
#define trace_usb_configfs_unlink_group(pitem, item) do {} while(0)
+#define trace_usb_configfs_write_attr(item, attr, page) do {} while(0)
#endif
struct usb_configuration *usb_get_config(struct usb_composite_dev *cdev,
diff --git a/include/linux/usb/gadget_configfs.h b/include/linux/usb/gadget_configfs.h
index a89f177..2c0663e 100644
--- a/include/linux/usb/gadget_configfs.h
+++ b/include/linux/usb/gadget_configfs.h
@@ -14,6 +14,8 @@ static ssize_t __struct##_##__name##_store(struct config_item *item, \
struct __struct *gs = to_##__struct(item); \
int ret; \
\
+ trace_usb_configfs_write_attr(item, #__name, page); \
+ \
ret = usb_string_copy(page, &gs->__name); \
if (ret) \
return ret; \
--
2.7.4
