From patchwork Tue Feb 13 00:19:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13554195 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 5FD38C4829F for ; Tue, 13 Feb 2024 00:19:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA7D46B007E; Mon, 12 Feb 2024 19:19:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E574E6B0080; Mon, 12 Feb 2024 19:19:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF89D6B0081; Mon, 12 Feb 2024 19:19:47 -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 C253A6B007E for ; Mon, 12 Feb 2024 19:19:47 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 895A51C1452 for ; Tue, 13 Feb 2024 00:19:47 +0000 (UTC) X-FDA: 81784872414.23.34F4C9A Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf10.hostedemail.com (Postfix) with ESMTP id F252EC0009 for ; Tue, 13 Feb 2024 00:19:45 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=AiC3e798; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf10.hostedemail.com: domain of 3obXKZQsKCGwVYUOcRQSNbKQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--lokeshgidra.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3obXKZQsKCGwVYUOcRQSNbKQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--lokeshgidra.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707783586; 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=ozUmCL0mQLu3kOwhLkKfGjhXoZDR0qC0AyLb7fRrCWM9KyjdgJ5rollfD4JeXblnrRN4wY sKFYW0bJYHA6h3v4FtfGugdI7KNUt/Nq908ToWh/EAg5Pv9xyxWClKEuIifos0Tdy7XrNb C88IONr/wJwiBgh/mKSWZxbCouNVYLk= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=AiC3e798; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf10.hostedemail.com: domain of 3obXKZQsKCGwVYUOcRQSNbKQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--lokeshgidra.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3obXKZQsKCGwVYUOcRQSNbKQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--lokeshgidra.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707783586; a=rsa-sha256; cv=none; b=3hKbBjjFty/sFu9J81UgOaMySa932ExrBCr0zbFV3UBw3soPFOAAYBTnEjPfCU+c740IEb mUUirWuotFnizKPVuneAOi/+xSoidhB+rBsruDFBa3Mubfxh4BHWQToClG7cHu7XW6oDGY 7k8sTnCFnGv9s+WZyulZsNnH3PX4tSo= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc6dbdcfd39so7811062276.2 for ; Mon, 12 Feb 2024 16:19:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707783585; x=1708388385; 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=AiC3e798lGMa4H2JKaWshzK8klH8+/eEUFRuE9RCtXE0jrn/0RtASJ3SLqaJd2krNq euda5DTdR+Jq7GTp+MQ7B9EK+krsGly89LsXvs9OemWnNMgEIfmZnNRwPxr8VLz/HmLr JeF6jtbFvo7G18h0gXlgdku/3lBRnHoNA+IO7eu2ZJZD4F8eLQFtHqLTo8S61if08LAQ PIVIpW7Dr0xcwFk+cyVQEv1TwGW0F1Fv8BKtisbsAFq6EwQQx5FDZag9ZdF2p7hcQCPQ SUw+Vnxg+hPNkKyL13Sb0jHHxlIbOffoTMf1RWZpXcRcjU/7iFRRHTxKNcIRAQ1OcMQe ruEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707783585; x=1708388385; 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=EnQUnKDQN1x9Wsb0CRygpIMsES2BvjJELpV3RIcFdXchRBLKkw9ASngH8DxB9qAy/T yslO8rRbeJNsRWqLRVr9CWoxn/2x6HvriGSqy+apxcT/RCx0JMoMPUO9QEYQHoHe7X8l enI9AuaGixXwYkbe3enudp11yER74YhIA0hAyEao2e5GA3x7yiYET8IVO6Kizswaj9Pb Ko6HquO7vViQzjRnaFehl0RIQKNdUruPZ61iTuR5MstmyXmmQfUNbcH6MBhtFGcLW5Mn ica5rw5GutjGYqZnY00AjXFYp1YmNZSy0D9tu+tqmWrWdMxJ7TZyBkR6LuZYUgIl62YT xZ6A== X-Gm-Message-State: AOJu0Yx/aVVQw8ZAcJv5xBAM9c9tkf8It9GYDrVqPYC2MEgQdrVULcpz osLsyZftyTuvm+Wb0HwA0QPItyDThWDCT7Mhz0CADjqITN3gBjilDsXG77T3kOzUIJvXesogrSL 3FIuV9O65fe05dUcdzqQiNQ== X-Google-Smtp-Source: AGHT+IHHF8psOCpR3jPtRIweQhip+WhYFn+NGs+b1/7N2Bm+HUMlIaS9Pt1A9QzZr7uT4pBB5l5vrCPMXQlp/u7k7Q== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:fd80:ef0f:6359:fc4c]) (user=lokeshgidra job=sendgmr) by 2002:a05:6902:10c2:b0:dc6:d2c8:6e50 with SMTP id w2-20020a05690210c200b00dc6d2c86e50mr1289834ybu.7.1707783585214; Mon, 12 Feb 2024 16:19:45 -0800 (PST) Date: Mon, 12 Feb 2024 16:19:18 -0800 In-Reply-To: <20240213001920.3551772-1-lokeshgidra@google.com> Mime-Version: 1.0 References: <20240213001920.3551772-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240213001920.3551772-2-lokeshgidra@google.com> Subject: [PATCH v5 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: F252EC0009 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: bn1hxxurcbzcunr6fsu9swad5xe4y9hp X-HE-Tag: 1707783585-98617 X-HE-Meta: U2FsdGVkX1/2yDNFVLnK0OFPljKCK0O0i6RGuHIkFv4rYFb+C3ZPu5tKpgXvFcNJogD0tl4I8ve8QJvQ5mOO4SCbQfuQTUc9TfP3UcTWU1rFvCl5tCZ1SlBBx18Q/SCZNigOoMryOQiOXHQAo2oYMFV9zpXbcw30euRjguakw/sbWo79bKlpjLlcyL8N6lACnKYGMYjcUItTpdDNsBk6sKY83zu01WoJuP9mpoXh9LVIyynmI5EvY/HFqMoQC3OqjL4BrLwBCH+EO2hBkKeoxcDd7r3I1ihmCiIoIqgXp+vMEZBd8BMEEmsNook6wDGGO2yPRnzkJkSG0T953M0nm80MWa7XeVK7bM5zVOnIEOw/oNEJc7bUl+IbMmvi+r401e3V085ZxUwCta5XceplBGUxGE1pmJx/2BV3J36peyjdLXKOlWKcU13cIGotSivFw2N2qT2cBrCASHxEoOKTQKYhcKFHnjmNZYS3OmV+jqT6C+uO5JWi996SVhUiP/kUbIrvPRk4+cuqzg3HOPZix81lM/ofxQ53ZxepTkWRACmwqJRFy3BU67Z21aYl6nAibyiJDRQHuCqhsymp/fb3SrJzqs7fnvZRypKRmuCyyKFtC33DSVk53tgPQDLLQchgUICovRMthJxP0vDCXMNZMb9uGNLmd020pdo8ajYbOXvFEJEXbpq6YlUYTyatQ7Oal+GTRxyfb7nKJVpxFlx8TaRS88/2PkT/j5xfQPOIzVZzyN+lllYFLF1X+0fpSmHZaCv19eXlaSuV7gNSL+QJ07bbJ+xGUAeN2XiOfG7l9akC37JdPilnzTyhODxmZYuK0Ux0gSQH8uEGpnRef++PMaArnKKFc6pUI0D3Inn4lTkQKHILiawy6VhmMYsekLgJcEo9AIbSFv4WIQ5pR9vy5c+DdMBau5nGHhkPDAAkMy29F4wqtmC8b6U440gtZz26uS4u8WppHrAyElEPNTa AH9KQmFk ogVZLs+3MlsP3uwywNH6sWe+oXHs63FhXEBuTHiAas4RN5IfvRKWmGyOmFqNksrznebu7H5KDrtTLcDkDdkCmuDMO/bn9+sZoHLquQ4Cz8l1p7/0AcMvNqzj49UfGRooWdiZjsAMwawqgcuc75mQPJYakKPr1u2XDKvApdTDuEQoAFnRln3PmuXq++YRSV5QptHylHM8U/vVXYfSnQnKEF2yP01KLtv01PNsWxKMe99Km/Z+RYtVaCZ0Oz3cYfJm6s5DvlBM/vqJX26QCwZAKjBiR2BzR1z8YcGhVmwy0JKOVYpd65Ni19NIjb9k/iWw0fTEavRkAh/x6ZLOXrpqTdmQQSdgwuSHjHXGGuHcdqVhQs38qUxT73SsARHXzIqTfBBVZMN/l3izhOahppvjxUSoovUS+rHT0PbYSrXGPLvTnt9CDk6U5m4pGdQEp/0FLxKQ8f55GNug1j6C8jcEJzRQCm0xxcWFFDfAMzNYZuvlfmZMAAzj1A2yaYiDXr2DHO9bJ 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 00:19:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13554196 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 A9EF4C4829D for ; Tue, 13 Feb 2024 00:19:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3ABD36B0081; Mon, 12 Feb 2024 19:19:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 337026B0082; Mon, 12 Feb 2024 19:19:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1136F6B0083; Mon, 12 Feb 2024 19:19:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E72DF6B0081 for ; Mon, 12 Feb 2024 19:19:49 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id BB6A512052B for ; Tue, 13 Feb 2024 00:19:49 +0000 (UTC) X-FDA: 81784872498.05.F3BF338 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf10.hostedemail.com (Postfix) with ESMTP id EA04DC0013 for ; Tue, 13 Feb 2024 00:19:47 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=SazD7yAl; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf10.hostedemail.com: domain of 3o7XKZQsKCG4XaWQeTSUPdMSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--lokeshgidra.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3o7XKZQsKCG4XaWQeTSUPdMSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--lokeshgidra.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707783588; 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=7M/u7NedatXuxxtPiPBeAYui3lChlZRLBmWf2llEe4PJmgt95tu5a3La7Caij7Pzp1uqN6 KikdLrToHX2ePCq9PMqQOJMDJTnhJuODj6yFW405kBZZC4gPejDi/YNhChxfe7sdzBtkZj Jk/Rph5ypRpsFvNBjCdOooQzel+dfvM= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=SazD7yAl; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf10.hostedemail.com: domain of 3o7XKZQsKCG4XaWQeTSUPdMSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--lokeshgidra.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3o7XKZQsKCG4XaWQeTSUPdMSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--lokeshgidra.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707783588; a=rsa-sha256; cv=none; b=fLQZXMh1pFhAOwHIDWSDcFh7zCQ4cJ/EXG/A6AsjhDmUQWa4zsRKxSfNz/he5DmCsG5i4V StMBG3Tmo04xt2aFlO9hi1/Pt0kTJxL8fXyWqAWsuHwDsTSILVZp+sbC1+l0NtWO1atCrl 4ATlrXBeaJjydFoLT0mzld2dttYptQg= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dcbee93a3e1so1072170276.3 for ; Mon, 12 Feb 2024 16:19:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707783587; x=1708388387; 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=SazD7yAludO29MAzY2mDTdsCXRjBrAuMp/H3X/0tUGaNPPmEgNrJf/a7MXLOGeSGHb 1T9Pr11p+O5RCxnXLUzzWVefvRVvvnQmIW34vdpBXObdAb/AEJBhYihl81pykYGbzbb8 IpXxw114xkvVoO6hcChnqBzn5rE2kQZaLH/hE+npHlaUAucmligYv3LyEse5rsARWciR UMFuycnuxiYX7gHZoUIybvYd2J1WghrB8JWE43Tx8HjOWoExcJgwcOR98D77MIbc4NzW BBLTP3UPdgcct47c6e6oMO9R8c9/QvKlbZrhkC0hyWomfiss0iJFr5jWVjXwYxrcgSjb WR9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707783587; x=1708388387; 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=Yqgls0MuQpYP9OR0euB8jiKCF85JKAsxLNurtg2tWR0g2i8csG2RhuiaD50m/T5ULj eAK7e1b6VgablZ0Ygi7zWQcmhwCx3987C8C7LpmVidW9HrpKL5I6v13NZkKe919JMrN3 +XPH3L+aPJMV36abhN/FGO7WN26hbg5kugPD3wb977ZPmdDmx3ddEKglVWiK34Hs6oQy 8cMgGU47d+M9z4Pc5YEYw227yoIJVcNsZR8drgzpOQXN3KwEK6agdZWnepZ9zKxwBaOA 5eRFeZq80ZHI8tzuTOwSbX+lb+GzWY/pEDQKdWsmSlpiZR+gpSXUwGfKVcYyD0t6pS05 tk+Q== X-Gm-Message-State: AOJu0YwlbMYiuIVbiCoVJavjoSwJGd7wh+KWyFcX/LnesaSdlkcz+aXW qNxuc1shdsqMnpqwdsK/rA/nVLFxVBQdNUA7ysnbNNIithw6NMTLxgVyHTmDvHM/xtYcFPOTLdd VZDwkCwwo9uvGR80RNAml4Q== X-Google-Smtp-Source: AGHT+IHUDuEjzMbEdCkojri1moJYf3kxPzNfFLGXk8eAuGj57GMIrZzgUI2jyxqII0cDDxjVoJCdhqMTIGxFJTHhlA== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:fd80:ef0f:6359:fc4c]) (user=lokeshgidra job=sendgmr) by 2002:a05:6902:1207:b0:dc6:dd76:34cc with SMTP id s7-20020a056902120700b00dc6dd7634ccmr375064ybu.1.1707783587100; Mon, 12 Feb 2024 16:19:47 -0800 (PST) Date: Mon, 12 Feb 2024 16:19:19 -0800 In-Reply-To: <20240213001920.3551772-1-lokeshgidra@google.com> Mime-Version: 1.0 References: <20240213001920.3551772-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240213001920.3551772-3-lokeshgidra@google.com> Subject: [PATCH v5 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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: EA04DC0013 X-Stat-Signature: 1mpwtwoo9n9h6e57yin4qroeb6mse8jf X-HE-Tag: 1707783587-732100 X-HE-Meta: U2FsdGVkX1/22hGrVFRAZUdECreDMzoUAG4z9y5aRjjeGyB9idOmXbtbRquFkyQVJLuHhawRkYYBT3MqRfaF5xegU1711CKlOYvK66zusggsAT8fL3UN6rqpu7ZeIkSPqP6GJ318+V/ewHFuRtoiKwDiioXdXZzpKRYNcnQpIRpHpRN1hlYfCe+ZxThrQxH1b4jH7WHezyH1ewE/h562W3QjBM8LRM/vr1Z2VVs2mn6yp6tssMYGzAjeYX1mbkgt+LqdFiF6aUY2iroyo7mfX7F8HMU4+FqMxW1+PGnn21WP7RObHf4JZBQ6Cm+GFN8BFMeyfGfzfZPf4yeZT+wU06adwK1zNG4FHeh2LhgBixIMCmjDNo9Td5ARWQPe8yfARiZCdNWIgrAzqN6o3BJRv+JivqnyVVqWBHVmpapUj9SE1GVeq4kFY1gJ+6m27rl+0uLoPrknXryRVfqX3vIOHHRe+x3U2Egx21wNfaqCaTNYGsk9kvtpRwTAfmywwoyqvpz9TPkT3NXzAbfZWqQMbDMzQVwP3mfnTqv+VWadJmk2AYopKznFeP9pV88aYPhmo9da0dWY7wnTwKQLc1fEABnNjMVBHZqZ/Ee3FuhQxpTAyyf9NtmoQmOmiO4pyirTUaLWsTe0HAj9fN7uLbKtwYJ+dIyENy2hELp75tmXXvPKxGvUO+bhDM9XhL60Gim2RwzM47NuzcGTLRWXCDuA+yaEvaIUzpUicRp+TBfydur9WvA4LyHYhV75vGy1qwREbNozZyM6X6CLoZKWVA4EMGY4foLJnLnfp/G8tXu7qA/BxbYYYMqwze/o7Fc42fKKM1NF6GysEpYlz2hb1/9QhBovHrcJ6L7x4iqSSPRtsuWUdz/jwAo4u9BeNdYTpIPkdW4op3qR82aYuMofew8dM3rPXZxKojkL7fDXSnY9wCNOZcaCNeT6NE1YHk/AuIZq4zYVRWnFtVbphJvXqA2 UyVuQ1Dg frGjAh40Mia95uhRlMctwienwALC7uHDUyTTSba+5Xu5UK594/1lnUAFvsL2RbEQ4e+VRQsGGdjj3WQ2ImA01o1lQWszMk4NsJWkXS0Tn7Twd+Qr/+3d8yOiBnhYUTjON77zt8rU72kStfjBLmkbIRcinGPmy8FhIcq34azncNoaheN2Ht+AadS3QETBw978IHZ38FZiqRTpNy9wvstqZCH03I7PNwOys4qvMaw1UzYHtMv7MuFy9LtQCrgQzWJ+fuimxV2Y5saMuyS0wNZKP/GozLXUFKJTADw6ItYBDEZ/uY0S1qsArZiEnZ0qGkgfTWxYS/jopaaPDq9zPhsMaxPS0AxZCr2RzZZHBJWKxXkORnH80nnoTSYCn7kUPfWscrDqcWL7GTocfbkCUYjOr2lQsSkY+s1iZdvr8+M0ZbCqqN7W6CGef7NNh9Z4cNRbyJ+wklWmLS3BMOGSW5PswL8dDYyVTga6zerlpzdxzNuOgq8s5+q19noyya85vzz+VdzstOWlKzlxgsnRyGCk4MTh1Hy+HPUeJSX7GktAKvbBUrEQhcrbFQSMT0tYE2GZNniv4hE0HUIXPpotOqw69Tgk84rv31f640CJXhqJhCMF2OxTMREGB6XwRIw5EaHY9gHjey5JB4Ov8sfSEQlA2Ml93MySi6/lYMwwKewTGi5JpA9ehUqmZ6BJOlqyGGMngbUK+sRbFQKwHIskoebyLuTiqX2x3aCIyKsMcvj6dw0P/JhlytSsu2jJnp0LoLALJveYLy9E/sEQlTbPhtsIlYeiKJzUe+f1HfIPBEOl8AQGIzY9gYLd3hzNL2ugi1plL59OIspaNBe2q16Y= 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 00:19:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13554197 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 230F8C4829E for ; Tue, 13 Feb 2024 00:19:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B46A6B0083; Mon, 12 Feb 2024 19:19:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8416B6B0085; Mon, 12 Feb 2024 19:19:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6446C6B0087; Mon, 12 Feb 2024 19:19:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 4682E6B0083 for ; Mon, 12 Feb 2024 19:19:52 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D89E740390 for ; Tue, 13 Feb 2024 00:19:51 +0000 (UTC) X-FDA: 81784872582.25.625C4C1 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf07.hostedemail.com (Postfix) with ESMTP id 166AA40006 for ; Tue, 13 Feb 2024 00:19:49 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tQ592lOY; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of 3pbXKZQsKCHAZcYSgVUWRfOUccUZS.QcaZWbil-aaYjOQY.cfU@flex--lokeshgidra.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3pbXKZQsKCHAZcYSgVUWRfOUccUZS.QcaZWbil-aaYjOQY.cfU@flex--lokeshgidra.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707783590; 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=p0acLNL0hrBdsLJihHiNr7h0MABVTrAouOJnKfhyS/s=; b=WEAx7iRCsvpMUZPoV+4rPCWj+cRLmxG5TvKmQpCVi6Gq4fG3FBzBh5zwkSrHB0ZiaUf6JC 8fs1ZXPcfC1V8KH4p66nb42I9IgQ45s/PI23pYb7f5g1m3ABIn+P57aUKvp8NZb4IgTalL pmhH3BSp84dJ8R/vkgZDLH7bN1qrqkw= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tQ592lOY; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of 3pbXKZQsKCHAZcYSgVUWRfOUccUZS.QcaZWbil-aaYjOQY.cfU@flex--lokeshgidra.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3pbXKZQsKCHAZcYSgVUWRfOUccUZS.QcaZWbil-aaYjOQY.cfU@flex--lokeshgidra.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707783590; a=rsa-sha256; cv=none; b=j3415zkhuNxc4WaorC5WxYd7EpvJxDECdn3SyR8RlqnZ6QZIj2QHsTWGIC8B+PKvrdDWIC FPzR/2r2mSJm8eIGvvROhuAykTvKP6F7NjO+nhPf+jTVzY2kpcTUK0YFaGMlGj1ywnlDIC MNoXa44oZiqpZlYwZP585YWdxB+DBtM= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc64e0fc7c8so5183177276.2 for ; Mon, 12 Feb 2024 16:19:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707783589; x=1708388389; 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=p0acLNL0hrBdsLJihHiNr7h0MABVTrAouOJnKfhyS/s=; b=tQ592lOYMiQ0lID/7rgi4P0n+7mH1DxesNt86f0rD5ckn6pmZqnf8S0VoxHUAYgECW nhVuQvqIZ0ZwVQ/OGzxVJ2EbViNrGeSWIMHW4WAuDYXpC/Jl6V/akXn/vBtfsQCDwn7f ePOAkk2Cazl9tQO6KCmTD+m8fgm/weOs+RZuZyzTDUk32DHoLmzhaIpQM63xxCoHNdQ0 8BgNOTHHafJ9TtT5OSWpXodL9fxKXBrzKhRC+f+eEnoeaACiELs8+SCwqTNvYzUSkk15 ufbEH+gL13AVnAZw5+hdaI3ikBbwWakxRCdI7iZlgN3wXsG+gu1TDRAmmXbE2K3p15VB AvRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707783589; x=1708388389; 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=p0acLNL0hrBdsLJihHiNr7h0MABVTrAouOJnKfhyS/s=; b=POc+IbgNDS15DarZeKifjhY0vmO6FBHLG7b8aizSNB9mkgSqnS8yF4cYyWwggtms2I HFy8061F5bbOB8t+fKPmYQJPaOywCB2WIL0bFU+ZMapOEkCmaN0sYmWAlxMhwnZE8IZp 9vwujyUjCUE4vTeoReofSPI7HMQ3V9OVXnTR7k8dVYfVIZINXcy7SonZly4FjCf+i028 MBYFY7KMLpQlAqebaSvj45wOGo+rJ77+cqEfT+z6hybO4pDSJlrgW82LlfCmrtT+kPUV Gx4G2Gz+o4+9lnDDSeMb5kqK3T98oQAbJ/1X/NQJUlhFD6cHNU7FkWqCEExsXdoXQ6g2 dNXw== X-Forwarded-Encrypted: i=1; AJvYcCWzKRQbJGL4XrJ5qjZYrgG/cZnoAya3fzkEF7O7vuIWWP1vHaUDJt3YDSsKjLbfHSNS6r1im8lVEvgPxikipR+T6mw= X-Gm-Message-State: AOJu0Yz7X0D7yM4gfwysOaFpTp4CQMp5St3/yDIVmrLKWLyV9BwvVb3T jwwbYZ6aWrBmrIRa9LDyBHRFqSHTUpjlGYHe4MrsYAlFCb4hipfyDsnaw6W8fYPnnEqOqWjMsyv EuH3pN3kyGAWdlMmDMuCnOw== X-Google-Smtp-Source: AGHT+IGabpi1FIUpjHhIJoV9U+X03FKg2G8P1VhpeQN7NaunrFQnnnBYd6dTBFPSRWclcvT+yNmGkJoRbVyzmNPGQg== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:fd80:ef0f:6359:fc4c]) (user=lokeshgidra job=sendgmr) by 2002:a05:6902:1005:b0:dcb:c2c0:b319 with SMTP id w5-20020a056902100500b00dcbc2c0b319mr91815ybt.9.1707783589269; Mon, 12 Feb 2024 16:19:49 -0800 (PST) Date: Mon, 12 Feb 2024 16:19:20 -0800 In-Reply-To: <20240213001920.3551772-1-lokeshgidra@google.com> Mime-Version: 1.0 References: <20240213001920.3551772-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240213001920.3551772-4-lokeshgidra@google.com> Subject: [PATCH v5 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-Rspam-User: X-Stat-Signature: xnzm8ueosu81exdqebemmy9dzqp7duye X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 166AA40006 X-HE-Tag: 1707783589-208867 X-HE-Meta: U2FsdGVkX18Jh41LcWgCcvJGAAs0gd03BSl44iCU5Os3Uv54zJL3xeIxQ48fmNYP1UCpGBqdh8lONta9eUEwP0BlVcIx3lvK0tONZVBgJaKZiGWjoK7cMjg6bgqt6hc9AqMHPrBLgpPOEtw6DCn7U/3SaD+Fq44O55loz1HBU0N8ugYOM1HqWe1J8Zu5KgmcYYYkgQY+NqabGlQk+UNxsygxx7HfdFnShUabftCBtcjdN1soXhoLTJKDAzJBdiF0dBEK7XMdleFEtyR7esDsUT0uTGsEVzXHtuFsiZMORUMzKvS2pmEIILUe+wrUi44wW1lmFJDbgNgI6FmuKKmZGsiGKHPtwBXSJGrDSz9Lt7jSiuVOt5VlfBKupyVV7CmqENhUSek9ZyCkJrHnhv54c4TGtR7cYiQj/IdL7x/zHcs2C31fW2V2voIc4VbraMFA5n4X5fPFeDRcDdfA1dJSOPjiIBaSTayklZinGrR38j2QpiGQIB7irzxpO8b7kIigkWRwhJMhr9pAjNCokM+REgVAP1U49M5diBBOrAjSKKCdaZ4/DZnT2n1dc2mfW6KOJUWpkSZ5OJeFWiRnVoLlMOh9t4zKxfqwDilR9cpHtYDx1ukZfFXl7Z9mjT7pSKFyajPm0aiPyYVvO7y/WArXID/OswnO9G/JKuzN1D/6zCM+EyRRjpOkA7v0f+ImgvZF0dePQR9eP+hiaqkwG6QK2mR7zJvanC8I39/jLNzZ034rL94sbmb7DwUQj++FFQMjXnbpn1eh6xnvfqCDfPZnWBQEpGZBsd5VsCdA3Lge12tq2ktYc7bHktHJGalHeMY2GzlPEdMVbNE9n5m+j9SaQiQqbT27/rYg3tL6ryaU8GxINkCIhW5uafrrciP0OEsepXtP54NrF3nRZAkkzI175NoU+Px8fSJ7N4tPQeexH/mp9pnF1l94gv9AGP/pgWL/gnhB31DAYE0plol+rtM afiDBGZx 3VJDXxK1NUUwVe7pwz4c9gVkqDncS6kjZNySivuWlTPgif2x1BX/3MzRoZ0hvhn6deA/oaQGiuWcM43wYHk8xPHAom4aldLebhd434zFRdRsAhHu0UX63hyW2DC1bHHRA3jHgOjV3OM6HU+MeFJ7H51bt0ypS1B3KvjRhDh4lTnYYEtSlhBNOT64DeZuDpokNNi+Jm+YYKzGjC7BG+DiveeKzJJ9J2+Bq3evXNDSSXeX50T7+KUz1ScCdP6z/YmXyeNA5A+jW4fB1whTNIl6Yw67OP+FD8isI+1LWWsu6fb1iRByTvsvbBJoe8m1j/JRd66gkBFGNwxzwbyJGVgapsTbPWiSpal6lkI+AXtuOVwCaDCYi2j4bEPXLl12vGsSCb7bdGCCho6j7lppjHWCYGyH8F+8zNjgkrpGo9gXBiCxHWQK7/jH8SR3KG/5AV+0puCBhF1EdINRsFmUR+mMcQb4cnk//5T6hxsUH9vwLpC66R+bZr1QJSErawT0XqMb6OfIa8wDsnLcvwibKsaxw2agybuxp95Ol+rkhB/mZWCsbOfXY0JRGJVYRHrZp2zroBcEdV80q078o/u0M6Puf3lmWJ0sX7ka/gm0WOhmim3ATIN6pCZww2FLPpCYKD08eee7we1rnEc35ESaaeSNOUtPWuA== 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 | 392 ++++++++++++++++++++++++++-------- 3 files changed, 312 insertions(+), 98 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..eb7ff220f315 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,10 +32,118 @@ 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) && 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) && !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 void unlock_vma(struct vm_area_struct *vma) +{ + vma_end_read(vma); +} + +static struct vm_area_struct *find_and_lock_dst_vma(struct mm_struct *dst_mm, + unsigned long dst_start, + unsigned long len) +{ + struct vm_area_struct *dst_vma; - return 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; + + unlock_vma(dst_vma); + return ERR_PTR(-ENOENT); +} + +#else + +static struct vm_area_struct *lock_mm_and_find_dst_vma(struct mm_struct *dst_mm, + unsigned long dst_start, + unsigned long len) +{ + struct vm_area_struct *dst_vma; + int err; + + mmap_read_lock(dst_mm); + dst_vma = find_vma_and_prepare_anon(dst_mm, dst_start); + if (IS_ERR(dst_vma)) { + err = PTR_ERR(dst_vma); + goto out_unlock; + } + + if (validate_dst_vma(dst_vma, dst_start + len)) + return dst_vma; + + err = -ENOENT; +out_unlock: + mmap_read_unlock(dst_mm); + return ERR_PTR(err); } +#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, @@ -350,7 +450,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 +462,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 +480,11 @@ static __always_inline ssize_t mfill_atomic_hugetlb( */ if (uffd_flags_mode_is(flags, MFILL_ATOMIC_ZEROPAGE)) { up_read(&ctx->map_changing_lock); +#ifdef CONFIG_PER_VMA_LOCK + unlock_vma(dst_vma); +#else mmap_read_unlock(dst_mm); +#endif return -EINVAL; } @@ -403,24 +507,32 @@ static __always_inline ssize_t mfill_atomic_hugetlb( * retry, dst_vma will be set to NULL and we must lookup again. */ if (!dst_vma) { +#ifdef CONFIG_PER_VMA_LOCK + dst_vma = find_and_lock_dst_vma(dst_mm, dst_start, len); +#else + dst_vma = lock_mm_and_find_dst_vma(dst_mm, dst_start, len); +#endif + 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 +577,11 @@ static __always_inline ssize_t mfill_atomic_hugetlb( if (unlikely(err == -ENOENT)) { up_read(&ctx->map_changing_lock); +#ifdef CONFIG_PER_VMA_LOCK + unlock_vma(dst_vma); +#else mmap_read_unlock(dst_mm); +#endif BUG_ON(!folio); err = copy_folio_from_user(folio, @@ -474,17 +590,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 +610,12 @@ static __always_inline ssize_t mfill_atomic_hugetlb( out_unlock: up_read(&ctx->map_changing_lock); +out_unlock_vma: +#ifdef CONFIG_PER_VMA_LOCK + unlock_vma(dst_vma); +#else mmap_read_unlock(dst_mm); +#endif out: if (folio) folio_put(folio); @@ -597,7 +707,19 @@ 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. + */ +#ifdef CONFIG_PER_VMA_LOCK + dst_vma = find_and_lock_dst_vma(dst_mm, dst_start, len); +#else + dst_vma = lock_mm_and_find_dst_vma(dst_mm, dst_start, len); +#endif + if (IS_ERR(dst_vma)) { + err = PTR_ERR(dst_vma); + goto out; + } /* * If memory mappings are changing because of non-cooperative @@ -609,15 +731,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 +760,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 +802,11 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, void *kaddr; up_read(&ctx->map_changing_lock); +#ifdef CONFIG_PER_VMA_LOCK + unlock_vma(dst_vma); +#else mmap_read_unlock(dst_mm); +#endif BUG_ON(!folio); kaddr = kmap_local_folio(folio, 0); @@ -730,7 +837,11 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, out_unlock: up_read(&ctx->map_changing_lock); +#ifdef CONFIG_PER_VMA_LOCK + unlock_vma(dst_vma); +#else mmap_read_unlock(dst_mm); +#endif out: if (folio) folio_put(folio); @@ -1267,27 +1378,119 @@ 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 +long 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 long find_and_lock_vmas(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; + long 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; +} +#else +static long lock_mm_and_find_vmas(struct mm_struct *mm, + unsigned long dst_start, + unsigned long src_start, + struct vm_area_struct **dst_vmap, + struct vm_area_struct **src_vmap) +{ + long 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; } +#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 +1558,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 +1579,40 @@ ssize_t move_pages(struct userfaultfd_ctx *ctx, struct mm_struct *mm, WARN_ON_ONCE(dst_start + len <= dst_start)) goto out; +#ifdef CONFIG_PER_VMA_LOCK + err = find_and_lock_vmas(mm, dst_start, src_start, + &dst_vma, &src_vma); +#else + err = lock_mm_and_find_vmas(mm, dst_start, src_start, + &dst_vma, &src_vma); +#endif + 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 +1729,15 @@ ssize_t move_pages(struct userfaultfd_ctx *ctx, struct mm_struct *mm, moved += step_size; } +out_unlock: + up_read(&ctx->map_changing_lock); +#ifdef CONFIG_PER_VMA_LOCK + unlock_vma(src_vma); + if (src_vma != dst_vma) + unlock_vma(dst_vma); +#else + mmap_read_unlock(mm); +#endif out: VM_WARN_ON(moved < 0); VM_WARN_ON(err > 0);