From 8b720d1a140fda6ecbf4eee3a82b2e0064330343 Mon Sep 17 00:00:00 2001 From: Alexander Winkowski Date: Fri, 12 Jan 2024 05:04:10 +0000 Subject: [PATCH] Revert "mm: skip speculative path for non-anonymous COW faults" This reverts commit d95ca82a5de955f2d17731d40deb55ebb9832131. Change-Id: I65cd50b4aab3578fdb2ae1b67d25a84775b19c4e Signed-off-by: Alexander Winkowski --- mm/memory.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 04906d1d7be7..bdeb832a7dc5 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4458,11 +4458,7 @@ int __handle_speculative_fault(struct mm_struct *mm, unsigned long address, * because vm_next and vm_prev must be safe. This can't be guaranteed * in the speculative path. */ - if (unlikely((vma_is_anonymous(vmf.vma) && !vmf.vma->anon_vma) || - (!vma_is_anonymous(vmf.vma) && - !(vmf.vma->vm_flags & VM_SHARED) && - (vmf.flags & FAULT_FLAG_WRITE) && - !vmf.vma->anon_vma))) + if (unlikely(vma_is_anonymous(vmf.vma) && !vmf.vma->anon_vma)) return VM_FAULT_RETRY; vmf.vma_flags = READ_ONCE(vmf.vma->vm_flags);