浏览代码

binder: remove binder_debug_no_lock mechanism

With the global lock, there was a mechanism to access
binder driver debugging information with the global
lock disabled to debug deadlocks or other issues.
This mechanism is rarely (if ever) used anymore
and wasn't needed during the development of
fine-grained locking in the binder driver.
Removing it.

Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Todd Kjos 8 年之前
父节点
当前提交
1cf29cf429
共有 1 个文件被更改,包括 8 次插入23 次删除
  1. 8 23
      drivers/android/binder.c

+ 8 - 23
drivers/android/binder.c

@@ -107,9 +107,6 @@ static uint32_t binder_debug_mask = BINDER_DEBUG_USER_ERROR |
 	BINDER_DEBUG_FAILED_TRANSACTION | BINDER_DEBUG_DEAD_TRANSACTION;
 	BINDER_DEBUG_FAILED_TRANSACTION | BINDER_DEBUG_DEAD_TRANSACTION;
 module_param_named(debug_mask, binder_debug_mask, uint, S_IWUSR | S_IRUGO);
 module_param_named(debug_mask, binder_debug_mask, uint, S_IWUSR | S_IRUGO);
 
 
-static bool binder_debug_no_lock;
-module_param_named(proc_no_lock, binder_debug_no_lock, bool, S_IWUSR | S_IRUGO);
-
 static char *binder_devices_param = CONFIG_ANDROID_BINDER_DEVICES;
 static char *binder_devices_param = CONFIG_ANDROID_BINDER_DEVICES;
 module_param_named(devices, binder_devices_param, charp, 0444);
 module_param_named(devices, binder_devices_param, charp, 0444);
 
 
@@ -3507,10 +3504,8 @@ static int binder_state_show(struct seq_file *m, void *unused)
 {
 {
 	struct binder_proc *proc;
 	struct binder_proc *proc;
 	struct binder_node *node;
 	struct binder_node *node;
-	int do_lock = !binder_debug_no_lock;
 
 
-	if (do_lock)
-		binder_lock(__func__);
+	binder_lock(__func__);
 
 
 	seq_puts(m, "binder state:\n");
 	seq_puts(m, "binder state:\n");
 
 
@@ -3521,18 +3516,15 @@ static int binder_state_show(struct seq_file *m, void *unused)
 
 
 	hlist_for_each_entry(proc, &binder_procs, proc_node)
 	hlist_for_each_entry(proc, &binder_procs, proc_node)
 		print_binder_proc(m, proc, 1);
 		print_binder_proc(m, proc, 1);
-	if (do_lock)
-		binder_unlock(__func__);
+	binder_unlock(__func__);
 	return 0;
 	return 0;
 }
 }
 
 
 static int binder_stats_show(struct seq_file *m, void *unused)
 static int binder_stats_show(struct seq_file *m, void *unused)
 {
 {
 	struct binder_proc *proc;
 	struct binder_proc *proc;
-	int do_lock = !binder_debug_no_lock;
 
 
-	if (do_lock)
-		binder_lock(__func__);
+	binder_lock(__func__);
 
 
 	seq_puts(m, "binder stats:\n");
 	seq_puts(m, "binder stats:\n");
 
 
@@ -3540,24 +3532,20 @@ static int binder_stats_show(struct seq_file *m, void *unused)
 
 
 	hlist_for_each_entry(proc, &binder_procs, proc_node)
 	hlist_for_each_entry(proc, &binder_procs, proc_node)
 		print_binder_proc_stats(m, proc);
 		print_binder_proc_stats(m, proc);
-	if (do_lock)
-		binder_unlock(__func__);
+	binder_unlock(__func__);
 	return 0;
 	return 0;
 }
 }
 
 
 static int binder_transactions_show(struct seq_file *m, void *unused)
 static int binder_transactions_show(struct seq_file *m, void *unused)
 {
 {
 	struct binder_proc *proc;
 	struct binder_proc *proc;
-	int do_lock = !binder_debug_no_lock;
 
 
-	if (do_lock)
-		binder_lock(__func__);
+	binder_lock(__func__);
 
 
 	seq_puts(m, "binder transactions:\n");
 	seq_puts(m, "binder transactions:\n");
 	hlist_for_each_entry(proc, &binder_procs, proc_node)
 	hlist_for_each_entry(proc, &binder_procs, proc_node)
 		print_binder_proc(m, proc, 0);
 		print_binder_proc(m, proc, 0);
-	if (do_lock)
-		binder_unlock(__func__);
+	binder_unlock(__func__);
 	return 0;
 	return 0;
 }
 }
 
 
@@ -3565,10 +3553,8 @@ static int binder_proc_show(struct seq_file *m, void *unused)
 {
 {
 	struct binder_proc *itr;
 	struct binder_proc *itr;
 	int pid = (unsigned long)m->private;
 	int pid = (unsigned long)m->private;
-	int do_lock = !binder_debug_no_lock;
 
 
-	if (do_lock)
-		binder_lock(__func__);
+	binder_lock(__func__);
 
 
 	hlist_for_each_entry(itr, &binder_procs, proc_node) {
 	hlist_for_each_entry(itr, &binder_procs, proc_node) {
 		if (itr->pid == pid) {
 		if (itr->pid == pid) {
@@ -3576,8 +3562,7 @@ static int binder_proc_show(struct seq_file *m, void *unused)
 			print_binder_proc(m, itr, 1);
 			print_binder_proc(m, itr, 1);
 		}
 		}
 	}
 	}
-	if (do_lock)
-		binder_unlock(__func__);
+	binder_unlock(__func__);
 	return 0;
 	return 0;
 }
 }