Commit da49889d authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Greg Kroah-Hartman
Browse files

staging: binder: Support concurrent 32 bit and 64 bit processes. 



For 64bit systems we want to use the same binder interface for 32bit and
64bit processes. Thus the size and the layout of the structures passed
between the kernel and the userspace has to be the same for both 32 and
64bit processes.

This change replaces all the uses of void* and size_t with
binder_uintptr_t and binder_size_t. These are then typedefed to specific
sizes depending on the use of the interface, as follows:
       * __u32 - on legacy 32bit only userspace
       * __u64 - on mixed 32/64bit userspace where all processes use the same
interface.

This change also increments the BINDER_CURRENT_PROTOCOL_VERSION to 8 and
hooks the compat_ioctl entry for the mixed 32/64bit Android userspace.

This patch also provides a CONFIG_ANDROID_BINDER_IPC_32BIT option for
compatability, which if set which enables the old protocol, setting
BINDER_CURRENT_PROTOCOL_VERSION to 7, on 32 bit systems.

Please note that all 64bit kernels will use the 64bit Binder ABI.

Cc: Colin Cross <ccross@android.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Serban Constantinescu <serban.constantinescu@arm.com>
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: default avatarArve Hjønnevåg <arve@android.com>
[jstultz: Merged with upstream type changes. Various whitespace fixes
and longer Kconfig description for checkpatch. Included improved commit
message from Serban (with a few tweaks).]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df24a2ea

drivers/staging/android/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -20,6 +20,18 @@ config ANDROID_BINDER_IPC 
	  Android process, using Binder to identify, invoke and pass arguments

	  between said processes.



config ANDROID_BINDER_IPC_32BIT

	bool "Use old 32-bit binder api"

	depends on !64BIT

	---help---

	  The Binder API has been changed to support both 32 and 64bit

	  applications in a mixed environment.



	  Enable this to support an old 32-bit Android user-space (v4.4 and

	  earlier).



	  Note that enabling this will break newer Android user-space.



config ASHMEM

	bool "Enable the Anonymous Shared Memory Subsystem"

	default n

drivers/staging/android/binder.c

+150 −118

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/android/binder.h

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 
#ifndef _LINUX_BINDER_H

#define _LINUX_BINDER_H



#ifdef CONFIG_ANDROID_BINDER_IPC_32BIT

#define BINDER_IPC_32BIT 1

#endif



#include "uapi/binder.h"



#endif /* _LINUX_BINDER_H */

drivers/staging/android/binder_trace.h

+8 −6
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ TRACE_EVENT(binder_transaction_node_to_ref, 
	TP_STRUCT__entry(

		__field(int, debug_id)

		__field(int, node_debug_id)

		__field(void __user *, node_ptr)

		__field(binder_uintptr_t, node_ptr)

		__field(int, ref_debug_id)

		__field(uint32_t, ref_desc)

	),
@@ -163,8 +163,9 @@ TRACE_EVENT(binder_transaction_node_to_ref, 
		__entry->ref_debug_id = ref->debug_id;

		__entry->ref_desc = ref->desc;

	),

	TP_printk("transaction=%d node=%d src_ptr=0x%p ==> dest_ref=%d dest_desc=%d",

		  __entry->debug_id, __entry->node_debug_id, __entry->node_ptr,

	TP_printk("transaction=%d node=%d src_ptr=0x%016llx ==> dest_ref=%d dest_desc=%d",

		  __entry->debug_id, __entry->node_debug_id,

		  (u64)__entry->node_ptr,

		  __entry->ref_debug_id, __entry->ref_desc)

);
@@ -177,7 +178,7 @@ TRACE_EVENT(binder_transaction_ref_to_node, 
		__field(int, ref_debug_id)

		__field(uint32_t, ref_desc)

		__field(int, node_debug_id)

		__field(void __user *, node_ptr)

		__field(binder_uintptr_t, node_ptr)

	),

	TP_fast_assign(

		__entry->debug_id = t->debug_id;
@@ -186,9 +187,10 @@ TRACE_EVENT(binder_transaction_ref_to_node, 
		__entry->node_debug_id = ref->node->debug_id;

		__entry->node_ptr = ref->node->ptr;

	),

	TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%p",

	TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%016llx",

		  __entry->debug_id, __entry->node_debug_id,

		  __entry->ref_debug_id, __entry->ref_desc, __entry->node_ptr)

		  __entry->ref_debug_id, __entry->ref_desc,

		  (u64)__entry->node_ptr)

);



TRACE_EVENT(binder_transaction_ref_to_ref,

drivers/staging/android/uapi/binder.h

+39 −25

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE