Skip to content

Commit 0e13e45

Browse files
Hridya Valsarajugregkh
authored andcommitted
binder: Add stats, state and transactions files
The following binder stat files currently live in debugfs. /sys/kernel/debug/binder/state /sys/kernel/debug/binder/stats /sys/kernel/debug/binder/transactions This patch makes these files available in a binderfs instance mounted with the mount option 'stats=global'. For example, if a binderfs instance is mounted at path /dev/binderfs, the above files will be available at the following locations: /dev/binderfs/binder_logs/state /dev/binderfs/binder_logs/stats /dev/binderfs/binder_logs/transactions This provides a way to access them even when debugfs is not mounted. Acked-by: Christian Brauner <[email protected]> Signed-off-by: Hridya Valsaraju <[email protected]> Acked-by: Christian Brauner <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f008345 commit 0e13e45

File tree

3 files changed

+153
-10
lines changed

3 files changed

+153
-10
lines changed

drivers/android/binder.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5907,7 +5907,7 @@ static void print_binder_proc_stats(struct seq_file *m,
59075907
}
59085908

59095909

5910-
static int state_show(struct seq_file *m, void *unused)
5910+
int binder_state_show(struct seq_file *m, void *unused)
59115911
{
59125912
struct binder_proc *proc;
59135913
struct binder_node *node;
@@ -5946,7 +5946,7 @@ static int state_show(struct seq_file *m, void *unused)
59465946
return 0;
59475947
}
59485948

5949-
static int stats_show(struct seq_file *m, void *unused)
5949+
int binder_stats_show(struct seq_file *m, void *unused)
59505950
{
59515951
struct binder_proc *proc;
59525952

@@ -5962,7 +5962,7 @@ static int stats_show(struct seq_file *m, void *unused)
59625962
return 0;
59635963
}
59645964

5965-
static int transactions_show(struct seq_file *m, void *unused)
5965+
int binder_transactions_show(struct seq_file *m, void *unused)
59665966
{
59675967
struct binder_proc *proc;
59685968

@@ -6050,9 +6050,6 @@ const struct file_operations binder_fops = {
60506050
.release = binder_release,
60516051
};
60526052

6053-
DEFINE_SHOW_ATTRIBUTE(state);
6054-
DEFINE_SHOW_ATTRIBUTE(stats);
6055-
DEFINE_SHOW_ATTRIBUTE(transactions);
60566053
DEFINE_SHOW_ATTRIBUTE(transaction_log);
60576054

60586055
static int __init init_binder_device(const char *name)
@@ -6108,17 +6105,17 @@ static int __init binder_init(void)
61086105
0444,
61096106
binder_debugfs_dir_entry_root,
61106107
NULL,
6111-
&state_fops);
6108+
&binder_state_fops);
61126109
debugfs_create_file("stats",
61136110
0444,
61146111
binder_debugfs_dir_entry_root,
61156112
NULL,
6116-
&stats_fops);
6113+
&binder_stats_fops);
61176114
debugfs_create_file("transactions",
61186115
0444,
61196116
binder_debugfs_dir_entry_root,
61206117
NULL,
6121-
&transactions_fops);
6118+
&binder_transactions_fops);
61226119
debugfs_create_file("transaction_log",
61236120
0444,
61246121
binder_debugfs_dir_entry_root,

drivers/android/binder_internal.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,12 @@ static inline int __init init_binderfs(void)
5757
}
5858
#endif
5959

60+
int binder_stats_show(struct seq_file *m, void *unused);
61+
DEFINE_SHOW_ATTRIBUTE(binder_stats);
62+
63+
int binder_state_show(struct seq_file *m, void *unused);
64+
DEFINE_SHOW_ATTRIBUTE(binder_state);
65+
66+
int binder_transactions_show(struct seq_file *m, void *unused);
67+
DEFINE_SHOW_ATTRIBUTE(binder_transactions);
6068
#endif /* _LINUX_BINDER_INTERNAL_H */

drivers/android/binderfs.c

Lines changed: 139 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static void binderfs_evict_inode(struct inode *inode)
280280

281281
clear_inode(inode);
282282

283-
if (!device)
283+
if (!S_ISCHR(inode->i_mode) || !device)
284284
return;
285285

286286
mutex_lock(&binderfs_minors_mutex);
@@ -502,6 +502,141 @@ static const struct inode_operations binderfs_dir_inode_operations = {
502502
.unlink = binderfs_unlink,
503503
};
504504

505+
static struct inode *binderfs_make_inode(struct super_block *sb, int mode)
506+
{
507+
struct inode *ret;
508+
509+
ret = new_inode(sb);
510+
if (ret) {
511+
ret->i_ino = iunique(sb, BINDERFS_MAX_MINOR + INODE_OFFSET);
512+
ret->i_mode = mode;
513+
ret->i_atime = ret->i_mtime = ret->i_ctime = current_time(ret);
514+
}
515+
return ret;
516+
}
517+
518+
static struct dentry *binderfs_create_dentry(struct dentry *parent,
519+
const char *name)
520+
{
521+
struct dentry *dentry;
522+
523+
dentry = lookup_one_len(name, parent, strlen(name));
524+
if (IS_ERR(dentry))
525+
return dentry;
526+
527+
/* Return error if the file/dir already exists. */
528+
if (d_really_is_positive(dentry)) {
529+
dput(dentry);
530+
return ERR_PTR(-EEXIST);
531+
}
532+
533+
return dentry;
534+
}
535+
536+
static struct dentry *binderfs_create_file(struct dentry *parent,
537+
const char *name,
538+
const struct file_operations *fops,
539+
void *data)
540+
{
541+
struct dentry *dentry;
542+
struct inode *new_inode, *parent_inode;
543+
struct super_block *sb;
544+
545+
parent_inode = d_inode(parent);
546+
inode_lock(parent_inode);
547+
548+
dentry = binderfs_create_dentry(parent, name);
549+
if (IS_ERR(dentry))
550+
goto out;
551+
552+
sb = parent_inode->i_sb;
553+
new_inode = binderfs_make_inode(sb, S_IFREG | 0444);
554+
if (!new_inode) {
555+
dput(dentry);
556+
dentry = ERR_PTR(-ENOMEM);
557+
goto out;
558+
}
559+
560+
new_inode->i_fop = fops;
561+
new_inode->i_private = data;
562+
d_instantiate(dentry, new_inode);
563+
fsnotify_create(parent_inode, dentry);
564+
565+
out:
566+
inode_unlock(parent_inode);
567+
return dentry;
568+
}
569+
570+
static struct dentry *binderfs_create_dir(struct dentry *parent,
571+
const char *name)
572+
{
573+
struct dentry *dentry;
574+
struct inode *new_inode, *parent_inode;
575+
struct super_block *sb;
576+
577+
parent_inode = d_inode(parent);
578+
inode_lock(parent_inode);
579+
580+
dentry = binderfs_create_dentry(parent, name);
581+
if (IS_ERR(dentry))
582+
goto out;
583+
584+
sb = parent_inode->i_sb;
585+
new_inode = binderfs_make_inode(sb, S_IFDIR | 0755);
586+
if (!new_inode) {
587+
dput(dentry);
588+
dentry = ERR_PTR(-ENOMEM);
589+
goto out;
590+
}
591+
592+
new_inode->i_fop = &simple_dir_operations;
593+
new_inode->i_op = &simple_dir_inode_operations;
594+
595+
set_nlink(new_inode, 2);
596+
d_instantiate(dentry, new_inode);
597+
inc_nlink(parent_inode);
598+
fsnotify_mkdir(parent_inode, dentry);
599+
600+
out:
601+
inode_unlock(parent_inode);
602+
return dentry;
603+
}
604+
605+
static int init_binder_logs(struct super_block *sb)
606+
{
607+
struct dentry *binder_logs_root_dir, *dentry;
608+
int ret = 0;
609+
610+
binder_logs_root_dir = binderfs_create_dir(sb->s_root,
611+
"binder_logs");
612+
if (IS_ERR(binder_logs_root_dir)) {
613+
ret = PTR_ERR(binder_logs_root_dir);
614+
goto out;
615+
}
616+
617+
dentry = binderfs_create_file(binder_logs_root_dir, "stats",
618+
&binder_stats_fops, NULL);
619+
if (IS_ERR(dentry)) {
620+
ret = PTR_ERR(dentry);
621+
goto out;
622+
}
623+
624+
dentry = binderfs_create_file(binder_logs_root_dir, "state",
625+
&binder_state_fops, NULL);
626+
if (IS_ERR(dentry)) {
627+
ret = PTR_ERR(dentry);
628+
goto out;
629+
}
630+
631+
dentry = binderfs_create_file(binder_logs_root_dir, "transactions",
632+
&binder_transactions_fops, NULL);
633+
if (IS_ERR(dentry))
634+
ret = PTR_ERR(dentry);
635+
636+
out:
637+
return ret;
638+
}
639+
505640
static int binderfs_fill_super(struct super_block *sb, void *data, int silent)
506641
{
507642
int ret;
@@ -579,6 +714,9 @@ static int binderfs_fill_super(struct super_block *sb, void *data, int silent)
579714
name++;
580715
}
581716

717+
if (info->mount_opts.stats_mode == STATS_GLOBAL)
718+
return init_binder_logs(sb);
719+
582720
return 0;
583721
}
584722

0 commit comments

Comments
 (0)