The patch titled
Subject: userfaultfd: use vma_is_anonymous
has been added to the -mm tree. Its filename is
userfaultfd-use-vma_is_anonymous.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/userfaultfd-use-vma_is_anonymous.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/userfaultfd-use-vma_is_anonymous.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Subject: userfaultfd: use vma_is_anonymous
Cleanup the vma->vm_ops usage.
Side note: it would be more robust if vma_is_anonymous() would also
check that vm_flags hasn't VM_PFNMAP set.
Link: http://lkml.kernel.org/r/20161216144821.5183-5-aarcange@xxxxxxxxxx
Signed-off-by: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: "Dr. David Alan Gilbert" <dgilbert@xxxxxxxxxx>
Cc: Hillf Danton <hillf.zj@xxxxxxxxxxxxxxx>
Cc: Michael Rapoport <RAPOPORT@xxxxxxxxxx>
Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Cc: Pavel Emelyanov <xemul@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/userfaultfd.c | 8 ++++----
mm/userfaultfd.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff -puN fs/userfaultfd.c~userfaultfd-use-vma_is_anonymous fs/userfaultfd.c
--- a/fs/userfaultfd.c~userfaultfd-use-vma_is_anonymous
+++ a/fs/userfaultfd.c
@@ -797,7 +797,7 @@ static int userfaultfd_register(struct u
/* check not compatible vmas */
ret = -EINVAL;
- if (cur->vm_ops)
+ if (!vma_is_anonymous(cur))
goto out_unlock;
/*
@@ -822,7 +822,7 @@ static int userfaultfd_register(struct u
do {
cond_resched();
- BUG_ON(vma->vm_ops);
+ BUG_ON(!vma_is_anonymous(vma));
BUG_ON(vma->vm_userfaultfd_ctx.ctx &&
vma->vm_userfaultfd_ctx.ctx != ctx);
@@ -948,7 +948,7 @@ static int userfaultfd_unregister(struct
* provides for more strict behavior to notice
* unregistration errors.
*/
- if (cur->vm_ops)
+ if (!vma_is_anonymous(cur))
goto out_unlock;
found = true;
@@ -962,7 +962,7 @@ static int userfaultfd_unregister(struct
do {
cond_resched();
- BUG_ON(vma->vm_ops);
+ BUG_ON(!vma_is_anonymous(vma));
/*
* Nothing to do: this vma is already registered into this
diff -puN mm/userfaultfd.c~userfaultfd-use-vma_is_anonymous mm/userfaultfd.c
--- a/mm/userfaultfd.c~userfaultfd-use-vma_is_anonymous
+++ a/mm/userfaultfd.c
@@ -197,7 +197,7 @@ retry:
* FIXME: only allow copying on anonymous vmas, tmpfs should
* be added.
*/
- if (dst_vma->vm_ops)
+ if (!vma_is_anonymous(dst_vma))
goto out_unlock;
/*
_
Patches currently in -mm which might be from aarcange@xxxxxxxxxx are
userfaultfd-document-_ior-_iow.patch
userfaultfd-correct-comment-about-uffd_feature_pagefault_flag_wp.patch
userfaultfd-convert-bug-to-warn_on_once.patch
userfaultfd-use-vma_is_anonymous.patch
userfaultfd-non-cooperative-report-all-available-features-to-userland.patch
userfaultfd-non-cooperative-add-fork-event-build-warning-fix.patch
userfaultfd-non-cooperative-optimize-mremap_userfaultfd_complete.patch
userfaultfd-non-cooperative-avoid-madv_dontneed-race-condition.patch
userfaultfd-non-cooperative-wake-userfaults-after-uffdio_unregister.patch
userfaultfd-hugetlbfs-gup-support-vm_fault_retry.patch
userfaultfd-hugetlbfs-uffd_feature_missing_hugetlbfs.patch
userfaultfd-shmem-add-tlbflushh-header-for-microblaze.patch
userfaultfd-shmem-lock-the-page-before-adding-it-to-pagecache.patch
userfaultfd-shmem-avoid-leaking-blocks-and-used-blocks-in-uffdio_copy.patch
userfaultfd-hugetlbfs-uffd_feature_missing_shmem.patch
userfaultfd-selftest-test-uffdio_zeropage-on-all-memory-types.patch
mm-mprotect-use-pmd_trans_unstable-instead-of-taking-the-pmd_lock.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
