From patchwork Thu Mar 16 01:49:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9626909 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 8A94260522 for ; Thu, 16 Mar 2017 01:50:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CF0F285FC for ; Thu, 16 Mar 2017 01:50:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71E2F28625; Thu, 16 Mar 2017 01:50:28 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6D3628604 for ; Thu, 16 Mar 2017 01:50:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751278AbdCPBuW (ORCPT ); Wed, 15 Mar 2017 21:50:22 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:48171 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751266AbdCPBuS (ORCPT ); Wed, 15 Mar 2017 21:50:18 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="16628559" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 16 Mar 2017 09:50:03 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id CDD8749F9A79 for ; Thu, 16 Mar 2017 09:50:03 +0800 (CST) Received: from localhost.localdomain (10.167.226.34) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 16 Mar 2017 09:50:02 +0800 From: Qu Wenruo To: Subject: [PATCH v10 5/5] btrfs-progs: dedupe: introduce reconfigure subcommand Date: Thu, 16 Mar 2017 09:49:56 +0800 Message-ID: <20170316014956.19916-6-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170316014956.19916-1-quwenruo@cn.fujitsu.com> References: <20170316014956.19916-1-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.34] X-yoursite-MailScanner-ID: CDD8749F9A79.A34A1 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Introduce reconfigure subcommand to co-operate with new kernel ioctl modification. Signed-off-by: Qu Wenruo --- Documentation/btrfs-dedupe-inband.asciidoc | 7 +++ cmds-dedupe-ib.c | 73 +++++++++++++++++++++++------- 2 files changed, 64 insertions(+), 16 deletions(-) diff --git a/Documentation/btrfs-dedupe-inband.asciidoc b/Documentation/btrfs-dedupe-inband.asciidoc index df068c31..5fc4bb0d 100644 --- a/Documentation/btrfs-dedupe-inband.asciidoc +++ b/Documentation/btrfs-dedupe-inband.asciidoc @@ -86,6 +86,13 @@ And compression has higher priority than in-band de-duplication, means if compression and de-duplication is enabled at the same time, only compression will work. +*reconfigure* [options] :: +Re-configure in-band de-duplication parameters of a filesystem. ++ +In-band de-duplication must be enbaled first before re-configuration. ++ +[Options] are the same with 'btrfs dedupe-inband enable'. + *status* :: Show current in-band de-duplication status of a filesystem. diff --git a/cmds-dedupe-ib.c b/cmds-dedupe-ib.c index 5fd26009..397946fa 100644 --- a/cmds-dedupe-ib.c +++ b/cmds-dedupe-ib.c @@ -69,7 +69,6 @@ static const char * const cmd_dedupe_ib_enable_usage[] = { NULL }; - #define report_fatal_parameter(dargs, old, member, type, err_val, fmt) \ if (dargs->member != old->member && dargs->member == (type)(err_val)) { \ error("unsupported dedupe "#member": %"#fmt"", old->member); \ @@ -92,6 +91,10 @@ static void report_parameter_error(struct btrfs_ioctl_dedupe_args *dargs, } report_option_parameter(dargs, old, flags, u8, -1, x); } + if (dargs->status == 0 && old->cmd == BTRFS_DEDUPE_CTL_RECONF) { + error("must enable dedupe before reconfiguration"); + return; + } report_fatal_parameter(dargs, old, cmd, u16, -1, u); report_fatal_parameter(dargs, old, blocksize, u64, -1, llu); report_fatal_parameter(dargs, old, backend, u16, -1, u); @@ -102,14 +105,17 @@ static void report_parameter_error(struct btrfs_ioctl_dedupe_args *dargs, return; } -static int cmd_dedupe_ib_enable(int argc, char **argv) +static int enable_reconfig_dedupe(int argc, char **argv, int reconf) { int ret; int fd = -1; char *path; u64 blocksize = BTRFS_DEDUPE_BLOCKSIZE_DEFAULT; + int blocksize_set = 0; u16 hash_algo = BTRFS_DEDUPE_HASH_SHA256; + int hash_algo_set = 0; u16 backend = BTRFS_DEDUPE_BACKEND_INMEMORY; + int backend_set = 0; u64 limit_nr = 0; u64 limit_mem = 0; u64 sys_mem = 0; @@ -131,20 +137,22 @@ static int cmd_dedupe_ib_enable(int argc, char **argv) { NULL, 0, NULL, 0} }; - c = getopt_long(argc, argv, "s:b:a:l:m:", long_options, NULL); + c = getopt_long(argc, argv, "s:b:a:l:m:f", long_options, NULL); if (c < 0) break; switch (c) { case 's': - if (!strcasecmp("inmemory", optarg)) + if (!strcasecmp("inmemory", optarg)) { backend = BTRFS_DEDUPE_BACKEND_INMEMORY; - else { + backend_set = 1; + } else { error("unsupported dedupe backend: %s", optarg); exit(1); } break; case 'b': blocksize = parse_size(optarg); + blocksize_set = 1; break; case 'a': if (strcmp("sha256", optarg)) { @@ -224,26 +232,40 @@ static int cmd_dedupe_ib_enable(int argc, char **argv) return 1; } memset(&dargs, -1, sizeof(dargs)); - dargs.cmd = BTRFS_DEDUPE_CTL_ENABLE; - dargs.blocksize = blocksize; - dargs.hash_algo = hash_algo; - dargs.limit_nr = limit_nr; - dargs.limit_mem = limit_mem; - dargs.backend = backend; - if (force) - dargs.flags |= BTRFS_DEDUPE_FLAG_FORCE; - else - dargs.flags = 0; + if (reconf) { + dargs.cmd = BTRFS_DEDUPE_CTL_RECONF; + if (blocksize_set) + dargs.blocksize = blocksize; + if (hash_algo_set) + dargs.hash_algo = hash_algo; + if (backend_set) + dargs.backend = backend; + dargs.limit_nr = limit_nr; + dargs.limit_mem = limit_mem; + } else { + dargs.cmd = BTRFS_DEDUPE_CTL_ENABLE; + dargs.blocksize = blocksize; + dargs.hash_algo = hash_algo; + dargs.limit_nr = limit_nr; + dargs.limit_mem = limit_mem; + dargs.backend = backend; + if (force) + dargs.flags |= BTRFS_DEDUPE_FLAG_FORCE; + else + dargs.flags = 0; + } memcpy(&backup, &dargs, sizeof(dargs)); ret = ioctl(fd, BTRFS_IOC_DEDUPE_CTL, &dargs); if (ret < 0) { - error("failed to enable inband deduplication: %s", + error("failed to (%s) inband deduplication: %s", + reconf ? "reconfigure" : "enable", strerror(errno)); report_parameter_error(&dargs, &backup); ret = 1; goto out; } + report_parameter_error(&dargs, &backup); ret = 0; mem_check: if (!force && dargs.limit_mem > sys_mem / 4) { @@ -258,6 +280,10 @@ out: close_file_or_dir(fd, dirstream); return ret; } +static int cmd_dedupe_ib_enable(int argc, char **argv) +{ + return enable_reconfig_dedupe(argc, argv, 0); +} static const char * const cmd_dedupe_ib_disable_usage[] = { "btrfs dedupe disable ", @@ -378,6 +404,19 @@ out: return ret; } +static int cmd_dedupe_ib_reconf(int argc, char **argv) +{ + return enable_reconfig_dedupe(argc, argv, 1); +} + +static const char * const cmd_dedupe_ib_reconf_usage[] = { + "btrfs dedupe-inband reconfigure [options] ", + "Reconfigure in-band(write time) de-duplication of a btrfs.", + "", + "Options are the same as 'btrfs dedupe-inband enable'", + NULL +}; + const struct cmd_group dedupe_ib_cmd_group = { dedupe_ib_cmd_group_usage, dedupe_ib_cmd_group_info, { { "enable", cmd_dedupe_ib_enable, cmd_dedupe_ib_enable_usage, @@ -386,6 +425,8 @@ const struct cmd_group dedupe_ib_cmd_group = { NULL, 0}, { "status", cmd_dedupe_ib_status, cmd_dedupe_ib_status_usage, NULL, 0}, + { "reconfigure", cmd_dedupe_ib_reconf, + cmd_dedupe_ib_reconf_usage, NULL, 0}, NULL_CMD_STRUCT } };