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 0266AC6FD1D for ; Mon, 27 Mar 2023 22:57:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0DF1D900003; Mon, 27 Mar 2023 18:57:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 08FE7900002; Mon, 27 Mar 2023 18:57:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E999C900003; Mon, 27 Mar 2023 18:57:42 -0400 (EDT) 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 D5F6B900002 for ; Mon, 27 Mar 2023 18:57:42 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9927FC02BF for ; Mon, 27 Mar 2023 22:57:42 +0000 (UTC) X-FDA: 80616191964.01.F2D4805 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf24.hostedemail.com (Postfix) with ESMTP id A6B0218000A for ; Mon, 27 Mar 2023 22:57:39 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=fromorbit-com.20210112.gappssmtp.com header.s=20210112 header.b=jpcqIXsN; spf=pass (imf24.hostedemail.com: domain of david@fromorbit.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=david@fromorbit.com; dmarc=pass (policy=quarantine) header.from=fromorbit.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679957859; 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=82lYB0lL4CS5tmQd94rDNpT+aJMD6MYBqshPk8Qqj/0=; b=cmrhgGRwgPvrTsRt42ExVIiJzxaWu+S0R8X9yorjn7+hcKdPiXBYl8YY48aOUWUVCNisLR +OTUTfuof8DrPx50jnqy26ysHcFYEvLoQbnCipG4hx3DeB8CMnu+C6Q/DxBcEIdG6hg0bX RSCPivN18GZPIIr9FEvfP2gEP/c8H/g= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=fromorbit-com.20210112.gappssmtp.com header.s=20210112 header.b=jpcqIXsN; spf=pass (imf24.hostedemail.com: domain of david@fromorbit.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=david@fromorbit.com; dmarc=pass (policy=quarantine) header.from=fromorbit.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679957859; a=rsa-sha256; cv=none; b=sTxag+hsJQHO2Pf2ZqMQZpQ+kdPUAnhhgW6BaT09KHozgKLAzeYqLG9noggnbtzSQYB6ru 1e09Z+3bGdXRG4dJlKspMZipOcLv0HRmkjxjBfcz4yZU1H1e3GcQjOYQtPAWsqqnlJAk5j LwNNj6BEHF61BMxyib3TWbIA0hYQb1g= Received: by mail-pl1-f181.google.com with SMTP id u10so9928969plz.7 for ; Mon, 27 Mar 2023 15:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20210112.gappssmtp.com; s=20210112; t=1679957858; 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=82lYB0lL4CS5tmQd94rDNpT+aJMD6MYBqshPk8Qqj/0=; b=jpcqIXsNMu8I6iiqe8Iz+8wGJU/f0+9F87Jnrmlte5fQ6NhbUbhxPudAr+ZJ/iA/ux 2qtNcVsjHrd2x+re6naJja5LwnoxLL1U0E7Fhmipi7oswBmnUduEC+2cBhCCr+uzw+FV kfSTGXPY1+fcSz9oS7knRfKKN+S0QAxvsRsku8/iy1a9BGaUGrdTQyx0RqTkJYavNa0l HtyTGCDr5tV8W6dPC7rsH9k5VlSKdThV9HLGiGT+oJzztmy8gv0u1XY6wWBMwFoID3Ur po6gwsrvXv5i1I2lbOiN5k+w66FYT9JQeEJMg8QJJ9AYZ4POkAD4m1KiDX8dvgJDKiEd oITA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679957858; 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=82lYB0lL4CS5tmQd94rDNpT+aJMD6MYBqshPk8Qqj/0=; b=1kc7LuWKp2xvJ2k0/Y8f4THH6eZcZYiod/qtBjkeyQVlXV6ujvp5Btob5YaECupmIp X8OgVKCXxSaCYkHHnDnBPVex/KuXJZI/WldhS2QhTzCMFKhL/NVstpaz+oTdlezCLAF9 Lkr8s7u29tilcDKp8JOJW1YL+bkX4L30cvH2meSS3uZJRxmXX/F+A4bmH2K8YsOuoEqt ZaioCWXg563VE6eVqGMHH1jAjsbWl2yW6QlZhKqm4ypVnUHwDdEoqpQOaMScH/i4TCT+ q1CBxebKHpjHta7UZ6Bc/JfefCU8bY9FIQQLbrNF24M1MNh3MhqEqvKBxPJ7fE8wW5fI 9Pdw== X-Gm-Message-State: AAQBX9dkirITpPIf5FqdJxUp/xr93JjPAsoj7XvlfMdxGBqUohcTBmjL zQHhiGQbBa6BEnl7r3FuKFmBaw== X-Google-Smtp-Source: AKy350awFcQ+e4+7yj7VCKplHwm7TW5pVIJRYciytY6OpPH6Dmej17dcFVDXOdqKwWtU+KtE2cU/6A== X-Received: by 2002:a17:902:db0e:b0:1a1:bff4:49e9 with SMTP id m14-20020a170902db0e00b001a1bff449e9mr17033852plx.23.1679957858452; Mon, 27 Mar 2023 15:57:38 -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 b17-20020a631b51000000b004e28be19d1csm18571013pgm.32.2023.03.27.15.57.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 15:57:38 -0700 (PDT) Received: from dave by dread.disaster.area with local (Exim 4.92.3) (envelope-from ) id 1pgvmQ-00DwrY-Vf; Tue, 28 Mar 2023 09:57:34 +1100 Date: Tue, 28 Mar 2023 09:57:34 +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 1/3] xfs: Remove xfs_filemap_map_pages() wrapper Message-ID: <20230327225734.GA3223426@dread.disaster.area> References: <20230327174515.1811532-1-willy@infradead.org> <20230327174515.1811532-2-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230327174515.1811532-2-willy@infradead.org> X-Rspamd-Queue-Id: A6B0218000A X-Stat-Signature: jmo8cboazeo99n6ssabktbznpt5h6iwe X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1679957859-98210 X-HE-Meta: U2FsdGVkX1+XUl/VqvioELNwE+XTxHTqciGxKgGqImumIjn8RXBHeO0p182ZA7/y+oKR6m1FUJQwFlYkO2hIu8uXQeFbDeOoWptpGc3e258DTx0Lj8uk2GpjFH94ZeIyCLKCY8ZeKql66LB6JC7kGjHflrU5e0g5Qx9E88JqD0uglLpa6wQfh+eb8IiHLTRSJuK+IOWJsHheL9qz641oxBPeX5ZiU4tkX8tsIR2rLK8GXBnbrk4ji8tcowYs/9aukryK84GbMsvSvzc12OtfYJ0k0jnwtSnZnUWGjgvIuWn6HzdBM4sf7boODnFYTUWflVINcXO2XMr21ibOohAuspl7HUUyR9W5P3DFB+9Bev5x89DI35wvqmOOqbw5QqLd40sk9akgMX0vguPFABbVAr7zlTSa6pj7ermFbgPj1R823w6C215svkfyrZzgD5DMnNNFcLCCvlAvl2NMHQLMFR5Lr0X1goXHJWjhuLJQL/cAj+ahG9DoyYowSII6GPwrXAQhAToFswlZpq+7HpXsgnb9JcbxZ9nY8rebJ9oXFbjjQhvTnqS+VuwfZCoivF9zuIGYx4EaV1fbOR/xZzKeBIMBGlyAAu/uW2xvmYHYpTRHWHKSeqUd6E9gZ2i1zb7gFepr88g2aZajK4AzJf/gssJeqEyeaTihT/0KvyBwtxvDZM37VYCW3dbjdqR22esP9JoTFKHwt2il4AdYBqpHEfFyy2pQX7KhJ4jnPeBDWoBjo7R7MESqbYTYc6aJjdf0Em17njuN2qeIoH2Agu0z0BXkyWMynEMKGcPd8HzyU0dzKE5rm5w+qfJ5YzjFs1BCzMOsemODDQZQ2wWQq6zgV59ksPz2VX81QSTl169zQ2KJkDGl8PUTP3Cys893B02bmL3LAOZWwTPI/vUyipiVCWpejD6g3YXYHOBvz8zeFVJOp/S2Tjf/X4+figDA3pWZiQNr4TL6kubMwaOoUVb I8pX3Y1t c7nYnbN49x8yexMfj2OcECaqXvGwmV7DAFKOSIB60ZVP1RADGeniKjYZbDgeVJ+w9doa6HN2WHymAo7UWPNUnYstSAtPAnmvTT4i1NosLlP2CwvU6PbOsbz38BNHu0ffqtg0YcG24S0GSnZ42ccKU4FQOopw2SPGdiSuRvOB7Kp5BiOOjxam0b2X6jtOiGGE6XJe0PX8QAFUe2GMp2/s2XgSWxu4Ri9HVDrfZNWsXklRvljYDZ+Mcjmv4dwhX6uqRAzaVSJDCRGd6CNBPynC/j8fO8RPPvyjPdyTs/wdSKFdToSIMn1N8mtt2Lxb+RSjGbttkjL3ZoWLDvAd9WGiFgb8Ew5JLjYyHwMQF0wsV9Q+KVlLladrctLcRrAGnwLdQxCBqdDlKCuYgzQrU+r0hE4/OB2mKUO4ggl8UN9HrVIbhlDNcpPgKEggA6XrpzygM5qg5+S3HrXIx2seGzbZtDD3P6xurh3Gt+cCinIlb0GQ7ydHi24BpujQMtKo0rM3dpzFq1PK7lQ/G3dw5gAzyp04XLBQcdDw/phgA6qQAA2A5aIDilYO/1/QYRwZvGTnJRfIsTqFEIUDClwOiuuokAb9jpw== 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:13PM +0100, Matthew Wilcox (Oracle) wrote: > XFS doesn't actually need to be holding the XFS_MMAPLOCK_SHARED to do > this. filemap_map_pages() cannot bring new folios into the page cache > and the folio lock is taken during filemap_map_pages() which provides > sufficient protection against a truncation or hole punch. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > fs/xfs/xfs_file.c | 17 +---------------- > 1 file changed, 1 insertion(+), 16 deletions(-) > > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index 863289aaa441..aede746541f8 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -1389,25 +1389,10 @@ xfs_filemap_pfn_mkwrite( > return __xfs_filemap_fault(vmf, PE_SIZE_PTE, true); > } > > -static vm_fault_t > -xfs_filemap_map_pages( > - struct vm_fault *vmf, > - pgoff_t start_pgoff, > - pgoff_t end_pgoff) > -{ > - struct inode *inode = file_inode(vmf->vma->vm_file); > - vm_fault_t ret; > - > - xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED); > - ret = filemap_map_pages(vmf, start_pgoff, end_pgoff); > - xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED); > - return ret; > -} > - > static const struct vm_operations_struct xfs_file_vm_ops = { > .fault = xfs_filemap_fault, > .huge_fault = xfs_filemap_huge_fault, > - .map_pages = xfs_filemap_map_pages, > + .map_pages = filemap_map_pages, > .page_mkwrite = xfs_filemap_page_mkwrite, > .pfn_mkwrite = xfs_filemap_pfn_mkwrite, > }; > -- > 2.39.2 Looks fine. Reviewed-by: Dave Chinner -- Dave Chinner david@fromorbit.com