linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] userfaultfd: clear flag if remap event not enabled
@ 2018-12-11  5:34 Peter Xu
  2018-12-11 13:46 ` William Kucharski
  0 siblings, 1 reply; 2+ messages in thread
From: Peter Xu @ 2018-12-11  5:34 UTC (permalink / raw)
  To: linux-kernel
  Cc: peterx, Andrea Arcangeli, Andrew Morton, Mike Rapoport,
	Kirill A . Shutemov, Hugh Dickins, Pavel Emelyanov,
	Pravin Shedge, linux-mm

When the process being tracked do mremap() without
UFFD_FEATURE_EVENT_REMAP on the corresponding tracking uffd file
handle, we should not generate the remap event, and at the same
time we should clear all the uffd flags on the new VMA.  Without
this patch, we can still have the VM_UFFD_MISSING|VM_UFFD_WP
flags on the new VMA even the fault handling process does not
even know the existance of the VMA.

CC: Andrea Arcangeli <aarcange@redhat.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Mike Rapoport <rppt@linux.vnet.ibm.com>
CC: Kirill A. Shutemov <kirill@shutemov.name>
CC: Hugh Dickins <hughd@google.com>
CC: Pavel Emelyanov <xemul@virtuozzo.com>
CC: Pravin Shedge <pravin.shedge4linux@gmail.com>
CC: linux-mm@kvack.org
CC: linux-kernel@vger.kernel.org
Acked-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 fs/userfaultfd.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index cd58939dc977..4567b5b6fd32 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -736,10 +736,18 @@ void mremap_userfaultfd_prep(struct vm_area_struct *vma,
 	struct userfaultfd_ctx *ctx;
 
 	ctx = vma->vm_userfaultfd_ctx.ctx;
-	if (ctx && (ctx->features & UFFD_FEATURE_EVENT_REMAP)) {
+
+	if (!ctx)
+		return;
+
+	if (ctx->features & UFFD_FEATURE_EVENT_REMAP) {
 		vm_ctx->ctx = ctx;
 		userfaultfd_ctx_get(ctx);
 		WRITE_ONCE(ctx->mmap_changing, true);
+	} else {
+		/* Drop uffd context if remap feature not enabled */
+		vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
+		vma->vm_flags &= ~(VM_UFFD_WP | VM_UFFD_MISSING);
 	}
 }
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] userfaultfd: clear flag if remap event not enabled
  2018-12-11  5:34 [PATCH v2] userfaultfd: clear flag if remap event not enabled Peter Xu
@ 2018-12-11 13:46 ` William Kucharski
  0 siblings, 0 replies; 2+ messages in thread
From: William Kucharski @ 2018-12-11 13:46 UTC (permalink / raw)
  To: Peter Xu
  Cc: LKML, Andrea Arcangeli, Andrew Morton, Mike Rapoport,
	Kirill A . Shutemov, Hugh Dickins, Pavel Emelyanov,
	Pravin Shedge, linux-mm



> On Dec 10, 2018, at 10:34 PM, Peter Xu <peterx@redhat.com> wrote:
> 
> ---
> fs/userfaultfd.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
> index cd58939dc977..4567b5b6fd32 100644
> --- a/fs/userfaultfd.c
> +++ b/fs/userfaultfd.c
> @@ -736,10 +736,18 @@ void mremap_userfaultfd_prep(struct vm_area_struct *vma,
> 	struct userfaultfd_ctx *ctx;
> 
> 	ctx = vma->vm_userfaultfd_ctx.ctx;
> -	if (ctx && (ctx->features & UFFD_FEATURE_EVENT_REMAP)) {
> +
> +	if (!ctx)
> +		return;
> +
> +	if (ctx->features & UFFD_FEATURE_EVENT_REMAP) {
> 		vm_ctx->ctx = ctx;
> 		userfaultfd_ctx_get(ctx);
> 		WRITE_ONCE(ctx->mmap_changing, true);
> +	} else {
> +		/* Drop uffd context if remap feature not enabled */
> +		vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
> +		vma->vm_flags &= ~(VM_UFFD_WP | VM_UFFD_MISSING);
> 	}
> }
> 
> -- 
> 2.17.1
> 

Looks good.

Reviewed-by: William Kucharski <william.kucharski@oracle.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-12-11 13:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-11  5:34 [PATCH v2] userfaultfd: clear flag if remap event not enabled Peter Xu
2018-12-11 13:46 ` William Kucharski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).