* [PATCH v7 1/8] btrfs-progs: Basic framework for dedupe command group
2016-04-01 6:37 [PATCH v7 0/8] Inband dedupe for btrfs-progs Qu Wenruo
@ 2016-04-01 6:37 ` Qu Wenruo
2016-04-01 6:37 ` [PATCH v7 2/8] btrfs-progs: dedupe: Add enable command " Qu Wenruo
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Qu Wenruo @ 2016-04-01 6:37 UTC (permalink / raw)
To: linux-btrfs
Add basic ioctl header and command group framework for later use.
Alone with basic man page doc.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
Documentation/Makefile.in | 1 +
Documentation/btrfs-dedupe.asciidoc | 39 ++++++++++++++++++++++++++++++
Documentation/btrfs.asciidoc | 4 ++++
Makefile.in | 3 ++-
btrfs.c | 1 +
cmds-dedupe.c | 48 +++++++++++++++++++++++++++++++++++++
commands.h | 2 ++
ctree.h | 39 +++++++++++++++++++++++++++++-
dedupe.h | 42 ++++++++++++++++++++++++++++++++
ioctl.h | 21 ++++++++++++++++
10 files changed, 198 insertions(+), 2 deletions(-)
create mode 100644 Documentation/btrfs-dedupe.asciidoc
create mode 100644 cmds-dedupe.c
create mode 100644 dedupe.h
diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
index aea2cb4..24fd35e 100644
--- a/Documentation/Makefile.in
+++ b/Documentation/Makefile.in
@@ -28,6 +28,7 @@ MAN8_TXT += btrfs-qgroup.asciidoc
MAN8_TXT += btrfs-replace.asciidoc
MAN8_TXT += btrfs-restore.asciidoc
MAN8_TXT += btrfs-property.asciidoc
+MAN8_TXT += btrfs-dedupe.asciidoc
# Category 5 manual page
MAN5_TXT += btrfs-man5.asciidoc
diff --git a/Documentation/btrfs-dedupe.asciidoc b/Documentation/btrfs-dedupe.asciidoc
new file mode 100644
index 0000000..5d63c32
--- /dev/null
+++ b/Documentation/btrfs-dedupe.asciidoc
@@ -0,0 +1,39 @@
+btrfs-dedupe(8)
+==============
+
+NAME
+----
+btrfs-dedupe - manage in-band (write time) de-duplication of a btrfs filesystem
+
+SYNOPSIS
+--------
+*btrfs dedupe* <subcommand> <args>
+
+DESCRIPTION
+-----------
+*btrfs dedupe* is used to enable/disable or show current in-band de-duplication
+status of a btrfs filesystem.
+
+Kernel support for in-band de-duplication starts from 4.6.
+
+WARNING: In-band de-duplication is still an experimental feautre of btrfs,
+use with caution.
+
+SUBCOMMAND
+----------
+Nothing yet
+
+EXIT STATUS
+-----------
+*btrfs dedupe* returns a zero exit status if it succeeds. Non zero is
+returned in case of failure.
+
+AVAILABILITY
+------------
+*btrfs* is part of btrfs-progs.
+Please refer to the btrfs wiki http://btrfs.wiki.kernel.org for
+further details.
+
+SEE ALSO
+--------
+`mkfs.btrfs`(8),
diff --git a/Documentation/btrfs.asciidoc b/Documentation/btrfs.asciidoc
index 6a77a85..8ded842 100644
--- a/Documentation/btrfs.asciidoc
+++ b/Documentation/btrfs.asciidoc
@@ -43,6 +43,10 @@ COMMANDS
Do off-line check on a btrfs filesystem. +
See `btrfs-check`(8) for details.
+*dedupe*::
+ Control btrfs in-band(write time) de-duplication. +
+ See `btrfs-dedupe`(8) for details.
+
*device*::
Manage devices managed by btrfs, including add/delete/scan and so
on. +
diff --git a/Makefile.in b/Makefile.in
index 0a1aece..c3f7072 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,7 +76,8 @@ cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \
cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \
cmds-property.o cmds-fi-usage.o cmds-inspect-dump-tree.o \
- cmds-inspect-dump-super.o cmds-inspect-tree-stats.o cmds-fi-du.o
+ cmds-inspect-dump-super.o cmds-inspect-tree-stats.o cmds-fi-du.o \
+ cmds-dedupe.o
libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \
uuid-tree.o utils-lib.o rbtree-utils.o
libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \
diff --git a/btrfs.c b/btrfs.c
index cc70515..c0c8f27 100644
--- a/btrfs.c
+++ b/btrfs.c
@@ -199,6 +199,7 @@ static const struct cmd_group btrfs_cmd_group = {
{ "receive", cmd_receive, cmd_receive_usage, NULL, 0 },
{ "quota", cmd_quota, NULL, "a_cmd_group, 0 },
{ "qgroup", cmd_qgroup, NULL, &qgroup_cmd_group, 0 },
+ { "dedupe", cmd_dedupe, NULL, &dedupe_cmd_group, 0 },
{ "replace", cmd_replace, NULL, &replace_cmd_group, 0 },
{ "help", cmd_help, cmd_help_usage, NULL, 0 },
{ "version", cmd_version, cmd_version_usage, NULL, 0 },
diff --git a/cmds-dedupe.c b/cmds-dedupe.c
new file mode 100644
index 0000000..b25b8db
--- /dev/null
+++ b/cmds-dedupe.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 Fujitsu. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License v2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ */
+
+#include <getopt.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include "ctree.h"
+#include "ioctl.h"
+
+#include "commands.h"
+#include "utils.h"
+#include "kerncompat.h"
+#include "dedupe.h"
+
+static const char * const dedupe_cmd_group_usage[] = {
+ "btrfs dedupe <command> [options] <path>",
+ NULL
+};
+
+static const char dedupe_cmd_group_info[] =
+"manage inband(write time) de-duplication";
+
+const struct cmd_group dedupe_cmd_group = {
+ dedupe_cmd_group_usage, dedupe_cmd_group_info, {
+ NULL_CMD_STRUCT
+ }
+};
+
+int cmd_dedupe(int argc, char **argv)
+{
+ return handle_command_group(&dedupe_cmd_group, argc, argv);
+}
diff --git a/commands.h b/commands.h
index 2da093b..1ae71a1 100644
--- a/commands.h
+++ b/commands.h
@@ -93,6 +93,7 @@ extern const struct cmd_group inspect_cmd_group;
extern const struct cmd_group property_cmd_group;
extern const struct cmd_group quota_cmd_group;
extern const struct cmd_group qgroup_cmd_group;
+extern const struct cmd_group dedupe_cmd_group;
extern const struct cmd_group replace_cmd_group;
extern const struct cmd_group rescue_cmd_group;
@@ -118,6 +119,7 @@ int cmd_send(int argc, char **argv);
int cmd_receive(int argc, char **argv);
int cmd_quota(int argc, char **argv);
int cmd_qgroup(int argc, char **argv);
+int cmd_dedupe(int argc, char **argv);
int cmd_replace(int argc, char **argv);
int cmd_restore(int argc, char **argv);
int cmd_select_super(int argc, char **argv);
diff --git a/ctree.h b/ctree.h
index 5ab0f4a..87ea684 100644
--- a/ctree.h
+++ b/ctree.h
@@ -457,6 +457,7 @@ struct btrfs_super_block {
* ones specified below then we will fail to mount
*/
#define BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE (1ULL << 0)
+#define BTRFS_FEATURE_COMPAT_RO_DEDUPE (1ULL << 1)
#define BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF (1ULL << 0)
#define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL (1ULL << 1)
@@ -484,7 +485,8 @@ struct btrfs_super_block {
#define BTRFS_FEATURE_COMPAT_SUPP 0ULL
#define BTRFS_FEATURE_COMPAT_RO_SUPP \
- (BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE)
+ (BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE | \
+ BTRFS_FEATURE_COMPAT_RO_DEDUPE)
#define BTRFS_FEATURE_INCOMPAT_SUPP \
(BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF | \
@@ -835,6 +837,25 @@ struct btrfs_csum_item {
u8 csum;
} __attribute__ ((__packed__));
+struct btrfs_dedupe_status_item {
+ __le64 blocksize;
+ __le64 limit_nr;
+ __le16 hash_type;
+ __le16 backend;
+} __attribute__ ((__packed__));
+
+struct btrfs_dedupe_hash_item {
+ /* length of dedupe range on disk */
+ __le32 disk_len;
+
+ u8 compression;
+
+ /*
+ * Hash follows, exclude the last 64 bit
+ * which is alreayd in key.objecitd
+ */
+} __attribute__ ((__packed__));
+
/*
* We don't want to overwrite 1M at the beginning of device, even though
* there is our 1st superblock at 64k. Some possible reasons:
@@ -2074,6 +2095,22 @@ static inline unsigned long btrfs_leaf_data(struct extent_buffer *l)
return offsetof(struct btrfs_leaf, items);
}
+/* btrfs_dedupe_status */
+BTRFS_SETGET_FUNCS(dedupe_status_blocksize, struct btrfs_dedupe_status_item,
+ blocksize, 64);
+BTRFS_SETGET_FUNCS(dedupe_status_limit, struct btrfs_dedupe_status_item,
+ limit_nr, 64);
+BTRFS_SETGET_FUNCS(dedupe_status_hash_type, struct btrfs_dedupe_status_item,
+ hash_type, 16);
+BTRFS_SETGET_FUNCS(dedupe_status_backend, struct btrfs_dedupe_status_item,
+ backend, 16);
+
+/* btrfs_dedupe_hash_item */
+BTRFS_SETGET_FUNCS(dedupe_hash_disk_len, struct btrfs_dedupe_hash_item,
+ disk_len, 32);
+BTRFS_SETGET_FUNCS(dedupe_hash_compression, struct btrfs_dedupe_hash_item,
+ compression, 8);
+
/* struct btrfs_file_extent_item */
BTRFS_SETGET_FUNCS(file_extent_type, struct btrfs_file_extent_item, type, 8);
BTRFS_SETGET_STACK_FUNCS(stack_file_extent_type, struct btrfs_file_extent_item, type, 8);
diff --git a/dedupe.h b/dedupe.h
new file mode 100644
index 0000000..ad3dab0
--- /dev/null
+++ b/dedupe.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2015 Fujitsu. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License v2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ */
+
+#ifndef __BTRFS_DEDUPE__
+#define __BTRFS_DEDUPE__
+
+/*
+ * Dedup storage backend
+ * On disk is persist storage but overhead is large
+ * In memory is fast but will lose all its hash on umount
+ */
+#define BTRFS_DEDUPE_BACKEND_INMEMORY 0
+#define BTRFS_DEDUPE_BACKEND_ONDISK 1
+#define BTRFS_DEDUPE_BACKEND_LAST 2
+
+/* Dedup block size limit and default value */
+#define BTRFS_DEDUPE_BLOCKSIZE_MAX (8 * 1024 * 1024)
+#define BTRFS_DEDUPE_BLOCKSIZE_MIN (16 * 1024)
+#define BTRFS_DEDUPE_BLOCKSIZE_DEFAULT (128 * 1024)
+
+/* Default dedupe limit on number of hash */
+#define BTRFS_DEDUPE_LIMIT_NR_DEFAULT (32 * 1024)
+
+/* Hash algorithm, only support SHA256 yet */
+#define BTRFS_DEDUPE_HASH_SHA256 0
+
+#endif
diff --git a/ioctl.h b/ioctl.h
index 7c80807..b89160f 100644
--- a/ioctl.h
+++ b/ioctl.h
@@ -503,6 +503,27 @@ struct btrfs_ioctl_get_dev_stats {
__u64 unused[128 - 2 - BTRFS_DEV_STAT_VALUES_MAX]; /* pad to 1k */
};
+/*
+ * de-duplication control modes
+ * For re-config, enable will handle it
+ */
+#define BTRFS_DEDUPE_CTL_ENABLE 1
+#define BTRFS_DEDUPE_CTL_DISABLE 2
+#define BTRFS_DEDUPE_CTL_STATUS 3
+#define BTRFS_DEDUPE_CTL_LAST 4
+struct btrfs_ioctl_dedupe_args {
+ __u16 cmd; /* In: command(see above macro) */
+ __u64 blocksize; /* In/Out: For enable/status */
+ __u64 limit_nr; /* In/Out: For enable/status */
+ __u64 limit_mem; /* In/Out: For enable/status */
+ __u64 current_nr; /* Out: For status output */
+ __u16 backend; /* In/Out: For enable/status */
+ __u16 hash_type; /* In/Out: For enable/status */
+ u8 status; /* Out: For status output */
+ /* pad to 512 bytes */
+ u8 __unused[473];
+};
+
/* BTRFS_IOC_SNAP_CREATE is no longer used by the btrfs command */
#define BTRFS_QUOTA_CTL_ENABLE 1
#define BTRFS_QUOTA_CTL_DISABLE 2
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v7 2/8] btrfs-progs: dedupe: Add enable command for dedupe command group
2016-04-01 6:37 [PATCH v7 0/8] Inband dedupe for btrfs-progs Qu Wenruo
2016-04-01 6:37 ` [PATCH v7 1/8] btrfs-progs: Basic framework for dedupe command group Qu Wenruo
@ 2016-04-01 6:37 ` Qu Wenruo
2016-04-01 6:37 ` [PATCH v7 3/8] btrfs-progs: dedupe: Add disable support for inband dedupelication Qu Wenruo
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Qu Wenruo @ 2016-04-01 6:37 UTC (permalink / raw)
To: linux-btrfs
Add enable subcommand for dedupe commmand group.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
Documentation/btrfs-dedupe.asciidoc | 105 +++++++++++++++++++++++-
btrfs-completion | 6 +-
cmds-dedupe.c | 155 ++++++++++++++++++++++++++++++++++++
ioctl.h | 2 +
4 files changed, 266 insertions(+), 2 deletions(-)
diff --git a/Documentation/btrfs-dedupe.asciidoc b/Documentation/btrfs-dedupe.asciidoc
index 5d63c32..8ab40ab 100644
--- a/Documentation/btrfs-dedupe.asciidoc
+++ b/Documentation/btrfs-dedupe.asciidoc
@@ -21,7 +21,110 @@ use with caution.
SUBCOMMAND
----------
-Nothing yet
+*enable* [options] <path>::
+Enable in-band de-duplication for a filesystem.
++
+`Options`
++
+-s|--storage-backend <BACKEND>::::
+Specify de-duplication hash storage backend.
+Supported backends are 'ondisk' and 'inmemory'.
+If not specified, default value is 'inmemory'.
++
+Refer to *BACKENDS* sector for more information.
+
+-b|--blocksize <BLOCKSIZE>::::
+Specify dedupe block size.
+Supported values are power of 2 from '16K' to '8M'.
+Default value is '128K'.
++
+Refer to *BLOCKSIZE* sector for more information.
+
+-a|--hash-algorithm <HASH>::::
+Specify hash algorithm.
+Only 'sha256' is supported yet.
+
+-l|--limit-hash <LIMIT>::::
+Specify maximum number of hashes stored in memory.
+Only works for 'inmemory' backend.
+Conflicts with '-m' option.
++
+Only positive values are valid.
+Default value is '32K'.
+
+-m|--limit-memory <LIMIT>::::
+Specify maximum memory used for hashes.
+Only works for 'inmemory' backend.
+Conflicts with '-l' option.
++
+Only value larger than or equal to '1024' is valid.
+No default value.
++
+NOTE: Memory limit will be rounded down to kernel internal hash size,
+so the memory limit shown in 'btrfs dedupe status' may be different
+from the <LIMIT>.
+
+WARNING: Too large value for '-l' or '-m' will easily trigger OOM.
+Please use with caution according to system memory or use 'ondisk' backend
+if memory usage is critical.
+
+BACKENDS
+--------
+Btrfs in-band de-duplication support two different backends with their own
+features.
+
+In-memory backend::
+This backend provides backward-compatibility, and more fine-tuning options.
+But hash pool is non-persistent and may exhaust kernel memory if not setup
+properly.
++
+This backend can be used on old btrfs(without '-O dedupe' mkfs option).
+When used on old btrfs, this backend needs to be enabled manually after mount.
++
+Designed for fast hash search speed, in-memory backend will keep all dedupe
+hashes in memory. (Although overall performance is still much the same with
+'ondisk' backend)
++
+And only keeps limited number of hash in memory to avoid exhausting memory.
+Hashes over the limit will be dropped following Last-Recent-Use behavior.
+So this backend has a consistent overhead for given limit but can\'t ensure
+any all duplicated blocks will be de-duplicated.
++
+After umount and mount, in-memory backend need to refill its hash pool.
+
+On-disk backend::
+This backend provides persistent hash pool, with more smart memory management
+for hash pool.
+But it\'s not backward-compatible, meaning it must be used with '-O dedupe' mkfs
+option and older kernel can\'t mount it read-write.
++
+Designed for de-duplication rate, hash pool is stored as B+ tree on disk.
+Although this behavior may cause extra disk IO for hash search under extreme
+high memory pressure,
+under most case the overall performance should be on par with 'inmemory'
+backend.
++
+After umount and mount, on-disk backend still has its hash on disk, no need to
+refill its dedupe hash pool.
+
+DEDUPE BLOCK SIZE
+----------------
+In-band de-duplication is done at dedupe block size.
+Any data smaller than dedupe block size won\'t go through in-band
+de-duplication.
+
+And dedupe block size affects dedupe rate and fragmentation heavily.
+
+Smaller block size will cause more fragments, but higher dedupe rate.
+
+Larger block size will cause less fragments, but lower dedupe rate.
+
+In-band de-duplication rate is highly related to the workload pattern.
+So it\'s highly recommended to align dedupe block size to the workload
+block size to make full use of de-duplication.
+
+And dedupe block size larger than 128K will cause compression unavailable, as
+compression only support maximum extent size of 128K.
EXIT STATUS
-----------
diff --git a/btrfs-completion b/btrfs-completion
index 3ede77b..50f7ea2 100644
--- a/btrfs-completion
+++ b/btrfs-completion
@@ -29,7 +29,7 @@ _btrfs()
local cmd=${words[1]}
- commands='subvolume filesystem balance device scrub check rescue restore inspect-internal property send receive quota qgroup replace help version'
+ commands='subvolume filesystem balance device scrub check rescue restore inspect-internal property send receive quota qgroup dedupe replace help version'
commands_subvolume='create delete list snapshot find-new get-default set-default show sync'
commands_filesystem='defragment sync resize show df label usage'
commands_balance='start pause cancel resume status'
@@ -40,6 +40,7 @@ _btrfs()
commands_property='get set list'
commands_quota='enable disable rescan'
commands_qgroup='assign remove create destroy show limit'
+ commands_dedupe='enable'
commands_replace='start status cancel'
if [[ "$cur" == -* && $cword -le 3 && "$cmd" != "help" ]]; then
@@ -94,6 +95,9 @@ _btrfs()
qgroup)
opts="$commands_qgroup"
;;
+ dedupe)
+ opts="$commands_dedupe"
+ ;;
replace)
opts="$commands_replace"
;;
diff --git a/cmds-dedupe.c b/cmds-dedupe.c
index b25b8db..d9dcb10 100644
--- a/cmds-dedupe.c
+++ b/cmds-dedupe.c
@@ -19,6 +19,7 @@
#include <getopt.h>
#include <unistd.h>
#include <sys/ioctl.h>
+#include <sys/ioctl.h>
#include "ctree.h"
#include "ioctl.h"
@@ -36,8 +37,162 @@ static const char * const dedupe_cmd_group_usage[] = {
static const char dedupe_cmd_group_info[] =
"manage inband(write time) de-duplication";
+static const char * const cmd_dedupe_enable_usage[] = {
+ "btrfs dedupe enable [options] <path>",
+ "Enable in-band(write time) de-duplication of a btrfs.",
+ "",
+ "-s|--storage-backend <BACKEND>",
+ " specify dedupe hash storage backend",
+ " supported backend: 'ondisk', 'inmemory'",
+ " inmemory is the default backend",
+ "-b|--blocksize <BLOCKSIZE>",
+ " specify dedupe block size",
+ " default value is 128K",
+ "-a|--hash-algorithm <HASH>",
+ " specify hash algorithm",
+ " only 'sha256' is supported yet",
+ "-l|--limit-hash <LIMIT>",
+ " specify maximum number of hashes stored in memory",
+ " only for 'inmemory' backend",
+ " positive value is valid, default value is 32K",
+ "-m|--limit-mem <LIMIT>",
+ " specify maximum memory used for hashes",
+ " only for 'inmemory' backend",
+ " value larger than or equal to 1024 is valid, no default",
+ " only one of '-m' and '-l' is allowed",
+ NULL
+};
+
+static int cmd_dedupe_enable(int argc, char **argv)
+{
+ int ret;
+ int fd;
+ char *path;
+ u64 blocksize = BTRFS_DEDUPE_BLOCKSIZE_DEFAULT;
+ u16 hash_type = BTRFS_DEDUPE_HASH_SHA256;
+ u16 backend = BTRFS_DEDUPE_BACKEND_INMEMORY;
+ u64 limit_nr = 0;
+ u64 limit_mem = 0;
+ struct btrfs_ioctl_dedupe_args dargs;
+ DIR *dirstream;
+
+ while (1) {
+ int c;
+ static const struct option long_options[] = {
+ { "storage-backend", required_argument, NULL, 's'},
+ { "blocksize", required_argument, NULL, 'b'},
+ { "hash-algorithm", required_argument, NULL, 'a'},
+ { "limit-hash", required_argument, NULL, 'l'},
+ { "limit-memory", required_argument, NULL, 'm'},
+ { NULL, 0, NULL, 0}
+ };
+
+ c = getopt_long(argc, argv, "s:b:a:l:m:", long_options, NULL);
+ if (c < 0)
+ break;
+ switch (c) {
+ case 's':
+ if (!strcmp("ondisk", optarg))
+ backend = BTRFS_DEDUPE_BACKEND_ONDISK;
+ else if (!strcmp("inmemory", optarg))
+ backend = BTRFS_DEDUPE_BACKEND_INMEMORY;
+ else {
+ error("unsupported dedupe backend: %s", optarg);
+ exit(1);
+ }
+ break;
+ case 'b':
+ blocksize = parse_size(optarg);
+ break;
+ case 'a':
+ if (strcmp("sha256", optarg)) {
+ error("unsupported dedupe hash algorithm: %s",
+ optarg);
+ return 1;
+ }
+ break;
+ case 'l':
+ limit_nr = parse_size(optarg);
+ if (limit_nr == 0) {
+ error("limit should be larger than 0");
+ return 1;
+ }
+ break;
+ case 'm':
+ limit_mem = parse_size(optarg);
+ /*
+ * Make sure at least one hash is allocated
+ * 1024 should be good enough though.
+ */
+ if (limit_mem < 1024) {
+ error("memory limit should be larger than or equal to 1024");
+ return 1;
+ }
+ break;
+ }
+ }
+
+ path = argv[optind];
+ if (check_argc_exact(argc - optind, 1))
+ usage(cmd_dedupe_enable_usage);
+
+ /* Validation check */
+ if (!is_power_of_2(blocksize) ||
+ blocksize > BTRFS_DEDUPE_BLOCKSIZE_MAX ||
+ blocksize < BTRFS_DEDUPE_BLOCKSIZE_MIN) {
+ error("invalid dedupe blocksize: %llu, not in range [%u,%u] or power of 2",
+ blocksize, BTRFS_DEDUPE_BLOCKSIZE_MIN,
+ BTRFS_DEDUPE_BLOCKSIZE_MAX);
+ return 1;
+ }
+ if ((limit_nr || limit_mem) && backend == BTRFS_DEDUPE_BACKEND_ONDISK) {
+ error("limit is only valid for 'inmemory' backend");
+ return 1;
+ }
+ if (limit_nr && limit_mem) {
+ error("limit-memory and limit-hash can't be given at the same time");
+ return 1;
+ }
+ /*
+ * TODO: Add check for limit_nr/limit_mem against current system
+ * memory to avoid wrongly set limit.
+ */
+
+ fd = open_file_or_dir(path, &dirstream);
+ if (fd < 0) {
+ error("failed to open file or directory: %s", path);
+ return 1;
+ }
+ memset(&dargs, 0, sizeof(dargs));
+ dargs.cmd = BTRFS_DEDUPE_CTL_ENABLE;
+ dargs.blocksize = blocksize;
+ dargs.hash_type = hash_type;
+ dargs.limit_nr = limit_nr;
+ dargs.limit_mem = limit_mem;
+ dargs.backend = backend;
+
+ ret = ioctl(fd, BTRFS_IOC_DEDUPE_CTL, &dargs);
+ if (ret < 0) {
+ char *error_message = NULL;
+ /* Special case, provide better error message */
+ if (backend == BTRFS_DEDUPE_BACKEND_ONDISK &&
+ errno == -EOPNOTSUPP)
+ error_message = "Need 'dedupe' mkfs feature to enable ondisk backend";
+ error("failed to enable inband deduplication: %s",
+ error_message ? error_message : strerror(errno));
+ ret = 1;
+ goto out;
+ }
+ ret = 0;
+
+out:
+ close_file_or_dir(fd, dirstream);
+ return ret;
+}
+
const struct cmd_group dedupe_cmd_group = {
dedupe_cmd_group_usage, dedupe_cmd_group_info, {
+ { "enable", cmd_dedupe_enable, cmd_dedupe_enable_usage, NULL, 0},
NULL_CMD_STRUCT
}
};
diff --git a/ioctl.h b/ioctl.h
index b89160f..6bfa56c 100644
--- a/ioctl.h
+++ b/ioctl.h
@@ -735,6 +735,8 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code)
struct btrfs_ioctl_dev_replace_args)
#define BTRFS_IOC_FILE_EXTENT_SAME _IOWR(BTRFS_IOCTL_MAGIC, 54, \
struct btrfs_ioctl_same_args)
+#define BTRFS_IOC_DEDUPE_CTL _IOWR(BTRFS_IOCTL_MAGIC, 55, \
+ struct btrfs_ioctl_dedupe_args)
#define BTRFS_IOC_GET_FEATURES _IOR(BTRFS_IOCTL_MAGIC, 57, \
struct btrfs_ioctl_feature_flags)
#define BTRFS_IOC_SET_FEATURES _IOW(BTRFS_IOCTL_MAGIC, 57, \
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v7 3/8] btrfs-progs: dedupe: Add disable support for inband dedupelication
2016-04-01 6:37 [PATCH v7 0/8] Inband dedupe for btrfs-progs Qu Wenruo
2016-04-01 6:37 ` [PATCH v7 1/8] btrfs-progs: Basic framework for dedupe command group Qu Wenruo
2016-04-01 6:37 ` [PATCH v7 2/8] btrfs-progs: dedupe: Add enable command " Qu Wenruo
@ 2016-04-01 6:37 ` Qu Wenruo
2016-04-01 6:37 ` [PATCH v7 4/8] btrfs-progs: dedupe: Add status subcommand Qu Wenruo
` (5 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Qu Wenruo @ 2016-04-01 6:37 UTC (permalink / raw)
To: linux-btrfs
Add disable subcommand for dedupe command group.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
Documentation/btrfs-dedupe.asciidoc | 5 +++++
btrfs-completion | 2 +-
cmds-dedupe.c | 42 +++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/Documentation/btrfs-dedupe.asciidoc b/Documentation/btrfs-dedupe.asciidoc
index 8ab40ab..28fe05f 100644
--- a/Documentation/btrfs-dedupe.asciidoc
+++ b/Documentation/btrfs-dedupe.asciidoc
@@ -21,6 +21,11 @@ use with caution.
SUBCOMMAND
----------
+*disable* <path>::
+Disable in-band de-duplication for a filesystem.
++
+This will trash all stored dedupe hash.
++
*enable* [options] <path>::
Enable in-band de-duplication for a filesystem.
+
diff --git a/btrfs-completion b/btrfs-completion
index 50f7ea2..9a6c73b 100644
--- a/btrfs-completion
+++ b/btrfs-completion
@@ -40,7 +40,7 @@ _btrfs()
commands_property='get set list'
commands_quota='enable disable rescan'
commands_qgroup='assign remove create destroy show limit'
- commands_dedupe='enable'
+ commands_dedupe='enable disable'
commands_replace='start status cancel'
if [[ "$cur" == -* && $cword -le 3 && "$cmd" != "help" ]]; then
diff --git a/cmds-dedupe.c b/cmds-dedupe.c
index d9dcb10..64ac0f2 100644
--- a/cmds-dedupe.c
+++ b/cmds-dedupe.c
@@ -190,9 +190,51 @@ out:
return ret;
}
+static const char * const cmd_dedupe_disable_usage[] = {
+ "btrfs dedupe disable <path>",
+ "Disable in-band(write time) de-duplication of a btrfs.",
+ NULL
+};
+
+static int cmd_dedupe_disable(int argc, char **argv)
+{
+ struct btrfs_ioctl_dedupe_args dargs;
+ DIR *dirstream;
+ char *path;
+ int fd;
+ int ret;
+
+ if (check_argc_exact(argc, 2))
+ usage(cmd_dedupe_disable_usage);
+
+ path = argv[1];
+ fd = open_file_or_dir(path, &dirstream);
+ if (fd < 0) {
+ error("failed to open file or directory: %s", path);
+ return 1;
+ }
+ memset(&dargs, 0, sizeof(dargs));
+ dargs.cmd = BTRFS_DEDUPE_CTL_DISABLE;
+
+ ret = ioctl(fd, BTRFS_IOC_DEDUPE_CTL, &dargs);
+ if (ret < 0) {
+ error("failed to disable inband deduplication: %s",
+ strerror(errno));
+ ret = 1;
+ goto out;
+ }
+ ret = 0;
+
+out:
+ close_file_or_dir(fd, dirstream);
+ return 0;
+}
+
const struct cmd_group dedupe_cmd_group = {
dedupe_cmd_group_usage, dedupe_cmd_group_info, {
{ "enable", cmd_dedupe_enable, cmd_dedupe_enable_usage, NULL, 0},
+ { "disable", cmd_dedupe_disable, cmd_dedupe_disable_usage,
+ NULL, 0},
NULL_CMD_STRUCT
}
};
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v7 4/8] btrfs-progs: dedupe: Add status subcommand
2016-04-01 6:37 [PATCH v7 0/8] Inband dedupe for btrfs-progs Qu Wenruo
` (2 preceding siblings ...)
2016-04-01 6:37 ` [PATCH v7 3/8] btrfs-progs: dedupe: Add disable support for inband dedupelication Qu Wenruo
@ 2016-04-01 6:37 ` Qu Wenruo
2016-04-01 6:37 ` [PATCH v7 5/8] btrfs-progs: Add dedupe feature for mkfs and convert Qu Wenruo
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Qu Wenruo @ 2016-04-01 6:37 UTC (permalink / raw)
To: linux-btrfs
Add status subcommand for dedupe command group.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
Documentation/btrfs-dedupe.asciidoc | 3 ++
btrfs-completion | 2 +-
cmds-dedupe.c | 84 +++++++++++++++++++++++++++++++++++++
3 files changed, 88 insertions(+), 1 deletion(-)
diff --git a/Documentation/btrfs-dedupe.asciidoc b/Documentation/btrfs-dedupe.asciidoc
index 28fe05f..5a5bf52 100644
--- a/Documentation/btrfs-dedupe.asciidoc
+++ b/Documentation/btrfs-dedupe.asciidoc
@@ -73,6 +73,9 @@ WARNING: Too large value for '-l' or '-m' will easily trigger OOM.
Please use with caution according to system memory or use 'ondisk' backend
if memory usage is critical.
+*status* <path>::
+Show current in-band de-duplication status of a filesystem.
+
BACKENDS
--------
Btrfs in-band de-duplication support two different backends with their own
diff --git a/btrfs-completion b/btrfs-completion
index 9a6c73b..fbaae0c 100644
--- a/btrfs-completion
+++ b/btrfs-completion
@@ -40,7 +40,7 @@ _btrfs()
commands_property='get set list'
commands_quota='enable disable rescan'
commands_qgroup='assign remove create destroy show limit'
- commands_dedupe='enable disable'
+ commands_dedupe='enable disable status'
commands_replace='start status cancel'
if [[ "$cur" == -* && $cword -le 3 && "$cmd" != "help" ]]; then
diff --git a/cmds-dedupe.c b/cmds-dedupe.c
index 64ac0f2..8005b6e 100644
--- a/cmds-dedupe.c
+++ b/cmds-dedupe.c
@@ -230,11 +230,95 @@ out:
return 0;
}
+static const char * const cmd_dedupe_status_usage[] = {
+ "btrfs dedupe status <path>",
+ "Show current in-band(write time) de-duplication status of a btrfs.",
+ NULL
+};
+
+static int cmd_dedupe_status(int argc, char **argv)
+{
+ struct btrfs_ioctl_dedupe_args dargs;
+ DIR *dirstream;
+ char *path;
+ int fd;
+ int ret;
+ int print_limit = 1;
+
+ if (check_argc_exact(argc, 2))
+ usage(cmd_dedupe_status_usage);
+
+ path = argv[1];
+ fd = open_file_or_dir(path, &dirstream);
+ if (fd < 0) {
+ error("failed to open file or directory: %s", path);
+ ret = 1;
+ goto out;
+ }
+ memset(&dargs, 0, sizeof(dargs));
+ dargs.cmd = BTRFS_DEDUPE_CTL_STATUS;
+
+ ret = ioctl(fd, BTRFS_IOC_DEDUPE_CTL, &dargs);
+ if (ret < 0) {
+ error("failed to get inband deduplication status: %s",
+ strerror(errno));
+ ret = 1;
+ goto out;
+ }
+ ret = 0;
+ if (dargs.status == 0) {
+ printf("Status: \t\t\tDisabled\n");
+ goto out;
+ }
+ printf("Status:\t\t\tEnabled\n");
+
+ if (dargs.hash_type == BTRFS_DEDUPE_HASH_SHA256)
+ printf("Hash algorithm:\t\tSHA-256\n");
+ else
+ printf("Hash algorithm:\t\tUnrecognized(%x)\n",
+ dargs.hash_type);
+
+ if (dargs.backend == BTRFS_DEDUPE_BACKEND_INMEMORY) {
+ printf("Backend:\t\tIn-memory\n");
+ print_limit = 1;
+ } else if (dargs.backend == BTRFS_DEDUPE_BACKEND_ONDISK) {
+ printf("Backend:\t\tOn-disk\n");
+ print_limit = 0;
+ } else {
+ printf("Backend:\t\tUnrecognized(%x)\n",
+ dargs.backend);
+ }
+
+ printf("Dedup Blocksize:\t%llu\n", dargs.blocksize);
+
+ if (print_limit) {
+ u64 cur_mem;
+
+ /* Limit nr may be 0 */
+ if (dargs.limit_nr)
+ cur_mem = dargs.current_nr * (dargs.limit_mem /
+ dargs.limit_nr);
+ else
+ cur_mem = 0;
+
+ printf("Number of hash: \t[%llu/%llu]\n", dargs.current_nr,
+ dargs.limit_nr);
+ printf("Memory usage: \t\t[%s/%s]\n",
+ pretty_size(cur_mem),
+ pretty_size(dargs.limit_mem));
+ }
+out:
+ close_file_or_dir(fd, dirstream);
+ return ret;
+}
+
const struct cmd_group dedupe_cmd_group = {
dedupe_cmd_group_usage, dedupe_cmd_group_info, {
{ "enable", cmd_dedupe_enable, cmd_dedupe_enable_usage, NULL, 0},
{ "disable", cmd_dedupe_disable, cmd_dedupe_disable_usage,
NULL, 0},
+ { "status", cmd_dedupe_status, cmd_dedupe_status_usage,
+ NULL, 0},
NULL_CMD_STRUCT
}
};
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v7 5/8] btrfs-progs: Add dedupe feature for mkfs and convert
2016-04-01 6:37 [PATCH v7 0/8] Inband dedupe for btrfs-progs Qu Wenruo
` (3 preceding siblings ...)
2016-04-01 6:37 ` [PATCH v7 4/8] btrfs-progs: dedupe: Add status subcommand Qu Wenruo
@ 2016-04-01 6:37 ` Qu Wenruo
2016-04-01 6:37 ` [PATCH v7 6/8] btrfs-progs: Add show-super support for new DEDUPE flag Qu Wenruo
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Qu Wenruo @ 2016-04-01 6:37 UTC (permalink / raw)
To: linux-btrfs
Add new DEDUPE ro compat flag and corresponding mkfs/convert flag
'dedupe'.
Since dedupe tree is completely isolated from fs tree, so even old kernel
could do read mount.
So add it to RO compat flag instead of common incompat flags
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
Documentation/mkfs.btrfs.asciidoc | 9 ++++++++
btrfs-convert.c | 19 +++++++++++-----
mkfs.c | 8 +++++--
utils.c | 47 +++++++++++++++++++++++++++++----------
utils.h | 7 +++---
5 files changed, 67 insertions(+), 23 deletions(-)
diff --git a/Documentation/mkfs.btrfs.asciidoc b/Documentation/mkfs.btrfs.asciidoc
index e4321de..12a41c6 100644
--- a/Documentation/mkfs.btrfs.asciidoc
+++ b/Documentation/mkfs.btrfs.asciidoc
@@ -208,6 +208,15 @@ reduced-size metadata for extent references, saves a few percent of metadata
improved representation of file extents where holes are not explicitly
stored as an extent, saves a few percent of metadata if sparse files are used
+*dedupe*::
+allow btrfs to use new on-disk format designed for in-band(write time)
+de-duplication.
++
+on-disk storage backend and persist de-duplication status needs this feature.
++
+this feature is RO compat feature, means old kernel can still mount it
+read-only.
+
BLOCK GROUPS, CHUNKS, RAID
--------------------------
diff --git a/btrfs-convert.c b/btrfs-convert.c
index 4474489..77e72f6 100644
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -2453,7 +2453,7 @@ static int convert_open_fs(const char *devname,
static int do_convert(const char *devname, int datacsum, int packing, int noxattr,
u32 nodesize, int copylabel, const char *fslabel, int progress,
- u64 features)
+ u64 features, u64 ro_features)
{
int i, ret, blocks_per_node;
int fd = -1;
@@ -2504,8 +2504,9 @@ static int do_convert(const char *devname, int datacsum, int packing, int noxatt
fprintf(stderr, "unable to open %s\n", devname);
goto fail;
}
- btrfs_parse_features_to_string(features_buf, features);
- if (features == BTRFS_MKFS_DEFAULT_FEATURES)
+ btrfs_parse_features_to_string(features_buf, features, ro_features);
+ if (features == BTRFS_MKFS_DEFAULT_FEATURES &&
+ ro_features == 0)
strcat(features_buf, " (default)");
printf("create btrfs filesystem:\n");
@@ -2521,6 +2522,7 @@ static int do_convert(const char *devname, int datacsum, int packing, int noxatt
mkfs_cfg.sectorsize = blocksize;
mkfs_cfg.stripesize = blocksize;
mkfs_cfg.features = features;
+ mkfs_cfg.ro_features = ro_features;
ret = make_btrfs(fd, &mkfs_cfg);
if (ret) {
@@ -3071,6 +3073,7 @@ int main(int argc, char *argv[])
char *file;
char fslabel[BTRFS_LABEL_SIZE];
u64 features = BTRFS_MKFS_DEFAULT_FEATURES;
+ u64 ro_features = 0;
while(1) {
enum { GETOPT_VAL_NO_PROGRESS = 256 };
@@ -3128,7 +3131,8 @@ int main(int argc, char *argv[])
char *orig = strdup(optarg);
char *tmp = orig;
- tmp = btrfs_parse_fs_features(tmp, &features);
+ tmp = btrfs_parse_fs_features(tmp, &features,
+ &ro_features);
if (tmp) {
fprintf(stderr,
"Unrecognized filesystem feature '%s'\n",
@@ -3146,7 +3150,9 @@ int main(int argc, char *argv[])
char buf[64];
btrfs_parse_features_to_string(buf,
- features & ~BTRFS_CONVERT_ALLOWED_FEATURES);
+ features &
+ ~BTRFS_CONVERT_ALLOWED_FEATURES,
+ ro_features);
fprintf(stderr,
"ERROR: features not allowed for convert: %s\n",
buf);
@@ -3196,7 +3202,8 @@ int main(int argc, char *argv[])
ret = do_rollback(file);
} else {
ret = do_convert(file, datacsum, packing, noxattr, nodesize,
- copylabel, fslabel, progress, features);
+ copylabel, fslabel, progress, features,
+ ro_features);
}
if (ret)
return 1;
diff --git a/mkfs.c b/mkfs.c
index 5e79e0b..5071060 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1369,6 +1369,7 @@ int main(int argc, char **argv)
int saved_optind;
char fs_uuid[BTRFS_UUID_UNPARSED_SIZE] = { 0 };
u64 features = BTRFS_MKFS_DEFAULT_FEATURES;
+ u64 ro_features = 0;
struct mkfs_allocation allocation = { 0 };
struct btrfs_mkfs_config mkfs_cfg;
@@ -1431,7 +1432,8 @@ int main(int argc, char **argv)
char *orig = strdup(optarg);
char *tmp = orig;
- tmp = btrfs_parse_fs_features(tmp, &features);
+ tmp = btrfs_parse_fs_features(tmp, &features,
+ &ro_features);
if (tmp) {
fprintf(stderr,
"Unrecognized filesystem feature '%s'\n",
@@ -1674,6 +1676,7 @@ int main(int argc, char **argv)
mkfs_cfg.sectorsize = sectorsize;
mkfs_cfg.stripesize = stripesize;
mkfs_cfg.features = features;
+ mkfs_cfg.ro_features = ro_features;
ret = make_btrfs(fd, &mkfs_cfg);
if (ret) {
@@ -1828,7 +1831,8 @@ raid_groups:
btrfs_group_profile_str(metadata_profile),
pretty_size(allocation.system));
printf("SSD detected: %s\n", ssd ? "yes" : "no");
- btrfs_parse_features_to_string(features_buf, features);
+ btrfs_parse_features_to_string(features_buf, features,
+ ro_features);
printf("Incompat features: %s", features_buf);
printf("\n");
diff --git a/utils.c b/utils.c
index 7e45702..fbedd8d 100644
--- a/utils.c
+++ b/utils.c
@@ -252,6 +252,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_super_chunk_root_generation(&super, 1);
btrfs_set_super_cache_generation(&super, -1);
btrfs_set_super_incompat_flags(&super, cfg->features);
+ btrfs_set_super_compat_ro_flags(&super, cfg->ro_features);
if (cfg->label)
__strncpy_null(super.label, cfg->label, BTRFS_LABEL_SIZE - 1);
@@ -574,23 +575,26 @@ out:
static const struct btrfs_fs_feature {
const char *name;
u64 flag;
+ u64 ro_flag;
const char *desc;
} mkfs_features[] = {
- { "mixed-bg", BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS,
+ { "mixed-bg", BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS, 0,
"mixed data and metadata block groups" },
- { "extref", BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF,
+ { "extref", BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF, 0,
"increased hardlink limit per file to 65536" },
- { "raid56", BTRFS_FEATURE_INCOMPAT_RAID56,
+ { "raid56", BTRFS_FEATURE_INCOMPAT_RAID56, 0,
"raid56 extended format" },
- { "skinny-metadata", BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA,
+ { "skinny-metadata", BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA, 0,
"reduced-size metadata extent refs" },
- { "no-holes", BTRFS_FEATURE_INCOMPAT_NO_HOLES,
+ { "no-holes", BTRFS_FEATURE_INCOMPAT_NO_HOLES, 0,
"no explicit hole extents for files" },
+ { "dedupe", 0, BTRFS_FEATURE_COMPAT_RO_DEDUPE,
+ "support on-disk dedupe backend and persist dedupe status" },
/* Keep this one last */
- { "list-all", BTRFS_FEATURE_LIST_ALL, NULL }
+ { "list-all", BTRFS_FEATURE_LIST_ALL, 0, NULL }
};
-static int parse_one_fs_feature(const char *name, u64 *flags)
+static int parse_one_fs_feature(const char *name, u64 *flags, u64 *ro_flags)
{
int i;
int found = 0;
@@ -599,9 +603,11 @@ static int parse_one_fs_feature(const char *name, u64 *flags)
if (name[0] == '^' &&
!strcmp(mkfs_features[i].name, name + 1)) {
*flags &= ~ mkfs_features[i].flag;
+ *ro_flags &= ~mkfs_features[i].ro_flag;
found = 1;
} else if (!strcmp(mkfs_features[i].name, name)) {
*flags |= mkfs_features[i].flag;
+ *ro_flags |= mkfs_features[i].ro_flag;
found = 1;
}
}
@@ -609,7 +615,7 @@ static int parse_one_fs_feature(const char *name, u64 *flags)
return !found;
}
-void btrfs_parse_features_to_string(char *buf, u64 flags)
+void btrfs_parse_features_to_string(char *buf, u64 flags, u64 ro_flags)
{
int i;
@@ -621,10 +627,15 @@ void btrfs_parse_features_to_string(char *buf, u64 flags)
strcat(buf, ", ");
strcat(buf, mkfs_features[i].name);
}
+ if (ro_flags & mkfs_features[i].ro_flag) {
+ if (*buf)
+ strcat(buf, ", ");
+ strcat(buf, mkfs_features[i].name);
+ }
}
}
-void btrfs_process_fs_features(u64 flags)
+void btrfs_process_fs_features(u64 flags, u64 ro_flags)
{
int i;
@@ -634,6 +645,11 @@ void btrfs_process_fs_features(u64 flags)
mkfs_features[i].name,
mkfs_features[i].desc);
}
+ if (ro_flags & mkfs_features[i].ro_flag) {
+ printf("Turning ON RO compat features '%s': %s\n",
+ mkfs_features[i].name,
+ mkfs_features[i].desc);
+ }
}
}
@@ -649,11 +665,18 @@ void btrfs_list_all_fs_features(u64 mask_disallowed)
continue;
if (mkfs_features[i].flag & BTRFS_MKFS_DEFAULT_FEATURES)
is_default = ", default";
- fprintf(stderr, "%-20s- %s (0x%llx%s)\n",
+ if (mkfs_features[i].flag)
+ printf("%-20s- %s (incompat flag: 0x%llx%s)\n",
mkfs_features[i].name,
mkfs_features[i].desc,
mkfs_features[i].flag,
is_default);
+ else
+ printf("%-20s- %s (ro compat flag: 0x%llx%s)\n",
+ mkfs_features[i].name,
+ mkfs_features[i].desc,
+ mkfs_features[i].ro_flag,
+ is_default);
}
}
@@ -661,7 +684,7 @@ void btrfs_list_all_fs_features(u64 mask_disallowed)
* Return NULL if all features were parsed fine, otherwise return the name of
* the first unparsed.
*/
-char* btrfs_parse_fs_features(char *namelist, u64 *flags)
+char *btrfs_parse_fs_features(char *namelist, u64 *flags, u64 *ro_flags)
{
char *this_char;
char *save_ptr = NULL; /* Satisfy static checkers */
@@ -669,7 +692,7 @@ char* btrfs_parse_fs_features(char *namelist, u64 *flags)
for (this_char = strtok_r(namelist, ",", &save_ptr);
this_char != NULL;
this_char = strtok_r(NULL, ",", &save_ptr)) {
- if (parse_one_fs_feature(this_char, flags))
+ if (parse_one_fs_feature(this_char, flags, ro_flags))
return this_char;
}
diff --git a/utils.h b/utils.h
index 9e890f9..9a64711 100644
--- a/utils.h
+++ b/utils.h
@@ -104,9 +104,9 @@ void units_set_mode(unsigned *units, unsigned mode);
void units_set_base(unsigned *units, unsigned base);
void btrfs_list_all_fs_features(u64 mask_disallowed);
-char* btrfs_parse_fs_features(char *namelist, u64 *flags);
-void btrfs_process_fs_features(u64 flags);
-void btrfs_parse_features_to_string(char *buf, u64 flags);
+char *btrfs_parse_fs_features(char *namelist, u64 *flags, u64 *ro_flags);
+void btrfs_process_fs_features(u64 flags, u64 ro_flags);
+void btrfs_parse_features_to_string(char *buf, u64 flags, u64 ro_flags);
struct btrfs_mkfs_config {
char *label;
@@ -121,6 +121,7 @@ struct btrfs_mkfs_config {
/* Super bytenr after make_btrfs */
u64 super_bytenr;
+ u64 ro_features;
};
int make_btrfs(int fd, struct btrfs_mkfs_config *cfg);
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v7 6/8] btrfs-progs: Add show-super support for new DEDUPE flag
2016-04-01 6:37 [PATCH v7 0/8] Inband dedupe for btrfs-progs Qu Wenruo
` (4 preceding siblings ...)
2016-04-01 6:37 ` [PATCH v7 5/8] btrfs-progs: Add dedupe feature for mkfs and convert Qu Wenruo
@ 2016-04-01 6:37 ` Qu Wenruo
2016-04-01 6:37 ` [PATCH v7 7/8] btrfs-progs: debug-tree: Add dedupe tree support Qu Wenruo
` (2 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Qu Wenruo @ 2016-04-01 6:37 UTC (permalink / raw)
To: linux-btrfs
Now btrfs-show-super can handle DEDUPE ro compat flag.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 3e09ee8..6a939c9 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -198,6 +198,16 @@ struct readable_flag_entry {
char *output;
};
+#define DEF_RO_COMPAT_FLAG_ENTRY(bit_name) \
+ {BTRFS_FEATURE_COMPAT_RO_##bit_name, #bit_name}
+
+struct readable_flag_entry ro_compat_flags_array[] = {
+ DEF_RO_COMPAT_FLAG_ENTRY(DEDUPE)
+};
+
+static const int ro_compat_flags_num = sizeof(ro_compat_flags_array) /
+ sizeof(struct readable_flag_entry);
+
#define DEF_INCOMPAT_FLAG_ENTRY(bit_name) \
{BTRFS_FEATURE_INCOMPAT_##bit_name, #bit_name}
@@ -269,6 +279,13 @@ static void __print_readable_flag(u64 flag, struct readable_flag_entry *array,
printf(")\n");
}
+static void print_readable_ro_compat_flag(u64 ro_flag)
+{
+ return __print_readable_flag(ro_flag, ro_compat_flags_array,
+ ro_compat_flags_num,
+ BTRFS_FEATURE_COMPAT_RO_SUPP);
+}
+
static void print_readable_incompat_flag(u64 flag)
{
return __print_readable_flag(flag, incompat_flags_array,
@@ -360,6 +377,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
(unsigned long long)btrfs_super_compat_flags(sb));
printf("compat_ro_flags\t\t0x%llx\n",
(unsigned long long)btrfs_super_compat_ro_flags(sb));
+ print_readable_ro_compat_flag(btrfs_super_compat_ro_flags(sb));
printf("incompat_flags\t\t0x%llx\n",
(unsigned long long)btrfs_super_incompat_flags(sb));
print_readable_incompat_flag(btrfs_super_incompat_flags(sb));
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v7 7/8] btrfs-progs: debug-tree: Add dedupe tree support
2016-04-01 6:37 [PATCH v7 0/8] Inband dedupe for btrfs-progs Qu Wenruo
` (5 preceding siblings ...)
2016-04-01 6:37 ` [PATCH v7 6/8] btrfs-progs: Add show-super support for new DEDUPE flag Qu Wenruo
@ 2016-04-01 6:37 ` Qu Wenruo
2016-04-01 6:37 ` [PATCH v7 8/8] btrfs-progs: property: add a dedupe property Qu Wenruo
2016-06-01 21:32 ` [PATCH v7 0/8] Inband dedupe for btrfs-progs Mark Fasheh
8 siblings, 0 replies; 13+ messages in thread
From: Qu Wenruo @ 2016-04-01 6:37 UTC (permalink / raw)
To: linux-btrfs
Add dedupe tree support for btrfs-debug-tree.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
cmds-inspect-dump-tree.c | 4 ++
ctree.h | 7 +++
print-tree.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 129 insertions(+)
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 43c8b67..0c75a3c 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -496,6 +496,10 @@ again:
printf("multiple");
}
break;
+ case BTRFS_DEDUPE_TREE_OBJECTID:
+ if (!skip)
+ printf("dedupe");
+ break;
default:
if (!skip) {
printf("file");
diff --git a/ctree.h b/ctree.h
index 87ea684..15504b2 100644
--- a/ctree.h
+++ b/ctree.h
@@ -79,6 +79,9 @@ struct btrfs_free_space_ctl;
/* tracks free space in block groups. */
#define BTRFS_FREE_SPACE_TREE_OBJECTID 10ULL
+/* on-disk dedupe tree (EXPERIMENTAL) */
+#define BTRFS_DEDUPE_TREE_OBJECTID 11ULL
+
/* for storing balance parameters in the root tree */
#define BTRFS_BALANCE_OBJECTID -4ULL
@@ -1219,6 +1222,10 @@ struct btrfs_root {
#define BTRFS_DEV_ITEM_KEY 216
#define BTRFS_CHUNK_ITEM_KEY 228
+#define BTRFS_DEDUPE_STATUS_ITEM_KEY 230
+#define BTRFS_DEDUPE_HASH_ITEM_KEY 231
+#define BTRFS_DEDUPE_BYTENR_ITEM_KEY 232
+
#define BTRFS_BALANCE_ITEM_KEY 248
/*
diff --git a/print-tree.c b/print-tree.c
index d0f37a5..5b8b90c 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -25,6 +25,7 @@
#include "disk-io.h"
#include "print-tree.h"
#include "utils.h"
+#include "dedupe.h"
static void print_dir_item_type(struct extent_buffer *eb,
@@ -687,11 +688,31 @@ static void print_key_type(u64 objectid, u8 type)
case BTRFS_UUID_KEY_RECEIVED_SUBVOL:
printf("UUID_KEY_RECEIVED_SUBVOL");
break;
+ case BTRFS_DEDUPE_STATUS_ITEM_KEY:
+ printf("DEDUPE_STATUS_ITEM");
+ break;
+ case BTRFS_DEDUPE_HASH_ITEM_KEY:
+ printf("DEDUPE_HASH_ITEM");
+ break;
+ case BTRFS_DEDUPE_BYTENR_ITEM_KEY:
+ printf("DEDUPE_BYTENR_ITEM");
+ break;
default:
printf("UNKNOWN.%d", type);
};
}
+static void print_64bit_hash(u64 hash)
+{
+ int i;
+ unsigned char buf[8];
+
+ memcpy(buf, &hash, 8);
+ printf("0x");
+ for (i = 0; i < 8; i++)
+ printf("%02x", buf[i]);
+}
+
static void print_objectid(u64 objectid, u8 type)
{
switch (type) {
@@ -706,6 +727,9 @@ static void print_objectid(u64 objectid, u8 type)
case BTRFS_UUID_KEY_RECEIVED_SUBVOL:
printf("0x%016llx", (unsigned long long)objectid);
return;
+ case BTRFS_DEDUPE_HASH_ITEM_KEY:
+ print_64bit_hash(objectid);
+ return;
}
switch (objectid) {
@@ -772,6 +796,9 @@ static void print_objectid(u64 objectid, u8 type)
case BTRFS_MULTIPLE_OBJECTIDS:
printf("MULTIPLE");
break;
+ case BTRFS_DEDUPE_TREE_OBJECTID:
+ printf("DEDUPE_TREE");
+ break;
case (u64)-1:
printf("-1");
break;
@@ -807,6 +834,9 @@ void btrfs_print_key(struct btrfs_disk_key *disk_key)
case BTRFS_UUID_KEY_RECEIVED_SUBVOL:
printf(" 0x%016llx)", (unsigned long long)offset);
break;
+ case BTRFS_DEDUPE_BYTENR_ITEM_KEY:
+ print_64bit_hash(offset);
+ break;
default:
if (offset == (u64)-1)
printf(" -1)");
@@ -835,6 +865,85 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset,
}
}
+static void print_dedupe_status(struct extent_buffer *node, int slot)
+{
+ struct btrfs_dedupe_status_item *status_item;
+ u64 blocksize;
+ u64 limit;
+ u16 hash_type;
+ u16 backend;
+
+ status_item = btrfs_item_ptr(node, slot,
+ struct btrfs_dedupe_status_item);
+ blocksize = btrfs_dedupe_status_blocksize(node, status_item);
+ limit = btrfs_dedupe_status_limit(node, status_item);
+ hash_type = btrfs_dedupe_status_hash_type(node, status_item);
+ backend = btrfs_dedupe_status_backend(node, status_item);
+
+ printf("\t\tdedupe status item ");
+ if (backend == BTRFS_DEDUPE_BACKEND_INMEMORY)
+ printf("backend: inmemory\n");
+ else if (backend == BTRFS_DEDUPE_BACKEND_ONDISK)
+ printf("backend: ondisk\n");
+ else
+ printf("backend: Unrecognized(%u)\n", backend);
+
+ if (hash_type == BTRFS_DEDUPE_HASH_SHA256)
+ printf("\t\thash algorithm: SHA-256 ");
+ else
+ printf("\t\thash algorithm: Unrecognized(%u) ", hash_type);
+
+ printf("blocksize: %llu limit: %llu\n", blocksize, limit);
+}
+
+static void print_dedupe_hash(struct extent_buffer *eb, int slot,
+ unsigned long offset)
+{
+ struct btrfs_key key;
+ u8 buf[32];
+ int i;
+
+ read_extent_buffer(eb, buf, offset, 32 - 8);
+ btrfs_item_key_to_cpu(eb, &key, slot);
+ WARN_ON(key.type != BTRFS_DEDUPE_HASH_ITEM_KEY);
+ memcpy(buf + 32 - 8, &key.objectid, 8);
+
+ printf("\t\thash: ");
+ for (i = 0; i < 32; i++) {
+ if (i == 16)
+ printf("\n\t\t ");
+ if (i == 8 || i == 24)
+ printf("-");
+ printf("%02x", buf[i]);
+ }
+ printf("\n");
+}
+
+static void print_dedupe_hash_item(struct extent_buffer *eb, int slot)
+{
+ struct btrfs_dedupe_hash_item *hash_item;
+ char compress_str[16];
+
+ /*
+ * Check item size first, it's possible that it contains hash only
+ * structure which is designed for older kernels
+ * (without compression support)
+ */
+ if (btrfs_item_size_nr(eb, slot) == 256 / 8 - 8) {
+ print_dedupe_hash(eb, slot, btrfs_item_ptr_offset(eb, slot));
+ return;
+ }
+ hash_item = btrfs_item_ptr(eb, slot,
+ struct btrfs_dedupe_hash_item);
+ compress_type_to_str(btrfs_dedupe_hash_compression(eb, hash_item),
+ compress_str);
+
+ printf("\t\tdedupe hash item disk_num_bytes: %u\n",
+ btrfs_dedupe_hash_disk_len(eb, hash_item));
+ printf("\t\tdedupe hash compression %s\n", compress_str);
+ print_dedupe_hash(eb, slot, (unsigned long)(hash_item + 1));
+}
+
void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
{
int i;
@@ -856,6 +965,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
struct btrfs_qgroup_info_item *qg_info;
struct btrfs_qgroup_limit_item *qg_limit;
struct btrfs_qgroup_status_item *qg_status;
+
u32 nr = btrfs_header_nritems(l);
u64 objectid;
u32 type;
@@ -1090,6 +1200,14 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
case BTRFS_DEV_STATS_KEY:
printf("\t\tdevice stats\n");
break;
+ case BTRFS_DEDUPE_STATUS_ITEM_KEY:
+ print_dedupe_status(l, i);
+ break;
+ case BTRFS_DEDUPE_HASH_ITEM_KEY:
+ print_dedupe_hash_item(l, i);
+ break;
+ case BTRFS_DEDUPE_BYTENR_ITEM_KEY:
+ break;
};
fflush(stdout);
}
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v7 8/8] btrfs-progs: property: add a dedupe property
2016-04-01 6:37 [PATCH v7 0/8] Inband dedupe for btrfs-progs Qu Wenruo
` (6 preceding siblings ...)
2016-04-01 6:37 ` [PATCH v7 7/8] btrfs-progs: debug-tree: Add dedupe tree support Qu Wenruo
@ 2016-04-01 6:37 ` Qu Wenruo
2016-06-01 21:32 ` [PATCH v7 0/8] Inband dedupe for btrfs-progs Mark Fasheh
8 siblings, 0 replies; 13+ messages in thread
From: Qu Wenruo @ 2016-04-01 6:37 UTC (permalink / raw)
To: linux-btrfs; +Cc: Wang Xiaoguang
From: Wang Xiaoguang <wangxg.fnst@cn.fujitsu.com>
Normally if we enable online dedupe for a fs, it's filesystem wide
de-duplication. With this property, we can explicitly disable data
de-duplication for specified files.
Signed-off-by: Wang Xiaoguang <wangxg.fnst@cn.fujitsu.com>
---
Documentation/btrfs-property.asciidoc | 2 +
props.c | 73 +++++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+)
diff --git a/Documentation/btrfs-property.asciidoc b/Documentation/btrfs-property.asciidoc
index 8b9b7f0..ca90035 100644
--- a/Documentation/btrfs-property.asciidoc
+++ b/Documentation/btrfs-property.asciidoc
@@ -44,6 +44,8 @@ label::::
label of device
compression::::
compression setting for an inode: lzo, zlib, or "" (empty string)
+dedupe::::
+online dedupe setting for an inode: disable or "" (empty string)
*list* [-t <type>] <object>::
Lists available properties with their descriptions for the given object.
diff --git a/props.c b/props.c
index 5b74932..d8f6925 100644
--- a/props.c
+++ b/props.c
@@ -187,6 +187,77 @@ out:
return ret;
}
+static int prop_dedupe(enum prop_object_type type, const char *object,
+ const char *name, const char *value)
+{
+ int ret;
+ ssize_t sret;
+ int fd = -1;
+ DIR *dirstream = NULL;
+ char *buf = NULL;
+ char *xattr_name = NULL;
+ int open_flags = value ? O_RDWR : O_RDONLY;
+
+ fd = open_file_or_dir3(object, &dirstream, open_flags);
+ if (fd == -1) {
+ ret = -errno;
+ fprintf(stderr, "ERROR: open %s failed. %s\n",
+ object, strerror(-ret));
+ goto out;
+ }
+
+ xattr_name = malloc(XATTR_BTRFS_PREFIX_LEN + strlen(name) + 1);
+ if (!xattr_name) {
+ ret = -ENOMEM;
+ goto out;
+ }
+ memcpy(xattr_name, XATTR_BTRFS_PREFIX, XATTR_BTRFS_PREFIX_LEN);
+ memcpy(xattr_name + XATTR_BTRFS_PREFIX_LEN, name, strlen(name));
+ xattr_name[XATTR_BTRFS_PREFIX_LEN + strlen(name)] = '\0';
+
+ if (value)
+ sret = fsetxattr(fd, xattr_name, value, strlen(value), 0);
+ else
+ sret = fgetxattr(fd, xattr_name, NULL, 0);
+ if (sret < 0) {
+ ret = -errno;
+ if (ret != -ENOATTR)
+ fprintf(stderr,
+ "ERROR: failed to %s dedupe for %s. %s\n",
+ value ? "set" : "get", object, strerror(-ret));
+ else
+ ret = 0;
+ goto out;
+ }
+ if (!value) {
+ size_t len = sret;
+
+ buf = malloc(len);
+ if (!buf) {
+ ret = -ENOMEM;
+ goto out;
+ }
+ sret = fgetxattr(fd, xattr_name, buf, len);
+ if (sret < 0) {
+ ret = -errno;
+ fprintf(stderr,
+ "ERROR: failed to get dedupe for %s. %s\n",
+ object, strerror(-ret));
+ goto out;
+ }
+ fprintf(stdout, "dedupe=%.*s\n", (int)len, buf);
+ }
+
+ ret = 0;
+out:
+ free(xattr_name);
+ free(buf);
+ if (fd >= 0)
+ close_file_or_dir(fd, dirstream);
+
+ return ret;
+}
+
const struct prop_handler prop_handlers[] = {
{"ro", "Set/get read-only flag of subvolume.", 0, prop_object_subvol,
prop_read_only},
@@ -194,5 +265,7 @@ const struct prop_handler prop_handlers[] = {
prop_object_dev | prop_object_root, prop_label},
{"compression", "Set/get compression for a file or directory", 0,
prop_object_inode, prop_compression},
+ {"dedupe", "Set/get dedupe for a file or directory", 0,
+ prop_object_inode, prop_dedupe},
{NULL, NULL, 0, 0, NULL}
};
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v7 0/8] Inband dedupe for btrfs-progs
2016-04-01 6:37 [PATCH v7 0/8] Inband dedupe for btrfs-progs Qu Wenruo
` (7 preceding siblings ...)
2016-04-01 6:37 ` [PATCH v7 8/8] btrfs-progs: property: add a dedupe property Qu Wenruo
@ 2016-06-01 21:32 ` Mark Fasheh
2016-06-02 1:07 ` Qu Wenruo
2016-06-02 5:16 ` Roman Mamedov
8 siblings, 2 replies; 13+ messages in thread
From: Mark Fasheh @ 2016-06-01 21:32 UTC (permalink / raw)
To: Qu Wenruo; +Cc: linux-btrfs, David Sterba, chris, Josef Bacik
On Fri, Apr 01, 2016 at 02:37:42PM +0800, Qu Wenruo wrote:
> No much change from previous version.
> 1) Rebased to latest devel branch
>
> 2) Update ctree.h to follow kernel structure change
>
> 3) Update print-tree to follow kernel structure change
>
> Qu Wenruo (7):
> btrfs-progs: Basic framework for dedupe command group
> btrfs-progs: dedupe: Add enable command for dedupe command group
> btrfs-progs: dedupe: Add disable support for inband dedupelication
> btrfs-progs: dedupe: Add status subcommand
> btrfs-progs: Add dedupe feature for mkfs and convert
> btrfs-progs: Add show-super support for new DEDUPE flag
> btrfs-progs: debug-tree: Add dedupe tree support
>
> Wang Xiaoguang (1):
> btrfs-progs: property: add a dedupe property
>
> Documentation/Makefile.in | 1 +
> Documentation/btrfs-dedupe.asciidoc | 150 ++++++++++++++++
> Documentation/btrfs-property.asciidoc | 2 +
> Documentation/btrfs.asciidoc | 4 +
> Documentation/mkfs.btrfs.asciidoc | 9 +
> Makefile.in | 3 +-
> btrfs-completion | 6 +-
> btrfs-convert.c | 19 +-
> btrfs.c | 1 +
> cmds-dedupe.c | 329 ++++++++++++++++++++++++++++++++++
Can we please have seperate and obvious namespaces for in-band dedupe and
out-of-band dedupe commands? I realize that there is no oob-dedupe
funcationality in btrfs-progs today but I would like to avoid confusing
users in the case that this code hits btrfs-progs.
Specifically by this, I mean I'd like to see anything except 'dedupe' as the
btrfs command, so a user who sees 'btrfs dedupe ....' is not confusing the
two forms we have.
I don't personally care what other name is used and of course it could have
'dedupe' in the name just not solely 'dedupe'. As a poor example, we could
call it 'btrfs inband-dedupe ...'.
Thanks,
--Mark
--
Mark Fasheh
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v7 0/8] Inband dedupe for btrfs-progs
2016-06-01 21:32 ` [PATCH v7 0/8] Inband dedupe for btrfs-progs Mark Fasheh
@ 2016-06-02 1:07 ` Qu Wenruo
2016-06-02 5:16 ` Roman Mamedov
1 sibling, 0 replies; 13+ messages in thread
From: Qu Wenruo @ 2016-06-02 1:07 UTC (permalink / raw)
To: Mark Fasheh; +Cc: linux-btrfs, David Sterba, chris, Josef Bacik
At 06/02/2016 05:32 AM, Mark Fasheh wrote:
> On Fri, Apr 01, 2016 at 02:37:42PM +0800, Qu Wenruo wrote:
>> No much change from previous version.
>> 1) Rebased to latest devel branch
>>
>> 2) Update ctree.h to follow kernel structure change
>>
>> 3) Update print-tree to follow kernel structure change
>>
>> Qu Wenruo (7):
>> btrfs-progs: Basic framework for dedupe command group
>> btrfs-progs: dedupe: Add enable command for dedupe command group
>> btrfs-progs: dedupe: Add disable support for inband dedupelication
>> btrfs-progs: dedupe: Add status subcommand
>> btrfs-progs: Add dedupe feature for mkfs and convert
>> btrfs-progs: Add show-super support for new DEDUPE flag
>> btrfs-progs: debug-tree: Add dedupe tree support
>>
>> Wang Xiaoguang (1):
>> btrfs-progs: property: add a dedupe property
>>
>> Documentation/Makefile.in | 1 +
>> Documentation/btrfs-dedupe.asciidoc | 150 ++++++++++++++++
>> Documentation/btrfs-property.asciidoc | 2 +
>> Documentation/btrfs.asciidoc | 4 +
>> Documentation/mkfs.btrfs.asciidoc | 9 +
>> Makefile.in | 3 +-
>> btrfs-completion | 6 +-
>> btrfs-convert.c | 19 +-
>> btrfs.c | 1 +
>> cmds-dedupe.c | 329 ++++++++++++++++++++++++++++++++++
>
> Can we please have seperate and obvious namespaces for in-band dedupe and
> out-of-band dedupe commands? I realize that there is no oob-dedupe
> funcationality in btrfs-progs today but I would like to avoid confusing
> users in the case that this code hits btrfs-progs.
>
> Specifically by this, I mean I'd like to see anything except 'dedupe' as the
> btrfs command, so a user who sees 'btrfs dedupe ....' is not confusing the
> two forms we have.
>
> I don't personally care what other name is used and of course it could have
> 'dedupe' in the name just not solely 'dedupe'. As a poor example, we could
> call it 'btrfs inband-dedupe ...'.
'btrfs inband-dedupe' sounds good to me.
Although I'd like to get more feedback for end users.
Thanks,
Qu
>
> Thanks,
> --Mark
>
> --
> Mark Fasheh
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v7 0/8] Inband dedupe for btrfs-progs
2016-06-01 21:32 ` [PATCH v7 0/8] Inband dedupe for btrfs-progs Mark Fasheh
2016-06-02 1:07 ` Qu Wenruo
@ 2016-06-02 5:16 ` Roman Mamedov
2016-06-15 12:56 ` David Sterba
1 sibling, 1 reply; 13+ messages in thread
From: Roman Mamedov @ 2016-06-02 5:16 UTC (permalink / raw)
To: Mark Fasheh; +Cc: Qu Wenruo, linux-btrfs, David Sterba, chris, Josef Bacik
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
On Wed, 1 Jun 2016 14:32:10 -0700
Mark Fasheh <mfasheh@suse.de> wrote:
> Can we please have seperate and obvious namespaces for in-band dedupe and
> out-of-band dedupe commands? I realize that there is no oob-dedupe
> funcationality in btrfs-progs today but I would like to avoid confusing
> users in the case that this code hits btrfs-progs.
>
> Specifically by this, I mean I'd like to see anything except 'dedupe' as the
> btrfs command, so a user who sees 'btrfs dedupe ....' is not confusing the
> two forms we have.
>
> I don't personally care what other name is used and of course it could have
> 'dedupe' in the name just not solely 'dedupe'. As a poor example, we could
> call it 'btrfs inband-dedupe ...'.
There might be no such code added ever -- but everyone will be stuck with
typing "inband-dedupe" instead of the simple and short "dedupe" forever
because of this "future precaution".
At least make that "dedupe-inband", so that the shorthand form of "dedupe"
also works for now, and only starts throwing a warning if any other subcommand
starting with "dedupe" is added.
--
With respect,
Roman
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v7 0/8] Inband dedupe for btrfs-progs
2016-06-02 5:16 ` Roman Mamedov
@ 2016-06-15 12:56 ` David Sterba
0 siblings, 0 replies; 13+ messages in thread
From: David Sterba @ 2016-06-15 12:56 UTC (permalink / raw)
To: Roman Mamedov; +Cc: Mark Fasheh, Qu Wenruo, linux-btrfs, chris, Josef Bacik
On Thu, Jun 02, 2016 at 10:16:34AM +0500, Roman Mamedov wrote:
> On Wed, 1 Jun 2016 14:32:10 -0700
> Mark Fasheh <mfasheh@suse.de> wrote:
>
> > Can we please have seperate and obvious namespaces for in-band dedupe and
> > out-of-band dedupe commands? I realize that there is no oob-dedupe
> > funcationality in btrfs-progs today but I would like to avoid confusing
> > users in the case that this code hits btrfs-progs.
> >
> > Specifically by this, I mean I'd like to see anything except 'dedupe' as the
> > btrfs command, so a user who sees 'btrfs dedupe ....' is not confusing the
> > two forms we have.
> >
> > I don't personally care what other name is used and of course it could have
> > 'dedupe' in the name just not solely 'dedupe'. As a poor example, we could
> > call it 'btrfs inband-dedupe ...'.
>
> There might be no such code added ever -- but everyone will be stuck with
> typing "inband-dedupe" instead of the simple and short "dedupe" forever
> because of this "future precaution".
>
> At least make that "dedupe-inband", so that the shorthand form of "dedupe"
> also works for now, and only starts throwing a warning if any other subcommand
> starting with "dedupe" is added.
This sounds like a good idea to me. Alternatively it could be 'idedupe'
and if we ever need the out-of-band, we could call it like 'fdedupe'
(file dedupe).
^ permalink raw reply [flat|nested] 13+ messages in thread