From 23ef56f65c9e321ffe64bc8b2c4bb12ca8bd04ac Mon Sep 17 00:00:00 2001
From: Steve Muckle <smuckle@google.com>
Date: Thu, 12 May 2022 18:46:36 +0000
Subject: [PATCH] Revert "ANDROID: Make file-backed vma teardown synchronous"

This reverts commit fe25fc53752307faeb8ebb382ef6cb8d2728cf90.

Reason for revert: test regressions
Bug: 232427425
Bug: 232421416
Change-Id: If7006fe6c3f1a55361099ef24927d4bc7c821b9c
Signed-off-by: Steve Muckle <smuckle@google.com>
---
 kernel/fork.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/kernel/fork.c b/kernel/fork.c
index a897ae226475..2c92ccbfe449 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -402,12 +402,8 @@ void vm_area_free(struct vm_area_struct *vma)
 	free_anon_vma_name(vma);
 #ifdef CONFIG_SPECULATIVE_PAGE_FAULT
 	if (atomic_read(&vma->vm_mm->mm_users) > 1) {
-		/* Only anonymous vmas can be torn down asynchronously */
-		if (!vma->vm_file) {
-			call_rcu(&vma->vm_rcu, __vm_area_free);
-			return;
-		}
-		synchronize_rcu();
+		call_rcu(&vma->vm_rcu, __vm_area_free);
+		return;
 	}
 #endif
 	____vm_area_free(vma);