[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/17] mm: gup: add FOLL_TRIED
From: |
Andrea Arcangeli |
Subject: |
[Qemu-devel] [PATCH 01/17] mm: gup: add FOLL_TRIED |
Date: |
Fri, 3 Oct 2014 19:07:51 +0200 |
From: Andres Lagar-Cavilla <address@hidden>
Reviewed-by: Radim Krčmář <address@hidden>
Signed-off-by: Andres Lagar-Cavilla <address@hidden>
Signed-off-by: Andrea Arcangeli <address@hidden>
---
include/linux/mm.h | 1 +
mm/gup.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 8981cc8..0f4196a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1985,6 +1985,7 @@ static inline struct page *follow_page(struct
vm_area_struct *vma,
#define FOLL_HWPOISON 0x100 /* check page is hwpoisoned */
#define FOLL_NUMA 0x200 /* force NUMA hinting page fault */
#define FOLL_MIGRATION 0x400 /* wait for page to replace migration entry */
+#define FOLL_TRIED 0x800 /* a retry, previous pass started an IO */
typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
void *data);
diff --git a/mm/gup.c b/mm/gup.c
index 91d044b..af7ea3e 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -281,6 +281,10 @@ static int faultin_page(struct task_struct *tsk, struct
vm_area_struct *vma,
fault_flags |= FAULT_FLAG_ALLOW_RETRY;
if (*flags & FOLL_NOWAIT)
fault_flags |= FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_RETRY_NOWAIT;
+ if (*flags & FOLL_TRIED) {
+ VM_WARN_ON_ONCE(fault_flags & FAULT_FLAG_ALLOW_RETRY);
+ fault_flags |= FAULT_FLAG_TRIED;
+ }
ret = handle_mm_fault(mm, vma, address, fault_flags);
if (ret & VM_FAULT_ERROR) {
- [Qemu-devel] [PATCH 00/17] RFC: userfault v2, Andrea Arcangeli, 2014/10/03
- [Qemu-devel] [PATCH 03/17] mm: gup: use get_user_pages_unlocked within get_user_pages_fast, Andrea Arcangeli, 2014/10/03
- [Qemu-devel] [PATCH 16/17] powerpc: add remap_anon_pages and userfaultfd, Andrea Arcangeli, 2014/10/03
- [Qemu-devel] [PATCH 14/17] userfaultfd: add new syscall to provide memory externalization, Andrea Arcangeli, 2014/10/03
- [Qemu-devel] [PATCH 01/17] mm: gup: add FOLL_TRIED,
Andrea Arcangeli <=
- [Qemu-devel] [PATCH 06/17] kvm: Faults which trigger IO release the mmap_sem, Andrea Arcangeli, 2014/10/03
- [Qemu-devel] [PATCH 04/17] mm: gup: make get_user_pages_fast and __get_user_pages_fast latency conscious, Andrea Arcangeli, 2014/10/03
- [Qemu-devel] [PATCH 11/17] mm: swp_entry_swapcount, Andrea Arcangeli, 2014/10/03
- [Qemu-devel] [PATCH 15/17] userfaultfd: make userfaultfd_write non blocking, Andrea Arcangeli, 2014/10/03
- [Qemu-devel] [PATCH 13/17] waitqueue: add nr wake parameter to __wake_up_locked_key, Andrea Arcangeli, 2014/10/03
- [Qemu-devel] [PATCH 09/17] mm: PT lock: export double_pt_lock/unlock, Andrea Arcangeli, 2014/10/03