From: Serban Constantinescu <serban.constantinescu@arm.com>
To: gregkh@linuxfoundation.org, arve@android.com,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
john.stultz@linaro.org, ccross@android.com, Dave.Butcher@arm.com,
irogers@google.com, romlem@android.com
Cc: Serban Constantinescu <serban.constantinescu@arm.com>
Subject: [PATCH v1 3/9] staging: android: binder: Add cmd == CMD_NAME handling
Date: Wed, 4 Dec 2013 18:09:35 +0000 [thread overview]
Message-ID: <1386180581-6710-4-git-send-email-serban.constantinescu@arm.com> (raw)
In-Reply-To: <1386180581-6710-1-git-send-email-serban.constantinescu@arm.com>
This patch modifies the functions that need to be passed the explicit
command to use a boolean flag. This way we can reuse the code for 64bit
compat commands.
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
---
drivers/staging/android/binder.c | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 6fbb340..16109cd 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -1701,7 +1701,7 @@ err_no_context_mgr_node:
}
static void bc_increfs_done(struct binder_proc *proc,
- struct binder_thread *thread, uint32_t cmd,
+ struct binder_thread *thread, bool acquire,
void __user *node_ptr, void __user *cookie)
{
struct binder_node *node;
@@ -1710,22 +1710,22 @@ static void bc_increfs_done(struct binder_proc *proc,
if (node == NULL) {
binder_user_error("%d:%d %s u%p no match\n",
proc->pid, thread->pid,
- cmd == BC_INCREFS_DONE ?
- "BC_INCREFS_DONE" :
- "BC_ACQUIRE_DONE",
+ acquire ?
+ "BC_ACQUIRE_DONE" :
+ "BC_INCREFS_DONE",
node_ptr);
return;
}
if (cookie != node->cookie) {
binder_user_error("%d:%d %s u%p node %d cookie mismatch %p != %p\n",
proc->pid, thread->pid,
- cmd == BC_INCREFS_DONE ?
- "BC_INCREFS_DONE" : "BC_ACQUIRE_DONE",
+ acquire ?
+ "BC_ACQUIRE_DONE" : "BC_INCREFS_DONE",
node_ptr, node->debug_id,
cookie, node->cookie);
return;
}
- if (cmd == BC_ACQUIRE_DONE) {
+ if (acquire) {
if (node->pending_strong_ref == 0) {
binder_user_error("%d:%d BC_ACQUIRE_DONE node %d has no pending acquire request\n",
proc->pid, thread->pid,
@@ -1742,13 +1742,13 @@ static void bc_increfs_done(struct binder_proc *proc,
}
node->pending_weak_ref = 0;
}
- binder_dec_node(node, cmd == BC_ACQUIRE_DONE, 0);
+ binder_dec_node(node, acquire, 0);
binder_debug(BINDER_DEBUG_USER_REFS,
"%d:%d %s node %d ls %d lw %d\n",
proc->pid, thread->pid,
- cmd == BC_INCREFS_DONE ?
- "BC_INCREFS_DONE" :
- "BC_ACQUIRE_DONE",
+ acquire ?
+ "BC_ACQUIRE_DONE" :
+ "BC_INCREFS_DONE",
node->debug_id, node->local_strong_refs,
node->local_weak_refs);
return;
@@ -1793,7 +1793,7 @@ static void bc_free_buffer(struct binder_proc *proc,
}
static void bc_clear_death_notif(struct binder_proc *proc,
- struct binder_thread *thread, uint32_t cmd,
+ struct binder_thread *thread, bool request,
uint32_t target, void __user *cookie)
{
struct binder_ref *ref;
@@ -1803,7 +1803,7 @@ static void bc_clear_death_notif(struct binder_proc *proc,
if (ref == NULL) {
binder_user_error("%d:%d %s invalid ref %d\n",
proc->pid, thread->pid,
- cmd == BC_REQUEST_DEATH_NOTIFICATION ?
+ request ?
"BC_REQUEST_DEATH_NOTIFICATION" :
"BC_CLEAR_DEATH_NOTIFICATION",
target);
@@ -1813,13 +1813,13 @@ static void bc_clear_death_notif(struct binder_proc *proc,
binder_debug(BINDER_DEBUG_DEATH_NOTIFICATION,
"%d:%d %s %p ref %d desc %d s %d w %d for node %d\n",
proc->pid, thread->pid,
- cmd == BC_REQUEST_DEATH_NOTIFICATION ?
+ request ?
"BC_REQUEST_DEATH_NOTIFICATION" :
"BC_CLEAR_DEATH_NOTIFICATION",
cookie, ref->debug_id, ref->desc,
ref->strong, ref->weak, ref->node->debug_id);
- if (cmd == BC_REQUEST_DEATH_NOTIFICATION) {
+ if (request) {
if (ref->death) {
binder_user_error("%d:%d BC_REQUEST_DEATH_NOTIFICATION death notification already set\n",
proc->pid, thread->pid);
@@ -1993,7 +1993,7 @@ static int binder_thread_write(struct binder_proc *proc,
if (get_user(cookie, (void * __user *)ptr))
return -EFAULT;
ptr += sizeof(void *);
- bc_increfs_done(proc, thread, cmd, node_ptr, cookie);
+ bc_increfs_done(proc, thread, cmd == BC_ACQUIRE_DONE, node_ptr, cookie);
break;
}
case BC_ATTEMPT_ACQUIRE:
@@ -2071,7 +2071,8 @@ static int binder_thread_write(struct binder_proc *proc,
if (get_user(cookie, (void __user * __user *)ptr))
return -EFAULT;
ptr += sizeof(void *);
- bc_clear_death_notif(proc, thread, cmd, target, cookie);
+ bc_clear_death_notif(proc, thread, cmd == BC_REQUEST_DEATH_NOTIFICATION,
+ target, cookie);
break;
}
case BC_DEAD_BINDER_DONE: {
--
1.7.9.5
next prev parent reply other threads:[~2013-12-04 18:14 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-04 18:09 [PATCH v1 0/9] Android: Add Support for Binder Compat Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 1/9] staging: android: binder: Move some of the logic into subfunction Serban Constantinescu
2013-12-05 8:00 ` Dan Carpenter
2013-12-05 18:37 ` Serban Constantinescu
2013-12-05 8:18 ` Dan Carpenter
2013-12-05 15:31 ` Greg KH
2013-12-05 18:35 ` Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 2/9] staging: android: binder: Add binder_copy_to_user() Serban Constantinescu
2013-12-04 23:17 ` Greg KH
2013-12-05 18:44 ` Serban Constantinescu
2013-12-05 8:36 ` Dan Carpenter
2013-12-04 18:09 ` Serban Constantinescu [this message]
2013-12-05 8:40 ` [PATCH v1 3/9] staging: android: binder: Add cmd == CMD_NAME handling Dan Carpenter
2013-12-05 18:50 ` Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 4/9] staging: android: binder: Add align_helper() macro Serban Constantinescu
2013-12-05 8:41 ` Dan Carpenter
2013-12-04 18:09 ` [PATCH v1 5/9] staging: android: binder: Add deref_helper() macro Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 6/9] staging: android: binder: Add size_helper() macro Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 7/9] staging: android: binder: Add copy_flat_binder_object() Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 8/9] staging: android: binder: Add binder compat handling to binder.h Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 9/9] staging: android: binder: Add binder compat layer Serban Constantinescu
2013-12-04 18:35 ` Greg KH
2013-12-04 20:46 ` Colin Cross
2013-12-04 21:43 ` Greg KH
2013-12-04 21:55 ` Colin Cross
2013-12-04 22:02 ` Greg KH
2013-12-04 22:22 ` Colin Cross
2013-12-05 0:02 ` Greg KH
2013-12-05 0:21 ` Colin Cross
2013-12-05 2:02 ` Arve Hjønnevåg
2013-12-05 18:31 ` Serban Constantinescu
2013-12-05 18:49 ` Greg KH
2013-12-10 3:01 ` Octavian Purdila
2013-12-11 3:21 ` Arve Hjønnevåg
2013-12-11 18:10 ` Octavian Purdila
2013-12-11 23:00 ` Arve Hjønnevåg
2013-12-12 8:45 ` Octavian Purdila
2013-12-13 5:14 ` Arve Hjønnevåg
2013-12-13 7:39 ` Octavian Purdila
2013-12-04 23:21 ` One Thousand Gnomes
2013-12-04 23:40 ` Colin Cross
2013-12-05 0:32 ` One Thousand Gnomes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386180581-6710-4-git-send-email-serban.constantinescu@arm.com \
--to=serban.constantinescu@arm.com \
--cc=Dave.Butcher@arm.com \
--cc=arve@android.com \
--cc=ccross@android.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=irogers@google.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=romlem@android.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®