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

Commit 7c9dd4b8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ANDROID: binder: Drop lru lock in isolate callback"

parents 22442ed9 d03727f9
Loading
Loading
Loading
Loading
+12 −6
Original line number Diff line number Diff line
@@ -913,6 +913,7 @@ 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,16 +924,22 @@ enum lru_status binder_alloc_free_page(struct list_head *item,

	index = page - alloc->pages;
	page_addr = (uintptr_t)alloc->buffer + index * PAGE_SIZE;
	if (alloc->vma) {
	vma = alloc->vma;
	if (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_lru_isolate(lru, item);
	spin_unlock(lock);

	if (vma) {
		trace_binder_unmap_user_start(alloc, index);

		zap_page_range(alloc->vma,
		zap_page_range(vma,
			       page_addr +
			       alloc->user_buffer_offset,
			       PAGE_SIZE, NULL);
@@ -951,13 +958,12 @@ enum lru_status binder_alloc_free_page(struct list_head *item,

	trace_binder_unmap_kernel_end(alloc, index);

	list_lru_isolate(lru, item);

	spin_lock(lock);
	mutex_unlock(&alloc->mutex);
	return LRU_REMOVED;
	return LRU_REMOVED_RETRY;

err_down_write_mmap_sem_failed:
	mmput(mm);
	mmput_async(mm);
err_get_task_mm_failed:
err_page_already_freed:
	mutex_unlock(&alloc->mutex);