From patchwork Fri Jan 26 18:26:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13533126 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A2DDC47422 for ; Fri, 26 Jan 2024 18:26:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 731A96B0082; Fri, 26 Jan 2024 13:26:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C3C66B0085; Fri, 26 Jan 2024 13:26:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 559E96B0088; Fri, 26 Jan 2024 13:26:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 41E276B0082 for ; Fri, 26 Jan 2024 13:26:57 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id F018C120693 for ; Fri, 26 Jan 2024 18:26:56 +0000 (UTC) X-FDA: 81722293632.10.4E08B1C Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf21.hostedemail.com (Postfix) with ESMTP id 33A071C000B for ; Fri, 26 Jan 2024 18:26:55 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=q5KtA1JD; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf21.hostedemail.com: domain of 3bvmzZQsKCGUORNHVKJLGUDJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--lokeshgidra.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3bvmzZQsKCGUORNHVKJLGUDJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--lokeshgidra.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706293615; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=uLXJpcEgAvHLQ8+bquI5HaOs2SY4k/xeWqEkBYhbiw0=; b=BrB5xmAZFNsR4ZuXVXn5wGQurOsD9gHZcyjcEmk4soJYvUs/ZSSIOGpAicBf0yrqriffbn s5cC/ZG6sxMzqzLkEPZukExcefVVLG6aJ82CneoRu5xnQAbvlJaAMwgIIs37FeM77xLxvA rsSwXrYJvzffWkBbuvgNPLxRo66nmec= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=q5KtA1JD; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf21.hostedemail.com: domain of 3bvmzZQsKCGUORNHVKJLGUDJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--lokeshgidra.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3bvmzZQsKCGUORNHVKJLGUDJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--lokeshgidra.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706293615; a=rsa-sha256; cv=none; b=hPJ3MS3tJYQlggz1zBfSRVLs1VIylTrDWWx6QrMupMldivHhYc9RAJsLFNn1wc6QuSEdik 0CWed8HDUelJxVA9OMzhW41tQ4g3UsKcbud5BsBT1RC7BZ2h1kp4d7z+AgbUjkRkvNYJ+F hMTp3IKgHcMFLB9/7Ih0OP30YkOffZg= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-5f38d676cecso23452207b3.0 for ; Fri, 26 Jan 2024 10:26:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706293614; x=1706898414; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=uLXJpcEgAvHLQ8+bquI5HaOs2SY4k/xeWqEkBYhbiw0=; b=q5KtA1JDFhYQXlDrMZ2jPIEcSmwwAvQsm1KscEJPKsoKL0/K9Pj5ZtGpqMxStMm+Wz DEVtmLD2NaKc4LJgR3TcPn9vD8UYuAuGcnbp6vUR1y7OHvSlfCy/gGawV9+IOP2EBjpJ SVhMbOncEz92s9BJiUw0gPhigbnVGP+uKuOnW9IaSpLRUOBLpJhAn9IkQ6onZOFOFKQA ZuvdIi/jK2qyZyhlSKwCNAKk1tQqwmhqU/zhWiYsejYo3GjP6Q/gQj29CLRumJi+BnH/ lsr8K4ncBVdRVSIz7uA0NLx9S66WhuFhue9wYvYtR+RrvSfGCO8ra3wNkW7uAcYyHkio UYSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706293614; x=1706898414; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uLXJpcEgAvHLQ8+bquI5HaOs2SY4k/xeWqEkBYhbiw0=; b=j8ubn9JMwLz8RZV39sVz2p/CA71PqrPI46sA6qDzc+WMzb7x4ONQu8/Qko2xU/wNkr SuO4Czpl+RscHFZzkIO5ltbYgr5TLeeZH1pLmqsWMZqXus2M88QAguubkPrQLnfDYbYX NBNhNP+fzGqRy7qzOULq3A2H4HpahYQUXayfYDbQQ6aH7SFTZLSK/a9thQ4YJgAOIK5X h+TbReqMfuTZ3+7ZZSNVFR1XVQLCJvkoyHQH4YCfJY7aROBBDl+bSa7LpemZuo3wBPXu EVhronQ685LnCDHtAhfntFlNUPWbkb33xAJUlpqBKVkC90zFc/FZXEqQE6ZZ2kaQcHxd yzAQ== X-Gm-Message-State: AOJu0Yyekwtkc7mSIWzOrTPmnkf4afIUIVAJsY5WS+2jMv7HNRVcwt8G ii4rWN3sk7JZGpckX6PPV471ujIKRhcY0wdh6skpkCSI+8yrqF+sFR7xJ/nbbnx5ZH+LDcXEa4P f0sMZVHsw8U/yfXP4I/s3Qg== X-Google-Smtp-Source: AGHT+IGt2/BA8dj3t3+f3CDFRNY8WvXgtUOL2IcXoo5TOnIKymbSZPVcMF8fo+tUfgFLJ3Qz79dJcQPFBkAu0Cw8KQ== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:cc8a:c6c9:a475:ebf]) (user=lokeshgidra job=sendgmr) by 2002:a81:4cd3:0:b0:5fc:7f94:da64 with SMTP id z202-20020a814cd3000000b005fc7f94da64mr95373ywa.5.1706293614376; Fri, 26 Jan 2024 10:26:54 -0800 (PST) Date: Fri, 26 Jan 2024 10:26:47 -0800 In-Reply-To: <20240126182647.2748949-1-lokeshgidra@google.com> Mime-Version: 1.0 References: <20240126182647.2748949-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240126182647.2748949-3-lokeshgidra@google.com> Subject: [PATCH 3/3] userfaultfd: use per-vma locks in userfaultfd operations From: Lokesh Gidra To: akpm@linux-foundation.org Cc: lokeshgidra@google.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, selinux@vger.kernel.org, surenb@google.com, kernel-team@android.com, aarcange@redhat.com, peterx@redhat.com, david@redhat.com, axelrasmussen@google.com, bgeffon@google.com, willy@infradead.org, jannh@google.com, kaleshsingh@google.com, ngeoffray@google.com, timmurray@google.com, rppt@kernel.org X-Rspamd-Queue-Id: 33A071C000B X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: ekixe9b1m5do3pwn4ruraab3ief1rcjt X-HE-Tag: 1706293615-17125 X-HE-Meta: U2FsdGVkX1/sKaAaWDMAfOgDrZZrixlytK6T0gi47pGjrsnCW5iStYnoXoUpnbiHAKdsiEsHW00V5c0tDrTqwwa2toQ1d9eey36V50UCM8rFcrsNTbuPBka6BAe82elKpnPrCG7WjlzhXoNidlFBg5eLLfGKeZlfT40eG6+p3YC1+smpILQ+6VKzz+IiJ6loe+zqkqC0+oHx+frOpzQwTzVmDNYZoCCschz3ho0teQj11tT7KtNlGllUq5DeTn/upgEDyMMXyJEEx622ALdK7ip62CNcoBol64bo6WMqKWFPn3p2ZqA5mBqsjrmglB/eC8BejEG7mrNEzE7iNlPL5ZgnKM1erQlJAJZO+w38ynLJDOfyQa7DIp3pXG1lqEhPkjE6fMM1XXM3wGup3gDX70Ni0u208W9H/1DcwpPxjA3oQ5dbmvzFkDNFVqbZbcT1M9+rGUOXFAK+5JJcHndAR7iTUJlNumbKuTiqdaUm4Sj3G35OjQxD/dML7JeQw7YX01ND3fMegPRM7GDlN9qAalQqWXzssb4DULQQ27ZjN85l5nvZo9XNM+qeWz6p+D4otm5oulUapWm1odaLRa80tiRywfvMIEFqKGoEpkNhCN4wybcmCMdE0usGrEuw6YA3WjYmHdnIX4ferAnZR2Aiig9mFe6DqVaeAEEtL9wQAFlvVcU4dHuFypeVijbtwGnP7r7g/aeSVOzJoJWvYRzCVPZqRwLXnuPQxPjEW1ZZgYtQJRJVfiVJGaV4FCDdZtaaLKyeWCJ3tLdelr7OD2Wvy8+34QP1e6lqdGP+W5cfcJpEU+akbrLroEfBvuJDbMLBOO15bA6DAbW14WdISLZ03LtWFaWKP5rNYzFUtb15HYOCL5px5Zv/6yAZmmb6i6faOjngpJSCkNPzx20LSCZd8UiP1GgKnrnvIAzX0VRAAvhM9xicaCELu4JcMXNzNUvArmkfZiTV3NujT0TQ6gD wqk7kIVJ v0VkXKmEB6ttGjycmAzgGWgUuXnSiE4MPj0kc1qhv2umGMJi7khJSQxJSoT/qu6DSIksD6g44yL60GxeDQ2whM+H70MxXb6/4wdu/Zpb2Mry23c4xY9E8TPqWKz1N8gD3t3XQXSR7HaeojL9r7rhBnaqw6rhIGLEqIoLCt1/ebpPIw3EfzsZ3rfvzig58EqFshFRBQBsZhYqOlt/Li8Z0dpPkTj7xjXLnKJ59wvdXMVK638vzKfPYc7yQeLo1uA6bziW2qWoAlRqxkZQemtnk1epdOQk8/LYRGMwWZeuZFEsCjkHKXIA6Y5yLH3+UzFfLY+t2Cy3R3bD79Xunt12LL8BYMGYEMcanpv+6k0s6sakRg+TqnnKHcYZA6rkGWAaXVHPeP/AaRSBT0CI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Performing userfaultfd operations (like copy/move etc.) in critical section of mmap_lock (read-mode) has shown significant contention on the lock when operations requiring the lock in write-mode are taking place concurrently. We can use per-vma locks instead to significantly reduce the contention issue. All userfaultfd operations, except write-protect, opportunistically use per-vma locks to lock vmas. Write-protect operation requires mmap_lock as it iterates over multiple vmas. Signed-off-by: Lokesh Gidra --- fs/userfaultfd.c | 14 +---- mm/userfaultfd.c | 160 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 117 insertions(+), 57 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 5aaf248d3107..faa10ed3788f 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -2005,18 +2005,8 @@ static int userfaultfd_move(struct userfaultfd_ctx *ctx, return -EINVAL; if (mmget_not_zero(mm)) { - mmap_read_lock(mm); - - /* Re-check after taking map_changing_lock */ - down_read(&ctx->map_changing_lock); - if (likely(!atomic_read(&ctx->mmap_changing))) - ret = move_pages(ctx, mm, uffdio_move.dst, uffdio_move.src, - uffdio_move.len, uffdio_move.mode); - else - ret = -EINVAL; - up_read(&ctx->map_changing_lock); - - mmap_read_unlock(mm); + ret = move_pages(ctx, mm, uffdio_move.dst, uffdio_move.src, + uffdio_move.len, uffdio_move.mode); mmput(mm); } else { return -ESRCH; diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index a66b4d62a361..9be643308f05 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -19,20 +19,39 @@ #include #include "internal.h" -static __always_inline -struct vm_area_struct *find_dst_vma(struct mm_struct *dst_mm, - unsigned long dst_start, - unsigned long len) +void unpin_vma(struct mm_struct *mm, struct vm_area_struct *vma, bool *mmap_locked) +{ + BUG_ON(!vma && !*mmap_locked); + + if (*mmap_locked) { + mmap_read_unlock(mm); + *mmap_locked = false; + } else + vma_end_read(vma); +} + +/* + * Search for VMA and make sure it is stable either by locking it or taking + * mmap_lock. + */ +struct vm_area_struct *find_and_pin_dst_vma(struct mm_struct *dst_mm, + unsigned long dst_start, + unsigned long len, + bool *mmap_locked) { + struct vm_area_struct *dst_vma = lock_vma_under_rcu(dst_mm, dst_start); + if (!dst_vma) { + mmap_read_lock(dst_mm); + *mmap_locked = true; + dst_vma = find_vma(dst_mm, dst_start); + } + /* * Make sure that the dst range is both valid and fully within a * single existing vma. */ - struct vm_area_struct *dst_vma; - - dst_vma = find_vma(dst_mm, dst_start); if (!range_in_vma(dst_vma, dst_start, dst_start + len)) - return NULL; + goto unpin; /* * Check the vma is registered in uffd, this is required to @@ -40,9 +59,13 @@ struct vm_area_struct *find_dst_vma(struct mm_struct *dst_mm, * time. */ if (!dst_vma->vm_userfaultfd_ctx.ctx) - return NULL; + goto unpin; return dst_vma; + +unpin: + unpin_vma(dst_mm, dst_vma, mmap_locked); + return NULL; } /* Check if dst_addr is outside of file's size. Must be called with ptl held. */ @@ -350,7 +373,8 @@ static pmd_t *mm_alloc_pmd(struct mm_struct *mm, unsigned long address) #ifdef CONFIG_HUGETLB_PAGE /* * mfill_atomic processing for HUGETLB vmas. Note that this routine is - * called with mmap_lock held, it will release mmap_lock before returning. + * called with either vma-lock or mmap_lock held, it will release the lock + * before returning. */ static __always_inline ssize_t mfill_atomic_hugetlb( struct userfaultfd_ctx *ctx, @@ -358,7 +382,8 @@ static __always_inline ssize_t mfill_atomic_hugetlb( unsigned long dst_start, unsigned long src_start, unsigned long len, - uffd_flags_t flags) + uffd_flags_t flags, + bool *mmap_locked) { struct mm_struct *dst_mm = dst_vma->vm_mm; int vm_shared = dst_vma->vm_flags & VM_SHARED; @@ -380,7 +405,7 @@ static __always_inline ssize_t mfill_atomic_hugetlb( */ if (uffd_flags_mode_is(flags, MFILL_ATOMIC_ZEROPAGE)) { up_read(&ctx->map_changing_lock); - mmap_read_unlock(dst_mm); + unpin_vma(dst_mm, dst_vma, mmap_locked); return -EINVAL; } @@ -404,12 +429,25 @@ static __always_inline ssize_t mfill_atomic_hugetlb( */ if (!dst_vma) { err = -ENOENT; - dst_vma = find_dst_vma(dst_mm, dst_start, len); - if (!dst_vma || !is_vm_hugetlb_page(dst_vma)) - goto out_unlock; + dst_vma = find_and_pin_dst_vma(dst_mm, dst_start, + len, mmap_locked); + if (!dst_vma) + goto out; + if (!is_vm_hugetlb_page(dst_vma)) + goto out_unlock_vma; err = -EINVAL; if (vma_hpagesize != vma_kernel_pagesize(dst_vma)) + goto out_unlock_vma; + + /* + * If memory mappings are changing because of non-cooperative + * operation (e.g. mremap) running in parallel, bail out and + * request the user to retry later + */ + down_read(&ctx->map_changing_lock); + err = -EAGAIN; + if (atomic_read(&ctx->mmap_changing)) goto out_unlock; vm_shared = dst_vma->vm_flags & VM_SHARED; @@ -465,7 +503,7 @@ static __always_inline ssize_t mfill_atomic_hugetlb( if (unlikely(err == -ENOENT)) { up_read(&ctx->map_changing_lock); - mmap_read_unlock(dst_mm); + unpin_vma(dst_mm, dst_vma, mmap_locked); BUG_ON(!folio); err = copy_folio_from_user(folio, @@ -474,8 +512,6 @@ static __always_inline ssize_t mfill_atomic_hugetlb( err = -EFAULT; goto out; } - mmap_read_lock(dst_mm); - down_read(&ctx->map_changing_lock); dst_vma = NULL; goto retry; @@ -496,7 +532,8 @@ static __always_inline ssize_t mfill_atomic_hugetlb( out_unlock: up_read(&ctx->map_changing_lock); - mmap_read_unlock(dst_mm); +out_unlock_vma: + unpin_vma(dst_mm, dst_vma, mmap_locked); out: if (folio) folio_put(folio); @@ -512,7 +549,8 @@ extern ssize_t mfill_atomic_hugetlb(struct userfaultfd_ctx *ctx, unsigned long dst_start, unsigned long src_start, unsigned long len, - uffd_flags_t flags); + uffd_flags_t flags, + bool *mmap_locked); #endif /* CONFIG_HUGETLB_PAGE */ static __always_inline ssize_t mfill_atomic_pte(pmd_t *dst_pmd, @@ -572,6 +610,7 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, unsigned long src_addr, dst_addr; long copied; struct folio *folio; + bool mmap_locked = false; /* * Sanitize the command parameters: @@ -588,7 +627,14 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, copied = 0; folio = NULL; retry: - mmap_read_lock(dst_mm); + /* + * Make sure the vma is not shared, that the dst range is + * both valid and fully within a single existing vma. + */ + err = -ENOENT; + dst_vma = find_and_pin_dst_vma(dst_mm, dst_start, len, &mmap_locked); + if (!dst_vma) + goto out; /* * If memory mappings are changing because of non-cooperative @@ -600,15 +646,6 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, if (atomic_read(&ctx->mmap_changing)) goto out_unlock; - /* - * Make sure the vma is not shared, that the dst range is - * both valid and fully within a single existing vma. - */ - err = -ENOENT; - dst_vma = find_dst_vma(dst_mm, dst_start, len); - if (!dst_vma) - goto out_unlock; - err = -EINVAL; /* * shmem_zero_setup is invoked in mmap for MAP_ANONYMOUS|MAP_SHARED but @@ -629,8 +666,8 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, * If this is a HUGETLB vma, pass off to appropriate routine */ if (is_vm_hugetlb_page(dst_vma)) - return mfill_atomic_hugetlb(ctx, dst_vma, dst_start, - src_start, len, flags); + return mfill_atomic_hugetlb(ctx, dst_vma, dst_start, src_start + len, flags, &mmap_locked); if (!vma_is_anonymous(dst_vma) && !vma_is_shmem(dst_vma)) goto out_unlock; @@ -690,7 +727,8 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, void *kaddr; up_read(&ctx->map_changing_lock); - mmap_read_unlock(dst_mm); + unpin_vma(dst_mm, dst_vma, &mmap_locked); + BUG_ON(!folio); kaddr = kmap_local_folio(folio, 0); @@ -721,7 +759,7 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, out_unlock: up_read(&ctx->map_changing_lock); - mmap_read_unlock(dst_mm); + unpin_vma(dst_mm, dst_vma, &mmap_locked); out: if (folio) folio_put(folio); @@ -1243,8 +1281,6 @@ static int validate_move_areas(struct userfaultfd_ctx *ctx, * @len: length of the virtual memory range * @mode: flags from uffdio_move.mode * - * Must be called with mmap_lock held for read. - * * move_pages() remaps arbitrary anonymous pages atomically in zero * copy. It only works on non shared anonymous pages because those can * be relocated without generating non linear anon_vmas in the rmap @@ -1320,6 +1356,7 @@ ssize_t move_pages(struct userfaultfd_ctx *ctx, struct mm_struct *mm, pmd_t *src_pmd, *dst_pmd; long err = -EINVAL; ssize_t moved = 0; + bool mmap_locked = false; /* Sanitize the command parameters. */ if (WARN_ON_ONCE(src_start & ~PAGE_MASK) || @@ -1332,28 +1369,52 @@ ssize_t move_pages(struct userfaultfd_ctx *ctx, struct mm_struct *mm, WARN_ON_ONCE(dst_start + len <= dst_start)) goto out; + dst_vma = NULL; + src_vma = lock_vma_under_rcu(mm, src_start); + if (src_vma) { + dst_vma = lock_vma_under_rcu(mm, dst_start); + if (!dst_vma) + vma_end_read(src_vma); + } + + /* If we failed to lock both VMAs, fall back to mmap_lock */ + if (!dst_vma) { + mmap_read_lock(mm); + mmap_locked = true; + src_vma = find_vma(mm, src_start); + if (!src_vma) + goto out_unlock_mmap; + dst_vma = find_vma(mm, dst_start); + if (!dst_vma) + goto out_unlock_mmap; + } + + /* Re-check after taking map_changing_lock */ + down_read(&ctx->map_changing_lock); + if (likely(atomic_read(&ctx->mmap_changing))) { + err = -EAGAIN; + goto out_unlock; + } /* * Make sure the vma is not shared, that the src and dst remap * ranges are both valid and fully within a single existing * vma. */ - src_vma = find_vma(mm, src_start); - if (!src_vma || (src_vma->vm_flags & VM_SHARED)) - goto out; + if (src_vma->vm_flags & VM_SHARED) + goto out_unlock; if (src_start < src_vma->vm_start || src_start + len > src_vma->vm_end) - goto out; + goto out_unlock; - dst_vma = find_vma(mm, dst_start); - if (!dst_vma || (dst_vma->vm_flags & VM_SHARED)) - goto out; + if (dst_vma->vm_flags & VM_SHARED) + goto out_unlock; if (dst_start < dst_vma->vm_start || dst_start + len > dst_vma->vm_end) - goto out; + goto out_unlock; err = validate_move_areas(ctx, src_vma, dst_vma); if (err) - goto out; + goto out_unlock; for (src_addr = src_start, dst_addr = dst_start; src_addr < src_start + len;) { @@ -1475,6 +1536,15 @@ ssize_t move_pages(struct userfaultfd_ctx *ctx, struct mm_struct *mm, moved += step_size; } +out_unlock: + up_read(&ctx->map_changing_lock); +out_unlock_mmap: + if (mmap_locked) + mmap_read_unlock(mm); + else { + vma_end_read(dst_vma); + vma_end_read(src_vma); + } out: VM_WARN_ON(moved < 0); VM_WARN_ON(err > 0);