Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bea346f0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "FROMLIST: android: binder: Drop lru lock in isolate callback" 



This reverts commit 472975aa as it
breaks the build.

Cc: Kyle Yan <kyan@codeaurora.org>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Sherry Yang <sherryy@android.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 472975aa

drivers/staging/android/binder_alloc.c

+6 −12
Original line number Diff line number Diff line
@@ -912,7 +912,6 @@ enum lru_status binder_alloc_free_page(struct list_head *item, 
	struct binder_alloc *alloc;

	uintptr_t page_addr;

	size_t index;

	struct vm_area_struct *vma;



	alloc = page->alloc;

	if (!mutex_trylock(&alloc->mutex))
@@ -923,22 +922,16 @@ enum lru_status binder_alloc_free_page(struct list_head *item, 


	index = page - alloc->pages;

	page_addr = (uintptr_t)alloc->buffer + index * PAGE_SIZE;

	vma = alloc->vma;

	if (vma) {

	if (alloc->vma) {

		mm = get_task_mm(alloc->tsk);

		if (!mm)

			goto err_get_task_mm_failed;

		if (!down_write_trylock(&mm->mmap_sem))

			goto err_down_write_mmap_sem_failed;

	}



	list_del_init(item);

	spin_unlock(lock);



	if (vma) {

		trace_binder_unmap_user_start(alloc, index);



		zap_page_range(vma,

		zap_page_range(alloc->vma,

			       page_addr +

			       alloc->user_buffer_offset,

			       PAGE_SIZE, NULL);
@@ -957,12 +950,13 @@ enum lru_status binder_alloc_free_page(struct list_head *item, 


	trace_binder_unmap_kernel_end(alloc, index);



	spin_lock(lock);

	list_del_init(item);



	mutex_unlock(&alloc->mutex);

	return LRU_REMOVED_RETRY;

	return LRU_REMOVED;



err_down_write_mmap_sem_failed:

	mmput_async(mm);

	mmput(mm);

err_get_task_mm_failed:

err_page_already_freed:

	mutex_unlock(&alloc->mutex);