From patchwork Wed May 9 07:48:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10388433 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7EEA4602C2 for ; Wed, 9 May 2018 07:49:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70E7628E05 for ; Wed, 9 May 2018 07:49:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6503F28E2B; Wed, 9 May 2018 07:49:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97F6728E05 for ; Wed, 9 May 2018 07:49:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 938976B0361; Wed, 9 May 2018 03:49:50 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8C2FA6B0363; Wed, 9 May 2018 03:49:50 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 78B466B0364; Wed, 9 May 2018 03:49:50 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 300126B0361 for ; Wed, 9 May 2018 03:49:50 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id z5so14239717pfz.6 for ; Wed, 09 May 2018 00:49:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=lk/MxONpFPkFap+aCxRIq17o3+o14vP9CmcyArrIKMg=; b=P72ZuB7VVo38az6MfVv78hTCIV9Jaw0GR7l+Y/aPMOIqrboSo8Xw/qvwAr8c/QIqR7 bv0u/aP+dPjPJJVnfa/J9ErAq4z5piZdREhm7NioT3NE4dDjFtNY4iIujE7Dc7Uzulek qpwCD/x3hSBzNCVxrETT25vJWKmYOgj0THkIOLi2sDsdbXFwnl7ghwKHN3VlXd85T3To GLnCkzbpLbT25CDMPD0i0xGWPlQuzt32LFLRVV7mPyQDLD6u2E7qgPkEo26bONQf2YXE wjxYXskwprV5ACmIiUnUsQXPeZF2XlhCh2JJJ7LKr6Zpt57b5L+2bQOlLZtvtqMlPr/d XNtw== X-Gm-Message-State: ALQs6tCrr0jD6FhyUp9KyfYibPWXUACr4fYyvtxmg8vz9Fovkc2qkSZy IF2GWoauVVodytsWkp++M/8pNcLS3YpHxICw382jiX1W3H7fPZh7uK6GxenOKiGf1IevFLqWnVw Epbd3mxkd9p9u6NMewSx1OasY1CzsII3Y+d8P+Qsuta6IG2m4LYpYvePyHb6U5CA= X-Received: by 10.98.61.84 with SMTP id k81mr43090643pfa.193.1525852189876; Wed, 09 May 2018 00:49:49 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqGPZLP3XUFRXdFl79Cw6H++iMKKC1fDZMT//INrGWFDjXtM5WaK2vOHo7/xUCPx5d/JYnw X-Received: by 10.98.61.84 with SMTP id k81mr43090610pfa.193.1525852189145; Wed, 09 May 2018 00:49:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525852189; cv=none; d=google.com; s=arc-20160816; b=GaHp/77fiW7j2CK/oYffbKneJdaI9rwsjhKkQ9SsuEbGocdayijqjOAsbaHYzpm1+u /cz9CjdsN0HPMsTyfgz1+hlWSe2hYwbQmWwx+EIuMQEhW55fbDaDoNOLcXuzu0YyuDKa i82rr4OBoz4P5wullEVbgcTz49WW9uie4rX7bPOiWVCGYVGFiYu3+Kt0NcLImZVaqiJ/ 96iJ3a6TvZIGxCjfd4jZ/fBCbS3iiOFS5qCyQBhMIez5ozD/8x26Ylj02SKLUx6z4VUB OUU3+IBMyrfOobxzMcwvHoFMOxb6+Q7ORiKWjAvWk2WGBXie3xr6Z/G+ZwAWHkApnDJy iWXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=lk/MxONpFPkFap+aCxRIq17o3+o14vP9CmcyArrIKMg=; b=LuSpEPOQAoI0y7EcWUBIR5GcqdlRhM1ayHW7NEYWXR9FtiRhXHZeib7fO+/xFz1s8Q 9f0/CfPJGl1X30W6E9on9daO3AojsnPbhaGXHV7U9YG/fi5WeW53YnHoqfuB+dfC2N/n p5rS/vpiptPDCkv9OADPE5AJcnowr6F3/gE+AdKaOqE5n2LWyYANttzKCRHkNHlob3KV WshRqKXQOERmMlE8aGV++wDZnGfXp70/y6MRJTP0VKXa61sM6pGWQqpgZfLT1BN2hEkq qYLBHKpVE62Gk8V4MTptY1OcJS0ecKV0TMRG6WYuAZMwK4rO9vZSqo3yFCVjrd/PT9cB SE6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=fhF+zN2D; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id f88si26495110pfk.107.2018.05.09.00.49.49 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 May 2018 00:49:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=fhF+zN2D; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=lk/MxONpFPkFap+aCxRIq17o3+o14vP9CmcyArrIKMg=; b=fhF+zN2DCI2vM4PAOiJgPi2cx ut52ax3RTajwthWxoO+PTRIawQ9ck0lueBKTWbaBzkfvb8faIbraLIyigwYLmbWZcJ6uUuOmCyrJU gfPQOqHvpaMWW9+FoHWBJahsWR5jEQs0KYQaDAPevn//EOrKDqienPCfXwF4TwBBKFAJv5tdg1utF QuxyRrnhIxtbN0rnFwZdX4uQTM+GlOeoGzZAgt8Yqrrqerh/nlITJH2SSRdnj8otnLsjL7de88LzI 0gERw5GNM7B93MZLVfqDjOdySWO4VdxFT/Km0bksQFg4PnKaEh6TrMCWqCLH9r7uyNav5fPYnxtGw jNAuUlCCg==; Received: from 213-225-15-246.nat.highway.a1.net ([213.225.15.246] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fGJr7-0001is-SA; Wed, 09 May 2018 07:49:46 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 20/33] xfs: remove xfs_reflink_trim_irec_to_next_cow Date: Wed, 9 May 2018 09:48:17 +0200 Message-Id: <20180509074830.16196-21-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509074830.16196-1-hch@lst.de> References: <20180509074830.16196-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 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: X-Virus-Scanned: ClamAV using ClamSMTP In the only caller we just did a lookup in the COW extent tree for the same offset. Reuse that result and save a lookup, as well as shortening the ilock hold time. Signed-off-by: Christoph Hellwig --- fs/xfs/xfs_aops.c | 25 +++++++++++++++++-------- fs/xfs/xfs_reflink.c | 33 --------------------------------- fs/xfs/xfs_reflink.h | 2 -- 3 files changed, 17 insertions(+), 43 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 41616629dd13..09fb10be1256 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -383,11 +383,12 @@ xfs_map_blocks( struct xfs_inode *ip = XFS_I(inode); struct xfs_mount *mp = ip->i_mount; ssize_t count = i_blocksize(inode); - xfs_fileoff_t offset_fsb, end_fsb; + xfs_fileoff_t offset_fsb, end_fsb, cow_fsb = 0; int whichfork = XFS_DATA_FORK; struct xfs_iext_cursor icur; int error = 0; int nimaps = 1; + bool cow_valid = false; if (XFS_FORCED_SHUTDOWN(mp)) return -EIO; @@ -407,8 +408,11 @@ xfs_map_blocks( * it directly instead of looking up anything in the data fork. */ if (xfs_is_reflink_inode(ip) && - xfs_iext_lookup_extent(ip, ip->i_cowfp, offset_fsb, &icur, imap) && - imap->br_startoff <= offset_fsb) { + xfs_iext_lookup_extent(ip, ip->i_cowfp, offset_fsb, &icur, imap)) { + cow_fsb = imap->br_startoff; + cow_valid = true; + } + if (cow_valid && cow_fsb <= offset_fsb) { xfs_iunlock(ip, XFS_ILOCK_SHARED); /* * Truncate can race with writeback since writeback doesn't @@ -430,6 +434,10 @@ xfs_map_blocks( error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb, imap, &nimaps, XFS_BMAPI_ENTIRE); + xfs_iunlock(ip, XFS_ILOCK_SHARED); + if (error) + return error; + if (!nimaps) { /* * Lookup returns no match? Beyond eof? regardless, @@ -451,16 +459,17 @@ xfs_map_blocks( * is a pending CoW reservation before the end of this extent, * so that we pick up the COW extents in the next iteration. */ - xfs_reflink_trim_irec_to_next_cow(ip, offset_fsb, imap); + if (cow_valid && + cow_fsb < imap->br_startoff + imap->br_blockcount) { + imap->br_blockcount = cow_fsb - imap->br_startoff; + trace_xfs_reflink_trim_irec(ip, imap); + } + if (imap->br_state == XFS_EXT_UNWRITTEN) *type = XFS_IO_UNWRITTEN; else *type = XFS_IO_OVERWRITE; } - xfs_iunlock(ip, XFS_ILOCK_SHARED); - if (error) - return error; - done: switch (*type) { case XFS_IO_HOLE: diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 3776b7bbd8c6..8231109f6256 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -484,39 +484,6 @@ xfs_reflink_allocate_cow( return error; } -/* - * Trim an extent to end at the next CoW reservation past offset_fsb. - */ -void -xfs_reflink_trim_irec_to_next_cow( - struct xfs_inode *ip, - xfs_fileoff_t offset_fsb, - struct xfs_bmbt_irec *imap) -{ - struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK); - struct xfs_bmbt_irec got; - struct xfs_iext_cursor icur; - - if (!xfs_is_reflink_inode(ip)) - return; - - /* Find the extent in the CoW fork. */ - if (!xfs_iext_lookup_extent(ip, ifp, offset_fsb, &icur, &got)) - return; - - /* This is the extent before; try sliding up one. */ - if (got.br_startoff < offset_fsb) { - if (!xfs_iext_next_extent(ifp, &icur, &got)) - return; - } - - if (got.br_startoff >= imap->br_startoff + imap->br_blockcount) - return; - - imap->br_blockcount = got.br_startoff - imap->br_startoff; - trace_xfs_reflink_trim_irec(ip, imap); -} - /* * Cancel CoW reservations for some block range of an inode. * diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h index 15a456492667..e8d4d50c629f 100644 --- a/fs/xfs/xfs_reflink.h +++ b/fs/xfs/xfs_reflink.h @@ -32,8 +32,6 @@ extern int xfs_reflink_allocate_cow(struct xfs_inode *ip, struct xfs_bmbt_irec *imap, bool *shared, uint *lockmode); extern int xfs_reflink_convert_cow(struct xfs_inode *ip, xfs_off_t offset, xfs_off_t count); -extern void xfs_reflink_trim_irec_to_next_cow(struct xfs_inode *ip, - xfs_fileoff_t offset_fsb, struct xfs_bmbt_irec *imap); extern int xfs_reflink_cancel_cow_blocks(struct xfs_inode *ip, struct xfs_trans **tpp, xfs_fileoff_t offset_fsb,