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 2E5D1C76195 for ; Mon, 27 Mar 2023 17:45:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5DD26900003; Mon, 27 Mar 2023 13:45:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C2B7900004; Mon, 27 Mar 2023 13:45:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 48A6E900003; Mon, 27 Mar 2023 13:45:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 38DC3900002 for ; Mon, 27 Mar 2023 13:45:31 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 102971C619B for ; Mon, 27 Mar 2023 17:45:31 +0000 (UTC) X-FDA: 80615405262.18.12BA2B7 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf03.hostedemail.com (Postfix) with ESMTP id D4DA52000F for ; Mon, 27 Mar 2023 17:45:27 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=CKZEq1db; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679939128; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fIu8B1m7y8UbXtnikmeJqrXTu7pczz9sY+BTw0TDSzU=; b=kI65/MhytCIBNRdJpUPlAf1bO0qlglRfummp3ol91arJKuuRSpmMdfXQw7LycvCZNrH01c Krn+MlEUxeNAVA6dFMxOyn+s+GJSWlpfcf1/+w6tk2sat1AKy7QYnPi79PHOoKQ72Oh4Bs mZTWyKBR820WaAj4cbbi1X1O7A/rfsM= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=CKZEq1db; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679939128; a=rsa-sha256; cv=none; b=4Ovlo48bzi7O1taVFGE8MKmAVFeDFHgYP1AZajlx6w5pR04uFD8AXcnwG7k9uHjW+HqNLe xGb9ZIByf3jvJCOxzWFRqSfGAy/a7RS0MLadP4fcVVjSly85wvTa5FBfYs0vuJ70QalZpL Ca7vQ1Cq0cb0Jo+D925X7X9aig1fb5w= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=fIu8B1m7y8UbXtnikmeJqrXTu7pczz9sY+BTw0TDSzU=; b=CKZEq1dbnw8YiG6UxQX5giGqXs b9qOE9hP4Zc+UTvy3UaWf9zFtTwqx+oPjlM6oYJZ+pjwcvBhQVO9urgYaxU378GSBu8PsOwkXiF2A P4w04/3X/Fk1dY8qO8rC5ABsCZ7tFnh7uVzkv62LsGUGSEU/ICt9/0nUVB4km/SkSgNgS4BL+TAzC I4/GoC4sgAfZcX7tK4aIIKfdPPPTJFpJSW94ooUXmGFjYrE5T3cpYJG7HES7h2QaDy3NFlDwcgp3O TsA8xaG1nVozZmC/WGOlhUKJiumhksvu+7CChPzNidOSqJ41toO1BytsA5c0/aUS1F1bhyv5WDQRu uZdUAbvA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pgquI-007bGU-9o; Mon, 27 Mar 2023 17:45:22 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-xfs@vger.kernel.org, linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 1/3] xfs: Remove xfs_filemap_map_pages() wrapper Date: Mon, 27 Mar 2023 18:45:13 +0100 Message-Id: <20230327174515.1811532-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230327174515.1811532-1-willy@infradead.org> References: <20230327174515.1811532-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 457xd77ghjsd64ca4wpkz89buhgjqan4 X-Rspam-User: X-Rspamd-Queue-Id: D4DA52000F X-Rspamd-Server: rspam06 X-HE-Tag: 1679939127-836864 X-HE-Meta: U2FsdGVkX1+Yi0MqtgbL8cdkF1RLKgTQpJK6N9t+CdRY12HoVMO+p91Cc5Z0r89BNLnBdB6O4dogUPb2eJrVakcrJNhuefliOODbfoYX+QaD5GXV9IThwZiTMMfXEGpmAKrrvc+LB8r3v2Q/Fvj3Da5ALRnE3RWRA9vNNvRPxPw/Giub9MEwrMXypVNCI/VHg7SpsnNzieM86BfUbRB1u5OCUj0BLe6pBuSl07wMyAYznoNHI6fW0Zy5+prUn1CxYw2sXsDzUe35JSv0pBOltG/UHqVnLb0LJeLuWAdrAWt4rD7ttiBRylNEUJPZPsaamqAwN7dYd45xy0MduaboW1cJCEqgZ0iS6NYlQECVzLB1EK7ZFqbt0bcdu4rCSew61Yq9Mu/7GnAh5m39Q/J8VDwx5OaRYyPgvf0EEboA0+WxX5fEdKvMCVgzuOmqx7GNUwKWr28cFeilOZQVcuKsb0/NB1xbJrGqKRaSwyFZ3sjN9sNhZSbhMQZREirZREvQkHtbkbGVbruD+yVrfsGG8KIOBpHtaUlwRimchHCzegR0cO+bAn8+UGAkXS383TCMaxKa8CMp2OR9xagFJgqIL/ghMUATTgzR5x5SXp3szlxk01eKkElgkIagCuehd20ftfs0utyP1YudzUdI0D0LAZ5bR0lLy1SLYldbvq6HaHW3XZmTF/qv50jWHiop+5cS5lMORYTUT3pKrSyfsEAndwWNvNS4EMJI/Gyn+/RwrUX1CkPl41NjBBwXgNCS8mt2HadDVAJs2AuP+lDvMGsjKGtUN9VaxGpsbSAmum45slFpvZDvOzg1OPfppFXThLbpZlV/oucuBjrvHpw1xaZH7OfXz5tCZ1LdCypTFVULVQDd04B0gh3UxYqwxQBBIn683beUy3GHYadJwO4f5V6QK57VrGxgTLdWeI/uPmCkNzY1CQefuPh3nAMJaZfudPEO/eYWLJ/vteyvI/+MBCw KTQ3zxWB pl2da1W+brdeGL/jPmyWwC79ARF7Qg64MvoChPHthVxvJ73Bu+VdfSB+JK2wP1tUmAxuxURJ1U+8lz8nbaHzqycprvBqI38f654iaK4D9or4rZXi4n+AMadPdSvECgjIk+D74D+7GEy9pDpBGPfCsKoV3JA66E7zKTh5+TGJK5JaejmsO5Fi0tKKarp0zqTlFbYDX+2Mu7a0qiu8is18pEWZpxS5VqesVwWNK+P8BnfUKjfkHeoEd09gzwg== 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: 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