summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBlagovest Kolenichev <bkolenichev@codeaurora.org>2017-07-26 05:01:18 -0700
committerBlagovest Kolenichev <bkolenichev@codeaurora.org>2017-08-04 07:43:15 -0700
commit220bdae208dfb20abd040e8e87dc3a4dbca72283 (patch)
treee83194e49c350e03a5dae81b928bc8a66b8ee7e4 /net
parentb1b3c5a65e5bbb95d1b512c8dc8d1dd3f2451a55 (diff)
android: binder: Revert fixes for preemption and locking issues
These were hacks and no longer needed as next binder from android-4.4@59ff2e1 (v4.4.78) has been reworked to use fine-grained locking. This is a preparation for clean merge of binder changes from android-4.4@59ff2e1 (v4.4.78), which follows right after this commit. Reverted changes: ================= 773fc2f android: binder: use copy_from_user_preempt_disabled To keep the driver consistent, and until we have fine-grained locking in place. Change-Id: I90fe02cdedb8a5677b900a68528fb443b9204322 Signed-off-by: Riley Andrews <riandrews@google.com> Git-repo: https://source.codeaurora.org/quic/la/kernel/msm-4.4 Git-commit: 5c9ce54ca3a66a57e4ebfe3ae71c5733b6bcc579 Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org> 821e02f CHROMIUM: android: binder: Fix potential scheduling-while-atomica Commit f1e7f0a724f6 ("android: binder: Disable preemption while holding the global binder lock.") re-enabled preemption around most of the sites where calls to potentially sleeping functions were made, but missed __alloc_fd(), which can sleep if the fdtable needs to be resized. Re-enable preemption around __alloc_fd() as well as __fd_install() which can now sleep in upstream kernels as of commit 8a81252b774b ("fs/file.c: don't acquire files->file_lock in fd_install()"). BUG=chrome-os-partner:44012 TEST=Build and boot on Smaug. Change-Id: I9819c4b95876f697e75b1b84810b6c520d9c33ec Signed-off-by: Andrew Bresticker <abrestic@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/308582 Reviewed-by: Stephen Barber <smbarber@chromium.org> Reviewed-by: Riley Andrews <riandrews@google.com> Git-repo: https://source.codeaurora.org/quic/la/kernel/msm-4.4 Git-commit: c267ff1d548ed1bdad6a08f1c70776c5e60d569e Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org> e4045d6 android: binder: Disable preemption while holding the global binder lock. Change-Id: I90fe02cdedb8a5677b900a68528fb443b9204322 Signed-off-by: Riley Andrews <riandrews@google.com> Git-repo: https://source.codeaurora.org/quic/la/kernel/msm-4.4 Git-commit: 5c9ce54ca3a66a57e4ebfe3ae71c5733b6bcc579 Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org> Change-Id: Id97e04f3694d76c2b6a1e7c0dc39da15d83c2867 Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions