From patchwork Mon Jan 13 13:38:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3475301 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2F23CC02DC for ; Mon, 13 Jan 2014 13:41:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2FBE720122 for ; Mon, 13 Jan 2014 13:41:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89D522011E for ; Mon, 13 Jan 2014 13:41:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751038AbaAMNlS (ORCPT ); Mon, 13 Jan 2014 08:41:18 -0500 Received: from mail-wi0-f169.google.com ([209.85.212.169]:34562 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751612AbaAMNlQ (ORCPT ); Mon, 13 Jan 2014 08:41:16 -0500 Received: by mail-wi0-f169.google.com with SMTP id e4so1141215wiv.4 for ; Mon, 13 Jan 2014 05:41:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cxxwrdl163bzeyhzlEPqa2c7p63S5yh89MNxD9QpmHQ=; b=c4/skNRLh+G/iefqZ+spnMaUURxWio0dIIivUDcGvMC8ef1FmQQvcJ/pPIWJRm/s2M IZlid6g13iwEP1DEL33VTsluCX3nN3O/XUDKcn1If7KEybU7aZQS8E5LivB4B3tXY9lA bjr9yRK1UbI2IrrTxi+mayrIv15Cc9Y9nFRhv1/WEOU+lGkp3iQ0/x01hZq7SmFtLXDI rzinVLRLRdKY2uifgbqxY5C8JsMjya8F246HoJOZMW6azweTX5QWKlGsZV1P7J6PiYI4 9K4CiScoTLCwvugMi9Uavr4gforQWLPSda4rzGvi6vPscLGiAtBfa4ZEsO17I737Ftq3 UunA== X-Received: by 10.180.8.194 with SMTP id t2mr211892wia.41.1389620475131; Mon, 13 Jan 2014 05:41:15 -0800 (PST) Received: from storm-desktop.lan (bl5-79-235.dsl.telepac.pt. [82.154.79.235]) by mx.google.com with ESMTPSA id bj3sm11510007wjb.14.2014.01.13.05.41.14 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Jan 2014 05:41:14 -0800 (PST) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH v2] Btrfs: faster file extent item search in clone ioctl Date: Mon, 13 Jan 2014 13:38:58 +0000 Message-Id: <1389620338-17424-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389475828-19339-1-git-send-email-fdmanana@gmail.com> References: <1389475828-19339-1-git-send-email-fdmanana@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When we are looking for file extent items that intersect the cloning range, for each one that falls completely outside the range, don't release the path and do another full tree search - just move on to the next slot and copy the file extent item into our buffer only if the item intersects the cloning range. Also leave the btree node/leaf locks in spinning mode to not make other tasks sleep since we process each leaf very quickly. Signed-off-by: Filipe David Borba Manana --- V2: Set path->leave_spinning to 1. fs/btrfs/ioctl.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 3970f32..e3b72da 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2893,7 +2893,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode, vfree(buf); return ret; } - + path->leave_spinning = 1; path->reada = 2; /* clone data */ key.objectid = btrfs_ino(src); @@ -2911,6 +2911,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode, goto out; nritems = btrfs_header_nritems(path->nodes[0]); +process_slot: if (path->slots[0] >= nritems) { ret = btrfs_next_leaf(BTRFS_I(src)->root, path); if (ret < 0) @@ -2937,11 +2938,6 @@ static int btrfs_clone(struct inode *src, struct inode *inode, u8 comp; u64 endoff; - size = btrfs_item_size_nr(leaf, slot); - read_extent_buffer(leaf, buf, - btrfs_item_ptr_offset(leaf, slot), - size); - extent = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item); comp = btrfs_file_extent_compression(leaf, extent); @@ -2960,11 +2956,19 @@ static int btrfs_clone(struct inode *src, struct inode *inode, datal = btrfs_file_extent_ram_bytes(leaf, extent); } - btrfs_release_path(path); if (key.offset + datal <= off || - key.offset >= off + len - 1) - goto next; + key.offset >= off + len - 1) { + path->slots[0]++; + goto process_slot; + } + + size = btrfs_item_size_nr(leaf, slot); + read_extent_buffer(leaf, buf, + btrfs_item_ptr_offset(leaf, slot), + size); + + btrfs_release_path(path); memcpy(&new_key, &key, sizeof(new_key)); new_key.objectid = btrfs_ino(inode); @@ -3135,7 +3139,6 @@ static int btrfs_clone(struct inode *src, struct inode *inode, } ret = btrfs_end_transaction(trans, root); } -next: btrfs_release_path(path); key.offset++; }