Skip to content

Commit 6ab7030

Browse files
rpptakpm00
authored andcommitted
userfaultfd: mfill_atomic(): remove retry logic
Since __mfill_atomic_pte() handles the retry for both anonymous and shmem, there is no need to retry copying the date from the userspace in the loop in mfill_atomic(). Drop the retry logic from mfill_atomic(). [rppt@kernel.org: remove safety measure of not returning ENOENT from _copy] Link: https://lore.kernel.org/ac5zcDUY8CFHr6Lw@kernel.org Link: https://lore.kernel.org/20260402041156.1377214-12-rppt@kernel.org Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Andrei Vagin <avagin@google.com> Cc: Axel Rasmussen <axelrasmussen@google.com> Cc: Baolin Wang <baolin.wang@linux.alibaba.com> Cc: David Hildenbrand (Arm) <david@kernel.org> Cc: Harry Yoo <harry.yoo@oracle.com> Cc: Harry Yoo (Oracle) <harry@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: James Houghton <jthoughton@google.com> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: Lorenzo Stoakes (Oracle) <ljs@kernel.org> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Muchun Song <muchun.song@linux.dev> Cc: Nikita Kalyazin <kalyazin@amazon.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Peter Xu <peterx@redhat.com> Cc: Sean Christopherson <seanjc@google.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: David Carlier <devnexen@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent f74991b commit 6ab7030

1 file changed

Lines changed: 0 additions & 27 deletions

File tree

mm/userfaultfd.c

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ struct mfill_state {
2929
struct vm_area_struct *vma;
3030
unsigned long src_addr;
3131
unsigned long dst_addr;
32-
struct folio *folio;
3332
pmd_t *pmd;
3433
};
3534

@@ -531,9 +530,6 @@ static int __mfill_atomic_pte(struct mfill_state *state,
531530
ops->filemap_remove(folio, state->vma);
532531
err_folio_put:
533532
folio_put(folio);
534-
/* Don't return -ENOENT so that our caller won't retry */
535-
if (ret == -ENOENT)
536-
ret = -EFAULT;
537533
return ret;
538534
}
539535

@@ -899,7 +895,6 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx,
899895
VM_WARN_ON_ONCE(src_start + len <= src_start);
900896
VM_WARN_ON_ONCE(dst_start + len <= dst_start);
901897

902-
retry:
903898
err = mfill_get_vma(&state);
904899
if (err)
905900
goto out;
@@ -926,26 +921,6 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx,
926921
err = mfill_atomic_pte(&state);
927922
cond_resched();
928923

929-
if (unlikely(err == -ENOENT)) {
930-
void *kaddr;
931-
932-
mfill_put_vma(&state);
933-
VM_WARN_ON_ONCE(!state.folio);
934-
935-
kaddr = kmap_local_folio(state.folio, 0);
936-
err = copy_from_user(kaddr,
937-
(const void __user *)state.src_addr,
938-
PAGE_SIZE);
939-
kunmap_local(kaddr);
940-
if (unlikely(err)) {
941-
err = -EFAULT;
942-
goto out;
943-
}
944-
flush_dcache_folio(state.folio);
945-
goto retry;
946-
} else
947-
VM_WARN_ON_ONCE(state.folio);
948-
949924
if (!err) {
950925
state.dst_addr += PAGE_SIZE;
951926
state.src_addr += PAGE_SIZE;
@@ -960,8 +935,6 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx,
960935

961936
mfill_put_vma(&state);
962937
out:
963-
if (state.folio)
964-
folio_put(state.folio);
965938
VM_WARN_ON_ONCE(copied < 0);
966939
VM_WARN_ON_ONCE(err > 0);
967940
VM_WARN_ON_ONCE(!copied && !err);

0 commit comments

Comments
 (0)