From patchwork Wed May 23 14:43:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421647 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 2BB3060327 for ; Wed, 23 May 2018 14:46:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DDFB28733 for ; Wed, 23 May 2018 14:46:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12426288B2; Wed, 23 May 2018 14:46:08 +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=unavailable 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 6955B28733 for ; Wed, 23 May 2018 14:46:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 145C36B0280; Wed, 23 May 2018 10:45:21 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0CFC76B0282; Wed, 23 May 2018 10:45:21 -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 EB38E6B0283; Wed, 23 May 2018 10:45:20 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f69.google.com (mail-pl0-f69.google.com [209.85.160.69]) by kanga.kvack.org (Postfix) with ESMTP id A29256B0280 for ; Wed, 23 May 2018 10:45:20 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id 89-v6so14385949plc.1 for ; Wed, 23 May 2018 07:45:20 -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=9XpA3czMmiBtJpZDdKHeHP4WkMo4hX7IuQzvbyG2+vo=; b=IHHeLmFGZlye0q6sYWqpKijBlh/CuoidEQMK4HjzE38W3JgYP2Rzg6DjEkEc+BJbxs xs6cfnWUQCQytq9QVp0pwewYKHu5yewQRlGLCFKQWodpAHr4R9wrNLBmsrXpQ3ODJxx/ SWSeGUAH3VVOdynRFxbcV3fCy32dIPlDqXvqZCmuk+JbgTvG1NldPK2F3dm8lxFXVfTb eVf9kAQxH5L0+crYOCbK9tf+Gwkak+dmCQZatkhBXWYMuU8bKSIFtVBpqTigeiARqpWN dMCe1rNRcER7i4qTZLcYncgl+o0z6WtGX63obazz9uPDWJAXjoilSiFk9b3lx+Re6moT aMmA== X-Gm-Message-State: ALKqPweFkoZJlofpIzQz/7pe0dq9RwwimWeqSp9+Q1OrDr+BE/wa0RPJ /KfCN/DzXbudN94O1OU0ZmRMmCV05DJbxhRsm5OiBI5n3JLZ3vKFGz1uhMi0+DDgcpT0FRAe6kj HfL3JjsEQ8qckiNAFkzr2lwJYw/sVHdEJK8Nzlul4/VmmkYyE1j+HIAVw15rk/Ts= X-Received: by 2002:a63:9541:: with SMTP id t1-v6mr2525544pgn.77.1527086720349; Wed, 23 May 2018 07:45:20 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpZLsM5t04IXVWcF0AB4XvFuPWLGe1lydhXIbS7+fwBsPBAEffi9MiSN/oL4EofUYXa5vQa X-Received: by 2002:a63:9541:: with SMTP id t1-v6mr2525502pgn.77.1527086719256; Wed, 23 May 2018 07:45:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086719; cv=none; d=google.com; s=arc-20160816; b=E4Kz4K2jOdo+3PtZXLQuDep74UHV4YsYXheuTRyezMJCaYDGInLqt/ZsaC4svadeG+ RYYHZiNrgDVB8G7uFPrpnDFtFfqsZH2CFVqtCvRFobTgl+9vNvD/Yx/m6NRSP+Ybt4mT B0kDENJ1nAInI2s3L0sYNIT1vkEreeHBnjw4VRLNfpzhpfH/jKACbe6BDjzYKym3YeHP BXMqjO/Pi5wSgwzijmBZlesknZs8c/uvRO/AaLmortS/Kh01wB93WhVZm8OtsUgYEVXj Tokcge73hHP48hfFZp0EP8OG/CfGjeoEyOmvAmSQrOWBO3jum2VY8OUtwCSPzKwmQUb3 Sq/A== 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=9XpA3czMmiBtJpZDdKHeHP4WkMo4hX7IuQzvbyG2+vo=; b=GzsInqUP2zBLKqFFJof8wGEz2TcL5ZndPGeilJU30D27LmTsjBtHHfaBWsbYBLVZc4 JTrWoa37XjBhGJX3JEnDg5Ivk+aPDIMlkkS8HxvgB5JC0dVc6qMfPT9ggLZkph14y8dd IKgjEsV2HmBD1dGUGSaKp0Hztt8jNGdhrmusqSV5ivR8SOXdoboduA7lda7J/4Y8JtDQ Gn4vy20grZgFPpwInweJwTraq70e9H1x9cveovrSwmiB6NMDKdTFOfsnD87A3YF2xHqk tCkwiAhARnbul9mFwHxDSqLs6ZWqyZ4gk6Huk2mnJ+EKbsAqViF4qUzG1rGWuZ3wSCAH 7KxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=g6euErHD; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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 r4-v6si11506449pgn.547.2018.05.23.07.45.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:45:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+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=g6euErHD; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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=9XpA3czMmiBtJpZDdKHeHP4WkMo4hX7IuQzvbyG2+vo=; b=g6euErHDhMRM8oQGOfBUgWOOc CK+/4ZIoWhRSYoyDoT93E/+VdCLsCtfywiFzOO9LzuTOIPa3obU7cqdm4Fn2QK9pdt7yZ8kDoUsmJ S6R0oDgCfx99TjdEUTG4tsHb4OHslBh/d80E+HcjEn0zBVApwyZ1JOrLbTa7Uy2isSRBN9ZXKqsSK YSmZFoJx6KEReq2egg4oV/GOxMbjycilpaHjnh7qNo8loZvwVpGXjaQRJjkkJdcmyj+xwmU0pWbmA dKVvEc16KGwLhJguJvf27XtAMAUcpkJVuCzygZOtvIPpjqwpYxC2L+t7vMpqvQRJVjfKeIixUjMO9 bdkyCrzxA==; Received: from 089144199016.atnat0008.highway.a1.net ([89.144.199.16] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLV0v-00018Y-Vc; Wed, 23 May 2018 14:45:18 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 25/34] xfs: remove xfs_reflink_trim_irec_to_next_cow Date: Wed, 23 May 2018 16:43:48 +0200 Message-Id: <20180523144357.18985-26-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523144357.18985-1-hch@lst.de> References: <20180523144357.18985-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 a4b4a7037deb..354d26d66c12 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 8e5eb8e70c89..ff76bc56ff3d 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,