From patchwork Tue Aug 23 20:02:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 1089772 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7NK2ks5007043 for ; Tue, 23 Aug 2011 20:03:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756131Ab1HWUDD (ORCPT ); Tue, 23 Aug 2011 16:03:03 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:56659 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756027Ab1HWUDB (ORCPT ); Tue, 23 Aug 2011 16:03:01 -0400 Received: by mail-bw0-f46.google.com with SMTP id 11so372435bke.19 for ; Tue, 23 Aug 2011 13:03:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=WAeOP7rkg9cvGssG+k+q9Kwiaw8tAmSK3C2w5BBXCdw=; b=Iy6pwAVM78gLSyZXBBb1OgGCLojgZcpxL8f5q/jCPrrQA1ir24ncEPr46a6ihrt6E/ NXhYIctM7O3JRNvCTstaawONPCwleKWYixH2PJ7pZCJYuaekzcRKUFAcSg3bnaeiAm1Z kdU6cUYwariVfoLe4WKdUnNyAVahgshKxMuCM= Received: by 10.204.135.131 with SMTP id n3mr1934377bkt.64.1314129780404; Tue, 23 Aug 2011 13:03:00 -0700 (PDT) Received: from localhost ([31.28.235.172]) by mx.google.com with ESMTPS id b17sm79370bkd.65.2011.08.23.13.02.58 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 13:02:59 -0700 (PDT) From: Ilya Dryomov To: linux-btrfs@vger.kernel.org Cc: Chris Mason , Hugo Mills , idryomov@gmail.com Subject: [PATCH 21/21] Btrfs: add restripe progress reporting Date: Tue, 23 Aug 2011 23:02:02 +0300 Message-Id: <1314129722-31601-22-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1314129722-31601-1-git-send-email-idryomov@gmail.com> References: <1314129722-31601-1-git-send-email-idryomov@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 23 Aug 2011 20:03:07 +0000 (UTC) Signed-off-by: Ilya Dryomov --- fs/btrfs/ioctl.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/ioctl.h | 2 ++ fs/btrfs/volumes.c | 40 ++++++++++++++++++++++++++++++++++------ fs/btrfs/volumes.h | 3 +++ 4 files changed, 84 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 4f29149..a342544 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2966,6 +2966,49 @@ static long btrfs_ioctl_restripe_ctl(struct btrfs_root *root, return -EINVAL; } +static long btrfs_ioctl_restripe_progress(struct btrfs_root *root, + void __user *arg) +{ + struct btrfs_fs_info *fs_info = root->fs_info; + struct btrfs_ioctl_restripe_args *rargs; + struct restripe_control *rctl; + int ret = 0; + + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + + mutex_lock(&fs_info->restripe_mutex); + if (!(rctl = fs_info->restripe_ctl)) { + ret = -ENOTCONN; + goto out; + } + + rargs = kzalloc(sizeof(*rargs), GFP_NOFS); + if (!rargs) { + ret = -ENOMEM; + goto out; + } + + rargs->flags = rctl->flags; + rargs->state = fs_info->restripe_state; + + memcpy(&rargs->data, &rctl->data, sizeof(rargs->data)); + memcpy(&rargs->sys, &rctl->sys, sizeof(rargs->sys)); + memcpy(&rargs->meta, &rctl->meta, sizeof(rargs->meta)); + + spin_lock(&fs_info->restripe_lock); + memcpy(&rargs->stat, &rctl->stat, sizeof(rargs->stat)); + spin_unlock(&fs_info->restripe_lock); + + if (copy_to_user(arg, rargs, sizeof(*rargs))) + ret = -EFAULT; + + kfree(rargs); +out: + mutex_unlock(&fs_info->restripe_mutex); + return ret; +} + long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -3042,6 +3085,8 @@ long btrfs_ioctl(struct file *file, unsigned int return btrfs_ioctl_restripe(root, argp); case BTRFS_IOC_RESTRIPE_CTL: return btrfs_ioctl_restripe_ctl(root, arg); + case BTRFS_IOC_RESTRIPE_PROGRESS: + return btrfs_ioctl_restripe_progress(root, argp); } return -ENOTTY; diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h index 365d06c..2154816 100644 --- a/fs/btrfs/ioctl.h +++ b/fs/btrfs/ioctl.h @@ -290,4 +290,6 @@ struct btrfs_ioctl_space_args { #define BTRFS_IOC_RESTRIPE _IOW(BTRFS_IOCTL_MAGIC, 32, \ struct btrfs_ioctl_restripe_args) #define BTRFS_IOC_RESTRIPE_CTL _IOW(BTRFS_IOCTL_MAGIC, 33, int) +#define BTRFS_IOC_RESTRIPE_PROGRESS _IOR(BTRFS_IOCTL_MAGIC, 34, \ + struct btrfs_ioctl_restripe_args) #endif diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index ead4996..9a248b9 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2187,8 +2187,10 @@ static void set_restripe_control(struct restripe_control *rctl, int update) spin_lock(&fs_info->restripe_lock); fs_info->restripe_ctl = rctl; - if (update) + if (update) { update_restripe_args(rctl); + memset(&rctl->stat, 0, sizeof(rctl->stat)); + } spin_unlock(&fs_info->restripe_lock); } @@ -2419,6 +2421,7 @@ static int __btrfs_restripe(struct btrfs_root *dev_root) int slot; int ret; int enospc_errors = 0; + bool counting_only = true; /* step one make some room on all the devices */ devices = &dev_root->fs_info->fs_devices->devices; @@ -2451,12 +2454,14 @@ static int __btrfs_restripe(struct btrfs_root *dev_root) goto error; } +again: key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID; key.offset = (u64)-1; key.type = BTRFS_CHUNK_ITEM_KEY; while (1) { struct btrfs_fs_info *fs_info = dev_root->fs_info; + struct restripe_control *rctl = fs_info->restripe_ctl; if (test_bit(RESTRIPE_CANCEL_REQ, &fs_info->restripe_state) || test_bit(RESTRIPE_PAUSE_REQ, &fs_info->restripe_state)) { @@ -2493,25 +2498,48 @@ static int __btrfs_restripe(struct btrfs_root *dev_root) chunk = btrfs_item_ptr(leaf, slot, struct btrfs_chunk); - if (!should_restripe_chunk(chunk_root, leaf, chunk, - found_key.offset)) { - btrfs_release_path(path); - goto loop; + if (!counting_only) { + spin_lock(&fs_info->restripe_lock); + rctl->stat.considered++; + spin_unlock(&fs_info->restripe_lock); } + ret = should_restripe_chunk(chunk_root, leaf, chunk, + found_key.offset); btrfs_release_path(path); + if (!ret) + goto loop; + + if (counting_only) { + spin_lock(&fs_info->restripe_lock); + rctl->stat.expected++; + spin_unlock(&fs_info->restripe_lock); + goto loop; + } + ret = btrfs_relocate_chunk(chunk_root, chunk_root->root_key.objectid, found_key.objectid, found_key.offset); if (ret && ret != -ENOSPC) goto error; - if (ret == -ENOSPC) + if (ret == -ENOSPC) { enospc_errors++; + } else { + spin_lock(&fs_info->restripe_lock); + rctl->stat.completed++; + spin_unlock(&fs_info->restripe_lock); + } loop: key.offset = found_key.offset - 1; } + if (counting_only) { + btrfs_release_path(path); + counting_only = false; + goto again; + } + error: btrfs_free_path(path); if (enospc_errors) { diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 20da71f..5ca3b3b 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -207,6 +207,7 @@ struct map_lookup { #define RESTRIPE_PAUSE_REQ 2 struct btrfs_restripe_args; +struct btrfs_restripe_progress; struct restripe_control { struct btrfs_fs_info *fs_info; u64 flags; @@ -214,6 +215,8 @@ struct restripe_control { struct btrfs_restripe_args data; struct btrfs_restripe_args sys; struct btrfs_restripe_args meta; + + struct btrfs_restripe_progress stat; }; int btrfs_account_dev_extents_size(struct btrfs_device *device, u64 start,