UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

binder: fix sparse warnings on locking context 

Add __acquire()/__release() annnotations to fix warnings
in sparse context checking

There is one case where the warning was due to a lack of
a "default:" case in a switch statement where a lock was
being released in each of the cases, so the default
case was added.

Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Todd Kjos 2018-11-06 15:56:31 -08:00 committed by Greg Kroah-Hartman
parent 1dbfe7f23b
commit 324fa64cf4
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/android/binder.c
View File

@ -660,6 +660,7 @@ struct binder_transaction {
#define binder_proc_lock(proc) _binder_proc_lock(proc, __LINE__) #define binder_proc_lock(proc) _binder_proc_lock(proc, __LINE__)
static void static void
_binder_proc_lock(struct binder_proc *proc, int line) _binder_proc_lock(struct binder_proc *proc, int line)
__acquires(&proc->outer_lock)
{ {
binder_debug(BINDER_DEBUG_SPINLOCKS, binder_debug(BINDER_DEBUG_SPINLOCKS,
"%s: line=%d\n", __func__, line); "%s: line=%d\n", __func__, line);
@ -675,6 +676,7 @@ _binder_proc_lock(struct binder_proc *proc, int line)
#define binder_proc_unlock(_proc) _binder_proc_unlock(_proc, __LINE__) #define binder_proc_unlock(_proc) _binder_proc_unlock(_proc, __LINE__)
static void static void
_binder_proc_unlock(struct binder_proc *proc, int line) _binder_proc_unlock(struct binder_proc *proc, int line)
__releases(&proc->outer_lock)
{ {
binder_debug(BINDER_DEBUG_SPINLOCKS, binder_debug(BINDER_DEBUG_SPINLOCKS,
"%s: line=%d\n", __func__, line); "%s: line=%d\n", __func__, line);
@ -690,6 +692,7 @@ _binder_proc_unlock(struct binder_proc *proc, int line)
#define binder_inner_proc_lock(proc) _binder_inner_proc_lock(proc, __LINE__) #define binder_inner_proc_lock(proc) _binder_inner_proc_lock(proc, __LINE__)
static void static void
_binder_inner_proc_lock(struct binder_proc *proc, int line) _binder_inner_proc_lock(struct binder_proc *proc, int line)
__acquires(&proc->inner_lock)
{ {
binder_debug(BINDER_DEBUG_SPINLOCKS, binder_debug(BINDER_DEBUG_SPINLOCKS,
"%s: line=%d\n", __func__, line); "%s: line=%d\n", __func__, line);
@ -705,6 +708,7 @@ _binder_inner_proc_lock(struct binder_proc *proc, int line)
#define binder_inner_proc_unlock(proc) _binder_inner_proc_unlock(proc, __LINE__) #define binder_inner_proc_unlock(proc) _binder_inner_proc_unlock(proc, __LINE__)
static void static void
_binder_inner_proc_unlock(struct binder_proc *proc, int line) _binder_inner_proc_unlock(struct binder_proc *proc, int line)
__releases(&proc->inner_lock)
{ {
binder_debug(BINDER_DEBUG_SPINLOCKS, binder_debug(BINDER_DEBUG_SPINLOCKS,
"%s: line=%d\n", __func__, line); "%s: line=%d\n", __func__, line);
@ -720,6 +724,7 @@ _binder_inner_proc_unlock(struct binder_proc *proc, int line)
#define binder_node_lock(node) _binder_node_lock(node, __LINE__) #define binder_node_lock(node) _binder_node_lock(node, __LINE__)
static void static void
_binder_node_lock(struct binder_node *node, int line) _binder_node_lock(struct binder_node *node, int line)
__acquires(&node->lock)
{ {
binder_debug(BINDER_DEBUG_SPINLOCKS, binder_debug(BINDER_DEBUG_SPINLOCKS,
"%s: line=%d\n", __func__, line); "%s: line=%d\n", __func__, line);
@ -735,6 +740,7 @@ _binder_node_lock(struct binder_node *node, int line)
#define binder_node_unlock(node) _binder_node_unlock(node, __LINE__) #define binder_node_unlock(node) _binder_node_unlock(node, __LINE__)
static void static void
_binder_node_unlock(struct binder_node *node, int line) _binder_node_unlock(struct binder_node *node, int line)
__releases(&node->lock)
{ {
binder_debug(BINDER_DEBUG_SPINLOCKS, binder_debug(BINDER_DEBUG_SPINLOCKS,
"%s: line=%d\n", __func__, line); "%s: line=%d\n", __func__, line);
@ -751,12 +757,16 @@ _binder_node_unlock(struct binder_node *node, int line)
#define binder_node_inner_lock(node) _binder_node_inner_lock(node, __LINE__) #define binder_node_inner_lock(node) _binder_node_inner_lock(node, __LINE__)
static void static void
_binder_node_inner_lock(struct binder_node *node, int line) _binder_node_inner_lock(struct binder_node *node, int line)
__acquires(&node->lock) __acquires(&node->proc->inner_lock)
{ {
binder_debug(BINDER_DEBUG_SPINLOCKS, binder_debug(BINDER_DEBUG_SPINLOCKS,
"%s: line=%d\n", __func__, line); "%s: line=%d\n", __func__, line);
spin_lock(&node->lock); spin_lock(&node->lock);
if (node->proc) if (node->proc)
binder_inner_proc_lock(node->proc); binder_inner_proc_lock(node->proc);
else
/* annotation for sparse */
__acquire(&node->proc->inner_lock);
} }
/** /**
@ -768,6 +778,7 @@ _binder_node_inner_lock(struct binder_node *node, int line)
#define binder_node_inner_unlock(node) _binder_node_inner_unlock(node, __LINE__) #define binder_node_inner_unlock(node) _binder_node_inner_unlock(node, __LINE__)
static void static void
_binder_node_inner_unlock(struct binder_node *node, int line) _binder_node_inner_unlock(struct binder_node *node, int line)
__releases(&node->lock) __releases(&node->proc->inner_lock)
{ {
struct binder_proc *proc = node->proc; struct binder_proc *proc = node->proc;
@ -775,6 +786,9 @@ _binder_node_inner_unlock(struct binder_node *node, int line)
"%s: line=%d\n", __func__, line); "%s: line=%d\n", __func__, line);
if (proc) if (proc)
binder_inner_proc_unlock(proc); binder_inner_proc_unlock(proc);
else
/* annotation for sparse */
__release(&node->proc->inner_lock);
spin_unlock(&node->lock); spin_unlock(&node->lock);
} }
@ -1384,10 +1398,14 @@ static void binder_dec_node_tmpref(struct binder_node *node)
binder_node_inner_lock(node); binder_node_inner_lock(node);
if (!node->proc) if (!node->proc)
spin_lock(&binder_dead_nodes_lock); spin_lock(&binder_dead_nodes_lock);
else
__acquire(&binder_dead_nodes_lock);
node->tmp_refs--; node->tmp_refs--;
BUG_ON(node->tmp_refs < 0); BUG_ON(node->tmp_refs < 0);
if (!node->proc) if (!node->proc)
spin_unlock(&binder_dead_nodes_lock); spin_unlock(&binder_dead_nodes_lock);
else
__release(&binder_dead_nodes_lock);
/* /*
* Call binder_dec_node() to check if all refcounts are 0 * Call binder_dec_node() to check if all refcounts are 0
* and cleanup is needed. Calling with strong=0 and internal=1 * and cleanup is needed. Calling with strong=0 and internal=1
@ -1890,18 +1908,22 @@ static struct binder_thread *binder_get_txn_from(
*/ */
static struct binder_thread *binder_get_txn_from_and_acq_inner( static struct binder_thread *binder_get_txn_from_and_acq_inner(
struct binder_transaction *t) struct binder_transaction *t)
__acquires(&t->from->proc->inner_lock)
{ {
struct binder_thread *from; struct binder_thread *from;
from = binder_get_txn_from(t); from = binder_get_txn_from(t);
if (!from) if (!from) {
__acquire(&from->proc->inner_lock);
return NULL; return NULL;
}
binder_inner_proc_lock(from->proc); binder_inner_proc_lock(from->proc);
if (t->from) { if (t->from) {
BUG_ON(from != t->from); BUG_ON(from != t->from);
return from; return from;
} }
binder_inner_proc_unlock(from->proc); binder_inner_proc_unlock(from->proc);
__acquire(&from->proc->inner_lock);
binder_thread_dec_tmpref(from); binder_thread_dec_tmpref(from);
return NULL; return NULL;
} }
@ -1973,6 +1995,8 @@ static void binder_send_failed_reply(struct binder_transaction *t,
binder_thread_dec_tmpref(target_thread); binder_thread_dec_tmpref(target_thread);
binder_free_transaction(t); binder_free_transaction(t);
return; return;
} else {
__release(&target_thread->proc->inner_lock);
} }
next = t->from_parent; next = t->from_parent;
@ -2394,11 +2418,15 @@ static int binder_translate_handle(struct flat_binder_object *fp,
fp->cookie = node->cookie; fp->cookie = node->cookie;
if (node->proc) if (node->proc)
binder_inner_proc_lock(node->proc); binder_inner_proc_lock(node->proc);
else
__acquire(&node->proc->inner_lock);
binder_inc_node_nilocked(node, binder_inc_node_nilocked(node,
fp->hdr.type == BINDER_TYPE_BINDER, fp->hdr.type == BINDER_TYPE_BINDER,
0, NULL); 0, NULL);
if (node->proc) if (node->proc)
binder_inner_proc_unlock(node->proc); binder_inner_proc_unlock(node->proc);
else
__release(&node->proc->inner_lock);
trace_binder_transaction_ref_to_node(t, node, &src_rdata); trace_binder_transaction_ref_to_node(t, node, &src_rdata);
binder_debug(BINDER_DEBUG_TRANSACTION, binder_debug(BINDER_DEBUG_TRANSACTION,
" ref %d desc %d -> node %d u%016llx\n", " ref %d desc %d -> node %d u%016llx\n",
@ -2762,6 +2790,8 @@ static void binder_transaction(struct binder_proc *proc,
binder_set_nice(in_reply_to->saved_priority); binder_set_nice(in_reply_to->saved_priority);
target_thread = binder_get_txn_from_and_acq_inner(in_reply_to); target_thread = binder_get_txn_from_and_acq_inner(in_reply_to);
if (target_thread == NULL) { if (target_thread == NULL) {
/* annotation for sparse */
__release(&target_thread->proc->inner_lock);
return_error = BR_DEAD_REPLY; return_error = BR_DEAD_REPLY;
return_error_line = __LINE__; return_error_line = __LINE__;
goto err_dead_binder; goto err_dead_binder;
@ -4161,6 +4191,11 @@ retry:
if (cmd == BR_DEAD_BINDER) if (cmd == BR_DEAD_BINDER)
goto done; /* DEAD_BINDER notifications can cause transactions */ goto done; /* DEAD_BINDER notifications can cause transactions */
} break; } break;
default:
binder_inner_proc_unlock(proc);
pr_err("%d:%d: bad work type %d\n",
proc->pid, thread->pid, w->type);
break;
} }
if (!t) if (!t)
@ -4464,6 +4499,8 @@ static int binder_thread_release(struct binder_proc *proc,
spin_lock(&t->lock); spin_lock(&t->lock);
if (t->to_thread == thread) if (t->to_thread == thread)
send_reply = t; send_reply = t;
} else {
__acquire(&t->lock);
} }
thread->is_dead = true; thread->is_dead = true;
@ -4492,7 +4529,11 @@ static int binder_thread_release(struct binder_proc *proc,
spin_unlock(&last_t->lock); spin_unlock(&last_t->lock);
if (t) if (t)
spin_lock(&t->lock); spin_lock(&t->lock);
else
__acquire(&t->lock);
} }
/* annotation for sparse, lock not acquired in last iteration above */
__release(&t->lock);
/* /*
* If this thread used poll, make sure we remove the waitqueue * If this thread used poll, make sure we remove the waitqueue

1
drivers/android/binder_alloc.c
View File

@ -943,6 +943,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item,
struct list_lru_one *lru, struct list_lru_one *lru,
spinlock_t *lock, spinlock_t *lock,
void *cb_arg) void *cb_arg)
__must_hold(lock)
{ {
struct mm_struct *mm = NULL; struct mm_struct *mm = NULL;
struct binder_lru_page *page = container_of(item, struct binder_lru_page *page = container_of(item,