From mboxrd@z Thu Jan 1 00:00:00 1970 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 A72EAC6FD1D for ; Mon, 27 Mar 2023 23:02:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2FF11900003; Mon, 27 Mar 2023 19:02:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2AE7C900002; Mon, 27 Mar 2023 19:02:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 177FA900003; Mon, 27 Mar 2023 19:02:13 -0400 (EDT) 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 0A711900002 for ; Mon, 27 Mar 2023 19:02:13 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CCC38C05F2 for ; Mon, 27 Mar 2023 23:02:12 +0000 (UTC) X-FDA: 80616203304.24.9299DB6 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf06.hostedemail.com (Postfix) with ESMTP id 017D218001C for ; Mon, 27 Mar 2023 23:02:10 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=fromorbit-com.20210112.gappssmtp.com header.s=20210112 header.b=Zz8B3FNY; dmarc=pass (policy=quarantine) header.from=fromorbit.com; spf=pass (imf06.hostedemail.com: domain of david@fromorbit.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=david@fromorbit.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679958131; 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=XwjJWkGsp6KWaPuhX4ZKe2jxF9ewadj6nf9Cn7FI1X8=; b=Kg0wXaCy8R2WUrWzp5X8KMjSSmB6D9l2A4uucHkMMmf+Jnj59yA0EzB3Vaz8G3prIOCP6F jyk4MbMP9H7GXh+jrQUH/q+Bdfxbf1BRYwdPlUGp9NOJEnOBuH78ERwOJYTxIlxIklfPOD 9trRAOySunBlDRW8vteaCw6hkcyfNvM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=fromorbit-com.20210112.gappssmtp.com header.s=20210112 header.b=Zz8B3FNY; dmarc=pass (policy=quarantine) header.from=fromorbit.com; spf=pass (imf06.hostedemail.com: domain of david@fromorbit.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=david@fromorbit.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679958131; a=rsa-sha256; cv=none; b=BcVs6oKVdA/JWwKFTpx3XhtrlCxICU6XB9e50UgPdaqFlpDnroFMGMqgiChgIj9W7SKMyd qBpqac3n2nor75Mw58q/xsCzbCcTy57X02ST86f0B/CgUmg2nfXCbZGwuK7wkcWVgqsQd1 dCJJgI0B8vCAfK85baWthTcJX0v19yg= Received: by mail-pl1-f177.google.com with SMTP id z19so9966893plo.2 for ; Mon, 27 Mar 2023 16:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20210112.gappssmtp.com; s=20210112; t=1679958130; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=XwjJWkGsp6KWaPuhX4ZKe2jxF9ewadj6nf9Cn7FI1X8=; b=Zz8B3FNY4b+sfM3gfYNEEatxFjxwT5o1zpMNuvfBS517c1CYE6PZUHcz+vKQ8ZK3I6 ClLBBKktOkc28IqhM36776xjqIMVzzd68Wv+FZKnHgaeOTuRX3pqh/9nZoUmvtZjbroh /HpBudD1UN/MdRKt/qGYgI0mBVhKZ//nk+V1TeeSn7WIXYnNhMbSB9aaQ/H+OOxQF4PK +8mCAP3e7DKdl6OydEeqWDXOsnJOVQm0B+/5a2VvkWwrxAlKTkRu6b97VNjgY7Rt8XYH AbIliowGwrJ1qKW7FRaV1H2An4bwesmo67qrWdznCygZkX6FmEo/qsCdrtNt+8JspfFP Cd9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679958130; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XwjJWkGsp6KWaPuhX4ZKe2jxF9ewadj6nf9Cn7FI1X8=; b=0C8UUDg2Uv+WR2VjAxXZQJelqGI2KkltSlwM6XcirATF3lmYwiCEycI0BX535ks1nv Y7J8bihnB2m1UIAYcWne51QCGiRjszjxFmZxtOd99zstubjYLeKPYS8P68JgYUxSfbDt D24Vmh6t/2NryHdBjthBXsfpwj+fvEw0cUZqDaGSQzkvUASfq8PjXdaObGfYeemejRZW 7rRw5pgOamowci3bseLsANVAWmlVi4m4IUWN9d0UQqsCPY075ZGPiA3cOqZgTirZgKXc L1vZTND7/oppj0Jjs0UmowRGreMAPMzPmCark/NMGb3uergyRygqo4SJMXKqts0dqmbN hhzw== X-Gm-Message-State: AAQBX9eIzjEK6jIYgtl38CeH5pabFbG3ZDeFAViNMbLXMyi3qmq55ITc bGZW2r8gLpPXg6FfbMy57r0WKg== X-Google-Smtp-Source: AKy350bjib11R2NrhpiPjugKHYIyoMxeV3cFjuVht7Zm9p1Mx82x5ICBvHK5McnUuHknqG1vfNYkLg== X-Received: by 2002:a17:90a:1d7:b0:23e:fc9c:930 with SMTP id 23-20020a17090a01d700b0023efc9c0930mr13985941pjd.36.1679958129769; Mon, 27 Mar 2023 16:02:09 -0700 (PDT) Received: from dread.disaster.area (pa49-181-91-157.pa.nsw.optusnet.com.au. [49.181.91.157]) by smtp.gmail.com with ESMTPSA id p13-20020a17090a348d00b002311ae14a01sm4907325pjb.11.2023.03.27.16.02.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 16:02:09 -0700 (PDT) Received: from dave by dread.disaster.area with local (Exim 4.92.3) (envelope-from ) id 1pgvqo-00DwxK-SK; Tue, 28 Mar 2023 10:02:06 +1100 Date: Tue, 28 Mar 2023 10:02:06 +1100 From: Dave Chinner To: "Matthew Wilcox (Oracle)" Cc: Andrew Morton , linux-xfs@vger.kernel.org, linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v2 3/3] mm: Hold the RCU read lock over calls to ->map_pages Message-ID: <20230327230206.GB3223426@dread.disaster.area> References: <20230327174515.1811532-1-willy@infradead.org> <20230327174515.1811532-4-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230327174515.1811532-4-willy@infradead.org> X-Rspamd-Queue-Id: 017D218001C X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: cfoowywnetpuckmu8k68n5za5asm4qy8 X-HE-Tag: 1679958130-60372 X-HE-Meta: U2FsdGVkX1+WbHlhnpHzed7V9Zkc0YB4g3DQJ6KTmKSv6k9Y7GlkVl29eBymtE8p4xVgx6ABv2kK73W2gryp4ffFiKtFVwB9FAW9veykqYvSX4dkTFxGd/1S1L94ypeFb/wmpB1qIOTJtBGG+tTy4E6EBJMbluw5YNQgOYE7xQWxqLvV7+/rUYImH0d7xTFX0F1hvWYSpiHwwObObO0xCGyH0QlIyTMiIRUD26zrxTCimgwIxuwSMNW+SdlXPgbaIdbPBrUTheYpe9L7FC/g11V+E8yYmUfLgRrOIDd91eIjDcEV4imon5dlo31gfvVk0MDgreIXrCIr9aQjqeWAhDls3grQ47ELvsIapTO3BlHZKG5zBIEANX+aP0RLvd9Wg4B1KUhNmjLELUFI4EAPTw2DmMuqWxuQ2UN+1rZsTFR+T7AaYePF9Ecudj+N6hQY/IgJqUIU9CNgBfAl82SKUeoGQVd2UKmCka2qRPlgA0NLUAe7hc/XBo9xwiNpFboxeWR5eF+J9YFeDdMHlGrcEOz4XR/ArdIGxsJe+QVTHzh0hfYsUcUoKYhoo5TIuYyDzLJyQewX1ib10A4Mb3cmOf1catPDsjRscD/8kmNp4QfpG4ZWABa8F6UfL34r5BaISNiM1NJgzPHAg/YfEt+gmkaAdcJMxvOYDdputt15DtuUw13UiJ536H7yTqxCS9tOyMW7sLxGhsva4/qPD4NbX62TboWGWbgeN7LfdJ4GfwiFXjq/PxfbpjWikicj007wZqBci8ELjLqrH+upt3UiH4N6C5xH76mjZnrV63k26TvuQMRqxbVCpLFAPwy8P1ylEPZXu1drFe7Q4fYGaTWD46uww6U9MTIeVpYKjaLTfgnqcuoJnQ97bVErw4gg4S1+gTi4xSln77TlEEZIZc3+Te3236H84/k8Ye2An2dYRItzJ0pfCfb4Z61uj7VDo6d/i3KepO2em5y3Da4MjMK 9VbNgCUZ Obe/peqp0uMExTmw4+bhzvzGDlahzgRF0h+rygI0jqhv3neQWlAvB32NxXcFMtKzCtKPAg6egLZ7FLksNu8gCQU6e5MogsmX254hZIoW94X/3L1hNCMO+Gkw+L3vfU+xqSA9+ul6K7FQHBLqfm0myhtFI/dAuUHfoZp79rfcjHqhEhdrUahyRunOxfVC5qLKoKvXwipXP0tzqP5BYgmpTBM3syybQWN5NEoBDDh/f+noKnhXunYdGdljRzu05XKNrq3E8mIOYJEObWOkoWjGsJvHTTClZvJcTv3bkjIiXIDF3slgZcykhM/6M9AcNJilWOXBb74NC8RhlGnCkKmGzdfHyQkI4LNa8ePOYiCAP9pOnw+u7QNGNvVhVgQX7v+6rlZ83Dwys8AdT2frJvYWFYBUkIjVnwi1ASOR4muxrAXbij7HQ3gvmmWQboHyH9fb976w4sYqAsaRJT2jhane1q/w7aLVKlnkO7fQ4SubtWZW0h0Pvv3ZJAxAPOqOH6cf0hYYx4FrF69Pb1izTPEcwmbRmjgniyq1kKdrHSNFZoqrWBrsze4duVJfuPJ0YwfjEwJzN 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: On Mon, Mar 27, 2023 at 06:45:15PM +0100, Matthew Wilcox (Oracle) wrote: > Prevent filesystems from doing things which sleep in their map_pages > method. This is in preparation for a pagefault path protected only > by RCU. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > Documentation/filesystems/locking.rst | 4 ++-- > mm/memory.c | 11 ++++++++--- > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/Documentation/filesystems/locking.rst b/Documentation/filesystems/locking.rst > index 922886fefb7f..8a80390446ba 100644 > --- a/Documentation/filesystems/locking.rst > +++ b/Documentation/filesystems/locking.rst > @@ -645,7 +645,7 @@ ops mmap_lock PageLocked(page) > open: yes > close: yes > fault: yes can return with page locked > -map_pages: yes > +map_pages: read > page_mkwrite: yes can return with page locked > pfn_mkwrite: yes > access: yes > @@ -661,7 +661,7 @@ locked. The VM will unlock the page. > > ->map_pages() is called when VM asks to map easy accessible pages. > Filesystem should find and map pages associated with offsets from "start_pgoff" > -till "end_pgoff". ->map_pages() is called with page table locked and must > +till "end_pgoff". ->map_pages() is called with the RCU lock held and must > not block. If it's not possible to reach a page without blocking, > filesystem should skip it. Filesystem should use set_pte_range() to setup > page table entry. Pointer to entry associated with the page is passed in > diff --git a/mm/memory.c b/mm/memory.c > index 8071bb17abf2..a7edf6d714db 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4461,6 +4461,7 @@ static vm_fault_t do_fault_around(struct vm_fault *vmf) > /* The page offset of vmf->address within the VMA. */ > pgoff_t vma_off = vmf->pgoff - vmf->vma->vm_pgoff; > pgoff_t from_pte, to_pte; > + vm_fault_t ret; > > /* The PTE offset of the start address, clamped to the VMA. */ > from_pte = max(ALIGN_DOWN(pte_off, nr_pages), > @@ -4476,9 +4477,13 @@ static vm_fault_t do_fault_around(struct vm_fault *vmf) > return VM_FAULT_OOM; > } > > - return vmf->vma->vm_ops->map_pages(vmf, > - vmf->pgoff + from_pte - pte_off, > - vmf->pgoff + to_pte - pte_off); > + rcu_read_lock(); > + ret = vmf->vma->vm_ops->map_pages(vmf, > + vmf->pgoff + from_pte - pte_off, > + vmf->pgoff + to_pte - pte_off); > + rcu_read_unlock(); > + > + return ret; Doesn't this mean that the rcu_read_lock/unlock can be removed from filemap_map_pages()? i.e. all callers are now already under rcu_read_lock(). Maybe WARN_ON_ONCE(!rcu_read_lock_held()) could be put in filemap_map_pages() if you are worried about callers not holding it... Otherwise it looks fine. -Dave. -- Dave Chinner david@fromorbit.com