From patchwork Mon Jan 29 19:35:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13536308 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 E6351C47DB3 for ; Mon, 29 Jan 2024 19:35:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 782946B0088; Mon, 29 Jan 2024 14:35:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7328C6B0089; Mon, 29 Jan 2024 14:35:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FB0B6B008A; Mon, 29 Jan 2024 14:35:28 -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 4FDF36B0088 for ; Mon, 29 Jan 2024 14:35:28 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E2A13160A45 for ; Mon, 29 Jan 2024 19:35:27 +0000 (UTC) X-FDA: 81733352694.26.8A159DB Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf22.hostedemail.com (Postfix) with ESMTP id 1F115C0017 for ; Mon, 29 Jan 2024 19:35:25 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=D74itNlL; spf=pass (imf22.hostedemail.com: domain of 3_f23ZQsKCA4z2ys6vuwr5ou22uzs.q20zw18B-00y9oqy.25u@flex--lokeshgidra.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3_f23ZQsKCA4z2ys6vuwr5ou22uzs.q20zw18B-00y9oqy.25u@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=1706556926; 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=RxV5wBXLAd7sIIElP90tsYG05NDDw/o/tErBcn9qBHI=; b=Gu+dxpRjhIgxAW3t80kPecxX8nQl/tOLlqu9Cs+niJCZb85DT1LxKmY0eupkieozeQx4nG /Q2oNj6tofiGxBgi77oo11UMLNFD5RguBDauaFr9K4Hq6CKDs4A4NvbAzSEQtOTvw8qSnr joMV7mVTWdJnfbGdSIE7r4EPOgrYR4I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706556926; a=rsa-sha256; cv=none; b=A0gWunW05CW1jXpOIr7Px9LuV8FiZvaZ7YPiw8Bp5yuaxB+GfTcdhd8Rr/EX0jhc4NbjkO NZwT+ZxcMJlAZAH3/gNL7cDHy3W1DRKg2CyFs+3OmWGp1wcHA52/hPtaE3UfSLsDYoPc6L 96gVG1DpnBzjWx0+IIbKdlosNzvKfHU= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=D74itNlL; spf=pass (imf22.hostedemail.com: domain of 3_f23ZQsKCA4z2ys6vuwr5ou22uzs.q20zw18B-00y9oqy.25u@flex--lokeshgidra.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3_f23ZQsKCA4z2ys6vuwr5ou22uzs.q20zw18B-00y9oqy.25u@flex--lokeshgidra.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-d9a541b720aso5607091276.0 for ; Mon, 29 Jan 2024 11:35:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706556925; x=1707161725; 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=RxV5wBXLAd7sIIElP90tsYG05NDDw/o/tErBcn9qBHI=; b=D74itNlLD4glyusGFUSXLJzjCKuJJJpWeJ+dos5ITVvhXZWnoim0qnx0yhawYQ4pUA kz56vzCncrBsk+yTIYijfius1oz8mA/P4noDGU489xCvIxZOjNiACTaSvw+kfIHyMqyO V2XIjvCp4910wu/5I4/QEzhWam8WNxXtIeK5Bgf44GlGPbHcgCPV9mPDtCfLcDaQBPh+ hyq+IzQPEV+spnv+SC1gZbAuETJB31RZkl07Ye9yTJXuwVpzTBDww98YC0qOAuGWOp7q G1/X6PhU5gnmvv7iix0iK89/z+0khCJ/yQO2Ub4o1CxbgZDetUDuOmmqGCLYFOIC9nt/ 2gVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706556925; x=1707161725; 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=RxV5wBXLAd7sIIElP90tsYG05NDDw/o/tErBcn9qBHI=; b=FhlZmhQwh5GHrLA964Q0KY4J/n4wWzzGfbz5P5PA2spVsmyGYaQLI8EbmM+GcOBqbl 7r3fgZNU2dpzh3D7gBO/+s9/R/hfoQeAT8NRm7hv58CFHCXcIJf9kxDhir6i8/XEnbqt gFD+hqRjEkOd4Vg9DnBr1jfomau+rPW0p7IPz0MnL7f6N9I3lDSN3/PjqhkeMksybh98 oFiYxp+0o6suTVZIPpFxXveXju+qfCzMmLpzIn7ixrxiLlgdaCe5AYtjcAwpaLCqYMCi woszUR51joSrlq3UhreYg4RIpyYhjl0Kh1ivcjLFG3uLjCxiQlcqolSCvmuMAclBYyxF lOLQ== X-Gm-Message-State: AOJu0Yydso5Rh74ERtT6qZBUEprUMPf/aul+gHnMSRduvCjisLw9yJZK 4/25SuqFIOKaqkULosBSZMcdJIwlMZa3x09BcUYdrt9y7z8uC4UMWQyegCnlhjvF74LK5LT2c4V Lss+uglpCrifPQjkCRP/8Ig== X-Google-Smtp-Source: AGHT+IF32DkXw2QhhBn3l4mRA2HIAIDhN6YElkLAMaf3KndoLGpHhaAw9uQKXHl2RVkOyBG8Y0880v//3lgc+vKdmg== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:9b1d:f1ee:f750:93f1]) (user=lokeshgidra job=sendgmr) by 2002:a05:6902:2611:b0:dc2:4ab7:3d89 with SMTP id dw17-20020a056902261100b00dc24ab73d89mr2460415ybb.1.1706556925300; Mon, 29 Jan 2024 11:35:25 -0800 (PST) Date: Mon, 29 Jan 2024 11:35:10 -0800 In-Reply-To: <20240129193512.123145-1-lokeshgidra@google.com> Mime-Version: 1.0 References: <20240129193512.123145-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240129193512.123145-2-lokeshgidra@google.com> Subject: [PATCH v2 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 X-Rspamd-Queue-Id: 1F115C0017 X-Rspam-User: X-Stat-Signature: w6aziyemmcgg56hg5xapw9o1angync1u X-Rspamd-Server: rspam03 X-HE-Tag: 1706556925-395698 X-HE-Meta: U2FsdGVkX18dooWA3xBMkgSQmSr3adfPKY3Aq0/gyqIbXlGUhjBAzUyFn44ioIz1bRidA+GsIkRNn+Ha+GYqYmxl3qtItKwhs6q9nYgKmdeLF10tuYbX80XK6c7B0mY2/db/gS+wmvPoRQJHAlyLve4n9AtFX4GGY6U157Qy9FdRtZudY1PTFxCKcCS8SvBCJ5tRZDH71yqixOKjjDIa1nToo1TrwkmBLQ/wPjpI45c2tmve53SVdf0f9iriV4WO0Vc/kYlNizYSLOWtx7si9JKjOpcBMk80e1VOiOHSxSyTZXVWAH0GL/FcmmaK2iMEtWOr0ceksDvr757vACm5FBpyklCSnS4VDDfCJxdEttslOv86nRuRUhXR3WlHk+eioP4o/iANU/A6T0DyatNpxdues78scFBe/Laqy5g4RqyFLrkjNIsZSHgYfCGFji38XFr8pCVVs3w0LrzrpkMx3qwytob5tBJhwgZ98+xAzP/o/AfYh7UN1sOUn2kQQt7plOUVD7lZrh60US1kVGEpZfYZDsCNVeV4a2P//8LO3Byqw6KgpMd0NGJ0Qa3uan/Gwg7C66/lF6Zk9B5hZCUKfVNSuw+DxJRQ/zgL8beHoBREx+yg0B+9meiEAiRGQSxVi4eWJBJqoiUlOMXmvIRCC/GhwvokcU+RpplzBRCJVsCuZ7lEXPDJ8JquofJ2PZZc4zpzBDccpPR03xIlyg/exN0IQsQWl1EbulOBD9+vcpcaPpitkO5E/IjH2aU/VVuQEP9NFHapdNzvATwylkeiiqK5Z+EcOYiGtrchSn0r4o/TSEc/t/xU4Erwda+7CpOio2jnW3vfByngxgbQYgwB9aPDG60ocy/gOYWMlutdjvP3JGlKRifYKr7fx6xsqIoaMOtEHH0XJCM66hNnTxXhIQ+uWzrfnKfCd4AOAJcdfIAq3DkrUqTB4NT+KyBHXKWUPZxG6AvxBnBanHOehV4 uEQLCPxD Y72b6jraTcYlWgrnXD1TmqRwsxktooss+jL/DODDKZrMgfwhA6DoBvJimnYde/O53jhr9c9uwAtApt0jTkU3sdnuEfcUS4SHmZxiVyln36aR9X2cXwjcsDlcbO8pbj8F0+Evjw7roxrJ02FQcL8qfliCJrGz/lCtjclV+9N/VTgjzfY1KZbil4xQhn1pvgMTpu8eAb96FZgYjbb31FpLliEO8/JxlNP1Av8w893ECjGgwrxTCRNnmx0+S4bzGCRIXbYT+aesOjQRN1CkcDxPHc1v2czVlETSxcmhpf62qyottaKMxgHyaleXycHfJ0v4EL2yVu8ubWyxN3LiPA5pHpaHbFsVWxZrOmJVSX63FPOemjQut/WtKnoc+vHlRTOTnJkupJJElX6LyvjijEUSmVZTcZWi7T1qsjcj2AMorsciihbqfgk2eNcznppPqupajwurrSeY++TOtbhIFHNH1LJvKt4W6b64hr4Txm3u5A3UnzDdrtfx1VT4XSnoud8yLp1uK6Rl3kSx0QLgDVT5ctvvhanbkgFyKmXKiI53Rom/luQZ9VarX2yKrITBM5S55sRg1XW9dVrUejOM7+8L68T7ShDwfPQQ0VrSc1V34MqpEAA9x11r/nPRXWqP/qdrWbFpouicayULDMMu8r3ITCzKblVYJSHQzW5WKIfgBNR6Yt8j7p3JILiDvrlSHBY+T7tx8 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 Mon Jan 29 19:35:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13536309 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 354E9C47DB3 for ; Mon, 29 Jan 2024 19:35:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF0966B008A; Mon, 29 Jan 2024 14:35:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B9F636B0092; Mon, 29 Jan 2024 14:35:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A19566B0093; Mon, 29 Jan 2024 14:35:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8C4626B008A for ; Mon, 29 Jan 2024 14:35:33 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5B1D3A1774 for ; Mon, 29 Jan 2024 19:35:33 +0000 (UTC) X-FDA: 81733352946.09.6D59031 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf03.hostedemail.com (Postfix) with ESMTP id 733412001B for ; Mon, 29 Jan 2024 19:35:31 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=YOH3TaoP; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 3Av63ZQsKCBM473xB0z1wAtz77z4x.v75416DG-553Etv3.7Az@flex--lokeshgidra.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3Av63ZQsKCBM473xB0z1wAtz77z4x.v75416DG-553Etv3.7Az@flex--lokeshgidra.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706556931; 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=d58A86vZ58W9GlIkgHFHlo47r/EdM3AnN+I4lpZG9DM=; b=XSFLrHJlf/3EQ3/uoo5DlDHqpA2BRobcq7MRLQryC9zvUhhz4QvBZE8PXMqrFywOkPHTBE xSCBdHXK17ndvN7pjIPcl+rlMGvN3Oz9c3p8xSpQcCclInC4LRGiDYjTWMerM8VolGtJwc wUJia4fJEQxNG6+OIDJw/E+RX0lDVWA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=YOH3TaoP; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 3Av63ZQsKCBM473xB0z1wAtz77z4x.v75416DG-553Etv3.7Az@flex--lokeshgidra.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3Av63ZQsKCBM473xB0z1wAtz77z4x.v75416DG-553Etv3.7Az@flex--lokeshgidra.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706556931; a=rsa-sha256; cv=none; b=c3PSifR8YLmFQrenEVuGu0GpUgQy7AQfT5WIZIds7lv+QI5GZrpM3k0dU8HJkbO/t8UqXz NBldp9FX9KGMNPBqhyxBA1U1tWxn0VchZ5YQ/pgUGZFmE3MYVxgDjlwmEUGQk4hK8b9ane l5cWKy5766KmeMMOlPdkiLxUkM+RIFc= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6002a655cc1so51019787b3.1 for ; Mon, 29 Jan 2024 11:35:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706556930; x=1707161730; 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=d58A86vZ58W9GlIkgHFHlo47r/EdM3AnN+I4lpZG9DM=; b=YOH3TaoPZ11cx9bn/ivkk/p9Jhgz9NLTi9OxFL0BDvjBvz0dIvxpa4y+t8Y3EmC/tj n1EaZmpRaHWnbB5r/d1XIEiEwDv5SRC83S84ti6r36yap9hP4SVM9o0wQkNbtuqHpngl siZ7N1nlUR2RFNyfJhmazIT39aziX3+r+XCa0MJZK83dn/rq09d60w1vuO3l8X/yLu34 UTliasB7kZg+opVwdtIaGVHNg24Mc3viZRm1L2m46ItESQZRQTIwkm8O0WxHipq/Q4rS eAPi+a7sXeWt/ftVjQJfrUezyYrCvIIuLnMvhDicxArGZbxJ0uq6LVZxfdwVtD8yviv0 Snzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706556930; x=1707161730; 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=d58A86vZ58W9GlIkgHFHlo47r/EdM3AnN+I4lpZG9DM=; b=RY/rEX0k1qUi6OOwRCe24gyJOojUDccAQRzXNr3CI8sYBa0VRxWYOGWIZK5fVJWk1A w4Og8EM4HmtvNrC+L1JT826o0cvCfBfR7gv2mCkaTF8CO/aqjQ1aN3ltKzuxaljihTCX z+4uiJlUxsveLlAyXd+/1FYElYtSbK/2DCWpick10BnJM01EPKJ+ZziRSlU3qaUICkhY B+1srdkFU4U2TE6k3pTjdAgn/qtrlLJBQArlnw+dz23/5L5j0qEwPC4JA2MhsTxEVnyr xDDiNauOWIseoH6UZWw7s9AXFov1xzpFvHsJTT5nlAGRzYIELnOCahxXy1WThRVs/Xh7 9vtg== X-Gm-Message-State: AOJu0YxniVmiZRN7q5XLVUNJZoviLuKQw6iPnD6s7xV/k+Xce1KaDIBc S5T/ueHaCrlkKln/nD7+ajMABt+oAtPpl0ifKitdylW+WDz/HISBZI1rW0X612JBZzcLewidjPV r3MKi8XCD41i+ELTEE23H0g== X-Google-Smtp-Source: AGHT+IE1PvMaB6+3Hjv+1DaHKrgtjZqmJWCQ16jIYn+568pU6S4HnoY5ZNPwoavC8p3R9cSdFTy25+/4zcBx7JAcww== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:9b1d:f1ee:f750:93f1]) (user=lokeshgidra job=sendgmr) by 2002:a05:690c:f91:b0:5ff:80cb:23c7 with SMTP id df17-20020a05690c0f9100b005ff80cb23c7mr1505040ywb.1.1706556930561; Mon, 29 Jan 2024 11:35:30 -0800 (PST) Date: Mon, 29 Jan 2024 11:35:11 -0800 In-Reply-To: <20240129193512.123145-1-lokeshgidra@google.com> Mime-Version: 1.0 References: <20240129193512.123145-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240129193512.123145-3-lokeshgidra@google.com> Subject: [PATCH v2 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 X-Rspamd-Queue-Id: 733412001B X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 94jebzx99bkytb65z84mqxtczp4xbnor X-HE-Tag: 1706556931-598976 X-HE-Meta: U2FsdGVkX18SdK04d1tU3eCww/Ndio+/SZ/zbt3r2B3QnWfq8HZ/hRZxfin+L9uNOMakZegL33nnNeKDTnv1GwChx+m7pij4eGULi5anjM0/FOW14Ga5dDbohAh/TfcRQGPXntIshGT5ht4WSno7pDvOVG97vzYwj0YgDGHQp5DgzHHVg/Rlo2guW/JQSKrZCyAs3PUSnX1Kx/ns1vNvjCgGZFy8qGwpLr9yUFoQadUv2mdmwFxgqME9nT2HWdg8A1uw64Fr0eSIEK6eCgD0Ev62Ju/RYSGmGerTfoO+/s12Ygax9d0i8rzcQG4pFAiw+Uphr+tYYuDiQodHSZlTT9fL2K3//CG5tKY+OOQHZMBF2dQKmbq7WGFyhBuwjU4RYTC6ENrRfxpVRWPjK/i7Q7yV8qOhAriO85u2oh0vSH1beyd4p9748uhDjzCsBvA1H4gZ8NDu9HegFxy6Wqv9nD1PAnxZGKrM6xs0ASi35OMqY+RkenapQPXRjM50EbBpTzSATXkNYHf7Hu1xTgRsNxzLJYqBhYtvcSdx3scPSLxuttlZwBKkAdthty5zEyhKMuUrrMsJ4FkQtZYeOrMGTjMQ3LyMKrhN9XomKh/+cQXqPn0UI409htDDMsQ6yXgS7FCKDvFkKhGJFv1oJdzPKmcMgk6K4g2fI/9xkysEvBoon3DDBscG0FC5X2KyqC+2HR1MoGbThkZyaZax3KPHGjgUov86Wbk7wgvX0wQS7yyJZi+WJGNvGj1OTNDswyKdbDOWrsUQOhTd3SBGdysepK+hOIwPgsX3vB2xCG6AOb49P7XRpVmMtCjng25VdiSkyx5H39adm/ZaL4m4za8ibv+DSE5gZC5GGNoNpomXmEDDPoAqhwz8AK6Ht4zuwvUawLlt8l454H874Xl0c6JVk0AjZFzjk1AyFE3c/aWQWIGGG/Vff/UDjODlkxF1d8WWGN+8hsude5MXz/5zRMl B03Ci/3R l3HdGaBUpSIwd0IbI1i9ESjDT9DCM0nQ1uMYwDCAzS+ybpZI7jT5xlKGUjZzaue0aWDSI63sdjkhc6I+RfNxidNgP9Ull2Zufas0eQf4mWgiXlu57HiW+EPf2EIr0MyipDs7ig1t+4f4y/LJYqeZ49gB5i5zqBq2pn0bWJiPIQI2oQnQH7jFs8PULVLWNPzwkidkDJrr9AfcUUBbZl3VyrJ02DEd7W+L9m2NApbspOnRkmsqeDc8bK0IhF8mf8IRh+MvvgvogBytwF4v1YJbhiPCIWoxCrfx9pjOOFtw7vmPZpTgJ9Q597apXrc2RT/Jn/Q7iphjg4l+miTRV4cV5LhAVSIQvwvoTHI0/t8k6+jjDUUg+qLd2I2c/oF1tMOpdnXU81UtCGhgvvxrl8rFoze7LWPP1lz2Q3cCcEBN3tNM3Kh1qyL3i4pu2kcZ/BonWnCRk3yQqO9cpsN69RnX/Qa4AdvOjR+dRZGF0T4x2Xh5CS6z2FOwyKgHGBWkS2THPR3CQQk073+fzQy5ordi4cyXEhGoXNA9zFx3ZYkGzwvctg2XcyXMMbEfl/Zj/nTUjcgEsa0M89xKeo7w4DquHJHgxjInsFbBQFphSiGg3N3au8XPLutlTgm7LXRC7VDngiWTpvJu7C4tg6p91o4PP/Iu1jg+6WXkxuISfiCKK7XhRWQqguc8ds4xm5snTjAns1LYD 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 e3a91871462a..6e2ca04ab04d 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 Mon Jan 29 19:35:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13536310 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 F3BA3C47DB3 for ; Mon, 29 Jan 2024 19:35:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 86E366B0093; Mon, 29 Jan 2024 14:35:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CF046B0098; Mon, 29 Jan 2024 14:35:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 649296B0099; Mon, 29 Jan 2024 14:35:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4C0446B0093 for ; Mon, 29 Jan 2024 14:35:39 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id EDFB9160131 for ; Mon, 29 Jan 2024 19:35:38 +0000 (UTC) X-FDA: 81733353156.21.D35E056 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf04.hostedemail.com (Postfix) with ESMTP id 3521D40015 for ; Mon, 29 Jan 2024 19:35:37 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=eBoheyW1; spf=pass (imf04.hostedemail.com: domain of 3CP63ZQsKCBkAD93H6572Gz5DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--lokeshgidra.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3CP63ZQsKCBkAD93H6572Gz5DD5A3.1DBA7CJM-BB9Kz19.DG5@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=1706556937; 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=/rTTdTkZrF1wexi3aiNZ7/0XWdKeqDeZCcom0yepX1o=; b=hHlqZgDlBOZEpClowVHUNVi/FvJv+eEsk6DBuEPDen7WQPCdCrkM/NYKAVujtZa+NeJTn1 YlUk2U+rRWpknLvGcchaepStdl1Sm8QukUuUZBfbv+6j39vjf16G00hLrts7Q0m/YZ7OCm ZxucsF++UFH23JbXWcXBTl5foyK1V2M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706556937; a=rsa-sha256; cv=none; b=4x9cXWFGHH3QaDT7acLjk2Mi+b2a78DhInoa9fq1/jegkdoqRJdhcac2IZmL4jKxc7y3Lz s6H/rCgkVULZhMB5aix5Zf52p7CNJcuPsRzWgEgABN1HVVnDzhRaqCWqi5ElrCUIsgHunY O6JIIuihpEY1tlELti0Gu/ziF1+nVhI= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=eBoheyW1; spf=pass (imf04.hostedemail.com: domain of 3CP63ZQsKCBkAD93H6572Gz5DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--lokeshgidra.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3CP63ZQsKCBkAD93H6572Gz5DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--lokeshgidra.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc22f3426aeso5840156276.1 for ; Mon, 29 Jan 2024 11:35:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706556936; x=1707161736; 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=/rTTdTkZrF1wexi3aiNZ7/0XWdKeqDeZCcom0yepX1o=; b=eBoheyW14/+yF6Q99tPelVwiirREl7+mCwXUTArASOH28qKrWrgxsUmRleVC6bNtIm b0/y0gbbQHfqczHVL3F80Y3cftaCm7voM8oej7XhGVd8Kdopa7UCJDHv3Su+AmME26xK cCvTjYApid14a83lWMAZfj8kMemSL0oxOFByMp1A7HmLxtSuFrcFzMGThxKjz2yU4YyS KmSrcnRHF9TWZGJz60B9RFlqceIScDURup5NlqoOM2nGek8urhunQCffdywvjX/4Rarf EAnX6URIcFMS6sqIZo8WLICusxDCD0P2TBm6ksQLJ/rzSJ0Quhr1bG7YCVsUygHMGfK+ Fiow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706556936; x=1707161736; 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=/rTTdTkZrF1wexi3aiNZ7/0XWdKeqDeZCcom0yepX1o=; b=gAxQa0sIZlIje9k73NVo3rHXlB+zmaLPoGL9XuNCDc6ewUC5NUVll637OKrqwHeQLT ZzLN7usBeTNvkSbmUrXSwsuknJ5U1TeTeGnWZgGi0BEQinnJHC/yM0wDfqoS3q3te8qO dzOq9tVQhWWOqCsMUlapQVpSS3fzxDX9rtXY1+LI1c4w7s8ESJZfl8KuiokBRFFsDNkl YGxWguPC1jaQFEACB0SD9WnHNXfIraHMvRs03W8e14dScHtLQyXfnk6CijXRkCT5up9R H461GyoPkEmekJbrKu/WtT6uFtjAAny9RpDTdxzO++9RNTSpWRi4gdrkAmpJy9tK6m54 NHaw== X-Gm-Message-State: AOJu0YxY6IcKc5b+tJ2rExtSEHJcznzweFvorcmI4rUeSliG+35MMXDh FkaOP8EJPXjwuOAojMkUd1ZdPillzlEA+u/+Uw70N4IQM3WSWoprw75qz5WpqpF/gfuW7UcvNDa 82HI5w5nTul79+TgaFa/82Q== X-Google-Smtp-Source: AGHT+IHg5bBsWt55Rz1Rugqar6MZ+VAZSQCpoEjW8I0EHN+ywy05kgFpt3/w0bymXcr1SFJEZK7hul4bbbOZB2g6+g== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:9b1d:f1ee:f750:93f1]) (user=lokeshgidra job=sendgmr) by 2002:a05:6902:250b:b0:dbe:d0a9:2be3 with SMTP id dt11-20020a056902250b00b00dbed0a92be3mr2244340ybb.3.1706556936414; Mon, 29 Jan 2024 11:35:36 -0800 (PST) Date: Mon, 29 Jan 2024 11:35:12 -0800 In-Reply-To: <20240129193512.123145-1-lokeshgidra@google.com> Mime-Version: 1.0 References: <20240129193512.123145-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240129193512.123145-4-lokeshgidra@google.com> Subject: [PATCH v2 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-Stat-Signature: s8f1xbi6a4szypn3pnk13uofm5uxnps6 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 3521D40015 X-Rspam-User: X-HE-Tag: 1706556937-417791 X-HE-Meta: U2FsdGVkX1/JKRGXTea/eRJqicpa5uhZjsT8XD3o9jscTKWZgvzlhkH2/TFRTKl/1dHV9njjTg5HcKUirPfM84qQ+2ErKQpGx2j93dCxq+7o7noqqPPL11iJaM72gWe5i+BBDhJL9JQAc8tc0c32LF7Vp8J1Keqg9wL5RAOm+GRD+n3ScMBdbHZt87+Qb3LomMYIq6tb0HYvPQLxiYz8JID/tIMcaLgKsxjh8iE3zO6YD0JHPUID/8KHWF08XlrnJs/6Xfu9ov1VEt1RPL3R7AZztNre2rafmIYkokP8VuBPcGu3ybHTENw0A7ZaJh8bYbQkhXzbIVuWLqjuZfdFFYrU7v2yUM8M9FE3BxuniKWmLV4CV2HOAetXjyZ36808Ej6MqQ13P3HhoXfEEqJJS5RDhHj1XQIZsfcjvCG14CohstOSnd9ICvdhHCoBH+JvujGeFuZIgE1sT0AVmwAh5fhXVuC6fIVI3cXLW/J0TtzyMsMuGhBQL/robfxr7KTEbkH4Eet6djs6wohvruLuPV+M2oEUxgSSh2hAEFzeEmpGs05Utx9OsnKRH+c0JbARMS0sPCHC/H2EopAVxXF4J6HOtrC9ASE8MOWAeCBpCCL7UAdjR9DQBCu86zJgOchq5Gx4sUJi2dZu6FgTTbJenJJIaXzkS5Z89JBd7BbJkWddXa4L8CyEE0eqpf/x2nvNPd3wVpqwN9hCL/qfLzMu1TmVtRHghEGo0Q9lz1qH/GbfZDRegnN6OekSTmI/4aAUYOJaU8q2enMxLiN0wGuwd+HbZ0UI9L9M6j6rSpVX8Q6Wi9A3seVdQJgZlcX81vj/NRkxhlJvg2r1vPHiZf6WTVW7ReXdsHgckyRgKbLJhkuitvbsXix3ECRI9GYD++LZMSGm5GWfo9QahUFI7i62blzQC0uClCayhIHBza2qieto1GkU0zTm07c1j80m1sKf6oJ6hVsiT6TOuqwK2kl IaBlae8x QTNE7jgZhu65m8pHPrWOL6YPJ2/5IajXQYIe4P3eNGfp+vtgbUlH2mzkpkm6ovb1MoAnvimVgHOcdBL46pwJvzhpJ882Jh2rmeUv+Njr50X3bOsl+9RCaTvBdOqh7Bbdb8jVTYe+9xlCME+B/vd5GU17LinxCx4jcajUu/VG1Vv6sp1nw2cFUACrei/X2mbRcewP/EAXCzw/qZFdtIhBnlTp+DhEiwU4IEGdFNfarvAatzRPUjS7oAASUc03sdcvFeJBUVoUsY9/dIoc/td3rQEys3nXTj02JY8hN2OuUoDs0/oB8ZhQviJmuy245BCZ2lWK3ax3O3l1zbnINGPUNDovXtoYs75Wp38pcnCtVlioOvazEgu2m1a0rMf/VDD8jbaj59J1IkbjkSRWg0Y9BQW7AsEMThAhi2JkwRwJy8LQ6FkTPl7FMpiWAe/nA0bXC8mMIZdqkErJ7UyQuNHTgRosnDaKwwu4VrISsiVS3K9pe7nj1s3rwNyQQrFakDoS5inrA+n95jfOiSifheYie+X4L2jwjkgtE5lDtEiUvaKeeTDQAHleLkGgfrqkVkns8ixOSTV/iM8gUzLhDuZl7YlxZgUY0KHXf3PTfikJjlhCexg0DWMQ9NIZzwtWJnOstQDFKvvpL0+GTbaGAYiPQOna9Jg== 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. If we fail then fall back to locking mmap-lock in read-mode. 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 | 175 +++++++++++++++++++++++----------- 3 files changed, 122 insertions(+), 71 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 6e2ca04ab04d..d55bf18b80db 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,17 +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); - /* - * 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 +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); @@ -521,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, @@ -581,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: @@ -597,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 @@ -609,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 @@ -638,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; @@ -699,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); @@ -730,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); @@ -1285,8 +1314,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 @@ -1353,15 +1380,16 @@ 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; long err = -EINVAL; ssize_t moved = 0; + bool mmap_locked = false; /* Sanitize the command parameters. */ if (WARN_ON_ONCE(src_start & ~PAGE_MASK) || @@ -1374,28 +1402,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;) { @@ -1512,6 +1564,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);