diff --git a/mm/memory.c b/mm/memory.c
index ce2ff976fc8d..4cc82ffbce4f 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3757,6 +3757,11 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
 	if (!pte_unmap_same(vmf))
 		goto out;
 
+	if (vmf->flags & FAULT_FLAG_VMA_LOCK) {
+		ret = VM_FAULT_RETRY;
+		goto out;
+	}
+
 	entry = pte_to_swp_entry(vmf->orig_pte);
 	if (unlikely(non_swap_entry(entry))) {
 		if (is_migration_entry(entry)) {