From patchwork Tue Feb 13 21:57:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13555745 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 B02B4C4829F for ; Tue, 13 Feb 2024 21:57:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 41F798D001A; Tue, 13 Feb 2024 16:57:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3A5AE6B0082; Tue, 13 Feb 2024 16:57:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F98B8D001A; Tue, 13 Feb 2024 16:57:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 074B46B007B for ; Tue, 13 Feb 2024 16:57:58 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D29EB120CFE for ; Tue, 13 Feb 2024 21:57:57 +0000 (UTC) X-FDA: 81788143794.14.15968F1 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf07.hostedemail.com (Postfix) with ESMTP id 1C43240017 for ; Tue, 13 Feb 2024 21:57:55 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=TonrWpv4; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of 34-XLZQsKCBQ584yC102xBu08805y.w86527EH-664Fuw4.8B0@flex--lokeshgidra.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=34-XLZQsKCBQ584yC102xBu08805y.w86527EH-664Fuw4.8B0@flex--lokeshgidra.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707861476; 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=FeTp34JzZtDcGzw26Xy4JuyVdUXeLDl6wgD9/498E4U=; b=CjBQD1yuN9Wmpgj6lwOzzGf+w/NknKPc6L8JyBbRG++g87Qq0HAhec4pxwcrNwk3qmENWs lsO9IgkuT6X4h+LhO8Oc46F77cHc9fTJ9WnEEyHMZpHCqkPsTmsJjXyzzolihkjj/2omN5 N4rQPXD57kU4klxPfDoxVAEqWJy+61U= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=TonrWpv4; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of 34-XLZQsKCBQ584yC102xBu08805y.w86527EH-664Fuw4.8B0@flex--lokeshgidra.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=34-XLZQsKCBQ584yC102xBu08805y.w86527EH-664Fuw4.8B0@flex--lokeshgidra.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707861476; a=rsa-sha256; cv=none; b=Xja8zFNJt7VENBCTYuYLoqC/HAXPAT6034w1JEORN5NpYGDwm4gHfcK0oDmsqx1BEIorVK q95XnCofQwKigyUBfpzs3dJLeuE7UGl2MCNxt3FlueP/8KqwIrc5PQJAbrOqV8MGbrJq5p 7WZ1rSLZ5U1msGm8+GkKYKBULKBjZ20= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5efe82b835fso109011837b3.0 for ; Tue, 13 Feb 2024 13:57:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707861475; x=1708466275; 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=FeTp34JzZtDcGzw26Xy4JuyVdUXeLDl6wgD9/498E4U=; b=TonrWpv4lT1UHawVVB+k0e1kMi8LoxK63B5PwghvAMYG5/vqdhxa97CXMF2x5q6BYQ 0I2cHtAhCMo52SCfL3lcROP+jQMSkodgcvrxZfPIr+st7W+QnN9VmvAiW7gsL+DLhFPH 9G0WYfBknp2t/5ocbqPSVDOdXq9d5yNFWAYuLjfxMNIRsb+a3VHDjHx5Fhf4VJKG8No+ 2PKPLmWcT2p0/U31oEPgugv3pm1+9LX6EnwZnks8oQnP/Ne6I82dVknigyauQ0A4OsTA rC2XDhbPqELPnGNc0vPgqTohagzH1Ggd49BNR99K4sJELs2ayop+vD4eaey314+RQQxd 1fQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707861475; x=1708466275; 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=FeTp34JzZtDcGzw26Xy4JuyVdUXeLDl6wgD9/498E4U=; b=qUTY1Q15IzxP/I4y2VvHDVpMPKgKA0LyDXZFj/ocNbUGE+HfMlm78bZ6p7Q2lzpOzi sn4YD4igxcvNCT0JN29Zm2N5IDqlFGJ9qkZNr7TomEZpYWM57UBxUITw47qQSkKcc8B+ /mujoyJUQ4IqqD8NxGCR33eyla68jt0hQrCT8hw2fHVnF/uHnTDVAGjGLeY94Y99/c3n 2q6OBuWYpapbxrKlmemWWVDHANtLHE2smMaS0cYsUMi5tELPurkePbN5t/YjyGpQsmYo xsuNc1uwFtgiT2/bICvEXwNg/KarEHSV47swPmV7a7L1uZF9AuGmGLyR298FqeP+KlML zSUA== X-Forwarded-Encrypted: i=1; AJvYcCUXCaPDBj8bnEMbFcJZ4RHTaIr4PXSmdsXIWNn4jd0s7bzjNe0M8oQSmFOsn6/Lf2Z2+HrqC/+2f4Svq1OljRITJ2E= X-Gm-Message-State: AOJu0Yw9P/At4K0xgHEU5FMJLxqVeRtP6gsbLUvqGxixayrNagbxE0EF VpegxXV7GkgZN030Nx/Ukdk0tTlKW+Gt+ejXTZ/xdHmfyCTc6yB2D/r1EsdctrB11QSDLwb9ABm 2sWgRHyyF08XacZcSDZkucQ== X-Google-Smtp-Source: AGHT+IF6FRAl67GGzZTs+uSDLQ3zEXnXXJGoppNG6Drbo0W+NjY2DiKJAS+tQbv/WS3Q7Q/R1NWID6lqQwyYNbHC0w== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:ce6c:821f:a756:b4b8]) (user=lokeshgidra job=sendgmr) by 2002:a05:6902:1021:b0:dc6:fa35:b42 with SMTP id x1-20020a056902102100b00dc6fa350b42mr95095ybt.2.1707861475235; Tue, 13 Feb 2024 13:57:55 -0800 (PST) Date: Tue, 13 Feb 2024 13:57:39 -0800 In-Reply-To: <20240213215741.3816570-1-lokeshgidra@google.com> Mime-Version: 1.0 References: <20240213215741.3816570-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240213215741.3816570-2-lokeshgidra@google.com> Subject: [PATCH v6 1/3] userfaultfd: move userfaultfd_ctx struct to header file 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, Liam.Howlett@oracle.com X-Rspamd-Queue-Id: 1C43240017 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: aw1yca5woahoqfzmo7ot5hjnra69uxwa X-HE-Tag: 1707861475-215277 X-HE-Meta: U2FsdGVkX19b280wiht1paKXSk5ON6PEHaRWOtMJTYege+toxyHupnulMi0bu5+ryzQx227PnaHvUqY/zz3R0owLCeiwi5Fm7ff7/r0j3cCKWhDimTeujRnrWSdOSx9XQEfanAgQ1euaajhhUNTg9jDAW3d5q+0uzD0n2nHIUnO9B1mG4OW9SaevgHSYaeDW49zWhaYeb++Im5Rb5a8sXMze72rvm7lVOZprWgoopHUihYBVc5I4VB+43R+1g7sXcNRaVGBTDKmOc7u2ui4QdZKwPAZjARFcDLWw9sXwugxdRrf0e6jqxipxnnDpevftokxCpB60wRnIKU8mgNRyJ11z5mR4CUHHaGLyrM7njEthu5NqJUz2Vhud8NfYKtUAwM3Hn+ccg/Bi4z7Mfmi9w04Xl8+zupsSbZ78dtcDJNaIfsUKBfJEsKtQUyYGxnnZO8Ii+9tlW0GGdAGL7ndFJCy4KdiLrdJ+bpBodPp/3hTNL949otjfqPXipwAjflbwjRuVJnBNSIfja9HqaohHH11NYoO2BSKa+VOrLU0zxCv0Ca3wmwafGPzrRauTeZIe1dQs8JH5o0fczt/mp1lIZ/kEH2O5b7TSu1ll+9Nar5jDm7ByEKavSYU5qKIn70mulahU+rAUeDZiZSCBnTHwKinpl2OYOMWYiwciQGH5cNO1FgJpzKf/dKpPtxOkB7FUYlWamHCG9auok5XYAtQPZJZ+fA0UopM4IOo866wHYw+Vq7Z6H//60u0DrbNOqWlA6i/GyN00LEtQm8r4NrSKAXE7e4wxXcJEze1snbV6J11ZyCtJCtgNKVPzoMaJDIBp90XcMhqGtaWwqQ2zCPTs2MtnEdfic8Q+GGKjh9S+b1G3qQfj281jbL++2xwwAcR24nywy5TMxW9SzSK6KQgZyCPB8GI3VnJEKwU+UeRnP1ZBQDp2Oc3Ci/3+8R4tkoWCsbqKCWC4aCGIPONth3f yYRWr+0l 1bP6lZz82teb4EY3tREDxjjMmQgUfixUSXqD1tPfGTdnoeN8K69vrBomTfRvToF/xiGP1uidnNKvBo0zNnZ1UMupgp9ngTiIUJmGyjxwjYewqFwpbPG3VyJhMBOzkaPFsub3GZkC22xKf2aCZGS4WgpL3QnrNCgQnjE3JTknEQaCjC1FDCfr9UxuuHRFXQFuwYLBJybv9+q0I90fqdxFSZtwvaKbfLOyN9NjNYI0vrS+eo5KVJzkRDpaKuc9GvmVVGoUuKEbapI9n2pT4bL4O9AL9/cjvxhmm2DkAhYCPgH0O1Jt/DpZ2wBv7ysnTOqnLtgt2Jozuot4SL7v8I8jV96aQmWHGzpZPUkasI6BpE+j6uokrWLkso+6HCXzvVVRwAReO9BtuxuNm6jrcN7TR3/Rwux2Qd7lsfz1zQZeoc+iN26kAJI0vkyyuku183zREvxdABsqT9y1NwRxfhQeb9h9n9YlXDTuu77TIuH1m15jDQUb2R2xoOAoGI4CXf2w4lNoWD7e/jFPDkaMKTTmB9r25M1wSK98e52Yhx7rySjp3yUn/3H48TLauBqrBX1F6SPqFz0dR2UP69J6v8UkbY54+72o3ESChuy0eHNJEOguW2J0p3WmngSQ6VpiN7TiCfpllzRBteyAP+ErxADYmjf5gILc2n9SjtvSO8yRV2NMV8DleY4zySP0MZM/JFcqFyqI20UTatLv1xqSgzDTOvco3gCkW6xaP+6AGUZ+Hy7Cv7SI9myAvTZPEaKfB70DsuS1IUGYTYISz3ZjoMi9SPK2bqTPcxNBwBuct7L3M/U5RxccNN6z6VsDqmzHHHJ2CRcVAfdVXXR1Uuuc= 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: Moving the struct to userfaultfd_k.h to be accessible from mm/userfaultfd.c. There are no other changes in the struct. This is required to prepare for using per-vma locks in userfaultfd operations. Signed-off-by: Lokesh Gidra Reviewed-by: Mike Rapoport (IBM) --- fs/userfaultfd.c | 39 ----------------------------------- include/linux/userfaultfd_k.h | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 05c8e8a05427..58331b83d648 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -50,45 +50,6 @@ static struct ctl_table vm_userfaultfd_table[] = { static struct kmem_cache *userfaultfd_ctx_cachep __ro_after_init; -/* - * Start with fault_pending_wqh and fault_wqh so they're more likely - * to be in the same cacheline. - * - * Locking order: - * fd_wqh.lock - * fault_pending_wqh.lock - * fault_wqh.lock - * event_wqh.lock - * - * To avoid deadlocks, IRQs must be disabled when taking any of the above locks, - * since fd_wqh.lock is taken by aio_poll() while it's holding a lock that's - * also taken in IRQ context. - */ -struct userfaultfd_ctx { - /* waitqueue head for the pending (i.e. not read) userfaults */ - wait_queue_head_t fault_pending_wqh; - /* waitqueue head for the userfaults */ - wait_queue_head_t fault_wqh; - /* waitqueue head for the pseudo fd to wakeup poll/read */ - wait_queue_head_t fd_wqh; - /* waitqueue head for events */ - wait_queue_head_t event_wqh; - /* a refile sequence protected by fault_pending_wqh lock */ - seqcount_spinlock_t refile_seq; - /* pseudo fd refcounting */ - refcount_t refcount; - /* userfaultfd syscall flags */ - unsigned int flags; - /* features requested from the userspace */ - unsigned int features; - /* released */ - bool released; - /* memory mappings are changing because of non-cooperative event */ - atomic_t mmap_changing; - /* mm with one ore more vmas attached to this userfaultfd_ctx */ - struct mm_struct *mm; -}; - struct userfaultfd_fork_ctx { struct userfaultfd_ctx *orig; struct userfaultfd_ctx *new; diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index e4056547fbe6..691d928ee864 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -36,6 +36,45 @@ #define UFFD_SHARED_FCNTL_FLAGS (O_CLOEXEC | O_NONBLOCK) #define UFFD_FLAGS_SET (EFD_SHARED_FCNTL_FLAGS) +/* + * Start with fault_pending_wqh and fault_wqh so they're more likely + * to be in the same cacheline. + * + * Locking order: + * fd_wqh.lock + * fault_pending_wqh.lock + * fault_wqh.lock + * event_wqh.lock + * + * To avoid deadlocks, IRQs must be disabled when taking any of the above locks, + * since fd_wqh.lock is taken by aio_poll() while it's holding a lock that's + * also taken in IRQ context. + */ +struct userfaultfd_ctx { + /* waitqueue head for the pending (i.e. not read) userfaults */ + wait_queue_head_t fault_pending_wqh; + /* waitqueue head for the userfaults */ + wait_queue_head_t fault_wqh; + /* waitqueue head for the pseudo fd to wakeup poll/read */ + wait_queue_head_t fd_wqh; + /* waitqueue head for events */ + wait_queue_head_t event_wqh; + /* a refile sequence protected by fault_pending_wqh lock */ + seqcount_spinlock_t refile_seq; + /* pseudo fd refcounting */ + refcount_t refcount; + /* userfaultfd syscall flags */ + unsigned int flags; + /* features requested from the userspace */ + unsigned int features; + /* released */ + bool released; + /* memory mappings are changing because of non-cooperative event */ + atomic_t mmap_changing; + /* mm with one ore more vmas attached to this userfaultfd_ctx */ + struct mm_struct *mm; +}; + extern vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason); /* A combined operation mode + behavior flags. */ From patchwork Tue Feb 13 21:57:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13555746 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 D2D65C4829A for ; Tue, 13 Feb 2024 21:58:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5FDA68D0022; Tue, 13 Feb 2024 16:58:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 57B2B6B0082; Tue, 13 Feb 2024 16:58:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 380628D0022; Tue, 13 Feb 2024 16:58:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 235036B007B for ; Tue, 13 Feb 2024 16:58:00 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id F3FAB80C69 for ; Tue, 13 Feb 2024 21:57:59 +0000 (UTC) X-FDA: 81788143878.01.38646FC Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf30.hostedemail.com (Postfix) with ESMTP id 2A8CD8000E for ; Tue, 13 Feb 2024 21:57:57 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=SaJh9qpT; spf=pass (imf30.hostedemail.com: domain of 35eXLZQsKCBY7A60E324zDw2AA270.yA8749GJ-886Hwy6.AD2@flex--lokeshgidra.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=35eXLZQsKCBY7A60E324zDw2AA270.yA8749GJ-886Hwy6.AD2@flex--lokeshgidra.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707861478; 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=lSLmVkRgWUoN7XoRPV1r5JJdZzlBEVE8ndv4C2H5Jh8=; b=DxhATf3Wsdu7PI/YSmKubYLYKnhlBFQa93mY/yDxyUPrYe4PlSioXnyTwqtEi8ihhl38ju GPMsIL/ZhqH/BetEATDa8YJzPeyLheuFrdOTx6O6jh4tjYha5J0i+uI2BB2yL6MZD9y5uH /eplA8+qyzXTqyXHkomYg8LadT7Tdmk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707861478; a=rsa-sha256; cv=none; b=f2YXZcFJaPBrkCP4FSJf3B/jRftee4KpvkSJj4vnNJIaRyO/0oqLGdwi6OwH/g/H8EhDIT oj3SXGVkF/kjdqy+rdkXE2zUfSz19WzLjyWdyO8PNnmohRVOOeuWF6eVlXy9pEoHWE2nu7 0ytdZjTvKVegYj3z3YgkVJ8647/9dAA= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=SaJh9qpT; spf=pass (imf30.hostedemail.com: domain of 35eXLZQsKCBY7A60E324zDw2AA270.yA8749GJ-886Hwy6.AD2@flex--lokeshgidra.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=35eXLZQsKCBY7A60E324zDw2AA270.yA8749GJ-886Hwy6.AD2@flex--lokeshgidra.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc6ceade361so8528128276.0 for ; Tue, 13 Feb 2024 13:57:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707861477; x=1708466277; 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=lSLmVkRgWUoN7XoRPV1r5JJdZzlBEVE8ndv4C2H5Jh8=; b=SaJh9qpTcTYV964mQSwdMztXKovwUgiVoEbwimXoGO3kJ0ke1fsInatKRm//heegjd oxoFqBDNzr63mVFQZEVBI6koiXIyQMXGgzkFacB5113B7LcVdE83fz6whnwXo4Wj8abQ DC/1jbMcPLkrcdg04wc3b8yLiZnHvuVPNZzWxuhfIyVhqTevXZfKeSzfTCM0bGsKRORy Hi1kC79vu6pyvl6OGh5/phlAHrMCW/B1ad5o42pU2EC2HWZxYQBkzSyzb+WHDPTgSYn8 6V9GFIcoRG+Gs8Tud1VHDYyuAZ9gTDawziHAePDyqOo3p4jcxY6hfJT9nmZE6yxHpCt4 pqTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707861477; x=1708466277; 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=lSLmVkRgWUoN7XoRPV1r5JJdZzlBEVE8ndv4C2H5Jh8=; b=DtMKsNADQWrb1FMYM54JrZIONLqelAdq2qRqrRLTBgTWqdX23MhDKZKOBNBuVqLk1C WUGNm1wVtaEP+AeDNTLN/1/wBUCtUD21BHRhIS6V6AAGERIar7A5fWBlBo8xV40a+U5h UdvnGvIYixSXSLzmKvBYTExDjps+/+FoovGXp/iPgfrzb6U2/25zRkYVa5t+Pvr+j1OP nCL9dObFh9QGTyZJ6MrbhvW1vLZ/UeZWGRlaYNe2VBhWYeA+FW+7qcgwEmzMuNBg33u3 1Sw8rQY8gqmrbR/MRVzwWaOvLXMmEgvVDuvD9AZDC+3peROP5Y3tCKLkenJWoO107eF/ PfRw== X-Forwarded-Encrypted: i=1; AJvYcCU5eAwpOsvn98tURZL3W6tgIE/7qv7RmQTN/qNKmpU9doeI7ijoaPignJkyYIJ0TLbH9fCTmGyCpiokxlhrDjkBEao= X-Gm-Message-State: AOJu0YwwgoQxkgzDVFXP7gM1Q1Z6gnYL7C2Z0JYHVT4SYcOInyu93K0R SBy3P7tqAjRif/3HR8zzmIJVpyLJU4bD/s0Am31rivF5LoSq8c3uyxOyFLwbc0H7eCP6WCZHY2m /i58yk/7+c7nE+o5Ovi/SxA== X-Google-Smtp-Source: AGHT+IH954nIwdBLMKzG+Hi6faE6gUN1nsyORBxMb+9Ivpb9zj9IUDvp6eZkkvZZIh0bsvjZ4k7hqnmrecb1SwwavQ== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:ce6c:821f:a756:b4b8]) (user=lokeshgidra job=sendgmr) by 2002:a05:6902:1509:b0:dc2:550b:a4f4 with SMTP id q9-20020a056902150900b00dc2550ba4f4mr86186ybu.1.1707861477294; Tue, 13 Feb 2024 13:57:57 -0800 (PST) Date: Tue, 13 Feb 2024 13:57:40 -0800 In-Reply-To: <20240213215741.3816570-1-lokeshgidra@google.com> Mime-Version: 1.0 References: <20240213215741.3816570-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240213215741.3816570-3-lokeshgidra@google.com> Subject: [PATCH v6 2/3] userfaultfd: protect mmap_changing with rw_sem in userfaulfd_ctx 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, Liam.Howlett@oracle.com X-Stat-Signature: tamfnnt1b7y16cd9a1bw6rki9d5ogui6 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 2A8CD8000E X-Rspam-User: X-HE-Tag: 1707861477-488309 X-HE-Meta: U2FsdGVkX183n65bhm/Tw6HkUzghCfp8DQ/9LP6q9uUDwD+0t0ghblol0u0AMqEYnODcCQT/Kyd+K6SPEYdxhgg4IT4K+O+iXMPp4cFoR8DjerwpS3tEYvVE1QysDXnPdsCXoVU8eJg+OzHpXPnJM/a4+wrC8KgjxQ98IpYJlZCltZ/d7bfJulNXu398viE+IteL3TJbVIzHRWlHO0CY1xwoJGHjAszKY0EY732QMTC6eGFkhkt0dqjfb7cNH5u8FnFS6NjOpQnfWPJcWp4io9AICZtllCBXmnLC/vesUX6/UiRl9zXVS7KLLJ52p6plLHm2dXnFoRa8KFWrOED4mK6JhPyne72Xd2dBhs71rQMBfqcuXUy8XMXIuCsq/v72YD1ldwKT898pfLbVar19wN+CGcfWEQ/Rwe8x2yMz/hmAiVBuPiDX85nYXOYcmc3s8rWi0KRsA3mbw5l42AedYlsKmT3FsXkIz5fnF0HlZff8Nb+WInEK3alSEprlgBCURtg/crjJF7Y23lDiVpdSSpIkida1Ytpvjx6lwN3RJxYc1AEPyBHnND2RccoAaR8zs4bx77YgP1CvuriHipWoAF9bPx6WVI+GxXVbVcz5Wfb515IUb+E3SRs3mmk8NQ3WDG9zMPqnNmSNet6m3tbCvQ5+WPI8JjzhBEpzKr3OrsyKnIJ2P2hLBuANLmNRmh+b6CztFp320EHG3hXp/SIB1RNpBjXCWZWM0J5VO2TMWKcxkBCm8rOj1MajqQXvDhxyRH+E1064srJOw4TBBuXLjd4XMhA7XC4zzhKfWreiqUl672KyvvPZgcTaYQ/gsAOBwrNtPFaB8ReeV/T+ssUEC7FwX0HkmqyIXkYC5+oN/KmJuxn8Zs0AY+yDgmZCVbDkquHoQLtBwbNq2JeOBPFdk++wPA7gdmGp8xLKR4A9X3dz6BswhSDvqotEU52WoLOPHQLlsZc2ZB4cwHH/WEW yNx3F6vJ BhF3We5WGTFuNrSTeGA09lWSZa4RfZ/EY6+ziJx+HxhCU9sWIYn0zD/8YsD3j2CNLtFAikOmv4Pka+cjH+eDSkwmbPeRCEfBRbTYdXWW5ON8yO7/27XrLODxmjZ3HnL2baFVhh61zPneUqu0qabDM58x5RcZvNHt0JKSSZ+wKpDsZyUNY43kemhNK054baBhuSVO0RhNtrFqWvQJrT9Bxg16hBJraAqoM63nRqwK2AVE+9w8pQ1FBBk9H+eWMd3sapQrw54zbFVtqRlXkcxIxuZUDGjcL04BJJMFrZWHBR/1nU6x2ju15eQ36/UtsV+lnNtsrrJz5Ei8P6erep+Eoa5/rCvSkUeK/4+7gv3VmXk6SAYXkfyj8ffbrJK3HumFRNRJGZHHe/oTh4MAd6tzdOCaFM9bich5c7OTInjroNCw26KllofhynmuLP01TKz3O79ZBcrXtA6srVxmGkFWcqe4wz6Hx4D0a80QZvW03CIRWolq80XFEalAzAgrU8EauxqgREmlow1/pbnlB/4pGytgaNUnpam/HKat6tW17C2eN/DUcQAm2/jN5mVZUAjhvh4Ucx3Z1rv838jHvd6P3axxsx/8MqHnfmBaKgEPFD6fOpIZ6EoLkcEcRKLr0ooEb76aiS/mk513DaNzvU0SvJ/RjvfaQkRHqDM30GoiZ0BRJ/PHpZsBuwpa80GM8rWPEJs+l/KMLyod8VekrD5VtxHJkjOxhoMM4xG2O+NRS7YyUANZTqRRr1lJdhuL6Etg48WJxnZrJLTcCaddEtaDE0bRx7FfYyHfuLLMS6LzBxStaWUPlINae/yaNBicwpZSpthB+uts+LB/ZmmA= 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: Increments and loads to mmap_changing are always in mmap_lock critical section. This ensures that if userspace requests event notification for non-cooperative operations (e.g. mremap), userfaultfd operations don't occur concurrently. This can be achieved by using a separate read-write semaphore in userfaultfd_ctx such that increments are done in write-mode and loads in read-mode, thereby eliminating the dependency on mmap_lock for this purpose. This is a preparatory step before we replace mmap_lock usage with per-vma locks in fill/move ioctls. Signed-off-by: Lokesh Gidra Reviewed-by: Mike Rapoport (IBM) --- fs/userfaultfd.c | 40 ++++++++++++---------- include/linux/userfaultfd_k.h | 31 ++++++++++-------- mm/userfaultfd.c | 62 ++++++++++++++++++++--------------- 3 files changed, 75 insertions(+), 58 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 58331b83d648..c00a021bcce4 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -685,12 +685,15 @@ int dup_userfaultfd(struct vm_area_struct *vma, struct list_head *fcs) ctx->flags = octx->flags; ctx->features = octx->features; ctx->released = false; + init_rwsem(&ctx->map_changing_lock); atomic_set(&ctx->mmap_changing, 0); ctx->mm = vma->vm_mm; mmgrab(ctx->mm); userfaultfd_ctx_get(octx); + down_write(&octx->map_changing_lock); atomic_inc(&octx->mmap_changing); + up_write(&octx->map_changing_lock); fctx->orig = octx; fctx->new = ctx; list_add_tail(&fctx->list, fcs); @@ -737,7 +740,9 @@ void mremap_userfaultfd_prep(struct vm_area_struct *vma, if (ctx->features & UFFD_FEATURE_EVENT_REMAP) { vm_ctx->ctx = ctx; userfaultfd_ctx_get(ctx); + down_write(&ctx->map_changing_lock); atomic_inc(&ctx->mmap_changing); + up_write(&ctx->map_changing_lock); } else { /* Drop uffd context if remap feature not enabled */ vma_start_write(vma); @@ -783,7 +788,9 @@ bool userfaultfd_remove(struct vm_area_struct *vma, return true; userfaultfd_ctx_get(ctx); + down_write(&ctx->map_changing_lock); atomic_inc(&ctx->mmap_changing); + up_write(&ctx->map_changing_lock); mmap_read_unlock(mm); msg_init(&ewq.msg); @@ -825,7 +832,9 @@ int userfaultfd_unmap_prep(struct vm_area_struct *vma, unsigned long start, return -ENOMEM; userfaultfd_ctx_get(ctx); + down_write(&ctx->map_changing_lock); atomic_inc(&ctx->mmap_changing); + up_write(&ctx->map_changing_lock); unmap_ctx->ctx = ctx; unmap_ctx->start = start; unmap_ctx->end = end; @@ -1709,9 +1718,8 @@ static int userfaultfd_copy(struct userfaultfd_ctx *ctx, if (uffdio_copy.mode & UFFDIO_COPY_MODE_WP) flags |= MFILL_ATOMIC_WP; if (mmget_not_zero(ctx->mm)) { - ret = mfill_atomic_copy(ctx->mm, uffdio_copy.dst, uffdio_copy.src, - uffdio_copy.len, &ctx->mmap_changing, - flags); + ret = mfill_atomic_copy(ctx, uffdio_copy.dst, uffdio_copy.src, + uffdio_copy.len, flags); mmput(ctx->mm); } else { return -ESRCH; @@ -1761,9 +1769,8 @@ static int userfaultfd_zeropage(struct userfaultfd_ctx *ctx, goto out; if (mmget_not_zero(ctx->mm)) { - ret = mfill_atomic_zeropage(ctx->mm, uffdio_zeropage.range.start, - uffdio_zeropage.range.len, - &ctx->mmap_changing); + ret = mfill_atomic_zeropage(ctx, uffdio_zeropage.range.start, + uffdio_zeropage.range.len); mmput(ctx->mm); } else { return -ESRCH; @@ -1818,9 +1825,8 @@ static int userfaultfd_writeprotect(struct userfaultfd_ctx *ctx, return -EINVAL; if (mmget_not_zero(ctx->mm)) { - ret = mwriteprotect_range(ctx->mm, uffdio_wp.range.start, - uffdio_wp.range.len, mode_wp, - &ctx->mmap_changing); + ret = mwriteprotect_range(ctx, uffdio_wp.range.start, + uffdio_wp.range.len, mode_wp); mmput(ctx->mm); } else { return -ESRCH; @@ -1870,9 +1876,8 @@ static int userfaultfd_continue(struct userfaultfd_ctx *ctx, unsigned long arg) flags |= MFILL_ATOMIC_WP; if (mmget_not_zero(ctx->mm)) { - ret = mfill_atomic_continue(ctx->mm, uffdio_continue.range.start, - uffdio_continue.range.len, - &ctx->mmap_changing, flags); + ret = mfill_atomic_continue(ctx, uffdio_continue.range.start, + uffdio_continue.range.len, flags); mmput(ctx->mm); } else { return -ESRCH; @@ -1925,9 +1930,8 @@ static inline int userfaultfd_poison(struct userfaultfd_ctx *ctx, unsigned long goto out; if (mmget_not_zero(ctx->mm)) { - ret = mfill_atomic_poison(ctx->mm, uffdio_poison.range.start, - uffdio_poison.range.len, - &ctx->mmap_changing, 0); + ret = mfill_atomic_poison(ctx, uffdio_poison.range.start, + uffdio_poison.range.len, 0); mmput(ctx->mm); } else { return -ESRCH; @@ -2003,13 +2007,14 @@ static int userfaultfd_move(struct userfaultfd_ctx *ctx, if (mmget_not_zero(mm)) { mmap_read_lock(mm); - /* Re-check after taking mmap_lock */ + /* 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 = -EAGAIN; - + up_read(&ctx->map_changing_lock); mmap_read_unlock(mm); mmput(mm); } else { @@ -2216,6 +2221,7 @@ static int new_userfaultfd(int flags) ctx->flags = flags; ctx->features = 0; ctx->released = false; + init_rwsem(&ctx->map_changing_lock); atomic_set(&ctx->mmap_changing, 0); ctx->mm = current->mm; /* prevent the mm struct to be freed */ diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index 691d928ee864..3210c3552976 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -69,6 +69,13 @@ struct userfaultfd_ctx { unsigned int features; /* released */ bool released; + /* + * Prevents userfaultfd operations (fill/move/wp) from happening while + * some non-cooperative event(s) is taking place. Increments are done + * in write-mode. Whereas, userfaultfd operations, which includes + * reading mmap_changing, is done under read-mode. + */ + struct rw_semaphore map_changing_lock; /* memory mappings are changing because of non-cooperative event */ atomic_t mmap_changing; /* mm with one ore more vmas attached to this userfaultfd_ctx */ @@ -113,22 +120,18 @@ extern int mfill_atomic_install_pte(pmd_t *dst_pmd, unsigned long dst_addr, struct page *page, bool newly_allocated, uffd_flags_t flags); -extern ssize_t mfill_atomic_copy(struct mm_struct *dst_mm, unsigned long dst_start, +extern ssize_t mfill_atomic_copy(struct userfaultfd_ctx *ctx, unsigned long dst_start, unsigned long src_start, unsigned long len, - atomic_t *mmap_changing, uffd_flags_t flags); -extern ssize_t mfill_atomic_zeropage(struct mm_struct *dst_mm, + uffd_flags_t flags); +extern ssize_t mfill_atomic_zeropage(struct userfaultfd_ctx *ctx, unsigned long dst_start, - unsigned long len, - atomic_t *mmap_changing); -extern ssize_t mfill_atomic_continue(struct mm_struct *dst_mm, unsigned long dst_start, - unsigned long len, atomic_t *mmap_changing, - uffd_flags_t flags); -extern ssize_t mfill_atomic_poison(struct mm_struct *dst_mm, unsigned long start, - unsigned long len, atomic_t *mmap_changing, - uffd_flags_t flags); -extern int mwriteprotect_range(struct mm_struct *dst_mm, - unsigned long start, unsigned long len, - bool enable_wp, atomic_t *mmap_changing); + unsigned long len); +extern ssize_t mfill_atomic_continue(struct userfaultfd_ctx *ctx, unsigned long dst_start, + unsigned long len, uffd_flags_t flags); +extern ssize_t mfill_atomic_poison(struct userfaultfd_ctx *ctx, unsigned long start, + unsigned long len, uffd_flags_t flags); +extern int mwriteprotect_range(struct userfaultfd_ctx *ctx, unsigned long start, + unsigned long len, bool enable_wp); extern long uffd_wp_range(struct vm_area_struct *vma, unsigned long start, unsigned long len, bool enable_wp); diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 9cc93cc1330b..74aad0831e40 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -353,11 +353,11 @@ static pmd_t *mm_alloc_pmd(struct mm_struct *mm, unsigned long address) * called with mmap_lock held, it will release mmap_lock before returning. */ static __always_inline ssize_t mfill_atomic_hugetlb( + struct userfaultfd_ctx *ctx, struct vm_area_struct *dst_vma, unsigned long dst_start, unsigned long src_start, unsigned long len, - atomic_t *mmap_changing, uffd_flags_t flags) { struct mm_struct *dst_mm = dst_vma->vm_mm; @@ -379,6 +379,7 @@ static __always_inline ssize_t mfill_atomic_hugetlb( * feature is not supported. */ if (uffd_flags_mode_is(flags, MFILL_ATOMIC_ZEROPAGE)) { + up_read(&ctx->map_changing_lock); mmap_read_unlock(dst_mm); return -EINVAL; } @@ -463,6 +464,7 @@ static __always_inline ssize_t mfill_atomic_hugetlb( cond_resched(); if (unlikely(err == -ENOENT)) { + up_read(&ctx->map_changing_lock); mmap_read_unlock(dst_mm); BUG_ON(!folio); @@ -473,12 +475,13 @@ static __always_inline ssize_t mfill_atomic_hugetlb( goto out; } mmap_read_lock(dst_mm); + down_read(&ctx->map_changing_lock); /* * 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 */ - if (mmap_changing && atomic_read(mmap_changing)) { + if (atomic_read(&ctx->mmap_changing)) { err = -EAGAIN; break; } @@ -501,6 +504,7 @@ static __always_inline ssize_t mfill_atomic_hugetlb( } out_unlock: + up_read(&ctx->map_changing_lock); mmap_read_unlock(dst_mm); out: if (folio) @@ -512,11 +516,11 @@ static __always_inline ssize_t mfill_atomic_hugetlb( } #else /* !CONFIG_HUGETLB_PAGE */ /* fail at build time if gcc attempts to use this */ -extern ssize_t mfill_atomic_hugetlb(struct vm_area_struct *dst_vma, +extern ssize_t mfill_atomic_hugetlb(struct userfaultfd_ctx *ctx, + struct vm_area_struct *dst_vma, unsigned long dst_start, unsigned long src_start, unsigned long len, - atomic_t *mmap_changing, uffd_flags_t flags); #endif /* CONFIG_HUGETLB_PAGE */ @@ -564,13 +568,13 @@ static __always_inline ssize_t mfill_atomic_pte(pmd_t *dst_pmd, return err; } -static __always_inline ssize_t mfill_atomic(struct mm_struct *dst_mm, +static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, unsigned long dst_start, unsigned long src_start, unsigned long len, - atomic_t *mmap_changing, uffd_flags_t flags) { + struct mm_struct *dst_mm = ctx->mm; struct vm_area_struct *dst_vma; ssize_t err; pmd_t *dst_pmd; @@ -600,8 +604,9 @@ static __always_inline ssize_t mfill_atomic(struct mm_struct *dst_mm, * 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 (mmap_changing && atomic_read(mmap_changing)) + if (atomic_read(&ctx->mmap_changing)) goto out_unlock; /* @@ -633,8 +638,8 @@ static __always_inline ssize_t mfill_atomic(struct mm_struct *dst_mm, * If this is a HUGETLB vma, pass off to appropriate routine */ if (is_vm_hugetlb_page(dst_vma)) - return mfill_atomic_hugetlb(dst_vma, dst_start, src_start, - len, mmap_changing, flags); + return mfill_atomic_hugetlb(ctx, dst_vma, dst_start, + src_start, len, flags); if (!vma_is_anonymous(dst_vma) && !vma_is_shmem(dst_vma)) goto out_unlock; @@ -693,6 +698,7 @@ static __always_inline ssize_t mfill_atomic(struct mm_struct *dst_mm, if (unlikely(err == -ENOENT)) { void *kaddr; + up_read(&ctx->map_changing_lock); mmap_read_unlock(dst_mm); BUG_ON(!folio); @@ -723,6 +729,7 @@ static __always_inline ssize_t mfill_atomic(struct mm_struct *dst_mm, } out_unlock: + up_read(&ctx->map_changing_lock); mmap_read_unlock(dst_mm); out: if (folio) @@ -733,34 +740,33 @@ static __always_inline ssize_t mfill_atomic(struct mm_struct *dst_mm, return copied ? copied : err; } -ssize_t mfill_atomic_copy(struct mm_struct *dst_mm, unsigned long dst_start, +ssize_t mfill_atomic_copy(struct userfaultfd_ctx *ctx, unsigned long dst_start, unsigned long src_start, unsigned long len, - atomic_t *mmap_changing, uffd_flags_t flags) + uffd_flags_t flags) { - return mfill_atomic(dst_mm, dst_start, src_start, len, mmap_changing, + return mfill_atomic(ctx, dst_start, src_start, len, uffd_flags_set_mode(flags, MFILL_ATOMIC_COPY)); } -ssize_t mfill_atomic_zeropage(struct mm_struct *dst_mm, unsigned long start, - unsigned long len, atomic_t *mmap_changing) +ssize_t mfill_atomic_zeropage(struct userfaultfd_ctx *ctx, + unsigned long start, + unsigned long len) { - return mfill_atomic(dst_mm, start, 0, len, mmap_changing, + return mfill_atomic(ctx, start, 0, len, uffd_flags_set_mode(0, MFILL_ATOMIC_ZEROPAGE)); } -ssize_t mfill_atomic_continue(struct mm_struct *dst_mm, unsigned long start, - unsigned long len, atomic_t *mmap_changing, - uffd_flags_t flags) +ssize_t mfill_atomic_continue(struct userfaultfd_ctx *ctx, unsigned long start, + unsigned long len, uffd_flags_t flags) { - return mfill_atomic(dst_mm, start, 0, len, mmap_changing, + return mfill_atomic(ctx, start, 0, len, uffd_flags_set_mode(flags, MFILL_ATOMIC_CONTINUE)); } -ssize_t mfill_atomic_poison(struct mm_struct *dst_mm, unsigned long start, - unsigned long len, atomic_t *mmap_changing, - uffd_flags_t flags) +ssize_t mfill_atomic_poison(struct userfaultfd_ctx *ctx, unsigned long start, + unsigned long len, uffd_flags_t flags) { - return mfill_atomic(dst_mm, start, 0, len, mmap_changing, + return mfill_atomic(ctx, start, 0, len, uffd_flags_set_mode(flags, MFILL_ATOMIC_POISON)); } @@ -793,10 +799,10 @@ long uffd_wp_range(struct vm_area_struct *dst_vma, return ret; } -int mwriteprotect_range(struct mm_struct *dst_mm, unsigned long start, - unsigned long len, bool enable_wp, - atomic_t *mmap_changing) +int mwriteprotect_range(struct userfaultfd_ctx *ctx, unsigned long start, + unsigned long len, bool enable_wp) { + struct mm_struct *dst_mm = ctx->mm; unsigned long end = start + len; unsigned long _start, _end; struct vm_area_struct *dst_vma; @@ -820,8 +826,9 @@ int mwriteprotect_range(struct mm_struct *dst_mm, unsigned long start, * 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 (mmap_changing && atomic_read(mmap_changing)) + if (atomic_read(&ctx->mmap_changing)) goto out_unlock; err = -ENOENT; @@ -850,6 +857,7 @@ int mwriteprotect_range(struct mm_struct *dst_mm, unsigned long start, err = 0; } out_unlock: + up_read(&ctx->map_changing_lock); mmap_read_unlock(dst_mm); return err; } From patchwork Tue Feb 13 21:57:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13555747 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 43745C48260 for ; Tue, 13 Feb 2024 21:58:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 46C9C8D0023; Tue, 13 Feb 2024 16:58:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CF7D6B0082; Tue, 13 Feb 2024 16:58:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F8C58D0023; Tue, 13 Feb 2024 16:58:02 -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 0B05F6B007B for ; Tue, 13 Feb 2024 16:58:02 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id DF5E5A2286 for ; Tue, 13 Feb 2024 21:58:01 +0000 (UTC) X-FDA: 81788143962.21.85056A8 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf05.hostedemail.com (Postfix) with ESMTP id 0D9CD100003 for ; Tue, 13 Feb 2024 21:57:59 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=rHhWxpEP; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 35-XLZQsKCBg9C82G5461Fy4CC492.0CA96BIL-AA8Jy08.CF4@flex--lokeshgidra.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=35-XLZQsKCBg9C82G5461Fy4CC492.0CA96BIL-AA8Jy08.CF4@flex--lokeshgidra.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707861480; 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=S/WOyhn1Esqfkwtwj2LaOT451Ry7/NR5qcNsraXDTSQ=; b=N1+dBlHCTdQvf7SgTOX+kMlm0xgJ4ajVBsP9n2dlnPDHwokMSoGqeCcrQ6QoBi7BlmThRP NaMWCaJpQdZ43puzuTtadQGnCPgoOzWw42+rcsGhNTFqBsBQGGC9A4QFOfx6sHaAJemTrn 1OUBxSGmxy5qkMTp3K/+oWdCvCW5UE8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=rHhWxpEP; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 35-XLZQsKCBg9C82G5461Fy4CC492.0CA96BIL-AA8Jy08.CF4@flex--lokeshgidra.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=35-XLZQsKCBg9C82G5461Fy4CC492.0CA96BIL-AA8Jy08.CF4@flex--lokeshgidra.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707861480; a=rsa-sha256; cv=none; b=OFOfgYULNpVDZVB33VVZoDRgIcyHv9AaqU1tLtQlMpavnAuZHtkSteYbpZGgAfkMk/asqv N1arkzzxO08BOY3KxgPT1237zW77u0Mr6HkfpWj6k+A5xNnIwqX6ffjKKfn+lDcqfWzYrg Bn0ozdmLpeq89+FEdyf/v7hZG+ZWBrA= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6b26845cdso8224430276.3 for ; Tue, 13 Feb 2024 13:57:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707861479; x=1708466279; 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=S/WOyhn1Esqfkwtwj2LaOT451Ry7/NR5qcNsraXDTSQ=; b=rHhWxpEPWiwTdVtD4rPYzhvx1BZF4b2KTT4fZIi88BHDahSPBiwuPYNFZTPa6sPqGE +6TfNSfU8jGcbo/ZNqfFj+/X3Mrf4imKKVpVQmgbEan9QKcGVrRIOCjdYeKgwR47OrgG Nmlu5RJT26lV+7eR70nqY8A5ZAszLIPJnbCdgYTfh3jFa89nsB6yyybh2GC/vhYXB+3k w6qwPcV1l85qLtp+kApLU8qO5eijXII1Fo+1gw2PQFgxDfSW/eaJ0rnYRSgO12Tt/efl 59Op7prCNccKS9/orj/Rr2x2FqiqZ/67ATDEXe52JeyeWV8TRA/hm4aEjLeKwYaSs7kI A3sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707861479; x=1708466279; 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=S/WOyhn1Esqfkwtwj2LaOT451Ry7/NR5qcNsraXDTSQ=; b=uA7Sa+0bb3DRnbUIBhsvtV++iLpWtcG4fLcEj86osjtq5JKnqJRD50kxPqHeSouG3M YdrWZ5zV1fVY8v5+29ThG1c02OgTwZJXMeRSrSUJVFPGh4MACws8JPFvzMS3qVLSQxOE tHtAhICjHFrQYd7C8mFO1KFrd0egvSSWJzdMQ+EG5qd0Zw8w/4JA/kN2uX/HRA6NZWnB W5jIGmdDif1n3y3eK4aUGObaek4u0E7m3xahwhf7RGA4AGkoXPdSpyui7BiW2Pu2v8zR 95gCgA5aAOr0P3y6BIyzvee84y0YbsQRE36BMs9nlp4TQMqzD7Sl/f6sLFZdVHiaF424 P2tg== X-Forwarded-Encrypted: i=1; AJvYcCWJdJNSZjQwGwXvywOCkAMpDHHIc7m5KDcJ3eBLIOr1GKJIsFhGnIdsaK7cu5tbNnwiNletSBpwH/2407PXGpZ/GDc= X-Gm-Message-State: AOJu0YxcqgXfIW37JRABSirYx2hzY3L8t/fhoRgtLJRhDLWC9YimUjcN kYduyJmNiXjaY/7989ew6lygg9nus3hPkxVTU0/vxKS3zUJhx9KNKSxFW8NDDWXH35FcR77rc/F TkbfXv4P+DZc97tAEYg1mtw== X-Google-Smtp-Source: AGHT+IHJIuj37L0FH95ttZFfcm6tTpnuKI2ov+Gsmwkus7z86ConSVyz4Fbc9PZvGiQunLpi5PNtvfrZ0M1s41aMJA== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:ce6c:821f:a756:b4b8]) (user=lokeshgidra job=sendgmr) by 2002:a05:6902:1007:b0:dc9:5ef8:2b2d with SMTP id w7-20020a056902100700b00dc95ef82b2dmr149426ybt.4.1707861479206; Tue, 13 Feb 2024 13:57:59 -0800 (PST) Date: Tue, 13 Feb 2024 13:57:41 -0800 In-Reply-To: <20240213215741.3816570-1-lokeshgidra@google.com> Mime-Version: 1.0 References: <20240213215741.3816570-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240213215741.3816570-4-lokeshgidra@google.com> Subject: [PATCH v6 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, Liam.Howlett@oracle.com X-Rspamd-Queue-Id: 0D9CD100003 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 5oeppmfo6a9eowwif9i6163enokcxos3 X-HE-Tag: 1707861479-709306 X-HE-Meta: U2FsdGVkX1/K5WxYYGt8NRJ94Xl4iviYX2UORqtHYT6Oza4+D8F0uUDCbfXr8dPHfSFJU8MPnYQbLfpjZNYbyWxs53kM9Jp3+C8DSmfxdPr/i4maDicQ6y0cpfP8Pxodk7xJr/QVfOrfzx7jTz71II8hBCJ2jkL6XtlsV8rSl8YgsWRQo8mLckIZC28l54gvznnAb3vb8spJm9dY4ZVCyf9yq5LIRZucqMAuZQup0kgb48RBFioX8qJM+IxxjcOk/jq9L+oIGnTUemkKwuGPfAHSy0VwRT9j2jW+a2FsMUx0Sg1Zx8kreYXlU4WGQdZpEs+bHFJaYwcZ4JScNZG9JcCnTYqkAwCOX/oqR4AwFqJLfXersZIoUqQXcIvigdwBrq8rZOBQGrB2oIHbXeen5qO5Z/AJXdA6GURWxbAXFWQVRj1iFUZ8lvmcp4xiANoveOTJ8IvSaUx4lPbyMsYQ3API5xrxvhrQavcy7WNXcy8rTbbLoH8edQ69ajdwcN8DTRYiH2mRKNsoW33wx/xLKa2219D1UipiPkVD1sjwDsDpmUUSNqgRmyCJe9+EH3LyXvjiUjm8BtbhYRgxa4BOket59CASxzMd0oLNlw9RXLVjgJnmnHRP/q2awS+nX4GYdGdyPQ/5lmkbwA5Ze28M9glwkZOvX059f3yvf80fAPDz+Jx1cCDZbh+N88oZ/QeUtbdglaVPA0qZb/EvAbOe73z+O466/Pnv66f4pfBwSjDKeoHOG+OMC6sXqFiC3kPfby5CcOZqjfx2v8nCtRWKq22Vw7dJYnAvjLNKpIkjJnLS+ibnM19c3dTVR7cEgJtH1jlSzgkJe4V5DUmbc1MQc8yFmEgCBnz5VdHJTApjl+H+XCU1Fsu7ohyvK012UUEqK/31QcRj+CM8EvCCrEDpcg5OVQZKZw0PIFBST4ULL4EsEuEdxqPFHlT1FZVEfQaCkVvIJE2SwYkFh1UJzHN PSRNHviB PRICFTHM3zYPZYMSW1alEyII5qRjeaGBNByWVU8KnXyyIF3aB9Ugqxx3Qwuo5qboUql1+XKExIGOKlB7W8IilRevC+/YgyRx2NgwRlRb00RnIAAimBSFBmxlrrIVZWdyrxwBz4fhu8sJ1+wev57duh2Jii66RXsD6BpuJZqaquBQ1Eq5bXSe68/ZjSwQUFKI0qmAnV5FJGYzWx16EvW8BTXymDYtbyE9ik2lJjpdhRNI7Y/BGt/pk/y1nO1kre5FyEtxkkBL17OxuBRwEOpuf5jvalOod0i1U2hZCfJ55GX9d6hLHYVT1H2jaC/I1ZHlnj8vEwSOO/yjOdWx9tyJVVDRcz3z4t3kDUXKXIeqUWQfwVAqU+gDzfXp1lVgHUxI62rTnweq7Hy1L5rqkxNAP1/p+RnjMoeyYZOJgz2KIZWYLRcDjkvfRgZGXqcNq/rjRvvHmOa/YcsCsJNncxQDbNIBfEDtBHK5hfzsHws/pWftBXgesFryaxEqGWj5XncvLgSx8pwlLobUfWH7gnraON1flkbOKyos+/0NvqFa7RAMaFrZIDaDZeMbjUP2XJqltksGndvFi+wp2dRKLXR9So244WXEywilnRUya1ihDhWCGx9Ygpo9O3VCzUzwpmx5XZ684wj7/iGIV0AqBpLJSe0q8Eg== 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: All userfaultfd operations, except write-protect, opportunistically use per-vma locks to lock vmas. On failure, attempt again inside mmap_lock critical section. Write-protect operation requires mmap_lock as it iterates over multiple vmas. Signed-off-by: Lokesh Gidra --- fs/userfaultfd.c | 13 +- include/linux/userfaultfd_k.h | 5 +- mm/userfaultfd.c | 380 ++++++++++++++++++++++++++-------- 3 files changed, 296 insertions(+), 102 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index c00a021bcce4..60dcfafdc11a 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -2005,17 +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 = -EAGAIN; - up_read(&ctx->map_changing_lock); - mmap_read_unlock(mm); + ret = move_pages(ctx, uffdio_move.dst, uffdio_move.src, + uffdio_move.len, uffdio_move.mode); mmput(mm); } else { return -ESRCH; diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index 3210c3552976..05d59f74fc88 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -138,9 +138,8 @@ extern long uffd_wp_range(struct vm_area_struct *vma, /* move_pages */ void double_pt_lock(spinlock_t *ptl1, spinlock_t *ptl2); void double_pt_unlock(spinlock_t *ptl1, spinlock_t *ptl2); -ssize_t move_pages(struct userfaultfd_ctx *ctx, struct mm_struct *mm, - unsigned long dst_start, unsigned long src_start, - unsigned long len, __u64 flags); +ssize_t move_pages(struct userfaultfd_ctx *ctx, unsigned long dst_start, + unsigned long src_start, unsigned long len, __u64 flags); int move_pages_huge_pmd(struct mm_struct *mm, pmd_t *dst_pmd, pmd_t *src_pmd, pmd_t dst_pmdval, struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 74aad0831e40..4744d6a96f96 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -20,19 +20,11 @@ #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) +bool validate_dst_vma(struct vm_area_struct *dst_vma, unsigned long dst_end) { - /* - * 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; + /* Make sure that the dst range is fully within dst_vma. */ + if (dst_end > dst_vma->vm_end) + return false; /* * Check the vma is registered in uffd, this is required to @@ -40,11 +32,122 @@ struct vm_area_struct *find_dst_vma(struct mm_struct *dst_mm, * time. */ if (!dst_vma->vm_userfaultfd_ctx.ctx) - return NULL; + return false; + + return true; +} + +static __always_inline +struct vm_area_struct *find_vma_and_prepare_anon(struct mm_struct *mm, + unsigned long addr) +{ + struct vm_area_struct *vma; + + mmap_assert_locked(mm); + vma = vma_lookup(mm, addr); + if (!vma) + vma = ERR_PTR(-ENOENT); + else if (!(vma->vm_flags & VM_SHARED) && + unlikely(anon_vma_prepare(vma))) + vma = ERR_PTR(-ENOMEM); + + return vma; +} + +#ifdef CONFIG_PER_VMA_LOCK +/* + * lock_vma() - Lookup and lock vma corresponding to @address. + * @mm: mm to search vma in. + * @address: address that the vma should contain. + * + * Should be called without holding mmap_lock. vma should be unlocked after use + * with unlock_vma(). + * + * Return: A locked vma containing @address, -ENOENT if no vma is found, or + * -ENOMEM if anon_vma couldn't be allocated. + */ +static struct vm_area_struct *lock_vma(struct mm_struct *mm, + unsigned long address) +{ + struct vm_area_struct *vma; + + vma = lock_vma_under_rcu(mm, address); + if (vma) { + /* + * lock_vma_under_rcu() only checks anon_vma for private + * anonymous mappings. But we need to ensure it is assigned in + * private file-backed vmas as well. + */ + if (!(vma->vm_flags & VM_SHARED) && unlikely(!vma->anon_vma)) + vma_end_read(vma); + else + return vma; + } + + mmap_read_lock(mm); + vma = find_vma_and_prepare_anon(mm, address); + if (!IS_ERR(vma)) { + /* + * We cannot use vma_start_read() as it may fail due to + * false locked (see comment in vma_start_read()). We + * can avoid that by directly locking vm_lock under + * mmap_lock, which guarantees that nobody can lock the + * vma for write (vma_start_write()) under us. + */ + down_read(&vma->vm_lock->lock); + } + + mmap_read_unlock(mm); + return vma; +} + +static struct vm_area_struct *uffd_mfill_lock(struct mm_struct *dst_mm, + unsigned long dst_start, + unsigned long len) +{ + struct vm_area_struct *dst_vma; + dst_vma = lock_vma(dst_mm, dst_start); + if (IS_ERR(dst_vma) || validate_dst_vma(dst_vma, dst_start + len)) + return dst_vma; + + vma_end_read(dst_vma); + return ERR_PTR(-ENOENT); +} + +static void uffd_mfill_unlock(struct vm_area_struct *vma) +{ + vma_end_read(vma); +} + +#else + +static struct vm_area_struct *uffd_mfill_lock(struct mm_struct *dst_mm, + unsigned long dst_start, + unsigned long len) +{ + struct vm_area_struct *dst_vma; + + mmap_read_lock(dst_mm); + dst_vma = find_vma_and_prepare_anon(dst_mm, dst_start); + if (IS_ERR(dst_vma)) + goto out_unlock; + + if (validate_dst_vma(dst_vma, dst_start + len)) + return dst_vma; + + dst_vma = ERR_PTR(-ENOENT); +out_unlock: + mmap_read_unlock(dst_mm); return dst_vma; } +static void uffd_mfill_unlock(struct vm_area_struct *vma) +{ + mmap_read_unlock(vma->vm_mm); +} +#endif + /* Check if dst_addr is outside of file's size. Must be called with ptl held. */ static bool mfill_file_over_size(struct vm_area_struct *dst_vma, unsigned long dst_addr) @@ -350,7 +453,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, @@ -361,7 +465,6 @@ static __always_inline ssize_t mfill_atomic_hugetlb( uffd_flags_t flags) { struct mm_struct *dst_mm = dst_vma->vm_mm; - int vm_shared = dst_vma->vm_flags & VM_SHARED; ssize_t err; pte_t *dst_pte; unsigned long src_addr, dst_addr; @@ -380,7 +483,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); + uffd_mfill_unlock(dst_vma); return -EINVAL; } @@ -403,24 +506,28 @@ static __always_inline ssize_t mfill_atomic_hugetlb( * retry, dst_vma will be set to NULL and we must lookup again. */ if (!dst_vma) { + dst_vma = uffd_mfill_lock(dst_mm, dst_start, len); + if (IS_ERR(dst_vma)) { + err = PTR_ERR(dst_vma); + goto out; + } + err = -ENOENT; - dst_vma = find_dst_vma(dst_mm, dst_start, len); - if (!dst_vma || !is_vm_hugetlb_page(dst_vma)) - goto out_unlock; + if (!is_vm_hugetlb_page(dst_vma)) + goto out_unlock_vma; err = -EINVAL; if (vma_hpagesize != vma_kernel_pagesize(dst_vma)) - goto out_unlock; - - vm_shared = dst_vma->vm_flags & VM_SHARED; - } + goto out_unlock_vma; - /* - * If not shared, ensure the dst_vma has a anon_vma. - */ - err = -ENOMEM; - if (!vm_shared) { - if (unlikely(anon_vma_prepare(dst_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; } @@ -465,7 +572,7 @@ static __always_inline ssize_t mfill_atomic_hugetlb( if (unlikely(err == -ENOENT)) { up_read(&ctx->map_changing_lock); - mmap_read_unlock(dst_mm); + uffd_mfill_unlock(dst_vma); BUG_ON(!folio); err = copy_folio_from_user(folio, @@ -474,17 +581,6 @@ static __always_inline ssize_t mfill_atomic_hugetlb( err = -EFAULT; goto out; } - mmap_read_lock(dst_mm); - down_read(&ctx->map_changing_lock); - /* - * 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 - */ - if (atomic_read(&ctx->mmap_changing)) { - err = -EAGAIN; - break; - } dst_vma = NULL; goto retry; @@ -505,7 +601,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: + uffd_mfill_unlock(dst_vma); out: if (folio) folio_put(folio); @@ -597,7 +694,15 @@ 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. + */ + dst_vma = uffd_mfill_lock(dst_mm, dst_start, len); + if (IS_ERR(dst_vma)) { + err = PTR_ERR(dst_vma); + goto out; + } /* * If memory mappings are changing because of non-cooperative @@ -609,15 +714,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 @@ -647,16 +743,6 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, uffd_flags_mode_is(flags, MFILL_ATOMIC_CONTINUE)) goto out_unlock; - /* - * Ensure the dst_vma has a anon_vma or this page - * would get a NULL anon_vma when moved in the - * dst_vma. - */ - err = -ENOMEM; - if (!(dst_vma->vm_flags & VM_SHARED) && - unlikely(anon_vma_prepare(dst_vma))) - goto out_unlock; - while (src_addr < src_start + len) { pmd_t dst_pmdval; @@ -699,7 +785,7 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, void *kaddr; up_read(&ctx->map_changing_lock); - mmap_read_unlock(dst_mm); + uffd_mfill_unlock(dst_vma); BUG_ON(!folio); kaddr = kmap_local_folio(folio, 0); @@ -730,7 +816,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); + uffd_mfill_unlock(dst_vma); out: if (folio) folio_put(folio); @@ -1267,27 +1353,136 @@ static int validate_move_areas(struct userfaultfd_ctx *ctx, if (!vma_is_anonymous(src_vma) || !vma_is_anonymous(dst_vma)) return -EINVAL; + return 0; +} + +static __always_inline +int find_vmas_mm_locked(struct mm_struct *mm, + unsigned long dst_start, + unsigned long src_start, + struct vm_area_struct **dst_vmap, + struct vm_area_struct **src_vmap) +{ + struct vm_area_struct *vma; + + mmap_assert_locked(mm); + vma = find_vma_and_prepare_anon(mm, dst_start); + if (IS_ERR(vma)) + return PTR_ERR(vma); + + *dst_vmap = vma; + /* Skip finding src_vma if src_start is in dst_vma */ + if (src_start >= vma->vm_start && src_start < vma->vm_end) + goto out_success; + + vma = vma_lookup(mm, src_start); + if (!vma) + return -ENOENT; +out_success: + *src_vmap = vma; + return 0; +} + +#ifdef CONFIG_PER_VMA_LOCK +static int uffd_move_lock(struct mm_struct *mm, + unsigned long dst_start, + unsigned long src_start, + struct vm_area_struct **dst_vmap, + struct vm_area_struct **src_vmap) +{ + struct vm_area_struct *vma; + int err; + + vma = lock_vma(mm, dst_start); + if (IS_ERR(vma)) + return PTR_ERR(vma); + + *dst_vmap = vma; /* - * Ensure the dst_vma has a anon_vma or this page - * would get a NULL anon_vma when moved in the - * dst_vma. + * Skip finding src_vma if src_start is in dst_vma. This also ensures + * that we don't lock the same vma twice. */ - if (unlikely(anon_vma_prepare(dst_vma))) - return -ENOMEM; + if (src_start >= vma->vm_start && src_start < vma->vm_end) { + *src_vmap = vma; + return 0; + } - return 0; + /* + * Using lock_vma() to get src_vma can lead to following deadlock: + * + * Thread1 Thread2 + * ------- ------- + * vma_start_read(dst_vma) + * mmap_write_lock(mm) + * vma_start_write(src_vma) + * vma_start_read(src_vma) + * mmap_read_lock(mm) + * vma_start_write(dst_vma) + */ + *src_vmap = lock_vma_under_rcu(mm, src_start); + if (likely(*src_vmap)) + return 0; + + /* Undo any locking and retry in mmap_lock critical section */ + vma_end_read(*dst_vmap); + + mmap_read_lock(mm); + err = find_vmas_mm_locked(mm, dst_start, src_start, dst_vmap, src_vmap); + if (!err) { + /* + * See comment in lock_vma() as to why not using + * vma_start_read() here. + */ + down_read(&(*dst_vmap)->vm_lock->lock); + if (*dst_vmap != *src_vmap) + down_read(&(*src_vmap)->vm_lock->lock); + } + mmap_read_unlock(mm); + return err; +} + +static void uffd_move_unlock(struct vm_area_struct *dst_vma, + struct vm_area_struct *src_vma) +{ + vma_end_read(src_vma); + if (src_vma != dst_vma) + vma_end_read(dst_vma); } +#else + +static int uffd_move_lock(struct mm_struct *mm, + unsigned long dst_start, + unsigned long src_start, + struct vm_area_struct **dst_vmap, + struct vm_area_struct **src_vmap) +{ + int err; + + mmap_read_lock(mm); + err = find_vmas_mm_locked(mm, dst_start, src_start, dst_vmap, src_vmap); + if (err) + mmap_read_unlock(mm); + return err; +} + +static void uffd_move_unlock(struct vm_area_struct *dst_vma, + struct vm_area_struct *src_vma) +{ + mmap_assert_locked(src_vma->vm_mm); + mmap_read_unlock(dst_vma->vm_mm); +} +#endif + /** * move_pages - move arbitrary anonymous pages of an existing vma * @ctx: pointer to the userfaultfd context - * @mm: the address space to move pages * @dst_start: start of the destination virtual memory range * @src_start: start of the source virtual memory range * @len: length of the virtual memory range * @mode: flags from uffdio_move.mode * - * Must be called with mmap_lock held for read. + * It will either use the mmap_lock in read mode or per-vma locks * * move_pages() remaps arbitrary anonymous pages atomically in zero * copy. It only works on non shared anonymous pages because those can @@ -1355,10 +1550,10 @@ static int validate_move_areas(struct userfaultfd_ctx *ctx, * could be obtained. This is the only additional complexity added to * the rmap code to provide this anonymous page remapping functionality. */ -ssize_t move_pages(struct userfaultfd_ctx *ctx, struct mm_struct *mm, - unsigned long dst_start, unsigned long src_start, - unsigned long len, __u64 mode) +ssize_t move_pages(struct userfaultfd_ctx *ctx, unsigned long dst_start, + unsigned long src_start, unsigned long len, __u64 mode) { + struct mm_struct *mm = ctx->mm; struct vm_area_struct *src_vma, *dst_vma; unsigned long src_addr, dst_addr; pmd_t *src_pmd, *dst_pmd; @@ -1376,28 +1571,34 @@ ssize_t move_pages(struct userfaultfd_ctx *ctx, struct mm_struct *mm, WARN_ON_ONCE(dst_start + len <= dst_start)) goto out; + err = uffd_move_lock(mm, dst_start, src_start, &dst_vma, &src_vma); + if (err) + goto out; + + /* Re-check after taking map_changing_lock */ + err = -EAGAIN; + down_read(&ctx->map_changing_lock); + if (likely(atomic_read(&ctx->mmap_changing))) + 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_start < src_vma->vm_start || - src_start + len > src_vma->vm_end) - goto out; + err = -EINVAL; + if (src_vma->vm_flags & VM_SHARED) + goto out_unlock; + if (src_start + len > src_vma->vm_end) + goto out_unlock; - dst_vma = find_vma(mm, dst_start); - if (!dst_vma || (dst_vma->vm_flags & VM_SHARED)) - goto out; - if (dst_start < dst_vma->vm_start || - dst_start + len > dst_vma->vm_end) - goto out; + if (dst_vma->vm_flags & VM_SHARED) + goto out_unlock; + if (dst_start + len > dst_vma->vm_end) + 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;) { @@ -1514,6 +1715,9 @@ ssize_t move_pages(struct userfaultfd_ctx *ctx, struct mm_struct *mm, moved += step_size; } +out_unlock: + up_read(&ctx->map_changing_lock); + uffd_move_unlock(dst_vma, src_vma); out: VM_WARN_ON(moved < 0); VM_WARN_ON(err > 0);