June 2018 - lvm2-commits - Fedora mailing-lists

master - dmsetup: fix error propagation in _display_info_cols()
by Bryn Reeves 28 Jun '18

28 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=29b9ccd261be025aaf75e… Commit: 29b9ccd261be025aaf75e58e5d2547e818ef22c3 Parent: f96fd9961d1a80999a38b45c1d173e3df1de83e5 Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Thu Jun 28 14:25:30 2018 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Thu Jun 28 14:25:30 2018 +0100 dmsetup: fix error propagation in _display_info_cols() Commit 3f35146 added a check on the value returned by the _display_info_cols() function: 1024 if (!_switches[COLS_ARG]) 1025 _display_info_long(dmt, &info); 1026 else 1027 r = _display_info_cols(dmt, &info); 1028 1029 return r; This exposes a bug in the dmstats code in _display_info_cols: the fact that a device has no regions is explicitly not an error (and is documented as such in the code), but since the return code is not changed before leaving the function it is now treated as an error leading to: # dmstats list Command failed. When no regions exist. Set the return code to the correct value before returning. --- libdm/dm-tools/dmsetup.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libdm/dm-tools/dmsetup.c b/libdm/dm-tools/dmsetup.c index 44386a6..fb1a574 100644 --- a/libdm/dm-tools/dmsetup.c +++ b/libdm/dm-tools/dmsetup.c @@ -943,8 +943,10 @@ static int _display_info_cols(struct dm_task *dmt, struct dm_info *info) goto_out; /* No regions to report is not an error */ - if (!dm_stats_get_nr_regions(obj.stats)) + if (!dm_stats_get_nr_regions(obj.stats)) { + r = 1; goto out; + } } /* group report with no groups? */

1 0

master - dmsetup: fix error propagation in _display_info_cols()
by Bryn Reeves 28 Jun '18

28 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=29b9ccd261be025aaf75e… Commit: 29b9ccd261be025aaf75e58e5d2547e818ef22c3 Parent: f96fd9961d1a80999a38b45c1d173e3df1de83e5 Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Thu Jun 28 14:25:30 2018 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Thu Jun 28 14:25:30 2018 +0100 dmsetup: fix error propagation in _display_info_cols() Commit 3f35146 added a check on the value returned by the _display_info_cols() function: 1024 if (!_switches[COLS_ARG]) 1025 _display_info_long(dmt, &info); 1026 else 1027 r = _display_info_cols(dmt, &info); 1028 1029 return r; This exposes a bug in the dmstats code in _display_info_cols: the fact that a device has no regions is explicitly not an error (and is documented as such in the code), but since the return code is not changed before leaving the function it is now treated as an error leading to: # dmstats list Command failed. When no regions exist. Set the return code to the correct value before returning. --- libdm/dm-tools/dmsetup.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libdm/dm-tools/dmsetup.c b/libdm/dm-tools/dmsetup.c index 44386a6..fb1a574 100644 --- a/libdm/dm-tools/dmsetup.c +++ b/libdm/dm-tools/dmsetup.c @@ -943,8 +943,10 @@ static int _display_info_cols(struct dm_task *dmt, struct dm_info *info) goto_out; /* No regions to report is not an error */ - if (!dm_stats_get_nr_regions(obj.stats)) + if (!dm_stats_get_nr_regions(obj.stats)) { + r = 1; goto out; + } } /* group report with no groups? */

1 0

master - Revert "man: fix lvreduce example"
by David Teigland 27 Jun '18

27 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f96fd9961d1a80999a38b… Commit: f96fd9961d1a80999a38b45c1d173e3df1de83e5 Parent: 163a30d7844e07a678c5eea8f38b5f5b2ea58d24 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 27 09:19:01 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 27 09:20:21 2018 -0500 Revert "man: fix lvreduce example" -l -3 is correct, meaning reduce by 3. This reverts commit d5bcc56eefde8349ffee93d0411c6f9fd71ceb84. --- man/lvreduce.8_end | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/man/lvreduce.8_end b/man/lvreduce.8_end index a9cb035..53f1ac7 100644 --- a/man/lvreduce.8_end +++ b/man/lvreduce.8_end @@ -2,4 +2,4 @@ Reduce the size of an LV by 3 logical extents: .br -.B lvreduce -l 3 vg00/lvol1 +.B lvreduce -l -3 vg00/lvol1

1 0

master - man: fix lvreduce example
by David Teigland 27 Jun '18

27 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=163a30d7844e07a678c5e… Commit: 163a30d7844e07a678c5eea8f38b5f5b2ea58d24 Parent: a14f21bf1ddbb93b13a917cad8720fed6c94d6de Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 27 08:58:22 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 27 08:59:41 2018 -0500 man: fix lvreduce example --- man/lvreduce.8_end | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/man/lvreduce.8_end b/man/lvreduce.8_end index 53f1ac7..a9cb035 100644 --- a/man/lvreduce.8_end +++ b/man/lvreduce.8_end @@ -2,4 +2,4 @@ Reduce the size of an LV by 3 logical extents: .br -.B lvreduce -l -3 vg00/lvol1 +.B lvreduce -l 3 vg00/lvol1

1 0

master - bcache: Fix null pointer dereferencing
by Marian Csontos 26 Jun '18

26 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a14f21bf1ddbb93b13a91… Commit: a14f21bf1ddbb93b13a917cad8720fed6c94d6de Parent: 4194fc9bbdc9107120ba09c22e56612d854fdd41 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Tue Jun 26 17:04:18 2018 +0200 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Jun 26 17:04:18 2018 +0200 bcache: Fix null pointer dereferencing --- lib/device/bcache.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/device/bcache.c b/lib/device/bcache.c index f315b2a..8d55c36 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -528,11 +528,13 @@ static bool _init_free_list(struct bcache *cache, unsigned count, unsigned pgsiz if (!data) return false; - cache->raw_data = data; cache->raw_blocks = malloc(count * sizeof(*cache->raw_blocks)); + if (!cache->raw_blocks) { + free(data); + return false; + } - if (!cache->raw_blocks) - free(cache->raw_data); + cache->raw_data = data; for (i = 0; i < count; i++) { struct block *b = cache->raw_blocks + i;

1 0

master - device_mapper: add new _dm_task_create_device_status
by Zdenek Kabelac 25 Jun '18

25 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4194fc9bbdc9107120ba0… Commit: 4194fc9bbdc9107120ba09c22e56612d854fdd41 Parent: 739a213d2ee01cc95861c342fde73e87088de6bb Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Jun 23 23:02:24 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 25 15:07:55 2018 +0200 device_mapper: add new _dm_task_create_device_status Introduce new function _dm_task_create_device_status for grabbing status of device for better code sharing. --- device_mapper/libdm-deptree.c | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/device_mapper/libdm-deptree.c b/device_mapper/libdm-deptree.c index 5327b2e..bb552b6 100644 --- a/device_mapper/libdm-deptree.c +++ b/device_mapper/libdm-deptree.c @@ -1382,20 +1382,14 @@ out: return r; } -static int _thin_pool_get_status(struct dm_tree_node *dnode, - struct dm_status_thin_pool *s) +static struct dm_task *_dm_task_create_device_status(uint32_t major, uint32_t minor) { struct dm_task *dmt; - int r = 0; - uint64_t start, length; - char *type = NULL; - char *params = NULL; if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) - return_0; + return_NULL; - if (!dm_task_set_major(dmt, dnode->info.major) || - !dm_task_set_minor(dmt, dnode->info.minor)) { + if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) { log_error("Failed to set major minor."); goto out; } @@ -1406,6 +1400,26 @@ static int _thin_pool_get_status(struct dm_tree_node *dnode, if (!dm_task_run(dmt)) goto_out; + return dmt; +out: + dm_task_destroy(dmt); + + return NULL; +} + +static int _thin_pool_get_status(struct dm_tree_node *dnode, + struct dm_status_thin_pool *s) +{ + struct dm_task *dmt; + int r = 0; + uint64_t start, length; + char *type = NULL; + char *params = NULL; + + if (!(dmt = _dm_task_create_device_status(dnode->info.major, + dnode->info.minor))) + return_0; + dm_get_next_target(dmt, NULL, &start, &length, &type, &params); if (!type || (strcmp(type, "thin-pool") != 0)) {

1 0

master - device_mapper: split code for sending message
by Zdenek Kabelac 25 Jun '18

25 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=739a213d2ee01cc95861c… Commit: 739a213d2ee01cc95861c342fde73e87088de6bb Parent: a1c81c009a59c2476ffca8a8cf2cd06f0674e46d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Jun 23 21:00:40 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 25 15:07:55 2018 +0200 device_mapper: split code for sending message Move message sending from _thin_pool_node_message to new _node_message for possible better code sharing. --- device_mapper/libdm-deptree.c | 63 ++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 26 deletions(-) diff --git a/device_mapper/libdm-deptree.c b/device_mapper/libdm-deptree.c index 4875858..5327b2e 100644 --- a/device_mapper/libdm-deptree.c +++ b/device_mapper/libdm-deptree.c @@ -1428,9 +1428,42 @@ out: return r; } -static int _thin_pool_node_message(struct dm_tree_node *dnode, struct thin_message *tm) +static int _node_message(uint32_t major, uint32_t minor, + int expected_errno, const char *message) { struct dm_task *dmt; + int r; + + if (!(dmt = dm_task_create(DM_DEVICE_TARGET_MSG))) + return_0; + + if (!dm_task_set_major(dmt, major) || + !dm_task_set_minor(dmt, minor)) { + log_error("Failed to set message major minor."); + goto out; + } + + if (!dm_task_set_message(dmt, message)) + goto_out; + + /* Internal functionality of dm_task */ + dmt->expected_errno = expected_errno; + + if (!dm_task_run(dmt)) { + log_error("Failed to process message \"%s\".", message); + goto out; + } + + r = 1; +out: + dm_task_destroy(dmt); + + return r; +} + + +static int _thin_pool_node_message(struct dm_tree_node *dnode, struct thin_message *tm) +{ struct dm_thin_message *m = &tm->message; char buf[64]; int r; @@ -1470,33 +1503,11 @@ static int _thin_pool_node_message(struct dm_tree_node *dnode, struct thin_messa return 0; } - r = 0; - - if (!(dmt = dm_task_create(DM_DEVICE_TARGET_MSG))) + if (!_node_message(dnode->info.major, dnode->info.minor, + tm->expected_errno, buf)) return_0; - if (!dm_task_set_major(dmt, dnode->info.major) || - !dm_task_set_minor(dmt, dnode->info.minor)) { - log_error("Failed to set message major minor."); - goto out; - } - - if (!dm_task_set_message(dmt, buf)) - goto_out; - - /* Internal functionality of dm_task */ - dmt->expected_errno = tm->expected_errno; - - if (!dm_task_run(dmt)) { - log_error("Failed to process thin pool message \"%s\".", buf); - goto out; - } - - r = 1; -out: - dm_task_destroy(dmt); - - return r; + return 1; } static struct load_segment *_get_last_load_segment(struct dm_tree_node *node)

1 0

master - device_mapper: split _node_send_message
by Zdenek Kabelac 25 Jun '18

25 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a1c81c009a59c2476ffca… Commit: a1c81c009a59c2476ffca8a8cf2cd06f0674e46d Parent: 19b92ae3f3185919a0a1cef849a9a003101d4429 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Jun 23 20:50:36 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 25 15:07:55 2018 +0200 device_mapper: split _node_send_message For better code reuse split _node_send_messages into commont messaging part and separate _thin_pool_node_send_messages. Patch makes it possible to better reuse common code for messaging other targets. --- device_mapper/libdm-deptree.c | 56 ++++++++++++++++++++++++----------------- 1 files changed, 33 insertions(+), 23 deletions(-) diff --git a/device_mapper/libdm-deptree.c b/device_mapper/libdm-deptree.c index d177374..4875858 100644 --- a/device_mapper/libdm-deptree.c +++ b/device_mapper/libdm-deptree.c @@ -1510,34 +1510,14 @@ static struct load_segment *_get_last_load_segment(struct dm_tree_node *node) } /* For preload pass only validate pool's transaction_id */ -static int _node_send_messages(struct dm_tree_node *dnode, - const char *uuid_prefix, - size_t uuid_prefix_len, - int send) +static int _thin_pool_node_send_messages(struct dm_tree_node *dnode, + struct load_segment *seg, + int send) { - struct load_segment *seg; struct thin_message *tmsg; struct dm_status_thin_pool stp; - const char *uuid; int have_messages; - if (!dnode->info.exists) - return 1; - - if (!(seg = _get_last_load_segment(dnode))) - return_0; - - if (seg->type != SEG_THIN_POOL) - return 1; - - if (!(uuid = dm_tree_node_get_uuid(dnode))) - return_0; - - if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) { - log_debug_activation("UUID \"%s\" does not match.", uuid); - return 1; - } - if (!_thin_pool_get_status(dnode, &stp)) return_0; @@ -1582,6 +1562,36 @@ static int _node_send_messages(struct dm_tree_node *dnode, return 1; } +static int _node_send_messages(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len, + int send) +{ + struct load_segment *seg; + const char *uuid; + + if (!dnode->info.exists || !dnode->info.live_table) + return 1; + + if (!(uuid = dm_tree_node_get_uuid(dnode))) + return_0; + + if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) { + log_debug_activation("UUID \"%s\" does not match.", uuid); + return 1; + } + + if (!(seg = _get_last_load_segment(dnode))) + return_0; + + switch (seg->type) { + case SEG_THIN_POOL: return _thin_pool_node_send_messages(dnode, seg, send); + } + + return 1; +} + + /* * FIXME Don't attempt to deactivate known internal dependencies. */

1 0

master - tests: update with --yes
by Zdenek Kabelac 25 Jun '18

25 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=19b92ae3f3185919a0a1c… Commit: 19b92ae3f3185919a0a1cef849a9a003101d4429 Parent: cea88a9e4ee5a2aa28b52d673fba66327e88ff6e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun Jun 24 20:49:59 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 25 15:07:55 2018 +0200 tests: update with --yes vgcfgrestore needs to confirm restore while LVs from VG are present. --- test/shell/thin-restore.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/shell/thin-restore.sh b/test/shell/thin-restore.sh index 3682a8c..d8bae3c 100644 --- a/test/shell/thin-restore.sh +++ b/test/shell/thin-restore.sh @@ -33,7 +33,7 @@ vgcfgbackup -f backup $vg # use of --force is mandatory not vgcfgrestore -f backup $vg -vgcfgrestore -f backup --force $vg +vgcfgrestore -y -f backup --force $vg check lv_field $vg/pool transaction_id 1

1 0

master - lv_manip: use vgmem pool
by Zdenek Kabelac 25 Jun '18

25 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=cea88a9e4ee5a2aa28b52… Commit: cea88a9e4ee5a2aa28b52d673fba66327e88ff6e Parent: 357e9f9572361ec2ea89ca0bf165a30545fa747f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Jun 23 11:59:35 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 25 15:07:55 2018 +0200 lv_manip: use vgmem pool Switch to vgmem pool for allocation associated with modification of particular VG. --- lib/metadata/lv_manip.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 11a6927..7b68313 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -5901,7 +5901,7 @@ struct dm_list *build_parallel_areas_from_lv(struct logical_volume *lv, uint32_t raid_multiple; struct lv_segment *seg = first_seg(lv); - if (!(parallel_areas = dm_pool_alloc(cmd->mem, sizeof(*parallel_areas)))) { + if (!(parallel_areas = dm_pool_alloc(lv->vg->vgmem, sizeof(*parallel_areas)))) { log_error("parallel_areas allocation failed"); return NULL; } @@ -5910,7 +5910,7 @@ struct dm_list *build_parallel_areas_from_lv(struct logical_volume *lv, do { if (!spvs || !create_single_list) { - if (!(spvs = dm_pool_zalloc(cmd->mem, sizeof(*spvs)))) { + if (!(spvs = dm_pool_zalloc(lv->vg->vgmem, sizeof(*spvs)))) { log_error("allocation failed"); return NULL; }

1 0

master - cache: use new api function
by Zdenek Kabelac 25 Jun '18

25 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=357e9f9572361ec2ea89c… Commit: 357e9f9572361ec2ea89ca0bf165a30545fa747f Parent: 9c0d92d9575da63b38685c385917644d9ac9445d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Jun 23 11:47:33 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 25 15:07:55 2018 +0200 cache: use new api function --- lib/metadata/cache_manip.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index e347144..4132e2f 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -620,10 +620,9 @@ int lv_cache_remove(struct logical_volume *cache_lv) if (!(cache_seg->segtype = get_segtype_from_string(corigin_lv->vg->cmd, SEG_TYPE_NAME_CACHE))) return_0; - if (!(cache_seg->areas = dm_pool_zalloc(cache_lv->vg->vgmem, sizeof(*cache_seg->areas)))) + if (!add_lv_segment_areas(cache_seg, 1)) return_0; - cache_seg->area_count = 1; if (!set_lv_segment_area_lv(cache_seg, 0, cache_lv, 0, 0)) return_0;

1 0

master - lv_manip: add new internal api function
by Zdenek Kabelac 25 Jun '18

25 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9c0d92d9575da63b38685… Commit: 9c0d92d9575da63b38685c385917644d9ac9445d Parent: 8949903fbb0be370ae7c5d71617d5084e8dddad9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Jun 23 11:35:22 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 25 15:07:55 2018 +0200 lv_manip: add new internal api function --- lib/metadata/lv_manip.c | 21 ++++++++++----------- lib/metadata/metadata.h | 2 ++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 4efe04a..11a6927 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -1219,17 +1219,19 @@ int set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num, /* * Prepare for adding parallel areas to an existing segment. */ -static int _lv_segment_add_areas(struct logical_volume *lv, - struct lv_segment *seg, - uint32_t new_area_count) +int add_lv_segment_areas(struct lv_segment *seg, uint32_t new_area_count) { struct lv_segment_area *newareas; uint32_t areas_sz = new_area_count * sizeof(*newareas); - if (!(newareas = dm_pool_zalloc(lv->vg->cmd->mem, areas_sz))) + if (!(newareas = dm_pool_zalloc(seg->lv->vg->vgmem, areas_sz))) { + log_error("Failed to allocate widened LV segment for %s.", + display_lvname(seg->lv)); return_0; + } - memcpy(newareas, seg->areas, seg->area_count * sizeof(*seg->areas)); + if (seg->area_count) + memcpy(newareas, seg->areas, seg->area_count * sizeof(*seg->areas)); seg->areas = newareas; seg->area_count = new_area_count; @@ -3766,7 +3768,7 @@ int lv_add_mirror_areas(struct alloc_handle *ah, old_area_count = seg->area_count; new_area_count = old_area_count + ah->area_count; - if (!_lv_segment_add_areas(lv, seg, new_area_count)) + if (!add_lv_segment_areas(seg, new_area_count)) return_0; for (s = 0; s < ah->area_count; s++) { @@ -3818,11 +3820,8 @@ int lv_add_mirror_lvs(struct logical_volume *lv, old_area_count = seg->area_count; new_area_count = old_area_count + num_extra_areas; - if (!_lv_segment_add_areas(lv, seg, new_area_count)) { - log_error("Failed to allocate widened LV segment for %s.", - display_lvname(lv)); - return 0; - } + if (!add_lv_segment_areas(seg, new_area_count)) + return_0; for (m = 0; m < old_area_count; m++) seg_lv(seg, m)->status |= status; diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index 129267c..1c4be48 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -445,6 +445,8 @@ int for_each_sub_lv(struct logical_volume *lv, int move_lv_segments(struct logical_volume *lv_to, struct logical_volume *lv_from, uint64_t set_status, uint64_t reset_status); +/* Widen existing segment areas */ +int add_lv_segment_areas(struct lv_segment *seg, uint32_t new_area_count); /* * Calculate readahead from underlying PV devices

1 0

master - cache: set areas count prior using it
by Zdenek Kabelac 25 Jun '18

25 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8949903fbb0be370ae7c5… Commit: 8949903fbb0be370ae7c5d71617d5084e8dddad9 Parent: 6b3a4aac0954264c3f054e7dd6c87babca77c244 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Jun 23 11:35:34 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 25 15:07:32 2018 +0200 cache: set areas count prior using it Set correct counter, so it's not failing on internal error check. --- lib/metadata/cache_manip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index c3bd2ec..e347144 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -623,10 +623,10 @@ int lv_cache_remove(struct logical_volume *cache_lv) if (!(cache_seg->areas = dm_pool_zalloc(cache_lv->vg->vgmem, sizeof(*cache_seg->areas)))) return_0; + cache_seg->area_count = 1; if (!set_lv_segment_area_lv(cache_seg, 0, cache_lv, 0, 0)) return_0; - cache_seg->area_count = 1; corigin_lv->le_count = cache_lv->le_count; corigin_lv->size = cache_lv->size; corigin_lv->status |= LV_PENDING_DELETE;

1 0

master - vcfgrestore: add prompt with active volumes
by Zdenek Kabelac 22 Jun '18

22 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6b3a4aac0954264c3f054… Commit: 6b3a4aac0954264c3f054e7dd6c87babca77c244 Parent: 106ee05ba01146abff248a4e7eae77982fda9ebd Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 22 18:45:48 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 22 23:37:36 2018 +0200 vcfgrestore: add prompt with active volumes Add check for active device with names matching restored VG. When such devices are present in dm table, prompt user, if he wish to continue. --- WHATS_NEW | 1 + tools/vgcfgrestore.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 70fb76a..d90ff3a 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 3.0.0 ============= + Enhance vgcfgrestore to check for active LVs in restored VG. Configure supports --disable-silent-rules for verbose builds. Fix unmonitoring of merging snapshots. Cache can uses metadata format 2 with cleaner policy. diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c index 0b03687..0dd7d4d 100644 --- a/tools/vgcfgrestore.c +++ b/tools/vgcfgrestore.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2018 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. * @@ -15,11 +15,70 @@ #include "tools.h" #include "daemons/lvmetad/lvmetad-client.h" +#include "device_mapper/all.h" +#include "device_mapper/misc/dm-ioctl.h" + +/* + * Check if there are any active volumes from restored vg_name. + * We can prompt user, as such operation may make some serious + * troubles later, when user will try to continue such devices. + */ +static int _check_all_dm_devices(const char *vg_name, unsigned *found) +{ + struct dm_task *dmt; + struct dm_names *names; + char vgname_buf[DM_NAME_LEN * 2]; + char *vgname, *lvname, *lvlayer; + unsigned next = 0; + int r = 1; + + if (!(dmt = dm_task_create(DM_DEVICE_LIST))) + return_0; + + if (!dm_task_run(dmt)) { + r = 0; + goto_out; + } + + if (!(names = dm_task_get_names(dmt))) { + r = 0; + goto_out; + } + + if (!names->dev) { + log_verbose("No devices found."); + goto out; + } + + do { + /* TODO: Do we want to validate UUID LVM- prefix as well ? */ + names = (struct dm_names *)((char *) names + next); + if (!dm_strncpy(vgname_buf, names->name, sizeof(vgname_buf))) { + r = 0; + goto_out; + } + vgname = vgname_buf; + if (!dm_split_lvm_name(NULL, NULL, &vgname, &lvname, &lvlayer)) { + r = 0; + goto_out; + } + if (strcmp(vgname, vg_name) == 0) { + log_print("Volume group %s has active volume: %s.", vgname, lvname); + (*found)++; + } + next = names->next; + } while (next); + +out: + dm_task_destroy(dmt); + return r; +} int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) { const char *vg_name = NULL; int lvmetad_rescan = 0; + unsigned found = 0; int ret; if (argc == 1) { @@ -47,6 +106,21 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) return ECMD_PROCESSED; } + if (!_check_all_dm_devices(vg_name, &found)) { + log_warn("WARNING: Failed to check for active volumes in volume group \"%s\".", vg_name); + } else if (found) { + log_warn("WARNING: Found %u active volume(s) in volume group \"%s\".", + found, vg_name); + log_print("Restoring VG with active LVs, may cause mismatch with its metadata."); + if (!arg_is_set(cmd, yes_ARG) && + yes_no_prompt("Do you really want to proceed with restore of volume group \"%s\", " + "while %u volume(s) are active? [y/n]: ", + vg_name, found) == 'n') { + log_error("Restore aborted."); + return ECMD_FAILED; + } + } + /* * lvmetad does not handle a VG being restored, which would require * vg_remove of the existing VG, then vg_update of the restored VG. A

1 0

master - lv_manip: add extra internal error
by Zdenek Kabelac 22 Jun '18

22 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=106ee05ba01146abff248… Commit: 106ee05ba01146abff248a4e7eae77982fda9ebd Parent: 6c84a36b539d02a5f975a1e5e98c180621078498 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Jun 20 10:44:13 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 22 23:37:02 2018 +0200 lv_manip: add extra internal error Catch error early, when trying to store data into non-allocated area. --- lib/metadata/lv_manip.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 27cd2c1..4efe04a 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -1190,6 +1190,11 @@ int set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num, display_lvname(seg->lv), seg->le, area_num, display_lvname(lv), le); + if (area_num >= seg->area_count) { + log_error(INTERNAL_ERROR "Try to set to high area number (%u >= %u) for LV %s.", + area_num, seg->area_count, display_lvname(seg->lv)); + return 0; + } lv->status |= status; if (lv_is_raid_metadata(lv)) { seg->meta_areas[area_num].type = AREA_LV;

1 0

master - utils: add clzll
by Zdenek Kabelac 22 Jun '18

22 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6c84a36b539d02a5f975a… Commit: 6c84a36b539d02a5f975a1e5e98c180621078498 Parent: 8215e3503d0799211d268c3e2a0f1b648d5f9584 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 19 19:35:48 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 22 23:37:02 2018 +0200 utils: add clzll Check for __builtin_clzll and add wrapper when missing. --- configure | 44 ++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + include/configure.h.in | 3 +++ lib/misc/util.h | 15 ++++++++++++++- 4 files changed, 62 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 7dee110..deaa8e9 100755 --- a/configure +++ b/configure @@ -6581,6 +6581,50 @@ fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzll" >&5 +$as_echo_n "checking for __builtin_clzll... " >&6; } +if ${ax_cv_have___builtin_clzll+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + __builtin_clzll(0) + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_have___builtin_clzll=yes +else + ax_cv_have___builtin_clzll=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have___builtin_clzll" >&5 +$as_echo "$ax_cv_have___builtin_clzll" >&6; } + + if test yes = $ax_cv_have___builtin_clzll; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE___BUILTIN_CLZLL 1 +_ACEOF + +fi + + + + ################################################################################ for ac_func in ftruncate gethostname getpagesize gettimeofday localtime_r \ memchr memset mkdir mkfifo munmap nl_langinfo realpath rmdir setenv \ diff --git a/configure.ac b/configure.ac index c3197b7..699bbb6 100644 --- a/configure.ac +++ b/configure.ac @@ -140,6 +140,7 @@ AC_TYPE_UINT16_T AC_TYPE_UINT32_T AC_TYPE_UINT64_T AX_GCC_BUILTIN([__builtin_clz]) +AX_GCC_BUILTIN([__builtin_clzll]) ################################################################################ dnl -- Check for functions diff --git a/include/configure.h.in b/include/configure.h.in index b1b2db3..50e35f7 100644 --- a/include/configure.h.in +++ b/include/configure.h.in @@ -528,6 +528,9 @@ /* Define to 1 if the system has the `__builtin_clz' built-in function */ #undef HAVE___BUILTIN_CLZ +/* Define to 1 if the system has the `__builtin_clzll' built-in function */ +#undef HAVE___BUILTIN_CLZLL + /* Internalization package */ #undef INTL_PACKAGE diff --git a/lib/misc/util.h b/lib/misc/util.h index 9231ea9..a42ecb3 100644 --- a/lib/misc/util.h +++ b/lib/misc/util.h @@ -43,7 +43,7 @@ #ifdef HAVE___BUILTIN_CLZ #define clz(x) __builtin_clz((x)) #else /* ifdef HAVE___BUILTIN_CLZ */ -unsigned _dm_clz(unsigned x) +static unsigned _dm_clz(unsigned x) { int n; @@ -76,6 +76,19 @@ unsigned _dm_clz(unsigned x) #define clz(x) _dm_clz((x)) #endif /* ifdef HAVE___BUILTIN_CLZ */ +#ifdef HAVE___BUILTIN_CLZLL +#define clzll(x) __builtin_clzll((x)) +#else /* ifdef HAVE___BUILTIN_CLZ */ +static unsigned _dm_clzll(unsigned long long x) +{ + if (x <= 0xffffffff) + return 32 + clz((unsigned) (x & 0xffffffff)); + + return clz(x >> 32); +} +#define clzll(x) _dm_clzll((x)) +#endif /* ifdef HAVE___BUILTIN_CLZLL */ + #define KERNEL_VERSION(major, minor, release) (((major) << 16) + ((minor) << 8) + (release)) /* Define some portable printing types */

1 0

master - tests: fix rules for mke2fs.conf install
by Zdenek Kabelac 22 Jun '18

22 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8215e3503d0799211d268… Commit: 8215e3503d0799211d268c3e2a0f1b648d5f9584 Parent: fa58fc32576a08bf11fa98623473f5e6ec5b6d68 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 22 22:43:58 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 22 23:36:54 2018 +0200 tests: fix rules for mke2fs.conf install --- test/Makefile.in | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 39093bf..5b7578c 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -34,7 +34,7 @@ CXXFLAGS += $(EXTRA_EXEC_CFLAGS) CLEAN_DIRS += dbus/__pycache__ $(LVM_TEST_RESULTS) ifneq (.,$(firstword $(srcdir))) -CLEAN_TARGETS += $(RUN_BASE) $(addprefix lib/,$(LIB_LVMLOCKD_CONF)) +CLEAN_TARGETS += $(RUN_BASE) $(addprefix lib/,$(LIB_LVMLOCKD_CONF) $(LIB_MKE2FS_CONF)) endif CLEAN_TARGETS += .lib-dir-stamp .tests-stamp $(LIB) $(addprefix lib/,\ @@ -239,7 +239,10 @@ LIB_LVMLOCKD_CONF = \ test-dlm-conf \ test-sanlock-conf -LIB_LOCAL = paths runner mke2fs.conf +LIB_MKE2FS_CONF = \ + mke2fs.conf + +LIB_LOCAL = paths runner LIB_NOT = not LIB_LINK_NOT = invalid fail should LIB_SHARED = check aux inittest utils get lvm-wrapper @@ -249,13 +252,13 @@ install: .tests-stamp lib/paths-installed $(INSTALL_DIR) $(DATADIR)/{shell,unit,lib,dbus} $(EXECDIR) $(INSTALL_DATA) shell/*.sh $(DATADIR)/shell $(INSTALL_DATA) unit/*.sh $(DATADIR)/unit - $(INSTALL_DATA) lib/mke2fs.conf $(DATADIR)/lib -$(INSTALL_PROGRAM) unit/unit-test $(DATADIR)/unit -$(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/ $(INSTALL_DATA) lib/paths-installed $(DATADIR)/lib/paths cd lib && $(INSTALL_DATA) \ $(LIB_FLAVOURS) \ $(LIB_LVMLOCKD_CONF) \ + $(LIB_MKE2FS_CONF) \ dm-version-expected \ version-expected \ $(DATADIR)/lib @@ -340,9 +343,6 @@ lib/version-expected: $(top_srcdir)/VERSION .lib-dir-stamp lib/dm-version-expected: $(top_srcdir)/VERSION_DM .lib-dir-stamp cut -f 1 -d ' ' <$< >$@ -lib/mke2fs.conf: $(srcdir)/lib/mke2fs.conf - $(LN_S) -f $< $@ - CMDS = lvm $(shell cat $(top_builddir)/tools/.commands 2>/dev/null) LIB = $(addprefix lib/, $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $(LIB_FLAVOURS)) @@ -369,8 +369,9 @@ LIB = $(addprefix lib/, $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $( $(LN_S) -f $(abs_top_srcdir)/conf/lvmdbusd.profile lib/ $(LN_S) -f $(abs_top_srcdir)/conf/thin-performance.profile lib/ $(LN_S) -f $(abs_top_srcdir)/scripts/fsadm.sh lib/fsadm - test "$(srcdir)" = . || for i in $(LIB_LVMLOCKD_CONF); do \ - $(LN_S) -f $(abs_top_srcdir)/test/lib/$$i lib/; done + test "$(srcdir)" = . || \ + for i in $(LIB_LVMLOCKD_CONF) $(LIB_MKE2FS_CONF); do \ + $(LN_S) -f $(abs_top_srcdir)/test/lib/$$i lib/; done touch $@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

1 0

master - build: support --disable-silent-rules
by Zdenek Kabelac 22 Jun '18

22 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fa58fc32576a08bf11fa9… Commit: fa58fc32576a08bf11fa98623473f5e6ec5b6d68 Parent: c728d88e11ffed97f8a5b96e1c0595a2462c5edc Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 22 23:30:42 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 22 23:36:19 2018 +0200 build: support --disable-silent-rules Add support for standardized option for have verbose builds. Useful for distro builds where more details can be useful. --- WHATS_NEW | 1 + configure | 17 +++++++++++++++++ configure.ac | 10 ++++++++++ make.tmpl.in | 4 ++++ 4 files changed, 32 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a875553..70fb76a 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 3.0.0 ============= + Configure supports --disable-silent-rules for verbose builds. Fix unmonitoring of merging snapshots. Cache can uses metadata format 2 with cleaner policy. Fix check if resized PV can also fit metadata area. diff --git a/configure b/configure index 4536b03..7dee110 100755 --- a/configure +++ b/configure @@ -643,6 +643,7 @@ DMEVENTD_PIDFILE WRITE_INSTALL VALGRIND_POOL USRSBINDIR +SILENT_RULES USE_TRACKING UDEV_HAS_BUILTIN_BLKID UDEV_RULE_EXEC_DETECTION @@ -885,6 +886,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_silent_rules enable_static_link with_user with_group @@ -1622,6 +1624,7 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build. + --disable-silent-rules disable silent building --enable-static_link use this to link the tools to their libraries statically (default is dynamic linking --disable-thin_check_needs_check @@ -8044,6 +8047,20 @@ fi $as_echo "$USE_TRACKING" >&6; } ################################################################################ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build silently" >&5 +$as_echo_n "checking whether to build silently... " >&6; } +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; SILENT_RULES=$enableval +else + SILENT_RULES=yes +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SILENT_RULES" >&5 +$as_echo "$SILENT_RULES" >&6; } + + +################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use static linking" >&5 $as_echo_n "checking whether to use static linking... " >&6; } # Check whether --enable-static_link was given. diff --git a/configure.ac b/configure.ac index 05b13e0..c3197b7 100644 --- a/configure.ac +++ b/configure.ac @@ -171,6 +171,15 @@ AC_ARG_ENABLE(dependency-tracking, AC_MSG_RESULT($USE_TRACKING) ################################################################################ +dnl -- Disable silence rules +AC_MSG_CHECKING(whether to build silently) +AC_ARG_ENABLE(silent-rules, + AC_HELP_STRING([--disable-silent-rules], [disable silent building]), + SILENT_RULES=$enableval, SILENT_RULES=yes) +AC_MSG_RESULT($SILENT_RULES) + + +################################################################################ dnl -- Enables statically-linked tools AC_MSG_CHECKING(whether to use static linking) AC_ARG_ENABLE(static_link, @@ -1726,6 +1735,7 @@ AC_SUBST(UDEV_SYSTEMD_BACKGROUND_JOBS) AC_SUBST(UDEV_RULE_EXEC_DETECTION) AC_SUBST(UDEV_HAS_BUILTIN_BLKID) AC_SUBST(USE_TRACKING) +AC_SUBST(SILENT_RULES) AC_SUBST(USRSBINDIR) AC_SUBST(VALGRIND_POOL) AC_SUBST(WRITE_INSTALL) diff --git a/make.tmpl.in b/make.tmpl.in index 07cb18a..38fdc73 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -13,6 +13,10 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +ifneq ("@SILENT_RULES@","yes") + V ?= 1 +endif + ifeq ($(V),1) Q= else

1 0

master - build: include configure.h
by Zdenek Kabelac 22 Jun '18

22 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c728d88e11ffed97f8a5b… Commit: c728d88e11ffed97f8a5b96e1c0595a2462c5edc Parent: 086f1ef4a0f59ee247067e850b9b9ef0cdf5b1c3 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 19 20:43:31 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 22 23:11:44 2018 +0200 build: include configure.h It's important to consistenly include configure.h as the 1st. header. It containts #defines influencing behavior of other included header files. --- daemons/dmeventd/dmeventd.c | 1 + daemons/dmeventd/libdevmapper-event.c | 2 +- device_mapper/all.h | 6 +++--- device_mapper/libdm-common.c | 6 +++--- device_mapper/vdo/status.c | 1 + lib/device/bcache.h | 1 + libdm/dm-tools/dmsetup.c | 4 ++-- test/unit/activation-generator_t.c | 3 +-- test/unit/bcache_t.c | 7 +++---- test/unit/bcache_utils_t.c | 3 +-- test/unit/framework.h | 1 + test/unit/io_engine_t.c | 7 +++---- test/unit/radix_tree_t.c | 3 +-- test/unit/vdo_t.c | 3 +-- 14 files changed, 23 insertions(+), 25 deletions(-) diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c index 3ad81ce..dcc743d 100644 --- a/daemons/dmeventd/dmeventd.c +++ b/daemons/dmeventd/dmeventd.c @@ -16,6 +16,7 @@ * dmeventd - dm event daemon to monitor active mapped devices */ +#include "device_mapper/misc/dmlib.h" #include "base/memory/zalloc.h" #include "device_mapper/misc/dm-logging.h" diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index 157b5f1..e58a0ce 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -12,9 +12,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "device_mapper/misc/dmlib.h" #include "base/memory/zalloc.h" #include "device_mapper/misc/dm-logging.h" -#include "device_mapper/misc/dmlib.h" #include "daemons/dmeventd/libdevmapper-event.h" #include "dmeventd.h" #include "lib/misc/intl.h" diff --git a/device_mapper/all.h b/device_mapper/all.h index 8dcb38c..602b7ba 100644 --- a/device_mapper/all.h +++ b/device_mapper/all.h @@ -17,6 +17,9 @@ #ifndef LIB_DEVICE_MAPPER_H #define LIB_DEVICE_MAPPER_H +#include "base/data-struct/list.h" +#include "base/data-struct/hash.h" + #include <inttypes.h> #include <stdarg.h> #include <sys/types.h> @@ -31,9 +34,6 @@ #include <stdlib.h> #include <stdio.h> -#include "base/data-struct/list.h" -#include "base/data-struct/hash.h" - #ifndef __GNUC__ # define __typeof__ typeof #endif diff --git a/device_mapper/libdm-common.c b/device_mapper/libdm-common.c index d46d4b0..111fff6 100644 --- a/device_mapper/libdm-common.c +++ b/device_mapper/libdm-common.c @@ -13,12 +13,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "base/memory/zalloc.h" -#include "device_mapper/misc/dmlib.h" -#include "ioctl/libdm-targets.h" +#include "misc/dmlib.h" #include "libdm-common.h" +#include "ioctl/libdm-targets.h" #include "misc/kdev_t.h" #include "misc/dm-ioctl.h" +#include "base/memory/zalloc.h" #include <stdarg.h> #include <sys/param.h> diff --git a/device_mapper/vdo/status.c b/device_mapper/vdo/status.c index 7a26e1a..f423ca1 100644 --- a/device_mapper/vdo/status.c +++ b/device_mapper/vdo/status.c @@ -1,3 +1,4 @@ +#include "configure.h" #include "target.h" // For DM_ARRAY_SIZE! diff --git a/lib/device/bcache.h b/lib/device/bcache.h index cb36c30..ae5e69c 100644 --- a/lib/device/bcache.h +++ b/lib/device/bcache.h @@ -15,6 +15,7 @@ #ifndef BCACHE_H #define BCACHE_H +#include "configure.h" #include "device_mapper/all.h" #include <linux/fs.h> diff --git a/libdm/dm-tools/dmsetup.c b/libdm/dm-tools/dmsetup.c index 83786f4..44386a6 100644 --- a/libdm/dm-tools/dmsetup.c +++ b/libdm/dm-tools/dmsetup.c @@ -18,11 +18,10 @@ // For canonicalize_file_name() #define _GNU_SOURCE -#include <stdlib.h> +#include "configure.h" #include "libdm/misc/dm-logging.h" #include "libdm/dm-tools/util.h" -#include "configure.h" #include <ctype.h> #include <dirent.h> @@ -35,6 +34,7 @@ #include <sys/wait.h> #include <time.h> #include <unistd.h> +#include <stdlib.h> #ifdef UDEV_SYNC_SUPPORT # include <sys/types.h> diff --git a/test/unit/activation-generator_t.c b/test/unit/activation-generator_t.c index 9f6b661..cff0968 100644 --- a/test/unit/activation-generator_t.c +++ b/test/unit/activation-generator_t.c @@ -12,9 +12,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "scripts/generator-internals.c" -#include "framework.h" #include "units.h" +#include "scripts/generator-internals.c" #include "device_mapper/all.h" diff --git a/test/unit/bcache_t.c b/test/unit/bcache_t.c index 5e07005..92c2d57 100644 --- a/test/unit/bcache_t.c +++ b/test/unit/bcache_t.c @@ -12,15 +12,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "units.h" +#include "lib/device/bcache.h" + #include <errno.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include "lib/device/bcache.h" -#include "framework.h" -#include "units.h" - #define SHOW_MOCK_CALLS 0 /*---------------------------------------------------------------- diff --git a/test/unit/bcache_utils_t.c b/test/unit/bcache_utils_t.c index 66780ea..2e08320 100644 --- a/test/unit/bcache_utils_t.c +++ b/test/unit/bcache_utils_t.c @@ -14,9 +14,8 @@ #define _GNU_SOURCE -#include "lib/device/bcache.h" -#include "framework.h" #include "units.h" +#include "lib/device/bcache.h" #include <errno.h> #include <stdio.h> diff --git a/test/unit/framework.h b/test/unit/framework.h index 0c45596..d5a2cdd 100644 --- a/test/unit/framework.h +++ b/test/unit/framework.h @@ -1,6 +1,7 @@ #ifndef TEST_UNIT_FRAMEWORK_H #define TEST_UNIT_FRAMEWORK_H +#include "configure.h" #include "device_mapper/all.h" #include <stdbool.h> diff --git a/test/unit/io_engine_t.c b/test/unit/io_engine_t.c index 1a4f638..bac9c38 100644 --- a/test/unit/io_engine_t.c +++ b/test/unit/io_engine_t.c @@ -14,6 +14,9 @@ #define _GNU_SOURCE +#include "units.h" +#include "lib/device/bcache.h" + #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -22,10 +25,6 @@ #include <fcntl.h> #include <unistd.h> -#include "lib/device/bcache.h" -#include "framework.h" -#include "units.h" - //---------------------------------------------------------------- #define SECTOR_SIZE 512 diff --git a/test/unit/radix_tree_t.c b/test/unit/radix_tree_t.c index 2fba15f..e5d3e98 100644 --- a/test/unit/radix_tree_t.c +++ b/test/unit/radix_tree_t.c @@ -10,11 +10,10 @@ // along with this program; if not, write to the Free Software Foundation, // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +#include "units.h" #include "base/data-struct/radix-tree.h" #include "base/memory/container_of.h" -#include "units.h" - #include <stdio.h> #include <stdlib.h> diff --git a/test/unit/vdo_t.c b/test/unit/vdo_t.c index 9c41887..a26c0b9 100644 --- a/test/unit/vdo_t.c +++ b/test/unit/vdo_t.c @@ -12,9 +12,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "device_mapper/vdo/target.h" -#include "framework.h" #include "units.h" +#include "device_mapper/vdo/target.h" //----------------------------------------------------------------

1 0

master - build: make generate
by Zdenek Kabelac 22 Jun '18

22 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=086f1ef4a0f59ee247067… Commit: 086f1ef4a0f59ee247067e850b9b9ef0cdf5b1c3 Parent: 254e5c5d119447bcb8b160a4b4e5b0c36e9af5ba Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 19 15:07:50 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 22 15:36:34 2018 +0200 build: make generate --- conf/example.conf.in | 33 +++++---------------------------- man/lvchange.8_pregen | 15 --------------- man/lvdisplay.8_pregen | 11 ----------- man/lvm-fullreport.8_pregen | 11 ----------- man/lvs.8_pregen | 11 ----------- man/pvchange.8_pregen | 11 ----------- man/pvdisplay.8_pregen | 11 ----------- man/pvs.8_pregen | 11 ----------- man/vgchange.8_pregen | 31 ------------------------------- man/vgconvert.8_pregen | 9 +++++---- man/vgdisplay.8_pregen | 11 ----------- man/vgs.8_pregen | 11 ----------- 12 files changed, 10 insertions(+), 166 deletions(-) diff --git a/conf/example.conf.in b/conf/example.conf.in index 97daab2..83f9f42 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -151,21 +151,15 @@ devices { # global_filter = [ "a|.*/|" ] # Configuration option devices/cache_dir. - # Directory in which to store the device cache file. - # The results of filtering are cached on disk to avoid rescanning dud - # devices (which can take a very long time). By default this cache is - # stored in a file named .cache. It is safe to delete this file; the - # tools regenerate it. If obtain_device_list_from_udev is enabled, the - # list of devices is obtained from udev and any existing .cache file - # is removed. + # This setting is no longer used. cache_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_CACHE_SUBDIR@" # Configuration option devices/cache_file_prefix. - # A prefix used before the .cache file name. See devices/cache_dir. + # This setting is no longer used. cache_file_prefix = "" # Configuration option devices/write_cache_state. - # Enable/disable writing the cache file. See devices/cache_dir. + # This setting is no longer used. write_cache_state = 1 # Configuration option devices/types. @@ -269,11 +263,7 @@ devices { ignore_lvm_mirrors = 1 # Configuration option devices/disable_after_error_count. - # Number of I/O errors after which a device is skipped. - # During each LVM operation, errors received from each device are - # counted. If the counter of a device exceeds the limit set here, - # no further I/O is sent to that device for the remainder of the - # operation. Setting this to 0 disables the counters altogether. + # This setting is no longer used. disable_after_error_count = 0 # Configuration option devices/require_restorefile_with_uuid. @@ -1557,20 +1547,7 @@ activation { # stripesize = 64 # Configuration option metadata/dirs. - # Directories holding live copies of text format metadata. - # These directories must not be on logical volumes! - # It's possible to use LVM with a couple of directories here, - # preferably on different (non-LV) filesystems, and with no other - # on-disk metadata (pvmetadatacopies = 0). Or this can be in addition - # to on-disk metadata areas. The feature was originally added to - # simplify testing and is not supported under low memory situations - - # the machine could lock up. Never edit any files in these directories - # by hand unless you are absolutely sure you know what you are doing! - # Use the supplied toolset to make changes (e.g. vgcfgrestore). - # - # Example - # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ] - # + # This setting is no longer used. # This configuration option is advanced. # This configuration option does not have a default value defined. # } diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen index 8f9783a..03e0b1c 100644 --- a/man/lvchange.8_pregen +++ b/man/lvchange.8_pregen @@ -97,10 +97,6 @@ lvchange - Change the attributes of logical volume(s) .ad b .br .ad l - \fB--ignoreskippedcluster\fP -.ad b -.br -.ad l \fB--lockopt\fP \fIString\fP .ad b .br @@ -520,10 +516,6 @@ Common options for command: .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--noudevsync\fP ] .ad b .br @@ -818,13 +810,6 @@ Do not use this if dmeventd is already monitoring a device. .ad b .HP .ad l -\fB--ignoreskippedcluster\fP -.br -Use to avoid exiting with an non-zero status code if the command is run -without clustered locking and clustered VGs are skipped. -.ad b -.HP -.ad l \fB--lockopt\fP \fIString\fP .br Used to pass options for special cases to lvmlockd. diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen index 6211a47..9a8962b 100644 --- a/man/lvdisplay.8_pregen +++ b/man/lvdisplay.8_pregen @@ -72,10 +72,6 @@ and more, using a more compact and configurable output format. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--logonly\fP ] .ad b .br @@ -284,13 +280,6 @@ operations after locking failures. .ad b .HP .ad l -\fB--ignoreskippedcluster\fP -.br -Use to avoid exiting with an non-zero status code if the command is run -without clustered locking and clustered VGs are skipped. -.ad b -.HP -.ad l \fB--lockopt\fP \fIString\fP .br Used to pass options for special cases to lvmlockd. diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen index 4a8d7b3..111b8ef 100644 --- a/man/lvm-fullreport.8_pregen +++ b/man/lvm-fullreport.8_pregen @@ -56,10 +56,6 @@ if information changes between commands. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--logonly\fP ] .ad b .br @@ -255,13 +251,6 @@ operations after locking failures. .ad b .HP .ad l -\fB--ignoreskippedcluster\fP -.br -Use to avoid exiting with an non-zero status code if the command is run -without clustered locking and clustered VGs are skipped. -.ad b -.HP -.ad l \fB--lockopt\fP \fIString\fP .br Used to pass options for special cases to lvmlockd. diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen index b5128f9..fecca99 100644 --- a/man/lvs.8_pregen +++ b/man/lvs.8_pregen @@ -60,10 +60,6 @@ lvs produces formatted output about LVs. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--logonly\fP ] .ad b .br @@ -270,13 +266,6 @@ operations after locking failures. .ad b .HP .ad l -\fB--ignoreskippedcluster\fP -.br -Use to avoid exiting with an non-zero status code if the command is run -without clustered locking and clustered VGs are skipped. -.ad b -.HP -.ad l \fB--lockopt\fP \fIString\fP .br Used to pass options for special cases to lvmlockd. diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen index 5da8eca..8c9288d 100644 --- a/man/pvchange.8_pregen +++ b/man/pvchange.8_pregen @@ -98,10 +98,6 @@ Common options for command: .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ] .ad b .RE @@ -244,13 +240,6 @@ Display help text. .ad b .HP .ad l -\fB--ignoreskippedcluster\fP -.br -Use to avoid exiting with an non-zero status code if the command is run -without clustered locking and clustered VGs are skipped. -.ad b -.HP -.ad l \fB--lockopt\fP \fIString\fP .br Used to pass options for special cases to lvmlockd. diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen index 5f39e7b..9dbcac3 100644 --- a/man/pvdisplay.8_pregen +++ b/man/pvdisplay.8_pregen @@ -72,10 +72,6 @@ and more, using a more compact and configurable output format. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--logonly\fP ] .ad b .br @@ -271,13 +267,6 @@ operations after locking failures. .ad b .HP .ad l -\fB--ignoreskippedcluster\fP -.br -Use to avoid exiting with an non-zero status code if the command is run -without clustered locking and clustered VGs are skipped. -.ad b -.HP -.ad l \fB--lockopt\fP \fIString\fP .br Used to pass options for special cases to lvmlockd. diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen index 59f1e3d..53c259c 100644 --- a/man/pvs.8_pregen +++ b/man/pvs.8_pregen @@ -56,10 +56,6 @@ pvs produces formatted output about PVs. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--logonly\fP ] .ad b .br @@ -257,13 +253,6 @@ operations after locking failures. .ad b .HP .ad l -\fB--ignoreskippedcluster\fP -.br -Use to avoid exiting with an non-zero status code if the command is run -without clustered locking and clustered VGs are skipped. -.ad b -.HP -.ad l \fB--lockopt\fP \fIString\fP .br Used to pass options for special cases to lvmlockd. diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen index a9ac546..94dbd88 100644 --- a/man/vgchange.8_pregen +++ b/man/vgchange.8_pregen @@ -75,10 +75,6 @@ vgchange - Change volume group attributes .ad b .br .ad l - \fB--ignoreskippedcluster\fP -.ad b -.br -.ad l \fB--lockopt\fP \fIString\fP .ad b .br @@ -279,10 +275,6 @@ required, after which the others are optional. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--noudevsync\fP ] .ad b .br @@ -333,10 +325,6 @@ Start or stop monitoring LVs from dmeventd. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--noudevsync\fP ] .ad b .br @@ -379,10 +367,6 @@ Start or stop processing LV conversions. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--noudevsync\fP ] .ad b .br @@ -449,10 +433,6 @@ Activate or deactivate LVs. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--noudevsync\fP ] .ad b .br @@ -503,10 +483,6 @@ Reactivate LVs using the latest metadata. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--noudevsync\fP ] .ad b .br @@ -800,13 +776,6 @@ Do not use this if dmeventd is already monitoring a device. .ad b .HP .ad l -\fB--ignoreskippedcluster\fP -.br -Use to avoid exiting with an non-zero status code if the command is run -without clustered locking and clustered VGs are skipped. -.ad b -.HP -.ad l \fB--lockopt\fP \fIString\fP .br Used to pass options for special cases to lvmlockd. diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen index 16e1fc8..b2a6027 100644 --- a/man/vgconvert.8_pregen +++ b/man/vgconvert.8_pregen @@ -8,9 +8,9 @@ vgconvert - Change volume group metadata format [ \fIoption_args\fP ] .br .SH DESCRIPTION -vgconvert converts VG metadata from one format to another. This command -is no longer used because this version of lvm no longer supports the LVM1 -format. +vgconvert is no longer a part of LVM. It was removed along with +support for the LVM1 format. Use an older version of LVM to +convert VGs from the LVM1 format to LVM2. .SH USAGE \fBvgconvert\fP \fIVG\fP ... .br @@ -46,7 +46,6 @@ format. [ COMMON_OPTIONS ] .RE .br - Common options for lvm: . .RS 4 @@ -106,6 +105,7 @@ Common options for lvm: [ \fB--version\fP ] .ad b .RE + .SH OPTIONS .HP .ad l @@ -301,6 +301,7 @@ capital letters mean multiple of 1000.) .SH ENVIRONMENT VARIABLES See \fBlvm\fP(8) for information about environment variables used by lvm. For example, LVM_VG_NAME can generally be substituted for a required VG parameter. + .SH SEE ALSO .BR lvm (8) diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen index 89e3603..7c8fb12 100644 --- a/man/vgdisplay.8_pregen +++ b/man/vgdisplay.8_pregen @@ -67,10 +67,6 @@ and more, using a more compact and configurable output format. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--logonly\fP ] .ad b .br @@ -266,13 +262,6 @@ operations after locking failures. .ad b .HP .ad l -\fB--ignoreskippedcluster\fP -.br -Use to avoid exiting with an non-zero status code if the command is run -without clustered locking and clustered VGs are skipped. -.ad b -.HP -.ad l \fB--lockopt\fP \fIString\fP .br Used to pass options for special cases to lvmlockd. diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen index 681711b..c8a9611 100644 --- a/man/vgs.8_pregen +++ b/man/vgs.8_pregen @@ -52,10 +52,6 @@ vgs produces formatted output about VGs. .ad b .br .ad l -[ \fB--ignoreskippedcluster\fP ] -.ad b -.br -.ad l [ \fB--logonly\fP ] .ad b .br @@ -252,13 +248,6 @@ operations after locking failures. .ad b .HP .ad l -\fB--ignoreskippedcluster\fP -.br -Use to avoid exiting with an non-zero status code if the command is run -without clustered locking and clustered VGs are skipped. -.ad b -.HP -.ad l \fB--lockopt\fP \fIString\fP .br Used to pass options for special cases to lvmlockd.

1 0

master - radix-tree: squash a pointer arithmetic warning
by Joe Thornber 21 Jun '18

21 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=254e5c5d119447bcb8b16… Commit: 254e5c5d119447bcb8b160a4b4e5b0c36e9af5ba Parent: 18528180d9f588e265747f4710a8767756454b4c Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Thu Jun 21 17:41:56 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 21 17:41:56 2018 +0100 radix-tree: squash a pointer arithmetic warning --- base/data-struct/radix-tree.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/base/data-struct/radix-tree.c b/base/data-struct/radix-tree.c index ffbf029..1d24dad 100644 --- a/base/data-struct/radix-tree.c +++ b/base/data-struct/radix-tree.c @@ -628,7 +628,7 @@ static void _erase_elt(void *array, unsigned obj_size, unsigned count, unsigned obj_size * (count - index - 1)); // Zero the now unused last elt (set's v.type to UNSET) - memset(array + (count - 1) * obj_size, 0, obj_size); + memset(((uint8_t *) array) + (count - 1) * obj_size, 0, obj_size); } static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint8_t *ke)

1 0

master - Merge branch 'master' of git+ssh://sourceware.org/git/lvm2
by Joe Thornber 21 Jun '18

21 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=18528180d9f588e265747… Commit: 18528180d9f588e265747f4710a8767756454b4c Parent: 72e2e92f4c23b75efdf08ee5a4019b6beb86b9f1 dd7ebec12028a65081f676b5f52215b012c75c88 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Thu Jun 21 17:12:09 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 21 17:12:09 2018 +0100 Merge branch 'master' of git+ssh://sourceware.org/git/lvm2 lib/commands/toolcontext.c | 18 --------- lib/config/config_settings.h | 2 +- lib/device/dev-cache.c | 80 +++------------------------------------ lib/device/dev-cache.h | 2 - lib/filters/filter-persistent.c | 7 ++- lib/metadata/mirror.c | 2 +- 6 files changed, 13 insertions(+), 98 deletions(-)

1 0

master - radix-tree: fix bug when erasing elts in remove_prefix
by Joe Thornber 21 Jun '18

21 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=72e2e92f4c23b75efdf08… Commit: 72e2e92f4c23b75efdf08ee5a4019b6beb86b9f1 Parent: 40c1f7889fd88ce4a2f2b42c594db3deb8f84593 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Thu Jun 21 17:10:05 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 21 17:10:05 2018 +0100 radix-tree: fix bug when erasing elts in remove_prefix _erase_elt() now zeroes the last element of the array (ie. sets to UNSET). Previously remove() was doing this, but not remove_prefix(). --- base/data-struct/radix-tree.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/data-struct/radix-tree.c b/base/data-struct/radix-tree.c index 202d463..ffbf029 100644 --- a/base/data-struct/radix-tree.c +++ b/base/data-struct/radix-tree.c @@ -626,6 +626,9 @@ static void _erase_elt(void *array, unsigned obj_size, unsigned count, unsigned memmove(((uint8_t *) array) + (obj_size * index), ((uint8_t *) array) + (obj_size * (index + 1)), obj_size * (count - index - 1)); + + // Zero the now unused last elt (set's v.type to UNSET) + memset(array + (count - 1) * obj_size, 0, obj_size); } static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint8_t *ke) @@ -700,7 +703,6 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint } n4->nr_entries--; - n4->values[n4->nr_entries].type = UNSET; if (!n4->nr_entries) { free(n4); root->type = UNSET; @@ -723,7 +725,6 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint } n16->nr_entries--; - n16->values[n16->nr_entries].type = UNSET; if (n16->nr_entries <= 4) { _degrade_to_n4(n16, root); } @@ -745,7 +746,6 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint n48->keys[j]--; _erase_elt(n48->values, sizeof(*n48->values), n48->nr_entries, i); n48->nr_entries--; - n48->values[n48->nr_entries].type = UNSET; if (n48->nr_entries <= 16) _degrade_to_n16(n48, root); } @@ -1066,7 +1066,7 @@ static bool _check_nodes(struct value *v, unsigned *count) for (i = n4->nr_entries; i < 4; i++) if (n4->values[i].type != UNSET) { - fprintf(stderr, "unused value is not UNSET\n"); + fprintf(stderr, "unused value is not UNSET (n4)\n"); return false; } @@ -1080,7 +1080,7 @@ static bool _check_nodes(struct value *v, unsigned *count) for (i = n16->nr_entries; i < 16; i++) if (n16->values[i].type != UNSET) { - fprintf(stderr, "unused value is not UNSET\n"); + fprintf(stderr, "unused value is not UNSET (n16)\n"); return false; } @@ -1105,7 +1105,7 @@ static bool _check_nodes(struct value *v, unsigned *count) for (i = n48->nr_entries; i < 48; i++) if (n48->values[i].type != UNSET) { - fprintf(stderr, "unused value is not UNSET\n"); + fprintf(stderr, "unused value is not UNSET (n48)\n"); return false; }

1 0

master - filter: use pointers to real addresses
by David Teigland 21 Jun '18

21 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=dd7ebec12028a65081f67… Commit: dd7ebec12028a65081f676b5f52215b012c75c88 Parent: 15826214f94da5a447f34ae9d237f1f018d3bac3 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jun 21 10:52:35 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Jun 21 10:54:43 2018 -0500 filter: use pointers to real addresses instead of casting values 1 and 2 to pointers which gcc optimization can have problems with. --- lib/filters/filter-persistent.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/filters/filter-persistent.c b/lib/filters/filter-persistent.c index 1782bfa..130b1e5 100644 --- a/lib/filters/filter-persistent.c +++ b/lib/filters/filter-persistent.c @@ -43,12 +43,15 @@ struct pfilter { * do this. */ +static int _good_device; +static int _bad_device; + /* * The hash table holds one of these two states * against each entry. */ -#define PF_BAD_DEVICE ((void *) 1) -#define PF_GOOD_DEVICE ((void *) 2) +#define PF_BAD_DEVICE ((void *) &_good_device) +#define PF_GOOD_DEVICE ((void *) &_bad_device) static int _init_hash(struct pfilter *pf) {

1 0

master - Remove code for using files as devices
by David Teigland 21 Jun '18

21 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=15826214f94da5a447f34… Commit: 15826214f94da5a447f34ae9d237f1f018d3bac3 Parent: e166d2b14ca22ead559a5898cc229ecbcc261007 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jun 21 09:33:21 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Jun 21 09:33:21 2018 -0500 Remove code for using files as devices It appears this has not been used in a long time, and it seems to have no point since loop devices exist. --- lib/commands/toolcontext.c | 18 --------- lib/config/config_settings.h | 2 +- lib/device/dev-cache.c | 80 +++-------------------------------------- lib/device/dev-cache.h | 2 - 4 files changed, 7 insertions(+), 95 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 50474c1..eb15581 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -1030,24 +1030,6 @@ static int _init_dev_cache(struct cmd_context *cmd) } } - if (!(cn = find_config_tree_array(cmd, devices_loopfiles_CFG, NULL))) - return 1; - - for (cv = cn->v; cv; cv = cv->next) { - if (cv->type != DM_CFG_STRING) { - log_error("Invalid string in config file: " - "devices/loopfiles"); - return 0; - } - - if (!dev_cache_add_loopfile(cv->v.str)) { - log_error("Failed to add loopfile %s to internal " - "device cache", cv->v.str); - return 0; - } - } - - return 1; } diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index ac0f0ff..7cb266c 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -226,7 +226,7 @@ cfg(devices_dir_CFG, "dir", devices_CFG_SECTION, CFG_ADVANCED, CFG_TYPE_STRING, cfg_array(devices_scan_CFG, "scan", devices_CFG_SECTION, CFG_ADVANCED, CFG_TYPE_STRING, "#S/dev", vsn(1, 0, 0), NULL, 0, NULL, "Directories containing device nodes to use with LVM.\n") -cfg_array(devices_loopfiles_CFG, "loopfiles", devices_CFG_SECTION, CFG_DEFAULT_UNDEFINED | CFG_UNSUPPORTED, CFG_TYPE_STRING, NULL, vsn(1, 2, 0), NULL, 0, NULL, NULL) +cfg_array(devices_loopfiles_CFG, "loopfiles", devices_CFG_SECTION, CFG_DEFAULT_UNDEFINED | CFG_UNSUPPORTED, CFG_TYPE_STRING, NULL, vsn(1, 2, 0), NULL, vsn(3, 0, 0), NULL, NULL) cfg(devices_obtain_device_list_from_udev_CFG, "obtain_device_list_from_udev", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV, vsn(2, 2, 85), NULL, 0, NULL, "Obtain the list of available devices from udev.\n" diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index a0d98a3..59e00ae 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -690,18 +690,8 @@ static int _insert_dev(const char *path, dev_t d) struct device *dev; struct device *dev_by_devt; struct device *dev_by_path; - static dev_t loopfile_count = 0; - int loopfile = 0; char *path_copy; - /* Generate pretend device numbers for loopfiles */ - if (!d) { - if (dm_hash_lookup(_cache.names, path)) - return 1; - d = ++loopfile_count; - loopfile = 1; - } - dev_by_devt = (struct device *) btree_lookup(_cache.devices, (uint32_t) d); dev_by_path = (struct device *) dm_hash_lookup(_cache.names, path); dev = dev_by_devt; @@ -724,10 +714,7 @@ static int _insert_dev(const char *path, dev_t d) if (!(dev = (struct device *) btree_lookup(_cache.sysfs_only_devices, (uint32_t) d))) { /* create new device */ - if (loopfile) { - if (!(dev = dev_create_file(path, NULL, NULL, 0))) - return_0; - } else if (!(dev = _dev_create(d))) + if (!(dev = _dev_create(d))) return_0; } @@ -742,7 +729,7 @@ static int _insert_dev(const char *path, dev_t d) return 0; } - if (!loopfile && !_add_alias(dev, path_copy)) { + if (!_add_alias(dev, path_copy)) { log_error("Couldn't add alias to dev cache."); return 0; } @@ -767,7 +754,7 @@ static int _insert_dev(const char *path, dev_t d) return 0; } - if (!loopfile && !_add_alias(dev, path_copy)) { + if (!_add_alias(dev, path_copy)) { log_error("Couldn't add alias to dev cache."); return 0; } @@ -791,10 +778,7 @@ static int _insert_dev(const char *path, dev_t d) if (!(dev = (struct device *) btree_lookup(_cache.sysfs_only_devices, (uint32_t) d))) { /* create new device */ - if (loopfile) { - if (!(dev = dev_create_file(path, NULL, NULL, 0))) - return_0; - } else if (!(dev = _dev_create(d))) + if (!(dev = _dev_create(d))) return_0; } @@ -809,7 +793,7 @@ static int _insert_dev(const char *path, dev_t d) return 0; } - if (!loopfile && !_add_alias(dev, path_copy)) { + if (!_add_alias(dev, path_copy)) { log_error("Couldn't add alias to dev cache."); return 0; } @@ -839,7 +823,7 @@ static int _insert_dev(const char *path, dev_t d) return 0; } - if (!loopfile && !_add_alias(dev, path_copy)) { + if (!_add_alias(dev, path_copy)) { log_error("Couldn't add alias to dev cache."); return 0; } @@ -919,26 +903,6 @@ static int _insert_dir(const char *dir) return r; } -static int _insert_file(const char *path) -{ - struct stat info; - - if (stat(path, &info) < 0) { - log_sys_very_verbose("stat", path); - return 0; - } - - if (!S_ISREG(info.st_mode)) { - log_debug_devs("%s: Not a regular file", path); - return 0; - } - - if (!_insert_dev(path, 0)) - return_0; - - return 1; -} - static int _dev_cache_iterate_devs_for_index(void) { struct btree_iter *iter = btree_first(_cache.devices); @@ -1207,8 +1171,6 @@ static int _insert(const char *path, const struct stat *info, void dev_cache_scan(void) { - struct dir_list *dl; - log_debug_devs("Creating list of system devices."); _cache.has_scanned = 1; @@ -1216,9 +1178,6 @@ void dev_cache_scan(void) _insert_dirs(&_cache.dirs); (void) dev_cache_index_devs(); - - dm_list_iterate_items(dl, &_cache.files) - _insert_file(dl->dir); } int dev_cache_has_scanned(void) @@ -1317,7 +1276,6 @@ int dev_cache_init(struct cmd_context *cmd) } dm_list_init(&_cache.dirs); - dm_list_init(&_cache.files); if (!_init_preferred_names(cmd)) goto_bad; @@ -1411,32 +1369,6 @@ int dev_cache_add_dir(const char *path) return 1; } -int dev_cache_add_loopfile(const char *path) -{ - struct dir_list *dl; - struct stat st; - - if (stat(path, &st)) { - log_warn("Ignoring %s: %s.", path, strerror(errno)); - /* But don't fail */ - return 1; - } - - if (!S_ISREG(st.st_mode)) { - log_warn("Ignoring %s: Not a regular file.", path); - return 1; - } - - if (!(dl = _zalloc(sizeof(*dl) + strlen(path) + 1))) { - log_error("dir_list allocation failed for file"); - return 0; - } - - strcpy(dl->dir, path); - dm_list_add(&_cache.files, &dl->list); - return 1; -} - /* Check cached device name is still valid before returning it */ /* This should be a rare occurrence */ /* set quiet if the cache is expected to be out-of-date */ diff --git a/lib/device/dev-cache.h b/lib/device/dev-cache.h index 6386ba9..41c4a9c 100644 --- a/lib/device/dev-cache.h +++ b/lib/device/dev-cache.h @@ -51,8 +51,6 @@ void dev_cache_scan(void); int dev_cache_has_scanned(void); int dev_cache_add_dir(const char *path); -int dev_cache_add_loopfile(const char *path); -__attribute__((nonnull(1))) struct device *dev_cache_get(struct cmd_context *cmd, const char *name, struct dev_filter *f); const char *dev_cache_filtered_reason(const char *name);

1 0

master - lvmlockd: fix another missing lock_type null check
by David Teigland 21 Jun '18

21 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e166d2b14ca22ead559a5… Commit: e166d2b14ca22ead559a5898cc229ecbcc261007 Parent: 40c1f7889fd88ce4a2f2b42c594db3deb8f84593 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jun 21 09:00:23 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Jun 21 09:24:51 2018 -0500 lvmlockd: fix another missing lock_type null check Same as 347c807f8. --- lib/metadata/mirror.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 11f2a8f..58615d8 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -698,7 +698,7 @@ static int _split_mirror_images(struct logical_volume *lv, return 0; } - if (!strcmp(lv->vg->lock_type, "dlm")) + if (lv->vg->lock_type && !strcmp(lv->vg->lock_type, "dlm")) new_lv->lock_args = lv->lock_args; if (!dm_list_empty(&split_images)) {

1 0

master - radix-tree: FIx various bugs to do with removal
by Joe Thornber 21 Jun '18

21 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=20b9746c5d22de385e32f… Commit: 20b9746c5d22de385e32f5be9a8f04754be2c706 Parent: 42f7caf1c267a5b75ee38ea77a7e2fd7c582e704 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Tue Jun 19 10:19:06 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 21 09:49:08 2018 +0100 radix-tree: FIx various bugs to do with removal Add radix_tree_is_well_formed() which does some sanity checking of the tree. Call the above a lot in the unit tests. Fix revealed bugs. --- base/data-struct/radix-tree.c | 342 +++++++++++++++++++++++++++++++++++++---- base/data-struct/radix-tree.h | 4 + test/unit/Makefile | 1 - test/unit/radix_tree_t.c | 146 +++++++++++++++++- 4 files changed, 457 insertions(+), 36 deletions(-) diff --git a/base/data-struct/radix-tree.c b/base/data-struct/radix-tree.c index 222b350..24455e1 100644 --- a/base/data-struct/radix-tree.c +++ b/base/data-struct/radix-tree.c @@ -387,11 +387,10 @@ static bool _insert_node48(struct radix_tree *rt, struct value *v, uint8_t *kb, if (!n256) return false; + n256->nr_entries = 49; for (i = 0; i < 256; i++) { - if (n48->keys[i] >= 48) - continue; - - n256->values[i] = n48->values[n48->keys[i]]; + if (n48->keys[i] < 48) + n256->values[i] = n48->values[n48->keys[i]]; } if (!_insert(rt, n256->values + *kb, kb + 1, ke, rv)) { @@ -417,15 +416,13 @@ static bool _insert_node48(struct radix_tree *rt, struct value *v, uint8_t *kb, static bool _insert_node256(struct radix_tree *rt, struct value *v, uint8_t *kb, uint8_t *ke, union radix_value rv) { struct node256 *n256 = v->value.ptr; - bool was_unset = n256->values[*kb].type == UNSET; - - if (!_insert(rt, n256->values + *kb, kb + 1, ke, rv)) - return false; + bool r, was_unset = n256->values[*kb].type == UNSET; - if (was_unset) + r = _insert(rt, n256->values + *kb, kb + 1, ke, rv); + if (r && was_unset) n256->nr_entries++; - return true; + return r; } // FIXME: the tree should not be touched if insert fails (eg, OOM) @@ -546,7 +543,9 @@ static struct lookup_result _lookup_prefix(struct value *v, uint8_t *kb, uint8_t case NODE256: n256 = v->value.ptr; - return _lookup_prefix(n256->values + *kb, kb + 1, ke); + if (n256->values[*kb].type != UNSET) + return _lookup_prefix(n256->values + *kb, kb + 1, ke); + break; } return (struct lookup_result) {.v = v, .kb = kb}; @@ -574,11 +573,19 @@ static void _degrade_to_n4(struct node16 *n16, struct value *result) static void _degrade_to_n16(struct node48 *n48, struct value *result) { - struct node4 *n16 = zalloc(sizeof(*n16)); + unsigned i, count = 0; + struct node16 *n16 = zalloc(sizeof(*n16)); n16->nr_entries = n48->nr_entries; - memcpy(n16->keys, n48->keys, n48->nr_entries * sizeof(*n16->keys)); + for (i = 0; i < 256; i++) { + if (n48->keys[i] < 48) { + n16->keys[count] = i; + count++; + } + } + memcpy(n16->values, n48->values, n48->nr_entries * sizeof(*n16->values)); + free(n48); result->type = NODE16; @@ -588,27 +595,42 @@ static void _degrade_to_n16(struct node48 *n48, struct value *result) static void _degrade_to_n48(struct node256 *n256, struct value *result) { unsigned i, count = 0; - struct node4 *n48 = zalloc(sizeof(*n48)); + struct node48 *n48 = zalloc(sizeof(*n48)); + + memset(n48->keys, 48, sizeof(n48->keys)); n48->nr_entries = n256->nr_entries; for (i = 0; i < 256; i++) { if (n256->values[i].type == UNSET) continue; - n48->keys[count] = i; + n48->keys[i] = count; n48->values[count] = n256->values[i]; count++; } + free(n256); result->type = NODE48; result->value.ptr = n48; } +// Removes an entry in an array by sliding the values above it down. +static void _erase_elt(void *array, unsigned obj_size, unsigned count, unsigned index) +{ + if (index == (count - 1)) + // The simple case + return; + + memmove(((uint8_t *) array) + (obj_size * index), + ((uint8_t *) array) + (obj_size * (index + 1)), + obj_size * (count - index - 1)); +} + static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint8_t *ke) { bool r; - unsigned i; + unsigned i, j; struct value_chain *vc; struct prefix_chain *pc; struct node4 *n4; @@ -643,7 +665,8 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint vc = root->value.ptr; r = _remove(rt, &vc->child, kb, ke); if (r && (vc->child.type == UNSET)) { - memcpy(root, &vc->child, sizeof(*root)); + root->type = VALUE; + root->value = vc->value; free(vc); } return r; @@ -657,7 +680,12 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint if (kb[i] != pc->prefix[i]) return false; - return _remove(rt, &pc->child, kb + pc->len, ke); + r = _remove(rt, &pc->child, kb + pc->len, ke); + if (r && pc->child.type == UNSET) { + root->type = UNSET; + free(pc); + } + return r; case NODE4: n4 = root->value.ptr; @@ -665,13 +693,16 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint if (n4->keys[i] == *kb) { r = _remove(rt, n4->values + i, kb + 1, ke); if (r && n4->values[i].type == UNSET) { + if (i < n4->nr_entries) { + _erase_elt(n4->keys, sizeof(*n4->keys), n4->nr_entries, i); + _erase_elt(n4->values, sizeof(*n4->values), n4->nr_entries, i); + } + n4->nr_entries--; - if (i < n4->nr_entries) - // slide the entries down - memmove(n4->keys + i, n4->keys + i + 1, - sizeof(*n4->keys) * (n4->nr_entries - i)); - if (!n4->nr_entries) + if (!n4->nr_entries) { + free(n4); root->type = UNSET; + } } return r; } @@ -684,13 +715,15 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint if (n16->keys[i] == *kb) { r = _remove(rt, n16->values + i, kb + 1, ke); if (r && n16->values[i].type == UNSET) { + if (i < n16->nr_entries) { + _erase_elt(n16->keys, sizeof(*n16->keys), n16->nr_entries, i); + _erase_elt(n16->values, sizeof(*n16->values), n16->nr_entries, i); + } + n16->nr_entries--; - if (i < n16->nr_entries) - // slide the entries down - memmove(n16->keys + i, n16->keys + i + 1, - sizeof(*n16->keys) * (n16->nr_entries - i)); - if (n16->nr_entries <= 4) + if (n16->nr_entries <= 4) { _degrade_to_n4(n16, root); + } } return r; } @@ -704,6 +737,10 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint r = _remove(rt, n48->values + i, kb + 1, ke); if (r && n48->values[i].type == UNSET) { n48->keys[*kb] = 48; + for (j = 0; j < 256; j++) + if (n48->keys[j] < 48 && n48->keys[j] > i) + n48->keys[j]--; + _erase_elt(n48->values, sizeof(*n48->values), n48->nr_entries, i); n48->nr_entries--; if (n48->nr_entries <= 16) _degrade_to_n16(n48, root); @@ -736,6 +773,8 @@ bool radix_tree_remove(struct radix_tree *rt, uint8_t *key_begin, uint8_t *key_e return false; } +//---------------------------------------------------------------- + static bool _prefix_chain_matches(struct lookup_result *lr, uint8_t *ke) { // It's possible the top node is a prefix chain, and @@ -754,19 +793,141 @@ static bool _prefix_chain_matches(struct lookup_result *lr, uint8_t *ke) return false; } +static bool _remove_subtree(struct radix_tree *rt, struct value *root, uint8_t *kb, uint8_t *ke, unsigned *count) +{ + bool r; + unsigned i, j, len; + struct value_chain *vc; + struct prefix_chain *pc; + struct node4 *n4; + struct node16 *n16; + struct node48 *n48; + struct node256 *n256; + + if (kb == ke) { + *count += _free_node(rt, *root); + root->type = UNSET; + return true; + } + + switch (root->type) { + case UNSET: + case VALUE: + // No entries with the given prefix + return true; + + case VALUE_CHAIN: + vc = root->value.ptr; + r = _remove_subtree(rt, &vc->child, kb, ke, count); + if (r && (vc->child.type == UNSET)) { + root->type = VALUE; + root->value = vc->value; + free(vc); + } + return r; + + case PREFIX_CHAIN: + pc = root->value.ptr; + len = min(pc->len, ke - kb); + for (i = 0; i < len; i++) + if (kb[i] != pc->prefix[i]) + return true; + + r = _remove_subtree(rt, &pc->child, len < pc->len ? ke : (kb + pc->len), ke, count); + if (r && pc->child.type == UNSET) { + root->type = UNSET; + free(pc); + } + return r; + + case NODE4: + n4 = root->value.ptr; + for (i = 0; i < n4->nr_entries; i++) { + if (n4->keys[i] == *kb) { + r = _remove_subtree(rt, n4->values + i, kb + 1, ke, count); + if (r && n4->values[i].type == UNSET) { + if (i < n4->nr_entries) { + _erase_elt(n4->keys, sizeof(*n4->keys), n4->nr_entries, i); + _erase_elt(n4->values, sizeof(*n4->values), n4->nr_entries, i); + } + + n4->nr_entries--; + if (!n4->nr_entries) { + free(n4); + root->type = UNSET; + } + } + return r; + } + } + return true; + + case NODE16: + n16 = root->value.ptr; + for (i = 0; i < n16->nr_entries; i++) { + if (n16->keys[i] == *kb) { + r = _remove_subtree(rt, n16->values + i, kb + 1, ke, count); + if (r && n16->values[i].type == UNSET) { + if (i < n16->nr_entries) { + _erase_elt(n16->keys, sizeof(*n16->keys), n16->nr_entries, i); + _erase_elt(n16->values, sizeof(*n16->values), n16->nr_entries, i); + } + + n16->nr_entries--; + if (n16->nr_entries <= 4) + _degrade_to_n4(n16, root); + } + return r; + } + } + return true; + + case NODE48: + n48 = root->value.ptr; + i = n48->keys[*kb]; + if (i < 48) { + r = _remove_subtree(rt, n48->values + i, kb + 1, ke, count); + if (r && n48->values[i].type == UNSET) { + n48->keys[*kb] = 48; + for (j = 0; j < 256; j++) + if (n48->keys[j] < 48 && n48->keys[j] > i) + n48->keys[j]--; + _erase_elt(n48->values, sizeof(*n48->values), n48->nr_entries, i); + n48->nr_entries--; + if (n48->nr_entries <= 16) + _degrade_to_n16(n48, root); + } + return r; + } + return true; + + case NODE256: + n256 = root->value.ptr; + r = _remove_subtree(rt, n256->values + (*kb), kb + 1, ke, count); + if (r && n256->values[*kb].type == UNSET) { + n256->nr_entries--; + if (n256->nr_entries <= 48) + _degrade_to_n48(n256, root); + } + return r; + } + + // Shouldn't get here + return false; +} + unsigned radix_tree_remove_prefix(struct radix_tree *rt, uint8_t *kb, uint8_t *ke) { unsigned count = 0; - struct lookup_result lr = _lookup_prefix(&rt->root, kb, ke); - if (lr.kb == ke || _prefix_chain_matches(&lr, ke)) { - count = _free_node(rt, *lr.v); - lr.v->type = UNSET; - } - rt->nr_entries -= count; + if (_remove_subtree(rt, &rt->root, kb, ke, &count)) + rt->nr_entries -= count; + return count; } +//---------------------------------------------------------------- + bool radix_tree_lookup(struct radix_tree *rt, uint8_t *kb, uint8_t *ke, union radix_value *result) { @@ -860,3 +1021,116 @@ void radix_tree_iterate(struct radix_tree *rt, uint8_t *kb, uint8_t *ke, } //---------------------------------------------------------------- +// Checks: +// 1) The number of entries matches rt->nr_entries +// 2) The number of entries is correct in each node + +static bool _check_nodes(struct value *v, unsigned *count) +{ + unsigned i, ncount; + struct value_chain *vc; + struct prefix_chain *pc; + struct node4 *n4; + struct node16 *n16; + struct node48 *n48; + struct node256 *n256; + + switch (v->type) { + case UNSET: + return true; + + case VALUE: + (*count)++; + return true; + + case VALUE_CHAIN: + (*count)++; + vc = v->value.ptr; + return _check_nodes(&vc->child, count); + + case PREFIX_CHAIN: + pc = v->value.ptr; + return _check_nodes(&pc->child, count); + + case NODE4: + n4 = v->value.ptr; + for (i = 0; i < n4->nr_entries; i++) + if (!_check_nodes(n4->values + i, count)) + return false; + return true; + + case NODE16: + n16 = v->value.ptr; + for (i = 0; i < n16->nr_entries; i++) + if (!_check_nodes(n16->values + i, count)) + return false; + return true; + + case NODE48: + n48 = v->value.ptr; + ncount = 0; + for (i = 0; i < 256; i++) { + if (n48->keys[i] < 48) { + ncount++; + if (!_check_nodes(n48->values + n48->keys[i], count)) + return false; + } + } + + if (ncount != n48->nr_entries) { + fprintf(stderr, "incorrect number of entries in n48, n48->nr_entries = %u, actual = %u\n", + n48->nr_entries, ncount); + return false; + } + + return true; + + case NODE256: + n256 = v->value.ptr; + + ncount = 0; + for (i = 0; i < 256; i++) { + struct value *v2 = n256->values + i; + + if (v2->type == UNSET) + continue; + + if (!_check_nodes(v2, count)) + return false; + + ncount++; + } + + if (ncount != n256->nr_entries) { + fprintf(stderr, "incorrect number of entries in n256, n256->nr_entries = %u, actual = %u\n", + n256->nr_entries, ncount); + return false; + } + + return true; + + default: + fprintf(stderr, "unknown value type: %u\n", v->type); + } + + fprintf(stderr, "shouldn't get here\n"); + return false; +} + +bool radix_tree_is_well_formed(struct radix_tree *rt) +{ + unsigned count = 0; + + if (!_check_nodes(&rt->root, &count)) + return false; + + if (rt->nr_entries != count) { + fprintf(stderr, "incorrect entry count: rt->nr_entries = %u, actual = %u\n", + rt->nr_entries, count); + return false; + } + + return true; +} + +//---------------------------------------------------------------- diff --git a/base/data-struct/radix-tree.h b/base/data-struct/radix-tree.h index 1b6aee8..2deaf9a 100644 --- a/base/data-struct/radix-tree.h +++ b/base/data-struct/radix-tree.h @@ -53,6 +53,10 @@ struct radix_tree_iterator { void radix_tree_iterate(struct radix_tree *rt, uint8_t *kb, uint8_t *ke, struct radix_tree_iterator *it); +// Checks that some constraints on the shape of the tree are +// being held. For debug only. +bool radix_tree_is_well_formed(struct radix_tree *rt); + //---------------------------------------------------------------- #endif diff --git a/test/unit/Makefile b/test/unit/Makefile index e7cc852..9155c47 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -11,7 +11,6 @@ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA UNIT_SOURCE=\ - base/data-struct/radix-tree.c \ device_mapper/vdo/status.c \ \ test/unit/activation-generator_t.c \ diff --git a/test/unit/radix_tree_t.c b/test/unit/radix_tree_t.c index 7266a8a..e2d11e8 100644 --- a/test/unit/radix_tree_t.c +++ b/test/unit/radix_tree_t.c @@ -44,6 +44,7 @@ static void test_insert_one(void *fixture) unsigned char k = 'a'; v.n = 65; T_ASSERT(radix_tree_insert(rt, &k, &k + 1, v)); + T_ASSERT(radix_tree_is_well_formed(rt)); v.n = 0; T_ASSERT(radix_tree_lookup(rt, &k, &k + 1, &v)); T_ASSERT_EQUAL(v.n, 65); @@ -62,6 +63,8 @@ static void test_single_byte_keys(void *fixture) T_ASSERT(radix_tree_insert(rt, &k, &k + 1, v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); + for (i = 0; i < count; i++) { k = i; T_ASSERT(radix_tree_lookup(rt, &k, &k + 1, &v)); @@ -82,12 +85,16 @@ static void test_overwrite_single_byte_keys(void *fixture) T_ASSERT(radix_tree_insert(rt, &k, &k + 1, v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); + for (i = 0; i < count; i++) { k = i; v.n = 1000 + i; T_ASSERT(radix_tree_insert(rt, &k, &k + 1, v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); + for (i = 0; i < count; i++) { k = i; T_ASSERT(radix_tree_lookup(rt, &k, &k + 1, &v)); @@ -109,6 +116,8 @@ static void test_16_bit_keys(void *fixture) T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); + for (i = 0; i < count; i++) { k[0] = i / 256; k[1] = i % 256; @@ -127,8 +136,10 @@ static void test_prefix_keys(void *fixture) k[1] = 200; v.n = 1024; T_ASSERT(radix_tree_insert(rt, k, k + 1, v)); + T_ASSERT(radix_tree_is_well_formed(rt)); v.n = 2345; T_ASSERT(radix_tree_insert(rt, k, k + 2, v)); + T_ASSERT(radix_tree_is_well_formed(rt)); T_ASSERT(radix_tree_lookup(rt, k, k + 1, &v)); T_ASSERT_EQUAL(v.n, 1024); T_ASSERT(radix_tree_lookup(rt, k, k + 2, &v)); @@ -145,8 +156,10 @@ static void test_prefix_keys_reversed(void *fixture) k[1] = 200; v.n = 1024; T_ASSERT(radix_tree_insert(rt, k, k + 2, v)); + T_ASSERT(radix_tree_is_well_formed(rt)); v.n = 2345; T_ASSERT(radix_tree_insert(rt, k, k + 1, v)); + T_ASSERT(radix_tree_is_well_formed(rt)); T_ASSERT(radix_tree_lookup(rt, k, k + 2, &v)); T_ASSERT_EQUAL(v.n, 1024); T_ASSERT(radix_tree_lookup(rt, k, k + 1, &v)); @@ -170,7 +183,10 @@ static void test_sparse_keys(void *fixture) _gen_key(k, k + sizeof(k)); v.n = 1234; T_ASSERT(radix_tree_insert(rt, k, k + 32, v)); + // FIXME: remove + //T_ASSERT(radix_tree_is_well_formed(rt)); } + T_ASSERT(radix_tree_is_well_formed(rt)); } static void test_remove_one(void *fixture) @@ -182,7 +198,9 @@ static void test_remove_one(void *fixture) _gen_key(k, k + sizeof(k)); v.n = 1234; T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); + T_ASSERT(radix_tree_is_well_formed(rt)); T_ASSERT(radix_tree_remove(rt, k, k + sizeof(k))); + T_ASSERT(radix_tree_is_well_formed(rt)); T_ASSERT(!radix_tree_lookup(rt, k, k + sizeof(k), &v)); } @@ -199,14 +217,19 @@ static void test_remove_one_byte_keys(void *fixture) T_ASSERT(radix_tree_insert(rt, k, k + 1, v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); for (i = 0; i < 256; i++) { k[0] = i; T_ASSERT(radix_tree_remove(rt, k, k + 1)); + T_ASSERT(radix_tree_is_well_formed(rt)); for (j = i + 1; j < 256; j++) { k[0] = j; T_ASSERT(radix_tree_lookup(rt, k, k + 1, &v)); - T_ASSERT_EQUAL(v.n, j + 1000); + if (v.n != j + 1000) + test_fail("v.n (%u) != j + 1000 (%u)\n", + (unsigned) v.n, + (unsigned) j + 1000); } } @@ -216,6 +239,40 @@ static void test_remove_one_byte_keys(void *fixture) } } +static void test_remove_one_byte_keys_reversed(void *fixture) +{ + struct radix_tree *rt = fixture; + unsigned i, j; + uint8_t k[1]; + union radix_value v; + + for (i = 0; i < 256; i++) { + k[0] = i; + v.n = i + 1000; + T_ASSERT(radix_tree_insert(rt, k, k + 1, v)); + } + + T_ASSERT(radix_tree_is_well_formed(rt)); + for (i = 256; i; i--) { + k[0] = i - 1; + T_ASSERT(radix_tree_remove(rt, k, k + 1)); + T_ASSERT(radix_tree_is_well_formed(rt)); + + for (j = 0; j < i - 1; j++) { + k[0] = j; + T_ASSERT(radix_tree_lookup(rt, k, k + 1, &v)); + if (v.n != j + 1000) + test_fail("v.n (%u) != j + 1000 (%u)\n", + (unsigned) v.n, + (unsigned) j + 1000); + } + } + + for (i = 0; i < 256; i++) { + k[0] = i; + T_ASSERT(!radix_tree_lookup(rt, k, k + 1, &v)); + } +} static void test_remove_prefix_keys(void *fixture) { struct radix_tree *rt = fixture; @@ -230,8 +287,10 @@ static void test_remove_prefix_keys(void *fixture) T_ASSERT(radix_tree_insert(rt, k, k + i, v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); for (i = 0; i < 32; i++) { T_ASSERT(radix_tree_remove(rt, k, k + i)); + T_ASSERT(radix_tree_is_well_formed(rt)); for (j = i + 1; j < 32; j++) { T_ASSERT(radix_tree_lookup(rt, k, k + j, &v)); T_ASSERT_EQUAL(v.n, j); @@ -256,8 +315,10 @@ static void test_remove_prefix_keys_reversed(void *fixture) T_ASSERT(radix_tree_insert(rt, k, k + i, v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); for (i = 0; i < 32; i++) { T_ASSERT(radix_tree_remove(rt, k, k + (31 - i))); + T_ASSERT(radix_tree_is_well_formed(rt)); for (j = 0; j < 31 - i; j++) { T_ASSERT(radix_tree_lookup(rt, k, k + j, &v)); T_ASSERT_EQUAL(v.n, j); @@ -284,9 +345,12 @@ static void test_remove_prefix(void *fixture) T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); + // remove keys in a sub range k[0] = 21; T_ASSERT_EQUAL(radix_tree_remove_prefix(rt, k, k + 1), count); + T_ASSERT(radix_tree_is_well_formed(rt)); } static void test_remove_prefix_single(void *fixture) @@ -298,7 +362,9 @@ static void test_remove_prefix_single(void *fixture) _gen_key(k, k + sizeof(k)); v.n = 1234; T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); + T_ASSERT(radix_tree_is_well_formed(rt)); T_ASSERT_EQUAL(radix_tree_remove_prefix(rt, k, k + 2), 1); + T_ASSERT(radix_tree_is_well_formed(rt)); } static void test_size(void *fixture) @@ -318,6 +384,7 @@ static void test_size(void *fixture) } T_ASSERT_EQUAL(radix_tree_size(rt), 10000 - dup_count); + T_ASSERT(radix_tree_is_well_formed(rt)); } struct visitor { @@ -348,6 +415,7 @@ static void test_iterate_all(void *fixture) T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); vt.count = 0; vt.it.visit = _visit; radix_tree_iterate(rt, NULL, NULL, &vt.it); @@ -371,6 +439,7 @@ static void test_iterate_subset(void *fixture) T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); vt.count = 0; vt.it.visit = _visit; k[0] = 21; @@ -390,6 +459,7 @@ static void test_iterate_single(void *fixture) v.n = 1234; T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); + T_ASSERT(radix_tree_is_well_formed(rt)); vt.count = 0; vt.it.visit = _visit; radix_tree_iterate(rt, k, k + 3, &vt.it); @@ -411,6 +481,7 @@ static void test_iterate_vary_middle(void *fixture) T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); } + T_ASSERT(radix_tree_is_well_formed(rt)); vt.it.visit = _visit; for (i = 0; i < 16; i++) { vt.count = 0; @@ -422,6 +493,77 @@ static void test_iterate_vary_middle(void *fixture) //---------------------------------------------------------------- +#define DTR_COUNT 100 + +struct counter { + unsigned c; + uint8_t present[DTR_COUNT]; +}; + +static void _counting_dtr(void *context, union radix_value v) +{ + struct counter *c = context; + c->c++; + T_ASSERT(v.n < DTR_COUNT); + c->present[v.n] = 0; +} + +static void test_remove_calls_dtr(void *fixture) +{ + struct counter c; + struct radix_tree *rt = radix_tree_create(_counting_dtr, &c); + T_ASSERT(rt); + + // Bug hunting, so I need the keys to be deterministic + srand(0); + + c.c = 0; + memset(c.present, 1, sizeof(c.present)); + + { + unsigned i; + uint8_t keys[DTR_COUNT * 3]; + union radix_value v; + + // generate and insert a lot of keys + for (i = 0; i < DTR_COUNT; i++) { + bool found = false; + do { + v.n = i; + uint8_t *k = keys + (i * 3); + _gen_key(k, k + 3); + if (!radix_tree_lookup(rt, k, k + 3, &v)) { + T_ASSERT(radix_tree_insert(rt, k, k + 3, v)); + found = true; + } + + } while (!found); + } + + T_ASSERT(radix_tree_is_well_formed(rt)); + + // double check + for (i = 0; i < DTR_COUNT; i++) { + uint8_t *k = keys + (i * 3); + T_ASSERT(radix_tree_lookup(rt, k, k + 3, &v)); + } + + for (i = 0; i < DTR_COUNT; i++) { + uint8_t *k = keys + (i * 3); + // FIXME: check the values get passed to the dtr + T_ASSERT(radix_tree_remove(rt, k, k + 3)); + } + + T_ASSERT(c.c == DTR_COUNT); + for (i = 0; i < DTR_COUNT; i++) + T_ASSERT(!c.present[i]); + } + + radix_tree_destroy(rt); +} + +//---------------------------------------------------------------- + #define T(path, desc, fn) register_test(ts, "/base/data-struct/radix-tree/" path, desc, fn) void radix_tree_tests(struct dm_list *all_tests) @@ -442,6 +584,7 @@ void radix_tree_tests(struct dm_list *all_tests) T("sparse-keys", "see what the memory usage is for sparsely distributed keys", test_sparse_keys); T("remove-one", "remove one entry", test_remove_one); T("remove-one-byte-keys", "remove many one byte keys", test_remove_one_byte_keys); + T("remove-one-byte-keys-reversed", "remove many one byte keys reversed", test_remove_one_byte_keys_reversed); T("remove-prefix-keys", "remove a set of keys that have common prefixes", test_remove_prefix_keys); T("remove-prefix-keys-reversed", "remove a set of keys that have common prefixes (reversed)", test_remove_prefix_keys_reversed); T("remove-prefix", "remove a subrange", test_remove_prefix); @@ -451,6 +594,7 @@ void radix_tree_tests(struct dm_list *all_tests) T("iterate-subset", "iterate a subset of entries in tree", test_iterate_subset); T("iterate-single", "iterate a subset that contains a single entry", test_iterate_single); T("iterate-vary-middle", "iterate keys that vary in the middle", test_iterate_vary_middle); + T("remove-calls-dtr", "remove should call the dtr for the value", test_remove_calls_dtr); dm_list_add(all_tests, &ts->list); }

1 0

master - radix-tree: More debugging of remove
by Joe Thornber 21 Jun '18

21 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=40c1f7889fd88ce4a2f2b… Commit: 40c1f7889fd88ce4a2f2b42c594db3deb8f84593 Parent: c8cfbfa605ce6577c390cf940d51d872b3556c64 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Wed Jun 20 10:04:59 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 21 09:49:43 2018 +0100 radix-tree: More debugging of remove There's now a pretty printer called radix_tree_dump() n4, n16, and n48 weren't UNSETting the last entry after sliding values down. --- base/data-struct/radix-tree.c | 157 ++++++++++++++++++++++++++++++++++++----- base/data-struct/radix-tree.h | 2 + test/unit/radix_tree_t.c | 32 ++++++++ 3 files changed, 174 insertions(+), 17 deletions(-) diff --git a/base/data-struct/radix-tree.c b/base/data-struct/radix-tree.c index 24455e1..202d463 100644 --- a/base/data-struct/radix-tree.c +++ b/base/data-struct/radix-tree.c @@ -251,7 +251,11 @@ static bool _insert_prefix_chain(struct radix_tree *rt, struct value *v, uint8_t { struct prefix_chain *pc = v->value.ptr; - if (*kb == pc->prefix[0]) { + if (!pc->len) { + v->type = VALUE; + v->value = rv; + + } else if (*kb == pc->prefix[0]) { // There's a common prefix let's split the chain into two and // recurse. struct prefix_chain *pc2; @@ -282,25 +286,23 @@ static bool _insert_prefix_chain(struct radix_tree *rt, struct value *v, uint8_t if (!n4) return false; - n4->keys[0] = *kb; - if (!_insert(rt, n4->values, kb + 1, ke, rv)) { + n4->keys[0] = pc->prefix[0]; + if (pc->len == 1) { + n4->values[0] = pc->child; + free(pc); + } else { + memmove(pc->prefix, pc->prefix + 1, pc->len - 1); + pc->len--; + n4->values[0] = *v; + } + + n4->keys[1] = *kb; + if (!_insert(rt, n4->values + 1, kb + 1, ke, rv)) { free(n4); return false; } - if (pc->len) { - n4->keys[1] = pc->prefix[0]; - if (pc->len == 1) { - n4->values[1] = pc->child; - free(pc); - } else { - memmove(pc->prefix, pc->prefix + 1, pc->len - 1); - pc->len--; - n4->values[1] = *v; - } - n4->nr_entries = 2; - } else - n4->nr_entries = 1; + n4->nr_entries = 2; v->type = NODE4; v->value.ptr = n4; @@ -330,7 +332,6 @@ static bool _insert_node4(struct radix_tree *rt, struct value *v, uint8_t *kb, u v->type = NODE16; v->value.ptr = n16; } else { - n4 = v->value.ptr; if (!_insert(rt, n4->values + n4->nr_entries, kb + 1, ke, rv)) return false; @@ -699,6 +700,7 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint } n4->nr_entries--; + n4->values[n4->nr_entries].type = UNSET; if (!n4->nr_entries) { free(n4); root->type = UNSET; @@ -721,6 +723,7 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint } n16->nr_entries--; + n16->values[n16->nr_entries].type = UNSET; if (n16->nr_entries <= 4) { _degrade_to_n4(n16, root); } @@ -742,6 +745,7 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint n48->keys[j]--; _erase_elt(n48->values, sizeof(*n48->values), n48->nr_entries, i); n48->nr_entries--; + n48->values[n48->nr_entries].type = UNSET; if (n48->nr_entries <= 16) _degrade_to_n16(n48, root); } @@ -1024,6 +1028,8 @@ void radix_tree_iterate(struct radix_tree *rt, uint8_t *kb, uint8_t *ke, // Checks: // 1) The number of entries matches rt->nr_entries // 2) The number of entries is correct in each node +// 3) prefix chain len > 0 +// 4) all unused values are UNSET static bool _check_nodes(struct value *v, unsigned *count) { @@ -1057,6 +1063,13 @@ static bool _check_nodes(struct value *v, unsigned *count) for (i = 0; i < n4->nr_entries; i++) if (!_check_nodes(n4->values + i, count)) return false; + + for (i = n4->nr_entries; i < 4; i++) + if (n4->values[i].type != UNSET) { + fprintf(stderr, "unused value is not UNSET\n"); + return false; + } + return true; case NODE16: @@ -1064,6 +1077,13 @@ static bool _check_nodes(struct value *v, unsigned *count) for (i = 0; i < n16->nr_entries; i++) if (!_check_nodes(n16->values + i, count)) return false; + + for (i = n16->nr_entries; i < 16; i++) + if (n16->values[i].type != UNSET) { + fprintf(stderr, "unused value is not UNSET\n"); + return false; + } + return true; case NODE48: @@ -1083,6 +1103,12 @@ static bool _check_nodes(struct value *v, unsigned *count) return false; } + for (i = n48->nr_entries; i < 48; i++) + if (n48->values[i].type != UNSET) { + fprintf(stderr, "unused value is not UNSET\n"); + return false; + } + return true; case NODE256: @@ -1134,3 +1160,100 @@ bool radix_tree_is_well_formed(struct radix_tree *rt) } //---------------------------------------------------------------- + +static void _dump(FILE *out, struct value v, unsigned indent) +{ + unsigned i; + struct value_chain *vc; + struct prefix_chain *pc; + struct node4 *n4; + struct node16 *n16; + struct node48 *n48; + struct node256 *n256; + + if (v.type == UNSET) + return; + + for (i = 0; i < 2 * indent; i++) + fprintf(out, " "); + + switch (v.type) { + case UNSET: + // can't happen + break; + + case VALUE: + fprintf(out, "<val: %llu>\n", (unsigned long long) v.value.n); + break; + + case VALUE_CHAIN: + vc = v.value.ptr; + fprintf(out, "<val_chain: %llu>\n", (unsigned long long) vc->value.n); + _dump(out, vc->child, indent + 1); + break; + + case PREFIX_CHAIN: + pc = v.value.ptr; + fprintf(out, "<prefix: "); + for (i = 0; i < pc->len; i++) + fprintf(out, "%x.", (unsigned) *(pc->prefix + i)); + fprintf(out, ">\n"); + _dump(out, pc->child, indent + 1); + break; + + case NODE4: + n4 = v.value.ptr; + fprintf(out, "<n4: "); + for (i = 0; i < n4->nr_entries; i++) + fprintf(out, "%x ", (unsigned) n4->keys[i]); + fprintf(out, ">\n"); + + for (i = 0; i < n4->nr_entries; i++) + _dump(out, n4->values[i], indent + 1); + break; + + case NODE16: + n16 = v.value.ptr; + fprintf(out, "<n16: "); + for (i = 0; i < n16->nr_entries; i++) + fprintf(out, "%x ", (unsigned) n16->keys[i]); + fprintf(out, ">\n"); + + for (i = 0; i < n16->nr_entries; i++) + _dump(out, n16->values[i], indent + 1); + break; + + case NODE48: + n48 = v.value.ptr; + fprintf(out, "<n48: "); + for (i = 0; i < 256; i++) + if (n48->keys[i] < 48) + fprintf(out, "%x ", i); + fprintf(out, ">\n"); + + for (i = 0; i < 256; i++) + if (n48->keys[i] < 48) + _dump(out, n48->values[i], indent + 1); + break; + + case NODE256: + n256 = v.value.ptr; + fprintf(out, "<n256: "); + for (i = 0; i < 256; i++) + if (n256->values[i].type != UNSET) + fprintf(out, "%x ", i); + fprintf(out, ">\n"); + + for (i = 0; i < 256; i++) + if (n256->values[i].type != UNSET) + _dump(out, n256->values[i], indent + 1); + break; + } +} + +void radix_tree_dump(struct radix_tree *rt, FILE *out) +{ + _dump(out, rt->root, 0); +} + +//---------------------------------------------------------------- diff --git a/base/data-struct/radix-tree.h b/base/data-struct/radix-tree.h index 2deaf9a..5d4d04c 100644 --- a/base/data-struct/radix-tree.h +++ b/base/data-struct/radix-tree.h @@ -15,6 +15,7 @@ #include <stdbool.h> #include <stdint.h> +#include <stdio.h> //---------------------------------------------------------------- @@ -56,6 +57,7 @@ void radix_tree_iterate(struct radix_tree *rt, uint8_t *kb, uint8_t *ke, // Checks that some constraints on the shape of the tree are // being held. For debug only. bool radix_tree_is_well_formed(struct radix_tree *rt); +void radix_tree_dump(struct radix_tree *rt, FILE *out); //---------------------------------------------------------------- diff --git a/test/unit/radix_tree_t.c b/test/unit/radix_tree_t.c index 4ee22c1..2fba15f 100644 --- a/test/unit/radix_tree_t.c +++ b/test/unit/radix_tree_t.c @@ -605,6 +605,37 @@ static void test_destroy_calls_dtr(void *fixture) //---------------------------------------------------------------- +static void test_bcache_scenario(void *fixture) +{ + struct radix_tree *rt = fixture; + + unsigned i; + uint8_t k[6]; + union radix_value v; + + memset(k, 0, sizeof(k)); + + for (i = 0; i < 3; i++) { + // it has to be the 4th byte that varies to + // trigger the bug. + k[4] = i; + v.n = i; + T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); + } + T_ASSERT(radix_tree_is_well_formed(rt)); + + k[4] = 0; + T_ASSERT(radix_tree_remove(rt, k, k + sizeof(k))); + T_ASSERT(radix_tree_is_well_formed(rt)); + + k[4] = i; + v.n = i; + T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); + T_ASSERT(radix_tree_is_well_formed(rt)); +} + +//---------------------------------------------------------------- + #define T(path, desc, fn) register_test(ts, "/base/data-struct/radix-tree/" path, desc, fn) void radix_tree_tests(struct dm_list *all_tests) @@ -637,6 +668,7 @@ void radix_tree_tests(struct dm_list *all_tests) T("iterate-vary-middle", "iterate keys that vary in the middle", test_iterate_vary_middle); T("remove-calls-dtr", "remove should call the dtr for the value", test_remove_calls_dtr); T("destroy-calls-dtr", "destroy should call the dtr for all values", test_destroy_calls_dtr); + T("bcache-scenario", "A specific series of keys from a bcache scenario", test_bcache_scenario); dm_list_add(all_tests, &ts->list); }

1 0

master - radix_tree: add new test case
by Joe Thornber 21 Jun '18

21 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c8cfbfa605ce6577c390c… Commit: c8cfbfa605ce6577c390cf940d51d872b3556c64 Parent: 20b9746c5d22de385e32f5be9a8f04754be2c706 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Tue Jun 19 13:38:13 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 21 09:49:25 2018 +0100 radix_tree: add new test case Check that value destructors are called by radix_tree_destroy() --- test/unit/radix_tree_t.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/test/unit/radix_tree_t.c b/test/unit/radix_tree_t.c index e2d11e8..4ee22c1 100644 --- a/test/unit/radix_tree_t.c +++ b/test/unit/radix_tree_t.c @@ -562,6 +562,47 @@ static void test_remove_calls_dtr(void *fixture) radix_tree_destroy(rt); } +static void test_destroy_calls_dtr(void *fixture) +{ + unsigned i; + struct counter c; + struct radix_tree *rt = radix_tree_create(_counting_dtr, &c); + T_ASSERT(rt); + + // Bug hunting, so I need the keys to be deterministic + srand(0); + + c.c = 0; + memset(c.present, 1, sizeof(c.present)); + + { + uint8_t keys[DTR_COUNT * 3]; + union radix_value v; + + // generate and insert a lot of keys + for (i = 0; i < DTR_COUNT; i++) { + bool found = false; + do { + v.n = i; + uint8_t *k = keys + (i * 3); + _gen_key(k, k + 3); + if (!radix_tree_lookup(rt, k, k + 3, &v)) { + T_ASSERT(radix_tree_insert(rt, k, k + 3, v)); + found = true; + } + + } while (!found); + } + + T_ASSERT(radix_tree_is_well_formed(rt)); + } + + radix_tree_destroy(rt); + T_ASSERT(c.c == DTR_COUNT); + for (i = 0; i < DTR_COUNT; i++) + T_ASSERT(!c.present[i]); +} + //---------------------------------------------------------------- #define T(path, desc, fn) register_test(ts, "/base/data-struct/radix-tree/" path, desc, fn) @@ -595,6 +636,7 @@ void radix_tree_tests(struct dm_list *all_tests) T("iterate-single", "iterate a subset that contains a single entry", test_iterate_single); T("iterate-vary-middle", "iterate keys that vary in the middle", test_iterate_vary_middle); T("remove-calls-dtr", "remove should call the dtr for the value", test_remove_calls_dtr); + T("destroy-calls-dtr", "destroy should call the dtr for all values", test_destroy_calls_dtr); dm_list_add(all_tests, &ts->list); }

1 0

master - scan: work around udev problems by avoiding open RDWR
by David Teigland 20 Jun '18

20 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=42f7caf1c267a5b75ee38… Commit: 42f7caf1c267a5b75ee38ea77a7e2fd7c582e704 Parent: f85a010a6bc9dc0414ccdf9c6b195c78231f1914 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 20 11:32:45 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 20 14:08:12 2018 -0500 scan: work around udev problems by avoiding open RDWR udev creates a train wreck of events if we open devices with RDWR. Until we can fix/disable/scrap udev, work around this by opening RDONLY and then closing/reopening RDWR when a write is needed. This invalidates the bcache blocks for the device before writing so it can trigger unnecessary rereading. --- lib/device/device.h | 1 + lib/label/label.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/lib/device/device.h b/lib/device/device.h index 00e398a..e879dbb 100644 --- a/lib/device/device.h +++ b/lib/device/device.h @@ -35,6 +35,7 @@ #define DEV_BCACHE_EXCL 0x00001000 /* bcache_fd should be open EXCL */ #define DEV_FILTER_AFTER_SCAN 0x00002000 /* apply filter after bcache has data */ #define DEV_FILTER_OUT_SCAN 0x00004000 /* filtered out during label scan */ +#define DEV_BCACHE_WRITE 0x00008000 /* bcache_fd is open with RDWR */ /* * Support for external device info. diff --git a/lib/label/label.c b/lib/label/label.c index 065c01f..d2c8685 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -467,12 +467,24 @@ static int _scan_dev_open(struct device *dev) name_sl = dm_list_item(name_list, struct dm_str_list); name = name_sl->str; - flags |= O_RDWR; flags |= O_DIRECT; flags |= O_NOATIME; - if (dev->flags & DEV_BCACHE_EXCL) + /* + * FIXME: udev is a train wreck when we open RDWR and close, so we + * need to only use RDWR when we actually need to write, and use + * RDONLY otherwise. Fix, disable or scrap udev nonsense so we can + * just open with RDWR by default. + */ + + if (dev->flags & DEV_BCACHE_EXCL) { flags |= O_EXCL; + flags |= O_RDWR; + } else if (dev->flags & DEV_BCACHE_WRITE) { + flags |= O_RDWR; + } else { + flags |= O_RDONLY; + } retry_open: @@ -1124,7 +1136,14 @@ int label_scan_open(struct device *dev) int label_scan_open_excl(struct device *dev) { + if (_in_bcache(dev) && !(dev->flags & DEV_BCACHE_EXCL)) { + /* FIXME: avoid tossing out bcache blocks just to replace fd. */ + log_debug("Close and reopen excl %s", dev_name(dev)); + bcache_invalidate_fd(scan_bcache, dev->bcache_fd); + _scan_dev_close(dev); + } dev->flags |= DEV_BCACHE_EXCL; + dev->flags |= DEV_BCACHE_WRITE; return label_scan_open(dev); } @@ -1166,8 +1185,19 @@ bool dev_write_bytes(struct device *dev, uint64_t start, size_t len, void *data) return false; } + if (!(dev->flags & DEV_BCACHE_WRITE)) { + /* FIXME: avoid tossing out bcache blocks just to replace fd. */ + log_debug("Close and reopen to write %s", dev_name(dev)); + bcache_invalidate_fd(scan_bcache, dev->bcache_fd); + _scan_dev_close(dev); + + dev->flags |= DEV_BCACHE_WRITE; + label_scan_open(dev); + } + if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ + dev->flags |= DEV_BCACHE_WRITE; if (!label_scan_open(dev)) { log_error("Error opening device %s for writing at %llu length %u.", dev_name(dev), (unsigned long long)start, (uint32_t)len); @@ -1201,8 +1231,19 @@ bool dev_write_zeros(struct device *dev, uint64_t start, size_t len) return false; } + if (!(dev->flags & DEV_BCACHE_WRITE)) { + /* FIXME: avoid tossing out bcache blocks just to replace fd. */ + log_debug("Close and reopen to write %s", dev_name(dev)); + bcache_invalidate_fd(scan_bcache, dev->bcache_fd); + _scan_dev_close(dev); + + dev->flags |= DEV_BCACHE_WRITE; + label_scan_open(dev); + } + if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ + dev->flags |= DEV_BCACHE_WRITE; if (!label_scan_open(dev)) { log_error("Error opening device %s for writing at %llu length %u.", dev_name(dev), (unsigned long long)start, (uint32_t)len); @@ -1236,8 +1277,19 @@ bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t val) return false; } + if (!(dev->flags & DEV_BCACHE_WRITE)) { + /* FIXME: avoid tossing out bcache blocks just to replace fd. */ + log_debug("Close and reopen to write %s", dev_name(dev)); + bcache_invalidate_fd(scan_bcache, dev->bcache_fd); + _scan_dev_close(dev); + + dev->flags |= DEV_BCACHE_WRITE; + label_scan_open(dev); + } + if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ + dev->flags |= DEV_BCACHE_WRITE; if (!label_scan_open(dev)) { log_error("Error opening device %s for writing at %llu length %u.", dev_name(dev), (unsigned long long)start, (uint32_t)len);

1 0

master - bcache: remove extraneous error message
by David Teigland 18 Jun '18

18 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f85a010a6bc9dc0414ccd… Commit: f85a010a6bc9dc0414ccdf9c6b195c78231f1914 Parent: 565df4e7321243614fd18c6a45d1f890ab92956b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Jun 18 11:59:57 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Jun 18 12:02:22 2018 -0500 bcache: remove extraneous error message an error from io_submit is already recognized by the caller like errors during completion. --- lib/device/bcache.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/device/bcache.c b/lib/device/bcache.c index f4c0712..f315b2a 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -191,7 +191,6 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int fd, } while (r == -EAGAIN); if (r < 0) { - log_sys_warn("io_submit"); _cb_free(e->cbs, cb); return false; }

1 0

master - Print advice about changing clustered VGs to shared
by David Teigland 18 Jun '18

18 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=565df4e7321243614fd18… Commit: 565df4e7321243614fd18c6a45d1f890ab92956b Parent: 428514a07f4bd270f6a137f08be1b2818312bdbd Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Jun 18 10:59:11 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Jun 18 10:59:11 2018 -0500 Print advice about changing clustered VGs to shared --- tools/toollib.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/toollib.c b/tools/toollib.c index ebf2509..f0cf78e 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -173,6 +173,8 @@ const char *skip_dev_dir(struct cmd_context *cmd, const char *vg_name, return vg_name; } +static int _printed_clustered_vg_advice = 0; + /* * Three possible results: * a) return 0, skip 0: take the VG, and cmd will end in success @@ -206,10 +208,18 @@ static int _ignore_vg(struct volume_group *vg, const char *vg_name, if (read_error & FAILED_CLUSTERED) { if (arg_vgnames && str_list_match_item(arg_vgnames, vg->name)) { - log_error("Cannot access clustered VG %s, see lvmlockd(8).", vg->name); + log_error("Cannot access clustered VG %s.", vg->name); + if (!_printed_clustered_vg_advice) { + _printed_clustered_vg_advice = 1; + log_error("See lvmlockd(8) for changing a clvm/clustered VG to a shared VG."); + } return 1; } else { log_warn("Skipping clustered VG %s.", vg_name); + if (!_printed_clustered_vg_advice) { + _printed_clustered_vg_advice = 1; + log_error("See lvmlockd(8) for changing a clvm/clustered VG to a shared VG."); + } *skip = 1; return 0; }

1 0

v2_02_179 annotated tag has been created
by Marian Csontos 18 Jun '18

18 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f426de669957e39d62ad2… Commit: f426de669957e39d62ad26748b9e6704571f7456 Parent: 0000000000000000000000000000000000000000 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: 2018-06-18 05:22 +0000 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: 2018-06-18 05:22 +0000 annotated tag: v2_02_179 has been created at f426de669957e39d62ad26748b9e6704571f7456 (tag) tagging 6283f5ea3f33fa022ec1f25baba630cbc5fdd1c5 (commit) replaces v2_02_178 Release 2.02.179 Bug fix release, fixing mostly problems with cache a lvmlockd. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJbJ0H2AAoJELkRJDHlCQOfCrQP/iWdSFUtDn2qnL5k6PMjV+co iVVd0PAkMkbra6Xesxhz6tePAV6WyYdswQmdgGKhnko/BtjuO88kFjEriLqS0sux YRakjqoXKOW7RZgTeEowYeGQX1Rxl0Oos/xG/KJRVS0O3/QAojQsOeQ6VSdpvlKV 10g/G2/pdIxa9bwMOlQMKQAJnoS8bRJ4+4W8c5wFNJi2OZLcPyoSQYwiLDpeUhYo xqJlgnzvkqEfaMg/INpdWgqvpC0slXcV2I7fNvqZdEQTgFdSLjncGRB3lWR4Pl4A f0/rLGgtOpCW48zNgUxpdx1TYOEf45OOXINfy8M/R8D1yoa1f3r1b6IRfrM+kXN4 Kv7q2TDfleO92nZ3xPyPVx3bLsX555sFLqK6OnKxoKHcHTLM+A6Qtdvd2I/xmZQv TmUCmp+CGsmMx/IwWF9Buoq67hXeGn9YDiOK1bkVcKOr8p5Gp++2pN2yN8f1Kb83 Qi7HGWQf/P+Ya6+qf/BqFnWxy7BNstUXCRJ7cZdmiMiSB5oWNxrABopID/QfIcXo B8tPm49P3N7U3dBrzl0Dz4KiK9B3MKOBx2AtvSkctXYOPrbOMOe20oOfBPj6XnD9 OaHqKvB8u+gVgonFf/oiuoEsQD95EYYZc3IFYOGJ0fb5dCTje4CkVVSujUyopU00 I5X+Y5te3LGivWIVZfNn =M1dD -----END PGP SIGNATURE----- Alasdair G Kergon (1): format_text: Use versionsort to sort archive files David Teigland (42): scan: refresh paths and retry open scan: removed failed paths for devices tests: fix skipping logic for lvmpolld and lvmlockd tests: some missed skip with lvmlockd lvmlockd: accept repeated global lock requests tests: separate lvmlockd tests with or without lvmetad lvmlockd: do not use an LV lock for some lvchange options config: revert to normal locking when no cluster lvmlockd: enable mirror split and merge with dlm lock_type lvmlockd: enable lvcreate of thin pool and thin lv in one command lvmlockd: enable creation of cache pool with lvcreate tests: enable lvmlockd for passing tests tests: vgcreate-usage update for lvmlockd tests: vgchange-usage update for lvmlockd lvmlockd: fix vgimportclone of a shared VG pvremove: skip lvmlockd locks for forced clearing tests: process-each-duplicate-pvs update for lvmlockd tests: add missing file lvmlockd: enable repairing shared VG while reading it tests: enable vg repair tests with lvmlockd tests: enable pvmove-restart with lvmlockd lvmlockd: enable lvcreate of new LV plus existing cache pool tests: enable lvcreate cache tests with lvmlockd tests: change lvcreate syntax to allow lvmlockd vgs: add report field for shared lvmlockd: enable lvcreate -H -L LV tests: enable lvmlockd with tests using lvcreate -H -L LV tests: enable metadata-balance with lvmlockd lvmlockd: fix reverting new lv in error path tests: enable lvcreate-pvtags with lvmlockd lvmlockd: improve error message for existing lockspace tests: enable more working tests with lvmlockd tests: enable non-working tests with lvmlockd man lvmlockd: update list of limitations devices: clean up io error messages lvmlockd: fix missing lock_type null check man lvmlockd: remove unnecessary reference to lvmetad lvmlockd: skip repair lock upgrade for non shared vgs WHATS_NEW for recent changes lvmlockd: update method for changing clustered VG man: updates to lvmlockd man: update lvmsystemid wording Joe Thornber (8): radix_tree: add remove method radix_tree_t: knock out some debug data-struct/radix-tree: pass the value dtr into create. Merge branch '2018-05-29-radix-tree-iterate' into 2018-05-23-radix-tree-remove radix-tree: call the value dtr when removing an entry. radix-tree: radix_tree_remove_prefix() radix-tree: radix_tree_iterate() radix-tree: fix some bugs in remove_prefix and iterate Marian Csontos (5): post-release Merge remote-tracking branch 'origin/master' post-release Merge branch 'dev-mcsontos-release' into stable pre-release Zdenek Kabelac (2): man: another missed typo for thin plugin tests: improve usability on older systems

1 0

master - Drop --ignoreskippedcluster option
by David Teigland 15 Jun '18

15 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=428514a07f4bd270f6a13… Commit: 428514a07f4bd270f6a137f08be1b2818312bdbd Parent: ccab4a1994f4218810f1a6152cf6c71caa00977e Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 15 15:43:59 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 15 15:59:34 2018 -0500 Drop --ignoreskippedcluster option It's no longer needed. Clustered VGs are now handled in the same way as foreign VGs, and as shared VGs that can't be accessed: - A command processing all VGs sees a clustered VG, prints a message ("Skipping clustered VG foo."), skips it, and does not fail. - A command where the clustered VG is explicitly named on the command line, prints a message and fails. "Cannot access clustered VG foo, see lvmlockd(8)." The option is listed in the set of ignored options for the commands that previously accepted it. (Removing it entirely would cause commands/scripts to fail if they set it.) --- lib/commands/toolcontext.c | 1 - lib/commands/toolcontext.h | 1 - lib/metadata/metadata.c | 5 +-- .../lvm2_activation_generator_systemd_red_hat.c | 2 +- scripts/lvm2_monitoring_systemd_red_hat.service.in | 4 +- tools/args.h | 3 +- tools/command-lines.in | 45 +++++++++++++------- tools/lvmcmdline.c | 1 - tools/toollib.c | 19 ++++---- 9 files changed, 44 insertions(+), 37 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 723f882..50474c1 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -1762,7 +1762,6 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, cmd->threaded = threaded ? 1 : 0; cmd->handles_missing_pvs = 0; cmd->handles_unknown_segments = 0; - cmd->ignore_clustered_vgs = 0; cmd->hosttags = 0; dm_list_init(&cmd->arg_value_groups); dm_list_init(&cmd->formats); diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index 9849e5f..2b730ea 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -144,7 +144,6 @@ struct cmd_context { unsigned report_binary_values_as_numeric:1; unsigned report_mark_hidden_devices:1; unsigned metadata_read_only:1; - unsigned ignore_clustered_vgs:1; unsigned threaded:1; /* set if running within a thread e.g. clvmd */ unsigned unknown_system_id:1; unsigned include_historical_lvs:1; /* also process/report/display historical LVs */ diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 34b1ec7..0ff38a2 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -4698,10 +4698,7 @@ static int _access_vg_clustered(struct cmd_context *cmd, const struct volume_gro return 1; } - if (!cmd->ignore_clustered_vgs) - log_error("Skipping clustered volume group %s", vg->name); - else - log_verbose("Skipping clustered volume group %s", vg->name); + log_verbose("Skipping clustered VG %s.", vg->name); return 0; } diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c index 7791e64..b3d18d2 100644 --- a/scripts/lvm2_activation_generator_systemd_red_hat.c +++ b/scripts/lvm2_activation_generator_systemd_red_hat.c @@ -175,7 +175,7 @@ static int generate_unit(struct generator *gen, int unit) "Wants=systemd-udev-settle.service\n\n" "[Service]\n", f); } - fputs("ExecStart=" LVM_PATH " vgchange -aay --ignoreskippedcluster", f); + fputs("ExecStart=" LVM_PATH " vgchange -aay", f); if (gen->cfg.sysinit_needed) fputs(" --sysinit", f); fputs("\nType=oneshot\n", f); diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in index ebc069e..4144862 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -10,8 +10,8 @@ Conflicts=shutdown.target [Service] Type=oneshot Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1 -ExecStart=@SBINDIR@/lvm vgchange --monitor y --ignoreskippedcluster -ExecStop=@SBINDIR@/lvm vgchange --monitor n --ignoreskippedcluster +ExecStart=@SBINDIR@/lvm vgchange --monitor y +ExecStop=@SBINDIR@/lvm vgchange --monitor n RemainAfterExit=yes [Install] diff --git a/tools/args.h b/tools/args.h index 2434f4b..e574bc7 100644 --- a/tools/args.h +++ b/tools/args.h @@ -243,8 +243,7 @@ arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", 0, 0, 0, "Do not use this if dmeventd is already monitoring a device.\n") arg(ignoreskippedcluster_ARG, '\0', "ignoreskippedcluster", 0, 0, 0, - "Use to avoid exiting with an non-zero status code if the command is run\n" - "without clustered locking and clustered VGs are skipped.\n") + "No longer used.\n") arg(ignoreunsupported_ARG, '\0', "ignoreunsupported", 0, 0, 0, "Exclude unsupported configuration settings from the output. These settings are\n" diff --git a/tools/command-lines.in b/tools/command-lines.in index 0f9ed47..0155b33 100644 --- a/tools/command-lines.in +++ b/tools/command-lines.in @@ -194,7 +194,7 @@ OO_ALL: --commandprofile String, --config String, --debug, # options for pvs, lvs, vgs, fullreport # OO_REPORT: --aligned, --all, --binary, --configreport ConfigReport, --foreign, ---ignorelockingfailure, --ignoreskippedcluster, --logonly, +--ignorelockingfailure, --logonly, --nameprefixes, --noheadings, --nosuffix, --options String, --readonly, --reportformat ReportFmt, --rows, --select String, --separator String, --shared, --sort String, @@ -213,8 +213,7 @@ OO_CONFIG: --atversion String, --typeconfig ConfigType, --file String, --ignorea # None of these can function as a required option for lvchange. OO_LVCHANGE: --autobackup Bool, --force, --ignoremonitoring, ---ignoreskippedcluster, --noudevsync, --reportformat ReportFmt, ---select String +--noudevsync, --reportformat ReportFmt, --select String # Any of these can function as a required option for lvchange. # profile is also part of OO_ALL, but is repeated in OO_LVCHANGE_META @@ -235,6 +234,7 @@ OO_LVCHANGE_META: --addtag Tag, --deltag Tag, lvchange OO_LVCHANGE_META VG|LV|Tag|Select ... OO: --activate Active, --poll Bool, --monitor Bool, OO_LVCHANGE +IO: --ignoreskippedcluster ID: lvchange_properties DESC: Change a general LV attribute. DESC: For options listed in parentheses, any one is @@ -257,6 +257,7 @@ RULE: --alloc --discards --zero --cachemode --cachepolicy --cachesettings not lv lvchange --resync VG|LV_raid_mirror|Tag|Select ... OO: --activate Active, OO_LVCHANGE +IO: --ignoreskippedcluster ID: lvchange_resync DESC: Resyncronize a mirror or raid LV. RULE: all not lv_is_pvmove lv_is_locked @@ -264,12 +265,14 @@ RULE: all not LV_raid0 lvchange --syncaction SyncAction VG|LV_raid|Tag|Select ... OO: OO_LVCHANGE +IO: --ignoreskippedcluster ID: lvchange_syncaction DESC: Resynchronize or check a raid LV. RULE: all not LV_raid0 lvchange --rebuild PV VG|LV_raid|Tag|Select ... OO: OO_LVCHANGE +IO: --ignoreskippedcluster ID: lvchange_rebuild DESC: Reconstruct data on specific PVs of a raid LV. RULE: all not LV_raid0 @@ -277,27 +280,32 @@ RULE: all not LV_raid0 lvchange --activate Active VG|LV|Tag|Select ... OO: --activationmode ActivationMode, --partial, --poll Bool, --monitor Bool, --ignoreactivationskip, --ignorelockingfailure, --sysinit, OO_LVCHANGE +IO: --ignoreskippedcluster ID: lvchange_activate DESC: Activate or deactivate an LV. lvchange --refresh VG|LV|Tag|Select ... OO: --activationmode ActivationMode, --partial, --poll Bool, --monitor Bool, OO_LVCHANGE +IO: --ignoreskippedcluster ID: lvchange_refresh DESC: Reactivate an LV using the latest metadata. lvchange --monitor Bool VG|LV|Tag|Select ... OO: OO_LVCHANGE +IO: --ignoreskippedcluster ID: lvchange_monitor DESC: Start or stop monitoring an LV from dmeventd. RULE: all not lv_is_pvmove lvchange --poll Bool VG|LV|Tag|Select ... OO: --monitor Bool, OO_LVCHANGE +IO: --ignoreskippedcluster ID: lvchange_poll DESC: Start or stop processing an LV conversion. lvchange --persistent y --minor Number LV OO: --major Number, --activate Active, --poll Bool, --monitor Bool, OO_LVCHANGE +IO: --ignoreskippedcluster ID: lvchange_persistent DESC: Make the minor device number persistent for an LV. RULE: all not LV_thinpool LV_cachepool @@ -1193,12 +1201,12 @@ FLAGS: SECONDARY_SYNTAX lvdisplay OO: --aligned, --all, --binary, --colon, --columns, --configreport ConfigReport, --foreign, --history, --ignorelockingfailure, ---ignoreskippedcluster, --logonly, --maps, --noheadings, +--logonly, --maps, --noheadings, --nosuffix, --options String, --sort String, --readonly, --reportformat ReportFmt, --segments, --select String, --separator String, --shared, --unbuffered, --units Units OP: VG|LV|Tag ... -IO: --partial +IO: --partial, --ignoreskippedcluster ID: lvdisplay_general --- @@ -1312,7 +1320,7 @@ DESC: Resize a pool metadata SubLV by a specified size. lvs OO: --history, --segments, OO_REPORT OP: VG|LV|Tag ... -IO: --partial +IO: --partial, --ignoreskippedcluster ID: lvs_general --- @@ -1333,8 +1341,7 @@ ID: lvscan_cache --- # None of these can function as a required option for pvchange. -OO_PVCHANGE: --autobackup Bool, --force, --ignoreskippedcluster, ---reportformat ReportFmt, --uuid +OO_PVCHANGE: --autobackup Bool, --force, --reportformat ReportFmt, --uuid # Any of these can function as a required option for pvchange. OO_PVCHANGE_META: --allocatable Bool, --addtag Tag, --deltag Tag, @@ -1342,11 +1349,13 @@ OO_PVCHANGE_META: --allocatable Bool, --addtag Tag, --deltag Tag, pvchange OO_PVCHANGE_META --all OO: OO_PVCHANGE +IO: --ignoreskippedcluster ID: pvchange_properties_all DESC: Change properties of all PVs. pvchange OO_PVCHANGE_META PV|Select ... OO: --select String, OO_PVCHANGE +IO: --ignoreskippedcluster ID: pvchange_properties_some DESC: Change properties of specified PVs. @@ -1381,11 +1390,12 @@ RULE: --bootloaderareasize not --restorefile pvdisplay OO: --aligned, --all, --binary, --colon, --columns, --configreport ConfigReport, ---foreign, --ignorelockingfailure, --ignoreskippedcluster, +--foreign, --ignorelockingfailure, --logonly, --maps, --noheadings, --nosuffix, --options String, --readonly, --reportformat ReportFmt, --select String, --separator String, --shared, --short, --sort String, --unbuffered, --units Units OP: PV|Tag ... +IO: --ignoreskippedcluster ID: pvdisplay_general --- @@ -1413,7 +1423,7 @@ ID: pvremove_general pvs OO: --segments, OO_REPORT OP: PV|Tag ... -IO: --partial +IO: --partial, --ignoreskippedcluster ID: pvs_general --- @@ -1473,7 +1483,7 @@ DESC: List one VG metadata backup file. # None of these can function as a required option for vgchange. -OO_VGCHANGE: --autobackup Bool, --ignoremonitoring, --ignoreskippedcluster, +OO_VGCHANGE: --autobackup Bool, --ignoremonitoring, --noudevsync, --reportformat ReportFmt, --select String, --force # Any of these can function as a required option for vgchange. @@ -1489,6 +1499,7 @@ OO_VGCHANGE_META: --addtag Tag, --deltag Tag, vgchange OO_VGCHANGE_META OO: --poll Bool, OO_VGCHANGE OP: VG|Tag|Select ... +IO: --ignoreskippedcluster ID: vgchange_properties DESC: Change a general VG attribute. DESC: For options listed in parentheses, any one is @@ -1497,12 +1508,14 @@ DESC: required, after which the others are optional. vgchange --monitor Bool OO: --sysinit, --ignorelockingfailure, --poll Bool, OO_VGCHANGE OP: VG|Tag|Select ... +IO: --ignoreskippedcluster ID: vgchange_monitor DESC: Start or stop monitoring LVs from dmeventd. vgchange --poll Bool OO: --ignorelockingfailure, OO_VGCHANGE OP: VG|Tag|Select ... +IO: --ignoreskippedcluster ID: vgchange_poll DESC: Start or stop processing LV conversions. @@ -1510,12 +1523,14 @@ vgchange --activate Active OO: --activationmode ActivationMode, --ignoreactivationskip, --partial, --sysinit, --ignorelockingfailure, --monitor Bool, --poll Bool, OO_VGCHANGE OP: VG|Tag|Select ... +IO: --ignoreskippedcluster ID: vgchange_activate DESC: Activate or deactivate LVs. vgchange --refresh OO: --sysinit, --ignorelockingfailure, --poll Bool, OO_VGCHANGE OP: VG|Tag|Select ... +IO: --ignoreskippedcluster ID: vgchange_refresh DESC: Reactivate LVs using the latest metadata. @@ -1562,11 +1577,11 @@ ID: vgcreate_general vgdisplay OO: --activevolumegroups, --aligned, --binary, --colon, --columns, --configreport ConfigReport, --foreign, --ignorelockingfailure, ---ignoreskippedcluster, --logonly, --noheadings, --nosuffix, +--logonly, --noheadings, --nosuffix, --options String, --readonly, --reportformat ReportFmt, --select String, --shared, --short, --separator String, --sort String, --unbuffered, --units Units OP: VG|Tag ... -IO: --partial +IO: --partial, --ignoreskippedcluster ID: vgdisplay_general --- @@ -1668,7 +1683,7 @@ DESC: Rename a VG by specifying the VG UUID. vgs OO: OO_REPORT OP: VG|Tag ... -IO: --partial +IO: --partial, --ignoreskippedcluster ID: vgs_general --- @@ -1723,7 +1738,7 @@ ID: devtypes_general fullreport OO: OO_REPORT OP: VG ... -IO: --partial +IO: --partial, --ignoreskippedcluster ID: fullreport_general lastlog diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 2578113..3e617c1 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -2323,7 +2323,6 @@ static int _get_current_settings(struct cmd_context *cmd) return EINVALID_CMD_LINE; } - cmd->ignore_clustered_vgs = arg_is_set(cmd, ignoreskippedcluster_ARG); cmd->include_foreign_vgs = arg_is_set(cmd, foreign_ARG) ? 1 : 0; cmd->include_shared_vgs = arg_is_set(cmd, shared_ARG) ? 1 : 0; cmd->include_historical_lvs = arg_is_set(cmd, history_ARG) ? 1 : 0; diff --git a/tools/toollib.c b/tools/toollib.c index c81d1c2..ebf2509 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -204,10 +204,15 @@ static int _ignore_vg(struct volume_group *vg, const char *vg_name, if ((read_error & FAILED_INCONSISTENT) && (read_flags & READ_ALLOW_INCONSISTENT)) read_error &= ~FAILED_INCONSISTENT; /* Check for other errors */ - if ((read_error & FAILED_CLUSTERED) && vg->cmd->ignore_clustered_vgs) { - read_error &= ~FAILED_CLUSTERED; /* Check for other errors */ - log_verbose("Skipping volume group %s", vg_name); - *skip = 1; + if (read_error & FAILED_CLUSTERED) { + if (arg_vgnames && str_list_match_item(arg_vgnames, vg->name)) { + log_error("Cannot access clustered VG %s, see lvmlockd(8).", vg->name); + return 1; + } else { + log_warn("Skipping clustered VG %s.", vg_name); + *skip = 1; + return 0; + } } /* @@ -254,12 +259,6 @@ static int _ignore_vg(struct volume_group *vg, const char *vg_name, } } - if (read_error == FAILED_CLUSTERED) { - *skip = 1; - stack; /* Error already logged */ - return 1; - } - if (read_error != SUCCESS) { *skip = 0; if (is_orphan_vg(vg_name))

1 0

master - report: show empty lock_type for none
by David Teigland 15 Jun '18

15 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ccab4a1994f4218810f1a… Commit: ccab4a1994f4218810f1a6152cf6c71caa00977e Parent: 328303d4d45b4e9480cc806ef84e843e2176f584 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 15 14:14:39 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 15 14:14:39 2018 -0500 report: show empty lock_type for none Sometimes lock_type would be displayed as "none" (after changing it) and sometimes as empty. Make it consistently empty. --- lib/report/report.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/lib/report/report.c b/lib/report/report.c index 8039820..369f47c 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -2855,8 +2855,14 @@ static int _vglocktype_disp(struct dm_report *rh, struct dm_pool *mem, const void *data, void *private) { const struct volume_group *vg = (const struct volume_group *) data; + const char *locktype; - return _field_string(rh, field, vg->lock_type ? : ""); + if (!vg->lock_type || !strcmp(vg->lock_type, "none")) + locktype = ""; + else + locktype = vg->lock_type; + + return _field_string(rh, field, locktype); } static int _vglockargs_disp(struct dm_report *rh, struct dm_pool *mem,

1 0

master - Remove unused device error counting
by David Teigland 15 Jun '18

15 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=328303d4d45b4e9480cc8… Commit: 328303d4d45b4e9480cc806ef84e843e2176f584 Parent: 54f61e7dccf82471dd4a963bfcbcf14802806ca9 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 15 14:04:39 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 15 14:04:39 2018 -0500 Remove unused device error counting --- lib/commands/toolcontext.c | 3 --- lib/config/config_settings.h | 8 ++------ lib/config/defaults.h | 3 --- lib/device/dev-cache.c | 19 +++---------------- lib/device/dev-io.c | 24 ------------------------ lib/device/device.h | 2 -- lib/misc/lvm-globals.c | 11 ----------- lib/misc/lvm-globals.h | 4 ---- 8 files changed, 5 insertions(+), 69 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index a76c68d..723f882 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -974,9 +974,6 @@ static int _init_dev_cache(struct cmd_context *cmd) int len_diff; int device_list_from_udev; - init_dev_disable_after_error_count( - find_config_tree_int(cmd, devices_disable_after_error_count_CFG, NULL)); - if (!dev_cache_init(cmd)) return_0; diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index ff098d8..ac0f0ff 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -410,12 +410,8 @@ cfg(devices_ignore_lvm_mirrors_CFG, "ignore_lvm_mirrors", devices_CFG_SECTION, 0 "apply to LVM RAID types like 'raid1' which handle failures in a\n" "different way, making them a better choice for VG stacking.\n") -cfg(devices_disable_after_error_count_CFG, "disable_after_error_count", devices_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_DISABLE_AFTER_ERROR_COUNT, vsn(2, 2, 75), NULL, 0, NULL, - "Number of I/O errors after which a device is skipped.\n" - "During each LVM operation, errors received from each device are\n" - "counted. If the counter of a device exceeds the limit set here,\n" - "no further I/O is sent to that device for the remainder of the\n" - "operation. Setting this to 0 disables the counters altogether.\n") +cfg(devices_disable_after_error_count_CFG, "disable_after_error_count", devices_CFG_SECTION, 0, CFG_TYPE_INT, 0, vsn(2, 2, 75), NULL, vsn(3, 0, 0), NULL, + "This setting is no longer used.\n") cfg(devices_require_restorefile_with_uuid_CFG, "require_restorefile_with_uuid", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_REQUIRE_RESTOREFILE_WITH_UUID, vsn(2, 2, 73), NULL, 0, NULL, "Allow use of pvcreate --uuid without requiring --restorefile.\n") diff --git a/lib/config/defaults.h b/lib/config/defaults.h index 7cebd84..084d365 100644 --- a/lib/config/defaults.h +++ b/lib/config/defaults.h @@ -39,7 +39,6 @@ #define DEFAULT_IGNORE_LVM_MIRRORS 1 #define DEFAULT_MULTIPATH_COMPONENT_DETECTION 1 #define DEFAULT_IGNORE_SUSPENDED_DEVICES 0 -#define DEFAULT_DISABLE_AFTER_ERROR_COUNT 0 #define DEFAULT_REQUIRE_RESTOREFILE_WITH_UUID 1 #define DEFAULT_DATA_ALIGNMENT_OFFSET_DETECTION 1 #define DEFAULT_DATA_ALIGNMENT_DETECTION 1 @@ -206,8 +205,6 @@ #define DEFAULT_MAX_HISTORY 100 -#define DEFAULT_MAX_ERROR_COUNT NO_DEV_ERROR_COUNT_LIMIT - #define DEFAULT_REP_COMPACT_OUTPUT 0 #define DEFAULT_REP_ALIGNED 1 #define DEFAULT_REP_BUFFERED 1 diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 1635c99..a0d98a3 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -62,13 +62,12 @@ static int _insert(const char *path, const struct stat *info, int rec, int check_with_udev_db); /* Setup non-zero members of passed zeroed 'struct device' */ -static void _dev_init(struct device *dev, int max_error_count) +static void _dev_init(struct device *dev) { dev->phys_block_size = -1; dev->block_size = -1; dev->fd = -1; dev->read_ahead = -1; - dev->max_error_count = max_error_count; dev->ext.enabled = 0; dev->ext.src = DEV_EXT_NONE; @@ -129,7 +128,7 @@ struct device *dev_create_file(const char *filename, struct device *dev, return NULL; } - _dev_init(dev, NO_DEV_ERROR_COUNT_LIMIT); + _dev_init(dev); dev->flags = DEV_REGULAR | ((use_malloc) ? DEV_ALLOCED : 0); dm_list_add(&dev->aliases, &alias->list); @@ -145,7 +144,7 @@ static struct device *_dev_create(dev_t d) return NULL; } - _dev_init(dev, dev_disable_after_error_count()); + _dev_init(dev); dev->dev = d; return dev; @@ -1690,18 +1689,6 @@ struct device *dev_iter_get(struct cmd_context *cmd, struct dev_iter *iter) return NULL; } -void dev_reset_error_count(struct cmd_context *cmd) -{ - struct dev_iter iter; - - if (!_cache.devices) - return; - - iter.current = btree_first(_cache.devices); - while (iter.current) - _iter_next(&iter)->error_count = 0; -} - int dev_fd(struct device *dev) { return dev->fd; diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index ffdf75e..43c2c2d 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -689,20 +689,6 @@ int dev_close_immediate(struct device *dev) return _dev_close(dev, 1); } -static inline int _dev_is_valid(struct device *dev) -{ - return (dev->max_error_count == NO_DEV_ERROR_COUNT_LIMIT || - dev->error_count < dev->max_error_count); -} - -static void _dev_inc_error_count(struct device *dev) -{ - if (++dev->error_count == dev->max_error_count) - log_warn("WARNING: Error counts reached a limit of %d. " - "Device %s was disabled", - dev->max_error_count, dev_name(dev)); -} - int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer) { struct device_area where; @@ -711,16 +697,11 @@ int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t re if (!dev->open_count) return_0; - if (!_dev_is_valid(dev)) - return 0; - where.dev = dev; where.start = offset; where.size = len; ret = _aligned_io(&where, buffer, 0, reason); - if (!ret) - _dev_inc_error_count(dev); return ret; } @@ -783,9 +764,6 @@ int dev_write(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t r if (!dev->open_count) return_0; - if (!_dev_is_valid(dev)) - return 0; - if (!len) { log_error(INTERNAL_ERROR "Attempted to write 0 bytes to %s at " FMTu64, dev_name(dev), offset); return 0; @@ -798,8 +776,6 @@ int dev_write(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t r dev->flags |= DEV_ACCESSED_W; ret = _aligned_io(&where, buffer, 1, reason); - if (!ret) - _dev_inc_error_count(dev); return ret; } diff --git a/lib/device/device.h b/lib/device/device.h index 8f9ed55..00e398a 100644 --- a/lib/device/device.h +++ b/lib/device/device.h @@ -64,8 +64,6 @@ struct device { /* private */ int fd; int open_count; - int error_count; - int max_error_count; int phys_block_size; int block_size; int read_ahead; diff --git a/lib/misc/lvm-globals.c b/lib/misc/lvm-globals.c index 9377588..86e6cf4 100644 --- a/lib/misc/lvm-globals.c +++ b/lib/misc/lvm-globals.c @@ -49,7 +49,6 @@ static int _udev_checking = 1; static int _retry_deactivation = DEFAULT_RETRY_DEACTIVATION; static int _activation_checks = 0; static char _sysfs_dir_path[PATH_MAX] = ""; -static int _dev_disable_after_error_count = DEFAULT_DISABLE_AFTER_ERROR_COUNT; static uint64_t _pv_min_size = (DEFAULT_PV_MIN_SIZE_KB * 1024L >> SECTOR_SHIFT); static const char *_unknown_device_name = DEFAULT_UNKNOWN_DEVICE_NAME; @@ -173,11 +172,6 @@ void init_activation_checks(int checks) log_debug_activation("LVM activation checks disabled"); } -void init_dev_disable_after_error_count(int value) -{ - _dev_disable_after_error_count = value; -} - void init_pv_min_size(uint64_t sectors) { _pv_min_size = sectors; @@ -345,11 +339,6 @@ const char *sysfs_dir_path(void) return _sysfs_dir_path; } -int dev_disable_after_error_count(void) -{ - return _dev_disable_after_error_count; -} - uint64_t pv_min_size(void) { return _pv_min_size; diff --git a/lib/misc/lvm-globals.h b/lib/misc/lvm-globals.h index 55a9399..6fc26cc 100644 --- a/lib/misc/lvm-globals.h +++ b/lib/misc/lvm-globals.h @@ -45,7 +45,6 @@ void init_ignore_lvm_mirrors(int scan); void init_error_message_produced(int produced); void init_is_static(unsigned value); void init_udev_checking(int checking); -void init_dev_disable_after_error_count(int value); void init_pv_min_size(uint64_t sectors); void init_activation_checks(int checks); void init_retry_deactivation(int retry); @@ -84,7 +83,4 @@ const char *unknown_device_name(void); #define DMEVENTD_MONITOR_IGNORE -1 int dmeventd_monitor_mode(void); -#define NO_DEV_ERROR_COUNT_LIMIT 0 -int dev_disable_after_error_count(void); - #endif

1 0

master - config: add deprecated version for recently removed settings
by David Teigland 15 Jun '18

15 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=54f61e7dccf82471dd4a9… Commit: 54f61e7dccf82471dd4a963bfcbcf14802806ca9 Parent: 3fd75d1bcd714b02fb2b843d1928b2a875402f37 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 15 13:56:26 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 15 13:56:26 2018 -0500 config: add deprecated version for recently removed settings assumes that the next version from this branch is 3.0.0 --- lib/config/config_settings.h | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index a730afb..ff098d8 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -315,13 +315,13 @@ cfg_array(devices_global_filter_CFG, "global_filter", devices_CFG_SECTION, CFG_D cfg_runtime(devices_cache_CFG, "cache", devices_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(1, 0, 0), vsn(1, 2, 19), NULL, "This setting is no longer used.\n") -cfg_runtime(devices_cache_dir_CFG, "cache_dir", devices_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(1, 2, 19), 0, NULL, +cfg_runtime(devices_cache_dir_CFG, "cache_dir", devices_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(1, 2, 19), vsn(3, 0, 0), NULL, "This setting is no longer used.\n") -cfg(devices_cache_file_prefix_CFG, "cache_file_prefix", devices_CFG_SECTION, CFG_ALLOW_EMPTY, CFG_TYPE_STRING, DEFAULT_CACHE_FILE_PREFIX, vsn(1, 2, 19), NULL, 0, NULL, +cfg(devices_cache_file_prefix_CFG, "cache_file_prefix", devices_CFG_SECTION, CFG_ALLOW_EMPTY, CFG_TYPE_STRING, DEFAULT_CACHE_FILE_PREFIX, vsn(1, 2, 19), NULL, vsn(3, 0, 0), NULL, "This setting is no longer used.\n") -cfg(devices_write_cache_state_CFG, "write_cache_state", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, 1, vsn(1, 0, 0), NULL, 0, NULL, +cfg(devices_write_cache_state_CFG, "write_cache_state", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, 1, vsn(1, 0, 0), NULL, vsn(3, 0, 0), NULL, "This setting is no longer used.\n") cfg_array(devices_types_CFG, "types", devices_CFG_SECTION, CFG_DEFAULT_UNDEFINED | CFG_ADVANCED, CFG_TYPE_INT | CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL, @@ -760,13 +760,13 @@ cfg(global_activation_CFG, "activation", global_CFG_SECTION, 0, CFG_TYPE_BOOL, D "is not present in the kernel, disabling this should suppress\n" "the error messages.\n") -cfg(global_fallback_to_lvm1_CFG, "fallback_to_lvm1", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, 0, vsn(1, 0, 18), NULL, 0, NULL, +cfg(global_fallback_to_lvm1_CFG, "fallback_to_lvm1", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, 0, vsn(1, 0, 18), NULL, vsn(3, 0, 0), NULL, "This setting is no longer used.\n") -cfg(global_format_CFG, "format", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_FORMAT, vsn(1, 0, 0), NULL, 0, NULL, +cfg(global_format_CFG, "format", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_FORMAT, vsn(1, 0, 0), NULL, vsn(3, 0, 0), NULL, "This setting is no longer used.\n") -cfg_array(global_format_libraries_CFG, "format_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL, +cfg_array(global_format_libraries_CFG, "format_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, vsn(3, 0, 0), NULL, "This setting is no longer used.") cfg_array(global_segment_libraries_CFG, "segment_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 18), NULL, 0, NULL, NULL) @@ -777,16 +777,16 @@ cfg(global_proc_CFG, "proc", global_CFG_SECTION, CFG_ADVANCED, CFG_TYPE_STRING, cfg(global_etc_CFG, "etc", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_ETC_DIR, vsn(2, 2, 117), "@CONFDIR@", 0, NULL, "Location of /etc system configuration directory.\n") -cfg(global_locking_type_CFG, "locking_type", global_CFG_SECTION, 0, CFG_TYPE_INT, 1, vsn(1, 0, 0), NULL, 0, NULL, +cfg(global_locking_type_CFG, "locking_type", global_CFG_SECTION, 0, CFG_TYPE_INT, 1, vsn(1, 0, 0), NULL, vsn(3, 0, 0), NULL, "This setting is no longer used.") cfg(global_wait_for_locks_CFG, "wait_for_locks", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_WAIT_FOR_LOCKS, vsn(2, 2, 50), NULL, 0, NULL, "When disabled, fail if a lock request would block.\n") -cfg(global_fallback_to_clustered_locking_CFG, "fallback_to_clustered_locking", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING, vsn(2, 2, 42), NULL, 0, NULL, +cfg(global_fallback_to_clustered_locking_CFG, "fallback_to_clustered_locking", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING, vsn(2, 2, 42), NULL, vsn(3, 0, 0), NULL, "This setting is no longer used.\n") -cfg(global_fallback_to_local_locking_CFG, "fallback_to_local_locking", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_LOCAL_LOCKING, vsn(2, 2, 42), NULL, 0, NULL, +cfg(global_fallback_to_local_locking_CFG, "fallback_to_local_locking", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_LOCAL_LOCKING, vsn(2, 2, 42), NULL, vsn(3, 0, 0), NULL, "This setting is no longer used.\n") cfg(global_locking_dir_CFG, "locking_dir", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_LOCK_DIR, vsn(1, 0, 0), "@DEFAULT_LOCK_DIR@", 0, NULL, @@ -806,7 +806,7 @@ cfg(global_prioritise_write_locks_CFG, "prioritise_write_locks", global_CFG_SECT cfg(global_library_dir_CFG, "library_dir", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL, "Search this directory first for shared libraries.\n") -cfg(global_locking_library_CFG, "locking_library", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_LOCKING_LIB, vsn(1, 0, 0), NULL, 0, NULL, +cfg(global_locking_library_CFG, "locking_library", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_LOCKING_LIB, vsn(1, 0, 0), NULL, vsn(3, 0, 0), NULL, "This setting is no longer used.\n") cfg(global_abort_on_internal_errors_CFG, "abort_on_internal_errors", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_ABORT_ON_INTERNAL_ERRORS, vsn(2, 2, 57), NULL, 0, NULL, @@ -1501,14 +1501,14 @@ cfg(metadata_pvmetadataignore_CFG, "pvmetadataignore", metadata_CFG_SECTION, CFG cfg(metadata_stripesize_CFG, "stripesize", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_STRIPESIZE, vsn(1, 0, 0), NULL, 0, NULL, NULL) -cfg_array(metadata_dirs_CFG, "dirs", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL, +cfg_array(metadata_dirs_CFG, "dirs", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, vsn(3, 0, 0), NULL, "This setting is no longer used.\n") -cfg_section(metadata_disk_areas_CFG_SUBSECTION, "disk_areas", metadata_CFG_SECTION, CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, vsn(1, 0, 0), 0, NULL, NULL) -cfg_section(disk_area_CFG_SUBSECTION, "disk_area", metadata_disk_areas_CFG_SUBSECTION, CFG_NAME_VARIABLE | CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, vsn(1, 0, 0), 0, NULL, NULL) -cfg(disk_area_start_sector_CFG, "start_sector", disk_area_CFG_SUBSECTION, CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, 0, vsn(1, 0, 0), NULL, 0, NULL, NULL) -cfg(disk_area_size_CFG, "size", disk_area_CFG_SUBSECTION, CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, 0, vsn(1, 0, 0), NULL, 0, NULL, NULL) -cfg(disk_area_id_CFG, "id", disk_area_CFG_SUBSECTION, CFG_UNSUPPORTED | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL, NULL) +cfg_section(metadata_disk_areas_CFG_SUBSECTION, "disk_areas", metadata_CFG_SECTION, CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, vsn(1, 0, 0), vsn(3, 0, 0), NULL, NULL) +cfg_section(disk_area_CFG_SUBSECTION, "disk_area", metadata_disk_areas_CFG_SUBSECTION, CFG_NAME_VARIABLE | CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, vsn(1, 0, 0), vsn(3, 0, 0), NULL, NULL) +cfg(disk_area_start_sector_CFG, "start_sector", disk_area_CFG_SUBSECTION, CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, 0, vsn(1, 0, 0), NULL, vsn(3, 0, 0), NULL, NULL) +cfg(disk_area_size_CFG, "size", disk_area_CFG_SUBSECTION, CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, 0, vsn(1, 0, 0), NULL, vsn(3, 0, 0), NULL, NULL) +cfg(disk_area_id_CFG, "id", disk_area_CFG_SUBSECTION, CFG_UNSUPPORTED | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, vsn(3, 0, 0), NULL, NULL) cfg(report_output_format_CFG, "output_format", report_CFG_SECTION, CFG_PROFILABLE | CFG_DEFAULT_COMMENTED | CFG_DISALLOW_INTERACTIVE, CFG_TYPE_STRING, DEFAULT_REP_OUTPUT_FORMAT, vsn(2, 2, 158), NULL, 0, NULL, "Format of LVM command's report output.\n"

1 0

master - scan: use full md filter when md 1.0 devices are present
by David Teigland 15 Jun '18

15 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3fd75d1bcd714b02fb2b8… Commit: 3fd75d1bcd714b02fb2b843d1928b2a875402f37 Parent: 8eab37593eccbbb8c6d03a9bae2f6852c17a00a5 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 15 11:42:10 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 15 12:21:25 2018 -0500 scan: use full md filter when md 1.0 devices are present The md filter can operate in two native modes: - normal: reads only the start of each device - full: reads both the start and end of each device md 1.0 devices place the superblock at the end of the device, so components of this version will only be identified and excluded when lvm uses the full md filter. Previously, the full md filter was only used in commands that could write to the device. Now, the full md filter is also applied when there is an md 1.0 device present on the system. This means the 'pvs' command can avoid displaying md 1.0 components (at the cost of doubling the i/o to every device on the system.) (The md filter can operate in a third mode, using udev, but this is disabled by default because there have been problems with reliability of the info returned from udev.) --- lib/cache/lvmcache.c | 2 +- lib/device/dev-md.c | 27 +++++++++--- lib/device/dev-type.h | 1 + lib/filters/filter-md.c | 81 ++++++++++++++++------------------- lib/label/label.c | 14 ++++++ test/shell/pvcreate-md-fake-hdr.sh | 3 +- 6 files changed, 75 insertions(+), 53 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index c7e3903..f15b352 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -452,7 +452,7 @@ int lvmcache_dev_is_unchosen_duplicate(struct device *dev) * unused_duplicate_devs list, and restrict what we allow done with it. * * In the case of md components, we usually filter these out in filter-md, - * but in the special case of md superblocks <= 1.0 where the superblock + * but in the special case of md superblock version 1.0 where the superblock * is at the end of the device, filter-md doesn't always eliminate them * first, so we eliminate them here. * diff --git a/lib/device/dev-md.c b/lib/device/dev-md.c index 8284c4d..ac99f42 100644 --- a/lib/device/dev-md.c +++ b/lib/device/dev-md.c @@ -142,13 +142,6 @@ static int _native_dev_is_md(struct device *dev, uint64_t *offset_found, int ful * command if it should do a full check (cmd->use_full_md_check), * and set it for commands that could possibly write to an md dev * (pvcreate/vgcreate/vgextend). - * - * For old md versions with magic numbers at the end of devices, - * the md dev components won't be filtered out here when full is 0, - * so they will be scanned, and appear as duplicate PVs in lvmcache. - * The md device itself will be chosen as the primary duplicate, - * and the components are dropped from the list of duplicates in, - * i.e. a kind of post-scan filtering. */ if (!full) { sb_offset = 0; @@ -414,6 +407,26 @@ unsigned long dev_md_stripe_width(struct dev_types *dt, struct device *dev) return stripe_width_sectors; } +int dev_is_md_with_end_superblock(struct dev_types *dt, struct device *dev) +{ + char version_string[MD_MAX_SYSFS_SIZE]; + const char *attribute = "metadata_version"; + + if (MAJOR(dev->dev) != dt->md_major) + return 0; + + if (_md_sysfs_attribute_scanf(dt, dev, attribute, + "%s", &version_string) != 1) + return -1; + + log_very_verbose("Device %s %s is %s.", + dev_name(dev), attribute, version_string); + + if (!strcmp(version_string, "1.0")) + return 1; + return 0; +} + #else int dev_is_md(struct device *dev __attribute__((unused)), diff --git a/lib/device/dev-type.h b/lib/device/dev-type.h index 210a316..0e418d6 100644 --- a/lib/device/dev-type.h +++ b/lib/device/dev-type.h @@ -76,6 +76,7 @@ int wipe_known_signatures(struct cmd_context *cmd, struct device *dev, const cha /* Type-specific device properties */ unsigned long dev_md_stripe_width(struct dev_types *dt, struct device *dev); +int dev_is_md_with_end_superblock(struct dev_types *dt, struct device *dev); /* Partitioning */ int major_max_partitions(struct dev_types *dt, int major); diff --git a/lib/filters/filter-md.c b/lib/filters/filter-md.c index 95e0aad..4c3f23d 100644 --- a/lib/filters/filter-md.c +++ b/lib/filters/filter-md.c @@ -30,50 +30,43 @@ * * (This is assuming lvm.conf md_component_detection=1.) * - * If lvm does *not* ignore the components, then lvm will read lvm - * labels from the md dev and from the component devs, and will see - * them all as duplicates of each other. LVM duplicate resolution - * will then kick in and keep the md dev around to use and ignore - * the components. - * - * It is better to exclude the components as early as possible during - * lvm processing, ideally before lvm even looks for labels on the - * components, so that duplicate resolution can be avoided. There are - * a number of ways that md components can be excluded earlier than - * the duplicate resolution phase: - * - * - When external_device_info_source="udev", lvm discovers a device is - * an md component by asking udev during the initial filtering phase. - * However, lvm's default is to not use udev for this. The - * alternative is "native" detection in which lvm tries to detect - * md components itself. - * - * - When using native detection, lvm's md filter looks for the md - * superblock at the start of devices. It will see the md superblock - * on the components, exclude them in the md filter, and avoid - * handling them later in duplicate resolution. - * - * - When using native detection, lvm's md filter will not detect - * components when the md device has an older superblock version that - * places the superblock at the end of the device. This case will - * fall back to duplicate resolution to exclude components. - * - * A variation of the description above occurs for lvm commands that - * intend to create new PVs on devices (pvcreate, vgcreate, vgextend). - * For these commands, the native md filter also reads the end of all - * devices to check for the odd md superblocks. - * - * (The reason that external_device_info_source is not set to udev by - * default is that there have be issues with udev not being promptly - * or reliably updated about md state changes, causing the udev info - * that lvm uses to be occasionally wrong.) - */ - -/* - * FIXME: for commands that want a full md check (pvcreate, vgcreate, - * vgextend), we do an extra read at the end of every device that the - * filter looks at. This isn't necessary; we only need to do the full - * md check on the PVs that these commands are trying to use. + * If lvm does *not* ignore the components, then lvm may read lvm + * labels from the component devs and potentially the md dev, + * which can trigger duplicate detection, and/or cause lvm to display + * md components as PVs rather than ignoring them. + * + * If scanning md componenents causes duplicates to be seen, then + * the lvm duplicate resolution will exclude the components. + * + * The lvm md filter has three modes: + * + * 1. look for md superblock at the start of the device + * 2. look for md superblock at the start and end of the device + * 3. use udev to detect components + * + * mode 1 will not detect and exclude components of md devices + * that use superblock version 1.0 which is at the end of the device. + * + * mode 2 will detect these, but mode 2 doubles the i/o done by label + * scan, since there's a read at both the start and end of every device. + * + * mode 3 is used when external_device_info_source="udev". It does + * not require any io from lvm, but this mode is not used by default + * because there have been problems getting reliable info from udev. + * + * lvm uses mode 2 when: + * + * - the command is pvcreate/vgcreate/vgextend, which format new + * devices, and if the user ran these commands on a component + * device of an md device 1.0, then it would cause problems. + * FIXME: this would only really need to scan the end of the + * devices being formatted, not all devices. + * + * - it sees an md device on the system using version 1.0. + * The point of this is just to avoid displaying md components + * from the 'pvs' command. + * FIXME: the cost (double i/o) may not be worth the benefit + * (not showing md components). */ /* diff --git a/lib/label/label.c b/lib/label/label.c index de5aa88..065c01f 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -847,6 +847,20 @@ int label_scan(struct cmd_context *cmd) bcache_invalidate_fd(scan_bcache, dev->bcache_fd); _scan_dev_close(dev); } + + /* + * When md devices exist that use the old superblock at the + * end of the device, then in order to detect and filter out + * the component devices of those md devs, we need to enable + * the full md filter which scans both the start and the end + * of every device. This doubles the amount of scanning i/o, + * which we want to avoid. FIXME: it may not be worth the + * cost of double i/o just to avoid displaying md component + * devs in 'pvs', which is a pretty harmless effect from a + * pretty uncommon situation. + */ + if (dev_is_md_with_end_superblock(cmd->dev_types, dev)) + cmd->use_full_md_check = 1; }; dev_iter_destroy(iter); diff --git a/test/shell/pvcreate-md-fake-hdr.sh b/test/shell/pvcreate-md-fake-hdr.sh index 13d810c..82dd8d4 100644 --- a/test/shell/pvcreate-md-fake-hdr.sh +++ b/test/shell/pvcreate-md-fake-hdr.sh @@ -95,6 +95,7 @@ sleep 1 # (when mdadm supports repair) if mdadm --action=repair "$mddev" ; then sleep 1 + pvscan -vvvv # should be showing correctly PV3 & PV4 - pvs + pvs -vvvv "$dev3" "$dev4" fi

1 0

master - Add cmd arg to more functions
by David Teigland 15 Jun '18

15 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8eab37593eccbbb8c6d03… Commit: 8eab37593eccbbb8c6d03a9bae2f6852c17a00a5 Parent: 27c647d6ce707326237771d3b046b6049161fb5a Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 15 11:03:55 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 15 11:03:55 2018 -0500 Add cmd arg to more functions so that it can be used in the filter code --- lib/cache/lvmetad.c | 8 ++++---- lib/device/dev-cache.c | 12 ++++++------ lib/device/dev-cache.h | 17 +++++++++-------- lib/filters/filter-composite.c | 8 ++++---- lib/filters/filter-fwraid.c | 2 +- lib/filters/filter-internal.c | 2 +- lib/filters/filter-md.c | 36 ++++++++++-------------------------- lib/filters/filter-mpath.c | 2 +- lib/filters/filter-partitioned.c | 2 +- lib/filters/filter-persistent.c | 4 ++-- lib/filters/filter-regex.c | 2 +- lib/filters/filter-signature.c | 2 +- lib/filters/filter-sysfs.c | 2 +- lib/filters/filter-type.c | 2 +- lib/filters/filter-usable.c | 2 +- lib/label/label.c | 8 ++++---- lib/locking/lvmlockd.c | 2 +- lib/metadata/lv_manip.c | 2 +- lib/metadata/metadata.c | 2 +- lib/metadata/mirror.c | 2 +- tools/lvmdiskscan.c | 8 ++++---- tools/pvck.c | 2 +- tools/pvscan.c | 8 ++++---- tools/reporter.c | 2 +- tools/toollib.c | 10 +++++----- 25 files changed, 67 insertions(+), 82 deletions(-) diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index 238a7f1..a75b448 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -863,9 +863,9 @@ static int _pv_populate_lvmcache(struct cmd_context *cmd, return 0; } - dev = dev_cache_get_by_devt(devt, cmd->filter); + dev = dev_cache_get_by_devt(cmd, devt, cmd->filter); if (!dev && fallback) - dev = dev_cache_get_by_devt(fallback, cmd->filter); + dev = dev_cache_get_by_devt(cmd, fallback, cmd->filter); if (!dev) { log_warn("WARNING: Device for PV %s not found or rejected by a filter.", pvid_txt); @@ -2404,7 +2404,7 @@ int lvmetad_pvscan_all_devs(struct cmd_context *cmd, int do_wait) was_silent = silent_mode(); init_silent(1); - while ((dev = dev_iter_get(iter))) { + while ((dev = dev_iter_get(cmd, iter))) { if (sigint_caught()) { ret = 0; stack; @@ -2549,7 +2549,7 @@ static void _update_pv_in_udev(struct cmd_context *cmd, dev_t devt) #if 0 struct device *dev; - if (!(dev = dev_cache_get_by_devt(devt, cmd->lvmetad_filter))) { + if (!(dev = dev_cache_get_by_devt(cmd, devt, cmd->lvmetad_filter))) { log_error("_update_pv_in_udev no dev found"); return; } diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index d60454a..1635c99 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -1504,7 +1504,7 @@ const char *dev_cache_filtered_reason(const char *name) return reason; } -struct device *dev_cache_get(const char *name, struct dev_filter *f) +struct device *dev_cache_get(struct cmd_context *cmd, const char *name, struct dev_filter *f) { struct stat buf; struct device *d = (struct device *) dm_hash_lookup(_cache.names, name); @@ -1544,7 +1544,7 @@ struct device *dev_cache_get(const char *name, struct dev_filter *f) return d; if (f && !(d->flags & DEV_REGULAR)) { - ret = f->passes_filter(f, d); + ret = f->passes_filter(cmd, f, d); if (ret == -EAGAIN) { log_debug_devs("get device by name defer filter %s", dev_name(d)); @@ -1576,7 +1576,7 @@ static struct device *_dev_cache_seek_devt(dev_t dev) * TODO This is very inefficient. We probably want a hash table indexed by * major:minor for keys to speed up these lookups. */ -struct device *dev_cache_get_by_devt(dev_t dev, struct dev_filter *f) +struct device *dev_cache_get_by_devt(struct cmd_context *cmd, dev_t dev, struct dev_filter *f) { char path[PATH_MAX]; const char *sysfs_dir; @@ -1617,7 +1617,7 @@ struct device *dev_cache_get_by_devt(dev_t dev, struct dev_filter *f) if (!f) return d; - ret = f->passes_filter(f, d); + ret = f->passes_filter(cmd, f, d); if (ret == -EAGAIN) { log_debug_devs("get device by number defer filter %s", dev_name(d)); @@ -1662,7 +1662,7 @@ static struct device *_iter_next(struct dev_iter *iter) return d; } -struct device *dev_iter_get(struct dev_iter *iter) +struct device *dev_iter_get(struct cmd_context *cmd, struct dev_iter *iter) { struct dev_filter *f; int ret; @@ -1674,7 +1674,7 @@ struct device *dev_iter_get(struct dev_iter *iter) f = iter->filter; if (f && !(d->flags & DEV_REGULAR)) { - ret = f->passes_filter(f, d); + ret = f->passes_filter(cmd, f, d); if (ret == -EAGAIN) { log_debug_devs("get device by iter defer filter %s", dev_name(d)); diff --git a/lib/device/dev-cache.h b/lib/device/dev-cache.h index c56ff50..6386ba9 100644 --- a/lib/device/dev-cache.h +++ b/lib/device/dev-cache.h @@ -19,14 +19,15 @@ #include "lib/device/device.h" #include "lib/misc/lvm-wrappers.h" +struct cmd_context; + /* * predicate for devices. */ struct dev_filter { - int (*passes_filter) (struct dev_filter * f, struct device * dev); - void (*destroy) (struct dev_filter * f); - void (*wipe) (struct dev_filter * f); - int (*dump) (struct dev_filter * f, int merge_existing); + int (*passes_filter) (struct cmd_context *cmd, struct dev_filter *f, struct device *dev); + void (*destroy) (struct dev_filter *f); + void (*wipe) (struct dev_filter *f); void *private; unsigned use_count; }; @@ -38,9 +39,9 @@ struct dm_list *dev_cache_get_dev_list_for_lvid(const char *lvid); /* * The global device cache. */ -struct cmd_context; int dev_cache_init(struct cmd_context *cmd); int dev_cache_exit(void); + /* * Returns number of open devices. */ @@ -52,11 +53,11 @@ int dev_cache_has_scanned(void); int dev_cache_add_dir(const char *path); int dev_cache_add_loopfile(const char *path); __attribute__((nonnull(1))) -struct device *dev_cache_get(const char *name, struct dev_filter *f); +struct device *dev_cache_get(struct cmd_context *cmd, const char *name, struct dev_filter *f); const char *dev_cache_filtered_reason(const char *name); // TODO -struct device *dev_cache_get_by_devt(dev_t device, struct dev_filter *f); +struct device *dev_cache_get_by_devt(struct cmd_context *cmd, dev_t device, struct dev_filter *f); void dev_set_preferred_name(struct dm_str_list *sl, struct device *dev); @@ -66,7 +67,7 @@ void dev_set_preferred_name(struct dm_str_list *sl, struct device *dev); struct dev_iter; struct dev_iter *dev_iter_create(struct dev_filter *f, int unused); void dev_iter_destroy(struct dev_iter *iter); -struct device *dev_iter_get(struct dev_iter *iter); +struct device *dev_iter_get(struct cmd_context *cmd, struct dev_iter *iter); void dev_reset_error_count(struct cmd_context *cmd); diff --git a/lib/filters/filter-composite.c b/lib/filters/filter-composite.c index ba837af..a9374ab 100644 --- a/lib/filters/filter-composite.c +++ b/lib/filters/filter-composite.c @@ -18,13 +18,13 @@ #include "lib/filters/filter.h" #include "lib/device/device.h" -static int _and_p(struct dev_filter *f, struct device *dev) +static int _and_p(struct cmd_context *cmd, struct dev_filter *f, struct device *dev) { struct dev_filter **filters; int ret; for (filters = (struct dev_filter **) f->private; *filters; ++filters) { - ret = (*filters)->passes_filter(*filters, dev); + ret = (*filters)->passes_filter(cmd, *filters, dev); if (!ret) return 0; /* No 'stack': a filter, not an error. */ @@ -33,12 +33,12 @@ static int _and_p(struct dev_filter *f, struct device *dev) return 1; } -static int _and_p_with_dev_ext_info(struct dev_filter *f, struct device *dev) +static int _and_p_with_dev_ext_info(struct cmd_context *cmd, struct dev_filter *f, struct device *dev) { int r; dev_ext_enable(dev, external_device_info_source()); - r = _and_p(f, dev); + r = _and_p(cmd, f, dev); dev_ext_disable(dev); return r; diff --git a/lib/filters/filter-fwraid.c b/lib/filters/filter-fwraid.c index 03c63b3..6f47692 100644 --- a/lib/filters/filter-fwraid.c +++ b/lib/filters/filter-fwraid.c @@ -64,7 +64,7 @@ static int _dev_is_fwraid(struct device *dev) #define MSG_SKIPPING "%s: Skipping firmware RAID component device" -static int _ignore_fwraid(struct dev_filter *f __attribute__((unused)), +static int _ignore_fwraid(struct cmd_context *cmd, struct dev_filter *f __attribute__((unused)), struct device *dev) { int ret; diff --git a/lib/filters/filter-internal.c b/lib/filters/filter-internal.c index 85e04d4..8cc0011 100644 --- a/lib/filters/filter-internal.c +++ b/lib/filters/filter-internal.c @@ -37,7 +37,7 @@ void internal_filter_clear(void) dm_list_init(&_allow_devs); } -static int _passes_internal(struct dev_filter *f __attribute__((unused)), +static int _passes_internal(struct cmd_context *cmd, struct dev_filter *f __attribute__((unused)), struct device *dev) { struct device_list *devl; diff --git a/lib/filters/filter-md.c b/lib/filters/filter-md.c index 4fcbca9..95e0aad 100644 --- a/lib/filters/filter-md.c +++ b/lib/filters/filter-md.c @@ -70,6 +70,13 @@ */ /* + * FIXME: for commands that want a full md check (pvcreate, vgcreate, + * vgextend), we do an extra read at the end of every device that the + * filter looks at. This isn't necessary; we only need to do the full + * md check on the PVs that these commands are trying to use. + */ + +/* * Returns 0 if: * the device is an md component and it should be ignored. * @@ -81,7 +88,7 @@ * that will not pass. */ -static int _passes_md_filter(struct device *dev, int full) +static int _passes_md_filter(struct cmd_context *cmd, struct dev_filter *f __attribute__((unused)), struct device *dev) { int ret; @@ -92,7 +99,7 @@ static int _passes_md_filter(struct device *dev, int full) if (!md_filtering()) return 1; - ret = dev_is_md(dev, NULL, full); + ret = dev_is_md(dev, NULL, cmd->use_full_md_check); if (ret == -EAGAIN) { /* let pass, call again after scan */ @@ -122,18 +129,6 @@ static int _passes_md_filter(struct device *dev, int full) return 1; } -static int _passes_md_filter_lite(struct dev_filter *f __attribute__((unused)), - struct device *dev) -{ - return _passes_md_filter(dev, 0); -} - -static int _passes_md_filter_full(struct dev_filter *f __attribute__((unused)), - struct device *dev) -{ - return _passes_md_filter(dev, 1); -} - static void _destroy(struct dev_filter *f) { if (f->use_count) @@ -151,18 +146,7 @@ struct dev_filter *md_filter_create(struct cmd_context *cmd, struct dev_types *d return NULL; } - /* - * FIXME: for commands that want a full md check (pvcreate, vgcreate, - * vgextend), we do an extra read at the end of every device that the - * filter looks at. This isn't necessary; we only need to do the full - * md check on the PVs that these commands are trying to use. - */ - - if (cmd->use_full_md_check) - f->passes_filter = _passes_md_filter_full; - else - f->passes_filter = _passes_md_filter_lite; - + f->passes_filter = _passes_md_filter; f->destroy = _destroy; f->use_count = 0; f->private = dt; diff --git a/lib/filters/filter-mpath.c b/lib/filters/filter-mpath.c index 785b518..bcd1e52 100644 --- a/lib/filters/filter-mpath.c +++ b/lib/filters/filter-mpath.c @@ -247,7 +247,7 @@ static int _dev_is_mpath(struct dev_filter *f, struct device *dev) #define MSG_SKIPPING "%s: Skipping mpath component device" -static int _ignore_mpath(struct dev_filter *f, struct device *dev) +static int _ignore_mpath(struct cmd_context *cmd, struct dev_filter *f, struct device *dev) { if (_dev_is_mpath(f, dev) == 1) { if (dev->ext.src == DEV_EXT_NONE) diff --git a/lib/filters/filter-partitioned.c b/lib/filters/filter-partitioned.c index 34151fd..6418cdf 100644 --- a/lib/filters/filter-partitioned.c +++ b/lib/filters/filter-partitioned.c @@ -19,7 +19,7 @@ #define MSG_SKIPPING "%s: Skipping: Partition table signature found" -static int _passes_partitioned_filter(struct dev_filter *f, struct device *dev) +static int _passes_partitioned_filter(struct cmd_context *cmd, struct dev_filter *f, struct device *dev) { struct dev_types *dt = (struct dev_types *) f->private; int ret; diff --git a/lib/filters/filter-persistent.c b/lib/filters/filter-persistent.c index 9ee3957..1782bfa 100644 --- a/lib/filters/filter-persistent.c +++ b/lib/filters/filter-persistent.c @@ -68,7 +68,7 @@ static void _persistent_filter_wipe(struct dev_filter *f) dm_hash_wipe(pf->devices); } -static int _lookup_p(struct dev_filter *f, struct device *dev) +static int _lookup_p(struct cmd_context *cmd, struct dev_filter *f, struct device *dev) { struct pfilter *pf = (struct pfilter *) f->private; void *l; @@ -99,7 +99,7 @@ static int _lookup_p(struct dev_filter *f, struct device *dev) if (!l) { dev->flags &= ~DEV_FILTER_AFTER_SCAN; - pass = pf->real->passes_filter(pf->real, dev); + pass = pf->real->passes_filter(cmd, pf->real, dev); if (!pass) { /* diff --git a/lib/filters/filter-regex.c b/lib/filters/filter-regex.c index c642ec4..1a8e8a2 100644 --- a/lib/filters/filter-regex.c +++ b/lib/filters/filter-regex.c @@ -145,7 +145,7 @@ static int _build_matcher(struct rfilter *rf, const struct dm_config_value *val) return r; } -static int _accept_p(struct dev_filter *f, struct device *dev) +static int _accept_p(struct cmd_context *cmd, struct dev_filter *f, struct device *dev) { int m, first = 1, rejected = 0; struct rfilter *rf = (struct rfilter *) f->private; diff --git a/lib/filters/filter-signature.c b/lib/filters/filter-signature.c index d4b6ea3..5c5796f 100644 --- a/lib/filters/filter-signature.c +++ b/lib/filters/filter-signature.c @@ -21,7 +21,7 @@ #define BUFSIZE 4096 -static int _ignore_signature(struct dev_filter *f __attribute__((unused)), +static int _ignore_signature(struct cmd_context *cmd, struct dev_filter *f __attribute__((unused)), struct device *dev) { char buf[BUFSIZE]; diff --git a/lib/filters/filter-sysfs.c b/lib/filters/filter-sysfs.c index 5b54312..c77c4a6 100644 --- a/lib/filters/filter-sysfs.c +++ b/lib/filters/filter-sysfs.c @@ -260,7 +260,7 @@ static int _init_devs(struct dev_set *ds) } -static int _accept_p(struct dev_filter *f, struct device *dev) +static int _accept_p(struct cmd_context *cmd, struct dev_filter *f, struct device *dev) { struct dev_set *ds = (struct dev_set *) f->private; diff --git a/lib/filters/filter-type.c b/lib/filters/filter-type.c index 63d7c70..3b0a644 100644 --- a/lib/filters/filter-type.c +++ b/lib/filters/filter-type.c @@ -17,7 +17,7 @@ #include "lib/misc/lib.h" #include "lib/filters/filter.h" -static int _passes_lvm_type_device_filter(struct dev_filter *f, struct device *dev) +static int _passes_lvm_type_device_filter(struct cmd_context *cmd, struct dev_filter *f, struct device *dev) { struct dev_types *dt = (struct dev_types *) f->private; const char *name = dev_name(dev); diff --git a/lib/filters/filter-usable.c b/lib/filters/filter-usable.c index 498b90c..ab5c02f 100644 --- a/lib/filters/filter-usable.c +++ b/lib/filters/filter-usable.c @@ -100,7 +100,7 @@ static int _check_pv_min_size(struct device *dev) return 0; } -static int _passes_usable_filter(struct dev_filter *f, struct device *dev) +static int _passes_usable_filter(struct cmd_context *cmd, struct dev_filter *f, struct device *dev) { filter_mode_t mode = *((filter_mode_t *) f->private); struct dev_usable_check_params ucp = {0}; diff --git a/lib/label/label.c b/lib/label/label.c index 373df29..de5aa88 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -366,7 +366,7 @@ static int _process_block(struct cmd_context *cmd, struct dev_filter *f, log_debug_devs("Scan filtering %s", dev_name(dev)); - pass = f->passes_filter(f, dev); + pass = f->passes_filter(cmd, f, dev); if ((pass == -EAGAIN) || (dev->flags & DEV_FILTER_AFTER_SCAN)) { /* Shouldn't happen */ @@ -833,7 +833,7 @@ int label_scan(struct cmd_context *cmd) return 0; } - while ((dev = dev_iter_get(iter))) { + while ((dev = dev_iter_get(cmd, iter))) { if (!(devl = zalloc(sizeof(*devl)))) continue; devl->dev = dev; @@ -946,7 +946,7 @@ void label_scan_invalidate_lv(struct cmd_context *cmd, struct logical_volume *lv lv_info(cmd, lv, 0, &lvinfo, 0, 0); devt = MKDEV(lvinfo.major, lvinfo.minor); - if ((dev = dev_cache_get_by_devt(devt, NULL))) + if ((dev = dev_cache_get_by_devt(cmd, devt, NULL))) label_scan_invalidate(dev); } @@ -963,7 +963,7 @@ void label_scan_drop(struct cmd_context *cmd) if (!(iter = dev_iter_create(NULL, 0))) return; - while ((dev = dev_iter_get(iter))) { + while ((dev = dev_iter_get(cmd, iter))) { if (_in_bcache(dev)) _scan_dev_close(dev); } diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index 21a9696..a277246 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -398,7 +398,7 @@ static int _extend_sanlock_lv(struct cmd_context *cmd, struct volume_group *vg, log_print("Zeroing %u MiB on extended internal lvmlock LV...", extend_mb); - if (!(dev = dev_cache_get(path, NULL))) { + if (!(dev = dev_cache_get(cmd, path, NULL))) { log_error("Extend sanlock LV %s cannot find device.", display_lvname(lv)); return 0; } diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index b2eba30..27cd2c1 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -7145,7 +7145,7 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp) return 0; } - if (!(dev = dev_cache_get(name, NULL))) { + if (!(dev = dev_cache_get(lv->vg->cmd, name, NULL))) { log_error("%s: not found: device not cleared", name); return 0; } diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 113c87c..34b1ec7 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -1510,7 +1510,7 @@ struct pv_list *find_pv_in_vg(const struct volume_group *vg, const char *pv_name) { struct pv_list *pvl; - struct device *dev = dev_cache_get(pv_name, vg->cmd->filter); + struct device *dev = dev_cache_get(vg->cmd, pv_name, vg->cmd->filter); /* * If the device does not exist or is filtered out, don't bother trying diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 8de1440..11f2a8f 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -292,7 +292,7 @@ static int _write_log_header(struct cmd_context *cmd, struct logical_volume *lv) log_verbose("Writing log header for LV %s to device %s.", display_lvname(lv), name); - if (!(dev = dev_cache_get(name, NULL))) { + if (!(dev = dev_cache_get(cmd, name, NULL))) { log_error("%s: not found: log header not written.", name); return 0; } diff --git a/tools/lvmdiskscan.c b/tools/lvmdiskscan.c index 772694c..0b97eba 100644 --- a/tools/lvmdiskscan.c +++ b/tools/lvmdiskscan.c @@ -27,7 +27,7 @@ int pv_disks_found; int pv_parts_found; int max_len; -static int _get_max_dev_name_len(struct dev_filter *filter) +static int _get_max_dev_name_len(struct cmd_context *cmd, struct dev_filter *filter) { int len = 0; int maxlen = 0; @@ -40,7 +40,7 @@ static int _get_max_dev_name_len(struct dev_filter *filter) } /* Do scan */ - for (dev = dev_iter_get(iter); dev; dev = dev_iter_get(iter)) { + for (dev = dev_iter_get(cmd, iter); dev; dev = dev_iter_get(cmd, iter)) { len = strlen(dev_name(dev)); if (len > maxlen) maxlen = len; @@ -100,14 +100,14 @@ int lvmdiskscan(struct cmd_context *cmd, int argc __attribute__((unused)), /* Call before using dev_iter which uses filters which want bcache data. */ label_scan(cmd); - max_len = _get_max_dev_name_len(cmd->full_filter); + max_len = _get_max_dev_name_len(cmd, cmd->full_filter); if (!(iter = dev_iter_create(cmd->full_filter, 0))) { log_error("dev_iter_create failed"); return ECMD_FAILED; } - for (dev = dev_iter_get(iter); dev; dev = dev_iter_get(iter)) { + for (dev = dev_iter_get(cmd, iter); dev; dev = dev_iter_get(cmd, iter)) { if (lvmcache_has_dev_info(dev)) { if (!dev_get_size(dev, &size)) { log_error("Couldn't get size of \"%s\"", diff --git a/tools/pvck.c b/tools/pvck.c index 027df6d..ce74036 100644 --- a/tools/pvck.c +++ b/tools/pvck.c @@ -35,7 +35,7 @@ int pvck(struct cmd_context *cmd, int argc, char **argv) pv_name = argv[i]; - dev = dev_cache_get(pv_name, cmd->filter); + dev = dev_cache_get(cmd, pv_name, cmd->filter); if (!dev) { log_error("Device %s %s.", pv_name, dev_cache_filtered_reason(pv_name)); diff --git a/tools/pvscan.c b/tools/pvscan.c index 61530ee..17fc1a6 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -438,10 +438,10 @@ static int _pvscan_cache(struct cmd_context *cmd, int argc, char **argv) while (argc--) { pv_name = *argv++; if (pv_name[0] == '/') { - if (!(dev = dev_cache_get(pv_name, cmd->lvmetad_filter))) { + if (!(dev = dev_cache_get(cmd, pv_name, cmd->lvmetad_filter))) { /* Remove device path from lvmetad. */ log_debug("Removing dev %s from lvmetad cache.", pv_name); - if ((dev = dev_cache_get(pv_name, NULL))) { + if ((dev = dev_cache_get(cmd, pv_name, NULL))) { if (!_lvmetad_clear_dev(dev->dev, MAJOR(dev->dev), MINOR(dev->dev))) remove_errors++; } else { @@ -468,7 +468,7 @@ static int _pvscan_cache(struct cmd_context *cmd, int argc, char **argv) } devno = MKDEV((dev_t)major, (dev_t)minor); - if (!(dev = dev_cache_get_by_devt(devno, cmd->lvmetad_filter))) { + if (!(dev = dev_cache_get_by_devt(cmd, devno, cmd->lvmetad_filter))) { /* Remove major:minor from lvmetad. */ log_debug("Removing dev %d:%d from lvmetad cache.", major, minor); if (!_lvmetad_clear_dev(devno, major, minor)) @@ -531,7 +531,7 @@ static int _pvscan_cache(struct cmd_context *cmd, int argc, char **argv) devno = MKDEV((dev_t)major, (dev_t)minor); - if (!(dev = dev_cache_get_by_devt(devno, cmd->lvmetad_filter))) { + if (!(dev = dev_cache_get_by_devt(cmd, devno, cmd->lvmetad_filter))) { /* Remove major:minor from lvmetad. */ log_debug("Removing dev %d:%d from lvmetad cache.", major, minor); if (!_lvmetad_clear_dev(devno, major, minor)) diff --git a/tools/reporter.c b/tools/reporter.c index a7f1f9b..faaff37 100644 --- a/tools/reporter.c +++ b/tools/reporter.c @@ -719,7 +719,7 @@ static void _check_pv_list(struct cmd_context *cmd, struct report_args *args, st if (single_args->args_are_pvs && args->argc) { for (i = 0; i < args->argc; i++) { - if (!rescan_done && !dev_cache_get(args->argv[i], cmd->full_filter)) { + if (!rescan_done && !dev_cache_get(cmd, args->argv[i], cmd->full_filter)) { cmd->filter->wipe(cmd->filter); /* FIXME scan only one device */ lvmcache_label_scan(cmd); diff --git a/tools/toollib.c b/tools/toollib.c index f64bd58..c81d1c2 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1470,7 +1470,7 @@ int process_each_label(struct cmd_context *cmd, int argc, char **argv, if (argc) { for (; opt < argc; opt++) { - if (!(dev = dev_cache_get(argv[opt], cmd->full_filter))) { + if (!(dev = dev_cache_get(cmd, argv[opt], cmd->full_filter))) { log_error("Failed to find device " "\"%s\".", argv[opt]); ret_max = ECMD_FAILED; @@ -1547,7 +1547,7 @@ int process_each_label(struct cmd_context *cmd, int argc, char **argv, goto out; } - while ((dev = dev_iter_get(iter))) + while ((dev = dev_iter_get(cmd, iter))) { if (!(label = lvmcache_get_dev_label(dev))) continue; @@ -3870,7 +3870,7 @@ static int _get_arg_devices(struct cmd_context *cmd, return ECMD_FAILED; } - if (!(dil->dev = dev_cache_get(sl->str, cmd->filter))) { + if (!(dil->dev = dev_cache_get(cmd, sl->str, cmd->filter))) { log_error("Failed to find device for physical volume \"%s\".", sl->str); ret_max = ECMD_FAILED; } else { @@ -3898,7 +3898,7 @@ static int _get_all_devices(struct cmd_context *cmd, struct dm_list *all_devices return ECMD_FAILED; } - while ((dev = dev_iter_get(iter))) { + while ((dev = dev_iter_get(cmd, iter))) { if (!(dil = dm_pool_alloc(cmd->mem, sizeof(*dil)))) { log_error("device_id_list alloc failed."); goto out; @@ -5398,7 +5398,7 @@ int pvcreate_each_device(struct cmd_context *cmd, * Translate arg names into struct device's. */ dm_list_iterate_items(pd, &pp->arg_devices) - pd->dev = dev_cache_get(pd->name, cmd->full_filter); + pd->dev = dev_cache_get(cmd, pd->name, cmd->full_filter); /* * Use process_each_pv to search all existing PVs and devices.

1 0

master - rpm: drop no longer present clvmd, lvm2app
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=27c647d6ce70732623777… Commit: 27c647d6ce707326237771d3b046b6049161fb5a Parent: 2a7f2a3a244dd02cacb947b19f7400b53dd71ca4 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 15 00:47:35 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 15 00:47:35 2018 +0200 rpm: drop no longer present clvmd, lvm2app --- spec/packages.inc | 102 ----------------------------------------------------- spec/source.inc | 1 - 2 files changed, 0 insertions(+), 103 deletions(-) diff --git a/spec/packages.inc b/spec/packages.inc index cdcc197..bf2432a 100644 --- a/spec/packages.inc +++ b/spec/packages.inc @@ -229,11 +229,8 @@ the lvm2 libraries. %files devel %defattr(-,root,root,-) -%{_libdir}/liblvm2app.so %{_libdir}/liblvm2cmd.so -%{_includedir}/lvm2app.h %{_includedir}/lvm2cmd.h -%{_libdir}/pkgconfig/lvm2app.pc %{_libdir}/libdevmapper-event-lvm2.so %package libs @@ -251,7 +248,6 @@ This package contains shared lvm2 libraries for applications. %files libs %defattr(-,root,root,-) -%attr(755,root,root) %{_libdir}/liblvm2app.so.* %attr(755,root,root) %{_libdir}/liblvm2cmd.so.* %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2.so.* %dir %{_libdir}/device-mapper @@ -291,10 +287,8 @@ LVM commands use lvmlockd to coordinate access to shared storage. %post lockd %daemon_reload %enable -s lvmlockd -t service -%enable -s lvmlocking -t service %preun lockd -%disable -s lvmlocking -t service %disable -s lvmlockd -t service %postun lockd @@ -309,66 +303,6 @@ fi %{_mandir}/man8/lvmlockctl.8.gz %dir %{_default_locking_dir} %{_unitdir}/lvm2-lvmlockd.service -%{_unitdir}/lvm2-lvmlocking.service -%endif - -############################################################################## -# Cluster subpackage -############################################################################## -%if %{have_with clvmd} - -%package cluster -Summary: Cluster extensions for userland logical volume management tools -License: GPLv2 -Group: System Environment/Base -Requires: lvm2 >= %{version}-%{release} -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): device-mapper >= %{device_mapper_version} -Requires(preun): lvm2 >= 2.02 -%maybe Requires: %{req_cluster} - -%description cluster - -Extensions to LVM2 to support clusters. - -%post cluster -%daemon_reload -%enable -s clvmd -t service -%if %{have_service clvmd} -if [ $1 = 2 ]; then - if [ -e %{_default_pid_dir}/clvmd.pid ]; then - %{_sbindir}/clvmd -S >/dev/null 2>&1 || : - fi -fi -%endif - -%preun cluster -%disable -s clvmd -t service -%if %{have_service clvmd} -if [ $1 = 0 ]; then - # lvmconf may no longer exist if lvm2 is being removed in the same rpm run - if test -x /sbin/lvmconf; then /sbin/lvmconf --disable-cluster; fi -fi -%endif - -%postun cluster -if [ $1 = 0 ]; then -%daemon_reload -fi - -%files cluster -%defattr(-,root,root,-) -%attr(755,root,root) /usr/sbin/clvmd -%{_mandir}/man8/clvmd.8.gz -%if %{enable_systemd} - %{_unitdir}/lvm2-clvmd.service - %{_unitdir}/lvm2-cluster-activation.service - %{_unitdir}/../lvm2-cluster-activation -%else - %{_sysconfdir}/rc.d/init.d/clvmd -%endif - %endif ############################################################################## @@ -413,42 +347,6 @@ fi %endif ############################################################################## -# Python bindings -############################################################################## -%if %{enable_python} -%package python-libs -Summary: Python module to access LVM -License: LGPLv2 -Group: Development/Libraries -Provides: python-lvm = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} - -%description python-libs -Python module to allow the creation and use of LVM -logical volumes, physical volumes, and volume groups. - -%files python-libs -%{python_sitearch}/* -%endif - -%if %{enable_python3} -%package python3-libs -Summary: Python 3 module to access LVM -License: LGPLv2 -Group: Development/Libraries -Provides: python3-lvm = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} - -%description python3-libs -Python 3 module to allow the creation and use of LVM -logical volumes, physical volumes, and volume groups. - -%files python3-libs -%{python3_sitearch}/*.so -%{python3_sitearch}/*.egg-info -%endif - -############################################################################## # LVM D-Bus daemon ############################################################################## %if %{enable_dbusd} diff --git a/spec/source.inc b/spec/source.inc index fb7ccf5..6a485ef 100644 --- a/spec/source.inc +++ b/spec/source.inc @@ -30,7 +30,6 @@ # enable service only if you know what you are doing # %if %{enable_cmirror} -#service clvmd 1 #service cmirrord 1 %endif

1 0

master - tests: more tolerable makefile
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2a7f2a3a244dd02cacb94… Commit: 2a7f2a3a244dd02cacb947b19f7400b53dd71ca4 Parent: 7d8bd97187b5eb8bbea10d95bc62b4a14c5e4d4e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 15 00:46:54 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 15 00:46:54 2018 +0200 tests: more tolerable makefile --- test/Makefile.in | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 48ecdd7..39093bf 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -239,7 +239,7 @@ LIB_LVMLOCKD_CONF = \ test-dlm-conf \ test-sanlock-conf -LIB_LOCAL = paths runner +LIB_LOCAL = paths runner mke2fs.conf LIB_NOT = not LIB_LINK_NOT = invalid fail should LIB_SHARED = check aux inittest utils get lvm-wrapper @@ -250,8 +250,8 @@ install: .tests-stamp lib/paths-installed $(INSTALL_DATA) shell/*.sh $(DATADIR)/shell $(INSTALL_DATA) unit/*.sh $(DATADIR)/unit $(INSTALL_DATA) lib/mke2fs.conf $(DATADIR)/lib - $(INSTALL_PROGRAM) unit/unit-test $(DATADIR)/unit - $(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/ + -$(INSTALL_PROGRAM) unit/unit-test $(DATADIR)/unit + -$(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/ $(INSTALL_DATA) lib/paths-installed $(DATADIR)/lib/paths cd lib && $(INSTALL_DATA) \ $(LIB_FLAVOURS) \ @@ -340,6 +340,9 @@ lib/version-expected: $(top_srcdir)/VERSION .lib-dir-stamp lib/dm-version-expected: $(top_srcdir)/VERSION_DM .lib-dir-stamp cut -f 1 -d ' ' <$< >$@ +lib/mke2fs.conf: $(srcdir)/lib/mke2fs.conf + $(LN_S) -f $< $@ + CMDS = lvm $(shell cat $(top_builddir)/tools/.commands 2>/dev/null) LIB = $(addprefix lib/, $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $(LIB_FLAVOURS))

1 0

master - scripts: clvmd gone
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7d8bd97187b5eb8bbea10… Commit: 7d8bd97187b5eb8bbea10d95bc62b4a14c5e4d4e Parent: 9d2b9e5bc6a5a887ab4423caabb4ec43031de662 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 15 00:46:24 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 15 00:46:24 2018 +0200 scripts: clvmd gone --- scripts/Makefile.in | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/scripts/Makefile.in b/scripts/Makefile.in index f0addc3..fc97544 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -69,9 +69,6 @@ endif ifeq ("@BUILD_LVMPOLLD@", "yes") $(INSTALL_SCRIPT) lvm2_lvmpolld_init_red_hat $(initdir)/lvm2-lvmpolld endif -ifneq ("@CLVMD@", "none") - $(INSTALL_SCRIPT) clvmd_init_red_hat $(initdir)/clvmd -endif ifeq ("@BUILD_CMIRRORD@", "yes") $(INSTALL_SCRIPT) cmirrord_init_red_hat $(initdir)/cmirrord endif @@ -110,11 +107,6 @@ endif ifeq ("@BUILD_LVMLOCKD@", "yes") $(INSTALL_DATA) lvm2_lvmlockd_systemd_red_hat.service $(systemd_unit_dir)/lvm2-lvmlockd.service endif -ifneq ("@CLVMD@", "none") - $(INSTALL_DATA) lvm2_clvmd_systemd_red_hat.service $(systemd_unit_dir)/lvm2-clvmd.service - $(INSTALL_DATA) lvm2_cluster_activation_systemd_red_hat.service $(systemd_unit_dir)/lvm2-cluster-activation.service - $(INSTALL_SCRIPT) lvm2_cluster_activation_red_hat.sh $(systemd_dir)/lvm2-cluster-activation -endif ifeq ("@BUILD_CMIRRORD@", "yes") $(INSTALL_DATA) lvm2_cmirrord_systemd_red_hat.service $(systemd_unit_dir)/lvm2-cmirrord.service endif

1 0

master - man: stop installing clvmd man page
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9d2b9e5bc6a5a887ab442… Commit: 9d2b9e5bc6a5a887ab4423caabb4ec43031de662 Parent: 52e7270e23858509fd0da419ecbc4e42e22f04ac Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 15 00:46:08 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 15 00:46:08 2018 +0200 man: stop installing clvmd man page --- man/Makefile.in | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/man/Makefile.in b/man/Makefile.in index 844b0ca..aefda2d 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -29,7 +29,6 @@ DMFILEMAPDMAN = dmfilemapd.8 LVMETADMAN = lvmetad.8 LVMPOLLDMAN = lvmpolld.8 LVMLOCKDMAN = lvmlockd.8 lvmlockctl.8 -CLVMDMAN = clvmd.8 CMIRRORDMAN = cmirrord.8 LVMCACHEMAN = lvmcache.7 LVMTHINMAN = lvmthin.7 @@ -63,7 +62,7 @@ endif ifeq ($(MAN_ALL),"yes") MAN8+=$(FSADMMAN) $(LVMETADMAN) $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(LVMDBUSDMAN) MAN8DM+=$(BLKDEACTIVATEMAN) $(DMEVENTDMAN) $(DMFILEMAPDMAN) - MAN8CLUSTER+=$(CLVMDMAN) $(CMIRRORDMAN) + MAN8CLUSTER+=$(CMIRRORDMAN) else ifeq ("@FSADM@", "yes") MAN8+=$(FSADMMAN) @@ -97,10 +96,6 @@ else MAN8DM+=$(DMFILEMAPDMAN) endif - ifneq ("@CLVMD@", "none") - MAN8CLUSTER+=$(CLVMDMAN) - endif - ifeq ("@BUILD_CMIRRORD@", "yes") MAN8CLUSTER+=$(CMIRRORDMAN) endif @@ -119,7 +114,7 @@ include $(top_builddir)/make.tmpl CLEAN_TARGETS+=$(MAN5) $(MAN7) $(MAN8) $(MAN8SO) $(MAN8:%.8=%.8_gen) $(MAN8CLUSTER) \ $(MAN8SYSTEMD_GENERATORS) $(MAN8DM) $(TESTMAN) DISTCLEAN_TARGETS+=$(FSADMMAN) $(BLKDEACTIVATEMAN) $(DMEVENTDMAN) \ - $(LVMETADMAN) $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(CLVMDMAN) $(CMIRRORDMAN) \ + $(LVMETADMAN) $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(CMIRRORDMAN) \ $(LVMCACHEMAN) $(LVMTHINMAN) $(LVMDBUSDMAN) $(LVMRAIDMAN) \ $(DMFILEMAPDMAN)

1 0

master - man-generator: drop macro redefines
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=52e7270e23858509fd0da… Commit: 52e7270e23858509fd0da419ecbc4e42e22f04ac Parent: faf3cc8f71a6e727e2124199eef25ff00e954c0f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 23:15:28 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 23:22:42 2018 +0200 man-generator: drop macro redefines --- tools/command.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/command.c b/tools/command.c index e1391a1..eefc124 100644 --- a/tools/command.c +++ b/tools/command.c @@ -51,9 +51,6 @@ do { \ printf(fmt "\n", ##args); \ } while (0) -#define malloc malloc -#define strdup strdup -#define free free #define dm_snprintf snprintf static int dm_strncpy(char *dest, const char *src, size_t n)

1 0

master - tests: drop some clvmd refs
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=faf3cc8f71a6e727e2124… Commit: faf3cc8f71a6e727e2124199eef25ff00e954c0f Parent: b2cb8f846ac8061bb3e71d5805edd72e67d277db Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 23:14:32 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 23:22:42 2018 +0200 tests: drop some clvmd refs Do not try to link clvmd binary. Ensure lib is created new and does not refer old binaries. --- test/Makefile.in | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index ca2e2e1..48ecdd7 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -123,7 +123,6 @@ help: @echo " LVM_TEST_CACHE_RESTORE_CMD Command for cache_restore [$(LVM_TEST_CACHE_RESTORE_CMD)]." @echo " LVM_TEST_UNLIMITED Set to get unlimited test log (>32MB)" @echo " LVM_VALGRIND Enable valgrind testing, execs $$"VALGRIND. - @echo " LVM_VALGRIND_CLVMD Enable valgrind testing of clvmd (1)." @echo " LVM_VALGRIND_DMEVENTD Enable valgrind testing of dmeventd (1)." @echo " LVM_VALGRIND_LVMETAD Enable valgrind testing of lvmetad (1)." @echo " LVM_STRACE Enable strace logging." @@ -304,7 +303,6 @@ lib/paths-common: $(srcdir)/Makefile.in .lib-dir-stamp Makefile echo 'LVMETAD_PIDFILE="@LVMETAD_PIDFILE@"' >> $@-t echo 'LVMPOLLD_PIDFILE="@LVMPOLLD_PIDFILE@"' >> $@-t echo 'DMEVENTD_PIDFILE="@DMEVENTD_PIDFILE@"' >> $@-t - echo 'CLVMD_PIDFILE="@CLVMD_PIDFILE@"' >> $@-t echo 'LVM_TEST_THIN_CHECK_CMD=$${LVM_TEST_THIN_CHECK_CMD-@THIN_CHECK_CMD@}' >> $@-t echo 'LVM_TEST_THIN_DUMP_CMD=$${LVM_TEST_THIN_DUMP_CMD-@THIN_DUMP_CMD@}' >> $@-t echo 'LVM_TEST_THIN_REPAIR_CMD=$${LVM_TEST_THIN_REPAIR_CMD-@THIN_REPAIR_CMD@}' >> $@-t @@ -314,7 +312,7 @@ lib/paths-common: $(srcdir)/Makefile.in .lib-dir-stamp Makefile echo 'LVM_TEST_CACHE_REPAIR_CMD=$${LVM_TEST_CACHE_REPAIR_CMD-@CACHE_REPAIR_CMD@}' >> $@-t echo 'LVM_TEST_CACHE_RESTORE_CMD=$${LVM_TEST_CACHE_RESTORE_CMD-@CACHE_RESTORE_CMD@}' >> $@-t echo 'export DM_UDEV_SYNCHRONISATION THIN RAID CACHE\' >> $@-t - echo ' LVMETAD_PIDFILE LVMPOLLD_PIDFILE DMEVENTD_PIDFILE CLVMD_PIDFILE\' >> $@-t + echo ' LVMETAD_PIDFILE LVMPOLLD_PIDFILE DMEVENTD_PIDFILE \' >> $@-t echo ' LVM_TEST_THIN_CHECK_CMD LVM_TEST_THIN_DUMP_CMD LVM_TEST_THIN_REPAIR_CMD LVM_TEST_THIN_RESTORE_CMD\' >> $@-t echo ' LVM_TEST_CACHE_CHECK_CMD LVM_TEST_CACHE_DUMP_CMD LVM_TEST_CACHE_REPAIR_CMD LVM_TEST_CACHE_RESTORE_CMD' >> $@-t mv $@-t $@ @@ -358,12 +356,13 @@ LIB = $(addprefix lib/, $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $( .lib-dir-stamp: $(MKDIR_P) lib unit + $(RM) lib/clvmd for i in $(CMDS); do $(LN_S) -f lvm-wrapper lib/$$i; done - for i in daemons/clvmd/clvmd daemons/dmeventd/dmeventd \ - tools/dmsetup daemons/lvmetad/lvmetad \ + for i in daemons/dmeventd/dmeventd \ + libdm/dm-tools/dmsetup daemons/lvmetad/lvmetad \ daemons/lvmpolld/lvmpolld ; do \ $(LN_S) -f $(abs_top_builddir)/$$i lib/; done - $(LN_S) -f $(abs_top_builddir)/tools/dmsetup lib/dmstats + $(LN_S) -f $(abs_top_builddir)/libdm/dm-tools/dmsetup lib/dmstats $(LN_S) -f $(abs_top_srcdir)/conf/lvmdbusd.profile lib/ $(LN_S) -f $(abs_top_srcdir)/conf/thin-performance.profile lib/ $(LN_S) -f $(abs_top_srcdir)/scripts/fsadm.sh lib/fsadm

1 0

master - build: cmirrord with internal dm lib
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b2cb8f846ac8061bb3e71… Commit: b2cb8f846ac8061bb3e71d5805edd72e67d277db Parent: b1729dbcddb7243f556b286f958cd4a97f821d65 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 23:14:04 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 23:14:04 2018 +0200 build: cmirrord with internal dm lib --- daemons/cmirrord/Makefile.in | 2 +- daemons/cmirrord/functions.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in index b6bab2d..a78dafe 100644 --- a/daemons/cmirrord/Makefile.in +++ b/daemons/cmirrord/Makefile.in @@ -30,7 +30,7 @@ LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) cmirrord: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \ - $(LVMLIBS) $(LMLIBS) $(LIBS) + $(LVMLIBS) $(LMLIBS) $(INTERNAL_LIBS) $(LIBS) install: $(TARGETS) $(INSTALL_PROGRAM) -D cmirrord $(usrsbindir)/cmirrord diff --git a/daemons/cmirrord/functions.c b/daemons/cmirrord/functions.c index 61bcf16..f10a8d5 100644 --- a/daemons/cmirrord/functions.c +++ b/daemons/cmirrord/functions.c @@ -11,6 +11,7 @@ */ #include "logging.h" #include "functions.h" +#include "base/memory/zalloc.h" #include <sys/sysmacros.h> #include <dirent.h>

1 0

master - tests: bigger lv
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b1729dbcddb7243f556b2… Commit: b1729dbcddb7243f556b286f958cd4a97f821d65 Parent: f4abbafde7ac1918ecb54c23ec90d2d9dcdc9c02 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 21:52:22 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 tests: bigger lv Although throttling slows down things considerable, it still could reach the end before next test so use bigger LV. --- test/shell/pvmove-abort.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/shell/pvmove-abort.sh b/test/shell/pvmove-abort.sh index 49847c0..1445799 100644 --- a/test/shell/pvmove-abort.sh +++ b/test/shell/pvmove-abort.sh @@ -34,8 +34,8 @@ for backgroundarg in "-b" "" ; do # Create multisegment LV -lvcreate -an -Zn -l30 -n $lv1 $vg "$dev1" -lvcreate -an -Zn -l40 -n $lv2 $vg "$dev2" +lvcreate -an -Zn -l40 -n $lv1 $vg "$dev1" +lvcreate -an -Zn -l50 -n $lv2 $vg "$dev2" cmd1=(pvmove -i1 $backgroundarg $mode "$dev1" "$dev3") cmd2=(pvmove -i1 $backgroundarg $mode "$dev2" "$dev3")

1 0

master - debug: missing trace
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f4abbafde7ac1918ecb54… Commit: f4abbafde7ac1918ecb54c23ec90d2d9dcdc9c02 Parent: b58160a1913fdd61c378479f6362bd904e7de942 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Jun 13 15:56:58 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 debug: missing trace --- tools/toollib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/toollib.c b/tools/toollib.c index 7caab45..f64bd58 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1963,6 +1963,7 @@ static int _process_vgnameid_list(struct cmd_context *cmd, uint32_t read_flags, log_very_verbose("Processing VG %s %s", vg_name, uuid); if (!lockd_vg(cmd, vg_name, NULL, 0, &lockd_state)) { + stack; ret_max = ECMD_FAILED; report_log_ret_code(ret_max); continue;

1 0

master - systemd: add conficting sockets
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b58160a1913fdd61c3784… Commit: b58160a1913fdd61c378479f6362bd904e7de942 Parent: a35098b1102eb7f387e90bd16da4cf3ed833ca57 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 12 16:27:42 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 systemd: add conficting sockets Since we are using "DefaultDependencies=no" we do not get automatic STOP job on socket connection - so automatically refuse connection on shutdown by adding this Conflict definition to socket Unit. --- scripts/lvm2_lvmetad_systemd_red_hat.socket.in | 1 + scripts/lvm2_lvmpolld_systemd_red_hat.socket.in | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/lvm2_lvmetad_systemd_red_hat.socket.in b/scripts/lvm2_lvmetad_systemd_red_hat.socket.in index 9575f98..2663c72 100644 --- a/scripts/lvm2_lvmetad_systemd_red_hat.socket.in +++ b/scripts/lvm2_lvmetad_systemd_red_hat.socket.in @@ -2,6 +2,7 @@ Description=LVM2 metadata daemon socket Documentation=man:lvmetad(8) DefaultDependencies=no +Conflicts=shutdown.target [Socket] ListenStream=@DEFAULT_RUN_DIR@/lvmetad.socket diff --git a/scripts/lvm2_lvmpolld_systemd_red_hat.socket.in b/scripts/lvm2_lvmpolld_systemd_red_hat.socket.in index ca9f123..0537d7f 100644 --- a/scripts/lvm2_lvmpolld_systemd_red_hat.socket.in +++ b/scripts/lvm2_lvmpolld_systemd_red_hat.socket.in @@ -2,6 +2,7 @@ Description=LVM2 poll daemon socket Documentation=man:lvmpolld(8) DefaultDependencies=no +Conflicts=shutdown.target [Socket] ListenStream=@DEFAULT_RUN_DIR@/lvmpolld.socket

1 0

master - vgchange: start polling with activation
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a35098b1102eb7f387e90… Commit: a35098b1102eb7f387e90bd16da4cf3ed833ca57 Parent: 218c57410c32bfa7bf7044cc6d94fd9253d6b547 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 21:05:41 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 vgchange: start polling with activation Shuffle code for better readability as set of conditions was hard to follow. Make it obvious the refresh & activate path is handling monitoring and polling on its own. So the only --monitor and --poll option needs explicit care. Option --monitor without option --poll will now as a result of this patch NOT start polling. So command: vgchange --monitor n is no longer a polling starter. --- tools/vgchange.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/tools/vgchange.c b/tools/vgchange.c index c513470..c444c30 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -662,26 +662,21 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name, activate = (activation_change_t) arg_uint_value(cmd, activate_ARG, 0); if (!vgchange_activate(cmd, vg, activate)) return_ECMD_FAILED; - } - - if (arg_is_set(cmd, refresh_ARG)) { + } else if (arg_is_set(cmd, refresh_ARG)) { /* refreshes the visible LVs (which starts polling) */ if (!_vgchange_refresh(cmd, vg)) return_ECMD_FAILED; - } - - if (!arg_is_set(cmd, activate_ARG) && - !arg_is_set(cmd, refresh_ARG) && - arg_is_set(cmd, monitor_ARG)) { + } else { /* -ay* will have already done monitoring changes */ - if (!_vgchange_monitoring(cmd, vg)) + if (arg_is_set(cmd, monitor_ARG) && + !_vgchange_monitoring(cmd, vg)) return_ECMD_FAILED; - } - if (!arg_is_set(cmd, refresh_ARG) && - arg_is_set(cmd, poll_ARG) && - !vgchange_background_polling(cmd, vg)) - return_ECMD_FAILED; + /* When explicitelly specified --poll */ + if (arg_is_set(cmd, poll_ARG) && + !vgchange_background_polling(cmd, vg)) + return_ECMD_FAILED; + } return ret; }

1 0

master - pvscan: move start of polling into vgchange
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=218c57410c32bfa7bf704… Commit: 218c57410c32bfa7bf7044cc6d94fd9253d6b547 Parent: 752c39d91db55ae637fef3b8066e1a78f894609d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 21:07:59 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 pvscan: move start of polling into vgchange Restoring polling for activated volumes lost with my recent commit: 75fed05d3ef648583764ff56cc577e0f3eba1bba and move start of polling directly into _activate_lvs_in_vg() - as there we know exactly if there was some volume even activated. Also make it sharing same code for pvscan -aay. --- tools/pvscan.c | 10 ---------- tools/vgchange.c | 25 +++++++++++++++++++------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/tools/pvscan.c b/tools/pvscan.c index 508f283..61530ee 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -248,16 +248,6 @@ static int _pvscan_autoactivate_single(struct cmd_context *cmd, const char *vg_n goto out; } - /* - * After sucessfull activation we need to initialise polling - * for all activated LVs in a VG. Possible enhancement would - * be adding --poll y|n cmdline option for pvscan and call - * init_background_polling routine in autoactivation handler. - */ - log_debug_activation("Starting background polling for VG %s.", vg_name); - - if (!(vgchange_background_polling(cmd, vg))) - goto_out; out: return ECMD_PROCESSED; } diff --git a/tools/vgchange.c b/tools/vgchange.c index 55bc476..c513470 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -127,17 +127,29 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg, sigint_restore(); + if (expected_count) + log_verbose("%sctivated %d logical volumes in volume group %s.", + is_change_activating(activate) ? "A" : "Dea", + count, vg->name); + + /* + * After sucessfull activation we need to initialise polling + * for all activated LVs in a VG. Possible enhancement would + * be adding --poll y|n cmdline option for pvscan and call + * init_background_polling routine in autoactivation handler. + */ + if (count && is_change_activating(activate) && + !vgchange_background_polling(cmd, vg)) { + stack; + r = 0; + } + /* Wait until devices are available */ if (!sync_local_dev_names(vg->cmd)) { log_error("Failed to sync local devices for VG %s.", vg->name); r = 0; } - if (expected_count) - log_verbose("%s %d logical volumes in volume group %s", - is_change_activating(activate) ? - "Activated" : "Deactivated", count, vg->name); - return r; } @@ -163,7 +175,8 @@ int vgchange_background_polling(struct cmd_context *cmd, struct volume_group *vg int polled; if (background_polling()) { - polled = _poll_lvs_in_vg(cmd, vg); + log_debug_activation("Starting background polling for volume group \"%s\".", vg->name); + polled = _poll_lvs_in_vg(cmd, vg); if (polled) log_print_unless_silent("Background polling started for %d logical volume(s) " "in volume group \"%s\"",

1 0

master - pvscan: code reshape
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=752c39d91db55ae637fef… Commit: 752c39d91db55ae637fef3b8066e1a78f894609d Parent: 33703995ae264c7abdc6d566283d94d8587a85f1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 21:07:15 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 pvscan: code reshape --- tools/pvscan.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/tools/pvscan.c b/tools/pvscan.c index 61626e6..508f283 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -318,21 +318,22 @@ static int _pvscan_cache(struct cmd_context *cmd, int argc, char **argv) dm_list_init(&found_vgnames); dm_list_init(&pp.changed_vgnames); - do_activate = arg_is_set(cmd, activate_ARG); - - if (!lvmetad_used() && !do_activate) { - log_verbose("Ignoring pvscan --cache because lvmetad is not in use."); - return ret; - } - - if (do_activate && (arg_uint_value(cmd, activate_ARG, CHANGE_AAY) != CHANGE_AAY)) { - log_error("Only --activate ay allowed with pvscan."); - return 0; - } + if ((do_activate = arg_is_set(cmd, activate_ARG))) { + if (arg_uint_value(cmd, activate_ARG, 0) != CHANGE_AAY) { + log_error("Only --activate ay allowed with pvscan."); + return EINVALID_CMD_LINE; + } - if (!lvmetad_used() && do_activate && !find_config_tree_bool(cmd, global_use_lvmetad_CFG, NULL)) { - log_verbose("Ignoring pvscan --cache -aay because lvmetad is not in use."); - return ret; + if (!lvmetad_used() && + !find_config_tree_bool(cmd, global_use_lvmetad_CFG, NULL)) { + log_verbose("Ignoring pvscan --cache -aay because lvmetad is not in use."); + return ret; + } + } else { + if (!lvmetad_used()) { + log_verbose("Ignoring pvscan --cache because lvmetad is not in use."); + return ret; + } } if (arg_is_set(cmd, major_ARG) + arg_is_set(cmd, minor_ARG))

1 0

master - vgchange: trace faling activation
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=33703995ae264c7abdc6d… Commit: 33703995ae264c7abdc6d566283d94d8587a85f1 Parent: f38a54227d71b6fd661d83609f46459306bc373a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 21:04:53 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 vgchange: trace faling activation Trace failed activation and directly assign 0 returning failure. --- tools/vgchange.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/vgchange.c b/tools/vgchange.c index 71a6c54..55bc476 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -116,8 +116,11 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg, expected_count++; - if (!lv_change_activate(cmd, lv, activate)) + if (!lv_change_activate(cmd, lv, activate)) { + stack; + r = 0; continue; + } count++; } @@ -135,7 +138,7 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg, is_change_activating(activate) ? "Activated" : "Deactivated", count, vg->name); - return (expected_count != count) ? 0 : r; + return r; } static int _vgchange_monitoring(struct cmd_context *cmd, struct volume_group *vg)

1 0

master - vgchange: move active assing
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f38a54227d71b6fd661d8… Commit: f38a54227d71b6fd661d83609f46459306bc373a Parent: 70b159d145dfa960a53f6f61ce735b90ec25b1e0 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 21:00:16 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 vgchange: move active assing Make eval of activate_ARG reusable. --- tools/vgchange.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/vgchange.c b/tools/vgchange.c index b608d87..71a6c54 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -586,6 +586,7 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name, { int ret = ECMD_PROCESSED; unsigned i; + activation_change_t activate = CHANGE_AN; static const struct { int arg; @@ -642,8 +643,8 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name, } if (arg_is_set(cmd, activate_ARG)) { - if (!vgchange_activate(cmd, vg, (activation_change_t) - arg_uint_value(cmd, activate_ARG, CHANGE_AY))) + activate = (activation_change_t) arg_uint_value(cmd, activate_ARG, 0); + if (!vgchange_activate(cmd, vg, activate)) return_ECMD_FAILED; }

1 0

master - vgchange: fix error code in error path
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=70b159d145dfa960a53f6… Commit: 70b159d145dfa960a53f6f61ce735b90ec25b1e0 Parent: 3eff3aa4f8faa5a84de2ba696b15a976fad31852 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Jun 13 15:57:51 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 vgchange: fix error code in error path This rather hard to hit error path used wrong return value to signal real error. --- tools/vgchange.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/vgchange.c b/tools/vgchange.c index 891f22a..b608d87 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -187,7 +187,7 @@ int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg, strcmp(vg->system_id, cmd->system_id) && do_activate) { log_error("Cannot activate LVs in a foreign VG."); - return ECMD_FAILED; + return 0; } /*

1 0

master - device_mapper: drop unneeded function
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3eff3aa4f8faa5a84de2b… Commit: 3eff3aa4f8faa5a84de2ba696b15a976fad31852 Parent: 5b515db71ba13d2a4f328be6a97bb309401c5c69 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 20:47:23 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 device_mapper: drop unneeded function Subdir without stats. --- device_mapper/ioctl/libdm-iface.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c index bec7f0f..733eece 100644 --- a/device_mapper/ioctl/libdm-iface.c +++ b/device_mapper/ioctl/libdm-iface.c @@ -624,20 +624,6 @@ static int _dm_inactive_supported(void) return inactive_supported; } -int dm_message_supports_precise_timestamps(void) -{ - /* - * 4.32.0 supports "precise_timestamps" and "histogram:" options - * to @stats_create messages but lacks the ability to report - * these properties via a subsequent @stats_list: require at - * least 4.33.0 in order to use these features. - */ - if (dm_check_version() && _dm_version >= 4) - if (_dm_version_minor >= 33) - return 1; - return 0; -} - void *dm_get_next_target(struct dm_task *dmt, void *next, uint64_t *start, uint64_t *length, char **target_type, char **params)

1 0

master - build: better srcdir builddir support
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5b515db71ba13d2a4f328… Commit: 5b515db71ba13d2a4f328be6a97bb309401c5c69 Parent: 52ab3c1584cd40572e82d6add7a7c71204fa9721 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 20:57:02 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 build: better srcdir builddir support With the move to top-level makefile - there are some issues with subdir recursive makefile. Make the building more tolerant for now until fully resolved. --- Makefile.in | 3 ++- test/Makefile.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index ae05aea..d076088 100644 --- a/Makefile.in +++ b/Makefile.in @@ -193,7 +193,8 @@ endif endif -include test/unit/Makefile +# FIXME: Drop once top-level make is resolved +-include test/unit/Makefile include $(top_srcdir)/device_mapper/Makefile include $(top_srcdir)/base/Makefile diff --git a/test/Makefile.in b/test/Makefile.in index 4c3c715..ca2e2e1 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -357,7 +357,7 @@ LIB = $(addprefix lib/, $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $( touch $@ .lib-dir-stamp: - $(MKDIR_P) lib + $(MKDIR_P) lib unit for i in $(CMDS); do $(LN_S) -f lvm-wrapper lib/$$i; done for i in daemons/clvmd/clvmd daemons/dmeventd/dmeventd \ tools/dmsetup daemons/lvmetad/lvmetad \

1 0

master - build: drop libdm referring from lvm code
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=52ab3c1584cd40572e82d… Commit: 52ab3c1584cd40572e82d6add7a7c71204fa9721 Parent: a457566e918840e2f21e724afd1b7f470fcbb02a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 20:48:08 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 build: drop libdm referring from lvm code Avoid adding /libdm paths into lvm building. --- make.tmpl.in | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/make.tmpl.in b/make.tmpl.in index 0790d7b..07cb18a 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -144,7 +144,6 @@ vpath %.po $(srcdir) vpath %.exported_symbols $(srcdir) interface = @interface@ -interfacebuilddir = $(top_builddir)/libdm/$(interface) rpmbuilddir = $(abs_top_builddir)/build # The number of jobs to run, if blank, defaults to the make standard @@ -252,18 +251,14 @@ endif DEFS += -DDEBUG # memory debugging is not thread-safe yet ifneq ("@BUILD_DMEVENTD@", "yes") - ifneq ("@BUILD_DMFILEMAPD@", "yes") ifneq ("@BUILD_LVMLOCKD@", "yes") ifneq ("@BUILD_LVMPOLLD@", "yes") ifneq ("@BUILD_LVMETAD@", "yes") - ifeq ("@CLVMD@", "none") DEFS += -DDEBUG_MEM endif endif endif endif - endif - endif endif # end of fPIC protection @@ -271,8 +266,8 @@ endif DEFS += -D_BUILDING_LVM -LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib -CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib +LDFLAGS += -L$(top_builddir)/lib +CLDFLAGS += -L$(top_builddir)/lib DAEMON_LIBS = -ldaemonclient LDFLAGS += -L$(top_builddir)/libdaemon/client @@ -426,8 +421,6 @@ CFLOW_FLAGS +=\ --symbol __REDIRECT:wrapper \ --symbol __REDIRECT_NTH:wrapper \ --symbol __wur:wrapper \ - -I$(top_srcdir)/libdm \ - -I$(top_srcdir)/libdm/ioctl \ -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2/ \ $(INCLUDES) $(DEFS)

1 0

master - build: drop some lvm references from libdm making
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a457566e918840e2f21e7… Commit: a457566e918840e2f21e724afd1b7f470fcbb02a Parent: c6be40960917de0e3baab23ab44c64c682895049 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 20:38:08 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 build: drop some lvm references from libdm making Some simplification, more may follow... --- libdm/make.tmpl.in | 55 +++------------------------------------------------ 1 files changed, 4 insertions(+), 51 deletions(-) diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in index fc29034..1365fd1 100644 --- a/libdm/make.tmpl.in +++ b/libdm/make.tmpl.in @@ -53,9 +53,6 @@ WC = @WC@ AR = @AR@ RM = rm -f -PYTHON2 = @PYTHON2@ -PYTHON3 = @PYTHON3@ -PYCOMPILE = $(top_srcdir)/autoconf/py-compile LIBS = @LIBS@ LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm @@ -69,9 +66,6 @@ CLDFLAGS += @CLDFLAGS@ ELDFLAGS += @ELDFLAGS@ LDDEPS += @LDDEPS@ LIB_SUFFIX = @LIB_SUFFIX@ -LVMINTERNAL_LIBS=\ - -llvm-internal \ - $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) DL_LIBS = @DL_LIBS@ RT_LIBS = @RT_LIBS@ M_LIBS = @M_LIBS@ @@ -250,20 +244,6 @@ ifeq (,$(findstring -g,$(CFLAGS))) endif CFLAGS += -fno-omit-frame-pointer DEFS += -DDEBUG - # memory debugging is not thread-safe yet - ifneq ("@BUILD_DMEVENTD@", "yes") - ifneq ("@BUILD_DMFILEMAPD@", "yes") - ifneq ("@BUILD_LVMLOCKD@", "yes") - ifneq ("@BUILD_LVMPOLLD@", "yes") - ifneq ("@BUILD_LVMETAD@", "yes") - ifeq ("@CLVMD@", "none") - DEFS += -DDEBUG_MEM - endif - endif - endif - endif - endif - endif endif # end of fPIC protection @@ -271,18 +251,8 @@ endif DEFS += -D_BUILDING_LVM -LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib -CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib - -DAEMON_LIBS = -ldaemonclient -LDFLAGS += -L$(top_builddir)/libdaemon/client -CLDFLAGS += -L$(top_builddir)/libdaemon/client - -ifeq ("@BUILD_DMEVENTD@", "yes") - DMEVENT_LIBS = -ldevmapper-event - LDFLAGS += -L$(top_builddir)/daemons/dmeventd - CLDFLAGS += -L$(top_builddir)/daemons/dmeventd -endif +LDFLAGS += -L$(top_builddir)/libdm +CLDFLAGS += -L$(top_builddir)/libdm # Combination of DEBUG_POOL and DEBUG_ENFORCE_POOL_LOCKING is not suppored. #DEFS += -DDEBUG_POOL @@ -307,8 +277,6 @@ LIB_VERSION_LVM := $(shell $(AWK) -F '.' '{printf "%s.%s",$$1,$$2}' $(top_srcdir LIB_VERSION_DM := $(shell $(AWK) -F '.' '{printf "%s.%s",$$1,$$2}' $(top_srcdir)/VERSION_DM) -LIB_VERSION_APP := $(shell $(AWK) -F '[(). ]' '{printf "%s.%s",$$1,$$4}' $(top_srcdir)/VERSION) - INCLUDES += -I$(top_srcdir) -I$(srcdir) -I$(top_builddir)/include @@ -319,22 +287,19 @@ OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o) POTFILES = $(SOURCES:%.c=%.pot) .PHONY: all pofile distclean clean cleandir cflow device-mapper -.PHONY: install install_cluster install_device-mapper install_lvm2 +.PHONY: install install_device-mapper install_lvm2 .PHONY: install_dbus_service .PHONY: install_lib_shared install_dm_plugin install_lvm2_plugin .PHONY: install_ocf install_systemd_generators install_all_man all_man man help .PHONY: python_bindings install_python_bindings .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean) -.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow) +.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.cflow) .PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper) .PHONY: $(SUBDIRS.generate) generate SUBDIRS.device-mapper := $(SUBDIRS:=.device-mapper) SUBDIRS.install := $(SUBDIRS:=.install) -SUBDIRS.install_cluster := $(SUBDIRS:=.install_cluster) SUBDIRS.install_device-mapper := $(SUBDIRS:=.install_device-mapper) -SUBDIRS.install_lvm2 := $(SUBDIRS:=.install_lvm2) -SUBDIRS.install_ocf := $(SUBDIRS:=.install_ocf) SUBDIRS.pofile := $(SUBDIRS:=.pofile) SUBDIRS.cflow := $(SUBDIRS:=.cflow) SUBDIRS.clean := $(SUBDIRS:=.clean) @@ -345,10 +310,7 @@ TARGETS += $(LIB_SHARED) $(LIB_STATIC) all: $(SUBDIRS) $(TARGETS) install: all $(SUBDIRS.install) -install_cluster: all $(SUBDIRS.install_cluster) install_device-mapper: $(SUBDIRS.install_device-mapper) -install_lvm2: $(SUBDIRS.install_lvm2) -install_ocf: $(SUBDIRS.install_ocf) cflow: $(SUBDIRS.cflow) $(SUBDIRS): $(SUBDIRS.device-mapper) @@ -360,18 +322,9 @@ $(SUBDIRS.device-mapper): $(SUBDIRS.install): $(SUBDIRS) $(MAKE) -C $(@:.install=) install -$(SUBDIRS.install_cluster): $(SUBDIRS) - $(MAKE) -C $(@:.install_cluster=) install_cluster - $(SUBDIRS.install_device-mapper): device-mapper $(MAKE) -C $(@:.install_device-mapper=) install_device-mapper -$(SUBDIRS.install_lvm2): $(SUBDIRS) - $(MAKE) -C $(@:.install_lvm2=) install_lvm2 - -$(SUBDIRS.install_ocf): - $(MAKE) -C $(@:.install_ocf=) install_ocf - $(SUBDIRS.clean): -$(MAKE) -C $(@:.clean=) clean

1 0

master - build: ensure libdm is built before dm-tools
by Zdenek Kabelac 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c6be40960917de0e3baab… Commit: c6be40960917de0e3baab23ab44c64c682895049 Parent: 327f62a25533c195f4b49a29974f3c5a2f93c15b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 14 20:37:33 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 14 22:02:01 2018 +0200 build: ensure libdm is built before dm-tools Making libs before entering dm-tools subdir, so the tool will not link i.e. system library if present. --- libdm/Makefile.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libdm/Makefile.in b/libdm/Makefile.in index 6472da7..8c8334a 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -62,6 +62,8 @@ LIBS += $(RT_LIBS) $(SELINUX_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) $(M_LIBS) device-mapper: all +dm-tools.device-mapper: $(TARGETS) + libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION): $(LIB_SHARED) $(LN_S) -f $< $@

1 0

master - man: update lvmsystemid wording
by David Teigland 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=327f62a25533c195f4b49… Commit: 327f62a25533c195f4b49a29974f3c5a2f93c15b Parent: b5f444d447e6c3f83fc1cc963b81501a760bbbeb Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jun 14 12:34:00 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Jun 14 12:35:00 2018 -0500 man: update lvmsystemid wording to refer to "shared VG" instead of "lockd VG". --- man/lvmsystemid.7_main | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/lvmsystemid.7_main b/man/lvmsystemid.7_main index 9b36dc3..97c67c2 100644 --- a/man/lvmsystemid.7_main +++ b/man/lvmsystemid.7_main @@ -346,9 +346,9 @@ of the foreign VG to its own. See Overriding system ID above. .SS shared VGs -A shared/lockd VG has no system ID set, allowing multiple hosts to use it -via lvmlockd. Changing a VG to a lockd type will clear the existing -system ID. Applicable only if LVM is compiled with lockd support. +A shared VG has no system ID set, allowing multiple hosts to use it +via lvmlockd. Changing a VG to shared will clear the existing +system ID. Applicable only if LVM is compiled with lvmlockd support. .SS clustered VGs

1 0

master - man: updates to lvmlockd
by David Teigland 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b5f444d447e6c3f83fc1c… Commit: b5f444d447e6c3f83fc1cc963b81501a760bbbeb Parent: e84e9cd115c37a64de6c0b67972a01044dffe843 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jun 14 12:30:45 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Jun 14 12:35:00 2018 -0500 man: updates to lvmlockd The terminology has migrated toward using "shared VG" rather than "lockd VG". Also improve the wording in a number of places. --- man/lvmlockd.8_main | 341 +++++++++++++++++++++----------------------------- 1 files changed, 143 insertions(+), 198 deletions(-) diff --git a/man/lvmlockd.8_main b/man/lvmlockd.8_main index 6411c01..cfb45b2 100644 --- a/man/lvmlockd.8_main +++ b/man/lvmlockd.8_main @@ -84,8 +84,8 @@ For default settings, see lvmlockd -h. .SS Initial set up -Using LVM with lvmlockd for the first time includes some one-time set up -steps: +Setting up LVM to use lvmlockd and a shared VG for the first time includes +some one time set up steps: .SS 1. choose a lock manager @@ -94,7 +94,7 @@ steps: If dlm (or corosync) are already being used by other cluster software, then select dlm. dlm uses corosync which requires additional configuration beyond the scope of this document. See corosync and dlm -documentation for instructions on configuration, setup and usage. +documentation for instructions on configuration, set up and usage. .I sanlock .br @@ -117,7 +117,9 @@ Assign each host a unique host_id in the range 1-2000 by setting .SS 3. start lvmlockd -Use a unit/init file, or run the lvmlockd daemon directly: +Start the lvmlockd daemon. +.br +Use systemctl, a cluster resource agent, or run directly, e.g. .br systemctl start lvm2-lvmlockd @@ -125,14 +127,17 @@ systemctl start lvm2-lvmlockd .I sanlock .br -Use unit/init files, or start wdmd and sanlock daemons directly: +Start the sanlock and wdmd daemons. +.br +Use systemctl or run directly, e.g. .br systemctl start wdmd sanlock .I dlm .br -Follow external clustering documentation when applicable, or use -unit/init files: +Start the dlm and corosync daemons. +.br +Use systemctl, a cluster resource agent, or run directly, e.g. .br systemctl start corosync dlm @@ -141,18 +146,17 @@ systemctl start corosync dlm vgcreate --shared <vgname> <devices> The shared option sets the VG lock type to sanlock or dlm depending on -which lock manager is running. LVM commands will perform locking for the -VG using lvmlockd. lvmlockd will use the chosen lock manager. +which lock manager is running. LVM commands acquire locks from lvmlockd, +and lvmlockd uses the chosen lock manager. .SS 6. start VG on all hosts vgchange --lock-start -lvmlockd requires shared VGs to be started before they are used. This is -a lock manager operation to start (join) the VG lockspace, and it may take -some time. Until the start completes, locks for the VG are not available. -LVM commands are allowed to read the VG while start is in progress. (A -unit/init file can also be used to start VGs.) +Shared VGs must be started before they are used. Starting the VG performs +lock manager initialization that is necessary to begin using locks (i.e. +creating and joining a lockspace). Starting the VG may take some time, +and until the start completes the VG may not be modified or activated. .SS 7. create and activate LVs @@ -168,9 +172,9 @@ multiple hosts.) .SS Normal start up and shut down -After initial set up, start up and shut down include the following general -steps. They can be performed manually or using the system service -manager. +After initial set up, start up and shut down include the following steps. +They can be performed directly or may be automated using systemd or a +cluster resource manager/agents. \[bu] start lvmlockd @@ -204,106 +208,64 @@ stop lvmlockd .SH TOPICS -.SS VG access control +.SS Protecting VGs on shared devices -The following terms are used to describe different forms of VG access -control. +The following terms are used to describe the different ways of accessing +VGs on shared devices. -.I "lockd VG" +.I "shared VG" -A "lockd VG" is a shared VG that has a "lock type" of dlm or sanlock. -Using it requires lvmlockd. These VGs exist on shared storage that is -visible to multiple hosts. LVM commands use lvmlockd to perform locking -for these VGs when they are used. +A shared VG exists on shared storage that is visible to multiple hosts. +LVM acquires locks through lvmlockd to coordinate access to shared VGs. +A shared VG has lock_type "dlm" or "sanlock", which specifies the lock +manager lvmlockd will use. -If the lock manager for the lock type is not available (e.g. not started -or failed), lvmlockd is unable to acquire locks for LVM commands. LVM -commands that only read the VG will generally be allowed to continue -without locks in this case (with a warning). Commands to modify or -activate the VG will fail without the necessary locks. +When the lock manager for the lock type is not available (e.g. not started +or failed), lvmlockd is unable to acquire locks for LVM commands. In this +situation, LVM commands are only allowed to read and display the VG; +changes and activation will fail. .I "local VG" -A "local VG" is meant to be used by a single host. It has no lock type or -lock type "none". LVM commands and lvmlockd do not perform locking for -these VGs. A local VG typically exists on local (non-shared) devices and -cannot be used concurrently from different hosts. +A local VG is meant to be used by a single host. It has no lock type or +lock type "none". A local VG typically exists on local (non-shared) +devices and cannot be used concurrently from different hosts. If a local VG does exist on shared devices, it should be owned by a single -host by having its system ID set, see +host by having the system ID set, see .BR lvmsystemid (7). -Only the host with a matching system ID can use the local VG. A VG -with no lock type and no system ID should be excluded from all but one -host using lvm.conf filters. Without any of these protections, a local VG -on shared devices can be easily damaged or destroyed. +The host with a matching system ID can use the local VG and other hosts +will ignore it. A VG with no lock type and no system ID should be +excluded from all but one host using lvm.conf filters. Without any of +these protections, a local VG on shared devices can be easily damaged or +destroyed. .I "clvm VG" -A "clvm VG" is a VG on shared storage (like a lockd VG) that requires -clvmd for clustering. See below for converting a clvm VG to a lockd VG. +A clvm VG (or clustered VG) is a VG on shared storage (like a shared VG) +that requires clvmd for clustering and locking. See below for converting +a clvm/clustered VG to a shared VG. -.SS lockd VGs from hosts not using lvmlockd +.SS shared VGs from hosts not using lvmlockd -Only hosts that use lockd VGs should be configured to run lvmlockd. -However, shared devices in lockd VGs may be visible from hosts not -using lvmlockd. From a host not using lvmlockd, lockd VGs are ignored -in the same way as foreign VGs (see +Hosts that do not use shared VGs will not be running lvmlockd. In this +case, shared VGs that are still visible to the host will be ignored +(like foreign VGs, see .BR lvmsystemid (7).) -The --shared option for reporting and display commands causes lockd VGs +The --shared option for reporting and display commands causes shared VGs to be displayed on a host not using lvmlockd, like the --foreign option does for foreign VGs. -.SS vgcreate comparison - -The type of VG access control is specified in the vgcreate command. -See -.BR vgcreate (8) -for all vgcreate options. - -.B vgcreate <vgname> <devices> - -.IP \[bu] 2 -Creates a local VG with the local host's system ID when neither lvmlockd nor clvm are configured. -.IP \[bu] 2 -Creates a local VG with the local host's system ID when lvmlockd is configured. -.IP \[bu] 2 -Creates a clvm VG when clvm is configured. - -.P - -.B vgcreate --shared <vgname> <devices> -.IP \[bu] 2 -Requires lvmlockd to be configured and running. -.IP \[bu] 2 -Creates a lockd VG with lock type sanlock|dlm depending on which lock -manager is running. -.IP \[bu] 2 -LVM commands request locks from lvmlockd to use the VG. -.IP \[bu] 2 -lvmlockd obtains locks from the selected lock manager. - -.P - -.B vgcreate -c|--clustered y <vgname> <devices> -.IP \[bu] 2 -Requires clvm to be configured and running. -.IP \[bu] 2 -Creates a clvm VG with the "clustered" flag. -.IP \[bu] 2 -LVM commands request locks from clvmd to use the VG. - -.P - .SS creating the first sanlock VG Creating the first sanlock VG is not protected by locking, so it requires special attention. This is because sanlock locks exist on storage within -the VG, so they are not available until the VG exists. The first sanlock -VG created will automatically contain the "global lock". Be aware of the -following special considerations: +the VG, so they are not available until after the VG is created. The +first sanlock VG that is created will automatically contain the "global +lock". Be aware of the following special considerations: .IP \[bu] 2 The first vgcreate command needs to be given the path to a device that has @@ -318,54 +280,48 @@ to be accessible to all hosts that will use sanlock shared VGs. All hosts will need to use the global lock from the first sanlock VG. .IP \[bu] 2 -While running vgcreate for the first sanlock VG, ensure that the device -being used is not used by another LVM command. Allocation of shared -devices is usually protected by the global lock, but this cannot be done -for the first sanlock VG which will hold the global lock. - -.IP \[bu] 2 -While running vgcreate for the first sanlock VG, ensure that the VG name -being used is not used by another LVM command. Uniqueness of VG names is -usually ensured by the global lock. +The device and VG name used by the initial vgcreate will not be protected +from concurrent use by another vgcreate on another host. See below for more information about managing the sanlock global lock. -.SS using lockd VGs +.SS using shared VGs -There are some special considerations when using lockd VGs. +There are some special considerations when using shared VGs. -When use_lvmlockd is first enabled in lvm.conf, and before the first lockd -VG is created, no global lock will exist. In this initial state, LVM -commands try and fail to acquire the global lock, producing a warning, and -some commands are disallowed. Once the first lockd VG is created, the -global lock will be available, and LVM will be fully operational. +When use_lvmlockd is first enabled in lvm.conf, and before the first +shared VG is created, no global lock will exist. In this initial state, +LVM commands try and fail to acquire the global lock, producing a warning, +and some commands are disallowed. Once the first shared VG is created, +the global lock will be available, and LVM will be fully operational. -When a new lockd VG is created, its lockspace is automatically started on -the host that creates it. Other hosts need to run 'vgchange ---lock-start' to start the new VG before they can use it. +When a new shared VG is created, its lockspace is automatically started on +the host that creates it. Other hosts need to run 'vgchange --lock-start' +to start the new VG before they can use it. -From the 'vgs' command, lockd VGs are indicated by "s" (for shared) in the -sixth attr field. The specific lock type and lock args for a lockd VG can -be displayed with 'vgs -o+locktype,lockargs'. +From the 'vgs' command, shared VGs are indicated by "s" (for shared) in +the sixth attr field, and by "shared" in the "--options shared" report +field. The specific lock type and lock args for a shared VG can be +displayed with 'vgs -o+locktype,lockargs'. -lockd VGs need to be "started" and "stopped", unlike other types of VGs. +Shared VGs need to be "started" and "stopped", unlike other types of VGs. See the following section for a full description of starting and stopping. -vgremove of a lockd VG will fail if other hosts have the VG started. -Run vgchange --lock-stop <vgname> on all other hosts before vgremove. -(It may take several seconds before vgremove recognizes that all hosts -have stopped a sanlock VG.) +Removing a shared VG will fail if other hosts have the VG started. Run +vgchange --lock-stop <vgname> on all other hosts before vgremove. (It may +take several seconds before vgremove recognizes that all hosts have +stopped a sanlock VG.) .SS starting and stopping VGs -Starting a lockd VG (vgchange --lock-start) causes the lock manager to +Starting a shared VG (vgchange --lock-start) causes the lock manager to start (join) the lockspace for the VG on the host where it is run. This makes locks for the VG available to LVM commands on the host. Before a VG is started, only LVM commands that read/display the VG are allowed to continue without locks (and with a warning). -Stopping a lockd VG (vgchange --lock-stop) causes the lock manager to +Stopping a shared VG (vgchange --lock-stop) causes the lock manager to stop (leave) the lockspace for the VG on the host where it is run. This makes locks for the VG inaccessible to the host. A VG cannot be stopped while it has active LVs. @@ -374,7 +330,7 @@ When using the lock type sanlock, starting a VG can take a long time (potentially minutes if the host was previously shut down without cleanly stopping the VG.) -A lockd VG can be started after all the following are true: +A shared VG can be started after all the following are true: .br \[bu] lvmlockd is running @@ -386,9 +342,9 @@ the lock manager is running the VG's devices are visible on the system .br -A lockd VG can be stopped if all LVs are deactivated. +A shared VG can be stopped if all LVs are deactivated. -All lockd VGs can be started/stopped using: +All shared VGs can be started/stopped using: .br vgchange --lock-start .br @@ -407,12 +363,12 @@ vgchange --lock-start --lock-opt nowait ... lvmlockd can be asked directly to stop all lockspaces: .br -lvmlockctl --stop-lockspaces +lvmlockctl -S|--stop-lockspaces -To start only selected lockd VGs, use the lvm.conf +To start only selected shared VGs, use the lvm.conf activation/lock_start_list. When defined, only VG names in this list are started by vgchange. If the list is not defined (the default), all -visible lockd VGs are started. To start only "vg1", use the following +visible shared VGs are started. To start only "vg1", use the following lvm.conf configuration: .nf @@ -435,7 +391,7 @@ The "auto" option causes the command to follow the lvm.conf activation/auto_lock_start_list. If auto_lock_start_list is undefined, all VGs are started, just as if the auto option was not used. -When auto_lock_start_list is defined, it lists the lockd VGs that should +When auto_lock_start_list is defined, it lists the shared VGs that should be started by the auto command. VG names that do not match an item in the list will be ignored by the auto start command. @@ -443,23 +399,20 @@ list will be ignored by the auto start command. commands, i.e. with or without the auto option. When the lock_start_list is defined, only VGs matching a list item can be started with vgchange.) -The auto_lock_start_list allows a user to select certain lockd VGs that +The auto_lock_start_list allows a user to select certain shared VGs that should be automatically started by the system (or indirectly, those that should not). -To use auto activation of lockd LVs (see auto_activation_volume_list), -auto starting of the corresponding lockd VGs is necessary. - .SS internal command locking To optimize the use of LVM with lvmlockd, be aware of the three kinds of locks and when they are used: -.I GL lock +.I Global lock -The global lock (GL lock) is associated with global information, which is -information not isolated to a single VG. This includes: +The global lock s associated with global information, which is information +not isolated to a single VG. This includes: \[bu] The global VG namespace. @@ -484,61 +437,58 @@ acquired. .I VG lock -A VG lock is associated with each lockd VG. The VG lock is acquired in -shared mode to read the VG and in exclusive mode to change the VG (modify -the VG metadata or activating LVs). This lock serializes access to a VG -with all other LVM commands accessing the VG from all hosts. - -The command 'vgs' will not only acquire the GL lock to read the list of -all VG names, but will acquire the VG lock for each VG prior to reading -it. +A VG lock is associated with each shared VG. The VG lock is acquired in +shared mode to read the VG and in exclusive mode to change the VG or +activate LVs. This lock serializes access to a VG with all other LVM +commands accessing the VG from all hosts. -The command 'vgs <vgname>' does not acquire the GL lock (it does not need -the list of all VG names), but will acquire the VG lock on each VG name -argument. +The command 'vgs <vgname>' does not acquire the global lock (it does not +need the list of all VG names), but will acquire the VG lock on each VG +name argument. .I LV lock An LV lock is acquired before the LV is activated, and is released after the LV is deactivated. If the LV lock cannot be acquired, the LV is not -activated. LV locks are persistent and remain in place when the -activation command is done. GL and VG locks are transient, and are held -only while an LVM command is running. +activated. (LV locks are persistent and remain in place when the +activation command is done. Global and VG locks are transient, and are +held only while an LVM command is running.) .I lock retries -If a request for a GL or VG lock fails due to a lock conflict with another -host, lvmlockd automatically retries for a short time before returning a -failure to the LVM command. If those retries are insufficient, the LVM -command will retry the entire lock request a number of times specified by -global/lvmlockd_lock_retries before failing. If a request for an LV lock -fails due to a lock conflict, the command fails immediately. +If a request for a Global or VG lock fails due to a lock conflict with +another host, lvmlockd automatically retries for a short time before +returning a failure to the LVM command. If those retries are +insufficient, the LVM command will retry the entire lock request a number +of times specified by global/lvmlockd_lock_retries before failing. If a +request for an LV lock fails due to a lock conflict, the command fails +immediately. .SS managing the global lock in sanlock VGs The global lock exists in one of the sanlock VGs. The first sanlock VG created will contain the global lock. Subsequent sanlock VGs will each -contain disabled global locks that can be enabled later if necessary. +contain a disabled global lock that can be enabled later if necessary. The VG containing the global lock must be visible to all hosts using -sanlock VGs. This can be a reason to create a small sanlock VG, visible -to all hosts, and dedicated to just holding the global lock. While not -required, this strategy can help to avoid difficulty in the future if VGs -are moved or removed. +sanlock VGs. For this reason, it can be useful to create a small sanlock +VG, visible to all hosts, and dedicated to just holding the global lock. +While not required, this strategy can help to avoid difficulty in the +future if VGs are moved or removed. The vgcreate command typically acquires the global lock, but in the case of the first sanlock VG, there will be no global lock to acquire until the first vgcreate is complete. So, creating the first sanlock VG is a special case that skips the global lock. -vgcreate for a sanlock VG determines it is the first one to exist if no -other sanlock VGs are visible. It is possible that other sanlock VGs do -exist but are not visible on the host running vgcreate. In this case, -vgcreate would create a new sanlock VG with the global lock enabled. When -the other VG containing a global lock appears, lvmlockd will see more than -one VG with a global lock enabled, and LVM commands will report that there -are duplicate global locks. +vgcreate determines that it's creating the first sanlock VG when no other +sanlock VGs are visible on the system. It is possible that other sanlock +VGs do exist, but are not visible when vgcreate checks for them. In this +case, vgcreate will create a new sanlock VG with the global lock enabled. +When the another VG containing a global lock appears, lvmlockd will then +see more than one VG with a global lock enabled. LVM commands will report +that there are duplicate global locks. If the situation arises where more than one sanlock VG contains a global lock, the global lock should be manually disabled in all but one of them @@ -556,8 +506,8 @@ VGs with the command: lvmlockctl --gl-enable <vgname> -A small sanlock VG dedicated to holding the global lock can avoid the case -where the GL lock must be manually enabled after a vgremove. +(Using a small sanlock VG dedicated to holding the global lock can avoid +the case where the global lock must be manually enabled after a vgremove.) .SS internal lvmlock LV @@ -574,8 +524,8 @@ device, then use vgextend to add other devices. .SS LV activation -In a shared VG, activation changes involve locking through lvmlockd, and -the following values are possible with lvchange/vgchange -a: +In a shared VG, LV activation involves locking through lvmlockd, and the +following values are possible with lvchange/vgchange -a: .IP \fBy\fP|\fBey\fP The command activates the LV in exclusive mode, allowing a single host @@ -596,10 +546,6 @@ The shared mode is intended for a multi-host/cluster application or file system. LV types that cannot be used concurrently from multiple hosts include thin, cache, raid, and snapshot. -lvextend on LV with shared locks is not yet allowed. The LV must be -deactivated, or activated exclusively to run lvextend. (LVs with -the mirror type can be activated in shared mode from multiple hosts -when using the dlm lock type and cmirrord.) .IP \fBn\fP The command deactivates the LV. After deactivating the LV, the command @@ -654,7 +600,7 @@ with the expiring lease before other hosts can acquire its locks. When the sanlock daemon detects that the lease storage is lost, it runs the command lvmlockctl --kill <vgname>. This command emits a syslog -message stating that lease storage is lost for the VG and LVs must be +message stating that lease storage is lost for the VG, and LVs must be immediately deactivated. If no LVs are active in the VG, then the lockspace with an expiring lease @@ -666,10 +612,10 @@ If the VG has active LVs when the lock storage is lost, the LVs must be quickly deactivated before the lockspace lease expires. After all LVs are deactivated, run lvmlockctl --drop <vgname> to clear the expiring lockspace from lvmlockd. If all LVs in the VG are not deactivated within -about 40 seconds, sanlock will reset the host using the local watchdog. -The machine reset is effectively a severe form of "deactivating" LVs -before they can be activated on other hosts. The reset is considered a -better alternative than having LVs used by multiple hosts at once, which +about 40 seconds, sanlock uses wdmd and the local watchdog to reset the +host. The machine reset is effectively a severe form of "deactivating" +LVs before they can be activated on other hosts. The reset is considered +a better alternative than having LVs used by multiple hosts at once, which could easily damage or destroy their content. In the future, the lvmlockctl kill command may automatically attempt to @@ -681,8 +627,7 @@ sanlock resets the machine. If the sanlock daemon fails or exits while a lockspace is started, the local watchdog will reset the host. This is necessary to protect any -application resources that depend on sanlock leases which will be lost -without sanlock running. +application resources that depend on sanlock leases. .SS changing dlm cluster name @@ -762,14 +707,14 @@ Start the VG on hosts to use it: vgchange --lock-start <vgname> -.SS changing a local VG to a lockd VG +.SS changing a local VG to a shared VG All LVs must be inactive to change the lock type. lvmlockd must be configured and running as described in USAGE. .IP \[bu] 2 -Change a local VG to a lockd VG with the command: +Change a local VG to a shared VG with the command: .br vgchange --lock-type sanlock|dlm <vgname> @@ -780,7 +725,7 @@ vgchange --lock-start <vgname> .P -.SS changing a lockd VG to a local VG +.SS changing a shared VG to a local VG All LVs must be inactive to change the lock type. @@ -806,11 +751,11 @@ type can be forcibly changed to none with: vgchange --lock-type none --lock-opt force <vgname> -To change a VG from one lockd type to another (i.e. between sanlock and +To change a VG from one lock type to another (i.e. between sanlock and dlm), first change it to a local VG, then to the new type. -.SS changing a clvm VG to a lockd VG +.SS changing a clvm/clustered VG to a shared VG All LVs must be inactive to change the lock type. @@ -823,15 +768,15 @@ If the clvm cluster is no longer running on any nodes, then extra options can be used to forcibly make the VG local. Caution: this is only safe if all nodes have stopped using the VG: -vgchange --lock-type none --lock-opt force <vgname> +vgchange --lock-type none --lock-opt force <vgname> After the VG is local, follow the steps described in "changing a local VG -to a lockd VG". +to a shared VG". -.SS limitations of lockd VGs +.SS limitations of shared VGs -Things that do not yet work in lockd VGs: +Things that do not yet work in shared VGs: .br \[bu] using external origins for thin LVs @@ -851,22 +796,22 @@ vgsplit and vgmerge (convert to a local VG to do this) .SS lvmlockd changes from clvmd -(See above for converting an existing clvm VG to a lockd VG.) +(See above for converting an existing clvm VG to a shared VG.) While lvmlockd and clvmd are entirely different systems, LVM command usage remains similar. Differences are more notable when using lvmlockd's sanlock option. -Visible usage differences between lockd VGs (using lvmlockd) and clvm VGs -(using clvmd): +Visible usage differences between shared VGs (using lvmlockd) and +clvm/clustered VGs (using clvmd): .IP \[bu] 2 lvm.conf must be configured to use either lvmlockd (use_lvmlockd=1) or clvmd (locking_type=3), but not both. .IP \[bu] 2 -vgcreate --shared creates a lockd VG, and vgcreate --clustered y -creates a clvm VG. +vgcreate --shared creates a shared VG, and vgcreate --clustered y +creates a clvm/clustered VG. .IP \[bu] 2 lvmlockd adds the option of using sanlock for locking, avoiding the @@ -887,11 +832,11 @@ lvmlockd works with thin and cache pools and LVs. lvmlockd works with lvmetad. .IP \[bu] 2 -lvmlockd saves the cluster name for a lockd VG using dlm. Only hosts in +lvmlockd saves the cluster name for a shared VG using dlm. Only hosts in the matching cluster can use the VG. .IP \[bu] 2 -lvmlockd requires starting/stopping lockd VGs with vgchange --lock-start +lvmlockd requires starting/stopping shared VGs with vgchange --lock-start and --lock-stop. .IP \[bu] 2 @@ -914,7 +859,7 @@ reporting option lock_args to view the corresponding metadata fields. .IP \[bu] 2 In the 'vgs' command's sixth VG attr field, "s" for "shared" is displayed -for lockd VGs. +for shared VGs. .IP \[bu] 2 If lvmlockd fails or is killed while in use, locks it held remain but are

1 0

master - device_mapper: remove libdm-stats.c
by Joe Thornber 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e84e9cd115c37a64de6c0… Commit: e84e9cd115c37a64de6c0b67972a01044dffe843 Parent: fededfbbbc5ed79c509a34a0f8a681fa27e49533 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Thu Jun 14 14:32:17 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 14 14:32:17 2018 +0100 device_mapper: remove libdm-stats.c We don't use it in lvm. --- device_mapper/Makefile | 1 - device_mapper/all.h | 1314 ----------- device_mapper/libdm-stats.c | 5096 ------------------------------------------- 3 files changed, 0 insertions(+), 6411 deletions(-) diff --git a/device_mapper/Makefile b/device_mapper/Makefile index 3a1e415..931431c 100644 --- a/device_mapper/Makefile +++ b/device_mapper/Makefile @@ -17,7 +17,6 @@ DEVICE_MAPPER_SOURCE=\ device_mapper/libdm-deptree.c \ device_mapper/libdm-file.c \ device_mapper/libdm-report.c \ - device_mapper/libdm-stats.c \ device_mapper/libdm-string.c \ device_mapper/libdm-targets.c \ device_mapper/libdm-timestamp.c \ diff --git a/device_mapper/all.h b/device_mapper/all.h index c834f32..8dcb38c 100644 --- a/device_mapper/all.h +++ b/device_mapper/all.h @@ -436,1006 +436,6 @@ int dm_get_status_thin(struct dm_pool *mem, const char *params, struct dm_status_thin **status); /* - * device-mapper statistics support - */ - -/* - * Statistics handle. - * - * Operations on dm_stats objects include managing statistics regions - * and obtaining and manipulating current counter values from the - * kernel. Methods are provided to return baisc count values and to - * derive time-based metrics when a suitable interval estimate is - * provided. - * - * Internally the dm_stats handle contains a pointer to a table of one - * or more dm_stats_region objects representing the regions registered - * with the dm_stats_create_region() method. These in turn point to a - * table of one or more dm_stats_counters objects containing the - * counter sets for each defined area within the region: - * - * dm_stats->dm_stats_region[nr_regions]->dm_stats_counters[nr_areas] - * - * This structure is private to the library and may change in future - * versions: all users should make use of the public interface and treat - * the dm_stats type as an opaque handle. - * - * Regions and counter sets are stored in order of increasing region_id. - * Depending on region specifications and the sequence of create and - * delete operations this may not correspond to increasing sector - * number: users of the library should not assume that this is the case - * unless region creation is deliberately managed to ensure this (by - * always creating regions in strict order of ascending sector address). - * - * Regions may also overlap so the same sector range may be included in - * more than one region or area: applications should be prepared to deal - * with this or manage regions such that it does not occur. - */ -struct dm_stats; - -/* - * Histogram handle. - * - * A histogram object represents the latency histogram values and bin - * boundaries of the histogram associated with a particular area. - * - * Operations on the handle allow the number of bins, bin boundaries, - * counts and relative proportions to be obtained as well as the - * conversion of a histogram or its bounds to a compact string - * representation. - */ -struct dm_histogram; - -/* - * Allocate a dm_stats handle to use for subsequent device-mapper - * statistics operations. A program_id may be specified and will be - * used by default for subsequent operations on this handle. - * - * If program_id is NULL or the empty string a program_id will be - * automatically set to the value contained in /proc/self/comm. - */ -struct dm_stats *dm_stats_create(const char *program_id); - -/* - * Bind a dm_stats handle to the specified device major and minor - * values. Any previous binding is cleared and any preexisting counter - * data contained in the handle is released. - */ -int dm_stats_bind_devno(struct dm_stats *dms, int major, int minor); - -/* - * Bind a dm_stats handle to the specified device name. - * Any previous binding is cleared and any preexisting counter - * data contained in the handle is released. - */ -int dm_stats_bind_name(struct dm_stats *dms, const char *name); - -/* - * Bind a dm_stats handle to the specified device UUID. - * Any previous binding is cleared and any preexisting counter - * data contained in the handle is released. - */ -int dm_stats_bind_uuid(struct dm_stats *dms, const char *uuid); - -/* - * Bind a dm_stats handle to the device backing the file referenced - * by the specified file descriptor. - * - * File descriptor fd must reference a regular file, open for reading, - * in a local file system, backed by a device-mapper device, that - * supports the FIEMAP ioctl, and that returns data describing the - * physical location of extents. - */ -int dm_stats_bind_from_fd(struct dm_stats *dms, int fd); -/* - * Test whether the running kernel supports the precise_timestamps - * feature. Presence of this feature also implies histogram support. - * The library will check this call internally and fails any attempt - * to use nanosecond counters or histograms on kernels that fail to - * meet this check. - */ -int dm_message_supports_precise_timestamps(void); - -/* - * Precise timetamps and histogram support. - * - * Test for the presence of precise_timestamps and histogram support. - */ -int dm_stats_driver_supports_precise(void); -int dm_stats_driver_supports_histogram(void); - -/* - * Returns 1 if the specified region has the precise_timestamps feature - * enabled (i.e. produces nanosecond-precision counter values) or 0 for - * a region using the default milisecond precision. - */ -int dm_stats_get_region_precise_timestamps(const struct dm_stats *dms, - uint64_t region_id); - -/* - * Returns 1 if the region at the current cursor location has the - * precise_timestamps feature enabled (i.e. produces - * nanosecond-precision counter values) or 0 for a region using the - * default milisecond precision. - */ -int dm_stats_get_current_region_precise_timestamps(const struct dm_stats *dms); - -#define DM_STATS_ALL_PROGRAMS "" -/* - * Parse the response from a @stats_list message. dm_stats_list will - * allocate the necessary dm_stats and dm_stats region structures from - * the embedded dm_pool. No counter data will be obtained (the counters - * members of dm_stats_region objects are set to NULL). - * - * A program_id may optionally be supplied; if the argument is non-NULL - * only regions with a matching program_id value will be considered. If - * the argument is NULL then the default program_id associated with the - * dm_stats handle will be used. Passing the special value - * DM_STATS_ALL_PROGRAMS will cause all regions to be queried - * regardless of region program_id. - */ -int dm_stats_list(struct dm_stats *dms, const char *program_id); - -#define DM_STATS_REGIONS_ALL UINT64_MAX -/* - * Populate a dm_stats object with statistics for one or more regions of - * the specified device. - * - * A program_id may optionally be supplied; if the argument is non-NULL - * only regions with a matching program_id value will be considered. If - * the argument is NULL then the default program_id associated with the - * dm_stats handle will be used. Passing the special value - * DM_STATS_ALL_PROGRAMS will cause all regions to be queried - * regardless of region program_id. - * - * Passing the special value DM_STATS_REGIONS_ALL as the region_id - * argument will attempt to retrieve all regions selected by the - * program_id argument. - * - * If region_id is used to request a single region_id to be populated - * the program_id is ignored. - */ -int dm_stats_populate(struct dm_stats *dms, const char *program_id, - uint64_t region_id); - -/* - * Create a new statistics region on the device bound to dms. - * - * start and len specify the region start and length in 512b sectors. - * Passing zero for both start and len will create a region spanning - * the entire device. - * - * Step determines how to subdivide the region into discrete counter - * sets: a positive value specifies the size of areas into which the - * region should be split while a negative value will split the region - * into a number of areas equal to the absolute value of step: - * - * - a region with one area spanning the entire device: - * - * dm_stats_create_region(dms, 0, 0, -1, p, a); - * - * - a region with areas of 1MiB: - * - * dm_stats_create_region(dms, 0, 0, 1 << 11, p, a); - * - * - one 1MiB region starting at 1024 sectors with two areas: - * - * dm_stats_create_region(dms, 1024, 1 << 11, -2, p, a); - * - * If precise is non-zero attempt to create a region with nanosecond - * precision counters using the kernel precise_timestamps feature. - * - * precise - A flag to request nanosecond precision counters - * to be used for this region. - * - * histogram_bounds - specify the boundaries of a latency histogram to - * be tracked for the region. The values are expressed as an array of - * uint64_t terminated with a zero. Values must be in order of ascending - * magnitude and specify the upper bounds of successive histogram bins - * in nanoseconds (with an implicit lower bound of zero on the first bin - * and an implicit upper bound of infinity on the final bin). For - * example: - * - * uint64_t bounds_ary[] = { 1000, 2000, 3000, 0 }; - * - * Specifies a histogram with four bins: 0-1000ns, 1000-2000ns, - * 2000-3000ns and >3000ns. - * - * The smallest latency value that can be tracked for a region not using - * precise_timestamps is 1ms: attempting to create a region with - * histogram boundaries < 1ms will cause the precise_timestamps feature - * to be enabled for that region automatically if it was not requested - * explicitly. - * - * program_id is an optional string argument that identifies the - * program creating the region. If program_id is NULL or the empty - * string the default program_id stored in the handle will be used. - * - * user_data is an optional string argument that is added to the - * content of the aux_data field stored with the statistics region by - * the kernel. - * - * The library may also use this space internally, for example, to - * store a group descriptor or other metadata: in this case the - * library will strip any internal data fields from the value before - * it is returned via a call to dm_stats_get_region_aux_data(). - * - * The user data stored is not accessed by the library or kernel and - * may be used to store an arbitrary data word (embedded whitespace is - * not permitted). - * - * An application using both the library and direct access to the - * @stats_list device-mapper message may see the internal values stored - * in this field by the library. In such cases any string up to and - * including the first '#' in the field must be treated as an opaque - * value and preserved across any external modification of aux_data. - * - * The region_id of the newly-created region is returned in *region_id - * if it is non-NULL. - */ -int dm_stats_create_region(struct dm_stats *dms, uint64_t *region_id, - uint64_t start, uint64_t len, int64_t step, - int precise, struct dm_histogram *bounds, - const char *program_id, const char *user_data); - -/* - * Delete the specified statistics region. This will also mark the - * region as not-present and discard any existing statistics data. - */ -int dm_stats_delete_region(struct dm_stats *dms, uint64_t region_id); - -/* - * Clear the specified statistics region. This requests the kernel to - * zero all counter values (except in-flight I/O). Note that this - * operation is not atomic with respect to reads of the counters; any IO - * events occurring between the last print operation and the clear will - * be lost. This can be avoided by using the atomic print-and-clear - * function of the dm_stats_print_region() call or by using the higher - * level dm_stats_populate() interface. - */ -int dm_stats_clear_region(struct dm_stats *dms, uint64_t region_id); - -/* - * Print the current counter values for the specified statistics region - * and return them as a string. The memory for the string buffer will - * be allocated from the dm_stats handle's private pool and should be - * returned by calling dm_stats_buffer_destroy() when no longer - * required. The pointer will become invalid following any call that - * clears or reinitializes the handle (destroy, list, populate, bind). - * - * This allows applications that wish to access the raw message response - * to obtain it via a dm_stats handle; no parsing of the textual counter - * data is carried out by this function. - * - * Most users are recommended to use the dm_stats_populate() call - * instead since this will automatically parse the statistics data into - * numeric form accessible via the dm_stats_get_*() counter access - * methods. - * - * A subset of the data lines may be requested by setting the - * start_line and num_lines parameters. If both are zero all data - * lines are returned. - * - * If the clear parameter is non-zero the operation will also - * atomically reset all counter values to zero (except in-flight IO). - */ -char *dm_stats_print_region(struct dm_stats *dms, uint64_t region_id, - unsigned start_line, unsigned num_lines, - unsigned clear); - -/* - * Destroy a statistics response buffer obtained from a call to - * dm_stats_print_region(). - */ -void dm_stats_buffer_destroy(struct dm_stats *dms, char *buffer); - -/* - * Determine the number of regions contained in a dm_stats handle - * following a dm_stats_list() or dm_stats_populate() call. - * - * The value returned is the number of registered regions visible with the - * progam_id value used for the list or populate operation and may not be - * equal to the highest present region_id (either due to program_id - * filtering or gaps in the sequence of region_id values). - * - * Always returns zero on an empty handle. - */ -uint64_t dm_stats_get_nr_regions(const struct dm_stats *dms); - -/* - * Determine the number of groups contained in a dm_stats handle - * following a dm_stats_list() or dm_stats_populate() call. - * - * The value returned is the number of registered groups visible with the - * progam_id value used for the list or populate operation and may not be - * equal to the highest present group_id (either due to program_id - * filtering or gaps in the sequence of group_id values). - * - * Always returns zero on an empty handle. - */ -uint64_t dm_stats_get_nr_groups(const struct dm_stats *dms); - -/* - * Test whether region_id is present in this dm_stats handle. - */ -int dm_stats_region_present(const struct dm_stats *dms, uint64_t region_id); - -/* - * Returns the number of areas (counter sets) contained in the specified - * region_id of the supplied dm_stats handle. - */ -uint64_t dm_stats_get_region_nr_areas(const struct dm_stats *dms, - uint64_t region_id); - -/* - * Returns the total number of areas (counter sets) in all regions of the - * given dm_stats object. - */ -uint64_t dm_stats_get_nr_areas(const struct dm_stats *dms); - -/* - * Test whether group_id is present in this dm_stats handle. - */ -int dm_stats_group_present(const struct dm_stats *dms, uint64_t group_id); - -/* - * Return the number of bins in the histogram configuration for the - * specified region or zero if no histogram specification is configured. - * Valid following a dm_stats_list() or dm_stats_populate() operation. - */ -int dm_stats_get_region_nr_histogram_bins(const struct dm_stats *dms, - uint64_t region_id); - -/* - * Parse a histogram string with optional unit suffixes into a - * dm_histogram bounds description. - * - * A histogram string is a string of numbers "n1,n2,n3,..." that - * represent the boundaries of a histogram. The first and final bins - * have implicit lower and upper bounds of zero and infinity - * respectively and boundary values must occur in order of ascending - * magnitude. Unless a unit suffix is given all values are specified in - * nanoseconds. - * - * For example, if bounds_str="300,600,900", the region will be created - * with a histogram containing four bins. Each report will include four - * numbers a:b:c:d. a is the number of requests that took between 0 and - * 300ns to complete, b is the number of requests that took 300-600ns to - * complete, c is the number of requests that took 600-900ns to complete - * and d is the number of requests that took more than 900ns to - * complete. - * - * An optional unit suffix of 's', 'ms', 'us', or 'ns' may be used to - * specify units of seconds, miliseconds, microseconds, or nanoseconds: - * - * bounds_str="1ns,1us,1ms,1s" - * bounds_str="500us,1ms,1500us,2ms" - * bounds_str="200ms,400ms,600ms,800ms,1s" - * - * The smallest valid unit of time for a histogram specification depends - * on whether the region uses precise timestamps: for a region with the - * default milisecond precision the smallest possible histogram boundary - * magnitude is one milisecond: attempting to use a histogram with a - * boundary less than one milisecond when creating a region will cause - * the region to be created with the precise_timestamps feature enabled. - * - * On sucess a pointer to the struct dm_histogram representing the - * bounds values is returned, or NULL in the case of error. The returned - * pointer should be freed using free() when no longer required. - */ -struct dm_histogram *dm_histogram_bounds_from_string(const char *bounds_str); - -/* - * Parse a zero terminated array of uint64_t into a dm_histogram bounds - * description. - * - * Each value in the array specifies the upper bound of a bin in the - * latency histogram in nanoseconds. Values must appear in ascending - * order of magnitude. - * - * The smallest valid unit of time for a histogram specification depends - * on whether the region uses precise timestamps: for a region with the - * default milisecond precision the smallest possible histogram boundary - * magnitude is one milisecond: attempting to use a histogram with a - * boundary less than one milisecond when creating a region will cause - * the region to be created with the precise_timestamps feature enabled. - */ -struct dm_histogram *dm_histogram_bounds_from_uint64(const uint64_t *bounds); - -/* - * Destroy the histogram bounds array obtained from a call to - * dm_histogram_bounds_from_string(). - */ -void dm_histogram_bounds_destroy(struct dm_histogram *bounds); - -/* - * Destroy a dm_stats object and all associated regions, counter - * sets and histograms. - */ -void dm_stats_destroy(struct dm_stats *dms); - -/* - * Counter sampling interval - */ - -/* - * Set the sampling interval for counter data to the specified value in - * either nanoseconds or milliseconds. - * - * The interval is used to calculate time-based metrics from the basic - * counter data: an interval must be set before calling any of the - * metric methods. - * - * For best accuracy the duration should be measured and updated at the - * end of each interval. - * - * All values are stored internally with nanosecond precision and are - * converted to or from ms when the millisecond interfaces are used. - */ -void dm_stats_set_sampling_interval_ns(struct dm_stats *dms, - uint64_t interval_ns); - -void dm_stats_set_sampling_interval_ms(struct dm_stats *dms, - uint64_t interval_ms); - -/* - * Retrieve the configured sampling interval in either nanoseconds or - * milliseconds. - */ -uint64_t dm_stats_get_sampling_interval_ns(const struct dm_stats *dms); -uint64_t dm_stats_get_sampling_interval_ms(const struct dm_stats *dms); - -/* - * Override program_id. This may be used to change the default - * program_id value for an existing handle. If the allow_empty argument - * is non-zero a NULL or empty program_id is permitted. - * - * Use with caution! Most users of the library should set a valid, - * non-NULL program_id for every statistics region created. Failing to - * do so may result in confusing state when multiple programs are - * creating and managing statistics regions. - * - * All users of the library are encouraged to choose an unambiguous, - * unique program_id: this could be based on PID (for programs that - * create, report, and delete regions in a single process), session id, - * executable name, or some other distinguishing string. - * - * Use of the empty string as a program_id does not simplify use of the - * library or the command line tools and use of this value is strongly - * discouraged. - */ -int dm_stats_set_program_id(struct dm_stats *dms, int allow_empty, - const char *program_id); - -/* - * Region properties: size, length & area_len. - * - * Region start and length are returned in units of 512b as specified - * at region creation time. The area_len value gives the size of areas - * into which the region has been subdivided. For regions with a single - * area spanning the range this value is equal to the region length. - * - * For regions created with a specified number of areas the value - * represents the size of the areas into which the kernel divided the - * region excluding any rounding of the last area size. The number of - * areas may be obtained using the dm_stats_nr_areas_region() call. - * - * All values are returned in units of 512b sectors. - */ -int dm_stats_get_region_start(const struct dm_stats *dms, uint64_t *start, - uint64_t region_id); - -int dm_stats_get_region_len(const struct dm_stats *dms, uint64_t *len, - uint64_t region_id); - -int dm_stats_get_region_area_len(const struct dm_stats *dms, - uint64_t *len, uint64_t region_id); - -/* - * Area properties: start, offset and length. - * - * The area length is always equal to the area length of the region - * that contains it and is obtained from dm_stats_get_region_area_len(). - * - * The start of an area is a function of the area_id and the containing - * region's start and area length: it gives the absolute offset into the - * containing device of the beginning of the area. - * - * The offset expresses the area's relative offset into the current - * region. I.e. the area start minus the start offset of the containing - * region. - * - * All values are returned in units of 512b sectors. - */ -int dm_stats_get_area_start(const struct dm_stats *dms, uint64_t *start, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_area_offset(const struct dm_stats *dms, uint64_t *offset, - uint64_t region_id, uint64_t area_id); - -/* - * Retrieve program_id and user aux_data for a specific region. - * - * Only valid following a call to dm_stats_list(). - */ - -/* - * Retrieve program_id for the specified region. - * - * The returned pointer does not need to be freed separately from the - * dm_stats handle but will become invalid after a dm_stats_destroy(), - * dm_stats_list(), dm_stats_populate(), or dm_stats_bind*() of the - * handle from which it was obtained. - */ -const char *dm_stats_get_region_program_id(const struct dm_stats *dms, - uint64_t region_id); - -/* - * Retrieve user aux_data set for the specified region. This function - * will return any stored user aux_data as a string in the memory - * pointed to by the aux_data argument. - * - * Any library internal aux_data fields, such as DMS_GROUP descriptors, - * are stripped before the value is returned. - * - * The returned pointer does not need to be freed separately from the - * dm_stats handle but will become invalid after a dm_stats_destroy(), - * dm_stats_list(), dm_stats_populate(), or dm_stats_bind*() of the - * handle from which it was obtained. - */ -const char *dm_stats_get_region_aux_data(const struct dm_stats *dms, - uint64_t region_id); - -typedef enum { - DM_STATS_OBJECT_TYPE_NONE, - DM_STATS_OBJECT_TYPE_AREA, - DM_STATS_OBJECT_TYPE_REGION, - DM_STATS_OBJECT_TYPE_GROUP -} dm_stats_obj_type_t; - -/* - * Statistics cursor - * - * A dm_stats handle maintains an optional cursor into the statistics - * tables that it stores. Iterators are provided to visit each region, - * area, or group in a handle and accessor methods are provided to - * obtain properties and values for the object at the current cursor - * position. - * - * Using the cursor simplifies walking all regions or groups when - * the tables are sparse (i.e. contains some present and some - * non-present region_id or group_id values either due to program_id - * filtering or the ordering of region and group creation and deletion). - * - * Simple macros are provided to visit each area, region, or group, - * contained in a handle and applications are encouraged to use these - * where possible. - */ - -/* - * Walk flags are used to initialise a dm_stats handle's cursor control - * and to select region or group aggregation when calling a metric or - * counter property method with immediate group, region, and area ID - * values. - * - * Walk flags are stored in the uppermost word of a uint64_t so that - * a region_id or group_id may be encoded in the lower bits. This - * allows an aggregate region_id or group_id to be specified when - * retrieving counter or metric values. - * - * Flags may be ORred together when used to initialise a dm_stats_walk: - * the resulting walk will visit instance of each type specified by - * the flag combination. - */ -#define DM_STATS_WALK_AREA 0x1000000000000ULL -#define DM_STATS_WALK_REGION 0x2000000000000ULL -#define DM_STATS_WALK_GROUP 0x4000000000000ULL - -#define DM_STATS_WALK_ALL 0x7000000000000ULL -#define DM_STATS_WALK_DEFAULT (DM_STATS_WALK_AREA | DM_STATS_WALK_REGION) - -/* - * Skip regions from a DM_STATS_WALK_REGION that contain only a single - * area: in this case the region's aggregate values are identical to - * the values of the single contained area. Setting this flag will - * suppress these duplicate entries during a dm_stats_walk_* with the - * DM_STATS_WALK_REGION flag set. - */ -#define DM_STATS_WALK_SKIP_SINGLE_AREA 0x8000000000000ULL - -/* - * Initialise the cursor control of a dm_stats handle for the specified - * walk type(s). Including a walk flag in the flags argument will cause - * any subsequent walk to visit that type of object (until the next - * call to dm_stats_walk_init()). - */ -int dm_stats_walk_init(struct dm_stats *dms, uint64_t flags); - -/* - * Set the cursor of a dm_stats handle to address the first present - * group, region, or area of the currently configured walk. It is - * valid to attempt to walk a NULL stats handle or a handle containing - * no present regions; in this case any call to dm_stats_walk_next() - * becomes a no-op and all calls to dm_stats_walk_end() return true. - */ -void dm_stats_walk_start(struct dm_stats *dms); - -/* - * Advance the statistics cursor to the next area, or to the next - * present region if at the end of the current region. If the end of - * the region, area, or group tables is reached a subsequent call to - * dm_stats_walk_end() will return 1 and dm_stats_object_type() called - * on the location will return DM_STATS_OBJECT_TYPE_NONE, - */ -void dm_stats_walk_next(struct dm_stats *dms); - -/* - * Force the statistics cursor to advance to the next region. This will - * stop any in-progress area walk (by clearing DM_STATS_WALK_AREA) and - * advance the cursor to the next present region, the first present - * group (if DM_STATS_GROUP_WALK is set), or to the end. In this case a - * subsequent call to dm_stats_walk_end() will return 1 and a call to - * dm_stats_object_type() for the location will return - * DM_STATS_OBJECT_TYPE_NONE. - */ -void dm_stats_walk_next_region(struct dm_stats *dms); - -/* - * Test whether the end of a statistics walk has been reached. - */ -int dm_stats_walk_end(struct dm_stats *dms); - -/* - * Return the type of object at the location specified by region_id - * and area_id. If either region_id or area_id uses one of the special - * values DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT the - * corresponding region or area identifier will be taken from the - * current cursor location. If the cursor location or the value encoded - * by region_id and area_id indicates an aggregate region or group, - * this will be reflected in the value returned. - */ -dm_stats_obj_type_t dm_stats_object_type(const struct dm_stats *dms, - uint64_t region_id, - uint64_t area_id); - -/* - * Return the type of object at the current stats cursor location. - */ -dm_stats_obj_type_t dm_stats_current_object_type(const struct dm_stats *dms); - -/* - * Stats iterators - * - * C 'for' and 'do'/'while' style iterators for dm_stats data. - * - * It is not safe to call any function that modifies the region table - * within the loop body (i.e. dm_stats_list(), dm_stats_populate(), - * dm_stats_init(), or dm_stats_destroy()). - * - * All counter and property (dm_stats_get_*) access methods, as well as - * dm_stats_populate_region() can be safely called from loops. - * - */ - -/* - * Iterate over the regions table visiting each region. - * - * If the region table is empty or unpopulated the loop body will not be - * executed. - */ -#define dm_stats_foreach_region(dms) \ -for (dm_stats_walk_init((dms), DM_STATS_WALK_REGION), \ - dm_stats_walk_start((dms)); \ - !dm_stats_walk_end((dms)); dm_stats_walk_next_region((dms))) - -/* - * Iterate over the regions table visiting each area. - * - * If the region table is empty or unpopulated the loop body will not - * be executed. - */ -#define dm_stats_foreach_area(dms) \ -for (dm_stats_walk_init((dms), DM_STATS_WALK_AREA), \ - dm_stats_walk_start((dms)); \ - !dm_stats_walk_end((dms)); dm_stats_walk_next((dms))) - -/* - * Iterate over the regions table visiting each group. Metric and - * counter methods will return values for the group. - * - * If the group table is empty or unpopulated the loop body will not - * be executed. - */ -#define dm_stats_foreach_group(dms) \ -for (dm_stats_walk_init((dms), DM_STATS_WALK_GROUP), \ - dm_stats_walk_start(dms); \ - !dm_stats_walk_end(dms); \ - dm_stats_walk_next(dms)) - -/* - * Start a walk iterating over the regions contained in dm_stats handle - * 'dms'. - * - * The body of the loop should call dm_stats_walk_next() or - * dm_stats_walk_next_region() to advance to the next element. - * - * The loop body is executed at least once even if the stats handle is - * empty. - */ -#define dm_stats_walk_do(dms) \ -do { \ - dm_stats_walk_start((dms)); \ - do - -/* - * Start a 'while' style loop or end a 'do..while' loop iterating over the - * regions contained in dm_stats handle 'dms'. - */ -#define dm_stats_walk_while(dms) \ - while(!dm_stats_walk_end((dms))); \ -} while (0) - -/* - * Cursor relative property methods - * - * Calls with the prefix dm_stats_get_current_* operate relative to the - * current cursor location, returning properties for the current region - * or area of the supplied dm_stats handle. - * - */ - -/* - * Returns the number of areas (counter sets) contained in the current - * region of the supplied dm_stats handle. - */ -uint64_t dm_stats_get_current_nr_areas(const struct dm_stats *dms); - -/* - * Retrieve the current values of the stats cursor. - */ -uint64_t dm_stats_get_current_region(const struct dm_stats *dms); -uint64_t dm_stats_get_current_area(const struct dm_stats *dms); - -/* - * Current region properties: size, length & area_len. - * - * See the comments for the equivalent dm_stats_get_* versions for a - * complete description of these methods. - * - * All values are returned in units of 512b sectors. - */ -int dm_stats_get_current_region_start(const struct dm_stats *dms, - uint64_t *start); - -int dm_stats_get_current_region_len(const struct dm_stats *dms, - uint64_t *len); - -int dm_stats_get_current_region_area_len(const struct dm_stats *dms, - uint64_t *area_len); - -/* - * Current area properties: start and length. - * - * See the comments for the equivalent dm_stats_get_* versions for a - * complete description of these methods. - * - * All values are returned in units of 512b sectors. - */ -int dm_stats_get_current_area_start(const struct dm_stats *dms, - uint64_t *start); - -int dm_stats_get_current_area_offset(const struct dm_stats *dms, - uint64_t *offset); - -int dm_stats_get_current_area_len(const struct dm_stats *dms, - uint64_t *start); - -/* - * Return a pointer to the program_id string for region at the current - * cursor location. - */ -const char *dm_stats_get_current_region_program_id(const struct dm_stats *dms); - -/* - * Return a pointer to the user aux_data string for the region at the - * current cursor location. - */ -const char *dm_stats_get_current_region_aux_data(const struct dm_stats *dms); - -/* - * Statistics groups and data aggregation. - */ - -/* - * Create a new group in stats handle dms from the group descriptor - * passed in group. The group descriptor is a string containing a list - * of region_id values that will be included in the group. The first - * region_id found will be the group leader. Ranges of identifiers may - * be expressed as "M-N", where M and N are the start and end region_id - * values for the range. - */ -int dm_stats_create_group(struct dm_stats *dms, const char *group, - const char *alias, uint64_t *group_id); - -/* - * Remove the specified group_id. If the remove argument is zero the - * group will be removed but the regions that it contained will remain. - * If remove is non-zero then all regions that belong to the group will - * also be removed. - */ -int dm_stats_delete_group(struct dm_stats *dms, uint64_t group_id, int remove); - -/* - * Set an alias for this group or region. The alias will be returned - * instead of the normal dm-stats name for this region or group. - */ -int dm_stats_set_alias(struct dm_stats *dms, uint64_t group_id, - const char *alias); - -/* - * Returns a pointer to the currently configured alias for id, or the - * name of the dm device the handle is bound to if no alias has been - * set. The pointer will be freed automatically when a new alias is set - * or when the stats handle is cleared. - */ -const char *dm_stats_get_alias(const struct dm_stats *dms, uint64_t id); - -#define DM_STATS_GROUP_NONE UINT64_MAX -/* - * Return the group_id that the specified region_id belongs to, or the - * special value DM_STATS_GROUP_NONE if the region does not belong - * to any group. - */ -uint64_t dm_stats_get_group_id(const struct dm_stats *dms, uint64_t region_id); - -/* - * Store a pointer to a string describing the regions that are members - * of the group specified by group_id in the memory pointed to by buf. - * The string is in the same format as the 'group' argument to - * dm_stats_create_group(). - * - * The pointer does not need to be freed explicitly by the caller: it - * will become invalid following a subsequent dm_stats_list(), - * dm_stats_populate() or dm_stats_destroy() of the corresponding - * dm_stats handle. - */ -int dm_stats_get_group_descriptor(const struct dm_stats *dms, - uint64_t group_id, char **buf); - -/* - * Create regions that correspond to the extents of a file in the - * filesystem and optionally place them into a group. - * - * File descriptor fd must reference a regular file, open for reading, - * in a local file system that supports the FIEMAP ioctl, and that - * returns data describing the physical location of extents. - * - * The file descriptor can be closed by the caller following the call - * to dm_stats_create_regions_from_fd(). - * - * Unless nogroup is non-zero the regions will be placed into a group - * and the group alias set to the value supplied (if alias is NULL no - * group alias will be assigned). - * - * On success the function returns a pointer to an array of uint64_t - * containing the IDs of the newly created regions. The region_id - * array is terminated by the value DM_STATS_REGION_NOT_PRESENT and - * should be freed using free() when no longer required. - * - * On error NULL is returned. - * - * Following a call to dm_stats_create_regions_from_fd() the handle - * is guaranteed to be in a listed state, and to contain any region - * and group identifiers created by the operation. - * - * The group_id for the new group is equal to the region_id value in - * the first array element. - */ -uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd, - int group, int precise, - struct dm_histogram *bounds, - const char *alias); -/* - * Update a group of regions that correspond to the extents of a file - * in the filesystem, adding and removing regions to account for - * allocation changes in the underlying file. - * - * File descriptor fd must reference a regular file, open for reading, - * in a local file system that supports the FIEMAP ioctl, and that - * returns data describing the physical location of extents. - * - * The file descriptor can be closed by the caller following the call - * to dm_stats_update_regions_from_fd(). - * - * On success the function returns a pointer to an array of uint64_t - * containing the IDs of the updated regions (including any existing - * regions that were not modified by the call). - * - * The region_id array is terminated by the special value - * DM_STATS_REGION_NOT_PRESENT and should be freed using free() - * when no longer required. - * - * On error NULL is returned. - * - * Following a call to dm_stats_update_regions_from_fd() the handle - * is guaranteed to be in a listed state, and to contain any region - * and group identifiers created by the operation. - * - * This function cannot be used with file mapped regions that are - * not members of a group: either group the regions, or remove them - * and re-map them with dm_stats_create_regions_from_fd(). - */ -uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, - uint64_t group_id); - - -/* - * The file map monitoring daemon can monitor files in two distinct - * ways: the mode affects the behaviour of the daemon when a file - * under monitoring is renamed or unlinked, and the conditions which - * cause the daemon to terminate. - * - * In both modes, the daemon will always shut down when the group - * being monitored is deleted. - * - * Follow inode: - * The daemon follows the inode of the file, as it was at the time the - * daemon started. The file descriptor referencing the file is kept - * open at all times, and the daemon will exit when it detects that - * the file has been unlinked and it is the last holder of a reference - * to the file. - * - * This mode is useful if the file is expected to be renamed, or moved - * within the file system, while it is being monitored. - * - * Follow path: - * The daemon follows the path that was given on the daemon command - * line. The file descriptor referencing the file is re-opened on each - * iteration of the daemon, and the daemon will exit if no file exists - * at this location (a tolerance is allowed so that a brief delay - * between unlink() and creat() is permitted). - * - * This mode is useful if the file is updated by unlinking the original - * and placing a new file at the same path. - */ - -typedef enum { - DM_FILEMAPD_FOLLOW_INODE, - DM_FILEMAPD_FOLLOW_PATH, - DM_FILEMAPD_FOLLOW_NONE -} dm_filemapd_mode_t; - -/* - * Parse a string representation of a dmfilemapd mode. - * - * Returns a valid dm_filemapd_mode_t value on success, or - * DM_FILEMAPD_FOLLOW_NONE on error. - */ -dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str); - -/* - * Start the dmfilemapd filemap monitoring daemon for the specified - * file descriptor, group, and file system path. The daemon will - * monitor the file for allocation changes, and when a change is - * detected, call dm_stats_update_regions_from_fd() to update the - * mapped regions for the file. - * - * The path provided to dm_stats_start_filemapd() must be an absolute - * path, and should reflect the path of 'fd' at the time that it was - * opened. - * - * The mode parameter controls the behaviour of the daemon when the - * file being monitored is unlinked or moved: see the comments for - * dm_filemapd_mode_t for a full description and possible values. - * - * The daemon can be stopped at any time by sending SIGTERM to the - * daemon pid. - */ -int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, - dm_filemapd_mode_t mode, unsigned foreground, - unsigned verbose); - -/* * Call this to actually run the ioctl. */ int dm_task_run(struct dm_task *dmt); @@ -2840,320 +1840,6 @@ int dm_report_group_pop(struct dm_report_group *group); int dm_report_group_output_and_pop_all(struct dm_report_group *group); int dm_report_group_destroy(struct dm_report_group *group); -/* - * Stats counter access methods - * - * Each method returns the corresponding stats counter value from the - * supplied dm_stats handle for the specified region_id and area_id. - * If either region_id or area_id uses one of the special values - * DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT then the region - * or area is selected according to the current state of the dm_stats - * handle's embedded cursor. - * - * Two methods are provided to access counter values: a named function - * for each available counter field and a single function that accepts - * an enum value specifying the required field. New code is encouraged - * to use the enum based interface as calls to the named functions are - * implemented using the enum method internally. - * - * See the kernel documentation for complete descriptions of each - * counter field: - * - * Documentation/device-mapper/statistics.txt - * Documentation/iostats.txt - * - * reads: the number of reads completed - * reads_merged: the number of reads merged - * read_sectors: the number of sectors read - * read_nsecs: the number of nanoseconds spent reading - * writes: the number of writes completed - * writes_merged: the number of writes merged - * write_sectors: the number of sectors written - * write_nsecs: the number of nanoseconds spent writing - * io_in_progress: the number of I/Os currently in progress - * io_nsecs: the number of nanoseconds spent doing I/Os - * weighted_io_nsecs: the weighted number of nanoseconds spent doing I/Os - * total_read_nsecs: the total time spent reading in nanoseconds - * total_write_nsecs: the total time spent writing in nanoseconds - */ - -#define DM_STATS_REGION_CURRENT UINT64_MAX -#define DM_STATS_AREA_CURRENT UINT64_MAX - -typedef enum { - DM_STATS_READS_COUNT, - DM_STATS_READS_MERGED_COUNT, - DM_STATS_READ_SECTORS_COUNT, - DM_STATS_READ_NSECS, - DM_STATS_WRITES_COUNT, - DM_STATS_WRITES_MERGED_COUNT, - DM_STATS_WRITE_SECTORS_COUNT, - DM_STATS_WRITE_NSECS, - DM_STATS_IO_IN_PROGRESS_COUNT, - DM_STATS_IO_NSECS, - DM_STATS_WEIGHTED_IO_NSECS, - DM_STATS_TOTAL_READ_NSECS, - DM_STATS_TOTAL_WRITE_NSECS, - DM_STATS_NR_COUNTERS -} dm_stats_counter_t; - -uint64_t dm_stats_get_counter(const struct dm_stats *dms, - dm_stats_counter_t counter, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_reads(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_reads_merged(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_read_sectors(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_read_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_writes(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_writes_merged(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_write_sectors(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_write_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_io_in_progress(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_io_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_weighted_io_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_total_read_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_total_write_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -/* - * Derived statistics access methods - * - * Each method returns the corresponding value calculated from the - * counters stored in the supplied dm_stats handle for the specified - * region_id and area_id. If either region_id or area_id uses one of the - * special values DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT then - * the region or area is selected according to the current state of the - * dm_stats handle's embedded cursor. - * - * The set of metrics is based on the fields provided by the Linux - * iostats program. - * - * rd_merges_per_sec: the number of reads merged per second - * wr_merges_per_sec: the number of writes merged per second - * reads_per_sec: the number of reads completed per second - * writes_per_sec: the number of writes completed per second - * read_sectors_per_sec: the number of sectors read per second - * write_sectors_per_sec: the number of sectors written per second - * average_request_size: the average size of requests submitted - * service_time: the average service time (in ns) for requests issued - * average_queue_size: the average queue length - * average_wait_time: the average time for requests to be served (in ns) - * average_rd_wait_time: the average read wait time - * average_wr_wait_time: the average write wait time - */ - -typedef enum { - DM_STATS_RD_MERGES_PER_SEC, - DM_STATS_WR_MERGES_PER_SEC, - DM_STATS_READS_PER_SEC, - DM_STATS_WRITES_PER_SEC, - DM_STATS_READ_SECTORS_PER_SEC, - DM_STATS_WRITE_SECTORS_PER_SEC, - DM_STATS_AVERAGE_REQUEST_SIZE, - DM_STATS_AVERAGE_QUEUE_SIZE, - DM_STATS_AVERAGE_WAIT_TIME, - DM_STATS_AVERAGE_RD_WAIT_TIME, - DM_STATS_AVERAGE_WR_WAIT_TIME, - DM_STATS_SERVICE_TIME, - DM_STATS_THROUGHPUT, - DM_STATS_UTILIZATION, - DM_STATS_NR_METRICS -} dm_stats_metric_t; - -int dm_stats_get_metric(const struct dm_stats *dms, int metric, - uint64_t region_id, uint64_t area_id, double *value); - -int dm_stats_get_rd_merges_per_sec(const struct dm_stats *dms, double *rrqm, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_wr_merges_per_sec(const struct dm_stats *dms, double *rrqm, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_reads_per_sec(const struct dm_stats *dms, double *rd_s, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_writes_per_sec(const struct dm_stats *dms, double *wr_s, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_read_sectors_per_sec(const struct dm_stats *dms, - double *rsec_s, uint64_t region_id, - uint64_t area_id); - -int dm_stats_get_write_sectors_per_sec(const struct dm_stats *dms, - double *wr_s, uint64_t region_id, - uint64_t area_id); - -int dm_stats_get_average_request_size(const struct dm_stats *dms, - double *arqsz, uint64_t region_id, - uint64_t area_id); - -int dm_stats_get_service_time(const struct dm_stats *dms, double *svctm, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_average_queue_size(const struct dm_stats *dms, double *qusz, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_average_wait_time(const struct dm_stats *dms, double *await, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_average_rd_wait_time(const struct dm_stats *dms, - double *await, uint64_t region_id, - uint64_t area_id); - -int dm_stats_get_average_wr_wait_time(const struct dm_stats *dms, - double *await, uint64_t region_id, - uint64_t area_id); - -int dm_stats_get_throughput(const struct dm_stats *dms, double *tput, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_utilization(const struct dm_stats *dms, dm_percent_t *util, - uint64_t region_id, uint64_t area_id); - -/* - * Statistics histogram access methods. - * - * Methods to access latency histograms for regions that have them - * enabled. Each histogram contains a configurable number of bins - * spanning a user defined latency interval. - * - * The bin count, upper and lower bin bounds, and bin values are - * made available via the following area methods. - * - * Methods to obtain a simple string representation of the histogram - * and its bounds are also provided. - */ - -/* - * Retrieve a pointer to the histogram associated with the specified - * area. If the area does not have a histogram configured this function - * returns NULL. - * - * The pointer does not need to be freed explicitly by the caller: it - * will become invalid following a subsequent dm_stats_list(), - * dm_stats_populate() or dm_stats_destroy() of the corresponding - * dm_stats handle. - * - * If region_id or area_id is one of the special values - * DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT the current cursor - * value is used to select the region or area. - */ -struct dm_histogram *dm_stats_get_histogram(const struct dm_stats *dms, - uint64_t region_id, - uint64_t area_id); - -/* - * Return the number of bins in the specified histogram handle. - */ -int dm_histogram_get_nr_bins(const struct dm_histogram *dmh); - -/* - * Get the lower bound of the specified bin of the histogram for the - * area specified by region_id and area_id. The value is returned in - * nanoseconds. - */ -uint64_t dm_histogram_get_bin_lower(const struct dm_histogram *dmh, int bin); - -/* - * Get the upper bound of the specified bin of the histogram for the - * area specified by region_id and area_id. The value is returned in - * nanoseconds. - */ -uint64_t dm_histogram_get_bin_upper(const struct dm_histogram *dmh, int bin); - -/* - * Get the width of the specified bin of the histogram for the area - * specified by region_id and area_id. The width is equal to the bin - * upper bound minus the lower bound and yields the range of latency - * values covered by this bin. The value is returned in nanoseconds. - */ -uint64_t dm_histogram_get_bin_width(const struct dm_histogram *dmh, int bin); - -/* - * Get the value of the specified bin of the histogram for the area - * specified by region_id and area_id. - */ -uint64_t dm_histogram_get_bin_count(const struct dm_histogram *dmh, int bin); - -/* - * Get the percentage (relative frequency) of the specified bin of the - * histogram for the area specified by region_id and area_id. - */ -dm_percent_t dm_histogram_get_bin_percent(const struct dm_histogram *dmh, - int bin); - -/* - * Return the total observations (sum of bin counts) for the histogram - * of the area specified by region_id and area_id. - */ -uint64_t dm_histogram_get_sum(const struct dm_histogram *dmh); - -/* - * Histogram formatting flags. - */ -#define DM_HISTOGRAM_SUFFIX 0x1 -#define DM_HISTOGRAM_VALUES 0x2 -#define DM_HISTOGRAM_PERCENT 0X4 -#define DM_HISTOGRAM_BOUNDS_LOWER 0x10 -#define DM_HISTOGRAM_BOUNDS_UPPER 0x20 -#define DM_HISTOGRAM_BOUNDS_RANGE 0x30 - -/* - * Return a string representation of the supplied histogram's values and - * bin boundaries. - * - * The bin argument selects the bin to format. If this argument is less - * than zero all bins will be included in the resulting string. - * - * width specifies a minimum width for the field in characters; if it is - * zero the width will be determined automatically based on the options - * selected for formatting. A value less than zero disables field width - * control: bin boundaries and values will be output with a minimum - * amount of whitespace. - * - * flags is a collection of flag arguments that control the string format: - * - * DM_HISTOGRAM_VALUES - Include bin values in the string. - * DM_HISTOGRAM_SUFFIX - Include time unit suffixes when printing bounds. - * DM_HISTOGRAM_PERCENT - Format bin values as a percentage. - * - * DM_HISTOGRAM_BOUNDS_LOWER - Include the lower bound of each bin. - * DM_HISTOGRAM_BOUNDS_UPPER - Include the upper bound of each bin. - * DM_HISTOGRAM_BOUNDS_RANGE - Show the span of each bin as "lo-up". - * - * The returned pointer does not need to be freed explicitly by the - * caller: it will become invalid following a subsequent - * dm_stats_list(), dm_stats_populate() or dm_stats_destroy() of the - * corresponding dm_stats handle. - */ -const char *dm_histogram_to_string(const struct dm_histogram *dmh, int bin, - int width, int flags); - /************************* * config file parse/print *************************/ diff --git a/device_mapper/libdm-stats.c b/device_mapper/libdm-stats.c deleted file mode 100644 index 219d393..0000000 --- a/device_mapper/libdm-stats.c +++ /dev/null @@ -1,5096 +0,0 @@ -/* - * Copyright (C) 2016 Red Hat, Inc. All rights reserved. - * - * _stats_get_extents_for_file() based in part on filefrag_fiemap() from - * e2fsprogs/misc/filefrag.c. Copyright 2003 by Theodore Ts'o. - * - * This file is part of the device-mapper userspace tools. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "base/memory/zalloc.h" -#include "misc/dmlib.h" -#include "misc/kdev_t.h" - -#include "math.h" /* log10() */ - -#include <sys/sysmacros.h> -#include <sys/ioctl.h> -#include <sys/vfs.h> /* fstatfs */ -#include <unistd.h> - -#ifdef __linux__ - #include <linux/fs.h> /* FS_IOC_FIEMAP */ -#endif - -#ifdef HAVE_LINUX_FIEMAP_H - #include <linux/fiemap.h> /* fiemap */ -#endif - -#ifdef HAVE_LINUX_MAGIC_H - #include <linux/magic.h> /* BTRFS_SUPER_MAGIC */ -#endif - -#define DM_STATS_REGION_NOT_PRESENT UINT64_MAX -#define DM_STATS_GROUP_NOT_PRESENT DM_STATS_GROUP_NONE - -#define NSEC_PER_USEC 1000L -#define NSEC_PER_MSEC 1000000L -#define NSEC_PER_SEC 1000000000L - -#define PRECISE_ARG "precise_timestamps" -#define HISTOGRAM_ARG "histogram:" - -#define STATS_ROW_BUF_LEN 4096 -#define STATS_MSG_BUF_LEN 1024 -#define STATS_FIE_BUF_LEN 2048 - -#define SECTOR_SHIFT 9L - -/* Histogram bin */ -struct dm_histogram_bin { - uint64_t upper; /* Upper bound on this bin. */ - uint64_t count; /* Count value for this bin. */ -}; - -struct dm_histogram { - /* The stats handle this histogram belongs to. */ - const struct dm_stats *dms; - /* The region this histogram belongs to. */ - const struct dm_stats_region *region; - uint64_t sum; /* Sum of histogram bin counts. */ - int nr_bins; /* Number of histogram bins assigned. */ - struct dm_histogram_bin bins[0]; -}; - -/* - * See Documentation/device-mapper/statistics.txt for full descriptions - * of the device-mapper statistics counter fields. - */ -struct dm_stats_counters { - uint64_t reads; /* Num reads completed */ - uint64_t reads_merged; /* Num reads merged */ - uint64_t read_sectors; /* Num sectors read */ - uint64_t read_nsecs; /* Num milliseconds spent reading */ - uint64_t writes; /* Num writes completed */ - uint64_t writes_merged; /* Num writes merged */ - uint64_t write_sectors; /* Num sectors written */ - uint64_t write_nsecs; /* Num milliseconds spent writing */ - uint64_t io_in_progress; /* Num I/Os currently in progress */ - uint64_t io_nsecs; /* Num milliseconds spent doing I/Os */ - uint64_t weighted_io_nsecs; /* Weighted num milliseconds doing I/Os */ - uint64_t total_read_nsecs; /* Total time spent reading in milliseconds */ - uint64_t total_write_nsecs; /* Total time spent writing in milliseconds */ - struct dm_histogram *histogram; /* Histogram. */ -}; - -struct dm_stats_region { - uint64_t region_id; /* as returned by @stats_list */ - uint64_t group_id; - uint64_t start; - uint64_t len; - uint64_t step; - char *program_id; - char *aux_data; - uint64_t timescale; /* precise_timestamps is per-region */ - struct dm_histogram *bounds; /* histogram configuration */ - struct dm_histogram *histogram; /* aggregate cache */ - struct dm_stats_counters *counters; -}; - -struct dm_stats_group { - uint64_t group_id; - const char *alias; - dm_bitset_t regions; - struct dm_histogram *histogram; -}; - -struct dm_stats { - /* device binding */ - int bind_major; /* device major that this dm_stats object is bound to */ - int bind_minor; /* device minor that this dm_stats object is bound to */ - char *bind_name; /* device-mapper device name */ - char *bind_uuid; /* device-mapper UUID */ - char *program_id; /* default program_id for this handle */ - const char *name; /* cached device_name used for reporting */ - struct dm_pool *mem; /* memory pool for region and counter tables */ - struct dm_pool *hist_mem; /* separate pool for histogram tables */ - struct dm_pool *group_mem; /* separate pool for group tables */ - uint64_t nr_regions; /* total number of present regions */ - uint64_t max_region; /* size of the regions table */ - uint64_t interval_ns; /* sampling interval in nanoseconds */ - uint64_t timescale; /* default sample value multiplier */ - int precise; /* use precise_timestamps when creating regions */ - struct dm_stats_region *regions; - struct dm_stats_group *groups; - /* statistics cursor */ - uint64_t walk_flags; /* walk control flags */ - uint64_t cur_flags; - uint64_t cur_group; - uint64_t cur_region; - uint64_t cur_area; -}; - -#define PROC_SELF_COMM "/proc/self/comm" -static char *_program_id_from_proc(void) -{ - FILE *comm = NULL; - char buf[STATS_ROW_BUF_LEN]; - - if (!(comm = fopen(PROC_SELF_COMM, "r"))) - return_NULL; - - if (!fgets(buf, sizeof(buf), comm)) { - log_error("Could not read from %s", PROC_SELF_COMM); - if (fclose(comm)) - stack; - return NULL; - } - - if (fclose(comm)) - stack; - - return strdup(buf); -} - -static uint64_t _nr_areas(uint64_t len, uint64_t step) -{ - /* Default is one area. */ - if (!len || !step) - return 1; - /* - * drivers/md/dm-stats.c::message_stats_create() - * A region may be sub-divided into areas with their own counters. - * Any partial area at the end of the region is treated as an - * additional complete area. - */ - return (len + step - 1) / step; -} - -static uint64_t _nr_areas_region(struct dm_stats_region *region) -{ - return _nr_areas(region->len, region->step); -} - -struct dm_stats *dm_stats_create(const char *program_id) -{ - size_t hist_hint = sizeof(struct dm_histogram_bin); - size_t group_hint = sizeof(struct dm_stats_group); - struct dm_stats *dms = NULL; - - if (!(dms = zalloc(sizeof(*dms)))) - return_NULL; - - /* FIXME: better hint. */ - if (!(dms->mem = dm_pool_create("stats_pool", 4096))) { - free(dms); - return_NULL; - } - - if (!(dms->hist_mem = dm_pool_create("histogram_pool", hist_hint))) - goto_bad; - - if (!(dms->group_mem = dm_pool_create("group_pool", group_hint))) - goto_bad; - - if (!program_id || !strlen(program_id)) - dms->program_id = _program_id_from_proc(); - else - dms->program_id = strdup(program_id); - - if (!dms->program_id) { - log_error("Could not allocate memory for program_id"); - goto bad; - } - - dms->bind_major = -1; - dms->bind_minor = -1; - dms->bind_name = NULL; - dms->bind_uuid = NULL; - - dms->name = NULL; - - /* by default all regions use msec precision */ - dms->timescale = NSEC_PER_MSEC; - dms->precise = 0; - - dms->nr_regions = DM_STATS_REGION_NOT_PRESENT; - dms->max_region = DM_STATS_REGION_NOT_PRESENT; - dms->regions = NULL; - - /* maintain compatibility with earlier walk version */ - dms->walk_flags = dms->cur_flags = DM_STATS_WALK_DEFAULT; - - return dms; - -bad: - dm_pool_destroy(dms->mem); - if (dms->hist_mem) - dm_pool_destroy(dms->hist_mem); - if (dms->group_mem) - dm_pool_destroy(dms->group_mem); - free(dms); - return NULL; -} - -/* - * Test whether the stats region pointed to by region is present. - */ -static int _stats_region_present(const struct dm_stats_region *region) -{ - return !(region->region_id == DM_STATS_REGION_NOT_PRESENT); -} - -/* - * Test whether the stats group pointed to by group is present. - */ -static int _stats_group_present(const struct dm_stats_group *group) -{ - return !(group->group_id == DM_STATS_GROUP_NOT_PRESENT); -} - -/* - * Test whether a stats group id is present. - */ -static int _stats_group_id_present(const struct dm_stats *dms, uint64_t id) -{ - struct dm_stats_group *group = NULL; - - if (id == DM_STATS_GROUP_NOT_PRESENT) - return 0; - - if (!dms) - return_0; - - if (!dms->regions) - return 0; - - if (id > dms->max_region) - return 0; - - group = &dms->groups[id]; - - return _stats_group_present(group); -} - -/* - * Test whether the given region_id is a member of any group. - */ -static uint64_t _stats_region_is_grouped(const struct dm_stats* dms, - uint64_t region_id) -{ - uint64_t group_id; - - if (region_id == DM_STATS_GROUP_NOT_PRESENT) - return 0; - - if (!_stats_region_present(&dms->regions[region_id])) - return 0; - - group_id = dms->regions[region_id].group_id; - - return group_id != DM_STATS_GROUP_NOT_PRESENT; -} - -static void _stats_histograms_destroy(struct dm_pool *mem, - struct dm_stats_region *region) -{ - /* Unpopulated handle. */ - if (!region->counters) - return; - - /* - * Free everything in the pool back to the first histogram. - */ - if (region->counters[0].histogram) - dm_pool_free(mem, region->counters[0].histogram); -} - -static void _stats_region_destroy(struct dm_stats_region *region) -{ - if (!_stats_region_present(region)) - return; - - region->start = region->len = region->step = 0; - region->timescale = 0; - - /* - * Don't free counters and histogram bounds here: they are - * dropped from the pool along with the corresponding - * regions table. - * - * The following objects are all allocated with malloc. - */ - - region->counters = NULL; - region->bounds = NULL; - - free(region->program_id); - region->program_id = NULL; - free(region->aux_data); - region->aux_data = NULL; - region->region_id = DM_STATS_REGION_NOT_PRESENT; -} - -static void _stats_regions_destroy(struct dm_stats *dms) -{ - struct dm_pool *mem = dms->mem; - uint64_t i; - - if (!dms->regions) - return; - - /* walk backwards to obey pool order */ - for (i = dms->max_region; (i != DM_STATS_REGION_NOT_PRESENT); i--) { - _stats_histograms_destroy(dms->hist_mem, &dms->regions[i]); - _stats_region_destroy(&dms->regions[i]); - } - - dm_pool_free(mem, dms->regions); - dms->regions = NULL; -} - -static void _stats_group_destroy(struct dm_stats_group *group) -{ - if (!_stats_group_present(group)) - return; - - group->histogram = NULL; - - if (group->alias) { - free((char *) group->alias); - group->alias = NULL; - } - if (group->regions) { - dm_bitset_destroy(group->regions); - group->regions = NULL; - } - group->group_id = DM_STATS_GROUP_NOT_PRESENT; -} - -static void _stats_groups_destroy(struct dm_stats *dms) -{ - uint64_t i; - - if (!dms->groups) - return; - - for (i = dms->max_region; (i != DM_STATS_REGION_NOT_PRESENT); i--) - _stats_group_destroy(&dms->groups[i]); - dm_pool_free(dms->group_mem, dms->groups); - dms->groups = NULL; -} - -static int _set_stats_device(struct dm_stats *dms, struct dm_task *dmt) -{ - if (dms->bind_name) - return dm_task_set_name(dmt, dms->bind_name); - if (dms->bind_uuid) - return dm_task_set_uuid(dmt, dms->bind_uuid); - if (dms->bind_major > 0) - return dm_task_set_major(dmt, dms->bind_major) - && dm_task_set_minor(dmt, dms->bind_minor); - return_0; -} - -static int _stats_bound(const struct dm_stats *dms) -{ - if (dms->bind_major > 0 || dms->bind_name || dms->bind_uuid) - return 1; - /* %p format specifier expects a void pointer. */ - log_error("Stats handle at %p is not bound.", dms); - return 0; -} - -static void _stats_clear_binding(struct dm_stats *dms) -{ - if (dms->bind_name) - dm_pool_free(dms->mem, dms->bind_name); - if (dms->bind_uuid) - dm_pool_free(dms->mem, dms->bind_uuid); - free((char *) dms->name); - - dms->bind_name = dms->bind_uuid = NULL; - dms->bind_major = dms->bind_minor = -1; - dms->name = NULL; -} - -int dm_stats_bind_devno(struct dm_stats *dms, int major, int minor) -{ - _stats_clear_binding(dms); - _stats_regions_destroy(dms); - _stats_groups_destroy(dms); - - dms->bind_major = major; - dms->bind_minor = minor; - - return 1; -} - -int dm_stats_bind_name(struct dm_stats *dms, const char *name) -{ - _stats_clear_binding(dms); - _stats_regions_destroy(dms); - _stats_groups_destroy(dms); - - if (!(dms->bind_name = dm_pool_strdup(dms->mem, name))) - return_0; - - return 1; -} - -int dm_stats_bind_uuid(struct dm_stats *dms, const char *uuid) -{ - _stats_clear_binding(dms); - _stats_regions_destroy(dms); - _stats_groups_destroy(dms); - - if (!(dms->bind_uuid = dm_pool_strdup(dms->mem, uuid))) - return_0; - - return 1; -} - -int dm_stats_bind_from_fd(struct dm_stats *dms, int fd) -{ - int major, minor; - struct stat buf; - - if (fstat(fd, &buf)) { - log_error("fstat failed for fd %d.", fd); - return 0; - } - - major = (int) MAJOR(buf.st_dev); - minor = (int) MINOR(buf.st_dev); - - if (!dm_stats_bind_devno(dms, major, minor)) - return_0; - return 1; -} - -static int _stats_check_precise_timestamps(const struct dm_stats *dms) -{ - /* Already checked? */ - if (dms && dms->precise) - return 1; - - return dm_message_supports_precise_timestamps(); -} - -int dm_stats_driver_supports_precise(void) -{ - return _stats_check_precise_timestamps(NULL); -} - -int dm_stats_driver_supports_histogram(void) -{ - return _stats_check_precise_timestamps(NULL); -} - -static int _fill_hist_arg(char *hist_arg, size_t hist_len, uint64_t scale, - struct dm_histogram *bounds) -{ - int i, l, len = 0, nr_bins; - char *arg = hist_arg; - uint64_t value; - - nr_bins = bounds->nr_bins; - - for (i = 0; i < nr_bins; i++) { - value = bounds->bins[i].upper / scale; - if ((l = dm_snprintf(arg, hist_len - len, FMTu64"%s", value, - (i == (nr_bins - 1)) ? "" : ",")) < 0) - return_0; - len += l; - arg += l; - } - return 1; -} - -static void *_get_hist_arg(struct dm_histogram *bounds, uint64_t scale, - size_t *len) -{ - struct dm_histogram_bin *entry, *bins; - size_t hist_len = 1; /* terminating '\0' */ - double value; - - entry = bins = bounds->bins; - - entry += bounds->nr_bins - 1; - while(entry >= bins) { - value = (double) (entry--)->upper; - /* Use lround to avoid size_t -> double cast warning. */ - hist_len += 1 + (size_t) lround(log10(value / scale)); - if (entry != bins) - hist_len++; /* ',' */ - } - - *len = hist_len; - - return zalloc(hist_len); -} - -static char *_build_histogram_arg(struct dm_histogram *bounds, int *precise) -{ - struct dm_histogram_bin *entry, *bins; - size_t hist_len; - char *hist_arg; - uint64_t scale; - - entry = bins = bounds->bins; - - /* Empty histogram is invalid. */ - if (!bounds->nr_bins) { - log_error("Cannot format empty histogram description."); - return NULL; - } - - /* Validate entries and set *precise if precision < 1ms. */ - entry += bounds->nr_bins - 1; - while (entry >= bins) { - if (entry != bins) { - if (entry->upper < (entry - 1)->upper) { - log_error("Histogram boundaries must be in " - "order of increasing magnitude."); - return 0; - } - } - - /* - * Only enable precise_timestamps automatically if any - * value in the histogram bounds uses precision < 1ms. - */ - if (((entry--)->upper % NSEC_PER_MSEC) && !*precise) - *precise = 1; - } - - scale = (*precise) ? 1 : NSEC_PER_MSEC; - - /* Calculate hist_len and allocate a character buffer. */ - if (!(hist_arg = _get_hist_arg(bounds, scale, &hist_len))) { - log_error("Could not allocate memory for histogram argument."); - return 0; - } - - /* Fill hist_arg with boundary strings. */ - if (!_fill_hist_arg(hist_arg, hist_len, scale, bounds)) - goto_bad; - - return hist_arg; - -bad: - log_error("Could not build histogram arguments."); - free(hist_arg); - - return NULL; -} - -static struct dm_task *_stats_send_message(struct dm_stats *dms, char *msg) -{ - struct dm_task *dmt; - - if (!(dmt = dm_task_create(DM_DEVICE_TARGET_MSG))) - return_0; - - if (!_set_stats_device(dms, dmt)) - goto_bad; - - if (!dm_task_set_message(dmt, msg)) - goto_bad; - - if (!dm_task_run(dmt)) - goto_bad; - - return dmt; - -bad: - dm_task_destroy(dmt); - return NULL; -} - -/* - * Cache the dm device_name for the device bound to dms. - */ -static int _stats_set_name_cache(struct dm_stats *dms) -{ - struct dm_task *dmt; - - if (dms->name) - return 1; - - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) - return_0; - - if (!_set_stats_device(dms, dmt)) - goto_bad; - - if (!dm_task_run(dmt)) - goto_bad; - - if (!(dms->name = strdup(dm_task_get_name(dmt)))) - goto_bad; - - dm_task_destroy(dmt); - - return 1; - -bad: - log_error("Could not retrieve device-mapper name for device."); - dm_task_destroy(dmt); - return 0; -} - -/* - * update region group_id values - */ -static void _stats_update_groups(struct dm_stats *dms) -{ - struct dm_stats_group *group; - uint64_t group_id, i; - - for (group_id = 0; group_id < dms->max_region + 1; group_id++) { - if (!_stats_group_id_present(dms, group_id)) - continue; - - group = &dms->groups[group_id]; - - for (i = dm_bit_get_first(group->regions); - i != DM_STATS_GROUP_NOT_PRESENT; - i = dm_bit_get_next(group->regions, i)) - dms->regions[i].group_id = group_id; - } -} - -static void _check_group_regions_present(struct dm_stats *dms, - struct dm_stats_group *group) -{ - dm_bitset_t regions = group->regions; - int64_t i, group_id; - - group_id = i = dm_bit_get_first(regions); - - for (; i > 0; i = dm_bit_get_next(regions, i)) - if (!_stats_region_present(&dms->regions[i])) { - log_warn("Group descriptor " FMTd64 " contains " - "non-existent region_id " FMTd64 ".", - group_id, i); - dm_bit_clear(regions, i); - } -} - -/* - * Parse a DMS_GROUP group descriptor embedded in a region's aux_data. - * - * DMS_GROUP="ALIAS:MEMBERS" - * - * ALIAS: group alias - * MEMBERS: list of group member region ids. - * - */ -#define DMS_GROUP_TAG "DMS_GROUP=" -#define DMS_GROUP_TAG_LEN (sizeof(DMS_GROUP_TAG) - 1) -#define DMS_GROUP_SEP ':' -#define DMS_AUX_SEP "#" - -static int _parse_aux_data_group(struct dm_stats *dms, - struct dm_stats_region *region, - struct dm_stats_group *group) -{ - char *alias, *c, *end; - dm_bitset_t regions; - - memset(group, 0, sizeof(*group)); - group->group_id = DM_STATS_GROUP_NOT_PRESENT; - - /* find start of group tag */ - c = strstr(region->aux_data, DMS_GROUP_TAG); - if (!c) - return 1; /* no group is not an error */ - - alias = c + strlen(DMS_GROUP_TAG); - - c = strchr(c, DMS_GROUP_SEP); - - if (!c) { - log_error("Found malformed group tag while reading aux_data"); - return 0; - } - - /* terminate alias and advance to members */ - *(c++) = '\0'; - - log_debug("Read alias '%s' from aux_data", alias); - - if (!c) { - log_error("Found malformed group descriptor while " - "reading aux_data, expected '%c'", DMS_GROUP_SEP); - return 0; - } - - /* if user aux_data follows make sure we have a terminated - * string to pass to dm_bitset_parse_list(). - */ - end = strstr(c, DMS_AUX_SEP); - if (!end) - end = c + strlen(c); - *(end++) = '\0'; - - if (!(regions = dm_bitset_parse_list(c, NULL, 0))) { - log_error("Could not parse member list while " - "reading group aux_data"); - return 0; - } - - group->group_id = dm_bit_get_first(regions); - if (group->group_id != region->region_id) { - log_error("Found invalid group descriptor in region " FMTu64 - " aux_data.", region->region_id); - group->group_id = DM_STATS_GROUP_NOT_PRESENT; - goto bad; - } - - group->regions = regions; - group->alias = NULL; - if (strlen(alias)) { - group->alias = strdup(alias); - if (!group->alias) { - log_error("Could not allocate memory for group alias"); - goto bad; - } - } - - /* separate group tag from user aux_data */ - if ((strlen(end) > 1) || strncmp(end, "-", 1)) - c = strdup(end); - else - c = strdup(""); - - if (!c) { - log_error("Could not allocate memory for user aux_data"); - goto bad_alias; - } - - free(region->aux_data); - region->aux_data = c; - - log_debug("Found group_id " FMTu64 ": alias=\"%s\"", group->group_id, - (group->alias) ? group->alias : ""); - - return 1; - -bad_alias: - free((char *) group->alias); -bad: - dm_bitset_destroy(regions); - return 0; -} - -/* - * Parse a histogram specification returned by the kernel in a - * @stats_list response. - */ -static int _stats_parse_histogram_spec(struct dm_stats *dms, - struct dm_stats_region *region, - const char *histogram) -{ - static const char _valid_chars[] = "0123456789,"; - uint64_t scale = region->timescale, this_val = 0; - struct dm_pool *mem = dms->hist_mem; - struct dm_histogram_bin cur; - struct dm_histogram hist; - int nr_bins = 1; - const char *c, *v, *val_start; - char *p, *endptr = NULL; - - /* Advance past "histogram:". */ - histogram = strchr(histogram, ':'); - if (!histogram) { - log_error("Could not parse histogram description."); - return 0; - } - histogram++; - - /* @stats_list rows are newline terminated. */ - if ((p = strchr(histogram, '\n'))) - *p = '\0'; - - if (!dm_pool_begin_object(mem, sizeof(cur))) - return_0; - - memset(&hist, 0, sizeof(hist)); - - hist.nr_bins = 0; /* fix later */ - hist.region = region; - hist.dms = dms; - - if (!dm_pool_grow_object(mem, &hist, sizeof(hist))) - goto_bad; - - c = histogram; - do { - for (v = _valid_chars; *v; v++) - if (*c == *v) - break; - if (!*v) { - stack; - goto badchar; - } - - if (*c == ',') { - log_error("Invalid histogram description: %s", - histogram); - goto bad; - } else { - val_start = c; - endptr = NULL; - - errno = 0; - this_val = strtoull(val_start, &endptr, 10); - if (errno || !endptr) { - log_error("Could not parse histogram boundary."); - goto bad; - } - - c = endptr; /* Advance to units, comma, or end. */ - - if (*c == ',') - c++; - else if (*c || (*c == ' ')) { /* Expected ',' or NULL. */ - stack; - goto badchar; - } - - if (*c == ',') - c++; - - cur.upper = scale * this_val; - cur.count = 0; - - if (!dm_pool_grow_object(mem, &cur, sizeof(cur))) - goto_bad; - - nr_bins++; - } - } while (*c && (*c != ' ')); - - /* final upper bound. */ - cur.upper = UINT64_MAX; - if (!dm_pool_grow_object(mem, &cur, sizeof(cur))) - goto_bad; - - region->bounds = dm_pool_end_object(mem); - - if (!region->bounds) - return_0; - - region->bounds->nr_bins = nr_bins; - - log_debug("Added region histogram spec with %d entries.", nr_bins); - return 1; - -badchar: - log_error("Invalid character in histogram: '%c' (0x%x)", *c, *c); -bad: - dm_pool_abandon_object(mem); - return 0; -} - -static int _stats_parse_list_region(struct dm_stats *dms, - struct dm_stats_region *region, char *line) -{ - char *p = NULL, string_data[STATS_ROW_BUF_LEN]; - char *program_id, *aux_data, *stats_args; - char *empty_string = (char *) ""; - int r; - - memset(string_data, 0, sizeof(string_data)); - - /* - * Parse fixed fields, line format: - * - * <region_id>: <start_sector>+<length> <step> <string data> - * - * Maximum string data size is 4096 - 1 bytes. - */ - r = sscanf(line, FMTu64 ": " FMTu64 "+" FMTu64 " " FMTu64 " %4095c", - &region->region_id, &region->start, &region->len, - &region->step, string_data); - - if (r != 5) - return_0; - - /* program_id is guaranteed to be first. */ - program_id = string_data; - - /* - * FIXME: support embedded '\ ' in string data: - * s/strchr/_find_unescaped_space()/ - */ - if ((p = strchr(string_data, ' '))) { - /* terminate program_id string. */ - *p = '\0'; - if (!strncmp(program_id, "-", 1)) - program_id = empty_string; - aux_data = p + 1; - if ((p = strchr(aux_data, ' '))) { - /* terminate aux_data string. */ - *p = '\0'; - stats_args = p + 1; - } else - stats_args = empty_string; - - /* no aux_data? */ - if (!strncmp(aux_data, "-", 1)) - aux_data = empty_string; - else - /* remove trailing newline */ - aux_data[strlen(aux_data) - 1] = '\0'; - } else - aux_data = stats_args = empty_string; - - if (strstr(stats_args, PRECISE_ARG)) - region->timescale = 1; - else - region->timescale = NSEC_PER_MSEC; - - if ((p = strstr(stats_args, HISTOGRAM_ARG))) { - if (!_stats_parse_histogram_spec(dms, region, p)) - return_0; - } else - region->bounds = NULL; - - /* clear aggregate cache */ - region->histogram = NULL; - - region->group_id = DM_STATS_GROUP_NOT_PRESENT; - - if (!(region->program_id = strdup(program_id))) - return_0; - if (!(region->aux_data = strdup(aux_data))) { - free(region->program_id); - return_0; - } - - region->counters = NULL; - return 1; -} - -static int _stats_parse_list(struct dm_stats *dms, const char *resp) -{ - uint64_t max_region = 0, nr_regions = 0; - struct dm_stats_region cur, fill; - struct dm_stats_group cur_group; - struct dm_pool *mem = dms->mem, *group_mem = dms->group_mem; - char line[STATS_ROW_BUF_LEN]; - FILE *list_rows; - - if (!resp) { - log_error("Could not parse NULL @stats_list response."); - return 0; - } - - _stats_regions_destroy(dms); - _stats_groups_destroy(dms); - - /* no regions */ - if (!strlen(resp)) { - dms->nr_regions = dms->max_region = 0; - dms->regions = NULL; - return 1; - } - - /* - * dm_task_get_message_response() returns a 'const char *' but - * since fmemopen also permits "w" it expects a 'char *'. - */ - if (!(list_rows = fmemopen((char *)resp, strlen(resp), "r"))) - return_0; - - /* begin region table */ - if (!dm_pool_begin_object(mem, 1024)) - goto_bad; - - /* begin group table */ - if (!dm_pool_begin_object(group_mem, 32)) - goto_bad; - - while(fgets(line, sizeof(line), list_rows)) { - - cur_group.group_id = DM_STATS_GROUP_NOT_PRESENT; - cur_group.regions = NULL; - cur_group.alias = NULL; - - if (!_stats_parse_list_region(dms, &cur, line)) - goto_bad; - - /* handle holes in the list of region_ids */ - if (cur.region_id > max_region) { - memset(&fill, 0, sizeof(fill)); - memset(&cur_group, 0, sizeof(cur_group)); - fill.region_id = DM_STATS_REGION_NOT_PRESENT; - cur_group.group_id = DM_STATS_GROUP_NOT_PRESENT; - do { - if (!dm_pool_grow_object(mem, &fill, sizeof(fill))) - goto_bad; - if (!dm_pool_grow_object(group_mem, &cur_group, - sizeof(cur_group))) - goto_bad; - } while (max_region++ < (cur.region_id - 1)); - } - - if (cur.aux_data) - if (!_parse_aux_data_group(dms, &cur, &cur_group)) - log_error("Failed to parse group descriptor " - "from region_id " FMTu64 " aux_data:" - "'%s'", cur.region_id, cur.aux_data); - /* continue */ - - if (!dm_pool_grow_object(mem, &cur, sizeof(cur))) - goto_bad; - - if (!dm_pool_grow_object(group_mem, &cur_group, - sizeof(cur_group))) - goto_bad; - - max_region++; - nr_regions++; - } - - if (!nr_regions) - /* no region data read from @stats_list */ - goto bad; - - dms->nr_regions = nr_regions; - dms->max_region = max_region - 1; - dms->regions = dm_pool_end_object(mem); - dms->groups = dm_pool_end_object(group_mem); - - dm_stats_foreach_group(dms) - _check_group_regions_present(dms, &dms->groups[dms->cur_group]); - - _stats_update_groups(dms); - - if (fclose(list_rows)) - stack; - - return 1; - -bad: - if (fclose(list_rows)) - stack; - dm_pool_abandon_object(mem); - dm_pool_abandon_object(group_mem); - - return 0; -} - -int dm_stats_list(struct dm_stats *dms, const char *program_id) -{ - char msg[STATS_MSG_BUF_LEN]; - struct dm_task *dmt; - int r; - - if (!_stats_bound(dms)) - return_0; - - /* allow zero-length program_id for list */ - if (!program_id) - program_id = dms->program_id; - - if (!_stats_set_name_cache(dms)) - return_0; - - if (dms->regions) - _stats_regions_destroy(dms); - - r = dm_snprintf(msg, sizeof(msg), "@stats_list %s", program_id); - - if (r < 0) { - log_error("Failed to prepare stats message."); - return 0; - } - - if (!(dmt = _stats_send_message(dms, msg))) - return_0; - - if (!_stats_parse_list(dms, dm_task_get_message_response(dmt))) { - log_error("Could not parse @stats_list response."); - goto bad; - } - - dm_task_destroy(dmt); - return 1; - -bad: - dm_task_destroy(dmt); - return 0; -} - -/* - * Parse histogram data returned from a @stats_print operation. - */ -static int _stats_parse_histogram(struct dm_pool *mem, char *hist_str, - struct dm_histogram **histogram, - struct dm_stats_region *region) -{ - static const char _valid_chars[] = "0123456789:"; - struct dm_histogram *bounds = region->bounds; - struct dm_histogram hist = { - .nr_bins = region->bounds->nr_bins - }; - const char *c, *v, *val_start; - struct dm_histogram_bin cur; - uint64_t sum = 0, this_val; - char *endptr = NULL; - int bin = 0; - - c = hist_str; - - if (!dm_pool_begin_object(mem, sizeof(cur))) - return_0; - - if (!dm_pool_grow_object(mem, &hist, sizeof(hist))) - goto_bad; - - do { - memset(&cur, 0, sizeof(cur)); - for (v = _valid_chars; *v; v++) - if (*c == *v) - break; - if (!*v) - goto badchar; - - if (*c == ',') - goto badchar; - else { - val_start = c; - endptr = NULL; - - errno = 0; - this_val = strtoull(val_start, &endptr, 10); - if (errno || !endptr) { - log_error("Could not parse histogram value."); - goto bad; - } - c = endptr; /* Advance to colon, or end. */ - - if (*c == ':') - c++; - else if (*c & (*c != '\n')) - /* Expected ':', '\n', or NULL. */ - goto badchar; - - if (*c == ':') - c++; - - cur.upper = bounds->bins[bin].upper; - cur.count = this_val; - sum += this_val; - - if (!dm_pool_grow_object(mem, &cur, sizeof(cur))) - goto_bad; - - bin++; - } - } while (*c && (*c != '\n')); - - log_debug("Added region histogram data with %d entries.", hist.nr_bins); - - *histogram = dm_pool_end_object(mem); - (*histogram)->sum = sum; - - return 1; - -badchar: - log_error("Invalid character in histogram data: '%c' (0x%x)", *c, *c); -bad: - dm_pool_abandon_object(mem); - return 0; -} - -static int _stats_parse_region(struct dm_stats *dms, const char *resp, - struct dm_stats_region *region, - uint64_t timescale) -{ - struct dm_histogram *hist = NULL; - struct dm_pool *mem = dms->mem; - struct dm_stats_counters cur; - FILE *stats_rows = NULL; - uint64_t start = 0, len = 0; - char row[STATS_ROW_BUF_LEN]; - int r; - - if (!resp) { - log_error("Could not parse empty @stats_print response."); - return 0; - } - - region->start = UINT64_MAX; - - if (!dm_pool_begin_object(mem, 512)) - goto_bad; - - /* - * dm_task_get_message_response() returns a 'const char *' but - * since fmemopen also permits "w" it expects a 'char *'. - */ - stats_rows = fmemopen((char *)resp, strlen(resp), "r"); - if (!stats_rows) - goto_bad; - - /* - * Output format for each step-sized area of a region: - * - * <start_sector>+<length> counters - * - * The first 11 counters have the same meaning as - * /sys/block/ * /stat or /proc/diskstats. - * - * Please refer to Documentation/iostats.txt for details. - * - * 1. the number of reads completed - * 2. the number of reads merged - * 3. the number of sectors read - * 4. the number of milliseconds spent reading - * 5. the number of writes completed - * 6. the number of writes merged - * 7. the number of sectors written - * 8. the number of milliseconds spent writing - * 9. the number of I/Os currently in progress - * 10. the number of milliseconds spent doing I/Os - * 11. the weighted number of milliseconds spent doing I/Os - * - * Additional counters: - * 12. the total time spent reading in milliseconds - * 13. the total time spent writing in milliseconds - * - */ - while (fgets(row, sizeof(row), stats_rows)) { - r = sscanf(row, FMTu64 "+" FMTu64 /* start+len */ - /* reads */ - FMTu64 " " FMTu64 " " FMTu64 " " FMTu64 " " - /* writes */ - FMTu64 " " FMTu64 " " FMTu64 " " FMTu64 " " - /* in flight & io nsecs */ - FMTu64 " " FMTu64 " " FMTu64 " " - /* tot read/write nsecs */ - FMTu64 " " FMTu64, &start, &len, - &cur.reads, &cur.reads_merged, &cur.read_sectors, - &cur.read_nsecs, - &cur.writes, &cur.writes_merged, &cur.write_sectors, - &cur.write_nsecs, - &cur.io_in_progress, - &cur.io_nsecs, &cur.weighted_io_nsecs, - &cur.total_read_nsecs, &cur.total_write_nsecs); - if (r != 15) { - log_error("Could not parse @stats_print row."); - goto bad; - } - - /* scale time values up if needed */ - if (timescale != 1) { - cur.read_nsecs *= timescale; - cur.write_nsecs *= timescale; - cur.io_nsecs *= timescale; - cur.weighted_io_nsecs *= timescale; - cur.total_read_nsecs *= timescale; - cur.total_write_nsecs *= timescale; - } - - if (region->bounds) { - /* Find first histogram separator. */ - char *hist_str = strchr(row, ':'); - if (!hist_str) { - log_error("Could not parse histogram value."); - goto bad; - } - /* Find space preceding histogram. */ - while (hist_str && *(hist_str - 1) != ' ') - hist_str--; - - /* Use a separate pool for histogram objects since we - * are growing the area table and each area's histogram - * table simultaneously. - */ - if (!_stats_parse_histogram(dms->hist_mem, hist_str, - &hist, region)) - goto_bad; - hist->dms = dms; - hist->region = region; - } - - cur.histogram = hist; - - if (!dm_pool_grow_object(mem, &cur, sizeof(cur))) - goto_bad; - - if (region->start == UINT64_MAX) { - region->start = start; - region->step = len; /* area size is always uniform. */ - } - } - - if (region->start == UINT64_MAX) - /* no area data read from @stats_print */ - goto bad; - - region->len = (start + len) - region->start; - region->timescale = timescale; - region->counters = dm_pool_end_object(mem); - - if (fclose(stats_rows)) - stack; - - return 1; - -bad: - if (stats_rows) - if (fclose(stats_rows)) - stack; - dm_pool_abandon_object(mem); - - return 0; -} - -static void _stats_walk_next_present(const struct dm_stats *dms, - uint64_t *flags, - uint64_t *cur_r, uint64_t *cur_a, - uint64_t *cur_g) -{ - struct dm_stats_region *cur = NULL; - - /* start of walk: region loop advances *cur_r to 0. */ - if (*cur_r != DM_STATS_REGION_NOT_PRESENT) - cur = &dms->regions[*cur_r]; - - /* within current region? */ - if (cur && (*flags & DM_STATS_WALK_AREA)) { - if (++(*cur_a) < _nr_areas_region(cur)) - return; - else - *cur_a = 0; - } - - /* advance to next present, non-skipped region or end */ - while (++(*cur_r) <= dms->max_region) { - cur = &dms->regions[*cur_r]; - if (!_stats_region_present(cur)) - continue; - if ((*flags & DM_STATS_WALK_SKIP_SINGLE_AREA)) - if (!(*flags & DM_STATS_WALK_AREA)) - if (_nr_areas_region(cur) < 2) - continue; - /* matching region found */ - break; - } - return; -} - -static void _stats_walk_next(const struct dm_stats *dms, uint64_t *flags, - uint64_t *cur_r, uint64_t *cur_a, uint64_t *cur_g) -{ - if (!dms || !dms->regions) - return; - - if (*flags & DM_STATS_WALK_AREA) { - /* advance to next area, region, or end */ - _stats_walk_next_present(dms, flags, cur_r, cur_a, cur_g); - return; - } - - if (*flags & DM_STATS_WALK_REGION) { - /* enable region aggregation */ - *cur_a = DM_STATS_WALK_REGION; - _stats_walk_next_present(dms, flags, cur_r, cur_a, cur_g); - return; - } - - if (*flags & DM_STATS_WALK_GROUP) { - /* enable group aggregation */ - *cur_r = *cur_a = DM_STATS_WALK_GROUP; - while (!_stats_group_id_present(dms, ++(*cur_g)) - && (*cur_g) < dms->max_region + 1) - ; /* advance to next present group or end */ - return; - } - - log_error("stats_walk_next called with empty walk flags"); -} - -static void _group_walk_start(const struct dm_stats *dms, uint64_t *flags, - uint64_t *cur_r, uint64_t *cur_a, uint64_t *cur_g) -{ - if (!(*flags & DM_STATS_WALK_GROUP)) - return; - - *cur_a = *cur_r = DM_STATS_WALK_GROUP; - *cur_g = 0; - - /* advance to next present group or end */ - while ((*cur_g) <= dms->max_region) { - if (_stats_region_is_grouped(dms, *cur_g)) - break; - (*cur_g)++; - } - - if (*cur_g > dms->max_region) - /* no groups to walk */ - *flags &= ~DM_STATS_WALK_GROUP; -} - -static void _stats_walk_start(const struct dm_stats *dms, uint64_t *flags, - uint64_t *cur_r, uint64_t *cur_a, - uint64_t *cur_g) -{ - log_debug("starting stats walk with %s %s %s %s", - (*flags & DM_STATS_WALK_AREA) ? "AREA" : "", - (*flags & DM_STATS_WALK_REGION) ? "REGION" : "", - (*flags & DM_STATS_WALK_GROUP) ? "GROUP" : "", - (*flags & DM_STATS_WALK_SKIP_SINGLE_AREA) ? "SKIP" : ""); - - if (!dms->regions) - return; - - if (!(*flags & (DM_STATS_WALK_AREA | DM_STATS_WALK_REGION))) - return _group_walk_start(dms, flags, cur_r, cur_a, cur_g); - - /* initialise cursor state */ - *cur_a = 0; - *cur_r = DM_STATS_REGION_NOT_PRESENT; - *cur_g = DM_STATS_GROUP_NOT_PRESENT; - - if (!(*flags & DM_STATS_WALK_AREA)) - *cur_a = DM_STATS_WALK_REGION; - - /* advance to first present, non-skipped region */ - _stats_walk_next_present(dms, flags, cur_r, cur_a, cur_g); -} - -#define DM_STATS_WALK_MASK (DM_STATS_WALK_AREA \ - | DM_STATS_WALK_REGION \ - | DM_STATS_WALK_GROUP \ - | DM_STATS_WALK_SKIP_SINGLE_AREA) - -int dm_stats_walk_init(struct dm_stats *dms, uint64_t flags) -{ - if (!dms) - return_0; - - if (flags & ~DM_STATS_WALK_MASK) { - log_error("Unknown value in walk flags: 0x" FMTx64, - (uint64_t) (flags & ~DM_STATS_WALK_MASK)); - return 0; - } - dms->walk_flags = flags; - log_debug("dm_stats_walk_init: initialised flags to " FMTx64, flags); - return 1; -} - -void dm_stats_walk_start(struct dm_stats *dms) -{ - if (!dms || !dms->regions) - return; - - dms->cur_flags = dms->walk_flags; - - _stats_walk_start(dms, &dms->cur_flags, - &dms->cur_region, &dms->cur_area, - &dms->cur_group); -} - -void dm_stats_walk_next(struct dm_stats *dms) -{ - _stats_walk_next(dms, &dms->cur_flags, - &dms->cur_region, &dms->cur_area, - &dms->cur_group); -} - -void dm_stats_walk_next_region(struct dm_stats *dms) -{ - dms->cur_flags &= ~DM_STATS_WALK_AREA; - _stats_walk_next(dms, &dms->cur_flags, - &dms->cur_region, &dms->cur_area, - &dms->cur_group); -} - -/* - * Return 1 if any regions remain that are present and not skipped - * by the current walk flags or 0 otherwise. - */ -static uint64_t _stats_walk_any_unskipped(const struct dm_stats *dms, - uint64_t *flags, - uint64_t *cur_r, uint64_t *cur_a) -{ - struct dm_stats_region *region; - uint64_t i; - - if (*cur_r > dms->max_region) - return 0; - - for (i = *cur_r; i <= dms->max_region; i++) { - region = &dms->regions[i]; - if (!_stats_region_present(region)) - continue; - if ((*flags & DM_STATS_WALK_SKIP_SINGLE_AREA) - && !(*flags & DM_STATS_WALK_AREA)) - if (_nr_areas_region(region) < 2) - continue; - return 1; - } - return 0; -} - -static void _stats_walk_end_areas(const struct dm_stats *dms, uint64_t *flags, - uint64_t *cur_r, uint64_t *cur_a, - uint64_t *cur_g) -{ - int end = !_stats_walk_any_unskipped(dms, flags, cur_r, cur_a); - - if (!(*flags & DM_STATS_WALK_AREA)) - return; - - if (!end) - return; - - *flags &= ~DM_STATS_WALK_AREA; - if (*flags & DM_STATS_WALK_REGION) { - /* start region walk */ - *cur_a = DM_STATS_WALK_REGION; - *cur_r = DM_STATS_REGION_NOT_PRESENT; - _stats_walk_next_present(dms, flags, cur_r, cur_a, cur_g); - if (!_stats_walk_any_unskipped(dms, flags, cur_r, cur_a)) { - /* no more regions */ - *flags &= ~DM_STATS_WALK_REGION; - if (!(*flags & DM_STATS_WALK_GROUP)) - *cur_r = dms->max_region; - } - } - - if (*flags & DM_STATS_WALK_REGION) - return; - - if (*flags & DM_STATS_WALK_GROUP) - _group_walk_start(dms, flags, cur_r, cur_a, cur_g); -} - -static int _stats_walk_end(const struct dm_stats *dms, uint64_t *flags, - uint64_t *cur_r, uint64_t *cur_a, uint64_t *cur_g) -{ - if (*flags & DM_STATS_WALK_AREA) { - _stats_walk_end_areas(dms, flags, cur_r, cur_a, cur_g); - goto out; - } - - if (*flags & DM_STATS_WALK_REGION) { - if (!_stats_walk_any_unskipped(dms, flags, cur_r, cur_a)) { - *flags &= ~DM_STATS_WALK_REGION; - _group_walk_start(dms, flags, cur_r, cur_a, cur_g); - } - goto out; - } - - if (*flags & DM_STATS_WALK_GROUP) { - if (*cur_g <= dms->max_region) - goto out; - *flags &= ~DM_STATS_WALK_GROUP; - } -out: - return !(*flags & ~DM_STATS_WALK_SKIP_SINGLE_AREA); -} - -int dm_stats_walk_end(struct dm_stats *dms) -{ - if (!dms) - return 1; - - if (_stats_walk_end(dms, &dms->cur_flags, - &dms->cur_region, &dms->cur_area, - &dms->cur_group)) { - dms->cur_flags = dms->walk_flags; - return 1; - } - return 0; -} - -dm_stats_obj_type_t dm_stats_object_type(const struct dm_stats *dms, - uint64_t region_id, - uint64_t area_id) -{ - uint64_t group_id; - - region_id = (region_id == DM_STATS_REGION_CURRENT) - ? dms->cur_region : region_id ; - area_id = (area_id == DM_STATS_AREA_CURRENT) - ? dms->cur_area : area_id ; - - if (region_id == DM_STATS_REGION_NOT_PRESENT) - /* no region */ - return DM_STATS_OBJECT_TYPE_NONE; - - if (region_id & DM_STATS_WALK_GROUP) { - if (region_id == DM_STATS_WALK_GROUP) - /* indirect group_id from cursor */ - group_id = dms->cur_group; - else - /* immediate group_id encoded in region_id */ - group_id = region_id & ~DM_STATS_WALK_GROUP; - if (!_stats_group_id_present(dms, group_id)) - return DM_STATS_OBJECT_TYPE_NONE; - return DM_STATS_OBJECT_TYPE_GROUP; - } - - if (region_id > dms->max_region) - /* end of table */ - return DM_STATS_OBJECT_TYPE_NONE; - - if (area_id & DM_STATS_WALK_REGION) - /* aggregate region */ - return DM_STATS_OBJECT_TYPE_REGION; - - /* plain region_id and area_id */ - return DM_STATS_OBJECT_TYPE_AREA; -} - -dm_stats_obj_type_t dm_stats_current_object_type(const struct dm_stats *dms) -{ - /* dm_stats_object_type will decode region/area */ - return dm_stats_object_type(dms, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT); -} - -uint64_t dm_stats_get_region_nr_areas(const struct dm_stats *dms, - uint64_t region_id) -{ - struct dm_stats_region *region = NULL; - - /* groups or aggregate regions cannot be subdivided */ - if (region_id & DM_STATS_WALK_GROUP) - return 1; - - region = &dms->regions[region_id]; - return _nr_areas_region(region); -} - -uint64_t dm_stats_get_current_nr_areas(const struct dm_stats *dms) -{ - /* groups or aggregate regions cannot be subdivided */ - if (dms->cur_region & DM_STATS_WALK_GROUP) - return 1; - - return dm_stats_get_region_nr_areas(dms, dms->cur_region); -} - -uint64_t dm_stats_get_nr_areas(const struct dm_stats *dms) -{ - uint64_t nr_areas = 0, flags = DM_STATS_WALK_AREA; - /* use a separate cursor */ - uint64_t cur_region = 0, cur_area = 0, cur_group = 0; - - /* no regions to visit? */ - if (!dms->regions) - return 0; - - flags = DM_STATS_WALK_AREA; - _stats_walk_start(dms, &flags, &cur_region, &cur_area, &cur_group); - do { - nr_areas += dm_stats_get_current_nr_areas(dms); - _stats_walk_next(dms, &flags, - &cur_region, &cur_area, - &cur_group); - } while (!_stats_walk_end(dms, &flags, - &cur_region, &cur_area, - &cur_group)); - return nr_areas; -} - -int dm_stats_group_present(const struct dm_stats *dms, uint64_t group_id) -{ - return _stats_group_id_present(dms, group_id); -} - -int dm_stats_get_region_nr_histogram_bins(const struct dm_stats *dms, - uint64_t region_id) -{ - region_id = (region_id == DM_STATS_REGION_CURRENT) - ? dms->cur_region : region_id ; - - /* FIXME: support group histograms if all region bounds match */ - if (region_id & DM_STATS_WALK_GROUP) - return 0; - - if (!dms->regions[region_id].bounds) - return 0; - - return dms->regions[region_id].bounds->nr_bins; -} - -/* - * Fill buf with a list of set regions in the regions bitmap. Consecutive - * ranges of set region IDs are output using "M-N" range notation. - * - * The number of bytes consumed is returned or zero on error. - */ -static size_t _stats_group_tag_fill(const struct dm_stats *dms, - dm_bitset_t regions, - char *buf, size_t buflen) -{ - int i, j, r, next, last = 0; - size_t used = 0; - - last = dm_bit_get_last(regions); - - i = dm_bit_get_first(regions); - for(; i >= 0; i = dm_bit_get_next(regions, i)) { - /* find range end */ - j = i; - do - next = j + 1; - while ((j = dm_bit_get_next(regions, j)) == next); - - /* set to last set bit */ - j = next - 1; - - /* handle range vs. single region */ - if (i != j) - r = dm_snprintf(buf, buflen, FMTu64 "-" FMTu64 "%s", - (uint64_t) i, (uint64_t) j, - (j == last) ? "" : ","); - else - r = dm_snprintf(buf, buflen, FMTu64 "%s", (uint64_t) i, - (i == last) ? "" : ","); - if (r < 0) - goto_bad; - - i = next; /* skip handled bits if in range */ - - buf += r; - used += r; - } - - return used; -bad: - log_error("Could not format group list."); - return 0; -} - -/* - * Calculate the space required to hold a string description of the group - * described by the regions bitset using comma separated list in range - * notation ("A,B,C,M-N"). - */ -static size_t _stats_group_tag_len(const struct dm_stats *dms, - dm_bitset_t regions) -{ - int64_t i, j, next, nr_regions = 0; - size_t buflen = 0, id_len = 0; - - /* check region ids and find last set bit */ - i = dm_bit_get_first(regions); - for (; i >= 0; i = dm_bit_get_next(regions, i)) { - /* length of region_id or range start in characters */ - id_len = (i) ? 1 + (size_t) log10(i) : 1; - buflen += id_len; - j = i; - do - next = j + 1; - while ((j = dm_bit_get_next(regions, j)) == next); - - /* set to last set bit */ - j = next - 1; - - nr_regions += j - i + 1; - - /* handle range */ - if (i != j) { - /* j is always > i, which is always >= 0 */ - id_len = 1 + (size_t) log10(j); - buflen += id_len + 1; /* range end plus "-" */ - } - buflen++; - i = next; /* skip bits if handling range */ - } - return buflen; -} - -/* - * Build a DMS_GROUP="..." tag for the group specified by group_id, - * to be stored in the corresponding region's aux_data field. - */ -static char *_build_group_tag(struct dm_stats *dms, uint64_t group_id) -{ - char *aux_string, *buf; - dm_bitset_t regions; - const char *alias; - size_t buflen = 0; - int r; - - regions = dms->groups[group_id].regions; - alias = dms->groups[group_id].alias; - - buflen = _stats_group_tag_len(dms, regions); - - if (!buflen) - return_0; - - buflen += DMS_GROUP_TAG_LEN; - buflen += 1 + (alias ? strlen(alias) : 0); /* 'alias:' */ - - buf = aux_string = malloc(buflen); - if (!buf) { - log_error("Could not allocate memory for aux_data string."); - return NULL; - } - - if (!dm_strncpy(buf, DMS_GROUP_TAG, DMS_GROUP_TAG_LEN + 1)) - goto_bad; - - buf += DMS_GROUP_TAG_LEN; - buflen -= DMS_GROUP_TAG_LEN; - - r = dm_snprintf(buf, buflen, "%s%c", alias ? alias : "", DMS_GROUP_SEP); - if (r < 0) - goto_bad; - - buf += r; - buflen -= r; - - r = _stats_group_tag_fill(dms, regions, buf, buflen); - if (!r) - goto_bad; - - return aux_string; -bad: - log_error("Could not format group aux_data."); - free(aux_string); - return NULL; -} - -/* - * Store updated aux_data for a region. The aux_data is passed to the - * kernel using the @stats_set_aux message. Any required group tag is - * generated from the current group table and included in the message. - */ -static int _stats_set_aux(struct dm_stats *dms, - uint64_t region_id, const char *aux_data) -{ - const char *group_tag = NULL; - struct dm_task *dmt = NULL; - char msg[STATS_MSG_BUF_LEN]; - - /* group data required? */ - if (_stats_group_id_present(dms, region_id)) { - group_tag = _build_group_tag(dms, region_id); - if (!group_tag) { - log_error("Could not build group descriptor for " - "region ID " FMTu64, region_id); - goto bad; - } - } - - if (dm_snprintf(msg, sizeof(msg), "@stats_set_aux " FMTu64 " %s%s%s ", - region_id, (group_tag) ? group_tag : "", - (group_tag) ? DMS_AUX_SEP : "", - (strlen(aux_data)) ? aux_data : "-") < 0) { - log_error("Could not prepare @stats_set_aux message"); - goto bad; - } - - if (!(dmt = _stats_send_message(dms, msg))) - goto_bad; - - free((char *) group_tag); - - /* no response to a @stats_set_aux message */ - dm_task_destroy(dmt); - - return 1; -bad: - free((char *) group_tag); - return 0; -} - -/* - * Maximum length of a "start+end" range string: - * Two 20 digit uint64_t, '+', and NULL. - */ -#define RANGE_LEN 42 -static int _stats_create_region(struct dm_stats *dms, uint64_t *region_id, - uint64_t start, uint64_t len, int64_t step, - int precise, const char *hist_arg, - const char *program_id, const char *aux_data) -{ - char msg[STATS_MSG_BUF_LEN], range[RANGE_LEN], *endptr = NULL; - const char *err_fmt = "Could not prepare @stats_create %s."; - const char *precise_str = PRECISE_ARG; - const char *resp, *opt_args = NULL; - struct dm_task *dmt = NULL; - int r = 0, nr_opt = 0; - - if (!_stats_bound(dms)) - return_0; - - if (!program_id || !strlen(program_id)) - program_id = dms->program_id; - - if (start || len) { - if (dm_snprintf(range, sizeof(range), FMTu64 "+" FMTu64, - start, len) < 0) { - log_error(err_fmt, "range"); - return 0; - } - } - - if (precise < 0) - precise = dms->precise; - - if (precise) - nr_opt++; - else - precise_str = ""; - - if (hist_arg) - nr_opt++; - else - hist_arg = ""; - - if (nr_opt) { - if ((dm_asprintf((char **)&opt_args, "%d %s %s%s", nr_opt, - precise_str, - (strlen(hist_arg)) ? HISTOGRAM_ARG : "", - hist_arg)) < 0) { - log_error(err_fmt, PRECISE_ARG " option."); - return 0; - } - } else - opt_args = strdup(""); - - if (dm_snprintf(msg, sizeof(msg), "@stats_create %s %s" FMTu64 - " %s %s %s", (start || len) ? range : "-", - (step < 0) ? "/" : "", - (uint64_t)llabs(step), - opt_args, program_id, aux_data) < 0) { - log_error(err_fmt, "message"); - free((void *) opt_args); - return 0; - } - - if (!(dmt = _stats_send_message(dms, msg))) - goto_out; - - resp = dm_task_get_message_response(dmt); - if (!resp) { - log_error("Could not parse empty @stats_create response."); - goto out; - } - - if (region_id) { - errno = 0; - *region_id = strtoull(resp, &endptr, 10); - if (errno || resp == endptr) - goto_out; - } - - r = 1; - -out: - if (dmt) - dm_task_destroy(dmt); - free((void *) opt_args); - - return r; -} - -int dm_stats_create_region(struct dm_stats *dms, uint64_t *region_id, - uint64_t start, uint64_t len, int64_t step, - int precise, struct dm_histogram *bounds, - const char *program_id, const char *user_data) -{ - char *hist_arg = NULL; - int r = 0; - - /* Nanosecond counters and histograms both need precise_timestamps. */ - if ((precise || bounds) && !_stats_check_precise_timestamps(dms)) - return_0; - - if (bounds) { - /* _build_histogram_arg enables precise if vals < 1ms. */ - if (!(hist_arg = _build_histogram_arg(bounds, &precise))) - goto_out; - } - - r = _stats_create_region(dms, region_id, start, len, step, - precise, hist_arg, program_id, user_data); - free(hist_arg); - -out: - return r; -} - -static void _stats_clear_group_regions(struct dm_stats *dms, uint64_t group_id) -{ - struct dm_stats_group *group; - uint64_t i; - - group = &dms->groups[group_id]; - for (i = dm_bit_get_first(group->regions); - i != DM_STATS_GROUP_NOT_PRESENT; - i = dm_bit_get_next(group->regions, i)) - dms->regions[i].group_id = DM_STATS_GROUP_NOT_PRESENT; -} - -static int _stats_remove_region_id_from_group(struct dm_stats *dms, - uint64_t region_id) -{ - struct dm_stats_region *region = &dms->regions[region_id]; - uint64_t group_id = region->group_id; - dm_bitset_t regions = dms->groups[group_id].regions; - - if (!_stats_region_is_grouped(dms, region_id)) - return_0; - - dm_bit_clear(regions, region_id); - - /* removing group leader? */ - if (region_id == group_id) { - _stats_clear_group_regions(dms, group_id); - _stats_group_destroy(&dms->groups[group_id]); - } - - return _stats_set_aux(dms, group_id, dms->regions[group_id].aux_data); -} - -static int _stats_delete_region(struct dm_stats *dms, uint64_t region_id) -{ - char msg[STATS_MSG_BUF_LEN]; - struct dm_task *dmt; - - if (_stats_region_is_grouped(dms, region_id)) - if (!_stats_remove_region_id_from_group(dms, region_id)) { - log_error("Could not remove region ID " FMTu64 " from " - "group ID " FMTu64, - region_id, dms->regions[region_id].group_id); - return 0; - } - - if (dm_snprintf(msg, sizeof(msg), "@stats_delete " FMTu64, region_id) < 0) { - log_error("Could not prepare @stats_delete message."); - return 0; - } - - dmt = _stats_send_message(dms, msg); - if (!dmt) - return_0; - dm_task_destroy(dmt); - - return 1; -} - -int dm_stats_delete_region(struct dm_stats *dms, uint64_t region_id) -{ - int listed = 0; - - if (!_stats_bound(dms)) - return_0; - - /* - * To correctly delete a region, that may be part of a group, a - * listed handle is required, since the region may need to be - * removed from another region's group descriptor; earlier - * versions of the region deletion interface do not have this - * requirement since there are no dependencies between regions. - * - * Listing a previously unlisted handle has numerous - * side-effects on other calls and operations (e.g. stats - * walks), especially when returning to a function that depends - * on the state of the region table, or statistics cursor. - * - * To avoid changing the semantics of the API, and the need for - * a versioned symbol, maintain a flag indicating when a listing - * has been carried out, and drop the region table before - * returning. - * - * This ensures compatibility with programs compiled against - * earlier versions of libdm. - */ - if (!dms->regions && !(listed = dm_stats_list(dms, dms->program_id))) { - log_error("Could not obtain region list while deleting " - "region ID " FMTu64, region_id); - goto bad; - } - - if (!dm_stats_get_nr_regions(dms)) { - log_error("Could not delete region ID " FMTu64 ": " - "no regions found", region_id); - goto bad; - } - - /* includes invalid and special region_id values */ - if (!dm_stats_region_present(dms, region_id)) { - log_error("Region ID " FMTu64 " does not exist", region_id); - goto bad; - } - - if (!_stats_delete_region(dms, region_id)) - goto bad; - - if (!listed) - /* wipe region and mark as not present */ - _stats_region_destroy(&dms->regions[region_id]); - else - /* return handle to prior state */ - _stats_regions_destroy(dms); - - return 1; -bad: - if (listed) - _stats_regions_destroy(dms); - - return 0; -} - -int dm_stats_clear_region(struct dm_stats *dms, uint64_t region_id) -{ - char msg[STATS_MSG_BUF_LEN]; - struct dm_task *dmt; - - if (!_stats_bound(dms)) - return_0; - - if (dm_snprintf(msg, sizeof(msg), "@stats_clear " FMTu64, region_id) < 0) { - log_error("Could not prepare @stats_clear message."); - return 0; - } - - dmt = _stats_send_message(dms, msg); - - if (!dmt) - return_0; - - dm_task_destroy(dmt); - - return 1; -} - -static struct dm_task *_stats_print_region(struct dm_stats *dms, - uint64_t region_id, unsigned start_line, - unsigned num_lines, unsigned clear) -{ - /* @stats_print[_clear] <region_id> [<start_line> <num_lines>] */ - const char *err_fmt = "Could not prepare @stats_print %s."; - char msg[STATS_MSG_BUF_LEN], lines[RANGE_LEN]; - struct dm_task *dmt = NULL; - - if (start_line || num_lines) - if (dm_snprintf(lines, sizeof(lines), - "%u %u", start_line, num_lines) < 0) { - log_error(err_fmt, "row specification"); - return NULL; - } - - if (dm_snprintf(msg, sizeof(msg), "@stats_print%s " FMTu64 " %s", - (clear) ? "_clear" : "", - region_id, (start_line || num_lines) ? lines : "") < 0) { - log_error(err_fmt, "message"); - return NULL; - } - - if (!(dmt = _stats_send_message(dms, msg))) - return_NULL; - - return dmt; -} - -char *dm_stats_print_region(struct dm_stats *dms, uint64_t region_id, - unsigned start_line, unsigned num_lines, - unsigned clear) -{ - char *resp = NULL; - struct dm_task *dmt = NULL; - const char *response; - - if (!_stats_bound(dms)) - return_0; - - /* - * FIXME: 'print' can be emulated for groups or aggregate regions - * by populating the handle and emitting aggregate counter data - * in the kernel print format. - */ - if (region_id == DM_STATS_WALK_GROUP) - return_0; - - dmt = _stats_print_region(dms, region_id, - start_line, num_lines, clear); - - if (!dmt) - return_0; - - if (!(response = dm_task_get_message_response(dmt))) - goto_out; - - if (!(resp = dm_pool_strdup(dms->mem, response))) - log_error("Could not allocate memory for response buffer."); -out: - dm_task_destroy(dmt); - - return resp; -} - -void dm_stats_buffer_destroy(struct dm_stats *dms, char *buffer) -{ - dm_pool_free(dms->mem, buffer); -} - -uint64_t dm_stats_get_nr_regions(const struct dm_stats *dms) -{ - if (!dms) - return_0; - - if (!dms->regions) - return 0; - - return dms->nr_regions; -} - -uint64_t dm_stats_get_nr_groups(const struct dm_stats *dms) -{ - uint64_t group_id, nr_groups = 0; - - if (!dms) - return_0; - - /* no regions or groups? */ - if (!dms->regions || !dms->groups) - return 0; - - for (group_id = 0; group_id <= dms->max_region; group_id++) - if (dms->groups[group_id].group_id - != DM_STATS_GROUP_NOT_PRESENT) - nr_groups++; - - return nr_groups; -} - -/** - * Test whether region_id is present in this set of stats data. - */ -int dm_stats_region_present(const struct dm_stats *dms, uint64_t region_id) -{ - if (!dms->regions) - return_0; - - if (region_id > dms->max_region) - return 0; - - return _stats_region_present(&dms->regions[region_id]); -} - -static int _dm_stats_populate_region(struct dm_stats *dms, uint64_t region_id, - const char *resp) -{ - struct dm_stats_region *region = &dms->regions[region_id]; - - if (!_stats_bound(dms)) - return_0; - - if (!region) { - log_error("Cannot populate empty handle before dm_stats_list()."); - return 0; - } - if (!_stats_parse_region(dms, resp, region, region->timescale)) { - log_error("Could not parse @stats_print message response."); - return 0; - } - region->region_id = region_id; - return 1; -} - -int dm_stats_populate(struct dm_stats *dms, const char *program_id, - uint64_t region_id) -{ - int all_regions = (region_id == DM_STATS_REGIONS_ALL); - struct dm_task *dmt = NULL; /* @stats_print task */ - uint64_t saved_flags; /* saved walk flags */ - const char *resp; - - /* - * We are about do destroy and re-create the region table, so it - * is safe to use the cursor embedded in the stats handle: just - * save a copy of the current walk_flags to restore later. - */ - saved_flags = dms->walk_flags; - - if (!_stats_bound(dms)) - return_0; - - if ((!all_regions) && (region_id & DM_STATS_WALK_GROUP)) { - log_error("Invalid region_id for dm_stats_populate: " - "DM_STATS_WALK_GROUP"); - return 0; - } - - if (!dms->nr_regions) { - log_error("No regions registered."); - return 0; - } - - /* allow zero-length program_id for populate */ - if (!program_id) - program_id = dms->program_id; - - if (all_regions && !dm_stats_list(dms, program_id)) { - log_error("Could not parse @stats_list response."); - goto bad; - } else if (!_stats_set_name_cache(dms)) { - goto_bad; - } - - dms->walk_flags = DM_STATS_WALK_REGION; - dm_stats_walk_start(dms); - do { - region_id = (all_regions) - ? dm_stats_get_current_region(dms) : region_id; - - /* obtain all lines and clear counter values */ - if (!(dmt = _stats_print_region(dms, region_id, 0, 0, 1))) - goto_bad; - - resp = dm_task_get_message_response(dmt); - if (!_dm_stats_populate_region(dms, region_id, resp)) { - dm_task_destroy(dmt); - goto_bad; - } - - dm_task_destroy(dmt); - dm_stats_walk_next(dms); - - } while (all_regions && !dm_stats_walk_end(dms)); - - dms->walk_flags = saved_flags; - return 1; - -bad: - dms->walk_flags = saved_flags; - _stats_regions_destroy(dms); - dms->regions = NULL; - return 0; -} - -/** - * destroy a dm_stats object and all associated regions and counter sets. - */ -void dm_stats_destroy(struct dm_stats *dms) -{ - if (!dms) - return; - - _stats_regions_destroy(dms); - _stats_groups_destroy(dms); - _stats_clear_binding(dms); - dm_pool_destroy(dms->mem); - dm_pool_destroy(dms->hist_mem); - dm_pool_destroy(dms->group_mem); - free(dms->program_id); - free((char *) dms->name); - free(dms); -} - -/* - * Walk each area that is a member of region_id rid. - * i is a variable of type int that holds the current area_id. - */ -#define _foreach_region_area(dms, rid, i) \ -for ((i) = 0; (i) < _nr_areas_region(&dms->regions[(rid)]); (i)++) \ - -/* - * Walk each region that is a member of group_id gid. - * i is a variable of type int that holds the current region_id. - */ -#define _foreach_group_region(dms, gid, i) \ -for ((i) = dm_bit_get_first((dms)->groups[(gid)].regions); \ - (i) != DM_STATS_GROUP_NOT_PRESENT; \ - (i) = dm_bit_get_next((dms)->groups[(gid)].regions, (i))) \ - -/* - * Walk each region that is a member of group_id gid visiting each - * area within the region. - * i is a variable of type int that holds the current region_id. - * j is a variable of type int variable that holds the current area_id. - */ -#define _foreach_group_area(dms, gid, i, j) \ -_foreach_group_region(dms, gid, i) \ - _foreach_region_area(dms, i, j) - -static uint64_t _stats_get_counter(const struct dm_stats *dms, - const struct dm_stats_counters *area, - dm_stats_counter_t counter) -{ - switch(counter) { - case DM_STATS_READS_COUNT: - return area->reads; - case DM_STATS_READS_MERGED_COUNT: - return area->reads_merged; - case DM_STATS_READ_SECTORS_COUNT: - return area->read_sectors; - case DM_STATS_READ_NSECS: - return area->read_nsecs; - case DM_STATS_WRITES_COUNT: - return area->writes; - case DM_STATS_WRITES_MERGED_COUNT: - return area->writes_merged; - case DM_STATS_WRITE_SECTORS_COUNT: - return area->write_sectors; - case DM_STATS_WRITE_NSECS: - return area->write_nsecs; - case DM_STATS_IO_IN_PROGRESS_COUNT: - return area->io_in_progress; - case DM_STATS_IO_NSECS: - return area->io_nsecs; - case DM_STATS_WEIGHTED_IO_NSECS: - return area->weighted_io_nsecs; - case DM_STATS_TOTAL_READ_NSECS: - return area->total_read_nsecs; - case DM_STATS_TOTAL_WRITE_NSECS: - return area->total_write_nsecs; - case DM_STATS_NR_COUNTERS: - default: - log_error("Attempt to read invalid counter: %d", counter); - } - return 0; -} - -uint64_t dm_stats_get_counter(const struct dm_stats *dms, - dm_stats_counter_t counter, - uint64_t region_id, uint64_t area_id) -{ - uint64_t i, j, sum = 0; /* aggregation */ - int sum_regions = 0; - struct dm_stats_region *region; - struct dm_stats_counters *area; - - region_id = (region_id == DM_STATS_REGION_CURRENT) - ? dms->cur_region : region_id ; - area_id = (area_id == DM_STATS_REGION_CURRENT) - ? dms->cur_area : area_id ; - - sum_regions = !!(region_id & DM_STATS_WALK_GROUP); - - if (region_id == DM_STATS_WALK_GROUP) - /* group walk using the cursor */ - region_id = dms->cur_group; - else if (region_id & DM_STATS_WALK_GROUP) - /* group walk using immediate group_id */ - region_id &= ~DM_STATS_WALK_GROUP; - region = &dms->regions[region_id]; - - /* - * All statistics aggregation takes place here: aggregate metrics - * are calculated as normal using the aggregated counter values - * returned for the region or group specified. - */ - - if (_stats_region_is_grouped(dms, region_id) && (sum_regions)) { - /* group */ - if (area_id & DM_STATS_WALK_GROUP) - _foreach_group_area(dms, region->group_id, i, j) { - area = &dms->regions[i].counters[j]; - sum += _stats_get_counter(dms, area, counter); - } - else - _foreach_group_region(dms, region->group_id, i) { - area = &dms->regions[i].counters[area_id]; - sum += _stats_get_counter(dms, area, counter); - } - } else if (area_id == DM_STATS_WALK_REGION) { - /* aggregate region */ - _foreach_region_area(dms, region_id, j) { - area = &dms->regions[region_id].counters[j]; - sum += _stats_get_counter(dms, area, counter); - } - } else { - /* plain region / area */ - area = &region->counters[area_id]; - sum = _stats_get_counter(dms, area, counter); - } - - return sum; -} - -/* - * Methods for accessing named counter fields. All methods share the - * following naming scheme and prototype: - * - * uint64_t dm_stats_get_COUNTER(const struct dm_stats *, uint64_t, uint64_t) - * - * Where the two integer arguments are the region_id and area_id - * respectively. - * - * name is the name of the counter (lower case) - * counter is the part of the enum name following DM_STATS_ (upper case) - */ -#define MK_STATS_GET_COUNTER_FN(name, counter) \ -uint64_t dm_stats_get_ ## name(const struct dm_stats *dms, \ - uint64_t region_id, uint64_t area_id) \ -{ \ - return dm_stats_get_counter(dms, DM_STATS_ ## counter, \ - region_id, area_id); \ -} - -MK_STATS_GET_COUNTER_FN(reads, READS_COUNT) -MK_STATS_GET_COUNTER_FN(reads_merged, READS_MERGED_COUNT) -MK_STATS_GET_COUNTER_FN(read_sectors, READ_SECTORS_COUNT) -MK_STATS_GET_COUNTER_FN(read_nsecs, READ_NSECS) -MK_STATS_GET_COUNTER_FN(writes, WRITES_COUNT) -MK_STATS_GET_COUNTER_FN(writes_merged, WRITES_MERGED_COUNT) -MK_STATS_GET_COUNTER_FN(write_sectors, WRITE_SECTORS_COUNT) -MK_STATS_GET_COUNTER_FN(write_nsecs, WRITE_NSECS) -MK_STATS_GET_COUNTER_FN(io_in_progress, IO_IN_PROGRESS_COUNT) -MK_STATS_GET_COUNTER_FN(io_nsecs, IO_NSECS) -MK_STATS_GET_COUNTER_FN(weighted_io_nsecs, WEIGHTED_IO_NSECS) -MK_STATS_GET_COUNTER_FN(total_read_nsecs, TOTAL_READ_NSECS) -MK_STATS_GET_COUNTER_FN(total_write_nsecs, TOTAL_WRITE_NSECS) -#undef MK_STATS_GET_COUNTER_FN - -/* - * Floating point stats metric functions - * - * Called from dm_stats_get_metric() to calculate the value of - * the requested metric. - * - * int _metric_name(const struct dm_stats *dms, - * struct dm_stats_counters *c, - * double *value); - * - * Calculate a metric value from the counter data for the given - * identifiers and store it in the memory pointed to by value, - * applying group or region aggregation if enabled. - * - * Return one on success or zero on failure. - * - * To add a new metric: - * - * o Add a new name to the dm_stats_metric_t enum. - * o Create a _metric_fn() to calculate the new metric. - * o Add _metric_fn to the _metrics function table - * (entries in enum order). - * o Do not add a new named public function for the metric - - * users of new metrics are encouraged to convert to the enum - * based metric interface. - * - */ - -static int _rd_merges_per_sec(const struct dm_stats *dms, double *rrqm, - uint64_t region_id, uint64_t area_id) -{ - double mrgs; - mrgs = (double) dm_stats_get_counter(dms, DM_STATS_READS_MERGED_COUNT, - region_id, area_id); - - *rrqm = mrgs / (double) dms->interval_ns; - - return 1; -} - -static int _wr_merges_per_sec(const struct dm_stats *dms, double *wrqm, - uint64_t region_id, uint64_t area_id) -{ - double mrgs; - mrgs = (double) dm_stats_get_counter(dms, DM_STATS_WRITES_MERGED_COUNT, - region_id, area_id); - - *wrqm = mrgs / (double) dms->interval_ns; - - return 1; -} - -static int _reads_per_sec(const struct dm_stats *dms, double *rd_s, - uint64_t region_id, uint64_t area_id) -{ - double reads; - reads = (double) dm_stats_get_counter(dms, DM_STATS_READS_COUNT, - region_id, area_id); - - *rd_s = (reads * NSEC_PER_SEC) / (double) dms->interval_ns; - - return 1; -} - -static int _writes_per_sec(const struct dm_stats *dms, double *wr_s, - uint64_t region_id, uint64_t area_id) -{ - double writes; - writes = (double) dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, - region_id, area_id); - - *wr_s = (writes * NSEC_PER_SEC) / (double) dms->interval_ns; - - return 1; -} - -static int _read_sectors_per_sec(const struct dm_stats *dms, double *rsec_s, - uint64_t region_id, uint64_t area_id) -{ - double sect; - sect = (double) dm_stats_get_counter(dms, DM_STATS_READ_SECTORS_COUNT, - region_id, area_id); - - *rsec_s = (sect * (double) NSEC_PER_SEC) / (double) dms->interval_ns; - - return 1; -} - -static int _write_sectors_per_sec(const struct dm_stats *dms, double *wsec_s, - uint64_t region_id, uint64_t area_id) -{ - double sect; - sect = (double) dm_stats_get_counter(dms, DM_STATS_WRITE_SECTORS_COUNT, - region_id, area_id); - - *wsec_s = (sect * (double) NSEC_PER_SEC) / (double) dms->interval_ns; - - return 1; -} - -static int _average_request_size(const struct dm_stats *dms, double *arqsz, - uint64_t region_id, uint64_t area_id) -{ - double ios, sectors; - - ios = (double) (dm_stats_get_counter(dms, DM_STATS_READS_COUNT, - region_id, area_id) - + dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, - region_id, area_id)); - sectors = (double) (dm_stats_get_counter(dms, DM_STATS_READ_SECTORS_COUNT, - region_id, area_id) - + dm_stats_get_counter(dms, DM_STATS_WRITE_SECTORS_COUNT, - region_id, area_id)); - - if (ios > 0.0) - *arqsz = sectors / ios; - else - *arqsz = 0.0; - - return 1; -} - -static int _average_queue_size(const struct dm_stats *dms, double *qusz, - uint64_t region_id, uint64_t area_id) -{ - double io_ticks; - io_ticks = (double) dm_stats_get_counter(dms, DM_STATS_WEIGHTED_IO_NSECS, - region_id, area_id); - - if (io_ticks > 0.0) - *qusz = io_ticks / (double) dms->interval_ns; - else - *qusz = 0.0; - - return 1; -} - -static int _average_wait_time(const struct dm_stats *dms, double *await, - uint64_t region_id, uint64_t area_id) -{ - uint64_t io_ticks, nr_ios; - - io_ticks = dm_stats_get_counter(dms, DM_STATS_READ_NSECS, - region_id, area_id); - io_ticks += dm_stats_get_counter(dms, DM_STATS_WRITE_NSECS, - region_id, area_id); - - nr_ios = dm_stats_get_counter(dms, DM_STATS_READS_COUNT, - region_id, area_id); - nr_ios += dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, - region_id, area_id); - - if (nr_ios > 0) - *await = (double) io_ticks / (double) nr_ios; - else - *await = 0.0; - - return 1; -} - -static int _average_rd_wait_time(const struct dm_stats *dms, double *await, - uint64_t region_id, uint64_t area_id) -{ - uint64_t rd_io_ticks, nr_rd_ios; - - rd_io_ticks = dm_stats_get_counter(dms, DM_STATS_READ_NSECS, - region_id, area_id); - nr_rd_ios = dm_stats_get_counter(dms, DM_STATS_READS_COUNT, - region_id, area_id); - - /* - * If rd_io_ticks is > 0 this should imply that nr_rd_ios is - * also > 0 (unless a kernel bug exists). Test for both here - * before using the IO count as a divisor (Coverity). - */ - if (rd_io_ticks > 0 && nr_rd_ios > 0) - *await = (double) rd_io_ticks / (double) nr_rd_ios; - else - *await = 0.0; - - return 1; -} - -static int _average_wr_wait_time(const struct dm_stats *dms, double *await, - uint64_t region_id, uint64_t area_id) -{ - uint64_t wr_io_ticks, nr_wr_ios; - - wr_io_ticks = dm_stats_get_counter(dms, DM_STATS_WRITE_NSECS, - region_id, area_id); - nr_wr_ios = dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, - region_id, area_id); - - /* - * If wr_io_ticks is > 0 this should imply that nr_wr_ios is - * also > 0 (unless a kernel bug exists). Test for both here - * before using the IO count as a divisor (Coverity). - */ - if (wr_io_ticks > 0 && nr_wr_ios > 0) - *await = (double) wr_io_ticks / (double) nr_wr_ios; - else - *await = 0.0; - - return 1; -} - -static int _throughput(const struct dm_stats *dms, double *tput, - uint64_t region_id, uint64_t area_id) -{ - uint64_t nr_ios; - - nr_ios = dm_stats_get_counter(dms, DM_STATS_READS_COUNT, - region_id, area_id); - nr_ios += dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, - region_id, area_id); - - *tput = ((double) NSEC_PER_SEC * (double) nr_ios) - / (double) (dms->interval_ns); - - return 1; -} - -static int _utilization(const struct dm_stats *dms, double *util, - uint64_t region_id, uint64_t area_id) -{ - uint64_t io_nsecs, interval_ns = dms->interval_ns; - - /** - * If io_nsec > interval_ns there is something wrong with the clock - * for the last interval; do not allow a value > 100% utilization - * to be passed to a dm_make_percent() call. We expect to see these - * at startup if counters have not been cleared before the first read. - * - * A zero interval_ns is also an error since metrics cannot be - * calculated without a defined interval - return zero and emit a - * backtrace in this case. - */ - io_nsecs = dm_stats_get_counter(dms, DM_STATS_IO_NSECS, - region_id, area_id); - - if (!interval_ns) { - *util = 0.0; - return_0; - } - - io_nsecs = ((io_nsecs < interval_ns) ? io_nsecs : interval_ns); - - *util = (double) io_nsecs / (double) interval_ns; - - return 1; -} - -static int _service_time(const struct dm_stats *dms, double *svctm, - uint64_t region_id, uint64_t area_id) -{ - double tput, util; - - if (!_throughput(dms, &tput, region_id, area_id)) - return 0; - - if (!_utilization(dms, &util, region_id, area_id)) - return 0; - - util *= 100; - - /* avoid NAN with zero counter values */ - if ( (uint64_t) tput == 0 || (uint64_t) util == 0) { - *svctm = 0.0; - return 1; - } - - *svctm = ((double) NSEC_PER_SEC * dm_percent_to_float(util)) - / (100.0 * tput); - - return 1; -} - -/* - * Table in enum order: - * DM_STATS_RD_MERGES_PER_SEC, - * DM_STATS_WR_MERGES_PER_SEC, - * DM_STATS_READS_PER_SEC, - * DM_STATS_WRITES_PER_SEC, - * DM_STATS_READ_SECTORS_PER_SEC, - * DM_STATS_WRITE_SECTORS_PER_SEC, - * DM_STATS_AVERAGE_REQUEST_SIZE, - * DM_STATS_AVERAGE_QUEUE_SIZE, - * DM_STATS_AVERAGE_WAIT_TIME, - * DM_STATS_AVERAGE_RD_WAIT_TIME, - * DM_STATS_AVERAGE_WR_WAIT_TIME - * DM_STATS_SERVICE_TIME, - * DM_STATS_THROUGHPUT, - * DM_STATS_UTILIZATION - * -*/ - -typedef int (*_metric_fn_t)(const struct dm_stats *, double *, - uint64_t, uint64_t); - -_metric_fn_t _metrics[DM_STATS_NR_METRICS] = { - _rd_merges_per_sec, - _wr_merges_per_sec, - _reads_per_sec, - _writes_per_sec, - _read_sectors_per_sec, - _write_sectors_per_sec, - _average_request_size, - _average_queue_size, - _average_wait_time, - _average_rd_wait_time, - _average_wr_wait_time, - _service_time, - _throughput, - _utilization -}; - -int dm_stats_get_metric(const struct dm_stats *dms, int metric, - uint64_t region_id, uint64_t area_id, double *value) -{ - if (!dms->interval_ns) - return_0; - - /* - * Decode DM_STATS_{REGION,AREA}_CURRENT here; counters will then - * be returned for the actual current region and area. - * - * DM_STATS_WALK_GROUP is passed through to the counter methods - - * aggregates for the group are returned and used to calculate - * the metric for the group totals. - */ - region_id = (region_id == DM_STATS_REGION_CURRENT) - ? dms->cur_region : region_id ; - area_id = (area_id == DM_STATS_REGION_CURRENT) - ? dms->cur_area : area_id ; - - if (metric < 0 || metric >= DM_STATS_NR_METRICS) { - log_error("Attempt to read invalid metric: %d", metric); - return 0; - } - - return _metrics[metric](dms, value, region_id, area_id); -} - -/** - * Methods for accessing stats metrics. All methods share the - * following naming scheme and prototype: - * - * uint64_t dm_stats_get_metric(struct dm_stats *, - * int, int, - * uint64_t, uint64_t, - * double *v) - * - * Where the two integer arguments are the region_id and area_id - * respectively. - * - * name is the name of the metric (lower case) - * metric is the part of the enum name following DM_STATS_ (upper case) - */ -#define MK_STATS_GET_METRIC_FN(name, metric, meta) \ -int dm_stats_get_ ## name(const struct dm_stats *dms, double *meta, \ - uint64_t region_id, uint64_t area_id) \ -{ \ - return dm_stats_get_metric(dms, DM_STATS_ ## metric, \ - region_id, area_id, meta); \ -} - -MK_STATS_GET_METRIC_FN(rd_merges_per_sec, RD_MERGES_PER_SEC, rrqm) -MK_STATS_GET_METRIC_FN(wr_merges_per_sec, WR_MERGES_PER_SEC, wrqm) -MK_STATS_GET_METRIC_FN(reads_per_sec, READS_PER_SEC, rd_s) -MK_STATS_GET_METRIC_FN(writes_per_sec, WRITES_PER_SEC, wr_s) -MK_STATS_GET_METRIC_FN(read_sectors_per_sec, READ_SECTORS_PER_SEC, rsec_s) -MK_STATS_GET_METRIC_FN(write_sectors_per_sec, WRITE_SECTORS_PER_SEC, wsec_s) -MK_STATS_GET_METRIC_FN(average_request_size, AVERAGE_REQUEST_SIZE, arqsz) -MK_STATS_GET_METRIC_FN(average_queue_size, AVERAGE_QUEUE_SIZE, qusz) -MK_STATS_GET_METRIC_FN(average_wait_time, AVERAGE_WAIT_TIME, await) -MK_STATS_GET_METRIC_FN(average_rd_wait_time, AVERAGE_RD_WAIT_TIME, await) -MK_STATS_GET_METRIC_FN(average_wr_wait_time, AVERAGE_WR_WAIT_TIME, await) -MK_STATS_GET_METRIC_FN(service_time, SERVICE_TIME, svctm) -MK_STATS_GET_METRIC_FN(throughput, THROUGHPUT, tput) - -/* - * Utilization is an exception since it used the dm_percent_t type in the - * original named function based interface: preserve this behaviour for - * backwards compatibility with existing users. - * - * The same metric may be accessed as a double via the enum based metric - * interface. - */ -int dm_stats_get_utilization(const struct dm_stats *dms, dm_percent_t *util, - uint64_t region_id, uint64_t area_id) -{ - double _util; - - if (!dm_stats_get_metric(dms, DM_STATS_UTILIZATION, - region_id, area_id, &_util)) - return_0; - /* scale up utilization value in the range [0.00..1.00] */ - *util = dm_make_percent(DM_PERCENT_1 * _util, DM_PERCENT_1); - return 1; -} - -void dm_stats_set_sampling_interval_ms(struct dm_stats *dms, uint64_t interval_ms) -{ - /* All times use nsecs internally. */ - dms->interval_ns = interval_ms * NSEC_PER_MSEC; -} - -void dm_stats_set_sampling_interval_ns(struct dm_stats *dms, uint64_t interval_ns) -{ - dms->interval_ns = interval_ns; -} - -uint64_t dm_stats_get_sampling_interval_ms(const struct dm_stats *dms) -{ - /* All times use nsecs internally. */ - return (dms->interval_ns / NSEC_PER_MSEC); -} - -uint64_t dm_stats_get_sampling_interval_ns(const struct dm_stats *dms) -{ - /* All times use nsecs internally. */ - return (dms->interval_ns); -} - -int dm_stats_set_program_id(struct dm_stats *dms, int allow_empty, - const char *program_id) -{ - if (!allow_empty && (!program_id || !strlen(program_id))) { - log_error("Empty program_id not permitted without " - "allow_empty=1"); - return 0; - } - - if (!program_id) - program_id = ""; - - free(dms->program_id); - - if (!(dms->program_id = strdup(program_id))) - return_0; - - return 1; -} - -uint64_t dm_stats_get_current_region(const struct dm_stats *dms) -{ - return dms->cur_region; -} - -uint64_t dm_stats_get_current_area(const struct dm_stats *dms) -{ - return dms->cur_area & ~DM_STATS_WALK_ALL; -} - -int dm_stats_get_region_start(const struct dm_stats *dms, uint64_t *start, - uint64_t region_id) -{ - if (!dms || !dms->regions) - return_0; - - /* start is unchanged when aggregating areas */ - if (region_id & DM_STATS_WALK_REGION) - region_id &= ~DM_STATS_WALK_REGION; - - /* use start of first region as group start */ - if (region_id & DM_STATS_WALK_GROUP) { - if (region_id == DM_STATS_WALK_GROUP) - region_id = dms->cur_group; - else - region_id &= ~DM_STATS_WALK_GROUP; - } - - *start = dms->regions[region_id].start; - return 1; -} - -int dm_stats_get_region_len(const struct dm_stats *dms, uint64_t *len, - uint64_t region_id) -{ - uint64_t i; - if (!dms || !dms->regions) - return_0; - - *len = 0; - - /* length is unchanged when aggregating areas */ - if (region_id & DM_STATS_WALK_REGION) - region_id &= ~DM_STATS_WALK_REGION; - - if (region_id & DM_STATS_WALK_GROUP) { - /* decode region / group ID */ - if (region_id == DM_STATS_WALK_GROUP) - region_id = dms->cur_group; - else - region_id &= ~DM_STATS_WALK_GROUP; - - /* use sum of region sizes as group size */ - if (_stats_region_is_grouped(dms, region_id)) - _foreach_group_region(dms, dms->cur_group, i) - *len += dms->regions[i].len; - else { - log_error("Group ID " FMTu64 " does not exist", - region_id); - return 0; - } - } else - *len = dms->regions[region_id].len; - - return 1; -} - -int dm_stats_get_region_area_len(const struct dm_stats *dms, uint64_t *len, - uint64_t region_id) -{ - if (!dms || !dms->regions) - return_0; - - /* groups are not subdivided - area size equals group size */ - if (region_id & (DM_STATS_WALK_GROUP | DM_STATS_WALK_REGION)) - /* get_region_len will decode region_id */ - return dm_stats_get_region_len(dms, len, region_id); - - *len = dms->regions[region_id].step; - return 1; -} - -int dm_stats_get_current_region_start(const struct dm_stats *dms, - uint64_t *start) -{ - return dm_stats_get_region_start(dms, start, dms->cur_region); -} - -int dm_stats_get_current_region_len(const struct dm_stats *dms, - uint64_t *len) -{ - return dm_stats_get_region_len(dms, len, dms->cur_region); -} - -int dm_stats_get_current_region_area_len(const struct dm_stats *dms, - uint64_t *step) -{ - return dm_stats_get_region_area_len(dms, step, dms->cur_region); -} - -int dm_stats_get_area_start(const struct dm_stats *dms, uint64_t *start, - uint64_t region_id, uint64_t area_id) -{ - struct dm_stats_region *region; - if (!dms || !dms->regions) - return_0; - - /* group or region area start equals region start */ - if (region_id & (DM_STATS_WALK_GROUP | DM_STATS_WALK_REGION)) - return dm_stats_get_region_start(dms, start, region_id); - - region = &dms->regions[region_id]; - *start = region->start + region->step * area_id; - return 1; -} - -int dm_stats_get_area_offset(const struct dm_stats *dms, uint64_t *offset, - uint64_t region_id, uint64_t area_id) -{ - if (!dms || !dms->regions) - return_0; - - /* no areas for groups or aggregate regions */ - if (region_id & (DM_STATS_WALK_GROUP | DM_STATS_WALK_REGION)) - *offset = 0; - else - *offset = dms->regions[region_id].step * area_id; - - return 1; -} - -int dm_stats_get_current_area_start(const struct dm_stats *dms, - uint64_t *start) -{ - return dm_stats_get_area_start(dms, start, - dms->cur_region, dms->cur_area); -} - -int dm_stats_get_current_area_offset(const struct dm_stats *dms, - uint64_t *offset) -{ - return dm_stats_get_area_offset(dms, offset, - dms->cur_region, dms->cur_area); -} - -int dm_stats_get_current_area_len(const struct dm_stats *dms, - uint64_t *len) -{ - return dm_stats_get_region_area_len(dms, len, dms->cur_region); -} - -const char *dm_stats_get_region_program_id(const struct dm_stats *dms, - uint64_t region_id) -{ - const char *program_id = NULL; - - if (region_id & DM_STATS_WALK_GROUP) - return dms->program_id; - - if (region_id & DM_STATS_WALK_REGION) - region_id &= ~DM_STATS_WALK_REGION; - - program_id = dms->regions[region_id].program_id; - return (program_id) ? program_id : ""; -} - -const char *dm_stats_get_region_aux_data(const struct dm_stats *dms, - uint64_t region_id) -{ - const char *aux_data = NULL; - - if (region_id & DM_STATS_WALK_GROUP) - return ""; - - if (region_id & DM_STATS_WALK_REGION) - region_id &= ~DM_STATS_WALK_REGION; - - aux_data = dms->regions[region_id].aux_data; - return (aux_data) ? aux_data : "" ; -} - -int dm_stats_set_alias(struct dm_stats *dms, uint64_t group_id, const char *alias) -{ - struct dm_stats_group *group = NULL; - const char *old_alias = NULL; - - if (!dms->regions || !dms->groups || !alias) - return_0; - - if (!_stats_region_is_grouped(dms, group_id)) { - log_error("Cannot set alias for ungrouped region ID " - FMTu64, group_id); - return 0; - } - - if (group_id & DM_STATS_WALK_GROUP) { - if (group_id == DM_STATS_WALK_GROUP) - group_id = dms->cur_group; - else - group_id &= ~DM_STATS_WALK_GROUP; - } - - if (group_id != dms->regions[group_id].group_id) { - /* dm_stats_set_alias() must be called on the group ID. */ - log_error("Cannot set alias for group member " FMTu64 ".", - group_id); - return 0; - } - - group = &dms->groups[group_id]; - old_alias = group->alias; - - group->alias = strdup(alias); - if (!group->alias) { - log_error("Could not allocate memory for alias."); - goto bad; - } - - if (!_stats_set_aux(dms, group_id, dms->regions[group_id].aux_data)) { - log_error("Could not set new aux_data"); - goto bad; - } - - free((char *) old_alias); - - return 1; - -bad: - free((char *) group->alias); - group->alias = old_alias; - return 0; -} - -const char *dm_stats_get_alias(const struct dm_stats *dms, uint64_t id) -{ - const struct dm_stats_region *region; - - id = (id == DM_STATS_REGION_CURRENT) ? dms->cur_region : id; - - if (id & DM_STATS_WALK_GROUP) { - if (id == DM_STATS_WALK_GROUP) - id = dms->cur_group; - else - id &= ~DM_STATS_WALK_GROUP; - } - - region = &dms->regions[id]; - if (!_stats_region_is_grouped(dms, id) - || !dms->groups[region->group_id].alias) - return dms->name; - - return dms->groups[region->group_id].alias; -} - -const char *dm_stats_get_current_region_program_id(const struct dm_stats *dms) -{ - return dm_stats_get_region_program_id(dms, dms->cur_region); -} - -const char *dm_stats_get_current_region_aux_data(const struct dm_stats *dms) -{ - return dm_stats_get_region_aux_data(dms, dms->cur_region); -} - -int dm_stats_get_region_precise_timestamps(const struct dm_stats *dms, - uint64_t region_id) -{ - struct dm_stats_region *region; - - if (region_id == DM_STATS_REGION_CURRENT) - region_id = dms->cur_region; - - if (region_id == DM_STATS_WALK_GROUP) - region_id = dms->cur_group; - else if (region_id & DM_STATS_WALK_GROUP) - region_id &= ~DM_STATS_WALK_GROUP; - - region = &dms->regions[region_id]; - return region->timescale == 1; -} - -int dm_stats_get_current_region_precise_timestamps(const struct dm_stats *dms) -{ - return dm_stats_get_region_precise_timestamps(dms, - DM_STATS_REGION_CURRENT); -} - -/* - * Histogram access methods. - */ - -static void _sum_histogram_bins(const struct dm_stats *dms, - struct dm_histogram *dmh_aggr, - uint64_t region_id, uint64_t area_id) -{ - struct dm_stats_region *region; - struct dm_histogram_bin *bins; - struct dm_histogram *dmh_cur; - int bin; - - region = &dms->regions[region_id]; - dmh_cur = region->counters[area_id].histogram; - bins = dmh_aggr->bins; - - for (bin = 0; bin < dmh_aggr->nr_bins; bin++) - bins[bin].count += dmh_cur->bins[bin].count; -} - -/* - * Create an aggregate histogram for a sub-divided region or a group. - */ -static struct dm_histogram *_aggregate_histogram(const struct dm_stats *dms, - uint64_t region_id, - uint64_t area_id) -{ - struct dm_histogram *dmh_aggr, *dmh_cur, **dmh_cachep; - uint64_t group_id = DM_STATS_GROUP_NOT_PRESENT; - int bin, nr_bins, group = 1; - size_t hist_size; - - if (area_id == DM_STATS_WALK_REGION) { - /* region aggregation */ - group = 0; - if (!_stats_region_present(&dms->regions[region_id])) - return_NULL; - - if (!dms->regions[region_id].bounds) - return_NULL; - - if (!dms->regions[region_id].counters) - return dms->regions[region_id].bounds; - - if (dms->regions[region_id].histogram) - return dms->regions[region_id].histogram; - - dmh_cur = dms->regions[region_id].counters[0].histogram; - dmh_cachep = &dms->regions[region_id].histogram; - nr_bins = dms->regions[region_id].bounds->nr_bins; - } else { - /* group aggregation */ - group_id = region_id; - area_id = DM_STATS_WALK_GROUP; - if (!_stats_group_id_present(dms, group_id)) - return_NULL; - - if (!dms->regions[group_id].bounds) - return_NULL; - - if (!dms->regions[group_id].counters) - return dms->regions[group_id].bounds; - - if (dms->groups[group_id].histogram) - return dms->groups[group_id].histogram; - - dmh_cur = dms->regions[group_id].counters[0].histogram; - dmh_cachep = &dms->groups[group_id].histogram; - nr_bins = dms->regions[group_id].bounds->nr_bins; - } - - hist_size = sizeof(*dmh_aggr) - + nr_bins * sizeof(struct dm_histogram_bin); - - if (!(dmh_aggr = dm_pool_zalloc(dms->hist_mem, hist_size))) { - log_error("Could not allocate group histogram"); - return 0; - } - - dmh_aggr->nr_bins = dmh_cur->nr_bins; - dmh_aggr->dms = dms; - - if (!group) - _foreach_region_area(dms, region_id, area_id) { - _sum_histogram_bins(dms, dmh_aggr, region_id, area_id); - } - else { - _foreach_group_area(dms, group_id, region_id, area_id) { - _sum_histogram_bins(dms, dmh_aggr, region_id, area_id); - } - } - - for (bin = 0; bin < nr_bins; bin++) { - dmh_aggr->sum += dmh_aggr->bins[bin].count; - dmh_aggr->bins[bin].upper = dmh_cur->bins[bin].upper; - } - - /* cache aggregate histogram for subsequent access */ - *dmh_cachep = dmh_aggr; - - return dmh_aggr; -} - -struct dm_histogram *dm_stats_get_histogram(const struct dm_stats *dms, - uint64_t region_id, - uint64_t area_id) -{ - int aggr = 0; - - if (region_id == DM_STATS_REGION_CURRENT) { - region_id = dms->cur_region; - if (region_id & DM_STATS_WALK_GROUP) { - region_id = dms->cur_group; - aggr = 1; - } - } else if (region_id & DM_STATS_WALK_GROUP) { - region_id &= ~DM_STATS_WALK_GROUP; - aggr = 1; - } - - area_id = (area_id == DM_STATS_AREA_CURRENT) - ? dms->cur_area : area_id ; - - if (area_id == DM_STATS_WALK_REGION) - aggr = 1; - - if (aggr) - return _aggregate_histogram(dms, region_id, area_id); - - if (region_id & DM_STATS_WALK_REGION) - region_id &= ~DM_STATS_WALK_REGION; - - if (!dms->regions[region_id].counters) - return dms->regions[region_id].bounds; - - return dms->regions[region_id].counters[area_id].histogram; -} - -int dm_histogram_get_nr_bins(const struct dm_histogram *dmh) -{ - return dmh->nr_bins; -} - -uint64_t dm_histogram_get_bin_lower(const struct dm_histogram *dmh, int bin) -{ - return (!bin) ? 0 : dmh->bins[bin - 1].upper; -} - -uint64_t dm_histogram_get_bin_upper(const struct dm_histogram *dmh, int bin) -{ - return dmh->bins[bin].upper; -} - -uint64_t dm_histogram_get_bin_width(const struct dm_histogram *dmh, int bin) -{ - uint64_t upper, lower; - upper = dm_histogram_get_bin_upper(dmh, bin); - lower = dm_histogram_get_bin_lower(dmh, bin); - return (upper - lower); -} - -uint64_t dm_histogram_get_bin_count(const struct dm_histogram *dmh, int bin) -{ - return dmh->bins[bin].count; -} - -uint64_t dm_histogram_get_sum(const struct dm_histogram *dmh) -{ - return dmh->sum; -} - -dm_percent_t dm_histogram_get_bin_percent(const struct dm_histogram *dmh, - int bin) -{ - uint64_t value = dm_histogram_get_bin_count(dmh, bin); - uint64_t width = dm_histogram_get_bin_width(dmh, bin); - uint64_t total = dm_histogram_get_sum(dmh); - - double val = (double) value; - - if (!total || !value || !width) - return DM_PERCENT_0; - - return dm_make_percent((uint64_t) val, total); -} - -/* - * Histogram string helper functions: used to construct histogram and - * bin boundary strings from numeric data. - */ - -/* - * Allocate an unbound histogram object with nr_bins bins. Only used - * for histograms used to hold bounds values as arguments for calls to - * dm_stats_create_region(). - */ -static struct dm_histogram *_alloc_dm_histogram(int nr_bins) -{ - /* Allocate space for dm_histogram + nr_entries. */ - size_t size = sizeof(struct dm_histogram) + - (unsigned) nr_bins * sizeof(struct dm_histogram_bin); - return zalloc(size); -} - -/* - * Parse a histogram bounds string supplied by the user. The string - * consists of a list of numbers, "n1,n2,n3,..." with optional 'ns', - * 'us', 'ms', or 's' unit suffixes. - * - * The scale parameter indicates the timescale used for this region: one - * for nanoscale resolution and NSEC_PER_MSEC for miliseconds. - * - * On return bounds contains a pointer to an array of uint64_t - * histogram bounds values expressed in units of nanoseconds. - */ -struct dm_histogram *dm_histogram_bounds_from_string(const char *bounds_str) -{ - static const char _valid_chars[] = "0123456789,muns"; - uint64_t this_val = 0, mult = 1; - const char *c, *v, *val_start; - struct dm_histogram_bin *cur; - struct dm_histogram *dmh; - int nr_entries = 1; - char *endptr; - - c = bounds_str; - - /* Count number of bounds entries. */ - while(*c) - if (*(c++) == ',') - nr_entries++; - - c = bounds_str; - - if (!(dmh = _alloc_dm_histogram(nr_entries))) - return_0; - - dmh->nr_bins = nr_entries; - - cur = dmh->bins; - - do { - for (v = _valid_chars; *v; v++) - if (*c == *v) - break; - - if (!*v) { - stack; - goto badchar; - } - - if (*c == ',') { - log_error("Empty histogram bin not allowed: %s", - bounds_str); - goto bad; - } else { - val_start = c; - endptr = NULL; - - this_val = strtoull(val_start, &endptr, 10); - if (!endptr) { - log_error("Could not parse histogram bound."); - goto bad; - } - c = endptr; /* Advance to units, comma, or end. */ - - if (*c == 's') { - mult = NSEC_PER_SEC; - c++; /* Advance over 's'. */ - } else if (*(c + 1) == 's') { - if (*c == 'm') - mult = NSEC_PER_MSEC; - else if (*c == 'u') - mult = NSEC_PER_USEC; - else if (*c == 'n') - mult = 1; - else { - stack; - goto badchar; - } - c += 2; /* Advance over 'ms', 'us', or 'ns'. */ - } else if (*c == ',') - c++; - else if (*c) { /* Expected ',' or NULL. */ - stack; - goto badchar; - } - - if (*c == ',') - c++; - this_val *= mult; - (cur++)->upper = this_val; - } - } while (*c); - - /* Bounds histograms have no owner. */ - dmh->dms = NULL; - dmh->region = NULL; - - return dmh; - -badchar: - log_error("Invalid character in histogram: %c", *c); -bad: - free(dmh); - return NULL; -} - -struct dm_histogram *dm_histogram_bounds_from_uint64(const uint64_t *bounds) -{ - const uint64_t *entry = bounds; - struct dm_histogram_bin *cur; - struct dm_histogram *dmh; - int nr_entries = 1; - - if (!bounds || !bounds[0]) { - log_error("Could not parse empty histogram bounds array"); - return 0; - } - - /* Count number of bounds entries. */ - while(*entry) - if (*(++entry)) - nr_entries++; - - entry = bounds; - - if (!(dmh = _alloc_dm_histogram(nr_entries))) - return_0; - - dmh->nr_bins = nr_entries; - - cur = dmh->bins; - - while (*entry) - (cur++)->upper = *(entry++); - - /* Bounds histograms have no owner. */ - dmh->dms = NULL; - dmh->region = NULL; - - return dmh; -} - -void dm_histogram_bounds_destroy(struct dm_histogram *bounds) -{ - if (!bounds) - return; - - /* Bounds histograms are not bound to any handle or region. */ - if (bounds->dms || bounds->region) { - log_error("Freeing invalid histogram bounds pointer %p.", - (void *) bounds); - stack; - } - /* free() expects a (void *). */ - free((void *) bounds); -} - -/* - * Scale a bounds value down from nanoseconds to the largest possible - * whole unit suffix. - */ -static void _scale_bound_value_to_suffix(uint64_t *bound, const char **suffix) -{ - *suffix = "ns"; - if (!(*bound % NSEC_PER_SEC)) { - *bound /= NSEC_PER_SEC; - *suffix = "s"; - } else if (!(*bound % NSEC_PER_MSEC)) { - *bound /= NSEC_PER_MSEC; - *suffix = "ms"; - } else if (!(*bound % NSEC_PER_USEC)) { - *bound /= NSEC_PER_USEC; - *suffix = "us"; - } -} - -#define DM_HISTOGRAM_BOUNDS_MASK 0x30 -#define BOUNDS_LEN 64 - -static int _make_bounds_string(char *buf, size_t size, uint64_t lower, - uint64_t upper, int flags, int width) -{ - char bound_buf[BOUNDS_LEN]; - const char *l_suff = NULL; - const char *u_suff = NULL; - const char *sep = ""; - int bounds = flags & DM_HISTOGRAM_BOUNDS_MASK; - - if (!bounds) - return_0; - - *buf = '\0'; - - if (flags & DM_HISTOGRAM_SUFFIX) { - _scale_bound_value_to_suffix(&lower, &l_suff); - _scale_bound_value_to_suffix(&upper, &u_suff); - } else - l_suff = u_suff = ""; - - if (flags & DM_HISTOGRAM_VALUES) - sep = ":"; - - if (bounds > DM_HISTOGRAM_BOUNDS_LOWER) { - /* Handle infinite uppermost bound. */ - if (upper == UINT64_MAX) { - if (dm_snprintf(bound_buf, sizeof(bound_buf), - ">" FMTu64 "%s", lower, l_suff) < 0) - goto_out; - /* Only display an 'upper' string for final bin. */ - bounds = DM_HISTOGRAM_BOUNDS_UPPER; - } else { - if (dm_snprintf(bound_buf, sizeof(bound_buf), - FMTu64 "%s", upper, u_suff) < 0) - goto_out; - } - } else if (bounds == DM_HISTOGRAM_BOUNDS_LOWER) { - if ((dm_snprintf(bound_buf, sizeof(bound_buf), FMTu64 "%s", - lower, l_suff)) < 0) - goto_out; - } - - switch (bounds) { - case DM_HISTOGRAM_BOUNDS_LOWER: - case DM_HISTOGRAM_BOUNDS_UPPER: - return dm_snprintf(buf, size, "%*s%s", width, bound_buf, sep); - case DM_HISTOGRAM_BOUNDS_RANGE: - return dm_snprintf(buf, size, FMTu64 "%s-%s%s", - lower, l_suff, bound_buf, sep); - } -out: - return 0; -} - -#define BOUND_WIDTH_NOSUFFIX 10 /* 999999999 nsecs */ -#define BOUND_WIDTH 6 /* bounds string up to 9999xs */ -#define COUNT_WIDTH 6 /* count string: up to 9999 */ -#define PERCENT_WIDTH 6 /* percent string : 0.00-100.00% */ -#define DM_HISTOGRAM_VALUES_MASK 0x06 - -const char *dm_histogram_to_string(const struct dm_histogram *dmh, int bin, - int width, int flags) -{ - char buf[BOUNDS_LEN], bounds_buf[BOUNDS_LEN]; - int minwidth, bounds, values, start, last; - uint64_t lower, upper, val_u64; /* bounds of the current bin. */ - /* Use the histogram pool for string building. */ - struct dm_pool *mem = dmh->dms->hist_mem; - const char *sep = ""; - int bounds_width; - ssize_t len = 0; - float val_flt; - - bounds = flags & DM_HISTOGRAM_BOUNDS_MASK; - values = flags & DM_HISTOGRAM_VALUES; - - if (bin < 0) { - start = 0; - last = dmh->nr_bins - 1; - } else - start = last = bin; - - minwidth = width; - - if (width < 0 || !values) - width = minwidth = 0; /* no padding */ - else if (flags & DM_HISTOGRAM_PERCENT) - width = minwidth = (width) ? : PERCENT_WIDTH; - else if (flags & DM_HISTOGRAM_VALUES) - width = minwidth = (width) ? : COUNT_WIDTH; - - if (values && !width) - sep = ":"; - - /* Set bounds string to the empty string. */ - bounds_buf[0] = '\0'; - - if (!dm_pool_begin_object(mem, 64)) - return_0; - - for (bin = start; bin <= last; bin++) { - if (bounds) { - /* Default bounds width depends on time suffixes. */ - bounds_width = (!(flags & DM_HISTOGRAM_SUFFIX)) - ? BOUND_WIDTH_NOSUFFIX - : BOUND_WIDTH ; - - bounds_width = (!width) ? width : bounds_width; - - lower = dm_histogram_get_bin_lower(dmh, bin); - upper = dm_histogram_get_bin_upper(dmh, bin); - - len = sizeof(bounds_buf); - len = _make_bounds_string(bounds_buf, len, - lower, upper, flags, - bounds_width); - /* - * Comma separates "bounds: value" pairs unless - * --noheadings is used. - */ - sep = (width || !values) ? "," : ":"; - - /* Adjust width by real bounds length if set. */ - width -= (width) ? (len - (bounds_width + 1)) : 0; - - /* -ve width indicates specified width was overrun. */ - width = (width > 0) ? width : 0; - } - - if (bin == last) - sep = ""; - - if (flags & DM_HISTOGRAM_PERCENT) { - dm_percent_t pr; - pr = dm_histogram_get_bin_percent(dmh, bin); - val_flt = dm_percent_to_float(pr); - len = dm_snprintf(buf, sizeof(buf), "%s%*.2f%%%s", - bounds_buf, width, val_flt, sep); - } else if (values) { - val_u64 = dmh->bins[bin].count; - len = dm_snprintf(buf, sizeof(buf), "%s%*"PRIu64"%s", - bounds_buf, width, val_u64, sep); - } else if (bounds) - len = dm_snprintf(buf, sizeof(buf), "%s%s", bounds_buf, - sep); - else { - *buf = '\0'; - len = 0; - } - - if (len < 0) - goto_bad; - - width = minwidth; /* re-set histogram column width. */ - if (!dm_pool_grow_object(mem, buf, (size_t) len)) - goto_bad; - } - - if (!dm_pool_grow_object(mem, "\0", 1)) - goto_bad; - - return (const char *) dm_pool_end_object(mem); - -bad: - dm_pool_abandon_object(mem); - return NULL; -} - -/* - * A lightweight representation of an extent (region, area, file - * system block or extent etc.). A table of extents can be used - * to sort and to efficiently find holes or overlaps among a set - * of tuples of the form (id, start, len). - */ -struct _extent { - struct dm_list list; - uint64_t id; - uint64_t start; - uint64_t len; -}; - -/* last address in an extent */ -#define _extent_end(a) ((a)->start + (a)->len - 1) - -/* a and b must be sorted by increasing start sector */ -#define _extents_overlap(a, b) (_extent_end(a) > (b)->start) - -/* - * Comparison function to sort extents in ascending start order. - */ -static int _extent_start_compare(const void *p1, const void *p2) -{ - const struct _extent *r1, *r2; - r1 = (const struct _extent *) p1; - r2 = (const struct _extent *) p2; - - if (r1->start < r2->start) - return -1; - else if (r1->start == r2->start) - return 0; - return 1; -} - -static int _stats_create_group(struct dm_stats *dms, dm_bitset_t regions, - const char *alias, uint64_t *group_id) -{ - struct dm_stats_group *group; - *group_id = dm_bit_get_first(regions); - - /* group has no regions? */ - if (*group_id == DM_STATS_GROUP_NOT_PRESENT) - return_0; - - group = &dms->groups[*group_id]; - - if (group->regions) { - log_error(INTERNAL_ERROR "Unexpected group state while" - "creating group ID bitmap" FMTu64, *group_id); - return 0; - } - - group->group_id = *group_id; - group->regions = regions; - - if (alias) - group->alias = strdup(alias); - else - group->alias = NULL; - - /* force an update of the group tag stored in aux_data */ - if (!_stats_set_aux(dms, *group_id, dms->regions[*group_id].aux_data)) - return 0; - - return 1; -} - -static int _stats_group_check_overlap(const struct dm_stats *dms, - dm_bitset_t regions, int count) -{ - struct dm_list ext_list = DM_LIST_HEAD_INIT(ext_list); - struct _extent *ext, *tmp, *next, *map = NULL; - size_t map_size = (dms->max_region + 1) * sizeof(*map); - int i = 0, id, overlap, merged; - - map = dm_pool_alloc(dms->mem, map_size); - if (!map) { - log_error("Could not allocate memory for region map"); - return 0; - } - - /* build a table of extents in order of region_id */ - for (id = dm_bit_get_first(regions); id >= 0; - id = dm_bit_get_next(regions, id)) { - dm_list_init(&map[i].list); - map[i].id = id; - map[i].start = dms->regions[id].start; - map[i].len = dms->regions[id].len; - i++; - } - - /* A single region cannot overlap itself. */ - if (i == 1) { - dm_pool_free(dms->mem, map); - return 1; - } - - /* sort by extent.start */ - qsort(map, count, sizeof(*map), _extent_start_compare); - - for (i = 0; i < count; i++) - dm_list_add(&ext_list, &map[i].list); - - overlap = 0; -merge: - merged = 0; - dm_list_iterate_items_safe(ext, tmp, &ext_list) { - next = dm_list_item(dm_list_next(&ext_list, &ext->list), - struct _extent); - if (!next) - continue; - - if (_extents_overlap(ext, next)) { - log_warn("WARNING: region IDs " FMTu64 " and " - FMTu64 " overlap. Some events will be " - "counted twice.", ext->id, next->id); - /* merge larger extent into smaller */ - if (_extent_end(ext) > _extent_end(next)) { - next->id = ext->id; - next->len = ext->len; - } - if (ext->start < next->start) - next->start = ext->start; - dm_list_del(&ext->list); - overlap = merged = 1; - } - } - /* continue until no merge candidates remain */ - if (merged) - goto merge; - - dm_pool_free(dms->mem, map); - return (overlap == 0); -} - -static void _stats_copy_histogram_bounds(struct dm_histogram *to, - struct dm_histogram *from) -{ - int i; - - to->nr_bins = from->nr_bins; - - for (i = 0; i < to->nr_bins; i++) - to->bins[i].upper = from->bins[i].upper; -} - -/* - * Compare histogram bounds h1 and h2, and return 1 if they match (i.e. - * have the same number of bins and identical bin boundary values), or 0 - * otherwise. - */ -static int _stats_check_histogram_bounds(struct dm_histogram *h1, - struct dm_histogram *h2) -{ - int i; - - if (!h1 || !h2) - return 0; - - if (h1->nr_bins != h2->nr_bins) - return 0; - - for (i = 0; i < h1->nr_bins; i++) - if (h1->bins[i].upper != h2->bins[i].upper) - return 0; - return 1; -} - -/* - * Create a new group in stats handle dms from the group description - * passed in group. - */ -int dm_stats_create_group(struct dm_stats *dms, const char *members, - const char *alias, uint64_t *group_id) -{ - struct dm_histogram *check = NULL, *bounds; - int i, count = 0, precise = 0; - dm_bitset_t regions; - - if (!dms->regions || !dms->groups) { - log_error("Could not create group: no regions found."); - return 0; - }; - - if (!(regions = dm_bitset_parse_list(members, NULL, 0))) { - log_error("Could not parse list: '%s'", members); - return 0; - } - - if (!(check = dm_pool_zalloc(dms->hist_mem, sizeof(*check)))) { - log_error("Could not allocate memory for bounds check"); - goto bad; - } - - /* too many bits? */ - if ((*regions - 1) > dms->max_region) { - log_error("Invalid region ID: %d", *regions - 1); - goto bad; - } - - /* - * Check that each region_id in the bitmap meets the group - * constraints: present, not already grouped, and if any - * histogram is present that they all have the same bounds. - */ - for (i = dm_bit_get_first(regions); i >= 0; - i = dm_bit_get_next(regions, i)) { - if (!dm_stats_region_present(dms, i)) { - log_error("Region ID %d does not exist", i); - goto bad; - } - if (_stats_region_is_grouped(dms, i)) { - log_error("Region ID %d already a member of group ID " - FMTu64, i, dms->regions[i].group_id); - goto bad; - } - if (dms->regions[i].timescale == 1) - precise++; - - /* check for matching histogram bounds */ - bounds = dms->regions[i].bounds; - if (bounds && !check->nr_bins) - _stats_copy_histogram_bounds(check, bounds); - else if (bounds) { - if (!_stats_check_histogram_bounds(check, bounds)) { - log_error("All region histogram bounds " - "must match exactly"); - goto bad; - } - } - count++; - } - - if (precise && (precise != count)) - log_warn("WARNING: Grouping regions with different clock resolution: " - "precision may be lost."); - - if (!_stats_group_check_overlap(dms, regions, count)) - log_very_verbose("Creating group with overlapping regions."); - - if (!_stats_create_group(dms, regions, alias, group_id)) - goto bad; - - dm_pool_free(dms->hist_mem, check); - return 1; - -bad: - dm_pool_free(dms->hist_mem, check); - dm_bitset_destroy(regions); - return 0; -} - -/* - * Remove the specified group_id. - */ -int dm_stats_delete_group(struct dm_stats *dms, uint64_t group_id, - int remove_regions) -{ - struct dm_stats_region *leader; - dm_bitset_t regions; - uint64_t i; - - if (group_id > dms->max_region) { - log_error("Invalid group ID: " FMTu64, group_id); - return 0; - } - - if (!_stats_group_id_present(dms, group_id)) { - log_error("Group ID " FMTu64 " does not exist", group_id); - return 0; - } - - regions = dms->groups[group_id].regions; - leader = &dms->regions[group_id]; - - /* delete all but the group leader */ - for (i = (*regions - 1); i > leader->region_id; i--) { - if (dm_bit(regions, i)) { - dm_bit_clear(regions, i); - if (remove_regions && !dm_stats_delete_region(dms, i)) - log_warn("WARNING: Failed to delete region " - FMTu64 " on %s.", i, dms->name); - } - } - - /* clear group and mark as not present */ - _stats_clear_group_regions(dms, group_id); - _stats_group_destroy(&dms->groups[group_id]); - - /* delete leader or clear aux_data */ - if (remove_regions) - return dm_stats_delete_region(dms, group_id); - else if (!_stats_set_aux(dms, group_id, leader->aux_data)) - return 0; - - return 1; -} - -uint64_t dm_stats_get_group_id(const struct dm_stats *dms, uint64_t region_id) -{ - region_id = (region_id == DM_STATS_REGION_CURRENT) - ? dms->cur_region : region_id; - - if (region_id & DM_STATS_WALK_GROUP) { - if (region_id == DM_STATS_WALK_GROUP) - return dms->cur_group; - else - return region_id & ~DM_STATS_WALK_GROUP; - } - - if (region_id & DM_STATS_WALK_REGION) - region_id &= ~DM_STATS_WALK_REGION; - - return dms->regions[region_id].group_id; -} - -int dm_stats_get_group_descriptor(const struct dm_stats *dms, - uint64_t group_id, char **buf) -{ - dm_bitset_t regions = dms->groups[group_id].regions; - size_t buflen; - - buflen = _stats_group_tag_len(dms, regions); - - *buf = dm_pool_alloc(dms->mem, buflen); - if (!*buf) { - log_error("Could not allocate memory for regions string"); - return 0; - } - - if (!_stats_group_tag_fill(dms, regions, *buf, buflen)) - return 0; - - return 1; -} - -#ifdef HAVE_LINUX_FIEMAP_H -/* - * Resize the group bitmap corresponding to group_id so that it can - * contain at least num_regions members. - */ -static int _stats_resize_group(struct dm_stats_group *group, - uint64_t num_regions) -{ - uint64_t last_bit = dm_bit_get_last(group->regions); - dm_bitset_t new, old; - - if (last_bit >= num_regions) { - log_error("Cannot resize group bitmap to " FMTu64 - " with bit " FMTu64 " set.", num_regions, last_bit); - return 0; - } - - log_very_verbose("Resizing group bitmap from " FMTu32 " to " FMTu64 - " (last_bit: " FMTu64 ").", group->regions[0], - num_regions, last_bit); - - new = dm_bitset_create(NULL, (unsigned) num_regions); - if (!new) { - log_error("Could not allocate memory for new group bitmap."); - return 0; - } - - old = group->regions; - dm_bit_copy(new, old); - group->regions = new; - dm_bitset_destroy(old); - return 1; -} - -/* - * Group a table of region_ids corresponding to the extents of a file. - */ -static int _stats_group_file_regions(struct dm_stats *dms, uint64_t *region_ids, - uint64_t count, const char *alias) -{ - dm_bitset_t regions = dm_bitset_create(NULL, dms->nr_regions); - uint64_t i, group_id = DM_STATS_GROUP_NOT_PRESENT; - char *members = NULL; - size_t buflen; - - if (!regions) { - log_error("Cannot map file: failed to allocate group bitmap."); - return 0; - } - - for (i = 0; i < count; i++) - dm_bit_set(regions, region_ids[i]); - - buflen = _stats_group_tag_len(dms, regions); - members = malloc(buflen); - - if (!members) { - log_error("Cannot map file: failed to allocate group " - "descriptor."); - dm_bitset_destroy(regions); - return 0; - } - - if (!_stats_group_tag_fill(dms, regions, members, buflen)) - goto bad; - - /* - * overlaps should not be possible: overlapping file extents - * returned by FIEMAP imply a kernel bug or a corrupt fs. - */ - if (!_stats_group_check_overlap(dms, regions, count)) - log_very_verbose("Creating group with overlapping regions."); - - if (!_stats_create_group(dms, regions, alias, &group_id)) - goto bad; - - free(members); - return 1; -bad: - dm_bitset_destroy(regions); - free(members); - return 0; -} - -static int _stats_add_file_extent(int fd, struct dm_pool *mem, uint64_t id, - struct fiemap_extent *fm_ext) -{ - struct _extent extent; - - /* final address of list is unknown */ - memset(&extent.list, 0, sizeof(extent.list)); - - /* convert bytes to dm (512b) sectors */ - extent.start = fm_ext->fe_physical >> SECTOR_SHIFT; - extent.len = fm_ext->fe_length >> SECTOR_SHIFT; - extent.id = id; - - log_very_verbose("Extent " FMTu64 " on fd %d at " FMTu64 "+" - FMTu64, extent.id, fd, extent.start, extent.len); - - if (!dm_pool_grow_object(mem, &extent, - sizeof(extent))) { - log_error("Cannot map file: failed to grow extent map."); - return 0; - } - return 1; -} - -/* test for the boundary of an extent */ -#define ext_boundary(ext, exp) \ -((ext).fe_logical != 0) && \ -((ext).fe_physical != (exp)) - -/* - * Copy fields from fiemap_extent 'from' to the fiemap_extent - * pointed to by 'to'. - */ -#define ext_copy(to, from) \ -do { \ - *(to) = *(from); \ -} while (0) - -static uint64_t _stats_map_extents(int fd, struct dm_pool *mem, - struct fiemap *fiemap, - struct fiemap_extent *fm_ext, - struct fiemap_extent *fm_last, - struct fiemap_extent *fm_pending, - uint64_t next_extent, - int *eof) -{ - uint64_t expected = 0, nr_extents = next_extent; - unsigned int i; - - /* - * Loop over the returned extents adding the fm_pending extent - * to the table of extents each time a discontinuity (or eof) - * is detected. - * - * We use a pointer to fm_pending in the caller since it is - * possible that logical extents comprising a single physical - * extent are returned by successive FIEMAP calls. - */ - for (i = 0; i < fiemap->fm_mapped_extents; i++) { - expected = fm_last->fe_physical + fm_last->fe_length; - - if (fm_ext[i].fe_flags & FIEMAP_EXTENT_LAST) - *eof = 1; - - /* cannot map extents that are not yet allocated. */ - if (fm_ext[i].fe_flags - & (FIEMAP_EXTENT_UNKNOWN | FIEMAP_EXTENT_DELALLOC)) - continue; - - /* - * Begin a new extent if the current physical address differs - * from the expected address yielded by fm_last.fe_physical + - * fm_last.fe_length. - * - * A logical discontinuity is seen at the start of the file if - * unwritten space exists before the first extent: do not add - * any extent record until we have accumulated a non-zero length - * in fm_pending. - */ - if (fm_pending->fe_length && - ext_boundary(fm_ext[i], expected)) { - if (!_stats_add_file_extent(fd, mem, nr_extents, - fm_pending)) - goto_bad; - nr_extents++; - /* Begin a new pending extent. */ - ext_copy(fm_pending, fm_ext + i); - } else { - expected = 0; - /* Begin a new pending extent for extent 0. If there is - * a hole at the start of the file, the first allocated - * extent will have a non-zero fe_logical. Detect this - * case by testing fm_pending->fe_length: if no length - * has been accumulated we are handling the first - * physical extent of the file. - */ - if (!fm_pending->fe_length || fm_ext[i].fe_logical == 0) - ext_copy(fm_pending, fm_ext + i); - else - /* accumulate this logical extent's length */ - fm_pending->fe_length += fm_ext[i].fe_length; - } - *fm_last = fm_ext[i]; - } - - /* - * If the file only has a single extent, no boundary is ever - * detected to trigger addition of the first extent. - */ - if (*eof || (fm_ext[i - 1].fe_logical == 0)) { - _stats_add_file_extent(fd, mem, nr_extents, fm_pending); - nr_extents++; - } - - fiemap->fm_start = (fm_ext[i - 1].fe_logical + - fm_ext[i - 1].fe_length); - - /* return the number of extents found in this call. */ - return nr_extents - next_extent; -bad: - /* signal mapping error to caller */ - *eof = -1; - return 0; -} - -/* - * Read the extents of an open file descriptor into a table of struct _extent. - * - * Based on e2fsprogs/misc/filefrag.c::filefrag_fiemap(). - * - * Copyright 2003 by Theodore Ts'o. - * - */ -static struct _extent *_stats_get_extents_for_file(struct dm_pool *mem, int fd, - uint64_t *count) -{ - struct fiemap_extent fm_last = {0}, fm_pending = {0}, *fm_ext = NULL; - struct fiemap *fiemap = NULL; - int eof = 0, nr_extents = 0; - struct _extent *extents; - unsigned long flags = 0; - uint64_t *buf; - - /* grow temporary extent table in the pool */ - if (!dm_pool_begin_object(mem, sizeof(*extents))) - return NULL; - - buf = zalloc(STATS_FIE_BUF_LEN); - if (!buf) { - log_error("Could not allocate memory for FIEMAP buffer."); - goto bad; - } - - /* initialise pointers into the ioctl buffer. */ - fiemap = (struct fiemap *) buf; - fm_ext = &fiemap->fm_extents[0]; - - /* space available per ioctl */ - *count = (STATS_FIE_BUF_LEN - sizeof(*fiemap)) - / sizeof(struct fiemap_extent); - - flags = FIEMAP_FLAG_SYNC; - - do { - /* start of ioctl loop - zero size and set count to bufsize */ - fiemap->fm_length = ~0ULL; - fiemap->fm_flags = flags; - fiemap->fm_extent_count = *count; - - /* get count-sized chunk of extents */ - if (ioctl(fd, FS_IOC_FIEMAP, (unsigned long) fiemap) < 0) { - if (errno == EBADR) - log_err_once("FIEMAP failed with unknown " - "flags %x.", fiemap->fm_flags); - goto bad; - } - - /* If 0 extents are returned, more ioctls are not needed */ - if (fiemap->fm_mapped_extents == 0) - break; - - nr_extents += _stats_map_extents(fd, mem, fiemap, fm_ext, - &fm_last, &fm_pending, - nr_extents, &eof); - - /* check for extent mapping error */ - if (eof < 0) - goto bad; - - } while (eof == 0); - - if (!nr_extents) { - log_error("Cannot map file: no allocated extents."); - goto bad; - } - - /* return total number of extents */ - *count = nr_extents; - extents = dm_pool_end_object(mem); - - /* free FIEMAP buffer. */ - free(buf); - - return extents; - -bad: - *count = 0; - dm_pool_abandon_object(mem); - free(buf); - return NULL; -} - -#define MATCH_EXTENT(e, s, l) \ -(((e).start == (s)) && ((e).len == (l))) - -static struct _extent *_find_extent(uint64_t nr_extents, struct _extent *extents, - uint64_t start, uint64_t len) -{ - size_t i; - for (i = 0; i < nr_extents; i++) - if (MATCH_EXTENT(extents[i], start, len)) - return extents + i; - return NULL; -} - -/* - * Clean up a table of region_id values that were created during a - * failed dm_stats_create_regions_from_fd, or dm_stats_update_regions_from_fd - * operation. - */ -static void _stats_cleanup_region_ids(struct dm_stats *dms, uint64_t *regions, - uint64_t nr_regions) -{ - uint64_t i; - - for (i = 0; i < nr_regions; i++) - if (!_stats_delete_region(dms, regions[i])) - log_error("Could not delete region " FMTu64 ".", i); -} - -/* - * First update pass: prune no-longer-allocated extents from the group - * and build a table of the remaining extents so that their creation - * can be skipped in the second pass. - */ -static int _stats_unmap_regions(struct dm_stats *dms, uint64_t group_id, - struct dm_pool *mem, struct _extent *extents, - struct _extent **old_extents, uint64_t *count, - int *regroup) -{ - struct dm_stats_region *region = NULL; - struct dm_stats_group *group = NULL; - uint64_t nr_kept, nr_old; - struct _extent ext; - int64_t i; - - group = &dms->groups[group_id]; - - log_very_verbose("Checking for changed file extents in group ID " - FMTu64, group_id); - - if (!dm_pool_begin_object(mem, sizeof(**old_extents))) { - log_error("Could not allocate extent table."); - return 0; - } - - nr_kept = nr_old = 0; /* counts of old and retained extents */ - - /* - * First pass: delete de-allocated extents and set regroup=1 if - * deleting the current group leader. - */ - i = dm_bit_get_last(group->regions); - for (; i >= 0; i = dm_bit_get_prev(group->regions, i)) { - region = &dms->regions[i]; - nr_old++; - - if (extents && _find_extent(*count, extents, - region->start, region->len)) { - ext.start = region->start; - ext.len = region->len; - ext.id = i; - nr_kept++; - - if (!dm_pool_grow_object(mem, &ext, sizeof(ext))) - goto out; - - log_very_verbose("Kept region " FMTu64, i); - } else { - - if (i == group_id) - *regroup = 1; - - if (!_stats_delete_region(dms, i)) { - log_error("Could not remove region ID " FMTu64, - i); - goto out; - } - - log_very_verbose("Deleted region " FMTu64, i); - } - } - - *old_extents = dm_pool_end_object(mem); - if (!*old_extents) { - log_error("Could not finalize region extent table."); - goto out; - } - log_very_verbose("Kept " FMTd64 " of " FMTd64 " old extents", - nr_kept, nr_old); - log_very_verbose("Found " FMTu64 " new extents", - *count - nr_kept); - - return (int) nr_kept; -out: - dm_pool_abandon_object(mem); - return -1; -} - -/* - * Create or update a set of regions representing the extents of a file - * and return a table of uint64_t region_id values. The number of regions - * created is returned in the memory pointed to by count (which must be - * non-NULL). - * - * If group_id is not equal to DM_STATS_GROUP_NOT_PRESENT, it is assumed - * that group_id corresponds to a group containing existing regions that - * were mapped to this file at an earlier time: regions will be added or - * removed to reflect the current status of the file. - */ -static uint64_t *_stats_map_file_regions(struct dm_stats *dms, int fd, - struct dm_histogram *bounds, - int precise, uint64_t group_id, - uint64_t *count, int *regroup) -{ - struct _extent *extents = NULL, *old_extents = NULL; - uint64_t *regions = NULL, fail_region, i, num_bits; - struct dm_stats_group *group = NULL; - struct dm_pool *extent_mem = NULL; - struct _extent *old_ext; - char *hist_arg = NULL; - struct statfs fsbuf; - int64_t nr_kept = 0; - struct stat buf; - int update; - - *count = 0; - update = _stats_group_id_present(dms, group_id); - -#ifdef BTRFS_SUPER_MAGIC - if (fstatfs(fd, &fsbuf)) { - log_error("fstatfs failed for fd %d", fd); - return 0; - } - - if (fsbuf.f_type == BTRFS_SUPER_MAGIC) { - log_error("Cannot map file: btrfs does not provide " - "physical FIEMAP extent data."); - return 0; - } -#endif - - if (fstat(fd, &buf)) { - log_error("fstat failed for fd %d", fd); - return 0; - } - - if (!(buf.st_mode & S_IFREG)) { - log_error("Not a regular file"); - return 0; - } - - if (!dm_is_dm_major(major(buf.st_dev))) { - log_error("Cannot map file: not a device-mapper device."); - return 0; - } - - /* - * If regroup is set here, we are creating a new filemap: otherwise - * we are updating a group with a valid group identifier in group_id. - */ - if (update) - log_very_verbose("Updating extents from fd %d with group ID " - FMTu64 " on (%d:%d)", fd, group_id, - major(buf.st_dev), minor(buf.st_dev)); - else - log_very_verbose("Mapping extents from fd %d on (%d:%d)", - fd, major(buf.st_dev), minor(buf.st_dev)); - - /* Use a temporary, private pool for the extent table. This avoids - * hijacking the dms->mem (region table) pool which would lead to - * interleaving temporary allocations with dm_stats_list() data, - * causing complications in the error path. - */ - if (!(extent_mem = dm_pool_create("extents", sizeof(*extents)))) - return_NULL; - - if (!(extents = _stats_get_extents_for_file(extent_mem, fd, count))) { - log_very_verbose("No extents found in fd %d", fd); - if (!update) - goto out; - } - - if (update) { - group = &dms->groups[group_id]; - if ((nr_kept = _stats_unmap_regions(dms, group_id, extent_mem, - extents, &old_extents, - count, regroup)) < 0) - goto_out; - } - - if (bounds) - if (!(hist_arg = _build_histogram_arg(bounds, &precise))) - goto_out; - - /* make space for end-of-table marker */ - if (!(regions = malloc((1 + *count) * sizeof(*regions)))) { - log_error("Could not allocate memory for region IDs."); - goto_out; - } - - /* - * Second pass (first for non-update case): create regions for - * all extents not retained from the prior mapping, and insert - * retained regions into the table of region_id values. - * - * If a regroup is not scheduled, set group bits for newly - * created regions in the group leader bitmap. - */ - for (i = 0; i < *count; i++) { - if (update) { - if ((old_ext = _find_extent((uint64_t) nr_kept, - old_extents, - extents[i].start, - extents[i].len))) { - regions[i] = old_ext->id; - continue; - } - } - if (!_stats_create_region(dms, regions + i, extents[i].start, - extents[i].len, -1, precise, hist_arg, - dms->program_id, "")) { - log_error("Failed to create region " FMTu64 " of " - FMTu64 " at " FMTu64 ".", i, *count, - extents[i].start); - goto out_remove; - } - - log_very_verbose("Created new region mapping " FMTu64 "+" FMTu64 - " with region ID " FMTu64, extents[i].start, - extents[i].len, regions[i]); - - if (!*regroup && update) { - /* expand group bitmap */ - if (regions[i] > (group->regions[0] - 1)) { - num_bits = regions[i] + *count; - if (!_stats_resize_group(group, num_bits)) { - log_error("Failed to resize group " - "bitmap."); - goto out_remove; - } - } - dm_bit_set(group->regions, regions[i]); - } - - } - regions[*count] = DM_STATS_REGION_NOT_PRESENT; - - /* Update group leader aux_data for new group members. */ - if (!*regroup && update) - if (!_stats_set_aux(dms, group_id, - dms->regions[group_id].aux_data)) - log_error("Failed to update group aux_data."); - - if (bounds) - free(hist_arg); - - /* the extent table will be empty if the file has been truncated. */ - if (extents) - dm_pool_free(extent_mem, extents); - - dm_pool_destroy(extent_mem); - - return regions; - -out_remove: - /* New region creation may begin to fail part-way through creating - * a set of file mapped regions: in this case we need to roll back - * the regions that were already created and return the handle to - * a consistent state. A listed handle is required for this: use a - * single list operation and call _stats_delete_region() directly - * to avoid a @stats_list ioctl and list parsing for each region. - */ - if (!dm_stats_list(dms, NULL)) - goto out; - - fail_region = i; - _stats_cleanup_region_ids(dms, regions, fail_region); - *count = 0; - -out: - dm_pool_destroy(extent_mem); - free(hist_arg); - free(regions); - return NULL; -} - -uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd, - int group, int precise, - struct dm_histogram *bounds, - const char *alias) -{ - uint64_t *regions, count; - int regroup = 1; - - if (alias && !group) { - log_error("Cannot set alias without grouping regions."); - return NULL; - } - - if (!(regions = _stats_map_file_regions(dms, fd, bounds, precise, - DM_STATS_GROUP_NOT_PRESENT, - &count, &regroup))) - return NULL; - - if (!group) - return regions; - - /* refresh handle */ - if (!dm_stats_list(dms, NULL)) - goto_out; - - if (!_stats_group_file_regions(dms, regions, count, alias)) - goto_out; - - return regions; -out: - _stats_cleanup_region_ids(dms, regions, count); - free(regions); - return NULL; -} - -uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, - uint64_t group_id) -{ - struct dm_histogram *bounds = NULL; - int nr_bins, precise, regroup; - uint64_t *regions, count = 0; - const char *alias = NULL; - - if (!dms->regions || !dm_stats_group_present(dms, group_id)) { - if (!dm_stats_list(dms, dms->program_id)) { - log_error("Could not obtain region list while " - "updating group " FMTu64 ".", group_id); - return NULL; - } - } - - if (!dm_stats_group_present(dms, group_id)) { - log_error("Group ID " FMTu64 " does not exist.", group_id); - return NULL; - } - - /* - * If the extent corresponding to the group leader's region has been - * deallocated, _stats_map_file_regions() will remove the region and - * the group. In this case, regroup will be set by the call and the - * group will be re-created using saved values. - */ - regroup = 0; - - /* - * A copy of the alias is needed to re-create the group when regroup=1. - */ - if (dms->groups[group_id].alias) { - alias = strdup(dms->groups[group_id].alias); - if (!alias) { - log_error("Failed to allocate group alias string."); - return NULL; - } - } - - if (dms->regions[group_id].bounds) { - /* - * A copy of the histogram bounds must be passed to - * _stats_map_file_regions() to be used when creating new - * regions: it is not safe to use the copy in the current group - * leader since it may be destroyed during the first group - * update pass. - */ - nr_bins = dms->regions[group_id].bounds->nr_bins; - bounds = _alloc_dm_histogram(nr_bins); - if (!bounds) { - log_error("Could not allocate memory for group " - "histogram bounds."); - goto out; - } - _stats_copy_histogram_bounds(bounds, - dms->regions[group_id].bounds); - } - - precise = (dms->regions[group_id].timescale == 1); - - regions = _stats_map_file_regions(dms, fd, bounds, precise, - group_id, &count, &regroup); - - if (!regions) - goto bad; - - if (!dm_stats_list(dms, NULL)) - goto bad; - - /* regroup if there are regions to group */ - if (regroup && (*regions != DM_STATS_REGION_NOT_PRESENT)) - if (!_stats_group_file_regions(dms, regions, count, alias)) - goto bad; - - free(bounds); - free((char *) alias); - return regions; -bad: - _stats_cleanup_region_ids(dms, regions, count); - free(bounds); - free(regions); -out: - free((char *) alias); - return NULL; -} -#else /* !HAVE_LINUX_FIEMAP */ -uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd, - int group, int precise, - struct dm_histogram *bounds, - const char *alias) -{ - log_error("File mapping requires FIEMAP ioctl support."); - return 0; -} - -uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, - uint64_t group_id) -{ - log_error("File mapping requires FIEMAP ioctl support."); - return 0; -} -#endif /* HAVE_LINUX_FIEMAP */ - -#ifdef DMFILEMAPD -static const char *_filemapd_mode_names[] = { - "inode", - "path", - NULL -}; - -dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str) -{ - dm_filemapd_mode_t mode = DM_FILEMAPD_FOLLOW_INODE; - const char **mode_name; - - if (mode_str) { - for (mode_name = _filemapd_mode_names; *mode_name; mode_name++) - if (!strcmp(*mode_name, mode_str)) - break; - if (*mode_name) - mode = DM_FILEMAPD_FOLLOW_INODE - + (mode_name - _filemapd_mode_names); - else { - log_error("Could not parse dmfilemapd mode: %s", - mode_str); - return DM_FILEMAPD_FOLLOW_NONE; - } - } - return mode; -} - -#define DM_FILEMAPD "dmfilemapd" -#define NR_FILEMAPD_ARGS 7 /* includes argv[0] */ -/* - * Start dmfilemapd to monitor the specified file descriptor, and to - * update the group given by 'group_id' when the file's allocation - * changes. - * - * usage: dmfilemapd <fd> <group_id> <mode> [<foreground>[<log_level>]] - */ -int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, - dm_filemapd_mode_t mode, unsigned foreground, - unsigned verbose) -{ - char fd_str[8], group_str[8], fg_str[2], verb_str[2]; - const char *mode_str = _filemapd_mode_names[mode]; - char *args[NR_FILEMAPD_ARGS + 1]; - pid_t pid = 0; - int argc = 0; - - if (fd < 0) { - log_error("dmfilemapd file descriptor must be " - "non-negative: %d", fd); - return 0; - } - - if (path[0] != '/') { - log_error("Path argument must specify an absolute path."); - return 0; - } - - if (mode > DM_FILEMAPD_FOLLOW_PATH) { - log_error("Invalid dmfilemapd mode argument: " - "Must be DM_FILEMAPD_FOLLOW_INODE or " - "DM_FILEMAPD_FOLLOW_PATH"); - return 0; - } - - if (foreground > 1) { - log_error("Invalid dmfilemapd foreground argument. " - "Must be 0 or 1: %d.", foreground); - return 0; - } - - if (verbose > 3) { - log_error("Invalid dmfilemapd verbose argument. " - "Must be 0..3: %d.", verbose); - return 0; - } - - /* set argv[0] */ - args[argc++] = (char *) DM_FILEMAPD; - - /* set <fd> */ - if ((dm_snprintf(fd_str, sizeof(fd_str), "%d", fd)) < 0) { - log_error("Could not format fd argument."); - return 0; - } - args[argc++] = fd_str; - - /* set <group_id> */ - if ((dm_snprintf(group_str, sizeof(group_str), FMTu64, group_id)) < 0) { - log_error("Could not format group_id argument."); - return 0; - } - args[argc++] = group_str; - - /* set <path> */ - args[argc++] = (char *) path; - - /* set <mode> */ - args[argc++] = (char *) mode_str; - - /* set <foreground> */ - if ((dm_snprintf(fg_str, sizeof(fg_str), "%u", foreground)) < 0) { - log_error("Could not format foreground argument."); - return 0; - } - args[argc++] = fg_str; - - /* set <verbose> */ - if ((dm_snprintf(verb_str, sizeof(verb_str), "%u", verbose)) < 0) { - log_error("Could not format verbose argument."); - return 0; - } - args[argc++] = verb_str; - - /* terminate args[argc] */ - args[argc] = NULL; - - log_very_verbose("Spawning daemon as '%s %d " FMTu64 " %s %s %u %u'", - *args, fd, group_id, path, mode_str, - foreground, verbose); - - if (!foreground && ((pid = fork()) < 0)) { - log_error("Failed to fork dmfilemapd process."); - return 0; - } - - if (pid > 0) { - log_very_verbose("Forked dmfilemapd process as pid %d", pid); - return 1; - } - - execvp(args[0], args); - log_sys_error("execvp", args[0]); - if (!foreground) - _exit(127); - return 0; -} -# else /* !DMFILEMAPD */ -dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str) -{ - return 0; -}; - -int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, - dm_filemapd_mode_t mode, unsigned foreground, - unsigned verbose) -{ - log_error("dmfilemapd support disabled."); - return 0; -} -#endif /* DMFILEMAPD */ - -/* - * Backward compatible dm_stats_create_region() implementations. - * - * Keep these at the end of the file to avoid adding clutter around the - * current dm_stats_create_region() version. - */ - -#if defined(__GNUC__) -int dm_stats_create_region_v1_02_106(struct dm_stats *dms, uint64_t *region_id, - uint64_t start, uint64_t len, int64_t step, - int precise, const char *program_id, - const char *aux_data); -int dm_stats_create_region_v1_02_106(struct dm_stats *dms, uint64_t *region_id, - uint64_t start, uint64_t len, int64_t step, - int precise, const char *program_id, - const char *aux_data) -{ - /* 1.02.106 lacks histogram argument. */ - return _stats_create_region(dms, region_id, start, len, step, precise, - NULL, program_id, aux_data); -} - -int dm_stats_create_region_v1_02_104(struct dm_stats *dms, uint64_t *region_id, - uint64_t start, uint64_t len, int64_t step, - const char *program_id, const char *aux_data); -int dm_stats_create_region_v1_02_104(struct dm_stats *dms, uint64_t *region_id, - uint64_t start, uint64_t len, int64_t step, - const char *program_id, const char *aux_data) -{ - /* 1.02.104 lacks histogram and precise arguments. */ - return _stats_create_region(dms, region_id, start, len, step, 0, NULL, - program_id, aux_data); -} -#endif

1 0

master - dmfilemapd: Move to libdm/dm-tools
by Joe Thornber 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fededfbbbc5ed79c509a3… Commit: fededfbbbc5ed79c509a34a0f8a681fa27e49533 Parent: 0524829af69935070b7b15c1bede8f7f4afc9a13 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Thu Jun 14 14:27:19 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 14 14:27:19 2018 +0100 dmfilemapd: Move to libdm/dm-tools No longer uses any lvm code. --- configure | 3 +- configure.ac | 1 - daemons/Makefile.in | 6 +- daemons/dmfilemapd/.gitignore | 1 - daemons/dmfilemapd/Makefile.in | 65 --- daemons/dmfilemapd/dmfilemapd.c | 836 --------------------------------------- libdm/dm-tools/.gitignore | 1 + libdm/dm-tools/Makefile.in | 42 ++- libdm/dm-tools/dmfilemapd.c | 835 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 876 insertions(+), 914 deletions(-) diff --git a/configure b/configure index ed3a315..4536b03 100755 --- a/configure +++ b/configure @@ -13611,7 +13611,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scri pts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile tools/Makefile udev/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/blkdeactivate.sh scripts /blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile tools/Makefile udev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14319,7 +14319,6 @@ do "daemons/dmeventd/plugins/mirror/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/mirror/Makefile" ;; "daemons/dmeventd/plugins/snapshot/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/snapshot/Makefile" ;; "daemons/dmeventd/plugins/thin/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/thin/Makefile" ;; - "daemons/dmfilemapd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmfilemapd/Makefile" ;; "daemons/lvmdbusd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/Makefile" ;; "daemons/lvmdbusd/lvmdbusd") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvmdbusd" ;; "daemons/lvmdbusd/lvmdb.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvmdb.py" ;; diff --git a/configure.ac b/configure.ac index 42f19fd..05b13e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1764,7 +1764,6 @@ daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile -daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py diff --git a/daemons/Makefile.in b/daemons/Makefile.in index 8edaefa..5226a5e 100644 --- a/daemons/Makefile.in +++ b/daemons/Makefile.in @@ -44,12 +44,8 @@ ifeq ("@BUILD_LVMDBUSD@", "yes") SUBDIRS += lvmdbusd endif -ifeq ("@BUILD_DMFILEMAPD@", "yes") - SUBDIRS += dmfilemapd -endif - ifeq ($(MAKECMDGOALS),distclean) - SUBDIRS = cmirrord dmeventd lvmetad lvmpolld lvmlockd lvmdbusd dmfilemapd + SUBDIRS = cmirrord dmeventd lvmetad lvmpolld lvmlockd lvmdbusd endif include $(top_builddir)/make.tmpl diff --git a/daemons/dmfilemapd/.gitignore b/daemons/dmfilemapd/.gitignore deleted file mode 100644 index 6dcde30..0000000 --- a/daemons/dmfilemapd/.gitignore +++ /dev/null @@ -1 +0,0 @@ -dmfilemapd diff --git a/daemons/dmfilemapd/Makefile.in b/daemons/dmfilemapd/Makefile.in deleted file mode 100644 index 1afd6b8..0000000 --- a/daemons/dmfilemapd/Makefile.in +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (C) 2016 Red Hat, Inc. All rights reserved. -# -# This file is part of the device-mapper userspace tools. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU Lesser General Public License v.2.1. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ - -SOURCES = dmfilemapd.c - -TARGETS = dmfilemapd - -.PHONY: install_dmfilemapd install_dmfilemapd_static - -INSTALL_DMFILEMAPD_TARGETS = install_dmfilemapd_dynamic - -CLEAN_TARGETS = dmfilemapd.static - -CFLOW_LIST = $(SOURCES) -CFLOW_LIST_TARGET = $(LIB_NAME).cflow -CFLOW_TARGET = dmfilemapd - -include $(top_builddir)/make.tmpl - -all: device-mapper -device-mapper: $(TARGETS) - -CFLAGS_dmfilemapd.o += $(EXTRA_EXEC_CFLAGS) - -dmfilemapd: $(LIB_SHARED) dmfilemapd.o - $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ - -o $@ dmfilemapd.o $(DL_LIBS) $(LIBS) - -dmfilemapd.static: $(LIB_STATIC) dmfilemapd.o - $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L$(interfacebuilddir) \ - -o $@ dmfilemapd.o $(DL_LIBS) $(LIBS) $(STATIC_LIBS) - -ifneq ("$(CFLOW_CMD)", "") -CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) --include $(top_builddir)/libdm/libdevmapper.cflow --include $(top_builddir)/lib/liblvm-internal.cflow --include $(top_builddir)/lib/liblvm2cmd.cflow --include $(top_builddir)/daemons/dmfilemapd/$(LIB_NAME).cflow -endif - -install_dmfilemapd_dynamic: dmfilemapd - $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) - -install_dmfilemapd_static: dmfilemapd.static - $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) - -install_dmfilemapd: $(INSTALL_DMFILEMAPD_TARGETS) - -install: install_dmfilemapd - -install_device-mapper: install_dmfilemapd diff --git a/daemons/dmfilemapd/dmfilemapd.c b/daemons/dmfilemapd/dmfilemapd.c deleted file mode 100644 index 726ad6e..0000000 --- a/daemons/dmfilemapd/dmfilemapd.c +++ /dev/null @@ -1,836 +0,0 @@ -/* - * Copyright (C) 2016 Red Hat, Inc. All rights reserved. - * - * This file is part of the device-mapper userspace tools. - * - * It includes tree drawing code based on pstree: http://psmisc.sourceforge.net/ - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "tools/tool.h" - -#include "device_mapper/misc/dm-logging.h" - -#include "lib/config/defaults.h" - -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/inotify.h> -#include <dirent.h> -#include <ctype.h> - -#ifdef __linux__ -# include "kdev_t.h" -#else -# define MAJOR(x) major((x)) -# define MINOR(x) minor((x)) -# define MKDEV(x,y) makedev((x),(y)) -#endif - -/* limit to two updates/sec */ -#define FILEMAPD_WAIT_USECS 500000 - -/* how long to wait for unlinked files */ -#define FILEMAPD_NOFILE_WAIT_USECS 100000 -#define FILEMAPD_NOFILE_WAIT_TRIES 10 - -struct filemap_monitor { - dm_filemapd_mode_t mode; - const char *program_id; - uint64_t group_id; - char *path; - int fd; - - int inotify_fd; - int inotify_watch_fd; - - /* monitoring heuristics */ - int64_t blocks; /* allocated blocks, from stat.st_blocks */ - uint64_t nr_regions; - int deleted; -}; - -static int _foreground; -static int _verbose; - -const char *const _usage = "dmfilemapd <fd> <group_id> <abs_path> <mode> " - "[<foreground>[<log_level>]]"; - -/* - * Daemon logging. By default, all messages are thrown away: messages - * are only written to the terminal if the daemon is run in the foreground. - */ -__attribute__((format(printf, 5, 0))) -static void _dmfilemapd_log_line(int level, - const char *file __attribute__((unused)), - int line __attribute__((unused)), - int dm_errno_or_class, - const char *f, va_list ap) -{ - static int _abort_on_internal_errors = -1; - FILE *out = log_stderr(level) ? stderr : stdout; - - level = log_level(level); - - if (level <= _LOG_WARN || _verbose) { - if (level < _LOG_WARN) - out = stderr; - vfprintf(out, f, ap); - fputc('\n', out); - } - - if (_abort_on_internal_errors < 0) - /* Set when env DM_ABORT_ON_INTERNAL_ERRORS is not "0" */ - _abort_on_internal_errors = - strcmp(getenv("DM_ABORT_ON_INTERNAL_ERRORS") ? : "0", "0"); - - if (_abort_on_internal_errors && - !strncmp(f, INTERNAL_ERROR, sizeof(INTERNAL_ERROR) - 1)) - abort(); -} - -__attribute__((format(printf, 5, 6))) -static void _dmfilemapd_log_with_errno(int level, - const char *file, int line, - int dm_errno_or_class, - const char *f, ...) -{ - va_list ap; - - va_start(ap, f); - _dmfilemapd_log_line(level, file, line, dm_errno_or_class, f, ap); - va_end(ap); -} - -/* - * Only used for reporting errors before daemonise(). - */ -__attribute__((format(printf, 1, 2))) -static void _early_log(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - fputc('\n', stderr); - va_end(ap); -} - -static void _setup_logging(void) -{ - dm_log_init_verbose(_verbose - 1); - dm_log_with_errno_init(_dmfilemapd_log_with_errno); -} - -#define PROC_FD_DELETED_STR "(deleted)" -/* - * Scan the /proc/<pid>/fd directory for pid and check for an fd - * symlink whose contents match path. - */ -static int _is_open_in_pid(pid_t pid, const char *path) -{ - char deleted_path[PATH_MAX + sizeof(PROC_FD_DELETED_STR)]; - struct dirent *pid_dp = NULL; - char path_buf[PATH_MAX]; - char link_buf[PATH_MAX]; - DIR *pid_d = NULL; - ssize_t len; - - if (pid == getpid()) - return 0; - - if (dm_snprintf(path_buf, sizeof(path_buf), - DEFAULT_PROC_DIR "%d/fd", pid) < 0) { - log_error("Could not format pid path."); - return 0; - } - - /* - * Test for the kernel 'file (deleted)' form when scanning. - */ - if (dm_snprintf(deleted_path, sizeof(deleted_path), "%s %s", - path, PROC_FD_DELETED_STR) < 0) { - log_error("Could not format check path."); - return 0; - } - - pid_d = opendir(path_buf); - if (!pid_d) { - log_error("Could not open proc path: %s.", path_buf); - return 0; - } - - while ((pid_dp = readdir(pid_d)) != NULL) { - if (pid_dp->d_name[0] == '.') - continue; - if ((len = readlinkat(dirfd(pid_d), pid_dp->d_name, link_buf, - sizeof(link_buf))) < 0) { - log_error("readlink failed for " DEFAULT_PROC_DIR - "/%d/fd/.", pid); - goto bad; - } - link_buf[len] = '\0'; - if (!strcmp(deleted_path, link_buf)) { - if (closedir(pid_d)) - log_sys_error("closedir", path_buf); - return 1; - } - } - -bad: - if (closedir(pid_d)) - log_sys_error("closedir", path_buf); - - return 0; -} - -/* - * Attempt to determine whether a file is open by any process by - * scanning symbolic links in /proc/<pid>/fd. - * - * This is a heuristic since it cannot guarantee to detect brief - * access in all cases: a process that opens and then closes the - * file rapidly may never be seen by the scan. - * - * The method will also give false-positives if a process exists - * that has a deleted file open that had the same path, but a - * different inode number, to the file being monitored. - * - * For this reason the daemon only uses _is_open() for unlinked - * files when the mode is DM_FILEMAPD_FOLLOW_INODE, since these - * files can no longer be newly opened by processes. - * - * In this situation !is_open(path) provides an indication that - * the daemon should shut down: the file has been unlinked from - * the file system and we appear to hold the final reference. - */ -static int _is_open(const char *path) -{ - struct dirent *proc_dp = NULL; - DIR *proc_d = NULL; - pid_t pid; - - proc_d = opendir(DEFAULT_PROC_DIR); - if (!proc_d) - return 0; - while ((proc_dp = readdir(proc_d)) != NULL) { - if (!isdigit(proc_dp->d_name[0])) - continue; - errno = 0; - pid = (pid_t) strtol(proc_dp->d_name, NULL, 10); - if (errno || !pid) - continue; - if (_is_open_in_pid(pid, path)) { - if (closedir(proc_d)) - log_sys_error("closedir", DEFAULT_PROC_DIR); - return 1; - } - } - - if (closedir(proc_d)) - log_sys_error("closedir", DEFAULT_PROC_DIR); - - return 0; -} - -static void _filemap_monitor_wait(uint64_t usecs) -{ - if (_verbose) { - if (usecs == FILEMAPD_WAIT_USECS) - log_very_verbose("Waiting for check interval"); - if (usecs == FILEMAPD_NOFILE_WAIT_USECS) - log_very_verbose("Waiting for unlinked path"); - } - usleep((useconds_t) usecs); -} - -static int _parse_args(int argc, char **argv, struct filemap_monitor *fm) -{ - char *endptr; - - /* we don't care what is in argv[0]. */ - argc--; - argv++; - - if (argc < 5) { - _early_log("Wrong number of arguments."); - _early_log("usage: %s", _usage); - return 0; - } - - /* - * We don't know the true nr_regions at daemon start time, - * and it is not worth a dm_stats_list()/group walk to count: - * we can assume that there is at least one region or the - * daemon would not have been started. - * - * A correct value will be obtained following the first update - * of the group's regions. - */ - fm->nr_regions = 1; - - /* parse <fd> */ - errno = 0; - fm->fd = (int) strtol(argv[0], &endptr, 10); - if (errno || *endptr) { - _early_log("Could not parse file descriptor: %s", argv[0]); - return 0; - } - - argc--; - argv++; - - /* parse <group_id> */ - errno = 0; - fm->group_id = strtoull(argv[0], &endptr, 10); - if (*endptr || errno) { - _early_log("Could not parse group identifier: %s", argv[0]); - return 0; - } - - argc--; - argv++; - - /* parse <path> */ - if (!argv[0] || !strlen(argv[0])) { - _early_log("Path argument is required."); - return 0; - } - - if (*argv[0] != '/') { - _early_log("Path argument must specify an absolute path."); - return 0; - } - - fm->path = strdup(argv[0]); - if (!fm->path) { - _early_log("Could not allocate memory for path argument."); - return 0; - } - - argc--; - argv++; - - /* parse <mode> */ - if (!argv[0] || !strlen(argv[0])) { - _early_log("Mode argument is required."); - return 0; - } - - fm->mode = dm_filemapd_mode_from_string(argv[0]); - if (fm->mode == DM_FILEMAPD_FOLLOW_NONE) - return 0; - - argc--; - argv++; - - /* parse [<foreground>[<verbose>]] */ - if (argc) { - errno = 0; - _foreground = (int) strtol(argv[0], &endptr, 10); - if (errno || *endptr) { - _early_log("Could not parse debug argument: %s.", - argv[0]); - return 0; - } - argc--; - argv++; - if (argc) { - errno = 0; - _verbose = (int) strtol(argv[0], &endptr, 10); - if (errno || *endptr) { - _early_log("Could not parse verbose " - "argument: %s", argv[0]); - return 0; - } - if (_verbose < 0 || _verbose > 3) { - _early_log("Verbose argument out of range: %d.", - _verbose); - return 0; - } - } - } - return 1; -} - -static int _filemap_fd_update_blocks(struct filemap_monitor *fm) -{ - struct stat buf; - - if (fm->fd < 0) { - log_error("Filemap fd is not open."); - return 0; - } - - if (fstat(fm->fd, &buf)) { - log_error("Failed to fstat filemap file descriptor."); - return 0; - } - - fm->blocks = buf.st_blocks; - - return 1; -} - -static int _filemap_fd_check_changed(struct filemap_monitor *fm) -{ - int64_t old_blocks; - - old_blocks = fm->blocks; - - if (!_filemap_fd_update_blocks(fm)) - return -1; - - return (fm->blocks != old_blocks); -} - -static void _filemap_monitor_close_fd(struct filemap_monitor *fm) -{ - if (close(fm->fd)) - log_error("Error closing file descriptor."); - fm->fd = -1; -} - -static void _filemap_monitor_end_notify(struct filemap_monitor *fm) -{ - inotify_rm_watch(fm->inotify_fd, fm->inotify_watch_fd); -} - -static int _filemap_monitor_set_notify(struct filemap_monitor *fm) -{ - int inotify_fd, watch_fd; - - /* - * Set IN_NONBLOCK since we do not want to block in event read() - * calls. Do not set IN_CLOEXEC as dmfilemapd is single-threaded - * and does not fork or exec. - */ - if ((inotify_fd = inotify_init1(IN_NONBLOCK)) < 0) { - log_sys_error("inotify_init1", "IN_NONBLOCK"); - return 0; - } - - if ((watch_fd = inotify_add_watch(inotify_fd, fm->path, - IN_MODIFY | IN_DELETE_SELF)) < 0) { - log_sys_error("inotify_add_watch", fm->path); - return 0; - } - fm->inotify_fd = inotify_fd; - fm->inotify_watch_fd = watch_fd; - return 1; -} - -static int _filemap_monitor_reopen_fd(struct filemap_monitor *fm) -{ - int tries = FILEMAPD_NOFILE_WAIT_TRIES; - - /* - * In DM_FILEMAPD_FOLLOW_PATH mode, inotify watches must be - * re-established whenever the file at the watched path is - * changed. - * - * FIXME: stat file and skip if inode is unchanged. - */ - if (fm->fd > 0) - log_error("Filemap file descriptor already open."); - - while ((fm->fd < 0) && --tries) - if (((fm->fd = open(fm->path, O_RDONLY)) < 0) && tries) - _filemap_monitor_wait(FILEMAPD_NOFILE_WAIT_USECS); - - if (!tries && (fm->fd < 0)) { - log_error("Could not re-open file descriptor."); - return 0; - } - - return _filemap_monitor_set_notify(fm); -} - -static int _filemap_monitor_get_events(struct filemap_monitor *fm) -{ - /* alignment as per man(7) inotify */ - char buf[sizeof(struct inotify_event) + NAME_MAX + 1] - __attribute__ ((aligned(__alignof__(struct inotify_event)))); - - struct inotify_event *event; - int check = 0; - ssize_t len; - char *ptr; - - /* - * Close the file descriptor for the file being monitored here - * when mode=path: this will allow the inode to be de-allocated, - * and an IN_DELETE_SELF event generated in the case that the - * daemon is holding the last open reference to the file. - */ - if (fm->mode == DM_FILEMAPD_FOLLOW_PATH) { - _filemap_monitor_end_notify(fm); - _filemap_monitor_close_fd(fm); - } - - len = read(fm->inotify_fd, (void *) &buf, sizeof(buf)); - - /* no events to read? */ - if (len < 0 && (errno == EAGAIN)) - goto out; - - /* interrupted by signal? */ - if (len < 0 && (errno == EINTR)) - goto out; - - if (len < 0) - return -1; - - if (!len) - goto out; - - for (ptr = buf; ptr < buf + len; ptr += sizeof(*event) + event->len) { - event = (struct inotify_event *) ptr; - if (event->mask & IN_DELETE_SELF) - fm->deleted = 1; - if (event->mask & IN_MODIFY) - check = 1; - /* - * Event IN_IGNORED is generated when a file has been deleted - * and IN_DELETE_SELF generated, and indicates that the file - * watch has been automatically removed. - * - * This can only happen for the DM_FILEMAPD_FOLLOW_PATH mode, - * since inotify IN_DELETE events are generated at the time - * the inode is destroyed: DM_FILEMAPD_FOLLOW_INODE will hold - * the file descriptor open, meaning that the event will not - * be generated until after the daemon closes the file. - * - * The event is ignored here since inotify monitoring will - * be reestablished (or the daemon will terminate) following - * deletion of a DM_FILEMAPD_FOLLOW_PATH monitored file. - */ - if (event->mask & IN_IGNORED) - log_very_verbose("Inotify watch removed: IN_IGNORED " - "in event->mask"); - } - -out: - /* - * Re-open file descriptor if required and log disposition. - */ - if (fm->mode == DM_FILEMAPD_FOLLOW_PATH) - if (!_filemap_monitor_reopen_fd(fm)) - return -1; - - log_very_verbose("exiting _filemap_monitor_get_events() with " - "deleted=%d, check=%d", fm->deleted, check); - return check; -} - -static void _filemap_monitor_destroy(struct filemap_monitor *fm) -{ - if (fm->fd > 0) { - _filemap_monitor_end_notify(fm); - _filemap_monitor_close_fd(fm); - } - free((void *) fm->program_id); - free(fm->path); -} - -static int _filemap_monitor_check_same_file(int fd1, int fd2) -{ - struct stat buf1, buf2; - - if ((fd1 < 0) || (fd2 < 0)) - return 0; - - if (fstat(fd1, &buf1)) { - log_error("Failed to fstat file descriptor %d", fd1); - return -1; - } - - if (fstat(fd2, &buf2)) { - log_error("Failed to fstat file descriptor %d", fd2); - return -1; - } - - return ((buf1.st_dev == buf2.st_dev) && (buf1.st_ino == buf2.st_ino)); -} - -static int _filemap_monitor_check_file_unlinked(struct filemap_monitor *fm) -{ - char path_buf[PATH_MAX]; - char link_buf[PATH_MAX]; - int same, fd; - ssize_t len; - - fm->deleted = 0; - same = 0; - - if ((fd = open(fm->path, O_RDONLY)) < 0) - goto check_unlinked; - - same = _filemap_monitor_check_same_file(fm->fd, fd); - - if (close(fd)) - log_error("Error closing fd %d", fd); - - if (same < 0) - return 0; - - if (same) - return 1; - -check_unlinked: - /* - * The file has been unlinked from its original location: test - * whether it is still reachable in the filesystem, or if it is - * unlinked and anonymous. - */ - if (dm_snprintf(path_buf, sizeof(path_buf), DEFAULT_PROC_DIR - "/%d/fd/%d", getpid(), fm->fd) < 0) { - log_error("Could not format pid path."); - return 0; - } - if ((len = readlink(path_buf, link_buf, sizeof(link_buf) - 1)) < 0) { - log_error("readlink failed for " DEFAULT_PROC_DIR "/%d/fd/%d.", - getpid(), fm->fd); - return 0; - } - link_buf[len] = '\0'; - - /* - * Try to re-open the file, from the path now reported in /proc/pid/fd. - */ - if ((fd = open(link_buf, O_RDONLY)) < 0) - fm->deleted = 1; - else - same = _filemap_monitor_check_same_file(fm->fd, fd); - - if ((fd >= 0) && close(fd)) - log_error("Error closing fd %d", fd); - - if (same < 0) - return 0; - - /* Should not happen with normal /proc. */ - if ((fd > 0) && !same) { - log_error("File descriptor mismatch: %d and %s (read from %s) " - "are not the same file!", fm->fd, link_buf, path_buf); - return 0; - } - return 1; -} - -static int _daemonise(struct filemap_monitor *fm) -{ - pid_t pid = 0, sid; - int fd; - - if (!(sid = setsid())) { - _early_log("setsid failed."); - return 0; - } - - if ((pid = fork()) < 0) { - _early_log("Failed to fork daemon process."); - return 0; - } - - if (pid > 0) { - if (_verbose) - _early_log("Started dmfilemapd with pid=%d", pid); - exit(0); - } - - if (chdir("/")) { - _early_log("Failed to change directory."); - return 0; - } - - if (!_verbose) { - if (close(STDIN_FILENO)) - _early_log("Error closing stdin"); - if (close(STDOUT_FILENO)) - _early_log("Error closing stdout"); - if (close(STDERR_FILENO)) - _early_log("Error closing stderr"); - if ((open("/dev/null", O_RDONLY) < 0) || - (open("/dev/null", O_WRONLY) < 0) || - (open("/dev/null", O_WRONLY) < 0)) { - _early_log("Error opening stdio streams."); - return 0; - } - } - /* TODO: Use libdaemon/server/daemon-server.c _daemonise() */ - for (fd = (int) sysconf(_SC_OPEN_MAX) - 1; fd > STDERR_FILENO; fd--) { - if (fd == fm->fd) - continue; - (void) close(fd); - } - - return 1; -} - -static int _update_regions(struct dm_stats *dms, struct filemap_monitor *fm) -{ - uint64_t *regions = NULL, *region, nr_regions = 0; - - regions = dm_stats_update_regions_from_fd(dms, fm->fd, fm->group_id); - if (!regions) { - log_error("Failed to update filemap regions for group_id=" - FMTu64 ".", fm->group_id); - return 0; - } - - for (region = regions; *region != DM_STATS_REGIONS_ALL; region++) - nr_regions++; - - if (!nr_regions) - log_warn("File contains no extents: exiting."); - - if (nr_regions && (regions[0] != fm->group_id)) { - log_warn("group_id changed from " FMTu64 " to " FMTu64, - fm->group_id, regions[0]); - fm->group_id = regions[0]; - } - free(regions); - fm->nr_regions = nr_regions; - return 1; -} - -static int _dmfilemapd(struct filemap_monitor *fm) -{ - int running = 1, check = 0, open = 0; - const char *program_id; - struct dm_stats *dms; - - /* - * The correct program_id is retrieved from the group leader - * following the call to dm_stats_list(). - */ - if (!(dms = dm_stats_create(NULL))) - goto_bad; - - if (!dm_stats_bind_from_fd(dms, fm->fd)) { - log_error("Could not bind dm_stats handle to file descriptor " - "%d", fm->fd); - goto bad; - } - - if (!_filemap_monitor_set_notify(fm)) - goto bad; - - if (!_filemap_fd_update_blocks(fm)) - goto bad; - - if (!dm_stats_list(dms, DM_STATS_ALL_PROGRAMS)) { - log_error("Failed to list stats handle."); - goto bad; - } - - /* - * Take the program_id for new regions (created by calls to - * dm_stats_update_regions_from_fd()) from the value used by - * the group leader. - */ - program_id = dm_stats_get_region_program_id(dms, fm->group_id); - if (program_id) - fm->program_id = strdup(program_id); - else - fm->program_id = NULL; - dm_stats_set_program_id(dms, 1, program_id); - - do { - if (!dm_stats_group_present(dms, fm->group_id)) { - log_info("Filemap group removed: exiting."); - running = 0; - continue; - } - - if ((check = _filemap_monitor_get_events(fm)) < 0) - goto bad; - - if (!check) - goto wait; - - if ((check = _filemap_fd_check_changed(fm)) < 0) - goto bad; - - if (check && !_update_regions(dms, fm)) - goto bad; - - running = !!fm->nr_regions; - if (!running) - continue; - -wait: - _filemap_monitor_wait(FILEMAPD_WAIT_USECS); - - /* mode=inode termination condions */ - if (fm->mode == DM_FILEMAPD_FOLLOW_INODE) { - if (!_filemap_monitor_check_file_unlinked(fm)) - goto bad; - if (fm->deleted && !(open = _is_open(fm->path))) { - log_info("File unlinked and closed: exiting."); - running = 0; - } else if (fm->deleted && open) - log_verbose("File unlinked and open: " - "continuing."); - } - - if (!dm_stats_list(dms, NULL)) { - log_error("Failed to list stats handle."); - goto bad; - } - - } while (running); - - _filemap_monitor_destroy(fm); - dm_stats_destroy(dms); - return 0; - -bad: - _filemap_monitor_destroy(fm); - dm_stats_destroy(dms); - log_error("Exiting"); - return 1; -} - -static const char * const _mode_names[] = { - "inode", - "path" -}; - -/* - * dmfilemapd <fd> <group_id> <path> <mode> [<foreground>[<log_level>]] - */ -int main(int argc, char **argv) -{ - struct filemap_monitor fm; - - memset(&fm, 0, sizeof(fm)); - - if (!_parse_args(argc, argv, &fm)) { - free(fm.path); - return 1; - } - - _setup_logging(); - - log_info("Starting dmfilemapd with fd=%d, group_id=" FMTu64 " " - "mode=%s, path=%s", fm.fd, fm.group_id, - _mode_names[fm.mode], fm.path); - - if (!_foreground && !_daemonise(&fm)) { - free(fm.path); - return 1; - } - - return _dmfilemapd(&fm); -} diff --git a/libdm/dm-tools/.gitignore b/libdm/dm-tools/.gitignore index c42a5e0..5274cda 100644 --- a/libdm/dm-tools/.gitignore +++ b/libdm/dm-tools/.gitignore @@ -1 +1,2 @@ dmsetup +dmfilemapd diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in index b8d83ac..39d411d 100644 --- a/libdm/dm-tools/Makefile.in +++ b/libdm/dm-tools/Makefile.in @@ -16,8 +16,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -SOURCES=\ - SOURCES2=\ dmsetup.c @@ -36,8 +34,6 @@ CLEAN_TARGETS = $(TARGETS_DM) \ include $(top_builddir)/libdm/make.tmpl -device-mapper: $(TARGETS_DM) - CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) dmsetup: dmsetup.o @@ -67,3 +63,41 @@ install_dmsetup_static: dmsetup.static install_device-mapper: $(INSTALL_DMSETUP_TARGETS) install: install_device-mapper + +# dmfilemapd support +ifeq ("@BUILD_DMFILEMAPD@", "yes") + SOURCES += dmfilemapd.c + TARGETS_DM += dmfilemapd + .PHONY: install_dmfilemapd install_dmfilemapd_static + INSTALL_DMFILEMAPD_TARGETS = install_dmfilemapd_dynamic + ifeq ("@STATIC_LINK@", "yes") + TARGETS_DM += dmfilemapd.static + else + TARGETS_DM += dmfilemapd + endif + CLEAN_TARGETS+= dmfilemapd.static + + CFLAGS_dmfilemapd.o += $(EXTRA_EXEC_CFLAGS) + + dmfilemapd: $(LIB_SHARED) dmfilemapd.o + $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ + -o $@ dmfilemapd.o -L$(top_builddir)/libdm -ldevmapper $(DL_LIBS) $(LIBS) + + dmfilemapd.static: $(LIB_STATIC) dmfilemapd.o + $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L$(interfacebuilddir) \ + -o $@ dmfilemapd.o $(DL_LIBS) $(LIBS) $(STATIC_LIBS) + + install_dmfilemapd_dynamic: dmfilemapd + $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) + + install_dmfilemapd_static: dmfilemapd.static + $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) + + install_dmfilemapd: $(INSTALL_DMFILEMAPD_TARGETS) + + install_device-mapper: install_dmfilemapd + + install: install_dmfilemapd +endif + +device-mapper: $(TARGETS_DM) diff --git a/libdm/dm-tools/dmfilemapd.c b/libdm/dm-tools/dmfilemapd.c new file mode 100644 index 0000000..0b17c2b --- /dev/null +++ b/libdm/dm-tools/dmfilemapd.c @@ -0,0 +1,835 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * It includes tree drawing code based on pstree: http://psmisc.sourceforge.net/ + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "util.h" +#include "libdm/misc/dm-logging.h" + +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <fcntl.h> +#include <sys/inotify.h> +#include <dirent.h> +#include <ctype.h> + +#ifdef __linux__ +# include "libdm/misc/kdev_t.h" +#else +# define MAJOR(x) major((x)) +# define MINOR(x) minor((x)) +# define MKDEV(x,y) makedev((x),(y)) +#endif + +#define DEFAULT_PROC_DIR "/proc" + +/* limit to two updates/sec */ +#define FILEMAPD_WAIT_USECS 500000 + +/* how long to wait for unlinked files */ +#define FILEMAPD_NOFILE_WAIT_USECS 100000 +#define FILEMAPD_NOFILE_WAIT_TRIES 10 + +struct filemap_monitor { + dm_filemapd_mode_t mode; + const char *program_id; + uint64_t group_id; + char *path; + int fd; + + int inotify_fd; + int inotify_watch_fd; + + /* monitoring heuristics */ + int64_t blocks; /* allocated blocks, from stat.st_blocks */ + uint64_t nr_regions; + int deleted; +}; + +static int _foreground; +static int _verbose; + +const char *const _usage = "dmfilemapd <fd> <group_id> <abs_path> <mode> " + "[<foreground>[<log_level>]]"; + +/* + * Daemon logging. By default, all messages are thrown away: messages + * are only written to the terminal if the daemon is run in the foreground. + */ +__attribute__((format(printf, 5, 0))) +static void _dmfilemapd_log_line(int level, + const char *file __attribute__((unused)), + int line __attribute__((unused)), + int dm_errno_or_class, + const char *f, va_list ap) +{ + static int _abort_on_internal_errors = -1; + FILE *out = log_stderr(level) ? stderr : stdout; + + level = log_level(level); + + if (level <= _LOG_WARN || _verbose) { + if (level < _LOG_WARN) + out = stderr; + vfprintf(out, f, ap); + fputc('\n', out); + } + + if (_abort_on_internal_errors < 0) + /* Set when env DM_ABORT_ON_INTERNAL_ERRORS is not "0" */ + _abort_on_internal_errors = + strcmp(getenv("DM_ABORT_ON_INTERNAL_ERRORS") ? : "0", "0"); + + if (_abort_on_internal_errors && + !strncmp(f, INTERNAL_ERROR, sizeof(INTERNAL_ERROR) - 1)) + abort(); +} + +__attribute__((format(printf, 5, 6))) +static void _dmfilemapd_log_with_errno(int level, + const char *file, int line, + int dm_errno_or_class, + const char *f, ...) +{ + va_list ap; + + va_start(ap, f); + _dmfilemapd_log_line(level, file, line, dm_errno_or_class, f, ap); + va_end(ap); +} + +/* + * Only used for reporting errors before daemonise(). + */ +__attribute__((format(printf, 1, 2))) +static void _early_log(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + fputc('\n', stderr); + va_end(ap); +} + +static void _setup_logging(void) +{ + dm_log_init_verbose(_verbose - 1); + dm_log_with_errno_init(_dmfilemapd_log_with_errno); +} + +#define PROC_FD_DELETED_STR "(deleted)" +/* + * Scan the /proc/<pid>/fd directory for pid and check for an fd + * symlink whose contents match path. + */ +static int _is_open_in_pid(pid_t pid, const char *path) +{ + char deleted_path[PATH_MAX + sizeof(PROC_FD_DELETED_STR)]; + struct dirent *pid_dp = NULL; + char path_buf[PATH_MAX]; + char link_buf[PATH_MAX]; + DIR *pid_d = NULL; + ssize_t len; + + if (pid == getpid()) + return 0; + + if (dm_snprintf(path_buf, sizeof(path_buf), + DEFAULT_PROC_DIR "%d/fd", pid) < 0) { + log_error("Could not format pid path."); + return 0; + } + + /* + * Test for the kernel 'file (deleted)' form when scanning. + */ + if (dm_snprintf(deleted_path, sizeof(deleted_path), "%s %s", + path, PROC_FD_DELETED_STR) < 0) { + log_error("Could not format check path."); + return 0; + } + + pid_d = opendir(path_buf); + if (!pid_d) { + log_error("Could not open proc path: %s.", path_buf); + return 0; + } + + while ((pid_dp = readdir(pid_d)) != NULL) { + if (pid_dp->d_name[0] == '.') + continue; + if ((len = readlinkat(dirfd(pid_d), pid_dp->d_name, link_buf, + sizeof(link_buf))) < 0) { + log_error("readlink failed for " DEFAULT_PROC_DIR + "/%d/fd/.", pid); + goto bad; + } + link_buf[len] = '\0'; + if (!strcmp(deleted_path, link_buf)) { + if (closedir(pid_d)) + log_sys_error("closedir", path_buf); + return 1; + } + } + +bad: + if (closedir(pid_d)) + log_sys_error("closedir", path_buf); + + return 0; +} + +/* + * Attempt to determine whether a file is open by any process by + * scanning symbolic links in /proc/<pid>/fd. + * + * This is a heuristic since it cannot guarantee to detect brief + * access in all cases: a process that opens and then closes the + * file rapidly may never be seen by the scan. + * + * The method will also give false-positives if a process exists + * that has a deleted file open that had the same path, but a + * different inode number, to the file being monitored. + * + * For this reason the daemon only uses _is_open() for unlinked + * files when the mode is DM_FILEMAPD_FOLLOW_INODE, since these + * files can no longer be newly opened by processes. + * + * In this situation !is_open(path) provides an indication that + * the daemon should shut down: the file has been unlinked from + * the file system and we appear to hold the final reference. + */ +static int _is_open(const char *path) +{ + struct dirent *proc_dp = NULL; + DIR *proc_d = NULL; + pid_t pid; + + proc_d = opendir(DEFAULT_PROC_DIR); + if (!proc_d) + return 0; + while ((proc_dp = readdir(proc_d)) != NULL) { + if (!isdigit(proc_dp->d_name[0])) + continue; + errno = 0; + pid = (pid_t) strtol(proc_dp->d_name, NULL, 10); + if (errno || !pid) + continue; + if (_is_open_in_pid(pid, path)) { + if (closedir(proc_d)) + log_sys_error("closedir", DEFAULT_PROC_DIR); + return 1; + } + } + + if (closedir(proc_d)) + log_sys_error("closedir", DEFAULT_PROC_DIR); + + return 0; +} + +static void _filemap_monitor_wait(uint64_t usecs) +{ + if (_verbose) { + if (usecs == FILEMAPD_WAIT_USECS) + log_very_verbose("Waiting for check interval"); + if (usecs == FILEMAPD_NOFILE_WAIT_USECS) + log_very_verbose("Waiting for unlinked path"); + } + usleep((useconds_t) usecs); +} + +static int _parse_args(int argc, char **argv, struct filemap_monitor *fm) +{ + char *endptr; + + /* we don't care what is in argv[0]. */ + argc--; + argv++; + + if (argc < 5) { + _early_log("Wrong number of arguments."); + _early_log("usage: %s", _usage); + return 0; + } + + /* + * We don't know the true nr_regions at daemon start time, + * and it is not worth a dm_stats_list()/group walk to count: + * we can assume that there is at least one region or the + * daemon would not have been started. + * + * A correct value will be obtained following the first update + * of the group's regions. + */ + fm->nr_regions = 1; + + /* parse <fd> */ + errno = 0; + fm->fd = (int) strtol(argv[0], &endptr, 10); + if (errno || *endptr) { + _early_log("Could not parse file descriptor: %s", argv[0]); + return 0; + } + + argc--; + argv++; + + /* parse <group_id> */ + errno = 0; + fm->group_id = strtoull(argv[0], &endptr, 10); + if (*endptr || errno) { + _early_log("Could not parse group identifier: %s", argv[0]); + return 0; + } + + argc--; + argv++; + + /* parse <path> */ + if (!argv[0] || !strlen(argv[0])) { + _early_log("Path argument is required."); + return 0; + } + + if (*argv[0] != '/') { + _early_log("Path argument must specify an absolute path."); + return 0; + } + + fm->path = strdup(argv[0]); + if (!fm->path) { + _early_log("Could not allocate memory for path argument."); + return 0; + } + + argc--; + argv++; + + /* parse <mode> */ + if (!argv[0] || !strlen(argv[0])) { + _early_log("Mode argument is required."); + return 0; + } + + fm->mode = dm_filemapd_mode_from_string(argv[0]); + if (fm->mode == DM_FILEMAPD_FOLLOW_NONE) + return 0; + + argc--; + argv++; + + /* parse [<foreground>[<verbose>]] */ + if (argc) { + errno = 0; + _foreground = (int) strtol(argv[0], &endptr, 10); + if (errno || *endptr) { + _early_log("Could not parse debug argument: %s.", + argv[0]); + return 0; + } + argc--; + argv++; + if (argc) { + errno = 0; + _verbose = (int) strtol(argv[0], &endptr, 10); + if (errno || *endptr) { + _early_log("Could not parse verbose " + "argument: %s", argv[0]); + return 0; + } + if (_verbose < 0 || _verbose > 3) { + _early_log("Verbose argument out of range: %d.", + _verbose); + return 0; + } + } + } + return 1; +} + +static int _filemap_fd_update_blocks(struct filemap_monitor *fm) +{ + struct stat buf; + + if (fm->fd < 0) { + log_error("Filemap fd is not open."); + return 0; + } + + if (fstat(fm->fd, &buf)) { + log_error("Failed to fstat filemap file descriptor."); + return 0; + } + + fm->blocks = buf.st_blocks; + + return 1; +} + +static int _filemap_fd_check_changed(struct filemap_monitor *fm) +{ + int64_t old_blocks; + + old_blocks = fm->blocks; + + if (!_filemap_fd_update_blocks(fm)) + return -1; + + return (fm->blocks != old_blocks); +} + +static void _filemap_monitor_close_fd(struct filemap_monitor *fm) +{ + if (close(fm->fd)) + log_error("Error closing file descriptor."); + fm->fd = -1; +} + +static void _filemap_monitor_end_notify(struct filemap_monitor *fm) +{ + inotify_rm_watch(fm->inotify_fd, fm->inotify_watch_fd); +} + +static int _filemap_monitor_set_notify(struct filemap_monitor *fm) +{ + int inotify_fd, watch_fd; + + /* + * Set IN_NONBLOCK since we do not want to block in event read() + * calls. Do not set IN_CLOEXEC as dmfilemapd is single-threaded + * and does not fork or exec. + */ + if ((inotify_fd = inotify_init1(IN_NONBLOCK)) < 0) { + log_sys_error("inotify_init1", "IN_NONBLOCK"); + return 0; + } + + if ((watch_fd = inotify_add_watch(inotify_fd, fm->path, + IN_MODIFY | IN_DELETE_SELF)) < 0) { + log_sys_error("inotify_add_watch", fm->path); + return 0; + } + fm->inotify_fd = inotify_fd; + fm->inotify_watch_fd = watch_fd; + return 1; +} + +static int _filemap_monitor_reopen_fd(struct filemap_monitor *fm) +{ + int tries = FILEMAPD_NOFILE_WAIT_TRIES; + + /* + * In DM_FILEMAPD_FOLLOW_PATH mode, inotify watches must be + * re-established whenever the file at the watched path is + * changed. + * + * FIXME: stat file and skip if inode is unchanged. + */ + if (fm->fd > 0) + log_error("Filemap file descriptor already open."); + + while ((fm->fd < 0) && --tries) + if (((fm->fd = open(fm->path, O_RDONLY)) < 0) && tries) + _filemap_monitor_wait(FILEMAPD_NOFILE_WAIT_USECS); + + if (!tries && (fm->fd < 0)) { + log_error("Could not re-open file descriptor."); + return 0; + } + + return _filemap_monitor_set_notify(fm); +} + +static int _filemap_monitor_get_events(struct filemap_monitor *fm) +{ + /* alignment as per man(7) inotify */ + char buf[sizeof(struct inotify_event) + NAME_MAX + 1] + __attribute__ ((aligned(__alignof__(struct inotify_event)))); + + struct inotify_event *event; + int check = 0; + ssize_t len; + char *ptr; + + /* + * Close the file descriptor for the file being monitored here + * when mode=path: this will allow the inode to be de-allocated, + * and an IN_DELETE_SELF event generated in the case that the + * daemon is holding the last open reference to the file. + */ + if (fm->mode == DM_FILEMAPD_FOLLOW_PATH) { + _filemap_monitor_end_notify(fm); + _filemap_monitor_close_fd(fm); + } + + len = read(fm->inotify_fd, (void *) &buf, sizeof(buf)); + + /* no events to read? */ + if (len < 0 && (errno == EAGAIN)) + goto out; + + /* interrupted by signal? */ + if (len < 0 && (errno == EINTR)) + goto out; + + if (len < 0) + return -1; + + if (!len) + goto out; + + for (ptr = buf; ptr < buf + len; ptr += sizeof(*event) + event->len) { + event = (struct inotify_event *) ptr; + if (event->mask & IN_DELETE_SELF) + fm->deleted = 1; + if (event->mask & IN_MODIFY) + check = 1; + /* + * Event IN_IGNORED is generated when a file has been deleted + * and IN_DELETE_SELF generated, and indicates that the file + * watch has been automatically removed. + * + * This can only happen for the DM_FILEMAPD_FOLLOW_PATH mode, + * since inotify IN_DELETE events are generated at the time + * the inode is destroyed: DM_FILEMAPD_FOLLOW_INODE will hold + * the file descriptor open, meaning that the event will not + * be generated until after the daemon closes the file. + * + * The event is ignored here since inotify monitoring will + * be reestablished (or the daemon will terminate) following + * deletion of a DM_FILEMAPD_FOLLOW_PATH monitored file. + */ + if (event->mask & IN_IGNORED) + log_very_verbose("Inotify watch removed: IN_IGNORED " + "in event->mask"); + } + +out: + /* + * Re-open file descriptor if required and log disposition. + */ + if (fm->mode == DM_FILEMAPD_FOLLOW_PATH) + if (!_filemap_monitor_reopen_fd(fm)) + return -1; + + log_very_verbose("exiting _filemap_monitor_get_events() with " + "deleted=%d, check=%d", fm->deleted, check); + return check; +} + +static void _filemap_monitor_destroy(struct filemap_monitor *fm) +{ + if (fm->fd > 0) { + _filemap_monitor_end_notify(fm); + _filemap_monitor_close_fd(fm); + } + free((void *) fm->program_id); + free(fm->path); +} + +static int _filemap_monitor_check_same_file(int fd1, int fd2) +{ + struct stat buf1, buf2; + + if ((fd1 < 0) || (fd2 < 0)) + return 0; + + if (fstat(fd1, &buf1)) { + log_error("Failed to fstat file descriptor %d", fd1); + return -1; + } + + if (fstat(fd2, &buf2)) { + log_error("Failed to fstat file descriptor %d", fd2); + return -1; + } + + return ((buf1.st_dev == buf2.st_dev) && (buf1.st_ino == buf2.st_ino)); +} + +static int _filemap_monitor_check_file_unlinked(struct filemap_monitor *fm) +{ + char path_buf[PATH_MAX]; + char link_buf[PATH_MAX]; + int same, fd; + ssize_t len; + + fm->deleted = 0; + same = 0; + + if ((fd = open(fm->path, O_RDONLY)) < 0) + goto check_unlinked; + + same = _filemap_monitor_check_same_file(fm->fd, fd); + + if (close(fd)) + log_error("Error closing fd %d", fd); + + if (same < 0) + return 0; + + if (same) + return 1; + +check_unlinked: + /* + * The file has been unlinked from its original location: test + * whether it is still reachable in the filesystem, or if it is + * unlinked and anonymous. + */ + if (dm_snprintf(path_buf, sizeof(path_buf), DEFAULT_PROC_DIR + "/%d/fd/%d", getpid(), fm->fd) < 0) { + log_error("Could not format pid path."); + return 0; + } + if ((len = readlink(path_buf, link_buf, sizeof(link_buf) - 1)) < 0) { + log_error("readlink failed for " DEFAULT_PROC_DIR "/%d/fd/%d.", + getpid(), fm->fd); + return 0; + } + link_buf[len] = '\0'; + + /* + * Try to re-open the file, from the path now reported in /proc/pid/fd. + */ + if ((fd = open(link_buf, O_RDONLY)) < 0) + fm->deleted = 1; + else + same = _filemap_monitor_check_same_file(fm->fd, fd); + + if ((fd >= 0) && close(fd)) + log_error("Error closing fd %d", fd); + + if (same < 0) + return 0; + + /* Should not happen with normal /proc. */ + if ((fd > 0) && !same) { + log_error("File descriptor mismatch: %d and %s (read from %s) " + "are not the same file!", fm->fd, link_buf, path_buf); + return 0; + } + return 1; +} + +static int _daemonise(struct filemap_monitor *fm) +{ + pid_t pid = 0, sid; + int fd; + + if (!(sid = setsid())) { + _early_log("setsid failed."); + return 0; + } + + if ((pid = fork()) < 0) { + _early_log("Failed to fork daemon process."); + return 0; + } + + if (pid > 0) { + if (_verbose) + _early_log("Started dmfilemapd with pid=%d", pid); + exit(0); + } + + if (chdir("/")) { + _early_log("Failed to change directory."); + return 0; + } + + if (!_verbose) { + if (close(STDIN_FILENO)) + _early_log("Error closing stdin"); + if (close(STDOUT_FILENO)) + _early_log("Error closing stdout"); + if (close(STDERR_FILENO)) + _early_log("Error closing stderr"); + if ((open("/dev/null", O_RDONLY) < 0) || + (open("/dev/null", O_WRONLY) < 0) || + (open("/dev/null", O_WRONLY) < 0)) { + _early_log("Error opening stdio streams."); + return 0; + } + } + /* TODO: Use libdaemon/server/daemon-server.c _daemonise() */ + for (fd = (int) sysconf(_SC_OPEN_MAX) - 1; fd > STDERR_FILENO; fd--) { + if (fd == fm->fd) + continue; + (void) close(fd); + } + + return 1; +} + +static int _update_regions(struct dm_stats *dms, struct filemap_monitor *fm) +{ + uint64_t *regions = NULL, *region, nr_regions = 0; + + regions = dm_stats_update_regions_from_fd(dms, fm->fd, fm->group_id); + if (!regions) { + log_error("Failed to update filemap regions for group_id=" + FMTu64 ".", fm->group_id); + return 0; + } + + for (region = regions; *region != DM_STATS_REGIONS_ALL; region++) + nr_regions++; + + if (!nr_regions) + log_warn("File contains no extents: exiting."); + + if (nr_regions && (regions[0] != fm->group_id)) { + log_warn("group_id changed from " FMTu64 " to " FMTu64, + fm->group_id, regions[0]); + fm->group_id = regions[0]; + } + free(regions); + fm->nr_regions = nr_regions; + return 1; +} + +static int _dmfilemapd(struct filemap_monitor *fm) +{ + int running = 1, check = 0, open = 0; + const char *program_id; + struct dm_stats *dms; + + /* + * The correct program_id is retrieved from the group leader + * following the call to dm_stats_list(). + */ + if (!(dms = dm_stats_create(NULL))) + goto_bad; + + if (!dm_stats_bind_from_fd(dms, fm->fd)) { + log_error("Could not bind dm_stats handle to file descriptor " + "%d", fm->fd); + goto bad; + } + + if (!_filemap_monitor_set_notify(fm)) + goto bad; + + if (!_filemap_fd_update_blocks(fm)) + goto bad; + + if (!dm_stats_list(dms, DM_STATS_ALL_PROGRAMS)) { + log_error("Failed to list stats handle."); + goto bad; + } + + /* + * Take the program_id for new regions (created by calls to + * dm_stats_update_regions_from_fd()) from the value used by + * the group leader. + */ + program_id = dm_stats_get_region_program_id(dms, fm->group_id); + if (program_id) + fm->program_id = strdup(program_id); + else + fm->program_id = NULL; + dm_stats_set_program_id(dms, 1, program_id); + + do { + if (!dm_stats_group_present(dms, fm->group_id)) { + log_info("Filemap group removed: exiting."); + running = 0; + continue; + } + + if ((check = _filemap_monitor_get_events(fm)) < 0) + goto bad; + + if (!check) + goto wait; + + if ((check = _filemap_fd_check_changed(fm)) < 0) + goto bad; + + if (check && !_update_regions(dms, fm)) + goto bad; + + running = !!fm->nr_regions; + if (!running) + continue; + +wait: + _filemap_monitor_wait(FILEMAPD_WAIT_USECS); + + /* mode=inode termination condions */ + if (fm->mode == DM_FILEMAPD_FOLLOW_INODE) { + if (!_filemap_monitor_check_file_unlinked(fm)) + goto bad; + if (fm->deleted && !(open = _is_open(fm->path))) { + log_info("File unlinked and closed: exiting."); + running = 0; + } else if (fm->deleted && open) + log_verbose("File unlinked and open: " + "continuing."); + } + + if (!dm_stats_list(dms, NULL)) { + log_error("Failed to list stats handle."); + goto bad; + } + + } while (running); + + _filemap_monitor_destroy(fm); + dm_stats_destroy(dms); + return 0; + +bad: + _filemap_monitor_destroy(fm); + dm_stats_destroy(dms); + log_error("Exiting"); + return 1; +} + +static const char * const _mode_names[] = { + "inode", + "path" +}; + +/* + * dmfilemapd <fd> <group_id> <path> <mode> [<foreground>[<log_level>]] + */ +int main(int argc, char **argv) +{ + struct filemap_monitor fm; + + memset(&fm, 0, sizeof(fm)); + + if (!_parse_args(argc, argv, &fm)) { + free(fm.path); + return 1; + } + + _setup_logging(); + + log_info("Starting dmfilemapd with fd=%d, group_id=" FMTu64 " " + "mode=%s, path=%s", fm.fd, fm.group_id, + _mode_names[fm.mode], fm.path); + + if (!_foreground && !_daemonise(&fm)) { + free(fm.path); + return 1; + } + + return _dmfilemapd(&fm); +}

1 0

master - dmsetup: move to libdm/dm-tools/dmsetup
by Joe Thornber 14 Jun '18

14 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0524829af69935070b7b1… Commit: 0524829af69935070b7b15c1bede8f7f4afc9a13 Parent: e53cfc6a88d7acafde6ba3fa293bcf15b9a033bc Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Thu Jun 14 13:08:33 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 14 13:10:17 2018 +0100 dmsetup: move to libdm/dm-tools/dmsetup links against libdevmapper again. no longer includes code from lvm. --- configure | 6 +- configure.ac | 1 + libdm/Makefile.in | 2 + libdm/dm-tools/.gitignore | 1 + libdm/dm-tools/Makefile.in | 69 + libdm/dm-tools/dmsetup.c | 7463 ++++++++++++++++++++++++++++++++++++++++++++ libdm/dm-tools/util.h | 79 + tools/Makefile.in | 40 +- tools/dmsetup.c | 7460 ------------------------------------------- 9 files changed, 7623 insertions(+), 7498 deletions(-) diff --git a/configure b/configure index 323ab4a..ed3a315 100755 --- a/configure +++ b/configure @@ -11527,7 +11527,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -13611,7 +13611,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/blkdeactivate.sh scr ipts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile tools/Makefile udev/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scri pts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile tools/Makefile udev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14340,6 +14340,7 @@ do "libdaemon/client/Makefile") CONFIG_FILES="$CONFIG_FILES libdaemon/client/Makefile" ;; "libdaemon/server/Makefile") CONFIG_FILES="$CONFIG_FILES libdaemon/server/Makefile" ;; "libdm/Makefile") CONFIG_FILES="$CONFIG_FILES libdm/Makefile" ;; + "libdm/dm-tools/Makefile") CONFIG_FILES="$CONFIG_FILES libdm/dm-tools/Makefile" ;; "libdm/libdevmapper.pc") CONFIG_FILES="$CONFIG_FILES libdm/libdevmapper.pc" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; @@ -14359,7 +14360,6 @@ do "scripts/lvm2_lvmpolld_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmpolld_systemd_red_hat.service" ;; "scripts/lvm2_lvmpolld_systemd_red_hat.socket") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmpolld_systemd_red_hat.socket" ;; "scripts/lvm2_lvmlockd_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmlockd_systemd_red_hat.service" ;; - "scripts/lvm2_lvmlocking_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmlocking_systemd_red_hat.service" ;; "scripts/lvm2_monitoring_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_init_red_hat" ;; "scripts/lvm2_monitoring_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_systemd_red_hat.service" ;; "scripts/lvm2_pvscan_systemd_red_hat@.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_pvscan_systemd_red_hat@.service" ;; diff --git a/configure.ac b/configure.ac index 4c431e4..42f19fd 100644 --- a/configure.ac +++ b/configure.ac @@ -1785,6 +1785,7 @@ libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile +libdm/dm-tools/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile diff --git a/libdm/Makefile.in b/libdm/Makefile.in index eeef080..6472da7 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -16,6 +16,8 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ +SUBDIRS=dm-tools + SOURCES =\ datastruct/bitset.c \ datastruct/hash.c \ diff --git a/libdm/dm-tools/.gitignore b/libdm/dm-tools/.gitignore new file mode 100644 index 0000000..c42a5e0 --- /dev/null +++ b/libdm/dm-tools/.gitignore @@ -0,0 +1 @@ +dmsetup diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in new file mode 100644 index 0000000..b8d83ac --- /dev/null +++ b/libdm/dm-tools/Makefile.in @@ -0,0 +1,69 @@ +# +# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. +# Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved. +# +# This file is part of LVM2. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ + +SOURCES=\ + +SOURCES2=\ + dmsetup.c + +TARGETS_DM = dmsetup + +INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic + +ifeq ("@STATIC_LINK@", "yes") + TARGETS_DM += dmsetup.static + INSTALL_DMSETUP_TARGETS += install_dmsetup_static +endif + +CLEAN_TARGETS = $(TARGETS_DM) \ + dmsetup.static \ + $(LDDEPS) .exported_symbols_generated + +include $(top_builddir)/libdm/make.tmpl + +device-mapper: $(TARGETS_DM) + +CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) + +dmsetup: dmsetup.o + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ + -o $@ $+ $(LIBS) -L$(top_builddir)/libdm -ldevmapper -lm + +dmsetup.static: dmsetup.o $(INTERNAL_LIBS) + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ + -o $@ $+ $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) + +all: device-mapper + +.PHONY: install_dmsetup_dynamic install_dmsetup_static + +install_dmsetup_dynamic: dmsetup + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) + $(Q) $(LN_S) -f $(<F) $(sbindir)/dmstats + +install_dmsetup_static: dmsetup.static + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) + $(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats + +install_device-mapper: $(INSTALL_DMSETUP_TARGETS) + +install: install_device-mapper diff --git a/libdm/dm-tools/dmsetup.c b/libdm/dm-tools/dmsetup.c new file mode 100644 index 0000000..83786f4 --- /dev/null +++ b/libdm/dm-tools/dmsetup.c @@ -0,0 +1,7463 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2018 Red Hat, Inc. All rights reserved. + * Copyright (C) 2005-2007 NEC Corporation + * + * This file is part of the device-mapper userspace tools. + * + * It includes tree drawing code based on pstree: http://psmisc.sourceforge.net/ + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +// For canonicalize_file_name() +#define _GNU_SOURCE +#include <stdlib.h> + +#include "libdm/misc/dm-logging.h" +#include "libdm/dm-tools/util.h" +#include "configure.h" + +#include <ctype.h> +#include <dirent.h> +#include <fcntl.h> +#include <langinfo.h> +#include <locale.h> +#include <stdlib.h> +#include <sys/param.h> +#include <sys/stat.h> +#include <sys/wait.h> +#include <time.h> +#include <unistd.h> + +#ifdef UDEV_SYNC_SUPPORT +# include <sys/types.h> +# include <sys/ipc.h> +# include <sys/sem.h> +# include <libudev.h> +#endif + +/* FIXME Unused so far */ +#undef HAVE_SYS_STATVFS_H + +#ifdef HAVE_SYS_STATVFS_H +# include <sys/statvfs.h> +#endif + +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif + +#ifdef HAVE_SYS_TIMERFD_H +# include <sys/timerfd.h> +#endif + +#ifdef HAVE_TERMIOS_H +# include <termios.h> +#endif + +#ifdef HAVE_GETOPTLONG +# include <getopt.h> +# define GETOPTLONG_FN(a, b, c, d, e) getopt_long((a), (b), (c), (d), (e)) +# define OPTIND_INIT 0 +#else +struct option { +}; +# define GETOPTLONG_FN(a, b, c, d, e) getopt((a), (b), (c)) +# define OPTIND_INIT 1 +#endif + +#ifndef TEMP_FAILURE_RETRY +# define TEMP_FAILURE_RETRY(expression) \ + (__extension__ \ + ({ long int __result; \ + do __result = (long int) (expression); \ + while (__result == -1L && errno == EINTR); \ + __result; })) +#endif + +#ifdef __linux__ +# include "libdm/misc/kdev_t.h" +#else +# define MAJOR(x) major((x)) +# define MINOR(x) minor((x)) +# define MKDEV(x,y) makedev((x),(y)) +#endif + +#define LINE_SIZE 4096 +#define ARGS_MAX 256 +#define LOOP_TABLE_SIZE (PATH_MAX + 255) + +#define DEFAULT_DM_DEV_DIR "/dev/" + +#define DM_DEV_DIR_ENV_VAR_NAME "DM_DEV_DIR" +#define DM_UDEV_COOKIE_ENV_VAR_NAME "DM_UDEV_COOKIE" + +/* FIXME Should be imported */ +#ifndef DM_MAX_TYPE_NAME +# define DM_MAX_TYPE_NAME 16 +#endif + +/* FIXME Should be elsewhere */ +#define SECTOR_SHIFT 9L + +/* program_id used for dmstats-managed statistics regions */ +#define DM_STATS_PROGRAM_ID "dmstats" + +/* + * Basic commands this code implments. + */ +typedef enum { + DMSETUP_CMD = 0, + LOSETUP_CMD = 1, + DMLOSETUP_CMD = 2, + DMSTATS_CMD = 3, + DMSETUP_STATS_CMD = 4, + DEVMAP_NAME_CMD = 5 +} cmd_name_t; + +typedef enum { + DMSETUP_TYPE = 0, + LOSETUP_TYPE = 1, + STATS_TYPE = 2, + DEVMAP_NAME_TYPE = 3 +} cmd_type_t; + +#define DMSETUP_CMD_NAME "dmsetup" +#define LOSETUP_CMD_NAME "losetup" +#define DMLOSETUP_CMD_NAME "dmlosetup" +#define DMSTATS_CMD_NAME "dmstats" +#define DMSETUP_STATS_CMD_NAME "dmsetup stats" +#define DEVMAP_NAME_CMD_NAME "devmap_name" + +static const struct { + cmd_name_t command; + const char name[14]; + cmd_type_t type; +} _base_commands[] = { + { DMSETUP_CMD, DMSETUP_CMD_NAME, DMSETUP_TYPE }, + { LOSETUP_CMD, LOSETUP_CMD_NAME, LOSETUP_TYPE }, + { DMLOSETUP_CMD, DMLOSETUP_CMD_NAME, LOSETUP_TYPE }, + { DMSTATS_CMD, DMSTATS_CMD_NAME, STATS_TYPE }, + { DMSETUP_STATS_CMD, DMSETUP_STATS_CMD_NAME, STATS_TYPE }, + { DEVMAP_NAME_CMD, DEVMAP_NAME_CMD_NAME, DEVMAP_NAME_TYPE }, +}; + +static const int _num_base_commands = DM_ARRAY_SIZE(_base_commands); + +/* + * We have only very simple switches ATM. + */ +enum { + READ_ONLY = 0, + ADD_NODE_ON_CREATE_ARG, + ADD_NODE_ON_RESUME_ARG, + ALIAS_ARG, + ALL_DEVICES_ARG, + ALL_PROGRAMS_ARG, + ALL_REGIONS_ARG, + AREA_ARG, + AREAS_ARG, + AREA_SIZE_ARG, + CONCISE_ARG, + BOUNDS_ARG, + CHECKS_ARG, + CLEAR_ARG, + COLS_ARG, + COUNT_ARG, + DEFERRED_ARG, + SELECT_ARG, + EXEC_ARG, + FILEMAP_ARG, + FOLLOW_ARG, + FORCE_ARG, + FOREGROUND_ARG, + GID_ARG, + GROUP_ARG, + GROUP_ID_ARG, + HELP_ARG, + HISTOGRAM_ARG, + INACTIVE_ARG, + INTERVAL_ARG, + LENGTH_ARG, + MANGLENAME_ARG, + MAJOR_ARG, + REGIONS_ARG, + MINOR_ARG, + MODE_ARG, + NAMEPREFIXES_ARG, + NOFLUSH_ARG, + NOGROUP_ARG, + NOHEADINGS_ARG, + NOLOCKFS_ARG, + NOOPENCOUNT_ARG, + NOSUFFIX_ARG, + NOTABLE_ARG, + NOTIMESUFFIX_ARG, + UDEVCOOKIE_ARG, + NOMONITOR_ARG, + NOUDEVRULES_ARG, + NOUDEVSYNC_ARG, + OPTIONS_ARG, + PRECISE_ARG, + PROGRAM_ID_ARG, + RAW_ARG, + READAHEAD_ARG, + REGION_ARG, + REGION_ID_ARG, + RELATIVE_ARG, + RETRY_ARG, + ROWS_ARG, + SEPARATOR_ARG, + SETUUID_ARG, + SHOWKEYS_ARG, + SORT_ARG, + START_ARG, + TABLE_ARG, + TARGET_ARG, + SEGMENTS_ARG, + TREE_ARG, + UID_ARG, + UNBUFFERED_ARG, + UNITS_ARG, + UNQUOTED_ARG, + USER_DATA_ARG, + UUID_ARG, + VERBOSE_ARG, + VERIFYUDEV_ARG, + VERSION_ARG, + YES_ARG, + NUM_SWITCHES +}; + +typedef enum { + DR_TASK = 1, + DR_INFO = 2, + DR_DEPS = 4, + DR_TREE = 8, /* Complete dependency tree required */ + DR_NAME = 16, + DR_STATS = 32, /* Requires populated stats handle. */ + DR_STATS_META = 64, /* Requires listed stats handle. */ +} report_type_t; + +typedef enum { + DN_DEVNO, /* Major and minor number pair */ + DN_BLK, /* Block device name (e.g. dm-0) */ + DN_MAP /* Map name (for dm devices only, equal to DN_BLK otherwise) */ +} dev_name_t; + +static cmd_name_t _base_command = DMSETUP_CMD; /* Default command is 'dmsetup' */ +static cmd_type_t _base_command_type = DMSETUP_TYPE; +static int _switches[NUM_SWITCHES]; +static int _int_args[NUM_SWITCHES]; +static char *_string_args[NUM_SWITCHES]; +static int _num_devices; +static char *_uuid; +static char *_table; +static char *_target; +static char *_command_to_exec; /* --exec <command> */ +static const char *_command; /* dmsetup <command> */ +static uint32_t _read_ahead_flags; +static uint32_t _udev_cookie; +static int _udev_only; +static struct dm_tree *_dtree; +static struct dm_report *_report; +static report_type_t _report_type; +static dev_name_t _dev_name_type; +static uint64_t _count = 1; /* count of repeating reports */ +static struct dm_timestamp *_initial_timestamp = NULL; +static uint64_t _disp_factor = 512; /* display sizes in sectors */ +static char _disp_units = 's'; +const char *_program_id = DM_STATS_PROGRAM_ID; /* program_id used for reports. */ +static uint64_t _statstype = 0; /* stats objects to report */ +static int _concise_output_produced = 0; /* Was any concise output already printed? */ +struct command; +static const struct command *_selection_cmd = NULL; /* Command to run against each device select with -S */ + +/* string names for stats object types */ +const char *_stats_types[] = { + "all", + "area", + "region", + "group", + NULL +}; + +/* report timekeeping */ +static struct dm_timestamp *_cycle_timestamp = NULL; +#ifndef HAVE_SYS_TIMERFD_H +static struct dm_timestamp *_start_timestamp = NULL; +#else /* HAVE_SYS_TIMERFD_H */ +static int _timer_fd = -1; /* timerfd file descriptor. */ +#endif /* !HAVE_SYS_TIMERFD_H */ + +static uint64_t _interval = 0; /* configured interval in nsecs */ +static uint64_t _new_interval = 0; /* flag top-of-interval */ +static uint64_t _last_interval = 0; /* approx. measured interval in nsecs */ + +/* Invalid fd value used to signal end-of-reporting. */ +#define TIMER_STOPPED (-2) + +#define NSEC_PER_USEC UINT64_C(1000) +#define NSEC_PER_MSEC UINT64_C(1000000) +#define NSEC_PER_SEC UINT64_C(1000000000) + +/* + * Commands + */ + +#define CMD_ARGS const struct command *cmd, const char *subcommand, int argc, char **argv, struct dm_names *names, int multiple_devices +typedef int (*command_fn) (CMD_ARGS); + +struct command { + const char *name; + const char *help; + int min_args; + int max_args; + int repeatable_cmd; /* Repeat to process device list? */ + /* 2 means --select is also supported */ + int has_subcommands; /* Command implements sub-commands. */ + command_fn fn; +}; + +static int _parse_line(struct dm_task *dmt, char *buffer, const char *file, + int line) +{ + char ttype[LINE_SIZE], *ptr, *comment; + unsigned long long start, size; + int n; + + /* trim trailing space */ + for (ptr = buffer + strlen(buffer) - 1; ptr >= buffer; ptr--) + if (!isspace((int) *ptr)) + break; + ptr++; + *ptr = '\0'; + + /* trim leading space */ + for (ptr = buffer; *ptr && isspace((int) *ptr); ptr++) + ; + + if (!*ptr || *ptr == '#') + return 1; + + if (sscanf(ptr, "%llu %llu %s %n", + &start, &size, ttype, &n) < 3) { + log_error("Invalid format on line %d of table %s.", line, file); + return 0; + } + + ptr += n; + if ((comment = strchr(ptr, (int) '#'))) + *comment = '\0'; + + if (!dm_task_add_target(dmt, start, size, ttype, ptr)) + return_0; + + return 1; +} + +/* Parse multiple lines of table */ +static int _parse_table_lines(struct dm_task *dmt) +{ + char *pos = _table, *next_pos; + int line = 0; + + do { + /* Identify and terminate each line */ + if ((next_pos = strchr(_table, '\n'))) + *next_pos++ = '\0'; + if (!_parse_line(dmt, pos, "", ++line)) + return_0; + } while ((pos = next_pos)); + + return 1; +} + +static int _parse_file(struct dm_task *dmt, const char *file) +{ + char *buffer = NULL; + size_t buffer_size = 0; + FILE *fp; + int r = 0, line = 0; + + /* Table on cmdline or from stdin with --concise */ + if (_table) + return _parse_table_lines(dmt); + + /* OK for empty stdin */ + if (file) { + if (!(fp = fopen(file, "r"))) { + log_error("Couldn't open '%s' for reading.", file); + return 0; + } + } else + fp = stdin; + +#ifndef HAVE_GETLINE + buffer_size = LINE_SIZE; + if (!(buffer = malloc(buffer_size))) { + log_error("Failed to malloc line buffer."); + return 0; + } + + while (fgets(buffer, (int) buffer_size, fp)) +#else + while (getline(&buffer, &buffer_size, fp) > 0) +#endif + if (!_parse_line(dmt, buffer, file ? : "on stdin", ++line)) + goto_out; + + r = 1; + +out: + memset(buffer, 0, buffer_size); +#ifndef HAVE_GETLINE + free(buffer); +#else + free(buffer); +#endif + if (file && fclose(fp)) + log_sys_debug("fclose", file); + + return r; +} + +struct dm_split_name { + char *subsystem; + char *vg_name; + char *lv_name; + char *lv_layer; +}; + +struct dmsetup_report_obj { + struct dm_task *task; + struct dm_info *info; + struct dm_task *deps_task; + struct dm_tree_node *tree_node; + struct dm_split_name *split_name; + struct dm_stats *stats; +}; + +static int _task_run(struct dm_task *dmt) +{ + int r; + uint64_t delta; + struct dm_timestamp *ts; + + if (_initial_timestamp) + dm_task_set_record_timestamp(dmt); + + r = dm_task_run(dmt); + + if (_initial_timestamp && + (ts = dm_task_get_ioctl_timestamp(dmt))) { + delta = dm_timestamp_delta(ts, _initial_timestamp); + log_debug("Timestamp: %7" PRIu64 ".%09" PRIu64 " seconds", + delta / NSEC_PER_SEC, delta % NSEC_PER_SEC); + } + + return r; +} + +static struct dm_task *_get_deps_task(int major, int minor) +{ + struct dm_task *dmt; + struct dm_info info; + + if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) + return_NULL; + + if (!dm_task_set_major(dmt, major) || + !dm_task_set_minor(dmt, minor)) + goto_bad; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_bad; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_bad; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_bad; + + if (!_task_run(dmt)) + goto_bad; + + if (!dm_task_get_info(dmt, &info)) + goto_bad; + + if (!info.exists) + goto_bad; + + return dmt; + +bad: + dm_task_destroy(dmt); + return NULL; +} + +static char *_extract_uuid_prefix(const char *uuid, const int separator) +{ + char *ptr = NULL; + char *uuid_prefix = NULL; + size_t len; + + if (uuid) + ptr = strchr(uuid, separator); + + len = ptr ? ptr - uuid : 0; + if (!(uuid_prefix = malloc(len + 1))) { + log_error("Failed to allocate memory to extract uuid prefix."); + return NULL; + } + + if (uuid) + memcpy(uuid_prefix, uuid, len); + + uuid_prefix[len] = '\0'; + + return uuid_prefix; +} + +static struct dm_split_name *_get_split_name(const char *uuid, const char *name, + int separator) +{ + struct dm_split_name *split_name; + + if (!(split_name = malloc(sizeof(*split_name)))) { + log_error("Failed to allocate memory to split device name " + "into components."); + return NULL; + } + + if (!(split_name->subsystem = _extract_uuid_prefix(uuid, separator))) { + free(split_name); + return_NULL; + } + + split_name->vg_name = split_name->lv_name = + split_name->lv_layer = (char *) ""; + + if (!strcmp(split_name->subsystem, "LVM") && + (!(split_name->vg_name = strdup(name)) || + !dm_split_lvm_name(NULL, NULL, &split_name->vg_name, + &split_name->lv_name, &split_name->lv_layer))) + log_error("Failed to allocate memory to split LVM name " + "into components."); + + return split_name; +} + +static void _destroy_split_name(struct dm_split_name *split_name) +{ + /* + * lv_name and lv_layer are allocated within the same block + * of memory as vg_name so don't need to be freed separately. + */ + if (!strcmp(split_name->subsystem, "LVM")) + free(split_name->vg_name); + + free(split_name->subsystem); + free(split_name); +} + +/* + * Stats clock: + * + * Use either Linux timerfds or usleep to implement the reporting + * interval wait. + * + * _start_timer() - Start the timer running. + * _do_timer_wait() - Wait until the beginning of the next interval. + * + * _update_interval_times() - Update timestamps and interval estimate. + */ + +/* + * Return the current interval number counting upwards from one. + */ +static uint64_t _interval_num(void) +{ + uint64_t count_arg = _int_args[COUNT_ARG]; + return ((uint64_t) _int_args[COUNT_ARG] - _count) + !!count_arg; +} + +#ifdef HAVE_SYS_TIMERFD_H +static int _start_timerfd_timer(void) +{ + struct itimerspec interval_timer; + time_t secs; + long nsecs; + + log_debug("Using timerfd for interval timekeeping."); + + /* timer running? */ + if (_timer_fd != -1) + return 1; + + memset(&interval_timer, 0, sizeof(interval_timer)); + + /* Use CLOCK_MONOTONIC to avoid warp on RTC adjustments. */ + if ((_timer_fd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC)) < 0) { + log_error("Could not create timer: %s", strerror(errno)); + return 0; + } + + secs = (time_t) _interval / NSEC_PER_SEC; + nsecs = (long) _interval % NSEC_PER_SEC; + + /* Must set interval and value to create an armed periodic timer. */ + interval_timer.it_interval.tv_sec = secs; + interval_timer.it_interval.tv_nsec = nsecs; + interval_timer.it_value.tv_sec = secs; + interval_timer.it_value.tv_nsec = nsecs; + + log_debug("Setting interval timer to: " FMTu64 "s %ldns", (uint64_t)secs, nsecs); + if (timerfd_settime(_timer_fd, 0, &interval_timer, NULL)) { + log_error("Could not set interval timer: %s", strerror(errno)); + return 0; + } + return 1; +} + +static int _do_timerfd_wait(void) +{ + uint64_t expired; + ssize_t bytes; + + if (_timer_fd < 0) + return_0; + + /* read on timerfd returns a uint64_t in host byte order. */ + bytes = read(_timer_fd, &expired, sizeof(expired)); + + if (bytes < 0) { + /* EBADF from invalid timerfd or EINVAL from too small buffer. */ + log_error("Interval timer wait failed: %s.", strerror(errno)); + return 0; + } + + /* read(2) on a timerfd descriptor is guaranteed to return 8 bytes. */ + if (bytes != 8) + log_error("Unexpected byte count on timerfd read: " FMTssize_t ".", bytes); + + /* FIXME: attempt to rebase clock? */ + if (expired > 1) + log_warn("WARNING: Try increasing --interval ("FMTu64 + " missed timer events).", expired - 1); + + /* Signal that a new interval has begun. */ + _new_interval = 1; + + /* Final interval? */ + if (_count == 2) { + if (close(_timer_fd)) + stack; + /* Tell _update_interval_times() to shut down. */ + _timer_fd = TIMER_STOPPED; + } + + return 1; +} + +static int _start_timer(void) +{ + return _start_timerfd_timer(); +} + +static int _do_timer_wait(void) +{ + return _do_timerfd_wait(); +} + +static int _timer_running(void) +{ + return ((_timer_fd != TIMER_STOPPED) || _cycle_timestamp); +} + +#else /* !HAVE_SYS_TIMERFD_H */ +static int _start_usleep_timer(void) +{ + log_debug("Using usleep for interval timekeeping."); + _start_timestamp = dm_timestamp_alloc(); + dm_timestamp_get(_start_timestamp); + return 1; +} + +static int _do_usleep_wait(void) +{ + static struct dm_timestamp *_now = NULL; + uint64_t this_interval; + int64_t delta_t; + + /* + * Report clock: compensate for time spent in userspace and stats + * message ioctls by keeping track of the last wake time and + * adjusting the sleep interval accordingly. + */ + if (!_now) { + if (!(_now = dm_timestamp_alloc())) + return_0; + dm_timestamp_get(_now); + this_interval = _interval; + log_error("Using "FMTu64" as first interval.", this_interval); + } else { + dm_timestamp_get(_now); + delta_t = dm_timestamp_delta(_now, _start_timestamp); + log_debug("Interval timer drift: "FMTd64".", + (delta_t % _interval)); + + /* FIXME: usleep timer drift over large counts. */ + + /* adjust for time spent populating and reporting */ + this_interval = _interval - (delta_t % _interval); + log_debug("Using "FMTu64" as interval.", this_interval); + } + + /* Signal that a new interval has begun. */ + _new_interval = 1; + + if (usleep(this_interval / NSEC_PER_USEC)) { + if (errno == EINTR) + log_error("Report interval interrupted by signal."); + else if (errno == EINVAL) + log_error("Report interval too short."); + else + stack; /* other reason */ + return 0; + } + + if (_count == 2) { + dm_timestamp_destroy(_start_timestamp); + dm_timestamp_destroy(_now); + _start_timestamp = _now = NULL; + } + + return 1; +} + +static int _start_timer(void) +{ + return _start_usleep_timer(); +} + +static int _do_timer_wait(void) +{ + return _do_usleep_wait(); +} + +static int _timer_running(void) +{ + return (_start_timestamp != NULL); +} + +#endif /* HAVE_SYS_TIMERFD_H */ + +static int _update_interval_times(void) +{ + static struct dm_timestamp *this_timestamp = NULL; + uint64_t delta_t, interval_num = _interval_num(); + int r = 1; + + /* + * Clock shutdown for exit - nothing to do. + */ + if (!_timer_running()) + goto out; + + /* clock is running */ + r = 0; + + /* + * Current timestamp. If _new_interval is set this is used as + * the new cycle start timestamp. + */ + if (!this_timestamp) { + if (!(this_timestamp = dm_timestamp_alloc())) + return_0; + } + + /* + * Take cycle timstamp as close as possible to ioctl return. + * + * FIXME: use per-region timestamp deltas for interval estimate. + */ + if (!dm_timestamp_get(this_timestamp)) + goto_out; + + /* + * Stats clock: maintain a single timestamp taken just after the + * call to dm_stats_populate() and take a delta between the current + * and last value to determine the sampling interval. + * + * A new interval is started when the _new_interval flag is set + * on return from _do_report_wait(). + * + * The first interval is treated as a special case: since the + * time since the last clear of the counters is unknown (no + * previous timestamp exists) the duration is assumed to be the + * configured value. + */ + if (_cycle_timestamp) + /* Current delta_t: time from start of cycle to now. */ + delta_t = dm_timestamp_delta(this_timestamp, _cycle_timestamp); + else { + _cycle_timestamp = dm_timestamp_alloc(); + if (!_cycle_timestamp) { + log_error("Could not allocate timestamp object."); + goto out; + } + + /* Pretend we have the configured interval. */ + delta_t = _interval; + + /* start the first cycle */ + log_debug("Beginning first interval."); + _new_interval = 1; + } + + log_debug("Interval #%-4"PRIu64" time delta: %12"PRIu64"ns.", + interval_num, delta_t); + + if (_new_interval) { + /* Update timestamp and interval and clear _new_interval */ + dm_timestamp_copy(_cycle_timestamp, this_timestamp); + _last_interval = delta_t; + _new_interval = 0; + + /* + * Log interval duration and current error. + */ + log_debug("Interval #%-5"PRIu64" current err: %12"PRIi64"ns.", + interval_num, ((int64_t)_last_interval - (int64_t)_interval)); + log_debug("End interval #%-9"PRIu64" duration: %12"PRIu64"ns.", + interval_num, _last_interval); + } + + r = 1; + +out: + /* timer stopped or never started */ + if (!r || !_timer_running()) { + /* The _cycle_timestamp has not yet been allocated if we + * fail to obtain this_timestamp on the first interval. + */ + if (_cycle_timestamp) + dm_timestamp_destroy(_cycle_timestamp); + dm_timestamp_destroy(this_timestamp); + + /* Clear timestamp pointers to signal shutdown. */ + _cycle_timestamp = this_timestamp = NULL; + } + return r; +} + +static int _display_info_cols(struct dm_task *dmt, struct dm_info *info) +{ + struct dmsetup_report_obj obj; + uint64_t walk_flags = _statstype; + int r = 0; + int selected; + char *device_name; + + obj.task = dmt; + obj.info = info; + obj.deps_task = NULL; + obj.split_name = NULL; + obj.stats = NULL; + + if (_report_type & DR_TREE) + if (!(obj.tree_node = dm_tree_find_node(_dtree, info->major, info->minor))) { + log_error("Cannot find node %d:%d.", info->major, info->minor); + goto out; + } + + if (_report_type & DR_DEPS) + if (!(obj.deps_task = _get_deps_task(info->major, info->minor))) { + log_error("Cannot get deps for %d:%d.", info->major, info->minor); + goto out; + } + + if (_report_type & DR_NAME) + if (!(obj.split_name = _get_split_name(dm_task_get_uuid(dmt), + dm_task_get_name(dmt), '-'))) + goto_out; + + if (!(_report_type & (DR_STATS | DR_STATS_META))) { + /* + * If _selection_cmd is set we are applying -S to some other command, so suppress + * output and run that other command if the device matches the criteria. + */ + if (!dm_report_object_is_selected(_report, &obj, _selection_cmd ? 0 : 1, &selected)) + goto_out; + if (_selection_cmd && selected) { + device_name = (char*) dm_task_get_name(dmt); + if (!_selection_cmd->fn(_selection_cmd, NULL, 1, &device_name, NULL, 1)) + goto_out; + } + r = 1; + goto out; + } + + /* + * Obtain statistics for the current reporting object and set + * the interval estimate used for stats rate conversion. + */ + if (_report_type & DR_STATS) { + if (!(obj.stats = dm_stats_create(DM_STATS_PROGRAM_ID))) + goto_out; + + if (!dm_stats_get_nr_regions(obj.stats)) { + log_debug("Skipping %s with no regions.", dm_task_get_name(dmt)); + r = 1; + goto out; + } + + dm_stats_bind_devno(obj.stats, info->major, info->minor); + + if (!dm_stats_populate(obj.stats, _program_id, DM_STATS_REGIONS_ALL)) + goto_out; + + /* Update timestamps and handle end-of-interval accounting. */ + _update_interval_times(); + + log_debug("Adjusted sample interval duration: %12"PRIu64"ns.", _last_interval); + /* use measured approximation for calculations */ + dm_stats_set_sampling_interval_ns(obj.stats, _last_interval); + } else if (!obj.stats && (_report_type & DR_STATS_META) + /* Only a dm_stats_list is needed for DR_STATS_META reports. */ + && !(_report_type & DR_STATS)) { + if (!(obj.stats = dm_stats_create(DM_STATS_PROGRAM_ID))) + goto_out; + + dm_stats_bind_devno(obj.stats, info->major, info->minor); + + if (!dm_stats_list(obj.stats, _program_id)) + goto_out; + + /* No regions to report is not an error */ + if (!dm_stats_get_nr_regions(obj.stats)) + goto out; + } + + /* group report with no groups? */ + if ((walk_flags == DM_STATS_WALK_GROUP) + && !dm_stats_get_nr_groups(obj.stats)) + goto out; + + dm_stats_walk_init(obj.stats, walk_flags); + dm_stats_walk_do(obj.stats) { + if (!dm_report_object(_report, &obj)) + goto_out; + dm_stats_walk_next(obj.stats); + } dm_stats_walk_while(obj.stats); + + r = 1; + +out: + if (obj.deps_task) + dm_task_destroy(obj.deps_task); + if (obj.split_name) + _destroy_split_name(obj.split_name); + if (obj.stats) + dm_stats_destroy(obj.stats); + return r; +} + +static void _display_info_long(struct dm_task *dmt, struct dm_info *info) +{ + const char *uuid; + uint32_t read_ahead; + + printf("Name: %s\n", dm_task_get_name(dmt)); + + printf("State: %s%s%s\n", + info->suspended ? "SUSPENDED" : "ACTIVE", + info->read_only ? " (READ-ONLY)" : "", + info->deferred_remove ? " (DEFERRED REMOVE)" : ""); + + /* FIXME Old value is being printed when it's being changed. */ + if (dm_task_get_read_ahead(dmt, &read_ahead)) + printf("Read Ahead: %" PRIu32 "\n", read_ahead); + + if (!info->live_table && !info->inactive_table) + printf("Tables present: None\n"); + else + printf("Tables present: %s%s%s\n", + info->live_table ? "LIVE" : "", + info->live_table && info->inactive_table ? " & " : "", + info->inactive_table ? "INACTIVE" : ""); + + if (info->open_count != -1) + printf("Open count: %d\n", info->open_count); + + printf("Event number: %" PRIu32 "\n", info->event_nr); + printf("Major, minor: %d, %d\n", info->major, info->minor); + + if (info->target_count != -1) + printf("Number of targets: %d\n", info->target_count); + + if ((uuid = dm_task_get_uuid(dmt)) && *uuid) + printf("UUID: %s\n", uuid); + + putchar('\n'); +} + +static int _display_info(struct dm_task *dmt) +{ + struct dm_info info; + int r = 1; + + if (!dm_task_get_info(dmt, &info)) + return_0; + + if (!info.exists) { + log_error("Device does not exist."); + return 0; + } + + if (!_switches[COLS_ARG]) + _display_info_long(dmt, &info); + else + r = _display_info_cols(dmt, &info); + + return r; +} + +static int _set_task_device(struct dm_task *dmt, const char *name, int optional) +{ + if (name) { + if (!dm_task_set_name(dmt, name)) + return_0; + } else if (_switches[UUID_ARG]) { + if (!dm_task_set_uuid(dmt, _uuid)) + return_0; + } else if (_switches[MAJOR_ARG] && _switches[MINOR_ARG]) { + if (!dm_task_set_major(dmt, _int_args[MAJOR_ARG]) || + !dm_task_set_minor(dmt, _int_args[MINOR_ARG])) + return_0; + } else if (!optional) { + log_error("No device specified."); + return 0; + } + + return 1; +} + +static int _set_task_add_node(struct dm_task *dmt) +{ + if (!dm_task_set_add_node(dmt, DEFAULT_DM_ADD_NODE)) + return_0; + + if (_switches[ADD_NODE_ON_RESUME_ARG] && + !dm_task_set_add_node(dmt, DM_ADD_NODE_ON_RESUME)) + return_0; + + if (_switches[ADD_NODE_ON_CREATE_ARG] && + !dm_task_set_add_node(dmt, DM_ADD_NODE_ON_CREATE)) + return_0; + + return 1; +} + +static int _load(CMD_ARGS) +{ + int r = 0; + struct dm_task *dmt; + const char *file = NULL; + const char *name = NULL; + + if (_switches[NOTABLE_ARG]) { + log_error("--notable only available when creating new device."); + return 0; + } + + if (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { + if (!argc) { + log_error("Please specify device."); + return 0; + } + name = argv[0]; + argc--; + argv++; + } else if (argc > 1) { + log_error("Too many command line arguments."); + return 0; + } + + if (argc == 1) + file = argv[0]; + + if (!(dmt = dm_task_create(DM_DEVICE_RELOAD))) + return_0; + + if (!_set_task_device(dmt, name, 0)) + goto_out; + + if (!_switches[NOTABLE_ARG] && !_parse_file(dmt, file)) + goto_out; + + if (_switches[READ_ONLY] && !dm_task_set_ro(dmt)) + goto_out; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + r = 1; + + if (_switches[VERBOSE_ARG]) + r = _display_info(dmt); + +out: + dm_task_destroy(dmt); + + return r; +} + +static int _create_one_device(const char *name, const char *file) +{ + int r = 0; + struct dm_task *dmt; + uint32_t cookie = 0; + uint16_t udev_flags = 0; + + if (!(dmt = dm_task_create(DM_DEVICE_CREATE))) + return_0; + + if (!dm_task_set_name(dmt, name)) + goto_out; + + if (_switches[UUID_ARG] && !dm_task_set_uuid(dmt, _uuid)) + goto_out; + + if (!_switches[NOTABLE_ARG] && !_parse_file(dmt, file)) + goto_out; + + if (_switches[READ_ONLY] && !dm_task_set_ro(dmt)) + goto_out; + + if (_switches[MAJOR_ARG] && !dm_task_set_major(dmt, _int_args[MAJOR_ARG])) + goto_out; + + if (_switches[MINOR_ARG] && !dm_task_set_minor(dmt, _int_args[MINOR_ARG])) + goto_out; + + if (_switches[UID_ARG] && !dm_task_set_uid(dmt, _int_args[UID_ARG])) + goto_out; + + if (_switches[GID_ARG] && !dm_task_set_gid(dmt, _int_args[GID_ARG])) + goto_out; + + if (_switches[MODE_ARG] && !dm_task_set_mode(dmt, _int_args[MODE_ARG])) + goto_out; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_out; + + if (_switches[READAHEAD_ARG] && + !dm_task_set_read_ahead(dmt, _int_args[READAHEAD_ARG], + _read_ahead_flags)) + goto_out; + + if (_switches[NOTABLE_ARG]) + dm_udev_set_sync_support(0); + + if (_switches[NOUDEVRULES_ARG]) + udev_flags |= DM_UDEV_DISABLE_DM_RULES_FLAG | + DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_set_task_add_node(dmt)) + goto_out; + + if (_udev_cookie) + cookie = _udev_cookie; + + if (_udev_only) + udev_flags |= DM_UDEV_DISABLE_LIBRARY_FALLBACK; + + if (!dm_task_set_cookie(dmt, &cookie, udev_flags) || + !_task_run(dmt)) + goto_out; + + r = 1; + +out: + if (!_udev_cookie) + (void) dm_udev_wait(cookie); + + if (r && _switches[VERBOSE_ARG]) + r = _display_info(dmt); + + dm_task_destroy(dmt); + + return r; +} + +#define DEFAULT_BUF_SIZE 4096 + +static char *_slurp_stdin(void) +{ + char *buf, *pos; + size_t bufsize = DEFAULT_BUF_SIZE; + size_t total = 0; + ssize_t n = 0; + + if (!(buf = malloc(bufsize))) { + log_error("Buffer memory allocation failed."); + return NULL; + } + + pos = buf; + do { + do + n = read(STDIN_FILENO, pos, (size_t) bufsize - total - 1); + while ((n < 0) && ((errno == EINTR) || (errno == EAGAIN))); + + if (n < 0) { + log_error("Read from stdin aborted: %s", strerror(errno)); + free(buf); + return NULL; + } + + if (!n) + break; + + total += n; + pos += n; + if (total == bufsize - 1) { + bufsize *= 2; + if (!(buf = realloc(buf, bufsize))) { + log_error("Buffer memory extension to %" PRIsize_t " bytes failed.", bufsize); + return NULL; + } + } + } while (1); + + buf[total] = '\0'; + + return buf; +} + +static int _create_concise(const struct command *cmd, int argc, char **argv) +{ + char *concise_format; + char *c, *n; + char *fields[5] = { NULL }; /* name,uuid,minor,flags,table */ + int f = 0; + + if (_switches[TABLE_ARG] || _switches[MINOR_ARG] || _switches[UUID_ARG] || + _switches[NOTABLE_ARG] || _switches[INACTIVE_ARG]){ + log_error("--concise is incompatible with --[no]table, --minor, --uuid and --inactive."); + return 0; + } + + if (argc) + concise_format = argv[0]; + else if (!(concise_format = _slurp_stdin())) + return_0; + + /* Work through input string c, parsing into sets of 5 fields. */ + /* Strip out any characters quoted by backslashes in-place. */ + /* Read characters from c and prepare them in situ for final processing at n */ + c = n = fields[f] = concise_format; + + while (*c) { + /* Quoted character? Skip past quote. */ + if (*c == '\\') { + if (!*(++c)) { + log_error("Backslash must be followed by another character at end of string."); + *n = '\0'; + log_error("Parsed %d fields: name: %s uuid: %s minor: %s flags: %s table: %s", + f + 1, fields[0], fields[1], fields[2], fields[3], fields[4]); + goto out; + } + + /* Don't interpret next character */ + *n++ = *c++; + + continue; + } + + /* Comma marking end of field? */ + if (*c == ',' && f < 4) { + /* Terminate string */ + *n++ = '\0', c++; + + /* Store start of next field */ + fields[++f] = n; + + /* Skip any whitespace after field-separating commas */ + while(isspace(*c)) + c++; + + continue; + } + + /* Comma marking end of a table line? */ + if (*c == ',' && f >= 4) { + /* Replace comma with newline to match standard table input format */ + *n++ = '\n', c++; + + continue; + } + + /* Semi-colon marking end of device? */ + if (*c == ';' || *(c + 1) == '\0') { + /* End of input? */ + if (*c != ';') + /* Copy final character */ + *n++ = *c; + + /* Terminate string */ + *n++ = '\0', c++; + + if (f != 4) { + log_error("Five comma-separated fields are required for each device"); + log_error("Parsed %d fields: name: %s uuid: %s minor: %s flags: %s table: %s", + f + 1, fields[0], fields[1], fields[2], fields[3], fields[4]); + goto out; + } + + /* Set up parameters the same way as when specified directly on command line */ + if (*fields[1]) { + _switches[UUID_ARG] = 1; + _uuid = fields[1]; + } + + if (*fields[2]) { + _switches[MINOR_ARG] = 1; + _int_args[MINOR_ARG] = atoi(fields[2]); + } + + if (!strcmp(fields[3], "ro")) + _switches[READ_ONLY] = 1; + else if (*fields[3] && strcmp(fields[3], "rw")) { + log_error("Invalid flags parameter '%s' must be 'ro' or 'rw' or empty.", fields[3]); + _uuid = NULL; + goto out; + } + + _table = fields[4]; + + /* Create the device */ + if (!_create_one_device(fields[0], NULL)) { + _uuid = _table = NULL; + goto out; + } + + /* Clear parameters ready for any further devices */ + _switches[UUID_ARG] = 0; + _switches[MINOR_ARG] = 0; + _switches[READ_ONLY] = 0; + _uuid = _table = NULL; + + f = 0; + fields[0] = n; + fields[1] = fields[2] = fields[3] = fields[4] = NULL; + + /* Skip any whitespace after semi-colons */ + while(isspace(*c)) + c++; + + continue; + } + + /* Normal character */ + *n++ = *c++; + } + + if (fields[0] != n) { + *n = '\0'; + log_error("Incomplete entry: five comma-separated fields are required for each device"); + log_error("Parsed %d fields: name: %s uuid: %s minor: %s flags: %s table: %s", + f + 1, fields[0], fields[1], fields[2], fields[3], fields[4]); + goto out; + } + + return 1; + +out: + if (!argc) + free(concise_format); + + return 0; +} + +static int _create(CMD_ARGS) +{ + const char *name; + const char *file = NULL; + + if (_switches[CONCISE_ARG]) { + if (argc > 1) { + log_error("dmsetup create --concise takes at most one argument"); + return 0; + } + return _create_concise(cmd, argc, argv); + } + + if (!argc) { + log_error("Please provide a name for the new device."); + return 0; + } + + name = argv[0]; + if (argc == 2) + file = argv[1]; + + return _create_one_device(name, file); +} + +static int _do_rename(const char *name, const char *new_name, const char *new_uuid) { + int r = 0; + struct dm_task *dmt; + uint32_t cookie = 0; + uint16_t udev_flags = 0; + + if (!(dmt = dm_task_create(DM_DEVICE_RENAME))) + return_0; + + /* FIXME Kernel doesn't support uuid or device number here yet */ + if (!_set_task_device(dmt, name, 0)) + goto_out; + + if (new_uuid) { + if (!dm_task_set_newuuid(dmt, new_uuid)) + goto_out; + } else if (!new_name || !dm_task_set_newname(dmt, new_name)) + goto_out; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (_switches[NOUDEVRULES_ARG]) + udev_flags |= DM_UDEV_DISABLE_DM_RULES_FLAG | + DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG; + + if (_udev_cookie) + cookie = _udev_cookie; + + if (_udev_only) + udev_flags |= DM_UDEV_DISABLE_LIBRARY_FALLBACK; + + if (!dm_task_set_cookie(dmt, &cookie, udev_flags) || + !_task_run(dmt)) + goto_out; + + r = 1; + +out: + if (!_udev_cookie) + (void) dm_udev_wait(cookie); + + dm_task_destroy(dmt); + + return r; +} + +static int _rename(CMD_ARGS) +{ + const char *name = (argc == 2) ? argv[0] : NULL; + + return _switches[SETUUID_ARG] ? _do_rename(name, NULL, argv[argc - 1]) : + _do_rename(name, argv[argc - 1], NULL); + +} + +static int _message(CMD_ARGS) +{ + int r = 0, i; + size_t sz = 1; + struct dm_task *dmt; + char *str; + const char *response; + uint64_t sector; + char *endptr; + + if (!(dmt = dm_task_create(DM_DEVICE_TARGET_MSG))) + return_0; + + if (_switches[UUID_ARG] || _switches[MAJOR_ARG]) { + if (!_set_task_device(dmt, NULL, 0)) + goto_out; + } else { + if (!_set_task_device(dmt, argv[0], 0)) + goto_out; + argc--; + argv++; + } + + errno = 0; + sector = strtoull(argv[0], &endptr, 10); + if (errno || *endptr || endptr == argv[0]) { + log_error("Invalid sector."); + goto out; + } + if (!dm_task_set_sector(dmt, sector)) + goto_out; + + argc--; + argv++; + + if (argc <= 0) + log_error("No message supplied."); + + for (i = 0; i < argc; i++) + sz += strlen(argv[i]) + 1; + + if (!(str = dm_zalloc(sz))) { + log_error("Message string allocation failed."); + goto out; + } + + for (i = 0; i < argc; i++) { + if (i) + strcat(str, " "); + strcat(str, argv[i]); + } + + i = dm_task_set_message(dmt, str); + + free(str); + + if (!i) + goto_out; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + if ((response = dm_task_get_message_response(dmt))) { + if (!*response || response[strlen(response) - 1] == '\n') + fputs(response, stdout); + else + puts(response); + } + + r = 1; + +out: + dm_task_destroy(dmt); + + return r; +} + +static int _setgeometry(CMD_ARGS) +{ + int r = 0; + struct dm_task *dmt; + + if (!(dmt = dm_task_create(DM_DEVICE_SET_GEOMETRY))) + return_0; + + if (_switches[UUID_ARG] || _switches[MAJOR_ARG]) { + if (!_set_task_device(dmt, NULL, 0)) + goto_out; + } else { + if (!_set_task_device(dmt, argv[0], 0)) + goto_out; + argc--; + argv++; + } + + if (!dm_task_set_geometry(dmt, argv[0], argv[1], argv[2], argv[3])) + goto_out; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + /* run the task */ + if (!_task_run(dmt)) + goto_out; + + r = 1; + +out: + dm_task_destroy(dmt); + + return r; +} + +static int _splitname(CMD_ARGS) +{ + struct dmsetup_report_obj obj = { NULL }; + int r; + + if (!(obj.split_name = _get_split_name((argc == 2) ? argv[1] : "LVM", + argv[0], '\0'))) + return_0; + + r = dm_report_object(_report, &obj); + _destroy_split_name(obj.split_name); + + return r; +} + +static uint32_t _get_cookie_value(const char *str_value) +{ + unsigned long int value; + char *p; + + errno = 0; + value = strtoul(str_value, &p, 0); + + if (errno || !value || (*p) || (value > UINT32_MAX)) { + log_error("Incorrect cookie value."); + return 0; + } + + return (uint32_t) value; +} + +static int _udevflags(CMD_ARGS) +{ + uint32_t cookie; + uint16_t flags; + int i; + static const char *dm_flag_names[] = {"DISABLE_DM_RULES", + "DISABLE_SUBSYSTEM_RULES", + "DISABLE_DISK_RULES", + "DISABLE_OTHER_RULES", + "LOW_PRIORITY", + "DISABLE_LIBRARY_FALLBACK", + "PRIMARY_SOURCE", + 0}; + + if (!(cookie = _get_cookie_value(argv[0]))) + return_0; + + flags = cookie >> DM_UDEV_FLAGS_SHIFT; + + for (i = 0; i < DM_UDEV_FLAGS_SHIFT; i++) + if (1 << i & flags) { + if (i < DM_UDEV_FLAGS_SHIFT / 2 && dm_flag_names[i]) + printf("DM_UDEV_%s_FLAG='1'\n", dm_flag_names[i]); + else if (i < DM_UDEV_FLAGS_SHIFT / 2) + /* + * This is just a fallback. Each new DM flag + * should have its symbolic name assigned. + */ + printf("DM_UDEV_FLAG%d='1'\n", i); + else + /* + * We can't assign symbolic names to subsystem + * flags. Their semantics vary based on the + * subsystem that is currently used. + */ + printf("DM_SUBSYSTEM_UDEV_FLAG%d='1'\n", + i - DM_UDEV_FLAGS_SHIFT / 2); + } + + return 1; +} + +static int _udevcomplete(CMD_ARGS) +{ + uint32_t cookie; + + if (!(cookie = _get_cookie_value(argv[0]))) + return_0; + + /* + * Strip flags from the cookie and use cookie magic instead. + * If the cookie has non-zero prefix and the base is zero then + * this one carries flags to control udev rules only and it is + * not meant to be for notification. Return with success in this + * situation. + */ + if (!(cookie &= ~DM_UDEV_FLAGS_MASK)) + return 1; + + cookie |= DM_COOKIE_MAGIC << DM_UDEV_FLAGS_SHIFT; + + return dm_udev_complete(cookie); +} + +#ifndef UDEV_SYNC_SUPPORT +static const char _cmd_not_supported[] = "Command not supported. Recompile with \"--enable-udev_sync\" to enable."; + +static int _udevcreatecookie(CMD_ARGS) +{ + log_error(_cmd_not_supported); + + return 0; +} + +static int _udevreleasecookie(CMD_ARGS) +{ + log_error(_cmd_not_supported); + + return 0; +} + +static int _udevcomplete_all(CMD_ARGS) +{ + log_error(_cmd_not_supported); + + return 0; +} + +static int _udevcookies(CMD_ARGS) +{ + log_error(_cmd_not_supported); + + return 0; +} + +#else /* UDEV_SYNC_SUPPORT */ +static int _set_up_udev_support(const char *dev_dir) +{ + int dirs_diff; + const char *env; + size_t len = strlen(dev_dir), udev_dir_len = strlen(DM_UDEV_DEV_DIR); + + if (_switches[NOUDEVSYNC_ARG]) + dm_udev_set_sync_support(0); + + if (!_udev_cookie) { + env = getenv(DM_UDEV_COOKIE_ENV_VAR_NAME); + if (env && *env && (_udev_cookie = _get_cookie_value(env))) + log_debug("Using udev transaction 0x%08" PRIX32 + " defined by %s environment variable.", + _udev_cookie, + DM_UDEV_COOKIE_ENV_VAR_NAME); + } + else if (_switches[UDEVCOOKIE_ARG]) + log_debug("Using udev transaction 0x%08" PRIX32 + " defined by --udevcookie option.", + _udev_cookie); + + /* + * Normally, there's always a fallback action by libdevmapper if udev + * has not done its job correctly, e.g. the nodes were not created. + * If using udev transactions by specifying existing cookie value, + * we need to disable node creation by libdevmapper completely, + * disabling any fallback actions, since any synchronisation happens + * at the end of the transaction only. We need to do this to prevent + * races between udev and libdevmapper but only in case udev "dev path" + * is the same as "dev path" used by libdevmapper. + */ + + + /* + * DM_UDEV_DEV_DIR always has '/' at its end. + * If the dev_dir does not have it, be sure + * to make the right comparison without the '/' char! + */ + if (dev_dir[len - 1] != '/') + udev_dir_len--; + + dirs_diff = udev_dir_len != len || + strncmp(DM_UDEV_DEV_DIR, dev_dir, len); + _udev_only = !dirs_diff && (_udev_cookie || !_switches[VERIFYUDEV_ARG]); + + if (dirs_diff) { + log_debug("The path %s used for creating device nodes that is " + "set via DM_DEV_DIR environment variable differs from " + "the path %s that is used by udev. All warnings " + "about udev not working correctly while processing " + "particular nodes will be suppressed. These nodes " + "and symlinks will be managed in each directory " + "separately.", dev_dir, DM_UDEV_DEV_DIR); + dm_udev_set_checking(0); + } + + return 1; +} + +static int _udevcreatecookie(CMD_ARGS) +{ + uint32_t cookie; + + if (!dm_udev_create_cookie(&cookie)) + return_0; + + if (cookie) + printf("0x%08" PRIX32 "\n", cookie); + + return 1; +} + +static int _udevreleasecookie(CMD_ARGS) +{ + if (argv[0] && !(_udev_cookie = _get_cookie_value(argv[0]))) + return_0; + + if (!_udev_cookie) { + log_error("No udev transaction cookie given."); + return 0; + } + + return dm_udev_wait(_udev_cookie); +} + +__attribute__((format(printf, 1, 2))) +static char _yes_no_prompt(const char *prompt, ...) +{ + int c = 0, ret = 0; + va_list ap; + + do { + if (c == '\n' || !c) { + va_start(ap, prompt); + vprintf(prompt, ap); + va_end(ap); + } + + if ((c = getchar()) == EOF) { + ret = 'n'; + break; + } + + c = tolower(c); + if ((c == 'y') || (c == 'n')) + ret = c; + } while (!ret || c != '\n'); + + if (c != '\n') + putchar('\n'); + + return ret; +} + +static int _udevcomplete_all(CMD_ARGS) +{ + int max_id, id, sid; + struct seminfo sinfo; + struct semid_ds sdata; + int counter = 0; + int skipped = 0; + unsigned age = 0; + time_t t; + + if (argc == 1 && (sscanf(argv[0], "%u", &age) != 1)) { + log_error("Failed to read age_in_minutes parameter."); + return 0; + } + + if (!_switches[YES_ARG]) { + log_warn("WARNING: This operation will destroy all semaphores %s%.0d%swith keys " + "that have a prefix %" PRIu16 " (0x%" PRIx16 ").", + age ? "older than " : "", age, age ? " minutes " : "", + DM_COOKIE_MAGIC, DM_COOKIE_MAGIC); + + if (_yes_no_prompt("Do you really want to continue? [y/n]: ") == 'n') { + log_print("Semaphores with keys prefixed by %" PRIu16 + " (0x%" PRIx16 ") NOT destroyed.", + DM_COOKIE_MAGIC, DM_COOKIE_MAGIC); + return 1; + } + } + + if ((max_id = semctl(0, 0, SEM_INFO, &sinfo)) < 0) { + log_sys_error("semctl", "SEM_INFO"); + return 0; + } + + for (id = 0; id <= max_id; id++) { + if ((sid = semctl(id, 0, SEM_STAT, &sdata)) < 0) + continue; + + if (sdata.sem_perm.__key >> 16 == DM_COOKIE_MAGIC) { + t = time(NULL); + + if (sdata.sem_ctime + age * 60 > t || + sdata.sem_otime + age * 60 > t) { + skipped++; + continue; + } + if (semctl(sid, 0, IPC_RMID, 0) < 0) { + log_error("Could not cleanup notification semaphore " + "with semid %d and cookie value " + FMTu32 " (0x" FMTx32 ").", sid, + sdata.sem_perm.__key, sdata.sem_perm.__key); + continue; + } + + counter++; + } + } + + log_print("%d semaphores with keys prefixed by " + FMTu16 " (0x" FMTx16 ") destroyed. %d skipped.", + counter, DM_COOKIE_MAGIC, DM_COOKIE_MAGIC, skipped); + + return 1; +} + +static int _udevcookies(CMD_ARGS) +{ + int max_id, id, sid; + struct seminfo sinfo; + struct semid_ds sdata; + int val; + char otime_str[26], ctime_str[26]; + char *otimes, *ctimes; + + if ((max_id = semctl(0, 0, SEM_INFO, &sinfo)) < 0) { + log_sys_error("sem_ctl", "SEM_INFO"); + return 0; + } + + printf("Cookie Semid Value Last semop time Last change time\n"); + + for (id = 0; id <= max_id; id++) { + if ((sid = semctl(id, 0, SEM_STAT, &sdata)) < 0) + continue; + + if (sdata.sem_perm.__key >> 16 == DM_COOKIE_MAGIC) { + if ((val = semctl(sid, 0, GETVAL)) < 0) { + log_error("semid %d: sem_ctl failed for " + "cookie 0x%" PRIx32 ": %s", + sid, sdata.sem_perm.__key, + strerror(errno)); + continue; + } + + if ((otimes = ctime_r((const time_t *) &sdata.sem_otime, (char *)&otime_str))) + otime_str[strlen(otimes)-1] = '\0'; + if ((ctimes = ctime_r((const time_t *) &sdata.sem_ctime, (char *)&ctime_str))) + ctime_str[strlen(ctimes)-1] = '\0'; + + printf("0x%-10x %-10d %-10d %s %s\n", sdata.sem_perm.__key, + sid, val, otimes ? : "unknown", + ctimes? : "unknown"); + } + } + + return 1; +} +#endif /* UDEV_SYNC_SUPPORT */ + +static int _version(CMD_ARGS) +{ + char version[80]; + + if (dm_get_library_version(version, sizeof(version))) + printf("Library version: %s\n", version); + + if (!dm_driver_version(version, sizeof(version))) + return_0; + + printf("Driver version: %s\n", version); + + /* don't output column headings for 'dmstats version'. */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + + return 1; +} + +static int _simple(int task, const char *name, uint32_t event_nr, int display) +{ + uint32_t cookie = 0; + uint16_t udev_flags = 0; + int udev_wait_flag = task == DM_DEVICE_RESUME || + task == DM_DEVICE_REMOVE; + int r = 0; + + struct dm_task *dmt; + + if (!(dmt = dm_task_create(task))) + return_0; + + if (!_set_task_device(dmt, name, 0)) + goto_out; + + if (event_nr && !dm_task_set_event_nr(dmt, event_nr)) + goto_out; + + if (_switches[NOFLUSH_ARG] && !dm_task_no_flush(dmt)) + goto_out; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_out; + + if (_switches[NOLOCKFS_ARG] && !dm_task_skip_lockfs(dmt)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + /* FIXME: needs to coperate with udev */ + if (!_set_task_add_node(dmt)) + goto_out; + + if (_switches[READAHEAD_ARG] && + !dm_task_set_read_ahead(dmt, _int_args[READAHEAD_ARG], + _read_ahead_flags)) + goto_out; + + if (_switches[NOUDEVRULES_ARG]) + udev_flags |= DM_UDEV_DISABLE_DM_RULES_FLAG | + DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG; + + if (_udev_cookie) + cookie = _udev_cookie; + + if (_udev_only) + udev_flags |= DM_UDEV_DISABLE_LIBRARY_FALLBACK; + + if (udev_wait_flag && !dm_task_set_cookie(dmt, &cookie, udev_flags)) + goto_out; + + if (_switches[RETRY_ARG] && task == DM_DEVICE_REMOVE) + dm_task_retry_remove(dmt); + + if (_switches[DEFERRED_ARG] && (task == DM_DEVICE_REMOVE || task == DM_DEVICE_REMOVE_ALL)) + dm_task_deferred_remove(dmt); + + r = _task_run(dmt); + +out: + if (!_udev_cookie && udev_wait_flag) + (void) dm_udev_wait(cookie); + + if (r && display && _switches[VERBOSE_ARG]) + r = _display_info(dmt); + + dm_task_destroy(dmt); + + return r; +} + +static int _suspend(CMD_ARGS) +{ + return _simple(DM_DEVICE_SUSPEND, argc ? argv[0] : NULL, 0, 1); +} + +static int _resume(CMD_ARGS) +{ + return _simple(DM_DEVICE_RESUME, argc ? argv[0] : NULL, 0, 1); +} + +static int _clear(CMD_ARGS) +{ + return _simple(DM_DEVICE_CLEAR, argc ? argv[0] : NULL, 0, 1); +} + +static int _wait(CMD_ARGS) +{ + const char *name = NULL; + + if (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { + if (!argc) { + log_error("No device specified."); + return 0; + } + name = argv[0]; + argc--, argv++; + } + + return _simple(DM_DEVICE_WAITEVENT, name, + (argc) ? (uint32_t) atoi(argv[argc - 1]) : 0, 1); +} + +static int _process_all(const struct command *cmd, const char *subcommand, int argc, char **argv, int silent, + int (*fn) (CMD_ARGS)) +{ + int r = 1; + struct dm_names *names; + unsigned next = 0; + + struct dm_task *dmt; + + if (!(dmt = dm_task_create(DM_DEVICE_LIST))) + return_0; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_task_run(dmt)) { + r = 0; + goto_out; + } + + if (!(names = dm_task_get_names(dmt))) { + r = 0; + goto_out; + } + + if (!names->dev) { + if (!silent) + printf("No devices found\n"); + goto out; + } + + do { + names = (struct dm_names *)((char *) names + next); + if (!fn(cmd, subcommand, argc, argv, names, 1)) + r = 0; + next = names->next; + } while (next); + +out: + dm_task_destroy(dmt); + return r; +} + +static uint64_t _get_device_size(const char *name) +{ + uint64_t start, length, size = UINT64_C(0); + struct dm_info info; + char *target_type, *params; + struct dm_task *dmt; + void *next = NULL; + + if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) + return_0; + + if (!_set_task_device(dmt, name, 0)) + goto_out; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + if (!dm_task_get_info(dmt, &info) || !info.exists) + goto_out; + + do { + next = dm_get_next_target(dmt, next, &start, &length, + &target_type, &params); + size += length; + } while (next); + +out: + dm_task_destroy(dmt); + return size; +} + +static int _error_device(CMD_ARGS) +{ + struct dm_task *dmt; + const char *name; + uint64_t size; + int r = 0; + + name = names ? names->name : argv[0]; + + if (!name || !*name) { + log_error("No device specified."); + return 0; + } + + size = _get_device_size(name); + + if (!(dmt = dm_task_create(DM_DEVICE_RELOAD))) + return_0; + + if (!_set_task_device(dmt, name, 0)) + goto_bad; + + if (!dm_task_add_target(dmt, UINT64_C(0), size, "error", "")) + goto_bad; + + if (_switches[READ_ONLY] && !dm_task_set_ro(dmt)) + goto_bad; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_bad; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_bad; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_bad; + + if (!_task_run(dmt)) + goto_bad; + + if (_switches[FORCE_ARG]) + /* Avoid hang on flushing with --force */ + _switches[NOLOCKFS_ARG] = _switches[NOFLUSH_ARG] = 1; + + if (!_simple(DM_DEVICE_RESUME, name, 0, 0)) { + _simple(DM_DEVICE_CLEAR, name, 0, 0); + goto_bad; + } + + r = 1; + +bad: + dm_task_destroy(dmt); + return r; +} + +static int _remove(CMD_ARGS) +{ + if (_switches[FORCE_ARG] && argc) { + /* + * 'remove --force' option is doing 2 operations on the same device + * this is not compatible with the use of --udevcookie/DM_UDEV_COOKIE. + * Udevd collision could be partially avoided with --retry. + */ + if (_udev_cookie) + log_warn("WARNING: Use of cookie and --force is not compatible."); + (void) _error_device(cmd, NULL, argc, argv, NULL, 0); + } + + return _simple(DM_DEVICE_REMOVE, argc ? argv[0] : NULL, 0, 0); +} + +static int _count_devices(CMD_ARGS) +{ + _num_devices++; + + return 1; +} + +static int _remove_all(CMD_ARGS) +{ + int r; + + /* Remove all closed devices */ + r = _simple(DM_DEVICE_REMOVE_ALL, "", 0, 0) | dm_mknodes(NULL); + + if (!_switches[FORCE_ARG]) + return r; + + _num_devices = 0; + r |= _process_all(cmd, NULL, argc, argv, 1, _count_devices); + + /* No devices left? */ + if (!_num_devices) + return r; + + r |= _process_all(cmd, NULL, argc, argv, 1, _error_device); + r |= _simple(DM_DEVICE_REMOVE_ALL, "", 0, 0) | dm_mknodes(NULL); + + _num_devices = 0; + r |= _process_all(cmd, NULL, argc, argv, 1, _count_devices); + if (!_num_devices) + return r; + + log_error("Unable to remove %d device(s).", _num_devices); + + return r; +} + +static void _display_dev(struct dm_task *dmt, const char *name) +{ + struct dm_info info; + + if (dm_task_get_info(dmt, &info)) + printf("%s\t(%u, %u)\n", name, info.major, info.minor); +} + +static int _mknodes(CMD_ARGS) +{ + return dm_mknodes(argc ? argv[0] : NULL); +} + +static int _exec_command(const char *name) +{ + static char path[PATH_MAX]; + static char *args[ARGS_MAX + 1]; + static int argc = 0; + char *c; + pid_t pid; + + if (argc < 0) + return_0; + + if (!dm_mknodes(name)) + return_0; + + if (dm_snprintf(path, sizeof(path), "%s/%s", dm_dir(), name) < 0) + return_0; + + if (!argc) { + c = _command_to_exec; + while (argc < ARGS_MAX) { + while (*c && isspace(*c)) + c++; + if (!*c) + break; + args[argc++] = c; + while (*c && !isspace(*c)) + c++; + if (*c) + *c++ = '\0'; + } + + if (!argc) { + argc = -1; + return_0; + } + + if (argc == ARGS_MAX) { + log_error("Too many args to --exec."); + argc = -1; + return 0; + } + + args[argc++] = path; + args[argc] = NULL; + } + + if (!(pid = fork())) { + execvp(args[0], args); + _exit(127); + } else if (pid < (pid_t) 0) + return 0; + + TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0)); + + return 1; +} + +/* + * Print string s using a backslash to quote each character that has a special + * meaning in the concise format - comma, semi-colon and backslash. + */ +static void _print_string_quoted(const char *s) +{ + while (*s) { + if (strchr(",;\\", *s)) + putchar('\\'); + putchar(*s++); + } +} + +static void hide_key(char *params, const char *name) +{ + char *c = strstr(params, name); + + if (!c) + return; + + c += strlen(name); + + /* key is optional */ + c = strpbrk(c, " :"); + if (!c || *c++ != ':') + return; + + while (*c && *c != ' ') + *c++ = '0'; +} + +static int _status(CMD_ARGS) +{ + int r = 0; + struct dm_task *dmt; + void *next = NULL; + uint64_t start, length; + char *target_type = NULL; + char *params, *c; + int cmdno; + const char *name = NULL; + int matched = 0; + int ls_only = 0; + int use_concise = 0; + struct dm_info info; + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + /* FIXME Respect deps in concise mode, so they are correctly ordered for recreation */ + return _process_all(cmd, NULL, argc, argv, 0, _status); + name = argv[0]; + } + + if (!strcmp(cmd->name, "table")) { + cmdno = DM_DEVICE_TABLE; + /* --concise only applies to 'table' */ + if (_switches[CONCISE_ARG]) + use_concise = 1; + } else + cmdno = DM_DEVICE_STATUS; + + if (!strcmp(cmd->name, "ls")) + ls_only = 1; + + if (!(dmt = dm_task_create(cmdno))) + return_0; + + if (!_set_task_device(dmt, name, 0)) + goto_out; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (_switches[NOFLUSH_ARG] && !dm_task_no_flush(dmt)) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + if (!dm_task_get_info(dmt, &info)) + goto_out; + + if (!info.exists) { + log_error("Device does not exist."); + goto out; + } + + if (!name) + name = dm_task_get_name(dmt); + + /* Fetch targets and print 'em */ + do { + next = dm_get_next_target(dmt, next, &start, &length, + &target_type, &params); + /* Skip if target type doesn't match */ + if (_switches[TARGET_ARG] && + (!target_type || strcmp(target_type, _target))) + continue; + + if (ls_only) { + if (!_switches[EXEC_ARG] || !_command_to_exec || + _switches[VERBOSE_ARG]) + _display_dev(dmt, name); + next = NULL; + } else if (!_switches[EXEC_ARG] || !_command_to_exec || + _switches[VERBOSE_ARG]) { + if (!use_concise) { + if (!matched && _switches[VERBOSE_ARG]) + _display_info(dmt); + if (multiple_devices && !_switches[VERBOSE_ARG]) + printf("%s: ", name); + } else if (!matched) { + /* + * Before first target of device in concise output, + * print basic device information in the appropriate format. + * Separate devices by a semi-colon. + */ + if (_concise_output_produced) + putchar(';'); + _concise_output_produced = 1; + + _print_string_quoted(name); + putchar(','); + _print_string_quoted(dm_task_get_uuid(dmt)); + printf(",%u,%s", info.minor, info.read_only ? "ro" : "rw"); + } + /* Next print any target-specific information */ + if (target_type) { + /* Suppress encryption keys */ + if (!_switches[SHOWKEYS_ARG] && + cmdno == DM_DEVICE_TABLE) { + if (!strcmp(target_type, "crypt")) { + c = params; + while (*c && *c != ' ') + c++; + if (*c) + c++; + /* + * Do not suppress kernel key references prefixed + * with colon ':'. Displaying those references is + * harmless. crypt target supports kernel keys + * starting with v1.15.0 (merged in kernel 4.10) + */ + if (*c != ':') + while (*c && *c != ' ') + *c++ = '0'; + } else if (!strcmp(target_type, "integrity")) { + /* + * "internal_hash", "journal_crypt" and "journal_mac" + * params allow keys optionally in hexbyte + * representation. + */ + hide_key(params, "internal_hash:"); + hide_key(params, "journal_crypt:"); + hide_key(params, "journal_mac:"); + } + } + if (use_concise) + putchar(','); + printf(FMTu64 " " FMTu64 " %s ", start, length, target_type); + if (use_concise) + _print_string_quoted(params); + else + printf("%s", params); + } + /* --concise places all devices on a single output line */ + if (!use_concise) + putchar('\n'); + } + matched = 1; + } while (next); + + if (multiple_devices && _switches[VERBOSE_ARG] && matched && !ls_only && (!use_concise || _switches[VERBOSE_ARG] > 1)) + putchar('\n'); + + if (matched && _switches[EXEC_ARG] && _command_to_exec && !_exec_command(name)) + goto_out; + + r = 1; + +out: + dm_task_destroy(dmt); + return r; +} + +/* Show target names and their version numbers */ +static int _targets(CMD_ARGS) +{ + int r = 0; + struct dm_task *dmt; + struct dm_versions *target; + struct dm_versions *last_target; + + if (!(dmt = dm_task_create(DM_DEVICE_LIST_VERSIONS))) + return_0; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + target = dm_task_get_versions(dmt); + + /* Fetch targets and print 'em */ + do { + last_target = target; + + printf("%-16s v%d.%d.%d\n", target->name, target->version[0], + target->version[1], target->version[2]); + + target = (struct dm_versions *)((char *) target + target->next); + } while (last_target != target); + + r = 1; + +out: + dm_task_destroy(dmt); + return r; +} + +static int _info(CMD_ARGS) +{ + int r = 0; + + struct dm_task *dmt; + char *name = NULL; + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + return _process_all(cmd, NULL, argc, argv, 0, _info); + name = argv[0]; + } + + if (!(dmt = dm_task_create(DM_DEVICE_INFO))) + return_0; + + if (!_set_task_device(dmt, name, 0)) + goto_out; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + r = _display_info(dmt); + +out: + dm_task_destroy(dmt); + return r; +} + +static int _deps(CMD_ARGS) +{ + int r = 0; + uint32_t i; + struct dm_deps *deps; + struct dm_task *dmt; + struct dm_info info; + char *name = NULL; + char dev_name[PATH_MAX]; + int major, minor; + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + return _process_all(cmd, NULL, argc, argv, 0, _deps); + name = argv[0]; + } + + if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) + return_0; + + if (!_set_task_device(dmt, name, 0)) + goto_out; + + if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + if (!dm_task_get_info(dmt, &info)) + goto_out; + + if (!(deps = dm_task_get_deps(dmt))) + goto_out; + + if (!info.exists) { + printf("Device does not exist.\n"); + r = 1; + goto out; + } + + if (_switches[VERBOSE_ARG]) + _display_info(dmt); + + if (multiple_devices && !_switches[VERBOSE_ARG]) + printf("%s: ", name); + printf("%d dependencies\t:", deps->count); + + for (i = 0; i < deps->count; i++) { + major = (int) MAJOR(deps->device[i]); + minor = (int) MINOR(deps->device[i]); + + if ((_dev_name_type == DN_BLK || _dev_name_type == DN_MAP) && + dm_device_get_name(major, minor, _dev_name_type == DN_BLK, + dev_name, PATH_MAX)) + printf(" (%s)", dev_name); + else + printf(" (%d, %d)", major, minor); + } + putchar('\n'); + + if (multiple_devices && _switches[VERBOSE_ARG]) + putchar('\n'); + + r = 1; + +out: + dm_task_destroy(dmt); + return r; +} + +static int _display_name(CMD_ARGS) +{ + char dev_name[PATH_MAX]; + + if (!names) + return 1; + + if ((_dev_name_type == DN_BLK || _dev_name_type == DN_MAP) && + dm_device_get_name((int) MAJOR(names->dev), (int) MINOR(names->dev), + _dev_name_type == DN_BLK, dev_name, PATH_MAX)) + printf("%s\t(%s)\n", names->name, dev_name); + else + printf("%s\t(%d:%d)\n", names->name, + (int) MAJOR(names->dev), + (int) MINOR(names->dev)); + + return 1; +} + +/* + * Tree drawing code + */ + +enum { + TR_DEVICE=0, /* display device major:minor number */ + TR_BLKDEVNAME, /* display device kernel name */ + TR_TABLE, + TR_STATUS, + TR_ACTIVE, + TR_RW, + TR_OPENCOUNT, + TR_UUID, + TR_COMPACT, + TR_TRUNCATE, + TR_BOTTOMUP, + NUM_TREEMODE, +}; + +static int _tree_switches[NUM_TREEMODE]; + +#define TR_PRINT_ATTRIBUTE ( _tree_switches[TR_ACTIVE] || \ + _tree_switches[TR_RW] || \ + _tree_switches[TR_OPENCOUNT] || \ + _tree_switches[TR_UUID] ) + +#define TR_PRINT_TARGETS ( _tree_switches[TR_TABLE] || \ + _tree_switches[TR_STATUS] ) + +/* Compact - fewer newlines */ +#define TR_PRINT_COMPACT (_tree_switches[TR_COMPACT] && \ + !TR_PRINT_ATTRIBUTE && \ + !TR_PRINT_TARGETS) + +/* FIXME Get rid of this */ +#define MAX_DEPTH 100 + +/* Drawing character definition from pstree */ +/* [pstree comment] UTF-8 defines by Johan Myreen, updated by Ben Winslow */ +#define UTF_V "\342\224\202" /* U+2502, Vertical line drawing char */ +#define UTF_VR "\342\224\234" /* U+251C, Vertical and right */ +#define UTF_H "\342\224\200" /* U+2500, Horizontal */ +#define UTF_UR "\342\224\224" /* U+2514, Up and right */ +#define UTF_HD "\342\224\254" /* U+252C, Horizontal and down */ + +#define VT_BEG "\033(0\017" /* use graphic chars */ +#define VT_END "\033(B" /* back to normal char set */ +#define VT_V "x" /* see UTF definitions above */ +#define VT_VR "t" +#define VT_H "q" +#define VT_UR "m" +#define VT_HD "w" + +static struct { + const char *empty_2; /* */ + const char *branch_2; /* |- */ + const char *vert_2; /* | */ + const char *last_2; /* `- */ + const char *single_3; /* --- */ + const char *first_3; /* -+- */ +} +_tsym_ascii = { + " ", + "|-", + "| ", + "`-", + "---", + "-+-" +}, +_tsym_utf = { + " ", + UTF_VR UTF_H, + UTF_V " ", + UTF_UR UTF_H, + UTF_H UTF_H UTF_H, + UTF_H UTF_HD UTF_H +}, +_tsym_vt100 = { + " ", + VT_BEG VT_VR VT_H VT_END, + VT_BEG VT_V VT_END " ", + VT_BEG VT_UR VT_H VT_END, + VT_BEG VT_H VT_H VT_H VT_END, + VT_BEG VT_H VT_HD VT_H VT_END +}, +*_tsym = &_tsym_ascii; + +/* + * Tree drawing functions. + */ +/* FIXME Get rid of these statics - use dynamic struct */ +/* FIXME Explain what these vars are for */ +static int _tree_width[MAX_DEPTH], _tree_more[MAX_DEPTH]; +static int _termwidth = 80; /* Maximum output width */ +static int _cur_x = 1; /* Current horizontal output position */ +static char _last_char = 0; + +static void _out_char(const unsigned c) +{ + /* Only first UTF-8 char counts */ + _cur_x += ((c & 0xc0) != 0x80); + + if (!_tree_switches[TR_TRUNCATE]) { + putchar((int) c); + return; + } + + /* Truncation? */ + if (_cur_x <= _termwidth) + putchar((int) c); + + if (_cur_x == _termwidth + 1 && ((c & 0xc0) != 0x80)) { + if (_last_char || (c & 0x80)) { + putchar('.'); + putchar('.'); + putchar('.'); + } else { + _last_char = c; + _cur_x--; + } + } +} + +static void _out_string(const char *str) +{ + while (*str) + _out_char((unsigned char) *str++); +} + +/* non-negative integers only */ +static unsigned _out_int(unsigned num) +{ + unsigned digits = 0; + unsigned divi; + + if (!num) { + _out_char('0'); + return 1; + } + + /* non zero case */ + for (divi = 1; num / divi; divi *= 10) + digits++; + + for (divi /= 10; divi; divi /= 10) + _out_char('0' + (num / divi) % 10); + + return digits; +} + +static void _out_newline(void) +{ + if (_last_char && _cur_x == _termwidth) + putchar(_last_char); + _last_char = 0; + putchar('\n'); + _cur_x = 1; +} + +static void _out_prefix(unsigned depth) +{ + unsigned x, d; + + for (d = 0; d < depth; d++) { + for (x = _tree_width[d] + 1; x > 0; x--) + _out_char(' '); + + _out_string(d == depth - 1 ? + !_tree_more[depth] ? _tsym->last_2 : _tsym->branch_2 + : _tree_more[d + 1] ? + _tsym->vert_2 : _tsym->empty_2); + } +} + +/* + * Display tree + */ +static void _display_tree_attributes(struct dm_tree_node *node) +{ + int attr = 0; + const char *uuid; + const struct dm_info *info; + + uuid = dm_tree_node_get_uuid(node); + info = dm_tree_node_get_info(node); + + if (!info->exists) + return; + + if (_tree_switches[TR_ACTIVE]) { + _out_string(attr++ ? ", " : " ["); + _out_string(info->suspended ? "SUSPENDED" : "ACTIVE"); + } + + if (_tree_switches[TR_RW]) { + _out_string(attr++ ? ", " : " ["); + _out_string(info->read_only ? "RO" : "RW"); + } + + if (_tree_switches[TR_OPENCOUNT]) { + _out_string(attr++ ? ", " : " ["); + (void) _out_int((unsigned) info->open_count); + } + + if (_tree_switches[TR_UUID]) { + _out_string(attr++ ? ", " : " ["); + _out_string(uuid && *uuid ? uuid : ""); + } + + if (attr) + _out_char(']'); +} + +/* FIXME Display table or status line. (Disallow both?) */ +static void _display_tree_targets(struct dm_tree_node *node, unsigned depth) +{ +} + +static void _display_tree_node(struct dm_tree_node *node, unsigned depth, + unsigned first_child __attribute__((unused)), + unsigned last_child, unsigned has_children) +{ + int offset; + const char *name; + const struct dm_info *info; + int first_on_line = 0; + char dev_name[PATH_MAX]; + + /* Sub-tree for targets has 2 more depth */ + if (depth + 2 > MAX_DEPTH) + return; + + name = dm_tree_node_get_name(node); + + if ((!name || !*name) && + (!_tree_switches[TR_DEVICE] && !_tree_switches[TR_BLKDEVNAME])) + return; + + /* Indicate whether there are more nodes at this depth */ + _tree_more[depth] = !last_child; + _tree_width[depth] = 0; + + if (_cur_x == 1) + first_on_line = 1; + + if (!TR_PRINT_COMPACT || first_on_line) + _out_prefix(depth); + + /* Remember the starting point for compact */ + offset = _cur_x; + + if (TR_PRINT_COMPACT && !first_on_line) + _out_string(_tree_more[depth] ? _tsym->first_3 : _tsym->single_3); + + /* display node */ + if (name) + _out_string(name); + + info = dm_tree_node_get_info(node); + + if (_tree_switches[TR_BLKDEVNAME] && + dm_device_get_name(info->major, info->minor, 1, dev_name, PATH_MAX)) { + _out_string(name ? " <" : "<"); + _out_string(dev_name); + _out_char('>'); + } + + if (_tree_switches[TR_DEVICE]) { + _out_string(name ? " (" : "("); + (void) _out_int(info->major); + _out_char(':'); + (void) _out_int(info->minor); + _out_char(')'); + } + + /* display additional info */ + if (TR_PRINT_ATTRIBUTE) + _display_tree_attributes(node); + + if (TR_PRINT_COMPACT) + _tree_width[depth] = _cur_x - offset; + + if (!TR_PRINT_COMPACT || !has_children) + _out_newline(); + + if (TR_PRINT_TARGETS) { + _tree_more[depth + 1] = has_children; + _display_tree_targets(node, depth + 2); + } +} + +/* + * Walk the dependency tree + */ +static void _display_tree_walk_children(struct dm_tree_node *node, + unsigned depth) +{ + struct dm_tree_node *child, *next_child; + void *handle = NULL; + uint32_t inverted = _tree_switches[TR_BOTTOMUP]; + unsigned first_child = 1; + unsigned has_children; + + next_child = dm_tree_next_child(&handle, node, inverted); + + while ((child = next_child)) { + next_child = dm_tree_next_child(&handle, node, inverted); + has_children = + dm_tree_node_num_children(child, inverted) ? 1 : 0; + + _display_tree_node(child, depth, first_child, + next_child ? 0U : 1U, has_children); + + if (has_children) + _display_tree_walk_children(child, depth + 1); + + first_child = 0; + } +} + +static int _add_dep(CMD_ARGS) +{ + if (names && + !dm_tree_add_dev(_dtree, (unsigned) MAJOR(names->dev), (unsigned) MINOR(names->dev))) + return_0; + + return 1; +} + +/* + * Create and walk dependency tree + * + * An incomplete _dtree may still be used by the caller, + * but the error must be reported. + */ +static int _build_whole_deptree(const struct command *cmd) +{ + if (_dtree) + return 1; + + if (!(_dtree = dm_tree_create())) + return_0; + + if (!_process_all(cmd, NULL, 0, NULL, 0, _add_dep)) + return_0; + + return 1; +} + +static int _display_tree(CMD_ARGS) +{ + int r; + + r = _build_whole_deptree(cmd); + + if (_dtree) + _display_tree_walk_children(dm_tree_find_node(_dtree, 0, 0), 0); + + return r; +} + +/* + * Report device information + */ + +/* dm specific display functions */ + +static int _int32_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const int32_t value = *(const int32_t *)data; + + return dm_report_field_int32(rh, field, &value); +} + +static int _uint32_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const uint32_t value = *(const int32_t *)data; + + return dm_report_field_uint32(rh, field, &value); +} + +static int _show_units(void) +{ + /* --nosuffix overrides --units */ + if (_switches[NOSUFFIX_ARG]) + return_0; + + return (_int_args[UNITS_ARG]) ? 1 : 0; +} + +static int _dm_name_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const char *name = dm_task_get_name((const struct dm_task *) data); + + return dm_report_field_string(rh, field, &name); +} + +static int _dm_mangled_name_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + char *name; + int r = 0; + + if ((name = dm_task_get_name_mangled((const struct dm_task *) data))) { + r = dm_report_field_string(rh, field, (const char * const *) &name); + free(name); + } + + return r; +} + +static int _dm_unmangled_name_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + char *name; + int r = 0; + + if ((name = dm_task_get_name_unmangled((const struct dm_task *) data))) { + r = dm_report_field_string(rh, field, (const char * const *) &name); + free(name); + } + + return r; +} + +static int _dm_uuid_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, + const void *data, void *private __attribute__((unused))) +{ + const char *uuid = dm_task_get_uuid((const struct dm_task *) data); + + if (!uuid || !*uuid) + uuid = ""; + + return dm_report_field_string(rh, field, &uuid); +} + +static int _dm_mangled_uuid_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, + const void *data, void *private __attribute__((unused))) +{ + char *uuid; + int r = 0; + + if ((uuid = dm_task_get_uuid_mangled((const struct dm_task *) data))) { + r = dm_report_field_string(rh, field, (const char * const *) &uuid); + free(uuid); + } + + return r; +} + +static int _dm_unmangled_uuid_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, + const void *data, void *private __attribute__((unused))) +{ + char *uuid; + int r = 0; + + if ((uuid = dm_task_get_uuid_unmangled((const struct dm_task *) data))) { + r = dm_report_field_string(rh, field, (const char * const *) &uuid); + free(uuid); + } + + return r; +} + +static int _dm_read_ahead_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + uint32_t value; + + if (!dm_task_get_read_ahead((const struct dm_task *) data, &value)) + value = 0; + + return dm_report_field_uint32(rh, field, &value); +} + +static int _dm_blk_name_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + char dev_name[PATH_MAX]; + const char *s = dev_name; + const struct dm_info *info = data; + + if (!dm_device_get_name(info->major, info->minor, 1, dev_name, PATH_MAX)) { + log_error("Could not resolve block device name for %d:%d.", + info->major, info->minor); + return 0; + } + + return dm_report_field_string(rh, field, &s); +} + +static int _dm_info_status_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + char buf[5]; + const char *s = buf; + const struct dm_info *info = data; + + buf[0] = info->live_table ? 'L' : '-'; + buf[1] = info->inactive_table ? 'I' : '-'; + buf[2] = info->suspended ? 's' : '-'; + buf[3] = info->read_only ? 'r' : 'w'; + buf[4] = '\0'; + + return dm_report_field_string(rh, field, &s); +} + +static int _dm_info_table_loaded_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, + const void *data, + void *private __attribute__((unused))) +{ + const struct dm_info *info = data; + + if (info->live_table) { + if (info->inactive_table) + dm_report_field_set_value(field, "Both", NULL); + else + dm_report_field_set_value(field, "Live", NULL); + return 1; + } + + if (info->inactive_table) + dm_report_field_set_value(field, "Inactive", NULL); + else + dm_report_field_set_value(field, "None", NULL); + + return 1; +} + +static int _dm_info_suspended_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, + const void *data, + void *private __attribute__((unused))) +{ + const struct dm_info *info = data; + + if (info->suspended) + dm_report_field_set_value(field, "Suspended", NULL); + else + dm_report_field_set_value(field, "Active", NULL); + + return 1; +} + +static int _dm_info_read_only_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, + const void *data, + void *private __attribute__((unused))) +{ + const struct dm_info *info = data; + + if (info->read_only) + dm_report_field_set_value(field, "Read-only", NULL); + else + dm_report_field_set_value(field, "Writeable", NULL); + + return 1; +} + + +static int _dm_info_devno_disp(struct dm_report *rh, struct dm_pool *mem, + struct dm_report_field *field, const void *data, + void *private) +{ + char buf[PATH_MAX], *repstr; + const struct dm_info *info = data; + + if (!dm_pool_begin_object(mem, 8)) { + log_error("dm_pool_begin_object failed"); + return 0; + } + + if (private) { + if (!dm_device_get_name(info->major, info->minor, + 1, buf, PATH_MAX)) { + stack; + goto out_abandon; + } + } + else { + if (dm_snprintf(buf, sizeof(buf), "%d:%d", + info->major, info->minor) < 0) { + log_error("dm_pool_alloc failed"); + goto out_abandon; + } + } + + if (!dm_pool_grow_object(mem, buf, strlen(buf) + 1)) { + log_error("dm_pool_grow_object failed"); + goto out_abandon; + } + + repstr = dm_pool_end_object(mem); + dm_report_field_set_value(field, repstr, repstr); + return 1; + + out_abandon: + dm_pool_abandon_object(mem); + return 0; +} + +static int _dm_tree_names(struct dm_report *rh, struct dm_pool *mem, + struct dm_report_field *field, const void *data, + void *private, unsigned inverted) +{ + const struct dm_tree_node *node = data; + struct dm_tree_node *parent; + void *t = NULL; + const char *name; + int first_node = 1; + char *repstr; + + if (!dm_pool_begin_object(mem, 16)) { + log_error("dm_pool_begin_object failed"); + return 0; + } + + while ((parent = dm_tree_next_child(&t, node, inverted))) { + name = dm_tree_node_get_name(parent); + if (!name || !*name) + continue; + if (!first_node && !dm_pool_grow_object(mem, ",", 1)) { + log_error("dm_pool_grow_object failed"); + goto out_abandon; + } + if (!dm_pool_grow_object(mem, name, 0)) { + log_error("dm_pool_grow_object failed"); + goto out_abandon; + } + if (first_node) + first_node = 0; + } + + if (!dm_pool_grow_object(mem, "\0", 1)) { + log_error("dm_pool_grow_object failed"); + goto out_abandon; + } + + repstr = dm_pool_end_object(mem); + dm_report_field_set_value(field, repstr, repstr); + return 1; + + out_abandon: + dm_pool_abandon_object(mem); + return 0; +} + +static int _dm_deps_names_disp(struct dm_report *rh, + struct dm_pool *mem, + struct dm_report_field *field, + const void *data, void *private) +{ + return _dm_tree_names(rh, mem, field, data, private, 0); +} + +static int _dm_tree_parents_names_disp(struct dm_report *rh, + struct dm_pool *mem, + struct dm_report_field *field, + const void *data, void *private) +{ + return _dm_tree_names(rh, mem, field, data, private, 1); +} + +static int _dm_tree_parents_devs_disp(struct dm_report *rh, struct dm_pool *mem, + struct dm_report_field *field, + const void *data, void *private) +{ + const struct dm_tree_node *node = data; + struct dm_tree_node *parent; + void *t = NULL; + const struct dm_info *info; + int first_node = 1; + char buf[DM_MAX_TYPE_NAME], *repstr; + + if (!dm_pool_begin_object(mem, 16)) { + log_error("dm_pool_begin_object failed"); + return 0; + } + + while ((parent = dm_tree_next_child(&t, node, 1))) { + info = dm_tree_node_get_info(parent); + if (!info->major && !info->minor) + continue; + if (!first_node && !dm_pool_grow_object(mem, ",", 1)) { + log_error("dm_pool_grow_object failed"); + goto out_abandon; + } + if (dm_snprintf(buf, sizeof(buf), "%d:%d", + info->major, info->minor) < 0) { + log_error("dm_snprintf failed"); + goto out_abandon; + } + if (!dm_pool_grow_object(mem, buf, 0)) { + log_error("dm_pool_grow_object failed"); + goto out_abandon; + } + if (first_node) + first_node = 0; + } + + if (!dm_pool_grow_object(mem, "\0", 1)) { + log_error("dm_pool_grow_object failed"); + goto out_abandon; + } + + repstr = dm_pool_end_object(mem); + dm_report_field_set_value(field, repstr, repstr); + return 1; + + out_abandon: + dm_pool_abandon_object(mem); + return 0; +} + +static int _dm_tree_parents_count_disp(struct dm_report *rh, + struct dm_pool *mem, + struct dm_report_field *field, + const void *data, void *private) +{ + const struct dm_tree_node *node = data; + int num_parent = dm_tree_node_num_children(node, 1); + + return dm_report_field_int(rh, field, &num_parent); +} + +static int _dm_deps_disp_common(struct dm_report *rh, struct dm_pool*mem, + struct dm_report_field *field, const void *data, + void *private, int disp_blk_dev_names) +{ + const struct dm_deps *deps = data; + char buf[PATH_MAX], *repstr; + int major, minor; + unsigned i; + + if (!dm_pool_begin_object(mem, 16)) { + log_error("dm_pool_begin_object failed"); + return 0; + } + + for (i = 0; i < deps->count; i++) { + major = (int) MAJOR(deps->device[i]); + minor = (int) MINOR(deps->device[i]); + + if (disp_blk_dev_names) { + if (!dm_device_get_name(major, minor, 1, buf, PATH_MAX)) { + log_error("Could not resolve block device " + "name for %d:%d.", major, minor); + goto out_abandon; + } + } + else if (dm_snprintf(buf, sizeof(buf), "%d:%d", + major, minor) < 0) { + log_error("dm_snprintf failed"); + goto out_abandon; + } + + if (!dm_pool_grow_object(mem, buf, 0)) { + log_error("dm_pool_grow_object failed"); + goto out_abandon; + } + + if (i + 1 < deps->count && !dm_pool_grow_object(mem, ",", 1)) { + log_error("dm_pool_grow_object failed"); + goto out_abandon; + } + } + + if (!dm_pool_grow_object(mem, "\0", 1)) { + log_error("dm_pool_grow_object failed"); + goto out_abandon; + } + + repstr = dm_pool_end_object(mem); + dm_report_field_set_value(field, repstr, repstr); + return 1; + + out_abandon: + dm_pool_abandon_object(mem); + return 0; +} + +static int _dm_deps_disp(struct dm_report *rh, struct dm_pool *mem, + struct dm_report_field *field, const void *data, + void *private) +{ + return _dm_deps_disp_common(rh, mem, field, data, private, 0); +} + +static int _dm_deps_blk_names_disp(struct dm_report *rh, struct dm_pool *mem, + struct dm_report_field *field, + const void *data, void *private) +{ + return _dm_deps_disp_common(rh, mem, field, data, private, 1); +} + +static int _dm_subsystem_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + return dm_report_field_string(rh, field, (const char *const *) data); +} + +static int _dm_vg_name_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + + return dm_report_field_string(rh, field, (const char *const *) data); +} + +static int _dm_lv_name_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) + +{ + return dm_report_field_string(rh, field, (const char *const *) data); +} + +static int _dm_lv_layer_name_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) + +{ + return dm_report_field_string(rh, field, (const char *const *) data); +} + +/** + * All _dm_stats_*_disp functions for basic counters are identical: + * obtain the value for the current region and area and pass it to + * dm_report_field_uint64(). + */ +#define MK_STATS_COUNTER_DISP_FN(counter) \ +static int _dm_stats_ ## counter ## _disp(struct dm_report *rh, \ + struct dm_pool *mem __attribute__((unused)), \ + struct dm_report_field *field, const void *data, \ + void *private __attribute__((unused))) \ +{ \ + const struct dm_stats *dms = (const struct dm_stats *) data; \ + uint64_t value = dm_stats_get_ ## counter(dms, DM_STATS_REGION_CURRENT, \ + DM_STATS_AREA_CURRENT); \ + return dm_report_field_uint64(rh, field, &value); \ +} + +MK_STATS_COUNTER_DISP_FN(reads) +MK_STATS_COUNTER_DISP_FN(reads_merged) +MK_STATS_COUNTER_DISP_FN(read_sectors) +MK_STATS_COUNTER_DISP_FN(read_nsecs) +MK_STATS_COUNTER_DISP_FN(writes) +MK_STATS_COUNTER_DISP_FN(writes_merged) +MK_STATS_COUNTER_DISP_FN(write_sectors) +MK_STATS_COUNTER_DISP_FN(write_nsecs) +MK_STATS_COUNTER_DISP_FN(io_in_progress) +MK_STATS_COUNTER_DISP_FN(io_nsecs) +MK_STATS_COUNTER_DISP_FN(weighted_io_nsecs) +MK_STATS_COUNTER_DISP_FN(total_read_nsecs) +MK_STATS_COUNTER_DISP_FN(total_write_nsecs) +#undef MK_STATS_COUNTER_DISP_FN + +static int _dm_stats_region_id_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + uint64_t group_id, region_id = dm_stats_get_current_region(dms); + char *group_buf = NULL, *repstr; + + if (dm_stats_current_object_type(dms) == DM_STATS_OBJECT_TYPE_GROUP) { + group_id = dm_stats_get_group_id(dms, dm_stats_get_current_region(dms)); + if (!dm_stats_get_group_descriptor(dms, group_id, &group_buf)) + return 0; + /* group_buf will disappear with the current handle */ + repstr = dm_pool_strdup(mem, group_buf); + dm_report_field_set_value(field, repstr, &group_id); + return 1; + } + + return dm_report_field_uint64(rh, field, &region_id); +} + +static int _dm_stats_region_start_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + uint64_t region_start; + const char *repstr; + double *sortval; + char units = _disp_units; + uint64_t factor = _disp_factor; + + if (!dm_stats_get_current_region_start(dms, &region_start)) + return_0; + + if (!(repstr = dm_size_to_string(mem, region_start, units, 1, factor, + _show_units(), DM_SIZE_UNIT))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = (double) region_start; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_region_len_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + uint64_t region_length; + const char *repstr; + double *sortval; + char units = _disp_units; + uint64_t factor = _disp_factor; + + if (!dm_stats_get_current_region_len(dms, &region_length)) + return_0; + + if (!(repstr = dm_size_to_string(mem, region_length, units, 1, factor, + _show_units(), DM_SIZE_UNIT))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = (double) region_length; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_area_id_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + uint64_t area_id = dm_stats_get_current_area(dms); + + if (dm_stats_current_object_type(dms) == DM_STATS_OBJECT_TYPE_GROUP) + area_id = 0; + + return dm_report_field_uint64(rh, field, &area_id); +} + +static int _dm_stats_area_start_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + uint64_t area_start; + const char *repstr; + double *sortval; + char units = _disp_units; + uint64_t factor = _disp_factor; + + if (!dm_stats_get_current_area_start(dms, &area_start)) + return_0; + + if (!(repstr = dm_size_to_string(mem, area_start, units, 1, factor, + _show_units(), DM_SIZE_UNIT))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = (double) area_start; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_area_offset_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + uint64_t area_offset; + const char *repstr; + double *sortval; + char units = _disp_units; + uint64_t factor = _disp_factor; + + if (!dm_stats_get_current_area_offset(dms, &area_offset)) + return_0; + + if (!(repstr = dm_size_to_string(mem, area_offset, units, 1, factor, + _show_units(), DM_SIZE_UNIT))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = (double) area_offset; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_area_len_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + uint64_t area_len; + const char *repstr; + double *sortval; + char units = _disp_units; + uint64_t factor = _disp_factor; + + if (!dm_stats_get_current_area_len(dms, &area_len)) + return_0; + + if (!(repstr = dm_size_to_string(mem, area_len, units, 1, factor, + _show_units(), DM_SIZE_UNIT))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = (double) area_len; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_area_count_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + uint64_t area_count, region; + + region = dm_stats_get_current_region(dms); + if (!(area_count = dm_stats_get_region_nr_areas(dms, region))) + return_0; + + return dm_report_field_uint64(rh, field, &area_count); +} + +static int _dm_stats_group_id_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + uint64_t group_id; + + group_id = dm_stats_get_group_id(dms, + dm_stats_get_current_region(dms)); + + if (!dm_stats_group_present(dms, group_id)) { + dm_report_field_set_value(field, "-", &group_id); + return 1; + } + + return dm_report_field_uint64(rh, field, &group_id); +} + +static int _dm_stats_program_id_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + const char *program_id; + if (!(program_id = dm_stats_get_current_region_program_id(dms))) + return_0; + return dm_report_field_string(rh, field, (const char * const *) &program_id); +} + +static int _dm_stats_user_data_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + const char *user_data; + if (!(user_data = dm_stats_get_current_region_aux_data(dms))) + return_0; + return dm_report_field_string(rh, field, (const char * const *) &user_data); +} + +static int _dm_stats_name_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + const char *stats_name; + if (!(stats_name = dm_stats_get_alias(dms, DM_STATS_REGION_CURRENT))) + return_0; + + return dm_report_field_string(rh, field, (const char * const *) &stats_name); +} + +static int _dm_stats_object_type_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + int type = dm_stats_current_object_type(dms); + + return dm_report_field_string(rh, field, (const char * const *) &_stats_types[type]); +} + +static int _dm_stats_precise_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + int precise; + precise = dm_stats_get_current_region_precise_timestamps(dms); + return dm_report_field_int(rh, field, (const int *) &precise); +} + +static const char *_get_histogram_string(const struct dm_stats *dms, int rel, + int vals, int bounds) +{ + const struct dm_histogram *dmh; + int flags = 0, width = (_switches[NOHEADINGS_ARG]) ? -1 : 0; + + if (!(dmh = dm_stats_get_histogram(dms, DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT))) + return ""; /* No histogram. */ + + flags |= (vals) ? DM_HISTOGRAM_VALUES + : 0; + + flags |= bounds; + + flags |= (rel) ? DM_HISTOGRAM_PERCENT + : 0; + + flags |= (_switches[NOTIMESUFFIX_ARG]) ? 0 : DM_HISTOGRAM_SUFFIX; + + /* FIXME: make unit conversion optional. */ + return dm_histogram_to_string(dmh, -1, width, flags); +} + +static int _stats_hist_count_disp(struct dm_report *rh, + struct dm_report_field *field, const void *data, + int bounds) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + const char *histogram; + + histogram = _get_histogram_string(dms, 0, 1, bounds); /* counts */ + + if (!histogram) + return_0; + + return dm_report_field_string(rh, field, (const char * const *) &histogram); +} + +static int _dm_stats_hist_count_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + return _stats_hist_count_disp(rh, field, data, 0); +} + +static int _dm_stats_hist_count_bounds_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + return _stats_hist_count_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_LOWER); +} + +static int _dm_stats_hist_count_ranges_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + return _stats_hist_count_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_RANGE); +} + +static int _stats_hist_percent_disp(struct dm_report *rh, + struct dm_report_field *field, const void *data, + int bounds) +{ + + /* FIXME: configurable to-string options. */ + const struct dm_stats *dms = (const struct dm_stats *) data; + const char *histogram; + + histogram = _get_histogram_string(dms, 1, 1, bounds); /* relative values */ + + if (!histogram) + return_0; + + return dm_report_field_string(rh, field, (const char * const *) &histogram); +} + +static int _dm_stats_hist_percent_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + return _stats_hist_percent_disp(rh, field, data, 0); +} + +static int _dm_stats_hist_percent_bounds_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + return _stats_hist_percent_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_LOWER); +} + +static int _dm_stats_hist_percent_ranges_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + return _stats_hist_percent_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_RANGE); +} + +static int _stats_hist_bounds_disp(struct dm_report *rh, + struct dm_report_field *field, const void *data, + int bounds) +{ + /* FIXME: configurable to-string options. */ + const struct dm_stats *dms = (const struct dm_stats *) data; + const char *histogram; + + histogram = _get_histogram_string(dms, 0, 0, bounds); + + if (!histogram) + return_0; + + return dm_report_field_string(rh, field, (const char * const *) &histogram); +} + +static int _dm_stats_hist_bounds_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + return _stats_hist_bounds_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_LOWER); +} + +static int _dm_stats_hist_ranges_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + return _stats_hist_bounds_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_RANGE); +} + +static int _dm_stats_hist_bins_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + int bins; + bins = dm_stats_get_region_nr_histogram_bins(dms, DM_STATS_REGION_CURRENT); + return dm_report_field_int(rh, field, (const int *) &bins); +} + +static int _dm_stats_rrqm_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + char buf[64]; + char *repstr; + double *sortval, rrqm; + + if (!dm_stats_get_rd_merges_per_sec(dms, &rrqm, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + if (dm_snprintf(buf, sizeof(buf), "%.2f", rrqm) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = rrqm; + + dm_report_field_set_value(field, repstr, sortval); + return 1; + +} + +static int _dm_stats_wrqm_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + char buf[64]; + char *repstr; + double *sortval, wrqm; + + if (!dm_stats_get_wr_merges_per_sec(dms, &wrqm, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + if (dm_snprintf(buf, sizeof(buf), "%.2f", wrqm) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = wrqm; + + dm_report_field_set_value(field, repstr, sortval); + return 1; + +} + +static int _dm_stats_rs_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + char buf[64]; + char *repstr; + double *sortval, rs; + + if (!dm_stats_get_reads_per_sec(dms, &rs, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + if (dm_snprintf(buf, sizeof(buf), "%.2f", rs) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = rs; + + dm_report_field_set_value(field, repstr, sortval); + return 1; + +} + +static int _dm_stats_ws_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + char buf[64]; + char *repstr; + double *sortval, ws; + + if (!dm_stats_get_writes_per_sec(dms, &ws, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + if (dm_snprintf(buf, sizeof(buf), "%.2f", ws) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = ws; + + dm_report_field_set_value(field, repstr, sortval); + return 1; + +} + +static int _dm_stats_read_secs_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + const char *repstr; + double *sortval, rsec; + char units = _disp_units; + uint64_t factor = _disp_factor; + + if (!dm_stats_get_read_sectors_per_sec(dms, &rsec, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + if (!(repstr = dm_size_to_string(mem, (uint64_t) rsec, units, 1, + factor, _show_units(), DM_SIZE_UNIT))) + + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = rsec; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_write_secs_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + const char *repstr; + double *sortval, wsec; + char units = _disp_units; + uint64_t factor = _disp_factor; + + if (!dm_stats_get_write_sectors_per_sec(dms, &wsec, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + if (!(repstr = dm_size_to_string(mem, (uint64_t) wsec, units, 1, + factor, _show_units(), DM_SIZE_UNIT))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = wsec; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_arqsz_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + const char *repstr; + double *sortval, arqsz; + char units = _disp_units; + uint64_t factor = _disp_factor; + + if (!dm_stats_get_average_request_size(dms, &arqsz, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + + if (!(repstr = dm_size_to_string(mem, (uint64_t) arqsz, units, 1, + factor, _show_units(), DM_SIZE_UNIT))) + + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = arqsz; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_qusz_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + char buf[64]; + char *repstr; + double *sortval, qusz; + + if (!dm_stats_get_average_queue_size(dms, &qusz, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + if (dm_snprintf(buf, sizeof(buf), "%.2f", qusz) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = qusz; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_await_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + char buf[64]; + char *repstr; + double *sortval, await; + + if (!dm_stats_get_average_wait_time(dms, &await, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + /* FIXME: make scale configurable */ + /* display in msecs */ + await /= NSEC_PER_MSEC; + + if (dm_snprintf(buf, sizeof(buf), "%.2f", await) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = await; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_r_await_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + char buf[64]; + char *repstr; + double *sortval, r_await; + + if (!dm_stats_get_average_rd_wait_time(dms, &r_await, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + /* FIXME: make scale configurable */ + /* display in msecs */ + r_await /= NSEC_PER_MSEC; + + if (dm_snprintf(buf, sizeof(buf), "%.2f", r_await) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = r_await; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_w_await_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + char buf[64]; + char *repstr; + double *sortval, w_await; + + if (!dm_stats_get_average_wr_wait_time(dms, &w_await, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + /* FIXME: make scale configurable */ + /* display in msecs */ + w_await /= NSEC_PER_MSEC; + + if (dm_snprintf(buf, sizeof(buf), "%.2f", w_await) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = w_await; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_tput_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + char buf[64]; + char *repstr; + double *sortval, tput; + + if (!dm_stats_get_throughput(dms, &tput, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + if (dm_snprintf(buf, sizeof(buf), "%.2f", tput) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = tput; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static int _dm_stats_svctm_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + char buf[64]; + char *repstr; + double *sortval, svctm; + + if (!dm_stats_get_service_time(dms, &svctm, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + /* FIXME: make scale configurable */ + /* display in msecs */ + svctm /= NSEC_PER_MSEC; + + if (dm_snprintf(buf, sizeof(buf), "%.2f", svctm) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) + return_0; + + *sortval = svctm; + + dm_report_field_set_value(field, repstr, sortval); + return 1; + +} + +static int _dm_stats_util_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + const struct dm_stats *dms = (const struct dm_stats *) data; + dm_percent_t util; + + if (!dm_stats_get_utilization(dms, &util, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT)) + return_0; + + dm_report_field_percent(rh, field, &util); + return 1; +} + +static int _dm_stats_sample_interval_ns_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + /* FIXME: use internal interval estimate when supported by libdm */ + return dm_report_field_uint64(rh, field, &_last_interval); +} + +static int _dm_stats_sample_interval_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + char buf[64]; + char *repstr; + double *sortval; + + if (!(sortval = dm_pool_alloc(mem, sizeof(*sortval)))) + return_0; + + *sortval = (double)_last_interval / (double) NSEC_PER_SEC; + + if (dm_snprintf(buf, sizeof(buf), "%2.6f", *sortval) < 0) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +static void *_task_get_obj(void *obj) +{ + return ((struct dmsetup_report_obj *)obj)->task; +} + +static void *_info_get_obj(void *obj) +{ + return ((struct dmsetup_report_obj *)obj)->info; +} + +static void *_deps_get_obj(void *obj) +{ + return dm_task_get_deps(((struct dmsetup_report_obj *)obj)->deps_task); +} + +static void *_tree_get_obj(void *obj) +{ + return ((struct dmsetup_report_obj *)obj)->tree_node; +} + +static void *_split_name_get_obj(void *obj) +{ + return ((struct dmsetup_report_obj *)obj)->split_name; +} + +static void *_stats_get_obj(void *obj) +{ + return ((struct dmsetup_report_obj *)obj)->stats; +} + +static const struct dm_report_object_type _report_types[] = { + { DR_TASK, "Mapped Device Name", "name_", _task_get_obj }, + { DR_INFO, "Mapped Device Information", "info_", _info_get_obj }, + { DR_DEPS, "Mapped Device Relationship Information", "deps_", _deps_get_obj }, + { DR_TREE, "Mapped Device Relationship Information", "tree_", _tree_get_obj }, + { DR_NAME, "Mapped Device Name Components", "splitname_", _split_name_get_obj }, + { DR_STATS, "Mapped Device Statistics","stats_", _stats_get_obj }, + { DR_STATS_META, "Mapped Device Statistics Region Information","region_", _stats_get_obj }, + { 0, "", "", NULL } +}; + +/* Column definitions */ +/* N.B. Field names must not contain the substring 'help' as this will disable --count. */ +#define OFFSET_OF(strct, field) (((char*)&((struct strct*)0)->field) - (char*)0) +#define STR (DM_REPORT_FIELD_TYPE_STRING) +#define NUM (DM_REPORT_FIELD_TYPE_NUMBER) +#define SIZ (DM_REPORT_FIELD_TYPE_SIZE) +#define TIM (DM_REPORT_FIELD_TYPE_TIME) +#define FIELD_O(type, strct, sorttype, head, field, width, func, id, desc) {DR_ ## type, sorttype, OFFSET_OF(strct, field), width, id, head, &_ ## func ## _disp, desc}, +#define FIELD_F(type, sorttype, head, width, func, id, desc) {DR_ ## type, sorttype, 0, width, id, head, &_ ## func ## _disp, desc}, + +static const struct dm_report_field_type _report_fields[] = { +/* *INDENT-OFF* */ +FIELD_F(TASK, STR, "Name", 16, dm_name, "name", "Name of mapped device.") +FIELD_F(TASK, STR, "MangledName", 16, dm_mangled_name, "mangled_name", "Mangled name of mapped device.") +FIELD_F(TASK, STR, "UnmangledName", 16, dm_unmangled_name, "unmangled_name", "Unmangled name of mapped device.") +FIELD_F(TASK, STR, "UUID", 32, dm_uuid, "uuid", "Unique (optional) identifier for mapped device.") +FIELD_F(TASK, STR, "MangledUUID", 32, dm_mangled_uuid, "mangled_uuid", "Mangled unique (optional) identifier for mapped device.") +FIELD_F(TASK, STR, "UnmangledUUID", 32, dm_unmangled_uuid, "unmangled_uuid", "Unmangled unique (optional) identifier for mapped device.") + +/* FIXME Next one should be INFO */ +FIELD_F(TASK, NUM, "RAhead", 6, dm_read_ahead, "read_ahead", "Read ahead value.") + +FIELD_F(INFO, STR, "BlkDevName", 16, dm_blk_name, "blkdevname", "Name of block device.") +FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "attr", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.") +FIELD_F(INFO, STR, "Tables", 6, dm_info_table_loaded, "tables_loaded", "Which of the live and inactive table slots are filled.") +FIELD_F(INFO, STR, "Suspended", 9, dm_info_suspended, "suspended", "Whether the device is suspended.") +FIELD_F(INFO, STR, "Read-only", 9, dm_info_read_only, "readonly", "Whether the device is read-only or writeable.") +FIELD_F(INFO, STR, "DevNo", 5, dm_info_devno, "devno", "Device major and minor numbers") +FIELD_O(INFO, dm_info, NUM, "Maj", major, 3, int32, "major", "Block device major number.") +FIELD_O(INFO, dm_info, NUM, "Min", minor, 3, int32, "minor", "Block device minor number.") +FIELD_O(INFO, dm_info, NUM, "Open", open_count, 4, int32, "open", "Number of references to open device, if requested.") +FIELD_O(INFO, dm_info, NUM, "Targ", target_count, 4, int32, "segments", "Number of segments in live table, if present.") +FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "events", "Number of most recent event.") + +FIELD_O(DEPS, dm_deps, NUM, "#Devs", count, 5, int32, "device_count", "Number of devices used by this one.") +FIELD_F(TREE, STR, "DevNamesUsed", 16, dm_deps_names, "devs_used", "List of names of mapped devices used by this one.") +FIELD_F(DEPS, STR, "DevNosUsed", 16, dm_deps, "devnos_used", "List of device numbers of devices used by this one.") +FIELD_F(DEPS, STR, "BlkDevNamesUsed", 16, dm_deps_blk_names, "blkdevs_used", "List of names of block devices used by this one.") + +FIELD_F(TREE, NUM, "#Refs", 5, dm_tree_parents_count, "device_ref_count", "Number of mapped devices referencing this one.") +FIELD_F(TREE, STR, "RefNames", 8, dm_tree_parents_names, "names_using_dev", "List of names of mapped devices using this one.") +FIELD_F(TREE, STR, "RefDevNos", 9, dm_tree_parents_devs, "devnos_using_dev", "List of device numbers of mapped devices using this one.") + +FIELD_O(NAME, dm_split_name, STR, "Subsys", subsystem, 6, dm_subsystem, "subsystem", "Userspace subsystem responsible for this device.") +FIELD_O(NAME, dm_split_name, STR, "VG", vg_name, 4, dm_vg_name, "vg_name", "LVM Volume Group name.") +FIELD_O(NAME, dm_split_name, STR, "LV", lv_name, 4, dm_lv_name, "lv_name", "LVM Logical Volume name.") +FIELD_O(NAME, dm_split_name, STR, "LVLayer", lv_layer, 7, dm_lv_layer_name, "lv_layer", "LVM device layer.") + +/* basic stats counters */ +FIELD_F(STATS, NUM, "#Reads", 6, dm_stats_reads, "read_count", "Count of reads completed.") +FIELD_F(STATS, NUM, "#RdMrgs", 7, dm_stats_reads_merged, "reads_merged_count", "Count of read requests merged.") +FIELD_F(STATS, NUM, "#RdSectors", 10, dm_stats_read_sectors, "read_sector_count", "Count of sectors read.") +FIELD_F(STATS, NUM, "AccRdTime", 11, dm_stats_read_nsecs, "read_time", "Accumulated duration of all read requests (ns).") +FIELD_F(STATS, NUM, "#Writes", 7, dm_stats_writes, "write_count", "Count of writes completed.") +FIELD_F(STATS, NUM, "#WrMrgs", 7, dm_stats_writes_merged, "writes_merged_count", "Count of write requests merged.") +FIELD_F(STATS, NUM, "#WrSectors", 10, dm_stats_write_sectors, "write_sector_count", "Count of sectors written.") +FIELD_F(STATS, NUM, "AccWrTime", 11, dm_stats_write_nsecs, "write_time", "Accumulated duration of all writes (ns).") +FIELD_F(STATS, NUM, "#InProg", 7, dm_stats_io_in_progress, "in_progress_count", "Count of requests currently in progress.") +FIELD_F(STATS, NUM, "IoTicks", 7, dm_stats_io_nsecs, "io_ticks", "Nanoseconds spent servicing requests.") +FIELD_F(STATS, NUM, "QueueTicks", 10, dm_stats_weighted_io_nsecs, "queue_ticks", "Total nanoseconds spent in queue.") +FIELD_F(STATS, NUM, "RdTicks", 7, dm_stats_total_read_nsecs, "read_ticks", "Nanoseconds spent servicing reads.") +FIELD_F(STATS, NUM, "WrTicks", 7, dm_stats_total_write_nsecs, "write_ticks", "Nanoseconds spent servicing writes.") + +/* Stats derived metrics */ +FIELD_F(STATS, NUM, "RMrg/s", 6, dm_stats_rrqm, "reads_merged_per_sec", "Read requests merged per second.") +FIELD_F(STATS, NUM, "WMrg/s", 6, dm_stats_wrqm, "writes_merged_per_sec", "Write requests merged per second.") +FIELD_F(STATS, NUM, "R/s", 3, dm_stats_rs, "reads_per_sec", "Reads per second.") +FIELD_F(STATS, NUM, "W/s", 3, dm_stats_ws, "writes_per_sec", "Writes per second.") +FIELD_F(STATS, NUM, "RSz/s", 5, dm_stats_read_secs, "read_size_per_sec", "Size of data read per second.") +FIELD_F(STATS, NUM, "WSz/s", 5, dm_stats_write_secs, "write_size_per_sec", "Size of data written per second.") +FIELD_F(STATS, NUM, "AvgRqSz", 7, dm_stats_arqsz, "avg_request_size", "Average request size.") +FIELD_F(STATS, NUM, "QSize", 5, dm_stats_qusz, "queue_size", "Average queue size.") +FIELD_F(STATS, NUM, "AWait", 5, dm_stats_await, "await", "Averate wait time.") +FIELD_F(STATS, NUM, "RdAWait", 7, dm_stats_r_await, "read_await", "Averate read wait time.") +FIELD_F(STATS, NUM, "WrAWait", 7, dm_stats_w_await, "write_await", "Averate write wait time.") +FIELD_F(STATS, NUM, "Throughput", 10, dm_stats_tput, "throughput", "Throughput.") +FIELD_F(STATS, NUM, "SvcTm", 5, dm_stats_svctm, "service_time", "Service time.") +FIELD_F(STATS, NUM, "Util%", 5, dm_stats_util, "util", "Utilization.") + +/* Histogram fields */ +FIELD_F(STATS, STR, "Histogram Counts", 16, dm_stats_hist_count, "hist_count", "Latency histogram counts.") +FIELD_F(STATS, STR, "Histogram Counts", 16, dm_stats_hist_count_bounds, "hist_count_bounds", "Latency histogram counts with bin boundaries.") +FIELD_F(STATS, STR, "Histogram Counts", 16, dm_stats_hist_count_ranges, "hist_count_ranges", "Latency histogram counts with bin ranges.") +FIELD_F(STATS, STR, "Histogram%", 10, dm_stats_hist_percent, "hist_percent", "Relative latency histogram.") +FIELD_F(STATS, STR, "Histogram%", 10, dm_stats_hist_percent_bounds, "hist_percent_bounds", "Relative latency histogram with bin boundaries.") +FIELD_F(STATS, STR, "Histogram%", 10, dm_stats_hist_percent_ranges, "hist_percent_ranges", "Relative latency histogram with bin ranges.") + +/* Stats interval duration estimates */ +FIELD_F(STATS, NUM, "IntervalNs", 10, dm_stats_sample_interval_ns, "interval_ns", "Sampling interval in nanoseconds.") +FIELD_F(STATS, NUM, "Interval", 8, dm_stats_sample_interval, "interval", "Sampling interval.") + +/* Stats report meta-fields */ +FIELD_F(STATS_META, NUM, "RgID", 4, dm_stats_region_id, "region_id", "Region ID.") +FIELD_F(STATS_META, SIZ, "RgStart", 7, dm_stats_region_start, "region_start", "Region start.") +FIELD_F(STATS_META, SIZ, "RgSize", 6, dm_stats_region_len, "region_len", "Region length.") +FIELD_F(STATS_META, NUM, "ArID", 4, dm_stats_area_id, "area_id", "Area ID.") +FIELD_F(STATS_META, SIZ, "ArStart", 7, dm_stats_area_start, "area_start", "Area offset from start of device.") +FIELD_F(STATS_META, SIZ, "ArSize", 6, dm_stats_area_len, "area_len", "Area length.") +FIELD_F(STATS_META, SIZ, "ArOff", 5, dm_stats_area_offset, "area_offset", "Area offset from start of region.") +FIELD_F(STATS_META, NUM, "#Areas", 6, dm_stats_area_count, "area_count", "Area count.") +FIELD_F(STATS_META, NUM, "GrpID", 5, dm_stats_group_id, "group_id", "Group ID.") +FIELD_F(STATS_META, STR, "ProgID", 6, dm_stats_program_id, "program_id", "Program ID.") +FIELD_F(STATS_META, STR, "UserData", 8, dm_stats_user_data, "user_data", "Auxiliary data.") +FIELD_F(STATS_META, STR, "Precise", 7, dm_stats_precise, "precise", "Set if nanosecond precision counters are enabled.") +FIELD_F(STATS_META, STR, "#Bins", 9, dm_stats_hist_bins, "hist_bins", "The number of histogram bins configured.") +FIELD_F(STATS_META, STR, "Histogram Bounds", 16, dm_stats_hist_bounds, "hist_bounds", "Latency histogram bin boundaries.") +FIELD_F(STATS_META, STR, "Histogram Ranges", 16, dm_stats_hist_ranges, "hist_ranges", "Latency histogram bin ranges.") +FIELD_F(STATS_META, STR, "Name", 16, dm_stats_name, "stats_name", "Stats name of current object.") +FIELD_F(STATS_META, STR, "ObjType", 7, dm_stats_object_type, "obj_type", "Type of stats object being reported.") +{0, 0, 0, 0, "", "", NULL, NULL}, +/* *INDENT-ON* */ +}; + +#undef FIELD_O +#undef FIELD_F + +#undef STR +#undef NUM +#undef SIZ + +static const char *_default_report_options = "name,major,minor,attr,open,segments,events,uuid"; +static const char *_splitname_report_options = "vg_name,lv_name,lv_layer"; + +/* Stats counters & derived metrics. */ +#define RD_COUNTERS "read_count,reads_merged_count,read_sector_count,read_time,read_ticks" +#define WR_COUNTERS "write_count,writes_merged_count,write_sector_count,write_time,write_ticks" +#define IO_COUNTERS "in_progress_count,io_ticks,queue_ticks" +#define COUNTERS RD_COUNTERS "," WR_COUNTERS "," IO_COUNTERS + +#define METRICS "reads_merged_per_sec,writes_merged_per_sec," \ + "reads_per_sec,writes_per_sec," \ + "read_size_per_sec,write_size_per_sec," \ + "avg_request_size,queue_size,util," \ + "await,read_await,write_await" + +/* Device, region and area metadata. */ +#define STATS_DEV_INFO "statsname,group_id,region_id,obj_type" +#define STATS_AREA_INFO "area_id,area_start,area_len" +#define STATS_AREA_INFO_FULL STATS_DEV_INFO ",region_start,region_len,area_count,area_id,area_start,area_len" +#define STATS_REGION_INFO STATS_DEV_INFO ",region_start,region_len,area_count,area_len" + +/* Minimal set of fields for histogram report. */ +#define STATS_HIST STATS_REGION_INFO ",util,await" + +/* Default stats report options. */ +static const char *_stats_default_report_options = STATS_DEV_INFO "," STATS_AREA_INFO "," METRICS; +static const char *_stats_raw_report_options = STATS_DEV_INFO "," STATS_AREA_INFO "," COUNTERS; +static const char *_stats_list_options = STATS_REGION_INFO ",program_id"; +static const char *_stats_area_list_options = STATS_AREA_INFO_FULL ",program_id"; +static const char *_stats_hist_list_options = STATS_REGION_INFO ",hist_bins,hist_bounds"; +static const char *_stats_hist_area_list_options = STATS_AREA_INFO_FULL ",hist_bins,hist_bounds"; +static const char *_stats_hist_options = STATS_HIST ",hist_count_bounds"; +static const char *_stats_hist_relative_options = STATS_HIST ",hist_percent_bounds"; + +static int _report_init(const struct command *cmd, const char *subcommand) +{ + char *options = (char *) _default_report_options; + char *opt_fields = NULL; /* optional fields from command line */ + const char *keys = ""; + const char *separator = " "; + const char *selection = NULL; + int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0; + int quoted = 1, columns_as_rows = 0; + uint32_t flags = 0; + size_t len = 0; + int r = 0; + + if (cmd && !strcmp(cmd->name, "splitname")) { + options = (char *) _splitname_report_options; + _report_type |= DR_NAME; + } + + if (cmd && !strcmp(cmd->name, "stats")) { + _report_type |= DR_STATS_META; + if (!strcmp(subcommand, "list")) { + if (!_switches[HISTOGRAM_ARG]) + options = (char *) ((_switches[VERBOSE_ARG]) + ? _stats_area_list_options + : _stats_list_options); + else + options = (char *) ((_switches[VERBOSE_ARG]) + ? _stats_hist_area_list_options + : _stats_hist_list_options); + } else { + if (_switches[HISTOGRAM_ARG]) + options = (char *) ((_switches[RELATIVE_ARG]) + ? _stats_hist_relative_options + : _stats_hist_options); + else + options = (char *) ((!_switches[RAW_ARG]) + ? _stats_default_report_options + : _stats_raw_report_options); + _report_type |= DR_STATS; + } + } + + if (cmd && !strcmp(cmd->name, "list")) { + options = (char *) _stats_list_options; + _report_type |= DR_STATS_META; + } + + /* emulate old dmsetup behaviour */ + if (_switches[NOHEADINGS_ARG]) { + separator = ":"; + aligned = 0; + headings = 0; + } + + if (_switches[UNBUFFERED_ARG]) + buffered = 0; + + if (_switches[ROWS_ARG]) + columns_as_rows = 1; + + if (_switches[UNQUOTED_ARG]) + quoted = 0; + + if (_switches[NAMEPREFIXES_ARG]) { + aligned = 0; + field_prefixes = 1; + } + + if (_switches[OPTIONS_ARG] && _string_args[OPTIONS_ARG]) { + /* Count & interval forbidden for help. */ + /* FIXME Detect "help" correctly and exit */ + if (strstr(_string_args[OPTIONS_ARG], "help")) { + _switches[COUNT_ARG] = 0; + _count = 1; + _switches[INTERVAL_ARG] = 0; + headings = 0; + } + + if (*_string_args[OPTIONS_ARG] != '+') + options = _string_args[OPTIONS_ARG]; + else { + char *tmpopts; + opt_fields = _string_args[OPTIONS_ARG] + 1; + len = strlen(options) + strlen(opt_fields) + 2; + if (!(tmpopts = malloc(len))) { + log_error("Failed to allocate option string."); + return 0; + } + if (dm_snprintf(tmpopts, len, "%s,%s", + options, opt_fields) < 0) { + free(tmpopts); + return 0; + } + options = tmpopts; + } + } + + if (_switches[SORT_ARG] && _string_args[SORT_ARG]) { + keys = _string_args[SORT_ARG]; + buffered = 1; + if (cmd && (!strcmp(cmd->name, "status") || !strcmp(cmd->name, "table"))) { + log_error("--sort is not yet supported with status and table."); + goto out; + } + } + + if (_switches[SEPARATOR_ARG] && _string_args[SEPARATOR_ARG]) { + separator = _string_args[SEPARATOR_ARG]; + aligned = 0; + } + + if (_switches[SELECT_ARG] && _string_args[SELECT_ARG]) + selection = _string_args[SELECT_ARG]; + + if (aligned) + flags |= DM_REPORT_OUTPUT_ALIGNED; + + if (buffered) + flags |= DM_REPORT_OUTPUT_BUFFERED; + + if (headings) + flags |= DM_REPORT_OUTPUT_HEADINGS; + + if (field_prefixes) + flags |= DM_REPORT_OUTPUT_FIELD_NAME_PREFIX; + + if (!quoted) + flags |= DM_REPORT_OUTPUT_FIELD_UNQUOTED; + + if (columns_as_rows) + flags |= DM_REPORT_OUTPUT_COLUMNS_AS_ROWS; + + if (!(_report = dm_report_init_with_selection(&_report_type, _report_types, + _report_fields, options, separator, flags, keys, + selection, NULL, NULL))) + goto_out; + + r = 1; + + if ((_report_type & DR_TREE) && cmd) { + r = _build_whole_deptree(cmd); + if (!_dtree) { + log_error("Internal device dependency tree creation failed."); + goto out; + } + } + + if (!_switches[INTERVAL_ARG]) + _int_args[INTERVAL_ARG] = 1; /* 1s default. */ + + _interval = NSEC_PER_SEC * (uint64_t) _int_args[INTERVAL_ARG]; + + if (field_prefixes) + dm_report_set_output_field_name_prefix(_report, "dm_"); + +out: + if (len) + free(options); + + return r; +} + +/* + * List devices + */ +static int _ls(CMD_ARGS) +{ + if ((_switches[TARGET_ARG] && _target) || + (_switches[EXEC_ARG] && _command_to_exec)) + return _status(cmd, NULL, argc, argv, NULL, 0); + + if ((_switches[TREE_ARG])) + return _display_tree(cmd, NULL, 0, NULL, NULL, 0); + + return _process_all(cmd, NULL, argc, argv, 0, _display_name); +} + +static int _mangle(CMD_ARGS) +{ + const char *name, *uuid; + char *new_name = NULL, *new_uuid = NULL; + struct dm_task *dmt; + struct dm_info info; + int r = 0; + int target_format; + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + return _process_all(cmd, NULL, argc, argv, 0, _mangle); + name = argv[0]; + } + + if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) + return_0; + + if (!(_set_task_device(dmt, name, 0))) + goto_out; + + if (!_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + if (!dm_task_get_info(dmt, &info) || !info.exists) + goto_out; + + uuid = dm_task_get_uuid(dmt); + + target_format = _switches[MANGLENAME_ARG] ? _int_args[MANGLENAME_ARG] + : DEFAULT_DM_NAME_MANGLING; + + if (target_format == DM_STRING_MANGLING_AUTO) { + if (strstr(name, "\\x5cx")) { + log_error("The name \"%s\" seems to be mangled more than once. " + "Manual intervention required to rename the device.", name); + goto out; + } + if (strstr(uuid, "\\x5cx")) { + log_error("The UUID \"%s\" seems to be mangled more than once. " + "Manual intervention required to correct the device UUID.", uuid); + goto out; + } + } + + if (target_format == DM_STRING_MANGLING_NONE) { + if (!(new_name = dm_task_get_name_unmangled(dmt))) + goto_out; + if (!(new_uuid = dm_task_get_uuid_unmangled(dmt))) + goto_out; + } + else { + if (!(new_name = dm_task_get_name_mangled(dmt))) + goto_out; + if (!(new_uuid = dm_task_get_uuid_mangled(dmt))) + goto_out; + } + + /* We can't rename the UUID, the device must be reactivated manually. */ + if (strcmp(uuid, new_uuid)) { + log_error("%s: %s: UUID in incorrect form. ", name, uuid); + log_error("Unable to change device UUID. The device must be deactivated first."); + r = 0; + goto out; + } + + /* Nothing to do if the name is in correct form already. */ + if (!strcmp(name, new_name)) { + log_print("%s: %s: name %salready in correct form", name, + *uuid ? uuid : "[no UUID]", *uuid ? "and UUID " : ""); + r = 1; + goto out; + } + else + log_print("%s: renaming to %s", name, new_name); + + /* Rename to correct form of the name. */ + r = _do_rename(name, new_name, NULL); + +out: + free(new_name); + free(new_uuid); + dm_task_destroy(dmt); + return r; +} + +static int _stats(CMD_ARGS); +static int _bind_stats_device(struct dm_stats *dms, const char *name) +{ + if (name && !dm_stats_bind_name(dms, name)) + return_0; + else if (_switches[UUID_ARG] && !dm_stats_bind_uuid(dms, _uuid)) + return_0; + else if (_switches[MAJOR_ARG] && _switches[MINOR_ARG] + && !dm_stats_bind_devno(dms, _int_args[MAJOR_ARG], + _int_args[MINOR_ARG])) + return_0; + + return 1; +} + +static int _stats_clear_one_region(struct dm_stats *dms, uint64_t region_id) +{ + + if (!dm_stats_region_present(dms, region_id)) { + log_error("No such region: %"PRIu64".", region_id); + return 0; + } + if (!dm_stats_clear_region(dms, region_id)) { + log_error("Clearing statistics region %"PRIu64" failed.", + region_id); + return 0; + } + log_info("Cleared statistics region %"PRIu64".", region_id); + return 1; +} + +static int _stats_clear_regions(struct dm_stats *dms, uint64_t region_id) +{ + int allregions = (region_id == DM_STATS_REGIONS_ALL); + + if (!dm_stats_list(dms, NULL)) + return_0; + + if (!dm_stats_get_nr_regions(dms)) + return 1; + + if (!allregions) + return _stats_clear_one_region(dms, region_id); + + dm_stats_foreach_region(dms) { + region_id = dm_stats_get_current_region(dms); + if (!_stats_clear_one_region(dms, region_id)) + return_0; + } + + return 1; +} + +static int _stats_clear(CMD_ARGS) +{ + struct dm_stats *dms; + uint64_t region_id; + char *name = NULL; + int allregions = _switches[ALL_REGIONS_ARG]; + + /* clear does not use a report */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + + if (!_switches[REGION_ID_ARG] && !_switches[ALL_REGIONS_ARG]) { + log_error("Please specify a --regionid or use --allregions."); + return 0; + } + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + return _process_all(cmd, subcommand, argc, argv, 0, _stats_clear); + name = argv[0]; + } + + region_id = (allregions) ? DM_STATS_REGIONS_ALL + : (uint64_t) _int_args[REGION_ID_ARG]; + + if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) + return_0; + + if (!_bind_stats_device(dms, name)) + goto_out; + + if (!_stats_clear_regions(dms, region_id)) + goto_out; + + dm_stats_destroy(dms); + return 1; + +out: + dm_stats_destroy(dms); + return 0; +} + +static uint64_t _factor_from_units(char *argptr, char *unit_type) +{ + return dm_units_to_factor(argptr, unit_type, 0, NULL); +} + +/** + * Parse a start, length, or area size argument in bytes from a string + * using optional units as supported by _factor_from_units(). + */ +static int _size_from_string(char *argptr, uint64_t *size, const char *name) +{ + uint64_t factor; + char *endptr = NULL, unit_type; + if (!argptr) + return_0; + + *size = strtoull(argptr, &endptr, 10); + if (endptr == argptr) { + *size = 0; + log_error("Invalid %s argument: \"%s\"", + name, (*argptr) ? argptr : ""); + return 0; + } + + if (*endptr == '\0') { + *size *= 512; + return 1; + } + + factor = _factor_from_units(endptr, &unit_type); + if (factor) + *size *= factor; + + return 1; +} + +/* + * FIXME: expose this from libdm-stats + */ +static uint64_t _nr_areas_from_step(uint64_t len, int64_t step) +{ + /* Default is one area. */ + if (!step || !len) + return 1; + + /* --areas */ + if (step < 0) + return (uint64_t)(-step); + + /* --areasize - cast step to unsigned as it cannot be -ve here. */ + return (len / step) + !!(len % (uint64_t) step); +} + +/* maximum length of a string representation of an integer */ +#define max_int_strlen(i) (strlen(#i)) +#define MAX_UINT64_STRLEN max_int_strlen(UINT64_MAX) +static int _stats_group_segments(struct dm_stats *dms, uint64_t *region_ids, + int count, const char *alias) +{ + /* NULL, commas, and count * region_id */ + size_t bufsize = 1 + count + count * MAX_UINT64_STRLEN; + char *this_region, *regions = NULL; + uint64_t group_id; + int r, i; + + this_region = regions = malloc(bufsize); + + if (!regions) { + log_error("Could not allocate memory for region_id table."); + return 0; + } + + for (i = 0; i < count; i++) { + /* + * We don't expect large numbers of segments (compared to e.g. + * --filemap): use a fixed-size buffer based on the number of + * region identifiers and do not collapse continuous ranges + * of identifiers in the group descriptor argument. + */ + r = dm_snprintf(this_region, bufsize, FMTu64 "%s", region_ids[i], + (i < (count - 1)) ? "," : ""); + if (r < 0) + goto_bad; + this_region += r; + bufsize -= r; + } + + /* refresh handle */ + if (!(r = dm_stats_list(dms, NULL))) + goto bad; + + if ((r = dm_stats_create_group(dms, regions, alias, &group_id))) + printf("Grouped regions %s as group ID " FMTu64 "%s%s\n", + regions, group_id, (alias) ? " with alias " : "", + (alias) ? : ""); + else + log_error("Failed to create group for regions %s.", regions); + +bad: + free(regions); + return r; +} + +/* + * Create a single region starting at start and spanning len sectors, + * or, if the segments argument is no-zero create one region for each + * segment present in the mapped device. Passing zero for segments, + * start, and length will create a single segment spanning the whole + * device. + */ +static int _do_stats_create_regions(struct dm_stats *dms, + const char *name, uint64_t start, + uint64_t len, int64_t step, + int segments, + const char *program_id, + const char *user_data) +{ + uint64_t this_start = 0, this_len = len, region_id = UINT64_C(0); + const char *devname = NULL, *histogram = _string_args[BOUNDS_ARG]; + int r = 0, count = 0, precise = _switches[PRECISE_ARG]; + struct dm_histogram *bounds = NULL; /* histogram bounds */ + uint64_t *region_ids = NULL; /* segments */ + char *target_type, *params; /* unused */ + struct dm_task *dmt; + struct dm_info info; + void *next = NULL; + + if (_switches[ALIAS_ARG] && _switches[NOGROUP_ARG]) { + log_error("Cannot set alias with --nogroup."); + dm_stats_destroy(dms); + return 0; + } + + if (histogram && !(bounds = dm_histogram_bounds_from_string(histogram))) + return_0; + + if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) { + dm_histogram_bounds_destroy(bounds); + dm_stats_destroy(dms); + return_0; + } + + if (!_set_task_device(dmt, name, 0)) + goto_out; + + if (!dm_task_no_open_count(dmt)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + if (!dm_task_get_info(dmt, &info) || !info.exists) + goto_out; + + if (!(devname = dm_task_get_name(dmt))) + goto_out; + + if (!segments || (info.target_count == 1)) + region_ids = &region_id; + else + region_ids = malloc(info.target_count * sizeof(*region_ids)); + + do { + uint64_t segment_start, segment_len; + next = dm_get_next_target(dmt, next, &segment_start, &segment_len, + &target_type, &params); + + /* Accumulate whole-device size for nr_areas calculation. */ + if (!segments && !len) + this_len += segment_len; + + /* Segments or whole-device. */ + if (segments || !next) { + /* + * this_start and this_len hold the start and length in + * sectors of the to-be-created region: this is either the + * segment start/len (for --segments), the value of the + * --start/--length arguments, or 0/0 for a default + * whole-device region). + */ + this_start = (segments) ? segment_start : start; + this_len = (segments) ? segment_len : this_len; + if (!(r = dm_stats_create_region(dms, &region_ids[count], + this_start, this_len, step, + precise, bounds, + program_id, user_data))) { + log_error("%s: Could not create statistics region.", + devname); + goto out; + } + + printf("%s: Created new region with "FMTu64" area(s) as " + "region ID "FMTu64"\n", devname, + _nr_areas_from_step(this_len, step), + region_ids[count++]); + } + } while (next); + + if (!_switches[NOGROUP_ARG] && segments) + r = _stats_group_segments(dms, region_ids, count, + _string_args[ALIAS_ARG]); + +out: + if (region_ids != &region_id) + free(region_ids); + + dm_task_destroy(dmt); + dm_stats_destroy(dms); + dm_histogram_bounds_destroy(bounds); + return r; +} + +/* + * Returns the full absolute path, or NULL if the path could + * not be resolved. + */ +static char *_get_abspath(const char *path) +{ + char *_path; + +#ifdef HAVE_CANONICALIZE_FILE_NAME + _path = canonicalize_file_name(path); +#else + /* FIXME Provide alternative */ + log_error(INTERNAL_ERROR "Unimplemented _get_abspath."); + _path = NULL; +#endif + return _path; +} + +static int _stats_check_filemap_switches(void) +{ + if (_switches[AREAS_ARG] || _switches[AREA_SIZE_ARG]) { + log_error("--filemap is incompatible with --areas and --area-size."); + return 0; + } + + if (_switches[START_ARG] || _switches[LENGTH_ARG]) { + log_error("--filemap is incompatible with --start and --length."); + return 0; + } + + if (_switches[SEGMENTS_ARG]) { + log_error("--filemap and --segments are incompatible."); + return 0; + } + + if (_switches[USER_DATA_ARG]) { + log_error("--userdata is not yet supported with --filemap."); + return 0; + } + + if (_switches[UUID_ARG] || _switches[MAJOR_ARG]) { + log_error("--uuid and --major are incompatible with --filemap."); + return 0; + } + + if (_switches[ALL_DEVICES_ARG]) { + log_error("--alldevices is incompatible with --filemap."); + return 0; + } + + return 1; +} + +static dm_filemapd_mode_t _stats_get_filemapd_mode(void) +{ + if (_switches[NOMONITOR_ARG] || _switches[NOGROUP_ARG]) + return DM_FILEMAPD_FOLLOW_NONE; + if (!_switches[FOLLOW_ARG]) + return DM_FILEMAPD_FOLLOW_INODE; + return dm_filemapd_mode_from_string(_string_args[FOLLOW_ARG]); +} + +static int _stats_create_file(CMD_ARGS) +{ + const char *alias, *program_id = DM_STATS_PROGRAM_ID; + const char *bounds_str = _string_args[BOUNDS_ARG]; + int foreground = _switches[FOREGROUND_ARG]; + int verbose = _switches[VERBOSE_ARG]; + uint64_t *regions, *region, count = 0; + struct dm_histogram *bounds = NULL; + char *path, *abspath = NULL; + struct dm_stats *dms = NULL; + int group, fd = -1, precise; + dm_filemapd_mode_t mode; + + if (names) { + log_error("Device names are not compatibile with --filemap."); + return 0; + } + + if (!_stats_check_filemap_switches()) + return 0; + + /* _stats_create_file does not use _process_all() */ + if (!argc) { + log_error("--filemap requires a file path argument"); + return 0; + } + + path = argv[0]; + + if (_switches[PRECISE_ARG]) { + if (!dm_stats_driver_supports_precise()) { + log_error("Using --precise requires driver version " + "4.32.0 or later."); + return 0; + } + } + + if (_switches[BOUNDS_ARG]) { + if (!dm_stats_driver_supports_histogram()) { + log_error("Using --bounds requires driver version " + "4.32.0 or later."); + return 0; + } + } + + if (!(abspath = _get_abspath(path))) { + log_error("Could not canonicalize file name: %s", path); + return 0; + } + + if (bounds_str + && !(bounds = dm_histogram_bounds_from_string(bounds_str))) { + free(abspath); + return_0; + } + + if (_switches[PROGRAM_ID_ARG]) + program_id = _string_args[PROGRAM_ID_ARG]; + if (!strlen(program_id) && !_switches[FORCE_ARG]) + program_id = DM_STATS_PROGRAM_ID; + + precise = _int_args[PRECISE_ARG]; + group = !_switches[NOGROUP_ARG]; + + mode = _stats_get_filemapd_mode(); + if (!_switches[NOMONITOR_ARG] && (mode == DM_FILEMAPD_FOLLOW_NONE)) + goto bad; + + if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) + goto_bad; + + fd = open(abspath, O_RDONLY); + + if (fd < 0) { + log_error("Could not open %s for reading", abspath); + goto bad; + } + + if (!dm_stats_bind_from_fd(dms, fd)) + goto_bad; + + if (!strlen(program_id)) + /* force creation of a region with no id */ + dm_stats_set_program_id(dms, 1, NULL); + + if (group && !_switches[ALIAS_ARG]) + alias = dm_basename(abspath); + else if (group) + alias = _string_args[ALIAS_ARG]; + else if (!_switches[ALIAS_ARG]) + alias = NULL; + else { + log_error("Cannot set alias with --nogroup."); + goto bad; + } + + regions = dm_stats_create_regions_from_fd(dms, fd, group, precise, + bounds, alias); + + if (!regions) { + log_error("Could not create regions from file %s.", abspath); + goto bad; + } + + if (!_switches[NOMONITOR_ARG] && group) { + if (!dm_stats_start_filemapd(fd, regions[0], abspath, mode, + foreground, verbose)) + log_warn("Failed to start filemap monitoring daemon."); + } + + if (close(fd)) + log_sys_debug("close", abspath); + + fd = -1; + + for (region = regions; *region != DM_STATS_REGIONS_ALL; region++) + count++; + + if (group) { + printf("%s: Created new group with "FMTu64" region(s) as " + "group ID "FMTu64".\n", path, count, regions[0]); + } else { + region = regions; + do + printf("%s: Created new region with 1 area as " + "region ID "FMTu64".\n", path, *region); + while (*(++region) != DM_STATS_REGIONS_ALL); + } + + free(regions); + free(abspath); + free(bounds); + dm_stats_destroy(dms); + return 1; + +bad: + free(abspath); + free(bounds); + + if ((fd > -1) && close(fd)) + log_sys_debug("close", path); + + if (dms) + dm_stats_destroy(dms); + + return 0; +} + +static int _stats_create(CMD_ARGS) +{ + struct dm_stats *dms; + const char *name, *user_data = "", *program_id = DM_STATS_PROGRAM_ID; + uint64_t start = 0, len = 0, areas = 0, area_size = 0; + int64_t step = 0; + + /* create does not use a report */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + + if (_switches[ALL_REGIONS_ARG]) { + log_error("Cannot use --allregions with create."); + return 0; + } + + if (_switches[ALL_PROGRAMS_ARG]) { + log_error("Cannot use --allprograms with create."); + return 0; + } + + if (_switches[AREAS_ARG] && _switches[AREA_SIZE_ARG]) { + log_error("Please specify one of --areas and --areasize."); + return 0; + } + + if (_switches[PROGRAM_ID_ARG] + && !strlen(_string_args[PROGRAM_ID_ARG]) && !_switches[FORCE_ARG]) { + log_error("Creating a region with no program " + "id requires --force."); + return 0; + } + + if (_switches[FILEMAP_ARG]) + return _stats_create_file(cmd, subcommand, argc, argv, + names, multiple_devices); + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { + if (!_switches[ALL_DEVICES_ARG]) { + log_error("Please specify device(s) or use " + "--alldevices."); + return 0; + } + return _process_all(cmd, subcommand, argc, argv, 0, _stats_create); + } + name = argv[0]; + } + + if (_switches[AREAS_ARG]) + areas = (uint64_t) _int_args[AREAS_ARG]; + + if (_switches[AREA_SIZE_ARG]) + if (!_size_from_string(_string_args[AREA_SIZE_ARG], + &area_size, "areasize")) + return_0; + + areas = (areas) ? areas : 1; + /* bytes to sectors or -(areas): promote to signed before conversion */ + step = (area_size) ? ((int64_t) area_size / 512) : -((int64_t) areas); + + if (_switches[START_ARG]) { + if (!_size_from_string(_string_args[START_ARG], + &start, "start")) + return_0; + } + + /* bytes to sectors */ + start /= 512; + + if (_switches[LENGTH_ARG]) { + if (!_size_from_string(_string_args[LENGTH_ARG], + &len, "length")) + return_0; + } + + /* bytes to sectors */ + len /= 512; + + if (_switches[PROGRAM_ID_ARG]) + program_id = _string_args[PROGRAM_ID_ARG]; + if (!strlen(program_id) && !_switches[FORCE_ARG]) + program_id = DM_STATS_PROGRAM_ID; + + if (_switches[USER_DATA_ARG]) + user_data = _string_args[USER_DATA_ARG]; + + if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) + return_0; + + if (!_bind_stats_device(dms, name)) + goto_bad; + + if (_switches[PRECISE_ARG]) { + if (!dm_stats_driver_supports_precise()) { + log_error("Using --precise requires driver version " + "4.32.0 or later."); + goto bad; + } + } + + if (_switches[BOUNDS_ARG]) { + if (!dm_stats_driver_supports_histogram()) { + log_error("Using --bounds requires driver version " + "4.32.0 or later."); + goto bad; + } + } + + if (!strlen(program_id)) + /* force creation of a region with no id */ + dm_stats_set_program_id(dms, 1, NULL); + + return _do_stats_create_regions(dms, name, start, len, step, + _switches[SEGMENTS_ARG], + program_id, user_data); + +bad: + dm_stats_destroy(dms); + return 0; +} + +static int _stats_delete(CMD_ARGS) +{ + struct dm_stats *dms; + uint64_t region_id, group_id; + char *name = NULL; + const char *program_id = DM_STATS_PROGRAM_ID; + int allregions = _switches[ALL_REGIONS_ARG]; + int r = 0; + + /* delete does not use a report */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + + if (_switches[REGION_ID_ARG] && _switches[GROUP_ID_ARG]) { + log_error("Please use one of --regionid and --groupid."); + return 0; + } + + if (!_switches[REGION_ID_ARG] && !allregions && !_switches[GROUP_ID_ARG]) { + log_error("Please specify a --regionid or --groupid, or use --allregions."); + return 0; + } + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { + if (!_switches[ALL_DEVICES_ARG]) { + log_error("Please specify device(s) or use " + "--alldevices."); + return 0; + } + return _process_all(cmd, subcommand, argc, argv, 0, _stats_delete); + } + name = argv[0]; + } + + if (_switches[PROGRAM_ID_ARG]) + program_id = _string_args[PROGRAM_ID_ARG]; + if (_switches[ALL_PROGRAMS_ARG]) + program_id = DM_STATS_ALL_PROGRAMS; + + region_id = (uint64_t) _int_args[REGION_ID_ARG]; + group_id = (uint64_t) _int_args[GROUP_ID_ARG]; + + if (!(dms = dm_stats_create(program_id))) + return_0; + + if (!_bind_stats_device(dms, name)) + goto_out; + + /* allregions and group delete require a listed handle */ + if ((allregions || _switches[GROUP_ID_ARG]) + && !dm_stats_list(dms, program_id)) + goto_out; + + if (allregions && !dm_stats_get_nr_regions(dms)) { + /* no regions present */ + r = 1; + goto out; + } + + if (_switches[GROUP_ID_ARG]) { + if (!dm_stats_delete_group(dms, group_id, 1)) { + log_error("Could not delete statistics group."); + goto out; + } + printf("Deleted statistics group " FMTu64 ".\n", group_id); + } else if (_switches[ALL_REGIONS_ARG]) { + dm_stats_foreach_region(dms) { + region_id = dm_stats_get_current_region(dms); + if (!dm_stats_delete_region(dms, region_id)) { + log_error("Could not delete statistics region."); + goto out; + } + log_info("Deleted statistics region %" PRIu64, region_id); + } + } else { + if (!dm_stats_delete_region(dms, region_id)) { + log_error("Could not delete statistics region"); + goto out; + } + log_info("Deleted statistics region " FMTu64 ".", region_id); + } + + r = 1; + +out: + dm_stats_destroy(dms); + return r; +} + +static int _stats_print_one_region(struct dm_stats *dms, int clear, + uint64_t region_id) +{ + char *stbuff = NULL; + + /*FIXME: line control for large regions */ + if (!(stbuff = dm_stats_print_region(dms, region_id, 0, 0, clear))) { + log_error("Could not print statistics region."); + return 0; + } + + printf("%s", stbuff); + dm_stats_buffer_destroy(dms, stbuff); + + return 1; +} + +static int _stats_print(CMD_ARGS) +{ + struct dm_stats *dms; + char *name, *stbuff = NULL; + uint64_t region_id; + unsigned clear = (unsigned) _switches[CLEAR_ARG]; + int allregions = _switches[ALL_REGIONS_ARG]; + int r = 0; + + /* print does not use a report */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + + if (!_switches[REGION_ID_ARG] && !allregions) { + log_error("Please specify a --regionid or use --allregions."); + return 0; + } + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + return _process_all(cmd, subcommand, argc, argv, 0, _stats_print); + name = argv[0]; + } + + if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) + return_0; + + if (!_bind_stats_device(dms, name)) + goto_out; + + if (!dm_stats_list(dms, NULL)) + goto_out; + + if (allregions && !dm_stats_get_nr_regions(dms)) { + r = 1; + goto out; + } + + if (!allregions) { + region_id = (uint64_t) _int_args[REGION_ID_ARG]; + if (!_stats_print_one_region(dms, clear, region_id)) + goto_out; + r = 1; + goto out; + } + + dm_stats_foreach_region(dms) { + region_id = dm_stats_get_current_region(dms); + if (!_stats_print_one_region(dms, clear, region_id)) + goto_out; + + /*FIXME: line control for large regions */ + if (!(stbuff = dm_stats_print_region(dms, region_id, 0, 0, clear))) { + log_error("Could not print statistics region."); + goto out; + } + + printf("%s", stbuff); + dm_stats_buffer_destroy(dms, stbuff); + } + + r = 1; + +out: + dm_stats_destroy(dms); + return r; +} + +static int _stats_report(CMD_ARGS) +{ + int r = 0, objtype_args; + + struct dm_task *dmt; + char *name = NULL; + + objtype_args = (_switches[AREA_ARG] + || _switches[REGION_ARG] + || _switches[GROUP_ARG]); + + if (_switches[PROGRAM_ID_ARG]) + _program_id = _string_args[PROGRAM_ID_ARG]; + + if (_switches[ALL_PROGRAMS_ARG]) + _program_id = ""; + + if (_switches[VERBOSE_ARG] && !strcmp(subcommand, "list")) + _statstype |= (DM_STATS_WALK_ALL + | DM_STATS_WALK_SKIP_SINGLE_AREA); + + /* suppress duplicates unless the user has requested all regions */ + if (!strcmp(subcommand, "report") && !objtype_args) + /* suppress duplicate rows of output */ + _statstype |= (DM_STATS_WALK_ALL + | DM_STATS_WALK_SKIP_SINGLE_AREA); + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + return _process_all(cmd, subcommand, argc, argv, 0, _info); + name = argv[0]; + } + + if (!(dmt = dm_task_create(DM_DEVICE_INFO))) + return_0; + + if (!_set_task_device(dmt, name, 0)) + goto_out; + + if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) + goto_out; + + if (!_task_run(dmt)) + goto_out; + + r = _display_info(dmt); + +out: + dm_task_destroy(dmt); + + if (!r && _report) { + dm_report_free(_report); + _report = NULL; + } + + return r; +} + +static int _stats_group(CMD_ARGS) +{ + char *name, *alias = NULL, *regions = NULL; + struct dm_stats *dms; + uint64_t group_id; + int r = 0; + + /* group does not use a report */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + + if (!_switches[REGIONS_ARG]) { + log_error("Group requires --regions."); + return 0; + } + + regions = _string_args[REGIONS_ARG]; + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { + if (!_switches[ALL_DEVICES_ARG]) { + log_error("Please specify device(s) or use " + "--alldevices."); + return 0; + } + return _process_all(cmd, subcommand, argc, argv, 0, _stats_group); + } + name = argv[0]; + } + + if (_switches[ALIAS_ARG]) + alias = _string_args[ALIAS_ARG]; + + if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) + return_0; + + if (!_bind_stats_device(dms, name)) + goto_out; + + if (!dm_stats_list(dms, NULL)) + goto_out; + + if(!dm_stats_create_group(dms, regions, alias, &group_id)) { + log_error("Could not create group on %s: %s", name, regions); + goto out; + } + + printf("Grouped regions %s as group ID " FMTu64 " on %s\n", + regions, group_id, name); + + r = 1; + +out: + dm_stats_destroy(dms); + return r; +} + +static int _stats_ungroup(CMD_ARGS) +{ + struct dm_stats *dms; + uint64_t group_id; + char *name; + int r = 0; + + /* ungroup does not use a report */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + + if (!_switches[GROUP_ID_ARG]) { + log_error("Please specify group id."); + return 0; + } + + group_id = (uint64_t) _int_args[GROUP_ID_ARG]; + + if (names) + name = names->name; + else { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { + if (!_switches[ALL_DEVICES_ARG]) { + log_error("Please specify device(s) or use " + "--alldevices."); + return 0; + } + return _process_all(cmd, subcommand, argc, argv, 0, _stats_ungroup); + } + name = argv[0]; + } + + if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) + return_0; + + if (!_bind_stats_device(dms, name)) + goto_out; + + if (!dm_stats_list(dms, NULL)) + goto_out; + + if (!(r = dm_stats_delete_group(dms, group_id, 0))) + log_error("Could not delete group " FMTu64 " on %s.", + group_id, name); + + printf("Removed group ID "FMTu64" on %s\n", group_id, name); + +out: + dm_stats_destroy(dms); + return r; +} + +static int _stats_update_file(CMD_ARGS) +{ + uint64_t group_id, *region, *regions = NULL, count = 0; + const char *program_id = DM_STATS_PROGRAM_ID; + int foreground = _switches[FOREGROUND_ARG]; + int verbose = _switches[VERBOSE_ARG]; + char *path, *abspath = NULL; + struct dm_stats *dms = NULL; + dm_filemapd_mode_t mode; + int fd = -1; + + + if (names) { + log_error("Device names are not compatibile with update_filemap."); + return 0; + } + + if (!_stats_check_filemap_switches()) + return 0; + + /* _stats_update_file does not use _process_all() */ + if (!argc) { + log_error("update_filemap requires a file path argument"); + return 0; + } + + if (!_switches[GROUP_ID_ARG]) { + log_error("--groupid is required to update a filemap group."); + return 0; + } + + path = argv[0]; + + if (!(abspath = _get_abspath(path))) { + log_error("Could not canonicalize file name: %s", path); + return 0; + } + + group_id = (uint64_t) _int_args[GROUP_ID_ARG]; + + mode = _stats_get_filemapd_mode(); + if (!_switches[NOMONITOR_ARG] && (mode == DM_FILEMAPD_FOLLOW_NONE)) + goto bad; + + if (_switches[PROGRAM_ID_ARG]) + program_id = _string_args[PROGRAM_ID_ARG]; + if (!strlen(program_id) && !_switches[FORCE_ARG]) + program_id = DM_STATS_PROGRAM_ID; + + if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) + goto_bad; + + fd = open(abspath, O_RDONLY); + + if (fd < 0) { + log_error("Could not open %s for reading", abspath); + goto bad; + } + + if (!dm_stats_bind_from_fd(dms, fd)) + goto_bad; + + if (!strlen(program_id)) + /* force creation of a region with no id */ + dm_stats_set_program_id(dms, 1, NULL); + + /* + * Start dmfilemapd - it will test the file descriptor to determine + * whether it is necessary to call dm_stats_update_regions_from_fd(). + * + * If starting the daemon fails, fall back to a direct update. + */ + if (!_switches[NOMONITOR_ARG]) { + if (dm_stats_start_filemapd(fd, group_id, abspath, mode, + foreground, verbose)) + goto out; + + log_warn("Failed to start filemap monitoring daemon."); + + /* fall back to one-shot update */ + } + + /* + * --nomonitor and fall back case - perform a one-shot update directly + * from dmsetup. + */ + regions = dm_stats_update_regions_from_fd(dms, fd, group_id); + + if (!regions) { + log_error("Could not update regions from file %s", abspath); + goto bad; + } + + for (region = regions; *region != DM_STATS_REGIONS_ALL; region++) + count++; + + if (group_id != regions[0]) { + printf("Group ID changed from " FMTu64 " to " FMTu64, + group_id, regions[0]); + group_id = regions[0]; + } + + printf("%s: Updated group ID " FMTu64 " with "FMTu64" region(s).\n", + path, group_id, count); + +out: + if (close(fd)) + log_sys_debug("close", abspath); + + free(regions); + free(abspath); + dm_stats_destroy(dms); + return 1; + +bad: + free(abspath); + + if ((fd > -1) && close(fd)) + log_sys_debug("close", path); + + dm_stats_destroy(dms); + + return 0; +} + +/* + * Command dispatch tables and usage. + */ +static int _stats_help(CMD_ARGS); + +/* + * dmsetup stats <cmd> [options] [device_name] + * dmstats <cmd> [options] [device_name] + * + * clear [--allregions|--regionid id] [--alldevices|<device>...] + * create [--start <start> [--length <len>] + * [--areas <nr_areas>] [--areasize <size>] + * [--programid <id>] [--userdata <data> ] + * [--bounds histogram_boundaries] [--precise] + * [--alldevices|<device>...] + * create --filemap [--nogroup] [--nomonitor] [--follow=mode] + * [--programid <id>] [--userdata <data> ] + * [--bounds histogram_boundaries] [--precise] [<file_path>] + * delete [--allprograms|--programid id] + * [--allregions|--regionid id] + * [--alldevices|<device>...] + * group [--alias NAME] --regions <regions> + * [--allprograms|--programid id] [--alldevices|<device>...] + * list [--allprograms|--programid id] [--allregions|--regionid id] + * print [--clear] [--allprograms|--programid id] + * [--allregions|--regionid id] + * [--alldevices|<device>...] + * report [--interval <seconds>] [--count <cnt>] + * [--units <u>] [--programid <id>] [--regionid <id>] + * [-o <fields>] [-O|--sort <sort_fields>] + * [-S|--select <selection>] [--nameprefixes] + * [--noheadings] [--separator <separator>] + * [--allprograms|--programid id] [<device>...] + * ungroup --groupid <id> [--allprograms|--programid id] + * [--alldevices|<device>...] + */ + +#define INDENT "\n\t " +/* groups of commonly used options */ +#define AREA_OPTS "[--areas <nr_areas>] [--areasize <size>] " +#define REGION_OPTS "[--start <start> [--length <len>]" INDENT AREA_OPTS +#define ID_OPTS "[--programid <id>] [--userdata <data> ] " +#define SELECT_OPTS "[--programid <id>] [--regionid <id>] " +#define HIST_OPTS "[--bounds histogram_boundaries] " +#define PRECISE_OPTS "[--precise] " +#define SEGMENTS_OPT "[--segments] " +#define EXTRA_OPTS HIST_OPTS PRECISE_OPTS +#define FILE_MONITOR_OPTS "[--nomonitor] [--follow mode]" +#define GROUP_ID_OPT "--groupid <id> " +#define ALL_PROGS_OPT "[--allprograms|--programid id] " +#define ALL_REGIONS_OPT "[--allregions|--regionid id] " +#define ALL_DEVICES_OPT "[--alldevices|<device>...] " +#define ALL_PROGS_REGIONS_DEVICES ALL_PROGS_OPT INDENT ALL_REGIONS_OPT INDENT ALL_DEVICES_OPT +#define FIELD_OPTS "[-o <fields>] [-O|--sort <sort_fields>]" +#define DM_REPORT_OPTS FIELD_OPTS INDENT "[-S|--select <selection>] [--nameprefixes]" INDENT \ +"[--noheadings] [--separator <separator>]" + +/* command options */ +#define CREATE_OPTS REGION_OPTS INDENT ID_OPTS INDENT EXTRA_OPTS INDENT SEGMENTS_OPT +#define FILEMAP_OPTS "--filemap [--nogroup] " FILE_MONITOR_OPTS INDENT ID_OPTS INDENT EXTRA_OPTS +#define PRINT_OPTS "[--clear] " ALL_PROGS_REGIONS_DEVICES +#define REPORT_OPTS "[--interval <seconds>] [--count <cnt>]" INDENT \ +"[--units <u>] " SELECT_OPTS INDENT DM_REPORT_OPTS INDENT ALL_PROGS_OPT +#define GROUP_OPTS "[--alias NAME] --regions <regions>" INDENT ALL_PROGS_OPT ALL_DEVICES_OPT +#define UNGROUP_OPTS GROUP_ID_OPT ALL_PROGS_OPT INDENT ALL_DEVICES_OPT +#define UPDATE_OPTS GROUP_ID_OPT INDENT FILE_MONITOR_OPTS " <file_path>" + +/* + * The 'create' command has two entries in the table, to allow for the + * the fact that 'create' and 'create --filemap' have largely disjoint + * sets of options. + */ +static struct command _stats_subcommands[] = { + {"help", "", 0, 0, 0, 0, _stats_help}, + {"clear", ALL_REGIONS_OPT ALL_DEVICES_OPT, 0, -1, 1, 0, _stats_clear}, + {"create", CREATE_OPTS ALL_DEVICES_OPT, 0, -1, 1, 0, _stats_create}, + {"create", FILEMAP_OPTS "<file_path>", 0, -1, 1, 0, _stats_create}, + {"delete", ALL_PROGS_REGIONS_DEVICES, 1, -1, 1, 0, _stats_delete}, + {"group", GROUP_OPTS, 1, -1, 1, 0, _stats_group}, + {"list", ALL_PROGS_OPT ALL_REGIONS_OPT, 0, -1, 1, 0, _stats_report}, + {"print", PRINT_OPTS, 0, -1, 1, 0, _stats_print}, + {"report", REPORT_OPTS "[<device>...]", 0, -1, 1, 0, _stats_report}, + {"ungroup", UNGROUP_OPTS, 1, -1, 1, 0, _stats_ungroup}, + {"update_filemap", UPDATE_OPTS, 1, 1, 0, 0, _stats_update_file}, + {"version", "", 0, -1, 1, 0, _version}, + {NULL, NULL, 0, 0, 0, 0, NULL} +}; + +#undef AREA_OPTS +#undef REGION_OPTS +#undef ID_OPTS +#undef SELECT_OPTS +#undef HIST_OPTS +#undef PRECISE_OPTS +#undef EXTRA_OPTS +#undef ALL_PROGS_OPT +#undef ALL_REGIONS_OPT +#undef ALL_DEVICES_OPT +#undef ALL_PROGS_REGIONS_DEVICES +#undef FIELD_OPTS +#undef DM_REPORT_OPTS +#undef CREATE_OPTS +#undef FILEMAP_OPTS +#undef PRINT_OPTS +#undef REPORT_OPTS +#undef GROUP_OPTS +#undef UNGROUP_OPTS + +static int _dmsetup_help(CMD_ARGS); + +static struct command _dmsetup_commands[] = { + {"help", "[-c|-C|--columns]", 0, 0, 0, 0, _dmsetup_help}, + {"create", "<dev_name>\n" + "\t [-j|--major <major> -m|--minor <minor>]\n" + "\t [-U|--uid <uid>] [-G|--gid <gid>] [-M|--mode <octal_mode>]\n" + "\t [-u|--uuid <uuid>] [--addnodeonresume|--addnodeoncreate]\n" + "\t [--readahead {[+]<sectors>|auto|none}]\n" + "\t [-n|--notable|--table {<table>|<table_file>}]\n" + "\tcreate --concise [<concise_device_spec_list>]", 0, 2, 0, 0, _create}, + {"remove", "[--deferred] [-f|--force] [--retry] <device>...", 0, -1, 2, 0, _remove}, + {"remove_all", "[-f|--force]", 0, 0, 0, 0, _remove_all}, + {"suspend", "[--noflush] [--nolockfs] <device>...", 0, -1, 2, 0, _suspend}, + {"resume", "[--noflush] [--nolockfs] <device>...\n" + "\t [--addnodeonresume|--addnodeoncreate]\n" + "\t [--readahead {[+]<sectors>|auto|none}]", 0, -1, 2, 0, _resume}, + {"load", "<device> [<table>|<table_file>]", 0, 2, 0, 0, _load}, + {"clear", "<device>", 0, -1, 2, 0, _clear}, + {"reload", "<device> [<table>|<table_file>]", 0, 2, 0, 0, _load}, + {"wipe_table", "[-f|--force] [--noflush] [--nolockfs] <device>...", 0, -1, 2, 0, _error_device}, + {"rename", "<device> [--setuuid] <new_name_or_uuid>", 1, 2, 0, 0, _rename}, + {"message", "<device> <sector> <message>", 2, -1, 0, 0, _message}, + {"ls", "[--target <target_type>] [--exec <command>] [-o <options>] [--tree]", 0, 0, 0, 0, _ls}, + {"info", "[<device>...]", 0, -1, 1, 0, _info}, + {"deps", "[-o <options>] [<device>...]", 0, -1, 2, 0, _deps}, + {"stats", "<command> [<options>] [<device>...]", 1, -1, 1, 1, _stats}, + {"status", "[<device>...] [--noflush] [--target <target_type>]", 0, -1, 2, 0, _status}, + {"table", "[<device>...] [--concise] [--target <target_type>] [--showkeys]", 0, -1, 2, 0, _status}, + {"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait}, + {"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes}, + {"mangle", "[<device>...]", 0, -1, 1, 0, _mangle}, + {"udevcreatecookie", "", 0, 0, 0, 0, _udevcreatecookie}, + {"udevreleasecookie", "[<cookie>]", 0, 1, 0, 0, _udevreleasecookie}, + {"udevflags", "<cookie>", 1, 1, 0, 0, _udevflags}, + {"udevcomplete", "<cookie>", 1, 1, 0, 0, _udevcomplete}, + {"udevcomplete_all", "[<age_in_minutes>]", 0, 1, 0, 0, _udevcomplete_all}, + {"udevcookies", "", 0, 0, 0, 0, _udevcookies}, + {"targets", "", 0, 0, 0, 0, _targets}, + {"version", "", 0, 0, 0, 0, _version}, + {"setgeometry", "<device> <cyl> <head> <sect> <start>", 5, 5, 0, 0, _setgeometry}, + {"splitname", "<device> [<subsystem>]", 1, 2, 0, 0, _splitname}, + {NULL, NULL, 0, 0, 0, 0, NULL} +}; + +/* + * Usage and help text. + */ + +static void _devmap_name_usage(FILE *out) +{ + fprintf(out, "Usage: " DEVMAP_NAME_CMD_NAME " <major> <minor>\n\n"); +} + +static void _stats_usage(FILE *out) +{ + int i; + + fprintf(out, "Usage:\n\n" + "%s\n" + " [-h|--help]\n" + " [-v|--verbose [-v|--verbose ...]]\n" + " [--areas <nr_areas>] [--areasize <size>]\n" + " [--userdata <data>] [--clear]\n" + " [--count <count>] [--interval <seconds>]\n" + " [-o <fields>] [-O|--sort <sort_fields>]\n" + " [--programid <id>]\n" + " [--start <start>] [--length <length>]\n" + " [--segments] [--units <units>]\n\n", + _base_commands[_base_command].name); + + for (i = 0; _stats_subcommands[i].name; i++) + fprintf(out, "\t%s %s\n", _stats_subcommands[i].name, _stats_subcommands[i].help); + + fprintf(out, "\n<device> may be device name or (if only one) -u <uuid> or -j <major> -m <minor>\n" + "<fields> are comma-separated. Use 'help -c' for list.\n\n"); +} + +static void _dmsetup_usage(FILE *out) +{ + int i; + + fprintf(out, "Usage:\n\n" + "%s\n" + " [--version] [-h|--help [-c|-C|--columns]]\n" + " [-v|--verbose [-v|--verbose ...]] [-f|--force]\n" + " [--checks] [--manglename {none|hex|auto}]\n" + " [-r|--readonly] [--noopencount] [--noflush] [--nolockfs] [--inactive]\n" + " [--udevcookie <cookie>] [--noudevrules] [--noudevsync] [--verifyudev]\n" + " [-y|--yes] [--readahead {[+]<sectors>|auto|none}] [--retry]\n" + " [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n" + " [-S|--select <selection>] [--nameprefixes] [--noheadings]\n" + " [--separator <separator>]\n\n", + _base_commands[_base_command].name); + + for (i = 0; _dmsetup_commands[i].name; i++) + fprintf(out, "\t%s %s\n", _dmsetup_commands[i].name, _dmsetup_commands[i].help); + + fprintf(out, "\n<device> may be device name or (if only one) -u <uuid> or " + "-j <major> -m <minor>\n" + "<mangling_mode> is one of 'none', 'auto' and 'hex'.\n" + "<fields> are comma-separated. Use 'help -c' for list.\n" + "<concise_device_specification> has single-device entries separated by semi-colons:\n" + " <name>,<uuid>,<minor>,<flags>,<table>\n" + " where <flags> is 'ro' or 'rw' (the default) and any of <uuid>, <minor>\n" + " and <flags> may be empty. Separate extra table lines with commas.\n" + " E.g.: dev1,,,,0 100 linear 253:1 0,100 100 error;dev2,,,ro,0 1 error\n" + "Table_file contents may be supplied on stdin.\n" + "Options are: devno, devname, blkdevname.\n" + "Tree specific options are: ascii, utf, vt100; compact, inverted, notrunc;\n" + " blkdevname, [no]device, active, open, rw and uuid.\n\n"); +} + +static void _losetup_usage(FILE *out) +{ + fprintf(out, + "Usage:\n\n" + "%s [-d|-a] [-e encryption] " + "[-o offset] [-f|loop_device] [file]\n\n", + _base_commands[_base_command].name); +} + +static void _usage(FILE *out) +{ + switch (_base_commands[_base_command].type) { + case DMSETUP_TYPE: + return _dmsetup_usage(out); + case LOSETUP_TYPE: + return _losetup_usage(out); + case STATS_TYPE: + return _stats_usage(out); + case DEVMAP_NAME_TYPE: + return _devmap_name_usage(out); + } +} + +static int _stats_help(CMD_ARGS) +{ + _usage(stderr); + + if (_switches[COLS_ARG] || (argc && !strcmp(argv[0], "report"))) { + _switches[OPTIONS_ARG] = 1; + _string_args[OPTIONS_ARG] = (char *) "help"; + _switches[SORT_ARG] = 0; + + if (_report) { + dm_report_free(_report); + _report = NULL; + } + + (void) _report_init(cmd, "help"); + if (_report) { + dm_report_free(_report); + _report = NULL; + } + } + + return 1; +} + +static int _dmsetup_help(CMD_ARGS) +{ + _usage(stderr); + + if (_switches[COLS_ARG]) { + _switches[OPTIONS_ARG] = 1; + _string_args[OPTIONS_ARG] = (char *) "help"; + _switches[SORT_ARG] = 0; + + if (_report) { + dm_report_free(_report); + _report = NULL; + } + (void) _report_init(cmd, ""); + if (_report) { + dm_report_free(_report); + _report = NULL; + } + } + + return 1; +} + +static const struct command *_find_command(const struct command *commands, + const char *name) +{ + int i; + + for (i = 0; commands[i].name; i++) + if (!strcmp(commands[i].name, name)) + return commands + i; + + return NULL; +} + +static const struct command *_find_dmsetup_command(const char *name) +{ + return _find_command(_dmsetup_commands, name); +} + +static const struct command *_find_stats_subcommand(const char *name) +{ + return _find_command(_stats_subcommands, name); +} + +static int _stats(CMD_ARGS) +{ + const struct command *stats_cmd; + + if (_switches[AREA_ARG] || _switches[REGION_ARG] || _switches[GROUP_ARG]) + _statstype = 0; /* switches will OR flags in */ + else + _statstype = DM_STATS_WALK_REGION | DM_STATS_WALK_GROUP; + + if (_switches[AREA_ARG]) + _statstype |= DM_STATS_WALK_AREA; + if (_switches[REGION_ARG]) + _statstype |= DM_STATS_WALK_REGION; + if (_switches[GROUP_ARG]) + _statstype |= DM_STATS_WALK_GROUP; + + if (!(stats_cmd = _find_stats_subcommand(subcommand))) { + log_error("Unknown stats command."); + _stats_help(stats_cmd, NULL, argc, argv, NULL, multiple_devices); + return 0; + } + + if (_switches[ALL_PROGRAMS_ARG] && _switches[PROGRAM_ID_ARG]) { + log_error("Please supply one of --allprograms and --programid"); + return 0; + } + + if (_switches[ALL_REGIONS_ARG] && _switches[REGION_ID_ARG]) { + log_error("Please supply one of --allregions and --regionid"); + return 0; + } + + if (_switches[FOLLOW_ARG] && _switches[NOMONITOR_ARG]) { + log_error("Use of --follow is incompatible with --nomonitor."); + return 0; + } + + /* + * Pass the sub-command through to allow a single function to be + * used to implement several distinct sub-commands (e.g. 'report' + * and 'list' share a single implementation. + */ + if (!stats_cmd->fn(stats_cmd, subcommand, argc, argv, NULL, + multiple_devices)) + return_0; + + return 1; +} + +static int _process_tree_options(const char *options) +{ + const char *s, *end; + struct winsize winsz; + size_t len; + + /* Symbol set default */ + if (!strcmp(nl_langinfo(CODESET), "UTF-8")) + _tsym = &_tsym_utf; + else + _tsym = &_tsym_ascii; + + /* Default */ + _tree_switches[TR_DEVICE] = 1; + _tree_switches[TR_TRUNCATE] = 1; + + /* parse */ + for (s = options; s && *s; s++) { + len = 0; + for (end = s; *end && *end != ','; end++, len++) + ; + if (!strncmp(s, "device", len)) + _tree_switches[TR_DEVICE] = 1; + else if (!strncmp(s, "blkdevname", len)) + _tree_switches[TR_BLKDEVNAME] = 1; + else if (!strncmp(s, "nodevice", len)) + _tree_switches[TR_DEVICE] = 0; + else if (!strncmp(s, "status", len)) + _tree_switches[TR_STATUS] = 1; + else if (!strncmp(s, "table", len)) + _tree_switches[TR_TABLE] = 1; + else if (!strncmp(s, "active", len)) + _tree_switches[TR_ACTIVE] = 1; + else if (!strncmp(s, "open", len)) + _tree_switches[TR_OPENCOUNT] = 1; + else if (!strncmp(s, "uuid", len)) + _tree_switches[TR_UUID] = 1; + else if (!strncmp(s, "rw", len)) + _tree_switches[TR_RW] = 1; + else if (!strncmp(s, "utf", len)) + _tsym = &_tsym_utf; + else if (!strncmp(s, "vt100", len)) + _tsym = &_tsym_vt100; + else if (!strncmp(s, "ascii", len)) + _tsym = &_tsym_ascii; + else if (!strncmp(s, "inverted", len)) + _tree_switches[TR_BOTTOMUP] = 1; + else if (!strncmp(s, "compact", len)) + _tree_switches[TR_COMPACT] = 1; + else if (!strncmp(s, "notrunc", len)) + _tree_switches[TR_TRUNCATE] = 0; + else { + log_error("Tree options not recognised: %s.", s); + return 0; + } + if (!*end) + break; + s = end; + } + + /* Truncation doesn't work well with vt100 drawing char */ + if (_tsym != &_tsym_vt100) + if (ioctl(1, (unsigned long) TIOCGWINSZ, &winsz) >= 0 && winsz.ws_col > 3) + _termwidth = winsz.ws_col - 3; + + return 1; +} + +static char *_parse_loop_device_name(const char *dev, const char *dev_dir) +{ + char *buf; + char *device = NULL; + + if (!(buf = malloc(PATH_MAX))) + return_NULL; + + if (dev[0] == '/') { + if (!(device = _get_abspath(dev))) + goto_bad; + + if (strncmp(device, dev_dir, strlen(dev_dir))) + goto_bad; + + /* If dev_dir does not end in a slash, ensure that the + following byte in the device string is "/". */ + if (dev_dir[strlen(dev_dir) - 1] != '/' && + device[strlen(dev_dir)] != '/') + goto_bad; + + if (!dm_strncpy(buf, strrchr(device, '/') + 1, PATH_MAX)) + goto_bad; + free(device); + } else { + /* check for device number */ + if (strncmp(dev, "loop", sizeof("loop") - 1)) + goto_bad; + + if (!dm_strncpy(buf, dev, PATH_MAX)) + goto_bad; + } + + return buf; +bad: + free(device); + free(buf); + + return NULL; +} + +/* + * create a table for a mapped device using the loop target. + */ +static int _loop_table(char *table, size_t tlen, char *file, + char *dev __attribute__((unused)), off_t off) +{ + struct stat fbuf; + off_t size, sectors; + int fd = -1; +#ifdef HAVE_SYS_STATVFS_H + struct statvfs fsbuf; + off_t blksize; +#endif + + if (!_switches[READ_ONLY]) + fd = open(file, O_RDWR); + + if (fd < 0) { + _switches[READ_ONLY]++; + fd = open(file, O_RDONLY); + } + + if (fd < 0) + goto_bad; + + if (fstat(fd, &fbuf)) + goto_bad; + + size = (fbuf.st_size - off); + sectors = size >> SECTOR_SHIFT; + + if (_switches[VERBOSE_ARG]) + log_error(LOSETUP_CMD_NAME ": set loop size to %llukB (%llu sectors).", + (long long unsigned) sectors >> 1, + (long long unsigned) sectors); + +#ifdef HAVE_SYS_STATVFS_H + if (fstatvfs(fd, &fsbuf)) + goto_bad; + + /* FIXME Fragment size currently unused */ + blksize = fsbuf.f_frsize; +#endif + + if (close(fd)) + log_sys_debug("close", file); + + if (dm_snprintf(table, tlen, "%llu %llu loop %s %llu\n", 0ULL, + (long long unsigned)sectors, file, (long long unsigned)off) < 0) + return_0; + + if (_switches[VERBOSE_ARG] > 1) + log_verbose("Table: %s", table); + + return 1; + +bad: + if (fd > -1 && close(fd)) + log_sys_error("close", file); + + return 0; +} + +static int _process_losetup_switches(const char *base, int *argcp, char ***argvp, + const char *dev_dir) +{ + int c; + int encrypt_loop = 0, delete = 0, find = 0, show_all = 0; + char *device_name = NULL; + char *loop_file = NULL; + off_t offset = 0; + +#ifdef HAVE_GETOPTLONG + static struct option long_options[] = { + {0, 0, 0, 0} + }; +#endif + + optarg = 0; + optind = OPTIND_INIT; + while ((c = GETOPTLONG_FN(*argcp, *argvp, "ade:fo:v", + long_options, NULL)) != -1 ) { + if (c == ':' || c == '?') + return_0; + if (c == 'a') + show_all++; + if (c == 'd') + delete++; + if (c == 'e') + encrypt_loop++; + if (c == 'f') + find++; + if (c == 'o') + offset = atoi(optarg); + if (c == 'v') + _switches[VERBOSE_ARG]++; + } + + *argvp += optind ; + *argcp -= optind ; + + if (encrypt_loop){ + log_error("%s: Sorry, cryptoloop is not yet implemented " + "in this version.", base); + return 0; + } + + if (show_all) { + log_error("%s: Sorry, show all is not yet implemented " + "in this version.", base); + return 0; + } + + if (find) { + log_error("%s: Sorry, find is not yet implemented " + "in this version.", base); + if (!*argcp) + return 0; + } + + if (!*argcp) { + log_error("%s: Please specify loop_device.", base); + _usage(stderr); + return 0; + } + + if (!(device_name = _parse_loop_device_name((*argvp)[0], dev_dir))) { + log_error("%s: Could not parse loop_device %s", base, (*argvp)[0]); + _usage(stderr); + return 0; + } + + if (delete) { + *argcp = 1; + + (*argvp)[0] = device_name; + _command = "remove"; + + return 1; + } + + if (*argcp != 2) { + log_error("%s: Too few arguments.", base); + _usage(stderr); + free(device_name); + return 0; + } + + /* FIXME move these to make them available to native dmsetup */ + if (!(loop_file = _get_abspath((*argvp)[(find) ? 0 : 1]))) { + log_error("%s: Could not parse loop file name %s.", + base, (*argvp)[1]); + _usage(stderr); + free(device_name); + return 0; + } + + _table = malloc(LOOP_TABLE_SIZE); + if (!_table || + !_loop_table(_table, (size_t) LOOP_TABLE_SIZE, loop_file, device_name, offset)) { + log_error("Could not build device-mapper table for %s.", (*argvp)[0]); + free(device_name); + return 0; + } + _switches[TABLE_ARG]++; + + _command = "create"; + (*argvp)[0] = device_name ; + *argcp = 1; + + return 1; +} + +static int _process_options(const char *options) +{ + const char *s, *end; + size_t len; + + /* Tree options are processed separately. */ + if (_switches[TREE_ARG]) + return _process_tree_options(_string_args[OPTIONS_ARG]); + + /* Column options are processed separately by _report_init (called later). */ + if (_switches[COLS_ARG]) + return 1; + + /* No options specified. */ + if (!_switches[OPTIONS_ARG]) + return 1; + + /* Set defaults. */ + _dev_name_type = DN_DEVNO; + + /* Parse. */ + for (s = options; s && *s; s++) { + len = 0; + for (end = s; *end && *end != ','; end++, len++) + ; + if (!strncmp(s, "devno", len)) + _dev_name_type = DN_DEVNO; + else if (!strncmp(s, "blkdevname", len)) + _dev_name_type = DN_BLK; + else if (!strncmp(s, "devname", len)) + _dev_name_type = DN_MAP; + else { + log_error("Option not recognised: %s.", s); + return 0; + } + + if (!*end) + break; + s = end; + } + + return 1; +} + +static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) +{ + const char *base; + char *namebase, *s; + static int ind; + int c, r, i; + +#ifdef HAVE_GETOPTLONG + static struct option long_options[] = { + {"readonly", 0, &ind, READ_ONLY}, + {"alias", 1, &ind, ALIAS_ARG}, + {"alldevices", 0, &ind, ALL_DEVICES_ARG}, + {"allprograms", 0, &ind, ALL_PROGRAMS_ARG}, + {"allregions", 0, &ind, ALL_REGIONS_ARG}, + {"area", 0, &ind, AREA_ARG}, + {"areas", 1, &ind, AREAS_ARG}, + {"areasize", 1, &ind, AREA_SIZE_ARG}, + {"bounds", 1, &ind, BOUNDS_ARG}, + {"checks", 0, &ind, CHECKS_ARG}, + {"clear", 0, &ind, CLEAR_ARG}, + {"columns", 0, &ind, COLS_ARG}, + {"concise", 0, &ind, CONCISE_ARG}, + {"count", 1, &ind, COUNT_ARG}, + {"deferred", 0, &ind, DEFERRED_ARG}, + {"select", 1, &ind, SELECT_ARG}, + {"exec", 1, &ind, EXEC_ARG}, + {"filemap", 0, &ind, FILEMAP_ARG}, + {"follow", 1, &ind, FOLLOW_ARG}, + {"force", 0, &ind, FORCE_ARG}, + {"foreground", 0, &ind, FOREGROUND_ARG}, + {"gid", 1, &ind, GID_ARG}, + {"group", 0, &ind, GROUP_ARG}, + {"groupid", 1, &ind, GROUP_ID_ARG}, + {"help", 0, &ind, HELP_ARG}, + {"histogram", 0, &ind, HISTOGRAM_ARG}, + {"inactive", 0, &ind, INACTIVE_ARG}, + {"interval", 1, &ind, INTERVAL_ARG}, + {"length", 1, &ind, LENGTH_ARG}, + {"manglename", 1, &ind, MANGLENAME_ARG}, + {"major", 1, &ind, MAJOR_ARG}, + {"minor", 1, &ind, MINOR_ARG}, + {"mode", 1, &ind, MODE_ARG}, + {"nameprefixes", 0, &ind, NAMEPREFIXES_ARG}, + {"nogroup", 0, &ind, NOGROUP_ARG}, + {"noflush", 0, &ind, NOFLUSH_ARG}, + {"noheadings", 0, &ind, NOHEADINGS_ARG}, + {"nolockfs", 0, &ind, NOLOCKFS_ARG}, + {"noopencount", 0, &ind, NOOPENCOUNT_ARG}, + {"nosuffix", 0, &ind, NOSUFFIX_ARG}, + {"notable", 0, &ind, NOTABLE_ARG}, + {"notimesuffix", 0, &ind, NOTIMESUFFIX_ARG}, + {"udevcookie", 1, &ind, UDEVCOOKIE_ARG}, + {"nomonitor", 0, &ind, NOMONITOR_ARG}, + {"noudevrules", 0, &ind, NOUDEVRULES_ARG}, + {"noudevsync", 0, &ind, NOUDEVSYNC_ARG}, + {"options", 1, &ind, OPTIONS_ARG}, + {"precise", 0, &ind, PRECISE_ARG}, + {"programid", 1, &ind, PROGRAM_ID_ARG}, + {"raw", 0, &ind, RAW_ARG}, + {"readahead", 1, &ind, READAHEAD_ARG}, + {"region", 0, &ind, REGION_ARG}, + {"regions", 1, &ind, REGIONS_ARG}, + {"regionid", 1, &ind, REGION_ID_ARG}, + {"relative", 0, &ind, RELATIVE_ARG}, + {"retry", 0, &ind, RETRY_ARG}, + {"rows", 0, &ind, ROWS_ARG}, + {"segments", 0, &ind, SEGMENTS_ARG}, + {"separator", 1, &ind, SEPARATOR_ARG}, + {"setuuid", 0, &ind, SETUUID_ARG}, + {"showkeys", 0, &ind, SHOWKEYS_ARG}, + {"sort", 1, &ind, SORT_ARG}, + {"start", 1, &ind, START_ARG}, + {"table", 1, &ind, TABLE_ARG}, + {"target", 1, &ind, TARGET_ARG}, + {"tree", 0, &ind, TREE_ARG}, + {"uid", 1, &ind, UID_ARG}, + {"units", 1, &ind, UNITS_ARG}, + {"uuid", 1, &ind, UUID_ARG}, + {"unbuffered", 0, &ind, UNBUFFERED_ARG}, + {"unquoted", 0, &ind, UNQUOTED_ARG}, + {"userdata", 1, &ind, USER_DATA_ARG}, + {"verbose", 1, &ind, VERBOSE_ARG}, + {"verifyudev", 0, &ind, VERIFYUDEV_ARG}, + {"version", 0, &ind, VERSION_ARG}, + {"yes", 0, &ind, YES_ARG}, + {"addnodeonresume", 0, &ind, ADD_NODE_ON_RESUME_ARG}, + {"addnodeoncreate", 0, &ind, ADD_NODE_ON_CREATE_ARG}, + {0, 0, 0, 0} + }; +#else + struct option long_options; +#endif + + /* + * Zero all the index counts. + */ + memset(&_switches, 0, sizeof(_switches)); + memset(&_int_args, 0, sizeof(_int_args)); + _read_ahead_flags = 0; + + if (!(namebase = strdup((*argvp)[0]))) { + log_error("Failed to duplicate name."); + return 0; + } + + base = dm_basename(namebase); + + i = 0; + do { + if (!strcmp(base, _base_commands[i].name)) { + _base_command = _base_commands[i].command; + _base_command_type = _base_commands[i].type; + break; + } + } while (++i < _num_base_commands); + + free(namebase); + + if (_base_command_type == DEVMAP_NAME_TYPE) { + _switches[COLS_ARG]++; + _switches[NOHEADINGS_ARG]++; + _switches[OPTIONS_ARG]++; + _switches[MAJOR_ARG]++; + _switches[MINOR_ARG]++; + _string_args[OPTIONS_ARG] = (char *) "name"; + + if (*argcp == 3) { + _int_args[MAJOR_ARG] = atoi((*argvp)[1]); + _int_args[MINOR_ARG] = atoi((*argvp)[2]); + *argcp -= 2; + *argvp += 2; + } else if ((*argcp == 2) && + (2 == sscanf((*argvp)[1], "%i:%i", + &_int_args[MAJOR_ARG], + &_int_args[MINOR_ARG]))) { + *argcp -= 1; + *argvp += 1; + } else { + _usage(stderr); + return 0; + } + + _command = "info"; + (*argvp)++; + (*argcp)--; + + return 1; + } + + if (_base_command_type == LOSETUP_TYPE) { + r = _process_losetup_switches(_base_commands[_base_command].name, argcp, argvp, dev_dir); + return r; + } + + optarg = 0; + optind = OPTIND_INIT; + while ((ind = -1, c = GETOPTLONG_FN(*argcp, *argvp, "cCfG:hj:m:M:no:O:rS:u:U:vy", + long_options, NULL)) != -1) { + if (ind == ALIAS_ARG) { + _switches[ALIAS_ARG]++; + _string_args[ALIAS_ARG] = optarg; + } + if (ind == ALL_DEVICES_ARG) + _switches[ALL_DEVICES_ARG]++; + if (ind == ALL_PROGRAMS_ARG) + _switches[ALL_PROGRAMS_ARG]++; + if (ind == ALL_REGIONS_ARG) + _switches[ALL_REGIONS_ARG]++; + if (ind == AREA_ARG) + _switches[AREA_ARG]++; + if (ind == AREAS_ARG) { + _switches[AREAS_ARG]++; + _int_args[AREAS_ARG] = atoi(optarg); + } + if (ind == AREA_SIZE_ARG) { + _switches[AREA_SIZE_ARG]++; + _string_args[AREA_SIZE_ARG] = optarg; + } + if (ind == USER_DATA_ARG) { + _switches[USER_DATA_ARG]++; + _string_args[USER_DATA_ARG] = optarg; + } + if (c == ':' || c == '?') + return_0; + if (c == 'h' || ind == HELP_ARG) + _switches[HELP_ARG]++; + if (ind == CONCISE_ARG) + _switches[CONCISE_ARG]++; + if (ind == BOUNDS_ARG) { + _switches[BOUNDS_ARG]++; + _string_args[BOUNDS_ARG] = optarg; + } + if (ind == CLEAR_ARG) + _switches[CLEAR_ARG]++; + if (c == 'c' || c == 'C' || ind == COLS_ARG) + _switches[COLS_ARG]++; + if (ind == FILEMAP_ARG) + _switches[FILEMAP_ARG]++; + if (ind == FOLLOW_ARG) { + _switches[FOLLOW_ARG]++; + _string_args[FOLLOW_ARG] = optarg; + } + if (c == 'f' || ind == FORCE_ARG) + _switches[FORCE_ARG]++; + if (ind == FOREGROUND_ARG) + _switches[FOREGROUND_ARG]++; + if (c == 'r' || ind == READ_ONLY) + _switches[READ_ONLY]++; + if (ind == HISTOGRAM_ARG) + _switches[HISTOGRAM_ARG]++; + if (ind == LENGTH_ARG) { + _switches[LENGTH_ARG]++; + _string_args[LENGTH_ARG] = optarg; + } + if (c == 'j' || ind == MAJOR_ARG) { + _switches[MAJOR_ARG]++; + _int_args[MAJOR_ARG] = atoi(optarg); + } + if (ind == REGIONS_ARG) { + _switches[REGIONS_ARG]++; + _string_args[REGIONS_ARG] = optarg; + } + if (c == 'm' || ind == MINOR_ARG) { + _switches[MINOR_ARG]++; + _int_args[MINOR_ARG] = atoi(optarg); + } + if (ind == NOSUFFIX_ARG) + _switches[NOSUFFIX_ARG]++; + if (c == 'n' || ind == NOTABLE_ARG) + _switches[NOTABLE_ARG]++; + if (ind == NOTIMESUFFIX_ARG) + _switches[NOTIMESUFFIX_ARG]++; + if (c == 'o' || ind == OPTIONS_ARG) { + _switches[OPTIONS_ARG]++; + _string_args[OPTIONS_ARG] = optarg; + } + if (ind == PROGRAM_ID_ARG) { + _switches[PROGRAM_ID_ARG]++; + _string_args[PROGRAM_ID_ARG] = optarg; + } + if (ind == PRECISE_ARG) + _switches[PRECISE_ARG]++; + if (ind == RAW_ARG) + _switches[RAW_ARG]++; + if (ind == REGION_ARG) + _switches[REGION_ARG]++; + if (ind == REGION_ID_ARG) { + _switches[REGION_ID_ARG]++; + _int_args[REGION_ID_ARG] = atoi(optarg); + } + if (ind == RELATIVE_ARG) + _switches[RELATIVE_ARG]++; + if (ind == SEPARATOR_ARG) { + _switches[SEPARATOR_ARG]++; + _string_args[SEPARATOR_ARG] = optarg; + } + if (ind == UNITS_ARG) { + _switches[UNITS_ARG]++; + _string_args[UNITS_ARG] = optarg; + } + if (c == 'O' || ind == SORT_ARG) { + _switches[SORT_ARG]++; + _string_args[SORT_ARG] = optarg; + } + if (c == 'S' || ind == SELECT_ARG) { + _switches[SELECT_ARG]++; + _string_args[SELECT_ARG] = optarg; + } + if (ind == START_ARG) { + _switches[START_ARG]++; + _string_args[START_ARG] = optarg; + } + if (c == 'v' || ind == VERBOSE_ARG) + _switches[VERBOSE_ARG]++; + if (c == 'u' || ind == UUID_ARG) { + _switches[UUID_ARG]++; + _uuid = optarg; + } + if (c == 'y' || ind == YES_ARG) + _switches[YES_ARG]++; + if (ind == ADD_NODE_ON_RESUME_ARG) + _switches[ADD_NODE_ON_RESUME_ARG]++; + if (ind == ADD_NODE_ON_CREATE_ARG) + _switches[ADD_NODE_ON_CREATE_ARG]++; + if (ind == CHECKS_ARG) + _switches[CHECKS_ARG]++; + if (ind == COUNT_ARG) { + _switches[COUNT_ARG]++; + _int_args[COUNT_ARG] = atoi(optarg); + if (_int_args[COUNT_ARG] < 0) { + log_error("Count must be zero or greater."); + return 0; + } + } + if (ind == UDEVCOOKIE_ARG) { + _switches[UDEVCOOKIE_ARG]++; + _udev_cookie = _get_cookie_value(optarg); + } + if (ind == NOMONITOR_ARG) + _switches[NOMONITOR_ARG]++; + if (ind == NOUDEVRULES_ARG) + _switches[NOUDEVRULES_ARG]++; + if (ind == NOUDEVSYNC_ARG) + _switches[NOUDEVSYNC_ARG]++; + if (ind == VERIFYUDEV_ARG) + _switches[VERIFYUDEV_ARG]++; + if (c == 'G' || ind == GID_ARG) { + _switches[GID_ARG]++; + _int_args[GID_ARG] = atoi(optarg); + } + if (ind == GROUP_ARG) + _switches[GROUP_ARG]++; + if (ind == GROUP_ID_ARG) { + _switches[GROUP_ID_ARG]++; + _int_args[GROUP_ID_ARG] = atoi(optarg); + } + if (c == 'U' || ind == UID_ARG) { + _switches[UID_ARG]++; + _int_args[UID_ARG] = atoi(optarg); + } + if (c == 'M' || ind == MODE_ARG) { + _switches[MODE_ARG]++; + /* FIXME Accept modes as per chmod */ + errno = 0; + _int_args[MODE_ARG] = (int) strtol(optarg, &s, 8); + if (errno || !s || *s || !_int_args[MODE_ARG]) { + log_error("Invalid argument for --mode: %s. %s", + optarg, errno ? strerror(errno) : ""); + return 0; + } + } + if (ind == DEFERRED_ARG) + _switches[DEFERRED_ARG]++; + if (ind == EXEC_ARG) { + _switches[EXEC_ARG]++; + _command_to_exec = optarg; + } + if (ind == TARGET_ARG) { + _switches[TARGET_ARG]++; + _target = optarg; + } + if (ind == SEGMENTS_ARG) + _switches[SEGMENTS_ARG]++; + if (ind == INACTIVE_ARG) + _switches[INACTIVE_ARG]++; + if (ind == INTERVAL_ARG) { + _switches[INTERVAL_ARG]++; + _int_args[INTERVAL_ARG] = atoi(optarg); + if (_int_args[INTERVAL_ARG] <= 0) { + log_error("Interval must be a positive integer."); + return 0; + } + } + if (ind == MANGLENAME_ARG) { + _switches[MANGLENAME_ARG]++; + if (!strcasecmp(optarg, "none")) + _int_args[MANGLENAME_ARG] = DM_STRING_MANGLING_NONE; + else if (!strcasecmp(optarg, "auto")) + _int_args[MANGLENAME_ARG] = DM_STRING_MANGLING_AUTO; + else if (!strcasecmp(optarg, "hex")) + _int_args[MANGLENAME_ARG] = DM_STRING_MANGLING_HEX; + else { + log_error("Unknown name mangling mode."); + return 0; + } + dm_set_name_mangling_mode((dm_string_mangling_t) _int_args[MANGLENAME_ARG]); + } + if (ind == NAMEPREFIXES_ARG) + _switches[NAMEPREFIXES_ARG]++; + if (ind == NOFLUSH_ARG) + _switches[NOFLUSH_ARG]++; + if (ind == NOGROUP_ARG) + _switches[NOGROUP_ARG]++; + if (ind == NOHEADINGS_ARG) + _switches[NOHEADINGS_ARG]++; + if (ind == NOLOCKFS_ARG) + _switches[NOLOCKFS_ARG]++; + if (ind == NOOPENCOUNT_ARG) + _switches[NOOPENCOUNT_ARG]++; + if (ind == READAHEAD_ARG) { + _switches[READAHEAD_ARG]++; + if (!strcasecmp(optarg, "auto")) + _int_args[READAHEAD_ARG] = DM_READ_AHEAD_AUTO; + else if (!strcasecmp(optarg, "none")) + _int_args[READAHEAD_ARG] = DM_READ_AHEAD_NONE; + else { + for (s = optarg; isspace(*s); s++) + ; + if (*s == '+') + _read_ahead_flags = DM_READ_AHEAD_MINIMUM_FLAG; + _int_args[READAHEAD_ARG] = atoi(optarg); + if (_int_args[READAHEAD_ARG] < -1) { + log_error("Negative read ahead value " + "(%d) is not understood.", + _int_args[READAHEAD_ARG]); + return 0; + } + } + } + if (ind == RETRY_ARG) + _switches[RETRY_ARG]++; + if (ind == ROWS_ARG) + _switches[ROWS_ARG]++; + if (ind == SETUUID_ARG) + _switches[SETUUID_ARG]++; + if (ind == SHOWKEYS_ARG) + _switches[SHOWKEYS_ARG]++; + if (ind == TABLE_ARG) { + _switches[TABLE_ARG]++; + if (!(_table = strdup(optarg))) { + log_error("Could not allocate memory for table string."); + return 0; + } + } + if (ind == TREE_ARG) + _switches[TREE_ARG]++; + if (ind == UNQUOTED_ARG) + _switches[UNQUOTED_ARG]++; + if (ind == VERSION_ARG) + _switches[VERSION_ARG]++; + } + + if (_switches[VERBOSE_ARG] > 1) { + dm_log_init_verbose(_switches[VERBOSE_ARG] - 1); + if (_switches[VERBOSE_ARG] > 2) { + if (!(_initial_timestamp = dm_timestamp_alloc())) + stack; + else if (!dm_timestamp_get(_initial_timestamp)) + stack; + else + log_debug("Timestamp: 0.000000000 seconds"); + } + } + + if ((_switches[MAJOR_ARG] && !_switches[MINOR_ARG]) || + (!_switches[MAJOR_ARG] && _switches[MINOR_ARG])) { + log_error("Please specify both major number and minor number."); + return 0; + } + + if (_switches[TABLE_ARG] && _switches[NOTABLE_ARG]) { + log_error("--table and --notable are incompatible."); + return 0; + } + + if (_switches[ADD_NODE_ON_RESUME_ARG] && _switches[ADD_NODE_ON_CREATE_ARG]) { + log_error("--addnodeonresume and --addnodeoncreate are incompatible."); + return 0; + } + + *argvp += optind; + *argcp -= optind; + + if (!*argcp) + _command = NULL; + else if (!strcmp((*argvp)[0], "stats")) { + _base_command = DMSETUP_STATS_CMD; + _base_command_type = STATS_TYPE; + _command = "stats"; + (*argvp)++; + (*argcp)--; + } else if (_base_command == DMSTATS_CMD) { + _command = "stats"; + } else if (*argcp) { + _command = (*argvp)[0]; + (*argvp)++; + (*argcp)--; + } + + return 1; +} + +static int _perform_command_for_all_repeatable_args(CMD_ARGS) +{ + do { + if (!cmd->fn(cmd, subcommand, argc, argv++, NULL, multiple_devices)) { + log_error("Command failed."); + return 0; + } + } while (cmd->repeatable_cmd && argc-- > 1); + + return 1; +} + +static int _do_report_wait(void) +{ + return _do_timer_wait(); +} + +int main(int argc, char **argv) +{ + int ret = 1, r; + const char *dev_dir; + const struct command *cmd; + const char *subcommand = ""; + int multiple_devices; + + (void) setlocale(LC_ALL, ""); + + dev_dir = getenv(DM_DEV_DIR_ENV_VAR_NAME); + if (dev_dir && *dev_dir) { + if (!dm_set_dev_dir(dev_dir)) { + log_error("Invalid DM_DEV_DIR environment variable value."); + goto out; + } + } else + dev_dir = DEFAULT_DM_DEV_DIR; + + if (!_process_switches(&argc, &argv, dev_dir)) { + log_error("Couldn't process command line."); + goto out; + } + + if (_switches[HELP_ARG]) { + switch (_base_command_type) { + case STATS_TYPE: + if ((cmd = _find_stats_subcommand("help"))) + goto doit; + goto unknown; + default: + if ((cmd = _find_dmsetup_command("help"))) + goto doit; + goto unknown; + } + } + + if (_switches[VERSION_ARG]) { + switch (_base_command_type) { + case STATS_TYPE: + if ((cmd = _find_stats_subcommand("version"))) + goto doit; + goto unknown; + default: + if ((cmd = _find_dmsetup_command("version"))) + goto doit; + goto unknown; + } + } + + if (!_command) { + _usage(stderr); + goto out; + } + + if (!(cmd = _find_dmsetup_command(_command))) { +unknown: + log_error("Unknown command."); + _usage(stderr); + goto out; + } + + if (argc < cmd->min_args || + (cmd->max_args >= 0 && argc > cmd->max_args)) { + log_error("Incorrect number of arguments."); + _usage(stderr); + goto out; + } + + if (!_switches[COLS_ARG] && !strcmp(cmd->name, "splitname")) + _switches[COLS_ARG]++; + + if (!strcmp(cmd->name, "stats")) { + _switches[COLS_ARG]++; + if (!_switches[UNITS_ARG]) { + _switches[UNITS_ARG]++; + _string_args[UNITS_ARG] = (char *) "h"; + } + } + + if (!strcmp(cmd->name, "mangle")) + dm_set_name_mangling_mode(DM_STRING_MANGLING_NONE); + + if (!_process_options(_string_args[OPTIONS_ARG])) { + log_error("Couldn't process command line."); + goto out; + } + +#ifdef UDEV_SYNC_SUPPORT + if (!_set_up_udev_support(dev_dir)) + goto_out; +#endif + + /* + * Extract subcommand? + * dmsetup <command> <subcommand> [args...] + */ + if (cmd->has_subcommands) { + subcommand = argv[0]; + argc--, argv++; + } + + /* Default to success */ + ret = 0; + + /* When -S is given, store the real command for later and run "info -c" first */ + if (_switches[SELECT_ARG] && (cmd->repeatable_cmd == 2)) { + _selection_cmd = cmd; + _switches[COLS_ARG] = 1; + if (!(cmd = _find_dmsetup_command("info"))) { + log_error(INTERNAL_ERROR "finding dmsetup info command struct."); + goto out; + } + } + + if (_switches[COLS_ARG]) { + if (!_report_init(cmd, subcommand)) + ret = 1; + if (ret || !_report) + goto_out; + } + + if (_switches[COUNT_ARG] && _int_args[COUNT_ARG]) + _count = (uint64_t)_int_args[COUNT_ARG]; + else if (_switches[COUNT_ARG] || _switches[INTERVAL_ARG]) + _count = UINT64_MAX; + + if (_switches[UNITS_ARG]) { + _disp_factor = _factor_from_units(_string_args[UNITS_ARG], + &_disp_units); + if (!_disp_factor) { + log_error("Invalid --units argument."); + ret = 1; + goto out; + } + } + + /* Start interval timer. */ + if (_count > 1) + if (!_start_timer()) { + ret = 1; + goto_out; + } + +doit: + multiple_devices = (cmd->repeatable_cmd && argc != 1 && + (argc || (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]))); + + do { + r = _perform_command_for_all_repeatable_args(cmd, subcommand, argc, argv, NULL, multiple_devices); + if (_concise_output_produced) { + putchar('\n'); + fflush(stdout); + } + if (_report) { + /* only output headings for repeating reports */ + if (_int_args[COUNT_ARG] != 1 && !dm_report_is_empty(_report)) + dm_report_column_headings(_report); + dm_report_output(_report); + + if (_count > 1 && r) { + putchar('\n'); + fflush(stdout); + /* wait for --interval and update timestamps */ + if (!_do_report_wait()) { + ret = 1; + goto_out; + } + } + } + + if (!r) { + ret = 1; + goto_out; + } + } while (--_count); + +out: + if (_report) + dm_report_free(_report); + + if (_dtree) + dm_tree_free(_dtree); + + free(_table); + + if (_initial_timestamp) + dm_timestamp_destroy(_initial_timestamp); + + return (_switches[HELP_ARG] || _switches[VERSION_ARG]) ? 0 : ret; +} diff --git a/libdm/dm-tools/util.h b/libdm/dm-tools/util.h new file mode 100644 index 0000000..730b903 --- /dev/null +++ b/libdm/dm-tools/util.h @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2007 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _LVM_UTIL_H +#define _LVM_UTIL_H + +#include <inttypes.h> + +#define min(a, b) ({ typeof(a) _a = (a); \ + typeof(b) _b = (b); \ + (void) (&_a == &_b); \ + _a < _b ? _a : _b; }) + +#define max(a, b) ({ typeof(a) _a = (a); \ + typeof(b) _b = (b); \ + (void) (&_a == &_b); \ + _a > _b ? _a : _b; }) + +#define is_power_of_2(n) ((n) && !((n) & ((n) - 1))) + +#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6) +#define uninitialized_var(x) x +#else +#define uninitialized_var(x) x = x +#endif + +#define KERNEL_VERSION(major, minor, release) (((major) << 16) + ((minor) << 8) + (release)) + +/* Define some portable printing types */ +#define PRIsize_t "zu" +#define PRIssize_t "zd" +#define PRIptrdiff_t "td" +#define PRIpid_t PRId32 + +/* For convenience */ +#define FMTsize_t "%" PRIsize_t +#define FMTssize_t "%" PRIssize_t +#define FMTptrdiff_t "%" PRIptrdiff_t +#define FMTpid_t "%" PRIpid_t + +#define FMTd8 "%" PRId8 +#define FMTd16 "%" PRId16 +#define FMTd32 "%" PRId32 +#define FMTd64 "%" PRId64 + +#define FMTi8 "%" PRIi8 +#define FMTi16 "%" PRIi16 +#define FMTi32 "%" PRIi32 +#define FMTi64 "%" PRIi64 + +#define FMTo8 "%" PRIo8 +#define FMTo16 "%" PRIo16 +#define FMTo32 "%" PRIo32 +#define FMTo64 "%" PRIo64 + +#define FMTu8 "%" PRIu8 +#define FMTu16 "%" PRIu16 +#define FMTu32 "%" PRIu32 +#define FMTu64 "%" PRIu64 + +#define FMTx8 "%" PRIx8 +#define FMTx16 "%" PRIx16 +#define FMTx32 "%" PRIx32 +#define FMTx64 "%" PRIx64 + +#define FMTVGID "%." DM_TO_STRING(ID_LEN) "s" + +#endif diff --git a/tools/Makefile.in b/tools/Makefile.in index 3785b50..7d9dd93 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -67,7 +67,6 @@ SOURCES =\ vgsplit.c SOURCES2 =\ - dmsetup.c \ lvm.c \ lvm2cmd-static.c \ lvm2cmd.c \ @@ -80,17 +79,13 @@ TARGETS =\ lvm \ man-generator -TARGETS_DM = dmsetup - INSTALL_LVM_TARGETS = install_tools_dynamic -INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic +INSTALL_DMSETUP_TARGETS = INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic install_cmdlib_include ifeq ("@STATIC_LINK@", "yes") TARGETS += lvm.static - TARGETS_DM += dmsetup.static INSTALL_LVM_TARGETS += install_tools_static - INSTALL_DMSETUP_TARGETS += install_dmsetup_static INSTALL_CMDLIB_TARGETS += install_cmdlib_static endif @@ -99,7 +94,7 @@ LIB_VERSION = $(LIB_VERSION_LVM) CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) $(TARGETS_DM) \ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) lvm-static.o \ - liblvm2cmd-static.a dmsetup.static lvm.static \ + liblvm2cmd-static.a lvm.static \ $(LDDEPS) .exported_symbols_generated \ cmds.h command-lines-input.h command-count.h man-generator.c @@ -117,19 +112,7 @@ CFLOW_TARGET = lvm include $(top_builddir)/make.tmpl -device-mapper: $(TARGETS_DM) - -CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) - -dmsetup: dmsetup.o $(INTERNAL_LIBS) - @echo " [CC] $@" - $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ - -o $@ $+ $(LIBS) -lm - -dmsetup.static: dmsetup.o $(INTERNAL_LIBS) - @echo " [CC] $@" - $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ - -o $@ $+ $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) +device-mapper: all: device-mapper @@ -225,8 +208,7 @@ CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) endif .PHONY: install_cmdlib_dynamic install_cmdlib_static install_cmdlib_include \ - install_tools_dynamic install_tools_static \ - install_dmsetup_dynamic install_dmsetup_static + install_tools_dynamic install_tools_static install_cmdlib_include: $(srcdir)/lvm2cmd.h @echo " [INSTALL] $<" @@ -255,18 +237,6 @@ install_tools_static: lvm.static @echo " [INSTALL] $<" $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) -install_dmsetup_dynamic: dmsetup - @echo " [INSTALL] $<" - $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) - $(Q) $(LN_S) -f $(<F) $(sbindir)/dmstats - -install_dmsetup_static: dmsetup.static - @echo " [INSTALL] $<" - $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) - $(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats - -install_device-mapper: $(INSTALL_DMSETUP_TARGETS) - install_lvm2: $(INSTALL_LVM_TARGETS) -install: install_lvm2 install_device-mapper +install: install_lvm2 diff --git a/tools/dmsetup.c b/tools/dmsetup.c deleted file mode 100644 index 7c5a2b3..0000000 --- a/tools/dmsetup.c +++ /dev/null @@ -1,7460 +0,0 @@ -/* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2018 Red Hat, Inc. All rights reserved. - * Copyright (C) 2005-2007 NEC Corporation - * - * This file is part of the device-mapper userspace tools. - * - * It includes tree drawing code based on pstree: http://psmisc.sourceforge.net/ - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -#include "tools/tool.h" - -#include "base/memory/zalloc.h" -#include "device_mapper/misc/dm-logging.h" - -#include <ctype.h> -#include <dirent.h> -#include <sys/wait.h> -#include <sys/param.h> -#include <locale.h> -#include <langinfo.h> -#include <time.h> - -#include <fcntl.h> -#include <sys/stat.h> - -#ifdef UDEV_SYNC_SUPPORT -# include <sys/types.h> -# include <sys/ipc.h> -# include <sys/sem.h> -# include <libudev.h> -#endif - -/* FIXME Unused so far */ -#undef HAVE_SYS_STATVFS_H - -#ifdef HAVE_SYS_STATVFS_H -# include <sys/statvfs.h> -#endif - -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif - -#ifdef HAVE_SYS_TIMERFD_H -# include <sys/timerfd.h> -#endif - -#ifdef HAVE_TERMIOS_H -# include <termios.h> -#endif - -#ifdef HAVE_GETOPTLONG -# include <getopt.h> -# define GETOPTLONG_FN(a, b, c, d, e) getopt_long((a), (b), (c), (d), (e)) -# define OPTIND_INIT 0 -#else -struct option { -}; -extern int optind; -extern char *optarg; -# define GETOPTLONG_FN(a, b, c, d, e) getopt((a), (b), (c)) -# define OPTIND_INIT 1 -#endif - -#ifndef TEMP_FAILURE_RETRY -# define TEMP_FAILURE_RETRY(expression) \ - (__extension__ \ - ({ long int __result; \ - do __result = (long int) (expression); \ - while (__result == -1L && errno == EINTR); \ - __result; })) -#endif - -#ifdef __linux__ -# include "libdm/misc/kdev_t.h" -#else -# define MAJOR(x) major((x)) -# define MINOR(x) minor((x)) -# define MKDEV(x,y) makedev((x),(y)) -#endif - -#define LINE_SIZE 4096 -#define ARGS_MAX 256 -#define LOOP_TABLE_SIZE (PATH_MAX + 255) - -#define DEFAULT_DM_DEV_DIR "/dev/" - -#define DM_DEV_DIR_ENV_VAR_NAME "DM_DEV_DIR" -#define DM_UDEV_COOKIE_ENV_VAR_NAME "DM_UDEV_COOKIE" - -/* FIXME Should be imported */ -#ifndef DM_MAX_TYPE_NAME -# define DM_MAX_TYPE_NAME 16 -#endif - -/* FIXME Should be elsewhere */ -#define SECTOR_SHIFT 9L - -/* program_id used for dmstats-managed statistics regions */ -#define DM_STATS_PROGRAM_ID "dmstats" - -/* - * Basic commands this code implments. - */ -typedef enum { - DMSETUP_CMD = 0, - LOSETUP_CMD = 1, - DMLOSETUP_CMD = 2, - DMSTATS_CMD = 3, - DMSETUP_STATS_CMD = 4, - DEVMAP_NAME_CMD = 5 -} cmd_name_t; - -typedef enum { - DMSETUP_TYPE = 0, - LOSETUP_TYPE = 1, - STATS_TYPE = 2, - DEVMAP_NAME_TYPE = 3 -} cmd_type_t; - -#define DMSETUP_CMD_NAME "dmsetup" -#define LOSETUP_CMD_NAME "losetup" -#define DMLOSETUP_CMD_NAME "dmlosetup" -#define DMSTATS_CMD_NAME "dmstats" -#define DMSETUP_STATS_CMD_NAME "dmsetup stats" -#define DEVMAP_NAME_CMD_NAME "devmap_name" - -static const struct { - cmd_name_t command; - const char name[14]; - cmd_type_t type; -} _base_commands[] = { - { DMSETUP_CMD, DMSETUP_CMD_NAME, DMSETUP_TYPE }, - { LOSETUP_CMD, LOSETUP_CMD_NAME, LOSETUP_TYPE }, - { DMLOSETUP_CMD, DMLOSETUP_CMD_NAME, LOSETUP_TYPE }, - { DMSTATS_CMD, DMSTATS_CMD_NAME, STATS_TYPE }, - { DMSETUP_STATS_CMD, DMSETUP_STATS_CMD_NAME, STATS_TYPE }, - { DEVMAP_NAME_CMD, DEVMAP_NAME_CMD_NAME, DEVMAP_NAME_TYPE }, -}; - -static const int _num_base_commands = DM_ARRAY_SIZE(_base_commands); - -/* - * We have only very simple switches ATM. - */ -enum { - READ_ONLY = 0, - ADD_NODE_ON_CREATE_ARG, - ADD_NODE_ON_RESUME_ARG, - ALIAS_ARG, - ALL_DEVICES_ARG, - ALL_PROGRAMS_ARG, - ALL_REGIONS_ARG, - AREA_ARG, - AREAS_ARG, - AREA_SIZE_ARG, - CONCISE_ARG, - BOUNDS_ARG, - CHECKS_ARG, - CLEAR_ARG, - COLS_ARG, - COUNT_ARG, - DEFERRED_ARG, - SELECT_ARG, - EXEC_ARG, - FILEMAP_ARG, - FOLLOW_ARG, - FORCE_ARG, - FOREGROUND_ARG, - GID_ARG, - GROUP_ARG, - GROUP_ID_ARG, - HELP_ARG, - HISTOGRAM_ARG, - INACTIVE_ARG, - INTERVAL_ARG, - LENGTH_ARG, - MANGLENAME_ARG, - MAJOR_ARG, - REGIONS_ARG, - MINOR_ARG, - MODE_ARG, - NAMEPREFIXES_ARG, - NOFLUSH_ARG, - NOGROUP_ARG, - NOHEADINGS_ARG, - NOLOCKFS_ARG, - NOOPENCOUNT_ARG, - NOSUFFIX_ARG, - NOTABLE_ARG, - NOTIMESUFFIX_ARG, - UDEVCOOKIE_ARG, - NOMONITOR_ARG, - NOUDEVRULES_ARG, - NOUDEVSYNC_ARG, - OPTIONS_ARG, - PRECISE_ARG, - PROGRAM_ID_ARG, - RAW_ARG, - READAHEAD_ARG, - REGION_ARG, - REGION_ID_ARG, - RELATIVE_ARG, - RETRY_ARG, - ROWS_ARG, - SEPARATOR_ARG, - SETUUID_ARG, - SHOWKEYS_ARG, - SORT_ARG, - START_ARG, - TABLE_ARG, - TARGET_ARG, - SEGMENTS_ARG, - TREE_ARG, - UID_ARG, - UNBUFFERED_ARG, - UNITS_ARG, - UNQUOTED_ARG, - USER_DATA_ARG, - UUID_ARG, - VERBOSE_ARG, - VERIFYUDEV_ARG, - VERSION_ARG, - YES_ARG, - NUM_SWITCHES -}; - -typedef enum { - DR_TASK = 1, - DR_INFO = 2, - DR_DEPS = 4, - DR_TREE = 8, /* Complete dependency tree required */ - DR_NAME = 16, - DR_STATS = 32, /* Requires populated stats handle. */ - DR_STATS_META = 64, /* Requires listed stats handle. */ -} report_type_t; - -typedef enum { - DN_DEVNO, /* Major and minor number pair */ - DN_BLK, /* Block device name (e.g. dm-0) */ - DN_MAP /* Map name (for dm devices only, equal to DN_BLK otherwise) */ -} dev_name_t; - -static cmd_name_t _base_command = DMSETUP_CMD; /* Default command is 'dmsetup' */ -static cmd_type_t _base_command_type = DMSETUP_TYPE; -static int _switches[NUM_SWITCHES]; -static int _int_args[NUM_SWITCHES]; -static char *_string_args[NUM_SWITCHES]; -static int _num_devices; -static char *_uuid; -static char *_table; -static char *_target; -static char *_command_to_exec; /* --exec <command> */ -static const char *_command; /* dmsetup <command> */ -static uint32_t _read_ahead_flags; -static uint32_t _udev_cookie; -static int _udev_only; -static struct dm_tree *_dtree; -static struct dm_report *_report; -static report_type_t _report_type; -static dev_name_t _dev_name_type; -static uint64_t _count = 1; /* count of repeating reports */ -static struct dm_timestamp *_initial_timestamp = NULL; -static uint64_t _disp_factor = 512; /* display sizes in sectors */ -static char _disp_units = 's'; -const char *_program_id = DM_STATS_PROGRAM_ID; /* program_id used for reports. */ -static uint64_t _statstype = 0; /* stats objects to report */ -static int _concise_output_produced = 0; /* Was any concise output already printed? */ -struct command; -static const struct command *_selection_cmd = NULL; /* Command to run against each device select with -S */ - -/* string names for stats object types */ -const char *_stats_types[] = { - "all", - "area", - "region", - "group", - NULL -}; - -/* report timekeeping */ -static struct dm_timestamp *_cycle_timestamp = NULL; -#ifndef HAVE_SYS_TIMERFD_H -static struct dm_timestamp *_start_timestamp = NULL; -#else /* HAVE_SYS_TIMERFD_H */ -static int _timer_fd = -1; /* timerfd file descriptor. */ -#endif /* !HAVE_SYS_TIMERFD_H */ - -static uint64_t _interval = 0; /* configured interval in nsecs */ -static uint64_t _new_interval = 0; /* flag top-of-interval */ -static uint64_t _last_interval = 0; /* approx. measured interval in nsecs */ - -/* Invalid fd value used to signal end-of-reporting. */ -#define TIMER_STOPPED (-2) - -#define NSEC_PER_USEC UINT64_C(1000) -#define NSEC_PER_MSEC UINT64_C(1000000) -#define NSEC_PER_SEC UINT64_C(1000000000) - -/* - * Commands - */ - -#define CMD_ARGS const struct command *cmd, const char *subcommand, int argc, char **argv, struct dm_names *names, int multiple_devices -typedef int (*command_fn) (CMD_ARGS); - -struct command { - const char *name; - const char *help; - int min_args; - int max_args; - int repeatable_cmd; /* Repeat to process device list? */ - /* 2 means --select is also supported */ - int has_subcommands; /* Command implements sub-commands. */ - command_fn fn; -}; - -static int _parse_line(struct dm_task *dmt, char *buffer, const char *file, - int line) -{ - char ttype[LINE_SIZE], *ptr, *comment; - unsigned long long start, size; - int n; - - /* trim trailing space */ - for (ptr = buffer + strlen(buffer) - 1; ptr >= buffer; ptr--) - if (!isspace((int) *ptr)) - break; - ptr++; - *ptr = '\0'; - - /* trim leading space */ - for (ptr = buffer; *ptr && isspace((int) *ptr); ptr++) - ; - - if (!*ptr || *ptr == '#') - return 1; - - if (sscanf(ptr, "%llu %llu %s %n", - &start, &size, ttype, &n) < 3) { - log_error("Invalid format on line %d of table %s.", line, file); - return 0; - } - - ptr += n; - if ((comment = strchr(ptr, (int) '#'))) - *comment = '\0'; - - if (!dm_task_add_target(dmt, start, size, ttype, ptr)) - return_0; - - return 1; -} - -/* Parse multiple lines of table */ -static int _parse_table_lines(struct dm_task *dmt) -{ - char *pos = _table, *next_pos; - int line = 0; - - do { - /* Identify and terminate each line */ - if ((next_pos = strchr(_table, '\n'))) - *next_pos++ = '\0'; - if (!_parse_line(dmt, pos, "", ++line)) - return_0; - } while ((pos = next_pos)); - - return 1; -} - -static int _parse_file(struct dm_task *dmt, const char *file) -{ - char *buffer = NULL; - size_t buffer_size = 0; - FILE *fp; - int r = 0, line = 0; - - /* Table on cmdline or from stdin with --concise */ - if (_table) - return _parse_table_lines(dmt); - - /* OK for empty stdin */ - if (file) { - if (!(fp = fopen(file, "r"))) { - log_error("Couldn't open '%s' for reading.", file); - return 0; - } - } else - fp = stdin; - -#ifndef HAVE_GETLINE - buffer_size = LINE_SIZE; - if (!(buffer = malloc(buffer_size))) { - log_error("Failed to malloc line buffer."); - return 0; - } - - while (fgets(buffer, (int) buffer_size, fp)) -#else - while (getline(&buffer, &buffer_size, fp) > 0) -#endif - if (!_parse_line(dmt, buffer, file ? : "on stdin", ++line)) - goto_out; - - r = 1; - -out: - memset(buffer, 0, buffer_size); -#ifndef HAVE_GETLINE - free(buffer); -#else - free(buffer); -#endif - if (file && fclose(fp)) - log_sys_debug("fclose", file); - - return r; -} - -struct dm_split_name { - char *subsystem; - char *vg_name; - char *lv_name; - char *lv_layer; -}; - -struct dmsetup_report_obj { - struct dm_task *task; - struct dm_info *info; - struct dm_task *deps_task; - struct dm_tree_node *tree_node; - struct dm_split_name *split_name; - struct dm_stats *stats; -}; - -static int _task_run(struct dm_task *dmt) -{ - int r; - uint64_t delta; - struct dm_timestamp *ts; - - if (_initial_timestamp) - dm_task_set_record_timestamp(dmt); - - r = dm_task_run(dmt); - - if (_initial_timestamp && - (ts = dm_task_get_ioctl_timestamp(dmt))) { - delta = dm_timestamp_delta(ts, _initial_timestamp); - log_debug("Timestamp: %7" PRIu64 ".%09" PRIu64 " seconds", - delta / NSEC_PER_SEC, delta % NSEC_PER_SEC); - } - - return r; -} - -static struct dm_task *_get_deps_task(int major, int minor) -{ - struct dm_task *dmt; - struct dm_info info; - - if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) - return_NULL; - - if (!dm_task_set_major(dmt, major) || - !dm_task_set_minor(dmt, minor)) - goto_bad; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_bad; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_bad; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_bad; - - if (!_task_run(dmt)) - goto_bad; - - if (!dm_task_get_info(dmt, &info)) - goto_bad; - - if (!info.exists) - goto_bad; - - return dmt; - -bad: - dm_task_destroy(dmt); - return NULL; -} - -static char *_extract_uuid_prefix(const char *uuid, const int separator) -{ - char *ptr = NULL; - char *uuid_prefix = NULL; - size_t len; - - if (uuid) - ptr = strchr(uuid, separator); - - len = ptr ? ptr - uuid : 0; - if (!(uuid_prefix = malloc(len + 1))) { - log_error("Failed to allocate memory to extract uuid prefix."); - return NULL; - } - - if (uuid) - memcpy(uuid_prefix, uuid, len); - - uuid_prefix[len] = '\0'; - - return uuid_prefix; -} - -static struct dm_split_name *_get_split_name(const char *uuid, const char *name, - int separator) -{ - struct dm_split_name *split_name; - - if (!(split_name = malloc(sizeof(*split_name)))) { - log_error("Failed to allocate memory to split device name " - "into components."); - return NULL; - } - - if (!(split_name->subsystem = _extract_uuid_prefix(uuid, separator))) { - free(split_name); - return_NULL; - } - - split_name->vg_name = split_name->lv_name = - split_name->lv_layer = (char *) ""; - - if (!strcmp(split_name->subsystem, "LVM") && - (!(split_name->vg_name = strdup(name)) || - !dm_split_lvm_name(NULL, NULL, &split_name->vg_name, - &split_name->lv_name, &split_name->lv_layer))) - log_error("Failed to allocate memory to split LVM name " - "into components."); - - return split_name; -} - -static void _destroy_split_name(struct dm_split_name *split_name) -{ - /* - * lv_name and lv_layer are allocated within the same block - * of memory as vg_name so don't need to be freed separately. - */ - if (!strcmp(split_name->subsystem, "LVM")) - free(split_name->vg_name); - - free(split_name->subsystem); - free(split_name); -} - -/* - * Stats clock: - * - * Use either Linux timerfds or usleep to implement the reporting - * interval wait. - * - * _start_timer() - Start the timer running. - * _do_timer_wait() - Wait until the beginning of the next interval. - * - * _update_interval_times() - Update timestamps and interval estimate. - */ - -/* - * Return the current interval number counting upwards from one. - */ -static uint64_t _interval_num(void) -{ - uint64_t count_arg = _int_args[COUNT_ARG]; - return ((uint64_t) _int_args[COUNT_ARG] - _count) + !!count_arg; -} - -#ifdef HAVE_SYS_TIMERFD_H -static int _start_timerfd_timer(void) -{ - struct itimerspec interval_timer; - time_t secs; - long nsecs; - - log_debug("Using timerfd for interval timekeeping."); - - /* timer running? */ - if (_timer_fd != -1) - return 1; - - memset(&interval_timer, 0, sizeof(interval_timer)); - - /* Use CLOCK_MONOTONIC to avoid warp on RTC adjustments. */ - if ((_timer_fd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC)) < 0) { - log_error("Could not create timer: %s", strerror(errno)); - return 0; - } - - secs = (time_t) _interval / NSEC_PER_SEC; - nsecs = (long) _interval % NSEC_PER_SEC; - - /* Must set interval and value to create an armed periodic timer. */ - interval_timer.it_interval.tv_sec = secs; - interval_timer.it_interval.tv_nsec = nsecs; - interval_timer.it_value.tv_sec = secs; - interval_timer.it_value.tv_nsec = nsecs; - - log_debug("Setting interval timer to: " FMTu64 "s %ldns", (uint64_t)secs, nsecs); - if (timerfd_settime(_timer_fd, 0, &interval_timer, NULL)) { - log_error("Could not set interval timer: %s", strerror(errno)); - return 0; - } - return 1; -} - -static int _do_timerfd_wait(void) -{ - uint64_t expired; - ssize_t bytes; - - if (_timer_fd < 0) - return_0; - - /* read on timerfd returns a uint64_t in host byte order. */ - bytes = read(_timer_fd, &expired, sizeof(expired)); - - if (bytes < 0) { - /* EBADF from invalid timerfd or EINVAL from too small buffer. */ - log_error("Interval timer wait failed: %s.", strerror(errno)); - return 0; - } - - /* read(2) on a timerfd descriptor is guaranteed to return 8 bytes. */ - if (bytes != 8) - log_error("Unexpected byte count on timerfd read: " FMTssize_t ".", bytes); - - /* FIXME: attempt to rebase clock? */ - if (expired > 1) - log_warn("WARNING: Try increasing --interval ("FMTu64 - " missed timer events).", expired - 1); - - /* Signal that a new interval has begun. */ - _new_interval = 1; - - /* Final interval? */ - if (_count == 2) { - if (close(_timer_fd)) - stack; - /* Tell _update_interval_times() to shut down. */ - _timer_fd = TIMER_STOPPED; - } - - return 1; -} - -static int _start_timer(void) -{ - return _start_timerfd_timer(); -} - -static int _do_timer_wait(void) -{ - return _do_timerfd_wait(); -} - -static int _timer_running(void) -{ - return ((_timer_fd != TIMER_STOPPED) || _cycle_timestamp); -} - -#else /* !HAVE_SYS_TIMERFD_H */ -static int _start_usleep_timer(void) -{ - log_debug("Using usleep for interval timekeeping."); - _start_timestamp = dm_timestamp_alloc(); - dm_timestamp_get(_start_timestamp); - return 1; -} - -static int _do_usleep_wait(void) -{ - static struct dm_timestamp *_now = NULL; - uint64_t this_interval; - int64_t delta_t; - - /* - * Report clock: compensate for time spent in userspace and stats - * message ioctls by keeping track of the last wake time and - * adjusting the sleep interval accordingly. - */ - if (!_now) { - if (!(_now = dm_timestamp_alloc())) - return_0; - dm_timestamp_get(_now); - this_interval = _interval; - log_error("Using "FMTu64" as first interval.", this_interval); - } else { - dm_timestamp_get(_now); - delta_t = dm_timestamp_delta(_now, _start_timestamp); - log_debug("Interval timer drift: "FMTd64".", - (delta_t % _interval)); - - /* FIXME: usleep timer drift over large counts. */ - - /* adjust for time spent populating and reporting */ - this_interval = _interval - (delta_t % _interval); - log_debug("Using "FMTu64" as interval.", this_interval); - } - - /* Signal that a new interval has begun. */ - _new_interval = 1; - - if (usleep(this_interval / NSEC_PER_USEC)) { - if (errno == EINTR) - log_error("Report interval interrupted by signal."); - else if (errno == EINVAL) - log_error("Report interval too short."); - else - stack; /* other reason */ - return 0; - } - - if (_count == 2) { - dm_timestamp_destroy(_start_timestamp); - dm_timestamp_destroy(_now); - _start_timestamp = _now = NULL; - } - - return 1; -} - -static int _start_timer(void) -{ - return _start_usleep_timer(); -} - -static int _do_timer_wait(void) -{ - return _do_usleep_wait(); -} - -static int _timer_running(void) -{ - return (_start_timestamp != NULL); -} - -#endif /* HAVE_SYS_TIMERFD_H */ - -static int _update_interval_times(void) -{ - static struct dm_timestamp *this_timestamp = NULL; - uint64_t delta_t, interval_num = _interval_num(); - int r = 1; - - /* - * Clock shutdown for exit - nothing to do. - */ - if (!_timer_running()) - goto out; - - /* clock is running */ - r = 0; - - /* - * Current timestamp. If _new_interval is set this is used as - * the new cycle start timestamp. - */ - if (!this_timestamp) { - if (!(this_timestamp = dm_timestamp_alloc())) - return_0; - } - - /* - * Take cycle timstamp as close as possible to ioctl return. - * - * FIXME: use per-region timestamp deltas for interval estimate. - */ - if (!dm_timestamp_get(this_timestamp)) - goto_out; - - /* - * Stats clock: maintain a single timestamp taken just after the - * call to dm_stats_populate() and take a delta between the current - * and last value to determine the sampling interval. - * - * A new interval is started when the _new_interval flag is set - * on return from _do_report_wait(). - * - * The first interval is treated as a special case: since the - * time since the last clear of the counters is unknown (no - * previous timestamp exists) the duration is assumed to be the - * configured value. - */ - if (_cycle_timestamp) - /* Current delta_t: time from start of cycle to now. */ - delta_t = dm_timestamp_delta(this_timestamp, _cycle_timestamp); - else { - _cycle_timestamp = dm_timestamp_alloc(); - if (!_cycle_timestamp) { - log_error("Could not allocate timestamp object."); - goto out; - } - - /* Pretend we have the configured interval. */ - delta_t = _interval; - - /* start the first cycle */ - log_debug("Beginning first interval."); - _new_interval = 1; - } - - log_debug("Interval #%-4"PRIu64" time delta: %12"PRIu64"ns.", - interval_num, delta_t); - - if (_new_interval) { - /* Update timestamp and interval and clear _new_interval */ - dm_timestamp_copy(_cycle_timestamp, this_timestamp); - _last_interval = delta_t; - _new_interval = 0; - - /* - * Log interval duration and current error. - */ - log_debug("Interval #%-5"PRIu64" current err: %12"PRIi64"ns.", - interval_num, ((int64_t)_last_interval - (int64_t)_interval)); - log_debug("End interval #%-9"PRIu64" duration: %12"PRIu64"ns.", - interval_num, _last_interval); - } - - r = 1; - -out: - /* timer stopped or never started */ - if (!r || !_timer_running()) { - /* The _cycle_timestamp has not yet been allocated if we - * fail to obtain this_timestamp on the first interval. - */ - if (_cycle_timestamp) - dm_timestamp_destroy(_cycle_timestamp); - dm_timestamp_destroy(this_timestamp); - - /* Clear timestamp pointers to signal shutdown. */ - _cycle_timestamp = this_timestamp = NULL; - } - return r; -} - -static int _display_info_cols(struct dm_task *dmt, struct dm_info *info) -{ - struct dmsetup_report_obj obj; - uint64_t walk_flags = _statstype; - int r = 0; - int selected; - char *device_name; - - obj.task = dmt; - obj.info = info; - obj.deps_task = NULL; - obj.split_name = NULL; - obj.stats = NULL; - - if (_report_type & DR_TREE) - if (!(obj.tree_node = dm_tree_find_node(_dtree, info->major, info->minor))) { - log_error("Cannot find node %d:%d.", info->major, info->minor); - goto out; - } - - if (_report_type & DR_DEPS) - if (!(obj.deps_task = _get_deps_task(info->major, info->minor))) { - log_error("Cannot get deps for %d:%d.", info->major, info->minor); - goto out; - } - - if (_report_type & DR_NAME) - if (!(obj.split_name = _get_split_name(dm_task_get_uuid(dmt), - dm_task_get_name(dmt), '-'))) - goto_out; - - if (!(_report_type & (DR_STATS | DR_STATS_META))) { - /* - * If _selection_cmd is set we are applying -S to some other command, so suppress - * output and run that other command if the device matches the criteria. - */ - if (!dm_report_object_is_selected(_report, &obj, _selection_cmd ? 0 : 1, &selected)) - goto_out; - if (_selection_cmd && selected) { - device_name = (char*) dm_task_get_name(dmt); - if (!_selection_cmd->fn(_selection_cmd, NULL, 1, &device_name, NULL, 1)) - goto_out; - } - r = 1; - goto out; - } - - /* - * Obtain statistics for the current reporting object and set - * the interval estimate used for stats rate conversion. - */ - if (_report_type & DR_STATS) { - if (!(obj.stats = dm_stats_create(DM_STATS_PROGRAM_ID))) - goto_out; - - if (!dm_stats_get_nr_regions(obj.stats)) { - log_debug("Skipping %s with no regions.", dm_task_get_name(dmt)); - r = 1; - goto out; - } - - dm_stats_bind_devno(obj.stats, info->major, info->minor); - - if (!dm_stats_populate(obj.stats, _program_id, DM_STATS_REGIONS_ALL)) - goto_out; - - /* Update timestamps and handle end-of-interval accounting. */ - _update_interval_times(); - - log_debug("Adjusted sample interval duration: %12"PRIu64"ns.", _last_interval); - /* use measured approximation for calculations */ - dm_stats_set_sampling_interval_ns(obj.stats, _last_interval); - } else if (!obj.stats && (_report_type & DR_STATS_META) - /* Only a dm_stats_list is needed for DR_STATS_META reports. */ - && !(_report_type & DR_STATS)) { - if (!(obj.stats = dm_stats_create(DM_STATS_PROGRAM_ID))) - goto_out; - - dm_stats_bind_devno(obj.stats, info->major, info->minor); - - if (!dm_stats_list(obj.stats, _program_id)) - goto_out; - - /* No regions to report is not an error */ - if (!dm_stats_get_nr_regions(obj.stats)) - goto out; - } - - /* group report with no groups? */ - if ((walk_flags == DM_STATS_WALK_GROUP) - && !dm_stats_get_nr_groups(obj.stats)) - goto out; - - dm_stats_walk_init(obj.stats, walk_flags); - dm_stats_walk_do(obj.stats) { - if (!dm_report_object(_report, &obj)) - goto_out; - dm_stats_walk_next(obj.stats); - } dm_stats_walk_while(obj.stats); - - r = 1; - -out: - if (obj.deps_task) - dm_task_destroy(obj.deps_task); - if (obj.split_name) - _destroy_split_name(obj.split_name); - if (obj.stats) - dm_stats_destroy(obj.stats); - return r; -} - -static void _display_info_long(struct dm_task *dmt, struct dm_info *info) -{ - const char *uuid; - uint32_t read_ahead; - - printf("Name: %s\n", dm_task_get_name(dmt)); - - printf("State: %s%s%s\n", - info->suspended ? "SUSPENDED" : "ACTIVE", - info->read_only ? " (READ-ONLY)" : "", - info->deferred_remove ? " (DEFERRED REMOVE)" : ""); - - /* FIXME Old value is being printed when it's being changed. */ - if (dm_task_get_read_ahead(dmt, &read_ahead)) - printf("Read Ahead: %" PRIu32 "\n", read_ahead); - - if (!info->live_table && !info->inactive_table) - printf("Tables present: None\n"); - else - printf("Tables present: %s%s%s\n", - info->live_table ? "LIVE" : "", - info->live_table && info->inactive_table ? " & " : "", - info->inactive_table ? "INACTIVE" : ""); - - if (info->open_count != -1) - printf("Open count: %d\n", info->open_count); - - printf("Event number: %" PRIu32 "\n", info->event_nr); - printf("Major, minor: %d, %d\n", info->major, info->minor); - - if (info->target_count != -1) - printf("Number of targets: %d\n", info->target_count); - - if ((uuid = dm_task_get_uuid(dmt)) && *uuid) - printf("UUID: %s\n", uuid); - - putchar('\n'); -} - -static int _display_info(struct dm_task *dmt) -{ - struct dm_info info; - int r = 1; - - if (!dm_task_get_info(dmt, &info)) - return_0; - - if (!info.exists) { - log_error("Device does not exist."); - return 0; - } - - if (!_switches[COLS_ARG]) - _display_info_long(dmt, &info); - else - r = _display_info_cols(dmt, &info); - - return r; -} - -static int _set_task_device(struct dm_task *dmt, const char *name, int optional) -{ - if (name) { - if (!dm_task_set_name(dmt, name)) - return_0; - } else if (_switches[UUID_ARG]) { - if (!dm_task_set_uuid(dmt, _uuid)) - return_0; - } else if (_switches[MAJOR_ARG] && _switches[MINOR_ARG]) { - if (!dm_task_set_major(dmt, _int_args[MAJOR_ARG]) || - !dm_task_set_minor(dmt, _int_args[MINOR_ARG])) - return_0; - } else if (!optional) { - log_error("No device specified."); - return 0; - } - - return 1; -} - -static int _set_task_add_node(struct dm_task *dmt) -{ - if (!dm_task_set_add_node(dmt, DEFAULT_DM_ADD_NODE)) - return_0; - - if (_switches[ADD_NODE_ON_RESUME_ARG] && - !dm_task_set_add_node(dmt, DM_ADD_NODE_ON_RESUME)) - return_0; - - if (_switches[ADD_NODE_ON_CREATE_ARG] && - !dm_task_set_add_node(dmt, DM_ADD_NODE_ON_CREATE)) - return_0; - - return 1; -} - -static int _load(CMD_ARGS) -{ - int r = 0; - struct dm_task *dmt; - const char *file = NULL; - const char *name = NULL; - - if (_switches[NOTABLE_ARG]) { - log_error("--notable only available when creating new device."); - return 0; - } - - if (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { - if (!argc) { - log_error("Please specify device."); - return 0; - } - name = argv[0]; - argc--; - argv++; - } else if (argc > 1) { - log_error("Too many command line arguments."); - return 0; - } - - if (argc == 1) - file = argv[0]; - - if (!(dmt = dm_task_create(DM_DEVICE_RELOAD))) - return_0; - - if (!_set_task_device(dmt, name, 0)) - goto_out; - - if (!_switches[NOTABLE_ARG] && !_parse_file(dmt, file)) - goto_out; - - if (_switches[READ_ONLY] && !dm_task_set_ro(dmt)) - goto_out; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_task_run(dmt)) - goto_out; - - r = 1; - - if (_switches[VERBOSE_ARG]) - r = _display_info(dmt); - -out: - dm_task_destroy(dmt); - - return r; -} - -static int _create_one_device(const char *name, const char *file) -{ - int r = 0; - struct dm_task *dmt; - uint32_t cookie = 0; - uint16_t udev_flags = 0; - - if (!(dmt = dm_task_create(DM_DEVICE_CREATE))) - return_0; - - if (!dm_task_set_name(dmt, name)) - goto_out; - - if (_switches[UUID_ARG] && !dm_task_set_uuid(dmt, _uuid)) - goto_out; - - if (!_switches[NOTABLE_ARG] && !_parse_file(dmt, file)) - goto_out; - - if (_switches[READ_ONLY] && !dm_task_set_ro(dmt)) - goto_out; - - if (_switches[MAJOR_ARG] && !dm_task_set_major(dmt, _int_args[MAJOR_ARG])) - goto_out; - - if (_switches[MINOR_ARG] && !dm_task_set_minor(dmt, _int_args[MINOR_ARG])) - goto_out; - - if (_switches[UID_ARG] && !dm_task_set_uid(dmt, _int_args[UID_ARG])) - goto_out; - - if (_switches[GID_ARG] && !dm_task_set_gid(dmt, _int_args[GID_ARG])) - goto_out; - - if (_switches[MODE_ARG] && !dm_task_set_mode(dmt, _int_args[MODE_ARG])) - goto_out; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_out; - - if (_switches[READAHEAD_ARG] && - !dm_task_set_read_ahead(dmt, _int_args[READAHEAD_ARG], - _read_ahead_flags)) - goto_out; - - if (_switches[NOTABLE_ARG]) - dm_udev_set_sync_support(0); - - if (_switches[NOUDEVRULES_ARG]) - udev_flags |= DM_UDEV_DISABLE_DM_RULES_FLAG | - DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_set_task_add_node(dmt)) - goto_out; - - if (_udev_cookie) - cookie = _udev_cookie; - - if (_udev_only) - udev_flags |= DM_UDEV_DISABLE_LIBRARY_FALLBACK; - - if (!dm_task_set_cookie(dmt, &cookie, udev_flags) || - !_task_run(dmt)) - goto_out; - - r = 1; - -out: - if (!_udev_cookie) - (void) dm_udev_wait(cookie); - - if (r && _switches[VERBOSE_ARG]) - r = _display_info(dmt); - - dm_task_destroy(dmt); - - return r; -} - -#define DEFAULT_BUF_SIZE 4096 - -static char *_slurp_stdin(void) -{ - char *buf, *pos; - size_t bufsize = DEFAULT_BUF_SIZE; - size_t total = 0; - ssize_t n = 0; - - if (!(buf = malloc(bufsize))) { - log_error("Buffer memory allocation failed."); - return NULL; - } - - pos = buf; - do { - do - n = read(STDIN_FILENO, pos, (size_t) bufsize - total - 1); - while ((n < 0) && ((errno == EINTR) || (errno == EAGAIN))); - - if (n < 0) { - log_error("Read from stdin aborted: %s", strerror(errno)); - free(buf); - return NULL; - } - - if (!n) - break; - - total += n; - pos += n; - if (total == bufsize - 1) { - bufsize *= 2; - if (!(buf = realloc(buf, bufsize))) { - log_error("Buffer memory extension to %" PRIsize_t " bytes failed.", bufsize); - return NULL; - } - } - } while (1); - - buf[total] = '\0'; - - return buf; -} - -static int _create_concise(const struct command *cmd, int argc, char **argv) -{ - char *concise_format; - char *c, *n; - char *fields[5] = { NULL }; /* name,uuid,minor,flags,table */ - int f = 0; - - if (_switches[TABLE_ARG] || _switches[MINOR_ARG] || _switches[UUID_ARG] || - _switches[NOTABLE_ARG] || _switches[INACTIVE_ARG]){ - log_error("--concise is incompatible with --[no]table, --minor, --uuid and --inactive."); - return 0; - } - - if (argc) - concise_format = argv[0]; - else if (!(concise_format = _slurp_stdin())) - return_0; - - /* Work through input string c, parsing into sets of 5 fields. */ - /* Strip out any characters quoted by backslashes in-place. */ - /* Read characters from c and prepare them in situ for final processing at n */ - c = n = fields[f] = concise_format; - - while (*c) { - /* Quoted character? Skip past quote. */ - if (*c == '\\') { - if (!*(++c)) { - log_error("Backslash must be followed by another character at end of string."); - *n = '\0'; - log_error("Parsed %d fields: name: %s uuid: %s minor: %s flags: %s table: %s", - f + 1, fields[0], fields[1], fields[2], fields[3], fields[4]); - goto out; - } - - /* Don't interpret next character */ - *n++ = *c++; - - continue; - } - - /* Comma marking end of field? */ - if (*c == ',' && f < 4) { - /* Terminate string */ - *n++ = '\0', c++; - - /* Store start of next field */ - fields[++f] = n; - - /* Skip any whitespace after field-separating commas */ - while(isspace(*c)) - c++; - - continue; - } - - /* Comma marking end of a table line? */ - if (*c == ',' && f >= 4) { - /* Replace comma with newline to match standard table input format */ - *n++ = '\n', c++; - - continue; - } - - /* Semi-colon marking end of device? */ - if (*c == ';' || *(c + 1) == '\0') { - /* End of input? */ - if (*c != ';') - /* Copy final character */ - *n++ = *c; - - /* Terminate string */ - *n++ = '\0', c++; - - if (f != 4) { - log_error("Five comma-separated fields are required for each device"); - log_error("Parsed %d fields: name: %s uuid: %s minor: %s flags: %s table: %s", - f + 1, fields[0], fields[1], fields[2], fields[3], fields[4]); - goto out; - } - - /* Set up parameters the same way as when specified directly on command line */ - if (*fields[1]) { - _switches[UUID_ARG] = 1; - _uuid = fields[1]; - } - - if (*fields[2]) { - _switches[MINOR_ARG] = 1; - _int_args[MINOR_ARG] = atoi(fields[2]); - } - - if (!strcmp(fields[3], "ro")) - _switches[READ_ONLY] = 1; - else if (*fields[3] && strcmp(fields[3], "rw")) { - log_error("Invalid flags parameter '%s' must be 'ro' or 'rw' or empty.", fields[3]); - _uuid = NULL; - goto out; - } - - _table = fields[4]; - - /* Create the device */ - if (!_create_one_device(fields[0], NULL)) { - _uuid = _table = NULL; - goto out; - } - - /* Clear parameters ready for any further devices */ - _switches[UUID_ARG] = 0; - _switches[MINOR_ARG] = 0; - _switches[READ_ONLY] = 0; - _uuid = _table = NULL; - - f = 0; - fields[0] = n; - fields[1] = fields[2] = fields[3] = fields[4] = NULL; - - /* Skip any whitespace after semi-colons */ - while(isspace(*c)) - c++; - - continue; - } - - /* Normal character */ - *n++ = *c++; - } - - if (fields[0] != n) { - *n = '\0'; - log_error("Incomplete entry: five comma-separated fields are required for each device"); - log_error("Parsed %d fields: name: %s uuid: %s minor: %s flags: %s table: %s", - f + 1, fields[0], fields[1], fields[2], fields[3], fields[4]); - goto out; - } - - return 1; - -out: - if (!argc) - free(concise_format); - - return 0; -} - -static int _create(CMD_ARGS) -{ - const char *name; - const char *file = NULL; - - if (_switches[CONCISE_ARG]) { - if (argc > 1) { - log_error("dmsetup create --concise takes at most one argument"); - return 0; - } - return _create_concise(cmd, argc, argv); - } - - if (!argc) { - log_error("Please provide a name for the new device."); - return 0; - } - - name = argv[0]; - if (argc == 2) - file = argv[1]; - - return _create_one_device(name, file); -} - -static int _do_rename(const char *name, const char *new_name, const char *new_uuid) { - int r = 0; - struct dm_task *dmt; - uint32_t cookie = 0; - uint16_t udev_flags = 0; - - if (!(dmt = dm_task_create(DM_DEVICE_RENAME))) - return_0; - - /* FIXME Kernel doesn't support uuid or device number here yet */ - if (!_set_task_device(dmt, name, 0)) - goto_out; - - if (new_uuid) { - if (!dm_task_set_newuuid(dmt, new_uuid)) - goto_out; - } else if (!new_name || !dm_task_set_newname(dmt, new_name)) - goto_out; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (_switches[NOUDEVRULES_ARG]) - udev_flags |= DM_UDEV_DISABLE_DM_RULES_FLAG | - DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG; - - if (_udev_cookie) - cookie = _udev_cookie; - - if (_udev_only) - udev_flags |= DM_UDEV_DISABLE_LIBRARY_FALLBACK; - - if (!dm_task_set_cookie(dmt, &cookie, udev_flags) || - !_task_run(dmt)) - goto_out; - - r = 1; - -out: - if (!_udev_cookie) - (void) dm_udev_wait(cookie); - - dm_task_destroy(dmt); - - return r; -} - -static int _rename(CMD_ARGS) -{ - const char *name = (argc == 2) ? argv[0] : NULL; - - return _switches[SETUUID_ARG] ? _do_rename(name, NULL, argv[argc - 1]) : - _do_rename(name, argv[argc - 1], NULL); - -} - -static int _message(CMD_ARGS) -{ - int r = 0, i; - size_t sz = 1; - struct dm_task *dmt; - char *str; - const char *response; - uint64_t sector; - char *endptr; - - if (!(dmt = dm_task_create(DM_DEVICE_TARGET_MSG))) - return_0; - - if (_switches[UUID_ARG] || _switches[MAJOR_ARG]) { - if (!_set_task_device(dmt, NULL, 0)) - goto_out; - } else { - if (!_set_task_device(dmt, argv[0], 0)) - goto_out; - argc--; - argv++; - } - - errno = 0; - sector = strtoull(argv[0], &endptr, 10); - if (errno || *endptr || endptr == argv[0]) { - log_error("Invalid sector."); - goto out; - } - if (!dm_task_set_sector(dmt, sector)) - goto_out; - - argc--; - argv++; - - if (argc <= 0) - log_error("No message supplied."); - - for (i = 0; i < argc; i++) - sz += strlen(argv[i]) + 1; - - if (!(str = zalloc(sz))) { - log_error("Message string allocation failed."); - goto out; - } - - for (i = 0; i < argc; i++) { - if (i) - strcat(str, " "); - strcat(str, argv[i]); - } - - i = dm_task_set_message(dmt, str); - - free(str); - - if (!i) - goto_out; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_task_run(dmt)) - goto_out; - - if ((response = dm_task_get_message_response(dmt))) { - if (!*response || response[strlen(response) - 1] == '\n') - fputs(response, stdout); - else - puts(response); - } - - r = 1; - -out: - dm_task_destroy(dmt); - - return r; -} - -static int _setgeometry(CMD_ARGS) -{ - int r = 0; - struct dm_task *dmt; - - if (!(dmt = dm_task_create(DM_DEVICE_SET_GEOMETRY))) - return_0; - - if (_switches[UUID_ARG] || _switches[MAJOR_ARG]) { - if (!_set_task_device(dmt, NULL, 0)) - goto_out; - } else { - if (!_set_task_device(dmt, argv[0], 0)) - goto_out; - argc--; - argv++; - } - - if (!dm_task_set_geometry(dmt, argv[0], argv[1], argv[2], argv[3])) - goto_out; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - /* run the task */ - if (!_task_run(dmt)) - goto_out; - - r = 1; - -out: - dm_task_destroy(dmt); - - return r; -} - -static int _splitname(CMD_ARGS) -{ - struct dmsetup_report_obj obj = { NULL }; - int r; - - if (!(obj.split_name = _get_split_name((argc == 2) ? argv[1] : "LVM", - argv[0], '\0'))) - return_0; - - r = dm_report_object(_report, &obj); - _destroy_split_name(obj.split_name); - - return r; -} - -static uint32_t _get_cookie_value(const char *str_value) -{ - unsigned long int value; - char *p; - - errno = 0; - value = strtoul(str_value, &p, 0); - - if (errno || !value || (*p) || (value > UINT32_MAX)) { - log_error("Incorrect cookie value."); - return 0; - } - - return (uint32_t) value; -} - -static int _udevflags(CMD_ARGS) -{ - uint32_t cookie; - uint16_t flags; - int i; - static const char *dm_flag_names[] = {"DISABLE_DM_RULES", - "DISABLE_SUBSYSTEM_RULES", - "DISABLE_DISK_RULES", - "DISABLE_OTHER_RULES", - "LOW_PRIORITY", - "DISABLE_LIBRARY_FALLBACK", - "PRIMARY_SOURCE", - 0}; - - if (!(cookie = _get_cookie_value(argv[0]))) - return_0; - - flags = cookie >> DM_UDEV_FLAGS_SHIFT; - - for (i = 0; i < DM_UDEV_FLAGS_SHIFT; i++) - if (1 << i & flags) { - if (i < DM_UDEV_FLAGS_SHIFT / 2 && dm_flag_names[i]) - printf("DM_UDEV_%s_FLAG='1'\n", dm_flag_names[i]); - else if (i < DM_UDEV_FLAGS_SHIFT / 2) - /* - * This is just a fallback. Each new DM flag - * should have its symbolic name assigned. - */ - printf("DM_UDEV_FLAG%d='1'\n", i); - else - /* - * We can't assign symbolic names to subsystem - * flags. Their semantics vary based on the - * subsystem that is currently used. - */ - printf("DM_SUBSYSTEM_UDEV_FLAG%d='1'\n", - i - DM_UDEV_FLAGS_SHIFT / 2); - } - - return 1; -} - -static int _udevcomplete(CMD_ARGS) -{ - uint32_t cookie; - - if (!(cookie = _get_cookie_value(argv[0]))) - return_0; - - /* - * Strip flags from the cookie and use cookie magic instead. - * If the cookie has non-zero prefix and the base is zero then - * this one carries flags to control udev rules only and it is - * not meant to be for notification. Return with success in this - * situation. - */ - if (!(cookie &= ~DM_UDEV_FLAGS_MASK)) - return 1; - - cookie |= DM_COOKIE_MAGIC << DM_UDEV_FLAGS_SHIFT; - - return dm_udev_complete(cookie); -} - -#ifndef UDEV_SYNC_SUPPORT -static const char _cmd_not_supported[] = "Command not supported. Recompile with \"--enable-udev_sync\" to enable."; - -static int _udevcreatecookie(CMD_ARGS) -{ - log_error(_cmd_not_supported); - - return 0; -} - -static int _udevreleasecookie(CMD_ARGS) -{ - log_error(_cmd_not_supported); - - return 0; -} - -static int _udevcomplete_all(CMD_ARGS) -{ - log_error(_cmd_not_supported); - - return 0; -} - -static int _udevcookies(CMD_ARGS) -{ - log_error(_cmd_not_supported); - - return 0; -} - -#else /* UDEV_SYNC_SUPPORT */ -static int _set_up_udev_support(const char *dev_dir) -{ - int dirs_diff; - const char *env; - size_t len = strlen(dev_dir), udev_dir_len = strlen(DM_UDEV_DEV_DIR); - - if (_switches[NOUDEVSYNC_ARG]) - dm_udev_set_sync_support(0); - - if (!_udev_cookie) { - env = getenv(DM_UDEV_COOKIE_ENV_VAR_NAME); - if (env && *env && (_udev_cookie = _get_cookie_value(env))) - log_debug("Using udev transaction 0x%08" PRIX32 - " defined by %s environment variable.", - _udev_cookie, - DM_UDEV_COOKIE_ENV_VAR_NAME); - } - else if (_switches[UDEVCOOKIE_ARG]) - log_debug("Using udev transaction 0x%08" PRIX32 - " defined by --udevcookie option.", - _udev_cookie); - - /* - * Normally, there's always a fallback action by libdevmapper if udev - * has not done its job correctly, e.g. the nodes were not created. - * If using udev transactions by specifying existing cookie value, - * we need to disable node creation by libdevmapper completely, - * disabling any fallback actions, since any synchronisation happens - * at the end of the transaction only. We need to do this to prevent - * races between udev and libdevmapper but only in case udev "dev path" - * is the same as "dev path" used by libdevmapper. - */ - - - /* - * DM_UDEV_DEV_DIR always has '/' at its end. - * If the dev_dir does not have it, be sure - * to make the right comparison without the '/' char! - */ - if (dev_dir[len - 1] != '/') - udev_dir_len--; - - dirs_diff = udev_dir_len != len || - strncmp(DM_UDEV_DEV_DIR, dev_dir, len); - _udev_only = !dirs_diff && (_udev_cookie || !_switches[VERIFYUDEV_ARG]); - - if (dirs_diff) { - log_debug("The path %s used for creating device nodes that is " - "set via DM_DEV_DIR environment variable differs from " - "the path %s that is used by udev. All warnings " - "about udev not working correctly while processing " - "particular nodes will be suppressed. These nodes " - "and symlinks will be managed in each directory " - "separately.", dev_dir, DM_UDEV_DEV_DIR); - dm_udev_set_checking(0); - } - - return 1; -} - -static int _udevcreatecookie(CMD_ARGS) -{ - uint32_t cookie; - - if (!dm_udev_create_cookie(&cookie)) - return_0; - - if (cookie) - printf("0x%08" PRIX32 "\n", cookie); - - return 1; -} - -static int _udevreleasecookie(CMD_ARGS) -{ - if (argv[0] && !(_udev_cookie = _get_cookie_value(argv[0]))) - return_0; - - if (!_udev_cookie) { - log_error("No udev transaction cookie given."); - return 0; - } - - return dm_udev_wait(_udev_cookie); -} - -__attribute__((format(printf, 1, 2))) -static char _yes_no_prompt(const char *prompt, ...) -{ - int c = 0, ret = 0; - va_list ap; - - do { - if (c == '\n' || !c) { - va_start(ap, prompt); - vprintf(prompt, ap); - va_end(ap); - } - - if ((c = getchar()) == EOF) { - ret = 'n'; - break; - } - - c = tolower(c); - if ((c == 'y') || (c == 'n')) - ret = c; - } while (!ret || c != '\n'); - - if (c != '\n') - putchar('\n'); - - return ret; -} - -static int _udevcomplete_all(CMD_ARGS) -{ - int max_id, id, sid; - struct seminfo sinfo; - struct semid_ds sdata; - int counter = 0; - int skipped = 0; - unsigned age = 0; - time_t t; - - if (argc == 1 && (sscanf(argv[0], "%u", &age) != 1)) { - log_error("Failed to read age_in_minutes parameter."); - return 0; - } - - if (!_switches[YES_ARG]) { - log_warn("WARNING: This operation will destroy all semaphores %s%.0d%swith keys " - "that have a prefix %" PRIu16 " (0x%" PRIx16 ").", - age ? "older than " : "", age, age ? " minutes " : "", - DM_COOKIE_MAGIC, DM_COOKIE_MAGIC); - - if (_yes_no_prompt("Do you really want to continue? [y/n]: ") == 'n') { - log_print("Semaphores with keys prefixed by %" PRIu16 - " (0x%" PRIx16 ") NOT destroyed.", - DM_COOKIE_MAGIC, DM_COOKIE_MAGIC); - return 1; - } - } - - if ((max_id = semctl(0, 0, SEM_INFO, &sinfo)) < 0) { - log_sys_error("semctl", "SEM_INFO"); - return 0; - } - - for (id = 0; id <= max_id; id++) { - if ((sid = semctl(id, 0, SEM_STAT, &sdata)) < 0) - continue; - - if (sdata.sem_perm.__key >> 16 == DM_COOKIE_MAGIC) { - t = time(NULL); - - if (sdata.sem_ctime + age * 60 > t || - sdata.sem_otime + age * 60 > t) { - skipped++; - continue; - } - if (semctl(sid, 0, IPC_RMID, 0) < 0) { - log_error("Could not cleanup notification semaphore " - "with semid %d and cookie value " - FMTu32 " (0x" FMTx32 ").", sid, - sdata.sem_perm.__key, sdata.sem_perm.__key); - continue; - } - - counter++; - } - } - - log_print("%d semaphores with keys prefixed by " - FMTu16 " (0x" FMTx16 ") destroyed. %d skipped.", - counter, DM_COOKIE_MAGIC, DM_COOKIE_MAGIC, skipped); - - return 1; -} - -static int _udevcookies(CMD_ARGS) -{ - int max_id, id, sid; - struct seminfo sinfo; - struct semid_ds sdata; - int val; - char otime_str[26], ctime_str[26]; - char *otimes, *ctimes; - - if ((max_id = semctl(0, 0, SEM_INFO, &sinfo)) < 0) { - log_sys_error("sem_ctl", "SEM_INFO"); - return 0; - } - - printf("Cookie Semid Value Last semop time Last change time\n"); - - for (id = 0; id <= max_id; id++) { - if ((sid = semctl(id, 0, SEM_STAT, &sdata)) < 0) - continue; - - if (sdata.sem_perm.__key >> 16 == DM_COOKIE_MAGIC) { - if ((val = semctl(sid, 0, GETVAL)) < 0) { - log_error("semid %d: sem_ctl failed for " - "cookie 0x%" PRIx32 ": %s", - sid, sdata.sem_perm.__key, - strerror(errno)); - continue; - } - - if ((otimes = ctime_r((const time_t *) &sdata.sem_otime, (char *)&otime_str))) - otime_str[strlen(otimes)-1] = '\0'; - if ((ctimes = ctime_r((const time_t *) &sdata.sem_ctime, (char *)&ctime_str))) - ctime_str[strlen(ctimes)-1] = '\0'; - - printf("0x%-10x %-10d %-10d %s %s\n", sdata.sem_perm.__key, - sid, val, otimes ? : "unknown", - ctimes? : "unknown"); - } - } - - return 1; -} -#endif /* UDEV_SYNC_SUPPORT */ - -static int _version(CMD_ARGS) -{ - char version[80]; - - if (dm_get_library_version(version, sizeof(version))) - printf("Library version: %s\n", version); - - if (!dm_driver_version(version, sizeof(version))) - return_0; - - printf("Driver version: %s\n", version); - - /* don't output column headings for 'dmstats version'. */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - - return 1; -} - -static int _simple(int task, const char *name, uint32_t event_nr, int display) -{ - uint32_t cookie = 0; - uint16_t udev_flags = 0; - int udev_wait_flag = task == DM_DEVICE_RESUME || - task == DM_DEVICE_REMOVE; - int r = 0; - - struct dm_task *dmt; - - if (!(dmt = dm_task_create(task))) - return_0; - - if (!_set_task_device(dmt, name, 0)) - goto_out; - - if (event_nr && !dm_task_set_event_nr(dmt, event_nr)) - goto_out; - - if (_switches[NOFLUSH_ARG] && !dm_task_no_flush(dmt)) - goto_out; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_out; - - if (_switches[NOLOCKFS_ARG] && !dm_task_skip_lockfs(dmt)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - /* FIXME: needs to coperate with udev */ - if (!_set_task_add_node(dmt)) - goto_out; - - if (_switches[READAHEAD_ARG] && - !dm_task_set_read_ahead(dmt, _int_args[READAHEAD_ARG], - _read_ahead_flags)) - goto_out; - - if (_switches[NOUDEVRULES_ARG]) - udev_flags |= DM_UDEV_DISABLE_DM_RULES_FLAG | - DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG; - - if (_udev_cookie) - cookie = _udev_cookie; - - if (_udev_only) - udev_flags |= DM_UDEV_DISABLE_LIBRARY_FALLBACK; - - if (udev_wait_flag && !dm_task_set_cookie(dmt, &cookie, udev_flags)) - goto_out; - - if (_switches[RETRY_ARG] && task == DM_DEVICE_REMOVE) - dm_task_retry_remove(dmt); - - if (_switches[DEFERRED_ARG] && (task == DM_DEVICE_REMOVE || task == DM_DEVICE_REMOVE_ALL)) - dm_task_deferred_remove(dmt); - - r = _task_run(dmt); - -out: - if (!_udev_cookie && udev_wait_flag) - (void) dm_udev_wait(cookie); - - if (r && display && _switches[VERBOSE_ARG]) - r = _display_info(dmt); - - dm_task_destroy(dmt); - - return r; -} - -static int _suspend(CMD_ARGS) -{ - return _simple(DM_DEVICE_SUSPEND, argc ? argv[0] : NULL, 0, 1); -} - -static int _resume(CMD_ARGS) -{ - return _simple(DM_DEVICE_RESUME, argc ? argv[0] : NULL, 0, 1); -} - -static int _clear(CMD_ARGS) -{ - return _simple(DM_DEVICE_CLEAR, argc ? argv[0] : NULL, 0, 1); -} - -static int _wait(CMD_ARGS) -{ - const char *name = NULL; - - if (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { - if (!argc) { - log_error("No device specified."); - return 0; - } - name = argv[0]; - argc--, argv++; - } - - return _simple(DM_DEVICE_WAITEVENT, name, - (argc) ? (uint32_t) atoi(argv[argc - 1]) : 0, 1); -} - -static int _process_all(const struct command *cmd, const char *subcommand, int argc, char **argv, int silent, - int (*fn) (CMD_ARGS)) -{ - int r = 1; - struct dm_names *names; - unsigned next = 0; - - struct dm_task *dmt; - - if (!(dmt = dm_task_create(DM_DEVICE_LIST))) - return_0; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_task_run(dmt)) { - r = 0; - goto_out; - } - - if (!(names = dm_task_get_names(dmt))) { - r = 0; - goto_out; - } - - if (!names->dev) { - if (!silent) - printf("No devices found\n"); - goto out; - } - - do { - names = (struct dm_names *)((char *) names + next); - if (!fn(cmd, subcommand, argc, argv, names, 1)) - r = 0; - next = names->next; - } while (next); - -out: - dm_task_destroy(dmt); - return r; -} - -static uint64_t _get_device_size(const char *name) -{ - uint64_t start, length, size = UINT64_C(0); - struct dm_info info; - char *target_type, *params; - struct dm_task *dmt; - void *next = NULL; - - if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) - return_0; - - if (!_set_task_device(dmt, name, 0)) - goto_out; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_task_run(dmt)) - goto_out; - - if (!dm_task_get_info(dmt, &info) || !info.exists) - goto_out; - - do { - next = dm_get_next_target(dmt, next, &start, &length, - &target_type, &params); - size += length; - } while (next); - -out: - dm_task_destroy(dmt); - return size; -} - -static int _error_device(CMD_ARGS) -{ - struct dm_task *dmt; - const char *name; - uint64_t size; - int r = 0; - - name = names ? names->name : argv[0]; - - if (!name || !*name) { - log_error("No device specified."); - return 0; - } - - size = _get_device_size(name); - - if (!(dmt = dm_task_create(DM_DEVICE_RELOAD))) - return_0; - - if (!_set_task_device(dmt, name, 0)) - goto_bad; - - if (!dm_task_add_target(dmt, UINT64_C(0), size, "error", "")) - goto_bad; - - if (_switches[READ_ONLY] && !dm_task_set_ro(dmt)) - goto_bad; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_bad; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_bad; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_bad; - - if (!_task_run(dmt)) - goto_bad; - - if (_switches[FORCE_ARG]) - /* Avoid hang on flushing with --force */ - _switches[NOLOCKFS_ARG] = _switches[NOFLUSH_ARG] = 1; - - if (!_simple(DM_DEVICE_RESUME, name, 0, 0)) { - _simple(DM_DEVICE_CLEAR, name, 0, 0); - goto_bad; - } - - r = 1; - -bad: - dm_task_destroy(dmt); - return r; -} - -static int _remove(CMD_ARGS) -{ - if (_switches[FORCE_ARG] && argc) { - /* - * 'remove --force' option is doing 2 operations on the same device - * this is not compatible with the use of --udevcookie/DM_UDEV_COOKIE. - * Udevd collision could be partially avoided with --retry. - */ - if (_udev_cookie) - log_warn("WARNING: Use of cookie and --force is not compatible."); - (void) _error_device(cmd, NULL, argc, argv, NULL, 0); - } - - return _simple(DM_DEVICE_REMOVE, argc ? argv[0] : NULL, 0, 0); -} - -static int _count_devices(CMD_ARGS) -{ - _num_devices++; - - return 1; -} - -static int _remove_all(CMD_ARGS) -{ - int r; - - /* Remove all closed devices */ - r = _simple(DM_DEVICE_REMOVE_ALL, "", 0, 0) | dm_mknodes(NULL); - - if (!_switches[FORCE_ARG]) - return r; - - _num_devices = 0; - r |= _process_all(cmd, NULL, argc, argv, 1, _count_devices); - - /* No devices left? */ - if (!_num_devices) - return r; - - r |= _process_all(cmd, NULL, argc, argv, 1, _error_device); - r |= _simple(DM_DEVICE_REMOVE_ALL, "", 0, 0) | dm_mknodes(NULL); - - _num_devices = 0; - r |= _process_all(cmd, NULL, argc, argv, 1, _count_devices); - if (!_num_devices) - return r; - - log_error("Unable to remove %d device(s).", _num_devices); - - return r; -} - -static void _display_dev(struct dm_task *dmt, const char *name) -{ - struct dm_info info; - - if (dm_task_get_info(dmt, &info)) - printf("%s\t(%u, %u)\n", name, info.major, info.minor); -} - -static int _mknodes(CMD_ARGS) -{ - return dm_mknodes(argc ? argv[0] : NULL); -} - -static int _exec_command(const char *name) -{ - static char path[PATH_MAX]; - static char *args[ARGS_MAX + 1]; - static int argc = 0; - char *c; - pid_t pid; - - if (argc < 0) - return_0; - - if (!dm_mknodes(name)) - return_0; - - if (dm_snprintf(path, sizeof(path), "%s/%s", dm_dir(), name) < 0) - return_0; - - if (!argc) { - c = _command_to_exec; - while (argc < ARGS_MAX) { - while (*c && isspace(*c)) - c++; - if (!*c) - break; - args[argc++] = c; - while (*c && !isspace(*c)) - c++; - if (*c) - *c++ = '\0'; - } - - if (!argc) { - argc = -1; - return_0; - } - - if (argc == ARGS_MAX) { - log_error("Too many args to --exec."); - argc = -1; - return 0; - } - - args[argc++] = path; - args[argc] = NULL; - } - - if (!(pid = fork())) { - execvp(args[0], args); - _exit(127); - } else if (pid < (pid_t) 0) - return 0; - - TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0)); - - return 1; -} - -/* - * Print string s using a backslash to quote each character that has a special - * meaning in the concise format - comma, semi-colon and backslash. - */ -static void _print_string_quoted(const char *s) -{ - while (*s) { - if (strchr(",;\\", *s)) - putchar('\\'); - putchar(*s++); - } -} - -static void hide_key(char *params, const char *name) -{ - char *c = strstr(params, name); - - if (!c) - return; - - c += strlen(name); - - /* key is optional */ - c = strpbrk(c, " :"); - if (!c || *c++ != ':') - return; - - while (*c && *c != ' ') - *c++ = '0'; -} - -static int _status(CMD_ARGS) -{ - int r = 0; - struct dm_task *dmt; - void *next = NULL; - uint64_t start, length; - char *target_type = NULL; - char *params, *c; - int cmdno; - const char *name = NULL; - int matched = 0; - int ls_only = 0; - int use_concise = 0; - struct dm_info info; - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) - /* FIXME Respect deps in concise mode, so they are correctly ordered for recreation */ - return _process_all(cmd, NULL, argc, argv, 0, _status); - name = argv[0]; - } - - if (!strcmp(cmd->name, "table")) { - cmdno = DM_DEVICE_TABLE; - /* --concise only applies to 'table' */ - if (_switches[CONCISE_ARG]) - use_concise = 1; - } else - cmdno = DM_DEVICE_STATUS; - - if (!strcmp(cmd->name, "ls")) - ls_only = 1; - - if (!(dmt = dm_task_create(cmdno))) - return_0; - - if (!_set_task_device(dmt, name, 0)) - goto_out; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (_switches[NOFLUSH_ARG] && !dm_task_no_flush(dmt)) - goto_out; - - if (!_task_run(dmt)) - goto_out; - - if (!dm_task_get_info(dmt, &info)) - goto_out; - - if (!info.exists) { - log_error("Device does not exist."); - goto out; - } - - if (!name) - name = dm_task_get_name(dmt); - - /* Fetch targets and print 'em */ - do { - next = dm_get_next_target(dmt, next, &start, &length, - &target_type, &params); - /* Skip if target type doesn't match */ - if (_switches[TARGET_ARG] && - (!target_type || strcmp(target_type, _target))) - continue; - - if (ls_only) { - if (!_switches[EXEC_ARG] || !_command_to_exec || - _switches[VERBOSE_ARG]) - _display_dev(dmt, name); - next = NULL; - } else if (!_switches[EXEC_ARG] || !_command_to_exec || - _switches[VERBOSE_ARG]) { - if (!use_concise) { - if (!matched && _switches[VERBOSE_ARG]) - _display_info(dmt); - if (multiple_devices && !_switches[VERBOSE_ARG]) - printf("%s: ", name); - } else if (!matched) { - /* - * Before first target of device in concise output, - * print basic device information in the appropriate format. - * Separate devices by a semi-colon. - */ - if (_concise_output_produced) - putchar(';'); - _concise_output_produced = 1; - - _print_string_quoted(name); - putchar(','); - _print_string_quoted(dm_task_get_uuid(dmt)); - printf(",%u,%s", info.minor, info.read_only ? "ro" : "rw"); - } - /* Next print any target-specific information */ - if (target_type) { - /* Suppress encryption keys */ - if (!_switches[SHOWKEYS_ARG] && - cmdno == DM_DEVICE_TABLE) { - if (!strcmp(target_type, "crypt")) { - c = params; - while (*c && *c != ' ') - c++; - if (*c) - c++; - /* - * Do not suppress kernel key references prefixed - * with colon ':'. Displaying those references is - * harmless. crypt target supports kernel keys - * starting with v1.15.0 (merged in kernel 4.10) - */ - if (*c != ':') - while (*c && *c != ' ') - *c++ = '0'; - } else if (!strcmp(target_type, "integrity")) { - /* - * "internal_hash", "journal_crypt" and "journal_mac" - * params allow keys optionally in hexbyte - * representation. - */ - hide_key(params, "internal_hash:"); - hide_key(params, "journal_crypt:"); - hide_key(params, "journal_mac:"); - } - } - if (use_concise) - putchar(','); - printf(FMTu64 " " FMTu64 " %s ", start, length, target_type); - if (use_concise) - _print_string_quoted(params); - else - printf("%s", params); - } - /* --concise places all devices on a single output line */ - if (!use_concise) - putchar('\n'); - } - matched = 1; - } while (next); - - if (multiple_devices && _switches[VERBOSE_ARG] && matched && !ls_only && (!use_concise || _switches[VERBOSE_ARG] > 1)) - putchar('\n'); - - if (matched && _switches[EXEC_ARG] && _command_to_exec && !_exec_command(name)) - goto_out; - - r = 1; - -out: - dm_task_destroy(dmt); - return r; -} - -/* Show target names and their version numbers */ -static int _targets(CMD_ARGS) -{ - int r = 0; - struct dm_task *dmt; - struct dm_versions *target; - struct dm_versions *last_target; - - if (!(dmt = dm_task_create(DM_DEVICE_LIST_VERSIONS))) - return_0; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_task_run(dmt)) - goto_out; - - target = dm_task_get_versions(dmt); - - /* Fetch targets and print 'em */ - do { - last_target = target; - - printf("%-16s v%d.%d.%d\n", target->name, target->version[0], - target->version[1], target->version[2]); - - target = (struct dm_versions *)((char *) target + target->next); - } while (last_target != target); - - r = 1; - -out: - dm_task_destroy(dmt); - return r; -} - -static int _info(CMD_ARGS) -{ - int r = 0; - - struct dm_task *dmt; - char *name = NULL; - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) - return _process_all(cmd, NULL, argc, argv, 0, _info); - name = argv[0]; - } - - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) - return_0; - - if (!_set_task_device(dmt, name, 0)) - goto_out; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_task_run(dmt)) - goto_out; - - r = _display_info(dmt); - -out: - dm_task_destroy(dmt); - return r; -} - -static int _deps(CMD_ARGS) -{ - int r = 0; - uint32_t i; - struct dm_deps *deps; - struct dm_task *dmt; - struct dm_info info; - char *name = NULL; - char dev_name[PATH_MAX]; - int major, minor; - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) - return _process_all(cmd, NULL, argc, argv, 0, _deps); - name = argv[0]; - } - - if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) - return_0; - - if (!_set_task_device(dmt, name, 0)) - goto_out; - - if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_task_run(dmt)) - goto_out; - - if (!dm_task_get_info(dmt, &info)) - goto_out; - - if (!(deps = dm_task_get_deps(dmt))) - goto_out; - - if (!info.exists) { - printf("Device does not exist.\n"); - r = 1; - goto out; - } - - if (_switches[VERBOSE_ARG]) - _display_info(dmt); - - if (multiple_devices && !_switches[VERBOSE_ARG]) - printf("%s: ", name); - printf("%d dependencies\t:", deps->count); - - for (i = 0; i < deps->count; i++) { - major = (int) MAJOR(deps->device[i]); - minor = (int) MINOR(deps->device[i]); - - if ((_dev_name_type == DN_BLK || _dev_name_type == DN_MAP) && - dm_device_get_name(major, minor, _dev_name_type == DN_BLK, - dev_name, PATH_MAX)) - printf(" (%s)", dev_name); - else - printf(" (%d, %d)", major, minor); - } - putchar('\n'); - - if (multiple_devices && _switches[VERBOSE_ARG]) - putchar('\n'); - - r = 1; - -out: - dm_task_destroy(dmt); - return r; -} - -static int _display_name(CMD_ARGS) -{ - char dev_name[PATH_MAX]; - - if (!names) - return 1; - - if ((_dev_name_type == DN_BLK || _dev_name_type == DN_MAP) && - dm_device_get_name((int) MAJOR(names->dev), (int) MINOR(names->dev), - _dev_name_type == DN_BLK, dev_name, PATH_MAX)) - printf("%s\t(%s)\n", names->name, dev_name); - else - printf("%s\t(%d:%d)\n", names->name, - (int) MAJOR(names->dev), - (int) MINOR(names->dev)); - - return 1; -} - -/* - * Tree drawing code - */ - -enum { - TR_DEVICE=0, /* display device major:minor number */ - TR_BLKDEVNAME, /* display device kernel name */ - TR_TABLE, - TR_STATUS, - TR_ACTIVE, - TR_RW, - TR_OPENCOUNT, - TR_UUID, - TR_COMPACT, - TR_TRUNCATE, - TR_BOTTOMUP, - NUM_TREEMODE, -}; - -static int _tree_switches[NUM_TREEMODE]; - -#define TR_PRINT_ATTRIBUTE ( _tree_switches[TR_ACTIVE] || \ - _tree_switches[TR_RW] || \ - _tree_switches[TR_OPENCOUNT] || \ - _tree_switches[TR_UUID] ) - -#define TR_PRINT_TARGETS ( _tree_switches[TR_TABLE] || \ - _tree_switches[TR_STATUS] ) - -/* Compact - fewer newlines */ -#define TR_PRINT_COMPACT (_tree_switches[TR_COMPACT] && \ - !TR_PRINT_ATTRIBUTE && \ - !TR_PRINT_TARGETS) - -/* FIXME Get rid of this */ -#define MAX_DEPTH 100 - -/* Drawing character definition from pstree */ -/* [pstree comment] UTF-8 defines by Johan Myreen, updated by Ben Winslow */ -#define UTF_V "\342\224\202" /* U+2502, Vertical line drawing char */ -#define UTF_VR "\342\224\234" /* U+251C, Vertical and right */ -#define UTF_H "\342\224\200" /* U+2500, Horizontal */ -#define UTF_UR "\342\224\224" /* U+2514, Up and right */ -#define UTF_HD "\342\224\254" /* U+252C, Horizontal and down */ - -#define VT_BEG "\033(0\017" /* use graphic chars */ -#define VT_END "\033(B" /* back to normal char set */ -#define VT_V "x" /* see UTF definitions above */ -#define VT_VR "t" -#define VT_H "q" -#define VT_UR "m" -#define VT_HD "w" - -static struct { - const char *empty_2; /* */ - const char *branch_2; /* |- */ - const char *vert_2; /* | */ - const char *last_2; /* `- */ - const char *single_3; /* --- */ - const char *first_3; /* -+- */ -} -_tsym_ascii = { - " ", - "|-", - "| ", - "`-", - "---", - "-+-" -}, -_tsym_utf = { - " ", - UTF_VR UTF_H, - UTF_V " ", - UTF_UR UTF_H, - UTF_H UTF_H UTF_H, - UTF_H UTF_HD UTF_H -}, -_tsym_vt100 = { - " ", - VT_BEG VT_VR VT_H VT_END, - VT_BEG VT_V VT_END " ", - VT_BEG VT_UR VT_H VT_END, - VT_BEG VT_H VT_H VT_H VT_END, - VT_BEG VT_H VT_HD VT_H VT_END -}, -*_tsym = &_tsym_ascii; - -/* - * Tree drawing functions. - */ -/* FIXME Get rid of these statics - use dynamic struct */ -/* FIXME Explain what these vars are for */ -static int _tree_width[MAX_DEPTH], _tree_more[MAX_DEPTH]; -static int _termwidth = 80; /* Maximum output width */ -static int _cur_x = 1; /* Current horizontal output position */ -static char _last_char = 0; - -static void _out_char(const unsigned c) -{ - /* Only first UTF-8 char counts */ - _cur_x += ((c & 0xc0) != 0x80); - - if (!_tree_switches[TR_TRUNCATE]) { - putchar((int) c); - return; - } - - /* Truncation? */ - if (_cur_x <= _termwidth) - putchar((int) c); - - if (_cur_x == _termwidth + 1 && ((c & 0xc0) != 0x80)) { - if (_last_char || (c & 0x80)) { - putchar('.'); - putchar('.'); - putchar('.'); - } else { - _last_char = c; - _cur_x--; - } - } -} - -static void _out_string(const char *str) -{ - while (*str) - _out_char((unsigned char) *str++); -} - -/* non-negative integers only */ -static unsigned _out_int(unsigned num) -{ - unsigned digits = 0; - unsigned divi; - - if (!num) { - _out_char('0'); - return 1; - } - - /* non zero case */ - for (divi = 1; num / divi; divi *= 10) - digits++; - - for (divi /= 10; divi; divi /= 10) - _out_char('0' + (num / divi) % 10); - - return digits; -} - -static void _out_newline(void) -{ - if (_last_char && _cur_x == _termwidth) - putchar(_last_char); - _last_char = 0; - putchar('\n'); - _cur_x = 1; -} - -static void _out_prefix(unsigned depth) -{ - unsigned x, d; - - for (d = 0; d < depth; d++) { - for (x = _tree_width[d] + 1; x > 0; x--) - _out_char(' '); - - _out_string(d == depth - 1 ? - !_tree_more[depth] ? _tsym->last_2 : _tsym->branch_2 - : _tree_more[d + 1] ? - _tsym->vert_2 : _tsym->empty_2); - } -} - -/* - * Display tree - */ -static void _display_tree_attributes(struct dm_tree_node *node) -{ - int attr = 0; - const char *uuid; - const struct dm_info *info; - - uuid = dm_tree_node_get_uuid(node); - info = dm_tree_node_get_info(node); - - if (!info->exists) - return; - - if (_tree_switches[TR_ACTIVE]) { - _out_string(attr++ ? ", " : " ["); - _out_string(info->suspended ? "SUSPENDED" : "ACTIVE"); - } - - if (_tree_switches[TR_RW]) { - _out_string(attr++ ? ", " : " ["); - _out_string(info->read_only ? "RO" : "RW"); - } - - if (_tree_switches[TR_OPENCOUNT]) { - _out_string(attr++ ? ", " : " ["); - (void) _out_int((unsigned) info->open_count); - } - - if (_tree_switches[TR_UUID]) { - _out_string(attr++ ? ", " : " ["); - _out_string(uuid && *uuid ? uuid : ""); - } - - if (attr) - _out_char(']'); -} - -/* FIXME Display table or status line. (Disallow both?) */ -static void _display_tree_targets(struct dm_tree_node *node, unsigned depth) -{ -} - -static void _display_tree_node(struct dm_tree_node *node, unsigned depth, - unsigned first_child __attribute__((unused)), - unsigned last_child, unsigned has_children) -{ - int offset; - const char *name; - const struct dm_info *info; - int first_on_line = 0; - char dev_name[PATH_MAX]; - - /* Sub-tree for targets has 2 more depth */ - if (depth + 2 > MAX_DEPTH) - return; - - name = dm_tree_node_get_name(node); - - if ((!name || !*name) && - (!_tree_switches[TR_DEVICE] && !_tree_switches[TR_BLKDEVNAME])) - return; - - /* Indicate whether there are more nodes at this depth */ - _tree_more[depth] = !last_child; - _tree_width[depth] = 0; - - if (_cur_x == 1) - first_on_line = 1; - - if (!TR_PRINT_COMPACT || first_on_line) - _out_prefix(depth); - - /* Remember the starting point for compact */ - offset = _cur_x; - - if (TR_PRINT_COMPACT && !first_on_line) - _out_string(_tree_more[depth] ? _tsym->first_3 : _tsym->single_3); - - /* display node */ - if (name) - _out_string(name); - - info = dm_tree_node_get_info(node); - - if (_tree_switches[TR_BLKDEVNAME] && - dm_device_get_name(info->major, info->minor, 1, dev_name, PATH_MAX)) { - _out_string(name ? " <" : "<"); - _out_string(dev_name); - _out_char('>'); - } - - if (_tree_switches[TR_DEVICE]) { - _out_string(name ? " (" : "("); - (void) _out_int(info->major); - _out_char(':'); - (void) _out_int(info->minor); - _out_char(')'); - } - - /* display additional info */ - if (TR_PRINT_ATTRIBUTE) - _display_tree_attributes(node); - - if (TR_PRINT_COMPACT) - _tree_width[depth] = _cur_x - offset; - - if (!TR_PRINT_COMPACT || !has_children) - _out_newline(); - - if (TR_PRINT_TARGETS) { - _tree_more[depth + 1] = has_children; - _display_tree_targets(node, depth + 2); - } -} - -/* - * Walk the dependency tree - */ -static void _display_tree_walk_children(struct dm_tree_node *node, - unsigned depth) -{ - struct dm_tree_node *child, *next_child; - void *handle = NULL; - uint32_t inverted = _tree_switches[TR_BOTTOMUP]; - unsigned first_child = 1; - unsigned has_children; - - next_child = dm_tree_next_child(&handle, node, inverted); - - while ((child = next_child)) { - next_child = dm_tree_next_child(&handle, node, inverted); - has_children = - dm_tree_node_num_children(child, inverted) ? 1 : 0; - - _display_tree_node(child, depth, first_child, - next_child ? 0U : 1U, has_children); - - if (has_children) - _display_tree_walk_children(child, depth + 1); - - first_child = 0; - } -} - -static int _add_dep(CMD_ARGS) -{ - if (names && - !dm_tree_add_dev(_dtree, (unsigned) MAJOR(names->dev), (unsigned) MINOR(names->dev))) - return_0; - - return 1; -} - -/* - * Create and walk dependency tree - * - * An incomplete _dtree may still be used by the caller, - * but the error must be reported. - */ -static int _build_whole_deptree(const struct command *cmd) -{ - if (_dtree) - return 1; - - if (!(_dtree = dm_tree_create())) - return_0; - - if (!_process_all(cmd, NULL, 0, NULL, 0, _add_dep)) - return_0; - - return 1; -} - -static int _display_tree(CMD_ARGS) -{ - int r; - - r = _build_whole_deptree(cmd); - - if (_dtree) - _display_tree_walk_children(dm_tree_find_node(_dtree, 0, 0), 0); - - return r; -} - -/* - * Report device information - */ - -/* dm specific display functions */ - -static int _int32_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const int32_t value = *(const int32_t *)data; - - return dm_report_field_int32(rh, field, &value); -} - -static int _uint32_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const uint32_t value = *(const int32_t *)data; - - return dm_report_field_uint32(rh, field, &value); -} - -static int _show_units(void) -{ - /* --nosuffix overrides --units */ - if (_switches[NOSUFFIX_ARG]) - return_0; - - return (_int_args[UNITS_ARG]) ? 1 : 0; -} - -static int _dm_name_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const char *name = dm_task_get_name((const struct dm_task *) data); - - return dm_report_field_string(rh, field, &name); -} - -static int _dm_mangled_name_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - char *name; - int r = 0; - - if ((name = dm_task_get_name_mangled((const struct dm_task *) data))) { - r = dm_report_field_string(rh, field, (const char * const *) &name); - free(name); - } - - return r; -} - -static int _dm_unmangled_name_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - char *name; - int r = 0; - - if ((name = dm_task_get_name_unmangled((const struct dm_task *) data))) { - r = dm_report_field_string(rh, field, (const char * const *) &name); - free(name); - } - - return r; -} - -static int _dm_uuid_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, - const void *data, void *private __attribute__((unused))) -{ - const char *uuid = dm_task_get_uuid((const struct dm_task *) data); - - if (!uuid || !*uuid) - uuid = ""; - - return dm_report_field_string(rh, field, &uuid); -} - -static int _dm_mangled_uuid_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, - const void *data, void *private __attribute__((unused))) -{ - char *uuid; - int r = 0; - - if ((uuid = dm_task_get_uuid_mangled((const struct dm_task *) data))) { - r = dm_report_field_string(rh, field, (const char * const *) &uuid); - free(uuid); - } - - return r; -} - -static int _dm_unmangled_uuid_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, - const void *data, void *private __attribute__((unused))) -{ - char *uuid; - int r = 0; - - if ((uuid = dm_task_get_uuid_unmangled((const struct dm_task *) data))) { - r = dm_report_field_string(rh, field, (const char * const *) &uuid); - free(uuid); - } - - return r; -} - -static int _dm_read_ahead_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - uint32_t value; - - if (!dm_task_get_read_ahead((const struct dm_task *) data, &value)) - value = 0; - - return dm_report_field_uint32(rh, field, &value); -} - -static int _dm_blk_name_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - char dev_name[PATH_MAX]; - const char *s = dev_name; - const struct dm_info *info = data; - - if (!dm_device_get_name(info->major, info->minor, 1, dev_name, PATH_MAX)) { - log_error("Could not resolve block device name for %d:%d.", - info->major, info->minor); - return 0; - } - - return dm_report_field_string(rh, field, &s); -} - -static int _dm_info_status_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - char buf[5]; - const char *s = buf; - const struct dm_info *info = data; - - buf[0] = info->live_table ? 'L' : '-'; - buf[1] = info->inactive_table ? 'I' : '-'; - buf[2] = info->suspended ? 's' : '-'; - buf[3] = info->read_only ? 'r' : 'w'; - buf[4] = '\0'; - - return dm_report_field_string(rh, field, &s); -} - -static int _dm_info_table_loaded_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, - const void *data, - void *private __attribute__((unused))) -{ - const struct dm_info *info = data; - - if (info->live_table) { - if (info->inactive_table) - dm_report_field_set_value(field, "Both", NULL); - else - dm_report_field_set_value(field, "Live", NULL); - return 1; - } - - if (info->inactive_table) - dm_report_field_set_value(field, "Inactive", NULL); - else - dm_report_field_set_value(field, "None", NULL); - - return 1; -} - -static int _dm_info_suspended_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, - const void *data, - void *private __attribute__((unused))) -{ - const struct dm_info *info = data; - - if (info->suspended) - dm_report_field_set_value(field, "Suspended", NULL); - else - dm_report_field_set_value(field, "Active", NULL); - - return 1; -} - -static int _dm_info_read_only_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, - const void *data, - void *private __attribute__((unused))) -{ - const struct dm_info *info = data; - - if (info->read_only) - dm_report_field_set_value(field, "Read-only", NULL); - else - dm_report_field_set_value(field, "Writeable", NULL); - - return 1; -} - - -static int _dm_info_devno_disp(struct dm_report *rh, struct dm_pool *mem, - struct dm_report_field *field, const void *data, - void *private) -{ - char buf[PATH_MAX], *repstr; - const struct dm_info *info = data; - - if (!dm_pool_begin_object(mem, 8)) { - log_error("dm_pool_begin_object failed"); - return 0; - } - - if (private) { - if (!dm_device_get_name(info->major, info->minor, - 1, buf, PATH_MAX)) { - stack; - goto out_abandon; - } - } - else { - if (dm_snprintf(buf, sizeof(buf), "%d:%d", - info->major, info->minor) < 0) { - log_error("dm_pool_alloc failed"); - goto out_abandon; - } - } - - if (!dm_pool_grow_object(mem, buf, strlen(buf) + 1)) { - log_error("dm_pool_grow_object failed"); - goto out_abandon; - } - - repstr = dm_pool_end_object(mem); - dm_report_field_set_value(field, repstr, repstr); - return 1; - - out_abandon: - dm_pool_abandon_object(mem); - return 0; -} - -static int _dm_tree_names(struct dm_report *rh, struct dm_pool *mem, - struct dm_report_field *field, const void *data, - void *private, unsigned inverted) -{ - const struct dm_tree_node *node = data; - struct dm_tree_node *parent; - void *t = NULL; - const char *name; - int first_node = 1; - char *repstr; - - if (!dm_pool_begin_object(mem, 16)) { - log_error("dm_pool_begin_object failed"); - return 0; - } - - while ((parent = dm_tree_next_child(&t, node, inverted))) { - name = dm_tree_node_get_name(parent); - if (!name || !*name) - continue; - if (!first_node && !dm_pool_grow_object(mem, ",", 1)) { - log_error("dm_pool_grow_object failed"); - goto out_abandon; - } - if (!dm_pool_grow_object(mem, name, 0)) { - log_error("dm_pool_grow_object failed"); - goto out_abandon; - } - if (first_node) - first_node = 0; - } - - if (!dm_pool_grow_object(mem, "\0", 1)) { - log_error("dm_pool_grow_object failed"); - goto out_abandon; - } - - repstr = dm_pool_end_object(mem); - dm_report_field_set_value(field, repstr, repstr); - return 1; - - out_abandon: - dm_pool_abandon_object(mem); - return 0; -} - -static int _dm_deps_names_disp(struct dm_report *rh, - struct dm_pool *mem, - struct dm_report_field *field, - const void *data, void *private) -{ - return _dm_tree_names(rh, mem, field, data, private, 0); -} - -static int _dm_tree_parents_names_disp(struct dm_report *rh, - struct dm_pool *mem, - struct dm_report_field *field, - const void *data, void *private) -{ - return _dm_tree_names(rh, mem, field, data, private, 1); -} - -static int _dm_tree_parents_devs_disp(struct dm_report *rh, struct dm_pool *mem, - struct dm_report_field *field, - const void *data, void *private) -{ - const struct dm_tree_node *node = data; - struct dm_tree_node *parent; - void *t = NULL; - const struct dm_info *info; - int first_node = 1; - char buf[DM_MAX_TYPE_NAME], *repstr; - - if (!dm_pool_begin_object(mem, 16)) { - log_error("dm_pool_begin_object failed"); - return 0; - } - - while ((parent = dm_tree_next_child(&t, node, 1))) { - info = dm_tree_node_get_info(parent); - if (!info->major && !info->minor) - continue; - if (!first_node && !dm_pool_grow_object(mem, ",", 1)) { - log_error("dm_pool_grow_object failed"); - goto out_abandon; - } - if (dm_snprintf(buf, sizeof(buf), "%d:%d", - info->major, info->minor) < 0) { - log_error("dm_snprintf failed"); - goto out_abandon; - } - if (!dm_pool_grow_object(mem, buf, 0)) { - log_error("dm_pool_grow_object failed"); - goto out_abandon; - } - if (first_node) - first_node = 0; - } - - if (!dm_pool_grow_object(mem, "\0", 1)) { - log_error("dm_pool_grow_object failed"); - goto out_abandon; - } - - repstr = dm_pool_end_object(mem); - dm_report_field_set_value(field, repstr, repstr); - return 1; - - out_abandon: - dm_pool_abandon_object(mem); - return 0; -} - -static int _dm_tree_parents_count_disp(struct dm_report *rh, - struct dm_pool *mem, - struct dm_report_field *field, - const void *data, void *private) -{ - const struct dm_tree_node *node = data; - int num_parent = dm_tree_node_num_children(node, 1); - - return dm_report_field_int(rh, field, &num_parent); -} - -static int _dm_deps_disp_common(struct dm_report *rh, struct dm_pool*mem, - struct dm_report_field *field, const void *data, - void *private, int disp_blk_dev_names) -{ - const struct dm_deps *deps = data; - char buf[PATH_MAX], *repstr; - int major, minor; - unsigned i; - - if (!dm_pool_begin_object(mem, 16)) { - log_error("dm_pool_begin_object failed"); - return 0; - } - - for (i = 0; i < deps->count; i++) { - major = (int) MAJOR(deps->device[i]); - minor = (int) MINOR(deps->device[i]); - - if (disp_blk_dev_names) { - if (!dm_device_get_name(major, minor, 1, buf, PATH_MAX)) { - log_error("Could not resolve block device " - "name for %d:%d.", major, minor); - goto out_abandon; - } - } - else if (dm_snprintf(buf, sizeof(buf), "%d:%d", - major, minor) < 0) { - log_error("dm_snprintf failed"); - goto out_abandon; - } - - if (!dm_pool_grow_object(mem, buf, 0)) { - log_error("dm_pool_grow_object failed"); - goto out_abandon; - } - - if (i + 1 < deps->count && !dm_pool_grow_object(mem, ",", 1)) { - log_error("dm_pool_grow_object failed"); - goto out_abandon; - } - } - - if (!dm_pool_grow_object(mem, "\0", 1)) { - log_error("dm_pool_grow_object failed"); - goto out_abandon; - } - - repstr = dm_pool_end_object(mem); - dm_report_field_set_value(field, repstr, repstr); - return 1; - - out_abandon: - dm_pool_abandon_object(mem); - return 0; -} - -static int _dm_deps_disp(struct dm_report *rh, struct dm_pool *mem, - struct dm_report_field *field, const void *data, - void *private) -{ - return _dm_deps_disp_common(rh, mem, field, data, private, 0); -} - -static int _dm_deps_blk_names_disp(struct dm_report *rh, struct dm_pool *mem, - struct dm_report_field *field, - const void *data, void *private) -{ - return _dm_deps_disp_common(rh, mem, field, data, private, 1); -} - -static int _dm_subsystem_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - return dm_report_field_string(rh, field, (const char *const *) data); -} - -static int _dm_vg_name_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - - return dm_report_field_string(rh, field, (const char *const *) data); -} - -static int _dm_lv_name_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) - -{ - return dm_report_field_string(rh, field, (const char *const *) data); -} - -static int _dm_lv_layer_name_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) - -{ - return dm_report_field_string(rh, field, (const char *const *) data); -} - -/** - * All _dm_stats_*_disp functions for basic counters are identical: - * obtain the value for the current region and area and pass it to - * dm_report_field_uint64(). - */ -#define MK_STATS_COUNTER_DISP_FN(counter) \ -static int _dm_stats_ ## counter ## _disp(struct dm_report *rh, \ - struct dm_pool *mem __attribute__((unused)), \ - struct dm_report_field *field, const void *data, \ - void *private __attribute__((unused))) \ -{ \ - const struct dm_stats *dms = (const struct dm_stats *) data; \ - uint64_t value = dm_stats_get_ ## counter(dms, DM_STATS_REGION_CURRENT, \ - DM_STATS_AREA_CURRENT); \ - return dm_report_field_uint64(rh, field, &value); \ -} - -MK_STATS_COUNTER_DISP_FN(reads) -MK_STATS_COUNTER_DISP_FN(reads_merged) -MK_STATS_COUNTER_DISP_FN(read_sectors) -MK_STATS_COUNTER_DISP_FN(read_nsecs) -MK_STATS_COUNTER_DISP_FN(writes) -MK_STATS_COUNTER_DISP_FN(writes_merged) -MK_STATS_COUNTER_DISP_FN(write_sectors) -MK_STATS_COUNTER_DISP_FN(write_nsecs) -MK_STATS_COUNTER_DISP_FN(io_in_progress) -MK_STATS_COUNTER_DISP_FN(io_nsecs) -MK_STATS_COUNTER_DISP_FN(weighted_io_nsecs) -MK_STATS_COUNTER_DISP_FN(total_read_nsecs) -MK_STATS_COUNTER_DISP_FN(total_write_nsecs) -#undef MK_STATS_COUNTER_DISP_FN - -static int _dm_stats_region_id_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - uint64_t group_id, region_id = dm_stats_get_current_region(dms); - char *group_buf = NULL, *repstr; - - if (dm_stats_current_object_type(dms) == DM_STATS_OBJECT_TYPE_GROUP) { - group_id = dm_stats_get_group_id(dms, dm_stats_get_current_region(dms)); - if (!dm_stats_get_group_descriptor(dms, group_id, &group_buf)) - return 0; - /* group_buf will disappear with the current handle */ - repstr = dm_pool_strdup(mem, group_buf); - dm_report_field_set_value(field, repstr, &group_id); - return 1; - } - - return dm_report_field_uint64(rh, field, &region_id); -} - -static int _dm_stats_region_start_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - uint64_t region_start; - const char *repstr; - double *sortval; - char units = _disp_units; - uint64_t factor = _disp_factor; - - if (!dm_stats_get_current_region_start(dms, &region_start)) - return_0; - - if (!(repstr = dm_size_to_string(mem, region_start, units, 1, factor, - _show_units(), DM_SIZE_UNIT))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = (double) region_start; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_region_len_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - uint64_t region_length; - const char *repstr; - double *sortval; - char units = _disp_units; - uint64_t factor = _disp_factor; - - if (!dm_stats_get_current_region_len(dms, &region_length)) - return_0; - - if (!(repstr = dm_size_to_string(mem, region_length, units, 1, factor, - _show_units(), DM_SIZE_UNIT))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = (double) region_length; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_area_id_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - uint64_t area_id = dm_stats_get_current_area(dms); - - if (dm_stats_current_object_type(dms) == DM_STATS_OBJECT_TYPE_GROUP) - area_id = 0; - - return dm_report_field_uint64(rh, field, &area_id); -} - -static int _dm_stats_area_start_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - uint64_t area_start; - const char *repstr; - double *sortval; - char units = _disp_units; - uint64_t factor = _disp_factor; - - if (!dm_stats_get_current_area_start(dms, &area_start)) - return_0; - - if (!(repstr = dm_size_to_string(mem, area_start, units, 1, factor, - _show_units(), DM_SIZE_UNIT))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = (double) area_start; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_area_offset_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - uint64_t area_offset; - const char *repstr; - double *sortval; - char units = _disp_units; - uint64_t factor = _disp_factor; - - if (!dm_stats_get_current_area_offset(dms, &area_offset)) - return_0; - - if (!(repstr = dm_size_to_string(mem, area_offset, units, 1, factor, - _show_units(), DM_SIZE_UNIT))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = (double) area_offset; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_area_len_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - uint64_t area_len; - const char *repstr; - double *sortval; - char units = _disp_units; - uint64_t factor = _disp_factor; - - if (!dm_stats_get_current_area_len(dms, &area_len)) - return_0; - - if (!(repstr = dm_size_to_string(mem, area_len, units, 1, factor, - _show_units(), DM_SIZE_UNIT))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = (double) area_len; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_area_count_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - uint64_t area_count, region; - - region = dm_stats_get_current_region(dms); - if (!(area_count = dm_stats_get_region_nr_areas(dms, region))) - return_0; - - return dm_report_field_uint64(rh, field, &area_count); -} - -static int _dm_stats_group_id_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - uint64_t group_id; - - group_id = dm_stats_get_group_id(dms, - dm_stats_get_current_region(dms)); - - if (!dm_stats_group_present(dms, group_id)) { - dm_report_field_set_value(field, "-", &group_id); - return 1; - } - - return dm_report_field_uint64(rh, field, &group_id); -} - -static int _dm_stats_program_id_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - const char *program_id; - if (!(program_id = dm_stats_get_current_region_program_id(dms))) - return_0; - return dm_report_field_string(rh, field, (const char * const *) &program_id); -} - -static int _dm_stats_user_data_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - const char *user_data; - if (!(user_data = dm_stats_get_current_region_aux_data(dms))) - return_0; - return dm_report_field_string(rh, field, (const char * const *) &user_data); -} - -static int _dm_stats_name_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - const char *stats_name; - if (!(stats_name = dm_stats_get_alias(dms, DM_STATS_REGION_CURRENT))) - return_0; - - return dm_report_field_string(rh, field, (const char * const *) &stats_name); -} - -static int _dm_stats_object_type_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - int type = dm_stats_current_object_type(dms); - - return dm_report_field_string(rh, field, (const char * const *) &_stats_types[type]); -} - -static int _dm_stats_precise_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - int precise; - precise = dm_stats_get_current_region_precise_timestamps(dms); - return dm_report_field_int(rh, field, (const int *) &precise); -} - -static const char *_get_histogram_string(const struct dm_stats *dms, int rel, - int vals, int bounds) -{ - const struct dm_histogram *dmh; - int flags = 0, width = (_switches[NOHEADINGS_ARG]) ? -1 : 0; - - if (!(dmh = dm_stats_get_histogram(dms, DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT))) - return ""; /* No histogram. */ - - flags |= (vals) ? DM_HISTOGRAM_VALUES - : 0; - - flags |= bounds; - - flags |= (rel) ? DM_HISTOGRAM_PERCENT - : 0; - - flags |= (_switches[NOTIMESUFFIX_ARG]) ? 0 : DM_HISTOGRAM_SUFFIX; - - /* FIXME: make unit conversion optional. */ - return dm_histogram_to_string(dmh, -1, width, flags); -} - -static int _stats_hist_count_disp(struct dm_report *rh, - struct dm_report_field *field, const void *data, - int bounds) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - const char *histogram; - - histogram = _get_histogram_string(dms, 0, 1, bounds); /* counts */ - - if (!histogram) - return_0; - - return dm_report_field_string(rh, field, (const char * const *) &histogram); -} - -static int _dm_stats_hist_count_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - return _stats_hist_count_disp(rh, field, data, 0); -} - -static int _dm_stats_hist_count_bounds_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - return _stats_hist_count_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_LOWER); -} - -static int _dm_stats_hist_count_ranges_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - return _stats_hist_count_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_RANGE); -} - -static int _stats_hist_percent_disp(struct dm_report *rh, - struct dm_report_field *field, const void *data, - int bounds) -{ - - /* FIXME: configurable to-string options. */ - const struct dm_stats *dms = (const struct dm_stats *) data; - const char *histogram; - - histogram = _get_histogram_string(dms, 1, 1, bounds); /* relative values */ - - if (!histogram) - return_0; - - return dm_report_field_string(rh, field, (const char * const *) &histogram); -} - -static int _dm_stats_hist_percent_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - return _stats_hist_percent_disp(rh, field, data, 0); -} - -static int _dm_stats_hist_percent_bounds_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - return _stats_hist_percent_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_LOWER); -} - -static int _dm_stats_hist_percent_ranges_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - return _stats_hist_percent_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_RANGE); -} - -static int _stats_hist_bounds_disp(struct dm_report *rh, - struct dm_report_field *field, const void *data, - int bounds) -{ - /* FIXME: configurable to-string options. */ - const struct dm_stats *dms = (const struct dm_stats *) data; - const char *histogram; - - histogram = _get_histogram_string(dms, 0, 0, bounds); - - if (!histogram) - return_0; - - return dm_report_field_string(rh, field, (const char * const *) &histogram); -} - -static int _dm_stats_hist_bounds_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - return _stats_hist_bounds_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_LOWER); -} - -static int _dm_stats_hist_ranges_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - return _stats_hist_bounds_disp(rh, field, data, DM_HISTOGRAM_BOUNDS_RANGE); -} - -static int _dm_stats_hist_bins_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - int bins; - bins = dm_stats_get_region_nr_histogram_bins(dms, DM_STATS_REGION_CURRENT); - return dm_report_field_int(rh, field, (const int *) &bins); -} - -static int _dm_stats_rrqm_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - char buf[64]; - char *repstr; - double *sortval, rrqm; - - if (!dm_stats_get_rd_merges_per_sec(dms, &rrqm, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - if (dm_snprintf(buf, sizeof(buf), "%.2f", rrqm) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = rrqm; - - dm_report_field_set_value(field, repstr, sortval); - return 1; - -} - -static int _dm_stats_wrqm_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - char buf[64]; - char *repstr; - double *sortval, wrqm; - - if (!dm_stats_get_wr_merges_per_sec(dms, &wrqm, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - if (dm_snprintf(buf, sizeof(buf), "%.2f", wrqm) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = wrqm; - - dm_report_field_set_value(field, repstr, sortval); - return 1; - -} - -static int _dm_stats_rs_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - char buf[64]; - char *repstr; - double *sortval, rs; - - if (!dm_stats_get_reads_per_sec(dms, &rs, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - if (dm_snprintf(buf, sizeof(buf), "%.2f", rs) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = rs; - - dm_report_field_set_value(field, repstr, sortval); - return 1; - -} - -static int _dm_stats_ws_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - char buf[64]; - char *repstr; - double *sortval, ws; - - if (!dm_stats_get_writes_per_sec(dms, &ws, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - if (dm_snprintf(buf, sizeof(buf), "%.2f", ws) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = ws; - - dm_report_field_set_value(field, repstr, sortval); - return 1; - -} - -static int _dm_stats_read_secs_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - const char *repstr; - double *sortval, rsec; - char units = _disp_units; - uint64_t factor = _disp_factor; - - if (!dm_stats_get_read_sectors_per_sec(dms, &rsec, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - if (!(repstr = dm_size_to_string(mem, (uint64_t) rsec, units, 1, - factor, _show_units(), DM_SIZE_UNIT))) - - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = rsec; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_write_secs_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - const char *repstr; - double *sortval, wsec; - char units = _disp_units; - uint64_t factor = _disp_factor; - - if (!dm_stats_get_write_sectors_per_sec(dms, &wsec, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - if (!(repstr = dm_size_to_string(mem, (uint64_t) wsec, units, 1, - factor, _show_units(), DM_SIZE_UNIT))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = wsec; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_arqsz_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - const char *repstr; - double *sortval, arqsz; - char units = _disp_units; - uint64_t factor = _disp_factor; - - if (!dm_stats_get_average_request_size(dms, &arqsz, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - - if (!(repstr = dm_size_to_string(mem, (uint64_t) arqsz, units, 1, - factor, _show_units(), DM_SIZE_UNIT))) - - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = arqsz; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_qusz_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - char buf[64]; - char *repstr; - double *sortval, qusz; - - if (!dm_stats_get_average_queue_size(dms, &qusz, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - if (dm_snprintf(buf, sizeof(buf), "%.2f", qusz) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = qusz; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_await_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - char buf[64]; - char *repstr; - double *sortval, await; - - if (!dm_stats_get_average_wait_time(dms, &await, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - /* FIXME: make scale configurable */ - /* display in msecs */ - await /= NSEC_PER_MSEC; - - if (dm_snprintf(buf, sizeof(buf), "%.2f", await) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = await; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_r_await_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - char buf[64]; - char *repstr; - double *sortval, r_await; - - if (!dm_stats_get_average_rd_wait_time(dms, &r_await, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - /* FIXME: make scale configurable */ - /* display in msecs */ - r_await /= NSEC_PER_MSEC; - - if (dm_snprintf(buf, sizeof(buf), "%.2f", r_await) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = r_await; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_w_await_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - char buf[64]; - char *repstr; - double *sortval, w_await; - - if (!dm_stats_get_average_wr_wait_time(dms, &w_await, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - /* FIXME: make scale configurable */ - /* display in msecs */ - w_await /= NSEC_PER_MSEC; - - if (dm_snprintf(buf, sizeof(buf), "%.2f", w_await) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = w_await; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_tput_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - char buf[64]; - char *repstr; - double *sortval, tput; - - if (!dm_stats_get_throughput(dms, &tput, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - if (dm_snprintf(buf, sizeof(buf), "%.2f", tput) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = tput; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static int _dm_stats_svctm_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - char buf[64]; - char *repstr; - double *sortval, svctm; - - if (!dm_stats_get_service_time(dms, &svctm, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - /* FIXME: make scale configurable */ - /* display in msecs */ - svctm /= NSEC_PER_MSEC; - - if (dm_snprintf(buf, sizeof(buf), "%.2f", svctm) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - if (!(sortval = dm_pool_alloc(mem, sizeof(uint64_t)))) - return_0; - - *sortval = svctm; - - dm_report_field_set_value(field, repstr, sortval); - return 1; - -} - -static int _dm_stats_util_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - const struct dm_stats *dms = (const struct dm_stats *) data; - dm_percent_t util; - - if (!dm_stats_get_utilization(dms, &util, - DM_STATS_REGION_CURRENT, - DM_STATS_AREA_CURRENT)) - return_0; - - dm_report_field_percent(rh, field, &util); - return 1; -} - -static int _dm_stats_sample_interval_ns_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - /* FIXME: use internal interval estimate when supported by libdm */ - return dm_report_field_uint64(rh, field, &_last_interval); -} - -static int _dm_stats_sample_interval_disp(struct dm_report *rh, - struct dm_pool *mem __attribute__((unused)), - struct dm_report_field *field, const void *data, - void *private __attribute__((unused))) -{ - char buf[64]; - char *repstr; - double *sortval; - - if (!(sortval = dm_pool_alloc(mem, sizeof(*sortval)))) - return_0; - - *sortval = (double)_last_interval / (double) NSEC_PER_SEC; - - if (dm_snprintf(buf, sizeof(buf), "%2.6f", *sortval) < 0) - return_0; - - if (!(repstr = dm_pool_strdup(mem, buf))) - return_0; - - dm_report_field_set_value(field, repstr, sortval); - return 1; -} - -static void *_task_get_obj(void *obj) -{ - return ((struct dmsetup_report_obj *)obj)->task; -} - -static void *_info_get_obj(void *obj) -{ - return ((struct dmsetup_report_obj *)obj)->info; -} - -static void *_deps_get_obj(void *obj) -{ - return dm_task_get_deps(((struct dmsetup_report_obj *)obj)->deps_task); -} - -static void *_tree_get_obj(void *obj) -{ - return ((struct dmsetup_report_obj *)obj)->tree_node; -} - -static void *_split_name_get_obj(void *obj) -{ - return ((struct dmsetup_report_obj *)obj)->split_name; -} - -static void *_stats_get_obj(void *obj) -{ - return ((struct dmsetup_report_obj *)obj)->stats; -} - -static const struct dm_report_object_type _report_types[] = { - { DR_TASK, "Mapped Device Name", "name_", _task_get_obj }, - { DR_INFO, "Mapped Device Information", "info_", _info_get_obj }, - { DR_DEPS, "Mapped Device Relationship Information", "deps_", _deps_get_obj }, - { DR_TREE, "Mapped Device Relationship Information", "tree_", _tree_get_obj }, - { DR_NAME, "Mapped Device Name Components", "splitname_", _split_name_get_obj }, - { DR_STATS, "Mapped Device Statistics","stats_", _stats_get_obj }, - { DR_STATS_META, "Mapped Device Statistics Region Information","region_", _stats_get_obj }, - { 0, "", "", NULL } -}; - -/* Column definitions */ -/* N.B. Field names must not contain the substring 'help' as this will disable --count. */ -#define OFFSET_OF(strct, field) (((char*)&((struct strct*)0)->field) - (char*)0) -#define STR (DM_REPORT_FIELD_TYPE_STRING) -#define NUM (DM_REPORT_FIELD_TYPE_NUMBER) -#define SIZ (DM_REPORT_FIELD_TYPE_SIZE) -#define TIM (DM_REPORT_FIELD_TYPE_TIME) -#define FIELD_O(type, strct, sorttype, head, field, width, func, id, desc) {DR_ ## type, sorttype, OFFSET_OF(strct, field), width, id, head, &_ ## func ## _disp, desc}, -#define FIELD_F(type, sorttype, head, width, func, id, desc) {DR_ ## type, sorttype, 0, width, id, head, &_ ## func ## _disp, desc}, - -static const struct dm_report_field_type _report_fields[] = { -/* *INDENT-OFF* */ -FIELD_F(TASK, STR, "Name", 16, dm_name, "name", "Name of mapped device.") -FIELD_F(TASK, STR, "MangledName", 16, dm_mangled_name, "mangled_name", "Mangled name of mapped device.") -FIELD_F(TASK, STR, "UnmangledName", 16, dm_unmangled_name, "unmangled_name", "Unmangled name of mapped device.") -FIELD_F(TASK, STR, "UUID", 32, dm_uuid, "uuid", "Unique (optional) identifier for mapped device.") -FIELD_F(TASK, STR, "MangledUUID", 32, dm_mangled_uuid, "mangled_uuid", "Mangled unique (optional) identifier for mapped device.") -FIELD_F(TASK, STR, "UnmangledUUID", 32, dm_unmangled_uuid, "unmangled_uuid", "Unmangled unique (optional) identifier for mapped device.") - -/* FIXME Next one should be INFO */ -FIELD_F(TASK, NUM, "RAhead", 6, dm_read_ahead, "read_ahead", "Read ahead value.") - -FIELD_F(INFO, STR, "BlkDevName", 16, dm_blk_name, "blkdevname", "Name of block device.") -FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "attr", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.") -FIELD_F(INFO, STR, "Tables", 6, dm_info_table_loaded, "tables_loaded", "Which of the live and inactive table slots are filled.") -FIELD_F(INFO, STR, "Suspended", 9, dm_info_suspended, "suspended", "Whether the device is suspended.") -FIELD_F(INFO, STR, "Read-only", 9, dm_info_read_only, "readonly", "Whether the device is read-only or writeable.") -FIELD_F(INFO, STR, "DevNo", 5, dm_info_devno, "devno", "Device major and minor numbers") -FIELD_O(INFO, dm_info, NUM, "Maj", major, 3, int32, "major", "Block device major number.") -FIELD_O(INFO, dm_info, NUM, "Min", minor, 3, int32, "minor", "Block device minor number.") -FIELD_O(INFO, dm_info, NUM, "Open", open_count, 4, int32, "open", "Number of references to open device, if requested.") -FIELD_O(INFO, dm_info, NUM, "Targ", target_count, 4, int32, "segments", "Number of segments in live table, if present.") -FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "events", "Number of most recent event.") - -FIELD_O(DEPS, dm_deps, NUM, "#Devs", count, 5, int32, "device_count", "Number of devices used by this one.") -FIELD_F(TREE, STR, "DevNamesUsed", 16, dm_deps_names, "devs_used", "List of names of mapped devices used by this one.") -FIELD_F(DEPS, STR, "DevNosUsed", 16, dm_deps, "devnos_used", "List of device numbers of devices used by this one.") -FIELD_F(DEPS, STR, "BlkDevNamesUsed", 16, dm_deps_blk_names, "blkdevs_used", "List of names of block devices used by this one.") - -FIELD_F(TREE, NUM, "#Refs", 5, dm_tree_parents_count, "device_ref_count", "Number of mapped devices referencing this one.") -FIELD_F(TREE, STR, "RefNames", 8, dm_tree_parents_names, "names_using_dev", "List of names of mapped devices using this one.") -FIELD_F(TREE, STR, "RefDevNos", 9, dm_tree_parents_devs, "devnos_using_dev", "List of device numbers of mapped devices using this one.") - -FIELD_O(NAME, dm_split_name, STR, "Subsys", subsystem, 6, dm_subsystem, "subsystem", "Userspace subsystem responsible for this device.") -FIELD_O(NAME, dm_split_name, STR, "VG", vg_name, 4, dm_vg_name, "vg_name", "LVM Volume Group name.") -FIELD_O(NAME, dm_split_name, STR, "LV", lv_name, 4, dm_lv_name, "lv_name", "LVM Logical Volume name.") -FIELD_O(NAME, dm_split_name, STR, "LVLayer", lv_layer, 7, dm_lv_layer_name, "lv_layer", "LVM device layer.") - -/* basic stats counters */ -FIELD_F(STATS, NUM, "#Reads", 6, dm_stats_reads, "read_count", "Count of reads completed.") -FIELD_F(STATS, NUM, "#RdMrgs", 7, dm_stats_reads_merged, "reads_merged_count", "Count of read requests merged.") -FIELD_F(STATS, NUM, "#RdSectors", 10, dm_stats_read_sectors, "read_sector_count", "Count of sectors read.") -FIELD_F(STATS, NUM, "AccRdTime", 11, dm_stats_read_nsecs, "read_time", "Accumulated duration of all read requests (ns).") -FIELD_F(STATS, NUM, "#Writes", 7, dm_stats_writes, "write_count", "Count of writes completed.") -FIELD_F(STATS, NUM, "#WrMrgs", 7, dm_stats_writes_merged, "writes_merged_count", "Count of write requests merged.") -FIELD_F(STATS, NUM, "#WrSectors", 10, dm_stats_write_sectors, "write_sector_count", "Count of sectors written.") -FIELD_F(STATS, NUM, "AccWrTime", 11, dm_stats_write_nsecs, "write_time", "Accumulated duration of all writes (ns).") -FIELD_F(STATS, NUM, "#InProg", 7, dm_stats_io_in_progress, "in_progress_count", "Count of requests currently in progress.") -FIELD_F(STATS, NUM, "IoTicks", 7, dm_stats_io_nsecs, "io_ticks", "Nanoseconds spent servicing requests.") -FIELD_F(STATS, NUM, "QueueTicks", 10, dm_stats_weighted_io_nsecs, "queue_ticks", "Total nanoseconds spent in queue.") -FIELD_F(STATS, NUM, "RdTicks", 7, dm_stats_total_read_nsecs, "read_ticks", "Nanoseconds spent servicing reads.") -FIELD_F(STATS, NUM, "WrTicks", 7, dm_stats_total_write_nsecs, "write_ticks", "Nanoseconds spent servicing writes.") - -/* Stats derived metrics */ -FIELD_F(STATS, NUM, "RMrg/s", 6, dm_stats_rrqm, "reads_merged_per_sec", "Read requests merged per second.") -FIELD_F(STATS, NUM, "WMrg/s", 6, dm_stats_wrqm, "writes_merged_per_sec", "Write requests merged per second.") -FIELD_F(STATS, NUM, "R/s", 3, dm_stats_rs, "reads_per_sec", "Reads per second.") -FIELD_F(STATS, NUM, "W/s", 3, dm_stats_ws, "writes_per_sec", "Writes per second.") -FIELD_F(STATS, NUM, "RSz/s", 5, dm_stats_read_secs, "read_size_per_sec", "Size of data read per second.") -FIELD_F(STATS, NUM, "WSz/s", 5, dm_stats_write_secs, "write_size_per_sec", "Size of data written per second.") -FIELD_F(STATS, NUM, "AvgRqSz", 7, dm_stats_arqsz, "avg_request_size", "Average request size.") -FIELD_F(STATS, NUM, "QSize", 5, dm_stats_qusz, "queue_size", "Average queue size.") -FIELD_F(STATS, NUM, "AWait", 5, dm_stats_await, "await", "Averate wait time.") -FIELD_F(STATS, NUM, "RdAWait", 7, dm_stats_r_await, "read_await", "Averate read wait time.") -FIELD_F(STATS, NUM, "WrAWait", 7, dm_stats_w_await, "write_await", "Averate write wait time.") -FIELD_F(STATS, NUM, "Throughput", 10, dm_stats_tput, "throughput", "Throughput.") -FIELD_F(STATS, NUM, "SvcTm", 5, dm_stats_svctm, "service_time", "Service time.") -FIELD_F(STATS, NUM, "Util%", 5, dm_stats_util, "util", "Utilization.") - -/* Histogram fields */ -FIELD_F(STATS, STR, "Histogram Counts", 16, dm_stats_hist_count, "hist_count", "Latency histogram counts.") -FIELD_F(STATS, STR, "Histogram Counts", 16, dm_stats_hist_count_bounds, "hist_count_bounds", "Latency histogram counts with bin boundaries.") -FIELD_F(STATS, STR, "Histogram Counts", 16, dm_stats_hist_count_ranges, "hist_count_ranges", "Latency histogram counts with bin ranges.") -FIELD_F(STATS, STR, "Histogram%", 10, dm_stats_hist_percent, "hist_percent", "Relative latency histogram.") -FIELD_F(STATS, STR, "Histogram%", 10, dm_stats_hist_percent_bounds, "hist_percent_bounds", "Relative latency histogram with bin boundaries.") -FIELD_F(STATS, STR, "Histogram%", 10, dm_stats_hist_percent_ranges, "hist_percent_ranges", "Relative latency histogram with bin ranges.") - -/* Stats interval duration estimates */ -FIELD_F(STATS, NUM, "IntervalNs", 10, dm_stats_sample_interval_ns, "interval_ns", "Sampling interval in nanoseconds.") -FIELD_F(STATS, NUM, "Interval", 8, dm_stats_sample_interval, "interval", "Sampling interval.") - -/* Stats report meta-fields */ -FIELD_F(STATS_META, NUM, "RgID", 4, dm_stats_region_id, "region_id", "Region ID.") -FIELD_F(STATS_META, SIZ, "RgStart", 7, dm_stats_region_start, "region_start", "Region start.") -FIELD_F(STATS_META, SIZ, "RgSize", 6, dm_stats_region_len, "region_len", "Region length.") -FIELD_F(STATS_META, NUM, "ArID", 4, dm_stats_area_id, "area_id", "Area ID.") -FIELD_F(STATS_META, SIZ, "ArStart", 7, dm_stats_area_start, "area_start", "Area offset from start of device.") -FIELD_F(STATS_META, SIZ, "ArSize", 6, dm_stats_area_len, "area_len", "Area length.") -FIELD_F(STATS_META, SIZ, "ArOff", 5, dm_stats_area_offset, "area_offset", "Area offset from start of region.") -FIELD_F(STATS_META, NUM, "#Areas", 6, dm_stats_area_count, "area_count", "Area count.") -FIELD_F(STATS_META, NUM, "GrpID", 5, dm_stats_group_id, "group_id", "Group ID.") -FIELD_F(STATS_META, STR, "ProgID", 6, dm_stats_program_id, "program_id", "Program ID.") -FIELD_F(STATS_META, STR, "UserData", 8, dm_stats_user_data, "user_data", "Auxiliary data.") -FIELD_F(STATS_META, STR, "Precise", 7, dm_stats_precise, "precise", "Set if nanosecond precision counters are enabled.") -FIELD_F(STATS_META, STR, "#Bins", 9, dm_stats_hist_bins, "hist_bins", "The number of histogram bins configured.") -FIELD_F(STATS_META, STR, "Histogram Bounds", 16, dm_stats_hist_bounds, "hist_bounds", "Latency histogram bin boundaries.") -FIELD_F(STATS_META, STR, "Histogram Ranges", 16, dm_stats_hist_ranges, "hist_ranges", "Latency histogram bin ranges.") -FIELD_F(STATS_META, STR, "Name", 16, dm_stats_name, "stats_name", "Stats name of current object.") -FIELD_F(STATS_META, STR, "ObjType", 7, dm_stats_object_type, "obj_type", "Type of stats object being reported.") -{0, 0, 0, 0, "", "", NULL, NULL}, -/* *INDENT-ON* */ -}; - -#undef FIELD_O -#undef FIELD_F - -#undef STR -#undef NUM -#undef SIZ - -static const char *_default_report_options = "name,major,minor,attr,open,segments,events,uuid"; -static const char *_splitname_report_options = "vg_name,lv_name,lv_layer"; - -/* Stats counters & derived metrics. */ -#define RD_COUNTERS "read_count,reads_merged_count,read_sector_count,read_time,read_ticks" -#define WR_COUNTERS "write_count,writes_merged_count,write_sector_count,write_time,write_ticks" -#define IO_COUNTERS "in_progress_count,io_ticks,queue_ticks" -#define COUNTERS RD_COUNTERS "," WR_COUNTERS "," IO_COUNTERS - -#define METRICS "reads_merged_per_sec,writes_merged_per_sec," \ - "reads_per_sec,writes_per_sec," \ - "read_size_per_sec,write_size_per_sec," \ - "avg_request_size,queue_size,util," \ - "await,read_await,write_await" - -/* Device, region and area metadata. */ -#define STATS_DEV_INFO "statsname,group_id,region_id,obj_type" -#define STATS_AREA_INFO "area_id,area_start,area_len" -#define STATS_AREA_INFO_FULL STATS_DEV_INFO ",region_start,region_len,area_count,area_id,area_start,area_len" -#define STATS_REGION_INFO STATS_DEV_INFO ",region_start,region_len,area_count,area_len" - -/* Minimal set of fields for histogram report. */ -#define STATS_HIST STATS_REGION_INFO ",util,await" - -/* Default stats report options. */ -static const char *_stats_default_report_options = STATS_DEV_INFO "," STATS_AREA_INFO "," METRICS; -static const char *_stats_raw_report_options = STATS_DEV_INFO "," STATS_AREA_INFO "," COUNTERS; -static const char *_stats_list_options = STATS_REGION_INFO ",program_id"; -static const char *_stats_area_list_options = STATS_AREA_INFO_FULL ",program_id"; -static const char *_stats_hist_list_options = STATS_REGION_INFO ",hist_bins,hist_bounds"; -static const char *_stats_hist_area_list_options = STATS_AREA_INFO_FULL ",hist_bins,hist_bounds"; -static const char *_stats_hist_options = STATS_HIST ",hist_count_bounds"; -static const char *_stats_hist_relative_options = STATS_HIST ",hist_percent_bounds"; - -static int _report_init(const struct command *cmd, const char *subcommand) -{ - char *options = (char *) _default_report_options; - char *opt_fields = NULL; /* optional fields from command line */ - const char *keys = ""; - const char *separator = " "; - const char *selection = NULL; - int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0; - int quoted = 1, columns_as_rows = 0; - uint32_t flags = 0; - size_t len = 0; - int r = 0; - - if (cmd && !strcmp(cmd->name, "splitname")) { - options = (char *) _splitname_report_options; - _report_type |= DR_NAME; - } - - if (cmd && !strcmp(cmd->name, "stats")) { - _report_type |= DR_STATS_META; - if (!strcmp(subcommand, "list")) { - if (!_switches[HISTOGRAM_ARG]) - options = (char *) ((_switches[VERBOSE_ARG]) - ? _stats_area_list_options - : _stats_list_options); - else - options = (char *) ((_switches[VERBOSE_ARG]) - ? _stats_hist_area_list_options - : _stats_hist_list_options); - } else { - if (_switches[HISTOGRAM_ARG]) - options = (char *) ((_switches[RELATIVE_ARG]) - ? _stats_hist_relative_options - : _stats_hist_options); - else - options = (char *) ((!_switches[RAW_ARG]) - ? _stats_default_report_options - : _stats_raw_report_options); - _report_type |= DR_STATS; - } - } - - if (cmd && !strcmp(cmd->name, "list")) { - options = (char *) _stats_list_options; - _report_type |= DR_STATS_META; - } - - /* emulate old dmsetup behaviour */ - if (_switches[NOHEADINGS_ARG]) { - separator = ":"; - aligned = 0; - headings = 0; - } - - if (_switches[UNBUFFERED_ARG]) - buffered = 0; - - if (_switches[ROWS_ARG]) - columns_as_rows = 1; - - if (_switches[UNQUOTED_ARG]) - quoted = 0; - - if (_switches[NAMEPREFIXES_ARG]) { - aligned = 0; - field_prefixes = 1; - } - - if (_switches[OPTIONS_ARG] && _string_args[OPTIONS_ARG]) { - /* Count & interval forbidden for help. */ - /* FIXME Detect "help" correctly and exit */ - if (strstr(_string_args[OPTIONS_ARG], "help")) { - _switches[COUNT_ARG] = 0; - _count = 1; - _switches[INTERVAL_ARG] = 0; - headings = 0; - } - - if (*_string_args[OPTIONS_ARG] != '+') - options = _string_args[OPTIONS_ARG]; - else { - char *tmpopts; - opt_fields = _string_args[OPTIONS_ARG] + 1; - len = strlen(options) + strlen(opt_fields) + 2; - if (!(tmpopts = malloc(len))) { - log_error("Failed to allocate option string."); - return 0; - } - if (dm_snprintf(tmpopts, len, "%s,%s", - options, opt_fields) < 0) { - free(tmpopts); - return 0; - } - options = tmpopts; - } - } - - if (_switches[SORT_ARG] && _string_args[SORT_ARG]) { - keys = _string_args[SORT_ARG]; - buffered = 1; - if (cmd && (!strcmp(cmd->name, "status") || !strcmp(cmd->name, "table"))) { - log_error("--sort is not yet supported with status and table."); - goto out; - } - } - - if (_switches[SEPARATOR_ARG] && _string_args[SEPARATOR_ARG]) { - separator = _string_args[SEPARATOR_ARG]; - aligned = 0; - } - - if (_switches[SELECT_ARG] && _string_args[SELECT_ARG]) - selection = _string_args[SELECT_ARG]; - - if (aligned) - flags |= DM_REPORT_OUTPUT_ALIGNED; - - if (buffered) - flags |= DM_REPORT_OUTPUT_BUFFERED; - - if (headings) - flags |= DM_REPORT_OUTPUT_HEADINGS; - - if (field_prefixes) - flags |= DM_REPORT_OUTPUT_FIELD_NAME_PREFIX; - - if (!quoted) - flags |= DM_REPORT_OUTPUT_FIELD_UNQUOTED; - - if (columns_as_rows) - flags |= DM_REPORT_OUTPUT_COLUMNS_AS_ROWS; - - if (!(_report = dm_report_init_with_selection(&_report_type, _report_types, - _report_fields, options, separator, flags, keys, - selection, NULL, NULL))) - goto_out; - - r = 1; - - if ((_report_type & DR_TREE) && cmd) { - r = _build_whole_deptree(cmd); - if (!_dtree) { - log_error("Internal device dependency tree creation failed."); - goto out; - } - } - - if (!_switches[INTERVAL_ARG]) - _int_args[INTERVAL_ARG] = 1; /* 1s default. */ - - _interval = NSEC_PER_SEC * (uint64_t) _int_args[INTERVAL_ARG]; - - if (field_prefixes) - dm_report_set_output_field_name_prefix(_report, "dm_"); - -out: - if (len) - free(options); - - return r; -} - -/* - * List devices - */ -static int _ls(CMD_ARGS) -{ - if ((_switches[TARGET_ARG] && _target) || - (_switches[EXEC_ARG] && _command_to_exec)) - return _status(cmd, NULL, argc, argv, NULL, 0); - - if ((_switches[TREE_ARG])) - return _display_tree(cmd, NULL, 0, NULL, NULL, 0); - - return _process_all(cmd, NULL, argc, argv, 0, _display_name); -} - -static int _mangle(CMD_ARGS) -{ - const char *name, *uuid; - char *new_name = NULL, *new_uuid = NULL; - struct dm_task *dmt; - struct dm_info info; - int r = 0; - int target_format; - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) - return _process_all(cmd, NULL, argc, argv, 0, _mangle); - name = argv[0]; - } - - if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) - return_0; - - if (!(_set_task_device(dmt, name, 0))) - goto_out; - - if (!_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_task_run(dmt)) - goto_out; - - if (!dm_task_get_info(dmt, &info) || !info.exists) - goto_out; - - uuid = dm_task_get_uuid(dmt); - - target_format = _switches[MANGLENAME_ARG] ? _int_args[MANGLENAME_ARG] - : DEFAULT_DM_NAME_MANGLING; - - if (target_format == DM_STRING_MANGLING_AUTO) { - if (strstr(name, "\\x5cx")) { - log_error("The name \"%s\" seems to be mangled more than once. " - "Manual intervention required to rename the device.", name); - goto out; - } - if (strstr(uuid, "\\x5cx")) { - log_error("The UUID \"%s\" seems to be mangled more than once. " - "Manual intervention required to correct the device UUID.", uuid); - goto out; - } - } - - if (target_format == DM_STRING_MANGLING_NONE) { - if (!(new_name = dm_task_get_name_unmangled(dmt))) - goto_out; - if (!(new_uuid = dm_task_get_uuid_unmangled(dmt))) - goto_out; - } - else { - if (!(new_name = dm_task_get_name_mangled(dmt))) - goto_out; - if (!(new_uuid = dm_task_get_uuid_mangled(dmt))) - goto_out; - } - - /* We can't rename the UUID, the device must be reactivated manually. */ - if (strcmp(uuid, new_uuid)) { - log_error("%s: %s: UUID in incorrect form. ", name, uuid); - log_error("Unable to change device UUID. The device must be deactivated first."); - r = 0; - goto out; - } - - /* Nothing to do if the name is in correct form already. */ - if (!strcmp(name, new_name)) { - log_print("%s: %s: name %salready in correct form", name, - *uuid ? uuid : "[no UUID]", *uuid ? "and UUID " : ""); - r = 1; - goto out; - } - else - log_print("%s: renaming to %s", name, new_name); - - /* Rename to correct form of the name. */ - r = _do_rename(name, new_name, NULL); - -out: - free(new_name); - free(new_uuid); - dm_task_destroy(dmt); - return r; -} - -static int _stats(CMD_ARGS); -static int _bind_stats_device(struct dm_stats *dms, const char *name) -{ - if (name && !dm_stats_bind_name(dms, name)) - return_0; - else if (_switches[UUID_ARG] && !dm_stats_bind_uuid(dms, _uuid)) - return_0; - else if (_switches[MAJOR_ARG] && _switches[MINOR_ARG] - && !dm_stats_bind_devno(dms, _int_args[MAJOR_ARG], - _int_args[MINOR_ARG])) - return_0; - - return 1; -} - -static int _stats_clear_one_region(struct dm_stats *dms, uint64_t region_id) -{ - - if (!dm_stats_region_present(dms, region_id)) { - log_error("No such region: %"PRIu64".", region_id); - return 0; - } - if (!dm_stats_clear_region(dms, region_id)) { - log_error("Clearing statistics region %"PRIu64" failed.", - region_id); - return 0; - } - log_info("Cleared statistics region %"PRIu64".", region_id); - return 1; -} - -static int _stats_clear_regions(struct dm_stats *dms, uint64_t region_id) -{ - int allregions = (region_id == DM_STATS_REGIONS_ALL); - - if (!dm_stats_list(dms, NULL)) - return_0; - - if (!dm_stats_get_nr_regions(dms)) - return 1; - - if (!allregions) - return _stats_clear_one_region(dms, region_id); - - dm_stats_foreach_region(dms) { - region_id = dm_stats_get_current_region(dms); - if (!_stats_clear_one_region(dms, region_id)) - return_0; - } - - return 1; -} - -static int _stats_clear(CMD_ARGS) -{ - struct dm_stats *dms; - uint64_t region_id; - char *name = NULL; - int allregions = _switches[ALL_REGIONS_ARG]; - - /* clear does not use a report */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - - if (!_switches[REGION_ID_ARG] && !_switches[ALL_REGIONS_ARG]) { - log_error("Please specify a --regionid or use --allregions."); - return 0; - } - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) - return _process_all(cmd, subcommand, argc, argv, 0, _stats_clear); - name = argv[0]; - } - - region_id = (allregions) ? DM_STATS_REGIONS_ALL - : (uint64_t) _int_args[REGION_ID_ARG]; - - if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) - return_0; - - if (!_bind_stats_device(dms, name)) - goto_out; - - if (!_stats_clear_regions(dms, region_id)) - goto_out; - - dm_stats_destroy(dms); - return 1; - -out: - dm_stats_destroy(dms); - return 0; -} - -static uint64_t _factor_from_units(char *argptr, char *unit_type) -{ - return dm_units_to_factor(argptr, unit_type, 0, NULL); -} - -/** - * Parse a start, length, or area size argument in bytes from a string - * using optional units as supported by _factor_from_units(). - */ -static int _size_from_string(char *argptr, uint64_t *size, const char *name) -{ - uint64_t factor; - char *endptr = NULL, unit_type; - if (!argptr) - return_0; - - *size = strtoull(argptr, &endptr, 10); - if (endptr == argptr) { - *size = 0; - log_error("Invalid %s argument: \"%s\"", - name, (*argptr) ? argptr : ""); - return 0; - } - - if (*endptr == '\0') { - *size *= 512; - return 1; - } - - factor = _factor_from_units(endptr, &unit_type); - if (factor) - *size *= factor; - - return 1; -} - -/* - * FIXME: expose this from libdm-stats - */ -static uint64_t _nr_areas_from_step(uint64_t len, int64_t step) -{ - /* Default is one area. */ - if (!step || !len) - return 1; - - /* --areas */ - if (step < 0) - return (uint64_t)(-step); - - /* --areasize - cast step to unsigned as it cannot be -ve here. */ - return (len / step) + !!(len % (uint64_t) step); -} - -/* maximum length of a string representation of an integer */ -#define max_int_strlen(i) (strlen(#i)) -#define MAX_UINT64_STRLEN max_int_strlen(UINT64_MAX) -static int _stats_group_segments(struct dm_stats *dms, uint64_t *region_ids, - int count, const char *alias) -{ - /* NULL, commas, and count * region_id */ - size_t bufsize = 1 + count + count * MAX_UINT64_STRLEN; - char *this_region, *regions = NULL; - uint64_t group_id; - int r, i; - - this_region = regions = malloc(bufsize); - - if (!regions) { - log_error("Could not allocate memory for region_id table."); - return 0; - } - - for (i = 0; i < count; i++) { - /* - * We don't expect large numbers of segments (compared to e.g. - * --filemap): use a fixed-size buffer based on the number of - * region identifiers and do not collapse continuous ranges - * of identifiers in the group descriptor argument. - */ - r = dm_snprintf(this_region, bufsize, FMTu64 "%s", region_ids[i], - (i < (count - 1)) ? "," : ""); - if (r < 0) - goto_bad; - this_region += r; - bufsize -= r; - } - - /* refresh handle */ - if (!(r = dm_stats_list(dms, NULL))) - goto bad; - - if ((r = dm_stats_create_group(dms, regions, alias, &group_id))) - printf("Grouped regions %s as group ID " FMTu64 "%s%s\n", - regions, group_id, (alias) ? " with alias " : "", - (alias) ? : ""); - else - log_error("Failed to create group for regions %s.", regions); - -bad: - free(regions); - return r; -} - -/* - * Create a single region starting at start and spanning len sectors, - * or, if the segments argument is no-zero create one region for each - * segment present in the mapped device. Passing zero for segments, - * start, and length will create a single segment spanning the whole - * device. - */ -static int _do_stats_create_regions(struct dm_stats *dms, - const char *name, uint64_t start, - uint64_t len, int64_t step, - int segments, - const char *program_id, - const char *user_data) -{ - uint64_t this_start = 0, this_len = len, region_id = UINT64_C(0); - const char *devname = NULL, *histogram = _string_args[BOUNDS_ARG]; - int r = 0, count = 0, precise = _switches[PRECISE_ARG]; - struct dm_histogram *bounds = NULL; /* histogram bounds */ - uint64_t *region_ids = NULL; /* segments */ - char *target_type, *params; /* unused */ - struct dm_task *dmt; - struct dm_info info; - void *next = NULL; - - if (_switches[ALIAS_ARG] && _switches[NOGROUP_ARG]) { - log_error("Cannot set alias with --nogroup."); - dm_stats_destroy(dms); - return 0; - } - - if (histogram && !(bounds = dm_histogram_bounds_from_string(histogram))) - return_0; - - if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) { - dm_histogram_bounds_destroy(bounds); - dm_stats_destroy(dms); - return_0; - } - - if (!_set_task_device(dmt, name, 0)) - goto_out; - - if (!dm_task_no_open_count(dmt)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_task_run(dmt)) - goto_out; - - if (!dm_task_get_info(dmt, &info) || !info.exists) - goto_out; - - if (!(devname = dm_task_get_name(dmt))) - goto_out; - - if (!segments || (info.target_count == 1)) - region_ids = &region_id; - else - region_ids = malloc(info.target_count * sizeof(*region_ids)); - - do { - uint64_t segment_start, segment_len; - next = dm_get_next_target(dmt, next, &segment_start, &segment_len, - &target_type, &params); - - /* Accumulate whole-device size for nr_areas calculation. */ - if (!segments && !len) - this_len += segment_len; - - /* Segments or whole-device. */ - if (segments || !next) { - /* - * this_start and this_len hold the start and length in - * sectors of the to-be-created region: this is either the - * segment start/len (for --segments), the value of the - * --start/--length arguments, or 0/0 for a default - * whole-device region). - */ - this_start = (segments) ? segment_start : start; - this_len = (segments) ? segment_len : this_len; - if (!(r = dm_stats_create_region(dms, &region_ids[count], - this_start, this_len, step, - precise, bounds, - program_id, user_data))) { - log_error("%s: Could not create statistics region.", - devname); - goto out; - } - - printf("%s: Created new region with "FMTu64" area(s) as " - "region ID "FMTu64"\n", devname, - _nr_areas_from_step(this_len, step), - region_ids[count++]); - } - } while (next); - - if (!_switches[NOGROUP_ARG] && segments) - r = _stats_group_segments(dms, region_ids, count, - _string_args[ALIAS_ARG]); - -out: - if (region_ids != &region_id) - free(region_ids); - - dm_task_destroy(dmt); - dm_stats_destroy(dms); - dm_histogram_bounds_destroy(bounds); - return r; -} - -/* - * Returns the full absolute path, or NULL if the path could - * not be resolved. - */ -static char *_get_abspath(const char *path) -{ - char *_path; - -#ifdef HAVE_CANONICALIZE_FILE_NAME - _path = canonicalize_file_name(path); -#else - /* FIXME Provide alternative */ - log_error(INTERNAL_ERROR "Unimplemented _get_abspath."); - _path = NULL; -#endif - return _path; -} - -static int _stats_check_filemap_switches(void) -{ - if (_switches[AREAS_ARG] || _switches[AREA_SIZE_ARG]) { - log_error("--filemap is incompatible with --areas and --area-size."); - return 0; - } - - if (_switches[START_ARG] || _switches[LENGTH_ARG]) { - log_error("--filemap is incompatible with --start and --length."); - return 0; - } - - if (_switches[SEGMENTS_ARG]) { - log_error("--filemap and --segments are incompatible."); - return 0; - } - - if (_switches[USER_DATA_ARG]) { - log_error("--userdata is not yet supported with --filemap."); - return 0; - } - - if (_switches[UUID_ARG] || _switches[MAJOR_ARG]) { - log_error("--uuid and --major are incompatible with --filemap."); - return 0; - } - - if (_switches[ALL_DEVICES_ARG]) { - log_error("--alldevices is incompatible with --filemap."); - return 0; - } - - return 1; -} - -static dm_filemapd_mode_t _stats_get_filemapd_mode(void) -{ - if (_switches[NOMONITOR_ARG] || _switches[NOGROUP_ARG]) - return DM_FILEMAPD_FOLLOW_NONE; - if (!_switches[FOLLOW_ARG]) - return DM_FILEMAPD_FOLLOW_INODE; - return dm_filemapd_mode_from_string(_string_args[FOLLOW_ARG]); -} - -static int _stats_create_file(CMD_ARGS) -{ - const char *alias, *program_id = DM_STATS_PROGRAM_ID; - const char *bounds_str = _string_args[BOUNDS_ARG]; - int foreground = _switches[FOREGROUND_ARG]; - int verbose = _switches[VERBOSE_ARG]; - uint64_t *regions, *region, count = 0; - struct dm_histogram *bounds = NULL; - char *path, *abspath = NULL; - struct dm_stats *dms = NULL; - int group, fd = -1, precise; - dm_filemapd_mode_t mode; - - if (names) { - log_error("Device names are not compatibile with --filemap."); - return 0; - } - - if (!_stats_check_filemap_switches()) - return 0; - - /* _stats_create_file does not use _process_all() */ - if (!argc) { - log_error("--filemap requires a file path argument"); - return 0; - } - - path = argv[0]; - - if (_switches[PRECISE_ARG]) { - if (!dm_stats_driver_supports_precise()) { - log_error("Using --precise requires driver version " - "4.32.0 or later."); - return 0; - } - } - - if (_switches[BOUNDS_ARG]) { - if (!dm_stats_driver_supports_histogram()) { - log_error("Using --bounds requires driver version " - "4.32.0 or later."); - return 0; - } - } - - if (!(abspath = _get_abspath(path))) { - log_error("Could not canonicalize file name: %s", path); - return 0; - } - - if (bounds_str - && !(bounds = dm_histogram_bounds_from_string(bounds_str))) { - free(abspath); - return_0; - } - - if (_switches[PROGRAM_ID_ARG]) - program_id = _string_args[PROGRAM_ID_ARG]; - if (!strlen(program_id) && !_switches[FORCE_ARG]) - program_id = DM_STATS_PROGRAM_ID; - - precise = _int_args[PRECISE_ARG]; - group = !_switches[NOGROUP_ARG]; - - mode = _stats_get_filemapd_mode(); - if (!_switches[NOMONITOR_ARG] && (mode == DM_FILEMAPD_FOLLOW_NONE)) - goto bad; - - if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) - goto_bad; - - fd = open(abspath, O_RDONLY); - - if (fd < 0) { - log_error("Could not open %s for reading", abspath); - goto bad; - } - - if (!dm_stats_bind_from_fd(dms, fd)) - goto_bad; - - if (!strlen(program_id)) - /* force creation of a region with no id */ - dm_stats_set_program_id(dms, 1, NULL); - - if (group && !_switches[ALIAS_ARG]) - alias = dm_basename(abspath); - else if (group) - alias = _string_args[ALIAS_ARG]; - else if (!_switches[ALIAS_ARG]) - alias = NULL; - else { - log_error("Cannot set alias with --nogroup."); - goto bad; - } - - regions = dm_stats_create_regions_from_fd(dms, fd, group, precise, - bounds, alias); - - if (!regions) { - log_error("Could not create regions from file %s.", abspath); - goto bad; - } - - if (!_switches[NOMONITOR_ARG] && group) { - if (!dm_stats_start_filemapd(fd, regions[0], abspath, mode, - foreground, verbose)) - log_warn("Failed to start filemap monitoring daemon."); - } - - if (close(fd)) - log_sys_debug("close", abspath); - - fd = -1; - - for (region = regions; *region != DM_STATS_REGIONS_ALL; region++) - count++; - - if (group) { - printf("%s: Created new group with "FMTu64" region(s) as " - "group ID "FMTu64".\n", path, count, regions[0]); - } else { - region = regions; - do - printf("%s: Created new region with 1 area as " - "region ID "FMTu64".\n", path, *region); - while (*(++region) != DM_STATS_REGIONS_ALL); - } - - free(regions); - free(abspath); - free(bounds); - dm_stats_destroy(dms); - return 1; - -bad: - free(abspath); - free(bounds); - - if ((fd > -1) && close(fd)) - log_sys_debug("close", path); - - if (dms) - dm_stats_destroy(dms); - - return 0; -} - -static int _stats_create(CMD_ARGS) -{ - struct dm_stats *dms; - const char *name, *user_data = "", *program_id = DM_STATS_PROGRAM_ID; - uint64_t start = 0, len = 0, areas = 0, area_size = 0; - int64_t step = 0; - - /* create does not use a report */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - - if (_switches[ALL_REGIONS_ARG]) { - log_error("Cannot use --allregions with create."); - return 0; - } - - if (_switches[ALL_PROGRAMS_ARG]) { - log_error("Cannot use --allprograms with create."); - return 0; - } - - if (_switches[AREAS_ARG] && _switches[AREA_SIZE_ARG]) { - log_error("Please specify one of --areas and --areasize."); - return 0; - } - - if (_switches[PROGRAM_ID_ARG] - && !strlen(_string_args[PROGRAM_ID_ARG]) && !_switches[FORCE_ARG]) { - log_error("Creating a region with no program " - "id requires --force."); - return 0; - } - - if (_switches[FILEMAP_ARG]) - return _stats_create_file(cmd, subcommand, argc, argv, - names, multiple_devices); - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { - if (!_switches[ALL_DEVICES_ARG]) { - log_error("Please specify device(s) or use " - "--alldevices."); - return 0; - } - return _process_all(cmd, subcommand, argc, argv, 0, _stats_create); - } - name = argv[0]; - } - - if (_switches[AREAS_ARG]) - areas = (uint64_t) _int_args[AREAS_ARG]; - - if (_switches[AREA_SIZE_ARG]) - if (!_size_from_string(_string_args[AREA_SIZE_ARG], - &area_size, "areasize")) - return_0; - - areas = (areas) ? areas : 1; - /* bytes to sectors or -(areas): promote to signed before conversion */ - step = (area_size) ? ((int64_t) area_size / 512) : -((int64_t) areas); - - if (_switches[START_ARG]) { - if (!_size_from_string(_string_args[START_ARG], - &start, "start")) - return_0; - } - - /* bytes to sectors */ - start /= 512; - - if (_switches[LENGTH_ARG]) { - if (!_size_from_string(_string_args[LENGTH_ARG], - &len, "length")) - return_0; - } - - /* bytes to sectors */ - len /= 512; - - if (_switches[PROGRAM_ID_ARG]) - program_id = _string_args[PROGRAM_ID_ARG]; - if (!strlen(program_id) && !_switches[FORCE_ARG]) - program_id = DM_STATS_PROGRAM_ID; - - if (_switches[USER_DATA_ARG]) - user_data = _string_args[USER_DATA_ARG]; - - if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) - return_0; - - if (!_bind_stats_device(dms, name)) - goto_bad; - - if (_switches[PRECISE_ARG]) { - if (!dm_stats_driver_supports_precise()) { - log_error("Using --precise requires driver version " - "4.32.0 or later."); - goto bad; - } - } - - if (_switches[BOUNDS_ARG]) { - if (!dm_stats_driver_supports_histogram()) { - log_error("Using --bounds requires driver version " - "4.32.0 or later."); - goto bad; - } - } - - if (!strlen(program_id)) - /* force creation of a region with no id */ - dm_stats_set_program_id(dms, 1, NULL); - - return _do_stats_create_regions(dms, name, start, len, step, - _switches[SEGMENTS_ARG], - program_id, user_data); - -bad: - dm_stats_destroy(dms); - return 0; -} - -static int _stats_delete(CMD_ARGS) -{ - struct dm_stats *dms; - uint64_t region_id, group_id; - char *name = NULL; - const char *program_id = DM_STATS_PROGRAM_ID; - int allregions = _switches[ALL_REGIONS_ARG]; - int r = 0; - - /* delete does not use a report */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - - if (_switches[REGION_ID_ARG] && _switches[GROUP_ID_ARG]) { - log_error("Please use one of --regionid and --groupid."); - return 0; - } - - if (!_switches[REGION_ID_ARG] && !allregions && !_switches[GROUP_ID_ARG]) { - log_error("Please specify a --regionid or --groupid, or use --allregions."); - return 0; - } - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { - if (!_switches[ALL_DEVICES_ARG]) { - log_error("Please specify device(s) or use " - "--alldevices."); - return 0; - } - return _process_all(cmd, subcommand, argc, argv, 0, _stats_delete); - } - name = argv[0]; - } - - if (_switches[PROGRAM_ID_ARG]) - program_id = _string_args[PROGRAM_ID_ARG]; - if (_switches[ALL_PROGRAMS_ARG]) - program_id = DM_STATS_ALL_PROGRAMS; - - region_id = (uint64_t) _int_args[REGION_ID_ARG]; - group_id = (uint64_t) _int_args[GROUP_ID_ARG]; - - if (!(dms = dm_stats_create(program_id))) - return_0; - - if (!_bind_stats_device(dms, name)) - goto_out; - - /* allregions and group delete require a listed handle */ - if ((allregions || _switches[GROUP_ID_ARG]) - && !dm_stats_list(dms, program_id)) - goto_out; - - if (allregions && !dm_stats_get_nr_regions(dms)) { - /* no regions present */ - r = 1; - goto out; - } - - if (_switches[GROUP_ID_ARG]) { - if (!dm_stats_delete_group(dms, group_id, 1)) { - log_error("Could not delete statistics group."); - goto out; - } - printf("Deleted statistics group " FMTu64 ".\n", group_id); - } else if (_switches[ALL_REGIONS_ARG]) { - dm_stats_foreach_region(dms) { - region_id = dm_stats_get_current_region(dms); - if (!dm_stats_delete_region(dms, region_id)) { - log_error("Could not delete statistics region."); - goto out; - } - log_info("Deleted statistics region %" PRIu64, region_id); - } - } else { - if (!dm_stats_delete_region(dms, region_id)) { - log_error("Could not delete statistics region"); - goto out; - } - log_info("Deleted statistics region " FMTu64 ".", region_id); - } - - r = 1; - -out: - dm_stats_destroy(dms); - return r; -} - -static int _stats_print_one_region(struct dm_stats *dms, int clear, - uint64_t region_id) -{ - char *stbuff = NULL; - - /*FIXME: line control for large regions */ - if (!(stbuff = dm_stats_print_region(dms, region_id, 0, 0, clear))) { - log_error("Could not print statistics region."); - return 0; - } - - printf("%s", stbuff); - dm_stats_buffer_destroy(dms, stbuff); - - return 1; -} - -static int _stats_print(CMD_ARGS) -{ - struct dm_stats *dms; - char *name, *stbuff = NULL; - uint64_t region_id; - unsigned clear = (unsigned) _switches[CLEAR_ARG]; - int allregions = _switches[ALL_REGIONS_ARG]; - int r = 0; - - /* print does not use a report */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - - if (!_switches[REGION_ID_ARG] && !allregions) { - log_error("Please specify a --regionid or use --allregions."); - return 0; - } - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) - return _process_all(cmd, subcommand, argc, argv, 0, _stats_print); - name = argv[0]; - } - - if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) - return_0; - - if (!_bind_stats_device(dms, name)) - goto_out; - - if (!dm_stats_list(dms, NULL)) - goto_out; - - if (allregions && !dm_stats_get_nr_regions(dms)) { - r = 1; - goto out; - } - - if (!allregions) { - region_id = (uint64_t) _int_args[REGION_ID_ARG]; - if (!_stats_print_one_region(dms, clear, region_id)) - goto_out; - r = 1; - goto out; - } - - dm_stats_foreach_region(dms) { - region_id = dm_stats_get_current_region(dms); - if (!_stats_print_one_region(dms, clear, region_id)) - goto_out; - - /*FIXME: line control for large regions */ - if (!(stbuff = dm_stats_print_region(dms, region_id, 0, 0, clear))) { - log_error("Could not print statistics region."); - goto out; - } - - printf("%s", stbuff); - dm_stats_buffer_destroy(dms, stbuff); - } - - r = 1; - -out: - dm_stats_destroy(dms); - return r; -} - -static int _stats_report(CMD_ARGS) -{ - int r = 0, objtype_args; - - struct dm_task *dmt; - char *name = NULL; - - objtype_args = (_switches[AREA_ARG] - || _switches[REGION_ARG] - || _switches[GROUP_ARG]); - - if (_switches[PROGRAM_ID_ARG]) - _program_id = _string_args[PROGRAM_ID_ARG]; - - if (_switches[ALL_PROGRAMS_ARG]) - _program_id = ""; - - if (_switches[VERBOSE_ARG] && !strcmp(subcommand, "list")) - _statstype |= (DM_STATS_WALK_ALL - | DM_STATS_WALK_SKIP_SINGLE_AREA); - - /* suppress duplicates unless the user has requested all regions */ - if (!strcmp(subcommand, "report") && !objtype_args) - /* suppress duplicate rows of output */ - _statstype |= (DM_STATS_WALK_ALL - | DM_STATS_WALK_SKIP_SINGLE_AREA); - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) - return _process_all(cmd, subcommand, argc, argv, 0, _info); - name = argv[0]; - } - - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) - return_0; - - if (!_set_task_device(dmt, name, 0)) - goto_out; - - if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) - goto_out; - - if (!_task_run(dmt)) - goto_out; - - r = _display_info(dmt); - -out: - dm_task_destroy(dmt); - - if (!r && _report) { - dm_report_free(_report); - _report = NULL; - } - - return r; -} - -static int _stats_group(CMD_ARGS) -{ - char *name, *alias = NULL, *regions = NULL; - struct dm_stats *dms; - uint64_t group_id; - int r = 0; - - /* group does not use a report */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - - if (!_switches[REGIONS_ARG]) { - log_error("Group requires --regions."); - return 0; - } - - regions = _string_args[REGIONS_ARG]; - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { - if (!_switches[ALL_DEVICES_ARG]) { - log_error("Please specify device(s) or use " - "--alldevices."); - return 0; - } - return _process_all(cmd, subcommand, argc, argv, 0, _stats_group); - } - name = argv[0]; - } - - if (_switches[ALIAS_ARG]) - alias = _string_args[ALIAS_ARG]; - - if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) - return_0; - - if (!_bind_stats_device(dms, name)) - goto_out; - - if (!dm_stats_list(dms, NULL)) - goto_out; - - if(!dm_stats_create_group(dms, regions, alias, &group_id)) { - log_error("Could not create group on %s: %s", name, regions); - goto out; - } - - printf("Grouped regions %s as group ID " FMTu64 " on %s\n", - regions, group_id, name); - - r = 1; - -out: - dm_stats_destroy(dms); - return r; -} - -static int _stats_ungroup(CMD_ARGS) -{ - struct dm_stats *dms; - uint64_t group_id; - char *name; - int r = 0; - - /* ungroup does not use a report */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - - if (!_switches[GROUP_ID_ARG]) { - log_error("Please specify group id."); - return 0; - } - - group_id = (uint64_t) _int_args[GROUP_ID_ARG]; - - if (names) - name = names->name; - else { - if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { - if (!_switches[ALL_DEVICES_ARG]) { - log_error("Please specify device(s) or use " - "--alldevices."); - return 0; - } - return _process_all(cmd, subcommand, argc, argv, 0, _stats_ungroup); - } - name = argv[0]; - } - - if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) - return_0; - - if (!_bind_stats_device(dms, name)) - goto_out; - - if (!dm_stats_list(dms, NULL)) - goto_out; - - if (!(r = dm_stats_delete_group(dms, group_id, 0))) - log_error("Could not delete group " FMTu64 " on %s.", - group_id, name); - - printf("Removed group ID "FMTu64" on %s\n", group_id, name); - -out: - dm_stats_destroy(dms); - return r; -} - -static int _stats_update_file(CMD_ARGS) -{ - uint64_t group_id, *region, *regions = NULL, count = 0; - const char *program_id = DM_STATS_PROGRAM_ID; - int foreground = _switches[FOREGROUND_ARG]; - int verbose = _switches[VERBOSE_ARG]; - char *path, *abspath = NULL; - struct dm_stats *dms = NULL; - dm_filemapd_mode_t mode; - int fd = -1; - - - if (names) { - log_error("Device names are not compatibile with update_filemap."); - return 0; - } - - if (!_stats_check_filemap_switches()) - return 0; - - /* _stats_update_file does not use _process_all() */ - if (!argc) { - log_error("update_filemap requires a file path argument"); - return 0; - } - - if (!_switches[GROUP_ID_ARG]) { - log_error("--groupid is required to update a filemap group."); - return 0; - } - - path = argv[0]; - - if (!(abspath = _get_abspath(path))) { - log_error("Could not canonicalize file name: %s", path); - return 0; - } - - group_id = (uint64_t) _int_args[GROUP_ID_ARG]; - - mode = _stats_get_filemapd_mode(); - if (!_switches[NOMONITOR_ARG] && (mode == DM_FILEMAPD_FOLLOW_NONE)) - goto bad; - - if (_switches[PROGRAM_ID_ARG]) - program_id = _string_args[PROGRAM_ID_ARG]; - if (!strlen(program_id) && !_switches[FORCE_ARG]) - program_id = DM_STATS_PROGRAM_ID; - - if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) - goto_bad; - - fd = open(abspath, O_RDONLY); - - if (fd < 0) { - log_error("Could not open %s for reading", abspath); - goto bad; - } - - if (!dm_stats_bind_from_fd(dms, fd)) - goto_bad; - - if (!strlen(program_id)) - /* force creation of a region with no id */ - dm_stats_set_program_id(dms, 1, NULL); - - /* - * Start dmfilemapd - it will test the file descriptor to determine - * whether it is necessary to call dm_stats_update_regions_from_fd(). - * - * If starting the daemon fails, fall back to a direct update. - */ - if (!_switches[NOMONITOR_ARG]) { - if (dm_stats_start_filemapd(fd, group_id, abspath, mode, - foreground, verbose)) - goto out; - - log_warn("Failed to start filemap monitoring daemon."); - - /* fall back to one-shot update */ - } - - /* - * --nomonitor and fall back case - perform a one-shot update directly - * from dmsetup. - */ - regions = dm_stats_update_regions_from_fd(dms, fd, group_id); - - if (!regions) { - log_error("Could not update regions from file %s", abspath); - goto bad; - } - - for (region = regions; *region != DM_STATS_REGIONS_ALL; region++) - count++; - - if (group_id != regions[0]) { - printf("Group ID changed from " FMTu64 " to " FMTu64, - group_id, regions[0]); - group_id = regions[0]; - } - - printf("%s: Updated group ID " FMTu64 " with "FMTu64" region(s).\n", - path, group_id, count); - -out: - if (close(fd)) - log_sys_debug("close", abspath); - - free(regions); - free(abspath); - dm_stats_destroy(dms); - return 1; - -bad: - free(abspath); - - if ((fd > -1) && close(fd)) - log_sys_debug("close", path); - - dm_stats_destroy(dms); - - return 0; -} - -/* - * Command dispatch tables and usage. - */ -static int _stats_help(CMD_ARGS); - -/* - * dmsetup stats <cmd> [options] [device_name] - * dmstats <cmd> [options] [device_name] - * - * clear [--allregions|--regionid id] [--alldevices|<device>...] - * create [--start <start> [--length <len>] - * [--areas <nr_areas>] [--areasize <size>] - * [--programid <id>] [--userdata <data> ] - * [--bounds histogram_boundaries] [--precise] - * [--alldevices|<device>...] - * create --filemap [--nogroup] [--nomonitor] [--follow=mode] - * [--programid <id>] [--userdata <data> ] - * [--bounds histogram_boundaries] [--precise] [<file_path>] - * delete [--allprograms|--programid id] - * [--allregions|--regionid id] - * [--alldevices|<device>...] - * group [--alias NAME] --regions <regions> - * [--allprograms|--programid id] [--alldevices|<device>...] - * list [--allprograms|--programid id] [--allregions|--regionid id] - * print [--clear] [--allprograms|--programid id] - * [--allregions|--regionid id] - * [--alldevices|<device>...] - * report [--interval <seconds>] [--count <cnt>] - * [--units <u>] [--programid <id>] [--regionid <id>] - * [-o <fields>] [-O|--sort <sort_fields>] - * [-S|--select <selection>] [--nameprefixes] - * [--noheadings] [--separator <separator>] - * [--allprograms|--programid id] [<device>...] - * ungroup --groupid <id> [--allprograms|--programid id] - * [--alldevices|<device>...] - */ - -#define INDENT "\n\t " -/* groups of commonly used options */ -#define AREA_OPTS "[--areas <nr_areas>] [--areasize <size>] " -#define REGION_OPTS "[--start <start> [--length <len>]" INDENT AREA_OPTS -#define ID_OPTS "[--programid <id>] [--userdata <data> ] " -#define SELECT_OPTS "[--programid <id>] [--regionid <id>] " -#define HIST_OPTS "[--bounds histogram_boundaries] " -#define PRECISE_OPTS "[--precise] " -#define SEGMENTS_OPT "[--segments] " -#define EXTRA_OPTS HIST_OPTS PRECISE_OPTS -#define FILE_MONITOR_OPTS "[--nomonitor] [--follow mode]" -#define GROUP_ID_OPT "--groupid <id> " -#define ALL_PROGS_OPT "[--allprograms|--programid id] " -#define ALL_REGIONS_OPT "[--allregions|--regionid id] " -#define ALL_DEVICES_OPT "[--alldevices|<device>...] " -#define ALL_PROGS_REGIONS_DEVICES ALL_PROGS_OPT INDENT ALL_REGIONS_OPT INDENT ALL_DEVICES_OPT -#define FIELD_OPTS "[-o <fields>] [-O|--sort <sort_fields>]" -#define DM_REPORT_OPTS FIELD_OPTS INDENT "[-S|--select <selection>] [--nameprefixes]" INDENT \ -"[--noheadings] [--separator <separator>]" - -/* command options */ -#define CREATE_OPTS REGION_OPTS INDENT ID_OPTS INDENT EXTRA_OPTS INDENT SEGMENTS_OPT -#define FILEMAP_OPTS "--filemap [--nogroup] " FILE_MONITOR_OPTS INDENT ID_OPTS INDENT EXTRA_OPTS -#define PRINT_OPTS "[--clear] " ALL_PROGS_REGIONS_DEVICES -#define REPORT_OPTS "[--interval <seconds>] [--count <cnt>]" INDENT \ -"[--units <u>] " SELECT_OPTS INDENT DM_REPORT_OPTS INDENT ALL_PROGS_OPT -#define GROUP_OPTS "[--alias NAME] --regions <regions>" INDENT ALL_PROGS_OPT ALL_DEVICES_OPT -#define UNGROUP_OPTS GROUP_ID_OPT ALL_PROGS_OPT INDENT ALL_DEVICES_OPT -#define UPDATE_OPTS GROUP_ID_OPT INDENT FILE_MONITOR_OPTS " <file_path>" - -/* - * The 'create' command has two entries in the table, to allow for the - * the fact that 'create' and 'create --filemap' have largely disjoint - * sets of options. - */ -static struct command _stats_subcommands[] = { - {"help", "", 0, 0, 0, 0, _stats_help}, - {"clear", ALL_REGIONS_OPT ALL_DEVICES_OPT, 0, -1, 1, 0, _stats_clear}, - {"create", CREATE_OPTS ALL_DEVICES_OPT, 0, -1, 1, 0, _stats_create}, - {"create", FILEMAP_OPTS "<file_path>", 0, -1, 1, 0, _stats_create}, - {"delete", ALL_PROGS_REGIONS_DEVICES, 1, -1, 1, 0, _stats_delete}, - {"group", GROUP_OPTS, 1, -1, 1, 0, _stats_group}, - {"list", ALL_PROGS_OPT ALL_REGIONS_OPT, 0, -1, 1, 0, _stats_report}, - {"print", PRINT_OPTS, 0, -1, 1, 0, _stats_print}, - {"report", REPORT_OPTS "[<device>...]", 0, -1, 1, 0, _stats_report}, - {"ungroup", UNGROUP_OPTS, 1, -1, 1, 0, _stats_ungroup}, - {"update_filemap", UPDATE_OPTS, 1, 1, 0, 0, _stats_update_file}, - {"version", "", 0, -1, 1, 0, _version}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - -#undef AREA_OPTS -#undef REGION_OPTS -#undef ID_OPTS -#undef SELECT_OPTS -#undef HIST_OPTS -#undef PRECISE_OPTS -#undef EXTRA_OPTS -#undef ALL_PROGS_OPT -#undef ALL_REGIONS_OPT -#undef ALL_DEVICES_OPT -#undef ALL_PROGS_REGIONS_DEVICES -#undef FIELD_OPTS -#undef DM_REPORT_OPTS -#undef CREATE_OPTS -#undef FILEMAP_OPTS -#undef PRINT_OPTS -#undef REPORT_OPTS -#undef GROUP_OPTS -#undef UNGROUP_OPTS - -static int _dmsetup_help(CMD_ARGS); - -static struct command _dmsetup_commands[] = { - {"help", "[-c|-C|--columns]", 0, 0, 0, 0, _dmsetup_help}, - {"create", "<dev_name>\n" - "\t [-j|--major <major> -m|--minor <minor>]\n" - "\t [-U|--uid <uid>] [-G|--gid <gid>] [-M|--mode <octal_mode>]\n" - "\t [-u|--uuid <uuid>] [--addnodeonresume|--addnodeoncreate]\n" - "\t [--readahead {[+]<sectors>|auto|none}]\n" - "\t [-n|--notable|--table {<table>|<table_file>}]\n" - "\tcreate --concise [<concise_device_spec_list>]", 0, 2, 0, 0, _create}, - {"remove", "[--deferred] [-f|--force] [--retry] <device>...", 0, -1, 2, 0, _remove}, - {"remove_all", "[-f|--force]", 0, 0, 0, 0, _remove_all}, - {"suspend", "[--noflush] [--nolockfs] <device>...", 0, -1, 2, 0, _suspend}, - {"resume", "[--noflush] [--nolockfs] <device>...\n" - "\t [--addnodeonresume|--addnodeoncreate]\n" - "\t [--readahead {[+]<sectors>|auto|none}]", 0, -1, 2, 0, _resume}, - {"load", "<device> [<table>|<table_file>]", 0, 2, 0, 0, _load}, - {"clear", "<device>", 0, -1, 2, 0, _clear}, - {"reload", "<device> [<table>|<table_file>]", 0, 2, 0, 0, _load}, - {"wipe_table", "[-f|--force] [--noflush] [--nolockfs] <device>...", 0, -1, 2, 0, _error_device}, - {"rename", "<device> [--setuuid] <new_name_or_uuid>", 1, 2, 0, 0, _rename}, - {"message", "<device> <sector> <message>", 2, -1, 0, 0, _message}, - {"ls", "[--target <target_type>] [--exec <command>] [-o <options>] [--tree]", 0, 0, 0, 0, _ls}, - {"info", "[<device>...]", 0, -1, 1, 0, _info}, - {"deps", "[-o <options>] [<device>...]", 0, -1, 2, 0, _deps}, - {"stats", "<command> [<options>] [<device>...]", 1, -1, 1, 1, _stats}, - {"status", "[<device>...] [--noflush] [--target <target_type>]", 0, -1, 2, 0, _status}, - {"table", "[<device>...] [--concise] [--target <target_type>] [--showkeys]", 0, -1, 2, 0, _status}, - {"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait}, - {"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes}, - {"mangle", "[<device>...]", 0, -1, 1, 0, _mangle}, - {"udevcreatecookie", "", 0, 0, 0, 0, _udevcreatecookie}, - {"udevreleasecookie", "[<cookie>]", 0, 1, 0, 0, _udevreleasecookie}, - {"udevflags", "<cookie>", 1, 1, 0, 0, _udevflags}, - {"udevcomplete", "<cookie>", 1, 1, 0, 0, _udevcomplete}, - {"udevcomplete_all", "[<age_in_minutes>]", 0, 1, 0, 0, _udevcomplete_all}, - {"udevcookies", "", 0, 0, 0, 0, _udevcookies}, - {"targets", "", 0, 0, 0, 0, _targets}, - {"version", "", 0, 0, 0, 0, _version}, - {"setgeometry", "<device> <cyl> <head> <sect> <start>", 5, 5, 0, 0, _setgeometry}, - {"splitname", "<device> [<subsystem>]", 1, 2, 0, 0, _splitname}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - -/* - * Usage and help text. - */ - -static void _devmap_name_usage(FILE *out) -{ - fprintf(out, "Usage: " DEVMAP_NAME_CMD_NAME " <major> <minor>\n\n"); -} - -static void _stats_usage(FILE *out) -{ - int i; - - fprintf(out, "Usage:\n\n" - "%s\n" - " [-h|--help]\n" - " [-v|--verbose [-v|--verbose ...]]\n" - " [--areas <nr_areas>] [--areasize <size>]\n" - " [--userdata <data>] [--clear]\n" - " [--count <count>] [--interval <seconds>]\n" - " [-o <fields>] [-O|--sort <sort_fields>]\n" - " [--programid <id>]\n" - " [--start <start>] [--length <length>]\n" - " [--segments] [--units <units>]\n\n", - _base_commands[_base_command].name); - - for (i = 0; _stats_subcommands[i].name; i++) - fprintf(out, "\t%s %s\n", _stats_subcommands[i].name, _stats_subcommands[i].help); - - fprintf(out, "\n<device> may be device name or (if only one) -u <uuid> or -j <major> -m <minor>\n" - "<fields> are comma-separated. Use 'help -c' for list.\n\n"); -} - -static void _dmsetup_usage(FILE *out) -{ - int i; - - fprintf(out, "Usage:\n\n" - "%s\n" - " [--version] [-h|--help [-c|-C|--columns]]\n" - " [-v|--verbose [-v|--verbose ...]] [-f|--force]\n" - " [--checks] [--manglename {none|hex|auto}]\n" - " [-r|--readonly] [--noopencount] [--noflush] [--nolockfs] [--inactive]\n" - " [--udevcookie <cookie>] [--noudevrules] [--noudevsync] [--verifyudev]\n" - " [-y|--yes] [--readahead {[+]<sectors>|auto|none}] [--retry]\n" - " [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n" - " [-S|--select <selection>] [--nameprefixes] [--noheadings]\n" - " [--separator <separator>]\n\n", - _base_commands[_base_command].name); - - for (i = 0; _dmsetup_commands[i].name; i++) - fprintf(out, "\t%s %s\n", _dmsetup_commands[i].name, _dmsetup_commands[i].help); - - fprintf(out, "\n<device> may be device name or (if only one) -u <uuid> or " - "-j <major> -m <minor>\n" - "<mangling_mode> is one of 'none', 'auto' and 'hex'.\n" - "<fields> are comma-separated. Use 'help -c' for list.\n" - "<concise_device_specification> has single-device entries separated by semi-colons:\n" - " <name>,<uuid>,<minor>,<flags>,<table>\n" - " where <flags> is 'ro' or 'rw' (the default) and any of <uuid>, <minor>\n" - " and <flags> may be empty. Separate extra table lines with commas.\n" - " E.g.: dev1,,,,0 100 linear 253:1 0,100 100 error;dev2,,,ro,0 1 error\n" - "Table_file contents may be supplied on stdin.\n" - "Options are: devno, devname, blkdevname.\n" - "Tree specific options are: ascii, utf, vt100; compact, inverted, notrunc;\n" - " blkdevname, [no]device, active, open, rw and uuid.\n\n"); -} - -static void _losetup_usage(FILE *out) -{ - fprintf(out, - "Usage:\n\n" - "%s [-d|-a] [-e encryption] " - "[-o offset] [-f|loop_device] [file]\n\n", - _base_commands[_base_command].name); -} - -static void _usage(FILE *out) -{ - switch (_base_commands[_base_command].type) { - case DMSETUP_TYPE: - return _dmsetup_usage(out); - case LOSETUP_TYPE: - return _losetup_usage(out); - case STATS_TYPE: - return _stats_usage(out); - case DEVMAP_NAME_TYPE: - return _devmap_name_usage(out); - } -} - -static int _stats_help(CMD_ARGS) -{ - _usage(stderr); - - if (_switches[COLS_ARG] || (argc && !strcmp(argv[0], "report"))) { - _switches[OPTIONS_ARG] = 1; - _string_args[OPTIONS_ARG] = (char *) "help"; - _switches[SORT_ARG] = 0; - - if (_report) { - dm_report_free(_report); - _report = NULL; - } - - (void) _report_init(cmd, "help"); - if (_report) { - dm_report_free(_report); - _report = NULL; - } - } - - return 1; -} - -static int _dmsetup_help(CMD_ARGS) -{ - _usage(stderr); - - if (_switches[COLS_ARG]) { - _switches[OPTIONS_ARG] = 1; - _string_args[OPTIONS_ARG] = (char *) "help"; - _switches[SORT_ARG] = 0; - - if (_report) { - dm_report_free(_report); - _report = NULL; - } - (void) _report_init(cmd, ""); - if (_report) { - dm_report_free(_report); - _report = NULL; - } - } - - return 1; -} - -static const struct command *_find_command(const struct command *commands, - const char *name) -{ - int i; - - for (i = 0; commands[i].name; i++) - if (!strcmp(commands[i].name, name)) - return commands + i; - - return NULL; -} - -static const struct command *_find_dmsetup_command(const char *name) -{ - return _find_command(_dmsetup_commands, name); -} - -static const struct command *_find_stats_subcommand(const char *name) -{ - return _find_command(_stats_subcommands, name); -} - -static int _stats(CMD_ARGS) -{ - const struct command *stats_cmd; - - if (_switches[AREA_ARG] || _switches[REGION_ARG] || _switches[GROUP_ARG]) - _statstype = 0; /* switches will OR flags in */ - else - _statstype = DM_STATS_WALK_REGION | DM_STATS_WALK_GROUP; - - if (_switches[AREA_ARG]) - _statstype |= DM_STATS_WALK_AREA; - if (_switches[REGION_ARG]) - _statstype |= DM_STATS_WALK_REGION; - if (_switches[GROUP_ARG]) - _statstype |= DM_STATS_WALK_GROUP; - - if (!(stats_cmd = _find_stats_subcommand(subcommand))) { - log_error("Unknown stats command."); - _stats_help(stats_cmd, NULL, argc, argv, NULL, multiple_devices); - return 0; - } - - if (_switches[ALL_PROGRAMS_ARG] && _switches[PROGRAM_ID_ARG]) { - log_error("Please supply one of --allprograms and --programid"); - return 0; - } - - if (_switches[ALL_REGIONS_ARG] && _switches[REGION_ID_ARG]) { - log_error("Please supply one of --allregions and --regionid"); - return 0; - } - - if (_switches[FOLLOW_ARG] && _switches[NOMONITOR_ARG]) { - log_error("Use of --follow is incompatible with --nomonitor."); - return 0; - } - - /* - * Pass the sub-command through to allow a single function to be - * used to implement several distinct sub-commands (e.g. 'report' - * and 'list' share a single implementation. - */ - if (!stats_cmd->fn(stats_cmd, subcommand, argc, argv, NULL, - multiple_devices)) - return_0; - - return 1; -} - -static int _process_tree_options(const char *options) -{ - const char *s, *end; - struct winsize winsz; - size_t len; - - /* Symbol set default */ - if (!strcmp(nl_langinfo(CODESET), "UTF-8")) - _tsym = &_tsym_utf; - else - _tsym = &_tsym_ascii; - - /* Default */ - _tree_switches[TR_DEVICE] = 1; - _tree_switches[TR_TRUNCATE] = 1; - - /* parse */ - for (s = options; s && *s; s++) { - len = 0; - for (end = s; *end && *end != ','; end++, len++) - ; - if (!strncmp(s, "device", len)) - _tree_switches[TR_DEVICE] = 1; - else if (!strncmp(s, "blkdevname", len)) - _tree_switches[TR_BLKDEVNAME] = 1; - else if (!strncmp(s, "nodevice", len)) - _tree_switches[TR_DEVICE] = 0; - else if (!strncmp(s, "status", len)) - _tree_switches[TR_STATUS] = 1; - else if (!strncmp(s, "table", len)) - _tree_switches[TR_TABLE] = 1; - else if (!strncmp(s, "active", len)) - _tree_switches[TR_ACTIVE] = 1; - else if (!strncmp(s, "open", len)) - _tree_switches[TR_OPENCOUNT] = 1; - else if (!strncmp(s, "uuid", len)) - _tree_switches[TR_UUID] = 1; - else if (!strncmp(s, "rw", len)) - _tree_switches[TR_RW] = 1; - else if (!strncmp(s, "utf", len)) - _tsym = &_tsym_utf; - else if (!strncmp(s, "vt100", len)) - _tsym = &_tsym_vt100; - else if (!strncmp(s, "ascii", len)) - _tsym = &_tsym_ascii; - else if (!strncmp(s, "inverted", len)) - _tree_switches[TR_BOTTOMUP] = 1; - else if (!strncmp(s, "compact", len)) - _tree_switches[TR_COMPACT] = 1; - else if (!strncmp(s, "notrunc", len)) - _tree_switches[TR_TRUNCATE] = 0; - else { - log_error("Tree options not recognised: %s.", s); - return 0; - } - if (!*end) - break; - s = end; - } - - /* Truncation doesn't work well with vt100 drawing char */ - if (_tsym != &_tsym_vt100) - if (ioctl(1, (unsigned long) TIOCGWINSZ, &winsz) >= 0 && winsz.ws_col > 3) - _termwidth = winsz.ws_col - 3; - - return 1; -} - -static char *_parse_loop_device_name(const char *dev, const char *dev_dir) -{ - char *buf; - char *device = NULL; - - if (!(buf = malloc(PATH_MAX))) - return_NULL; - - if (dev[0] == '/') { - if (!(device = _get_abspath(dev))) - goto_bad; - - if (strncmp(device, dev_dir, strlen(dev_dir))) - goto_bad; - - /* If dev_dir does not end in a slash, ensure that the - following byte in the device string is "/". */ - if (dev_dir[strlen(dev_dir) - 1] != '/' && - device[strlen(dev_dir)] != '/') - goto_bad; - - if (!dm_strncpy(buf, strrchr(device, '/') + 1, PATH_MAX)) - goto_bad; - free(device); - } else { - /* check for device number */ - if (strncmp(dev, "loop", sizeof("loop") - 1)) - goto_bad; - - if (!dm_strncpy(buf, dev, PATH_MAX)) - goto_bad; - } - - return buf; -bad: - free(device); - free(buf); - - return NULL; -} - -/* - * create a table for a mapped device using the loop target. - */ -static int _loop_table(char *table, size_t tlen, char *file, - char *dev __attribute__((unused)), off_t off) -{ - struct stat fbuf; - off_t size, sectors; - int fd = -1; -#ifdef HAVE_SYS_STATVFS_H - struct statvfs fsbuf; - off_t blksize; -#endif - - if (!_switches[READ_ONLY]) - fd = open(file, O_RDWR); - - if (fd < 0) { - _switches[READ_ONLY]++; - fd = open(file, O_RDONLY); - } - - if (fd < 0) - goto_bad; - - if (fstat(fd, &fbuf)) - goto_bad; - - size = (fbuf.st_size - off); - sectors = size >> SECTOR_SHIFT; - - if (_switches[VERBOSE_ARG]) - log_error(LOSETUP_CMD_NAME ": set loop size to %llukB (%llu sectors).", - (long long unsigned) sectors >> 1, - (long long unsigned) sectors); - -#ifdef HAVE_SYS_STATVFS_H - if (fstatvfs(fd, &fsbuf)) - goto_bad; - - /* FIXME Fragment size currently unused */ - blksize = fsbuf.f_frsize; -#endif - - if (close(fd)) - log_sys_debug("close", file); - - if (dm_snprintf(table, tlen, "%llu %llu loop %s %llu\n", 0ULL, - (long long unsigned)sectors, file, (long long unsigned)off) < 0) - return_0; - - if (_switches[VERBOSE_ARG] > 1) - log_verbose("Table: %s", table); - - return 1; - -bad: - if (fd > -1 && close(fd)) - log_sys_error("close", file); - - return 0; -} - -static int _process_losetup_switches(const char *base, int *argcp, char ***argvp, - const char *dev_dir) -{ - int c; - int encrypt_loop = 0, delete = 0, find = 0, show_all = 0; - char *device_name = NULL; - char *loop_file = NULL; - off_t offset = 0; - -#ifdef HAVE_GETOPTLONG - static struct option long_options[] = { - {0, 0, 0, 0} - }; -#endif - - optarg = 0; - optind = OPTIND_INIT; - while ((c = GETOPTLONG_FN(*argcp, *argvp, "ade:fo:v", - long_options, NULL)) != -1 ) { - if (c == ':' || c == '?') - return_0; - if (c == 'a') - show_all++; - if (c == 'd') - delete++; - if (c == 'e') - encrypt_loop++; - if (c == 'f') - find++; - if (c == 'o') - offset = atoi(optarg); - if (c == 'v') - _switches[VERBOSE_ARG]++; - } - - *argvp += optind ; - *argcp -= optind ; - - if (encrypt_loop){ - log_error("%s: Sorry, cryptoloop is not yet implemented " - "in this version.", base); - return 0; - } - - if (show_all) { - log_error("%s: Sorry, show all is not yet implemented " - "in this version.", base); - return 0; - } - - if (find) { - log_error("%s: Sorry, find is not yet implemented " - "in this version.", base); - if (!*argcp) - return 0; - } - - if (!*argcp) { - log_error("%s: Please specify loop_device.", base); - _usage(stderr); - return 0; - } - - if (!(device_name = _parse_loop_device_name((*argvp)[0], dev_dir))) { - log_error("%s: Could not parse loop_device %s", base, (*argvp)[0]); - _usage(stderr); - return 0; - } - - if (delete) { - *argcp = 1; - - (*argvp)[0] = device_name; - _command = "remove"; - - return 1; - } - - if (*argcp != 2) { - log_error("%s: Too few arguments.", base); - _usage(stderr); - free(device_name); - return 0; - } - - /* FIXME move these to make them available to native dmsetup */ - if (!(loop_file = _get_abspath((*argvp)[(find) ? 0 : 1]))) { - log_error("%s: Could not parse loop file name %s.", - base, (*argvp)[1]); - _usage(stderr); - free(device_name); - return 0; - } - - _table = malloc(LOOP_TABLE_SIZE); - if (!_table || - !_loop_table(_table, (size_t) LOOP_TABLE_SIZE, loop_file, device_name, offset)) { - log_error("Could not build device-mapper table for %s.", (*argvp)[0]); - free(device_name); - return 0; - } - _switches[TABLE_ARG]++; - - _command = "create"; - (*argvp)[0] = device_name ; - *argcp = 1; - - return 1; -} - -static int _process_options(const char *options) -{ - const char *s, *end; - size_t len; - - /* Tree options are processed separately. */ - if (_switches[TREE_ARG]) - return _process_tree_options(_string_args[OPTIONS_ARG]); - - /* Column options are processed separately by _report_init (called later). */ - if (_switches[COLS_ARG]) - return 1; - - /* No options specified. */ - if (!_switches[OPTIONS_ARG]) - return 1; - - /* Set defaults. */ - _dev_name_type = DN_DEVNO; - - /* Parse. */ - for (s = options; s && *s; s++) { - len = 0; - for (end = s; *end && *end != ','; end++, len++) - ; - if (!strncmp(s, "devno", len)) - _dev_name_type = DN_DEVNO; - else if (!strncmp(s, "blkdevname", len)) - _dev_name_type = DN_BLK; - else if (!strncmp(s, "devname", len)) - _dev_name_type = DN_MAP; - else { - log_error("Option not recognised: %s.", s); - return 0; - } - - if (!*end) - break; - s = end; - } - - return 1; -} - -static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) -{ - const char *base; - char *namebase, *s; - static int ind; - int c, r, i; - -#ifdef HAVE_GETOPTLONG - static struct option long_options[] = { - {"readonly", 0, &ind, READ_ONLY}, - {"alias", 1, &ind, ALIAS_ARG}, - {"alldevices", 0, &ind, ALL_DEVICES_ARG}, - {"allprograms", 0, &ind, ALL_PROGRAMS_ARG}, - {"allregions", 0, &ind, ALL_REGIONS_ARG}, - {"area", 0, &ind, AREA_ARG}, - {"areas", 1, &ind, AREAS_ARG}, - {"areasize", 1, &ind, AREA_SIZE_ARG}, - {"bounds", 1, &ind, BOUNDS_ARG}, - {"checks", 0, &ind, CHECKS_ARG}, - {"clear", 0, &ind, CLEAR_ARG}, - {"columns", 0, &ind, COLS_ARG}, - {"concise", 0, &ind, CONCISE_ARG}, - {"count", 1, &ind, COUNT_ARG}, - {"deferred", 0, &ind, DEFERRED_ARG}, - {"select", 1, &ind, SELECT_ARG}, - {"exec", 1, &ind, EXEC_ARG}, - {"filemap", 0, &ind, FILEMAP_ARG}, - {"follow", 1, &ind, FOLLOW_ARG}, - {"force", 0, &ind, FORCE_ARG}, - {"foreground", 0, &ind, FOREGROUND_ARG}, - {"gid", 1, &ind, GID_ARG}, - {"group", 0, &ind, GROUP_ARG}, - {"groupid", 1, &ind, GROUP_ID_ARG}, - {"help", 0, &ind, HELP_ARG}, - {"histogram", 0, &ind, HISTOGRAM_ARG}, - {"inactive", 0, &ind, INACTIVE_ARG}, - {"interval", 1, &ind, INTERVAL_ARG}, - {"length", 1, &ind, LENGTH_ARG}, - {"manglename", 1, &ind, MANGLENAME_ARG}, - {"major", 1, &ind, MAJOR_ARG}, - {"minor", 1, &ind, MINOR_ARG}, - {"mode", 1, &ind, MODE_ARG}, - {"nameprefixes", 0, &ind, NAMEPREFIXES_ARG}, - {"nogroup", 0, &ind, NOGROUP_ARG}, - {"noflush", 0, &ind, NOFLUSH_ARG}, - {"noheadings", 0, &ind, NOHEADINGS_ARG}, - {"nolockfs", 0, &ind, NOLOCKFS_ARG}, - {"noopencount", 0, &ind, NOOPENCOUNT_ARG}, - {"nosuffix", 0, &ind, NOSUFFIX_ARG}, - {"notable", 0, &ind, NOTABLE_ARG}, - {"notimesuffix", 0, &ind, NOTIMESUFFIX_ARG}, - {"udevcookie", 1, &ind, UDEVCOOKIE_ARG}, - {"nomonitor", 0, &ind, NOMONITOR_ARG}, - {"noudevrules", 0, &ind, NOUDEVRULES_ARG}, - {"noudevsync", 0, &ind, NOUDEVSYNC_ARG}, - {"options", 1, &ind, OPTIONS_ARG}, - {"precise", 0, &ind, PRECISE_ARG}, - {"programid", 1, &ind, PROGRAM_ID_ARG}, - {"raw", 0, &ind, RAW_ARG}, - {"readahead", 1, &ind, READAHEAD_ARG}, - {"region", 0, &ind, REGION_ARG}, - {"regions", 1, &ind, REGIONS_ARG}, - {"regionid", 1, &ind, REGION_ID_ARG}, - {"relative", 0, &ind, RELATIVE_ARG}, - {"retry", 0, &ind, RETRY_ARG}, - {"rows", 0, &ind, ROWS_ARG}, - {"segments", 0, &ind, SEGMENTS_ARG}, - {"separator", 1, &ind, SEPARATOR_ARG}, - {"setuuid", 0, &ind, SETUUID_ARG}, - {"showkeys", 0, &ind, SHOWKEYS_ARG}, - {"sort", 1, &ind, SORT_ARG}, - {"start", 1, &ind, START_ARG}, - {"table", 1, &ind, TABLE_ARG}, - {"target", 1, &ind, TARGET_ARG}, - {"tree", 0, &ind, TREE_ARG}, - {"uid", 1, &ind, UID_ARG}, - {"units", 1, &ind, UNITS_ARG}, - {"uuid", 1, &ind, UUID_ARG}, - {"unbuffered", 0, &ind, UNBUFFERED_ARG}, - {"unquoted", 0, &ind, UNQUOTED_ARG}, - {"userdata", 1, &ind, USER_DATA_ARG}, - {"verbose", 1, &ind, VERBOSE_ARG}, - {"verifyudev", 0, &ind, VERIFYUDEV_ARG}, - {"version", 0, &ind, VERSION_ARG}, - {"yes", 0, &ind, YES_ARG}, - {"addnodeonresume", 0, &ind, ADD_NODE_ON_RESUME_ARG}, - {"addnodeoncreate", 0, &ind, ADD_NODE_ON_CREATE_ARG}, - {0, 0, 0, 0} - }; -#else - struct option long_options; -#endif - - /* - * Zero all the index counts. - */ - memset(&_switches, 0, sizeof(_switches)); - memset(&_int_args, 0, sizeof(_int_args)); - _read_ahead_flags = 0; - - if (!(namebase = strdup((*argvp)[0]))) { - log_error("Failed to duplicate name."); - return 0; - } - - base = dm_basename(namebase); - - i = 0; - do { - if (!strcmp(base, _base_commands[i].name)) { - _base_command = _base_commands[i].command; - _base_command_type = _base_commands[i].type; - break; - } - } while (++i < _num_base_commands); - - free(namebase); - - if (_base_command_type == DEVMAP_NAME_TYPE) { - _switches[COLS_ARG]++; - _switches[NOHEADINGS_ARG]++; - _switches[OPTIONS_ARG]++; - _switches[MAJOR_ARG]++; - _switches[MINOR_ARG]++; - _string_args[OPTIONS_ARG] = (char *) "name"; - - if (*argcp == 3) { - _int_args[MAJOR_ARG] = atoi((*argvp)[1]); - _int_args[MINOR_ARG] = atoi((*argvp)[2]); - *argcp -= 2; - *argvp += 2; - } else if ((*argcp == 2) && - (2 == sscanf((*argvp)[1], "%i:%i", - &_int_args[MAJOR_ARG], - &_int_args[MINOR_ARG]))) { - *argcp -= 1; - *argvp += 1; - } else { - _usage(stderr); - return 0; - } - - _command = "info"; - (*argvp)++; - (*argcp)--; - - return 1; - } - - if (_base_command_type == LOSETUP_TYPE) { - r = _process_losetup_switches(_base_commands[_base_command].name, argcp, argvp, dev_dir); - return r; - } - - optarg = 0; - optind = OPTIND_INIT; - while ((ind = -1, c = GETOPTLONG_FN(*argcp, *argvp, "cCfG:hj:m:M:no:O:rS:u:U:vy", - long_options, NULL)) != -1) { - if (ind == ALIAS_ARG) { - _switches[ALIAS_ARG]++; - _string_args[ALIAS_ARG] = optarg; - } - if (ind == ALL_DEVICES_ARG) - _switches[ALL_DEVICES_ARG]++; - if (ind == ALL_PROGRAMS_ARG) - _switches[ALL_PROGRAMS_ARG]++; - if (ind == ALL_REGIONS_ARG) - _switches[ALL_REGIONS_ARG]++; - if (ind == AREA_ARG) - _switches[AREA_ARG]++; - if (ind == AREAS_ARG) { - _switches[AREAS_ARG]++; - _int_args[AREAS_ARG] = atoi(optarg); - } - if (ind == AREA_SIZE_ARG) { - _switches[AREA_SIZE_ARG]++; - _string_args[AREA_SIZE_ARG] = optarg; - } - if (ind == USER_DATA_ARG) { - _switches[USER_DATA_ARG]++; - _string_args[USER_DATA_ARG] = optarg; - } - if (c == ':' || c == '?') - return_0; - if (c == 'h' || ind == HELP_ARG) - _switches[HELP_ARG]++; - if (ind == CONCISE_ARG) - _switches[CONCISE_ARG]++; - if (ind == BOUNDS_ARG) { - _switches[BOUNDS_ARG]++; - _string_args[BOUNDS_ARG] = optarg; - } - if (ind == CLEAR_ARG) - _switches[CLEAR_ARG]++; - if (c == 'c' || c == 'C' || ind == COLS_ARG) - _switches[COLS_ARG]++; - if (ind == FILEMAP_ARG) - _switches[FILEMAP_ARG]++; - if (ind == FOLLOW_ARG) { - _switches[FOLLOW_ARG]++; - _string_args[FOLLOW_ARG] = optarg; - } - if (c == 'f' || ind == FORCE_ARG) - _switches[FORCE_ARG]++; - if (ind == FOREGROUND_ARG) - _switches[FOREGROUND_ARG]++; - if (c == 'r' || ind == READ_ONLY) - _switches[READ_ONLY]++; - if (ind == HISTOGRAM_ARG) - _switches[HISTOGRAM_ARG]++; - if (ind == LENGTH_ARG) { - _switches[LENGTH_ARG]++; - _string_args[LENGTH_ARG] = optarg; - } - if (c == 'j' || ind == MAJOR_ARG) { - _switches[MAJOR_ARG]++; - _int_args[MAJOR_ARG] = atoi(optarg); - } - if (ind == REGIONS_ARG) { - _switches[REGIONS_ARG]++; - _string_args[REGIONS_ARG] = optarg; - } - if (c == 'm' || ind == MINOR_ARG) { - _switches[MINOR_ARG]++; - _int_args[MINOR_ARG] = atoi(optarg); - } - if (ind == NOSUFFIX_ARG) - _switches[NOSUFFIX_ARG]++; - if (c == 'n' || ind == NOTABLE_ARG) - _switches[NOTABLE_ARG]++; - if (ind == NOTIMESUFFIX_ARG) - _switches[NOTIMESUFFIX_ARG]++; - if (c == 'o' || ind == OPTIONS_ARG) { - _switches[OPTIONS_ARG]++; - _string_args[OPTIONS_ARG] = optarg; - } - if (ind == PROGRAM_ID_ARG) { - _switches[PROGRAM_ID_ARG]++; - _string_args[PROGRAM_ID_ARG] = optarg; - } - if (ind == PRECISE_ARG) - _switches[PRECISE_ARG]++; - if (ind == RAW_ARG) - _switches[RAW_ARG]++; - if (ind == REGION_ARG) - _switches[REGION_ARG]++; - if (ind == REGION_ID_ARG) { - _switches[REGION_ID_ARG]++; - _int_args[REGION_ID_ARG] = atoi(optarg); - } - if (ind == RELATIVE_ARG) - _switches[RELATIVE_ARG]++; - if (ind == SEPARATOR_ARG) { - _switches[SEPARATOR_ARG]++; - _string_args[SEPARATOR_ARG] = optarg; - } - if (ind == UNITS_ARG) { - _switches[UNITS_ARG]++; - _string_args[UNITS_ARG] = optarg; - } - if (c == 'O' || ind == SORT_ARG) { - _switches[SORT_ARG]++; - _string_args[SORT_ARG] = optarg; - } - if (c == 'S' || ind == SELECT_ARG) { - _switches[SELECT_ARG]++; - _string_args[SELECT_ARG] = optarg; - } - if (ind == START_ARG) { - _switches[START_ARG]++; - _string_args[START_ARG] = optarg; - } - if (c == 'v' || ind == VERBOSE_ARG) - _switches[VERBOSE_ARG]++; - if (c == 'u' || ind == UUID_ARG) { - _switches[UUID_ARG]++; - _uuid = optarg; - } - if (c == 'y' || ind == YES_ARG) - _switches[YES_ARG]++; - if (ind == ADD_NODE_ON_RESUME_ARG) - _switches[ADD_NODE_ON_RESUME_ARG]++; - if (ind == ADD_NODE_ON_CREATE_ARG) - _switches[ADD_NODE_ON_CREATE_ARG]++; - if (ind == CHECKS_ARG) - _switches[CHECKS_ARG]++; - if (ind == COUNT_ARG) { - _switches[COUNT_ARG]++; - _int_args[COUNT_ARG] = atoi(optarg); - if (_int_args[COUNT_ARG] < 0) { - log_error("Count must be zero or greater."); - return 0; - } - } - if (ind == UDEVCOOKIE_ARG) { - _switches[UDEVCOOKIE_ARG]++; - _udev_cookie = _get_cookie_value(optarg); - } - if (ind == NOMONITOR_ARG) - _switches[NOMONITOR_ARG]++; - if (ind == NOUDEVRULES_ARG) - _switches[NOUDEVRULES_ARG]++; - if (ind == NOUDEVSYNC_ARG) - _switches[NOUDEVSYNC_ARG]++; - if (ind == VERIFYUDEV_ARG) - _switches[VERIFYUDEV_ARG]++; - if (c == 'G' || ind == GID_ARG) { - _switches[GID_ARG]++; - _int_args[GID_ARG] = atoi(optarg); - } - if (ind == GROUP_ARG) - _switches[GROUP_ARG]++; - if (ind == GROUP_ID_ARG) { - _switches[GROUP_ID_ARG]++; - _int_args[GROUP_ID_ARG] = atoi(optarg); - } - if (c == 'U' || ind == UID_ARG) { - _switches[UID_ARG]++; - _int_args[UID_ARG] = atoi(optarg); - } - if (c == 'M' || ind == MODE_ARG) { - _switches[MODE_ARG]++; - /* FIXME Accept modes as per chmod */ - errno = 0; - _int_args[MODE_ARG] = (int) strtol(optarg, &s, 8); - if (errno || !s || *s || !_int_args[MODE_ARG]) { - log_error("Invalid argument for --mode: %s. %s", - optarg, errno ? strerror(errno) : ""); - return 0; - } - } - if (ind == DEFERRED_ARG) - _switches[DEFERRED_ARG]++; - if (ind == EXEC_ARG) { - _switches[EXEC_ARG]++; - _command_to_exec = optarg; - } - if (ind == TARGET_ARG) { - _switches[TARGET_ARG]++; - _target = optarg; - } - if (ind == SEGMENTS_ARG) - _switches[SEGMENTS_ARG]++; - if (ind == INACTIVE_ARG) - _switches[INACTIVE_ARG]++; - if (ind == INTERVAL_ARG) { - _switches[INTERVAL_ARG]++; - _int_args[INTERVAL_ARG] = atoi(optarg); - if (_int_args[INTERVAL_ARG] <= 0) { - log_error("Interval must be a positive integer."); - return 0; - } - } - if (ind == MANGLENAME_ARG) { - _switches[MANGLENAME_ARG]++; - if (!strcasecmp(optarg, "none")) - _int_args[MANGLENAME_ARG] = DM_STRING_MANGLING_NONE; - else if (!strcasecmp(optarg, "auto")) - _int_args[MANGLENAME_ARG] = DM_STRING_MANGLING_AUTO; - else if (!strcasecmp(optarg, "hex")) - _int_args[MANGLENAME_ARG] = DM_STRING_MANGLING_HEX; - else { - log_error("Unknown name mangling mode."); - return 0; - } - dm_set_name_mangling_mode((dm_string_mangling_t) _int_args[MANGLENAME_ARG]); - } - if (ind == NAMEPREFIXES_ARG) - _switches[NAMEPREFIXES_ARG]++; - if (ind == NOFLUSH_ARG) - _switches[NOFLUSH_ARG]++; - if (ind == NOGROUP_ARG) - _switches[NOGROUP_ARG]++; - if (ind == NOHEADINGS_ARG) - _switches[NOHEADINGS_ARG]++; - if (ind == NOLOCKFS_ARG) - _switches[NOLOCKFS_ARG]++; - if (ind == NOOPENCOUNT_ARG) - _switches[NOOPENCOUNT_ARG]++; - if (ind == READAHEAD_ARG) { - _switches[READAHEAD_ARG]++; - if (!strcasecmp(optarg, "auto")) - _int_args[READAHEAD_ARG] = DM_READ_AHEAD_AUTO; - else if (!strcasecmp(optarg, "none")) - _int_args[READAHEAD_ARG] = DM_READ_AHEAD_NONE; - else { - for (s = optarg; isspace(*s); s++) - ; - if (*s == '+') - _read_ahead_flags = DM_READ_AHEAD_MINIMUM_FLAG; - _int_args[READAHEAD_ARG] = atoi(optarg); - if (_int_args[READAHEAD_ARG] < -1) { - log_error("Negative read ahead value " - "(%d) is not understood.", - _int_args[READAHEAD_ARG]); - return 0; - } - } - } - if (ind == RETRY_ARG) - _switches[RETRY_ARG]++; - if (ind == ROWS_ARG) - _switches[ROWS_ARG]++; - if (ind == SETUUID_ARG) - _switches[SETUUID_ARG]++; - if (ind == SHOWKEYS_ARG) - _switches[SHOWKEYS_ARG]++; - if (ind == TABLE_ARG) { - _switches[TABLE_ARG]++; - if (!(_table = strdup(optarg))) { - log_error("Could not allocate memory for table string."); - return 0; - } - } - if (ind == TREE_ARG) - _switches[TREE_ARG]++; - if (ind == UNQUOTED_ARG) - _switches[UNQUOTED_ARG]++; - if (ind == VERSION_ARG) - _switches[VERSION_ARG]++; - } - - if (_switches[VERBOSE_ARG] > 1) { - dm_log_init_verbose(_switches[VERBOSE_ARG] - 1); - if (_switches[VERBOSE_ARG] > 2) { - if (!(_initial_timestamp = dm_timestamp_alloc())) - stack; - else if (!dm_timestamp_get(_initial_timestamp)) - stack; - else - log_debug("Timestamp: 0.000000000 seconds"); - } - } - - if ((_switches[MAJOR_ARG] && !_switches[MINOR_ARG]) || - (!_switches[MAJOR_ARG] && _switches[MINOR_ARG])) { - log_error("Please specify both major number and minor number."); - return 0; - } - - if (_switches[TABLE_ARG] && _switches[NOTABLE_ARG]) { - log_error("--table and --notable are incompatible."); - return 0; - } - - if (_switches[ADD_NODE_ON_RESUME_ARG] && _switches[ADD_NODE_ON_CREATE_ARG]) { - log_error("--addnodeonresume and --addnodeoncreate are incompatible."); - return 0; - } - - *argvp += optind; - *argcp -= optind; - - if (!*argcp) - _command = NULL; - else if (!strcmp((*argvp)[0], "stats")) { - _base_command = DMSETUP_STATS_CMD; - _base_command_type = STATS_TYPE; - _command = "stats"; - (*argvp)++; - (*argcp)--; - } else if (_base_command == DMSTATS_CMD) { - _command = "stats"; - } else if (*argcp) { - _command = (*argvp)[0]; - (*argvp)++; - (*argcp)--; - } - - return 1; -} - -static int _perform_command_for_all_repeatable_args(CMD_ARGS) -{ - do { - if (!cmd->fn(cmd, subcommand, argc, argv++, NULL, multiple_devices)) { - log_error("Command failed."); - return 0; - } - } while (cmd->repeatable_cmd && argc-- > 1); - - return 1; -} - -static int _do_report_wait(void) -{ - return _do_timer_wait(); -} - -int main(int argc, char **argv) -{ - int ret = 1, r; - const char *dev_dir; - const struct command *cmd; - const char *subcommand = ""; - int multiple_devices; - - (void) setlocale(LC_ALL, ""); - - dev_dir = getenv(DM_DEV_DIR_ENV_VAR_NAME); - if (dev_dir && *dev_dir) { - if (!dm_set_dev_dir(dev_dir)) { - log_error("Invalid DM_DEV_DIR environment variable value."); - goto out; - } - } else - dev_dir = DEFAULT_DM_DEV_DIR; - - if (!_process_switches(&argc, &argv, dev_dir)) { - log_error("Couldn't process command line."); - goto out; - } - - if (_switches[HELP_ARG]) { - switch (_base_command_type) { - case STATS_TYPE: - if ((cmd = _find_stats_subcommand("help"))) - goto doit; - goto unknown; - default: - if ((cmd = _find_dmsetup_command("help"))) - goto doit; - goto unknown; - } - } - - if (_switches[VERSION_ARG]) { - switch (_base_command_type) { - case STATS_TYPE: - if ((cmd = _find_stats_subcommand("version"))) - goto doit; - goto unknown; - default: - if ((cmd = _find_dmsetup_command("version"))) - goto doit; - goto unknown; - } - } - - if (!_command) { - _usage(stderr); - goto out; - } - - if (!(cmd = _find_dmsetup_command(_command))) { -unknown: - log_error("Unknown command."); - _usage(stderr); - goto out; - } - - if (argc < cmd->min_args || - (cmd->max_args >= 0 && argc > cmd->max_args)) { - log_error("Incorrect number of arguments."); - _usage(stderr); - goto out; - } - - if (!_switches[COLS_ARG] && !strcmp(cmd->name, "splitname")) - _switches[COLS_ARG]++; - - if (!strcmp(cmd->name, "stats")) { - _switches[COLS_ARG]++; - if (!_switches[UNITS_ARG]) { - _switches[UNITS_ARG]++; - _string_args[UNITS_ARG] = (char *) "h"; - } - } - - if (!strcmp(cmd->name, "mangle")) - dm_set_name_mangling_mode(DM_STRING_MANGLING_NONE); - - if (!_process_options(_string_args[OPTIONS_ARG])) { - log_error("Couldn't process command line."); - goto out; - } - -#ifdef UDEV_SYNC_SUPPORT - if (!_set_up_udev_support(dev_dir)) - goto_out; -#endif - - /* - * Extract subcommand? - * dmsetup <command> <subcommand> [args...] - */ - if (cmd->has_subcommands) { - subcommand = argv[0]; - argc--, argv++; - } - - /* Default to success */ - ret = 0; - - /* When -S is given, store the real command for later and run "info -c" first */ - if (_switches[SELECT_ARG] && (cmd->repeatable_cmd == 2)) { - _selection_cmd = cmd; - _switches[COLS_ARG] = 1; - if (!(cmd = _find_dmsetup_command("info"))) { - log_error(INTERNAL_ERROR "finding dmsetup info command struct."); - goto out; - } - } - - if (_switches[COLS_ARG]) { - if (!_report_init(cmd, subcommand)) - ret = 1; - if (ret || !_report) - goto_out; - } - - if (_switches[COUNT_ARG] && _int_args[COUNT_ARG]) - _count = (uint64_t)_int_args[COUNT_ARG]; - else if (_switches[COUNT_ARG] || _switches[INTERVAL_ARG]) - _count = UINT64_MAX; - - if (_switches[UNITS_ARG]) { - _disp_factor = _factor_from_units(_string_args[UNITS_ARG], - &_disp_units); - if (!_disp_factor) { - log_error("Invalid --units argument."); - ret = 1; - goto out; - } - } - - /* Start interval timer. */ - if (_count > 1) - if (!_start_timer()) { - ret = 1; - goto_out; - } - -doit: - multiple_devices = (cmd->repeatable_cmd && argc != 1 && - (argc || (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]))); - - do { - r = _perform_command_for_all_repeatable_args(cmd, subcommand, argc, argv, NULL, multiple_devices); - if (_concise_output_produced) { - putchar('\n'); - fflush(stdout); - } - if (_report) { - /* only output headings for repeating reports */ - if (_int_args[COUNT_ARG] != 1 && !dm_report_is_empty(_report)) - dm_report_column_headings(_report); - dm_report_output(_report); - - if (_count > 1 && r) { - putchar('\n'); - fflush(stdout); - /* wait for --interval and update timestamps */ - if (!_do_report_wait()) { - ret = 1; - goto_out; - } - } - } - - if (!r) { - ret = 1; - goto_out; - } - } while (--_count); - -out: - if (_report) - dm_report_free(_report); - - if (_dtree) - dm_tree_free(_dtree); - - free(_table); - - if (_initial_timestamp) - dm_timestamp_destroy(_initial_timestamp); - - return (_switches[HELP_ARG] || _switches[VERSION_ARG]) ? 0 : ret; -}

1 0

master - lvmlockd: update method for changing clustered VG
by David Teigland 13 Jun '18

13 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e53cfc6a88d7acafde6ba… Commit: e53cfc6a88d7acafde6ba3fa293bcf15b9a033bc Parent: 9b79f0244a17c91d790e2114e1c912e5efe00a2f Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 13 15:30:28 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 13 15:30:28 2018 -0500 lvmlockd: update method for changing clustered VG The previous method for forcibly changing a clustered VG to a local VG involved using -cn and locking_type 0. Since those options are deprecated, replace it with the same command used for other forced lock type changes: vgchange --locktype none --lockopt force. --- lib/commands/toolcontext.h | 1 + lib/metadata/metadata.c | 9 +++++++++ man/lvmlockd.8_main | 9 +++------ tools/vgchange.c | 1 + 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index baecfbd..9849e5f 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -153,6 +153,7 @@ struct cmd_context { unsigned include_shared_vgs:1; /* report/display cmds can reveal lockd VGs */ unsigned include_active_foreign_vgs:1; /* cmd should process foreign VGs with active LVs */ unsigned vg_read_print_access_error:1; /* print access errors from vg_read */ + unsigned force_access_clustered:1; unsigned lockd_gl_disable:1; unsigned lockd_vg_disable:1; unsigned lockd_lv_disable:1; diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 40854de..113c87c 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -4689,6 +4689,15 @@ int vg_flag_write_locked(struct volume_group *vg) static int _access_vg_clustered(struct cmd_context *cmd, const struct volume_group *vg) { if (vg_is_clustered(vg)) { + /* + * force_access_clustered is only set when forcibly + * converting a clustered vg to lock type none. + */ + if (cmd->force_access_clustered) { + log_debug("Allowing forced access to clustered vg %s", vg->name); + return 1; + } + if (!cmd->ignore_clustered_vgs) log_error("Skipping clustered volume group %s", vg->name); else diff --git a/man/lvmlockd.8_main b/man/lvmlockd.8_main index cf4c52e..6411c01 100644 --- a/man/lvmlockd.8_main +++ b/man/lvmlockd.8_main @@ -814,8 +814,8 @@ dlm), first change it to a local VG, then to the new type. All LVs must be inactive to change the lock type. -First change the clvm VG to a local VG. Within a running clvm cluster, -change a clvm VG to a local VG with the command: +First change the clvm/clustered VG to a local VG. Within a running clvm +cluster, change a clustered VG to a local VG with the command: vgchange -cn <vgname> @@ -823,10 +823,7 @@ If the clvm cluster is no longer running on any nodes, then extra options can be used to forcibly make the VG local. Caution: this is only safe if all nodes have stopped using the VG: -vgchange --config 'global/locking_type=0 global/use_lvmlockd=0' -.RS --cn <vgname> -.RE +vgchange --lock-type none --lock-opt force <vgname> After the VG is local, follow the steps described in "changing a local VG to a lockd VG". diff --git a/tools/vgchange.c b/tools/vgchange.c index b427a81..891f22a 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -1039,6 +1039,7 @@ int vgchange_locktype_cmd(struct cmd_context *cmd, int argc, char **argv) cmd->lockd_vg_disable = 1; cmd->lockd_lv_disable = 1; cmd->handles_missing_pvs = 1; + cmd->force_access_clustered = 1; goto process; }

1 0

master - Remove makefile entries for removed script
by David Teigland 13 Jun '18

13 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9b79f0244a17c91d790e2… Commit: 9b79f0244a17c91d790e2114e1c912e5efe00a2f Parent: fa00fce97c1eabef9f1ec88dd420660cd4d6f004 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 13 15:02:12 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 13 15:04:26 2018 -0500 Remove makefile entries for removed script --- configure.ac | 1 - scripts/.gitignore | 1 - scripts/Makefile.in | 2 -- 3 files changed, 0 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7d490f6..4c431e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1804,7 +1804,6 @@ scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service -scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service diff --git a/scripts/.gitignore b/scripts/.gitignore index 0368f23..314bdb5 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -16,7 +16,6 @@ lvm2_lvmetad_init_red_hat lvm2_lvmetad_systemd_red_hat.service lvm2_lvmetad_systemd_red_hat.socket lvm2_lvmlockd_systemd_red_hat.service -lvm2_lvmlocking_systemd_red_hat.service lvm2_lvmpolld_init_red_hat lvm2_lvmpolld_systemd_red_hat.service lvm2_lvmpolld_systemd_red_hat.socket diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 208aebf..f0addc3 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -109,7 +109,6 @@ ifeq ("@BUILD_LVMPOLLD@", "yes") endif ifeq ("@BUILD_LVMLOCKD@", "yes") $(INSTALL_DATA) lvm2_lvmlockd_systemd_red_hat.service $(systemd_unit_dir)/lvm2-lvmlockd.service - $(INSTALL_DATA) lvm2_lvmlocking_systemd_red_hat.service $(systemd_unit_dir)/lvm2-lvmlocking.service endif ifneq ("@CLVMD@", "none") $(INSTALL_DATA) lvm2_clvmd_systemd_red_hat.service $(systemd_unit_dir)/lvm2-clvmd.service @@ -159,7 +158,6 @@ DISTCLEAN_TARGETS += \ lvm2_lvmpolld_systemd_red_hat.service \ lvm2_lvmpolld_systemd_red_hat.socket \ lvm2_lvmlockd_systemd_red_hat.service \ - lvm2_lvmlocking_systemd_red_hat.service \ lvm2_monitoring_init_red_hat \ lvm2_monitoring_systemd_red_hat.service \ lvm2_pvscan_systemd_red_hat@.service \

1 0

master - Remove systemd script for starting shared VG
by David Teigland 13 Jun '18

13 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fa00fce97c1eabef9f1ec… Commit: fa00fce97c1eabef9f1ec88dd420660cd4d6f004 Parent: a163d5341a90c1c2f656b0d15c055bbd90333a60 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 12 14:35:27 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 13 14:37:16 2018 -0500 Remove systemd script for starting shared VG Shared VGs will generally be started and activated by the resource agent. Without the agent, this script doesn't have a good way to know which LVs to activate. --- scripts/lvm2_lvmlocking_systemd_red_hat.service.in | 24 -------------------- 1 files changed, 0 insertions(+), 24 deletions(-) diff --git a/scripts/lvm2_lvmlocking_systemd_red_hat.service.in b/scripts/lvm2_lvmlocking_systemd_red_hat.service.in deleted file mode 100644 index 62d8177..0000000 --- a/scripts/lvm2_lvmlocking_systemd_red_hat.service.in +++ /dev/null @@ -1,24 +0,0 @@ -[Unit] -Description=Availability of lockspaces in lvmlockd -Documentation=man:lvmlockd(8) -After=lvm2-lvmlockd.service sanlock.service dlm.service - -[Service] -Type=oneshot -RemainAfterExit=yes - -# start lockspaces and wait for them to finish starting -ExecStart=@SBINDIR@/lvm vgchange --lock-start --lock-opt autowait - -# auto activate LVs in the newly started lockd VGs -ExecStart=@SBINDIR@/lvm vgchange -aay -S 'locktype=sanlock || locktype=dlm' - -# deactivate LVs in lockd VGs -ExecStop=@SBINDIR@/lvm vgchange -an -S 'locktype=sanlock || locktype=dlm' - -# stop lockspaces and wait for them to finish stopping -ExecStop=@SBINDIR@/lvmlockctl --stop-lockspaces --wait 1 - -[Install] -WantedBy=multi-user.target -

1 0

master - tests: remove metadata-dirs
by David Teigland 13 Jun '18

13 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d067263f51f782661d6fa… Commit: d067263f51f782661d6faa00b106b872b3e1dc6f Parent: 5fca75877d8af5fe6f277159490eda4817740060 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 13 14:14:23 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 13 14:14:23 2018 -0500 tests: remove metadata-dirs metadata dirs are removed --- test/shell/metadata-dirs.sh | 48 ------------------------------------------- 1 files changed, 0 insertions(+), 48 deletions(-) diff --git a/test/shell/metadata-dirs.sh b/test/shell/metadata-dirs.sh deleted file mode 100644 index 2a43340..0000000 --- a/test/shell/metadata-dirs.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (C) 2011 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - -SKIP_WITH_LVMPOLLD=1 - -. lib/inittest - -aux prepare_devs 3 -get_devs - -pvcreate --metadatacopies 0 "${DEVICES[@]}" -not vgcreate $SHARED "$vg" "${DEVICES[@]}" - -aux lvmconf "metadata/dirs = [ \"$TESTDIR/mda\" ]" - -vgcreate $SHARED $vg "$dev1" -check vg_field $vg vg_mda_count 1 -vgremove -ff $vg - -vgcreate $SHARED "$vg" "${DEVICES[@]}" -check vg_field $vg vg_mda_count 1 -vgremove -ff $vg - -pvcreate --metadatacopies 1 --metadataignore y "$dev1" -vgcreate $SHARED "$vg" "${DEVICES[@]}" -check vg_field $vg vg_mda_count 2 -vgremove -ff $vg - -pvcreate --metadatacopies 1 --metadataignore n "$dev1" -vgcreate $SHARED "$vg" "${DEVICES[@]}" -check vg_field $vg vg_mda_count 2 -vgremove -ff $vg - -pvcreate --metadatacopies 0 "$dev1" -aux lvmconf "metadata/dirs = [ \"$TESTDIR/mda\", \"$TESTDIR/mda2\" ]" -vgcreate $SHARED "$vg" "${DEVICES[@]}" -check vg_field $vg vg_mda_count 2 -vgremove -ff $vg

1 0

master - tests: remove vgconvert usage
by David Teigland 13 Jun '18

13 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a163d5341a90c1c2f656b… Commit: a163d5341a90c1c2f656b0d15c055bbd90333a60 Parent: d067263f51f782661d6faa00b106b872b3e1dc6f Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 13 14:16:28 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 13 14:16:28 2018 -0500 tests: remove vgconvert usage --- test/shell/metadata.sh | 38 -------------------------------------- test/shell/pvcreate-usage.sh | 19 ------------------- 2 files changed, 0 insertions(+), 57 deletions(-) diff --git a/test/shell/metadata.sh b/test/shell/metadata.sh index aae749a..a86bc0b 100644 --- a/test/shell/metadata.sh +++ b/test/shell/metadata.sh @@ -46,41 +46,3 @@ for mdacp in 1 0; do vgremove -f $vg done not grep "Cached VG .* incorrect PV list" out0 - -# begin M1 metadata tests -if test -n "$LVM_TEST_LVM1" ; then - -pvcreate -M1 "$dev1" "$dev2" "$dev3" -pv3_uuid=$(get pv_field "$dev3" pv_uuid) -vgcreate $SHARED -M1 $vg "$dev1" "$dev2" "$dev3" -pvchange --uuid "$dev1" - -# verify pe_start of all M1 PVs -pv_align="128.00k" -check pv_field "$dev1" pe_start $pv_align -check pv_field "$dev2" pe_start $pv_align -check pv_field "$dev3" pe_start $pv_align - -pvs --units k -o name,pe_start,vg_mda_size,vg_name "${DEVICES[@]}" - -# upgrade from v1 to v2 metadata -vgconvert -M2 $vg - -# verify pe_start of all M2 PVs -check pv_field "$dev1" pe_start $pv_align -check pv_field "$dev2" pe_start $pv_align -check pv_field "$dev3" pe_start $pv_align - -pvs --units k -o name,pe_start,vg_mda_size,vg_name "${DEVICES[@]}" - -# create backup and then restore $dev3 -vgcfgbackup -f "$TESTDIR/bak-%s" "$vg" -pvcreate -ff -y --restorefile "$TESTDIR/bak-$vg" --uuid "$pv3_uuid" "$dev3" -vgcfgrestore -f "$TESTDIR/bak-$vg" "$vg" - -# verify pe_start of $dev3 -check pv_field "$dev3" pe_start $pv_align - -fi -# end M1 metadata tests - diff --git a/test/shell/pvcreate-usage.sh b/test/shell/pvcreate-usage.sh index 4ece05f..0a6f1ea 100644 --- a/test/shell/pvcreate-usage.sh +++ b/test/shell/pvcreate-usage.sh @@ -143,25 +143,6 @@ pvcreate --metadatasize 128k --metadatacopies 2 --dataalignmentoffset 7s "$dev1" check pv_field "$dev1" pv_mda_count 2 # FIXME: compare start of 2nd mda with and without --dataalignmentoffset -#COMM 'pv with LVM1 compatible data alignment can be convereted' -#compatible == LVM1_PE_ALIGN == 64k -if test -n "$LVM_TEST_LVM1" ; then -pvcreate --dataalignment 256k "$dev1" -vgcreate $SHARED -s 1m $vg "$dev1" -vgconvert -M1 $vg -vgconvert -M2 $vg -check pv_field "$dev1" pe_start 256.00k -vgremove $vg -fi - -#COMM 'pv with LVM1 incompatible data alignment cannot be convereted' -if test -n "$LVM_TEST_LVM1" ; then -pvcreate --dataalignment 10k "$dev1" -vgcreate $SHARED -s 1m $vg "$dev1" -not vgconvert -M1 $vg -vgremove $vg -fi - #COMM 'vgcfgrestore allows pe_start=0' #basically it produces nonsense, but it tests vgcfgrestore, #not that final cfg is usable...

1 0

master - Remove vgconvert
by David Teigland 13 Jun '18

13 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5fca75877d8af5fe6f277… Commit: 5fca75877d8af5fe6f277159490eda4817740060 Parent: 22c5467add88268554a7d163a26892166dbc3104 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 13 14:12:46 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 13 14:14:03 2018 -0500 Remove vgconvert it has no use without lvm1 --- man/vgconvert.8_des | 6 +- tools/Makefile.in | 1 - tools/command-lines.in | 15 ++--- tools/stub.h | 9 +++ tools/vgconvert.c | 151 ------------------------------------------------ 5 files changed, 19 insertions(+), 163 deletions(-) diff --git a/man/vgconvert.8_des b/man/vgconvert.8_des index 8519063..eb5a006 100644 --- a/man/vgconvert.8_des +++ b/man/vgconvert.8_des @@ -1,3 +1,3 @@ -vgconvert converts VG metadata from one format to another. This command -is no longer used because this version of lvm no longer supports the LVM1 -format. +vgconvert is no longer a part of LVM. It was removed along with +support for the LVM1 format. Use an older version of LVM to +convert VGs from the LVM1 format to LVM2. diff --git a/tools/Makefile.in b/tools/Makefile.in index 9742842..3785b50 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -52,7 +52,6 @@ SOURCES =\ vgchange.c \ vgck.c \ vgcreate.c \ - vgconvert.c \ vgdisplay.c \ vgexport.c \ vgextend.c \ diff --git a/tools/command-lines.in b/tools/command-lines.in index ad710a4..0f9ed47 100644 --- a/tools/command-lines.in +++ b/tools/command-lines.in @@ -1548,14 +1548,6 @@ ID: vgck_general --- -vgconvert VG ... -OO: --force, --labelsector Number, --bootloaderareasize SizeMB, ---metadatatype MetadataType, --pvmetadatacopies MetadataCopiesPV, ---metadatasize SizeMB, --reportformat ReportFmt -ID: vgconvert_general - ---- - vgcreate VG_new PV ... OO: --addtag Tag, --alloc Alloc, --autobackup Bool, --clustered Bool, --maxlogicalvolumes Uint32, --maxphysicalvolumes Uint32, --metadataprofile String, --metadatatype MetadataType, @@ -1783,3 +1775,10 @@ lvmsar OO: --full, --stdin ID: lvmsar_general +# deprecated +vgconvert VG ... +OO: --force, --labelsector Number, --bootloaderareasize SizeMB, +--metadatatype MetadataType, --pvmetadatacopies MetadataCopiesPV, +--metadatasize SizeMB, --reportformat ReportFmt +ID: vgconvert_general + diff --git a/tools/stub.h b/tools/stub.h index 1d58387..fcfc189 100644 --- a/tools/stub.h +++ b/tools/stub.h @@ -48,3 +48,12 @@ int lvmchange(struct cmd_context *cmd __attribute__((unused)), log_error("Use 'dmsetup' commands to reset the kernel device-mapper driver."); return ECMD_FAILED; } + +int vgconvert(struct cmd_context *cmd __attribute__((unused)), + int argc __attribute__((unused)), + char **argv __attribute__((unused))) +{ + log_error("The vgconvert command has been removed along with the lvm1 format."); + log_error("Use a previous version of lvm to convert the lvm1 format to lvm2."); + return ECMD_FAILED; +} diff --git a/tools/vgconvert.c b/tools/vgconvert.c deleted file mode 100644 index ca9615c..0000000 --- a/tools/vgconvert.c +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "tools.h" - -static int _vgconvert_single(struct cmd_context *cmd, const char *vg_name, - struct volume_group *vg, - struct processing_handle *handle __attribute__((unused))) -{ - struct pv_create_args pva = { 0 }; - struct logical_volume *lv; - struct lv_list *lvl; - struct lvinfo info; - int active = 0; - - if (!vg_check_status(vg, LVM_WRITE | EXPORTED_VG)) - return_ECMD_FAILED; - - if (vg->fid->fmt == cmd->fmt) { - log_error("Volume group \"%s\" already uses format %s", - vg_name, cmd->fmt->name); - return ECMD_FAILED; - } - - if (arg_sign_value(cmd, metadatasize_ARG, SIGN_NONE) == SIGN_MINUS) { - log_error("Metadata size may not be negative"); - return EINVALID_CMD_LINE; - } - - pva.pvmetadatasize = arg_uint64_value(cmd, metadatasize_ARG, UINT64_C(0)); - if (!pva.pvmetadatasize) - pva.pvmetadatasize = find_config_tree_int(cmd, metadata_pvmetadatasize_CFG, NULL); - - pva.pvmetadatacopies = arg_int_value(cmd, pvmetadatacopies_ARG, -1); - if (pva.pvmetadatacopies < 0) - pva.pvmetadatacopies = find_config_tree_int(cmd, metadata_pvmetadatacopies_CFG, NULL); - - if (arg_sign_value(cmd, bootloaderareasize_ARG, SIGN_NONE) == SIGN_MINUS) { - log_error("Bootloader area size may not be negative"); - return EINVALID_CMD_LINE; - } - - pva.ba_size = arg_uint64_value(cmd, bootloaderareasize_ARG, UINT64_C(0)); - - if (!vg_check_new_extent_size(cmd->fmt, vg->extent_size)) - return_ECMD_FAILED; - - if (!archive(vg)) { - log_error("Archive of \"%s\" metadata failed.", vg_name); - return ECMD_FAILED; - } - - /* Set PV/LV limit if converting from unlimited metadata format */ - if (vg->fid->fmt->features & FMT_UNLIMITED_VOLS && - !(cmd->fmt->features & FMT_UNLIMITED_VOLS)) { - if (!vg->max_lv) - vg->max_lv = 255; - if (!vg->max_pv) - vg->max_pv = 255; - } - - /* If converting to restricted lvid, check if lvid is compatible */ - if (!(vg->fid->fmt->features & FMT_RESTRICTED_LVIDS) && - cmd->fmt->features & FMT_RESTRICTED_LVIDS) - dm_list_iterate_items(lvl, &vg->lvs) - if (!lvid_in_restricted_range(&lvl->lv->lvid)) { - log_error("Logical volume %s lvid format is" - " incompatible with requested" - " metadata format.", lvl->lv->name); - return ECMD_FAILED; - } - - /* Attempt to change any LVIDs that are too big */ - if (cmd->fmt->features & FMT_RESTRICTED_LVIDS) { - dm_list_iterate_items(lvl, &vg->lvs) { - lv = lvl->lv; - if (lv_is_snapshot(lv)) - continue; - if (lvnum_from_lvid(&lv->lvid) < MAX_RESTRICTED_LVS) - continue; - if (lv_info(cmd, lv, 0, &info, 0, 0) && info.exists) { - log_error("Logical volume %s must be " - "deactivated before conversion.", - lv->name); - active++; - continue; - } - lvid_from_lvnum(&lv->lvid, &lv->vg->id, find_free_lvnum(lv)); - - } - } - - if (active) - return_ECMD_FAILED; - - /* FIXME Cache the label format change so we don't have to skip this */ - if (test_mode()) { - log_verbose("Test mode: Skipping metadata writing for VG %s in" - " format %s", vg_name, cmd->fmt->name); - return ECMD_PROCESSED; - } - - log_verbose("Writing metadata for VG %s using format %s", vg_name, - cmd->fmt->name); - - if (!backup_restore_vg(cmd, vg, 1, &pva)) { - log_error("Conversion failed for volume group %s.", vg_name); - log_error("Use pvcreate and vgcfgrestore to repair from " - "archived metadata."); - return ECMD_FAILED; - } - log_print_unless_silent("Volume group %s successfully converted", vg_name); - - backup(vg); - - return ECMD_PROCESSED; -} - -int vgconvert(struct cmd_context *cmd, int argc, char **argv) -{ - if (!argc) { - log_error("Please enter volume group(s)"); - return EINVALID_CMD_LINE; - } - - if (arg_is_set(cmd, metadatatype_ARG) && lvmetad_used()) { - log_error("lvmetad must be disabled to change metadata types."); - return EINVALID_CMD_LINE; - } - - if (arg_int_value(cmd, labelsector_ARG, 0) >= LABEL_SCAN_SECTORS) { - log_error("labelsector must be less than %lu", - LABEL_SCAN_SECTORS); - return EINVALID_CMD_LINE; - } - - return process_each_vg(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE, 0, NULL, - &_vgconvert_single); -}

1 0

master - filters: remove cache file in persistent filter
by David Teigland 13 Jun '18

13 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=22c5467add88268554a7d… Commit: 22c5467add88268554a7d163a26892166dbc3104 Parent: 17f5572bc972c932bcf62fc2bff3029268ae0109 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 13 14:00:47 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 13 14:00:47 2018 -0500 filters: remove cache file in persistent filter It creates problems because it's not always correct, and it doesn't actually help much. --- lib/commands/toolcontext.c | 37 +------ lib/commands/toolcontext.h | 1 - lib/config/config_settings.h | 17 +-- lib/filters/filter-composite.c | 13 -- lib/filters/filter-persistent.c | 233 +-------------------------------------- lib/filters/filter.h | 6 +- 6 files changed, 8 insertions(+), 299 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 8c18fc6..a76c68d 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -1195,20 +1195,15 @@ bad: */ int init_filters(struct cmd_context *cmd, unsigned load_persistent_cache) { - const char *dev_cache; struct dev_filter *filter = NULL, *filter_components[2] = {0}; int nr_filt; - struct stat st; const struct dm_config_node *cn; - struct timespec ts, cts; if (!cmd->initialized.connections) { log_error(INTERNAL_ERROR "connections must be initialized before filters"); return 0; } - cmd->dump_filter = 0; - cmd->lvmetad_filter = _init_lvmetad_filter_chain(cmd); if (!cmd->lvmetad_filter) goto_bad; @@ -1246,10 +1241,7 @@ int init_filters(struct cmd_context *cmd, unsigned load_persistent_cache) cmd->lvmetad_filter = NULL; } - if (!(dev_cache = find_config_tree_str(cmd, devices_cache_CFG, NULL))) - goto_bad; - - if (!(filter = persistent_filter_create(cmd->dev_types, filter, dev_cache))) { + if (!(filter = persistent_filter_create(cmd->dev_types, filter))) { log_verbose("Failed to create persistent device filter."); goto bad; } @@ -1267,29 +1259,6 @@ int init_filters(struct cmd_context *cmd, unsigned load_persistent_cache) } else cmd->full_filter = filter; - /* Should we ever dump persistent filter state? */ - if (find_config_tree_bool(cmd, devices_write_cache_state_CFG, NULL)) - cmd->dump_filter = 1; - - if (!*cmd->system_dir) - cmd->dump_filter = 0; - - /* - * Only load persistent filter device cache on startup if it is newer - * than the config file and this is not a long-lived process. Also avoid - * it when lvmetad is enabled. - */ - if (!find_config_tree_bool(cmd, global_use_lvmetad_CFG, NULL) && - load_persistent_cache && !cmd->is_long_lived && - !stat(dev_cache, &st)) { - lvm_stat_ctim(&ts, &st); - cts = config_file_timestamp(cmd->cft); - if (timespeccmp(&ts, &cts, >) && - !persistent_filter_load(cmd->filter, NULL)) - log_verbose("Failed to load existing device cache from %s", - dev_cache); - } - cmd->initialized.filters = 1; return 1; bad: @@ -2166,10 +2135,6 @@ void destroy_toolcontext(struct cmd_context *cmd) struct dm_config_tree *cft_cmdline; int flags; - if (cmd->dump_filter && cmd->filter && cmd->filter->dump && - !cmd->filter->dump(cmd->filter, 1)) - stack; - archive_exit(cmd); backup_exit(cmd); lvmcache_destroy(cmd, 0, 0); diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index 18e1b7d..baecfbd 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -179,7 +179,6 @@ struct cmd_context { struct dev_filter *lvmetad_filter; /* pre-lvmetad filter chain */ struct dev_filter *filter; /* post-lvmetad filter chain */ struct dev_filter *full_filter; /* lvmetad_filter + filter */ - int dump_filter; /* Dump filter when exiting? */ /* * Configuration. diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 8aa4879..a730afb 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -312,24 +312,17 @@ cfg_array(devices_global_filter_CFG, "global_filter", devices_CFG_SECTION, CFG_D "The syntax is the same as devices/filter. Devices rejected by\n" "global_filter are not opened by LVM.\n") -cfg_runtime(devices_cache_CFG, "cache", devices_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(1, 0, 0), vsn(1, 2, 19), - "This has been replaced by the devices/cache_dir setting.\n", - "Cache file path.\n") +cfg_runtime(devices_cache_CFG, "cache", devices_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(1, 0, 0), vsn(1, 2, 19), NULL, + "This setting is no longer used.\n") cfg_runtime(devices_cache_dir_CFG, "cache_dir", devices_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(1, 2, 19), 0, NULL, - "Directory in which to store the device cache file.\n" - "The results of filtering are cached on disk to avoid rescanning dud\n" - "devices (which can take a very long time). By default this cache is\n" - "stored in a file named .cache. It is safe to delete this file; the\n" - "tools regenerate it. If obtain_device_list_from_udev is enabled, the\n" - "list of devices is obtained from udev and any existing .cache file\n" - "is removed.\n") + "This setting is no longer used.\n") cfg(devices_cache_file_prefix_CFG, "cache_file_prefix", devices_CFG_SECTION, CFG_ALLOW_EMPTY, CFG_TYPE_STRING, DEFAULT_CACHE_FILE_PREFIX, vsn(1, 2, 19), NULL, 0, NULL, - "A prefix used before the .cache file name. See devices/cache_dir.\n") + "This setting is no longer used.\n") cfg(devices_write_cache_state_CFG, "write_cache_state", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, 1, vsn(1, 0, 0), NULL, 0, NULL, - "Enable/disable writing the cache file. See devices/cache_dir.\n") + "This setting is no longer used.\n") cfg_array(devices_types_CFG, "types", devices_CFG_SECTION, CFG_DEFAULT_UNDEFINED | CFG_ADVANCED, CFG_TYPE_INT | CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL, "List of additional acceptable block device types.\n" diff --git a/lib/filters/filter-composite.c b/lib/filters/filter-composite.c index 8691aeb..ba837af 100644 --- a/lib/filters/filter-composite.c +++ b/lib/filters/filter-composite.c @@ -58,18 +58,6 @@ static void _composite_destroy(struct dev_filter *f) free(f); } -static int _dump(struct dev_filter *f, int merge_existing) -{ - struct dev_filter **filters; - - for (filters = (struct dev_filter **) f->private; *filters; ++filters) - if ((*filters)->dump && - !(*filters)->dump(*filters, merge_existing)) - return_0; - - return 1; -} - static void _wipe(struct dev_filter *f) { struct dev_filter **filters; @@ -102,7 +90,6 @@ struct dev_filter *composite_filter_create(int n, int use_dev_ext_info, struct d cft->passes_filter = use_dev_ext_info ? _and_p_with_dev_ext_info : _and_p; cft->destroy = _composite_destroy; - cft->dump = _dump; cft->wipe = _wipe; cft->use_count = 0; cft->private = filters_copy; diff --git a/lib/filters/filter-persistent.c b/lib/filters/filter-persistent.c index 643c349..9ee3957 100644 --- a/lib/filters/filter-persistent.c +++ b/lib/filters/filter-persistent.c @@ -17,13 +17,10 @@ #include "lib/misc/lib.h" #include "lib/filters/filter.h" #include "lib/config/config.h" -#include "lib/misc/lvm-file.h" struct pfilter { - char *file; struct dm_hash_table *devices; struct dev_filter *real; - struct timespec ctime; struct dev_types *dt; }; @@ -44,11 +41,6 @@ struct pfilter { * times. A device should be checked against the filter once, and then not * need to be checked again. With scanning now controlled, we could probably * do this. - * - * FIXME: "persistent" isn't a great name for this caching filter. This filter - * at one time saved its cache results to a file, which is how it got the name. - * That .cache file does not work well, causes problems, and is no longer used - * by default. The old code for it should be removed. */ /* @@ -76,214 +68,6 @@ static void _persistent_filter_wipe(struct dev_filter *f) dm_hash_wipe(pf->devices); } -static int _read_array(struct pfilter *pf, struct dm_config_tree *cft, - const char *path, void *data) -{ - const struct dm_config_node *cn; - const struct dm_config_value *cv; - - if (!(cn = dm_config_find_node(cft->root, path))) { - log_very_verbose("Couldn't find %s array in '%s'", - path, pf->file); - return 0; - } - - /* - * iterate through the array, adding - * devices as we go. - */ - for (cv = cn->v; cv; cv = cv->next) { - if (cv->type != DM_CFG_STRING) { - log_verbose("Devices array contains a value " - "which is not a string ... ignoring"); - continue; - } - - if (!dm_hash_insert(pf->devices, cv->v.str, data)) - log_verbose("Couldn't add '%s' to filter ... ignoring", - cv->v.str); - /* Populate dev_cache ourselves */ - dev_cache_get(cv->v.str, NULL); - } - return 1; -} - -int persistent_filter_load(struct dev_filter *f, struct dm_config_tree **cft_out) -{ - struct pfilter *pf = (struct pfilter *) f->private; - struct dm_config_tree *cft; - struct stat info; - int r = 0; - - if (obtain_device_list_from_udev()) { - if (!stat(pf->file, &info)) { - log_very_verbose("Obtaining device list from udev. " - "Removing obsolete %s.", - pf->file); - if (unlink(pf->file) < 0 && errno != EROFS) - log_sys_error("unlink", pf->file); - } - return 1; - } - - if (!stat(pf->file, &info)) - lvm_stat_ctim(&pf->ctime, &info); - else { - log_very_verbose("%s: stat failed: %s", pf->file, - strerror(errno)); - return_0; - } - - if (!(cft = config_open(CONFIG_FILE_SPECIAL, pf->file, 1))) - return_0; - - if (!config_file_read(cft)) - goto_out; - - log_debug_devs("Loading persistent filter cache from %s", pf->file); - _read_array(pf, cft, "persistent_filter_cache/valid_devices", - PF_GOOD_DEVICE); - /* We don't gain anything by holding invalid devices */ - /* _read_array(pf, cft, "persistent_filter_cache/invalid_devices", - PF_BAD_DEVICE); */ - - log_very_verbose("Loaded persistent filter cache from %s", pf->file); - - out: - if (r && cft_out) - *cft_out = cft; - else - config_destroy(cft); - return r; -} - -static void _write_array(struct pfilter *pf, FILE *fp, const char *path, - void *data) -{ - void *d; - int first = 1; - char buf[2 * PATH_MAX]; - struct dm_hash_node *n; - - for (n = dm_hash_get_first(pf->devices); n; - n = dm_hash_get_next(pf->devices, n)) { - d = dm_hash_get_data(pf->devices, n); - - if (d != data) - continue; - - if (!first) - fprintf(fp, ",\n"); - else { - fprintf(fp, "\t%s=[\n", path); - first = 0; - } - - dm_escape_double_quotes(buf, dm_hash_get_key(pf->devices, n)); - fprintf(fp, "\t\t\"%s\"", buf); - } - - if (!first) - fprintf(fp, "\n\t]\n"); -} - -static int _persistent_filter_dump(struct dev_filter *f, int merge_existing) -{ - struct pfilter *pf; - char *tmp_file; - struct stat info, info2; - struct timespec ts; - struct dm_config_tree *cft = NULL; - FILE *fp; - int lockfd; - int r = 0; - - if (obtain_device_list_from_udev()) - return 1; - - if (!f) - return_0; - pf = (struct pfilter *) f->private; - - if (!dm_hash_get_num_entries(pf->devices)) { - log_very_verbose("Internal persistent device cache empty " - "- not writing to %s", pf->file); - return 1; - } - if (!dev_cache_has_scanned()) { - log_very_verbose("Device cache incomplete - not writing " - "to %s", pf->file); - return 0; - } - - log_very_verbose("Dumping persistent device cache to %s", pf->file); - - while (1) { - if ((lockfd = fcntl_lock_file(pf->file, F_WRLCK, 0)) < 0) - return_0; - - /* - * Ensure we locked the file we expected - */ - if (fstat(lockfd, &info)) { - log_sys_error("fstat", pf->file); - goto out; - } - if (stat(pf->file, &info2)) { - log_sys_error("stat", pf->file); - goto out; - } - - if (is_same_inode(info, info2)) - break; - - fcntl_unlock_file(lockfd); - } - - /* - * If file contents changed since we loaded it, merge new contents - */ - lvm_stat_ctim(&ts, &info); - if (merge_existing && timespeccmp(&ts, &pf->ctime, !=)) - /* Keep cft open to avoid losing lock */ - persistent_filter_load(f, &cft); - - tmp_file = alloca(strlen(pf->file) + 5); - sprintf(tmp_file, "%s.tmp", pf->file); - - if (!(fp = fopen(tmp_file, "w"))) { - /* EACCES has been reported over NFS */ - if (errno != EROFS && errno != EACCES) - log_sys_error("fopen", tmp_file); - goto out; - } - - fprintf(fp, "# This file is automatically maintained by lvm.\n\n"); - fprintf(fp, "persistent_filter_cache {\n"); - - _write_array(pf, fp, "valid_devices", PF_GOOD_DEVICE); - /* We don't gain anything by remembering invalid devices */ - /* _write_array(pf, fp, "invalid_devices", PF_BAD_DEVICE); */ - - fprintf(fp, "}\n"); - if (lvm_fclose(fp, tmp_file)) - goto_out; - - if (rename(tmp_file, pf->file)) - log_error("%s: rename to %s failed: %s", tmp_file, pf->file, - strerror(errno)); - - r = 1; - -out: - fcntl_unlock_file(lockfd); - - if (cft) - config_destroy(cft); - - return r; -} - static int _lookup_p(struct dev_filter *f, struct device *dev) { struct pfilter *pf = (struct pfilter *) f->private; @@ -361,19 +145,15 @@ static void _persistent_destroy(struct dev_filter *f) log_error(INTERNAL_ERROR "Destroying persistent filter while in use %u times.", f->use_count); dm_hash_destroy(pf->devices); - free(pf->file); pf->real->destroy(pf->real); free(pf); free(f); } -struct dev_filter *persistent_filter_create(struct dev_types *dt, - struct dev_filter *real, - const char *file) +struct dev_filter *persistent_filter_create(struct dev_types *dt, struct dev_filter *real) { struct pfilter *pf; struct dev_filter *f = NULL; - struct stat info; if (!(pf = zalloc(sizeof(*pf)))) { log_error("Allocation of persistent filter failed."); @@ -382,11 +162,6 @@ struct dev_filter *persistent_filter_create(struct dev_types *dt, pf->dt = dt; - if (!(pf->file = strdup(file))) { - log_error("Filename duplication for persistent filter failed."); - goto bad; - } - pf->real = real; if (!(_init_hash(pf))) { @@ -399,23 +174,17 @@ struct dev_filter *persistent_filter_create(struct dev_types *dt, goto bad; } - /* Only merge cache file before dumping it if it changed externally. */ - if (!stat(pf->file, &info)) - lvm_stat_ctim(&pf->ctime, &info); - f->passes_filter = _lookup_p; f->destroy = _persistent_destroy; f->use_count = 0; f->private = pf; f->wipe = _persistent_filter_wipe; - f->dump = _persistent_filter_dump; log_debug_devs("Persistent filter initialised."); return f; bad: - free(pf->file); if (pf->devices) dm_hash_destroy(pf->devices); free(pf); diff --git a/lib/filters/filter.h b/lib/filters/filter.h index ff9cc1b..cdd5a14 100644 --- a/lib/filters/filter.h +++ b/lib/filters/filter.h @@ -27,9 +27,7 @@ struct dev_filter *md_filter_create(struct cmd_context *cmd, struct dev_types *d struct dev_filter *fwraid_filter_create(struct dev_types *dt); struct dev_filter *mpath_filter_create(struct dev_types *dt); struct dev_filter *partitioned_filter_create(struct dev_types *dt); -struct dev_filter *persistent_filter_create(struct dev_types *dt, - struct dev_filter *f, - const char *file); +struct dev_filter *persistent_filter_create(struct dev_types *dt, struct dev_filter *f); struct dev_filter *sysfs_filter_create(void); struct dev_filter *signature_filter_create(struct dev_types *dt); @@ -54,6 +52,4 @@ typedef enum { } filter_mode_t; struct dev_filter *usable_filter_create(struct dev_types *dt, filter_mode_t mode); -int persistent_filter_load(struct dev_filter *f, struct dm_config_tree **cft_out); - #endif /* _LVM_FILTER_H */

1 0

master - Remove independent metadata areas
by David Teigland 13 Jun '18

13 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=17f5572bc972c932bcf62… Commit: 17f5572bc972c932bcf62fc2bff3029268ae0109 Parent: 9df6f601e019d0e5b052d9e6aa0bd9dc732e411d Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 13 12:25:19 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 13 12:25:19 2018 -0500 Remove independent metadata areas in which metadata is stored in files on the local fs instead of on PVs. --- lib/cache/lvmcache.c | 36 ----- lib/commands/toolcontext.c | 3 - lib/commands/toolcontext.h | 1 - lib/config/config_settings.h | 15 +-- lib/format_text/format-text.c | 340 +---------------------------------------- lib/format_text/layout.h | 2 - lib/metadata/metadata.c | 12 -- 7 files changed, 2 insertions(+), 407 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 8db964c..c7e3903 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -60,7 +60,6 @@ struct lvmcache_vginfo { uint32_t mda_checksum; size_t mda_size; int seqno; - int independent_metadata_location; /* metadata read from independent areas */ int scan_summary_mismatch; /* vgsummary from devs had mismatching seqno or checksum */ }; @@ -794,16 +793,6 @@ next: * VG metadata to figure out that a dev with no metadata belongs * to a particular VG, so a device with no mdas will not be linked * to that VG after a scan. - * - * (In the special case where VG metadata is stored in files on the - * file system (configured in lvm.conf), the - * vginfo->independent_metadata_location flag is set during label scan. - * When we get here to rescan, we are revalidating the device to VG - * mapping from label scan by repeating the label scan on a subset of - * devices. If we see independent_metadata_location is set from the - * initial label scan, we know that there is nothing to do because - * there is no device to VG mapping to revalidate, since the VG metadata - * comes directly from files.) */ int lvmcache_label_rescan_vg(struct cmd_context *cmd, const char *vgname, const char *vgid) @@ -821,16 +810,6 @@ int lvmcache_label_rescan_vg(struct cmd_context *cmd, const char *vgname, const if (!(vginfo = lvmcache_vginfo_from_vgname(vgname, vgid))) return_0; - /* - * When the VG metadata is from an independent location, - * then rescanning the devices in the VG won't find the - * metadata, and will destroy the vginfo/info associations - * that were created during label scan when the - * independent locations were read. - */ - if (vginfo->independent_metadata_location) - return 1; - dm_list_iterate_items(info, &vginfo->infos) { if (!(devl = malloc(sizeof(*devl)))) { log_error("device_list element allocation failed"); @@ -897,7 +876,6 @@ int lvmcache_label_scan(struct cmd_context *cmd) struct lvmcache_info *info; struct lvmcache_vginfo *vginfo; struct device_list *devl; - struct format_type *fmt; int vginfo_count = 0; int r = 0; @@ -998,12 +976,6 @@ int lvmcache_label_scan(struct cmd_context *cmd) } } - /* Perform any format-specific scanning e.g. text files */ - if (cmd->independent_metadata_areas) - dm_list_iterate_items(fmt, &cmd->formats) - if (fmt->ops->scan && !fmt->ops->scan(fmt, NULL)) - goto out; - r = 1; out: @@ -2234,14 +2206,6 @@ int lvmcache_vgid_is_cached(const char *vgid) { return 1; } -void lvmcache_set_independent_location(const char *vgname) -{ - struct lvmcache_vginfo *vginfo; - - if ((vginfo = lvmcache_vginfo_from_vgname(vgname, NULL))) - vginfo->independent_metadata_location = 1; -} - uint64_t lvmcache_smallest_mda_size(struct lvmcache_info *info) { if (!info) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index aca93f9..8c18fc6 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -1796,7 +1796,6 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, cmd->threaded = threaded ? 1 : 0; cmd->handles_missing_pvs = 0; cmd->handles_unknown_segments = 0; - cmd->independent_metadata_areas = 0; cmd->ignore_clustered_vgs = 0; cmd->hosttags = 0; dm_list_init(&cmd->arg_value_groups); @@ -1968,8 +1967,6 @@ static void _destroy_formats(struct cmd_context *cmd, struct dm_list *formats) dm_list_del(&fmt->list); fmt->ops->destroy(fmt); } - - cmd->independent_metadata_areas = 0; } static void _destroy_segtypes(struct dm_list *segtypes) diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index fee35d4..18e1b7d 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -146,7 +146,6 @@ struct cmd_context { unsigned metadata_read_only:1; unsigned ignore_clustered_vgs:1; unsigned threaded:1; /* set if running within a thread e.g. clvmd */ - unsigned independent_metadata_areas:1; /* active formats have MDAs outside PVs */ unsigned unknown_system_id:1; unsigned include_historical_lvs:1; /* also process/report/display historical LVs */ unsigned record_historical_lvs:1; /* record historical LVs */ diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 32a6476..8aa4879 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -1509,20 +1509,7 @@ cfg(metadata_pvmetadataignore_CFG, "pvmetadataignore", metadata_CFG_SECTION, CFG cfg(metadata_stripesize_CFG, "stripesize", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_STRIPESIZE, vsn(1, 0, 0), NULL, 0, NULL, NULL) cfg_array(metadata_dirs_CFG, "dirs", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL, - "Directories holding live copies of text format metadata.\n" - "These directories must not be on logical volumes!\n" - "It's possible to use LVM with a couple of directories here,\n" - "preferably on different (non-LV) filesystems, and with no other\n" - "on-disk metadata (pvmetadatacopies = 0). Or this can be in addition\n" - "to on-disk metadata areas. The feature was originally added to\n" - "simplify testing and is not supported under low memory situations -\n" - "the machine could lock up. Never edit any files in these directories\n" - "by hand unless you are absolutely sure you know what you are doing!\n" - "Use the supplied toolset to make changes (e.g. vgcfgrestore).\n" - "#\n" - "Example\n" - "dirs = [ \"/etc/lvm/metadata\", \"/mnt/disk2/lvm/metadata2\" ]\n" - "#\n") + "This setting is no longer used.\n") cfg_section(metadata_disk_areas_CFG_SUBSECTION, "disk_areas", metadata_CFG_SECTION, CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, vsn(1, 0, 0), 0, NULL, NULL) cfg_section(disk_area_CFG_SUBSECTION, "disk_area", metadata_disk_areas_CFG_SUBSECTION, CFG_NAME_VARIABLE | CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, vsn(1, 0, 0), 0, NULL, NULL) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 907944a..a1fce86 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -45,16 +45,6 @@ struct text_fid_context { uint32_t raw_metadata_buf_size; }; -struct dir_list { - struct dm_list list; - char dir[0]; -}; - -struct raw_list { - struct dm_list list; - struct device_area dev_area; -}; - int rlocn_is_ignored(const struct raw_locn *rlocn) { return (rlocn->flags & RAW_LOCN_IGNORED ? 1 : 0); @@ -505,22 +495,6 @@ static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, struct mda_header *md return new_start_offset; } -static int _raw_holds_vgname(struct format_instance *fid, - struct device_area *dev_area, const char *vgname) -{ - int r = 0; - int noprecommit = 0; - struct mda_header *mdah; - - if (!(mdah = raw_read_mda_header(fid->fmt, dev_area, 0))) - return_0; - - if (_read_metadata_location_vg(dev_area, mdah, 0, vgname, &noprecommit)) - r = 1; - - return r; -} - static struct volume_group *_vg_read_raw_area(struct format_instance *fid, const char *vgname, struct device_area *area, @@ -1118,75 +1092,6 @@ static int _vg_remove_file(struct format_instance *fid __attribute__((unused)), return 1; } -static int _scan_file(const struct format_type *fmt, const char *vgname) -{ - struct dirent *dirent; - struct dir_list *dl; - struct dm_list *dir_list; - char *tmp; - DIR *d; - struct volume_group *vg; - struct format_instance *fid; - struct format_instance_ctx fic; - char path[PATH_MAX]; - char *scanned_vgname; - - dir_list = &((struct mda_lists *) fmt->private)->dirs; - - if (!dm_list_empty(dir_list)) - log_debug_metadata("Scanning independent files for %s", vgname ? vgname : "VGs"); - - dm_list_iterate_items(dl, dir_list) { - if (!(d = opendir(dl->dir))) { - log_sys_error("opendir", dl->dir); - continue; - } - while ((dirent = readdir(d))) - if (strcmp(dirent->d_name, ".") && - strcmp(dirent->d_name, "..") && - (!(tmp = strstr(dirent->d_name, ".tmp")) || - tmp != dirent->d_name + strlen(dirent->d_name) - - 4)) { - scanned_vgname = dirent->d_name; - - /* If vgname supplied, only scan that one VG */ - if (vgname && strcmp(vgname, scanned_vgname)) - continue; - - if (dm_snprintf(path, PATH_MAX, "%s/%s", - dl->dir, scanned_vgname) < 0) { - log_error("Name too long %s/%s", - dl->dir, scanned_vgname); - break; - } - - /* FIXME stat file to see if it's changed */ - /* FIXME: Check this fid is OK! */ - fic.type = FMT_INSTANCE_PRIVATE_MDAS; - fic.context.private = NULL; - if (!(fid = _text_create_text_instance(fmt, &fic))) { - stack; - break; - } - - log_debug_metadata("Scanning independent file %s for VG %s", path, scanned_vgname); - - if ((vg = _vg_read_file_name(fid, scanned_vgname, - path))) { - /* FIXME Store creation host in vg */ - lvmcache_update_vg(vg, 0); - lvmcache_set_independent_location(vg->name); - release_vg(vg); - } - } - - if (closedir(d)) - log_sys_error("closedir", dl->dir); - } - - return 1; -} - int read_metadata_location_summary(const struct format_type *fmt, struct mda_header *mdah, int primary_mda, struct device_area *dev_area, struct lvmcache_vgsummary *vgsummary, uint64_t *mda_free_sectors) @@ -1326,55 +1231,6 @@ int read_metadata_location_summary(const struct format_type *fmt, return 1; } -/* used for independent_metadata_areas */ - -static int _scan_raw(const struct format_type *fmt, const char *vgname __attribute__((unused))) -{ - struct raw_list *rl; - struct dm_list *raw_list; - struct volume_group *vg; - struct format_instance fid; - struct lvmcache_vgsummary vgsummary = { 0 }; - struct mda_header *mdah; - - raw_list = &((struct mda_lists *) fmt->private)->raws; - - if (!dm_list_empty(raw_list)) - log_debug_metadata("Scanning independent raw locations for %s", vgname ? vgname : "VGs"); - - fid.fmt = fmt; - dm_list_init(&fid.metadata_areas_in_use); - dm_list_init(&fid.metadata_areas_ignored); - - dm_list_iterate_items(rl, raw_list) { - log_debug_metadata("Scanning independent dev %s", dev_name(rl->dev_area.dev)); - - if (!(mdah = raw_read_mda_header(fmt, &rl->dev_area, 0))) { - stack; - continue; - } - - if (read_metadata_location_summary(fmt, mdah, 0, &rl->dev_area, &vgsummary, NULL)) { - vg = _vg_read_raw_area(&fid, vgsummary.vgname, &rl->dev_area, NULL, NULL, 0, 0); - if (vg) { - lvmcache_update_vg(vg, 0); - lvmcache_set_independent_location(vg->name); - } - } - } - - return 1; -} - -/* used for independent_metadata_areas */ - -static int _text_scan(const struct format_type *fmt, const char *vgname) -{ - _scan_file(fmt, vgname); - _scan_raw(fmt, vgname); - return 1; -} - struct _write_single_mda_baton { const struct format_type *fmt; struct physical_volume *pv; @@ -1535,28 +1391,6 @@ static int _text_pv_needs_rewrite(const struct format_type *fmt, struct physical return 1; } -static int _add_raw(struct dm_list *raw_list, struct device_area *dev_area) -{ - struct raw_list *rl; - - /* Already present? */ - dm_list_iterate_items(rl, raw_list) { - /* FIXME Check size/overlap consistency too */ - if (rl->dev_area.dev == dev_area->dev && - rl->dev_area.start == dev_area->start) - return 1; - } - - if (!(rl = malloc(sizeof(struct raw_list)))) { - log_error("_add_raw allocation failed"); - return 0; - } - memcpy(&rl->dev_area, dev_area, sizeof(*dev_area)); - dm_list_add(raw_list, &rl->list); - - return 1; -} - /* * Copy constructor for a metadata_locn. */ @@ -1709,36 +1543,13 @@ static void _text_destroy_instance(struct format_instance *fid) } } -static void _free_dirs(struct dm_list *dir_list) -{ - struct dm_list *dl, *tmp; - - dm_list_iterate_safe(dl, tmp, dir_list) { - dm_list_del(dl); - free(dl); - } -} - -static void _free_raws(struct dm_list *raw_list) -{ - struct dm_list *rl, *tmp; - - dm_list_iterate_safe(rl, tmp, raw_list) { - dm_list_del(rl); - free(rl); - } -} - static void _text_destroy(struct format_type *fmt) { if (fmt->orphan_vg) free_orphan_vg(fmt->orphan_vg); - if (fmt->private) { - _free_dirs(&((struct mda_lists *) fmt->private)->dirs); - _free_raws(&((struct mda_lists *) fmt->private)->raws); + if (fmt->private) free(fmt->private); - } free(fmt); } @@ -1963,15 +1774,9 @@ static void *_create_text_context(struct dm_pool *mem, struct text_context *tc) static int _create_vg_text_instance(struct format_instance *fid, const struct format_instance_ctx *fic) { - static char path[PATH_MAX]; uint32_t type = fic->type; struct text_fid_context *fidtc; struct metadata_area *mda; - struct mda_context *mdac; - struct dir_list *dl; - struct raw_list *rl; - struct dm_list *dir_list, *raw_list; - struct text_context tc; struct lvmcache_vginfo *vginfo; const char *vg_name, *vg_id; @@ -2001,53 +1806,12 @@ static int _create_vg_text_instance(struct format_instance *fid, return 0; } - if (type & FMT_INSTANCE_AUX_MDAS) { - dir_list = &((struct mda_lists *) fid->fmt->private)->dirs; - dm_list_iterate_items(dl, dir_list) { - if (dm_snprintf(path, PATH_MAX, "%s/%s", dl->dir, vg_name) < 0) { - log_error("Name too long %s/%s", dl->dir, vg_name); - return 0; - } - - if (!(mda = dm_pool_zalloc(fid->mem, sizeof(*mda)))) - return_0; - mda->ops = &_metadata_text_file_ops; - tc.path_live = path; - tc.path_edit = tc.desc = NULL; - mda->metadata_locn = _create_text_context(fid->mem, &tc); - mda->status = 0; - fid_add_mda(fid, mda, NULL, 0, 0); - } - - raw_list = &((struct mda_lists *) fid->fmt->private)->raws; - dm_list_iterate_items(rl, raw_list) { - /* FIXME Cache this; rescan below if some missing */ - if (!_raw_holds_vgname(fid, &rl->dev_area, vg_name)) - continue; - - if (!(mda = dm_pool_zalloc(fid->mem, sizeof(*mda)))) - return_0; - - if (!(mdac = dm_pool_zalloc(fid->mem, sizeof(*mdac)))) - return_0; - mda->metadata_locn = mdac; - /* FIXME Allow multiple dev_areas inside area */ - memcpy(&mdac->area, &rl->dev_area, sizeof(mdac->area)); - mda->ops = &_metadata_text_raw_ops; - mda->status = 0; - /* FIXME MISTAKE? mda->metadata_locn = context; */ - fid_add_mda(fid, mda, NULL, 0, 0); - } - } - if (type & FMT_INSTANCE_MDAS) { if (!(vginfo = lvmcache_vginfo_from_vgname(vg_name, vg_id))) goto_out; if (!lvmcache_fid_add_mdas_vg(vginfo, fid)) goto_out; } - - /* FIXME If PV list or raw metadata area count are not as expected rescan */ } out: @@ -2440,7 +2204,6 @@ static struct format_instance *_text_create_text_instance(const struct format_ty } static struct format_handler _text_handler = { - .scan = _text_scan, .pv_initialise = _text_pv_initialise, .pv_setup = _text_pv_setup, .pv_add_metadata_area = _text_pv_add_metadata_area, @@ -2455,84 +2218,11 @@ static struct format_handler _text_handler = { .destroy = _text_destroy }; -static int _add_dir(const char *dir, struct dm_list *dir_list) -{ - struct dir_list *dl; - - if (dm_create_dir(dir)) { - if (!(dl = malloc(sizeof(struct dm_list) + strlen(dir) + 1))) { - log_error("_add_dir allocation failed"); - return 0; - } - log_very_verbose("Adding text format metadata dir: %s", dir); - strcpy(dl->dir, dir); - dm_list_add(dir_list, &dl->list); - return 1; - } - - return 0; -} - -static int _get_config_disk_area(struct cmd_context *cmd, - const struct dm_config_node *cn, struct dm_list *raw_list) -{ - struct device_area dev_area; - const char *id_str; - struct id id; - - if (!(cn = cn->child)) { - log_error("Empty metadata disk_area section of config file"); - return 0; - } - - if (!dm_config_get_uint64(cn, "start_sector", &dev_area.start)) { - log_error("Missing start_sector in metadata disk_area section " - "of config file"); - return 0; - } - dev_area.start <<= SECTOR_SHIFT; - - if (!dm_config_get_uint64(cn, "size", &dev_area.size)) { - log_error("Missing size in metadata disk_area section " - "of config file"); - return 0; - } - dev_area.size <<= SECTOR_SHIFT; - - if (!dm_config_get_str(cn, "id", &id_str)) { - log_error("Missing uuid in metadata disk_area section " - "of config file"); - return 0; - } - - if (!id_read_format(&id, id_str)) { - log_error("Invalid uuid in metadata disk_area section " - "of config file: %s", id_str); - return 0; - } - - if (!(dev_area.dev = lvmcache_device_from_pvid(cmd, &id, NULL))) { - char buffer[64] __attribute__((aligned(8))); - - if (!id_write_format(&id, buffer, sizeof(buffer))) - log_error("Couldn't find device."); - else - log_error("Couldn't find device with uuid '%s'.", - buffer); - - return 0; - } - - return _add_raw(raw_list, &dev_area); -} - struct format_type *create_text_format(struct cmd_context *cmd) { struct format_instance_ctx fic; struct format_instance *fid; struct format_type *fmt; - const struct dm_config_node *cn; - const struct dm_config_value *cv; struct mda_lists *mda_lists; if (!(fmt = malloc(sizeof(*fmt)))) { @@ -2556,8 +2246,6 @@ struct format_type *create_text_format(struct cmd_context *cmd) return NULL; } - dm_list_init(&mda_lists->dirs); - dm_list_init(&mda_lists->raws); mda_lists->file_ops = &_metadata_text_file_ops; mda_lists->raw_ops = &_metadata_text_raw_ops; fmt->private = (void *) mda_lists; @@ -2576,32 +2264,6 @@ struct format_type *create_text_format(struct cmd_context *cmd) goto bad; } - if ((cn = find_config_tree_array(cmd, metadata_dirs_CFG, NULL))) { - for (cv = cn->v; cv; cv = cv->next) { - if (cv->type != DM_CFG_STRING) { - log_error("Invalid string in config file: " - "metadata/dirs"); - goto bad; - } - - if (!_add_dir(cv->v.str, &mda_lists->dirs)) { - log_error("Failed to add %s to text format " - "metadata directory list ", cv->v.str); - goto bad; - } - cmd->independent_metadata_areas = 1; - } - } - - if ((cn = find_config_tree_node(cmd, metadata_disk_areas_CFG_SUBSECTION, NULL))) { - /* FIXME: disk_areas do not work with lvmetad - the "id" can't be found. */ - for (cn = cn->child; cn; cn = cn->sib) { - if (!_get_config_disk_area(cmd, cn, &mda_lists->raws)) - goto_bad; - cmd->independent_metadata_areas = 1; - } - } - if (!(fmt->orphan_vg = alloc_vg("text_orphan", cmd, fmt->orphan_vg_name))) goto_bad; diff --git a/lib/format_text/layout.h b/lib/format_text/layout.h index 0a63708..e1462f1 100644 --- a/lib/format_text/layout.h +++ b/lib/format_text/layout.h @@ -84,8 +84,6 @@ struct mda_header *raw_read_mda_header(const struct format_type *fmt, struct device_area *dev_area, int primary_mda); struct mda_lists { - struct dm_list dirs; - struct dm_list raws; struct metadata_area_ops *file_ops; struct metadata_area_ops *raw_ops; }; diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index a4308bc..40854de 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -4026,9 +4026,6 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, inconsistent = 0; - /* Independent MDAs aren't supported under low memory */ - if (!cmd->independent_metadata_areas && prioritized_section()) - return_NULL; if (!(fmt = lvmcache_fmt_from_vgname(cmd, vgname, vgid, 0))) return_NULL; @@ -5211,15 +5208,6 @@ uint32_t vg_lock_newname(struct cmd_context *cmd, const char *vgname) if (!lvmcache_fmt_from_vgname(cmd, vgname, NULL, 1)) { lvmcache_label_scan(cmd); if (!lvmcache_fmt_from_vgname(cmd, vgname, NULL, 1)) { - /* Independent MDAs aren't supported under low memory */ - if (!cmd->independent_metadata_areas && critical_section()) { - /* - * FIXME: Disallow calling this function if - * critical_section() is true. - */ - unlock_vg(cmd, NULL, vgname); - return FAILED_LOCKING; - } lvmcache_label_scan(cmd); if (!lvmcache_fmt_from_vgname(cmd, vgname, NULL, 0)) return SUCCESS; /* vgname not found after scanning */

1 0

master - Remove code for loading other metadata formats
by David Teigland 13 Jun '18

13 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9df6f601e019d0e5b052d… Commit: 9df6f601e019d0e5b052d9e6aa0bd9dc732e411d Parent: 885e57cb2723b8f58e8bced534b81d536a1a16a4 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 13 11:32:29 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 13 12:03:42 2018 -0500 Remove code for loading other metadata formats other formats are not used. --- lib/commands/toolcontext.c | 70 ++++---------------------------------------- 1 files changed, 6 insertions(+), 64 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 20a73b7..aca93f9 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -1331,73 +1331,21 @@ struct format_type *get_format_by_name(struct cmd_context *cmd, const char *form return NULL; } +/* FIXME: there's only one format, get rid of the list of formats */ + static int _init_formats(struct cmd_context *cmd) { - const char *format; - struct format_type *fmt; -#ifdef HAVE_LIBDL - const struct dm_config_node *cn; -#endif - -#ifdef HAVE_LIBDL - /* Load any formats in shared libs if not static */ - if (!is_static() && - (cn = find_config_tree_array(cmd, global_format_libraries_CFG, NULL))) { - - const struct dm_config_value *cv; - struct format_type *(*init_format_fn) (struct cmd_context *); - void *lib; - - for (cv = cn->v; cv; cv = cv->next) { - if (cv->type != DM_CFG_STRING) { - log_error("Invalid string in config file: " - "global/format_libraries"); - return 0; - } - if (!(lib = load_shared_library(cmd, cv->v.str, - "format", 0))) - return_0; - - if (!(init_format_fn = dlsym(lib, "init_format"))) { - log_error("Shared library %s does not contain " - "format functions", cv->v.str); - dlclose(lib); - return 0; - } - - if (!(fmt = init_format_fn(cmd))) { - dlclose(lib); - return_0; - } - - fmt->library = lib; - dm_list_add(&cmd->formats, &fmt->list); - } - } -#endif - if (!(fmt = create_text_format(cmd))) return 0; - fmt->library = NULL; - dm_list_add(&cmd->formats, &fmt->list); + dm_list_add(&cmd->formats, &fmt->list); cmd->fmt_backup = fmt; + cmd->default_settings.fmt_name = fmt->name; + cmd->fmt = fmt; - format = find_config_tree_str(cmd, global_format_CFG, NULL); - - dm_list_iterate_items(fmt, &cmd->formats) { - if (!strcasecmp(fmt->name, format) || - (fmt->alias && !strcasecmp(fmt->alias, format))) { - cmd->default_settings.fmt_name = fmt->name; - cmd->fmt = fmt; - return 1; - } - } - - log_error("_init_formats: Default format (%s) not found", format); - return 0; + return 1; } int init_lvmcache_orphans(struct cmd_context *cmd) @@ -2014,17 +1962,11 @@ static void _destroy_formats(struct cmd_context *cmd, struct dm_list *formats) { struct dm_list *fmtl, *tmp; struct format_type *fmt; - void *lib; dm_list_iterate_safe(fmtl, tmp, formats) { fmt = dm_list_item(fmtl, struct format_type); dm_list_del(&fmt->list); - lib = fmt->library; fmt->ops->destroy(fmt); -#ifdef HAVE_LIBDL - if (lib) - dlclose(lib); -#endif } cmd->independent_metadata_areas = 0;

1 0

v2_02_178 annotated tag has been created
by Marian Csontos 13 Jun '18

13 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=97926eae03282419984fe… Commit: 97926eae03282419984fe3264dea6108d55df019 Parent: 0000000000000000000000000000000000000000 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: 2018-06-13 12:16 +0000 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: 2018-06-13 12:16 +0000 annotated tag: v2_02_178 has been created at 97926eae03282419984fe3264dea6108d55df019 (tag) tagging 06accf13953d0bc3a5ffef918e562bad1d802249 (commit) replaces v2_02_178-rc1 Release 2.02.178 Major changes: Remove support for historical lvm1 and GFS pool formats. Major changes in label scanning. Use libaio. See doc/release-notes/2.02.178 for details. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJbIQszAAoJELkRJDHlCQOft38P/3iW0pILWiZudLTPvNmUEQUa 6lY8v8jmWVbWUhvKFYFq3hDTkeS1cz5wem1AfmUJxE+A6Av26ESje5efBPpVCM8d x4OTh1azEHjD2y42tN+pdsJT40ka56XCxPDYSssbv8DMWXjk322orv7zCAAfM9yH ly9KF84mcko09vx5cVBrJiJPGNykdYY+fPuAl7nS1GPf2fWg4yeHHv68ghZ3gh6j To5d2YsflhJIecmUsOI3+MucdPjfxFUjQmTOuaio7UwlXAMNq7wlqdD24zxzkmVg qk0NrvX0SHjh/RF9VhmjF06TCPJdcINf6odJ1sOMYa9HsXyBBZSqdyCNnYbv+IDD 6cT6DranKVaeVC/TMKKWFiw0eaONQ+wvgPdFKmSjsTbiRhtPEEyGQkmL2MguSfoF 30ilB6codzK7A/aH4Lgj/Kd3aV934Ia1Tk0UlQCsNrDMhU/6e3FeoDBfWhJ/zB+5 JTC7dKcCr8JydZJx85Bsls6ak0HmeGMMMYoOJW40RQrUrI3cq6qFD7qWM5h/tI5d EjeP1qIMjAIgob8usHPFQNZh9HiFi2Z6O/UB97AyMIgJ4kMl+ZxbCLvcLzDlOcSn 6z/JpJpzPsrLsZpFFFjlzExioYw7bZKsFQye7FU7J2MpeRHKWxP+ciOop6hh4Cak rhzJRZs2SFt1no/T/cWY =3FED -----END PGP SIGNATURE----- Marian Csontos (1): pre-release

1 0

master - tests: lvmetad-pvscan-cache expect command to fail
by David Teigland 12 Jun '18

12 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=885e57cb2723b8f58e8bc… Commit: 885e57cb2723b8f58e8bced534b81d536a1a16a4 Parent: 7824bb710d376804a7b821730aaa8ff1a65cae21 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 12 12:44:23 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 12 12:44:23 2018 -0500 tests: lvmetad-pvscan-cache expect command to fail --- test/shell/lvmetad-pvscan-cache.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/shell/lvmetad-pvscan-cache.sh b/test/shell/lvmetad-pvscan-cache.sh index e57030d..367220e 100644 --- a/test/shell/lvmetad-pvscan-cache.sh +++ b/test/shell/lvmetad-pvscan-cache.sh @@ -37,8 +37,8 @@ check lv_field $vg1/$lv1 lv_active "" # Check that an LV cannot be activated by pvscan while VG is exported vgexport $vg1 -pvscan --cache -aay "$dev1" -pvscan --cache -aay "$dev2" +not pvscan --cache -aay "$dev1" +not pvscan --cache -aay "$dev2" vgimport $vg1 check lv_exists $vg1 check lv_field $vg1/$lv1 lv_active ""

1 0

master - tests: lvconvert-repair remove cluster test
by David Teigland 12 Jun '18

12 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7824bb710d376804a7b82… Commit: 7824bb710d376804a7b821730aaa8ff1a65cae21 Parent: be3af7f93ef0ca7d65b07863c876a7cbb1e7a239 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 12 11:35:45 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 12 11:35:45 2018 -0500 tests: lvconvert-repair remove cluster test --- test/shell/lvconvert-repair.sh | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/test/shell/lvconvert-repair.sh b/test/shell/lvconvert-repair.sh index 9ee7980..5f7b851 100644 --- a/test/shell/lvconvert-repair.sh +++ b/test/shell/lvconvert-repair.sh @@ -68,11 +68,7 @@ vgreduce --removemissing $vg aux enable_dev "$dev4" # 3-way, mirrored log => 3-way, core log -if test -n "$LVM_TEST_LVMLOCKD"; then recreate_vg_ -else -recreate_vg_ -c n -fi lvcreate -aey --type mirror -m 2 --mirrorlog mirrored --ignoremonitoring -L 1 -n 3way $vg \ "$dev1" "$dev2" "$dev3" "$dev4":0 "$dev5":0 aux disable_dev "$dev4" "$dev5"

1 0

master - Remove the unused lock_hash in lvmcache
by David Teigland 12 Jun '18

12 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=be3af7f93ef0ca7d65b07… Commit: be3af7f93ef0ca7d65b07863c876a7cbb1e7a239 Parent: 981a3ba98ed6815a8b761261ed5652ec81294938 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 12 11:29:56 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 12 11:29:56 2018 -0500 Remove the unused lock_hash in lvmcache It kept track of which VGs were locked, but is no longer used, so remove it. --- lib/cache/lvmcache.c | 56 -------------------------------------------------- 1 files changed, 0 insertions(+), 56 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 757ed88..8db964c 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -67,14 +67,12 @@ struct lvmcache_vginfo { static struct dm_hash_table *_pvid_hash = NULL; static struct dm_hash_table *_vgid_hash = NULL; static struct dm_hash_table *_vgname_hash = NULL; -static struct dm_hash_table *_lock_hash = NULL; static DM_LIST_INIT(_vginfos); static DM_LIST_INIT(_found_duplicate_devs); static DM_LIST_INIT(_unused_duplicate_devs); static int _scanning_in_progress = 0; static int _has_scanned = 0; static int _vgs_locked = 0; -static int _vg_global_lock_held = 0; /* Global lock held when cache wiped? */ static int _found_duplicate_pvs = 0; /* If we never see a duplicate PV we can skip checking for them later. */ int lvmcache_init(struct cmd_context *cmd) @@ -98,19 +96,6 @@ int lvmcache_init(struct cmd_context *cmd) if (!(_pvid_hash = dm_hash_create(128))) return 0; - if (!(_lock_hash = dm_hash_create(128))) - return 0; - - /* - * Reinitialising the cache clears the internal record of - * which locks are held. The global lock can be held during - * this operation so its state must be restored afterwards. - */ - if (_vg_global_lock_held) { - lvmcache_lock_vgname(VG_GLOBAL, 0); - _vg_global_lock_held = 0; - } - return 1; } @@ -131,25 +116,12 @@ void lvmcache_seed_infos_from_lvmetad(struct cmd_context *cmd) void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unused))) { - if (dm_hash_lookup(_lock_hash, vgname)) - log_error(INTERNAL_ERROR "Nested locking attempted on VG %s.", - vgname); - - if (!dm_hash_insert(_lock_hash, vgname, (void *) 1)) - log_error("Cache locking failure for %s", vgname); - if (strcmp(vgname, VG_GLOBAL)) _vgs_locked++; } void lvmcache_unlock_vgname(const char *vgname) { - if (!dm_hash_lookup(_lock_hash, vgname)) - log_error(INTERNAL_ERROR "Attempt to unlock unlocked VG %s.", - vgname); - - dm_hash_remove(_lock_hash, vgname); - /* FIXME Do this per-VG */ if (strcmp(vgname, VG_GLOBAL) && !--_vgs_locked) { dev_size_seqno_inc(); /* invalidate all cached dev sizes */ @@ -1912,26 +1884,8 @@ static void _lvmcache_destroy_vgnamelist(struct lvmcache_vginfo *vginfo) } while ((vginfo = next)); } -static void _lvmcache_destroy_lockname(struct dm_hash_node *n) -{ - char *vgname; - - if (!dm_hash_get_data(_lock_hash, n)) - return; - - vgname = dm_hash_get_key(_lock_hash, n); - - if (!strcmp(vgname, VG_GLOBAL)) - _vg_global_lock_held = 1; - else - log_error(INTERNAL_ERROR "Volume Group %s was not unlocked", - dm_hash_get_key(_lock_hash, n)); -} - void lvmcache_destroy(struct cmd_context *cmd, int retain_orphans, int reset) { - struct dm_hash_node *n; - log_debug_cache("Dropping VG info"); _has_scanned = 0; @@ -1954,16 +1908,6 @@ void lvmcache_destroy(struct cmd_context *cmd, int retain_orphans, int reset) _vgname_hash = NULL; } - if (_lock_hash) { - if (reset) - _vg_global_lock_held = 0; - else - dm_hash_iterate(n, _lock_hash) - _lvmcache_destroy_lockname(n); - dm_hash_destroy(_lock_hash); - _lock_hash = NULL; - } - if (!dm_list_empty(&_vginfos)) log_error(INTERNAL_ERROR "_vginfos list should be empty"); dm_list_init(&_vginfos);

1 0

master - Clean up repair and result values in vg_read
by David Teigland 12 Jun '18

12 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=981a3ba98ed6815a8b761… Commit: 981a3ba98ed6815a8b761261ed5652ec81294938 Parent: 9a8c36b8917edf00ea875e727b0b775ca5a87a43 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 12 09:44:37 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 12 11:08:26 2018 -0500 Clean up repair and result values in vg_read Fix the confusing mix of input and output values in the single variable. --- lib/metadata/metadata-exported.h | 11 ++-- lib/metadata/metadata.c | 104 +++++++++++++++++++------------------- lib/metadata/vg.c | 3 +- tools/toollib.c | 3 +- 4 files changed, 60 insertions(+), 61 deletions(-) diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 36a87b5..501d0fa 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -653,8 +653,6 @@ void pvcreate_params_set_defaults(struct pvcreate_params *pp); int vg_write(struct volume_group *vg); int vg_commit(struct volume_group *vg); void vg_revert(struct volume_group *vg); -struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vg_name, - const char *vgid, uint32_t lockd_state, uint32_t warn_flags, int *consistent); /* * Add/remove LV to/from volume group @@ -689,15 +687,18 @@ int lv_resize(struct logical_volume *lv, /* * Return a handle to VG metadata. */ +struct volume_group *vg_read_internal(struct cmd_context *cmd, + const char *vgname, const char *vgid, + uint32_t lockd_state, uint32_t warn_flags, + int enable_repair, + int *mdas_consistent); struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, const char *vgid, uint32_t read_flags, uint32_t lockd_state); struct volume_group *vg_read_for_update(struct cmd_context *cmd, const char *vg_name, const char *vgid, uint32_t read_flags, uint32_t lockd_state); struct volume_group *vg_read_orphans(struct cmd_context *cmd, uint32_t warn_flags, - const char *orphan_vgname, - int *consistent); - + const char *orphan_vgname); /* * Test validity of a VG handle. */ diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 9dc5627..a4308bc 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3276,8 +3276,7 @@ static int _vg_read_orphan_pv(struct lvmcache_info *info, void *baton) /* Make orphan PVs look like a VG. */ struct volume_group *vg_read_orphans(struct cmd_context *cmd, uint32_t warn_flags, - const char *orphan_vgname, - int *consistent) + const char *orphan_vgname) { const struct format_type *fmt; struct lvmcache_vginfo *vginfo; @@ -3624,7 +3623,9 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, const char *vgid, uint32_t lockd_state, uint32_t warn_flags, - int *consistent, unsigned precommitted) + int enable_repair, + int *mdas_consistent, + unsigned precommitted) { struct format_instance *fid = NULL; struct format_instance_ctx fic; @@ -3637,19 +3638,20 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, int inconsistent_pvs = 0; int inconsistent_mdas = 0; int inconsistent_mda_count = 0; - int strip_historical_lvs = *consistent; - int update_old_pv_ext = *consistent; + int strip_historical_lvs = enable_repair; + int update_old_pv_ext = enable_repair; unsigned use_precommitted = precommitted; struct dm_list *pvids; struct pv_list *pvl; struct dm_list all_pvs; char uuid[64] __attribute__((aligned(8))); int skipped_rescan = 0; - int reappeared = 0; struct cached_vg_fmtdata *vg_fmtdata = NULL; /* Additional format-specific data about the vg */ unsigned use_previous_vg; + *mdas_consistent = 1; + if (is_orphan_vg(vgname)) { log_very_verbose("Reading VG %s", vgname); @@ -3658,7 +3660,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, "with pre-commit."); return NULL; } - return vg_read_orphans(cmd, warn_flags, vgname, consistent); + return vg_read_orphans(cmd, warn_flags, vgname); } uuid[0] = '\0'; @@ -3670,11 +3672,11 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, if (lvmetad_used() && !use_precommitted) { if ((correct_vg = lvmetad_vg_lookup(cmd, vgname, vgid))) { dm_list_iterate_items(pvl, &correct_vg->pvs) - reappeared += _check_reappeared_pv(correct_vg, pvl->pv, *consistent); - if (reappeared && *consistent) - *consistent = _repair_inconsistent_vg(correct_vg, lockd_state); + reappeared += _check_reappeared_pv(correct_vg, pvl->pv, enable_repair); + if (reappeared && enable_repair) + *mdas_consistent = _repair_inconsistent_vg(correct_vg, lockd_state); else - *consistent = !reappeared; + *mdas_consistent = !reappeared; if (_wipe_outdated_pvs(cmd, correct_vg, &correct_vg->pvs_outdated, lockd_state)) { /* clear the list */ dm_list_init(&correct_vg->pvs_outdated); @@ -4153,7 +4155,6 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, log_error(INTERNAL_ERROR "Too many inconsistent MDAs."); if (!inconsistent_mda_count) { - *consistent = 0; _free_pv_list(&all_pvs); return correct_vg; } @@ -4162,13 +4163,9 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, return NULL; } - if (!*consistent) { - _free_pv_list(&all_pvs); - return correct_vg; - } - - if (cmd->is_clvmd) { + if (!enable_repair) { _free_pv_list(&all_pvs); + *mdas_consistent = 0; return correct_vg; } @@ -4181,10 +4178,9 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, /* Don't touch if vgids didn't match */ if (inconsistent_vgid) { - log_warn("WARNING: Inconsistent metadata UUIDs found for " - "volume group %s.", vgname); - *consistent = 0; + log_warn("WARNING: Inconsistent metadata UUIDs found for volume group %s.", vgname); _free_pv_list(&all_pvs); + *mdas_consistent = 0; return correct_vg; } @@ -4225,16 +4221,13 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, } /* We have the VG now finally, check if PV ext info is in sync with VG metadata. */ - if (!cmd->is_clvmd && !_check_or_repair_pv_ext(cmd, correct_vg, lockd_state, - skipped_rescan ? 0 : *consistent, + if (!_check_or_repair_pv_ext(cmd, correct_vg, lockd_state, skipped_rescan ? 0 : enable_repair, &inconsistent_pvs)) { release_vg(correct_vg); return_NULL; } - *consistent = !inconsistent_pvs; - - if (!cmd->is_clvmd && correct_vg && *consistent && !skipped_rescan) { + if (correct_vg && enable_repair && !skipped_rescan) { if (update_old_pv_ext && !_vg_update_old_pv_ext_if_needed(correct_vg)) { release_vg(correct_vg); return_NULL; @@ -4246,6 +4239,9 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, } } + if (inconsistent_pvs) + *mdas_consistent = 0; + return correct_vg; } @@ -4390,12 +4386,14 @@ static int _check_devs_used_correspond_with_vg(struct volume_group *vg) struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vgname, const char *vgid, uint32_t lockd_state, uint32_t warn_flags, - int *consistent) + int enable_repair, + int *mdas_consistent) { struct volume_group *vg; struct lv_list *lvl; - if (!(vg = _vg_read(cmd, vgname, vgid, lockd_state, warn_flags, consistent, 0))) + if (!(vg = _vg_read(cmd, vgname, vgid, lockd_state, + warn_flags, enable_repair, mdas_consistent, 0))) goto_out; if (!check_pv_dev_sizes(vg)) @@ -4435,7 +4433,7 @@ struct volume_group *vg_read_internal(struct cmd_context *cmd, (void) _check_devs_used_correspond_with_vg(vg); out: - if (!*consistent && (warn_flags & WARN_INCONSISTENT)) { + if (!*mdas_consistent && (warn_flags & WARN_INCONSISTENT)) { if (is_orphan_vg(vgname)) log_warn("WARNING: Found inconsistent standalone Physical Volumes."); else @@ -4756,7 +4754,7 @@ static struct volume_group *_recover_vg(struct cmd_context *cmd, const char *vg_name, const char *vgid, int is_shared, uint32_t lockd_state) { - int consistent = 1; + int mdas_consistent = 0; struct volume_group *vg; uint32_t state = 0; @@ -4777,12 +4775,12 @@ static struct volume_group *_recover_vg(struct cmd_context *cmd, lockd_state |= LDST_EX; } - if (!(vg = vg_read_internal(cmd, vg_name, vgid, lockd_state, WARN_PV_READ, &consistent))) { + if (!(vg = vg_read_internal(cmd, vg_name, vgid, lockd_state, 0, 1, &mdas_consistent))) { unlock_vg(cmd, NULL, vg_name); return_NULL; } - if (!consistent) { + if (!mdas_consistent) { release_vg(vg); unlock_vg(cmd, NULL, vg_name); return_NULL; @@ -5015,15 +5013,17 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha uint32_t lockd_state) { struct volume_group *vg = NULL; - int consistent = 1; - int consistent_in; uint32_t failure = 0; uint32_t warn_flags = 0; + int mdas_consistent = 1; + int enable_repair = 1; int is_shared = 0; int skip_lock = is_orphan_vg(vg_name) && (read_flags & PROCESS_SKIP_ORPHAN_LOCK); - if ((read_flags & READ_ALLOW_INCONSISTENT) || (lock_flags != LCK_VG_WRITE)) - consistent = 0; + if ((read_flags & READ_ALLOW_INCONSISTENT) || (lock_flags != LCK_VG_WRITE)) { + enable_repair = 0; + warn_flags |= WARN_INCONSISTENT; + } if (!validate_name(vg_name) && !is_orphan_vg(vg_name)) { log_error("Volume group name \"%s\" has invalid characters.", @@ -5043,18 +5043,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha if (is_orphan_vg(vg_name)) status_flags &= ~LVM_WRITE; - consistent_in = consistent; - - warn_flags = WARN_PV_READ; - if (consistent || (read_flags & READ_WARN_INCONSISTENT)) - warn_flags |= WARN_INCONSISTENT; - - /* If consistent == 1, we get NULL here if correction fails. */ - if (!(vg = vg_read_internal(cmd, vg_name, vgid, lockd_state, warn_flags, &consistent))) { - if (consistent_in && !consistent) { - failure |= FAILED_INCONSISTENT; - goto bad; - } + if (!(vg = vg_read_internal(cmd, vg_name, vgid, lockd_state, warn_flags, enable_repair, &mdas_consistent))) { if (!(read_flags & READ_OK_NOTFOUND)) log_error("Volume group \"%s\" not found", vg_name); failure |= FAILED_NOTFOUND; @@ -5064,16 +5053,27 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha if (!_vg_access_permitted(cmd, vg, lockd_state, &failure)) goto bad; - /* consistent == 0 when VG is not found, but failed == FAILED_NOTFOUND */ - if (!consistent && !failure) { + /* + * If we called vg_read_internal above without repair enabled, + * and the read found inconsistent mdas, then then get a write/ex + * lock and call it again with repair enabled so it will fix + * the inconsistent mdas. + * + * FIXME: factor vg repair out of vg_read. The vg_read caller + * should get an error about the vg have problems and then call + * a repair-specific function if it wants to. (NB there are + * other kinds of repairs hidden in _vg_read that should be + * pulled out in addition to _recover_vg). + */ + if (!mdas_consistent && !enable_repair) { is_shared = vg_is_shared(vg); release_vg(vg); + if (!(vg = _recover_vg(cmd, vg_name, vgid, is_shared, lockd_state))) { if (is_orphan_vg(vg_name)) log_error("Recovery of standalone physical volumes failed."); else - log_error("Recovery of volume group \"%s\" failed.", - vg_name); + log_error("Recovery of volume group \"%s\" failed.", vg_name); failure |= FAILED_RECOVERY; goto bad_no_unlock; } diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c index d837a55..75a054f 100644 --- a/lib/metadata/vg.c +++ b/lib/metadata/vg.c @@ -671,7 +671,6 @@ int vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, { struct pv_list *pvl; struct volume_group *orphan_vg = NULL; - int consistent; int r = 0; const char *name = pv_dev_name(pv); @@ -715,7 +714,7 @@ int vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, vg->extent_count -= pv_pe_count(pv); /* FIXME: we don't need to vg_read the orphan vg here */ - orphan_vg = vg_read_orphans(cmd, 0, vg->fid->fmt->orphan_vg_name, &consistent); + orphan_vg = vg_read_orphans(cmd, 0, vg->fid->fmt->orphan_vg_name); if (vg_read_error(orphan_vg)) goto bad; diff --git a/tools/toollib.c b/tools/toollib.c index fb37d07..7caab45 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -5348,7 +5348,6 @@ int pvcreate_each_device(struct cmd_context *cmd, struct pv_list *vgpvl; struct device_list *devl; const char *pv_name; - int consistent = 0; int must_use_all = (cmd->cname->flags & MUST_USE_ALL_ARGS); int found; unsigned i; @@ -5639,7 +5638,7 @@ do_command: if (pp->preserve_existing && pp->orphan_vg_name) { log_debug("Using existing orphan PVs in %s.", pp->orphan_vg_name); - if (!(orphan_vg = vg_read_internal(cmd, pp->orphan_vg_name, NULL, 0, 0, &consistent))) { + if (!(orphan_vg = vg_read_orphans(cmd, 0, pp->orphan_vg_name))) { log_error("Cannot read orphans VG %s.", pp->orphan_vg_name); goto bad; }

1 0

master - Fix use of orphan lock in commands
by David Teigland 12 Jun '18

12 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9a8c36b8917edf00ea875… Commit: 9a8c36b8917edf00ea875e727b0b775ca5a87a43 Parent: c4153a8dfca9defcea645818dcd547388858c51e Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Jun 11 15:08:23 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 12 09:46:11 2018 -0500 Fix use of orphan lock in commands vgreduce, vgremove and vgcfgrestore were acquiring the orphan lock in the midst of command processing instead of at the start of the command. (The orphan lock moved to being acquired at the start of the command back when pvcreate/vgcreate/vgextend were reworked based on pvcreate_each_device.) vgsplit also needed a small update to avoid reacquiring a VG lock that it already held (for the new VG name). --- lib/metadata/metadata-exported.h | 4 ++++ lib/metadata/metadata.c | 10 ++-------- lib/metadata/vg.c | 14 ++++++-------- tools/vgcfgrestore.c | 12 ++++++------ tools/vgreduce.c | 13 ++++++++++++- tools/vgremove.c | 7 +++++++ tools/vgsplit.c | 2 ++ 7 files changed, 39 insertions(+), 23 deletions(-) diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 641bf49..36a87b5 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -693,6 +693,10 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, const char *vgid, uint32_t read_flags, uint32_t lockd_state); struct volume_group *vg_read_for_update(struct cmd_context *cmd, const char *vg_name, const char *vgid, uint32_t read_flags, uint32_t lockd_state); +struct volume_group *vg_read_orphans(struct cmd_context *cmd, + uint32_t warn_flags, + const char *orphan_vgname, + int *consistent); /* * Test validity of a VG handle. diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 30b22c0..9dc5627 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -600,14 +600,8 @@ int vg_remove(struct volume_group *vg) { int ret; - if (!lock_vol(vg->cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { - log_error("Can't get lock for orphan PVs"); - return 0; - } - ret = vg_remove_direct(vg); - unlock_vg(vg->cmd, vg, VG_ORPHANS); return ret; } @@ -3280,7 +3274,7 @@ static int _vg_read_orphan_pv(struct lvmcache_info *info, void *baton) } /* Make orphan PVs look like a VG. */ -static struct volume_group *_vg_read_orphans(struct cmd_context *cmd, +struct volume_group *vg_read_orphans(struct cmd_context *cmd, uint32_t warn_flags, const char *orphan_vgname, int *consistent) @@ -3664,7 +3658,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, "with pre-commit."); return NULL; } - return _vg_read_orphans(cmd, warn_flags, vgname, consistent); + return vg_read_orphans(cmd, warn_flags, vgname, consistent); } uuid[0] = '\0'; diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c index 400af8d..d837a55 100644 --- a/lib/metadata/vg.c +++ b/lib/metadata/vg.c @@ -671,6 +671,7 @@ int vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, { struct pv_list *pvl; struct volume_group *orphan_vg = NULL; + int consistent; int r = 0; const char *name = pv_dev_name(pv); @@ -679,6 +680,8 @@ int vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, return r; } + log_debug("vgreduce_single VG %s PV %s", vg->name, pv_dev_name(pv)); + if (pv_pe_alloc_count(pv)) { log_error("Physical volume \"%s\" still in use", name); return r; @@ -690,11 +693,6 @@ int vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, return r; } - if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { - log_error("Can't get lock for orphan PVs"); - return r; - } - pvl = find_pv_in_vg(vg, name); if (!archive(vg)) @@ -716,8 +714,8 @@ int vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, vg->free_count -= pv_pe_count(pv) - pv_pe_alloc_count(pv); vg->extent_count -= pv_pe_count(pv); - orphan_vg = vg_read_for_update(cmd, vg->fid->fmt->orphan_vg_name, - NULL, 0, 0); + /* FIXME: we don't need to vg_read the orphan vg here */ + orphan_vg = vg_read_orphans(cmd, 0, vg->fid->fmt->orphan_vg_name, &consistent); if (vg_read_error(orphan_vg)) goto bad; @@ -755,6 +753,6 @@ bad: /* If we are committing here or we had an error then we will free fid */ if (pvl && (commit || r != 1)) free_pv_fid(pvl->pv); - unlock_and_release_vg(cmd, orphan_vg, VG_ORPHANS); + release_vg(orphan_vg); return r; } diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c index ec2c240..0b03687 100644 --- a/tools/vgcfgrestore.c +++ b/tools/vgcfgrestore.c @@ -63,14 +63,14 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) lvmetad_rescan = 1; } - if (!lock_vol(cmd, vg_name, LCK_VG_WRITE, NULL)) { - log_error("Unable to lock volume group %s.", vg_name); + if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { + log_error("Unable to lock orphans."); return ECMD_FAILED; } - if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { - log_error("Unable to lock orphans."); - unlock_vg(cmd, NULL, vg_name); + if (!lock_vol(cmd, vg_name, LCK_VG_WRITE, NULL)) { + log_error("Unable to lock volume group %s.", vg_name); + unlock_vg(cmd, NULL, VG_ORPHANS); return ECMD_FAILED; } @@ -83,8 +83,8 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) arg_str_value(cmd, file_ARG, ""), arg_count(cmd, force_long_ARG)) : backup_restore(cmd, vg_name, arg_count(cmd, force_long_ARG)))) { - unlock_vg(cmd, NULL, VG_ORPHANS); unlock_vg(cmd, NULL, vg_name); + unlock_vg(cmd, NULL, VG_ORPHANS); log_error("Restore failed."); ret = ECMD_FAILED; goto rescan; diff --git a/tools/vgreduce.c b/tools/vgreduce.c index e8479a8..ce3d155 100644 --- a/tools/vgreduce.c +++ b/tools/vgreduce.c @@ -231,9 +231,20 @@ int vgreduce(struct cmd_context *cmd, int argc, char **argv) handle->custom_handle = &vp; if (!repairing) { + if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { + log_error("Can't get lock for orphan PVs"); + ret = ECMD_FAILED; + goto out; + } + /* FIXME: Pass private struct through to all these functions */ /* and update in batch afterwards? */ - ret = process_each_pv(cmd, argc, argv, vg_name, 0, READ_FOR_UPDATE, handle, _vgreduce_single); + + ret = process_each_pv(cmd, argc, argv, vg_name, 0, + READ_FOR_UPDATE | PROCESS_SKIP_ORPHAN_LOCK, + handle, _vgreduce_single); + + unlock_vg(cmd, NULL, VG_ORPHANS); goto out; } diff --git a/tools/vgremove.c b/tools/vgremove.c index 8bf3841..5010e7d 100644 --- a/tools/vgremove.c +++ b/tools/vgremove.c @@ -108,10 +108,17 @@ int vgremove(struct cmd_context *cmd, int argc, char **argv) */ cmd->lockd_gl_disable = 1; + if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { + log_error("Can't get lock for orphan PVs"); + return ECMD_FAILED; + } + cmd->handles_missing_pvs = 1; ret = process_each_vg(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE, 0, NULL, &_vgremove_single); + unlock_vg(cmd, NULL, VG_ORPHANS); + return ret; } diff --git a/tools/vgsplit.c b/tools/vgsplit.c index 1e46e7e..7ec00f8 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -748,8 +748,10 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) /* * Finally, remove the EXPORTED flag from the new VG and write it out. + * We need to unlock vg_to because vg_read_for_update wants to lock it. */ if (!test_mode()) { + unlock_vg(cmd, NULL, vg_name_to); release_vg(vg_to); vg_to = vg_read_for_update(cmd, vg_name_to, NULL, READ_ALLOW_EXPORTED, 0);

1 0

master - Remove checking for locked VGs
by David Teigland 12 Jun '18

12 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c4153a8dfca9defcea645… Commit: c4153a8dfca9defcea645818dcd547388858c51e Parent: 3b6b7f8f9be1841fc7d283203a1f3261e7e3622a Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Jun 11 12:25:52 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 12 09:46:04 2018 -0500 Remove checking for locked VGs A few places were calling a function to check if a VG lock was held. The only place it was actually needed is for pvcreate which wants to do its own locking (and scanning) around process_each_pv. The locking/scanning exceptions for pvcreate in process_each_pv/vg_read can be enabled by just passing a couple of flags instead of checking if the VG is already locked. This also means that these special cases won't be enabled unknowingly in other places where they shouldn't be used. --- lib/cache/lvmcache.c | 8 --- lib/cache/lvmcache.h | 1 - lib/metadata/metadata-exported.h | 2 + lib/metadata/metadata.c | 18 ++----- tools/toollib.c | 94 +++++++++++--------------------------- 5 files changed, 34 insertions(+), 89 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 923fb2e..757ed88 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -142,14 +142,6 @@ void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unuse _vgs_locked++; } -int lvmcache_vgname_is_locked(const char *vgname) -{ - if (!_lock_hash) - return 0; - - return dm_hash_lookup(_lock_hash, is_orphan_vg(vgname) ? VG_ORPHANS : vgname) ? 1 : 0; -} - void lvmcache_unlock_vgname(const char *vgname) { if (!dm_hash_lookup(_lock_hash, vgname)) diff --git a/lib/cache/lvmcache.h b/lib/cache/lvmcache.h index 536f6fd..008f110 100644 --- a/lib/cache/lvmcache.h +++ b/lib/cache/lvmcache.h @@ -105,7 +105,6 @@ struct device *lvmcache_device_from_pvid(struct cmd_context *cmd, const struct i const char *lvmcache_vgname_from_info(struct lvmcache_info *info); const struct format_type *lvmcache_fmt_from_info(struct lvmcache_info *info); int lvmcache_vgs_locked(void); -int lvmcache_vgname_is_locked(const char *vgname); void lvmcache_seed_infos_from_lvmetad(struct cmd_context *cmd); diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index bcd10a3..641bf49 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -178,6 +178,8 @@ #define READ_OK_NOTFOUND 0x00040000U #define READ_WARN_INCONSISTENT 0x00080000U #define READ_FOR_UPDATE 0x00100000U /* A meta-flag, useful with toollib for_each_* functions. */ +#define PROCESS_SKIP_SCAN 0x00200000U /* skip lvmcache_label_scan in process_each_pv */ +#define PROCESS_SKIP_ORPHAN_LOCK 0x00400000U /* skip lock_vol(VG_ORPHAN) in vg_read */ /* vg's "read_status" field */ #define FAILED_INCONSISTENT 0x00000001U diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index ff8f1a5..30b22c0 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3049,12 +3049,6 @@ int vg_commit(struct volume_group *vg) int cache_updated = 0; struct pv_list *pvl; - if (!lvmcache_vgname_is_locked(vg->name)) { - log_error(INTERNAL_ERROR "Attempt to write new VG metadata " - "without locking %s", vg->name); - return cache_updated; - } - cache_updated = _vg_commit_mdas(vg); set_vg_notify(vg->cmd); @@ -5032,7 +5026,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha uint32_t failure = 0; uint32_t warn_flags = 0; int is_shared = 0; - int already_locked; + int skip_lock = is_orphan_vg(vg_name) && (read_flags & PROCESS_SKIP_ORPHAN_LOCK); if ((read_flags & READ_ALLOW_INCONSISTENT) || (lock_flags != LCK_VG_WRITE)) consistent = 0; @@ -5043,15 +5037,13 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha return NULL; } - already_locked = lvmcache_vgname_is_locked(vg_name); - - if (!already_locked && + if (!skip_lock && !lock_vol(cmd, vg_name, lock_flags, NULL)) { log_error("Can't get lock for %s", vg_name); return _vg_make_handle(cmd, vg, FAILED_LOCKING); } - if (already_locked) + if (skip_lock) log_very_verbose("Locking %s already done", vg_name); if (is_orphan_vg(vg_name)) @@ -5119,13 +5111,13 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha goto_bad; if (!(vg = _vg_make_handle(cmd, vg, failure)) || vg_read_error(vg)) - if (!already_locked) + if (!skip_lock) unlock_vg(cmd, vg, vg_name); return vg; bad: - if (!already_locked) + if (!skip_lock) unlock_vg(cmd, vg, vg_name); bad_no_unlock: diff --git a/tools/toollib.c b/tools/toollib.c index 7da1703..fb37d07 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1926,7 +1926,6 @@ static int _process_vgnameid_list(struct cmd_context *cmd, uint32_t read_flags, int skip; int notfound; int process_all = 0; - int already_locked; int do_report_ret_code = 1; log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_VG); @@ -1969,8 +1968,6 @@ static int _process_vgnameid_list(struct cmd_context *cmd, uint32_t read_flags, continue; } - already_locked = lvmcache_vgname_is_locked(vg_name); - vg = vg_read(cmd, vg_name, vg_uuid, read_flags, lockd_state); if (_ignore_vg(vg, vg_name, arg_vgnames, read_flags, &skip, &notfound)) { stack; @@ -1998,7 +1995,7 @@ static int _process_vgnameid_list(struct cmd_context *cmd, uint32_t read_flags, ret_max = ret; } - if (!vg_read_error(vg) && !already_locked) + if (!vg_read_error(vg)) unlock_vg(cmd, vg, vg_name); endvg: release_vg(vg); @@ -3577,7 +3574,6 @@ static int _process_lv_vgnameid_list(struct cmd_context *cmd, uint32_t read_flag int ret; int skip; int notfound; - int already_locked; int do_report_ret_code = 1; log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_VG); @@ -3638,8 +3634,6 @@ static int _process_lv_vgnameid_list(struct cmd_context *cmd, uint32_t read_flag continue; } - already_locked = lvmcache_vgname_is_locked(vg_name); - vg = vg_read(cmd, vg_name, vg_uuid, read_flags, lockd_state); if (_ignore_vg(vg, vg_name, arg_vgnames, read_flags, &skip, &notfound)) { stack; @@ -3658,8 +3652,7 @@ static int _process_lv_vgnameid_list(struct cmd_context *cmd, uint32_t read_flag if (ret > ret_max) ret_max = ret; - if (!already_locked) - unlock_vg(cmd, vg, vg_name); + unlock_vg(cmd, vg, vg_name); endvg: release_vg(vg); if (!lockd_vg(cmd, vg_name, "un", 0, &lockd_state)) @@ -4299,7 +4292,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags, int ret; int skip; int notfound; - int already_locked; + int skip_lock; int do_report_ret_code = 1; log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_VG); @@ -4333,7 +4326,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags, log_debug("Processing PVs in VG %s", vg_name); - already_locked = lvmcache_vgname_is_locked(vg_name); + skip_lock = is_orphan_vg(vg_name) && (read_flags & PROCESS_SKIP_ORPHAN_LOCK); vg = vg_read(cmd, vg_name, vg_uuid, read_flags, lockd_state); if (_ignore_vg(vg, vg_name, NULL, read_flags, &skip, &notfound)) { @@ -4361,7 +4354,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags, if (ret > ret_max) ret_max = ret; - if (!skip && !already_locked) + if (!skip && !skip_lock) unlock_vg(cmd, vg, vg->name); endvg: release_vg(vg); @@ -4400,7 +4393,6 @@ int process_each_pv(struct cmd_context *cmd, struct device_id_list *dil; int process_all_pvs; int process_all_devices; - int orphans_locked; int ret_max = ECMD_PROCESSED; int ret; @@ -4448,8 +4440,6 @@ int process_each_pv(struct cmd_context *cmd, return ECMD_FAILED; } - orphans_locked = lvmcache_vgname_is_locked(VG_ORPHANS); - process_all_pvs = dm_list_empty(&arg_pvnames) && dm_list_empty(&arg_tags); process_all_devices = process_all_pvs && (cmd->cname->flags & ENABLE_ALL_DEVS) && all_is_set; @@ -4460,22 +4450,8 @@ int process_each_pv(struct cmd_context *cmd, goto_out; } - /* - * This full scan would be done by _get_all_devices() if - * it were not done here first. It's called here first - * so that get_vgnameids() will look at any new devices. - * When orphans is already locked, these steps are done - * before process_each_pv is called. - */ - if (!trust_cache() && !orphans_locked) { - lvmcache_destroy(cmd, 1, 0); - - /* - * Scan all devices to populate lvmcache with initial - * list of PVs and VGs. - */ + if (!(read_flags & PROCESS_SKIP_SCAN)) lvmcache_label_scan(cmd); - } if (!get_vgnameids(cmd, &all_vgnameids, only_this_vgname, 1)) { ret_max = ret; @@ -4546,11 +4522,9 @@ int process_each_pv(struct cmd_context *cmd, ret_max = ret; /* - * If the orphans lock was held, there shouldn't be missed devices. If - * there were, we cannot clear the cache while holding the orphans lock - * anyway. + * If the orphans lock was held, there shouldn't be missed devices. */ - if (orphans_locked) + if (read_flags & PROCESS_SKIP_ORPHAN_LOCK) goto skip_missed; /* @@ -4577,12 +4551,7 @@ int process_each_pv(struct cmd_context *cmd, log_verbose("Some PVs were not found in first search, retrying."); - lvmcache_destroy(cmd, 0, 0); - if (!lvmcache_init(cmd)) { - log_error("Failed to initalize lvm cache."); - ret_max = ECMD_FAILED; - goto out; - } + lvmcache_label_scan(cmd); lvmcache_seed_infos_from_lvmetad(cmd); ret = _process_pvs_in_vgs(cmd, read_flags, &all_vgnameids, &all_devices, @@ -5413,25 +5382,16 @@ int pvcreate_each_device(struct cmd_context *cmd, dm_list_add(&pp->arg_devices, &pd->list); } - /* - * Clear the cache before acquiring the orphan lock. (Clearing the - * cache with locks held is an error.) We want the orphan lock - * acquired before process_each_pv. If the orphan lock is not held - * when process_each_pv is called, then process_each_pv clears the - * cache. - */ - lvmcache_destroy(cmd, 1, 0); - - /* - * If no prompts require a user response, this orphan lock is held - * throughout, and pvcreate_each_device() returns with it held so that - * vgcreate/vgextend use the PVs created here to add to a VG. - */ if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { log_error("Can't get lock for orphan PVs."); return 0; } + /* + * Scan before calling process_each_pv so we can set up the PV args + * first. We can then skip the scan that would normally occur at the + * beginning of process_each_pv. + */ lvmcache_label_scan(cmd); /* @@ -5455,8 +5415,8 @@ int pvcreate_each_device(struct cmd_context *cmd, * If it's added to arg_process but needs a prompt or force option, then * a corresponding prompt entry is added to pp->prompts. */ - process_each_pv(cmd, 0, NULL, NULL, 1, 0, handle, - pp->is_remove ? _pvremove_check_single : _pvcreate_check_single); + process_each_pv(cmd, 0, NULL, NULL, 1, PROCESS_SKIP_SCAN | PROCESS_SKIP_ORPHAN_LOCK, + handle, pp->is_remove ? _pvremove_check_single : _pvcreate_check_single); /* * A fatal error was found while checking. @@ -5538,9 +5498,11 @@ int pvcreate_each_device(struct cmd_context *cmd, goto do_command; /* - * Prompts require asking the user, so release the orphans lock, ask - * the questions, reacquire the orphans lock, verify that the PVs were - * not used during the questions, then do the create steps. + * Prompts require asking the user and make take some time, during + * which we don't want to block other commands. So, release the lock + * to prevent blocking other commands while we wait. After a response + * from the user, reacquire the lock, verify that the PVs were not used + * during the wait, then do the create steps. */ unlock_vg(cmd, NULL, VG_ORPHANS); @@ -5575,14 +5537,11 @@ int pvcreate_each_device(struct cmd_context *cmd, } /* - * Clear the cache, reacquire the orphans write lock, then check again - * that the devices can still be used. If the second loop finds them - * changed, or can't find them any more, then they aren't used. - * Clear the cache here before locking orphans, since it won't be - * done by process_each_pv with orphans already locked. + * Reacquire the lock that was released above before waiting, then + * check again that the devices can still be used. If the second loop + * finds them changed, or can't find them any more, then they aren't + * used. */ - lvmcache_destroy(cmd, 1, 0); - if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { log_error("Can't get lock for orphan PVs."); goto out; @@ -5604,7 +5563,8 @@ int pvcreate_each_device(struct cmd_context *cmd, */ dm_list_splice(&pp->arg_confirm, &pp->arg_process); - process_each_pv(cmd, 0, NULL, NULL, 1, 0, handle, _pv_confirm_single); + process_each_pv(cmd, 0, NULL, NULL, 1, PROCESS_SKIP_SCAN | PROCESS_SKIP_ORPHAN_LOCK, + handle, _pv_confirm_single); dm_list_iterate_items(pd, &pp->arg_confirm) log_error("Device %s %s.", pd->name, dev_cache_filtered_reason(pd->name));

1 0

master - lvmlockd: skip repair lock upgrade for non shared vgs
by David Teigland 12 Jun '18

12 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3b6b7f8f9be1841fc7d28… Commit: 3b6b7f8f9be1841fc7d283203a1f3261e7e3622a Parent: 1c79cf9830390cfbe31d3146da66cbe36ac3e72a Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 12 09:25:51 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 12 09:44:05 2018 -0500 lvmlockd: skip repair lock upgrade for non shared vgs Only attempt lvmlockd lock upgrade for shared VGs. --- lib/metadata/metadata.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index e45f5c1..ff8f1a5 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -4765,7 +4765,8 @@ int vg_check_status(const struct volume_group *vg, uint64_t status) * VG is left unlocked on failure */ static struct volume_group *_recover_vg(struct cmd_context *cmd, - const char *vg_name, const char *vgid, uint32_t lockd_state) + const char *vg_name, const char *vgid, + int is_shared, uint32_t lockd_state) { int consistent = 1; struct volume_group *vg; @@ -4779,7 +4780,7 @@ static struct volume_group *_recover_vg(struct cmd_context *cmd, /* * Convert vg lock in lvmlockd from sh to ex. */ - if (!(lockd_state & LDST_FAIL) && !(lockd_state & LDST_EX)) { + if (is_shared && !(lockd_state & LDST_FAIL) && !(lockd_state & LDST_EX)) { log_debug("Upgrade lvmlockd lock to repair vg %s.", vg_name); if (!lockd_vg(cmd, vg_name, "ex", 0, &state)) { log_warn("Skip repair for shared VG without exclusive lock."); @@ -5030,6 +5031,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha int consistent_in; uint32_t failure = 0; uint32_t warn_flags = 0; + int is_shared = 0; int already_locked; if ((read_flags & READ_ALLOW_INCONSISTENT) || (lock_flags != LCK_VG_WRITE)) @@ -5078,8 +5080,9 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha /* consistent == 0 when VG is not found, but failed == FAILED_NOTFOUND */ if (!consistent && !failure) { + is_shared = vg_is_shared(vg); release_vg(vg); - if (!(vg = _recover_vg(cmd, vg_name, vgid, lockd_state))) { + if (!(vg = _recover_vg(cmd, vg_name, vgid, is_shared, lockd_state))) { if (is_orphan_vg(vg_name)) log_error("Recovery of standalone physical volumes failed."); else

1 0

master - build: ensure configure.h comes first
by Zdenek Kabelac 11 Jun '18

11 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1c79cf9830390cfbe31d3… Commit: 1c79cf9830390cfbe31d3146da66cbe36ac3e72a Parent: 77d5caae90a898888d32603bc7823de40f426c06 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Jun 11 22:38:51 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 11 22:38:51 2018 +0200 build: ensure configure.h comes first Fix header order so configure.h is 1st. included header. --- device_mapper/libdm-report.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/device_mapper/libdm-report.c b/device_mapper/libdm-report.c index e437e4c..cbd0d16 100644 --- a/device_mapper/libdm-report.c +++ b/device_mapper/libdm-report.c @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "base/memory/zalloc.h" #include "misc/dmlib.h" +#include "base/memory/zalloc.h" #include <ctype.h> #include <math.h> /* fabs() */

1 0

master - snapshot: improve checking of merging snapshot
by Zdenek Kabelac 11 Jun '18

11 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=77d5caae90a898888d326… Commit: 77d5caae90a898888d32603bc7823de40f426c06 Parent: 75fed05d3ef648583764ff56cc577e0f3eba1bba Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Jun 11 22:19:20 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 11 22:25:42 2018 +0200 snapshot: improve checking of merging snapshot Add runtime detection for 'lvs -o+seg_monitor' and 'vgchange --monitor'. This fix should avoid unnecessary timeout on systemd shutdown. --- WHATS_NEW | 1 + lib/activate/activate.c | 3 ++- lib/metadata/lv.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 162b584..a875553 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 3.0.0 ============= + Fix unmonitoring of merging snapshots. Cache can uses metadata format 2 with cleaner policy. Fix check if resized PV can also fit metadata area. Avoid showing internal error in lvs output or pvmoved LVs. diff --git a/lib/activate/activate.c b/lib/activate/activate.c index ce67ec8..8f4462a 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -1735,7 +1735,8 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume * In case of a snapshot device, we monitor lv->snapshot->lv, * not the actual LV itself. */ - if (lv_is_cow(lv) && (laopts->no_merging || !lv_is_merging_cow(lv))) { + if (lv_is_cow(lv) && (laopts->no_merging || !lv_is_merging_cow(lv) || + lv_has_target_type(lv->vg->cmd->mem, lv, NULL, TARGET_NAME_SNAPSHOT))) { if (!(r = monitor_dev_for_events(cmd, lv->snapshot->lv, NULL, monitor))) stack; return r; diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index 14d7312..7ab06cb 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -301,7 +301,8 @@ char *lvseg_monitor_dup(struct dm_pool *mem, const struct lv_segment *seg) int pending = 0, monitored = 0; struct lv_segment *segm = (struct lv_segment *) seg; - if (lv_is_cow(seg->lv) && !lv_is_merging_cow(seg->lv)) + if (lv_is_cow(seg->lv) && (!lv_is_merging_cow(seg->lv) || + lv_has_target_type(seg->lv->vg->cmd->mem, seg->lv, NULL, TARGET_NAME_SNAPSHOT))) segm = first_seg(seg->lv->snapshot->lv); // log_debug("Query LV:%s mon:%s segm:%s tgtm:%p segmon:%d statusm:%d", seg->lv->name, segm->lv->name, segm->segtype->name, segm->segtype->ops->target_monitored, seg_monitored(segm), (int)(segm->status & PVMOVE));

1 0

master - vgchange: start polling with option
by Zdenek Kabelac 11 Jun '18

11 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=75fed05d3ef648583764f… Commit: 75fed05d3ef648583764ff56cc577e0f3eba1bba Parent: e82b70e7399b20dd201e8d7fad182ce276596fb2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Jun 11 22:18:00 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 11 22:25:42 2018 +0200 vgchange: start polling with option Polling start either with '--refresh' or with '--poll' option specified. --- tools/vgchange.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/vgchange.c b/tools/vgchange.c index b07057f..b427a81 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -662,6 +662,7 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name, } if (!arg_is_set(cmd, refresh_ARG) && + arg_is_set(cmd, poll_ARG) && !vgchange_background_polling(cmd, vg)) return_ECMD_FAILED;

1 0

master - build: use internal libs for lvm2cmd
by Zdenek Kabelac 11 Jun '18

11 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e82b70e7399b20dd201e8… Commit: e82b70e7399b20dd201e8d7fad182ce276596fb2 Parent: 9c7ee1e1c4e436060d3b1970c73084d41012f108 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Jun 11 22:15:49 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 11 22:25:42 2018 +0200 build: use internal libs for lvm2cmd --- tools/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 2dbd93b..9742842 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -177,7 +177,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS) $(Q) $(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \ $(CFLAGS) $(CLDFLAGS) -o $@ \ @CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@ \ - $(LVMLIBS) $(LIBS) + $(LVMLIBS) $(INTERNAL_LIBS) $(LIBS) liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX) @echo " [LN] $@"

1 0

master - build: link dmeventd plugins with internal libs
by Zdenek Kabelac 11 Jun '18

11 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9c7ee1e1c4e436060d3b1… Commit: 9c7ee1e1c4e436060d3b1970c73084d41012f108 Parent: 5c2f7f083cc518b11e657b294f42e38a688404e1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Jun 11 21:09:45 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 11 22:25:42 2018 +0200 build: link dmeventd plugins with internal libs --- daemons/dmeventd/plugins/lvm2/Makefile.in | 2 +- daemons/dmeventd/plugins/mirror/Makefile.in | 2 +- daemons/dmeventd/plugins/raid/Makefile.in | 2 +- daemons/dmeventd/plugins/snapshot/Makefile.in | 2 +- daemons/dmeventd/plugins/thin/Makefile.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/daemons/dmeventd/plugins/lvm2/Makefile.in b/daemons/dmeventd/plugins/lvm2/Makefile.in index 7e4696c..e4eedc6 100644 --- a/daemons/dmeventd/plugins/lvm2/Makefile.in +++ b/daemons/dmeventd/plugins/lvm2/Makefile.in @@ -24,7 +24,7 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -LIBS += @LVM2CMD_LIB@ $(PTHREAD_LIBS) +LIBS += @LVM2CMD_LIB@ $(INTERNAL_LIBS) $(PTHREAD_LIBS) install_lvm2: install_lib_shared diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in index 22832dd..a28b9e5 100644 --- a/daemons/dmeventd/plugins/mirror/Makefile.in +++ b/daemons/dmeventd/plugins/mirror/Makefile.in @@ -30,7 +30,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow include $(top_builddir)/make.tmpl -LIBS += -ldevmapper-event-lvm2 +LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS) install_lvm2: install_dm_plugin diff --git a/daemons/dmeventd/plugins/raid/Makefile.in b/daemons/dmeventd/plugins/raid/Makefile.in index 54343b1..d38ca15 100644 --- a/daemons/dmeventd/plugins/raid/Makefile.in +++ b/daemons/dmeventd/plugins/raid/Makefile.in @@ -29,7 +29,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow include $(top_builddir)/make.tmpl -LIBS += -ldevmapper-event-lvm2 +LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS) install_lvm2: install_dm_plugin diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in index 75f4342..ab46b43 100644 --- a/daemons/dmeventd/plugins/snapshot/Makefile.in +++ b/daemons/dmeventd/plugins/snapshot/Makefile.in @@ -26,7 +26,7 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -LIBS += -ldevmapper-event-lvm2 +LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS) install_lvm2: install_dm_plugin diff --git a/daemons/dmeventd/plugins/thin/Makefile.in b/daemons/dmeventd/plugins/thin/Makefile.in index 9f1c2b3..b1e3e1b 100644 --- a/daemons/dmeventd/plugins/thin/Makefile.in +++ b/daemons/dmeventd/plugins/thin/Makefile.in @@ -29,7 +29,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow include $(top_builddir)/make.tmpl -LIBS += -ldevmapper-event-lvm2 +LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS) install_lvm2: install_dm_plugin

1 0

master - build: make generate
by Zdenek Kabelac 11 Jun '18

11 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5c2f7f083cc518b11e657… Commit: 5c2f7f083cc518b11e657b294f42e38a688404e1 Parent: 2a307ce33c515268763c714275bd4a85bf9fd0fa Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 8 22:16:00 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 11 22:25:42 2018 +0200 build: make generate --- conf/example.conf.in | 43 ++++--------------------------------------- man/lvchange.8_pregen | 14 ++++++++++++++ man/lvconvert.8_pregen | 14 ++++++++++++++ man/lvcreate.8_pregen | 14 ++++++++++++++ man/lvdisplay.8_pregen | 10 ++++++++++ man/lvextend.8_pregen | 14 ++++++++++++++ man/lvm-fullreport.8_pregen | 8 ++++---- man/lvm-lvpoll.8_pregen | 10 ++++++++++ man/lvmconfig.8_pregen | 10 ++++++++++ man/lvmdiskscan.8_pregen | 10 ++++++++++ man/lvreduce.8_pregen | 10 ++++++++++ man/lvremove.8_pregen | 10 ++++++++++ man/lvrename.8_pregen | 10 ++++++++++ man/lvresize.8_pregen | 14 ++++++++++++++ man/lvs.8_pregen | 8 ++++---- man/lvscan.8_pregen | 10 ++++++++++ man/pvchange.8_pregen | 10 ++++++++++ man/pvck.8_pregen | 10 ++++++++++ man/pvcreate.8_pregen | 10 ++++++++++ man/pvdisplay.8_pregen | 10 ++++++++++ man/pvmove.8_pregen | 10 ++++++++++ man/pvremove.8_pregen | 10 ++++++++++ man/pvresize.8_pregen | 10 ++++++++++ man/pvs.8_pregen | 8 ++++---- man/pvscan.8_pregen | 10 ++++++++++ man/vgcfgbackup.8_pregen | 10 ++++++++++ man/vgcfgrestore.8_pregen | 14 ++++++++++++++ man/vgchange.8_pregen | 29 ++++++++++++++--------------- man/vgck.8_pregen | 10 ++++++++++ man/vgconvert.8_pregen | 10 ++++++++++ man/vgcreate.8_pregen | 17 ++++++++++++----- man/vgdisplay.8_pregen | 10 ++++++++++ man/vgexport.8_pregen | 10 ++++++++++ man/vgextend.8_pregen | 10 ++++++++++ man/vgimport.8_pregen | 10 ++++++++++ man/vgimportclone.8_pregen | 10 ++++++++++ man/vgmerge.8_pregen | 10 ++++++++++ man/vgmknodes.8_pregen | 10 ++++++++++ man/vgreduce.8_pregen | 14 ++++++++++++++ man/vgremove.8_pregen | 10 ++++++++++ man/vgrename.8_pregen | 10 ++++++++++ man/vgs.8_pregen | 8 ++++---- man/vgscan.8_pregen | 10 ++++++++++ man/vgsplit.8_pregen | 20 ++++++++++---------- 44 files changed, 444 insertions(+), 85 deletions(-) diff --git a/conf/example.conf.in b/conf/example.conf.in index 4c62aad..97daab2 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -728,34 +728,7 @@ global { etc = "@CONFDIR@" # Configuration option global/locking_type. - # Type of locking to use. - # - # Accepted values: - # 0 - # Turns off locking. Warning: this risks metadata corruption if - # commands run concurrently. - # 1 - # LVM uses local file-based locking, the standard mode. - # 2 - # LVM uses the external shared library locking_library. - # 3 - # LVM uses built-in clustered locking with clvmd. - # This is incompatible with lvmetad. If use_lvmetad is enabled, - # LVM prints a warning and disables lvmetad use. - # 4 - # LVM uses read-only locking which forbids any operations that - # might change metadata. - # 5 - # Offers dummy locking for tools that do not need any locks. - # You should not need to set this directly; the tools will select - # when to use it instead of the configured locking_type. - # Do not use lvmetad or the kernel device-mapper driver with this - # locking type. It is used by the --readonly option that offers - # read-only access to Volume Group metadata that cannot be locked - # safely because it belongs to an inaccessible domain and might be - # in use, for example a virtual machine image or a disk that is - # shared by a clustered machine. - # + # This setting is no longer used. locking_type = 1 # Configuration option global/wait_for_locks. @@ -763,19 +736,11 @@ global { wait_for_locks = 1 # Configuration option global/fallback_to_clustered_locking. - # Attempt to use built-in cluster locking if locking_type 2 fails. - # If using external locking (type 2) and initialisation fails, with - # this enabled, an attempt will be made to use the built-in clustered - # locking. Disable this if using a customised locking_library. + # This setting is no longer used. fallback_to_clustered_locking = 1 # Configuration option global/fallback_to_local_locking. - # Use locking_type 1 (local) if locking_type 2 or 3 fail. - # If an attempt to initialise type 2 or type 3 locking failed, perhaps - # because cluster components such as clvmd are not running, with this - # enabled, an attempt will be made to use local file-based locking - # (type 1). If this succeeds, only commands against local VGs will - # proceed. VGs marked as clustered will be ignored. + # This setting is no longer used. fallback_to_local_locking = 1 # Configuration option global/locking_dir. @@ -799,7 +764,7 @@ global { # This configuration option does not have a default value defined. # Configuration option global/locking_library. - # The external locking library to use for locking_type 2. + # This setting is no longer used. # This configuration option has an automatic default value. # locking_library = "liblvm2clusterlock.so" diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen index 26a6297..8f9783a 100644 --- a/man/lvchange.8_pregen +++ b/man/lvchange.8_pregen @@ -133,6 +133,10 @@ lvchange - Change the attributes of logical volume(s) .ad b .br .ad l + \fB--nolocking\fP +.ad b +.br +.ad l \fB--noudevsync\fP .ad b .br @@ -576,6 +580,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -876,6 +884,12 @@ See \fBdmeventd\fP(8) for more information. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--noudevsync\fP .br Disables udev synchronisation. The process will not wait for notification diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen index 91691a3..c9df4da 100644 --- a/man/lvconvert.8_pregen +++ b/man/lvconvert.8_pregen @@ -119,6 +119,10 @@ lvconvert - Change logical volume layout .ad b .br .ad l + \fB--nolocking\fP +.ad b +.br +.ad l \fB--noudevsync\fP .ad b .br @@ -903,6 +907,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -1177,6 +1185,12 @@ generated, where # is a number generated by LVM. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--noudevsync\fP .br Disables udev synchronisation. The process will not wait for notification diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen index 9dcb33f..b6483b5 100644 --- a/man/lvcreate.8_pregen +++ b/man/lvcreate.8_pregen @@ -143,6 +143,10 @@ lvcreate - Create a logical volume .ad b .br .ad l + \fB--nolocking\fP +.ad b +.br +.ad l \fB--nosync\fP .ad b .br @@ -916,6 +920,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -1254,6 +1262,12 @@ generated, where # is a number generated by LVM. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--nosync\fP .br Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen index 33e4f5d..6211a47 100644 --- a/man/lvdisplay.8_pregen +++ b/man/lvdisplay.8_pregen @@ -170,6 +170,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -321,6 +325,12 @@ Useful if grepping the output. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--nosuffix\fP .br Suppress the suffix on output sizes. Use with --units diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen index 130672e..b29f508 100644 --- a/man/lvextend.8_pregen +++ b/man/lvextend.8_pregen @@ -63,6 +63,10 @@ lvextend - Add space to a logical volume .ad b .br .ad l + \fB--nolocking\fP +.ad b +.br +.ad l \fB--nosync\fP .ad b .br @@ -324,6 +328,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -455,6 +463,12 @@ this option. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--nosync\fP .br Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen index 3fb00b1..4a8d7b3 100644 --- a/man/lvm-fullreport.8_pregen +++ b/man/lvm-fullreport.8_pregen @@ -72,10 +72,6 @@ if information changes between commands. .ad b .br .ad l -[ \fB--nolocking\fP ] -.ad b -.br -.ad l [ \fB--nosuffix\fP ] .ad b .br @@ -170,6 +166,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen index 4591a28..1f4c129 100644 --- a/man/lvm-lvpoll.8_pregen +++ b/man/lvm-lvpoll.8_pregen @@ -84,6 +84,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -169,6 +173,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--polloperation\fP \fBpvmove\fP|\fBconvert\fP|\fBmerge\fP|\fBmerge_thin\fP .br The command to perform from lvmpolld. diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen index b47d589..0db2dd7 100644 --- a/man/lvmconfig.8_pregen +++ b/man/lvmconfig.8_pregen @@ -153,6 +153,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -281,6 +285,12 @@ See \fBlvm.conf\fP(5) for more information about profiles. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen index 8b26d95..8eb57bf 100644 --- a/man/lvmdiskscan.8_pregen +++ b/man/lvmdiskscan.8_pregen @@ -79,6 +79,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -144,6 +148,12 @@ Only report PVs. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen index 3aa4b5a..7acc042 100644 --- a/man/lvreduce.8_pregen +++ b/man/lvreduce.8_pregen @@ -110,6 +110,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -214,6 +218,12 @@ this option. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--noudevsync\fP .br Disables udev synchronisation. The process will not wait for notification diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen index 88d0501..c835672 100644 --- a/man/lvremove.8_pregen +++ b/man/lvremove.8_pregen @@ -114,6 +114,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -195,6 +199,12 @@ metadata/record_lvs_history is enabled. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--noudevsync\fP .br Disables udev synchronisation. The process will not wait for notification diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen index 69711e0..8d2f9b3 100644 --- a/man/lvrename.8_pregen +++ b/man/lvrename.8_pregen @@ -89,6 +89,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -155,6 +159,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--noudevsync\fP .br Disables udev synchronisation. The process will not wait for notification diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen index 8df157a..13246f5 100644 --- a/man/lvresize.8_pregen +++ b/man/lvresize.8_pregen @@ -59,6 +59,10 @@ lvresize - Resize a logical volume .ad b .br .ad l + \fB--nolocking\fP +.ad b +.br +.ad l \fB--nosync\fP .ad b .br @@ -272,6 +276,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -397,6 +405,12 @@ this option. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--nosync\fP .br Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen index c6303bb..b5128f9 100644 --- a/man/lvs.8_pregen +++ b/man/lvs.8_pregen @@ -76,10 +76,6 @@ lvs produces formatted output about LVs. .ad b .br .ad l -[ \fB--nolocking\fP ] -.ad b -.br -.ad l [ \fB--nosuffix\fP ] .ad b .br @@ -174,6 +170,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen index e9d90ee..489286e 100644 --- a/man/lvscan.8_pregen +++ b/man/lvscan.8_pregen @@ -105,6 +105,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -191,6 +195,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen index 6a80e72..5da8eca 100644 --- a/man/pvchange.8_pregen +++ b/man/pvchange.8_pregen @@ -154,6 +154,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -269,6 +273,12 @@ If no, lvm will store metadata on the PV. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen index 1140d69..499f62c 100644 --- a/man/pvck.8_pregen +++ b/man/pvck.8_pregen @@ -69,6 +69,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -137,6 +141,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen index c4b03da..2b4fb1c 100644 --- a/man/pvcreate.8_pregen +++ b/man/pvcreate.8_pregen @@ -145,6 +145,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -274,6 +278,12 @@ Specifies the type of on-disk metadata to use. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--norestorefile\fP .br In conjunction with --uuid, this allows a uuid to be specified diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen index bbf09d8..5f39e7b 100644 --- a/man/pvdisplay.8_pregen +++ b/man/pvdisplay.8_pregen @@ -166,6 +166,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -306,6 +310,12 @@ Useful if grepping the output. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--nosuffix\fP .br Suppress the suffix on output sizes. Use with --units diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen index cb121f2..e553722 100644 --- a/man/pvmove.8_pregen +++ b/man/pvmove.8_pregen @@ -137,6 +137,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -260,6 +264,12 @@ Move only the extents belonging to the named LV. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--noudevsync\fP .br Disables udev synchronisation. The process will not wait for notification diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen index 16a82ad..3d83478 100644 --- a/man/pvremove.8_pregen +++ b/man/pvremove.8_pregen @@ -79,6 +79,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -145,6 +149,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen index 7b61f81..5a5c975 100644 --- a/man/pvresize.8_pregen +++ b/man/pvresize.8_pregen @@ -74,6 +74,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -133,6 +137,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen index a2a62a6..59f1e3d 100644 --- a/man/pvs.8_pregen +++ b/man/pvs.8_pregen @@ -72,10 +72,6 @@ pvs produces formatted output about PVs. .ad b .br .ad l -[ \fB--nolocking\fP ] -.ad b -.br -.ad l [ \fB--nosuffix\fP ] .ad b .br @@ -170,6 +166,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen index 230492b..3ce59b5 100644 --- a/man/pvscan.8_pregen +++ b/man/pvscan.8_pregen @@ -218,6 +218,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -323,6 +327,12 @@ The minor number of a device. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB-n\fP|\fB--novolumegroup\fP .br Only show PVs not belonging to any VG. diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen index e9c42fe..cd2521a 100644 --- a/man/vgcfgbackup.8_pregen +++ b/man/vgcfgbackup.8_pregen @@ -105,6 +105,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -186,6 +190,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen index cffd44b..b4e2183 100644 --- a/man/vgcfgrestore.8_pregen +++ b/man/vgcfgrestore.8_pregen @@ -55,6 +55,10 @@ vgcfgrestore - Restore volume group configuration .ad b .br .ad l + \fB--nolocking\fP +.ad b +.br +.ad l \fB--profile\fP \fIString\fP .ad b .br @@ -197,6 +201,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -288,6 +296,12 @@ Specifies the type of on-disk metadata to use. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen index 00cfc2b..a9ac546 100644 --- a/man/vgchange.8_pregen +++ b/man/vgchange.8_pregen @@ -31,10 +31,6 @@ vgchange - Change volume group attributes .ad b .br .ad l - \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP -.ad b -.br -.ad l \fB--commandprofile\fP \fIString\fP .ad b .br @@ -119,6 +115,10 @@ vgchange - Change volume group attributes .ad b .br .ad l + \fB--nolocking\fP +.ad b +.br +.ad l \fB--noudevsync\fP .ad b .br @@ -218,10 +218,6 @@ required, after which the others are optional. .ad b .br .ad l - \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP, -.ad b -.br -.ad l \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT], .ad b .br @@ -637,6 +633,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -722,13 +722,6 @@ Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information .ad b .HP .ad l -\fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP -.br -Change the clustered property of a VG using clvmd. -See \fBclvmd\fP(8) for more information about clustered VGs. -.ad b -.HP -.ad l \fB--commandprofile\fP \fIString\fP .br The command profile to use for command configuration. @@ -881,6 +874,12 @@ See \fBdmeventd\fP(8) for more information. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--noudevsync\fP .br Disables udev synchronisation. The process will not wait for notification diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen index 83e4a19..b1418f3 100644 --- a/man/vgck.8_pregen +++ b/man/vgck.8_pregen @@ -74,6 +74,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -133,6 +137,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen index 5e7f8a9..16e1fc8 100644 --- a/man/vgconvert.8_pregen +++ b/man/vgconvert.8_pregen @@ -95,6 +95,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -199,6 +203,12 @@ Specifies the type of on-disk metadata to use. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen index 09bf126..cc990cc 100644 --- a/man/vgcreate.8_pregen +++ b/man/vgcreate.8_pregen @@ -152,6 +152,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -199,11 +203,8 @@ Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information .ad l \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP .br -Create a clustered VG using clvmd if LVM is compiled with cluster support. -This allows multiple hosts to share a VG on shared devices. -clvmd and a lock manager must be configured and running. -(A clustered VG using clvmd is different from a shared VG using lvmlockd.) -See \fBclvmd\fP(8) for more information about clustered VGs. +This option was specific to clvm and is now replaced by +the --shared option with \fBlvmlockd\fP(8). .ad b .HP .ad l @@ -332,6 +333,12 @@ Specifies the type of on-disk metadata to use. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT] .br Sets the physical extent size of PVs in the VG. diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen index dcf9934..89e3603 100644 --- a/man/vgdisplay.8_pregen +++ b/man/vgdisplay.8_pregen @@ -161,6 +161,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -295,6 +299,12 @@ Useful if grepping the output. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--nosuffix\fP .br Suppress the suffix on output sizes. Use with --units diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen index 1dd715e..a87c871 100644 --- a/man/vgexport.8_pregen +++ b/man/vgexport.8_pregen @@ -108,6 +108,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -172,6 +176,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen index a6a30e9..a2aff35 100644 --- a/man/vgextend.8_pregen +++ b/man/vgextend.8_pregen @@ -123,6 +123,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -245,6 +249,12 @@ Specifies the type of on-disk metadata to use. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen index 71f9d56..f3d86df 100644 --- a/man/vgimport.8_pregen +++ b/man/vgimport.8_pregen @@ -98,6 +98,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -170,6 +174,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen index aab34f4..0d0eb84 100644 --- a/man/vgimportclone.8_pregen +++ b/man/vgimportclone.8_pregen @@ -78,6 +78,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -154,6 +158,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen index ab6873d..8b599f8 100644 --- a/man/vgmerge.8_pregen +++ b/man/vgmerge.8_pregen @@ -75,6 +75,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -147,6 +151,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen index 9588694..1cff786 100644 --- a/man/vgmknodes.8_pregen +++ b/man/vgmknodes.8_pregen @@ -86,6 +86,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -152,6 +156,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen index ecc5aca..fd92266 100644 --- a/man/vgreduce.8_pregen +++ b/man/vgreduce.8_pregen @@ -53,6 +53,10 @@ vgreduce - Remove physical volume(s) from a volume group .ad b .br .ad l + \fB--nolocking\fP +.ad b +.br +.ad l \fB--profile\fP \fIString\fP .ad b .br @@ -187,6 +191,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -272,6 +280,12 @@ Only remove missing PVs from mirror LVs. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen index f562991..69f2831 100644 --- a/man/vgremove.8_pregen +++ b/man/vgremove.8_pregen @@ -89,6 +89,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -155,6 +159,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--noudevsync\fP .br Disables udev synchronisation. The process will not wait for notification diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen index 1f8928e..0313cf8 100644 --- a/man/vgrename.8_pregen +++ b/man/vgrename.8_pregen @@ -102,6 +102,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -175,6 +179,12 @@ Display long help text. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen index efceb4e..681711b 100644 --- a/man/vgs.8_pregen +++ b/man/vgs.8_pregen @@ -68,10 +68,6 @@ vgs produces formatted output about VGs. .ad b .br .ad l -[ \fB--nolocking\fP ] -.ad b -.br -.ad l [ \fB--nosuffix\fP ] .ad b .br @@ -166,6 +162,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen index 18b2990..fe9f201 100644 --- a/man/vgscan.8_pregen +++ b/man/vgscan.8_pregen @@ -85,6 +85,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -164,6 +168,12 @@ LVs and creates any missing ones and removes unused ones. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--notifydbus\fP .br Send a notification to D-Bus. The command will exit with an error diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen index 6c3e6ec..c1e7f4e 100644 --- a/man/vgsplit.8_pregen +++ b/man/vgsplit.8_pregen @@ -50,10 +50,6 @@ Common options for command: .ad b .br .ad l -[ \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP ] -.ad b -.br -.ad l [ \fB-l\fP|\fB--maxlogicalvolumes\fP \fINumber\fP ] .ad b .br @@ -122,6 +118,10 @@ Common options for lvm: .ad b .br .ad l +[ \fB--nolocking\fP ] +.ad b +.br +.ad l [ \fB--profile\fP \fIString\fP ] .ad b .br @@ -160,12 +160,6 @@ Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information .ad b .HP .ad l -\fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP -.br -Specifies the clustered property of the new VG. -.ad b -.HP -.ad l \fB--commandprofile\fP \fIString\fP .br The command profile to use for command configuration. @@ -244,6 +238,12 @@ Move only PVs used by the named LV. .ad b .HP .ad l +\fB--nolocking\fP +.br +Disable locking. +.ad b +.HP +.ad l \fB--profile\fP \fIString\fP .br An alias for --commandprofile or --metadataprofile, depending

1 0

master - build: update configure
by Zdenek Kabelac 11 Jun '18

11 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2a307ce33c515268763c7… Commit: 2a307ce33c515268763c714275bd4a85bf9fd0fa Parent: b48e10d9e6fd33ea26ce5296be44a986f49352a2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 8 22:15:05 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 11 22:25:42 2018 +0200 build: update configure --- configure | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 953539f..323ab4a 100755 --- a/configure +++ b/configure @@ -11527,7 +11527,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -13611,7 +13611,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile python/Makefile python/setup .py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/api/python_lvm_unit.py tools/Makefile udev/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/blkdeactivate.sh scr ipts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile tools/Makefile udev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14343,8 +14343,6 @@ do "libdm/libdevmapper.pc") CONFIG_FILES="$CONFIG_FILES libdm/libdevmapper.pc" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; - "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; - "python/setup.py") CONFIG_FILES="$CONFIG_FILES python/setup.py" ;; "scripts/blkdeactivate.sh") CONFIG_FILES="$CONFIG_FILES scripts/blkdeactivate.sh" ;; "scripts/blk_availability_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/blk_availability_init_red_hat" ;; "scripts/blk_availability_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/blk_availability_systemd_red_hat.service" ;; @@ -14369,8 +14367,6 @@ do "scripts/lvmdump.sh") CONFIG_FILES="$CONFIG_FILES scripts/lvmdump.sh" ;; "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "test/api/Makefile") CONFIG_FILES="$CONFIG_FILES test/api/Makefile" ;; - "test/api/python_lvm_unit.py") CONFIG_FILES="$CONFIG_FILES test/api/python_lvm_unit.py" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "udev/Makefile") CONFIG_FILES="$CONFIG_FILES udev/Makefile" ;;

1 0

master - Remove lvmcache CACHE_LOCKED flag
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b48e10d9e6fd33ea26ce5… Commit: b48e10d9e6fd33ea26ce5296be44a986f49352a2 Parent: ebd147ff244abd7d308ffb3ea8a2121b5f4bc7a3 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 15:11:47 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 15:11:47 2018 -0500 Remove lvmcache CACHE_LOCKED flag and the functions that set it. It's no longer used. --- lib/cache/lvmcache.c | 38 +------------------------------------- 1 files changed, 1 insertions(+), 37 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 3cbe1df..923fb2e 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -28,8 +28,6 @@ #include "lib/cache/lvmetad.h" #include "daemons/lvmetad/lvmetad-client.h" -#define CACHE_LOCKED 0x00000002 - /* One per device */ struct lvmcache_info { struct dm_list list; /* Join VG members together */ @@ -131,33 +129,6 @@ void lvmcache_seed_infos_from_lvmetad(struct cmd_context *cmd) _has_scanned = 1; } -static void _update_cache_info_lock_state(struct lvmcache_info *info, int locked) -{ - if (locked) - info->status |= CACHE_LOCKED; - else - info->status &= ~CACHE_LOCKED; -} - -static void _update_cache_vginfo_lock_state(struct lvmcache_vginfo *vginfo, - int locked) -{ - struct lvmcache_info *info; - - dm_list_iterate_items(info, &vginfo->infos) - _update_cache_info_lock_state(info, locked); -} - -static void _update_cache_lock_state(const char *vgname, int locked) -{ - struct lvmcache_vginfo *vginfo; - - if (!(vginfo = lvmcache_vginfo_from_vgname(vgname, NULL))) - return; - - _update_cache_vginfo_lock_state(vginfo, locked); -} - void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unused))) { if (dm_hash_lookup(_lock_hash, vgname)) @@ -167,10 +138,8 @@ void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unuse if (!dm_hash_insert(_lock_hash, vgname, (void *) 1)) log_error("Cache locking failure for %s", vgname); - if (strcmp(vgname, VG_GLOBAL)) { - _update_cache_lock_state(vgname, 1); + if (strcmp(vgname, VG_GLOBAL)) _vgs_locked++; - } } int lvmcache_vgname_is_locked(const char *vgname) @@ -187,9 +156,6 @@ void lvmcache_unlock_vgname(const char *vgname) log_error(INTERNAL_ERROR "Attempt to unlock unlocked VG %s.", vgname); - if (strcmp(vgname, VG_GLOBAL)) - _update_cache_lock_state(vgname, 0); - dm_hash_remove(_lock_hash, vgname); /* FIXME Do this per-VG */ @@ -1513,8 +1479,6 @@ static int _lvmcache_update_vgname(struct lvmcache_info *info, else if (!_lvmcache_update_vgid(NULL, vginfo, vgid)) /* Orphans */ return_0; - _update_cache_vginfo_lock_state(vginfo, lvmcache_vgname_is_locked(vgname)); - /* FIXME Check consistency of list! */ vginfo->fmt = fmt;

1 0

master - Remove locking for non-vgs
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ebd147ff244abd7d308ff… Commit: ebd147ff244abd7d308ffb3ea8a2121b5f4bc7a3 Parent: 4ce9579099a08e4d3cb0c0805517d3352b487b86 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 14:34:50 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 14:34:50 2018 -0500 Remove locking for non-vgs Locks for VGs are the only thing that locking.[ch] now handles, so references to other variations can be removed. --- lib/locking/file_locking.c | 39 ++++++++++++++------------------------- lib/locking/locking.c | 26 +++++--------------------- lib/locking/locking.h | 41 ++++++----------------------------------- 3 files changed, 25 insertions(+), 81 deletions(-) diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index a0a4f02..8e08b08 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -45,31 +45,20 @@ static int _file_lock_resource(struct cmd_context *cmd, const char *resource, { char lockfile[PATH_MAX]; - switch (flags & LCK_SCOPE_MASK) { - case LCK_VG: - if (is_orphan_vg(resource) || is_global_vg(resource)) { - if (dm_snprintf(lockfile, sizeof(lockfile), - "%s/P_%s", _lock_dir, resource + 1) < 0) { - log_error("Too long locking filename %s/P_%s.", - _lock_dir, resource + 1); - return 0; - } - } else - if (dm_snprintf(lockfile, sizeof(lockfile), - "%s/V_%s", _lock_dir, resource) < 0) { - log_error("Too long locking filename %s/V_%s.", - _lock_dir, resource); - return 0; - } - - if (!lock_file(lockfile, flags)) - return_0; - break; - default: - log_error("Unrecognised lock scope: %d", - flags & LCK_SCOPE_MASK); - return 0; - } + if (is_orphan_vg(resource) || is_global_vg(resource)) { + if (dm_snprintf(lockfile, sizeof(lockfile), + "%s/P_%s", _lock_dir, resource + 1) < 0) { + log_error("Too long locking filename %s/P_%s.", _lock_dir, resource + 1); + return 0; + } + } else + if (dm_snprintf(lockfile, sizeof(lockfile), "%s/V_%s", _lock_dir, resource) < 0) { + log_error("Too long locking filename %s/V_%s.", _lock_dir, resource); + return 0; + } + + if (!lock_file(lockfile, flags)) + return_0; return 1; } diff --git a/lib/locking/locking.c b/lib/locking/locking.c index c9298af..3276283 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -69,8 +69,7 @@ void reset_locking(void) static void _update_vg_lock_count(const char *resource, uint32_t flags) { /* Ignore locks not associated with updating VG metadata */ - if ((flags & LCK_SCOPE_MASK) != LCK_VG || - !strcmp(resource, VG_GLOBAL)) + if (!strcmp(resource, VG_GLOBAL)) return; if ((flags & LCK_TYPE_MASK) == LCK_UNLOCK) @@ -179,7 +178,6 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str { char resource[258] __attribute__((aligned(8))); uint32_t lck_type = flags & LCK_TYPE_MASK; - uint32_t lck_scope = flags & LCK_SCOPE_MASK; if (!_blocking_supported) flags |= LCK_NONBLOCK; @@ -206,7 +204,7 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str if (lck_type != LCK_WRITE) goto out_hold; - if (cmd->is_activating && (lck_scope == LCK_VG) && strcmp(vol, VG_GLOBAL)) + if (cmd->is_activating && strcmp(vol, VG_GLOBAL)) goto out_hold; goto out_fail; @@ -229,7 +227,7 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str * refuse write lock requests. */ if (cmd->metadata_read_only) { - if ((lck_type == LCK_WRITE) && (lck_scope == LCK_VG) && strcmp(vol, VG_GLOBAL)) { + if ((lck_type == LCK_WRITE) && strcmp(vol, VG_GLOBAL)) { log_error("Operation prohibited while global/metadata_read_only is set."); goto out_fail; } @@ -240,29 +238,15 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str if (!_lock_vol(cmd, resource, flags)) goto out_fail; - /* - * FIXME: I don't think we need this any more. - * If a real lock was acquired - * perform an immediate unlock unless LCK_HOLD was requested. - */ - - if ((lck_type == LCK_UNLOCK) || (flags & LCK_HOLD)) - goto out_hold; - - if (!_lock_vol(cmd, resource, (flags & ~LCK_TYPE_MASK) | LCK_UNLOCK)) - return_0; - return 1; - - out_hold: /* * FIXME: other parts of the code want to check if a VG is * locked by looking in lvmcache. They shouldn't need to * do that, and we should be able to remove this. */ - if ((lck_scope == LCK_VG) && (lck_type != LCK_UNLOCK)) + if (lck_type != LCK_UNLOCK) lvmcache_lock_vgname(resource, lck_type == LCK_READ); - else if ((lck_scope == LCK_VG) && (lck_type == LCK_UNLOCK)) + else if (lck_type == LCK_UNLOCK) lvmcache_unlock_vgname(resource); /* FIXME: we shouldn't need to keep track of this either. */ diff --git a/lib/locking/locking.h b/lib/locking/locking.h index bbd7dfe..b2b69b8 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -27,7 +27,6 @@ void reset_locking(void); int vg_write_lock_held(void); /* - * LCK_VG: * Lock/unlock on-disk volume group data. * Use VG_ORPHANS to lock all orphan PVs. * Use VG_GLOBAL as a global lock and to wipe the internal cache. @@ -35,42 +34,19 @@ int vg_write_lock_held(void); * If more than one lock needs to be held simultaneously, they must be * acquired in alphabetical order of 'vol' (to avoid deadlocks), with * VG_ORPHANS last. - * - * Use VG_SYNC_NAMES to ensure /dev is up-to-date for example, with udev, - * by waiting for any asynchronous events issued to have completed. - * - * LCK_LV: - * Lock/unlock an individual logical volume - * char *vol holds lvid */ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const struct logical_volume *lv); -/* - * Internal locking representation. - * LCK_VG: Uses prefix V_ unless the vol begins with # (i.e. #global or #orphans) - */ - -/* - * Lock type - these numbers are the same as VMS and the IBM DLM - */ #define LCK_TYPE_MASK 0x00000007U - -#define LCK_READ 0x00000001U /* LCK$_CRMODE (Activate) */ -#define LCK_WRITE 0x00000004U /* LCK$_PWMODE (Suspend) */ -#define LCK_UNLOCK 0x00000006U /* This is ours (Resume) */ - -/* - * Lock scope - */ -#define LCK_SCOPE_MASK 0x00001008U -#define LCK_VG 0x00000000U /* Volume Group */ +#define LCK_READ 0x00000001U +#define LCK_WRITE 0x00000004U +#define LCK_UNLOCK 0x00000006U /* * Lock bits. * Bottom 8 bits except LCK_LOCAL form args[0] in cluster comms. */ #define LCK_NONBLOCK 0x00000010U /* Don't block waiting for lock? */ -#define LCK_HOLD 0x00000020U /* Hold lock when lock_vol returns? */ /* * Special cases of VG locks. @@ -78,14 +54,9 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str #define VG_ORPHANS "#orphans" #define VG_GLOBAL "#global" -/* - * Common combinations - */ -#define LCK_VG_READ (LCK_VG | LCK_READ | LCK_HOLD) -#define LCK_VG_WRITE (LCK_VG | LCK_WRITE | LCK_HOLD) -#define LCK_VG_UNLOCK (LCK_VG | LCK_UNLOCK) - -#define LCK_MASK (LCK_TYPE_MASK | LCK_SCOPE_MASK) +#define LCK_VG_READ LCK_READ +#define LCK_VG_WRITE LCK_WRITE +#define LCK_VG_UNLOCK LCK_UNLOCK #define unlock_vg(cmd, vg, vol) \ do { \

1 0

master - Remove unused cluster-related locking flags
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1c59140f5fbd48139ac00… Commit: 1c59140f5fbd48139ac008c8c1ab1aefc4288698 Parent: a8759dc7a6669b9ecfbc749d68beed2e0029903b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 12:38:43 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 14:01:00 2018 -0500 Remove unused cluster-related locking flags --- lib/locking/file_locking.c | 4 --- lib/locking/locking.c | 19 ++++--------- lib/locking/locking.h | 60 -------------------------------------------- 3 files changed, 6 insertions(+), 77 deletions(-) diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index 6b295e9..a0a4f02 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -47,10 +47,6 @@ static int _file_lock_resource(struct cmd_context *cmd, const char *resource, switch (flags & LCK_SCOPE_MASK) { case LCK_VG: - /* LCK_CACHE does not require a real lock */ - if (flags & LCK_CACHE) - break; - if (is_orphan_vg(resource) || is_global_vg(resource)) { if (dm_snprintf(lockfile, sizeof(lockfile), "%s/P_%s", _lock_dir, resource + 1) < 0) { diff --git a/lib/locking/locking.c b/lib/locking/locking.c index b6bd8d8..c9298af 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -70,7 +70,6 @@ static void _update_vg_lock_count(const char *resource, uint32_t flags) { /* Ignore locks not associated with updating VG metadata */ if ((flags & LCK_SCOPE_MASK) != LCK_VG || - (flags & LCK_CACHE) || !strcmp(resource, VG_GLOBAL)) return; @@ -207,7 +206,7 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str if (lck_type != LCK_WRITE) goto out_hold; - if (cmd->is_activating && (lck_scope == LCK_VG) && !(flags & LCK_CACHE) && strcmp(vol, VG_GLOBAL)) + if (cmd->is_activating && (lck_scope == LCK_VG) && strcmp(vol, VG_GLOBAL)) goto out_hold; goto out_fail; @@ -230,7 +229,7 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str * refuse write lock requests. */ if (cmd->metadata_read_only) { - if ((lck_type == LCK_WRITE) && (lck_scope == LCK_VG) && !(flags & LCK_CACHE) && strcmp(vol, VG_GLOBAL)) { + if ((lck_type == LCK_WRITE) && (lck_scope == LCK_VG) && strcmp(vol, VG_GLOBAL)) { log_error("Operation prohibited while global/metadata_read_only is set."); goto out_fail; } @@ -243,12 +242,11 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str /* * FIXME: I don't think we need this any more. - * If a real lock was acquired (i.e. not LCK_CACHE), + * If a real lock was acquired * perform an immediate unlock unless LCK_HOLD was requested. */ - if ((lck_type == LCK_NULL) || (lck_type == LCK_UNLOCK) || - (flags & (LCK_CACHE | LCK_HOLD))) + if ((lck_type == LCK_UNLOCK) || (flags & LCK_HOLD)) goto out_hold; if (!_lock_vol(cmd, resource, (flags & ~LCK_TYPE_MASK) | LCK_UNLOCK)) @@ -262,9 +260,9 @@ out_hold: * locked by looking in lvmcache. They shouldn't need to * do that, and we should be able to remove this. */ - if ((lck_scope == LCK_VG) && !(flags & LCK_CACHE) && (lck_type != LCK_UNLOCK)) + if ((lck_scope == LCK_VG) && (lck_type != LCK_UNLOCK)) lvmcache_lock_vgname(resource, lck_type == LCK_READ); - else if ((lck_scope == LCK_VG) && !(flags & LCK_CACHE) && (lck_type == LCK_UNLOCK)) + else if ((lck_scope == LCK_VG) && (lck_type == LCK_UNLOCK)) lvmcache_unlock_vgname(resource); /* FIXME: we shouldn't need to keep track of this either. */ @@ -304,11 +302,6 @@ int vg_write_lock_held(void) return _vg_write_lock_held; } -int locking_is_clustered(void) -{ - return 0; -} - int sync_local_dev_names(struct cmd_context* cmd) { memlock_unlock(cmd); diff --git a/lib/locking/locking.h b/lib/locking/locking.h index 23636fc..bbd7dfe 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -25,15 +25,6 @@ int init_locking(struct cmd_context *cmd, int file_locking_sysinit, int file_loc void fin_locking(void); void reset_locking(void); int vg_write_lock_held(void); -int locking_is_clustered(void); -int locking_supports_remote_queries(void); - -#ifndef NODE_ALL -# define NODE_ALL "*" -# define NODE_LOCAL "." -# define NODE_REMOTE "^" -#endif -int cluster_lock_held(const char *vol, const char *node, int *exclusive); /* * LCK_VG: @@ -41,8 +32,6 @@ int cluster_lock_held(const char *vol, const char *node, int *exclusive); * Use VG_ORPHANS to lock all orphan PVs. * Use VG_GLOBAL as a global lock and to wipe the internal cache. * char *vol holds volume group name. - * Set LCK_CACHE flag when manipulating 'vol' metadata in the internal cache. - * (Like commit, revert or invalidate metadata.) * If more than one lock needs to be held simultaneously, they must be * acquired in alphabetical order of 'vol' (to avoid deadlocks), with * VG_ORPHANS last. @@ -59,37 +48,18 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str /* * Internal locking representation. * LCK_VG: Uses prefix V_ unless the vol begins with # (i.e. #global or #orphans) - * or the LCK_CACHE flag is set when it uses the prefix P_. - * If LCK_CACHE is set, we do not take out a real lock. - * NB In clustered situations, LCK_CACHE is not propagated directly to remote nodes. - * (It can be deduced from lock name.) - */ - -/* - * Does the LVM1 driver have this VG active? */ -int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); /* * Lock type - these numbers are the same as VMS and the IBM DLM */ #define LCK_TYPE_MASK 0x00000007U -#define LCK_NULL 0x00000000U /* LCK$_NLMODE (Deactivate) */ #define LCK_READ 0x00000001U /* LCK$_CRMODE (Activate) */ - /* LCK$_CWMODE */ -#define LCK_PREAD 0x00000003U /* LCK$_PRMODE */ #define LCK_WRITE 0x00000004U /* LCK$_PWMODE (Suspend) */ -#define LCK_EXCL 0x00000005U /* LCK$_EXMODE (Exclusive) */ #define LCK_UNLOCK 0x00000006U /* This is ours (Resume) */ /* - * Lock flags - these numbers are the same as DLM - */ -#define LCKF_NOQUEUE 0x00000001U /* LKF$_NOQUEUE */ -#define LCKF_CONVERT 0x00000004U /* LKF$_CONVERT */ - -/* * Lock scope */ #define LCK_SCOPE_MASK 0x00001008U @@ -101,28 +71,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); */ #define LCK_NONBLOCK 0x00000010U /* Don't block waiting for lock? */ #define LCK_HOLD 0x00000020U /* Hold lock when lock_vol returns? */ -#define LCK_CLUSTER_VG 0x00000080U /* VG is clustered */ - -#define LCK_LOCAL 0x00000040U /* Don't propagate to other nodes */ -#define LCK_REMOTE 0x00000800U /* Propagate to remote nodes only */ -#define LCK_CACHE 0x00000100U /* Operation on cache only using P_ lock */ -#define LCK_ORIGIN_ONLY 0x00000200U /* Operation should bypass any snapshots */ -#define LCK_REVERT 0x00000400U /* Revert any incomplete change */ - -/* - * Additional lock bits for cluster communication via args[1] - */ -#define LCK_PARTIAL_MODE 0x01 /* Partial activation? */ -#define LCK_MIRROR_NOSYNC_MODE 0x02 /* Mirrors don't require sync */ -#define LCK_DMEVENTD_MONITOR_MODE 0x04 /* Register with dmeventd */ - -/* Not yet used. */ -#define LCK_CONVERT_MODE 0x08 /* Convert existing lock */ - -#define LCK_TEST_MODE 0x10 /* Test mode: No activation */ -#define LCK_ORIGIN_ONLY_MODE 0x20 /* Same as above */ -#define LCK_DMEVENTD_MONITOR_IGNORE 0x40 /* Whether to ignore dmeventd */ -#define LCK_REVERT_MODE 0x80 /* Remove inactive tables */ /* * Special cases of VG locks. @@ -133,18 +81,10 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); /* * Common combinations */ -#define LCK_NONE (LCK_VG | LCK_NULL) - #define LCK_VG_READ (LCK_VG | LCK_READ | LCK_HOLD) #define LCK_VG_WRITE (LCK_VG | LCK_WRITE | LCK_HOLD) #define LCK_VG_UNLOCK (LCK_VG | LCK_UNLOCK) -/* FIXME: LCK_HOLD abused here */ -#define LCK_VG_COMMIT (LCK_VG | LCK_WRITE | LCK_CACHE | LCK_HOLD) -#define LCK_VG_REVERT (LCK_VG | LCK_READ | LCK_CACHE | LCK_HOLD) - -#define LCK_VG_BACKUP (LCK_VG | LCK_CACHE) - #define LCK_MASK (LCK_TYPE_MASK | LCK_SCOPE_MASK) #define unlock_vg(cmd, vg, vol) \

1 0

master - tests: remove vgsplit-usage cluster test
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4ce9579099a08e4d3cb0c… Commit: 4ce9579099a08e4d3cb0c0805517d3352b487b86 Parent: 1c59140f5fbd48139ac008c8c1ab1aefc4288698 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 13:08:32 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 14:01:05 2018 -0500 tests: remove vgsplit-usage cluster test --- test/shell/vgsplit-usage.sh | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/test/shell/vgsplit-usage.sh b/test/shell/vgsplit-usage.sh index 38f3964..33a606e 100644 --- a/test/shell/vgsplit-usage.sh +++ b/test/shell/vgsplit-usage.sh @@ -95,13 +95,6 @@ not vgsplit --alloc cling $vg1 $vg2 "$dev1" 2>err; grep "Volume group \"$vg2\" exists, but new VG option specified" err vgremove $vg1 $vg2 -# vgsplit rejects split because clustered given with existing vg -vgcreate -M$mdatype $vg1 "$dev1" "$dev2" -vgcreate -M$mdatype $vg2 "$dev3" "$dev4" -not vgsplit $vg1 $vg2 "$dev1" 2>err -grep "Volume group \"$vg2\" exists, but new VG option specified" err -vgremove $vg1 $vg2 - # vgsplit rejects vg with active lv pvcreate -M$mdatype -ff "$dev3" "$dev4" vgcreate -M$mdatype $vg1 "$dev1" "$dev2"

1 0

master - Remove unused cache management from locking
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a8759dc7a6669b9ecfbc7… Commit: a8759dc7a6669b9ecfbc749d68beed2e0029903b Parent: 5e672df6aefd5b61129636994d8b5cdc05f651ea Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 12:30:43 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 12:30:43 2018 -0500 Remove unused cache management from locking This code was for managing lvmcache for clvm and it no longer does anything. --- lib/locking/locking.h | 4 ---- lib/metadata/metadata.c | 20 -------------------- tools/vgmerge.c | 3 --- tools/vgrename.c | 4 ---- 4 files changed, 0 insertions(+), 31 deletions(-) diff --git a/lib/locking/locking.h b/lib/locking/locking.h index f6a3859..23636fc 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -138,7 +138,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); #define LCK_VG_READ (LCK_VG | LCK_READ | LCK_HOLD) #define LCK_VG_WRITE (LCK_VG | LCK_WRITE | LCK_HOLD) #define LCK_VG_UNLOCK (LCK_VG | LCK_UNLOCK) -#define LCK_VG_DROP_CACHE (LCK_VG | LCK_WRITE | LCK_CACHE) /* FIXME: LCK_HOLD abused here */ #define LCK_VG_COMMIT (LCK_VG | LCK_WRITE | LCK_CACHE | LCK_HOLD) @@ -163,9 +162,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); release_vg(vg); \ } while (0) -#define drop_cached_metadata(vg) \ - lock_vol((vg)->cmd, (vg)->name, LCK_VG_DROP_CACHE, NULL) - int sync_local_dev_names(struct cmd_context* cmd); /* Process list of LVs */ diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index b7a73c5..e45f5c1 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -2915,11 +2915,6 @@ int vg_write(struct volume_group *vg) return 0; } - if (!drop_cached_metadata(vg)) { - log_error("Unable to drop cached metadata for VG %s.", vg->name); - return 0; - } - if (critical_section()) log_error(INTERNAL_ERROR "Writing metadata in critical section."); @@ -3077,11 +3072,6 @@ int vg_commit(struct volume_group *vg) _vg_move_cached_precommitted_to_committed(vg); } - /* If update failed, remove any cached precommitted metadata. */ - if (!cache_updated && !drop_cached_metadata(vg)) - log_error("Attempt to drop cached metadata failed " - "after commit for VG %s.", vg->name); - /* If at least one mda commit succeeded, it was committed */ return cache_updated; } @@ -3115,10 +3105,6 @@ void vg_revert(struct volume_group *vg) stack; } } - - if (!drop_cached_metadata(vg)) - log_error("Attempt to drop cached metadata failed " - "after reverted update for VG %s.", vg->name); } static int _check_mda_in_use(struct metadata_area *mda, void *_in_use) @@ -3543,12 +3529,6 @@ static int _wipe_outdated_pvs(struct cmd_context *cmd, struct volume_group *vg, pv_dev_name(pvl->pv), uuid, vg->name); if (!pv_write_orphan(cmd, pvl->pv)) return_0; - - /* Refresh metadata after orphan write */ - if (!drop_cached_metadata(vg)) { - log_error("Unable to drop cached metadata for VG %s while wiping outdated PVs.", vg->name); - return 0; - } next_pv: ; } diff --git a/tools/vgmerge.c b/tools/vgmerge.c index 920ed73..eab3d56 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -103,9 +103,6 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, if (!archive(vg_from) || !archive(vg_to)) goto_bad; - if (!drop_cached_metadata(vg_from)) - stack; - if (!_vgmerge_select_pool_metadata_spare(cmd, vg_to, vg_from)) goto_bad; diff --git a/tools/vgrename.c b/tools/vgrename.c index bbc3087..2e6157f 100644 --- a/tools/vgrename.c +++ b/tools/vgrename.c @@ -108,10 +108,6 @@ static int _vgrename_single(struct cmd_context *cmd, const char *vg_name, if (!archive(vg)) goto error; - /* Remove references based on old name */ - if (!drop_cached_metadata(vg)) - stack; - if (!lockd_rename_vg_before(cmd, vg)) { stack; goto error;

1 0

master - Removing locking layer from sync_local_dev_names
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5e672df6aefd5b6112963… Commit: 5e672df6aefd5b61129636994d8b5cdc05f651ea Parent: 8266b7e951427de997b5b89d8ac8af8bf011c52e Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 12:15:22 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 12:18:57 2018 -0500 Removing locking layer from sync_local_dev_names the indirection is not needed without clvm --- lib/locking/file_locking.c | 3 --- lib/locking/locking.c | 11 ++--------- lib/locking/locking.h | 7 +------ 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index 0bded0e..6b295e9 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -47,9 +47,6 @@ static int _file_lock_resource(struct cmd_context *cmd, const char *resource, switch (flags & LCK_SCOPE_MASK) { case LCK_VG: - if (!strcmp(resource, VG_SYNC_NAMES)) - fs_unlock(); - /* LCK_CACHE does not require a real lock */ if (flags & LCK_CACHE) break; diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 7e499bb..b6bd8d8 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -312,14 +312,7 @@ int locking_is_clustered(void) int sync_local_dev_names(struct cmd_context* cmd) { memlock_unlock(cmd); - - return lock_vol(cmd, VG_SYNC_NAMES, LCK_VG_SYNC_LOCAL, NULL); -} - -int sync_dev_names(struct cmd_context* cmd) -{ - memlock_unlock(cmd); - - return lock_vol(cmd, VG_SYNC_NAMES, LCK_VG_SYNC, NULL); + fs_unlock(); + return 1; } diff --git a/lib/locking/locking.h b/lib/locking/locking.h index 96f7d86..f6a3859 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -129,7 +129,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); */ #define VG_ORPHANS "#orphans" #define VG_GLOBAL "#global" -#define VG_SYNC_NAMES "#sync_names" /* * Common combinations @@ -147,16 +146,13 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); #define LCK_VG_BACKUP (LCK_VG | LCK_CACHE) -#define LCK_VG_SYNC (LCK_NONE | LCK_CACHE) -#define LCK_VG_SYNC_LOCAL (LCK_NONE | LCK_CACHE | LCK_LOCAL) - #define LCK_MASK (LCK_TYPE_MASK | LCK_SCOPE_MASK) #define unlock_vg(cmd, vg, vol) \ do { \ if (vg && !lvmetad_vg_update_finish(vg)) \ stack; \ - if (is_real_vg(vol) && !sync_dev_names(cmd)) \ + if (is_real_vg(vol) && !sync_local_dev_names(cmd)) \ stack; \ if (!lock_vol(cmd, vol, LCK_VG_UNLOCK, NULL)) \ stack; \ @@ -171,7 +167,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); lock_vol((vg)->cmd, (vg)->name, LCK_VG_DROP_CACHE, NULL) int sync_local_dev_names(struct cmd_context* cmd); -int sync_dev_names(struct cmd_context* cmd); /* Process list of LVs */ struct volume_group;

1 0

master - tests: remove use of vgcreate -c option
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8266b7e951427de997b5b… Commit: 8266b7e951427de997b5b89d8ac8af8bf011c52e Parent: ae961a192a85c54bcf193a132bcb7c91c8dd8a79 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 10:51:07 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 10:51:07 2018 -0500 tests: remove use of vgcreate -c option --- test/shell/vgchange-partial.sh | 3 -- test/shell/vgchange-usage.sh | 46 ---------------------------------------- 2 files changed, 0 insertions(+), 49 deletions(-) diff --git a/test/shell/vgchange-partial.sh b/test/shell/vgchange-partial.sh index 5f5920f..854b8aa 100644 --- a/test/shell/vgchange-partial.sh +++ b/test/shell/vgchange-partial.sh @@ -41,9 +41,6 @@ not vgchange -u $vg # physicalextentsize_ARG not vgchange -s 2M $vg -# clustered_ARG -not vgchange -c y $vg - # alloc_ARG not vgchange --alloc anywhere $vg diff --git a/test/shell/vgchange-usage.sh b/test/shell/vgchange-usage.sh index 9fe9bc5..f6fc842 100644 --- a/test/shell/vgchange-usage.sh +++ b/test/shell/vgchange-usage.sh @@ -31,7 +31,6 @@ fail vgchange --deltag tag $vg fail vgchange -s 4k $vg fail vgchange --uuid $vg fail vgchange --alloc anywhere $vg -fail vgchange -c y $vg vgimport $vg # unsupported combinations of options... @@ -96,48 +95,3 @@ check vg_attr_bit resizeable $vg "-" fail vgchange -x n $vg fail vgextend $vg "$dev4" vgremove -ff $vg - -# skip cluster tests with lvmlockd -test -n "$LVM_TEST_LVMLOCKD" && exit 0 - -# set cluster bit -vgcreate $vg "$dev1" "$dev2" "$dev3" -# check prompt to change cluster bit without giving explicit vg name -fail vgchange -cy 2>&1 | tee out -grep "y/n" out -check vg_attr_bit cluster $vg "-" - -lvcreate -l1 -n $lv1 $vg - -# check on cluster -# either skipped as clustered (non-cluster), or already clustered (on cluster) -if test -e LOCAL_CLVMD ; then - # can switch with active LV - vgchange -cy $vg - fail vgchange -cy $vg - # check volume is active locally exclusively - check lv_field $vg/$lv1 lv_active "local exclusive" - check vg_attr_bit cluster $vg "c" - # check we do not support conversion of just locally active LVs - lvchange -an $vg - lvchange -ay $vg - not vgchange $vg - lvchange -an $vg - lvchange -aey $vg - vgchange $vg -else - # no clvmd is running - fail vgchange -cy $vg - # can't switch with active LV - vgchange --yes -cy $vg - fail vgchange --yes -cy $vg - fail vgs $vg 2>&1 | tee out - grep "Skipping clustered volume group" out - vgs --ignoreskippedcluster $vg 2>&1 | tee out - not grep "Skipping clustered volume group" out - # reset back to non-clustered VG with disabled locking - vgchange $vg --config 'global{locking_type=0}' $vg -fi -check vg_attr_bit cluster $vg "-" - -vgremove -ff $vg

1 0

master - Remove python bindings for liblvm2app
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ae961a192a85c54bcf193… Commit: ae961a192a85c54bcf193a132bcb7c91c8dd8a79 Parent: 669b1295aef917e5f811f448b88c9592944cf18a Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 10:33:47 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 10:33:47 2018 -0500 Remove python bindings for liblvm2app --- Makefile.in | 6 +- configure.ac | 4 - python/.gitignore | 2 - python/Makefile.in | 56 -- python/example.py | 120 --- python/liblvm.c | 2095 ---------------------------------------- python/setup.py.in | 35 - test/Makefile.in | 11 +- test/api/Makefile.in | 29 - test/api/lvtest.sh | 25 - test/api/pe_start.sh | 23 - test/api/percent.sh | 34 - test/api/pytest.sh | 115 --- test/api/python_lvm_unit.py.in | 1048 -------------------- test/api/thin_percent.sh | 38 - test/api/vglist.sh | 17 - test/api/vgtest.sh | 23 - test/lib/aux.sh | 5 - 18 files changed, 5 insertions(+), 3681 deletions(-) diff --git a/Makefile.in b/Makefile.in index ed00696..ae05aea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,10 +28,6 @@ ifeq ("@INTL@", "yes") SUBDIRS += po endif -ifeq ("@PYTHON_BINDINGS@", "yes") - SUBDIRS += python -endif - ifeq ($(MAKECMDGOALS),clean) SUBDIRS += test endif @@ -39,7 +35,7 @@ endif ifeq ($(MAKECMDGOALS),distclean) SUBDIRS = conf include man test scripts \ libdaemon lib tools daemons libdm \ - udev po python + udev po tools.distclean: test.distclean endif DISTCLEAN_DIRS += lcov_reports* diff --git a/configure.ac b/configure.ac index d8bfb47..7d490f6 100644 --- a/configure.ac +++ b/configure.ac @@ -1788,8 +1788,6 @@ libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile -python/Makefile -python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service @@ -1814,8 +1812,6 @@ scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile -test/api/Makefile -test/api/python_lvm_unit.py tools/Makefile udev/Makefile ]) diff --git a/python/.gitignore b/python/.gitignore deleted file mode 100644 index c87e43e..0000000 --- a/python/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.liblvm_built -setup.py diff --git a/python/Makefile.in b/python/Makefile.in deleted file mode 100644 index 3dc5664..0000000 --- a/python/Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (C) 2011-2016 Red Hat, Inc. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU Lesser General Public License v.2.1. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ - -TARGETS = .liblvm_built - -include $(top_builddir)/make.tmpl - -.liblvm_built: liblvm_python.c -ifeq ("@PYTHON2_BINDINGS@", "yes") - $(PYTHON2) setup.py build -endif -ifeq ("@PYTHON3_BINDINGS@", "yes") - $(PYTHON3) setup.py build -endif - touch $@ - -liblvm_python.c: - $(LN_S) $(srcdir)/liblvm.c $@ - -install_python_bindings: $(TARGETS) -ifeq ("@PYTHON2_BINDINGS@", "yes") - $(PYTHON2) setup.py install --skip-build --prefix $(pythonprefix) -endif -ifeq ("@PYTHON3_BINDINGS@", "yes") - $(PYTHON3) setup.py install --skip-build --prefix $(pythonprefix) -endif - -install_lvm2: install_python_bindings - -install: install_lvm2 - -.PHONY: install_python_bindings -.INTERMEDIATE: liblvm_python.c - -clean: - $(RM) -r build - -distclean: clean - -CLEAN_TARGETS += liblvm_python.c - -DISTCLEAN_TARGETS += setup.py diff --git a/python/example.py b/python/example.py deleted file mode 100644 index 07ebbf2..0000000 --- a/python/example.py +++ /dev/null @@ -1,120 +0,0 @@ -# -# Copyright (C) 2012 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 2.1 of the License, or -# (at your option) any later version. -# -# 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -#----------------------------- -# Python example code: -#----------------------------- - -import lvm - -# Note: This example will create a logical unit, tag it and -# delete it, don't run this on production box! - -#Dump information about PV -def print_pv(pv): - print('PV name: ', pv.getName(), ' ID: ', pv.getUuid(), 'Size: ', pv.getSize()) - - -#Dump some information about a specific volume group -def print_vg(vg_name): - #Open read only - vg = lvm.vgOpen(vg_name, 'r') - - print('Volume group:', vg_name, 'Size: ', vg.getSize()) - - #Retrieve a list of Physical volumes for this volume group - pv_list = vg.listPVs() - - #Print out the physical volumes - for p in pv_list: - print_pv(p) - - #Get a list of logical volumes in this volume group - lv_list = vg.listLVs() - if len(lv_list): - for l in lv_list: - print('LV name: ', l.getName(), ' ID: ', l.getUuid()) - else: - print('No logical volumes present!') - - vg.close() - -#Returns the name of a vg with space available -def find_vg_with_free_space(): - free_space = 0 - rc = None - - vg_names = lvm.listVgNames() - for v in vg_names: - vg = lvm.vgOpen(v, 'r') - c_free = vg.getFreeSize() - if c_free > free_space: - free_space = c_free - rc = v - vg.close() - - return rc - -#Walk through the volume groups and fine one with space in which we can -#create a new logical volume -def create_delete_logical_volume(): - vg_name = find_vg_with_free_space() - - print('Using volume group ', vg_name, ' for example') - - if vg_name: - vg = lvm.vgOpen(vg_name, 'w') - lv = vg.createLvLinear('python_lvm_ok_to_delete', vg.getFreeSize()) - - if lv: - print('New lv, id= ', lv.getUuid()) - - #Create a tag - lv.addTag('Demo_tag') - - #Get the tags - tags = lv.getTags() - for t in tags: - #Remove tag - lv.removeTag(t) - - lv.deactivate() - - #Try to rename - lv.rename("python_lvm_renamed") - print('LV name= ', lv.getName()) - lv.remove() - - vg.close() - else: - print('No free space available to create demo lv!') - -if __name__ == '__main__': - #What version - print('lvm version=', lvm.getVersion()) - - #Get a list of volume group names - vg_names = lvm.listVgNames() - - #For each volume group display some information about each of them - for vg_i in vg_names: - print_vg(vg_i) - - #Demo creating a logical volume - create_delete_logical_volume() - diff --git a/python/liblvm.c b/python/liblvm.c deleted file mode 100644 index ea9697a..0000000 --- a/python/liblvm.c +++ /dev/null @@ -1,2095 +0,0 @@ -/* - * Liblvm -- Python interface to LVM2 API. - * - * Copyright (C) 2010, 2013 Red Hat, Inc. All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 2.1 of the License, or - * (at your option) any later version. - - * 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 Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * Authors: Lars Sjostrom (lars sjostrom redhat com) - * Andy Grover (agrover redhat com) - * Tony Asleson (tasleson redhat com) - */ - -#include <Python.h> -#define _BUILDING_LVM -#include "liblvm/lvm2app.h" -#include "lib/config/defaults.h" - -#if PY_MAJOR_VERSION >= 3 -#define IS_PY3K -#define PYINTTYPE_CHECK PyLong_Check -#define PYINTTYPE_ASLONG PyLong_AsLong -#define PYINTTYPE_FROMLONG PyLong_FromLong -#define PYSTRYPE_CHECK PyUnicode_Check -#define PYSTRTYPE_ASSTRING PyUnicode_AsUTF8 -#define PYSTRTYPE_FROMSTRING PyUnicode_FromString -#else -#define PYINTTYPE_CHECK PyInt_Check -#define PYINTTYPE_ASLONG PyInt_AsLong -#define PYINTTYPE_FROMLONG PyInt_FromLong -#define PYSTRYPE_CHECK PyString_Check -#define PYSTRTYPE_ASSTRING PyString_AsString -#define PYSTRTYPE_FROMSTRING PyString_FromString -#endif - -static lvm_t _libh; - - -typedef struct { - PyObject_HEAD - vg_t vg; /* vg handle */ - lvm_t libh_copy; -} vgobject; - -typedef struct { - PyObject_HEAD - struct dm_list *pvslist; - lvm_t libh_copy; -} pvslistobject; - -typedef struct { - PyObject_HEAD - lv_t lv; /* lv handle */ - vgobject *parent_vgobj; -} lvobject; - -typedef struct { - PyObject_HEAD - pv_t pv; /* pv handle */ - vgobject *parent_vgobj; - pvslistobject *parent_pvslistobj; -} pvobject; - -typedef struct { - PyObject_HEAD - lvseg_t lv_seg; /* lv segment handle */ - lvobject *parent_lvobj; -} lvsegobject; - -typedef struct { - PyObject_HEAD - pvseg_t pv_seg; /* pv segment handle */ - pvobject *parent_pvobj; -} pvsegobject; - -static PyTypeObject _LibLVMvgType; -static PyTypeObject _LibLVMlvType; -static PyTypeObject _LibLVMpvlistType; -static PyTypeObject _LibLVMpvType; -static PyTypeObject _LibLVMlvsegType; -static PyTypeObject _LibLVMpvsegType; - -static PyObject *_LibLVMError; - -#define LVM_VALID(ptr) \ - do { \ - if (!_libh) { \ - _libh = lvm_init(NULL); \ - } \ - if (ptr && _libh) { \ - if (ptr != _libh) { \ - PyErr_SetString(PyExc_UnboundLocalError, "LVM handle reference stale"); \ - return NULL; \ - } \ - } else if (!_libh) { \ - PyErr_SetString(PyExc_UnboundLocalError, "LVM handle invalid"); \ - return NULL; \ - } \ - } while (0) - -/** - * Ensure that we initialize all the bits to a sane state. - */ -static pvobject *_create_py_pv(void) -{ - pvobject * pvobj = PyObject_New(pvobject, &_LibLVMpvType); - - if (pvobj) { - pvobj->pv = NULL; - pvobj->parent_vgobj = NULL; - pvobj->parent_pvslistobj = NULL; - } - - return pvobj; -} - -static vgobject *_create_py_vg(void) -{ - vgobject *vgobj = PyObject_New(vgobject, &_LibLVMvgType); - - if (vgobj) { - vgobj->vg = NULL; - vgobj->libh_copy = _libh; - } - - return vgobj; -} - -static pvslistobject *_create_py_pvlist(void) -{ - pvslistobject *pvlistobj = PyObject_New(pvslistobject, &_LibLVMpvlistType); - - if (pvlistobj) { - pvlistobj->pvslist = NULL; - pvlistobj->libh_copy = _libh; - } - - return pvlistobj; -} - -static lvobject *_create_py_lv(vgobject *parent, lv_t lv) -{ - lvobject * lvobj = PyObject_New(lvobject, &_LibLVMlvType); - if (lvobj) { - lvobj->parent_vgobj = parent; - Py_INCREF(lvobj->parent_vgobj); - lvobj->lv = lv; - } - return lvobj; -} - -static PyObject *_liblvm_get_last_error(void) -{ - PyObject *info; - const char *msg = NULL; - - LVM_VALID(NULL); - - if (!(info = PyTuple_New(2))) - return NULL; - - PyTuple_SetItem(info, 0, PYINTTYPE_FROMLONG((long) lvm_errno(_libh))); - msg = lvm_errmsg(_libh); - PyTuple_SetItem(info, 1, ((msg) ? PYSTRTYPE_FROMSTRING(msg) : - PYSTRTYPE_FROMSTRING("Memory error while retrieving error message"))); - - return info; -} - -static PyObject *_liblvm_library_get_version(void) -{ - return Py_BuildValue("s", lvm_library_get_version()); -} - -static const char _gc_doc[] = "Garbage collect the C library"; - -static PyObject *_liblvm_lvm_gc(void) -{ - if (_libh) { - lvm_quit(_libh); - _libh = NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_list_vg_names(void) -{ - struct dm_list *vgnames; - struct lvm_str_list *strl; - PyObject * pytuple; - int i = 0; - - LVM_VALID(NULL); - - if (!(vgnames = lvm_list_vg_names(_libh))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - if (!(pytuple = PyTuple_New(dm_list_size(vgnames)))) - return NULL; - - dm_list_iterate_items(strl, vgnames) { - PyTuple_SET_ITEM(pytuple, i, PYSTRTYPE_FROMSTRING(strl->str)); - i++; - } - - return pytuple; -} - -static PyObject *_liblvm_lvm_list_vg_uuids(void) -{ - struct dm_list *uuids; - struct lvm_str_list *strl; - PyObject * pytuple; - int i = 0; - - LVM_VALID(NULL); - - if (!(uuids = lvm_list_vg_uuids(_libh))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - if (!(pytuple = PyTuple_New(dm_list_size(uuids)))) - return NULL; - - dm_list_iterate_items(strl, uuids) { - PyTuple_SET_ITEM(pytuple, i, PYSTRTYPE_FROMSTRING(strl->str)); - i++; - } - - return pytuple; -} - -static PyObject *_liblvm_lvm_pvlist_get(pvslistobject *pvsobj) -{ - struct lvm_pv_list *pvl; - PyObject * pytuple; - pvobject * pvobj; - int i = 0; - - /* unlike other LVM api calls, if there are no results, we get NULL */ - pvsobj->pvslist = lvm_list_pvs(_libh); - - if (!pvsobj->pvslist) - return Py_BuildValue("()"); - - if (!(pytuple = PyTuple_New(dm_list_size(pvsobj->pvslist)))) - return NULL; - - dm_list_iterate_items(pvl, pvsobj->pvslist) { - /* Create and initialize the object */ - if (!(pvobj = _create_py_pv())) { - Py_DECREF(pytuple); - return NULL; - } - - /* We don't have a parent vg object to be concerned about */ - pvobj->parent_vgobj = NULL; - pvobj->parent_pvslistobj = pvsobj; - Py_INCREF(pvobj->parent_pvslistobj); - - pvobj->pv = pvl->pv; - PyTuple_SET_ITEM(pytuple, i, (PyObject *) pvobj); - i++; - } - - return pytuple; -} - -static PyObject *_liblvm_lvm_pvlist_put(pvslistobject *self) -{ - if (self->pvslist) { - if (lvm_list_pvs_free(self->pvslist)) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - self->pvslist = NULL; - Py_INCREF(Py_None); - - return Py_None; - } - - return NULL; -} - -static PyObject *_liblvm_pvlist_dealloc(pvslistobject *self) -{ - if (self->pvslist) - _liblvm_lvm_pvlist_put(self); - - PyObject_Del(self); - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_list_pvs(void) -{ - LVM_VALID(NULL); - - return (PyObject *)_create_py_pvlist(); -} - -static PyObject *_liblvm_lvm_pv_remove(PyObject *self, PyObject *arg) -{ - const char *pv_name; - - LVM_VALID(NULL); - - if (!PyArg_ParseTuple(arg, "s", &pv_name)) - return NULL; - - if (lvm_pv_remove(_libh, pv_name) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static int _set_pv_numeric_prop(pv_create_params_t pv_params, const char *name, - unsigned long long value) -{ - struct lvm_property_value prop_value = { - .is_integer = 1, - .value.integer = value, - }; - - return lvm_pv_params_set_property(pv_params, name, &prop_value); -} - -#define SET_PV_PROP(params, name, value) \ - do { \ - if (_set_pv_numeric_prop(params, name, value) == -1) \ - goto error; \ - } while(0)\ - -static PyObject *_liblvm_lvm_pv_create(PyObject *self, PyObject *arg) -{ - const char *pv_name; - unsigned long long size = 0; - unsigned long long pvmetadatacopies = DEFAULT_PVMETADATACOPIES; - unsigned long long pvmetadatasize = DEFAULT_PVMETADATASIZE; - unsigned long long data_alignment = 0; - unsigned long long data_alignment_offset = 0; - unsigned long long zero = 1; - pv_create_params_t pv_params = NULL; - - LVM_VALID(NULL); - - if (!PyArg_ParseTuple(arg, "s|KKKKKK", &pv_name, &size, &pvmetadatacopies, - &pvmetadatasize, &data_alignment, - &data_alignment_offset, &zero)) - return NULL; - - pv_params = lvm_pv_params_create(_libh, pv_name); - if (!pv_params) { - goto error; - } - - SET_PV_PROP(pv_params, "size", size); - SET_PV_PROP(pv_params, "pvmetadatacopies", pvmetadatacopies); - SET_PV_PROP(pv_params, "pvmetadatasize", pvmetadatasize); - SET_PV_PROP(pv_params, "data_alignment", data_alignment); - SET_PV_PROP(pv_params, "data_alignment_offset", data_alignment_offset); - SET_PV_PROP(pv_params, "zero", zero); - - if (lvm_pv_create_adv(pv_params)) { - goto error; - } - - Py_INCREF(Py_None); - return Py_None; - -error: - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; -} - -static PyObject *_liblvm_lvm_percent_to_float(PyObject *self, PyObject *arg) -{ - double converted; - int percent; - - LVM_VALID(NULL); - - if (!PyArg_ParseTuple(arg, "i", &percent)) - return NULL; - - converted = lvm_percent_to_float(percent); - - return Py_BuildValue("d", converted); -} - -static PyObject *_liblvm_lvm_vg_name_validate(PyObject *self, PyObject *arg) -{ - const char *name; - - LVM_VALID(NULL); - - if (!PyArg_ParseTuple(arg, "s", &name)) - return NULL; - - if (lvm_vg_name_validate(_libh, name) < 0) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_vgname_from_pvid(PyObject *self, PyObject *arg) -{ - const char *pvid; - const char *vgname; - - LVM_VALID(NULL); - - if (!PyArg_ParseTuple(arg, "s", &pvid)) - return NULL; - - if (!(vgname = lvm_vgname_from_pvid(_libh, pvid))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - return Py_BuildValue("s", vgname); -} - -static PyObject *_liblvm_lvm_vgname_from_device(PyObject *self, PyObject *arg) -{ - const char *device; - const char *vgname; - - LVM_VALID(NULL); - - if (!PyArg_ParseTuple(arg, "s", &device)) - return NULL; - - if (!(vgname = lvm_vgname_from_device(_libh, device))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - return Py_BuildValue("s", vgname); -} - - -static PyObject *_liblvm_lvm_config_find_bool(PyObject *self, PyObject *arg) -{ - const char *config; - int rval; - PyObject *rc; - - LVM_VALID(NULL); - - if (!PyArg_ParseTuple(arg, "s", &config)) - return NULL; - - if ((rval = lvm_config_find_bool(_libh, config, -10)) == -10) { - /* Retrieving error information yields no error in this case */ - PyErr_Format(PyExc_ValueError, "config path not found"); - return NULL; - } - - rc = (rval) ? Py_True: Py_False; - - Py_INCREF(rc); - - return rc; -} - -static PyObject *_liblvm_lvm_config_reload(void) -{ - LVM_VALID(NULL); - - if (lvm_config_reload(_libh) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - - -static PyObject *_liblvm_lvm_scan(void) -{ - LVM_VALID(NULL); - - if (lvm_scan(_libh) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_config_override(PyObject *self, PyObject *arg) -{ - const char *config; - - LVM_VALID(NULL); - - if (!PyArg_ParseTuple(arg, "s", &config)) - return NULL; - - if (lvm_config_override(_libh, config) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} -/* ---------------------------------------------------------------------- - * VG object initialization/deallocation - */ - - -static PyObject *_liblvm_lvm_vg_open(PyObject *self, PyObject *args) -{ - const char *vgname; - const char *mode = NULL; - - vgobject *vgobj; - - LVM_VALID(NULL); - - if (!PyArg_ParseTuple(args, "s|s", &vgname, &mode)) - return NULL; - - if (mode == NULL) - mode = "r"; - - if (!(vgobj = _create_py_vg())) - return NULL; - - if (!(vgobj->vg = lvm_vg_open(_libh, vgname, mode, 0))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - Py_DECREF(vgobj); - return NULL; - } - - return (PyObject *)vgobj; -} - -static PyObject *_liblvm_lvm_vg_create(PyObject *self, PyObject *args) -{ - const char *vgname; - vgobject *vgobj; - - LVM_VALID(NULL); - - if (!PyArg_ParseTuple(args, "s", &vgname)) - return NULL; - - if (!(vgobj = _create_py_vg())) - return NULL; - - if (!(vgobj->vg = lvm_vg_create(_libh, vgname))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - Py_DECREF(vgobj); - return NULL; - } - - return (PyObject *)vgobj; -} - -static void liblvm_vg_dealloc(vgobject *self) -{ - /* if already closed, don't reclose it */ - if (self->vg != NULL) { - lvm_vg_close(self->vg); - self->vg = NULL; - self->libh_copy = NULL; - } - - PyObject_Del(self); -} - -/* VG Methods */ - -#define VG_VALID(vgobject) \ - do { \ - if (!vgobject || !vgobject->vg) { \ - PyErr_SetString(PyExc_UnboundLocalError, "VG object invalid"); \ - return NULL; \ - } \ - LVM_VALID(vgobject->libh_copy); \ - } while (0) - -#define PVSLIST_VALID(pvslistobject) \ - do { \ - if (!pvslistobject || !pvslistobject->pvslist) { \ - PyErr_SetString(PyExc_UnboundLocalError, "PVS object invalid"); \ - return NULL; \ - } \ - LVM_VALID(pvslistobject->libh_copy); \ - } while (0) - -static PyObject *_liblvm_lvm_vg_close(vgobject *self) -{ - /* if already closed, don't reclose it */ - if (self->vg) { - if (lvm_vg_close(self->vg) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - self->vg = NULL; - self->libh_copy = NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_vg_get_name(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("s", lvm_vg_get_name(self->vg)); -} - - -static PyObject *_liblvm_lvm_vg_get_uuid(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("s", lvm_vg_get_uuid(self->vg)); -} - -static PyObject *_liblvm_lvm_vg_remove(vgobject *self) -{ - VG_VALID(self); - - if (lvm_vg_remove(self->vg) == -1) - goto error; - - if (lvm_vg_write(self->vg) == -1) - goto error; - - /* Not much you can do with a vg that is removed so close it */ - return _liblvm_lvm_vg_close(self); - -error: - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - - return NULL; -} - -static PyObject *_liblvm_lvm_vg_extend(vgobject *self, PyObject *args) -{ - const char *device; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &device)) { - return NULL; - } - - if (lvm_vg_extend(self->vg, device) == -1) - goto error; - - if (lvm_vg_write(self->vg) == -1) - goto error; - - Py_INCREF(Py_None); - return Py_None; - -error: - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - - return NULL; -} - -static PyObject *_liblvm_lvm_vg_reduce(vgobject *self, PyObject *args) -{ - const char *device; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &device)) - return NULL; - - if (lvm_vg_reduce(self->vg, device) == -1) - goto error; - - if (lvm_vg_write(self->vg) == -1) - goto error; - - Py_INCREF(Py_None); - - return Py_None; - -error: - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - - return NULL; -} - -static PyObject *_liblvm_lvm_vg_add_tag(vgobject *self, PyObject *args) -{ - const char *tag; - int rval; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &tag)) { - return NULL; - } - if ((rval = lvm_vg_add_tag(self->vg, tag)) == -1) - goto error; - - if (lvm_vg_write(self->vg) == -1) - goto error; - - return Py_BuildValue("i", rval); - -error: - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - - return NULL; -} - -static PyObject *_liblvm_lvm_vg_remove_tag(vgobject *self, PyObject *args) -{ - const char *tag; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &tag)) - return NULL; - - if (lvm_vg_remove_tag(self->vg, tag) == -1) - goto error; - - if (lvm_vg_write(self->vg) == -1) - goto error; - - Py_INCREF(Py_None); - - return Py_None; - -error: - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - - return NULL; -} - -static PyObject *_liblvm_lvm_vg_is_clustered(vgobject *self) -{ - PyObject *rval; - - VG_VALID(self); - - rval = ( lvm_vg_is_clustered(self->vg) == 1) ? Py_True : Py_False; - - Py_INCREF(rval); - - return rval; -} - -static PyObject *_liblvm_lvm_vg_is_exported(vgobject *self) -{ - PyObject *rval; - - VG_VALID(self); - - rval = ( lvm_vg_is_exported(self->vg) == 1) ? Py_True : Py_False; - - Py_INCREF(rval); - - return rval; -} - -static PyObject *_liblvm_lvm_vg_is_partial(vgobject *self) -{ - PyObject *rval; - - VG_VALID(self); - - rval = ( lvm_vg_is_partial(self->vg) == 1) ? Py_True : Py_False; - - Py_INCREF(rval); - - return rval; -} - -static PyObject *_liblvm_lvm_vg_get_seqno(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_vg_get_seqno(self->vg)); -} - -static PyObject *_liblvm_lvm_vg_get_size(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_vg_get_size(self->vg)); -} - -static PyObject *_liblvm_lvm_vg_get_free_size(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_vg_get_free_size(self->vg)); -} - -static PyObject *_liblvm_lvm_vg_get_extent_size(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_vg_get_extent_size(self->vg)); -} - -static PyObject *_liblvm_lvm_vg_get_extent_count(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_vg_get_extent_count(self->vg)); -} - -static PyObject *_liblvm_lvm_vg_get_free_extent_count(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_vg_get_free_extent_count(self->vg)); -} - -/* Builds a python tuple ([string|number], bool) from a struct lvm_property_value */ -static PyObject *get_property(struct lvm_property_value *prop) -{ - PyObject *pytuple; - PyObject *setable; - - if (!prop->is_valid) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - if (!(pytuple = PyTuple_New(2))) - return NULL; - - if (prop->is_integer) { - if (prop->is_signed) { - PyTuple_SET_ITEM(pytuple, 0, Py_BuildValue("L", prop->value.signed_integer)); - } else { - PyTuple_SET_ITEM(pytuple, 0, Py_BuildValue("K", prop->value.integer)); - } - } else { - if ( prop->value.string ) { - PyTuple_SET_ITEM(pytuple, 0, PYSTRTYPE_FROMSTRING(prop->value.string)); - } else { - PyTuple_SET_ITEM(pytuple, 0, Py_None); - } - } - - if (prop->is_settable) - setable = Py_True; - else - setable = Py_False; - - Py_INCREF(setable); - PyTuple_SET_ITEM(pytuple, 1, setable); - - return pytuple; -} - -/* This will return a tuple of (value, bool) with the value being a string or - integer and bool indicating if property is settable */ -static PyObject *_liblvm_lvm_vg_get_property(vgobject *self, PyObject *args) -{ - const char *name; - struct lvm_property_value prop_value; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &name)) - return NULL; - - prop_value = lvm_vg_get_property(self->vg, name); - - return get_property(&prop_value); -} - -static PyObject *_liblvm_lvm_vg_set_property(vgobject *self, PyObject *args) -{ - const char *property_name = NULL; - PyObject *variant_type_arg = NULL; - struct lvm_property_value lvm_property; - char *string_value = NULL; - int temp_py_int; - unsigned long long temp_py_long; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "sO", &property_name, &variant_type_arg)) - return NULL; - - lvm_property = lvm_vg_get_property(self->vg, property_name); - if (!lvm_property.is_valid) - goto lvmerror; - - if (PYSTRYPE_CHECK(variant_type_arg)) { - - if (!lvm_property.is_string) { - PyErr_Format(PyExc_ValueError, "Property requires string value"); - goto bail; - } - - if (!(string_value = PYSTRTYPE_ASSTRING(variant_type_arg))) { - PyErr_NoMemory(); - goto bail; - } - - lvm_property.value.string = string_value; - } else { - - if (!lvm_property.is_integer) { - PyErr_Format(PyExc_ValueError, "Property requires numeric value"); - goto bail; - } - - if (PYINTTYPE_CHECK(variant_type_arg)) { - temp_py_int = PYINTTYPE_ASLONG(variant_type_arg); - - /* -1 could be valid, need to see if an exception was gen. */ - if (temp_py_int == -1 && PyErr_Occurred()) - goto bail; - - if (temp_py_int < 0) { - PyErr_Format(PyExc_ValueError, "Positive integers only!"); - goto bail; - } - - lvm_property.value.integer = temp_py_int; - } else if (PyObject_IsInstance(variant_type_arg, (PyObject*)&PyLong_Type)){ - /* If PyLong_AsUnsignedLongLong function fails an OverflowError is - * raised and (unsigned long long)-1 is returned - */ - if ((temp_py_long = PyLong_AsUnsignedLongLong(variant_type_arg)) == ~0ULL) - goto bail; - - lvm_property.value.integer = temp_py_long; - } else { - PyErr_Format(PyExc_ValueError, "supported value types are numeric and string"); - goto bail; - } - } - - if (lvm_vg_set_property(self->vg, property_name, &lvm_property) == -1) - goto lvmerror; - - if (lvm_vg_write(self->vg) == -1) - goto lvmerror; - - Py_INCREF(Py_None); - - return Py_None; - -lvmerror: - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); -bail: - return NULL; -} - -static PyObject *_liblvm_lvm_vg_get_pv_count(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_vg_get_pv_count(self->vg)); -} - -static PyObject *_liblvm_lvm_vg_get_max_pv(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_vg_get_max_pv(self->vg)); -} - -static PyObject *_liblvm_lvm_vg_get_max_lv(vgobject *self) -{ - VG_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_vg_get_max_lv(self->vg)); -} - -static PyObject *_liblvm_lvm_vg_set_extent_size(vgobject *self, PyObject *args) -{ - unsigned int new_size; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "I", &new_size)) - return NULL; - - if (lvm_vg_set_extent_size(self->vg, new_size) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_vg_list_lvs(vgobject *self) -{ - struct dm_list *lvs; - struct lvm_lv_list *lvl; - PyObject * pytuple; - lvobject * lvobj; - int i = 0; - - VG_VALID(self); - - /* unlike other LVM api calls, if there are no results, we get NULL */ - if (!(lvs = lvm_vg_list_lvs(self->vg))) - return Py_BuildValue("()"); - - if (!(pytuple = PyTuple_New(dm_list_size(lvs)))) - return NULL; - - dm_list_iterate_items(lvl, lvs) { - /* Create and initialize the object */ - if (!(lvobj = _create_py_lv(self, lvl->lv))) { - Py_DECREF(pytuple); - return NULL; - } - - PyTuple_SET_ITEM(pytuple, i, (PyObject *) lvobj); - i++; - } - - return pytuple; -} - -static PyObject *_liblvm_lvm_vg_get_tags(vgobject *self) -{ - struct dm_list *tagsl; - struct lvm_str_list *strl; - PyObject * pytuple; - int i = 0; - - VG_VALID(self); - - if (!(tagsl = lvm_vg_get_tags(self->vg))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - if (!(pytuple = PyTuple_New(dm_list_size(tagsl)))) - return NULL; - - dm_list_iterate_items(strl, tagsl) { - PyTuple_SET_ITEM(pytuple, i, PYSTRTYPE_FROMSTRING(strl->str)); - i++; - } - - return pytuple; -} - -static PyObject *_liblvm_lvm_vg_create_lv_linear(vgobject *self, PyObject *args) -{ - const char *vgname; - unsigned long long size; - lv_t lv; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "sK", &vgname, &size)) - return NULL; - - if (!(lv = lvm_vg_create_lv_linear(self->vg, vgname, size))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - return (PyObject *)_create_py_lv(self, lv); -} - -static PyObject *_liblvm_lvm_vg_create_lv_thinpool(vgobject *self, PyObject *args) -{ - unsigned long long size = 0; - unsigned long long meta_size = 0; - const char *pool_name; - unsigned long chunk_size = 0; - int skip_zero = 0; - lvm_thin_discards_t discard = LVM_THIN_DISCARDS_PASSDOWN; - lv_t lv; - lv_create_params_t lvp = NULL; - struct lvm_property_value prop_value; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "sK|kKii", &pool_name, &size, &chunk_size, - &meta_size, &discard, &skip_zero)) - return NULL; - - if (!(lvp = lvm_lv_params_create_thin_pool(self->vg, pool_name, size, chunk_size, - meta_size, discard))) { - - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - if (skip_zero) { - prop_value = lvm_lv_params_get_property(lvp, "skip_zero"); - - if (prop_value.is_valid) { - prop_value.value.integer = 1; - - if (lvm_lv_params_set_property(lvp, "skip_zero", - &prop_value) == -1) { - goto error; - } - } - } - - if (!(lv = lvm_lv_create(lvp))) { - goto error; - } - - return (PyObject *)_create_py_lv(self, lv); - -error: - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; -} - -static PyObject *_liblvm_lvm_vg_create_lv_thin(vgobject *self, PyObject *args) -{ - const char *pool_name; - const char *lv_name; - unsigned long long size = 0; - lv_t lv; - lv_create_params_t lvp = NULL; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "ssK", &pool_name, &lv_name, &size)) - return NULL; - - if (!(lvp = lvm_lv_params_create_thin(self->vg, pool_name, lv_name,size))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - if (!(lv = lvm_lv_create(lvp))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - return (PyObject *)_create_py_lv(self, lv); -} - -static void liblvm_lv_dealloc(lvobject *self) -{ - /* We can dealloc an object that didn't get fully created */ - if (self->parent_vgobj) { - Py_DECREF(self->parent_vgobj); - } - - PyObject_Del(self); -} - -static PyObject *_liblvm_lvm_vg_list_pvs(vgobject *self) -{ - struct dm_list *pvs; - struct lvm_pv_list *pvl; - PyObject * pytuple; - pvobject * pvobj; - int i = 0; - - VG_VALID(self); - - /* unlike other LVM api calls, if there are no results, we get NULL */ - if (!(pvs = lvm_vg_list_pvs(self->vg))) - return Py_BuildValue("()"); - - if (!(pytuple = PyTuple_New(dm_list_size(pvs)))) - return NULL; - - dm_list_iterate_items(pvl, pvs) { - /* Create and initialize the object */ - if (!(pvobj = _create_py_pv())) { - Py_DECREF(pytuple); - return NULL; - } - - pvobj->parent_vgobj = self; - Py_INCREF(pvobj->parent_vgobj); - - pvobj->pv = pvl->pv; - PyTuple_SET_ITEM(pytuple, i, (PyObject *) pvobj); - i++; - } - - return pytuple; -} - -typedef lv_t (*lv_fetch_by_N)(vg_t vg, const char *id); -typedef pv_t (*pv_fetch_by_N)(vg_t vg, const char *id); - -static PyObject *_liblvm_lvm_lv_from_N(vgobject *self, PyObject *arg, lv_fetch_by_N method) -{ - const char *id; - lv_t lv = NULL; - - VG_VALID(self); - - if (!PyArg_ParseTuple(arg, "s", &id)) - return NULL; - - if (!(lv = method(self->vg, id))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - return (PyObject *)_create_py_lv(self, lv); -} - -static PyObject *_liblvm_lvm_lv_from_name(vgobject *self, PyObject *arg) -{ - return _liblvm_lvm_lv_from_N(self, arg, lvm_lv_from_name); -} - -static PyObject *_liblvm_lvm_lv_from_uuid(vgobject *self, PyObject *arg) -{ - return _liblvm_lvm_lv_from_N(self, arg, lvm_lv_from_uuid); -} - -static PyObject *_liblvm_lvm_lv_name_validate(vgobject *self, PyObject *args) -{ - const char *name; - - VG_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &name)) - return NULL; - - if (lvm_lv_name_validate(self->vg, name) < 0) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_pv_from_N(vgobject *self, PyObject *arg, pv_fetch_by_N method) -{ - const char *id; - pvobject *rc; - pv_t pv = NULL; - - VG_VALID(self); - - if (!PyArg_ParseTuple(arg, "s", &id)) - return NULL; - - if (!(pv = method(self->vg, id))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - if (!(rc = _create_py_pv())) - return NULL; - - Py_INCREF(self); - rc->pv = pv; - - return (PyObject *)rc; -} - -static PyObject *_liblvm_lvm_pv_from_name(vgobject *self, PyObject *arg) -{ - return _liblvm_lvm_pv_from_N(self, arg, lvm_pv_from_name); -} - -static PyObject *_liblvm_lvm_pv_from_uuid(vgobject *self, PyObject *arg) -{ - return _liblvm_lvm_pv_from_N(self, arg, lvm_pv_from_uuid); -} - -static void _liblvm_pv_dealloc(pvobject *self) -{ - if (self->parent_vgobj) { - Py_DECREF(self->parent_vgobj); - } - - if (self->parent_pvslistobj) { - Py_DECREF(self->parent_pvslistobj); - } - - self->parent_vgobj = NULL; - self->parent_pvslistobj = NULL; - PyObject_Del(self); -} - -/* LV Methods */ - -#define LV_VALID(lvobject) \ - do { \ - if (!lvobject || !lvobject->lv) { \ - PyErr_SetString(PyExc_UnboundLocalError, "LV object invalid"); \ - return NULL; \ - }\ - VG_VALID(lvobject->parent_vgobj); \ - } while (0) - -static PyObject *_liblvm_lvm_lv_get_attr(lvobject *self) -{ - LV_VALID(self); - - return Py_BuildValue("s", lvm_lv_get_attr(self->lv)); -} - -static PyObject *_liblvm_lvm_lv_get_origin(lvobject *self) -{ - LV_VALID(self); - - return Py_BuildValue("s", lvm_lv_get_origin(self->lv)); -} - -static PyObject *_liblvm_lvm_lv_get_name(lvobject *self) -{ - LV_VALID(self); - - return Py_BuildValue("s", lvm_lv_get_name(self->lv)); -} - -static PyObject *_liblvm_lvm_lv_get_uuid(lvobject *self) -{ - LV_VALID(self); - - return Py_BuildValue("s", lvm_lv_get_uuid(self->lv)); -} - -static PyObject *_liblvm_lvm_lv_activate(lvobject *self) -{ - LV_VALID(self); - - if (lvm_lv_activate(self->lv) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_lv_deactivate(lvobject *self) -{ - LV_VALID(self); - - if (lvm_lv_deactivate(self->lv) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_vg_remove_lv(lvobject *self) -{ - LV_VALID(self); - - if (lvm_vg_remove_lv(self->lv) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - self->lv = NULL; - - Py_INCREF(Py_None); - - return Py_None; -} - -/* This will return a tuple of (value, bool) with the value being a string or - integer and bool indicating if property is settable */ -static PyObject * _liblvm_lvm_lv_get_property(lvobject *self, PyObject *args) -{ - const char *name; - struct lvm_property_value prop_value; - - LV_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &name)) - return NULL; - - prop_value = lvm_lv_get_property(self->lv, name); - - return get_property(&prop_value); -} - -static PyObject *_liblvm_lvm_lv_get_size(lvobject *self) -{ - LV_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_lv_get_size(self->lv)); -} - -static PyObject *_liblvm_lvm_lv_is_active(lvobject *self) -{ - PyObject *rval; - - LV_VALID(self); - - rval = (lvm_lv_is_active(self->lv) == 1) ? Py_True : Py_False; - - Py_INCREF(rval); - - return rval; -} - -static PyObject *_liblvm_lvm_lv_is_suspended(lvobject *self) -{ - PyObject *rval; - - LV_VALID(self); - - rval = (lvm_lv_is_suspended(self->lv) == 1) ? Py_True : Py_False; - - Py_INCREF(rval); - - return rval; -} - -static PyObject *_liblvm_lvm_lv_add_tag(lvobject *self, PyObject *args) -{ - const char *tag; - - LV_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &tag)) - return NULL; - - if (lvm_lv_add_tag(self->lv, tag) == -1) - goto error; - - if (lvm_vg_write(self->parent_vgobj->vg) == -1) - goto error; - - Py_INCREF(Py_None); - return Py_None; - -error: - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; -} - -static PyObject *_liblvm_lvm_lv_remove_tag(lvobject *self, PyObject *args) -{ - const char *tag; - - LV_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &tag)) - return NULL; - - if (lvm_lv_remove_tag(self->lv, tag) == -1) - goto error; - - if (lvm_vg_write(self->parent_vgobj->vg) == -1) - goto error; - - Py_INCREF(Py_None); - return Py_None; - -error: - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; -} - -static PyObject *_liblvm_lvm_lv_get_tags(lvobject *self) -{ - struct dm_list *tagsl; - struct lvm_str_list *strl; - PyObject * pytuple; - int i = 0; - - LV_VALID(self); - - if (!(tagsl = lvm_lv_get_tags(self->lv))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - if (!(pytuple = PyTuple_New(dm_list_size(tagsl)))) - return NULL; - - dm_list_iterate_items(strl, tagsl) { - PyTuple_SET_ITEM(pytuple, i, PYSTRTYPE_FROMSTRING(strl->str)); - i++; - } - - return pytuple; -} - -static PyObject *_liblvm_lvm_lv_rename(lvobject *self, PyObject *args) -{ - const char *new_name; - - LV_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &new_name)) - return NULL; - - if (lvm_lv_rename(self->lv, new_name) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_lv_resize(lvobject *self, PyObject *args) -{ - unsigned long long new_size; - - LV_VALID(self); - - if (!PyArg_ParseTuple(args, "K", &new_size)) - return NULL; - - if (lvm_lv_resize(self->lv, new_size) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_lv_list_lvsegs(lvobject *self) -{ - struct dm_list *lvsegs; - lvseg_list_t *lvsegl; - PyObject * pytuple; - lvsegobject *lvsegobj; - int i = 0; - - LV_VALID(self); - - if (!(lvsegs = lvm_lv_list_lvsegs(self->lv))) - return Py_BuildValue("()"); - - if (!(pytuple = PyTuple_New(dm_list_size(lvsegs)))) - return NULL; - - dm_list_iterate_items(lvsegl, lvsegs) { - /* Create and initialize the object */ - if (!(lvsegobj = PyObject_New(lvsegobject, &_LibLVMlvsegType))) { - Py_DECREF(pytuple); - return NULL; - } - - lvsegobj->parent_lvobj = self; - Py_INCREF(lvsegobj->parent_lvobj); - - lvsegobj->lv_seg = lvsegl->lvseg; - PyTuple_SET_ITEM(pytuple, i, (PyObject *) lvsegobj); - i++; - } - - return pytuple; -} - -static PyObject *_liblvm_lvm_lv_snapshot(lvobject *self, PyObject *args) -{ - const char *snap_name; - unsigned long long size = 0; - lv_t lv; - lv_create_params_t lvp = NULL; - - LV_VALID(self); - - if (!PyArg_ParseTuple(args, "s|K", &snap_name, &size)) - return NULL; - - if (!(lvp = lvm_lv_params_create_snapshot(self->lv, snap_name, size))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - if (!(lv = lvm_lv_create(lvp))) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - return (PyObject *)_create_py_lv(self->parent_vgobj, lv); -} - -/* PV Methods */ - -#define PV_VALID(pvobject) \ - do { \ - if (!pvobject || !pvobject->pv) { \ - PyErr_SetString(PyExc_UnboundLocalError, "PV object invalid"); \ - return NULL; \ - } \ - if (pvobject->parent_vgobj) { \ - VG_VALID(pvobject->parent_vgobj); \ - } \ - if (pvobject->parent_pvslistobj) { \ - PVSLIST_VALID(pvobject->parent_pvslistobj); \ - } \ - } while (0) - -static PyObject *_liblvm_lvm_pv_get_name(pvobject *self) -{ - PV_VALID(self); - - return Py_BuildValue("s", lvm_pv_get_name(self->pv)); -} - -static PyObject *_liblvm_lvm_pv_get_uuid(pvobject *self) -{ - PV_VALID(self); - - return Py_BuildValue("s", lvm_pv_get_uuid(self->pv)); -} - -static PyObject *_liblvm_lvm_pv_get_mda_count(pvobject *self) -{ - PV_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_pv_get_mda_count(self->pv)); -} - -static PyObject *_liblvm_lvm_pv_get_property(pvobject *self, PyObject *args) -{ - const char *name; - struct lvm_property_value prop_value; - - PV_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &name)) - return NULL; - - prop_value = lvm_pv_get_property(self->pv, name); - - return get_property(&prop_value); -} - -static PyObject *_liblvm_lvm_pv_get_dev_size(pvobject *self) -{ - PV_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_pv_get_dev_size(self->pv)); -} - -static PyObject *_liblvm_lvm_pv_get_size(pvobject *self) -{ - PV_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_pv_get_size(self->pv)); -} - -static PyObject *_liblvm_lvm_pv_get_free(pvobject *self) -{ - PV_VALID(self); - - return Py_BuildValue("K", (unsigned long long)lvm_pv_get_free(self->pv)); -} - -static PyObject *_liblvm_lvm_pv_resize(pvobject *self, PyObject *args) -{ - unsigned long long new_size; - - PV_VALID(self); - - if (!PyArg_ParseTuple(args, "K", &new_size)) - return NULL; - - if (lvm_pv_resize(self->pv, new_size) == -1) { - PyErr_SetObject(_LibLVMError, _liblvm_get_last_error()); - return NULL; - } - - Py_INCREF(Py_None); - - return Py_None; -} - -static PyObject *_liblvm_lvm_pv_list_pvsegs(pvobject *self) -{ - struct dm_list *pvsegs; - pvseg_list_t *pvsegl; - PyObject *pytuple; - pvsegobject *pvsegobj; - int i = 0; - - PV_VALID(self); - - if (!(pvsegs = lvm_pv_list_pvsegs(self->pv))) - return Py_BuildValue("()"); - - if (!(pytuple = PyTuple_New(dm_list_size(pvsegs)))) - return NULL; - - dm_list_iterate_items(pvsegl, pvsegs) { - /* Create and initialize the object */ - if (!(pvsegobj = PyObject_New(pvsegobject, &_LibLVMpvsegType))) { - Py_DECREF(pytuple); - return NULL; - } - - pvsegobj->parent_pvobj = self; - Py_INCREF(pvsegobj->parent_pvobj); - - pvsegobj->pv_seg = pvsegl->pvseg; - PyTuple_SET_ITEM(pytuple, i, (PyObject *) pvsegobj); - i++; - } - - return pytuple; -} - -/* LV seg methods */ - -/* - * No way to close/destroy an lvseg, just need to make sure parents are - * still good - */ -#define LVSEG_VALID(lvsegobject) \ - do { \ - if ( !lvsegobject || !lvsegobject->parent_lvobj ) { \ - PyErr_SetString(PyExc_UnboundLocalError, "LV segment object invalid"); \ - return NULL; \ - } \ - LV_VALID(lvsegobject->parent_lvobj); \ - } while(0) - -static void _liblvm_lvseg_dealloc(lvsegobject *self) -{ - Py_DECREF(self->parent_lvobj); - PyObject_Del(self); -} - -static PyObject *_liblvm_lvm_lvseg_get_property(lvsegobject *self, PyObject *args) -{ - const char *name; - struct lvm_property_value prop_value; - - LVSEG_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &name)) - return NULL; - - prop_value = lvm_lvseg_get_property(self->lv_seg, name); - - return get_property(&prop_value); -} - -/* PV seg methods */ - -/* - * No way to close/destroy a pvseg, just need to make sure parents are - * still good - */ -#define PVSEG_VALID(pvsegobject) \ - do { \ - if (!pvsegobject || !pvsegobject->parent_pvobj) { \ - PyErr_SetString(PyExc_UnboundLocalError, "PV segment object invalid"); \ - return NULL; \ - } \ - PV_VALID(pvsegobject->parent_pvobj); \ - } while(0) - -static void _liblvm_pvseg_dealloc(pvsegobject *self) -{ - Py_DECREF(self->parent_pvobj); - PyObject_Del(self); -} - -static PyObject *_liblvm_lvm_pvseg_get_property(pvsegobject *self, PyObject *args) -{ - const char *name; - struct lvm_property_value prop_value; - - PVSEG_VALID(self); - - if (!PyArg_ParseTuple(args, "s", &name)) - return NULL; - - prop_value = lvm_pvseg_get_property(self->pv_seg, name); - - return get_property(&prop_value); -} - -/* ---------------------------------------------------------------------- - * Method tables and other bureaucracy - */ - -static PyMethodDef _Liblvm_methods[] = { - /* LVM methods */ - { "getVersion", (PyCFunction)_liblvm_library_get_version, METH_NOARGS }, - { "gc", (PyCFunction)_liblvm_lvm_gc, METH_NOARGS, _gc_doc }, - { "vgOpen", (PyCFunction)_liblvm_lvm_vg_open, METH_VARARGS }, - { "vgCreate", (PyCFunction)_liblvm_lvm_vg_create, METH_VARARGS }, - { "configFindBool", (PyCFunction)_liblvm_lvm_config_find_bool, METH_VARARGS }, - { "configReload", (PyCFunction)_liblvm_lvm_config_reload, METH_NOARGS }, - { "configOverride", (PyCFunction)_liblvm_lvm_config_override, METH_VARARGS }, - { "scan", (PyCFunction)_liblvm_lvm_scan, METH_NOARGS }, - { "listVgNames", (PyCFunction)_liblvm_lvm_list_vg_names, METH_NOARGS }, - { "listVgUuids", (PyCFunction)_liblvm_lvm_list_vg_uuids, METH_NOARGS }, - { "listPvs", (PyCFunction)_liblvm_lvm_list_pvs, METH_NOARGS }, - { "pvCreate", (PyCFunction)_liblvm_lvm_pv_create, METH_VARARGS }, - { "pvRemove", (PyCFunction)_liblvm_lvm_pv_remove, METH_VARARGS }, - { "percentToFloat", (PyCFunction)_liblvm_lvm_percent_to_float, METH_VARARGS }, - { "vgNameValidate", (PyCFunction)_liblvm_lvm_vg_name_validate, METH_VARARGS }, - { "vgNameFromPvid", (PyCFunction)_liblvm_lvm_vgname_from_pvid, METH_VARARGS }, - { "vgNameFromDevice", (PyCFunction)_liblvm_lvm_vgname_from_device, METH_VARARGS }, - { NULL, NULL } /* sentinel */ -}; - -static PyMethodDef _liblvm_vg_methods[] = { - /* vg methods */ - { "getName", (PyCFunction)_liblvm_lvm_vg_get_name, METH_NOARGS }, - { "getUuid", (PyCFunction)_liblvm_lvm_vg_get_uuid, METH_NOARGS }, - { "close", (PyCFunction)_liblvm_lvm_vg_close, METH_NOARGS }, - { "remove", (PyCFunction)_liblvm_lvm_vg_remove, METH_NOARGS }, - { "extend", (PyCFunction)_liblvm_lvm_vg_extend, METH_VARARGS }, - { "reduce", (PyCFunction)_liblvm_lvm_vg_reduce, METH_VARARGS }, - { "addTag", (PyCFunction)_liblvm_lvm_vg_add_tag, METH_VARARGS }, - { "removeTag", (PyCFunction)_liblvm_lvm_vg_remove_tag, METH_VARARGS }, - { "setExtentSize", (PyCFunction)_liblvm_lvm_vg_set_extent_size, METH_VARARGS }, - { "isClustered", (PyCFunction)_liblvm_lvm_vg_is_clustered, METH_NOARGS }, - { "isExported", (PyCFunction)_liblvm_lvm_vg_is_exported, METH_NOARGS }, - { "isPartial", (PyCFunction)_liblvm_lvm_vg_is_partial, METH_NOARGS }, - { "getSeqno", (PyCFunction)_liblvm_lvm_vg_get_seqno, METH_NOARGS }, - { "getSize", (PyCFunction)_liblvm_lvm_vg_get_size, METH_NOARGS }, - { "getFreeSize", (PyCFunction)_liblvm_lvm_vg_get_free_size, METH_NOARGS }, - { "getExtentSize", (PyCFunction)_liblvm_lvm_vg_get_extent_size, METH_NOARGS }, - { "getExtentCount", (PyCFunction)_liblvm_lvm_vg_get_extent_count, METH_NOARGS }, - { "getFreeExtentCount", (PyCFunction)_liblvm_lvm_vg_get_free_extent_count, METH_NOARGS }, - { "getProperty", (PyCFunction)_liblvm_lvm_vg_get_property, METH_VARARGS }, - { "setProperty", (PyCFunction)_liblvm_lvm_vg_set_property, METH_VARARGS }, - { "getPvCount", (PyCFunction)_liblvm_lvm_vg_get_pv_count, METH_NOARGS }, - { "getMaxPv", (PyCFunction)_liblvm_lvm_vg_get_max_pv, METH_NOARGS }, - { "getMaxLv", (PyCFunction)_liblvm_lvm_vg_get_max_lv, METH_NOARGS }, - { "listLVs", (PyCFunction)_liblvm_lvm_vg_list_lvs, METH_NOARGS }, - { "listPVs", (PyCFunction)_liblvm_lvm_vg_list_pvs, METH_NOARGS }, - { "lvFromName", (PyCFunction)_liblvm_lvm_lv_from_name, METH_VARARGS }, - { "lvFromUuid", (PyCFunction)_liblvm_lvm_lv_from_uuid, METH_VARARGS }, - { "lvNameValidate", (PyCFunction)_liblvm_lvm_lv_name_validate, METH_VARARGS }, - { "pvFromName", (PyCFunction)_liblvm_lvm_pv_from_name, METH_VARARGS }, - { "pvFromUuid", (PyCFunction)_liblvm_lvm_pv_from_uuid, METH_VARARGS }, - { "getTags", (PyCFunction)_liblvm_lvm_vg_get_tags, METH_NOARGS }, - { "createLvLinear", (PyCFunction)_liblvm_lvm_vg_create_lv_linear, METH_VARARGS }, - { "createLvThinpool", (PyCFunction)_liblvm_lvm_vg_create_lv_thinpool, METH_VARARGS }, - { "createLvThin", (PyCFunction)_liblvm_lvm_vg_create_lv_thin, METH_VARARGS }, - { NULL, NULL } /* sentinel */ -}; - -static PyMethodDef _liblvm_lv_methods[] = { - /* lv methods */ - { "getAttr", (PyCFunction)_liblvm_lvm_lv_get_attr, METH_NOARGS }, - { "getName", (PyCFunction)_liblvm_lvm_lv_get_name, METH_NOARGS }, - { "getOrigin", (PyCFunction)_liblvm_lvm_lv_get_origin, METH_NOARGS }, - { "getUuid", (PyCFunction)_liblvm_lvm_lv_get_uuid, METH_NOARGS }, - { "activate", (PyCFunction)_liblvm_lvm_lv_activate, METH_NOARGS }, - { "deactivate", (PyCFunction)_liblvm_lvm_lv_deactivate, METH_NOARGS }, - { "remove", (PyCFunction)_liblvm_lvm_vg_remove_lv, METH_NOARGS }, - { "getProperty", (PyCFunction)_liblvm_lvm_lv_get_property, METH_VARARGS }, - { "getSize", (PyCFunction)_liblvm_lvm_lv_get_size, METH_NOARGS }, - { "isActive", (PyCFunction)_liblvm_lvm_lv_is_active, METH_NOARGS }, - { "isSuspended", (PyCFunction)_liblvm_lvm_lv_is_suspended, METH_NOARGS }, - { "addTag", (PyCFunction)_liblvm_lvm_lv_add_tag, METH_VARARGS }, - { "removeTag", (PyCFunction)_liblvm_lvm_lv_remove_tag, METH_VARARGS }, - { "getTags", (PyCFunction)_liblvm_lvm_lv_get_tags, METH_NOARGS }, - { "rename", (PyCFunction)_liblvm_lvm_lv_rename, METH_VARARGS }, - { "resize", (PyCFunction)_liblvm_lvm_lv_resize, METH_VARARGS }, - { "listLVsegs", (PyCFunction)_liblvm_lvm_lv_list_lvsegs, METH_NOARGS }, - { "snapshot", (PyCFunction)_liblvm_lvm_lv_snapshot, METH_VARARGS }, - { NULL, NULL } /* sentinel */ -}; - -static PyMethodDef _liblvm_pv_list_methods[] = { - /* pv list methods */ - { "__enter__", (PyCFunction)_liblvm_lvm_pvlist_get, METH_VARARGS }, - { "__exit__", (PyCFunction)_liblvm_lvm_pvlist_put, METH_VARARGS }, - { "open", (PyCFunction)_liblvm_lvm_pvlist_get, METH_VARARGS }, - { "close", (PyCFunction)_liblvm_lvm_pvlist_put, METH_VARARGS }, - { NULL, NULL } -}; - -static PyMethodDef _liblvm_pv_methods[] = { - /* pv methods */ - { "getName", (PyCFunction)_liblvm_lvm_pv_get_name, METH_NOARGS }, - { "getUuid", (PyCFunction)_liblvm_lvm_pv_get_uuid, METH_NOARGS }, - { "getMdaCount", (PyCFunction)_liblvm_lvm_pv_get_mda_count, METH_NOARGS }, - { "getProperty", (PyCFunction)_liblvm_lvm_pv_get_property, METH_VARARGS }, - { "getSize", (PyCFunction)_liblvm_lvm_pv_get_size, METH_NOARGS }, - { "getDevSize", (PyCFunction)_liblvm_lvm_pv_get_dev_size, METH_NOARGS }, - { "getFree", (PyCFunction)_liblvm_lvm_pv_get_free, METH_NOARGS }, - { "resize", (PyCFunction)_liblvm_lvm_pv_resize, METH_VARARGS }, - { "listPVsegs", (PyCFunction)_liblvm_lvm_pv_list_pvsegs, METH_NOARGS }, - { NULL, NULL } /* sentinel */ -}; - -static PyMethodDef _liblvm_lvseg_methods[] = { - { "getProperty", (PyCFunction)_liblvm_lvm_lvseg_get_property, METH_VARARGS }, - { NULL, NULL } /* sentinel */ -}; - -static PyMethodDef _liblvm_pvseg_methods[] = { - { "getProperty", (PyCFunction)_liblvm_lvm_pvseg_get_property, METH_VARARGS }, - { NULL, NULL } /* sentinel */ -}; - -static PyTypeObject _LibLVMvgType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) - .tp_name = "lvm.Liblvm_vg", - .tp_basicsize = sizeof(vgobject), - .tp_new = PyType_GenericNew, - .tp_dealloc = (destructor)liblvm_vg_dealloc, - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_doc = "LVM Volume Group object", - .tp_methods = _liblvm_vg_methods, -}; - -static PyTypeObject _LibLVMlvType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) - .tp_name = "lvm.Liblvm_lv", - .tp_basicsize = sizeof(lvobject), - .tp_new = PyType_GenericNew, - .tp_dealloc = (destructor)liblvm_lv_dealloc, - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_doc = "LVM Logical Volume object", - .tp_methods = _liblvm_lv_methods, -}; - -static PyTypeObject _LibLVMpvlistType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) - .tp_name = "lvm.Liblvm_pvlist", - .tp_basicsize = sizeof(pvslistobject), - .tp_new = PyType_GenericNew, - .tp_dealloc = (destructor)_liblvm_pvlist_dealloc, - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_doc = "LVM Physical Volume list object", - .tp_methods = _liblvm_pv_list_methods, -}; - -static PyTypeObject _LibLVMpvType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) - .tp_name = "lvm.Liblvm_pv", - .tp_basicsize = sizeof(pvobject), - .tp_new = PyType_GenericNew, - .tp_dealloc = (destructor)_liblvm_pv_dealloc, - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_doc = "LVM Physical Volume object", - .tp_methods = _liblvm_pv_methods, -}; - -static PyTypeObject _LibLVMlvsegType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) - .tp_name = "lvm.Liblvm_lvseg", - .tp_basicsize = sizeof(lvsegobject), - .tp_new = PyType_GenericNew, - .tp_dealloc = (destructor)_liblvm_lvseg_dealloc, - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_doc = "LVM Logical Volume Segment object", - .tp_methods = _liblvm_lvseg_methods, -}; - -static PyTypeObject _LibLVMpvsegType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) - .tp_name = "lvm.Liblvm_pvseg", - .tp_basicsize = sizeof(pvsegobject), - .tp_new = PyType_GenericNew, - .tp_dealloc = (destructor)_liblvm_pvseg_dealloc, - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_doc = "LVM Physical Volume Segment object", - .tp_methods = _liblvm_pvseg_methods, -}; - -static void _liblvm_cleanup(void) -{ - if (_libh) { - lvm_quit(_libh); - _libh = NULL; - } -} - -#ifdef IS_PY3K -static struct PyModuleDef moduledef = { - PyModuleDef_HEAD_INIT, - "lvm", - "Liblvm module", - -1, - _Liblvm_methods, - NULL, - NULL, - NULL, - NULL -}; - -#define MODINITERROR return NULL -PyObject * -PyInit_lvm(void) - -#else -#define MODINITERROR return -PyMODINIT_FUNC initlvm(void); -PyMODINIT_FUNC initlvm(void) -#endif -{ - PyObject *m; - - if (PyType_Ready(&_LibLVMvgType) < 0) - MODINITERROR; - if (PyType_Ready(&_LibLVMlvType) < 0) - MODINITERROR; - if (PyType_Ready(&_LibLVMpvType) < 0) - MODINITERROR; - if (PyType_Ready(&_LibLVMlvsegType) < 0) - MODINITERROR; - if (PyType_Ready(&_LibLVMpvsegType) < 0) - MODINITERROR; - if (PyType_Ready(&_LibLVMpvlistType) < 0) - MODINITERROR; - -#ifdef IS_PY3K - m = PyModule_Create(&moduledef); -#else - m = Py_InitModule3("lvm", _Liblvm_methods, "Liblvm module"); -#endif - if (m == NULL) - MODINITERROR; - - if (PyModule_AddIntConstant(m, "THIN_DISCARDS_IGNORE", - LVM_THIN_DISCARDS_IGNORE) < 0) - MODINITERROR; - - if (PyModule_AddIntConstant(m, "THIN_DISCARDS_NO_PASSDOWN", - LVM_THIN_DISCARDS_NO_PASSDOWN) < 0) - MODINITERROR; - - if (PyModule_AddIntConstant(m, "THIN_DISCARDS_PASSDOWN", - LVM_THIN_DISCARDS_PASSDOWN) < 0) - MODINITERROR; - - if ((_LibLVMError = PyErr_NewException((char*)"lvm.LibLVMError", NULL, NULL))) { - /* Each call to PyModule_AddObject decrefs it; compensate: */ - Py_INCREF(_LibLVMError); - Py_INCREF(_LibLVMError); - PyModule_AddObject(m, "error", _LibLVMError); - PyModule_AddObject(m, "LibLVMError", _LibLVMError); - } - - PyErr_Warn(PyExc_DeprecationWarning, "Python API is deprecated, use D-Bus API instead."); - - Py_AtExit(_liblvm_cleanup); -#ifdef IS_PY3K - return m; -#endif -} diff --git a/python/setup.py.in b/python/setup.py.in deleted file mode 100644 index 07b79df..0000000 --- a/python/setup.py.in +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (C) 2012-2018 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 2.1 of the License, or -# (at your option) any later version. -# -# 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -from distutils.core import setup, Extension - -liblvm = Extension('lvm', - sources = ['liblvm_python.c'], - libraries= ['lvm2app', 'devmapper'], - library_dirs= ['@top_builddir@/liblvm', '@top_builddir@/libdm'], - include_dirs= ['@top_builddir@/include', '@top_srcdir@']) - -setup (name='lvm', - version=@LVM_VERSION@, - description='Python bindings for liblvm2', - license="LGPLv2+", - maintainer='LVM2 maintainers', - maintainer_email='linux-lvm(a)redhat.com', - url='http://sourceware.org/lvm2/', - ext_modules=[liblvm], -) diff --git a/test/Makefile.in b/test/Makefile.in index 65ba900..4c3c715 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -27,7 +27,6 @@ datarootdir = @datarootdir@ LVM_TEST_RESULTS ?= results -SUBDIRS = api # FIXME: resolve testing of: unit SOURCES = lib/not.c lib/harness.c CXXSOURCES = lib/runner.cpp @@ -50,9 +49,9 @@ include $(top_builddir)/make.tmpl T ?= . S ?= @ # never match anything by default VERBOSE ?= 0 -ALL := $(shell find -L $(srcdir) $ -path \*/shell/\*.sh -or -path \*/api/\*.sh -or -path \*/unit/\*.sh $ | $(SORT)) +ALL := $(shell find -L $(srcdir) $ -path \*/shell/\*.sh -or -path \*/unit/\*.sh $ | $(SORT)) comma = , -RUN := $(shell find -L $(srcdir) -regextype posix-egrep $ -path \*/shell/\*.sh -or -path \*/api/\*.sh -or -path \*/unit/\*.sh $ -and -regex "$(srcdir)/.*($(subst $(comma),|,$(T))).*" -and -not -regex "$(srcdir)/.*($(subst $(comma),|,$(S))).*" | $(SORT)) +RUN := $(shell find -L $(srcdir) -regextype posix-egrep $ -path \*/shell/\*.sh -or -path \*/unit/\*.sh $ -and -regex "$(srcdir)/.*($(subst $(comma),|,$(T))).*" -and -not -regex "$(srcdir)/.*($(subst $(comma),|,$(S))).*" | $(SORT)) RUN_BASE = $(subst $(srcdir)/,,$(RUN)) ifeq ("@BUILD_LVMETAD@", "yes") @@ -248,12 +247,10 @@ LIB_SHARED = check aux inittest utils get lvm-wrapper install: .tests-stamp lib/paths-installed @echo $(srcdir) - $(INSTALL_DIR) $(DATADIR)/{shell,api,unit,lib,dbus} $(EXECDIR) + $(INSTALL_DIR) $(DATADIR)/{shell,unit,lib,dbus} $(EXECDIR) $(INSTALL_DATA) shell/*.sh $(DATADIR)/shell - $(INSTALL_DATA) api/*.sh $(DATADIR)/api $(INSTALL_DATA) unit/*.sh $(DATADIR)/unit $(INSTALL_DATA) lib/mke2fs.conf $(DATADIR)/lib - $(INSTALL_PROGRAM) api/*.{t,py} $(DATADIR)/api $(INSTALL_PROGRAM) unit/unit-test $(DATADIR)/unit $(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/ $(INSTALL_DATA) lib/paths-installed $(DATADIR)/lib/paths @@ -326,7 +323,7 @@ lib/paths-installed: lib/paths-common $(RM) $@-t cat lib/paths-common > $@-t echo 'installed_testsuite=1' >> $@-t - echo 'export PATH=@libexecdir@/lvm2-testsuite:@datadir@/lvm2-testsuite/lib:@datadir@/lvm2-testsuite/api:$$PATH' >> $@-t + echo 'export PATH=@libexecdir@/lvm2-testsuite:@datadir@/lvm2-testsuite/lib:$$PATH' >> $@-t mv $@-t $@ lib/paths: lib/paths-common diff --git a/test/api/Makefile.in b/test/api/Makefile.in deleted file mode 100644 index c8d9fc0..0000000 --- a/test/api/Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (C) 2009-2012 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ - -TARGETS = -PYTEST = python_lvm_unit.py - -include $(top_builddir)/make.tmpl - -DEFS += -D_REENTRANT - -all: - test -x $(PYTEST) || chmod 755 $(PYTEST) - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status test/api/Makefile diff --git a/test/api/lvtest.sh b/test/api/lvtest.sh deleted file mode 100644 index 8cba14c..0000000 --- a/test/api/lvtest.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Copyright (C) 2011 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -SKIP_WITH_LVMPOLLD=1 - -. lib/inittest - -aux prepare_vg 1 - -lvcreate -n test -l 5 $vg -aux apitest lvtest $vg - -check lv_field $vg/test lv_name test - -vgremove -ff $vg diff --git a/test/api/pe_start.sh b/test/api/pe_start.sh deleted file mode 100644 index 88d4d01..0000000 --- a/test/api/pe_start.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Copyright (C) 2011 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -SKIP_WITH_LVMPOLLD=1 - -. lib/inittest - -aux prepare_devs 2 - -aux apitest pe_start test_vg $dev1 - -not vgs test_vg -not pvs $dev1 diff --git a/test/api/percent.sh b/test/api/percent.sh deleted file mode 100644 index 32c0892..0000000 --- a/test/api/percent.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# Copyright (C) 2010-2013 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -SKIP_WITH_LVMPOLLD=1 - -. lib/inittest - -aux kernel_at_least 2 6 33 || skip - -aux prepare_pvs 2 -get_devs - -vgcreate -s 4k "$vg" "${DEVICES[@]}" -lvcreate -aey -l 5 -n foo $vg -lvcreate -s -n snap $vg/foo -l 3 -c 4k -lvcreate -s -n snap2 $vg/foo -l 6 -c 4k -dd if=/dev/zero of="$DM_DEV_DIR/$vg/snap2" count=1 bs=1024 oflag=direct -# skip test with broken kernel -check lv_field $vg/snap2 data_percent "50.00" || skip -lvcreate -aey --type mirror -m 1 -n mirr $vg -l 1 --mirrorlog core -lvs -a $vg -aux apitest percent $vg - -vgremove -ff $vg diff --git a/test/api/pytest.sh b/test/api/pytest.sh deleted file mode 100644 index ed9df5e..0000000 --- a/test/api/pytest.sh +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash -# Copyright (C) 2012-2015 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -SKIP_WITH_LVMETAD=1 -SKIP_WITH_CLVMD=1 - -. lib/inittest - -aux prepare_dmeventd - -# -# TODO: -# lvm2app is not yet capable to respect many lvm.conf options -# since a lot of them is set in /tools/liblvmline -# Until fixed - testing always runs with enabled monitoring -# thus it needs dmeventd -# - -# Example of using 'gdb' with python: -# gdb -ex r --args python FULL_PATH/lvm2/test/api/python_lvm_unit.py -v TestLvm.test_lv_active_inactive - -#Locate the python binding library to use. -if [[ -n "${abs_top_builddir+varset}" ]]; then - # For python2 look for lvm.so, python3 uses some lengthy names - case "$(head -1 $(which python_lvm_unit.py) )" in - *2) python_lib=($(find "$abs_top_builddir" -name lvm.so)) ;; - *) python_lib=($(find "$abs_top_builddir" -name lvm*gnu.so)) ;; - esac - if [[ ${#python_lib[*]} -ne 1 ]]; then - if [[ ${#python_lib[*]} -gt 1 ]]; then - # Unable to test python bindings if multiple libraries found: - echo "Found left over lvm.so: ${python_lib[*]}" - false - else - # Unable to test python bindings if library not available - skip "lvm2-python-libs not built" - fi - fi - - PYTHONPATH=$(dirname "${python_lib[*]}"):${PYTHONPATH-} - export PYTHONPATH -elif rpm -q lvm2-python-libs &>/dev/null; then - true -else - skip "lvm2-python-libs neither built nor installed" -fi - -#If you change this change the unit test case too. -aux prepare_pvs 6 - -#Setup which devices the unit test can use. -PY_UNIT_PVS=$(cat DEVICES) -export PY_UNIT_PVS - -#When needed to run 1 single individual python test -#python_lvm_unit.py -v -f TestLvm.test_lv_persistence -#exit - -# Run individual tests for shorter error trace -for i in \ - lv_persistence \ - config_find_bool \ - config_override \ - config_reload \ - dupe_lv_create \ - get_set_extend_size \ - lv_active_inactive \ - lv_property \ - lv_rename \ - lv_resize \ - lv_seg \ - lv_size \ - lv_snapshot \ - lv_suspend \ - lv_tags \ - percent_to_float \ - pv_create \ - pv_empty_listing \ - pv_getters \ - pv_life_cycle \ - pv_lookup_from_vg \ - pv_property \ - pv_resize \ - pv_segs \ - scan \ - version \ - vg_from_pv_lookups \ - vg_getters \ - vg_get_name \ - vg_get_set_prop \ - vg_get_uuid \ - vg_lv_name_validate \ - vg_names \ - vg_reduce \ - vg_remove_restore \ - vg_tags \ - vg_uuids -do - python_lvm_unit.py -v TestLvm.test_$i - rm -f debug.log_DEBUG* -done - -# CHECKME: not for testing? -#python_lvm_unit.py -v TestLvm.test_listing -#python_lvm_unit.py -v TestLvm.test_pv_methods diff --git a/test/api/python_lvm_unit.py.in b/test/api/python_lvm_unit.py.in deleted file mode 100755 index 78ced7e..0000000 --- a/test/api/python_lvm_unit.py.in +++ /dev/null @@ -1,1048 +0,0 @@ -#!@PYTHON@ - -# Copyright (C) 2012-2013 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -import unittest -import random -import string -import lvm -import os -import itertools -import sys - -if sys.version_info[0] > 2: - long = int - -# Set of basic unit tests for the python bindings. -# -# *** WARNING *** -# -# This test tries to only modify configuration for the list of allowed -# PVs, but an error in it could potentially cause data loss if run on a -# production system. Therefore it is strongly advised that this unit test -# not be run on a system that contains data of value. - -fh = None - - -def l(txt): - if os.environ.get('PY_UNIT_LOG') is not None: - global fh - if fh is None: - fh = open('/tmp/lvm_py_unit_test_' + rs(10), "a") - fh.write(txt + "\n") - fh.flush() - - -def rs(rand_len=10): - """ - Generate a random string - """ - return ''.join( - random.choice(string.ascii_uppercase)for x in range(rand_len)) - - -def _get_allowed_devices(): - rc = os.environ.get('PY_UNIT_PVS') - if rc is not None: - rc = rc.splitlines() - rc.sort() - return rc - - -class AllowedPVS(object): - """ - We are only allowed to muck with certain PV, filter to only - the ones we can use. - """ - - def __init__(self): - self.handle = None - self.pvs_all = None - - def __enter__(self): - rc = [] - - allowed_dev = _get_allowed_devices() - - if allowed_dev: - self.handle = lvm.listPvs() - self.pvs_all = self.handle.open() - - for p in self.pvs_all: - if p.getName() in allowed_dev: - rc.append(p) - - #Sort them consistently - rc.sort(key=lambda x: x.getName()) - return rc - - def __exit__(self, t_type, value, traceback): - if self.handle: - self.pvs_all = None - self.handle.close() - - -class TestLvm(unittest.TestCase): - - VG_P = os.environ.get('PREFIX') - - @staticmethod - def _get_pv_device_names(): - rc = [] - with AllowedPVS() as pvs: - for p in pvs: - rc.append(p.getName()) - return rc - - @staticmethod - def _create_thick_lv(device_list, name): - vg = lvm.vgCreate(TestLvm.VG_P + "_" + name) - - for d in device_list: - vg.extend(d) - - vg.createLvLinear(name, vg.getSize() // 2) - vg.close() - vg = None - - @staticmethod - def _create_thin_pool(device_list, pool_name): - vg = lvm.vgCreate(TestLvm.VG_P + "_" + pool_name) - - for d in device_list: - vg.extend(d) - - vg.createLvThinpool( - pool_name, vg.getSize() // 2, 0, 0, lvm.THIN_DISCARDS_PASSDOWN, 1) - return vg - - @staticmethod - def _create_thin_lv(pv_devices, name): - thin_pool_name = 'thin_vg_pool_' + rs(4) - vg = TestLvm._create_thin_pool(pv_devices, thin_pool_name) - vg.createLvThin(thin_pool_name, name, vg.getSize() // 8) - vg.close() - vg = None - - @staticmethod - def _vg_names(): - rc = [] - vg_names = lvm.listVgNames() - - for i in vg_names: - if i[0:len(TestLvm.VG_P)] == TestLvm.VG_P: - rc.append(i) - - return rc - - @staticmethod - def _get_lv(lv_vol_type=None, lv_name=None): - vg_name_list = TestLvm._vg_names() - for vg_name in vg_name_list: - vg = lvm.vgOpen(vg_name, "w") - lvs = vg.listLVs() - - for lv in lvs: - attr = lv.getAttr() - if lv_vol_type or lv_name: - if lv_vol_type is not None and attr[0] == lv_vol_type: - return lv, vg - elif lv_name is not None and lv_name == lv.getName(): - return lv, vg - else: - return lv, vg - vg.close() - return None, None - - @staticmethod - def _remove_vg(vg_name): - vg = lvm.vgOpen(vg_name, 'w') - - pvs = vg.listPVs() - - pe_devices = [] - - #Remove old snapshots first, then lv - for lv in vg.listLVs(): - attr = lv.getAttr() - if attr[0] == 's': - lv.remove() - - lvs = vg.listLVs() - - #Now remove any thin lVs - for lv in vg.listLVs(): - attr = lv.getAttr() - if attr[0] == 'V': - lv.remove() - - #now remove the rest - for lv in vg.listLVs(): - name = lv.getName() - - #Don't remove the hidden ones - if '_tmeta' not in name and '_tdata' not in name: - lv.remove() - - for p in pvs: - pe_devices.append(p.getName()) - - for pv in pe_devices[:-1]: - vg.reduce(pv) - - vg.remove() - vg.close() - - @staticmethod - def _clean_up(): - #Clear out the testing PVs, but only if they contain stuff - #this unit test created - for vg_n in TestLvm._vg_names(): - TestLvm._remove_vg(vg_n) - - for d in TestLvm._get_pv_device_names(): - lvm.pvRemove(d) - lvm.pvCreate(d) - - def setUp(self): - device_list = TestLvm._get_pv_device_names() - - #Make sure we have an adequate number of PVs to use - self.assertTrue(len(device_list) >= 4) - TestLvm._clean_up() - - def tearDown(self): - TestLvm._clean_up() - - def test_pv_resize(self): - with AllowedPVS() as pvs: - pv = pvs[0] - curr_size = pv.getSize() - dev_size = pv.getDevSize() - self.assertTrue(curr_size == dev_size) - pv.resize(curr_size // 2) - with AllowedPVS() as pvs: - pv = pvs[0] - resized_size = pv.getSize() - self.assertTrue(resized_size != curr_size) - pv.resize(dev_size) - - def test_pv_life_cycle(self): - """ - Test removing and re-creating a PV - """ - target_name = None - - with AllowedPVS() as pvs: - pv = pvs[0] - target_name = pv.getName() - lvm.pvRemove(target_name) - - with AllowedPVS() as pvs: - for p in pvs: - self.assertTrue(p.getName() != target_name) - - lvm.pvCreate(target_name, 0) - - with AllowedPVS() as pvs: - found = False - for p in pvs: - if p.getName() == target_name: - found = True - - self.assertTrue(found) - - @staticmethod - def _test_pv_methods(): - with AllowedPVS() as pvs: - for p in pvs: - p.getName() - p.getUuid() - p.getMdaCount() - p.getSize() - p.getDevSize() - p.getFree() - p = None - - def test_version(self): - version = lvm.getVersion() - self.assertNotEquals(version, None) - self.assertEquals(type(version), str) - self.assertTrue(len(version) > 0) - - def test_pv_getters(self): - with AllowedPVS() as pvs: - pv = pvs[0] - self.assertEqual(type(pv.getName()), str) - self.assertTrue(len(pv.getName()) > 0) - - self.assertEqual(type(pv.getUuid()), str) - self.assertTrue(len(pv.getUuid()) > 0) - - self.assertTrue( - type(pv.getMdaCount()) == int or - type(pv.getMdaCount()) == long) - - self.assertTrue( - type(pv.getSize()) == int or - type(pv.getSize()) == long) - - self.assertTrue( - type(pv.getDevSize()) == int or - type(pv.getSize()) == long) - - self.assertTrue( - type(pv.getFree()) == int or - type(pv.getFree()) == long) - - def _test_prop(self, prop_obj, prop, var_type, settable): - result = prop_obj.getProperty(prop) - - #If we have no string value we can get a None type back - if result[0] is not None: - self.assertEqual(type(result[0]), var_type) - else: - self.assertTrue(str == var_type) - self.assertEqual(type(result[1]), bool) - self.assertTrue(result[1] == settable) - - def test_pv_segs(self): - with AllowedPVS() as pvs: - pv = pvs[0] - pv_segs = pv.listPVsegs() - - #LVsegs returns a tuple, (value, bool settable) - #TODO: Test other properties of pv_seg - for i in pv_segs: - self._test_prop(i, 'pvseg_start', long, False) - - def test_pv_property(self): - with AllowedPVS() as pvs: - pv = pvs[0] - self._test_prop(pv, 'pv_mda_count', long, False) - - def test_lv_property(self): - lv_name = 'lv_test' - TestLvm._create_thin_lv(TestLvm._get_pv_device_names(), lv_name) - lv, vg = TestLvm._get_lv(None, lv_name) - - lv_seg_properties = [ - ('chunk_size', long, False), ('devices', str, False), - ('discards', str, False), ('region_size', long, False), - ('segtype', str, False), ('seg_pe_ranges', str, False), - ('seg_size', long, False), ('seg_size_pe', long, False), - ('seg_start', long, False), ('seg_start_pe', long, False), - ('seg_tags', str, False), ('stripes', long, False), - ('stripe_size', long, False), ('thin_count', long, False), - ('transaction_id', long, False), ('zero', long, False)] - - lv_properties = [ - ('convert_lv', str, False), ('copy_percent', long, False), - ('data_lv', str, False), ('lv_attr', str, False), - ('lv_host', str, False), ('lv_kernel_major', long, False), - ('lv_kernel_minor', long, False), - ('lv_kernel_read_ahead', long, False), - ('lv_major', long, False), ('lv_minor', long, False), - ('lv_name', str, False), ('lv_path', str, False), - ('lv_profile', str, False), ('lv_read_ahead', long, False), - ('lv_size', long, False), ('lv_tags', str, False), - ('lv_time', str, False), ('lv_uuid', str, False), - ('metadata_lv', str, False), ('mirror_log', str, False), - ('lv_modules', str, False), ('move_pv', str, False), - ('origin', str, False), ('origin_size', long, False), - ('pool_lv', str, False), ('raid_max_recovery_rate', long, False), - ('raid_min_recovery_rate', long, False), - ('raid_mismatch_count', long, False), - ('raid_sync_action', str, False), - ('raid_write_behind', long, False), ('seg_count', long, False), - ('snap_percent', long, False), ('sync_percent', long, False)] - - # Generic test case, make sure we get what we expect - for t in lv_properties: - self._test_prop(lv, *t) - - segments = lv.listLVsegs() - if segments and len(segments): - for s in segments: - for t in lv_seg_properties: - self._test_prop(s, *t) - - # Test specific cases - tag = 'hello_world' - lv.addTag(tag) - tags = lv.getProperty('lv_tags') - self.assertTrue(tag in tags[0]) - vg.close() - - def test_lv_tags(self): - lv_name = 'lv_test' - TestLvm._create_thin_lv(TestLvm._get_pv_device_names(), lv_name) - lv, vg = TestLvm._get_lv(None, lv_name) - self._test_tags(lv) - vg.close() - - def test_lv_active_inactive(self): - lv_name = 'lv_test' - TestLvm._create_thin_lv(TestLvm._get_pv_device_names(), lv_name) - lv, vg = TestLvm._get_lv(None, lv_name) - lv.deactivate() - self.assertTrue(lv.isActive() is False) - lv.activate() - self.assertTrue(lv.isActive() is True) - vg.close() - - def test_lv_rename(self): - lv_name = 'lv_test' - TestLvm._create_thin_lv(TestLvm._get_pv_device_names(), lv_name) - lv, vg = TestLvm._get_lv(None, lv_name) - - current_name = lv.getName() - new_name = rs() - lv.rename(new_name) - self.assertEqual(lv.getName(), new_name) - lv.rename(current_name) - vg.close() - - def test_lv_persistence(self): - # Make changes to the lv, close the vg and re-open to make sure that - # the changes persist - lv_name = 'lv_test_persist' - TestLvm._create_thick_lv(TestLvm._get_pv_device_names(), lv_name) - - # Test rename - lv, vg = TestLvm._get_lv(None, lv_name) - current_name = lv.getName() - new_name = rs() - lv.rename(new_name) - - vg.close() - vg = None - - lv, vg = TestLvm._get_lv(None, new_name) - - self.assertTrue(lv is not None) - - if lv and vg: - lv.rename(lv_name) - vg.close() - vg = None - - # Test lv tag add - tag = 'hello_world' - - lv, vg = TestLvm._get_lv(None, lv_name) - lv.addTag(tag) - vg.close() - vg = None - - lv, vg = TestLvm._get_lv(None, lv_name) - tags = lv.getTags() - - self.assertTrue(tag in tags) - vg.close() - vg = None - - # Test lv tag delete - lv, vg = TestLvm._get_lv(None, lv_name) - self.assertTrue(lv is not None and vg is not None) - - if lv and vg: - tags = lv.getTags() - - for t in tags: - lv.removeTag(t) - - vg.close() - vg = None - - lv, vg = TestLvm._get_lv(None, lv_name) - self.assertTrue(lv is not None and vg is not None) - - if lv and vg: - tags = lv.getTags() - - if tags: - self.assertEqual(len(tags), 0) - vg.close() - vg = None - - # Test lv deactivate - lv, vg = TestLvm._get_lv(None, lv_name) - self.assertTrue(lv is not None and vg is not None) - - if lv and vg: - lv.deactivate() - vg.close() - vg = None - - lv, vg = TestLvm._get_lv(None, lv_name) - self.assertTrue(lv is not None and vg is not None) - if lv and vg: - self.assertFalse(lv.isActive()) - vg.close() - vg = None - - # Test lv activate - lv, vg = TestLvm._get_lv(None, lv_name) - self.assertTrue(lv is not None and vg is not None) - if lv and vg: - lv.activate() - vg.close() - vg = None - - lv, vg = TestLvm._get_lv(None, lv_name) - self.assertTrue(lv is not None and vg is not None) - if lv and vg: - self.assertTrue(lv.isActive()) - vg.close() - vg = None - - def test_lv_snapshot(self): - - thin_lv = 'thin_lv' - thick_lv = 'thick_lv' - - device_names = TestLvm._get_pv_device_names() - - TestLvm._create_thin_lv(device_names[0:2], thin_lv) - TestLvm._create_thick_lv(device_names[2:4], thick_lv) - - lv, vg = TestLvm._get_lv(None, thick_lv) -# FIXME lv.snapshot('thick_snap_shot', 1024*1024) - vg.close() - -# FIXME thick_ss, vg = TestLvm._get_lv(None, 'thick_snap_shot') -# FIXME self.assertTrue(thick_ss is not None) -# FIXME vg.close() - - thin_lv, vg = TestLvm._get_lv(None, thin_lv) - thin_lv.snapshot('thin_snap_shot') - vg.close() - - thin_ss, vg = TestLvm._get_lv(None, 'thin_snap_shot') - self.assertTrue(thin_ss is not None) - - origin = thin_ss.getOrigin() - self.assertTrue(thin_lv, origin) - - vg.close() - - def test_lv_suspend(self): - lv_name = 'lv_test' - TestLvm._create_thin_lv(TestLvm._get_pv_device_names(), lv_name) - lv, vg = TestLvm._get_lv(None, lv_name) - - result = lv.isSuspended() - self.assertTrue(type(result) == bool) - vg.close() - - def test_lv_size(self): - lv_name = 'lv_test' - TestLvm._create_thin_lv(TestLvm._get_pv_device_names(), lv_name) - lv, vg = TestLvm._get_lv(None, lv_name) - - result = lv.getSize() - self.assertTrue(type(result) == int or type(result) == long) - vg.close() - - def test_lv_resize(self): - lv_name = 'lv_test' - TestLvm._create_thin_lv(TestLvm._get_pv_device_names(), lv_name) - lv, vg = TestLvm._get_lv(None, lv_name) - - curr_size = lv.getSize() - lv.resize(curr_size + (1024 * 1024)) - latest = lv.getSize() - self.assertTrue(curr_size != latest) - - def test_lv_seg(self): - lv_name = 'lv_test' - TestLvm._create_thin_lv(TestLvm._get_pv_device_names(), lv_name) - lv, vg = TestLvm._get_lv(None, lv_name) - - lv_segs = lv.listLVsegs() - - #LVsegs returns a tuple, (value, bool settable) - #TODO: Test other properties of lv_seg - for i in lv_segs: - self._test_prop(i, 'seg_start_pe', long, False) - - vg.close() - - def test_get_set_extend_size(self): - thick_lv = 'get_set_prop' - device_names = TestLvm._get_pv_device_names() - TestLvm._create_thick_lv(device_names[0:2], thick_lv) - lv, vg = TestLvm._get_lv(None, thick_lv) - - new_extent = 1024 * 1024 * 4 - - self.assertFalse( - vg.getExtentSize() != new_extent, - "Cannot determine if it works if they are the same") - - vg.setExtentSize(new_extent) - self.assertEqual(vg.getExtentSize(), new_extent) - vg.close() - - def test_vg_get_set_prop(self): - thick_lv = 'get_set_prop' - device_names = TestLvm._get_pv_device_names() - TestLvm._create_thick_lv(device_names[0:2], thick_lv) - lv, vg = TestLvm._get_lv(None, thick_lv) - - self.assertTrue(vg is not None) - if vg: - vg_mda_copies = vg.getProperty('vg_mda_copies') - vg.setProperty('vg_mda_copies', vg_mda_copies[0]) - vg.close() - - def test_vg_remove_restore(self): - #Store off the list of physical devices - pv_devices = [] - - thick_lv = 'get_set_prop' - device_names = TestLvm._get_pv_device_names() - TestLvm._create_thick_lv(device_names[0:2], thick_lv) - lv, vg = TestLvm._get_lv(None, thick_lv) - - vg_name = vg.getName() - - pvs = vg.listPVs() - for p in pvs: - pv_devices.append(p.getName()) - vg.close() - - TestLvm._remove_vg(vg_name) - self._create_thick_lv(pv_devices, thick_lv) - - def test_vg_names(self): - vg = lvm.listVgNames() - self.assertTrue(isinstance(vg, tuple)) - - def test_dupe_lv_create(self): - """ - Try to create a lv with the same name expecting a failure - Note: This was causing a seg. fault previously - """ - thick_lv = 'dupe_name' - device_names = TestLvm._get_pv_device_names() - TestLvm._create_thick_lv(device_names[0:2], thick_lv) - lv, vg = TestLvm._get_lv(None, thick_lv) - - self.assertTrue(vg is not None) - - if vg: - lvs = vg.listLVs() - - if len(lvs): - lv = lvs[0] - lv_name = lv.getName() - self.assertRaises( - lvm.LibLVMError, vg.createLvLinear, lv_name, lv.getSize()) - vg.close() - - def test_vg_uuids(self): - - device_names = TestLvm._get_pv_device_names() - TestLvm._create_thin_lv(device_names[0:2], 'thin') - TestLvm._create_thick_lv(device_names[2:4], 'thick') - - vgs_uuids = lvm.listVgUuids() - - self.assertTrue(len(vgs_uuids) > 0) - self.assertTrue(isinstance(vgs_uuids, tuple)) - - vgs_uuids = list(vgs_uuids) - vgs_names = lvm.listVgNames() - - for vg_name in vgs_names: - vg = lvm.vgOpen(vg_name, "r") - - #TODO Write/fix BUG, vg uuid don't match between - #lvm.listVgUuids and vg.getUuid() - vg_uuid_search = vg.getUuid().replace('-', '') - - self.assertTrue(vg_uuid_search in vgs_uuids) - vgs_uuids.remove(vg_uuid_search) - vg.close() - - self.assertTrue(len(vgs_uuids) == 0) - - def test_pv_lookup_from_vg(self): - device_names = TestLvm._get_pv_device_names() - TestLvm._create_thin_lv(device_names[0:2], 'thin') - TestLvm._create_thick_lv(device_names[2:4], 'thick') - - vg_names = TestLvm._vg_names() - - self.assertTrue(len(vg_names) > 0) - - for vg_name in vg_names: - vg = lvm.vgOpen(vg_name, 'w') - pvs = vg.listPVs() - - for p in pvs: - name = p.getName() - uuid = p.getUuid() - - pv_name_lookup = vg.pvFromName(name) - pv_uuid_lookup = vg.pvFromUuid(uuid) - - self.assertTrue( - pv_name_lookup.getName() == pv_uuid_lookup.getName()) - self.assertTrue( - pv_name_lookup.getUuid() == pv_uuid_lookup.getUuid()) - - self.assertTrue(name == pv_name_lookup.getName()) - self.assertTrue(uuid == pv_uuid_lookup.getUuid()) - - pv_name_lookup = None - pv_uuid_lookup = None - p = None - - pvs = None - vg.close() - - def test_percent_to_float(self): - self.assertEqual(lvm.percentToFloat(0), 0.0) - self.assertEqual(lvm.percentToFloat(1000000), 1.0) - self.assertEqual(lvm.percentToFloat(1000000 // 2), 0.5) - - def test_scan(self): - self.assertEqual(lvm.scan(), None) - - def test_config_reload(self): - self.assertEqual(lvm.configReload(), None) - - def test_config_override(self): - self.assertEquals(lvm.configOverride("global.test = 1"), None) - - def test_config_find_bool(self): - either_or = lvm.configFindBool("global/fallback_to_local_locking") - self.assertTrue(type(either_or) == bool) - self.assertTrue(lvm.configFindBool("global/locking_type")) - - def test_vg_from_pv_lookups(self): - device_names = TestLvm._get_pv_device_names() - TestLvm._create_thin_lv(device_names[0:2], 'thin') - TestLvm._create_thick_lv(device_names[2:4], 'thick') - - vgname_list = TestLvm._vg_names() - - self.assertTrue(len(vgname_list) > 0) - - for vg_name in vgname_list: - vg = lvm.vgOpen(vg_name, 'r') - - vg_name = vg.getName() - - pv_list = vg.listPVs() - for pv in pv_list: - vg_name_from_pv = lvm.vgNameFromPvid(pv.getUuid()) - self.assertEquals(vg_name, vg_name_from_pv) - self.assertEqual(vg_name, lvm.vgNameFromDevice(pv.getName())) - vg.close() - - def test_vg_get_name(self): - device_names = TestLvm._get_pv_device_names() - TestLvm._create_thin_lv(device_names[0:2], 'thin') - TestLvm._create_thick_lv(device_names[2:4], 'thick') - - vgname_list = TestLvm._vg_names() - - self.assertTrue(len(vgname_list) > 0) - - for vg_name in vgname_list: - vg = lvm.vgOpen(vg_name, 'r') - self.assertEqual(vg.getName(), vg_name) - vg.close() - - def test_vg_get_uuid(self): - device_names = TestLvm._get_pv_device_names() - TestLvm._create_thin_lv(device_names[0:2], 'thin') - TestLvm._create_thick_lv(device_names[2:4], 'thick') - - vgname_list = TestLvm._vg_names() - - self.assertTrue(len(vgname_list) > 0) - - for vg_name in vgname_list: - vg = lvm.vgOpen(vg_name, 'r') - uuid = vg.getUuid() - self.assertNotEqual(uuid, None) - self.assertTrue(len(uuid) > 0) - vg.close() - - RETURN_NUMERIC = [ - "getSeqno", "getSize", "getFreeSize", "getFreeSize", - "getExtentSize", "getExtentCount", "getFreeExtentCount", - "getPvCount", "getMaxPv", "getMaxLv"] - - def test_vg_getters(self): - device_names = TestLvm._get_pv_device_names() - TestLvm._create_thin_lv(device_names[0:2], 'thin') - TestLvm._create_thick_lv(device_names[2:4], 'thick') - - vg_name_list = TestLvm._vg_names() - - self.assertTrue(len(vg_name_list) > 0) - - for vg_name in vg_name_list: - vg = lvm.vgOpen(vg_name, 'r') - self.assertTrue(type(vg.isClustered()) == bool) - self.assertTrue(type(vg.isExported()) == bool) - self.assertTrue(type(vg.isPartial()) == bool) - - #Loop through the list invoking the method - for method_name in TestLvm.RETURN_NUMERIC: - method = getattr(vg, method_name) - result = method() - self.assertTrue(type(result) == int or type(result) == long) - - vg.close() - - def _test_tags(self, tag_obj): - existing_tags = tag_obj.getTags() - self.assertTrue(type(existing_tags) == tuple) - - num_tags = random.randint(2, 40) - created_tags = [] - - for i in range(num_tags): - tag_name = rs(random.randint(1, 128)) - tag_obj.addTag(tag_name) - created_tags.append(tag_name) - - tags = tag_obj.getTags() - self.assertTrue(len(existing_tags) + len(created_tags) == len(tags)) - - num_remove = len(created_tags) - - for i in range(num_remove): - tag_to_remove = created_tags[ - random.randint(0, len(created_tags) - 1)] - - created_tags.remove(tag_to_remove) - - tag_obj.removeTag(tag_to_remove) - - current_tags = tag_obj.getTags() - self.assertFalse(tag_to_remove in current_tags) - - current_tags = tag_obj.getTags() - self.assertTrue(len(current_tags) == len(existing_tags)) - for e in existing_tags: - self.assertTrue(e in current_tags) - - def test_vg_tags(self): - device_names = TestLvm._get_pv_device_names() - - i = 0 - for d in device_names: - if i % 2 == 0: - TestLvm._create_thin_lv([d], "thin_lv%d" % i) - else: - TestLvm._create_thick_lv([d], "thick_lv%d" % i) - i += 1 - - for vg_name in TestLvm._vg_names(): - vg = lvm.vgOpen(vg_name, 'w') - self._test_tags(vg) - vg.close() - - @staticmethod - def _test_listing(): - - env = os.environ - - for k, v in env.items(): - l("%s:%s" % (k, v)) - - with lvm.listPvs() as pvs: - for p in pvs: - l('pv= %s' % p.getName()) - - l('Checking for VG') - for v in lvm.listVgNames(): - l('vg= %s' % v) - - def test_pv_empty_listing(self): - #We had a bug where we would seg. fault if we had no PVs. - - l('testPVemptylisting entry') - - device_names = TestLvm._get_pv_device_names() - - for d in device_names: - l("Removing %s" % d) - lvm.pvRemove(d) - - count = 0 - - with lvm.listPvs() as pvs: - for p in pvs: - count += 1 - l('pv= %s' % p.getName()) - - self.assertTrue(count == 0) - - for d in device_names: - lvm.pvCreate(d) - - def test_pv_create(self): - size = [0, 1024 * 1024 * 8] - pvmeta_copies = [0, 1, 2] - pvmeta_size = [0, 255, 512, 1024] - data_alignment = [0, 2048, 4096] - zero = [0, 1] - - device_names = TestLvm._get_pv_device_names() - - for d in device_names: - lvm.pvRemove(d) - - d = device_names[0] - - #Test some error cases - self.assertRaises(TypeError, lvm.pvCreate, None) - self.assertRaises(lvm.LibLVMError, lvm.pvCreate, '') - self.assertRaises(lvm.LibLVMError, lvm.pvCreate, d, 4) - self.assertRaises(lvm.LibLVMError, lvm.pvCreate, d, 0, 4) - self.assertRaises(lvm.LibLVMError, lvm.pvCreate, d, 0, 0, 0, 2 ** 34) - self.assertRaises( - lvm.LibLVMError, lvm.pvCreate, d, 0, 0, 0, 4096, 2 ** 34) - - #Try a number of combinations and permutations - for s in size: - for copies in pvmeta_copies: - for pv_size in pvmeta_size: - for align in data_alignment: - for z in zero: - lvm.pvCreate(d, s, copies, pv_size, align, - align, z) - lvm.pvRemove(d) - - #Restore - for d in device_names: - lvm.pvCreate(d) - - def test_vg_reduce(self): - # Test the case where we try to reduce a vg where the last PV has - # no metadata copies. In this case the reduce should fail. - vg_name = TestLvm.VG_P + 'reduce_test' - - device_names = TestLvm._get_pv_device_names() - - for d in device_names: - lvm.pvRemove(d) - - lvm.pvCreate(device_names[0], 0, 0) # Size all, pvmetadatacopies 0 - lvm.pvCreate(device_names[1]) - lvm.pvCreate(device_names[2]) - lvm.pvCreate(device_names[3]) - - vg = lvm.vgCreate(vg_name) - - vg.extend(device_names[3]) - vg.extend(device_names[2]) - vg.extend(device_names[1]) - vg.extend(device_names[0]) - vg.close() - - vg = None - - vg = lvm.vgOpen(vg_name, 'w') - - vg.reduce(device_names[3]) - vg.reduce(device_names[2]) - - self.assertRaises(lvm.LibLVMError, vg.reduce, device_names[1]) - - vg.close() - vg = None - - vg = lvm.vgOpen(vg_name, 'w') - vg.remove() - vg.close() - - @staticmethod - def _test_valid_names(method): - sample = 'azAZ09._-+' - - method('x' * 127) - method('.X') - method('..X') - - for i in range(1, 7): - tests = (''.join(i) for i in itertools.product(sample, repeat=i)) - for t in tests: - if t == '.' or t == '..': - t += 'X' - elif t.startswith('-'): - t = 'H' + t - method(t) - - def _test_bad_names(self, method, dupe_name): - # Test for duplicate name - self.assertRaises(lvm.LibLVMError, method, dupe_name) - - # Test for too long a name - self.assertRaises(lvm.LibLVMError, method, ('x' * 128)) - - # Test empty - self.assertRaises(lvm.LibLVMError, method, '') - - # Invalid characters - self.assertRaises(lvm.LibLVMError, method, '&invalid^char') - - # Cannot start with .. and no following characters - self.assertRaises(lvm.LibLVMError, method, '..') - - # Cannot start with . and no following characters - self.assertRaises(lvm.LibLVMError, method, '.') - - # Cannot start with a hyphen - self.assertRaises(lvm.LibLVMError, method, '-not_good') - - def _lv_reserved_names(self, method): - prefixes = ['snapshot', 'pvmove'] - reserved = [ - '_mlog', '_mimage', '_pmspare', '_rimage', '_rmeta', - '_vorigin', '_tdata', '_tmeta'] - - for p in prefixes: - self.assertRaises(lvm.LibLVMError, method, p + rs(3)) - - for r in reserved: - self.assertRaises(lvm.LibLVMError, method, rs(3) + r + rs(1)) - self.assertRaises(lvm.LibLVMError, method, r + rs(1)) - - def test_vg_lv_name_validate(self): - lv_name = 'vg_lv_name_validate' - TestLvm._create_thin_lv(TestLvm._get_pv_device_names(), lv_name) - lv, vg = TestLvm._get_lv(None, lv_name) - - self._test_bad_names(lvm.vgNameValidate, vg.getName()) - self._test_bad_names(vg.lvNameValidate, lv.getName()) - - # Test good values - TestLvm._test_valid_names(lvm.vgNameValidate) - TestLvm._test_valid_names(vg.lvNameValidate) - self._lv_reserved_names(vg.lvNameValidate) - - vg.close() - -if __name__ == "__main__": - unittest.main() diff --git a/test/api/thin_percent.sh b/test/api/thin_percent.sh deleted file mode 100644 index db4970f..0000000 --- a/test/api/thin_percent.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Copyright (C) 2012 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -SKIP_WITH_LVMPOLLD=1 - -export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false} - -. lib/inittest - -aux have_thin 1 0 0 || skip - -aux prepare_devs 2 - -vgcreate -s 64k $vg $(cat DEVICES) - -lvcreate -L5M -T $vg/pool - -lvcreate -V1M -T $vg/pool -n thin -dd if=/dev/urandom of="$DM_DEV_DIR/$vg/thin" count=2 bs=256K - -lvcreate -s $vg/thin -K -n snap -dd if=/dev/urandom of="$DM_DEV_DIR/$vg/snap" count=3 bs=256K - -lvs -o+discards $vg - -aux apitest thin_percent $vg - -vgremove -ff $vg diff --git a/test/api/vglist.sh b/test/api/vglist.sh deleted file mode 100644 index b07cac9..0000000 --- a/test/api/vglist.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Copyright (C) 2013 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -SKIP_WITH_LVMPOLLD=1 - -. lib/inittest - -aux prepare_vg 2 -aux apitest vglist $vg "$(get vg_field $vg vg_uuid | sed -e s,-,,g)" diff --git a/test/api/vgtest.sh b/test/api/vgtest.sh deleted file mode 100644 index 13bf505..0000000 --- a/test/api/vgtest.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Copyright (C) 2008 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -# -# tests lvm2app library -# - -SKIP_WITH_LVMLOCKD=1 -SKIP_WITH_LVMPOLLD=1 - -. lib/inittest - -aux prepare_pvs 2 - -aux apitest vgtest $vg1 "$dev1" "$dev2" diff --git a/test/lib/aux.sh b/test/lib/aux.sh index bd42f30..4eb9260 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -1364,11 +1364,6 @@ prepare_profiles() { done } -apitest() { - test -x "$TESTOLDPWD/api/$1.t" || skip - "$TESTOLDPWD/api/$1.t" "${@:2}" && rm -f debug.log strace.log -} - unittest() { test -x "$TESTOLDPWD/unit/unit-test" || skip "$TESTOLDPWD/unit/unit-test" "${@}"

1 0

master - Remove header declarations for removed functions
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=669b1295aef917e5f811f… Commit: 669b1295aef917e5f811f448b88c9592944cf18a Parent: dbc3e62cc079c00bb48987848a6315fb0a7372f8 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 10:01:05 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 10:01:05 2018 -0500 Remove header declarations for removed functions --- lib/cache/lvmcache.h | 13 ------------- lib/metadata/metadata-exported.h | 27 --------------------------- lib/metadata/vg.h | 7 ------- 3 files changed, 0 insertions(+), 47 deletions(-) diff --git a/lib/cache/lvmcache.h b/lib/cache/lvmcache.h index 4808a0d..536f6fd 100644 --- a/lib/cache/lvmcache.h +++ b/lib/cache/lvmcache.h @@ -102,8 +102,6 @@ struct lvmcache_info *lvmcache_info_from_pvid(const char *pvid, struct device *d const char *lvmcache_vgname_from_vgid(struct dm_pool *mem, const char *vgid); const char *lvmcache_vgid_from_vgname(struct cmd_context *cmd, const char *vgname); struct device *lvmcache_device_from_pvid(struct cmd_context *cmd, const struct id *pvid, uint64_t *label_sector); -const char *lvmcache_pvid_from_devname(struct cmd_context *cmd, const char *devname); -char *lvmcache_vgname_from_pvid(struct cmd_context *cmd, const char *pvid); const char *lvmcache_vgname_from_info(struct lvmcache_info *info); const struct format_type *lvmcache_fmt_from_info(struct lvmcache_info *info); int lvmcache_vgs_locked(void); @@ -111,16 +109,6 @@ int lvmcache_vgname_is_locked(const char *vgname); void lvmcache_seed_infos_from_lvmetad(struct cmd_context *cmd); -/* Returns list of struct dm_str_list containing pool-allocated copy of vgnames */ -/* If include_internal is not set, return only proper vg names. */ -struct dm_list *lvmcache_get_vgnames(struct cmd_context *cmd, - int include_internal); - -/* Returns list of struct dm_str_list containing pool-allocated copy of vgids */ -/* If include_internal is not set, return only proper vg ids. */ -struct dm_list *lvmcache_get_vgids(struct cmd_context *cmd, - int include_internal); - int lvmcache_get_vgnameids(struct cmd_context *cmd, int include_internal, struct dm_list *vgnameids); @@ -180,7 +168,6 @@ uint64_t lvmcache_device_size(struct lvmcache_info *info); void lvmcache_set_device_size(struct lvmcache_info *info, uint64_t size); struct device *lvmcache_device(struct lvmcache_info *info); int lvmcache_is_orphan(struct lvmcache_info *info); -int lvmcache_uncertain_ownership(struct lvmcache_info *info); unsigned lvmcache_mda_count(struct lvmcache_info *info); int lvmcache_vgid_is_cached(const char *vgid); uint64_t lvmcache_smallest_mda_size(struct lvmcache_info *info); diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index e95652e..bcd10a3 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -654,12 +654,6 @@ void vg_revert(struct volume_group *vg); struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vg_name, const char *vgid, uint32_t lockd_state, uint32_t warn_flags, int *consistent); -#define get_pvs( cmd ) get_pvs_internal((cmd), NULL, NULL) -#define get_pvs_perserve_vg( cmd, pv_list, vg_list ) get_pvs_internal((cmd), (pv_list), (vg_list)) - -struct dm_list *get_pvs_internal(struct cmd_context *cmd, - struct dm_list *pvslist, struct dm_list *vgslist); - /* * Add/remove LV to/from volume group */ @@ -668,11 +662,8 @@ int unlink_lv_from_vg(struct logical_volume *lv); void lv_set_visible(struct logical_volume *lv); void lv_set_hidden(struct logical_volume *lv); -struct dm_list *get_vgnames(struct cmd_context *cmd, int include_internal); -struct dm_list *get_vgids(struct cmd_context *cmd, int include_internal); int get_vgnameids(struct cmd_context *cmd, struct dm_list *vgnameids, const char *only_this_vgname, int include_internal); -int scan_vgs_for_pvs(struct cmd_context *cmd, uint32_t warn_flags); int pv_write(struct cmd_context *cmd, struct physical_volume *pv, int allow_non_orphan); int move_pv(struct volume_group *vg_from, struct volume_group *vg_to, @@ -711,12 +702,6 @@ uint32_t vg_read_error(struct volume_group *vg_handle); struct physical_volume *pv_create(const struct cmd_context *cmd, struct device *dev, struct pv_create_args *pva); -struct physical_volume *pvcreate_vol(struct cmd_context *cmd, const char *pv_name, - struct pvcreate_params *pp, int write_now); - -int pvremove_many(struct cmd_context *cmd, struct dm_list *pv_names, - unsigned force_count, unsigned prompt); - int pv_resize_single(struct cmd_context *cmd, struct volume_group *vg, struct physical_volume *pv, @@ -740,10 +725,7 @@ int vg_remove_direct(struct volume_group *vg); int vg_remove(struct volume_group *vg); int vg_rename(struct cmd_context *cmd, struct volume_group *vg, const char *new_name); -int vg_extend(struct volume_group *vg, int pv_count, const char *const *pv_names, - struct pvcreate_params *pp); int vg_extend_each_pv(struct volume_group *vg, struct pvcreate_params *pp); -int vg_reduce(struct volume_group *vg, const char *pv_name); int vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, struct physical_volume *pv, int commit); @@ -1029,15 +1011,6 @@ struct generic_logical_volume *find_historical_glv(const struct volume_group *vg int lv_name_is_used_in_vg(const struct volume_group *vg, const char *name, int *historical); -struct physical_volume *find_pv_by_name(struct cmd_context *cmd, - const char *pv_name, - int allow_orphan, int allow_unformatted); - -const char *find_vgname_from_pvname(struct cmd_context *cmd, - const char *pvname); -const char *find_vgname_from_pvid(struct cmd_context *cmd, - const char *pvid); - int lv_is_on_pv(struct logical_volume *lv, struct physical_volume *pv); int lv_is_on_pvs(struct logical_volume *lv, struct dm_list *pvs); int get_pv_list_for_lv(struct dm_pool *mem, diff --git a/lib/metadata/vg.h b/lib/metadata/vg.h index 8e9917f..4c70406 100644 --- a/lib/metadata/vg.h +++ b/lib/metadata/vg.h @@ -32,13 +32,6 @@ typedef enum { ALLOC_INHERIT } alloc_policy_t; -struct pv_to_write { - struct dm_list list; - struct physical_volume *pv; - struct pvcreate_params *pp; - int new_pv; -}; - #define MAX_EXTENT_COUNT (UINT32_MAX) struct volume_group {

1 0

master - tests: don't look for liblvm
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=dbc3e62cc079c00bb4898… Commit: dbc3e62cc079c00bb48987848a6315fb0a7372f8 Parent: 73b7e6fde720601b6c2d8e36d818c89580f097ff Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 09:36:03 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 09:36:03 2018 -0500 tests: don't look for liblvm --- test/lib/utils.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/lib/utils.sh b/test/lib/utils.sh index 36fbf06..2cd00dd 100644 --- a/test/lib/utils.sh +++ b/test/lib/utils.sh @@ -276,7 +276,7 @@ if test -z "${installed_testsuite+varset}"; then *) PATH="$abs_top_builddir/test/lib:$abs_top_builddir/test/api:$PATH" LD_LIBRARY_PATH=$(find -L "$abs_top_builddir/libdm/" "$abs_top_builddir/tools/"\ - "$abs_top_builddir/daemons/" "$abs_top_builddir/liblvm/"\ + "$abs_top_builddir/daemons/" \ -name "*.so" -printf "%h:")"$LD_LIBRARY_PATH" export PATH LD_LIBRARY_PATH ;; esac

1 0

master - Remove more code that was only used by liblvm2app
by David Teigland 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=73b7e6fde720601b6c2d8… Commit: 73b7e6fde720601b6c2d8e36d818c89580f097ff Parent: 7c4b19c335c7da9f2b58ef71de46b170b59a2f9d Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 8 09:29:11 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 8 09:29:11 2018 -0500 Remove more code that was only used by liblvm2app --- lib/Makefile.in | 1 - lib/cache/lvmcache.c | 101 ------ lib/metadata/metadata-liblvm.c | 679 ---------------------------------------- lib/metadata/metadata.c | 271 ---------------- lib/metadata/vg.c | 1 - lib/metadata/vg.h | 2 - 6 files changed, 0 insertions(+), 1055 deletions(-) diff --git a/lib/Makefile.in b/lib/Makefile.in index 4b64ce0..ead443e 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -68,7 +68,6 @@ SOURCES =\ metadata/lv_manip.c \ metadata/merge.c \ metadata/metadata.c \ - metadata/metadata-liblvm.c \ metadata/mirror.c \ metadata/pool_manip.c \ metadata/pv.c \ diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 86c8775..3cbe1df 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -471,27 +471,6 @@ const char *lvmcache_vgname_from_info(struct lvmcache_info *info) return NULL; } -char *lvmcache_vgname_from_pvid(struct cmd_context *cmd, const char *pvid) -{ - struct lvmcache_info *info; - char *vgname; - - if (!lvmcache_device_from_pvid(cmd, (const struct id *)pvid, NULL)) { - log_error("Couldn't find device with uuid %s.", pvid); - return NULL; - } - - info = lvmcache_info_from_pvid(pvid, NULL, 0); - if (!info) - return_NULL; - - if (!(vgname = dm_pool_strdup(cmd->mem, info->vginfo->vgname))) { - log_errno(ENOMEM, "vgname allocation failed"); - return NULL; - } - return vgname; -} - /* * Check if any PVs in vg->pvs have the same PVID as any * entries in _unused_duplicate_devices. @@ -1187,61 +1166,6 @@ int lvmcache_get_vgnameids(struct cmd_context *cmd, int include_internal, return 1; } -struct dm_list *lvmcache_get_vgids(struct cmd_context *cmd, - int include_internal) -{ - struct dm_list *vgids; - struct lvmcache_vginfo *vginfo; - - // TODO plug into lvmetad here automagically? - lvmcache_label_scan(cmd); - - if (!(vgids = str_list_create(cmd->mem))) { - log_error("vgids list allocation failed"); - return NULL; - } - - dm_list_iterate_items(vginfo, &_vginfos) { - if (!include_internal && is_orphan_vg(vginfo->vgname)) - continue; - - if (!str_list_add(cmd->mem, vgids, - dm_pool_strdup(cmd->mem, vginfo->vgid))) { - log_error("strlist allocation failed"); - return NULL; - } - } - - return vgids; -} - -struct dm_list *lvmcache_get_vgnames(struct cmd_context *cmd, - int include_internal) -{ - struct dm_list *vgnames; - struct lvmcache_vginfo *vginfo; - - lvmcache_label_scan(cmd); - - if (!(vgnames = str_list_create(cmd->mem))) { - log_errno(ENOMEM, "vgnames list allocation failed"); - return NULL; - } - - dm_list_iterate_items(vginfo, &_vginfos) { - if (!include_internal && is_orphan_vg(vginfo->vgname)) - continue; - - if (!str_list_add(cmd->mem, vgnames, - dm_pool_strdup(cmd->mem, vginfo->vgname))) { - log_errno(ENOMEM, "strlist allocation failed"); - return NULL; - } - } - - return vgnames; -} - struct dm_list *lvmcache_get_pvids(struct cmd_context *cmd, const char *vgname, const char *vgid) { @@ -1310,23 +1234,6 @@ struct device *lvmcache_device_from_pvid(struct cmd_context *cmd, const struct i return NULL; } -const char *lvmcache_pvid_from_devname(struct cmd_context *cmd, - const char *devname) -{ - struct device *dev; - - if (!(dev = dev_cache_get(devname, cmd->filter))) { - log_error("%s: Couldn't find device. Check your filters?", - devname); - return NULL; - } - - if (!label_read(dev)) - return NULL; - - return dev->pvid; -} - int lvmcache_pvid_in_unchosen_duplicates(const char *pvid) { struct device_list *devl; @@ -2435,14 +2342,6 @@ void lvmcache_set_independent_location(const char *vgname) vginfo->independent_metadata_location = 1; } -/* - * Return true iff it is impossible to find out from this info alone whether the - * PV in question is or is not an orphan. - */ -int lvmcache_uncertain_ownership(struct lvmcache_info *info) { - return mdas_empty_or_ignored(&info->mdas); -} - uint64_t lvmcache_smallest_mda_size(struct lvmcache_info *info) { if (!info) diff --git a/lib/metadata/metadata-liblvm.c b/lib/metadata/metadata-liblvm.c deleted file mode 100644 index ccea2e4..0000000 --- a/lib/metadata/metadata-liblvm.c +++ /dev/null @@ -1,679 +0,0 @@ -/* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * This file contains functions now used only by liblvm. - * Ideally this file should be empty as liblvm and toollib should be doing identical things. - * FIXME Merge all the code into different parts of the tree. - */ -#include "lib/misc/lib.h" -#include "lib/commands/toolcontext.h" -#include "lib/misc/lvm-string.h" -#include "lib/metadata/metadata.h" -#include "lib/label/label.h" -#include "lib/misc/lvm-signal.h" -#include "lib/cache/lvmcache.h" -#include "lib/cache/lvmetad.h" - -int vg_reduce(struct volume_group *vg, const char *pv_name) -{ - struct physical_volume *pv; - struct pv_list *pvl; - - if (!(pvl = find_pv_in_vg(vg, pv_name))) { - log_error("Physical volume %s not in volume group %s.", - pv_name, vg->name); - return 0; - } - - pv = pvl->pv; - - if (vgreduce_single(vg->cmd, vg, pv, 0)) { - dm_list_add(&vg->removed_pvs, &pvl->list); - return 1; - } - - log_error("Unable to remove physical volume '%s' from " - "volume group '%s'.", pv_name, vg->name); - - return 0; -} - -static int _pvcreate_write(struct cmd_context *cmd, struct pv_to_write *pvw) -{ - struct physical_volume *pv = pvw->pv; - struct device *dev = pv->dev; - const char *pv_name = dev_name(dev); - - if (pvw->new_pv) { - /* Wipe existing label first */ - if (!label_remove(pv_dev(pv))) { - log_error("Failed to wipe existing label on %s", pv_name); - return 0; - } - - if (pvw->pp->zero) { - log_verbose("Zeroing start of device %s", pv_name); - - if (!dev_write_zeros(dev, UINT64_C(0), (size_t) 2048)) { - log_error("%s not wiped: aborting", pv_name); - return 0; - } - } - } - - log_verbose("Writing physical volume data to disk \"%s\"", - pv_name); - - if (!(pv_write(cmd, pv, 1))) { - log_error("Failed to write physical volume \"%s\"", pv_name); - return 0; - } - - if (pvw->new_pv) - log_print_unless_silent("Physical volume \"%s\" successfully created", pv_name); - else - log_verbose("Physical volume \"%s\" successfully written", pv_name); - - return 1; -} - -static int _verify_pv_create_params(struct pvcreate_params *pp) -{ - /* - * FIXME: Some of these checks are duplicates in pvcreate_params_validate. - */ - if (pp->pva.pvmetadatacopies > 2) { - log_error("Metadatacopies may only be 0, 1 or 2"); - return 0; - } - - if (pp->pva.data_alignment > UINT32_MAX) { - log_error("Physical volume data alignment is too big."); - return 0; - } - - if (pp->pva.data_alignment_offset > UINT32_MAX) { - log_error("Physical volume data alignment offset is too big."); - return 0; - } - - return 1; -} - -/* - * See if we may pvcreate on this device. - * 0 indicates we may not. - */ -static int _pvcreate_check(struct cmd_context *cmd, const char *name, - struct pvcreate_params *pp, int *wiped) -{ - static const char really_init_msg[] = "Really INITIALIZE physical volume"; - static const char not_init_msg[] = "physical volume not initialized"; - struct physical_volume *pv; - struct device *dev; - int r = 0; - int scan_needed = 0; - int filter_refresh_needed = 0; - int used; - - /* FIXME Check partition type is LVM unless --force is given */ - - *wiped = 0; - - /* Is there a pv here already? */ - pv = find_pv_by_name(cmd, name, 1, 1); - - /* Allow partial & exported VGs to be destroyed. */ - /* We must have -ff to overwrite a non orphan */ - if (pv) { - if (!is_orphan(pv) && pp->force != DONT_PROMPT_OVERRIDE) { - log_error("Can't initialize physical volume \"%s\" of " - "volume group \"%s\" without -ff.", name, pv_vg_name(pv)); - goto out; - } - - if ((used = is_used_pv(pv)) < 0) - goto_out; - - if (used && pp->force != DONT_PROMPT_OVERRIDE) { - log_error("PV %s is used by a VG but its metadata is missing.", name); - log_error("Can't initialize PV '%s' without -ff.", name); - goto out; - } - } - - /* prompt */ - if (pv && !pp->yes) { - if (is_orphan(pv)) { - if (used) { - if (yes_no_prompt("%s \"%s\" that is marked as belonging to a VG [y/n]? ", - really_init_msg, name) == 'n') { - log_error("%s: %s", name, not_init_msg); - goto out; - } - } - } else { - if (yes_no_prompt("%s \"%s\" of volume group \"%s\" [y/n]? ", - really_init_msg, name, pv_vg_name(pv)) == 'n') { - log_error("%s: %s", name, not_init_msg); - goto out; - } - } - } - - if (sigint_caught()) - goto_out; - - dev = dev_cache_get(name, cmd->full_filter); - - /* - * Refresh+rescan at the end is needed if: - * - we don't obtain device list from udev, - * hence persistent cache file is used - * and we need to trash it and reevaluate - * for any changes done outside - adding - * any new foreign signature which may affect - * filtering - before we do pvcreate, we - * need to be sure that we have up-to-date - * view for filters - * - * - we have wiped existing foreign signatures - * from dev as this may affect what's filtered - * as well - * - * - * Only rescan at the end is needed if: - * - we've just checked whether dev is fileterd - * by MD filter. We do the refresh in-situ, - * so no need to require the refresh at the - * end of this fn. This is to allow for - * wiping MD signature during pvcreate for - * the dev - the dev would normally be - * filtered because of MD filter. - * This is an exception. - */ - - /* Is there an md superblock here? */ - if (!dev && md_filtering()) { - if (!refresh_filters(cmd)) - goto_out; - - init_md_filtering(0); - dev = dev_cache_get(name, cmd->full_filter); - init_md_filtering(1); - - scan_needed = 1; - } else if (!obtain_device_list_from_udev()) - filter_refresh_needed = scan_needed = 1; - - if (!dev) { - log_error("Device %s not found (or ignored by filtering).", name); - goto out; - } - - /* - * This test will fail if the device belongs to an MD array. - */ - if (!label_scan_open_excl(dev)) { - /* FIXME Detect whether device-mapper itself is still using it */ - log_error("Can't open %s exclusively. Mounted filesystem?", - name); - goto out; - } - - if (!wipe_known_signatures(cmd, dev, name, - TYPE_LVM1_MEMBER | TYPE_LVM2_MEMBER, - 0, pp->yes, pp->force, wiped)) { - log_error("Aborting pvcreate on %s.", name); - goto out; - } - - if (*wiped) - filter_refresh_needed = scan_needed = 1; - - if (sigint_caught()) - goto_out; - - if (pv && !is_orphan(pv) && pp->force) - log_warn("WARNING: Forcing physical volume creation on " - "%s%s%s%s", name, - !is_orphan(pv) ? " of volume group \"" : "", - pv_vg_name(pv), - !is_orphan(pv) ? "\"" : ""); - - r = 1; - -out: - if (filter_refresh_needed) - if (!refresh_filters(cmd)) { - stack; - r = 0; - } - - if (scan_needed) { - if (!lvmcache_label_scan(cmd)) { - stack; - r = 0; - } - } - - free_pv_fid(pv); - return r; -} - -/* - * pvcreate_vol() - initialize a device with PV label and metadata area - * - * Parameters: - * - pv_name: device path to initialize - * - pp: parameters to pass to pv_create; if NULL, use default values - * - * Returns: - * NULL: error - * struct physical_volume * (non-NULL): handle to physical volume created - */ -struct physical_volume *pvcreate_vol(struct cmd_context *cmd, const char *pv_name, - struct pvcreate_params *pp, int write_now) -{ - struct physical_volume *pv = NULL; - struct device *dev; - int wiped = 0; - struct dm_list mdas; - struct pvcreate_params default_pp; - char buffer[64] __attribute__((aligned(8))); - dev_ext_t dev_ext_src; - - pvcreate_params_set_defaults(&default_pp); - if (!pp) - pp = &default_pp; - - if (!_verify_pv_create_params(pp)) { - goto bad; - } - - if (pp->pva.idp) { - if ((dev = lvmcache_device_from_pvid(cmd, pp->pva.idp, NULL)) && - (dev != dev_cache_get(pv_name, cmd->full_filter))) { - if (!id_write_format((const struct id*)&pp->pva.idp->uuid, - buffer, sizeof(buffer))) - goto_bad; - log_error("uuid %s already in use on \"%s\"", buffer, - dev_name(dev)); - goto bad; - } - } - - if (!_pvcreate_check(cmd, pv_name, pp, &wiped)) - goto_bad; - - if (sigint_caught()) - goto_bad; - - /* - * wipe_known_signatures called in _pvcreate_check fires - * WATCH event to update udev database. But at the moment, - * we have no way to synchronize with such event - we may - * end up still seeing the old info in udev db and pvcreate - * can fail to proceed because of the device still being - * filtered (because of the stale info in udev db). - * Disable udev dev-ext source temporarily here for - * this reason and rescan with DEV_EXT_NONE dev-ext - * source (so filters use DEV_EXT_NONE source). - */ - dev_ext_src = external_device_info_source(); - if (wiped && (dev_ext_src == DEV_EXT_UDEV)) - init_external_device_info_source(DEV_EXT_NONE); - - dev = dev_cache_get(pv_name, cmd->full_filter); - - init_external_device_info_source(dev_ext_src); - - if (!dev) { - log_error("%s: Couldn't find device. Check your filters?", - pv_name); - goto bad; - } - - dm_list_init(&mdas); - - if (!(pv = pv_create(cmd, dev, &pp->pva))) { - log_error("Failed to setup physical volume \"%s\"", pv_name); - goto bad; - } - - log_verbose("Set up physical volume for \"%s\" with %" PRIu64 - " available sectors", pv_name, pv_size(pv)); - - pv->status |= UNLABELLED_PV; - if (write_now) { - struct pv_to_write pvw; - pvw.pp = pp; - pvw.pv = pv; - pvw.new_pv = 1; - if (!_pvcreate_write(cmd, &pvw)) - goto bad; - } - - return pv; - -bad: - return NULL; -} - -/* - * Extend a VG by a single PV / device path - * - * Parameters: - * - vg: handle of volume group to extend by 'pv_name' - * - pv_name: device path of PV to add to VG - * - pp: parameters to pass to implicit pvcreate; if NULL, do not pvcreate - * - max_phys_block_size: largest physical block size found amongst PVs in a VG - * - */ -static int _vg_extend_single_pv(struct volume_group *vg, char *pv_name, - struct pvcreate_params *pp, - unsigned int *max_phys_block_size) -{ - struct physical_volume *pv; - struct pv_to_write *pvw; - int new_pv = 0; - - pv = find_pv_by_name(vg->cmd, pv_name, 1, 1); - - if (!pv && !pp) { - log_error("%s not identified as an existing " - "physical volume", pv_name); - return 0; - } - - if (!pv && pp) { - if (!(pv = pvcreate_vol(vg->cmd, pv_name, pp, 0))) - return_0; - new_pv = 1; - } - - if (!(check_dev_block_size_for_vg(pv->dev, (const struct volume_group *) vg, - max_phys_block_size))) - goto_bad; - - if (!add_pv_to_vg(vg, pv_name, pv, new_pv)) - goto_bad; - - if ((pv->fmt->features & FMT_PV_FLAGS) || - (pv->status & UNLABELLED_PV)) { - if (!(pvw = dm_pool_zalloc(vg->vgmem, sizeof(*pvw)))) { - log_error("pv_to_write allocation for '%s' failed", pv_name); - return 0; - } - pvw->pv = pv; - pvw->pp = new_pv ? pp : NULL; - pvw->new_pv = new_pv; - dm_list_add(&vg->pvs_to_write, &pvw->list); - } - - return 1; -bad: - free_pv_fid(pv); - return 0; -} - -/* - * Extend a VG by a single PV / device path - * - * Parameters: - * - vg: handle of volume group to extend by 'pv_name' - * - pv_count: count of device paths of PVs - * - pv_names: device paths of PVs to add to VG - * - pp: parameters to pass to implicit pvcreate; if NULL, do not pvcreate - * - */ -int vg_extend(struct volume_group *vg, int pv_count, const char *const *pv_names, - struct pvcreate_params *pp) -{ - int i; - char *pv_name; - unsigned int max_phys_block_size = 0; - - if (vg_bad_status_bits(vg, RESIZEABLE_VG)) - return_0; - - /* attach each pv */ - for (i = 0; i < pv_count; i++) { - if (!(pv_name = strdup(pv_names[i]))) { - log_error("Failed to duplicate pv name %s.", pv_names[i]); - return 0; - } - dm_unescape_colons_and_at_signs(pv_name, NULL, NULL); - if (!_vg_extend_single_pv(vg, pv_name, pp, &max_phys_block_size)) { - log_error("Unable to add physical volume '%s' to " - "volume group '%s'.", pv_name, vg->name); - free(pv_name); - return 0; - } - free(pv_name); - } - - (void) check_pv_dev_sizes(vg); - -/* FIXME Decide whether to initialise and add new mdahs to format instance */ - - return 1; -} - -/* - * Decide whether it is "safe" to wipe the labels on this device. - * 0 indicates we may not. - */ -static int _pvremove_check(struct cmd_context *cmd, const char *name, - unsigned force_count, unsigned prompt, struct dm_list *pvslist) -{ - static const char really_wipe_msg[] = "Really WIPE LABELS from physical volume"; - struct device *dev; - struct pv_list *pvl; - struct physical_volume *pv = NULL; - int used; - int r = 0; - - /* FIXME Check partition type is LVM unless --force is given */ - - if (!(dev = dev_cache_get(name, cmd->filter))) { - log_error("Device %s not found.", name); - return 0; - } - - /* Is there a pv here already? */ - /* If not, this is an error unless you used -f. */ - if (!label_read(dev)) { - if (force_count) - return 1; - log_error("No PV label found on %s.", name); - return 0; - } - - dm_list_iterate_items(pvl, pvslist) - if (pvl->pv->dev == dev) - pv = pvl->pv; - - if (!pv) { - log_error(INTERNAL_ERROR "Physical Volume %s has a label, " - "but is neither in a VG nor orphan.", name); - goto out; /* better safe than sorry */ - } - - if (is_orphan(pv)) { - if ((used = is_used_pv(pv)) < 0) - goto_out; - - if (used) { - log_warn("WARNING: PV %s is used by a VG but its metadata is missing.", name); - - if (force_count < 2) - goto_bad; - - if (!prompt && - yes_no_prompt("%s \"%s\" that is marked as belonging to a VG [y/n]? ", - really_wipe_msg, name) == 'n') - goto_bad; - } - } else { - log_warn("WARNING: PV %s is used by VG %s (consider using vgreduce).", name, pv_vg_name(pv)); - - if (force_count < 2) - goto_bad; - - if (!prompt && - yes_no_prompt("%s \"%s\" of volume group \"%s\" [y/n]? ", - really_wipe_msg, name, pv_vg_name(pv)) == 'n') - goto_bad; - } - - if (force_count) - log_warn("WARNING: Wiping physical volume label from " - "%s%s%s%s", name, - !is_orphan(pv) ? " of volume group \"" : "", - pv_vg_name(pv), - !is_orphan(pv) ? "\"" : ""); - - r = 1; -bad: - if (!r) { - log_error("%s: physical volume label not removed.", name); - - if (force_count < 2) /* Show hint as log_error() */ - log_error("(If you are certain you need pvremove, " - "then confirm by using --force twice.)"); - } -out: - return r; -} - -static int _pvremove_single(struct cmd_context *cmd, const char *pv_name, - void *handle __attribute__((unused)), unsigned force_count, - unsigned prompt, struct dm_list *pvslist) -{ - struct device *dev; - //struct lvmcache_info *info; - int r = 0; - - if (!_pvremove_check(cmd, pv_name, force_count, prompt, pvslist)) - goto out; - - if (!(dev = dev_cache_get(pv_name, cmd->filter))) { - log_error("%s: Couldn't find device. Check your filters?", - pv_name); - goto out; - } - - /* Wipe existing label(s) */ - if (!label_remove(dev)) { - log_error("Failed to wipe existing label(s) on %s", pv_name); - goto out; - } - - if (!lvmetad_pv_gone_by_dev(dev)) - goto_out; - - log_print_unless_silent("Labels on physical volume \"%s\" successfully wiped", - pv_name); - - r = 1; - -out: - return r; -} - -int pvremove_many(struct cmd_context *cmd, struct dm_list *pv_names, - unsigned force_count, unsigned prompt) -{ - int ret = 1; - struct dm_list *pvslist = NULL; - struct pv_list *pvl; - const struct dm_str_list *pv_name; - - if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { - log_error("Can't get lock for orphan PVs"); - return 0; - } - - lvmcache_seed_infos_from_lvmetad(cmd); - - if (!(pvslist = get_pvs(cmd))) { - ret = 0; - goto_out; - } - - dm_list_iterate_items(pv_name, pv_names) { - if (!_pvremove_single(cmd, pv_name->str, NULL, force_count, prompt, pvslist)) { - stack; - ret = 0; - } - if (sigint_caught()) { - ret = 0; - goto_out; - } - } - -out: - unlock_vg(cmd, NULL, VG_ORPHANS); - - if (pvslist) - dm_list_iterate_items(pvl, pvslist) - free_pv_fid(pvl->pv); - - return ret; -} - -/* FIXME: liblvm todo - make into function that returns handle */ -struct physical_volume *find_pv_by_name(struct cmd_context *cmd, - const char *pv_name, - int allow_orphan, int allow_unformatted) -{ - struct device *dev; - struct pv_list *pvl; - struct dm_list *pvslist; - struct physical_volume *pv = NULL; - - lvmcache_seed_infos_from_lvmetad(cmd); - - if (!(dev = dev_cache_get(pv_name, cmd->filter))) { - if (!allow_unformatted) - log_error("Physical volume %s not found", pv_name); - return_NULL; - } - - if (!(pvslist = get_pvs(cmd))) - return_NULL; - - dm_list_iterate_items(pvl, pvslist) - if (pvl->pv->dev == dev) - pv = pvl->pv; - else - free_pv_fid(pvl->pv); - - if (!pv && !allow_unformatted) - log_error("Physical volume %s not found", pv_name); - - if (pv && !allow_orphan && is_orphan_vg(pv->vg_name)) { - log_error("Physical volume %s not in a volume group", pv_name); - goto bad; - } - - return pv; - -bad: - free_pv_fid(pv); - return NULL; -} diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 7c41d78..b7a73c5 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -680,21 +680,6 @@ int check_pv_dev_sizes(struct volume_group *vg) return r; } -/* - * FIXME: commands shifting to common code in toollib have left a large - * amount of code only used by liblvm. Either remove this by shifting - * liblvm to use toollib, or isolate all this code into a liblvm-specific - * source file. All the following and more are only used by liblvm: - * - * . get_pvs() - * . get_vgids() - * . get_vgnames() - * . lvmcache_get_vgids() - * . lvmcache_get_vgnames() - * . the vg->pvs_to_write list and pv_to_write struct - * . _pvcreate_write() - */ - int vg_extend_each_pv(struct volume_group *vg, struct pvcreate_params *pp) { struct pv_list *pvl; @@ -1407,49 +1392,6 @@ void pvcreate_params_set_defaults(struct pvcreate_params *pp) dm_list_init(&pp->pvs); } -static int _pvcreate_write(struct cmd_context *cmd, struct pv_to_write *pvw) -{ - struct physical_volume *pv = pvw->pv; - struct device *dev = pv->dev; - const char *pv_name = dev_name(dev); - - if (!label_scan_open_excl(dev)) { - log_error("%s not opened: device not written", pv_name); - return 0; - } - - if (pvw->new_pv) { - /* Wipe existing label first */ - if (!label_remove(dev)) { - log_error("Failed to wipe existing label on %s", pv_name); - return 0; - } - - if (pvw->pp->zero) { - log_verbose("Zeroing start of device %s", pv_name); - if (!dev_write_zeros(dev, 0, 2048)) { - log_error("%s not wiped: aborting", pv_name); - return 0; - } - } - } - - log_verbose("Writing physical volume data to disk \"%s\"", - pv_name); - - if (!(pv_write(cmd, pv, 1))) { - log_error("Failed to write physical volume \"%s\"", pv_name); - return 0; - } - - if (pvw->new_pv) - log_print_unless_silent("Physical volume \"%s\" successfully created", pv_name); - else - log_verbose("Physical volume \"%s\" successfully written", pv_name); - - return 1; -} - static struct physical_volume *_alloc_pv(struct dm_pool *mem, struct device *dev) { struct physical_volume *pv; @@ -2916,7 +2858,6 @@ static int _handle_historical_lvs(struct volume_group *vg) int vg_write(struct volume_group *vg) { struct dm_list *mdah; - struct pv_to_write *pv_to_write, *pv_to_write_safe; struct pv_list *pvl, *pvl_safe; struct metadata_area *mda; struct lv_list *lvl; @@ -2993,12 +2934,6 @@ int vg_write(struct volume_group *vg) dm_list_del(&pvl->list); } - dm_list_iterate_items_safe(pv_to_write, pv_to_write_safe, &vg->pvs_to_write) { - if (!_pvcreate_write(vg->cmd, pv_to_write)) - return_0; - dm_list_del(&pv_to_write->list); - } - /* Write to each copy of the metadata area */ dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) { if (mda->status & MDA_FAILED) @@ -4550,55 +4485,6 @@ void free_pv_fid(struct physical_volume *pv) pv_set_fid(pv, NULL); } -const char *find_vgname_from_pvid(struct cmd_context *cmd, - const char *pvid) -{ - char *vgname; - struct lvmcache_info *info; - - vgname = lvmcache_vgname_from_pvid(cmd, pvid); - - if (is_orphan_vg(vgname)) { - if (!(info = lvmcache_info_from_pvid(pvid, NULL, 0))) { - return_NULL; - } - /* - * If an orphan PV has no MDAs, or it has MDAs but the - * MDA is ignored, it may appear to be an orphan until - * the metadata is read off another PV in the same VG. - * Detecting this means checking every VG by scanning - * every PV on the system. - */ - if (lvmcache_uncertain_ownership(info)) { - if (!scan_vgs_for_pvs(cmd, WARN_PV_READ)) { - log_error("Rescan for PVs without " - "metadata areas failed."); - return NULL; - } - /* - * Ask lvmcache again - we may have a non-orphan - * name now - */ - vgname = lvmcache_vgname_from_pvid(cmd, pvid); - } - } - return vgname; -} - - -const char *find_vgname_from_pvname(struct cmd_context *cmd, - const char *pvname) -{ - const char *pvid; - - pvid = lvmcache_pvid_from_devname(cmd, pvname); - if (!pvid) - /* Not a PV */ - return NULL; - - return find_vgname_from_pvid(cmd, pvid); -} - static struct physical_volume *_pv_read(struct cmd_context *cmd, const struct format_type *fmt, struct volume_group *vg, @@ -4636,17 +4522,6 @@ bad: return NULL; } -/* May return empty list */ -struct dm_list *get_vgnames(struct cmd_context *cmd, int include_internal) -{ - return lvmcache_get_vgnames(cmd, include_internal); -} - -struct dm_list *get_vgids(struct cmd_context *cmd, int include_internal) -{ - return lvmcache_get_vgids(cmd, include_internal); -} - int get_vgnameids(struct cmd_context *cmd, struct dm_list *vgnameids, const char *only_this_vgname, int include_internal) { @@ -4695,152 +4570,6 @@ int get_vgnameids(struct cmd_context *cmd, struct dm_list *vgnameids, return 1; } -static int _get_pvs(struct cmd_context *cmd, uint32_t warn_flags, - struct dm_list *pvslist, struct dm_list *vgslist) -{ - struct dm_str_list *strl; - const char *vgname, *name, *vgid; - struct pv_list *pvl, *pvl_copy; - struct dm_list *vgids; - struct volume_group *vg; - int consistent = 0; - int old_pvmove; - struct vg_list *vgl_item = NULL; - int have_pv = 0; - - lvmcache_label_scan(cmd); - - /* Get list of VGs */ - if (!(vgids = get_vgids(cmd, 1))) { - log_error("get_pvs: get_vgids failed"); - return 0; - } - - /* Read every VG to ensure cache consistency */ - /* Orphan VG is last on list */ - old_pvmove = pvmove_mode(); - init_pvmove(1); - dm_list_iterate_items(strl, vgids) { - vgid = strl->str; - if (!vgid) - continue; /* FIXME Unnecessary? */ - consistent = 0; - if (!(name = lvmcache_vgname_from_vgid(NULL, vgid))) { - stack; - continue; - } - - vgname = dm_pool_strdup(cmd->mem, name); - - /* - * When we are retrieving a list to return toliblvm we need - * that list to contain VGs that are modifiable as we are using - * the vgmem pool in the vg to provide allocation for liblvm. - * This is a hack to prevent the vg from getting cached as the - * vgid will be NULL. - * FIXME Remove this hack. - */ - - warn_flags |= WARN_INCONSISTENT; - - if (!(vg = vg_read_internal(cmd, vgname, (!vgslist) ? vgid : NULL, 0, warn_flags, &consistent))) { - stack; - continue; - } - - /* Move PVs onto results list */ - if (pvslist) - dm_list_iterate_items(pvl, &vg->pvs) { - if (!(pvl_copy = _copy_pvl(cmd->mem, pvl))) { - log_error("PV list allocation failed"); - release_vg(vg); - return 0; - } - /* If we are going to release the VG, don't - * store a pointer to it in the PV structure. - */ - if (!vgslist) - pvl_copy->pv->vg = NULL; - else - /* - * Make sure the vg mode indicates - * writeable. - * FIXME Rework function to take a - * parameter to control this - */ - pvl_copy->pv->vg->open_mode = 'w'; - have_pv = 1; - dm_list_add(pvslist, &pvl_copy->list); - } - - /* - * In the case of the library we want to preserve the embedded - * volume group as subsequent calls to retrieve data about the - * PV require it. - */ - if (!vgslist || !have_pv) - release_vg(vg); - else { - /* - * Add VG to list of VG objects that will be returned - */ - vgl_item = dm_pool_alloc(cmd->mem, sizeof(*vgl_item)); - if (!vgl_item) { - log_error("VG list element allocation failed"); - return 0; - } - vgl_item->vg = vg; - vg = NULL; - dm_list_add(vgslist, &vgl_item->list); - } - have_pv = 0; - } - init_pvmove(old_pvmove); - - if (!pvslist) - dm_pool_free(cmd->mem, vgids); - - return 1; -} - -/* - * Retrieve a list of all physical volumes. - * @param cmd Command context - * @param pvslist Set to NULL if you want memory for list created, - * else valid memory - * @param vgslist Set to NULL if you need the pv structures to contain - * valid vg pointer. This is the list of VGs - * @returns NULL on errors, else pvslist which will equal passed-in value if - * supplied. - */ -struct dm_list *get_pvs_internal(struct cmd_context *cmd, - struct dm_list *pvslist, - struct dm_list *vgslist) -{ - struct dm_list *results = pvslist; - - if (NULL == results) { - if (!(results = dm_pool_alloc(cmd->mem, sizeof(*results)))) { - log_error("PV list allocation failed"); - return 0; - } - - dm_list_init(results); - } - - if (!_get_pvs(cmd, WARN_PV_READ, results, vgslist)) { - if (!pvslist) - dm_pool_free(cmd->mem, results); - return NULL; - } - return results; -} - -int scan_vgs_for_pvs(struct cmd_context *cmd, uint32_t warn_flags) -{ - return _get_pvs(cmd, warn_flags, NULL, NULL); -} - int pv_write(struct cmd_context *cmd, struct physical_volume *pv, int allow_non_orphan) { diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c index db382d0..400af8d 100644 --- a/lib/metadata/vg.c +++ b/lib/metadata/vg.c @@ -55,7 +55,6 @@ struct volume_group *alloc_vg(const char *pool_name, struct cmd_context *cmd, } dm_list_init(&vg->pvs); - dm_list_init(&vg->pvs_to_write); dm_list_init(&vg->pv_write_list); dm_list_init(&vg->pvs_outdated); dm_list_init(&vg->lvs); diff --git a/lib/metadata/vg.h b/lib/metadata/vg.h index 9921b91..8e9917f 100644 --- a/lib/metadata/vg.h +++ b/lib/metadata/vg.h @@ -89,8 +89,6 @@ struct volume_group { * a PV label yet. They need to be pvcreate'd at vg_write time. */ - struct dm_list pvs_to_write; /* struct pv_to_write */ - struct dm_list pv_write_list; /* struct pv_list */ /*

1 0

master - Merge branch '2018-06-04-data-structs'
by Joe Thornber 08 Jun '18

08 Jun '18

1 0

master - various: some missing #include zalloc.h
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0ac89fb8603d891458cbb… Commit: 0ac89fb8603d891458cbb55d9071db0c5c057db3 Parent: 61e67e51e112a317886fcfc70b2d479d08cbda90 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 14:18:09 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 14:18:09 2018 +0100 various: some missing #include zalloc.h --- daemons/dmeventd/dmeventd.c | 1 + daemons/dmeventd/libdevmapper-event.c | 1 + tools/tool.h | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c index 4b4e1f0..3ad81ce 100644 --- a/daemons/dmeventd/dmeventd.c +++ b/daemons/dmeventd/dmeventd.c @@ -16,6 +16,7 @@ * dmeventd - dm event daemon to monitor active mapped devices */ +#include "base/memory/zalloc.h" #include "device_mapper/misc/dm-logging.h" #include "daemons/dmeventd/libdevmapper-event.h" diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index 4673f01..157b5f1 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "device_mapper/misc/dm-logging.h" #include "device_mapper/misc/dmlib.h" #include "daemons/dmeventd/libdevmapper-event.h" diff --git a/tools/tool.h b/tools/tool.h index a4cef3d..fb6cab8 100644 --- a/tools/tool.h +++ b/tools/tool.h @@ -24,6 +24,7 @@ #include <unistd.h> +#include "base/memory/zalloc.h" #include "device_mapper/all.h" #include "lib/misc/util.h"

1 0

master - device_mapper: move hash.[hc] to base/data-struct
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=61e67e51e112a317886fc… Commit: 61e67e51e112a317886fcfc70b2d479d08cbda90 Parent: 962a3eb3faced455b0a10f8e7d4575bed65b8dbd Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 13:54:19 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 13:54:19 2018 +0100 device_mapper: move hash.[hc] to base/data-struct --- base/Makefile | 1 + base/data-struct/hash.c | 394 +++++++++++++++++++++++++++++++++++++++ base/data-struct/hash.h | 94 +++++++++ device_mapper/Makefile | 1 - device_mapper/all.h | 89 +--------- device_mapper/datastruct/hash.c | 393 -------------------------------------- 6 files changed, 490 insertions(+), 482 deletions(-) diff --git a/base/Makefile b/base/Makefile index 4dcb6b6..02c4236 100644 --- a/base/Makefile +++ b/base/Makefile @@ -12,6 +12,7 @@ BASE_SOURCE=\ base/data-struct/radix-tree.c \ + base/data-struct/hash.c \ base/data-struct/list.c BASE_DEPENDS=$(addprefix $(top_builddir)/,$(subst .c,.d,$(BASE_SOURCE))) diff --git a/base/data-struct/hash.c b/base/data-struct/hash.c new file mode 100644 index 0000000..0a0541d --- /dev/null +++ b/base/data-struct/hash.c @@ -0,0 +1,394 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "device_mapper/misc/dmlib.h" +#include "base/memory/zalloc.h" +#include "hash.h" + +struct dm_hash_node { + struct dm_hash_node *next; + void *data; + unsigned data_len; + unsigned keylen; + char key[0]; +}; + +struct dm_hash_table { + unsigned num_nodes; + unsigned num_slots; + struct dm_hash_node **slots; +}; + +/* Permutation of the Integers 0 through 255 */ +static unsigned char _nums[] = { + 1, 14, 110, 25, 97, 174, 132, 119, 138, 170, 125, 118, 27, 233, 140, 51, + 87, 197, 177, 107, 234, 169, 56, 68, 30, 7, 173, 73, 188, 40, 36, 65, + 49, 213, 104, 190, 57, 211, 148, 223, 48, 115, 15, 2, 67, 186, 210, 28, + 12, 181, 103, 70, 22, 58, 75, 78, 183, 167, 238, 157, 124, 147, 172, + 144, + 176, 161, 141, 86, 60, 66, 128, 83, 156, 241, 79, 46, 168, 198, 41, 254, + 178, 85, 253, 237, 250, 154, 133, 88, 35, 206, 95, 116, 252, 192, 54, + 221, + 102, 218, 255, 240, 82, 106, 158, 201, 61, 3, 89, 9, 42, 155, 159, 93, + 166, 80, 50, 34, 175, 195, 100, 99, 26, 150, 16, 145, 4, 33, 8, 189, + 121, 64, 77, 72, 208, 245, 130, 122, 143, 55, 105, 134, 29, 164, 185, + 194, + 193, 239, 101, 242, 5, 171, 126, 11, 74, 59, 137, 228, 108, 191, 232, + 139, + 6, 24, 81, 20, 127, 17, 91, 92, 251, 151, 225, 207, 21, 98, 113, 112, + 84, 226, 18, 214, 199, 187, 13, 32, 94, 220, 224, 212, 247, 204, 196, + 43, + 249, 236, 45, 244, 111, 182, 153, 136, 129, 90, 217, 202, 19, 165, 231, + 71, + 230, 142, 96, 227, 62, 179, 246, 114, 162, 53, 160, 215, 205, 180, 47, + 109, + 44, 38, 31, 149, 135, 0, 216, 52, 63, 23, 37, 69, 39, 117, 146, 184, + 163, 200, 222, 235, 248, 243, 219, 10, 152, 131, 123, 229, 203, 76, 120, + 209 +}; + +static struct dm_hash_node *_create_node(const char *str, unsigned len) +{ + struct dm_hash_node *n = malloc(sizeof(*n) + len); + + if (n) { + memcpy(n->key, str, len); + n->keylen = len; + } + + return n; +} + +static unsigned long _hash(const char *str, unsigned len) +{ + unsigned long h = 0, g; + unsigned i; + + for (i = 0; i < len; i++) { + h <<= 4; + h += _nums[(unsigned char) *str++]; + g = h & ((unsigned long) 0xf << 16u); + if (g) { + h ^= g >> 16u; + h ^= g >> 5u; + } + } + + return h; +} + +struct dm_hash_table *dm_hash_create(unsigned size_hint) +{ + size_t len; + unsigned new_size = 16u; + struct dm_hash_table *hc = zalloc(sizeof(*hc)); + + if (!hc) + return_0; + + /* round size hint up to a power of two */ + while (new_size < size_hint) + new_size = new_size << 1; + + hc->num_slots = new_size; + len = sizeof(*(hc->slots)) * new_size; + if (!(hc->slots = zalloc(len))) + goto_bad; + + return hc; + + bad: + free(hc->slots); + free(hc); + return 0; +} + +static void _free_nodes(struct dm_hash_table *t) +{ + struct dm_hash_node *c, *n; + unsigned i; + + for (i = 0; i < t->num_slots; i++) + for (c = t->slots[i]; c; c = n) { + n = c->next; + free(c); + } +} + +void dm_hash_destroy(struct dm_hash_table *t) +{ + _free_nodes(t); + free(t->slots); + free(t); +} + +static struct dm_hash_node **_find(struct dm_hash_table *t, const void *key, + uint32_t len) +{ + unsigned h = _hash(key, len) & (t->num_slots - 1); + struct dm_hash_node **c; + + for (c = &t->slots[h]; *c; c = &((*c)->next)) { + if ((*c)->keylen != len) + continue; + + if (!memcmp(key, (*c)->key, len)) + break; + } + + return c; +} + +void *dm_hash_lookup_binary(struct dm_hash_table *t, const void *key, + uint32_t len) +{ + struct dm_hash_node **c = _find(t, key, len); + + return *c ? (*c)->data : 0; +} + +int dm_hash_insert_binary(struct dm_hash_table *t, const void *key, + uint32_t len, void *data) +{ + struct dm_hash_node **c = _find(t, key, len); + + if (*c) + (*c)->data = data; + else { + struct dm_hash_node *n = _create_node(key, len); + + if (!n) + return 0; + + n->data = data; + n->next = 0; + *c = n; + t->num_nodes++; + } + + return 1; +} + +void dm_hash_remove_binary(struct dm_hash_table *t, const void *key, + uint32_t len) +{ + struct dm_hash_node **c = _find(t, key, len); + + if (*c) { + struct dm_hash_node *old = *c; + *c = (*c)->next; + free(old); + t->num_nodes--; + } +} + +void *dm_hash_lookup(struct dm_hash_table *t, const char *key) +{ + return dm_hash_lookup_binary(t, key, strlen(key) + 1); +} + +int dm_hash_insert(struct dm_hash_table *t, const char *key, void *data) +{ + return dm_hash_insert_binary(t, key, strlen(key) + 1, data); +} + +void dm_hash_remove(struct dm_hash_table *t, const char *key) +{ + dm_hash_remove_binary(t, key, strlen(key) + 1); +} + +static struct dm_hash_node **_find_str_with_val(struct dm_hash_table *t, + const void *key, const void *val, + uint32_t len, uint32_t val_len) +{ + struct dm_hash_node **c; + unsigned h; + + h = _hash(key, len) & (t->num_slots - 1); + + for (c = &t->slots[h]; *c; c = &((*c)->next)) { + if ((*c)->keylen != len) + continue; + + if (!memcmp(key, (*c)->key, len) && (*c)->data) { + if (((*c)->data_len == val_len) && + !memcmp(val, (*c)->data, val_len)) + return c; + } + } + + return NULL; +} + +int dm_hash_insert_allow_multiple(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len) +{ + struct dm_hash_node *n; + struct dm_hash_node *first; + int len = strlen(key) + 1; + unsigned h; + + n = _create_node(key, len); + if (!n) + return 0; + + n->data = (void *)val; + n->data_len = val_len; + + h = _hash(key, len) & (t->num_slots - 1); + + first = t->slots[h]; + + if (first) + n->next = first; + else + n->next = 0; + t->slots[h] = n; + + t->num_nodes++; + return 1; +} + +/* + * Look through multiple entries with the same key for one that has a + * matching val and return that. If none have maching val, return NULL. + */ +void *dm_hash_lookup_with_val(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len) +{ + struct dm_hash_node **c; + + c = _find_str_with_val(t, key, val, strlen(key) + 1, val_len); + + return (c && *c) ? (*c)->data : 0; +} + +/* + * Look through multiple entries with the same key for one that has a + * matching val and remove that. + */ +void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len) +{ + struct dm_hash_node **c; + + c = _find_str_with_val(t, key, val, strlen(key) + 1, val_len); + + if (c && *c) { + struct dm_hash_node *old = *c; + *c = (*c)->next; + free(old); + t->num_nodes--; + } +} + +/* + * Look up the value for a key and count how many + * entries have the same key. + * + * If no entries have key, return NULL and set count to 0. + * + * If one entry has the key, the function returns the val, + * and sets count to 1. + * + * If N entries have the key, the function returns the val + * from the first entry, and sets count to N. + */ +void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *count) +{ + struct dm_hash_node **c; + struct dm_hash_node **c1 = NULL; + uint32_t len = strlen(key) + 1; + unsigned h; + + *count = 0; + + h = _hash(key, len) & (t->num_slots - 1); + + for (c = &t->slots[h]; *c; c = &((*c)->next)) { + if ((*c)->keylen != len) + continue; + + if (!memcmp(key, (*c)->key, len)) { + (*count)++; + if (!c1) + c1 = c; + } + } + + if (!c1) + return NULL; + else + return *c1 ? (*c1)->data : 0; +} + +unsigned dm_hash_get_num_entries(struct dm_hash_table *t) +{ + return t->num_nodes; +} + +void dm_hash_iter(struct dm_hash_table *t, dm_hash_iterate_fn f) +{ + struct dm_hash_node *c, *n; + unsigned i; + + for (i = 0; i < t->num_slots; i++) + for (c = t->slots[i]; c; c = n) { + n = c->next; + f(c->data); + } +} + +void dm_hash_wipe(struct dm_hash_table *t) +{ + _free_nodes(t); + memset(t->slots, 0, sizeof(struct dm_hash_node *) * t->num_slots); + t->num_nodes = 0u; +} + +char *dm_hash_get_key(struct dm_hash_table *t __attribute__((unused)), + struct dm_hash_node *n) +{ + return n->key; +} + +void *dm_hash_get_data(struct dm_hash_table *t __attribute__((unused)), + struct dm_hash_node *n) +{ + return n->data; +} + +static struct dm_hash_node *_next_slot(struct dm_hash_table *t, unsigned s) +{ + struct dm_hash_node *c = NULL; + unsigned i; + + for (i = s; i < t->num_slots && !c; i++) + c = t->slots[i]; + + return c; +} + +struct dm_hash_node *dm_hash_get_first(struct dm_hash_table *t) +{ + return _next_slot(t, 0); +} + +struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_node *n) +{ + unsigned h = _hash(n->key, n->keylen) & (t->num_slots - 1); + + return n->next ? n->next : _next_slot(t, h + 1); +} diff --git a/base/data-struct/hash.h b/base/data-struct/hash.h new file mode 100644 index 0000000..217f5e2 --- /dev/null +++ b/base/data-struct/hash.h @@ -0,0 +1,94 @@ +#ifndef BASE_DATA_STRUCT_HASH_H +#define BASE_DATA_STRUCT_HASH_H + +#include <stdint.h> + +//---------------------------------------------------------------- + +struct dm_hash_table; +struct dm_hash_node; + +typedef void (*dm_hash_iterate_fn) (void *data); + +struct dm_hash_table *dm_hash_create(unsigned size_hint) + __attribute__((__warn_unused_result__)); +void dm_hash_destroy(struct dm_hash_table *t); +void dm_hash_wipe(struct dm_hash_table *t); + +void *dm_hash_lookup(struct dm_hash_table *t, const char *key); +int dm_hash_insert(struct dm_hash_table *t, const char *key, void *data); +void dm_hash_remove(struct dm_hash_table *t, const char *key); + +void *dm_hash_lookup_binary(struct dm_hash_table *t, const void *key, uint32_t len); +int dm_hash_insert_binary(struct dm_hash_table *t, const void *key, uint32_t len, + void *data); +void dm_hash_remove_binary(struct dm_hash_table *t, const void *key, uint32_t len); + +unsigned dm_hash_get_num_entries(struct dm_hash_table *t); +void dm_hash_iter(struct dm_hash_table *t, dm_hash_iterate_fn f); + +char *dm_hash_get_key(struct dm_hash_table *t, struct dm_hash_node *n); +void *dm_hash_get_data(struct dm_hash_table *t, struct dm_hash_node *n); +struct dm_hash_node *dm_hash_get_first(struct dm_hash_table *t); +struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_node *n); + +/* + * dm_hash_insert() replaces the value of an existing + * entry with a matching key if one exists. Otherwise + * it adds a new entry. + * + * dm_hash_insert_with_val() inserts a new entry if + * another entry with the same key already exists. + * val_len is the size of the data being inserted. + * + * If two entries with the same key exist, + * (added using dm_hash_insert_allow_multiple), then: + * . dm_hash_lookup() returns the first one it finds, and + * dm_hash_lookup_with_val() returns the one with a matching + * val_len/val. + * . dm_hash_remove() removes the first one it finds, and + * dm_hash_remove_with_val() removes the one with a matching + * val_len/val. + * + * If a single entry with a given key exists, and it has + * zero val_len, then: + * . dm_hash_lookup() returns it + * . dm_hash_lookup_with_val(val_len=0) returns it + * . dm_hash_remove() removes it + * . dm_hash_remove_with_val(val_len=0) removes it + * + * dm_hash_lookup_with_count() is a single call that will + * both lookup a key's value and check if there is more + * than one entry with the given key. + * + * (It is not meant to retrieve all the entries with the + * given key. In the common case where a single entry exists + * for the key, it is useful to have a single call that will + * both look up the value and indicate if multiple values + * exist for the key.) + * + * dm_hash_lookup_with_count: + * . If no entries exist, the function returns NULL, and + * the count is set to 0. + * . If only one entry exists, the value of that entry is + * returned and count is set to 1. + * . If N entries exists, the value of the first entry is + * returned and count is set to N. + */ + +void *dm_hash_lookup_with_val(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len); +void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len); +int dm_hash_insert_allow_multiple(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len); +void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *count); + + +#define dm_hash_iterate(v, h) \ + for (v = dm_hash_get_first((h)); v; \ + v = dm_hash_get_next((h), v)) + +//---------------------------------------------------------------- + +#endif diff --git a/device_mapper/Makefile b/device_mapper/Makefile index da97675..3a1e415 100644 --- a/device_mapper/Makefile +++ b/device_mapper/Makefile @@ -12,7 +12,6 @@ DEVICE_MAPPER_SOURCE=\ device_mapper/datastruct/bitset.c \ - device_mapper/datastruct/hash.c \ device_mapper/libdm-common.c \ device_mapper/libdm-config.c \ device_mapper/libdm-deptree.c \ diff --git a/device_mapper/all.h b/device_mapper/all.h index ca0dbc7..c834f32 100644 --- a/device_mapper/all.h +++ b/device_mapper/all.h @@ -32,6 +32,7 @@ #include <stdio.h> #include "base/data-struct/list.h" +#include "base/data-struct/hash.h" #ifndef __GNUC__ # define __typeof__ typeof @@ -2248,94 +2249,6 @@ static inline unsigned hweight32(uint32_t i) return (r & 0x0000FFFF) + ((r >> 16) & 0x0000FFFF); } -/**************** - * hash functions - ****************/ - -struct dm_hash_table; -struct dm_hash_node; - -typedef void (*dm_hash_iterate_fn) (void *data); - -struct dm_hash_table *dm_hash_create(unsigned size_hint) - __attribute__((__warn_unused_result__)); -void dm_hash_destroy(struct dm_hash_table *t); -void dm_hash_wipe(struct dm_hash_table *t); - -void *dm_hash_lookup(struct dm_hash_table *t, const char *key); -int dm_hash_insert(struct dm_hash_table *t, const char *key, void *data); -void dm_hash_remove(struct dm_hash_table *t, const char *key); - -void *dm_hash_lookup_binary(struct dm_hash_table *t, const void *key, uint32_t len); -int dm_hash_insert_binary(struct dm_hash_table *t, const void *key, uint32_t len, - void *data); -void dm_hash_remove_binary(struct dm_hash_table *t, const void *key, uint32_t len); - -unsigned dm_hash_get_num_entries(struct dm_hash_table *t); -void dm_hash_iter(struct dm_hash_table *t, dm_hash_iterate_fn f); - -char *dm_hash_get_key(struct dm_hash_table *t, struct dm_hash_node *n); -void *dm_hash_get_data(struct dm_hash_table *t, struct dm_hash_node *n); -struct dm_hash_node *dm_hash_get_first(struct dm_hash_table *t); -struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_node *n); - -/* - * dm_hash_insert() replaces the value of an existing - * entry with a matching key if one exists. Otherwise - * it adds a new entry. - * - * dm_hash_insert_with_val() inserts a new entry if - * another entry with the same key already exists. - * val_len is the size of the data being inserted. - * - * If two entries with the same key exist, - * (added using dm_hash_insert_allow_multiple), then: - * . dm_hash_lookup() returns the first one it finds, and - * dm_hash_lookup_with_val() returns the one with a matching - * val_len/val. - * . dm_hash_remove() removes the first one it finds, and - * dm_hash_remove_with_val() removes the one with a matching - * val_len/val. - * - * If a single entry with a given key exists, and it has - * zero val_len, then: - * . dm_hash_lookup() returns it - * . dm_hash_lookup_with_val(val_len=0) returns it - * . dm_hash_remove() removes it - * . dm_hash_remove_with_val(val_len=0) removes it - * - * dm_hash_lookup_with_count() is a single call that will - * both lookup a key's value and check if there is more - * than one entry with the given key. - * - * (It is not meant to retrieve all the entries with the - * given key. In the common case where a single entry exists - * for the key, it is useful to have a single call that will - * both look up the value and indicate if multiple values - * exist for the key.) - * - * dm_hash_lookup_with_count: - * . If no entries exist, the function returns NULL, and - * the count is set to 0. - * . If only one entry exists, the value of that entry is - * returned and count is set to 1. - * . If N entries exists, the value of the first entry is - * returned and count is set to N. - */ - -void *dm_hash_lookup_with_val(struct dm_hash_table *t, const char *key, - const void *val, uint32_t val_len); -void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key, - const void *val, uint32_t val_len); -int dm_hash_insert_allow_multiple(struct dm_hash_table *t, const char *key, - const void *val, uint32_t val_len); -void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *count); - - -#define dm_hash_iterate(v, h) \ - for (v = dm_hash_get_first((h)); v; \ - v = dm_hash_get_next((h), v)) - /********* * selinux *********/ diff --git a/device_mapper/datastruct/hash.c b/device_mapper/datastruct/hash.c deleted file mode 100644 index f16508a..0000000 --- a/device_mapper/datastruct/hash.c +++ /dev/null @@ -1,393 +0,0 @@ -/* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. - * - * This file is part of the device-mapper userspace tools. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "device_mapper/misc/dmlib.h" -#include "base/memory/zalloc.h" - -struct dm_hash_node { - struct dm_hash_node *next; - void *data; - unsigned data_len; - unsigned keylen; - char key[0]; -}; - -struct dm_hash_table { - unsigned num_nodes; - unsigned num_slots; - struct dm_hash_node **slots; -}; - -/* Permutation of the Integers 0 through 255 */ -static unsigned char _nums[] = { - 1, 14, 110, 25, 97, 174, 132, 119, 138, 170, 125, 118, 27, 233, 140, 51, - 87, 197, 177, 107, 234, 169, 56, 68, 30, 7, 173, 73, 188, 40, 36, 65, - 49, 213, 104, 190, 57, 211, 148, 223, 48, 115, 15, 2, 67, 186, 210, 28, - 12, 181, 103, 70, 22, 58, 75, 78, 183, 167, 238, 157, 124, 147, 172, - 144, - 176, 161, 141, 86, 60, 66, 128, 83, 156, 241, 79, 46, 168, 198, 41, 254, - 178, 85, 253, 237, 250, 154, 133, 88, 35, 206, 95, 116, 252, 192, 54, - 221, - 102, 218, 255, 240, 82, 106, 158, 201, 61, 3, 89, 9, 42, 155, 159, 93, - 166, 80, 50, 34, 175, 195, 100, 99, 26, 150, 16, 145, 4, 33, 8, 189, - 121, 64, 77, 72, 208, 245, 130, 122, 143, 55, 105, 134, 29, 164, 185, - 194, - 193, 239, 101, 242, 5, 171, 126, 11, 74, 59, 137, 228, 108, 191, 232, - 139, - 6, 24, 81, 20, 127, 17, 91, 92, 251, 151, 225, 207, 21, 98, 113, 112, - 84, 226, 18, 214, 199, 187, 13, 32, 94, 220, 224, 212, 247, 204, 196, - 43, - 249, 236, 45, 244, 111, 182, 153, 136, 129, 90, 217, 202, 19, 165, 231, - 71, - 230, 142, 96, 227, 62, 179, 246, 114, 162, 53, 160, 215, 205, 180, 47, - 109, - 44, 38, 31, 149, 135, 0, 216, 52, 63, 23, 37, 69, 39, 117, 146, 184, - 163, 200, 222, 235, 248, 243, 219, 10, 152, 131, 123, 229, 203, 76, 120, - 209 -}; - -static struct dm_hash_node *_create_node(const char *str, unsigned len) -{ - struct dm_hash_node *n = malloc(sizeof(*n) + len); - - if (n) { - memcpy(n->key, str, len); - n->keylen = len; - } - - return n; -} - -static unsigned long _hash(const char *str, unsigned len) -{ - unsigned long h = 0, g; - unsigned i; - - for (i = 0; i < len; i++) { - h <<= 4; - h += _nums[(unsigned char) *str++]; - g = h & ((unsigned long) 0xf << 16u); - if (g) { - h ^= g >> 16u; - h ^= g >> 5u; - } - } - - return h; -} - -struct dm_hash_table *dm_hash_create(unsigned size_hint) -{ - size_t len; - unsigned new_size = 16u; - struct dm_hash_table *hc = zalloc(sizeof(*hc)); - - if (!hc) - return_0; - - /* round size hint up to a power of two */ - while (new_size < size_hint) - new_size = new_size << 1; - - hc->num_slots = new_size; - len = sizeof(*(hc->slots)) * new_size; - if (!(hc->slots = zalloc(len))) - goto_bad; - - return hc; - - bad: - free(hc->slots); - free(hc); - return 0; -} - -static void _free_nodes(struct dm_hash_table *t) -{ - struct dm_hash_node *c, *n; - unsigned i; - - for (i = 0; i < t->num_slots; i++) - for (c = t->slots[i]; c; c = n) { - n = c->next; - free(c); - } -} - -void dm_hash_destroy(struct dm_hash_table *t) -{ - _free_nodes(t); - free(t->slots); - free(t); -} - -static struct dm_hash_node **_find(struct dm_hash_table *t, const void *key, - uint32_t len) -{ - unsigned h = _hash(key, len) & (t->num_slots - 1); - struct dm_hash_node **c; - - for (c = &t->slots[h]; *c; c = &((*c)->next)) { - if ((*c)->keylen != len) - continue; - - if (!memcmp(key, (*c)->key, len)) - break; - } - - return c; -} - -void *dm_hash_lookup_binary(struct dm_hash_table *t, const void *key, - uint32_t len) -{ - struct dm_hash_node **c = _find(t, key, len); - - return *c ? (*c)->data : 0; -} - -int dm_hash_insert_binary(struct dm_hash_table *t, const void *key, - uint32_t len, void *data) -{ - struct dm_hash_node **c = _find(t, key, len); - - if (*c) - (*c)->data = data; - else { - struct dm_hash_node *n = _create_node(key, len); - - if (!n) - return 0; - - n->data = data; - n->next = 0; - *c = n; - t->num_nodes++; - } - - return 1; -} - -void dm_hash_remove_binary(struct dm_hash_table *t, const void *key, - uint32_t len) -{ - struct dm_hash_node **c = _find(t, key, len); - - if (*c) { - struct dm_hash_node *old = *c; - *c = (*c)->next; - free(old); - t->num_nodes--; - } -} - -void *dm_hash_lookup(struct dm_hash_table *t, const char *key) -{ - return dm_hash_lookup_binary(t, key, strlen(key) + 1); -} - -int dm_hash_insert(struct dm_hash_table *t, const char *key, void *data) -{ - return dm_hash_insert_binary(t, key, strlen(key) + 1, data); -} - -void dm_hash_remove(struct dm_hash_table *t, const char *key) -{ - dm_hash_remove_binary(t, key, strlen(key) + 1); -} - -static struct dm_hash_node **_find_str_with_val(struct dm_hash_table *t, - const void *key, const void *val, - uint32_t len, uint32_t val_len) -{ - struct dm_hash_node **c; - unsigned h; - - h = _hash(key, len) & (t->num_slots - 1); - - for (c = &t->slots[h]; *c; c = &((*c)->next)) { - if ((*c)->keylen != len) - continue; - - if (!memcmp(key, (*c)->key, len) && (*c)->data) { - if (((*c)->data_len == val_len) && - !memcmp(val, (*c)->data, val_len)) - return c; - } - } - - return NULL; -} - -int dm_hash_insert_allow_multiple(struct dm_hash_table *t, const char *key, - const void *val, uint32_t val_len) -{ - struct dm_hash_node *n; - struct dm_hash_node *first; - int len = strlen(key) + 1; - unsigned h; - - n = _create_node(key, len); - if (!n) - return 0; - - n->data = (void *)val; - n->data_len = val_len; - - h = _hash(key, len) & (t->num_slots - 1); - - first = t->slots[h]; - - if (first) - n->next = first; - else - n->next = 0; - t->slots[h] = n; - - t->num_nodes++; - return 1; -} - -/* - * Look through multiple entries with the same key for one that has a - * matching val and return that. If none have maching val, return NULL. - */ -void *dm_hash_lookup_with_val(struct dm_hash_table *t, const char *key, - const void *val, uint32_t val_len) -{ - struct dm_hash_node **c; - - c = _find_str_with_val(t, key, val, strlen(key) + 1, val_len); - - return (c && *c) ? (*c)->data : 0; -} - -/* - * Look through multiple entries with the same key for one that has a - * matching val and remove that. - */ -void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key, - const void *val, uint32_t val_len) -{ - struct dm_hash_node **c; - - c = _find_str_with_val(t, key, val, strlen(key) + 1, val_len); - - if (c && *c) { - struct dm_hash_node *old = *c; - *c = (*c)->next; - free(old); - t->num_nodes--; - } -} - -/* - * Look up the value for a key and count how many - * entries have the same key. - * - * If no entries have key, return NULL and set count to 0. - * - * If one entry has the key, the function returns the val, - * and sets count to 1. - * - * If N entries have the key, the function returns the val - * from the first entry, and sets count to N. - */ -void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *count) -{ - struct dm_hash_node **c; - struct dm_hash_node **c1 = NULL; - uint32_t len = strlen(key) + 1; - unsigned h; - - *count = 0; - - h = _hash(key, len) & (t->num_slots - 1); - - for (c = &t->slots[h]; *c; c = &((*c)->next)) { - if ((*c)->keylen != len) - continue; - - if (!memcmp(key, (*c)->key, len)) { - (*count)++; - if (!c1) - c1 = c; - } - } - - if (!c1) - return NULL; - else - return *c1 ? (*c1)->data : 0; -} - -unsigned dm_hash_get_num_entries(struct dm_hash_table *t) -{ - return t->num_nodes; -} - -void dm_hash_iter(struct dm_hash_table *t, dm_hash_iterate_fn f) -{ - struct dm_hash_node *c, *n; - unsigned i; - - for (i = 0; i < t->num_slots; i++) - for (c = t->slots[i]; c; c = n) { - n = c->next; - f(c->data); - } -} - -void dm_hash_wipe(struct dm_hash_table *t) -{ - _free_nodes(t); - memset(t->slots, 0, sizeof(struct dm_hash_node *) * t->num_slots); - t->num_nodes = 0u; -} - -char *dm_hash_get_key(struct dm_hash_table *t __attribute__((unused)), - struct dm_hash_node *n) -{ - return n->key; -} - -void *dm_hash_get_data(struct dm_hash_table *t __attribute__((unused)), - struct dm_hash_node *n) -{ - return n->data; -} - -static struct dm_hash_node *_next_slot(struct dm_hash_table *t, unsigned s) -{ - struct dm_hash_node *c = NULL; - unsigned i; - - for (i = s; i < t->num_slots && !c; i++) - c = t->slots[i]; - - return c; -} - -struct dm_hash_node *dm_hash_get_first(struct dm_hash_table *t) -{ - return _next_slot(t, 0); -} - -struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_node *n) -{ - unsigned h = _hash(n->key, n->keylen) & (t->num_slots - 1); - - return n->next ? n->next : _next_slot(t, h + 1); -}

1 0

master - device_mapper: remove dbg_malloc.
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d5da55ed85248adb066d2… Commit: d5da55ed85248adb066d293c2a1b863ce17d2779 Parent: c78239d8605f333915543c0e0c3ccf4f4ef5ee8f Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 13:40:53 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 13:40:53 2018 +0100 device_mapper: remove dbg_malloc. I wrote dbg_malloc before we had valgrind. These days there's just no need. --- daemons/cmirrord/functions.c | 14 +- daemons/dmeventd/dmeventd.c | 72 +++--- daemons/dmeventd/libdevmapper-event.c | 64 +++--- daemons/dmfilemapd/dmfilemapd.c | 14 +- daemons/lvmetad/lvmetad-core.c | 78 +++--- daemons/lvmpolld/lvmpolld-cmd-utils.c | 10 +- daemons/lvmpolld/lvmpolld-core.c | 16 +- daemons/lvmpolld/lvmpolld-data-utils.c | 54 ++-- device_mapper/Makefile | 1 - device_mapper/all.h | 44 +--- device_mapper/datastruct/bitset.c | 5 +- device_mapper/datastruct/hash.c | 21 +- device_mapper/ioctl/libdm-iface.c | 56 +++--- device_mapper/libdm-common.c | 57 +++--- device_mapper/libdm-config.c | 8 +- device_mapper/libdm-deptree.c | 5 +- device_mapper/libdm-file.c | 4 +- device_mapper/libdm-report.c | 45 ++-- device_mapper/libdm-stats.c | 119 +++++----- device_mapper/libdm-string.c | 12 +- device_mapper/libdm-timestamp.c | 7 +- device_mapper/mm/dbg_malloc.c | 413 -------------------------------- device_mapper/mm/pool-debug.c | 20 +- device_mapper/mm/pool-fast.c | 9 +- lib/activate/activate.c | 2 +- lib/activate/dev_manager.c | 4 +- lib/activate/fs.c | 4 +- lib/cache/lvmcache.c | 57 +++--- lib/cache/lvmetad.c | 4 +- lib/cache_segtype/cache.c | 7 +- lib/commands/toolcontext.c | 15 +- lib/config/config.c | 16 +- lib/device/bcache.c | 40 ++-- lib/device/dev-cache.c | 29 ++- lib/device/dev-io.c | 4 +- lib/device/dev-type.c | 5 +- lib/device/device.h | 2 +- lib/error/errseg.c | 5 +- lib/filters/filter-composite.c | 11 +- lib/filters/filter-fwraid.c | 5 +- lib/filters/filter-internal.c | 5 +- lib/filters/filter-md.c | 5 +- lib/filters/filter-mpath.c | 5 +- lib/filters/filter-partitioned.c | 5 +- lib/filters/filter-persistent.c | 19 +- lib/filters/filter-signature.c | 5 +- lib/filters/filter-type.c | 5 +- lib/filters/filter-usable.c | 11 +- lib/format_text/archiver.c | 8 +- lib/format_text/export.c | 33 ++-- lib/format_text/flags.c | 4 +- lib/format_text/format-text.c | 32 ++-- lib/format_text/text_label.c | 19 +- lib/freeseg/freeseg.c | 5 +- lib/label/label.c | 21 +- lib/log/log.c | 10 +- lib/lvmpolld/lvmpolld-client.c | 4 +- lib/metadata/lv_manip.c | 6 +- lib/metadata/metadata-liblvm.c | 6 +- lib/mirror/mirrored.c | 7 +- lib/misc/lib.h | 1 + lib/misc/lvm-file.c | 10 +- lib/misc/lvm-flock.c | 14 +- lib/mm/memlock.c | 4 +- lib/raid/raid.c | 11 +- lib/snapshot/snapshot.c | 7 +- lib/striped/striped.c | 5 +- lib/thin/thin.c | 7 +- lib/unknown/unknown.c | 11 +- lib/zero/zero.c | 5 +- libdaemon/client/config-util.c | 10 +- libdaemon/client/daemon-client.c | 6 +- libdaemon/server/daemon-log.c | 12 +- libdaemon/server/daemon-server.c | 4 +- tools/command.c | 36 ++-- tools/dmsetup.c | 95 ++++---- tools/lvmcmdlib.c | 4 +- tools/pvck.c | 3 +- tools/toollib.c | 2 +- tools/vgcfgbackup.c | 12 +- 80 files changed, 714 insertions(+), 1118 deletions(-) diff --git a/daemons/cmirrord/functions.c b/daemons/cmirrord/functions.c index 5e43e1a..61bcf16 100644 --- a/daemons/cmirrord/functions.c +++ b/daemons/cmirrord/functions.c @@ -435,7 +435,7 @@ static int _clog_ctr(char *uuid, uint64_t luid, block_on_error = 1; } - lc = dm_zalloc(sizeof(*lc)); + lc = zalloc(sizeof(*lc)); if (!lc) { LOG_ERROR("Unable to allocate cluster log context"); r = -ENOMEM; @@ -532,9 +532,9 @@ fail: LOG_ERROR("Close device error, %s: %s", disk_path, strerror(errno)); free(lc->disk_buffer); - dm_free(lc->sync_bits); - dm_free(lc->clean_bits); - dm_free(lc); + free(lc->sync_bits); + free(lc->clean_bits); + free(lc); } return r; } @@ -659,9 +659,9 @@ static int clog_dtr(struct dm_ulog_request *rq) strerror(errno)); if (lc->disk_buffer) free(lc->disk_buffer); - dm_free(lc->clean_bits); - dm_free(lc->sync_bits); - dm_free(lc); + free(lc->clean_bits); + free(lc->sync_bits); + free(lc); return 0; } diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c index 533186b..4b4e1f0 100644 --- a/daemons/dmeventd/dmeventd.c +++ b/daemons/dmeventd/dmeventd.c @@ -264,19 +264,19 @@ static pthread_cond_t _timeout_cond = PTHREAD_COND_INITIALIZER; /* DSO data allocate/free. */ static void _free_dso_data(struct dso_data *data) { - dm_free(data->dso_name); - dm_free(data); + free(data->dso_name); + free(data); } static struct dso_data *_alloc_dso_data(struct message_data *data) { - struct dso_data *ret = (typeof(ret)) dm_zalloc(sizeof(*ret)); + struct dso_data *ret = (typeof(ret)) zalloc(sizeof(*ret)); if (!ret) return_NULL; - if (!(ret->dso_name = dm_strdup(data->dso_name))) { - dm_free(ret); + if (!(ret->dso_name = strdup(data->dso_name))) { + free(ret); return_NULL; } @@ -397,9 +397,9 @@ static void _free_thread_status(struct thread_status *thread) _lib_put(thread->dso_data); if (thread->wait_task) dm_task_destroy(thread->wait_task); - dm_free(thread->device.uuid); - dm_free(thread->device.name); - dm_free(thread); + free(thread->device.uuid); + free(thread->device.name); + free(thread); } /* Note: events_field must not be 0, ensured by caller */ @@ -408,7 +408,7 @@ static struct thread_status *_alloc_thread_status(const struct message_data *dat { struct thread_status *thread; - if (!(thread = dm_zalloc(sizeof(*thread)))) { + if (!(thread = zalloc(sizeof(*thread)))) { log_error("Cannot create new thread, out of memory."); return NULL; } @@ -422,11 +422,11 @@ static struct thread_status *_alloc_thread_status(const struct message_data *dat if (!dm_task_set_uuid(thread->wait_task, data->device_uuid)) goto_out; - if (!(thread->device.uuid = dm_strdup(data->device_uuid))) + if (!(thread->device.uuid = strdup(data->device_uuid))) goto_out; /* Until real name resolved, use UUID */ - if (!(thread->device.name = dm_strdup(data->device_uuid))) + if (!(thread->device.name = strdup(data->device_uuid))) goto_out; /* runs ioctl and may register lvm2 pluging */ @@ -515,7 +515,7 @@ static int _fetch_string(char **ptr, char **src, const int delimiter) if ((p = strchr(*src, delimiter))) { if (*src < p) { *p = 0; /* Temporary exit with \0 */ - if (!(*ptr = dm_strdup(*src))) { + if (!(*ptr = strdup(*src))) { log_error("Failed to fetch item %s.", *src); ret = 0; /* Allocation fail */ } @@ -525,7 +525,7 @@ static int _fetch_string(char **ptr, char **src, const int delimiter) (*src)++; /* Skip delmiter, next field */ } else if ((len = strlen(*src))) { /* No delimiter, item ends with '\0' */ - if (!(*ptr = dm_strdup(*src))) { + if (!(*ptr = strdup(*src))) { log_error("Failed to fetch last item %s.", *src); ret = 0; /* Fail */ } @@ -538,11 +538,11 @@ out: /* Free message memory. */ static void _free_message(struct message_data *message_data) { - dm_free(message_data->id); - dm_free(message_data->dso_name); - dm_free(message_data->device_uuid); - dm_free(message_data->events_str); - dm_free(message_data->timeout_str); + free(message_data->id); + free(message_data->dso_name); + free(message_data->device_uuid); + free(message_data->events_str); + free(message_data->timeout_str); } /* Parse a register message from the client. */ @@ -574,7 +574,7 @@ static int _parse_message(struct message_data *message_data) ret = 1; } - dm_free(msg->data); + free(msg->data); msg->data = NULL; return ret; @@ -608,8 +608,8 @@ static int _fill_device_data(struct thread_status *ts) if (!dm_task_run(dmt)) goto fail; - dm_free(ts->device.name); - if (!(ts->device.name = dm_strdup(dm_task_get_name(dmt)))) + free(ts->device.name); + if (!(ts->device.name = strdup(dm_task_get_name(dmt)))) goto fail; if (!dm_task_get_info(dmt, &dmi)) @@ -696,8 +696,8 @@ static int _get_status(struct message_data *message_data) len = strlen(message_data->id); msg->size = size + len + 1; - dm_free(msg->data); - if (!(msg->data = dm_malloc(msg->size))) + free(msg->data); + if (!(msg->data = malloc(msg->size))) goto out; memcpy(msg->data, message_data->id, len); @@ -712,7 +712,7 @@ static int _get_status(struct message_data *message_data) ret = 0; out: for (j = 0; j < i; ++j) - dm_free(buffers[j]); + free(buffers[j]); return ret; } @@ -721,7 +721,7 @@ static int _get_parameters(struct message_data *message_data) { struct dm_event_daemon_message *msg = message_data->msg; int size; - dm_free(msg->data); + free(msg->data); if ((size = dm_asprintf(&msg->data, "%s pid=%d daemon=%s exec_method=%s", message_data->id, getpid(), _foreground ? "no" : "yes", @@ -1225,7 +1225,7 @@ static int _registered_device(struct message_data *message_data, int r; struct dm_event_daemon_message *msg = message_data->msg; - dm_free(msg->data); + free(msg->data); if ((r = dm_asprintf(&(msg->data), "%s %s %s %u", message_data->id, @@ -1365,7 +1365,7 @@ static int _get_timeout(struct message_data *message_data) if (!thread) return -ENODEV; - dm_free(msg->data); + free(msg->data); msg->size = dm_asprintf(&(msg->data), "%s %" PRIu32, message_data->id, thread->timeout); @@ -1502,7 +1502,7 @@ static int _client_read(struct dm_event_fifos *fifos, bytes = 0; if (!size) break; /* No data -> error */ - buf = msg->data = dm_malloc(msg->size); + buf = msg->data = malloc(msg->size); if (!buf) break; /* No mem -> error */ header = 0; @@ -1510,7 +1510,7 @@ static int _client_read(struct dm_event_fifos *fifos, } if (bytes != size) { - dm_free(msg->data); + free(msg->data); msg->data = NULL; return 0; } @@ -1530,7 +1530,7 @@ static int _client_write(struct dm_event_fifos *fifos, fd_set fds; size_t size = 2 * sizeof(uint32_t) + ((msg->data) ? msg->size : 0); - uint32_t *header = dm_malloc(size); + uint32_t *header = malloc(size); char *buf = (char *)header; if (!header) { @@ -1560,7 +1560,7 @@ static int _client_write(struct dm_event_fifos *fifos, } if (header != temp) - dm_free(header); + free(header); return (bytes == size); } @@ -1622,7 +1622,7 @@ static int _do_process_request(struct dm_event_daemon_message *msg) msg->size = dm_asprintf(&(msg->data), "%s %s %d", answer, (msg->cmd == DM_EVENT_CMD_DIE) ? "DYING" : "HELLO", DM_EVENT_PROTOCOL_VERSION); - dm_free(answer); + free(answer); } } else if (msg->cmd != DM_EVENT_CMD_ACTIVE && !_parse_message(&message_data)) { stack; @@ -1664,7 +1664,7 @@ static void _process_request(struct dm_event_fifos *fifos) DEBUGLOG("<<< CMD:%s (0x%x) completed (result %d).", decode_cmd(cmd), cmd, msg.cmd); - dm_free(msg.data); + free(msg.data); if (cmd == DM_EVENT_CMD_DIE) { if (unlink(DMEVENTD_PIDFILE)) @@ -1975,7 +1975,7 @@ static int _reinstate_registrations(struct dm_event_fifos *fifos) int i, ret; ret = daemon_talk(fifos, &msg, DM_EVENT_CMD_HELLO, NULL, NULL, 0, 0); - dm_free(msg.data); + free(msg.data); msg.data = NULL; if (ret) { @@ -2061,13 +2061,13 @@ static void _restart_dmeventd(void) ++count; } - if (!(_initial_registrations = dm_malloc(sizeof(char*) * (count + 1)))) { + if (!(_initial_registrations = malloc(sizeof(char*) * (count + 1)))) { fprintf(stderr, "Memory allocation registration failed.\n"); goto bad; } for (i = 0; i < count; ++i) { - if (!(_initial_registrations[i] = dm_strdup(message))) { + if (!(_initial_registrations[i] = strdup(message))) { fprintf(stderr, "Memory allocation for message failed.\n"); goto bad; } diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index 7f07228..4673f01 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -49,8 +49,8 @@ struct dm_event_handler { static void _dm_event_handler_clear_dev_info(struct dm_event_handler *dmevh) { - dm_free(dmevh->dev_name); - dm_free(dmevh->uuid); + free(dmevh->dev_name); + free(dmevh->uuid); dmevh->dev_name = dmevh->uuid = NULL; dmevh->major = dmevh->minor = 0; } @@ -59,7 +59,7 @@ struct dm_event_handler *dm_event_handler_create(void) { struct dm_event_handler *dmevh; - if (!(dmevh = dm_zalloc(sizeof(*dmevh)))) { + if (!(dmevh = zalloc(sizeof(*dmevh)))) { log_error("Failed to allocate event handler."); return NULL; } @@ -70,9 +70,9 @@ struct dm_event_handler *dm_event_handler_create(void) void dm_event_handler_destroy(struct dm_event_handler *dmevh) { _dm_event_handler_clear_dev_info(dmevh); - dm_free(dmevh->dso); - dm_free(dmevh->dmeventd_path); - dm_free(dmevh); + free(dmevh->dso); + free(dmevh->dmeventd_path); + free(dmevh); } int dm_event_handler_set_dmeventd_path(struct dm_event_handler *dmevh, const char *dmeventd_path) @@ -80,9 +80,9 @@ int dm_event_handler_set_dmeventd_path(struct dm_event_handler *dmevh, const cha if (!dmeventd_path) /* noop */ return 0; - dm_free(dmevh->dmeventd_path); + free(dmevh->dmeventd_path); - if (!(dmevh->dmeventd_path = dm_strdup(dmeventd_path))) + if (!(dmevh->dmeventd_path = strdup(dmeventd_path))) return -ENOMEM; return 0; @@ -93,9 +93,9 @@ int dm_event_handler_set_dso(struct dm_event_handler *dmevh, const char *path) if (!path) /* noop */ return 0; - dm_free(dmevh->dso); + free(dmevh->dso); - if (!(dmevh->dso = dm_strdup(path))) + if (!(dmevh->dso = strdup(path))) return -ENOMEM; return 0; @@ -108,7 +108,7 @@ int dm_event_handler_set_dev_name(struct dm_event_handler *dmevh, const char *de _dm_event_handler_clear_dev_info(dmevh); - if (!(dmevh->dev_name = dm_strdup(dev_name))) + if (!(dmevh->dev_name = strdup(dev_name))) return -ENOMEM; return 0; @@ -121,7 +121,7 @@ int dm_event_handler_set_uuid(struct dm_event_handler *dmevh, const char *uuid) _dm_event_handler_clear_dev_info(dmevh); - if (!(dmevh->uuid = dm_strdup(uuid))) + if (!(dmevh->uuid = strdup(uuid))) return -ENOMEM; return 0; @@ -261,7 +261,7 @@ static int _daemon_read(struct dm_event_fifos *fifos, if (header && (bytes == 2 * sizeof(uint32_t))) { msg->cmd = ntohl(header[0]); msg->size = ntohl(header[1]); - buf = msg->data = dm_malloc(msg->size); + buf = msg->data = malloc(msg->size); size = msg->size; bytes = 0; header = 0; @@ -269,7 +269,7 @@ static int _daemon_read(struct dm_event_fifos *fifos, } if (bytes != size) { - dm_free(msg->data); + free(msg->data); msg->data = NULL; } return bytes == size; @@ -372,13 +372,13 @@ int daemon_talk(struct dm_event_fifos *fifos, */ if (!_daemon_write(fifos, msg)) { stack; - dm_free(msg->data); + free(msg->data); msg->data = NULL; return -EIO; } do { - dm_free(msg->data); + free(msg->data); msg->data = NULL; if (!_daemon_read(fifos, msg)) { @@ -621,7 +621,7 @@ static int _do_event(int cmd, char *dmeventd_path, struct dm_event_daemon_messag ret = daemon_talk(&fifos, msg, DM_EVENT_CMD_HELLO, NULL, NULL, 0, 0); - dm_free(msg->data); + free(msg->data); msg->data = 0; if (!ret) @@ -661,7 +661,7 @@ int dm_event_register_handler(const struct dm_event_handler *dmevh) ret = 0; } - dm_free(msg.data); + free(msg.data); dm_task_destroy(dmt); @@ -688,7 +688,7 @@ int dm_event_unregister_handler(const struct dm_event_handler *dmevh) ret = 0; } - dm_free(msg.data); + free(msg.data); dm_task_destroy(dmt); @@ -704,7 +704,7 @@ static char *_fetch_string(char **src, const int delimiter) if ((p = strchr(*src, delimiter))) *p = 0; - if ((ret = dm_strdup(*src))) + if ((ret = strdup(*src))) *src += strlen(ret) + 1; if (p) @@ -724,11 +724,11 @@ static int _parse_message(struct dm_event_daemon_message *msg, char **dso_name, (*dso_name = _fetch_string(&p, ' ')) && (*uuid = _fetch_string(&p, ' '))) { *evmask = atoi(p); - dm_free(id); + free(id); return 0; } - dm_free(id); + free(id); return -ENOMEM; } @@ -770,7 +770,7 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next) dm_task_destroy(dmt); dmt = NULL; - dm_free(msg.data); + free(msg.data); msg.data = NULL; _dm_event_handler_clear_dev_info(dmevh); @@ -779,7 +779,7 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next) goto fail; } - if (!(dmevh->uuid = dm_strdup(reply_uuid))) { + if (!(dmevh->uuid = strdup(reply_uuid))) { ret = -ENOMEM; goto fail; } @@ -792,13 +792,13 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next) dm_event_handler_set_dso(dmevh, reply_dso); dm_event_handler_set_event_mask(dmevh, reply_mask); - dm_free(reply_dso); + free(reply_dso); reply_dso = NULL; - dm_free(reply_uuid); + free(reply_uuid); reply_uuid = NULL; - if (!(dmevh->dev_name = dm_strdup(dm_task_get_name(dmt)))) { + if (!(dmevh->dev_name = strdup(dm_task_get_name(dmt)))) { ret = -ENOMEM; goto fail; } @@ -816,9 +816,9 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next) return ret; fail: - dm_free(msg.data); - dm_free(reply_dso); - dm_free(reply_uuid); + free(msg.data); + free(reply_dso); + free(reply_uuid); _dm_event_handler_clear_dev_info(dmevh); if (dmt) dm_task_destroy(dmt); @@ -983,12 +983,12 @@ int dm_event_get_timeout(const char *device_path, uint32_t *timeout) if (!p) { log_error("Malformed reply from dmeventd '%s'.", msg.data); - dm_free(msg.data); + free(msg.data); return -EIO; } *timeout = atoi(p); } - dm_free(msg.data); + free(msg.data); return ret; } diff --git a/daemons/dmfilemapd/dmfilemapd.c b/daemons/dmfilemapd/dmfilemapd.c index 4e048ff..726ad6e 100644 --- a/daemons/dmfilemapd/dmfilemapd.c +++ b/daemons/dmfilemapd/dmfilemapd.c @@ -311,7 +311,7 @@ static int _parse_args(int argc, char **argv, struct filemap_monitor *fm) return 0; } - fm->path = dm_strdup(argv[0]); + fm->path = strdup(argv[0]); if (!fm->path) { _early_log("Could not allocate memory for path argument."); return 0; @@ -538,8 +538,8 @@ static void _filemap_monitor_destroy(struct filemap_monitor *fm) _filemap_monitor_end_notify(fm); _filemap_monitor_close_fd(fm); } - dm_free((void *) fm->program_id); - dm_free(fm->path); + free((void *) fm->program_id); + free(fm->path); } static int _filemap_monitor_check_same_file(int fd1, int fd2) @@ -699,7 +699,7 @@ static int _update_regions(struct dm_stats *dms, struct filemap_monitor *fm) fm->group_id, regions[0]); fm->group_id = regions[0]; } - dm_free(regions); + free(regions); fm->nr_regions = nr_regions; return 1; } @@ -741,7 +741,7 @@ static int _dmfilemapd(struct filemap_monitor *fm) */ program_id = dm_stats_get_region_program_id(dms, fm->group_id); if (program_id) - fm->program_id = dm_strdup(program_id); + fm->program_id = strdup(program_id); else fm->program_id = NULL; dm_stats_set_program_id(dms, 1, program_id); @@ -817,7 +817,7 @@ int main(int argc, char **argv) memset(&fm, 0, sizeof(fm)); if (!_parse_args(argc, argv, &fm)) { - dm_free(fm.path); + free(fm.path); return 1; } @@ -828,7 +828,7 @@ int main(int argc, char **argv) _mode_names[fm.mode], fm.path); if (!_foreground && !_daemonise(&fm)) { - dm_free(fm.path); + free(fm.path); return 1; } diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c index 8858e29..cd44be5 100644 --- a/daemons/lvmetad/lvmetad-core.c +++ b/daemons/lvmetad/lvmetad-core.c @@ -259,19 +259,19 @@ static void destroy_metadata_hashes(lvmetad_state *s) dm_config_destroy(dm_hash_get_data(s->pvid_to_pvmeta, n)); dm_hash_iterate(n, s->vgid_to_vgname) - dm_free(dm_hash_get_data(s->vgid_to_vgname, n)); + free(dm_hash_get_data(s->vgid_to_vgname, n)); dm_hash_iterate(n, s->vgname_to_vgid) - dm_free(dm_hash_get_data(s->vgname_to_vgid, n)); + free(dm_hash_get_data(s->vgname_to_vgid, n)); dm_hash_iterate(n, s->vgid_to_info) - dm_free(dm_hash_get_data(s->vgid_to_info, n)); + free(dm_hash_get_data(s->vgid_to_info, n)); dm_hash_iterate(n, s->device_to_pvid) - dm_free(dm_hash_get_data(s->device_to_pvid, n)); + free(dm_hash_get_data(s->device_to_pvid, n)); dm_hash_iterate(n, s->pvid_to_vgid) - dm_free(dm_hash_get_data(s->pvid_to_vgid, n)); + free(dm_hash_get_data(s->pvid_to_vgid, n)); dm_hash_destroy(s->pvid_to_pvmeta); dm_hash_destroy(s->vgid_to_metadata); @@ -818,19 +818,19 @@ static int _update_pvid_to_vgid(lvmetad_state *s, struct dm_config_tree *vg, if (mode == MARK_OUTDATED) mark_outdated_pv(s, vgid, pvid); - if (!(vgid_dup = dm_strdup(vgid))) { + if (!(vgid_dup = strdup(vgid))) { ERROR(s, "update_pvid_to_vgid out of memory for vgid %s", vgid); goto abort_daemon; } if (!dm_hash_insert(s->pvid_to_vgid, pvid, vgid_dup)) { ERROR(s, "update_pvid_to_vgid out of memory for hash insert vgid %s", vgid_dup); - dm_free(vgid_dup); + free(vgid_dup); goto abort_daemon; } /* pvid_to_vgid no longer references vgid_old */ - dm_free(vgid_old); + free(vgid_old); DEBUGLOG(s, "moving PV %s to VG %s", pvid, vgid); } @@ -889,9 +889,9 @@ static int remove_metadata(lvmetad_state *s, const char *vgid, int update_pvids) dm_config_destroy(meta_lookup); if (outdated_pvs_lookup) dm_config_destroy(outdated_pvs_lookup); - dm_free(info_lookup); - dm_free(name_lookup); - dm_free(vgid_lookup); + free(info_lookup); + free(name_lookup); + free(vgid_lookup); return 1; } @@ -950,7 +950,7 @@ static void _purge_metadata(lvmetad_state *s, const char *arg_name, const char * if ((rem_vgid = dm_hash_lookup_with_val(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1))) { dm_hash_remove_with_val(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1); - dm_free(rem_vgid); + free(rem_vgid); } } @@ -978,10 +978,10 @@ static int _update_metadata_new_vgid(lvmetad_state *s, int abort_daemon = 0; int retval = 0; - if (!(new_vgid_dup = dm_strdup(new_vgid))) + if (!(new_vgid_dup = strdup(new_vgid))) goto ret; - if (!(arg_name_dup = dm_strdup(arg_name))) + if (!(arg_name_dup = strdup(arg_name))) goto ret; /* @@ -999,7 +999,7 @@ static int _update_metadata_new_vgid(lvmetad_state *s, if ((rem_info = dm_hash_lookup(s->vgid_to_info, old_vgid))) { dm_hash_remove(s->vgid_to_info, old_vgid); - dm_free(rem_info); + free(rem_info); } if ((rem_outdated = dm_hash_lookup(s->vgid_to_outdated_pvs, old_vgid))) { @@ -1013,7 +1013,7 @@ static int _update_metadata_new_vgid(lvmetad_state *s, dm_hash_remove_with_val(s->vgname_to_vgid, arg_name, old_vgid, strlen(old_vgid) + 1); dm_hash_remove(s->vgid_to_vgname, old_vgid); - dm_free((char *)old_vgid); + free((char *)old_vgid); old_vgid = NULL; /* @@ -1085,10 +1085,10 @@ static int _update_metadata_new_name(lvmetad_state *s, int abort_daemon = 0; int retval = 0; - if (!(new_name_dup = dm_strdup(new_name))) + if (!(new_name_dup = strdup(new_name))) goto ret; - if (!(arg_vgid_dup = dm_strdup(arg_vgid))) + if (!(arg_vgid_dup = strdup(arg_vgid))) goto ret; /* @@ -1106,7 +1106,7 @@ static int _update_metadata_new_name(lvmetad_state *s, if ((rem_info = dm_hash_lookup(s->vgid_to_info, arg_vgid))) { dm_hash_remove(s->vgid_to_info, arg_vgid); - dm_free(rem_info); + free(rem_info); } if ((rem_outdated = dm_hash_lookup(s->vgid_to_outdated_pvs, arg_vgid))) { @@ -1120,7 +1120,7 @@ static int _update_metadata_new_name(lvmetad_state *s, dm_hash_remove(s->vgid_to_vgname, arg_vgid); dm_hash_remove_with_val(s->vgname_to_vgid, old_name, arg_vgid, strlen(arg_vgid) + 1); - dm_free((char *)old_name); + free((char *)old_name); old_name = NULL; /* @@ -1183,10 +1183,10 @@ static int _update_metadata_add_new(lvmetad_state *s, const char *new_name, cons DEBUGLOG(s, "update_metadata_add_new for %s %s", new_name, new_vgid); - if (!(new_name_dup = dm_strdup(new_name))) + if (!(new_name_dup = strdup(new_name))) goto out_free; - if (!(new_vgid_dup = dm_strdup(new_vgid))) + if (!(new_vgid_dup = strdup(new_vgid))) goto out_free; if (!dm_hash_insert(s->vgid_to_metadata, new_vgid, new_meta)) { @@ -1218,8 +1218,8 @@ static int _update_metadata_add_new(lvmetad_state *s, const char *new_name, cons out: out_free: if (!new_name_dup || !new_vgid_dup || abort_daemon) { - dm_free(new_name_dup); - dm_free(new_vgid_dup); + free(new_name_dup); + free(new_vgid_dup); ERROR(s, "lvmetad could not be updated and is aborting."); exit(EXIT_FAILURE); } @@ -1799,17 +1799,17 @@ static response pv_gone(lvmetad_state *s, request r) * mappings for this vg, which will free the "vgid" string that * was returned above from the pvid_to_vgid lookup. */ - if (!(vgid_dup = dm_strdup(vgid))) + if (!(vgid_dup = strdup(vgid))) return reply_fail("out of memory"); vg_remove_if_missing(s, vgid_dup, 1); - dm_free(vgid_dup); + free(vgid_dup); vgid_dup = NULL; vgid = NULL; } dm_config_destroy(pvmeta); - dm_free(old_pvid); + free(old_pvid); return daemon_reply_simple("OK", NULL ); } @@ -2082,7 +2082,7 @@ static response pv_found(lvmetad_state *s, request r) DEBUGLOG(s, "pv_found new entry device_to_pvid %" PRIu64 " to %s", new_device, new_pvid); - if (!(new_pvid_dup = dm_strdup(new_pvid))) + if (!(new_pvid_dup = strdup(new_pvid))) goto nomem_free1; if (!dm_hash_insert_binary(s->device_to_pvid, &new_device, sizeof(new_device), new_pvid_dup)) @@ -2122,7 +2122,7 @@ static response pv_found(lvmetad_state *s, request r) arg_device, arg_pvid); dm_config_destroy(new_pvmeta); /* device_to_pvid no longer references prev_pvid_lookup */ - dm_free((void*)prev_pvid_on_dev); + free((void*)prev_pvid_on_dev); s->flags |= GLFL_DISABLE; s->flags |= GLFL_DISABLE_REASON_DUPLICATES; return reply_fail("Ignore duplicate PV"); @@ -2130,7 +2130,7 @@ static response pv_found(lvmetad_state *s, request r) } - if (!(new_pvid_dup = dm_strdup(new_pvid))) + if (!(new_pvid_dup = strdup(new_pvid))) goto nomem_free1; if (!dm_hash_insert_binary(s->device_to_pvid, &arg_device, sizeof(arg_device), new_pvid_dup)) @@ -2218,22 +2218,22 @@ static response pv_found(lvmetad_state *s, request r) char *tmp_vgid; if (!arg_vgid || strcmp(arg_vgid, prev_vgid_on_dev)) { - tmp_vgid = dm_strdup(prev_vgid_on_dev); + tmp_vgid = strdup(prev_vgid_on_dev); /* vg_remove_if_missing will clear and free the string pointed to by prev_vgid_on_dev. */ vg_remove_if_missing(s, tmp_vgid, 1); - dm_free(tmp_vgid); + free(tmp_vgid); } /* vg_remove_if_missing may have remapped prev_pvid_on_dev to orphan */ if ((tmp_vgid = dm_hash_lookup(s->pvid_to_vgid, prev_pvid_on_dev))) { dm_hash_remove(s->pvid_to_vgid, prev_pvid_on_dev); - dm_free(tmp_vgid); + free(tmp_vgid); } } /* This was unhashed from device_to_pvid above. */ - dm_free((void *)prev_pvid_on_dev); + free((void *)prev_pvid_on_dev); return daemon_reply_simple("OK", "status = %s", vg_status, @@ -2245,7 +2245,7 @@ static response pv_found(lvmetad_state *s, request r) NULL); nomem_free2: - dm_free(new_pvid_dup); + free(new_pvid_dup); nomem_free1: dm_config_destroy(new_pvmeta); nomem: @@ -2525,7 +2525,7 @@ inval: info = dm_hash_lookup(s->vgid_to_info, uuid); if (!info) { - if (!(info = dm_zalloc(sizeof(struct vg_info)))) + if (!(info = zalloc(sizeof(struct vg_info)))) goto bad; if (!dm_hash_insert(s->vgid_to_info, uuid, (void*)info)) goto bad; @@ -2570,7 +2570,7 @@ static void _dump_pairs(struct buffer *buf, struct dm_hash_table *ht, const char (void) dm_asprintf(&append, " %s = \"%s\"\n", key, val); if (append) buffer_append(buf, append); - dm_free(append); + free(append); } buffer_append(buf, "}\n"); } @@ -2590,7 +2590,7 @@ static void _dump_info_version(struct buffer *buf, struct dm_hash_table *ht, con (void) dm_asprintf(&append, " %s = %lld\n", key, (long long)info->external_version); if (append) buffer_append(buf, append); - dm_free(append); + free(append); n = dm_hash_get_next(ht, n); } buffer_append(buf, "}\n"); @@ -2611,7 +2611,7 @@ static void _dump_info_flags(struct buffer *buf, struct dm_hash_table *ht, const (void) dm_asprintf(&append, " %s = %llx\n", key, (long long)info->flags); if (append) buffer_append(buf, append); - dm_free(append); + free(append); n = dm_hash_get_next(ht, n); } buffer_append(buf, "}\n"); diff --git a/daemons/lvmpolld/lvmpolld-cmd-utils.c b/daemons/lvmpolld/lvmpolld-cmd-utils.c index 601338f..865b47e 100644 --- a/daemons/lvmpolld/lvmpolld-cmd-utils.c +++ b/daemons/lvmpolld/lvmpolld-cmd-utils.c @@ -36,7 +36,7 @@ static int add_to_cmd_arr(const char ***cmdargv, const char *str, unsigned *ind) const char **newargv; if (*ind && !(*ind % MIN_ARGV_SIZE)) { - newargv = dm_realloc(*cmdargv, (*ind / MIN_ARGV_SIZE + 1) * MIN_ARGV_SIZE * sizeof(char *)); + newargv = realloc(*cmdargv, (*ind / MIN_ARGV_SIZE + 1) * MIN_ARGV_SIZE * sizeof(char *)); if (!newargv) return 0; *cmdargv = newargv; @@ -50,7 +50,7 @@ static int add_to_cmd_arr(const char ***cmdargv, const char *str, unsigned *ind) const char **cmdargv_ctr(const struct lvmpolld_lv *pdlv, const char *lvm_binary, unsigned abort_polling, unsigned handle_missing_pvs) { unsigned i = 0; - const char **cmd_argv = dm_malloc(MIN_ARGV_SIZE * sizeof(char *)); + const char **cmd_argv = malloc(MIN_ARGV_SIZE * sizeof(char *)); if (!cmd_argv) return NULL; @@ -98,7 +98,7 @@ const char **cmdargv_ctr(const struct lvmpolld_lv *pdlv, const char *lvm_binary, return cmd_argv; err: - dm_free(cmd_argv); + free(cmd_argv); return NULL; } @@ -122,7 +122,7 @@ static int copy_env(const char ***cmd_envp, unsigned *i, const char *exclude) const char **cmdenvp_ctr(const struct lvmpolld_lv *pdlv) { unsigned i = 0; - const char **cmd_envp = dm_malloc(MIN_ARGV_SIZE * sizeof(char *)); + const char **cmd_envp = malloc(MIN_ARGV_SIZE * sizeof(char *)); if (!cmd_envp) return NULL; @@ -141,6 +141,6 @@ const char **cmdenvp_ctr(const struct lvmpolld_lv *pdlv) return cmd_envp; err: - dm_free(cmd_envp); + free(cmd_envp); return NULL; } diff --git a/daemons/lvmpolld/lvmpolld-core.c b/daemons/lvmpolld/lvmpolld-core.c index fd73272..3aac65f 100644 --- a/daemons/lvmpolld/lvmpolld-core.c +++ b/daemons/lvmpolld/lvmpolld-core.c @@ -530,7 +530,7 @@ static response progress_info(client_handle h, struct lvmpolld_state *ls, reques pdst_unlock(pdst); - dm_free(id); + free(id); if (pdlv) { if (st.error) @@ -673,7 +673,7 @@ static response poll_init(client_handle h, struct lvmpolld_state *ls, request re PD_LOG_PREFIX, "poll operation type mismatch on LV identified by", id, polling_op(pdlv_get_type(pdlv)), polling_op(type)); - dm_free(id); + free(id); return reply(LVMPD_RESP_EINVAL, REASON_DIFFERENT_OPERATION_IN_PROGRESS); } @@ -683,14 +683,14 @@ static response poll_init(client_handle h, struct lvmpolld_state *ls, request re lvname, sysdir, type, abort_polling, 2 * uinterval); if (!pdlv) { pdst_unlock(pdst); - dm_free(id); + free(id); return reply(LVMPD_RESP_FAILED, REASON_ENOMEM); } if (!pdst_locked_insert(pdst, id, pdlv)) { pdlv_destroy(pdlv); pdst_unlock(pdst); ERROR(ls, "%s: %s", PD_LOG_PREFIX, "couldn't store internal LV data structure"); - dm_free(id); + free(id); return reply(LVMPD_RESP_FAILED, REASON_ENOMEM); } if (!spawn_detached_thread(pdlv)) { @@ -698,7 +698,7 @@ static response poll_init(client_handle h, struct lvmpolld_state *ls, request re pdst_locked_remove(pdst, id); pdlv_destroy(pdlv); pdst_unlock(pdst); - dm_free(id); + free(id); return reply(LVMPD_RESP_FAILED, REASON_ENOMEM); } @@ -709,7 +709,7 @@ static response poll_init(client_handle h, struct lvmpolld_state *ls, request re pdst_unlock(pdst); - dm_free(id); + free(id); return daemon_reply_simple(LVMPD_RESP_OK, NULL); } @@ -806,7 +806,7 @@ static int printout_raw_response(const char *prefix, const char *msg) char *buf; char *pos; - buf = dm_strdup(msg); + buf = strdup(msg); pos = buf; if (!buf) @@ -819,7 +819,7 @@ static int printout_raw_response(const char *prefix, const char *msg) _log_line(pos, &b); pos = next ? next + 1 : 0; } - dm_free(buf); + free(buf); return 1; } diff --git a/daemons/lvmpolld/lvmpolld-data-utils.c b/daemons/lvmpolld/lvmpolld-data-utils.c index d5e1139..23e316a 100644 --- a/daemons/lvmpolld/lvmpolld-data-utils.c +++ b/daemons/lvmpolld/lvmpolld-data-utils.c @@ -27,12 +27,12 @@ static char *_construct_full_lvname(const char *vgname, const char *lvname) size_t l; l = strlen(vgname) + strlen(lvname) + 2; /* vg/lv and \0 */ - name = (char *) dm_malloc(l * sizeof(char)); + name = (char *) malloc(l * sizeof(char)); if (!name) return NULL; if (dm_snprintf(name, l, "%s/%s", vgname, lvname) < 0) { - dm_free(name); + free(name); name = NULL; } @@ -47,7 +47,7 @@ static char *_construct_lvm_system_dir_env(const char *sysdir) * just single char to store NULL byte */ size_t l = sysdir ? strlen(sysdir) + 16 : 1; - char *env = (char *) dm_malloc(l * sizeof(char)); + char *env = (char *) malloc(l * sizeof(char)); if (!env) return NULL; @@ -55,7 +55,7 @@ static char *_construct_lvm_system_dir_env(const char *sysdir) *env = '\0'; if (sysdir && dm_snprintf(env, l, "%s%s", LVM_SYSTEM_DIR, sysdir) < 0) { - dm_free(env); + free(env); env = NULL; } @@ -74,7 +74,7 @@ char *construct_id(const char *sysdir, const char *uuid) size_t l; l = strlen(uuid) + (sysdir ? strlen(sysdir) : 0) + 1; - id = (char *) dm_malloc(l * sizeof(char)); + id = (char *) malloc(l * sizeof(char)); if (!id) return NULL; @@ -82,7 +82,7 @@ char *construct_id(const char *sysdir, const char *uuid) dm_snprintf(id, l, "%s", uuid); if (r < 0) { - dm_free(id); + free(id); id = NULL; } @@ -95,7 +95,7 @@ struct lvmpolld_lv *pdlv_create(struct lvmpolld_state *ls, const char *id, const char *sinterval, unsigned pdtimeout, struct lvmpolld_store *pdst) { - char *lvmpolld_id = dm_strdup(id), /* copy */ + char *lvmpolld_id = strdup(id), /* copy */ *full_lvname = _construct_full_lvname(vgname, lvname), /* copy */ *lvm_system_dir_env = _construct_lvm_system_dir_env(sysdir); /* copy */ @@ -106,12 +106,12 @@ struct lvmpolld_lv *pdlv_create(struct lvmpolld_state *ls, const char *id, .lvid = _get_lvid(lvmpolld_id, sysdir), .lvname = full_lvname, .lvm_system_dir_env = lvm_system_dir_env, - .sinterval = dm_strdup(sinterval), /* copy */ + .sinterval = strdup(sinterval), /* copy */ .pdtimeout = pdtimeout < MIN_POLLING_TIMEOUT ? MIN_POLLING_TIMEOUT : pdtimeout, .cmd_state = { .retcode = -1, .signal = 0 }, .pdst = pdst, .init_rq_count = 1 - }, *pdlv = (struct lvmpolld_lv *) dm_malloc(sizeof(struct lvmpolld_lv)); + }, *pdlv = (struct lvmpolld_lv *) malloc(sizeof(struct lvmpolld_lv)); if (!pdlv || !tmp.lvid || !tmp.lvname || !tmp.lvm_system_dir_env || !tmp.sinterval) goto err; @@ -124,27 +124,27 @@ struct lvmpolld_lv *pdlv_create(struct lvmpolld_state *ls, const char *id, return pdlv; err: - dm_free((void *)full_lvname); - dm_free((void *)lvmpolld_id); - dm_free((void *)lvm_system_dir_env); - dm_free((void *)tmp.sinterval); - dm_free((void *)pdlv); + free((void *)full_lvname); + free((void *)lvmpolld_id); + free((void *)lvm_system_dir_env); + free((void *)tmp.sinterval); + free((void *)pdlv); return NULL; } void pdlv_destroy(struct lvmpolld_lv *pdlv) { - dm_free((void *)pdlv->lvmpolld_id); - dm_free((void *)pdlv->lvname); - dm_free((void *)pdlv->sinterval); - dm_free((void *)pdlv->lvm_system_dir_env); - dm_free((void *)pdlv->cmdargv); - dm_free((void *)pdlv->cmdenvp); + free((void *)pdlv->lvmpolld_id); + free((void *)pdlv->lvname); + free((void *)pdlv->sinterval); + free((void *)pdlv->lvm_system_dir_env); + free((void *)pdlv->cmdargv); + free((void *)pdlv->cmdenvp); pthread_mutex_destroy(&pdlv->lock); - dm_free((void *)pdlv); + free((void *)pdlv); } unsigned pdlv_get_polling_finished(struct lvmpolld_lv *pdlv) @@ -194,7 +194,7 @@ void pdlv_set_polling_finished(struct lvmpolld_lv *pdlv, unsigned finished) struct lvmpolld_store *pdst_init(const char *name) { - struct lvmpolld_store *pdst = (struct lvmpolld_store *) dm_malloc(sizeof(struct lvmpolld_store)); + struct lvmpolld_store *pdst = (struct lvmpolld_store *) malloc(sizeof(struct lvmpolld_store)); if (!pdst) return NULL; @@ -212,7 +212,7 @@ struct lvmpolld_store *pdst_init(const char *name) err_mutex: dm_hash_destroy(pdst->store); err_hash: - dm_free(pdst); + free(pdst); return NULL; } @@ -223,7 +223,7 @@ void pdst_destroy(struct lvmpolld_store *pdst) dm_hash_destroy(pdst->store); pthread_mutex_destroy(&pdst->lock); - dm_free(pdst); + free(pdst); } void pdst_locked_lock_all_pdlvs(const struct lvmpolld_store *pdst) @@ -321,7 +321,7 @@ void pdst_locked_destroy_all_pdlvs(const struct lvmpolld_store *pdst) struct lvmpolld_thread_data *lvmpolld_thread_data_constructor(struct lvmpolld_lv *pdlv) { - struct lvmpolld_thread_data *data = (struct lvmpolld_thread_data *) dm_malloc(sizeof(struct lvmpolld_thread_data)); + struct lvmpolld_thread_data *data = (struct lvmpolld_thread_data *) malloc(sizeof(struct lvmpolld_thread_data)); if (!data) return NULL; @@ -368,7 +368,7 @@ void lvmpolld_thread_data_destroy(void *thread_private) pdst_unlock(data->pdlv->pdst); } - /* may get reallocated in getline(). dm_free must not be used */ + /* may get reallocated in getline(). free must not be used */ free(data->line); if (data->fout && !fclose(data->fout)) @@ -389,5 +389,5 @@ void lvmpolld_thread_data_destroy(void *thread_private) if (data->errpipe[1] >= 0) (void) close(data->errpipe[1]); - dm_free(data); + free(data); } diff --git a/device_mapper/Makefile b/device_mapper/Makefile index 4036cb4..da97675 100644 --- a/device_mapper/Makefile +++ b/device_mapper/Makefile @@ -22,7 +22,6 @@ DEVICE_MAPPER_SOURCE=\ device_mapper/libdm-string.c \ device_mapper/libdm-targets.c \ device_mapper/libdm-timestamp.c \ - device_mapper/mm/dbg_malloc.c \ device_mapper/mm/pool.c \ device_mapper/regex/matcher.c \ device_mapper/regex/parse_rx.c \ diff --git a/device_mapper/all.h b/device_mapper/all.h index f7ff4ce..b1d5a8c 100644 --- a/device_mapper/all.h +++ b/device_mapper/all.h @@ -33,8 +33,6 @@ #include "base/data-struct/list.h" -#include "base/data-struct/list.h" - #ifndef __GNUC__ # define __typeof__ typeof #endif @@ -826,7 +824,7 @@ int dm_stats_get_region_nr_histogram_bins(const struct dm_stats *dms, * * On sucess a pointer to the struct dm_histogram representing the * bounds values is returned, or NULL in the case of error. The returned - * pointer should be freed using dm_free() when no longer required. + * pointer should be freed using free() when no longer required. */ struct dm_histogram *dm_histogram_bounds_from_string(const char *bounds_str); @@ -1325,7 +1323,7 @@ int dm_stats_get_group_descriptor(const struct dm_stats *dms, * On success the function returns a pointer to an array of uint64_t * containing the IDs of the newly created regions. The region_id * array is terminated by the value DM_STATS_REGION_NOT_PRESENT and - * should be freed using dm_free() when no longer required. + * should be freed using free() when no longer required. * * On error NULL is returned. * @@ -1357,7 +1355,7 @@ uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd, * regions that were not modified by the call). * * The region_id array is terminated by the special value - * DM_STATS_REGION_NOT_PRESENT and should be freed using dm_free() + * DM_STATS_REGION_NOT_PRESENT and should be freed using free() * when no longer required. * * On error NULL is returned. @@ -1478,7 +1476,7 @@ dm_string_mangling_t dm_get_name_mangling_mode(void); /* * Get mangled/unmangled form of the device-mapper name or uuid * irrespective of the global setting (set by dm_set_name_mangling_mode). - * The name or uuid returned needs to be freed after use by calling dm_free! + * The name or uuid returned needs to be freed after use by calling free! */ char *dm_task_get_name_mangled(const struct dm_task *dmt); char *dm_task_get_name_unmangled(const struct dm_task *dmt); @@ -2070,35 +2068,7 @@ uint32_t dm_tree_get_cookie(struct dm_tree_node *node); * Library functions *****************************************************************************/ -/******************* - * Memory management - *******************/ - -/* - * Never use these functions directly - use the macros following instead. - */ -void *dm_malloc_wrapper(size_t s, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -void *dm_malloc_aligned_wrapper(size_t s, size_t a, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -void *dm_zalloc_wrapper(size_t s, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -void *dm_realloc_wrapper(void *p, unsigned int s, const char *file, int line) - __attribute__((__warn_unused_result__)); -void dm_free_wrapper(void *ptr); -char *dm_strdup_wrapper(const char *s, const char *file, int line) - __attribute__((__warn_unused_result__)); -int dm_dump_memory_wrapper(void); -void dm_bounds_check_wrapper(void); - -#define dm_malloc(s) dm_malloc_wrapper((s), __FILE__, __LINE__) -#define dm_malloc_aligned(s, a) dm_malloc_aligned_wrapper((s), (a), __FILE__, __LINE__) -#define dm_zalloc(s) dm_zalloc_wrapper((s), __FILE__, __LINE__) -#define dm_strdup(s) dm_strdup_wrapper((s), __FILE__, __LINE__) -#define dm_free(p) dm_free_wrapper(p) -#define dm_realloc(p, s) dm_realloc_wrapper((p), (s), __FILE__, __LINE__) -#define dm_dump_memory() dm_dump_memory_wrapper() -#define dm_bounds_check() dm_bounds_check_wrapper() +#define malloc_aligned(s, a) malloc_aligned_wrapper((s), (a), __FILE__, __LINE__) /* * The pool allocator is useful when you are going to allocate @@ -2265,7 +2235,7 @@ int dm_bit_get_prev(dm_bitset_t bs, int last_bit); * notation used is identical to the kernel bitmap parser (cpuset etc.) * and supports both lists ("1,2,3") and ranges ("1-2,5-8"). If the mem * parameter is NULL memory for the bitset will be allocated using - * dm_malloc(). Otherwise the bitset will be allocated using the supplied + * malloc(). Otherwise the bitset will be allocated using the supplied * dm_pool. */ dm_bitset_t dm_bitset_parse_list(const char *str, struct dm_pool *mem, @@ -2557,7 +2527,7 @@ int dm_is_empty_dir(const char *dir); int dm_fclose(FILE *stream); /* - * Returns size of a buffer which is allocated with dm_malloc. + * Returns size of a buffer which is allocated with malloc. * Pointer to the buffer is stored in *buf. * Returns -1 on failure leaving buf undefined. */ diff --git a/device_mapper/datastruct/bitset.c b/device_mapper/datastruct/bitset.c index f093ac0..fc2c3c3 100644 --- a/device_mapper/datastruct/bitset.c +++ b/device_mapper/datastruct/bitset.c @@ -14,6 +14,7 @@ */ #include "device_mapper/misc/dmlib.h" +#include "base/memory/zalloc.h" #include <ctype.h> @@ -29,7 +30,7 @@ dm_bitset_t dm_bitset_create(struct dm_pool *mem, unsigned num_bits) if (mem) bs = dm_pool_zalloc(mem, size); else - bs = dm_zalloc(size); + bs = zalloc(size); if (!bs) return NULL; @@ -41,7 +42,7 @@ dm_bitset_t dm_bitset_create(struct dm_pool *mem, unsigned num_bits) void dm_bitset_destroy(dm_bitset_t bs) { - dm_free(bs); + free(bs); } int dm_bitset_equal(dm_bitset_t in1, dm_bitset_t in2) diff --git a/device_mapper/datastruct/hash.c b/device_mapper/datastruct/hash.c index 59e719b..f16508a 100644 --- a/device_mapper/datastruct/hash.c +++ b/device_mapper/datastruct/hash.c @@ -14,6 +14,7 @@ */ #include "device_mapper/misc/dmlib.h" +#include "base/memory/zalloc.h" struct dm_hash_node { struct dm_hash_node *next; @@ -59,7 +60,7 @@ static unsigned char _nums[] = { static struct dm_hash_node *_create_node(const char *str, unsigned len) { - struct dm_hash_node *n = dm_malloc(sizeof(*n) + len); + struct dm_hash_node *n = malloc(sizeof(*n) + len); if (n) { memcpy(n->key, str, len); @@ -91,7 +92,7 @@ struct dm_hash_table *dm_hash_create(unsigned size_hint) { size_t len; unsigned new_size = 16u; - struct dm_hash_table *hc = dm_zalloc(sizeof(*hc)); + struct dm_hash_table *hc = zalloc(sizeof(*hc)); if (!hc) return_0; @@ -102,14 +103,14 @@ struct dm_hash_table *dm_hash_create(unsigned size_hint) hc->num_slots = new_size; len = sizeof(*(hc->slots)) * new_size; - if (!(hc->slots = dm_zalloc(len))) + if (!(hc->slots = zalloc(len))) goto_bad; return hc; bad: - dm_free(hc->slots); - dm_free(hc); + free(hc->slots); + free(hc); return 0; } @@ -121,15 +122,15 @@ static void _free_nodes(struct dm_hash_table *t) for (i = 0; i < t->num_slots; i++) for (c = t->slots[i]; c; c = n) { n = c->next; - dm_free(c); + free(c); } } void dm_hash_destroy(struct dm_hash_table *t) { _free_nodes(t); - dm_free(t->slots); - dm_free(t); + free(t->slots); + free(t); } static struct dm_hash_node **_find(struct dm_hash_table *t, const void *key, @@ -187,7 +188,7 @@ void dm_hash_remove_binary(struct dm_hash_table *t, const void *key, if (*c) { struct dm_hash_node *old = *c; *c = (*c)->next; - dm_free(old); + free(old); t->num_nodes--; } } @@ -287,7 +288,7 @@ void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key, if (c && *c) { struct dm_hash_node *old = *c; *c = (*c)->next; - dm_free(old); + free(old); t->num_nodes--; } } diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c index 3e1b445..bec7f0f 100644 --- a/device_mapper/ioctl/libdm-iface.c +++ b/device_mapper/ioctl/libdm-iface.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "device_mapper/misc/dmlib.h" #include "device_mapper/ioctl/libdm-targets.h" #include "device_mapper/libdm-common.h" @@ -467,7 +468,7 @@ static void _dm_zfree_string(char *string) { if (string) { memset(string, 0, strlen(string)); - dm_free(string); + free(string); } } @@ -475,7 +476,7 @@ static void _dm_zfree_dmi(struct dm_ioctl *dmi) { if (dmi) { memset(dmi, 0, dmi->data_size); - dm_free(dmi); + free(dmi); } } @@ -486,8 +487,8 @@ static void _dm_task_free_targets(struct dm_task *dmt) for (t = dmt->head; t; t = n) { n = t->next; _dm_zfree_string(t->params); - dm_free(t->type); - dm_free(t); + free(t->type); + free(t); } dmt->head = dmt->tail = NULL; @@ -497,14 +498,14 @@ void dm_task_destroy(struct dm_task *dmt) { _dm_task_free_targets(dmt); _dm_zfree_dmi(dmt->dmi.v4); - dm_free(dmt->dev_name); - dm_free(dmt->mangled_dev_name); - dm_free(dmt->newname); - dm_free(dmt->message); - dm_free(dmt->geometry); - dm_free(dmt->uuid); - dm_free(dmt->mangled_uuid); - dm_free(dmt); + free(dmt->dev_name); + free(dmt->mangled_dev_name); + free(dmt->newname); + free(dmt->message); + free(dmt->geometry); + free(dmt->uuid); + free(dmt->mangled_uuid); + free(dmt); } /* @@ -852,8 +853,8 @@ int dm_task_set_newuuid(struct dm_task *dmt, const char *newuuid) newuuid = mangled_uuid; } - dm_free(dmt->newname); - if (!(dmt->newname = dm_strdup(newuuid))) { + free(dmt->newname); + if (!(dmt->newname = strdup(newuuid))) { log_error("dm_task_set_newuuid: strdup(%s) failed", newuuid); return 0; } @@ -864,8 +865,8 @@ int dm_task_set_newuuid(struct dm_task *dmt, const char *newuuid) int dm_task_set_message(struct dm_task *dmt, const char *message) { - dm_free(dmt->message); - if (!(dmt->message = dm_strdup(message))) { + free(dmt->message); + if (!(dmt->message = strdup(message))) { log_error("dm_task_set_message: strdup failed"); return 0; } @@ -883,7 +884,7 @@ int dm_task_set_sector(struct dm_task *dmt, uint64_t sector) int dm_task_set_geometry(struct dm_task *dmt, const char *cylinders, const char *heads, const char *sectors, const char *start) { - dm_free(dmt->geometry); + free(dmt->geometry); if (dm_asprintf(&(dmt->geometry), "%s %s %s %s", cylinders, heads, sectors, start) < 0) { log_error("dm_task_set_geometry: sprintf failed"); @@ -977,18 +978,18 @@ struct target *create_target(uint64_t start, uint64_t len, const char *type, return NULL; } - if (!(t = dm_zalloc(sizeof(*t)))) { + if (!(t = zalloc(sizeof(*t)))) { log_error("create_target: malloc(%" PRIsize_t ") failed", sizeof(*t)); return NULL; } - if (!(t->params = dm_strdup(params))) { + if (!(t->params = strdup(params))) { log_error("create_target: strdup(params) failed"); goto bad; } - if (!(t->type = dm_strdup(type))) { + if (!(t->type = strdup(type))) { log_error("create_target: strdup(type) failed"); goto bad; } @@ -999,8 +1000,8 @@ struct target *create_target(uint64_t start, uint64_t len, const char *type, bad: _dm_zfree_string(t->params); - dm_free(t->type); - dm_free(t); + free(t->type); + free(t); return NULL; } @@ -1168,7 +1169,7 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count) while (repeat_count--) len *= 2; - if (!(dmi = dm_zalloc(len))) + if (!(dmi = zalloc(len))) return NULL; version = &_cmd_data_v4[dmt->type].version; @@ -1463,9 +1464,9 @@ static int _create_and_load_v4(struct dm_task *dmt) /* Use the original structure last so the info will be correct */ dmt->type = DM_DEVICE_RESUME; - dm_free(dmt->uuid); + free(dmt->uuid); dmt->uuid = NULL; - dm_free(dmt->mangled_uuid); + free(dmt->mangled_uuid); dmt->mangled_uuid = NULL; if (dm_task_run(dmt)) @@ -1473,9 +1474,9 @@ static int _create_and_load_v4(struct dm_task *dmt) revert: dmt->type = DM_DEVICE_REMOVE; - dm_free(dmt->uuid); + free(dmt->uuid); dmt->uuid = NULL; - dm_free(dmt->mangled_uuid); + free(dmt->mangled_uuid); dmt->mangled_uuid = NULL; /* @@ -2141,7 +2142,6 @@ void dm_lib_exit(void) dm_bitset_destroy(_dm_bitset); _dm_bitset = NULL; dm_pools_check_leaks(); - dm_dump_memory(); _version_ok = 1; _version_checked = 0; } diff --git a/device_mapper/libdm-common.c b/device_mapper/libdm-common.c index bcf12cb..d46d4b0 100644 --- a/device_mapper/libdm-common.c +++ b/device_mapper/libdm-common.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "device_mapper/misc/dmlib.h" #include "ioctl/libdm-targets.h" #include "libdm-common.h" @@ -308,7 +309,7 @@ dm_string_mangling_t dm_get_name_mangling_mode(void) struct dm_task *dm_task_create(int type) { - struct dm_task *dmt = dm_zalloc(sizeof(*dmt)); + struct dm_task *dmt = zalloc(sizeof(*dmt)); if (!dmt) { log_error("dm_task_create: malloc(%" PRIsize_t ") failed", @@ -317,7 +318,7 @@ struct dm_task *dm_task_create(int type) } if (!dm_check_version()) { - dm_free(dmt); + free(dmt); return_NULL; } @@ -562,9 +563,9 @@ static int _dm_task_set_name(struct dm_task *dmt, const char *name, char mangled_name[DM_NAME_LEN]; int r = 0; - dm_free(dmt->dev_name); + free(dmt->dev_name); dmt->dev_name = NULL; - dm_free(dmt->mangled_dev_name); + free(dmt->mangled_dev_name); dmt->mangled_dev_name = NULL; if (strlen(name) >= DM_NAME_LEN) { @@ -587,13 +588,13 @@ static int _dm_task_set_name(struct dm_task *dmt, const char *name, log_debug_activation("Device name mangled [%s]: %s --> %s", mangling_mode == DM_STRING_MANGLING_AUTO ? "auto" : "hex", name, mangled_name); - if (!(dmt->mangled_dev_name = dm_strdup(mangled_name))) { - log_error("_dm_task_set_name: dm_strdup(%s) failed", mangled_name); + if (!(dmt->mangled_dev_name = strdup(mangled_name))) { + log_error("_dm_task_set_name: strdup(%s) failed", mangled_name); return 0; } } - if (!(dmt->dev_name = dm_strdup(name))) { + if (!(dmt->dev_name = strdup(name))) { log_error("_dm_task_set_name: strdup(%s) failed", name); return 0; } @@ -689,8 +690,8 @@ static char *_task_get_string_mangled(const char *str, const char *str_name, if ((r = mangle_string(str, str_name, strlen(str), buf, buf_size, mode)) < 0) return NULL; - if (!(rs = r ? dm_strdup(buf) : dm_strdup(str))) - log_error("_task_get_string_mangled: dm_strdup failed"); + if (!(rs = r ? strdup(buf) : strdup(str))) + log_error("_task_get_string_mangled: strdup failed"); return rs; } @@ -710,8 +711,8 @@ static char *_task_get_string_unmangled(const char *str, const char *str_name, (r = unmangle_string(str, str_name, strlen(str), buf, buf_size, mode)) < 0) return NULL; - if (!(rs = r ? dm_strdup(buf) : dm_strdup(str))) - log_error("_task_get_string_unmangled: dm_strdup failed"); + if (!(rs = r ? strdup(buf) : strdup(str))) + log_error("_task_get_string_unmangled: strdup failed"); return rs; } @@ -807,8 +808,8 @@ int dm_task_set_newname(struct dm_task *dmt, const char *newname) newname = mangled_name; } - dm_free(dmt->newname); - if (!(dmt->newname = dm_strdup(newname))) { + free(dmt->newname); + if (!(dmt->newname = strdup(newname))) { log_error("dm_task_set_newname: strdup(%s) failed", newname); return 0; } @@ -824,9 +825,9 @@ int dm_task_set_uuid(struct dm_task *dmt, const char *uuid) dm_string_mangling_t mangling_mode = dm_get_name_mangling_mode(); int r = 0; - dm_free(dmt->uuid); + free(dmt->uuid); dmt->uuid = NULL; - dm_free(dmt->mangled_uuid); + free(dmt->mangled_uuid); dmt->mangled_uuid = NULL; if (!check_multiple_mangled_string_allowed(uuid, "UUID", mangling_mode)) @@ -844,13 +845,13 @@ int dm_task_set_uuid(struct dm_task *dmt, const char *uuid) mangling_mode == DM_STRING_MANGLING_AUTO ? "auto" : "hex", uuid, mangled_uuid); - if (!(dmt->mangled_uuid = dm_strdup(mangled_uuid))) { - log_error("dm_task_set_uuid: dm_strdup(%s) failed", mangled_uuid); + if (!(dmt->mangled_uuid = strdup(mangled_uuid))) { + log_error("dm_task_set_uuid: strdup(%s) failed", mangled_uuid); return 0; } } - if (!(dmt->uuid = dm_strdup(uuid))) { + if (!(dmt->uuid = strdup(uuid))) { log_error("dm_task_set_uuid: strdup(%s) failed", uuid); return 0; } @@ -1458,7 +1459,7 @@ static void _del_node_op(struct node_op_parms *nop) { _count_node_ops[nop->type]--; dm_list_del(&nop->list); - dm_free(nop); + free(nop); } @@ -1562,7 +1563,7 @@ static int _stack_node_op(node_op_t type, const char *dev_name, uint32_t major, warn_if_udev_failed = 0; } - if (!(nop = dm_malloc(sizeof(*nop) + len))) { + if (!(nop = malloc(sizeof(*nop) + len))) { log_error("Insufficient memory to stack mknod operation"); return 0; } @@ -1828,8 +1829,8 @@ static int _sysfs_get_dm_name(uint32_t major, uint32_t minor, char *buf, size_t int r = 0; size_t len; - if (!(sysfs_path = dm_malloc(PATH_MAX)) || - !(temp_buf = dm_malloc(PATH_MAX))) { + if (!(sysfs_path = malloc(PATH_MAX)) || + !(temp_buf = malloc(PATH_MAX))) { log_error("_sysfs_get_dm_name: failed to allocate temporary buffers"); goto bad; } @@ -1867,8 +1868,8 @@ bad: if (fp && fclose(fp)) log_sys_error("fclose", sysfs_path); - dm_free(temp_buf); - dm_free(sysfs_path); + free(temp_buf); + free(sysfs_path); return r; } @@ -1880,8 +1881,8 @@ static int _sysfs_get_kernel_name(uint32_t major, uint32_t minor, char *buf, siz size_t len; int r = 0; - if (!(sysfs_path = dm_malloc(PATH_MAX)) || - !(temp_buf = dm_malloc(PATH_MAX))) { + if (!(sysfs_path = malloc(PATH_MAX)) || + !(temp_buf = malloc(PATH_MAX))) { log_error("_sysfs_get_kernel_name: failed to allocate temporary buffers"); goto bad; } @@ -1916,8 +1917,8 @@ static int _sysfs_get_kernel_name(uint32_t major, uint32_t minor, char *buf, siz strcpy(buf, name); r = 1; bad: - dm_free(temp_buf); - dm_free(sysfs_path); + free(temp_buf); + free(sysfs_path); return r; } diff --git a/device_mapper/libdm-config.c b/device_mapper/libdm-config.c index fd4d929..0928843 100644 --- a/device_mapper/libdm-config.c +++ b/device_mapper/libdm-config.c @@ -269,11 +269,11 @@ static int _line_append(struct config_output *out, const char *fmt, ...) if (!dm_pool_grow_object(out->mem, dyn_buf ? : buf, 0)) { log_error("dm_pool_grow_object failed for config line"); - dm_free(dyn_buf); + free(dyn_buf); return 0; } - dm_free(dyn_buf); + free(dyn_buf); return 1; } @@ -1441,12 +1441,12 @@ static int _enumerate(const char *path, struct dm_config_node *cn, int (*cb)(con } else if (!cb(sub, cn, baton)) goto_bad; - dm_free(sub); + free(sub); cn = cn->sib; } return 1; bad: - dm_free(sub); + free(sub); return 0; } diff --git a/device_mapper/libdm-deptree.c b/device_mapper/libdm-deptree.c index fab3e06..d177374 100644 --- a/device_mapper/libdm-deptree.c +++ b/device_mapper/libdm-deptree.c @@ -19,6 +19,7 @@ #include "misc/dm-ioctl.h" #include <stdarg.h> +#include <string.h> #include <sys/param.h> #include <sys/utsname.h> @@ -2660,7 +2661,7 @@ static int _emit_segment(struct dm_task *dmt, uint32_t major, uint32_t minor, int ret; do { - if (!(params = dm_malloc(paramsize))) { + if (!(params = malloc(paramsize))) { log_error("Insufficient space for target parameters."); return 0; } @@ -2668,7 +2669,7 @@ static int _emit_segment(struct dm_task *dmt, uint32_t major, uint32_t minor, params[0] = '\0'; ret = _emit_segment_line(dmt, major, minor, seg, seg_start, params, paramsize); - dm_free(params); + free(params); if (!ret) stack; diff --git a/device_mapper/libdm-file.c b/device_mapper/libdm-file.c index 5c6d223..096c796 100644 --- a/device_mapper/libdm-file.c +++ b/device_mapper/libdm-file.c @@ -45,7 +45,7 @@ static int _create_dir_recursive(const char *dir) log_verbose("Creating directory \"%s\"", dir); /* Create parent directories */ - orig = s = dm_strdup(dir); + orig = s = strdup(dir); if (!s) { log_error("Failed to duplicate directory name."); return 0; @@ -84,7 +84,7 @@ static int _create_dir_recursive(const char *dir) r = 1; out: - dm_free(orig); + free(orig); return r; } diff --git a/device_mapper/libdm-report.c b/device_mapper/libdm-report.c index 3a48c3f..e437e4c 100644 --- a/device_mapper/libdm-report.c +++ b/device_mapper/libdm-report.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "misc/dmlib.h" #include <ctype.h> @@ -477,8 +478,8 @@ static int _report_field_string_list(struct dm_report *rh, } /* more than one item - sort the list */ - if (!(arr = dm_malloc(sizeof(struct str_list_sort_item) * list_size))) { - log_error("dm_report_field_string_list: dm_malloc failed"); + if (!(arr = malloc(sizeof(struct str_list_sort_item) * list_size))) { + log_error("dm_report_field_string_list: malloc failed"); goto out; } @@ -547,7 +548,7 @@ static int _report_field_string_list(struct dm_report *rh, out: if (!r && sort_value) dm_pool_free(rh->mem, sort_value); - dm_free(arr); + free(arr); return r; } @@ -1257,8 +1258,8 @@ struct dm_report *dm_report_init(uint32_t *report_types, if (_contains_reserved_report_type(types)) return_NULL; - if (!(rh = dm_zalloc(sizeof(*rh)))) { - log_error("dm_report_init: dm_malloc failed"); + if (!(rh = zalloc(sizeof(*rh)))) { + log_error("dm_report_init: malloc failed"); return NULL; } @@ -1300,7 +1301,7 @@ struct dm_report *dm_report_init(uint32_t *report_types, if (!(rh->mem = dm_pool_create("report", 10 * 1024))) { log_error("dm_report_init: allocation of memory pool failed"); - dm_free(rh); + free(rh); return NULL; } @@ -1348,7 +1349,7 @@ void dm_report_free(struct dm_report *rh) if (rh->value_cache) dm_hash_destroy(rh->value_cache); dm_pool_destroy(rh->mem); - dm_free(rh); + free(rh); } static char *_toupperstr(char *str) @@ -2732,7 +2733,7 @@ static const char *_tok_value_string_list(const struct dm_report_field_type *ft, goto bad; } else if (list_size == 1) goto out; - if (!(arr = dm_malloc(sizeof(item) * list_size))) { + if (!(arr = malloc(sizeof(item) * list_size))) { log_error("_tok_value_string_list: memory allocation failed for sort array"); goto bad; } @@ -2745,7 +2746,7 @@ static const char *_tok_value_string_list(const struct dm_report_field_type *ft, for (i = 0; i < list_size; i++) dm_list_add(&ssl->str_list.list, &arr[i]->list); - dm_free(arr); + free(arr); out: *end = s; if (sel_str_list) @@ -3514,8 +3515,8 @@ static struct field_selection *_create_field_selection(struct dm_report *rh, /* store comparison operand */ if (flags & FLD_CMP_REGEX) { /* REGEX */ - if (!(s = dm_malloc(len + 1))) { - log_error("dm_report: dm_malloc failed to store " + if (!(s = malloc(len + 1))) { + log_error("dm_report: malloc failed to store " "regex value for selection field %s", field_id); goto error; } @@ -3523,7 +3524,7 @@ static struct field_selection *_create_field_selection(struct dm_report *rh, s[len] = '\0'; fs->value->v.r = dm_regex_create(rh->selection->mem, (const char * const *) &s, 1); - dm_free(s); + free(s); if (!fs->value->v.r) { log_error("dm_report: failed to create regex " "matcher for selection field %s", field_id); @@ -4175,7 +4176,7 @@ static int _report_headings(struct dm_report *rh) /* Including trailing '\0'! */ buf_size++; - if (!(buf = dm_malloc(buf_size))) { + if (!(buf = malloc(buf_size))) { log_error("dm_report: Could not allocate memory for heading buffer."); goto bad; } @@ -4219,12 +4220,12 @@ static int _report_headings(struct dm_report *rh) log_print("%s", heading); dm_pool_free(rh->mem, (void *)heading); - dm_free(buf); + free(buf); return 1; bad: - dm_free(buf); + free(buf); dm_pool_abandon_object(rh->mem); return 0; } @@ -4398,24 +4399,24 @@ static int _output_field(struct dm_report *rh, struct dm_report_field *field) return 0; } } else if (rh->flags & DM_REPORT_OUTPUT_FIELD_NAME_PREFIX) { - if (!(field_id = dm_strdup(fields[field->props->field_num].id))) { + if (!(field_id = strdup(fields[field->props->field_num].id))) { log_error("dm_report: Failed to copy field name"); return 0; } if (!dm_pool_grow_object(rh->mem, rh->output_field_name_prefix, 0)) { log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); - dm_free(field_id); + free(field_id); return 0; } if (!dm_pool_grow_object(rh->mem, _toupperstr(field_id), 0)) { log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); - dm_free(field_id); + free(field_id); return 0; } - dm_free(field_id); + free(field_id); if (!dm_pool_grow_object(rh->mem, STANDARD_PAIR, 1)) { log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); @@ -4468,7 +4469,7 @@ static int _output_field(struct dm_report *rh, struct dm_report_field *field) /* Including trailing '\0'! */ buf_size = width + 1; - if (!(buf = dm_malloc(buf_size))) { + if (!(buf = malloc(buf_size))) { log_error("dm_report: Could not allocate memory for output line buffer."); return 0; } @@ -4510,11 +4511,11 @@ static int _output_field(struct dm_report *rh, struct dm_report_field *field) } } - dm_free(buf); + free(buf); return 1; bad: - dm_free(buf); + free(buf); return 0; } diff --git a/device_mapper/libdm-stats.c b/device_mapper/libdm-stats.c index 6cd08a7..219d393 100644 --- a/device_mapper/libdm-stats.c +++ b/device_mapper/libdm-stats.c @@ -15,6 +15,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "misc/dmlib.h" #include "misc/kdev_t.h" @@ -156,7 +157,7 @@ static char *_program_id_from_proc(void) if (fclose(comm)) stack; - return dm_strdup(buf); + return strdup(buf); } static uint64_t _nr_areas(uint64_t len, uint64_t step) @@ -184,12 +185,12 @@ struct dm_stats *dm_stats_create(const char *program_id) size_t group_hint = sizeof(struct dm_stats_group); struct dm_stats *dms = NULL; - if (!(dms = dm_zalloc(sizeof(*dms)))) + if (!(dms = zalloc(sizeof(*dms)))) return_NULL; /* FIXME: better hint. */ if (!(dms->mem = dm_pool_create("stats_pool", 4096))) { - dm_free(dms); + free(dms); return_NULL; } @@ -202,7 +203,7 @@ struct dm_stats *dm_stats_create(const char *program_id) if (!program_id || !strlen(program_id)) dms->program_id = _program_id_from_proc(); else - dms->program_id = dm_strdup(program_id); + dms->program_id = strdup(program_id); if (!dms->program_id) { log_error("Could not allocate memory for program_id"); @@ -235,7 +236,7 @@ bad: dm_pool_destroy(dms->hist_mem); if (dms->group_mem) dm_pool_destroy(dms->group_mem); - dm_free(dms); + free(dms); return NULL; } @@ -325,15 +326,15 @@ static void _stats_region_destroy(struct dm_stats_region *region) * dropped from the pool along with the corresponding * regions table. * - * The following objects are all allocated with dm_malloc. + * The following objects are all allocated with malloc. */ region->counters = NULL; region->bounds = NULL; - dm_free(region->program_id); + free(region->program_id); region->program_id = NULL; - dm_free(region->aux_data); + free(region->aux_data); region->aux_data = NULL; region->region_id = DM_STATS_REGION_NOT_PRESENT; } @@ -364,7 +365,7 @@ static void _stats_group_destroy(struct dm_stats_group *group) group->histogram = NULL; if (group->alias) { - dm_free((char *) group->alias); + free((char *) group->alias); group->alias = NULL; } if (group->regions) { @@ -414,7 +415,7 @@ static void _stats_clear_binding(struct dm_stats *dms) dm_pool_free(dms->mem, dms->bind_name); if (dms->bind_uuid) dm_pool_free(dms->mem, dms->bind_uuid); - dm_free((char *) dms->name); + free((char *) dms->name); dms->bind_name = dms->bind_uuid = NULL; dms->bind_major = dms->bind_minor = -1; @@ -534,7 +535,7 @@ static void *_get_hist_arg(struct dm_histogram *bounds, uint64_t scale, *len = hist_len; - return dm_zalloc(hist_len); + return zalloc(hist_len); } static char *_build_histogram_arg(struct dm_histogram *bounds, int *precise) @@ -587,7 +588,7 @@ static char *_build_histogram_arg(struct dm_histogram *bounds, int *precise) bad: log_error("Could not build histogram arguments."); - dm_free(hist_arg); + free(hist_arg); return NULL; } @@ -634,7 +635,7 @@ static int _stats_set_name_cache(struct dm_stats *dms) if (!dm_task_run(dmt)) goto_bad; - if (!(dms->name = dm_strdup(dm_task_get_name(dmt)))) + if (!(dms->name = strdup(dm_task_get_name(dmt)))) goto_bad; dm_task_destroy(dmt); @@ -759,7 +760,7 @@ static int _parse_aux_data_group(struct dm_stats *dms, group->regions = regions; group->alias = NULL; if (strlen(alias)) { - group->alias = dm_strdup(alias); + group->alias = strdup(alias); if (!group->alias) { log_error("Could not allocate memory for group alias"); goto bad; @@ -768,16 +769,16 @@ static int _parse_aux_data_group(struct dm_stats *dms, /* separate group tag from user aux_data */ if ((strlen(end) > 1) || strncmp(end, "-", 1)) - c = dm_strdup(end); + c = strdup(end); else - c = dm_strdup(""); + c = strdup(""); if (!c) { log_error("Could not allocate memory for user aux_data"); goto bad_alias; } - dm_free(region->aux_data); + free(region->aux_data); region->aux_data = c; log_debug("Found group_id " FMTu64 ": alias=\"%s\"", group->group_id, @@ -786,7 +787,7 @@ static int _parse_aux_data_group(struct dm_stats *dms, return 1; bad_alias: - dm_free((char *) group->alias); + free((char *) group->alias); bad: dm_bitset_destroy(regions); return 0; @@ -971,10 +972,10 @@ static int _stats_parse_list_region(struct dm_stats *dms, region->group_id = DM_STATS_GROUP_NOT_PRESENT; - if (!(region->program_id = dm_strdup(program_id))) + if (!(region->program_id = strdup(program_id))) return_0; - if (!(region->aux_data = dm_strdup(aux_data))) { - dm_free(region->program_id); + if (!(region->aux_data = strdup(aux_data))) { + free(region->program_id); return_0; } @@ -1843,7 +1844,7 @@ static char *_build_group_tag(struct dm_stats *dms, uint64_t group_id) buflen += DMS_GROUP_TAG_LEN; buflen += 1 + (alias ? strlen(alias) : 0); /* 'alias:' */ - buf = aux_string = dm_malloc(buflen); + buf = aux_string = malloc(buflen); if (!buf) { log_error("Could not allocate memory for aux_data string."); return NULL; @@ -1869,7 +1870,7 @@ static char *_build_group_tag(struct dm_stats *dms, uint64_t group_id) return aux_string; bad: log_error("Could not format group aux_data."); - dm_free(aux_string); + free(aux_string); return NULL; } @@ -1906,14 +1907,14 @@ static int _stats_set_aux(struct dm_stats *dms, if (!(dmt = _stats_send_message(dms, msg))) goto_bad; - dm_free((char *) group_tag); + free((char *) group_tag); /* no response to a @stats_set_aux message */ dm_task_destroy(dmt); return 1; bad: - dm_free((char *) group_tag); + free((char *) group_tag); return 0; } @@ -1970,7 +1971,7 @@ static int _stats_create_region(struct dm_stats *dms, uint64_t *region_id, return 0; } } else - opt_args = dm_strdup(""); + opt_args = strdup(""); if (dm_snprintf(msg, sizeof(msg), "@stats_create %s %s" FMTu64 " %s %s %s", (start || len) ? range : "-", @@ -1978,7 +1979,7 @@ static int _stats_create_region(struct dm_stats *dms, uint64_t *region_id, (uint64_t)llabs(step), opt_args, program_id, aux_data) < 0) { log_error(err_fmt, "message"); - dm_free((void *) opt_args); + free((void *) opt_args); return 0; } @@ -2003,7 +2004,7 @@ static int _stats_create_region(struct dm_stats *dms, uint64_t *region_id, out: if (dmt) dm_task_destroy(dmt); - dm_free((void *) opt_args); + free((void *) opt_args); return r; } @@ -2028,7 +2029,7 @@ int dm_stats_create_region(struct dm_stats *dms, uint64_t *region_id, r = _stats_create_region(dms, region_id, start, len, step, precise, hist_arg, program_id, user_data); - dm_free(hist_arg); + free(hist_arg); out: return r; @@ -2398,9 +2399,9 @@ void dm_stats_destroy(struct dm_stats *dms) dm_pool_destroy(dms->mem); dm_pool_destroy(dms->hist_mem); dm_pool_destroy(dms->group_mem); - dm_free(dms->program_id); - dm_free((char *) dms->name); - dm_free(dms); + free(dms->program_id); + free((char *) dms->name); + free(dms); } /* @@ -2995,9 +2996,9 @@ int dm_stats_set_program_id(struct dm_stats *dms, int allow_empty, if (!program_id) program_id = ""; - dm_free(dms->program_id); + free(dms->program_id); - if (!(dms->program_id = dm_strdup(program_id))) + if (!(dms->program_id = strdup(program_id))) return_0; return 1; @@ -3215,7 +3216,7 @@ int dm_stats_set_alias(struct dm_stats *dms, uint64_t group_id, const char *alia group = &dms->groups[group_id]; old_alias = group->alias; - group->alias = dm_strdup(alias); + group->alias = strdup(alias); if (!group->alias) { log_error("Could not allocate memory for alias."); goto bad; @@ -3226,12 +3227,12 @@ int dm_stats_set_alias(struct dm_stats *dms, uint64_t group_id, const char *alia goto bad; } - dm_free((char *) old_alias); + free((char *) old_alias); return 1; bad: - dm_free((char *) group->alias); + free((char *) group->alias); group->alias = old_alias; return 0; } @@ -3492,7 +3493,7 @@ static struct dm_histogram *_alloc_dm_histogram(int nr_bins) /* Allocate space for dm_histogram + nr_entries. */ size_t size = sizeof(struct dm_histogram) + (unsigned) nr_bins * sizeof(struct dm_histogram_bin); - return dm_zalloc(size); + return zalloc(size); } /* @@ -3595,7 +3596,7 @@ struct dm_histogram *dm_histogram_bounds_from_string(const char *bounds_str) badchar: log_error("Invalid character in histogram: %c", *c); bad: - dm_free(dmh); + free(dmh); return NULL; } @@ -3646,8 +3647,8 @@ void dm_histogram_bounds_destroy(struct dm_histogram *bounds) (void *) bounds); stack; } - /* dm_free() expects a (void *). */ - dm_free((void *) bounds); + /* free() expects a (void *). */ + free((void *) bounds); } /* @@ -3897,7 +3898,7 @@ static int _stats_create_group(struct dm_stats *dms, dm_bitset_t regions, group->regions = regions; if (alias) - group->alias = dm_strdup(alias); + group->alias = strdup(alias); else group->alias = NULL; @@ -4231,7 +4232,7 @@ static int _stats_group_file_regions(struct dm_stats *dms, uint64_t *region_ids, dm_bit_set(regions, region_ids[i]); buflen = _stats_group_tag_len(dms, regions); - members = dm_malloc(buflen); + members = malloc(buflen); if (!members) { log_error("Cannot map file: failed to allocate group " @@ -4253,11 +4254,11 @@ static int _stats_group_file_regions(struct dm_stats *dms, uint64_t *region_ids, if (!_stats_create_group(dms, regions, alias, &group_id)) goto bad; - dm_free(members); + free(members); return 1; bad: dm_bitset_destroy(regions); - dm_free(members); + free(members); return 0; } @@ -4408,7 +4409,7 @@ static struct _extent *_stats_get_extents_for_file(struct dm_pool *mem, int fd, if (!dm_pool_begin_object(mem, sizeof(*extents))) return NULL; - buf = dm_zalloc(STATS_FIE_BUF_LEN); + buf = zalloc(STATS_FIE_BUF_LEN); if (!buf) { log_error("Could not allocate memory for FIEMAP buffer."); goto bad; @@ -4462,14 +4463,14 @@ static struct _extent *_stats_get_extents_for_file(struct dm_pool *mem, int fd, extents = dm_pool_end_object(mem); /* free FIEMAP buffer. */ - dm_free(buf); + free(buf); return extents; bad: *count = 0; dm_pool_abandon_object(mem); - dm_free(buf); + free(buf); return NULL; } @@ -4677,7 +4678,7 @@ static uint64_t *_stats_map_file_regions(struct dm_stats *dms, int fd, goto_out; /* make space for end-of-table marker */ - if (!(regions = dm_malloc((1 + *count) * sizeof(*regions)))) { + if (!(regions = malloc((1 + *count) * sizeof(*regions)))) { log_error("Could not allocate memory for region IDs."); goto_out; } @@ -4736,7 +4737,7 @@ static uint64_t *_stats_map_file_regions(struct dm_stats *dms, int fd, log_error("Failed to update group aux_data."); if (bounds) - dm_free(hist_arg); + free(hist_arg); /* the extent table will be empty if the file has been truncated. */ if (extents) @@ -4763,8 +4764,8 @@ out_remove: out: dm_pool_destroy(extent_mem); - dm_free(hist_arg); - dm_free(regions); + free(hist_arg); + free(regions); return NULL; } @@ -4799,7 +4800,7 @@ uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd, return regions; out: _stats_cleanup_region_ids(dms, regions, count); - dm_free(regions); + free(regions); return NULL; } @@ -4836,7 +4837,7 @@ uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, * A copy of the alias is needed to re-create the group when regroup=1. */ if (dms->groups[group_id].alias) { - alias = dm_strdup(dms->groups[group_id].alias); + alias = strdup(dms->groups[group_id].alias); if (!alias) { log_error("Failed to allocate group alias string."); return NULL; @@ -4878,15 +4879,15 @@ uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, if (!_stats_group_file_regions(dms, regions, count, alias)) goto bad; - dm_free(bounds); - dm_free((char *) alias); + free(bounds); + free((char *) alias); return regions; bad: _stats_cleanup_region_ids(dms, regions, count); - dm_free(bounds); - dm_free(regions); + free(bounds); + free(regions); out: - dm_free((char *) alias); + free((char *) alias); return NULL; } #else /* !HAVE_LINUX_FIEMAP */ diff --git a/device_mapper/libdm-string.c b/device_mapper/libdm-string.c index 8bd6c2d..62629c7 100644 --- a/device_mapper/libdm-string.c +++ b/device_mapper/libdm-string.c @@ -146,7 +146,7 @@ int dm_vasprintf(char **result, const char *format, va_list aq) { int i, n, size = 16; va_list ap; - char *buf = dm_malloc(size); + char *buf = malloc(size); *result = 0; @@ -161,20 +161,20 @@ int dm_vasprintf(char **result, const char *format, va_list aq) if (0 <= n && n < size) break; - dm_free(buf); + free(buf); /* Up to glibc 2.0.6 returns -1 */ size = (n < 0) ? size * 2 : n + 1; - if (!(buf = dm_malloc(size))) + if (!(buf = malloc(size))) return -1; } if (i > 1) { /* Reallocating more then once? */ - if (!(*result = dm_strdup(buf))) { - dm_free(buf); + if (!(*result = strdup(buf))) { + free(buf); return -1; } - dm_free(buf); + free(buf); } else *result = buf; diff --git a/device_mapper/libdm-timestamp.c b/device_mapper/libdm-timestamp.c index c2d0ad8..236cf1a 100644 --- a/device_mapper/libdm-timestamp.c +++ b/device_mapper/libdm-timestamp.c @@ -18,6 +18,7 @@ * the results of these routines should stay in-core. */ +#include "base/memory/zalloc.h" #include "misc/dmlib.h" #include <stdlib.h> @@ -53,7 +54,7 @@ struct dm_timestamp *dm_timestamp_alloc(void) { struct dm_timestamp *ts = NULL; - if (!(ts = dm_zalloc(sizeof(*ts)))) + if (!(ts = zalloc(sizeof(*ts)))) stack; return ts; @@ -101,7 +102,7 @@ struct dm_timestamp *dm_timestamp_alloc(void) { struct dm_timestamp *ts; - if (!(ts = dm_malloc(sizeof(*ts)))) + if (!(ts = malloc(sizeof(*ts)))) stack; return ts; @@ -174,5 +175,5 @@ void dm_timestamp_copy(struct dm_timestamp *ts_new, struct dm_timestamp *ts_old) void dm_timestamp_destroy(struct dm_timestamp *ts) { - dm_free(ts); + free(ts); } diff --git a/device_mapper/mm/dbg_malloc.c b/device_mapper/mm/dbg_malloc.c deleted file mode 100644 index b169f8b..0000000 --- a/device_mapper/mm/dbg_malloc.c +++ /dev/null @@ -1,413 +0,0 @@ -/* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. - * - * This file is part of the device-mapper userspace tools. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "device_mapper/misc/dmlib.h" - -#ifdef VALGRIND_POOL -#include "memcheck.h" -#endif -#include <assert.h> -#include <stdarg.h> -#include <unistd.h> - -void *dm_malloc_aux(size_t s, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -void *dm_malloc_aux_debug(size_t s, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -static void *_dm_malloc_aligned_aux(size_t s, size_t a, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -void *dm_zalloc_aux(size_t s, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -void *dm_zalloc_aux_debug(size_t s, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -void *dm_realloc_aux(void *p, unsigned int s, const char *file, int line) - __attribute__((__warn_unused_result__)); -void dm_free_aux(void *p); -char *dm_strdup_aux(const char *str, const char *file, int line) - __attribute__((__warn_unused_result__)); -int dm_dump_memory_debug(void); -void dm_bounds_check_debug(void); - -char *dm_strdup_aux(const char *str, const char *file, int line) -{ - char *ret; - - if (!str) { - log_error(INTERNAL_ERROR "dm_strdup called with NULL pointer"); - return NULL; - } - - if ((ret = dm_malloc_aux_debug(strlen(str) + 1, file, line))) - strcpy(ret, str); - - return ret; -} - -struct memblock { - struct memblock *prev, *next; /* All allocated blocks are linked */ - size_t length; /* Size of the requested block */ - int id; /* Index of the block */ - const char *file; /* File that allocated */ - int line; /* Line that allocated */ - void *magic; /* Address of this block */ -} __attribute__((aligned(8))); - -static struct { - unsigned block_serialno;/* Non-decreasing serialno of block */ - unsigned blocks_allocated; /* Current number of blocks allocated */ - unsigned blocks_max; /* Max no of concurrently-allocated blocks */ - unsigned int bytes, mbytes; - -} _mem_stats = { -0, 0, 0, 0, 0}; - -static struct memblock *_head = 0; -static struct memblock *_tail = 0; - -void *dm_malloc_aux_debug(size_t s, const char *file, int line) -{ - struct memblock *nb; - size_t tsize = s + sizeof(*nb) + sizeof(unsigned long); - - if (s > 50000000) { - log_error("Huge memory allocation (size %" PRIsize_t - ") rejected - metadata corruption?", s); - return 0; - } - - if (!(nb = malloc(tsize))) { - log_error("couldn't allocate any memory, size = %" PRIsize_t, - s); - return 0; - } - - /* set up the file and line info */ - nb->file = file; - nb->line = line; - - dm_bounds_check(); - - /* setup fields */ - nb->magic = nb + 1; - nb->length = s; - nb->id = ++_mem_stats.block_serialno; - nb->next = 0; - - /* stomp a pretty pattern across the new memory - and fill in the boundary bytes */ - { - char *ptr = (char *) (nb + 1); - size_t i; - for (i = 0; i < s; i++) - *ptr++ = i & 0x1 ? (char) 0xba : (char) 0xbe; - - for (i = 0; i < sizeof(unsigned long); i++) - *ptr++ = (char) nb->id; - } - - nb->prev = _tail; - - /* link to tail of the list */ - if (!_head) - _head = _tail = nb; - else { - _tail->next = nb; - _tail = nb; - } - - _mem_stats.blocks_allocated++; - if (_mem_stats.blocks_allocated > _mem_stats.blocks_max) - _mem_stats.blocks_max = _mem_stats.blocks_allocated; - - _mem_stats.bytes += s; - if (_mem_stats.bytes > _mem_stats.mbytes) - _mem_stats.mbytes = _mem_stats.bytes; - - /* log_debug_mem("Allocated: %u %u %u", nb->id, _mem_stats.blocks_allocated, - _mem_stats.bytes); */ -#ifdef VALGRIND_POOL - VALGRIND_MAKE_MEM_UNDEFINED(nb + 1, s); -#endif - return nb + 1; -} - -void *dm_zalloc_aux_debug(size_t s, const char *file, int line) -{ - void *ptr = dm_malloc_aux_debug(s, file, line); - - if (ptr) - memset(ptr, 0, s); - - return ptr; -} - -void dm_free_aux(void *p) -{ - char *ptr; - size_t i; - struct memblock *mb = ((struct memblock *) p) - 1; - if (!p) - return; - - dm_bounds_check(); - - /* sanity check */ - assert(mb->magic == p); -#ifdef VALGRIND_POOL - VALGRIND_MAKE_MEM_DEFINED(p, mb->length); -#endif - /* check data at the far boundary */ - ptr = (char *) p + mb->length; - for (i = 0; i < sizeof(unsigned long); i++) - if (ptr[i] != (char) mb->id) - assert(!"Damage at far end of block"); - - /* have we freed this before ? */ - assert(mb->id != 0); - - /* unlink */ - if (mb->prev) - mb->prev->next = mb->next; - else - _head = mb->next; - - if (mb->next) - mb->next->prev = mb->prev; - else - _tail = mb->prev; - - mb->id = 0; - - /* stomp a different pattern across the memory */ - ptr = p; - for (i = 0; i < mb->length; i++) - ptr[i] = i & 1 ? (char) 0xde : (char) 0xad; - - assert(_mem_stats.blocks_allocated); - _mem_stats.blocks_allocated--; - _mem_stats.bytes -= mb->length; - - /* free the memory */ - free(mb); -} - -void *dm_realloc_aux(void *p, unsigned int s, const char *file, int line) -{ - void *r; - struct memblock *mb = ((struct memblock *) p) - 1; - - r = dm_malloc_aux_debug(s, file, line); - - if (r && p) { - memcpy(r, p, mb->length); - dm_free_aux(p); - } - - return r; -} - -int dm_dump_memory_debug(void) -{ - unsigned long tot = 0; - struct memblock *mb; - char str[32]; - - if (_head) - log_very_verbose("You have a memory leak:"); - - for (mb = _head; mb; mb = mb->next) { -#ifdef VALGRIND_POOL - /* - * We can't look at the memory in case it has had - * VALGRIND_MAKE_MEM_NOACCESS called on it. - */ - str[0] = '\0'; -#else - size_t c; - - for (c = 0; c < sizeof(str) - 1; c++) { - if (c >= mb->length) - str[c] = ' '; - else if (((char *)mb->magic)[c] == '\0') - str[c] = '\0'; - else if (((char *)mb->magic)[c] < ' ') - str[c] = '?'; - else - str[c] = ((char *)mb->magic)[c]; - } - str[sizeof(str) - 1] = '\0'; -#endif - - LOG_MESG(_LOG_INFO, mb->file, mb->line, 0, - "block %d at %p, size %" PRIsize_t "\t [%s]", - mb->id, mb->magic, mb->length, str); - tot += mb->length; - } - - if (_head) - log_very_verbose("%ld bytes leaked in total", tot); - - return 1; -} - -void dm_bounds_check_debug(void) -{ - struct memblock *mb = _head; - while (mb) { - size_t i; - char *ptr = ((char *) (mb + 1)) + mb->length; - for (i = 0; i < sizeof(unsigned long); i++) - if (*ptr++ != (char) mb->id) - assert(!"Memory smash"); - - mb = mb->next; - } -} - -void *dm_malloc_aux(size_t s, const char *file __attribute__((unused)), - int line __attribute__((unused))) -{ - if (s > 50000000) { - log_error("Huge memory allocation (size %" PRIsize_t - ") rejected - metadata corruption?", s); - return 0; - } - - return malloc(s); -} - -/* Allocate size s with alignment a (or page size if 0) */ -static void *_dm_malloc_aligned_aux(size_t s, size_t a, const char *file __attribute__((unused)), - int line __attribute__((unused))) -{ - void *memptr; - int r; - - if (!a) - a = getpagesize(); - - if (s > 50000000) { - log_error("Huge memory allocation (size %" PRIsize_t - ") rejected - metadata corruption?", s); - return 0; - } - - if ((r = posix_memalign(&memptr, a, s))) { - log_error("Failed to allocate %" PRIsize_t " bytes aligned to %" PRIsize_t ": %s", s, a, strerror(r)); - return 0; - } - - return memptr; -} - -void *dm_zalloc_aux(size_t s, const char *file, int line) -{ - void *ptr = dm_malloc_aux(s, file, line); - - if (ptr) - memset(ptr, 0, s); - - return ptr; -} - -#ifdef DEBUG_MEM - -void *dm_malloc_wrapper(size_t s, const char *file, int line) -{ - return dm_malloc_aux_debug(s, file, line); -} - -void *dm_malloc_aligned_wrapper(size_t s, size_t a, const char *file, int line) -{ - /* FIXME Implement alignment when debugging - currently just ignored */ - return _dm_malloc_aux_debug(s, file, line); -} - -void *dm_zalloc_wrapper(size_t s, const char *file, int line) -{ - return dm_zalloc_aux_debug(s, file, line); -} - -char *dm_strdup_wrapper(const char *str, const char *file, int line) -{ - return dm_strdup_aux(str, file, line); -} - -void dm_free_wrapper(void *ptr) -{ - dm_free_aux(ptr); -} - -void *dm_realloc_wrapper(void *p, unsigned int s, const char *file, int line) -{ - return dm_realloc_aux(p, s, file, line); -} - -int dm_dump_memory_wrapper(void) -{ - return dm_dump_memory_debug(); -} - -void dm_bounds_check_wrapper(void) -{ - dm_bounds_check_debug(); -} - -#else /* !DEBUG_MEM */ - -void *dm_malloc_wrapper(size_t s, const char *file, int line) -{ - return dm_malloc_aux(s, file, line); -} - -void *dm_malloc_aligned_wrapper(size_t s, size_t a, const char *file, int line) -{ - return _dm_malloc_aligned_aux(s, a, file, line); -} - -void *dm_zalloc_wrapper(size_t s, const char *file, int line) -{ - return dm_zalloc_aux(s, file, line); -} - -char *dm_strdup_wrapper(const char *str, - const char *file __attribute__((unused)), - int line __attribute__((unused))) -{ - return strdup(str); -} - -void dm_free_wrapper(void *ptr) -{ - free(ptr); -} - -void *dm_realloc_wrapper(void *p, unsigned int s, - const char *file __attribute__((unused)), - int line __attribute__((unused))) -{ - return realloc(p, s); -} - -int dm_dump_memory_wrapper(void) -{ - return 1; -} - -void dm_bounds_check_wrapper(void) -{ -} - -#endif /* DEBUG_MEM */ diff --git a/device_mapper/mm/pool-debug.c b/device_mapper/mm/pool-debug.c index c523238..c9484b7 100644 --- a/device_mapper/mm/pool-debug.c +++ b/device_mapper/mm/pool-debug.c @@ -50,7 +50,7 @@ struct dm_pool { struct dm_pool *dm_pool_create(const char *name, size_t chunk_hint) { - struct dm_pool *mem = dm_zalloc(sizeof(*mem)); + struct dm_pool *mem = zalloc(sizeof(*mem)); if (!mem) { log_error("Couldn't create memory pool %s (size %" @@ -82,8 +82,8 @@ static void _free_blocks(struct dm_pool *p, struct block *b) p->stats.blocks_allocated--; n = b->next; - dm_free(b->data); - dm_free(b); + free(b->data); + free(b); b = n; } } @@ -105,7 +105,7 @@ void dm_pool_destroy(struct dm_pool *p) _pool_stats(p, "Destroying"); _free_blocks(p, p->blocks); dm_list_del(&p->list); - dm_free(p); + free(p); } void *dm_pool_alloc(struct dm_pool *p, size_t s) @@ -139,7 +139,7 @@ static struct block *_new_block(size_t s, unsigned alignment) { /* FIXME: I'm currently ignoring the alignment arg. */ size_t len = sizeof(struct block) + s; - struct block *b = dm_malloc(len); + struct block *b = malloc(len); /* * Too lazy to implement alignment for debug version, and @@ -153,9 +153,9 @@ static struct block *_new_block(size_t s, unsigned alignment) return NULL; } - if (!(b->data = dm_malloc(s))) { + if (!(b->data = malloc(s))) { log_error("Out of memory"); - dm_free(b); + free(b); return NULL; } @@ -247,8 +247,8 @@ int dm_pool_grow_object(struct dm_pool *p, const void *extra, size_t delta) if (p->object) { memcpy(new->data, p->object->data, p->object->size); - dm_free(p->object->data); - dm_free(p->object); + free(p->object->data); + free(p->object); } p->object = new; @@ -270,7 +270,7 @@ void *dm_pool_end_object(struct dm_pool *p) void dm_pool_abandon_object(struct dm_pool *p) { assert(p->begun); - dm_free(p->object); + free(p->object); p->begun = 0; p->object = NULL; } diff --git a/device_mapper/mm/pool-fast.c b/device_mapper/mm/pool-fast.c index b83c693..29bbc10 100644 --- a/device_mapper/mm/pool-fast.c +++ b/device_mapper/mm/pool-fast.c @@ -17,6 +17,7 @@ #include "memcheck.h" #endif +#include "base/memory/zalloc.h" #include "device_mapper/misc/dmlib.h" #include <stddef.h> /* For musl libc */ #include <malloc.h> @@ -48,7 +49,7 @@ static void _free_chunk(struct chunk *c); struct dm_pool *dm_pool_create(const char *name, size_t chunk_hint) { size_t new_size = 1024; - struct dm_pool *p = dm_zalloc(sizeof(*p)); + struct dm_pool *p = zalloc(sizeof(*p)); if (!p) { log_error("Couldn't create memory pool %s (size %" @@ -82,7 +83,7 @@ void dm_pool_destroy(struct dm_pool *p) pthread_mutex_lock(&_dm_pools_mutex); dm_list_del(&p->list); pthread_mutex_unlock(&_dm_pools_mutex); - dm_free(p); + free(p); } void *dm_pool_alloc(struct dm_pool *p, size_t s) @@ -281,7 +282,7 @@ static struct chunk *_new_chunk(struct dm_pool *p, size_t s) # define aligned_malloc(s) (posix_memalign((void**)&c, _pagesize, \ ALIGN_ON_PAGE(s)) == 0) #else -# define aligned_malloc(s) (c = dm_malloc(s)) +# define aligned_malloc(s) (c = malloc(s)) #endif /* DEBUG_ENFORCE_POOL_LOCKING */ if (!aligned_malloc(s)) { #undef aligned_malloc @@ -315,7 +316,7 @@ static void _free_chunk(struct chunk *c) /* since DEBUG_MEM is using own memory list */ free(c); /* for posix_memalign() */ #else - dm_free(c); + free(c); #endif } diff --git a/lib/activate/activate.c b/lib/activate/activate.c index a7e5fe3..ce67ec8 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -1514,7 +1514,7 @@ char *get_monitor_dso_path(struct cmd_context *cmd, int id) get_shared_library_path(cmd, libpath, path, sizeof(path)); - return dm_strdup(path); + return strdup(path); } static char *_build_target_uuid(struct cmd_context *cmd, const struct logical_volume *lv) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 5dd0e6f..d0e1dac 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -627,7 +627,7 @@ int device_is_usable(struct device *dev, struct dev_usable_check_params check) goto out; } - if (!(vgname = dm_strdup(name)) || + if (!(vgname = strdup(name)) || !dm_split_lvm_name(NULL, NULL, &vgname, &lvname, &layer)) goto_out; @@ -735,7 +735,7 @@ int device_is_usable(struct device *dev, struct dev_usable_check_params check) r = 1; out: - dm_free(vgname); + free(vgname); dm_task_destroy(dmt); return r; } diff --git a/lib/activate/fs.c b/lib/activate/fs.c index 6e07eda..87bc724 100644 --- a/lib/activate/fs.c +++ b/lib/activate/fs.c @@ -327,7 +327,7 @@ static void _del_fs_op(struct fs_op_parms *fsp) { _count_fs_ops[fsp->type]--; dm_list_del(&fsp->list); - dm_free(fsp); + free(fsp); } /* Check if there is other the type of fs operation stacked */ @@ -401,7 +401,7 @@ static int _stack_fs_op(fs_op_t type, const char *dev_dir, const char *vg_name, _del_fs_op(fsp); } - if (!(fsp = dm_malloc(sizeof(*fsp) + len))) { + if (!(fsp = malloc(sizeof(*fsp) + len))) { log_error("No space to stack fs operation"); return 0; } diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 774d687..86c8775 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/cache/lvmcache.h" #include "lib/commands/toolcontext.h" @@ -253,7 +254,7 @@ static void _destroy_duplicate_device_list(struct dm_list *head) dm_list_iterate_items_safe(devl, devl2, head) { dm_list_del(&devl->list); - dm_free(devl); + free(devl); } dm_list_init(head); } @@ -348,7 +349,7 @@ const struct format_type *lvmcache_fmt_from_vgname(struct cmd_context *cmd, */ dm_list_init(&devs); dm_list_iterate_items(info, &vginfo->infos) { - if (!(devl = dm_malloc(sizeof(*devl)))) { + if (!(devl = malloc(sizeof(*devl)))) { log_error("device_list element allocation failed"); return NULL; } @@ -362,7 +363,7 @@ const struct format_type *lvmcache_fmt_from_vgname(struct cmd_context *cmd, devl = dm_list_item(devh, struct device_list); label_read(devl->dev); dm_list_del(&devl->list); - dm_free(devl); + free(devl); } /* If vginfo changed, caller needs to rescan */ @@ -566,7 +567,7 @@ static void _filter_duplicate_devs(struct cmd_context *cmd) if (MAJOR(info->dev->dev) == dt->md_major) { log_debug_devs("Ignoring md component duplicate %s", dev_name(devl->dev)); dm_list_del(&devl->list); - dm_free(devl); + free(devl); } } @@ -836,7 +837,7 @@ next: dm_list_move(add_cache_devs, &alt->list); - if ((del = dm_zalloc(sizeof(*del)))) { + if ((del = zalloc(sizeof(*del)))) { del->dev = info->dev; dm_list_add(del_cache_devs, &del->list); } @@ -922,7 +923,7 @@ int lvmcache_label_rescan_vg(struct cmd_context *cmd, const char *vgname, const return 1; dm_list_iterate_items(info, &vginfo->infos) { - if (!(devl = dm_malloc(sizeof(*devl)))) { + if (!(devl = malloc(sizeof(*devl)))) { log_error("device_list element allocation failed"); return 0; } @@ -945,7 +946,7 @@ int lvmcache_label_rescan_vg(struct cmd_context *cmd, const char *vgname, const dm_list_iterate_items_safe(devl, devl2, &devs) { dm_list_del(&devl->list); - dm_free(devl); + free(devl); } if (!(vginfo = lvmcache_vginfo_from_vgname(vgname, vgid))) { @@ -1361,9 +1362,9 @@ static int _free_vginfo(struct lvmcache_vginfo *vginfo) vginfo2 = vginfo2->next; } - dm_free(vginfo->system_id); - dm_free(vginfo->vgname); - dm_free(vginfo->creation_host); + free(vginfo->system_id); + free(vginfo->vgname); + free(vginfo->creation_host); if (*vginfo->vgid && _vgid_hash && lvmcache_vginfo_from_vgid(vginfo->vgid) == vginfo) @@ -1371,7 +1372,7 @@ static int _free_vginfo(struct lvmcache_vginfo *vginfo) dm_list_del(&vginfo->list); - dm_free(vginfo); + free(vginfo); return r; } @@ -1405,7 +1406,7 @@ void lvmcache_del(struct lvmcache_info *info) info->label->labeller->ops->destroy_label(info->label->labeller, info->label); label_destroy(info->label); - dm_free(info); + free(info); } void lvmcache_del_dev(struct device *dev) @@ -1568,12 +1569,12 @@ static int _lvmcache_update_vgname(struct lvmcache_info *info, * into the hash table. */ - if (!(vginfo = dm_zalloc(sizeof(*vginfo)))) { + if (!(vginfo = zalloc(sizeof(*vginfo)))) { log_error("lvmcache_update_vgname: list alloc failed"); return 0; } - if (!(vginfo->vgname = dm_strdup(vgname))) { - dm_free(vginfo); + if (!(vginfo->vgname = strdup(vgname))) { + free(vginfo); log_error("cache vgname alloc failed for %s", vgname); return 0; } @@ -1588,8 +1589,8 @@ static int _lvmcache_update_vgname(struct lvmcache_info *info, primary_vginfo = lvmcache_vginfo_from_vgname(vgname, NULL); if (!_insert_vginfo(vginfo, vgid, vgstatus, creation_host, primary_vginfo)) { - dm_free(vginfo->vgname); - dm_free(vginfo); + free(vginfo->vgname); + free(vginfo); return 0; } @@ -1647,9 +1648,9 @@ static int _lvmcache_update_vgstatus(struct lvmcache_info *info, uint32_t vgstat info->vginfo->creation_host)) goto set_lock_type; - dm_free(info->vginfo->creation_host); + free(info->vginfo->creation_host); - if (!(info->vginfo->creation_host = dm_strdup(creation_host))) { + if (!(info->vginfo->creation_host = strdup(creation_host))) { log_error("cache creation host alloc failed for %s.", creation_host); return 0; @@ -1666,9 +1667,9 @@ set_lock_type: if (info->vginfo->lock_type && !strcmp(lock_type, info->vginfo->lock_type)) goto set_system_id; - dm_free(info->vginfo->lock_type); + free(info->vginfo->lock_type); - if (!(info->vginfo->lock_type = dm_strdup(lock_type))) { + if (!(info->vginfo->lock_type = strdup(lock_type))) { log_error("cache lock_type alloc failed for %s", lock_type); return 0; } @@ -1684,9 +1685,9 @@ set_system_id: if (info->vginfo->system_id && !strcmp(system_id, info->vginfo->system_id)) goto out; - dm_free(info->vginfo->system_id); + free(info->vginfo->system_id); - if (!(info->vginfo->system_id = dm_strdup(system_id))) { + if (!(info->vginfo->system_id = strdup(system_id))) { log_error("cache system_id alloc failed for %s", system_id); return 0; } @@ -1889,7 +1890,7 @@ static struct lvmcache_info * _create_info(struct labeller *labeller, struct dev if (!(label = label_create(labeller))) return_NULL; - if (!(info = dm_zalloc(sizeof(*info)))) { + if (!(info = zalloc(sizeof(*info)))) { log_error("lvmcache_info allocation failed"); label_destroy(label); return NULL; @@ -1965,7 +1966,7 @@ struct lvmcache_info *lvmcache_add(struct labeller *labeller, * use it. */ - if (!(devl = dm_zalloc(sizeof(*devl)))) + if (!(devl = zalloc(sizeof(*devl)))) return_NULL; devl->dev = dev; @@ -2020,8 +2021,8 @@ update_vginfo: if (created) { dm_hash_remove(_pvid_hash, pvid_s); strcpy(info->dev->pvid, ""); - dm_free(info->label); - dm_free(info); + free(info->label); + free(info); } return NULL; } @@ -2034,7 +2035,7 @@ static void _lvmcache_destroy_entry(struct lvmcache_info *info) _vginfo_detach_info(info); info->dev->pvid[0] = 0; label_destroy(info->label); - dm_free(info); + free(info); } static void _lvmcache_destroy_vgnamelist(struct lvmcache_vginfo *vginfo) diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index fc46c07..238a7f1 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -196,7 +196,7 @@ void lvmetad_set_token(const struct dm_config_value *filter) { int ft = 0; - dm_free(_lvmetad_token); + free(_lvmetad_token); while (filter && filter->type == DM_CFG_STRING) { ft = calc_crc(ft, (const uint8_t *) filter->v.str, strlen(filter->v.str)); @@ -209,7 +209,7 @@ void lvmetad_set_token(const struct dm_config_value *filter) void lvmetad_release_token(void) { - dm_free(_lvmetad_token); + free(_lvmetad_token); _lvmetad_token = NULL; } diff --git a/lib/cache_segtype/cache.c b/lib/cache_segtype/cache.c index b7119d2..ab9f942 100644 --- a/lib/cache_segtype/cache.c +++ b/lib/cache_segtype/cache.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/commands/toolcontext.h" #include "lib/metadata/segtype.h" @@ -261,7 +262,7 @@ static int _cache_pool_text_export(const struct lv_segment *seg, static void _destroy(struct segment_type *segtype) { - dm_free((void *) segtype); + free((void *) segtype); } #ifdef DEVMAPPER_SUPPORT @@ -611,7 +612,7 @@ int init_cache_segtypes(struct cmd_context *cmd, struct segtype_library *seglib) #endif { - struct segment_type *segtype = dm_zalloc(sizeof(*segtype)); + struct segment_type *segtype = zalloc(sizeof(*segtype)); if (!segtype) { log_error("Failed to allocate memory for cache_pool segtype"); @@ -626,7 +627,7 @@ int init_cache_segtypes(struct cmd_context *cmd, return_0; log_very_verbose("Initialised segtype: %s", segtype->name); - segtype = dm_zalloc(sizeof(*segtype)); + segtype = zalloc(sizeof(*segtype)); if (!segtype) { log_error("Failed to allocate memory for cache segtype"); return 0; diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 8eaece6..20a73b7 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/commands/toolcontext.h" #include "lib/metadata/metadata.h" @@ -1758,7 +1759,7 @@ void destroy_config_context(struct cmd_context *cmd) if (cmd->libmem) dm_pool_destroy(cmd->libmem); - dm_free(cmd); + free(cmd); } /* @@ -1771,7 +1772,7 @@ struct cmd_context *create_config_context(void) { struct cmd_context *cmd; - if (!(cmd = dm_zalloc(sizeof(*cmd)))) + if (!(cmd = zalloc(sizeof(*cmd)))) goto_out; strcpy(cmd->system_dir, DEFAULT_SYS_DIR); @@ -1838,7 +1839,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, init_syslog(DEFAULT_LOG_FACILITY); - if (!(cmd = dm_zalloc(sizeof(*cmd)))) { + if (!(cmd = zalloc(sizeof(*cmd)))) { log_error("Failed to allocate command context"); return NULL; } @@ -1870,7 +1871,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, #endif ) { /* Allocate 2 buffers */ - if (!(cmd->linebuffer = dm_malloc(2 * _linebuffer_size))) { + if (!(cmd->linebuffer = malloc(2 * _linebuffer_size))) { log_error("Failed to allocate line buffer."); goto out; } @@ -2062,7 +2063,7 @@ static void _destroy_dev_types(struct cmd_context *cmd) if (!cmd->dev_types) return; - dm_free(cmd->dev_types); + free(cmd->dev_types); cmd->dev_types = NULL; } @@ -2275,10 +2276,10 @@ void destroy_toolcontext(struct cmd_context *cmd) cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */ } - dm_free(cmd->linebuffer); + free(cmd->linebuffer); } #endif - dm_free(cmd); + free(cmd); lvmetad_release_token(); lvmetad_disconnect(); diff --git a/lib/config/config.c b/lib/config/config.c index c638d75..2e7e9b6 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -529,7 +529,7 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r } fb = fb + mmap_offset; } else { - if (!(buf = dm_malloc(size + size2))) { + if (!(buf = malloc(size + size2))) { log_error("Failed to allocate circular buffer."); return 0; } @@ -573,7 +573,7 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r out: if (!use_mmap) - dm_free(buf); + free(buf); else { /* unmap the file */ if (munmap(fb - mmap_offset, size + mmap_offset)) { @@ -715,8 +715,8 @@ static struct dm_config_value *_get_def_array_values(struct cmd_context *cmd, return array; } - if (!(p = token = enc_value = dm_strdup(def_enc_value))) { - log_error("_get_def_array_values: dm_strdup failed"); + if (!(p = token = enc_value = strdup(def_enc_value))) { + log_error("_get_def_array_values: strdup failed"); return NULL; } /* Proper value always starts with '#'. */ @@ -741,7 +741,7 @@ static struct dm_config_value *_get_def_array_values(struct cmd_context *cmd, if (!(v = dm_config_create_value(cft))) { log_error("Failed to create default config array value for %s.", def->name); - dm_free(enc_value); + free(enc_value); return NULL; } @@ -770,7 +770,7 @@ static struct dm_config_value *_get_def_array_values(struct cmd_context *cmd, break; case 'S': if (!(r = dm_pool_strdup(cft->mem, token + 1))) { - dm_free(enc_value); + free(enc_value); log_error("Failed to duplicate token for default " "array value of %s.", def->name); return NULL; @@ -786,13 +786,13 @@ static struct dm_config_value *_get_def_array_values(struct cmd_context *cmd, token = p; } - dm_free(enc_value); + free(enc_value); return array; bad: log_error(INTERNAL_ERROR "Default array value malformed for \"%s\", " "value: \"%s\", token: \"%s\".", def->name, def->default_value.v_CFG_TYPE_STRING, token); - dm_free(enc_value); + free(enc_value); return NULL; } diff --git a/lib/device/bcache.c b/lib/device/bcache.c index 561f68e..f4c0712 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -70,14 +70,14 @@ struct cb_set { static struct cb_set *_cb_set_create(unsigned nr) { int i; - struct cb_set *cbs = dm_malloc(sizeof(*cbs)); + struct cb_set *cbs = malloc(sizeof(*cbs)); if (!cbs) return NULL; - cbs->vec = dm_malloc(nr * sizeof(*cbs->vec)); + cbs->vec = malloc(nr * sizeof(*cbs->vec)); if (!cbs->vec) { - dm_free(cbs); + free(cbs); return NULL; } @@ -100,8 +100,8 @@ static void _cb_set_destroy(struct cb_set *cbs) return; } - dm_free(cbs->vec); - dm_free(cbs); + free(cbs->vec); + free(cbs); } static struct control_block *_cb_alloc(struct cb_set *cbs, void *context) @@ -155,7 +155,7 @@ static void _async_destroy(struct io_engine *ioe) if (r) log_sys_warn("io_destroy"); - dm_free(e); + free(e); } static bool _async_issue(struct io_engine *ioe, enum dir d, int fd, @@ -253,7 +253,7 @@ static unsigned _async_max_io(struct io_engine *e) struct io_engine *create_async_io_engine(void) { int r; - struct async_engine *e = dm_malloc(sizeof(*e)); + struct async_engine *e = malloc(sizeof(*e)); if (!e) return NULL; @@ -267,14 +267,14 @@ struct io_engine *create_async_io_engine(void) r = io_setup(MAX_IO, &e->aio_context); if (r < 0) { log_warn("io_setup failed"); - dm_free(e); + free(e); return NULL; } e->cbs = _cb_set_create(MAX_IO); if (!e->cbs) { log_warn("couldn't create control block set"); - dm_free(e); + free(e); return NULL; } @@ -303,7 +303,7 @@ static struct sync_engine *_to_sync(struct io_engine *e) static void _sync_destroy(struct io_engine *ioe) { struct sync_engine *e = _to_sync(ioe); - dm_free(e); + free(e); } static bool _sync_issue(struct io_engine *ioe, enum dir d, int fd, @@ -362,7 +362,7 @@ static bool _sync_wait(struct io_engine *ioe, io_complete_fn fn) dm_list_iterate_items_safe(io, tmp, &e->complete) { fn(io->context, 0); dm_list_del(&io->list); - dm_free(io); + free(io); } return true; @@ -375,7 +375,7 @@ static unsigned _sync_max_io(struct io_engine *e) struct io_engine *create_sync_io_engine(void) { - struct sync_engine *e = dm_malloc(sizeof(*e)); + struct sync_engine *e = malloc(sizeof(*e)); if (!e) return NULL; @@ -530,10 +530,10 @@ static bool _init_free_list(struct bcache *cache, unsigned count, unsigned pgsiz return false; cache->raw_data = data; - cache->raw_blocks = dm_malloc(count * sizeof(*cache->raw_blocks)); + cache->raw_blocks = malloc(count * sizeof(*cache->raw_blocks)); if (!cache->raw_blocks) - dm_free(cache->raw_data); + free(cache->raw_data); for (i = 0; i < count; i++) { struct block *b = cache->raw_blocks + i; @@ -547,8 +547,8 @@ static bool _init_free_list(struct bcache *cache, unsigned count, unsigned pgsiz static void _exit_free_list(struct bcache *cache) { - dm_free(cache->raw_data); - dm_free(cache->raw_blocks); + free(cache->raw_data); + free(cache->raw_blocks); } static struct block *_alloc_block(struct bcache *cache) @@ -885,7 +885,7 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks, return NULL; } - cache = dm_malloc(sizeof(*cache)); + cache = malloc(sizeof(*cache)); if (!cache) return NULL; @@ -906,7 +906,7 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks, cache->rtree = radix_tree_create(NULL, NULL); if (!cache->rtree) { cache->engine->destroy(cache->engine); - dm_free(cache); + free(cache); return NULL; } @@ -920,7 +920,7 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks, if (!_init_free_list(cache, nr_cache_blocks, pgsize)) { cache->engine->destroy(cache->engine); radix_tree_destroy(cache->rtree); - dm_free(cache); + free(cache); return NULL; } @@ -937,7 +937,7 @@ void bcache_destroy(struct bcache *cache) _exit_free_list(cache); radix_tree_destroy(cache->rtree); cache->engine->destroy(cache->engine); - dm_free(cache); + free(cache); } sector_t bcache_block_sectors(struct bcache *cache) diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 4f7a7a0..d60454a 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/datastruct/btree.h" #include "lib/config/config.h" @@ -80,9 +81,9 @@ void dev_destroy_file(struct device *dev) if (!(dev->flags & DEV_ALLOCED)) return; - dm_free((void *) dm_list_item(dev->aliases.n, struct dm_str_list)->str); - dm_free(dev->aliases.n); - dm_free(dev); + free((void *) dm_list_item(dev->aliases.n, struct dm_str_list)->str); + free(dev->aliases.n); + free(dev); } struct device *dev_create_file(const char *filename, struct device *dev, @@ -92,19 +93,19 @@ struct device *dev_create_file(const char *filename, struct device *dev, if (allocate) { if (use_malloc) { - if (!(dev = dm_zalloc(sizeof(*dev)))) { + if (!(dev = zalloc(sizeof(*dev)))) { log_error("struct device allocation failed"); return NULL; } - if (!(alias = dm_zalloc(sizeof(*alias)))) { + if (!(alias = zalloc(sizeof(*alias)))) { log_error("struct dm_str_list allocation failed"); - dm_free(dev); + free(dev); return NULL; } - if (!(alias->str = dm_strdup(filename))) { + if (!(alias->str = strdup(filename))) { log_error("filename strdup failed"); - dm_free(dev); - dm_free(alias); + free(dev); + free(alias); return NULL; } } else { @@ -123,7 +124,7 @@ struct device *dev_create_file(const char *filename, struct device *dev, return NULL; } } - } else if (!(alias->str = dm_strdup(filename))) { + } else if (!(alias->str = strdup(filename))) { log_error("filename strdup failed"); return NULL; } @@ -861,7 +862,7 @@ static int _insert_dev(const char *path, dev_t d) static char *_join(const char *dir, const char *name) { size_t len = strlen(dir) + strlen(name) + 2; - char *r = dm_malloc(len); + char *r = malloc(len); if (r) snprintf(r, len, "%s/%s", dir, name); @@ -909,7 +910,7 @@ static int _insert_dir(const char *dir) _collapse_slashes(path); r &= _insert(path, NULL, 1, 0); - dm_free(path); + free(path); free(dirent[n]); } @@ -1632,7 +1633,7 @@ struct device *dev_cache_get_by_devt(dev_t dev, struct dev_filter *f) struct dev_iter *dev_iter_create(struct dev_filter *f, int unused) { - struct dev_iter *di = dm_malloc(sizeof(*di)); + struct dev_iter *di = malloc(sizeof(*di)); if (!di) { log_error("dev_iter allocation failed"); @@ -1651,7 +1652,7 @@ void dev_iter_destroy(struct dev_iter *iter) { if (iter->filter) iter->filter->use_count--; - dm_free(iter); + free(iter); } static struct device *_iter_next(struct dev_iter *iter) diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index 65b3db4..ffdf75e 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -256,7 +256,7 @@ static int _aligned_io(struct device_area *where, char *buffer, return _io(where, buffer, should_write, reason); /* Allocate a bounce buffer with an extra block */ - if (!(bounce_buf = bounce = dm_malloc((size_t) widened.size + block_size))) { + if (!(bounce_buf = bounce = malloc((size_t) widened.size + block_size))) { log_error("Bounce buffer malloc failed"); return 0; } @@ -294,7 +294,7 @@ static int _aligned_io(struct device_area *where, char *buffer, r = 1; out: - dm_free(bounce_buf); + free(bounce_buf); return r; } diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index 718038c..0b7af1b 100644 --- a/lib/device/dev-type.c +++ b/lib/device/dev-type.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/device/dev-type.h" #include "lib/mm/xlate.h" @@ -49,7 +50,7 @@ struct dev_types *create_dev_types(const char *proc_dir, const char *name; char *nl; - if (!(dt = dm_zalloc(sizeof(struct dev_types)))) { + if (!(dt = zalloc(sizeof(struct dev_types)))) { log_error("Failed to allocate device type register."); return NULL; } @@ -204,7 +205,7 @@ struct dev_types *create_dev_types(const char *proc_dir, return dt; bad: - dm_free(dt); + free(dt); return NULL; } diff --git a/lib/device/device.h b/lib/device/device.h index b9aec70..8f9ed55 100644 --- a/lib/device/device.h +++ b/lib/device/device.h @@ -22,7 +22,7 @@ #define DEV_ACCESSED_W 0x00000001 /* Device written to? */ #define DEV_REGULAR 0x00000002 /* Regular file? */ -#define DEV_ALLOCED 0x00000004 /* dm_malloc used */ +#define DEV_ALLOCED 0x00000004 /* malloc used */ #define DEV_OPENED_RW 0x00000008 /* Opened RW */ #define DEV_OPENED_EXCL 0x00000010 /* Opened EXCL */ #define DEV_O_DIRECT 0x00000020 /* Use O_DIRECT */ diff --git a/lib/error/errseg.c b/lib/error/errseg.c index 9f0262a..bbdf235 100644 --- a/lib/error/errseg.c +++ b/lib/error/errseg.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/commands/toolcontext.h" #include "lib/metadata/segtype.h" @@ -77,7 +78,7 @@ static int _errseg_modules_needed(struct dm_pool *mem, static void _errseg_destroy(struct segment_type *segtype) { - dm_free(segtype); + free(segtype); } static struct segtype_handler _error_ops = { @@ -92,7 +93,7 @@ static struct segtype_handler _error_ops = { struct segment_type *init_error_segtype(struct cmd_context *cmd) { - struct segment_type *segtype = dm_zalloc(sizeof(*segtype)); + struct segment_type *segtype = zalloc(sizeof(*segtype)); if (!segtype) return_NULL; diff --git a/lib/filters/filter-composite.c b/lib/filters/filter-composite.c index 8d9e061..8691aeb 100644 --- a/lib/filters/filter-composite.c +++ b/lib/filters/filter-composite.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/filters/filter.h" #include "lib/device/device.h" @@ -53,8 +54,8 @@ static void _composite_destroy(struct dev_filter *f) for (filters = (struct dev_filter **) f->private; *filters; ++filters) (*filters)->destroy(*filters); - dm_free(f->private); - dm_free(f); + free(f->private); + free(f); } static int _dump(struct dev_filter *f, int merge_existing) @@ -85,7 +86,7 @@ struct dev_filter *composite_filter_create(int n, int use_dev_ext_info, struct d if (!filters) return_NULL; - if (!(filters_copy = dm_malloc(sizeof(*filters) * (n + 1)))) { + if (!(filters_copy = malloc(sizeof(*filters) * (n + 1)))) { log_error("Composite filters allocation failed."); return NULL; } @@ -93,9 +94,9 @@ struct dev_filter *composite_filter_create(int n, int use_dev_ext_info, struct d memcpy(filters_copy, filters, sizeof(*filters) * n); filters_copy[n] = NULL; - if (!(cft = dm_zalloc(sizeof(*cft)))) { + if (!(cft = zalloc(sizeof(*cft)))) { log_error("Composite filters allocation failed."); - dm_free(filters_copy); + free(filters_copy); return NULL; } diff --git a/lib/filters/filter-fwraid.c b/lib/filters/filter-fwraid.c index 62022b3..03c63b3 100644 --- a/lib/filters/filter-fwraid.c +++ b/lib/filters/filter-fwraid.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/filters/filter.h" @@ -96,14 +97,14 @@ static void _destroy(struct dev_filter *f) if (f->use_count) log_error(INTERNAL_ERROR "Destroying firmware RAID filter while in use %u times.", f->use_count); - dm_free(f); + free(f); } struct dev_filter *fwraid_filter_create(struct dev_types *dt __attribute__((unused))) { struct dev_filter *f; - if (!(f = dm_zalloc(sizeof(*f)))) { + if (!(f = zalloc(sizeof(*f)))) { log_error("Firmware RAID filter allocation failed"); return NULL; } diff --git a/lib/filters/filter-internal.c b/lib/filters/filter-internal.c index ebbee7e..85e04d4 100644 --- a/lib/filters/filter-internal.c +++ b/lib/filters/filter-internal.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/filters/filter.h" @@ -58,14 +59,14 @@ static void _destroy(struct dev_filter *f) if (f->use_count) log_error(INTERNAL_ERROR "Destroying internal filter while in use %u times.", f->use_count); - dm_free(f); + free(f); } struct dev_filter *internal_filter_create(void) { struct dev_filter *f; - if (!(f = dm_zalloc(sizeof(*f)))) { + if (!(f = zalloc(sizeof(*f)))) { log_error("md filter allocation failed"); return NULL; } diff --git a/lib/filters/filter-md.c b/lib/filters/filter-md.c index b9d3bc8..4fcbca9 100644 --- a/lib/filters/filter-md.c +++ b/lib/filters/filter-md.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/filters/filter.h" @@ -138,14 +139,14 @@ static void _destroy(struct dev_filter *f) if (f->use_count) log_error(INTERNAL_ERROR "Destroying md filter while in use %u times.", f->use_count); - dm_free(f); + free(f); } struct dev_filter *md_filter_create(struct cmd_context *cmd, struct dev_types *dt) { struct dev_filter *f; - if (!(f = dm_zalloc(sizeof(*f)))) { + if (!(f = zalloc(sizeof(*f)))) { log_error("md filter allocation failed"); return NULL; } diff --git a/lib/filters/filter-mpath.c b/lib/filters/filter-mpath.c index a7dc12e..785b518 100644 --- a/lib/filters/filter-mpath.c +++ b/lib/filters/filter-mpath.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/filters/filter.h" #include "lib/activate/activate.h" @@ -265,7 +266,7 @@ static void _destroy(struct dev_filter *f) if (f->use_count) log_error(INTERNAL_ERROR "Destroying mpath filter while in use %u times.", f->use_count); - dm_free(f); + free(f); } struct dev_filter *mpath_filter_create(struct dev_types *dt) @@ -278,7 +279,7 @@ struct dev_filter *mpath_filter_create(struct dev_types *dt) return NULL; } - if (!(f = dm_zalloc(sizeof(*f)))) { + if (!(f = zalloc(sizeof(*f)))) { log_error("mpath filter allocation failed"); return NULL; } diff --git a/lib/filters/filter-partitioned.c b/lib/filters/filter-partitioned.c index a85e182..34151fd 100644 --- a/lib/filters/filter-partitioned.c +++ b/lib/filters/filter-partitioned.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/filters/filter.h" @@ -49,14 +50,14 @@ static void _partitioned_filter_destroy(struct dev_filter *f) if (f->use_count) log_error(INTERNAL_ERROR "Destroying partitioned filter while in use %u times.", f->use_count); - dm_free(f); + free(f); } struct dev_filter *partitioned_filter_create(struct dev_types *dt) { struct dev_filter *f; - if (!(f = dm_zalloc(sizeof(struct dev_filter)))) { + if (!(f = zalloc(sizeof(struct dev_filter)))) { log_error("Partitioned filter allocation failed"); return NULL; } diff --git a/lib/filters/filter-persistent.c b/lib/filters/filter-persistent.c index 8f6d584..643c349 100644 --- a/lib/filters/filter-persistent.c +++ b/lib/filters/filter-persistent.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/filters/filter.h" #include "lib/config/config.h" @@ -360,10 +361,10 @@ static void _persistent_destroy(struct dev_filter *f) log_error(INTERNAL_ERROR "Destroying persistent filter while in use %u times.", f->use_count); dm_hash_destroy(pf->devices); - dm_free(pf->file); + free(pf->file); pf->real->destroy(pf->real); - dm_free(pf); - dm_free(f); + free(pf); + free(f); } struct dev_filter *persistent_filter_create(struct dev_types *dt, @@ -374,14 +375,14 @@ struct dev_filter *persistent_filter_create(struct dev_types *dt, struct dev_filter *f = NULL; struct stat info; - if (!(pf = dm_zalloc(sizeof(*pf)))) { + if (!(pf = zalloc(sizeof(*pf)))) { log_error("Allocation of persistent filter failed."); return NULL; } pf->dt = dt; - if (!(pf->file = dm_strdup(file))) { + if (!(pf->file = strdup(file))) { log_error("Filename duplication for persistent filter failed."); goto bad; } @@ -393,7 +394,7 @@ struct dev_filter *persistent_filter_create(struct dev_types *dt, goto bad; } - if (!(f = dm_zalloc(sizeof(*f)))) { + if (!(f = zalloc(sizeof(*f)))) { log_error("Allocation of device filter for persistent filter failed."); goto bad; } @@ -414,10 +415,10 @@ struct dev_filter *persistent_filter_create(struct dev_types *dt, return f; bad: - dm_free(pf->file); + free(pf->file); if (pf->devices) dm_hash_destroy(pf->devices); - dm_free(pf); - dm_free(f); + free(pf); + free(f); return NULL; } diff --git a/lib/filters/filter-signature.c b/lib/filters/filter-signature.c index 3aa6284..d4b6ea3 100644 --- a/lib/filters/filter-signature.c +++ b/lib/filters/filter-signature.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/filters/filter.h" @@ -64,14 +65,14 @@ static void _destroy(struct dev_filter *f) if (f->use_count) log_error(INTERNAL_ERROR "Destroying signature filter while in use %u times.", f->use_count); - dm_free(f); + free(f); } struct dev_filter *signature_filter_create(struct dev_types *dt) { struct dev_filter *f; - if (!(f = dm_zalloc(sizeof(*f)))) { + if (!(f = zalloc(sizeof(*f)))) { log_error("md filter allocation failed"); return NULL; } diff --git a/lib/filters/filter-type.c b/lib/filters/filter-type.c index 8ec3025..63d7c70 100644 --- a/lib/filters/filter-type.c +++ b/lib/filters/filter-type.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/filters/filter.h" @@ -36,14 +37,14 @@ static void _lvm_type_filter_destroy(struct dev_filter *f) if (f->use_count) log_error(INTERNAL_ERROR "Destroying lvm_type filter while in use %u times.", f->use_count); - dm_free(f); + free(f); } struct dev_filter *lvm_type_filter_create(struct dev_types *dt) { struct dev_filter *f; - if (!(f = dm_zalloc(sizeof(struct dev_filter)))) { + if (!(f = zalloc(sizeof(struct dev_filter)))) { log_error("LVM type filter allocation failed"); return NULL; } diff --git a/lib/filters/filter-usable.c b/lib/filters/filter-usable.c index 45c7832..498b90c 100644 --- a/lib/filters/filter-usable.c +++ b/lib/filters/filter-usable.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/filters/filter.h" #include "lib/activate/activate.h" @@ -157,15 +158,15 @@ static void _usable_filter_destroy(struct dev_filter *f) if (f->use_count) log_error(INTERNAL_ERROR "Destroying usable device filter while in use %u times.", f->use_count); - dm_free(f->private); - dm_free(f); + free(f->private); + free(f); } struct dev_filter *usable_filter_create(struct dev_types *dt __attribute__((unused)), filter_mode_t mode) { struct dev_filter *f; - if (!(f = dm_zalloc(sizeof(struct dev_filter)))) { + if (!(f = zalloc(sizeof(struct dev_filter)))) { log_error("Usable device filter allocation failed"); return NULL; } @@ -173,9 +174,9 @@ struct dev_filter *usable_filter_create(struct dev_types *dt __attribute__((unus f->passes_filter = _passes_usable_filter; f->destroy = _usable_filter_destroy; f->use_count = 0; - if (!(f->private = dm_zalloc(sizeof(filter_mode_t)))) { + if (!(f->private = zalloc(sizeof(filter_mode_t)))) { log_error("Usable device filter mode allocation failed"); - dm_free(f); + free(f); return NULL; } *((filter_mode_t *) f->private) = mode; diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c index ab80117..5cdbf6d 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -55,7 +55,7 @@ int archive_init(struct cmd_context *cmd, const char *dir, if (!*dir) return 1; - if (!(cmd->archive_params->dir = dm_strdup(dir))) { + if (!(cmd->archive_params->dir = strdup(dir))) { log_error("Couldn't copy archive directory name."); return 0; } @@ -71,7 +71,7 @@ void archive_exit(struct cmd_context *cmd) { if (!cmd->archive_params) return; - dm_free(cmd->archive_params->dir); + free(cmd->archive_params->dir); memset(cmd->archive_params, 0, sizeof(*cmd->archive_params)); } @@ -193,7 +193,7 @@ int backup_init(struct cmd_context *cmd, const char *dir, if (!*dir) return 1; - if (!(cmd->backup_params->dir = dm_strdup(dir))) { + if (!(cmd->backup_params->dir = strdup(dir))) { log_error("Couldn't copy backup directory name."); return 0; } @@ -206,7 +206,7 @@ void backup_exit(struct cmd_context *cmd) { if (!cmd->backup_params) return; - dm_free(cmd->backup_params->dir); + free(cmd->backup_params->dir); memset(cmd->backup_params, 0, sizeof(*cmd->backup_params)); } diff --git a/lib/format_text/export.c b/lib/format_text/export.c index 2924aea..a9a7e15 100644 --- a/lib/format_text/export.c +++ b/lib/format_text/export.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "import-export.h" #include "lib/metadata/metadata.h" @@ -123,7 +124,7 @@ static int _extend_buffer(struct formatter *f) log_debug_metadata("Doubling metadata output buffer to " FMTu32, f->data.buf.size * 2); - if (!(newbuf = dm_realloc(f->data.buf.start, + if (!(newbuf = realloc(f->data.buf.start, f->data.buf.size * 2))) { log_error("Buffer reallocation failed."); return 0; @@ -383,7 +384,7 @@ static char *_alloc_printed_str_list(struct dm_list *list) /* '[' + ']' + '\0' */ size += 3; - if (!(buffer = buf = dm_malloc(size))) { + if (!(buffer = buf = malloc(size))) { log_error("Could not allocate memory for string list buffer."); return NULL; } @@ -408,7 +409,7 @@ static char *_alloc_printed_str_list(struct dm_list *list) return buffer; bad: - dm_free(buffer); + free(buffer); return_NULL; } @@ -421,10 +422,10 @@ static int _out_list(struct formatter *f, struct dm_list *list, if (!(buffer = _alloc_printed_str_list(list))) return_0; if (!out_text(f, "%s = %s", list_name, buffer)) { - dm_free(buffer); + free(buffer); return_0; } - dm_free(buffer); + free(buffer); } return 1; @@ -835,7 +836,7 @@ static int _alloc_printed_indirect_descendants(struct dm_list *indirect_glvs, ch /* '[' + ']' + '\0' */ buf_size += 3; - if (!(*buffer = dm_malloc(buf_size))) { + if (!(*buffer = malloc(buf_size))) { log_error("Could not allocate memory for ancestor list buffer."); return 0; } @@ -863,7 +864,7 @@ static int _alloc_printed_indirect_descendants(struct dm_list *indirect_glvs, ch return 1; bad: if (*buffer) { - dm_free(*buffer); + free(*buffer); *buffer = NULL; } return 0; @@ -908,7 +909,7 @@ static int _print_historical_lv(struct formatter *f, struct historical_logical_v r = 1; out: - dm_free(descendants_buffer); + free(descendants_buffer); return r; } @@ -1034,7 +1035,7 @@ int text_vg_export_file(struct volume_group *vg, const char *desc, FILE *fp) _init(); - if (!(f = dm_zalloc(sizeof(*f)))) + if (!(f = zalloc(sizeof(*f)))) return_0; f->data.fp = fp; @@ -1046,7 +1047,7 @@ int text_vg_export_file(struct volume_group *vg, const char *desc, FILE *fp) r = _text_vg_export(f, vg, desc); if (r) r = !ferror(f->data.fp); - dm_free(f); + free(f); return r; } @@ -1058,11 +1059,11 @@ size_t text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf) _init(); - if (!(f = dm_zalloc(sizeof(*f)))) + if (!(f = zalloc(sizeof(*f)))) return_0; f->data.buf.size = 65536; /* Initial metadata limit */ - if (!(f->data.buf.start = dm_malloc(f->data.buf.size))) { + if (!(f->data.buf.start = malloc(f->data.buf.size))) { log_error("text_export buffer allocation failed"); goto out; } @@ -1073,7 +1074,7 @@ size_t text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf) f->nl = &_nl_raw; if (!_text_vg_export(f, vg, desc)) { - dm_free(f->data.buf.start); + free(f->data.buf.start); goto_out; } @@ -1081,7 +1082,7 @@ size_t text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf) *buf = f->data.buf.start; out: - dm_free(f); + free(f); return r; } @@ -1102,11 +1103,11 @@ struct dm_config_tree *export_vg_to_config_tree(struct volume_group *vg) if (!(vg_cft = config_tree_from_string_without_dup_node_check(buf))) { log_error("Error parsing metadata for VG %s.", vg->name); - dm_free(buf); + free(buf); return_NULL; } - dm_free(buf); + free(buf); return vg_cft; } diff --git a/lib/format_text/flags.c b/lib/format_text/flags.c index 69d8afc..98894e7 100644 --- a/lib/format_text/flags.c +++ b/lib/format_text/flags.c @@ -235,7 +235,7 @@ int read_segtype_lvflags(uint64_t *status, char *segtype_str) if (!(str = strchr(segtype_str, '+'))) return 1; /* No flags */ - if (!(buffer = dm_strdup(str + 1))) { + if (!(buffer = strdup(str + 1))) { log_error("Cannot duplicate segment string."); return 0; } @@ -263,7 +263,7 @@ int read_segtype_lvflags(uint64_t *status, char *segtype_str) else *str = '\0'; /* Cut away 1st. '+' */ - dm_free(buffer); + free(buffer); return 1; } diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index c834335..907944a 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -224,7 +224,7 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, * "dm_config_maybe_section" returning true when there's no valid * metadata in a sector (sectors with all nulls). */ - if (!(buf = dm_malloc(size + size2))) + if (!(buf = malloc(size + size2))) goto_out; if (!dev_read_bytes(area->dev, offset, size, buf)) { @@ -273,13 +273,13 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, size += SECTOR_SIZE; } } - dm_free(buf); + free(buf); buf = NULL; } r = 1; out: - dm_free(buf); + free(buf); return r; } @@ -294,7 +294,7 @@ static int _text_lv_setup(struct format_instance *fid __attribute__((unused)), if (lv->size > max_size) { char *dummy = display_size(max_size); log_error("logical volumes cannot be larger than %s", dummy); - dm_free(dummy); + free(dummy); return 0; } */ @@ -711,7 +711,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, out: if (!r) { - dm_free(fidtc->raw_metadata_buf); + free(fidtc->raw_metadata_buf); fidtc->raw_metadata_buf = NULL; } @@ -807,7 +807,7 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid, out: if (!precommit) { - dm_free(fidtc->raw_metadata_buf); + free(fidtc->raw_metadata_buf); fidtc->raw_metadata_buf = NULL; } @@ -1547,7 +1547,7 @@ static int _add_raw(struct dm_list *raw_list, struct device_area *dev_area) return 1; } - if (!(rl = dm_malloc(sizeof(struct raw_list)))) { + if (!(rl = malloc(sizeof(struct raw_list)))) { log_error("_add_raw allocation failed"); return 0; } @@ -1715,7 +1715,7 @@ static void _free_dirs(struct dm_list *dir_list) dm_list_iterate_safe(dl, tmp, dir_list) { dm_list_del(dl); - dm_free(dl); + free(dl); } } @@ -1725,7 +1725,7 @@ static void _free_raws(struct dm_list *raw_list) dm_list_iterate_safe(rl, tmp, raw_list) { dm_list_del(rl); - dm_free(rl); + free(rl); } } @@ -1737,10 +1737,10 @@ static void _text_destroy(struct format_type *fmt) if (fmt->private) { _free_dirs(&((struct mda_lists *) fmt->private)->dirs); _free_raws(&((struct mda_lists *) fmt->private)->raws); - dm_free(fmt->private); + free(fmt->private); } - dm_free(fmt); + free(fmt); } static struct metadata_area_ops _metadata_text_file_ops = { @@ -2079,7 +2079,7 @@ static int _add_metadata_area_to_pv(struct physical_volume *pv, if (!(mdac = dm_pool_zalloc(pv->fid->mem, sizeof(struct mda_context)))) { log_error("struct mda_context allocation failed"); - dm_free(mda); + free(mda); return 0; } @@ -2460,7 +2460,7 @@ static int _add_dir(const char *dir, struct dm_list *dir_list) struct dir_list *dl; if (dm_create_dir(dir)) { - if (!(dl = dm_malloc(sizeof(struct dm_list) + strlen(dir) + 1))) { + if (!(dl = malloc(sizeof(struct dm_list) + strlen(dir) + 1))) { log_error("_add_dir allocation failed"); return 0; } @@ -2535,7 +2535,7 @@ struct format_type *create_text_format(struct cmd_context *cmd) const struct dm_config_value *cv; struct mda_lists *mda_lists; - if (!(fmt = dm_malloc(sizeof(*fmt)))) { + if (!(fmt = malloc(sizeof(*fmt)))) { log_error("Failed to allocate text format type structure."); return NULL; } @@ -2550,9 +2550,9 @@ struct format_type *create_text_format(struct cmd_context *cmd) FMT_UNLIMITED_STRIPESIZE | FMT_CONFIG_PROFILE | FMT_NON_POWER2_EXTENTS | FMT_PV_FLAGS; - if (!(mda_lists = dm_malloc(sizeof(struct mda_lists)))) { + if (!(mda_lists = malloc(sizeof(struct mda_lists)))) { log_error("Failed to allocate dir_list"); - dm_free(fmt); + free(fmt); return NULL; } diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c index a7eaa6e..1157b98 100644 --- a/lib/format_text/text_label.c +++ b/lib/format_text/text_label.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/format_text/format-text.h" #include "layout.h" @@ -198,7 +199,7 @@ int add_da(struct dm_pool *mem, struct dm_list *das, struct data_area_list *dal; if (!mem) { - if (!(dal = dm_malloc(sizeof(*dal)))) { + if (!(dal = malloc(sizeof(*dal)))) { log_error("struct data_area_list allocation failed"); return 0; } @@ -225,7 +226,7 @@ void del_das(struct dm_list *das) dm_list_iterate_safe(dah, tmp, das) { da = dm_list_item(dah, struct data_area_list); dm_list_del(&da->list); - dm_free(da); + free(da); } } @@ -250,14 +251,14 @@ int add_mda(const struct format_type *fmt, struct dm_pool *mem, struct dm_list * struct mda_context *mdac, *mdac2; if (!mem) { - if (!(mdal = dm_malloc(sizeof(struct metadata_area)))) { + if (!(mdal = malloc(sizeof(struct metadata_area)))) { log_error("struct mda_list allocation failed"); return 0; } - if (!(mdac = dm_malloc(sizeof(struct mda_context)))) { + if (!(mdac = malloc(sizeof(struct mda_context)))) { log_error("struct mda_context allocation failed"); - dm_free(mdal); + free(mdal); return 0; } } else { @@ -304,9 +305,9 @@ void del_mdas(struct dm_list *mdas) dm_list_iterate_safe(mdah, tmp, mdas) { mda = dm_list_item(mdah, struct metadata_area); - dm_free(mda->metadata_locn); + free(mda->metadata_locn); dm_list_del(&mda->list); - dm_free(mda); + free(mda); } } @@ -465,7 +466,7 @@ static void _text_destroy_label(struct labeller *l __attribute__((unused)), static void _fmt_text_destroy(struct labeller *l) { - dm_free(l); + free(l); } struct label_ops _text_ops = { @@ -481,7 +482,7 @@ struct labeller *text_labeller_create(const struct format_type *fmt) { struct labeller *l; - if (!(l = dm_zalloc(sizeof(*l)))) { + if (!(l = zalloc(sizeof(*l)))) { log_error("Couldn't allocate labeller object."); return NULL; } diff --git a/lib/freeseg/freeseg.c b/lib/freeseg/freeseg.c index 90e9cd3..fa73e22 100644 --- a/lib/freeseg/freeseg.c +++ b/lib/freeseg/freeseg.c @@ -12,13 +12,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/commands/toolcontext.h" #include "lib/metadata/segtype.h" static void _freeseg_destroy(struct segment_type *segtype) { - dm_free(segtype); + free(segtype); } static struct segtype_handler _freeseg_ops = { @@ -27,7 +28,7 @@ static struct segtype_handler _freeseg_ops = { struct segment_type *init_free_segtype(struct cmd_context *cmd) { - struct segment_type *segtype = dm_zalloc(sizeof(*segtype)); + struct segment_type *segtype = zalloc(sizeof(*segtype)); if (!segtype) return_NULL; diff --git a/lib/label/label.c b/lib/label/label.c index ce995d6..373df29 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -13,6 +13,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#define _GNU_SOURCE + +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/label/label.h" #include "lib/misc/crc.h" @@ -26,7 +29,7 @@ #include <fcntl.h> #include <unistd.h> #include <sys/time.h> - +#include <sys/types.h> /* FIXME Allow for larger labels? Restricted to single sector currently */ @@ -49,7 +52,7 @@ static struct labeller_i *_alloc_li(const char *name, struct labeller *l) len = sizeof(*li) + strlen(name) + 1; - if (!(li = dm_malloc(len))) { + if (!(li = malloc(len))) { log_error("Couldn't allocate memory for labeller list object."); return NULL; } @@ -73,7 +76,7 @@ void label_exit(void) dm_list_iterate_items_safe(li, tli, &_labellers) { dm_list_del(&li->list); li->l->ops->destroy(li->l); - dm_free(li); + free(li); } dm_list_init(&_labellers); @@ -217,14 +220,14 @@ int label_write(struct device *dev, struct label *label) void label_destroy(struct label *label) { label->labeller->ops->destroy_label(label->labeller, label); - dm_free(label); + free(label); } struct label *label_create(struct labeller *labeller) { struct label *label; - if (!(label = dm_zalloc(sizeof(*label)))) { + if (!(label = zalloc(sizeof(*label)))) { log_error("label allocaction failed"); return NULL; } @@ -831,7 +834,7 @@ int label_scan(struct cmd_context *cmd) } while ((dev = dev_iter_get(iter))) { - if (!(devl = dm_zalloc(sizeof(*devl)))) + if (!(devl = zalloc(sizeof(*devl)))) continue; devl->dev = dev; dm_list_add(&all_devs, &devl->list); @@ -858,7 +861,7 @@ int label_scan(struct cmd_context *cmd) dm_list_iterate_items_safe(devl, devl2, &all_devs) { dm_list_del(&devl->list); - dm_free(devl); + free(devl); } return 1; @@ -997,7 +1000,7 @@ int label_read(struct device *dev) int failed = 0; /* scanning is done by list, so make a single item list for this dev */ - if (!(devl = dm_zalloc(sizeof(*devl)))) + if (!(devl = zalloc(sizeof(*devl)))) return 0; devl->dev = dev; dm_list_init(&one_dev); @@ -1010,7 +1013,7 @@ int label_read(struct device *dev) _scan_list(NULL, NULL, &one_dev, &failed); - dm_free(devl); + free(devl); if (failed) return 0; diff --git a/lib/log/log.c b/lib/log/log.c index a040ca5..fd056b1 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -123,13 +123,13 @@ static int _set_custom_log_stream(struct log_stream_item *stream_item, int custo goto out; } - if (!(stream_item->buffer = dm_malloc(LOG_STREAM_BUFFER_SIZE))) { + if (!(stream_item->buffer = malloc(LOG_STREAM_BUFFER_SIZE))) { log_error("Failed to allocate buffer for stream on file " "descriptor %d.", (int) custom_fd); } else { if (setvbuf(final_stream, stream_item->buffer, _IOLBF, LOG_STREAM_BUFFER_SIZE)) { log_sys_error("setvbuf", ""); - dm_free(stream_item->buffer); + free(stream_item->buffer); stream_item->buffer = NULL; } } @@ -342,7 +342,7 @@ void release_log_memory(void) if (!_log_direct) return; - dm_free((char *) _log_dev_alias.str); + free((char *) _log_dev_alias.str); _log_dev_alias.str = "activate_log file"; } @@ -396,7 +396,7 @@ void reset_lvm_errno(int store_errmsg) _lvm_errno = 0; if (_lvm_errmsg) { - dm_free(_lvm_errmsg); + free(_lvm_errmsg); _lvm_errmsg = NULL; _lvm_errmsg_size = _lvm_errmsg_len = 0; } @@ -542,7 +542,7 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c msglen = strlen(message); if ((_lvm_errmsg_len + msglen + 1) >= _lvm_errmsg_size) { _lvm_errmsg_size = 2 * (_lvm_errmsg_len + msglen + 1); - if ((newbuf = dm_realloc(_lvm_errmsg, + if ((newbuf = realloc(_lvm_errmsg, _lvm_errmsg_size))) _lvm_errmsg = newbuf; else diff --git a/lib/lvmpolld/lvmpolld-client.c b/lib/lvmpolld/lvmpolld-client.c index 78cf813..1a76485 100644 --- a/lib/lvmpolld/lvmpolld-client.c +++ b/lib/lvmpolld/lvmpolld-client.c @@ -207,7 +207,7 @@ static int _process_poll_init(const struct cmd_context *cmd, const char *poll_ty const char *e = getenv("LVM_SYSTEM_DIR"); int r = 0; - str = dm_malloc(INTERV_SIZE * sizeof(char)); + str = malloc(INTERV_SIZE * sizeof(char)); if (!str) return r; @@ -266,7 +266,7 @@ out_rep: daemon_reply_destroy(rep); out_req: daemon_request_destroy(req); - dm_free(str); + free(str); return r; } diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index dad5953..b2eba30 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -2384,7 +2384,7 @@ static int _reserve_required_area(struct alloc_handle *ah, struct alloc_state *a /* Expand areas array if needed after an area was split. */ if (ix_pva >= alloc_state->areas_size) { alloc_state->areas_size *= 2; - if (!(alloc_state->areas = dm_realloc(alloc_state->areas, sizeof(*alloc_state->areas) * (alloc_state->areas_size)))) { + if (!(alloc_state->areas = realloc(alloc_state->areas, sizeof(*alloc_state->areas) * (alloc_state->areas_size)))) { log_error("Memory reallocation for parallel areas failed."); return 0; } @@ -3170,7 +3170,7 @@ static int _allocate(struct alloc_handle *ah, alloc_state.areas_size += _stripes_per_mimage(prev_lvseg) * prev_lvseg->area_count; /* Allocate an array of pv_areas to hold the largest space on each PV */ - if (!(alloc_state.areas = dm_malloc(sizeof(*alloc_state.areas) * alloc_state.areas_size))) { + if (!(alloc_state.areas = malloc(sizeof(*alloc_state.areas) * alloc_state.areas_size))) { log_error("Couldn't allocate areas array."); return 0; } @@ -3251,7 +3251,7 @@ static int _allocate(struct alloc_handle *ah, r = 1; out: - dm_free(alloc_state.areas); + free(alloc_state.areas); return r; } diff --git a/lib/metadata/metadata-liblvm.c b/lib/metadata/metadata-liblvm.c index 53934d2..ccea2e4 100644 --- a/lib/metadata/metadata-liblvm.c +++ b/lib/metadata/metadata-liblvm.c @@ -452,7 +452,7 @@ int vg_extend(struct volume_group *vg, int pv_count, const char *const *pv_names /* attach each pv */ for (i = 0; i < pv_count; i++) { - if (!(pv_name = dm_strdup(pv_names[i]))) { + if (!(pv_name = strdup(pv_names[i]))) { log_error("Failed to duplicate pv name %s.", pv_names[i]); return 0; } @@ -460,10 +460,10 @@ int vg_extend(struct volume_group *vg, int pv_count, const char *const *pv_names if (!_vg_extend_single_pv(vg, pv_name, pp, &max_phys_block_size)) { log_error("Unable to add physical volume '%s' to " "volume group '%s'.", pv_name, vg->name); - dm_free(pv_name); + free(pv_name); return 0; } - dm_free(pv_name); + free(pv_name); } (void) check_pv_dev_sizes(vg); diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c index 4110dec..1ca4037 100644 --- a/lib/mirror/mirrored.c +++ b/lib/mirror/mirrored.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/commands/toolcontext.h" #include "lib/metadata/metadata.h" @@ -525,8 +526,8 @@ static int _mirrored_modules_needed(struct dm_pool *mem, static void _mirrored_destroy(struct segment_type *segtype) { - dm_free((void *) segtype->dso); - dm_free(segtype); + free((void *) segtype->dso); + free(segtype); } static struct segtype_handler _mirrored_ops = { @@ -556,7 +557,7 @@ struct segment_type *init_segtype(struct cmd_context *cmd); struct segment_type *init_segtype(struct cmd_context *cmd) #endif { - struct segment_type *segtype = dm_zalloc(sizeof(*segtype)); + struct segment_type *segtype = zalloc(sizeof(*segtype)); if (!segtype) return_NULL; diff --git a/lib/misc/lib.h b/lib/misc/lib.h index 0d61f34..f7baf9d 100644 --- a/lib/misc/lib.h +++ b/lib/misc/lib.h @@ -81,6 +81,7 @@ #include "lib/misc/intl.h" #include "device_mapper/all.h" #include "lib/misc/util.h" +#include "base/memory/zalloc.h" #ifdef DM # include "libdm/misc/dm-logging.h" diff --git a/lib/misc/lvm-file.c b/lib/misc/lvm-file.c index 5c23b0a..883b22d 100644 --- a/lib/misc/lvm-file.c +++ b/lib/misc/lvm-file.c @@ -166,7 +166,7 @@ void sync_dir(const char *file) int fd; char *dir, *c; - if (!(dir = dm_strdup(file))) { + if (!(dir = strdup(file))) { log_error("sync_dir failed in strdup"); return; } @@ -194,7 +194,7 @@ void sync_dir(const char *file) log_sys_error("close", dir); out: - dm_free(dir); + free(dir); } /* @@ -210,7 +210,7 @@ int fcntl_lock_file(const char *file, short lock_type, int warn_if_read_only) char *dir; char *c; - if (!(dir = dm_strdup(file))) { + if (!(dir = strdup(file))) { log_error("fcntl_lock_file failed in strdup."); return -1; } @@ -219,11 +219,11 @@ int fcntl_lock_file(const char *file, short lock_type, int warn_if_read_only) *c = '\0'; if (!dm_create_dir(dir)) { - dm_free(dir); + free(dir); return -1; } - dm_free(dir); + free(dir); log_very_verbose("Locking %s (%s, %hd)", file, (lock_type == F_WRLCK) ? "F_WRLCK" : "F_RDLCK", diff --git a/lib/misc/lvm-flock.c b/lib/misc/lvm-flock.c index 00d74de..88ea6c2 100644 --- a/lib/misc/lvm-flock.c +++ b/lib/misc/lvm-flock.c @@ -74,8 +74,8 @@ static int _release_lock(const char *file, int unlock) } else _drop_shared_flock(ll->res, ll->lf); - dm_free(ll->res); - dm_free(llh); + free(ll->res); + free(llh); if (file) return 1; @@ -188,11 +188,11 @@ int lock_file(const char *file, uint32_t flags) return 0; } - if (!(ll = dm_malloc(sizeof(struct lock_list)))) + if (!(ll = malloc(sizeof(struct lock_list)))) return_0; - if (!(ll->res = dm_strdup(file))) { - dm_free(ll); + if (!(ll->res = strdup(file))) { + free(ll); return_0; } @@ -211,8 +211,8 @@ int lock_file(const char *file, uint32_t flags) if (r) dm_list_add(&_lock_list, &ll->list); else { - dm_free(ll->res); - dm_free(ll); + free(ll->res); + free(ll); stack; } diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c index 571caab..65f13c4 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -339,7 +339,7 @@ static int _memlock_maps(struct cmd_context *cmd, lvmlock_t lock, size_t *mstats if (!_maps_buffer || len >= _maps_len) { if (_maps_buffer) _maps_len *= 2; - if (!(line = dm_realloc(_maps_buffer, _maps_len))) { + if (!(line = realloc(_maps_buffer, _maps_len))) { log_error("Allocation of maps buffer failed."); return 0; } @@ -551,7 +551,7 @@ static void _unlock_mem(struct cmd_context *cmd) _restore_mmap(); if (close(_maps_fd)) log_sys_error("close", _procselfmaps); - dm_free(_maps_buffer); + free(_maps_buffer); _maps_buffer = NULL; if (_mstats < unlock_mstats) { if ((_mstats + lvm_getpagesize()) < unlock_mstats) diff --git a/lib/raid/raid.c b/lib/raid/raid.c index 2efaf19..e88a154 100644 --- a/lib/raid/raid.c +++ b/lib/raid/raid.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/metadata/segtype.h" #include "lib/display/display.h" @@ -363,8 +364,8 @@ static int _raid_target_status_compatible(const char *type) static void _raid_destroy(struct segment_type *segtype) { - dm_free((void *) segtype->dso); - dm_free(segtype); + free((void *) segtype->dso); + free(segtype); } #ifdef DEVMAPPER_SUPPORT @@ -617,7 +618,7 @@ static struct segment_type *_init_raid_segtype(struct cmd_context *cmd, const char *dso, uint64_t monitored) { - struct segment_type *segtype = dm_zalloc(sizeof(*segtype)); + struct segment_type *segtype = zalloc(sizeof(*segtype)); if (!segtype) { log_error("Failed to allocate memory for %s segtype", @@ -631,7 +632,7 @@ static struct segment_type *_init_raid_segtype(struct cmd_context *cmd, /* Never monitor raid0 or raid0_meta LVs */ if (!segtype_is_any_raid0(segtype) && - dso && (dso = dm_strdup(dso))) { + dso && (dso = strdup(dso))) { segtype->dso = dso; segtype->flags |= monitored; } @@ -675,7 +676,7 @@ int init_multiple_segtypes(struct cmd_context *cmd, struct segtype_library *segl break; } - dm_free(dso); + free(dso); return r; } diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c index 4d9cd7e..3c30b35 100644 --- a/lib/snapshot/snapshot.c +++ b/lib/snapshot/snapshot.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/metadata/metadata.h" #include "lib/metadata/segtype.h" @@ -224,8 +225,8 @@ static int _snap_modules_needed(struct dm_pool *mem, static void _snap_destroy(struct segment_type *segtype) { - dm_free((void *) segtype->dso); - dm_free(segtype); + free((void *) segtype->dso); + free(segtype); } static struct segtype_handler _snapshot_ops = { @@ -253,7 +254,7 @@ struct segment_type *init_segtype(struct cmd_context *cmd); struct segment_type *init_segtype(struct cmd_context *cmd) #endif { - struct segment_type *segtype = dm_zalloc(sizeof(*segtype)); + struct segment_type *segtype = zalloc(sizeof(*segtype)); if (!segtype) return_NULL; diff --git a/lib/striped/striped.c b/lib/striped/striped.c index a9854a2..efed169 100644 --- a/lib/striped/striped.c +++ b/lib/striped/striped.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/commands/toolcontext.h" #include "lib/metadata/segtype.h" @@ -212,7 +213,7 @@ static int _striped_target_present(struct cmd_context *cmd, static void _striped_destroy(struct segment_type *segtype) { - dm_free(segtype); + free(segtype); } static struct segtype_handler _striped_ops = { @@ -232,7 +233,7 @@ static struct segtype_handler _striped_ops = { static struct segment_type *_init_segtype(struct cmd_context *cmd, const char *name, uint64_t target) { - struct segment_type *segtype = dm_zalloc(sizeof(*segtype)); + struct segment_type *segtype = zalloc(sizeof(*segtype)); if (!segtype) return_NULL; diff --git a/lib/thin/thin.c b/lib/thin/thin.c index 3c62008..d759b76 100644 --- a/lib/thin/thin.c +++ b/lib/thin/thin.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/display/display.h" #include "lib/metadata/metadata.h" @@ -745,8 +746,8 @@ static int _thin_target_present(struct cmd_context *cmd, static void _thin_destroy(struct segment_type *segtype) { - dm_free((void *) segtype->dso); - dm_free(segtype); + free((void *) segtype->dso); + free(segtype); } static struct segtype_handler _thin_pool_ops = { @@ -803,7 +804,7 @@ int init_multiple_segtypes(struct cmd_context *cmd, struct segtype_library *segl unsigned i; for (i = 0; i < DM_ARRAY_SIZE(reg_segtypes); ++i) { - segtype = dm_zalloc(sizeof(*segtype)); + segtype = zalloc(sizeof(*segtype)); if (!segtype) { log_error("Failed to allocate memory for %s segtype", diff --git a/lib/unknown/unknown.c b/lib/unknown/unknown.c index 7c2a54c..b7c06ac 100644 --- a/lib/unknown/unknown.c +++ b/lib/unknown/unknown.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/commands/toolcontext.h" #include "lib/metadata/segtype.h" @@ -49,8 +50,8 @@ static int _unknown_text_export(const struct lv_segment *seg, struct formatter * static void _unknown_destroy(struct segment_type *segtype) { - dm_free((void *) segtype->name); - dm_free(segtype); + free((void *) segtype->name); + free(segtype); } static struct segtype_handler _unknown_ops = { @@ -61,7 +62,7 @@ static struct segtype_handler _unknown_ops = { struct segment_type *init_unknown_segtype(struct cmd_context *cmd, const char *name) { - struct segment_type *segtype = dm_zalloc(sizeof(*segtype)); + struct segment_type *segtype = zalloc(sizeof(*segtype)); if (!segtype) { log_error("Failed to allocate memory for unknown segtype"); @@ -69,9 +70,9 @@ struct segment_type *init_unknown_segtype(struct cmd_context *cmd, const char *n } segtype->ops = &_unknown_ops; - if (!(segtype->name = dm_strdup(name))) { + if (!(segtype->name = strdup(name))) { log_error("Failed to allocate name."); - dm_free(segtype); + free(segtype); return NULL; } diff --git a/lib/zero/zero.c b/lib/zero/zero.c index f1e4831..cb204fc 100644 --- a/lib/zero/zero.c +++ b/lib/zero/zero.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/metadata/segtype.h" #include "lib/datastruct/str_list.h" @@ -71,7 +72,7 @@ static int _zero_modules_needed(struct dm_pool *mem, static void _zero_destroy(struct segment_type *segtype) { - dm_free(segtype); + free(segtype); } static struct segtype_handler _zero_ops = { @@ -86,7 +87,7 @@ static struct segtype_handler _zero_ops = { struct segment_type *init_zero_segtype(struct cmd_context *cmd) { - struct segment_type *segtype = dm_zalloc(sizeof(*segtype)); + struct segment_type *segtype = zalloc(sizeof(*segtype)); if (!segtype) return_NULL; diff --git a/libdaemon/client/config-util.c b/libdaemon/client/config-util.c index f8526d7..bdbdd3a 100644 --- a/libdaemon/client/config-util.c +++ b/libdaemon/client/config-util.c @@ -63,12 +63,12 @@ int buffer_append_vf(struct buffer *buf, va_list ap) !buffer_append(buf, append)) goto fail; - dm_free(append); + free(append); } return 1; fail: - dm_free(append); + free(append); return 0; } @@ -365,11 +365,11 @@ int buffer_realloc(struct buffer *buf, int needed) alloc = needed; buf->allocated += alloc; - new = dm_realloc(buf->mem, buf->allocated); + new = realloc(buf->mem, buf->allocated); if (new) buf->mem = new; else { /* utter failure */ - dm_free(buf->mem); + free(buf->mem); buf->mem = 0; buf->allocated = buf->used = 0; return 0; @@ -402,7 +402,7 @@ int buffer_line(const char *line, void *baton) void buffer_destroy(struct buffer *buf) { - dm_free(buf->mem); + free(buf->mem); buffer_init(buf); } diff --git a/libdaemon/client/daemon-client.c b/libdaemon/client/daemon-client.c index 28d7c04..53f4495 100644 --- a/libdaemon/client/daemon-client.c +++ b/libdaemon/client/daemon-client.c @@ -60,7 +60,7 @@ daemon_handle daemon_open(daemon_info i) /* Check protocol and version matches */ h.protocol = daemon_reply_str(r, "protocol", NULL); if (h.protocol) - h.protocol = dm_strdup(h.protocol); /* keep around */ + h.protocol = strdup(h.protocol); /* keep around */ h.protocol_version = daemon_reply_int(r, "version", 0); if (i.protocol && (!h.protocol || strcmp(h.protocol, i.protocol))) { @@ -85,7 +85,7 @@ error: if (r.cft) daemon_reply_destroy(r); - dm_free((char *)h.protocol); + free((char *)h.protocol); h.protocol = NULL; return h; @@ -181,7 +181,7 @@ void daemon_close(daemon_handle h) log_sys_error("close", "daemon_close"); } - dm_free((char *)h.protocol); + free((char *)h.protocol); } daemon_request daemon_request_make(const char *id) diff --git a/libdaemon/server/daemon-log.c b/libdaemon/server/daemon-log.c index 8c2a208..864f504 100644 --- a/libdaemon/server/daemon-log.c +++ b/libdaemon/server/daemon-log.c @@ -91,7 +91,7 @@ void daemon_logf(log_state *s, int type, const char *fmt, ...) { va_start(ap, fmt); if (dm_vasprintf(&buf, fmt, ap) >= 0) { daemon_log(s, type, buf); - dm_free(buf); + free(buf); } /* else return_0 */ va_end(ap); } @@ -127,7 +127,7 @@ void daemon_log_multi(log_state *s, int type, const char *prefix, const char *ms if (!_type_interesting(s, type)) return; - buf = dm_strdup(msg); + buf = strdup(msg); pos = buf; if (!buf) @@ -140,7 +140,7 @@ void daemon_log_multi(log_state *s, int type, const char *prefix, const char *ms _log_line(pos, &b); pos = next ? next + 1 : 0; } - dm_free(buf); + free(buf); } void daemon_log_enable(log_state *s, int outlet, int type, int enable) @@ -184,7 +184,7 @@ int daemon_log_parse(log_state *s, int outlet, const char *types, int enable) if (!types || !types[0]) return 1; - if (!(buf = dm_strdup(types))) + if (!(buf = strdup(types))) return 0; pos = buf; @@ -193,13 +193,13 @@ int daemon_log_parse(log_state *s, int outlet, const char *types, int enable) if (next) *next = 0; if (!_parse_one(s, outlet, pos, enable)) { - dm_free(buf); + free(buf); return 0; } pos = next ? next + 1 : 0; } - dm_free(buf); + free(buf); return 1; } diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c index 4acb00e..78c8221 100644 --- a/libdaemon/server/daemon-server.c +++ b/libdaemon/server/daemon-server.c @@ -515,7 +515,7 @@ static int _handle_connect(daemon_state s) if (fcntl(client.socket_fd, F_SETFD, FD_CLOEXEC)) WARN(&s, "setting CLOEXEC on client socket fd %d failed", client.socket_fd); - if (!(ts = dm_malloc(sizeof(thread_state)))) { + if (!(ts = malloc(sizeof(thread_state)))) { if (close(client.socket_fd)) perror("close"); ERROR(&s, "Failed to allocate thread state"); @@ -547,7 +547,7 @@ static void _reap(daemon_state s, int waiting) if ((errno = pthread_join(ts->client.thread_id, &rv))) ERROR(&s, "pthread_join failed: %s", strerror(errno)); last->next = ts->next; - dm_free(ts); + free(ts); } else last = ts; ts = last->next; diff --git a/tools/command.c b/tools/command.c index 377d03f..e1391a1 100644 --- a/tools/command.c +++ b/tools/command.c @@ -51,9 +51,9 @@ do { \ printf(fmt "\n", ##args); \ } while (0) -#define dm_malloc malloc -#define dm_strdup strdup -#define dm_free free +#define malloc malloc +#define strdup strdup +#define free free #define dm_snprintf snprintf static int dm_strncpy(char *dest, const char *src, size_t n) @@ -746,7 +746,7 @@ static void _add_oo_definition_line(const char *name, const char *line) oo = &_oo_lines[_oo_line_count++]; - if (!(oo->name = dm_strdup(name))) { + if (!(oo->name = strdup(name))) { log_error("Failer to duplicate name %s.", name); return; /* FIXME: return code */ } @@ -759,7 +759,7 @@ static void _add_oo_definition_line(const char *name, const char *line) } start = strchr(line, ':') + 2; - if (!(oo->line = dm_strdup(start))) { + if (!(oo->line = strdup(start))) { log_error("Failer to duplicate line %s.", start); return; } @@ -780,14 +780,14 @@ static void _append_oo_definition_line(const char *new_line) /* +2 = 1 space between old and new + 1 terminating \0 */ len = strlen(old_line) + strlen(new_line) + 2; - line = dm_malloc(len); + line = malloc(len); if (!line) { log_error("Parsing command defs: no memory."); return; } (void) dm_snprintf(line, len, "%s %s", old_line, new_line); - dm_free(oo->line); + free(oo->line); oo->line = line; } @@ -834,14 +834,14 @@ static void _include_optional_opt_args(struct cmd_context *cmdtool, struct comma return; } - if (!(line = dm_strdup(oo_line))) { + if (!(line = strdup(oo_line))) { cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR; return; } _split_line(line, &line_argc, line_argv, ' '); __add_optional_opt_line(cmdtool, cmd, line_argc, line_argv); - dm_free(line); + free(line); } /* @@ -1090,14 +1090,14 @@ static void _include_required_opt_args(struct cmd_context *cmdtool, struct comma return; } - if (!(line = dm_strdup(oo_line))) { + if (!(line = strdup(oo_line))) { cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR; return; } _split_line(line, &line_argc, line_argv, ' '); _add_required_opt_line(cmdtool, cmd, line_argc, line_argv); - dm_free(line); + free(line); } /* Process what follows command_name, which are required opt/pos args. */ @@ -1568,8 +1568,8 @@ int define_commands(struct cmd_context *cmdtool, const char *run_name) for (i = 0; i < _oo_line_count; i++) { struct oo_line *oo = &_oo_lines[i]; - dm_free(oo->name); - dm_free(oo->line); + free(oo->name); + free(oo->line); } memset(&_oo_lines, 0, sizeof(_oo_lines)); _oo_line_count = 0; @@ -2298,7 +2298,7 @@ static void _print_val_man(struct command_name *cname, int opt_enum, int val_enu } if (strchr(str, '|')) { - line = dm_strdup(str); + line = strdup(str); _split_line(line, &line_argc, line_argv, '|'); for (i = 0; i < line_argc; i++) { if (i) @@ -2308,7 +2308,7 @@ static void _print_val_man(struct command_name *cname, int opt_enum, int val_enu else printf("\\fB%s\\fP", line_argv[i]); } - dm_free(line); + free(line); return; } @@ -3318,7 +3318,7 @@ static int _include_description_file(char *name, char *des_file) goto out_close; } - if (!(buf = dm_malloc(statbuf.st_size + 1))) { + if (!(buf = malloc(statbuf.st_size + 1))) { log_error("Failed to allocate buffer for description file %s.", des_file); goto out_close; } @@ -3333,7 +3333,7 @@ static int _include_description_file(char *name, char *des_file) r = 1; out_free: - dm_free(buf); + free(buf); out_close: (void) close(fd); @@ -3520,7 +3520,7 @@ int main(int argc, char *argv[]) memset(&commands, 0, sizeof(commands)); - if (!(stdout_buf = dm_malloc(sz))) + if (!(stdout_buf = malloc(sz))) log_error("Failed to allocate stdout buffer; carrying on with default buffering."); else setbuffer(stdout, stdout_buf, sz); diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 5486ed3..7c5a2b3 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -17,6 +17,7 @@ */ #include "tools/tool.h" +#include "base/memory/zalloc.h" #include "device_mapper/misc/dm-logging.h" #include <ctype.h> @@ -398,7 +399,7 @@ static int _parse_file(struct dm_task *dmt, const char *file) #ifndef HAVE_GETLINE buffer_size = LINE_SIZE; - if (!(buffer = dm_malloc(buffer_size))) { + if (!(buffer = malloc(buffer_size))) { log_error("Failed to malloc line buffer."); return 0; } @@ -415,7 +416,7 @@ static int _parse_file(struct dm_task *dmt, const char *file) out: memset(buffer, 0, buffer_size); #ifndef HAVE_GETLINE - dm_free(buffer); + free(buffer); #else free(buffer); #endif @@ -509,7 +510,7 @@ static char *_extract_uuid_prefix(const char *uuid, const int separator) ptr = strchr(uuid, separator); len = ptr ? ptr - uuid : 0; - if (!(uuid_prefix = dm_malloc(len + 1))) { + if (!(uuid_prefix = malloc(len + 1))) { log_error("Failed to allocate memory to extract uuid prefix."); return NULL; } @@ -527,14 +528,14 @@ static struct dm_split_name *_get_split_name(const char *uuid, const char *name, { struct dm_split_name *split_name; - if (!(split_name = dm_malloc(sizeof(*split_name)))) { + if (!(split_name = malloc(sizeof(*split_name)))) { log_error("Failed to allocate memory to split device name " "into components."); return NULL; } if (!(split_name->subsystem = _extract_uuid_prefix(uuid, separator))) { - dm_free(split_name); + free(split_name); return_NULL; } @@ -542,7 +543,7 @@ static struct dm_split_name *_get_split_name(const char *uuid, const char *name, split_name->lv_layer = (char *) ""; if (!strcmp(split_name->subsystem, "LVM") && - (!(split_name->vg_name = dm_strdup(name)) || + (!(split_name->vg_name = strdup(name)) || !dm_split_lvm_name(NULL, NULL, &split_name->vg_name, &split_name->lv_name, &split_name->lv_layer))) log_error("Failed to allocate memory to split LVM name " @@ -558,10 +559,10 @@ static void _destroy_split_name(struct dm_split_name *split_name) * of memory as vg_name so don't need to be freed separately. */ if (!strcmp(split_name->subsystem, "LVM")) - dm_free(split_name->vg_name); + free(split_name->vg_name); - dm_free(split_name->subsystem); - dm_free(split_name); + free(split_name->subsystem); + free(split_name); } /* @@ -1220,7 +1221,7 @@ static char *_slurp_stdin(void) size_t total = 0; ssize_t n = 0; - if (!(buf = dm_malloc(bufsize))) { + if (!(buf = malloc(bufsize))) { log_error("Buffer memory allocation failed."); return NULL; } @@ -1233,7 +1234,7 @@ static char *_slurp_stdin(void) if (n < 0) { log_error("Read from stdin aborted: %s", strerror(errno)); - dm_free(buf); + free(buf); return NULL; } @@ -1244,7 +1245,7 @@ static char *_slurp_stdin(void) pos += n; if (total == bufsize - 1) { bufsize *= 2; - if (!(buf = dm_realloc(buf, bufsize))) { + if (!(buf = realloc(buf, bufsize))) { log_error("Buffer memory extension to %" PRIsize_t " bytes failed.", bufsize); return NULL; } @@ -1396,7 +1397,7 @@ static int _create_concise(const struct command *cmd, int argc, char **argv) out: if (!argc) - dm_free(concise_format); + free(concise_format); return 0; } @@ -1529,7 +1530,7 @@ static int _message(CMD_ARGS) for (i = 0; i < argc; i++) sz += strlen(argv[i]) + 1; - if (!(str = dm_zalloc(sz))) { + if (!(str = zalloc(sz))) { log_error("Message string allocation failed."); goto out; } @@ -1542,7 +1543,7 @@ static int _message(CMD_ARGS) i = dm_task_set_message(dmt, str); - dm_free(str); + free(str); if (!i) goto_out; @@ -3141,7 +3142,7 @@ static int _dm_mangled_name_disp(struct dm_report *rh, if ((name = dm_task_get_name_mangled((const struct dm_task *) data))) { r = dm_report_field_string(rh, field, (const char * const *) &name); - dm_free(name); + free(name); } return r; @@ -3157,7 +3158,7 @@ static int _dm_unmangled_name_disp(struct dm_report *rh, if ((name = dm_task_get_name_unmangled((const struct dm_task *) data))) { r = dm_report_field_string(rh, field, (const char * const *) &name); - dm_free(name); + free(name); } return r; @@ -3186,7 +3187,7 @@ static int _dm_mangled_uuid_disp(struct dm_report *rh, if ((uuid = dm_task_get_uuid_mangled((const struct dm_task *) data))) { r = dm_report_field_string(rh, field, (const char * const *) &uuid); - dm_free(uuid); + free(uuid); } return r; @@ -3202,7 +3203,7 @@ static int _dm_unmangled_uuid_disp(struct dm_report *rh, if ((uuid = dm_task_get_uuid_unmangled((const struct dm_task *) data))) { r = dm_report_field_string(rh, field, (const char * const *) &uuid); - dm_free(uuid); + free(uuid); } return r; @@ -4772,13 +4773,13 @@ static int _report_init(const struct command *cmd, const char *subcommand) char *tmpopts; opt_fields = _string_args[OPTIONS_ARG] + 1; len = strlen(options) + strlen(opt_fields) + 2; - if (!(tmpopts = dm_malloc(len))) { + if (!(tmpopts = malloc(len))) { log_error("Failed to allocate option string."); return 0; } if (dm_snprintf(tmpopts, len, "%s,%s", options, opt_fields) < 0) { - dm_free(tmpopts); + free(tmpopts); return 0; } options = tmpopts; @@ -4845,7 +4846,7 @@ static int _report_init(const struct command *cmd, const char *subcommand) out: if (len) - dm_free(options); + free(options); return r; } @@ -4950,8 +4951,8 @@ static int _mangle(CMD_ARGS) r = _do_rename(name, new_name, NULL); out: - dm_free(new_name); - dm_free(new_uuid); + free(new_name); + free(new_uuid); dm_task_destroy(dmt); return r; } @@ -5120,7 +5121,7 @@ static int _stats_group_segments(struct dm_stats *dms, uint64_t *region_ids, uint64_t group_id; int r, i; - this_region = regions = dm_malloc(bufsize); + this_region = regions = malloc(bufsize); if (!regions) { log_error("Could not allocate memory for region_id table."); @@ -5154,7 +5155,7 @@ static int _stats_group_segments(struct dm_stats *dms, uint64_t *region_ids, log_error("Failed to create group for regions %s.", regions); bad: - dm_free(regions); + free(regions); return r; } @@ -5218,7 +5219,7 @@ static int _do_stats_create_regions(struct dm_stats *dms, if (!segments || (info.target_count == 1)) region_ids = &region_id; else - region_ids = dm_malloc(info.target_count * sizeof(*region_ids)); + region_ids = malloc(info.target_count * sizeof(*region_ids)); do { uint64_t segment_start, segment_len; @@ -5262,7 +5263,7 @@ static int _do_stats_create_regions(struct dm_stats *dms, out: if (region_ids != &region_id) - dm_free(region_ids); + free(region_ids); dm_task_destroy(dmt); dm_stats_destroy(dms); @@ -5384,7 +5385,7 @@ static int _stats_create_file(CMD_ARGS) if (bounds_str && !(bounds = dm_histogram_bounds_from_string(bounds_str))) { - dm_free(abspath); + free(abspath); return_0; } @@ -5461,15 +5462,15 @@ static int _stats_create_file(CMD_ARGS) while (*(++region) != DM_STATS_REGIONS_ALL); } - dm_free(regions); - dm_free(abspath); - dm_free(bounds); + free(regions); + free(abspath); + free(bounds); dm_stats_destroy(dms); return 1; bad: - dm_free(abspath); - dm_free(bounds); + free(abspath); + free(bounds); if ((fd > -1) && close(fd)) log_sys_debug("close", path); @@ -6073,13 +6074,13 @@ out: if (close(fd)) log_sys_debug("close", abspath); - dm_free(regions); - dm_free(abspath); + free(regions); + free(abspath); dm_stats_destroy(dms); return 1; bad: - dm_free(abspath); + free(abspath); if ((fd > -1) && close(fd)) log_sys_debug("close", path); @@ -6524,7 +6525,7 @@ static char *_parse_loop_device_name(const char *dev, const char *dev_dir) char *buf; char *device = NULL; - if (!(buf = dm_malloc(PATH_MAX))) + if (!(buf = malloc(PATH_MAX))) return_NULL; if (dev[0] == '/') { @@ -6542,7 +6543,7 @@ static char *_parse_loop_device_name(const char *dev, const char *dev_dir) if (!dm_strncpy(buf, strrchr(device, '/') + 1, PATH_MAX)) goto_bad; - dm_free(device); + free(device); } else { /* check for device number */ if (strncmp(dev, "loop", sizeof("loop") - 1)) @@ -6554,8 +6555,8 @@ static char *_parse_loop_device_name(const char *dev, const char *dev_dir) return buf; bad: - dm_free(device); - dm_free(buf); + free(device); + free(buf); return NULL; } @@ -6704,7 +6705,7 @@ static int _process_losetup_switches(const char *base, int *argcp, char ***argvp if (*argcp != 2) { log_error("%s: Too few arguments.", base); _usage(stderr); - dm_free(device_name); + free(device_name); return 0; } @@ -6713,15 +6714,15 @@ static int _process_losetup_switches(const char *base, int *argcp, char ***argvp log_error("%s: Could not parse loop file name %s.", base, (*argvp)[1]); _usage(stderr); - dm_free(device_name); + free(device_name); return 0; } - _table = dm_malloc(LOOP_TABLE_SIZE); + _table = malloc(LOOP_TABLE_SIZE); if (!_table || !_loop_table(_table, (size_t) LOOP_TABLE_SIZE, loop_file, device_name, offset)) { log_error("Could not build device-mapper table for %s.", (*argvp)[0]); - dm_free(device_name); + free(device_name); return 0; } _switches[TABLE_ARG]++; @@ -7186,7 +7187,7 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) _switches[SHOWKEYS_ARG]++; if (ind == TABLE_ARG) { _switches[TABLE_ARG]++; - if (!(_table = dm_strdup(optarg))) { + if (!(_table = strdup(optarg))) { log_error("Could not allocate memory for table string."); return 0; } @@ -7450,7 +7451,7 @@ out: if (_dtree) dm_tree_free(_dtree); - dm_free(_table); + free(_table); if (_initial_timestamp) dm_timestamp_destroy(_initial_timestamp); diff --git a/tools/lvmcmdlib.c b/tools/lvmcmdlib.c index 9f94b5c..b787d09 100644 --- a/tools/lvmcmdlib.c +++ b/tools/lvmcmdlib.c @@ -60,7 +60,7 @@ int lvm2_run(void *handle, const char *cmdline) cmd->argv = argv; - if (!(cmdcopy = dm_strdup(cmdline))) { + if (!(cmdcopy = strdup(cmdline))) { log_error("Cmdline copy failed."); ret = ECMD_FAILED; goto out; @@ -91,7 +91,7 @@ int lvm2_run(void *handle, const char *cmdline) ret = lvm_run_command(cmd, argc, argv); out: - dm_free(cmdcopy); + free(cmdcopy); if (oneoff) lvm2_exit(handle); diff --git a/tools/pvck.c b/tools/pvck.c index 9030496..027df6d 100644 --- a/tools/pvck.c +++ b/tools/pvck.c @@ -13,6 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "tools.h" int pvck(struct cmd_context *cmd, int argc, char **argv) @@ -41,7 +42,7 @@ int pvck(struct cmd_context *cmd, int argc, char **argv) continue; } - if (!(devl = dm_zalloc(sizeof(*devl)))) + if (!(devl = zalloc(sizeof(*devl)))) continue; devl->dev = dev; diff --git a/tools/toollib.c b/tools/toollib.c index a4dddd3..7da1703 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1482,7 +1482,7 @@ int process_each_label(struct cmd_context *cmd, int argc, char **argv, log_error("No physical volume label read from %s.", argv[opt]); ret_max = ECMD_FAILED; } else { - if (!(devl = dm_malloc(sizeof(*devl)))) + if (!(devl = malloc(sizeof(*devl)))) return_0; devl->dev = dev; dm_list_add(&process_duplicates, &devl->list); diff --git a/tools/vgcfgbackup.c b/tools/vgcfgbackup.c index 814ed1d..7d061d5 100644 --- a/tools/vgcfgbackup.c +++ b/tools/vgcfgbackup.c @@ -21,14 +21,14 @@ static char *_expand_filename(const char *template, const char *vg_name, char *filename; if (security_level()) { - if (!(filename = dm_strdup(template))) { + if (!(filename = strdup(template))) { log_error("Failed to allocate filename."); return NULL; } goto out; } - if (!(filename = dm_malloc(PATH_MAX))) { + if (!(filename = malloc(PATH_MAX))) { log_error("Failed to allocate filename."); return NULL; } @@ -36,17 +36,17 @@ static char *_expand_filename(const char *template, const char *vg_name, if (dm_snprintf(filename, PATH_MAX, template, vg_name) < 0) { log_error("Error processing filename template %s", template); - dm_free(filename); + free(filename); return NULL; } if (*last_filename && !strncmp(*last_filename, filename, PATH_MAX)) { log_error("VGs must be backed up into different files. " "Use %%s in filename for VG name."); - dm_free(filename); + free(filename); return NULL; } out: - dm_free(*last_filename); + free(*last_filename); *last_filename = filename; return filename; @@ -102,7 +102,7 @@ int vgcfgbackup(struct cmd_context *cmd, int argc, char **argv) ret = process_each_vg(cmd, argc, argv, NULL, NULL, READ_ALLOW_INCONSISTENT, 0, handle, &_vg_backup_single); - dm_free(last_filename); + free(last_filename); init_pvmove(0);

1 0

master - device_mapper: remove c++ guards from the header
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=962a3eb3faced455b0a10… Commit: 962a3eb3faced455b0a10f8e7d4575bed65b8dbd Parent: d5da55ed85248adb066d293c2a1b863ce17d2779 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 13:44:43 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 13:44:43 2018 +0100 device_mapper: remove c++ guards from the header This isn't a public header anymore, so not needed. --- device_mapper/all.h | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/device_mapper/all.h b/device_mapper/all.h index b1d5a8c..ca0dbc7 100644 --- a/device_mapper/all.h +++ b/device_mapper/all.h @@ -43,10 +43,6 @@ #define DM_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) -#ifdef __cplusplus -extern "C" { -#endif - /***************************************************************** * The first section of this file provides direct access to the * individual device-mapper ioctls. Since it is quite laborious to @@ -3518,7 +3514,4 @@ int dm_udev_wait_immediate(uint32_t cookie, int *ready); #define DM_DEV_DIR_UMASK 0022 #define DM_CONTROL_NODE_UMASK 0177 -#ifdef __cplusplus -} -#endif #endif /* LIB_DEVICE_MAPPER_H */

1 0

master - device_mapper: rename libdevmapper.h -> all.h
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=286c1ba3369d190148042… Commit: 286c1ba3369d1901480425e305e313e8ea365da4 Parent: 88ae928ca3f950fa0ecb8b8e0aff118b7360a9d7 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 12:31:45 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 12:31:45 2018 +0100 device_mapper: rename libdevmapper.h -> all.h I'm paranoid a file will include the global one in /usr/include by accident. --- daemons/cmirrord/cluster.h | 2 +- device_mapper/all.h | 3554 ++++++++++++++++++++ device_mapper/libdevmapper.h | 3554 -------------------- device_mapper/libdm-common.h | 2 +- device_mapper/misc/dm-logging.h | 2 +- device_mapper/misc/dmlib.h | 2 +- device_mapper/vdo/status.c | 2 +- lib/config/config.h | 2 +- lib/device/bcache.h | 2 +- lib/metadata/pv.h | 2 +- lib/metadata/vg.h | 2 +- lib/misc/lib.h | 2 +- lib/report/properties.h | 2 +- .../lvm2_activation_generator_systemd_red_hat.c | 2 +- test/unit/activation-generator_t.c | 2 +- test/unit/bitset_t.c | 2 +- test/unit/config_t.c | 2 +- test/unit/dmlist_t.c | 2 +- test/unit/dmstatus_t.c | 2 +- test/unit/framework.h | 2 +- test/unit/matcher_t.c | 2 +- test/unit/percent_t.c | 2 +- test/unit/string_t.c | 2 +- tools/tool.h | 2 +- 24 files changed, 3576 insertions(+), 3576 deletions(-) diff --git a/daemons/cmirrord/cluster.h b/daemons/cmirrord/cluster.h index 54ddd79..01d4871 100644 --- a/daemons/cmirrord/cluster.h +++ b/daemons/cmirrord/cluster.h @@ -13,7 +13,7 @@ #define _LVM_CLOG_CLUSTER_H #include "device_mapper/misc/dm-log-userspace.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #define DM_ULOG_RESPONSE 0x1000U /* in last byte of 32-bit value */ #define DM_ULOG_CHECKPOINT_READY 21 diff --git a/device_mapper/all.h b/device_mapper/all.h new file mode 100644 index 0000000..f7ff4ce --- /dev/null +++ b/device_mapper/all.h @@ -0,0 +1,3554 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved. + * Copyright (C) 2006 Rackable Systems All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef LIB_DEVICE_MAPPER_H +#define LIB_DEVICE_MAPPER_H + +#include <inttypes.h> +#include <stdarg.h> +#include <sys/types.h> +#include <sys/stat.h> + +#ifdef __linux__ +# include <linux/types.h> +#endif + +#include <limits.h> +#include <string.h> +#include <stdlib.h> +#include <stdio.h> + +#include "base/data-struct/list.h" + +#include "base/data-struct/list.h" + +#ifndef __GNUC__ +# define __typeof__ typeof +#endif + +/* Macros to make string defines */ +#define DM_TO_STRING_EXP(A) #A +#define DM_TO_STRING(A) DM_TO_STRING_EXP(A) + +#define DM_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************************************************** + * The first section of this file provides direct access to the + * individual device-mapper ioctls. Since it is quite laborious to + * build the ioctl arguments for the device-mapper, people are + * encouraged to use this library. + ****************************************************************/ + +/* + * The library user may wish to register their own + * logging function. By default errors go to stderr. + * Use dm_log_with_errno_init(NULL) to restore the default log fn. + * Error messages may have a non-zero errno. + * Debug messages may have a non-zero class. + * Aborts on internal error when env DM_ABORT_ON_INTERNAL_ERRORS is 1 + */ + +typedef void (*dm_log_with_errno_fn) (int level, const char *file, int line, + int dm_errno_or_class, const char *f, ...) + __attribute__ ((format(printf, 5, 6))); + +void dm_log_with_errno_init(dm_log_with_errno_fn fn); +void dm_log_init_verbose(int level); + +/* + * Original version of this function. + * dm_errno is set to 0. + * + * Deprecated: Use the _with_errno_ versions above instead. + */ +typedef void (*dm_log_fn) (int level, const char *file, int line, + const char *f, ...) + __attribute__ ((format(printf, 4, 5))); + +void dm_log_init(dm_log_fn fn); +/* + * For backward-compatibility, indicate that dm_log_init() was used + * to set a non-default value of dm_log(). + */ +int dm_log_is_non_default(void); + +/* + * Number of devices currently in suspended state (via the library). + */ +int dm_get_suspended_counter(void); + +enum { + DM_DEVICE_CREATE, + DM_DEVICE_RELOAD, + DM_DEVICE_REMOVE, + DM_DEVICE_REMOVE_ALL, + + DM_DEVICE_SUSPEND, + DM_DEVICE_RESUME, + + DM_DEVICE_INFO, + DM_DEVICE_DEPS, + DM_DEVICE_RENAME, + + DM_DEVICE_VERSION, + + DM_DEVICE_STATUS, + DM_DEVICE_TABLE, + DM_DEVICE_WAITEVENT, + + DM_DEVICE_LIST, + + DM_DEVICE_CLEAR, + + DM_DEVICE_MKNODES, + + DM_DEVICE_LIST_VERSIONS, + + DM_DEVICE_TARGET_MSG, + + DM_DEVICE_SET_GEOMETRY +}; + +/* + * You will need to build a struct dm_task for + * each ioctl command you want to execute. + */ + +struct dm_pool; +struct dm_task; +struct dm_timestamp; + +struct dm_task *dm_task_create(int type); +void dm_task_destroy(struct dm_task *dmt); + +int dm_task_set_name(struct dm_task *dmt, const char *name); +int dm_task_set_uuid(struct dm_task *dmt, const char *uuid); + +/* + * Retrieve attributes after an info. + */ +struct dm_info { + int exists; + int suspended; + int live_table; + int inactive_table; + int32_t open_count; + uint32_t event_nr; + uint32_t major; + uint32_t minor; /* minor device number */ + int read_only; /* 0:read-write; 1:read-only */ + + int32_t target_count; + + int deferred_remove; + int internal_suspend; +}; + +struct dm_deps { + uint32_t count; + uint32_t filler; + uint64_t device[0]; +}; + +struct dm_names { + uint64_t dev; + uint32_t next; /* Offset to next struct from start of this struct */ + char name[0]; +}; + +struct dm_versions { + uint32_t next; /* Offset to next struct from start of this struct */ + uint32_t version[3]; + + char name[0]; +}; + +int dm_get_library_version(char *version, size_t size); +int dm_task_get_driver_version(struct dm_task *dmt, char *version, size_t size); +int dm_task_get_info(struct dm_task *dmt, struct dm_info *dmi); + +/* + * This function returns dm device's UUID based on the value + * of the mangling mode set during preceding dm_task_run call: + * - unmangled UUID for DM_STRING_MANGLING_{AUTO, HEX}, + * - UUID without any changes for DM_STRING_MANGLING_NONE. + * + * To get mangled or unmangled form of the UUID directly, use + * dm_task_get_uuid_mangled or dm_task_get_uuid_unmangled function. + */ +const char *dm_task_get_uuid(const struct dm_task *dmt); + +struct dm_deps *dm_task_get_deps(struct dm_task *dmt); +struct dm_versions *dm_task_get_versions(struct dm_task *dmt); +const char *dm_task_get_message_response(struct dm_task *dmt); + +/* + * These functions return device-mapper names based on the value + * of the mangling mode set during preceding dm_task_run call: + * - unmangled name for DM_STRING_MANGLING_{AUTO, HEX}, + * - name without any changes for DM_STRING_MANGLING_NONE. + * + * To get mangled or unmangled form of the name directly, use + * dm_task_get_name_mangled or dm_task_get_name_unmangled function. + */ +const char *dm_task_get_name(const struct dm_task *dmt); +struct dm_names *dm_task_get_names(struct dm_task *dmt); + +int dm_task_set_ro(struct dm_task *dmt); +int dm_task_set_newname(struct dm_task *dmt, const char *newname); +int dm_task_set_newuuid(struct dm_task *dmt, const char *newuuid); +int dm_task_set_minor(struct dm_task *dmt, int minor); +int dm_task_set_major(struct dm_task *dmt, int major); +int dm_task_set_major_minor(struct dm_task *dmt, int major, int minor, int allow_default_major_fallback); +int dm_task_set_uid(struct dm_task *dmt, uid_t uid); +int dm_task_set_gid(struct dm_task *dmt, gid_t gid); +int dm_task_set_mode(struct dm_task *dmt, mode_t mode); +/* See also description for DM_UDEV_DISABLE_LIBRARY_FALLBACK flag! */ +int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags); +int dm_task_set_event_nr(struct dm_task *dmt, uint32_t event_nr); +int dm_task_set_geometry(struct dm_task *dmt, const char *cylinders, const char *heads, const char *sectors, const char *start); +int dm_task_set_message(struct dm_task *dmt, const char *message); +int dm_task_set_sector(struct dm_task *dmt, uint64_t sector); +int dm_task_no_flush(struct dm_task *dmt); +int dm_task_no_open_count(struct dm_task *dmt); +int dm_task_skip_lockfs(struct dm_task *dmt); +int dm_task_query_inactive_table(struct dm_task *dmt); +int dm_task_suppress_identical_reload(struct dm_task *dmt); +int dm_task_secure_data(struct dm_task *dmt); +int dm_task_retry_remove(struct dm_task *dmt); +int dm_task_deferred_remove(struct dm_task *dmt); + +/* + * Record timestamp immediately after the ioctl returns. + */ +int dm_task_set_record_timestamp(struct dm_task *dmt); +struct dm_timestamp *dm_task_get_ioctl_timestamp(struct dm_task *dmt); + +/* + * Enable checks for common mistakes such as issuing ioctls in an unsafe order. + */ +int dm_task_enable_checks(struct dm_task *dmt); + +typedef enum { + DM_ADD_NODE_ON_RESUME, /* add /dev/mapper node with dmsetup resume */ + DM_ADD_NODE_ON_CREATE /* add /dev/mapper node with dmsetup create */ +} dm_add_node_t; +int dm_task_set_add_node(struct dm_task *dmt, dm_add_node_t add_node); + +/* + * Control read_ahead. + */ +#define DM_READ_AHEAD_AUTO UINT32_MAX /* Use kernel default readahead */ +#define DM_READ_AHEAD_NONE 0 /* Disable readahead */ + +#define DM_READ_AHEAD_MINIMUM_FLAG 0x1 /* Value supplied is minimum */ + +/* + * Read ahead is set with DM_DEVICE_CREATE with a table or DM_DEVICE_RESUME. + */ +int dm_task_set_read_ahead(struct dm_task *dmt, uint32_t read_ahead, + uint32_t read_ahead_flags); +uint32_t dm_task_get_read_ahead(const struct dm_task *dmt, + uint32_t *read_ahead); + +/* + * Use these to prepare for a create or reload. + */ +int dm_task_add_target(struct dm_task *dmt, + uint64_t start, + uint64_t size, const char *ttype, const char *params); + +/* + * Format major/minor numbers correctly for input to driver. + */ +#define DM_FORMAT_DEV_BUFSIZE 13 /* Minimum bufsize to handle worst case. */ +int dm_format_dev(char *buf, int bufsize, uint32_t dev_major, uint32_t dev_minor); + +/* Use this to retrive target information returned from a STATUS call */ +void *dm_get_next_target(struct dm_task *dmt, + void *next, uint64_t *start, uint64_t *length, + char **target_type, char **params); + +/* + * Following dm_get_status_* functions will allocate approriate status structure + * from passed mempool together with the necessary character arrays. + * Destroying the mempool will release all asociated allocation. + */ + +/* Parse params from STATUS call for mirror target */ +typedef enum { + DM_STATUS_MIRROR_ALIVE = 'A',/* No failures */ + DM_STATUS_MIRROR_FLUSH_FAILED = 'F',/* Mirror out-of-sync */ + DM_STATUS_MIRROR_WRITE_FAILED = 'D',/* Mirror out-of-sync */ + DM_STATUS_MIRROR_SYNC_FAILED = 'S',/* Mirror out-of-sync */ + DM_STATUS_MIRROR_READ_FAILED = 'R',/* Mirror data unaffected */ + DM_STATUS_MIRROR_UNCLASSIFIED = 'U' /* Bug */ +} dm_status_mirror_health_t; + +struct dm_status_mirror { + uint64_t total_regions; + uint64_t insync_regions; + uint32_t dev_count; /* # of devs[] elements (<= 8) */ + struct { + dm_status_mirror_health_t health; + uint32_t major; + uint32_t minor; + } *devs; /* array with individual legs */ + const char *log_type; /* core, disk,.... */ + uint32_t log_count; /* # of logs[] elements */ + struct { + dm_status_mirror_health_t health; + uint32_t major; + uint32_t minor; + } *logs; /* array with individual logs */ +}; + +int dm_get_status_mirror(struct dm_pool *mem, const char *params, + struct dm_status_mirror **status); + +/* Parse params from STATUS call for raid target */ +struct dm_status_raid { + uint64_t reserved; + uint64_t total_regions; /* sectors */ + uint64_t insync_regions; /* sectors */ + uint64_t mismatch_count; + uint32_t dev_count; + char *raid_type; + /* A - alive, a - alive not in-sync, D - dead/failed */ + char *dev_health; + /* idle, frozen, resync, recover, check, repair */ + char *sync_action; + uint64_t data_offset; /* RAID out-of-place reshaping */ +}; + +int dm_get_status_raid(struct dm_pool *mem, const char *params, + struct dm_status_raid **status); + +/* Parse params from STATUS call for cache target */ +struct dm_status_cache { + uint64_t version; /* zero for now */ + + uint32_t metadata_block_size; /* in 512B sectors */ + uint32_t block_size; /* AKA 'chunk_size' */ + + uint64_t metadata_used_blocks; + uint64_t metadata_total_blocks; + + uint64_t used_blocks; + uint64_t dirty_blocks; + uint64_t total_blocks; + + uint64_t read_hits; + uint64_t read_misses; + uint64_t write_hits; + uint64_t write_misses; + + uint64_t demotions; + uint64_t promotions; + + uint64_t feature_flags; /* DM_CACHE_FEATURE_? */ + + int core_argc; + char **core_argv; + + char *policy_name; + int policy_argc; + char **policy_argv; + + unsigned error : 1; /* detected error (switches to fail soon) */ + unsigned fail : 1; /* all I/O fails */ + unsigned needs_check : 1; /* metadata needs check */ + unsigned read_only : 1; /* metadata may not be changed */ + uint32_t reserved : 28; +}; + +int dm_get_status_cache(struct dm_pool *mem, const char *params, + struct dm_status_cache **status); + +/* + * Parse params from STATUS call for snapshot target + * + * Snapshot target's format: + * <= 1.7.0: <used_sectors>/<total_sectors> + * >= 1.8.0: <used_sectors>/<total_sectors> <metadata_sectors> + */ +struct dm_status_snapshot { + uint64_t used_sectors; /* in 512b units */ + uint64_t total_sectors; + uint64_t metadata_sectors; + unsigned has_metadata_sectors : 1; /* set when metadata_sectors is present */ + unsigned invalid : 1; /* set when snapshot is invalidated */ + unsigned merge_failed : 1; /* set when snapshot merge failed */ + unsigned overflow : 1; /* set when snapshot overflows */ +}; + +int dm_get_status_snapshot(struct dm_pool *mem, const char *params, + struct dm_status_snapshot **status); + +/* Parse params from STATUS call for thin_pool target */ +typedef enum { + DM_THIN_DISCARDS_IGNORE, + DM_THIN_DISCARDS_NO_PASSDOWN, + DM_THIN_DISCARDS_PASSDOWN +} dm_thin_discards_t; + +struct dm_status_thin_pool { + uint64_t transaction_id; + uint64_t used_metadata_blocks; + uint64_t total_metadata_blocks; + uint64_t used_data_blocks; + uint64_t total_data_blocks; + uint64_t held_metadata_root; + uint32_t read_only; /* metadata may not be changed */ + dm_thin_discards_t discards; + uint32_t fail : 1; /* all I/O fails */ + uint32_t error_if_no_space : 1; /* otherwise queue_if_no_space */ + uint32_t out_of_data_space : 1; /* metadata may be changed, but data may not be allocated (no rw) */ + uint32_t needs_check : 1; /* metadata needs check */ + uint32_t error : 1; /* detected error (switches to fail soon) */ + uint32_t reserved : 27; +}; + +int dm_get_status_thin_pool(struct dm_pool *mem, const char *params, + struct dm_status_thin_pool **status); + +/* Parse params from STATUS call for thin target */ +struct dm_status_thin { + uint64_t mapped_sectors; + uint64_t highest_mapped_sector; + uint32_t fail : 1; /* Thin volume fails I/O */ + uint32_t reserved : 31; +}; + +int dm_get_status_thin(struct dm_pool *mem, const char *params, + struct dm_status_thin **status); + +/* + * device-mapper statistics support + */ + +/* + * Statistics handle. + * + * Operations on dm_stats objects include managing statistics regions + * and obtaining and manipulating current counter values from the + * kernel. Methods are provided to return baisc count values and to + * derive time-based metrics when a suitable interval estimate is + * provided. + * + * Internally the dm_stats handle contains a pointer to a table of one + * or more dm_stats_region objects representing the regions registered + * with the dm_stats_create_region() method. These in turn point to a + * table of one or more dm_stats_counters objects containing the + * counter sets for each defined area within the region: + * + * dm_stats->dm_stats_region[nr_regions]->dm_stats_counters[nr_areas] + * + * This structure is private to the library and may change in future + * versions: all users should make use of the public interface and treat + * the dm_stats type as an opaque handle. + * + * Regions and counter sets are stored in order of increasing region_id. + * Depending on region specifications and the sequence of create and + * delete operations this may not correspond to increasing sector + * number: users of the library should not assume that this is the case + * unless region creation is deliberately managed to ensure this (by + * always creating regions in strict order of ascending sector address). + * + * Regions may also overlap so the same sector range may be included in + * more than one region or area: applications should be prepared to deal + * with this or manage regions such that it does not occur. + */ +struct dm_stats; + +/* + * Histogram handle. + * + * A histogram object represents the latency histogram values and bin + * boundaries of the histogram associated with a particular area. + * + * Operations on the handle allow the number of bins, bin boundaries, + * counts and relative proportions to be obtained as well as the + * conversion of a histogram or its bounds to a compact string + * representation. + */ +struct dm_histogram; + +/* + * Allocate a dm_stats handle to use for subsequent device-mapper + * statistics operations. A program_id may be specified and will be + * used by default for subsequent operations on this handle. + * + * If program_id is NULL or the empty string a program_id will be + * automatically set to the value contained in /proc/self/comm. + */ +struct dm_stats *dm_stats_create(const char *program_id); + +/* + * Bind a dm_stats handle to the specified device major and minor + * values. Any previous binding is cleared and any preexisting counter + * data contained in the handle is released. + */ +int dm_stats_bind_devno(struct dm_stats *dms, int major, int minor); + +/* + * Bind a dm_stats handle to the specified device name. + * Any previous binding is cleared and any preexisting counter + * data contained in the handle is released. + */ +int dm_stats_bind_name(struct dm_stats *dms, const char *name); + +/* + * Bind a dm_stats handle to the specified device UUID. + * Any previous binding is cleared and any preexisting counter + * data contained in the handle is released. + */ +int dm_stats_bind_uuid(struct dm_stats *dms, const char *uuid); + +/* + * Bind a dm_stats handle to the device backing the file referenced + * by the specified file descriptor. + * + * File descriptor fd must reference a regular file, open for reading, + * in a local file system, backed by a device-mapper device, that + * supports the FIEMAP ioctl, and that returns data describing the + * physical location of extents. + */ +int dm_stats_bind_from_fd(struct dm_stats *dms, int fd); +/* + * Test whether the running kernel supports the precise_timestamps + * feature. Presence of this feature also implies histogram support. + * The library will check this call internally and fails any attempt + * to use nanosecond counters or histograms on kernels that fail to + * meet this check. + */ +int dm_message_supports_precise_timestamps(void); + +/* + * Precise timetamps and histogram support. + * + * Test for the presence of precise_timestamps and histogram support. + */ +int dm_stats_driver_supports_precise(void); +int dm_stats_driver_supports_histogram(void); + +/* + * Returns 1 if the specified region has the precise_timestamps feature + * enabled (i.e. produces nanosecond-precision counter values) or 0 for + * a region using the default milisecond precision. + */ +int dm_stats_get_region_precise_timestamps(const struct dm_stats *dms, + uint64_t region_id); + +/* + * Returns 1 if the region at the current cursor location has the + * precise_timestamps feature enabled (i.e. produces + * nanosecond-precision counter values) or 0 for a region using the + * default milisecond precision. + */ +int dm_stats_get_current_region_precise_timestamps(const struct dm_stats *dms); + +#define DM_STATS_ALL_PROGRAMS "" +/* + * Parse the response from a @stats_list message. dm_stats_list will + * allocate the necessary dm_stats and dm_stats region structures from + * the embedded dm_pool. No counter data will be obtained (the counters + * members of dm_stats_region objects are set to NULL). + * + * A program_id may optionally be supplied; if the argument is non-NULL + * only regions with a matching program_id value will be considered. If + * the argument is NULL then the default program_id associated with the + * dm_stats handle will be used. Passing the special value + * DM_STATS_ALL_PROGRAMS will cause all regions to be queried + * regardless of region program_id. + */ +int dm_stats_list(struct dm_stats *dms, const char *program_id); + +#define DM_STATS_REGIONS_ALL UINT64_MAX +/* + * Populate a dm_stats object with statistics for one or more regions of + * the specified device. + * + * A program_id may optionally be supplied; if the argument is non-NULL + * only regions with a matching program_id value will be considered. If + * the argument is NULL then the default program_id associated with the + * dm_stats handle will be used. Passing the special value + * DM_STATS_ALL_PROGRAMS will cause all regions to be queried + * regardless of region program_id. + * + * Passing the special value DM_STATS_REGIONS_ALL as the region_id + * argument will attempt to retrieve all regions selected by the + * program_id argument. + * + * If region_id is used to request a single region_id to be populated + * the program_id is ignored. + */ +int dm_stats_populate(struct dm_stats *dms, const char *program_id, + uint64_t region_id); + +/* + * Create a new statistics region on the device bound to dms. + * + * start and len specify the region start and length in 512b sectors. + * Passing zero for both start and len will create a region spanning + * the entire device. + * + * Step determines how to subdivide the region into discrete counter + * sets: a positive value specifies the size of areas into which the + * region should be split while a negative value will split the region + * into a number of areas equal to the absolute value of step: + * + * - a region with one area spanning the entire device: + * + * dm_stats_create_region(dms, 0, 0, -1, p, a); + * + * - a region with areas of 1MiB: + * + * dm_stats_create_region(dms, 0, 0, 1 << 11, p, a); + * + * - one 1MiB region starting at 1024 sectors with two areas: + * + * dm_stats_create_region(dms, 1024, 1 << 11, -2, p, a); + * + * If precise is non-zero attempt to create a region with nanosecond + * precision counters using the kernel precise_timestamps feature. + * + * precise - A flag to request nanosecond precision counters + * to be used for this region. + * + * histogram_bounds - specify the boundaries of a latency histogram to + * be tracked for the region. The values are expressed as an array of + * uint64_t terminated with a zero. Values must be in order of ascending + * magnitude and specify the upper bounds of successive histogram bins + * in nanoseconds (with an implicit lower bound of zero on the first bin + * and an implicit upper bound of infinity on the final bin). For + * example: + * + * uint64_t bounds_ary[] = { 1000, 2000, 3000, 0 }; + * + * Specifies a histogram with four bins: 0-1000ns, 1000-2000ns, + * 2000-3000ns and >3000ns. + * + * The smallest latency value that can be tracked for a region not using + * precise_timestamps is 1ms: attempting to create a region with + * histogram boundaries < 1ms will cause the precise_timestamps feature + * to be enabled for that region automatically if it was not requested + * explicitly. + * + * program_id is an optional string argument that identifies the + * program creating the region. If program_id is NULL or the empty + * string the default program_id stored in the handle will be used. + * + * user_data is an optional string argument that is added to the + * content of the aux_data field stored with the statistics region by + * the kernel. + * + * The library may also use this space internally, for example, to + * store a group descriptor or other metadata: in this case the + * library will strip any internal data fields from the value before + * it is returned via a call to dm_stats_get_region_aux_data(). + * + * The user data stored is not accessed by the library or kernel and + * may be used to store an arbitrary data word (embedded whitespace is + * not permitted). + * + * An application using both the library and direct access to the + * @stats_list device-mapper message may see the internal values stored + * in this field by the library. In such cases any string up to and + * including the first '#' in the field must be treated as an opaque + * value and preserved across any external modification of aux_data. + * + * The region_id of the newly-created region is returned in *region_id + * if it is non-NULL. + */ +int dm_stats_create_region(struct dm_stats *dms, uint64_t *region_id, + uint64_t start, uint64_t len, int64_t step, + int precise, struct dm_histogram *bounds, + const char *program_id, const char *user_data); + +/* + * Delete the specified statistics region. This will also mark the + * region as not-present and discard any existing statistics data. + */ +int dm_stats_delete_region(struct dm_stats *dms, uint64_t region_id); + +/* + * Clear the specified statistics region. This requests the kernel to + * zero all counter values (except in-flight I/O). Note that this + * operation is not atomic with respect to reads of the counters; any IO + * events occurring between the last print operation and the clear will + * be lost. This can be avoided by using the atomic print-and-clear + * function of the dm_stats_print_region() call or by using the higher + * level dm_stats_populate() interface. + */ +int dm_stats_clear_region(struct dm_stats *dms, uint64_t region_id); + +/* + * Print the current counter values for the specified statistics region + * and return them as a string. The memory for the string buffer will + * be allocated from the dm_stats handle's private pool and should be + * returned by calling dm_stats_buffer_destroy() when no longer + * required. The pointer will become invalid following any call that + * clears or reinitializes the handle (destroy, list, populate, bind). + * + * This allows applications that wish to access the raw message response + * to obtain it via a dm_stats handle; no parsing of the textual counter + * data is carried out by this function. + * + * Most users are recommended to use the dm_stats_populate() call + * instead since this will automatically parse the statistics data into + * numeric form accessible via the dm_stats_get_*() counter access + * methods. + * + * A subset of the data lines may be requested by setting the + * start_line and num_lines parameters. If both are zero all data + * lines are returned. + * + * If the clear parameter is non-zero the operation will also + * atomically reset all counter values to zero (except in-flight IO). + */ +char *dm_stats_print_region(struct dm_stats *dms, uint64_t region_id, + unsigned start_line, unsigned num_lines, + unsigned clear); + +/* + * Destroy a statistics response buffer obtained from a call to + * dm_stats_print_region(). + */ +void dm_stats_buffer_destroy(struct dm_stats *dms, char *buffer); + +/* + * Determine the number of regions contained in a dm_stats handle + * following a dm_stats_list() or dm_stats_populate() call. + * + * The value returned is the number of registered regions visible with the + * progam_id value used for the list or populate operation and may not be + * equal to the highest present region_id (either due to program_id + * filtering or gaps in the sequence of region_id values). + * + * Always returns zero on an empty handle. + */ +uint64_t dm_stats_get_nr_regions(const struct dm_stats *dms); + +/* + * Determine the number of groups contained in a dm_stats handle + * following a dm_stats_list() or dm_stats_populate() call. + * + * The value returned is the number of registered groups visible with the + * progam_id value used for the list or populate operation and may not be + * equal to the highest present group_id (either due to program_id + * filtering or gaps in the sequence of group_id values). + * + * Always returns zero on an empty handle. + */ +uint64_t dm_stats_get_nr_groups(const struct dm_stats *dms); + +/* + * Test whether region_id is present in this dm_stats handle. + */ +int dm_stats_region_present(const struct dm_stats *dms, uint64_t region_id); + +/* + * Returns the number of areas (counter sets) contained in the specified + * region_id of the supplied dm_stats handle. + */ +uint64_t dm_stats_get_region_nr_areas(const struct dm_stats *dms, + uint64_t region_id); + +/* + * Returns the total number of areas (counter sets) in all regions of the + * given dm_stats object. + */ +uint64_t dm_stats_get_nr_areas(const struct dm_stats *dms); + +/* + * Test whether group_id is present in this dm_stats handle. + */ +int dm_stats_group_present(const struct dm_stats *dms, uint64_t group_id); + +/* + * Return the number of bins in the histogram configuration for the + * specified region or zero if no histogram specification is configured. + * Valid following a dm_stats_list() or dm_stats_populate() operation. + */ +int dm_stats_get_region_nr_histogram_bins(const struct dm_stats *dms, + uint64_t region_id); + +/* + * Parse a histogram string with optional unit suffixes into a + * dm_histogram bounds description. + * + * A histogram string is a string of numbers "n1,n2,n3,..." that + * represent the boundaries of a histogram. The first and final bins + * have implicit lower and upper bounds of zero and infinity + * respectively and boundary values must occur in order of ascending + * magnitude. Unless a unit suffix is given all values are specified in + * nanoseconds. + * + * For example, if bounds_str="300,600,900", the region will be created + * with a histogram containing four bins. Each report will include four + * numbers a:b:c:d. a is the number of requests that took between 0 and + * 300ns to complete, b is the number of requests that took 300-600ns to + * complete, c is the number of requests that took 600-900ns to complete + * and d is the number of requests that took more than 900ns to + * complete. + * + * An optional unit suffix of 's', 'ms', 'us', or 'ns' may be used to + * specify units of seconds, miliseconds, microseconds, or nanoseconds: + * + * bounds_str="1ns,1us,1ms,1s" + * bounds_str="500us,1ms,1500us,2ms" + * bounds_str="200ms,400ms,600ms,800ms,1s" + * + * The smallest valid unit of time for a histogram specification depends + * on whether the region uses precise timestamps: for a region with the + * default milisecond precision the smallest possible histogram boundary + * magnitude is one milisecond: attempting to use a histogram with a + * boundary less than one milisecond when creating a region will cause + * the region to be created with the precise_timestamps feature enabled. + * + * On sucess a pointer to the struct dm_histogram representing the + * bounds values is returned, or NULL in the case of error. The returned + * pointer should be freed using dm_free() when no longer required. + */ +struct dm_histogram *dm_histogram_bounds_from_string(const char *bounds_str); + +/* + * Parse a zero terminated array of uint64_t into a dm_histogram bounds + * description. + * + * Each value in the array specifies the upper bound of a bin in the + * latency histogram in nanoseconds. Values must appear in ascending + * order of magnitude. + * + * The smallest valid unit of time for a histogram specification depends + * on whether the region uses precise timestamps: for a region with the + * default milisecond precision the smallest possible histogram boundary + * magnitude is one milisecond: attempting to use a histogram with a + * boundary less than one milisecond when creating a region will cause + * the region to be created with the precise_timestamps feature enabled. + */ +struct dm_histogram *dm_histogram_bounds_from_uint64(const uint64_t *bounds); + +/* + * Destroy the histogram bounds array obtained from a call to + * dm_histogram_bounds_from_string(). + */ +void dm_histogram_bounds_destroy(struct dm_histogram *bounds); + +/* + * Destroy a dm_stats object and all associated regions, counter + * sets and histograms. + */ +void dm_stats_destroy(struct dm_stats *dms); + +/* + * Counter sampling interval + */ + +/* + * Set the sampling interval for counter data to the specified value in + * either nanoseconds or milliseconds. + * + * The interval is used to calculate time-based metrics from the basic + * counter data: an interval must be set before calling any of the + * metric methods. + * + * For best accuracy the duration should be measured and updated at the + * end of each interval. + * + * All values are stored internally with nanosecond precision and are + * converted to or from ms when the millisecond interfaces are used. + */ +void dm_stats_set_sampling_interval_ns(struct dm_stats *dms, + uint64_t interval_ns); + +void dm_stats_set_sampling_interval_ms(struct dm_stats *dms, + uint64_t interval_ms); + +/* + * Retrieve the configured sampling interval in either nanoseconds or + * milliseconds. + */ +uint64_t dm_stats_get_sampling_interval_ns(const struct dm_stats *dms); +uint64_t dm_stats_get_sampling_interval_ms(const struct dm_stats *dms); + +/* + * Override program_id. This may be used to change the default + * program_id value for an existing handle. If the allow_empty argument + * is non-zero a NULL or empty program_id is permitted. + * + * Use with caution! Most users of the library should set a valid, + * non-NULL program_id for every statistics region created. Failing to + * do so may result in confusing state when multiple programs are + * creating and managing statistics regions. + * + * All users of the library are encouraged to choose an unambiguous, + * unique program_id: this could be based on PID (for programs that + * create, report, and delete regions in a single process), session id, + * executable name, or some other distinguishing string. + * + * Use of the empty string as a program_id does not simplify use of the + * library or the command line tools and use of this value is strongly + * discouraged. + */ +int dm_stats_set_program_id(struct dm_stats *dms, int allow_empty, + const char *program_id); + +/* + * Region properties: size, length & area_len. + * + * Region start and length are returned in units of 512b as specified + * at region creation time. The area_len value gives the size of areas + * into which the region has been subdivided. For regions with a single + * area spanning the range this value is equal to the region length. + * + * For regions created with a specified number of areas the value + * represents the size of the areas into which the kernel divided the + * region excluding any rounding of the last area size. The number of + * areas may be obtained using the dm_stats_nr_areas_region() call. + * + * All values are returned in units of 512b sectors. + */ +int dm_stats_get_region_start(const struct dm_stats *dms, uint64_t *start, + uint64_t region_id); + +int dm_stats_get_region_len(const struct dm_stats *dms, uint64_t *len, + uint64_t region_id); + +int dm_stats_get_region_area_len(const struct dm_stats *dms, + uint64_t *len, uint64_t region_id); + +/* + * Area properties: start, offset and length. + * + * The area length is always equal to the area length of the region + * that contains it and is obtained from dm_stats_get_region_area_len(). + * + * The start of an area is a function of the area_id and the containing + * region's start and area length: it gives the absolute offset into the + * containing device of the beginning of the area. + * + * The offset expresses the area's relative offset into the current + * region. I.e. the area start minus the start offset of the containing + * region. + * + * All values are returned in units of 512b sectors. + */ +int dm_stats_get_area_start(const struct dm_stats *dms, uint64_t *start, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_area_offset(const struct dm_stats *dms, uint64_t *offset, + uint64_t region_id, uint64_t area_id); + +/* + * Retrieve program_id and user aux_data for a specific region. + * + * Only valid following a call to dm_stats_list(). + */ + +/* + * Retrieve program_id for the specified region. + * + * The returned pointer does not need to be freed separately from the + * dm_stats handle but will become invalid after a dm_stats_destroy(), + * dm_stats_list(), dm_stats_populate(), or dm_stats_bind*() of the + * handle from which it was obtained. + */ +const char *dm_stats_get_region_program_id(const struct dm_stats *dms, + uint64_t region_id); + +/* + * Retrieve user aux_data set for the specified region. This function + * will return any stored user aux_data as a string in the memory + * pointed to by the aux_data argument. + * + * Any library internal aux_data fields, such as DMS_GROUP descriptors, + * are stripped before the value is returned. + * + * The returned pointer does not need to be freed separately from the + * dm_stats handle but will become invalid after a dm_stats_destroy(), + * dm_stats_list(), dm_stats_populate(), or dm_stats_bind*() of the + * handle from which it was obtained. + */ +const char *dm_stats_get_region_aux_data(const struct dm_stats *dms, + uint64_t region_id); + +typedef enum { + DM_STATS_OBJECT_TYPE_NONE, + DM_STATS_OBJECT_TYPE_AREA, + DM_STATS_OBJECT_TYPE_REGION, + DM_STATS_OBJECT_TYPE_GROUP +} dm_stats_obj_type_t; + +/* + * Statistics cursor + * + * A dm_stats handle maintains an optional cursor into the statistics + * tables that it stores. Iterators are provided to visit each region, + * area, or group in a handle and accessor methods are provided to + * obtain properties and values for the object at the current cursor + * position. + * + * Using the cursor simplifies walking all regions or groups when + * the tables are sparse (i.e. contains some present and some + * non-present region_id or group_id values either due to program_id + * filtering or the ordering of region and group creation and deletion). + * + * Simple macros are provided to visit each area, region, or group, + * contained in a handle and applications are encouraged to use these + * where possible. + */ + +/* + * Walk flags are used to initialise a dm_stats handle's cursor control + * and to select region or group aggregation when calling a metric or + * counter property method with immediate group, region, and area ID + * values. + * + * Walk flags are stored in the uppermost word of a uint64_t so that + * a region_id or group_id may be encoded in the lower bits. This + * allows an aggregate region_id or group_id to be specified when + * retrieving counter or metric values. + * + * Flags may be ORred together when used to initialise a dm_stats_walk: + * the resulting walk will visit instance of each type specified by + * the flag combination. + */ +#define DM_STATS_WALK_AREA 0x1000000000000ULL +#define DM_STATS_WALK_REGION 0x2000000000000ULL +#define DM_STATS_WALK_GROUP 0x4000000000000ULL + +#define DM_STATS_WALK_ALL 0x7000000000000ULL +#define DM_STATS_WALK_DEFAULT (DM_STATS_WALK_AREA | DM_STATS_WALK_REGION) + +/* + * Skip regions from a DM_STATS_WALK_REGION that contain only a single + * area: in this case the region's aggregate values are identical to + * the values of the single contained area. Setting this flag will + * suppress these duplicate entries during a dm_stats_walk_* with the + * DM_STATS_WALK_REGION flag set. + */ +#define DM_STATS_WALK_SKIP_SINGLE_AREA 0x8000000000000ULL + +/* + * Initialise the cursor control of a dm_stats handle for the specified + * walk type(s). Including a walk flag in the flags argument will cause + * any subsequent walk to visit that type of object (until the next + * call to dm_stats_walk_init()). + */ +int dm_stats_walk_init(struct dm_stats *dms, uint64_t flags); + +/* + * Set the cursor of a dm_stats handle to address the first present + * group, region, or area of the currently configured walk. It is + * valid to attempt to walk a NULL stats handle or a handle containing + * no present regions; in this case any call to dm_stats_walk_next() + * becomes a no-op and all calls to dm_stats_walk_end() return true. + */ +void dm_stats_walk_start(struct dm_stats *dms); + +/* + * Advance the statistics cursor to the next area, or to the next + * present region if at the end of the current region. If the end of + * the region, area, or group tables is reached a subsequent call to + * dm_stats_walk_end() will return 1 and dm_stats_object_type() called + * on the location will return DM_STATS_OBJECT_TYPE_NONE, + */ +void dm_stats_walk_next(struct dm_stats *dms); + +/* + * Force the statistics cursor to advance to the next region. This will + * stop any in-progress area walk (by clearing DM_STATS_WALK_AREA) and + * advance the cursor to the next present region, the first present + * group (if DM_STATS_GROUP_WALK is set), or to the end. In this case a + * subsequent call to dm_stats_walk_end() will return 1 and a call to + * dm_stats_object_type() for the location will return + * DM_STATS_OBJECT_TYPE_NONE. + */ +void dm_stats_walk_next_region(struct dm_stats *dms); + +/* + * Test whether the end of a statistics walk has been reached. + */ +int dm_stats_walk_end(struct dm_stats *dms); + +/* + * Return the type of object at the location specified by region_id + * and area_id. If either region_id or area_id uses one of the special + * values DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT the + * corresponding region or area identifier will be taken from the + * current cursor location. If the cursor location or the value encoded + * by region_id and area_id indicates an aggregate region or group, + * this will be reflected in the value returned. + */ +dm_stats_obj_type_t dm_stats_object_type(const struct dm_stats *dms, + uint64_t region_id, + uint64_t area_id); + +/* + * Return the type of object at the current stats cursor location. + */ +dm_stats_obj_type_t dm_stats_current_object_type(const struct dm_stats *dms); + +/* + * Stats iterators + * + * C 'for' and 'do'/'while' style iterators for dm_stats data. + * + * It is not safe to call any function that modifies the region table + * within the loop body (i.e. dm_stats_list(), dm_stats_populate(), + * dm_stats_init(), or dm_stats_destroy()). + * + * All counter and property (dm_stats_get_*) access methods, as well as + * dm_stats_populate_region() can be safely called from loops. + * + */ + +/* + * Iterate over the regions table visiting each region. + * + * If the region table is empty or unpopulated the loop body will not be + * executed. + */ +#define dm_stats_foreach_region(dms) \ +for (dm_stats_walk_init((dms), DM_STATS_WALK_REGION), \ + dm_stats_walk_start((dms)); \ + !dm_stats_walk_end((dms)); dm_stats_walk_next_region((dms))) + +/* + * Iterate over the regions table visiting each area. + * + * If the region table is empty or unpopulated the loop body will not + * be executed. + */ +#define dm_stats_foreach_area(dms) \ +for (dm_stats_walk_init((dms), DM_STATS_WALK_AREA), \ + dm_stats_walk_start((dms)); \ + !dm_stats_walk_end((dms)); dm_stats_walk_next((dms))) + +/* + * Iterate over the regions table visiting each group. Metric and + * counter methods will return values for the group. + * + * If the group table is empty or unpopulated the loop body will not + * be executed. + */ +#define dm_stats_foreach_group(dms) \ +for (dm_stats_walk_init((dms), DM_STATS_WALK_GROUP), \ + dm_stats_walk_start(dms); \ + !dm_stats_walk_end(dms); \ + dm_stats_walk_next(dms)) + +/* + * Start a walk iterating over the regions contained in dm_stats handle + * 'dms'. + * + * The body of the loop should call dm_stats_walk_next() or + * dm_stats_walk_next_region() to advance to the next element. + * + * The loop body is executed at least once even if the stats handle is + * empty. + */ +#define dm_stats_walk_do(dms) \ +do { \ + dm_stats_walk_start((dms)); \ + do + +/* + * Start a 'while' style loop or end a 'do..while' loop iterating over the + * regions contained in dm_stats handle 'dms'. + */ +#define dm_stats_walk_while(dms) \ + while(!dm_stats_walk_end((dms))); \ +} while (0) + +/* + * Cursor relative property methods + * + * Calls with the prefix dm_stats_get_current_* operate relative to the + * current cursor location, returning properties for the current region + * or area of the supplied dm_stats handle. + * + */ + +/* + * Returns the number of areas (counter sets) contained in the current + * region of the supplied dm_stats handle. + */ +uint64_t dm_stats_get_current_nr_areas(const struct dm_stats *dms); + +/* + * Retrieve the current values of the stats cursor. + */ +uint64_t dm_stats_get_current_region(const struct dm_stats *dms); +uint64_t dm_stats_get_current_area(const struct dm_stats *dms); + +/* + * Current region properties: size, length & area_len. + * + * See the comments for the equivalent dm_stats_get_* versions for a + * complete description of these methods. + * + * All values are returned in units of 512b sectors. + */ +int dm_stats_get_current_region_start(const struct dm_stats *dms, + uint64_t *start); + +int dm_stats_get_current_region_len(const struct dm_stats *dms, + uint64_t *len); + +int dm_stats_get_current_region_area_len(const struct dm_stats *dms, + uint64_t *area_len); + +/* + * Current area properties: start and length. + * + * See the comments for the equivalent dm_stats_get_* versions for a + * complete description of these methods. + * + * All values are returned in units of 512b sectors. + */ +int dm_stats_get_current_area_start(const struct dm_stats *dms, + uint64_t *start); + +int dm_stats_get_current_area_offset(const struct dm_stats *dms, + uint64_t *offset); + +int dm_stats_get_current_area_len(const struct dm_stats *dms, + uint64_t *start); + +/* + * Return a pointer to the program_id string for region at the current + * cursor location. + */ +const char *dm_stats_get_current_region_program_id(const struct dm_stats *dms); + +/* + * Return a pointer to the user aux_data string for the region at the + * current cursor location. + */ +const char *dm_stats_get_current_region_aux_data(const struct dm_stats *dms); + +/* + * Statistics groups and data aggregation. + */ + +/* + * Create a new group in stats handle dms from the group descriptor + * passed in group. The group descriptor is a string containing a list + * of region_id values that will be included in the group. The first + * region_id found will be the group leader. Ranges of identifiers may + * be expressed as "M-N", where M and N are the start and end region_id + * values for the range. + */ +int dm_stats_create_group(struct dm_stats *dms, const char *group, + const char *alias, uint64_t *group_id); + +/* + * Remove the specified group_id. If the remove argument is zero the + * group will be removed but the regions that it contained will remain. + * If remove is non-zero then all regions that belong to the group will + * also be removed. + */ +int dm_stats_delete_group(struct dm_stats *dms, uint64_t group_id, int remove); + +/* + * Set an alias for this group or region. The alias will be returned + * instead of the normal dm-stats name for this region or group. + */ +int dm_stats_set_alias(struct dm_stats *dms, uint64_t group_id, + const char *alias); + +/* + * Returns a pointer to the currently configured alias for id, or the + * name of the dm device the handle is bound to if no alias has been + * set. The pointer will be freed automatically when a new alias is set + * or when the stats handle is cleared. + */ +const char *dm_stats_get_alias(const struct dm_stats *dms, uint64_t id); + +#define DM_STATS_GROUP_NONE UINT64_MAX +/* + * Return the group_id that the specified region_id belongs to, or the + * special value DM_STATS_GROUP_NONE if the region does not belong + * to any group. + */ +uint64_t dm_stats_get_group_id(const struct dm_stats *dms, uint64_t region_id); + +/* + * Store a pointer to a string describing the regions that are members + * of the group specified by group_id in the memory pointed to by buf. + * The string is in the same format as the 'group' argument to + * dm_stats_create_group(). + * + * The pointer does not need to be freed explicitly by the caller: it + * will become invalid following a subsequent dm_stats_list(), + * dm_stats_populate() or dm_stats_destroy() of the corresponding + * dm_stats handle. + */ +int dm_stats_get_group_descriptor(const struct dm_stats *dms, + uint64_t group_id, char **buf); + +/* + * Create regions that correspond to the extents of a file in the + * filesystem and optionally place them into a group. + * + * File descriptor fd must reference a regular file, open for reading, + * in a local file system that supports the FIEMAP ioctl, and that + * returns data describing the physical location of extents. + * + * The file descriptor can be closed by the caller following the call + * to dm_stats_create_regions_from_fd(). + * + * Unless nogroup is non-zero the regions will be placed into a group + * and the group alias set to the value supplied (if alias is NULL no + * group alias will be assigned). + * + * On success the function returns a pointer to an array of uint64_t + * containing the IDs of the newly created regions. The region_id + * array is terminated by the value DM_STATS_REGION_NOT_PRESENT and + * should be freed using dm_free() when no longer required. + * + * On error NULL is returned. + * + * Following a call to dm_stats_create_regions_from_fd() the handle + * is guaranteed to be in a listed state, and to contain any region + * and group identifiers created by the operation. + * + * The group_id for the new group is equal to the region_id value in + * the first array element. + */ +uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd, + int group, int precise, + struct dm_histogram *bounds, + const char *alias); +/* + * Update a group of regions that correspond to the extents of a file + * in the filesystem, adding and removing regions to account for + * allocation changes in the underlying file. + * + * File descriptor fd must reference a regular file, open for reading, + * in a local file system that supports the FIEMAP ioctl, and that + * returns data describing the physical location of extents. + * + * The file descriptor can be closed by the caller following the call + * to dm_stats_update_regions_from_fd(). + * + * On success the function returns a pointer to an array of uint64_t + * containing the IDs of the updated regions (including any existing + * regions that were not modified by the call). + * + * The region_id array is terminated by the special value + * DM_STATS_REGION_NOT_PRESENT and should be freed using dm_free() + * when no longer required. + * + * On error NULL is returned. + * + * Following a call to dm_stats_update_regions_from_fd() the handle + * is guaranteed to be in a listed state, and to contain any region + * and group identifiers created by the operation. + * + * This function cannot be used with file mapped regions that are + * not members of a group: either group the regions, or remove them + * and re-map them with dm_stats_create_regions_from_fd(). + */ +uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, + uint64_t group_id); + + +/* + * The file map monitoring daemon can monitor files in two distinct + * ways: the mode affects the behaviour of the daemon when a file + * under monitoring is renamed or unlinked, and the conditions which + * cause the daemon to terminate. + * + * In both modes, the daemon will always shut down when the group + * being monitored is deleted. + * + * Follow inode: + * The daemon follows the inode of the file, as it was at the time the + * daemon started. The file descriptor referencing the file is kept + * open at all times, and the daemon will exit when it detects that + * the file has been unlinked and it is the last holder of a reference + * to the file. + * + * This mode is useful if the file is expected to be renamed, or moved + * within the file system, while it is being monitored. + * + * Follow path: + * The daemon follows the path that was given on the daemon command + * line. The file descriptor referencing the file is re-opened on each + * iteration of the daemon, and the daemon will exit if no file exists + * at this location (a tolerance is allowed so that a brief delay + * between unlink() and creat() is permitted). + * + * This mode is useful if the file is updated by unlinking the original + * and placing a new file at the same path. + */ + +typedef enum { + DM_FILEMAPD_FOLLOW_INODE, + DM_FILEMAPD_FOLLOW_PATH, + DM_FILEMAPD_FOLLOW_NONE +} dm_filemapd_mode_t; + +/* + * Parse a string representation of a dmfilemapd mode. + * + * Returns a valid dm_filemapd_mode_t value on success, or + * DM_FILEMAPD_FOLLOW_NONE on error. + */ +dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str); + +/* + * Start the dmfilemapd filemap monitoring daemon for the specified + * file descriptor, group, and file system path. The daemon will + * monitor the file for allocation changes, and when a change is + * detected, call dm_stats_update_regions_from_fd() to update the + * mapped regions for the file. + * + * The path provided to dm_stats_start_filemapd() must be an absolute + * path, and should reflect the path of 'fd' at the time that it was + * opened. + * + * The mode parameter controls the behaviour of the daemon when the + * file being monitored is unlinked or moved: see the comments for + * dm_filemapd_mode_t for a full description and possible values. + * + * The daemon can be stopped at any time by sending SIGTERM to the + * daemon pid. + */ +int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, + dm_filemapd_mode_t mode, unsigned foreground, + unsigned verbose); + +/* + * Call this to actually run the ioctl. + */ +int dm_task_run(struct dm_task *dmt); + +/* + * The errno from the last device-mapper ioctl performed by dm_task_run. + */ +int dm_task_get_errno(struct dm_task *dmt); + +/* + * Call this to make or remove the device nodes associated with previously + * issued commands. + */ +void dm_task_update_nodes(void); + +/* + * Mangling support + * + * Character whitelist: 0-9, A-Z, a-z, #+-.:=@_ + * HEX mangling format: \xNN, NN being the hex value of the character. + * (whitelist and format supported by udev) +*/ +typedef enum { + DM_STRING_MANGLING_NONE, /* do not mangle at all */ + DM_STRING_MANGLING_AUTO, /* mangle only if not already mangled with hex, error when mixed */ + DM_STRING_MANGLING_HEX /* always mangle with hex encoding, no matter what the input is */ +} dm_string_mangling_t; + +/* + * Set/get mangling mode used for device-mapper names and uuids. + */ +int dm_set_name_mangling_mode(dm_string_mangling_t name_mangling); +dm_string_mangling_t dm_get_name_mangling_mode(void); + +/* + * Get mangled/unmangled form of the device-mapper name or uuid + * irrespective of the global setting (set by dm_set_name_mangling_mode). + * The name or uuid returned needs to be freed after use by calling dm_free! + */ +char *dm_task_get_name_mangled(const struct dm_task *dmt); +char *dm_task_get_name_unmangled(const struct dm_task *dmt); +char *dm_task_get_uuid_mangled(const struct dm_task *dmt); +char *dm_task_get_uuid_unmangled(const struct dm_task *dmt); + +/* + * Configure the device-mapper directory + */ +int dm_set_dev_dir(const char *dir); +const char *dm_dir(void); + +/* + * Configure sysfs directory, /sys by default + */ +int dm_set_sysfs_dir(const char *dir); +const char *dm_sysfs_dir(void); + +/* + * Configure default UUID prefix string. + * Conventionally this is a short capitalised prefix indicating the subsystem + * that is managing the devices, e.g. "LVM-" or "MPATH-". + * To support stacks of devices from different subsystems, recursive functions + * stop recursing if they reach a device with a different prefix. + */ +int dm_set_uuid_prefix(const char *uuid_prefix); +const char *dm_uuid_prefix(void); + +/* + * Determine whether a major number belongs to device-mapper or not. + */ +int dm_is_dm_major(uint32_t major); + +/* + * Get associated device name for given major and minor number by reading + * the sysfs content. If this is a dm device, get associated dm name, the one + * that appears in /dev/mapper. DM names could be resolved this way only if + * kernel used >= 2.6.29, kernel name is found otherwise (e.g. dm-0). + * If prefer_kernel_name is set, the kernel name is always preferred over + * device-mapper name for dm devices no matter what the kernel version is. + * For non-dm devices, we always get associated kernel name, e.g sda, md0 etc. + * Returns 0 on error or if sysfs is not used (or configured incorrectly), + * otherwise returns 1 and the supplied buffer holds the device name. + */ +int dm_device_get_name(uint32_t major, uint32_t minor, + int prefer_kernel_name, + char *buf, size_t buf_size); + +/* + * Determine whether a device has any holders (devices + * using this device). If sysfs is not used (or configured + * incorrectly), returns 0. + */ +int dm_device_has_holders(uint32_t major, uint32_t minor); + +/* + * Determine whether a device contains mounted filesystem. + * If sysfs is not used (or configured incorrectly), returns 0. + */ +int dm_device_has_mounted_fs(uint32_t major, uint32_t minor); + + +/* + * Callback is invoked for individal mountinfo lines, + * minor, major and mount target are parsed and unmangled. + */ +typedef int (*dm_mountinfo_line_callback_fn) (char *line, unsigned maj, unsigned min, + char *target, void *cb_data); + +/* + * Read all lines from /proc/self/mountinfo, + * for each line calls read_fn callback. + */ +int dm_mountinfo_read(dm_mountinfo_line_callback_fn read_fn, void *cb_data); + +/* + * Initialise library + */ +void dm_lib_init(void) __attribute__((constructor)); + +/* + * Release library resources + */ +void dm_lib_release(void); +void dm_lib_exit(void) __attribute__((destructor)); + +/* An optimisation for clients making repeated calls involving dm ioctls */ +void dm_hold_control_dev(int hold_open); + +/* + * Use NULL for all devices. + */ +int dm_mknodes(const char *name); +int dm_driver_version(char *version, size_t size); + +/****************************************************** + * Functions to build and manipulate trees of devices * + ******************************************************/ +struct dm_tree; +struct dm_tree_node; + +/* + * Initialise an empty dependency tree. + * + * The tree consists of a root node together with one node for each mapped + * device which has child nodes for each device referenced in its table. + * + * Every node in the tree has one or more children and one or more parents. + * + * The root node is the parent/child of every node that doesn't have other + * parents/children. + */ +struct dm_tree *dm_tree_create(void); +void dm_tree_free(struct dm_tree *tree); + +/* + * List of suffixes to be ignored when matching uuids against existing devices. + */ +void dm_tree_set_optional_uuid_suffixes(struct dm_tree *dtree, const char **optional_uuid_suffixes); + +/* + * Add nodes to the tree for a given device and all the devices it uses. + */ +int dm_tree_add_dev(struct dm_tree *tree, uint32_t major, uint32_t minor); +int dm_tree_add_dev_with_udev_flags(struct dm_tree *tree, uint32_t major, + uint32_t minor, uint16_t udev_flags); + +/* + * Add a new node to the tree if it doesn't already exist. + */ +struct dm_tree_node *dm_tree_add_new_dev(struct dm_tree *tree, + const char *name, + const char *uuid, + uint32_t major, uint32_t minor, + int read_only, + int clear_inactive, + void *context); +struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *tree, + const char *name, + const char *uuid, + uint32_t major, + uint32_t minor, + int read_only, + int clear_inactive, + void *context, + uint16_t udev_flags); + +/* + * Search for a node in the tree. + * Set major and minor to 0 or uuid to NULL to get the root node. + */ +struct dm_tree_node *dm_tree_find_node(struct dm_tree *tree, + uint32_t major, + uint32_t minor); +struct dm_tree_node *dm_tree_find_node_by_uuid(struct dm_tree *tree, + const char *uuid); + +/* + * Use this to walk through all children of a given node. + * Set handle to NULL in first call. + * Returns NULL after the last child. + * Set inverted to use inverted tree. + */ +struct dm_tree_node *dm_tree_next_child(void **handle, + const struct dm_tree_node *parent, + uint32_t inverted); + +/* + * Get properties of a node. + */ +const char *dm_tree_node_get_name(const struct dm_tree_node *node); +const char *dm_tree_node_get_uuid(const struct dm_tree_node *node); +const struct dm_info *dm_tree_node_get_info(const struct dm_tree_node *node); +void *dm_tree_node_get_context(const struct dm_tree_node *node); +/* + * Returns 0 when node size and its children is unchanged. + * Returns 1 when node or any of its children has increased size. + * Rerurns -1 when node or any of its children has reduced size. + */ +int dm_tree_node_size_changed(const struct dm_tree_node *dnode); + +/* + * Returns the number of children of the given node (excluding the root node). + * Set inverted for the number of parents. + */ +int dm_tree_node_num_children(const struct dm_tree_node *node, uint32_t inverted); + +/* + * Deactivate a device plus all dependencies. + * Ignores devices that don't have a uuid starting with uuid_prefix. + */ +int dm_tree_deactivate_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len); +/* + * Preload/create a device plus all dependencies. + * Ignores devices that don't have a uuid starting with uuid_prefix. + */ +int dm_tree_preload_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len); + +/* + * Resume a device plus all dependencies. + * Ignores devices that don't have a uuid starting with uuid_prefix. + */ +int dm_tree_activate_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len); + +/* + * Suspend a device plus all dependencies. + * Ignores devices that don't have a uuid starting with uuid_prefix. + */ +int dm_tree_suspend_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len); + +/* + * Skip the filesystem sync when suspending. + * Does nothing with other functions. + * Use this when no snapshots are involved. + */ +void dm_tree_skip_lockfs(struct dm_tree_node *dnode); + +/* + * Set the 'noflush' flag when suspending devices. + * If the kernel supports it, instead of erroring outstanding I/O that + * cannot be completed, the I/O is queued and resubmitted when the + * device is resumed. This affects multipath devices when all paths + * have failed and queue_if_no_path is set, and mirror devices when + * block_on_error is set and the mirror log has failed. + */ +void dm_tree_use_no_flush_suspend(struct dm_tree_node *dnode); + +/* + * Retry removal of each device if not successful. + */ +void dm_tree_retry_remove(struct dm_tree_node *dnode); + +/* + * Is the uuid prefix present in the tree? + * Only returns 0 if every node was checked successfully. + * Returns 1 if the tree walk has to be aborted. + */ +int dm_tree_children_use_uuid(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len); + +/* + * Construct tables for new nodes before activating them. + */ +int dm_tree_node_add_snapshot_origin_target(struct dm_tree_node *dnode, + uint64_t size, + const char *origin_uuid); +int dm_tree_node_add_snapshot_target(struct dm_tree_node *node, + uint64_t size, + const char *origin_uuid, + const char *cow_uuid, + int persistent, + uint32_t chunk_size); +int dm_tree_node_add_snapshot_merge_target(struct dm_tree_node *node, + uint64_t size, + const char *origin_uuid, + const char *cow_uuid, + const char *merge_uuid, + uint32_t chunk_size); +int dm_tree_node_add_error_target(struct dm_tree_node *node, + uint64_t size); +int dm_tree_node_add_zero_target(struct dm_tree_node *node, + uint64_t size); +int dm_tree_node_add_linear_target(struct dm_tree_node *node, + uint64_t size); +int dm_tree_node_add_striped_target(struct dm_tree_node *node, + uint64_t size, + uint32_t stripe_size); + +#define DM_CRYPT_IV_DEFAULT UINT64_C(-1) /* iv_offset == seg offset */ +/* + * Function accepts one string in cipher specification + * (chainmode and iv should be NULL because included in cipher string) + * or + * separate arguments which will be joined to "cipher-chainmode-iv" + */ +int dm_tree_node_add_crypt_target(struct dm_tree_node *node, + uint64_t size, + const char *cipher, + const char *chainmode, + const char *iv, + uint64_t iv_offset, + const char *key); +int dm_tree_node_add_mirror_target(struct dm_tree_node *node, + uint64_t size); + +/* Mirror log flags */ +#define DM_NOSYNC 0x00000001 /* Known already in sync */ +#define DM_FORCESYNC 0x00000002 /* Force resync */ +#define DM_BLOCK_ON_ERROR 0x00000004 /* On error, suspend I/O */ +#define DM_CORELOG 0x00000008 /* In-memory log */ + +int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node, + uint32_t region_size, + unsigned clustered, + const char *log_uuid, + unsigned area_count, + uint32_t flags); + +int dm_tree_node_add_raid_target(struct dm_tree_node *node, + uint64_t size, + const char *raid_type, + uint32_t region_size, + uint32_t stripe_size, + uint64_t rebuilds, + uint64_t flags); + +/* + * Defines below are based on kernel's dm-cache.c defines + * DM_CACHE_MIN_DATA_BLOCK_SIZE (32 * 1024 >> SECTOR_SHIFT) + * DM_CACHE_MAX_DATA_BLOCK_SIZE (1024 * 1024 * 1024 >> SECTOR_SHIFT) + */ +#define DM_CACHE_MIN_DATA_BLOCK_SIZE (UINT32_C(64)) +#define DM_CACHE_MAX_DATA_BLOCK_SIZE (UINT32_C(2097152)) +/* + * Max supported size for cache pool metadata device. + * Limitation is hardcoded into the kernel and bigger device sizes + * are not accepted. + * + * Limit defined in drivers/md/dm-cache-metadata.h + */ +#define DM_CACHE_METADATA_MAX_SECTORS DM_THIN_METADATA_MAX_SECTORS + +/* + * Define number of elements in rebuild and writemostly arrays + * 'of struct dm_tree_node_raid_params'. + */ + +struct dm_tree_node_raid_params { + const char *raid_type; + + uint32_t stripes; + uint32_t mirrors; + uint32_t region_size; + uint32_t stripe_size; + + /* + * 'rebuilds' and 'writemostly' are bitfields that signify + * which devices in the array are to be rebuilt or marked + * writemostly. The kernel supports up to 253 legs. + * We limit ourselves by choosing a lower value + * for DEFAULT_RAID{1}_MAX_IMAGES in defaults.h. + */ + uint64_t rebuilds; + uint64_t writemostly; + uint32_t writebehind; /* I/Os (kernel default COUNTER_MAX / 2) */ + uint32_t sync_daemon_sleep; /* ms (kernel default = 5sec) */ + uint32_t max_recovery_rate; /* kB/sec/disk */ + uint32_t min_recovery_rate; /* kB/sec/disk */ + uint32_t stripe_cache; /* sectors */ + + uint64_t flags; /* [no]sync */ + uint32_t reserved2; +}; + +/* + * Version 2 of above node raid params struct to keeep API compatibility. + * + * Extended for more than 64 legs (max 253 in the MD kernel runtime!), + * delta_disks for disk add/remove reshaping, + * data_offset for out-of-place reshaping + * and data_copies for odd number of raid10 legs. + */ +#define RAID_BITMAP_SIZE 4 /* 4 * 64 bit elements in rebuilds/writemostly arrays */ +struct dm_tree_node_raid_params_v2 { + const char *raid_type; + + uint32_t stripes; + uint32_t mirrors; + uint32_t region_size; + uint32_t stripe_size; + + int delta_disks; /* +/- number of disks to add/remove (reshaping) */ + int data_offset; /* data offset to set (out-of-place reshaping) */ + + /* + * 'rebuilds' and 'writemostly' are bitfields that signify + * which devices in the array are to be rebuilt or marked + * writemostly. The kernel supports up to 253 legs. + * We limit ourselvs by choosing a lower value + * for DEFAULT_RAID_MAX_IMAGES. + */ + uint64_t rebuilds[RAID_BITMAP_SIZE]; + uint64_t writemostly[RAID_BITMAP_SIZE]; + uint32_t writebehind; /* I/Os (kernel default COUNTER_MAX / 2) */ + uint32_t data_copies; /* RAID # of data copies */ + uint32_t sync_daemon_sleep; /* ms (kernel default = 5sec) */ + uint32_t max_recovery_rate; /* kB/sec/disk */ + uint32_t min_recovery_rate; /* kB/sec/disk */ + uint32_t stripe_cache; /* sectors */ + + uint64_t flags; /* [no]sync */ +}; + +int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node, + uint64_t size, + const struct dm_tree_node_raid_params *p); + +/* Version 2 API function taking dm_tree_node_raid_params_v2 for aforementioned extensions. */ +int dm_tree_node_add_raid_target_with_params_v2(struct dm_tree_node *node, + uint64_t size, + const struct dm_tree_node_raid_params_v2 *p); + +/* Cache feature_flags */ +#define DM_CACHE_FEATURE_WRITEBACK 0x00000001 +#define DM_CACHE_FEATURE_WRITETHROUGH 0x00000002 +#define DM_CACHE_FEATURE_PASSTHROUGH 0x00000004 +#define DM_CACHE_FEATURE_METADATA2 0x00000008 /* cache v1.10 */ + +struct dm_config_node; +/* + * Use for passing cache policy and all its args e.g.: + * + * policy_settings { + * migration_threshold=2048 + * sequention_threashold=100 + * ... + * } + * + * For policy without any parameters use NULL. + */ +int dm_tree_node_add_cache_target(struct dm_tree_node *node, + uint64_t size, + uint64_t feature_flags, /* DM_CACHE_FEATURE_* */ + const char *metadata_uuid, + const char *data_uuid, + const char *origin_uuid, + const char *policy_name, + const struct dm_config_node *policy_settings, + uint32_t data_block_size); + +/* + * FIXME Add individual cache policy pairs <key> = value, like: + * int dm_tree_node_add_cache_policy_arg(struct dm_tree_node *dnode, + * const char *key, uint64_t value); + */ + +/* + * Replicator operation mode + * Note: API for Replicator is not yet stable + */ +typedef enum { + DM_REPLICATOR_SYNC, /* Synchronous replication */ + DM_REPLICATOR_ASYNC_WARN, /* Warn if async replicator is slow */ + DM_REPLICATOR_ASYNC_STALL, /* Stall replicator if not fast enough */ + DM_REPLICATOR_ASYNC_DROP, /* Drop sites out of sync */ + DM_REPLICATOR_ASYNC_FAIL, /* Fail replicator if slow */ + NUM_DM_REPLICATOR_MODES +} dm_replicator_mode_t; + +int dm_tree_node_add_replicator_target(struct dm_tree_node *node, + uint64_t size, + const char *rlog_uuid, + const char *rlog_type, + unsigned rsite_index, + dm_replicator_mode_t mode, + uint32_t async_timeout, + uint64_t fall_behind_data, + uint32_t fall_behind_ios); + +int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node, + uint64_t size, + const char *replicator_uuid, /* Replicator control device */ + uint64_t rdevice_index, + const char *rdev_uuid, /* Rimage device name/uuid */ + unsigned rsite_index, + const char *slog_uuid, + uint32_t slog_flags, /* Mirror log flags */ + uint32_t slog_region_size); +/* End of Replicator API */ + +/* + * FIXME: Defines bellow are based on kernel's dm-thin.c defines + * DATA_DEV_BLOCK_SIZE_MIN_SECTORS (64 * 1024 >> SECTOR_SHIFT) + * DATA_DEV_BLOCK_SIZE_MAX_SECTORS (1024 * 1024 * 1024 >> SECTOR_SHIFT) + */ +#define DM_THIN_MIN_DATA_BLOCK_SIZE (UINT32_C(128)) +#define DM_THIN_MAX_DATA_BLOCK_SIZE (UINT32_C(2097152)) +/* + * Max supported size for thin pool metadata device (17112760320 bytes) + * Limitation is hardcoded into the kernel and bigger device size + * is not accepted. + * drivers/md/dm-thin-metadata.h THIN_METADATA_MAX_SECTORS + */ +#define DM_THIN_MAX_METADATA_SIZE (UINT64_C(255) * (1 << 14) * (4096 / (1 << 9)) - 256 * 1024) + +int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, + uint64_t size, + uint64_t transaction_id, + const char *metadata_uuid, + const char *pool_uuid, + uint32_t data_block_size, + uint64_t low_water_mark, + unsigned skip_block_zeroing); + +/* Supported messages for thin provision target */ +typedef enum { + DM_THIN_MESSAGE_CREATE_SNAP, /* device_id, origin_id */ + DM_THIN_MESSAGE_CREATE_THIN, /* device_id */ + DM_THIN_MESSAGE_DELETE, /* device_id */ + DM_THIN_MESSAGE_SET_TRANSACTION_ID, /* current_id, new_id */ + DM_THIN_MESSAGE_RESERVE_METADATA_SNAP, /* target version >= 1.1 */ + DM_THIN_MESSAGE_RELEASE_METADATA_SNAP, /* target version >= 1.1 */ +} dm_thin_message_t; + +int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node, + dm_thin_message_t type, + uint64_t id1, uint64_t id2); + +/* + * Set thin pool discard features + * ignore - Disable support for discards + * no_passdown - Don't pass discards down to underlying data device, + * just remove the mapping + * Feature is available since version 1.1 of the thin target. + */ +int dm_tree_node_set_thin_pool_discard(struct dm_tree_node *node, + unsigned ignore, + unsigned no_passdown); +/* + * Set error if no space, instead of queueing for thin pool. + */ +int dm_tree_node_set_thin_pool_error_if_no_space(struct dm_tree_node *node, + unsigned error_if_no_space); +/* Start thin pool with metadata in read-only mode */ +int dm_tree_node_set_thin_pool_read_only(struct dm_tree_node *node, + unsigned read_only); +/* + * FIXME: Defines bellow are based on kernel's dm-thin.c defines + * MAX_DEV_ID ((1 << 24) - 1) + */ +#define DM_THIN_MAX_DEVICE_ID (UINT32_C((1 << 24) - 1)) +int dm_tree_node_add_thin_target(struct dm_tree_node *node, + uint64_t size, + const char *pool_uuid, + uint32_t device_id); + +int dm_tree_node_set_thin_external_origin(struct dm_tree_node *node, + const char *external_uuid); + +void dm_tree_node_set_udev_flags(struct dm_tree_node *node, uint16_t udev_flags); + +void dm_tree_node_set_presuspend_node(struct dm_tree_node *node, + struct dm_tree_node *presuspend_node); + +int dm_tree_node_add_target_area(struct dm_tree_node *node, + const char *dev_name, + const char *dlid, + uint64_t offset); + +/* + * Only for temporarily-missing raid devices where changes are tracked. + */ +int dm_tree_node_add_null_area(struct dm_tree_node *node, uint64_t offset); + +/* + * Set readahead (in sectors) after loading the node. + */ +void dm_tree_node_set_read_ahead(struct dm_tree_node *dnode, + uint32_t read_ahead, + uint32_t read_ahead_flags); + +/* + * Set node callback hook before de/activation. + * Callback is called before 'activation' of node for activation tree, + * or 'deactivation' of node for deactivation tree. + */ +typedef enum { + DM_NODE_CALLBACK_PRELOADED, /* Node has preload deps */ + DM_NODE_CALLBACK_DEACTIVATED, /* Node is deactivated */ +} dm_node_callback_t; +typedef int (*dm_node_callback_fn) (struct dm_tree_node *node, + dm_node_callback_t type, void *cb_data); +void dm_tree_node_set_callback(struct dm_tree_node *node, + dm_node_callback_fn cb, void *cb_data); + +void dm_tree_set_cookie(struct dm_tree_node *node, uint32_t cookie); +uint32_t dm_tree_get_cookie(struct dm_tree_node *node); + +/***************************************************************************** + * Library functions + *****************************************************************************/ + +/******************* + * Memory management + *******************/ + +/* + * Never use these functions directly - use the macros following instead. + */ +void *dm_malloc_wrapper(size_t s, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +void *dm_malloc_aligned_wrapper(size_t s, size_t a, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +void *dm_zalloc_wrapper(size_t s, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +void *dm_realloc_wrapper(void *p, unsigned int s, const char *file, int line) + __attribute__((__warn_unused_result__)); +void dm_free_wrapper(void *ptr); +char *dm_strdup_wrapper(const char *s, const char *file, int line) + __attribute__((__warn_unused_result__)); +int dm_dump_memory_wrapper(void); +void dm_bounds_check_wrapper(void); + +#define dm_malloc(s) dm_malloc_wrapper((s), __FILE__, __LINE__) +#define dm_malloc_aligned(s, a) dm_malloc_aligned_wrapper((s), (a), __FILE__, __LINE__) +#define dm_zalloc(s) dm_zalloc_wrapper((s), __FILE__, __LINE__) +#define dm_strdup(s) dm_strdup_wrapper((s), __FILE__, __LINE__) +#define dm_free(p) dm_free_wrapper(p) +#define dm_realloc(p, s) dm_realloc_wrapper((p), (s), __FILE__, __LINE__) +#define dm_dump_memory() dm_dump_memory_wrapper() +#define dm_bounds_check() dm_bounds_check_wrapper() + +/* + * The pool allocator is useful when you are going to allocate + * lots of memory, use the memory for a bit, and then free the + * memory in one go. A surprising amount of code has this usage + * profile. + * + * You should think of the pool as an infinite, contiguous chunk + * of memory. The front of this chunk of memory contains + * allocated objects, the second half is free. dm_pool_alloc grabs + * the next 'size' bytes from the free half, in effect moving it + * into the allocated half. This operation is very efficient. + * + * dm_pool_free frees the allocated object *and* all objects + * allocated after it. It is important to note this semantic + * difference from malloc/free. This is also extremely + * efficient, since a single dm_pool_free can dispose of a large + * complex object. + * + * dm_pool_destroy frees all allocated memory. + * + * eg, If you are building a binary tree in your program, and + * know that you are only ever going to insert into your tree, + * and not delete (eg, maintaining a symbol table for a + * compiler). You can create yourself a pool, allocate the nodes + * from it, and when the tree becomes redundant call dm_pool_destroy + * (no nasty iterating through the tree to free nodes). + * + * eg, On the other hand if you wanted to repeatedly insert and + * remove objects into the tree, you would be better off + * allocating the nodes from a free list; you cannot free a + * single arbitrary node with pool. + */ + +struct dm_pool; + +/* constructor and destructor */ +struct dm_pool *dm_pool_create(const char *name, size_t chunk_hint) + __attribute__((__warn_unused_result__)); +void dm_pool_destroy(struct dm_pool *p); + +/* simple allocation/free routines */ +void *dm_pool_alloc(struct dm_pool *p, size_t s) + __attribute__((__warn_unused_result__)); +void *dm_pool_alloc_aligned(struct dm_pool *p, size_t s, unsigned alignment) + __attribute__((__warn_unused_result__)); +void dm_pool_empty(struct dm_pool *p); +void dm_pool_free(struct dm_pool *p, void *ptr); + +/* + * To aid debugging, a pool can be locked. Any modifications made + * to the content of the pool while it is locked can be detected. + * Default compilation is using a crc checksum to notice modifications. + * The pool locking is using the mprotect with the compilation flag + * DEBUG_ENFORCE_POOL_LOCKING to enforce the memory protection. + */ +/* query pool lock status */ +int dm_pool_locked(struct dm_pool *p); +/* mark pool as locked */ +int dm_pool_lock(struct dm_pool *p, int crc) + __attribute__((__warn_unused_result__)); +/* mark pool as unlocked */ +int dm_pool_unlock(struct dm_pool *p, int crc) + __attribute__((__warn_unused_result__)); + +/* + * Object building routines: + * + * These allow you to 'grow' an object, useful for + * building strings, or filling in dynamic + * arrays. + * + * It's probably best explained with an example: + * + * char *build_string(struct dm_pool *mem) + * { + * int i; + * char buffer[16]; + * + * if (!dm_pool_begin_object(mem, 128)) + * return NULL; + * + * for (i = 0; i < 50; i++) { + * snprintf(buffer, sizeof(buffer), "%d, ", i); + * if (!dm_pool_grow_object(mem, buffer, 0)) + * goto bad; + * } + * + * // add null + * if (!dm_pool_grow_object(mem, "\0", 1)) + * goto bad; + * + * return dm_pool_end_object(mem); + * + * bad: + * + * dm_pool_abandon_object(mem); + * return NULL; + *} + * + * So start an object by calling dm_pool_begin_object + * with a guess at the final object size - if in + * doubt make the guess too small. + * + * Then append chunks of data to your object with + * dm_pool_grow_object. Finally get your object with + * a call to dm_pool_end_object. + * + * Setting delta to 0 means it will use strlen(extra). + */ +int dm_pool_begin_object(struct dm_pool *p, size_t hint); +int dm_pool_grow_object(struct dm_pool *p, const void *extra, size_t delta); +void *dm_pool_end_object(struct dm_pool *p); +void dm_pool_abandon_object(struct dm_pool *p); + +/* utilities */ +char *dm_pool_strdup(struct dm_pool *p, const char *str) + __attribute__((__warn_unused_result__)); +char *dm_pool_strndup(struct dm_pool *p, const char *str, size_t n) + __attribute__((__warn_unused_result__)); +void *dm_pool_zalloc(struct dm_pool *p, size_t s) + __attribute__((__warn_unused_result__)); + +/****************** + * bitset functions + ******************/ + +typedef uint32_t *dm_bitset_t; + +dm_bitset_t dm_bitset_create(struct dm_pool *mem, unsigned num_bits); +void dm_bitset_destroy(dm_bitset_t bs); + +int dm_bitset_equal(dm_bitset_t in1, dm_bitset_t in2); + +void dm_bit_and(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2); +void dm_bit_union(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2); +int dm_bit_get_first(dm_bitset_t bs); +int dm_bit_get_next(dm_bitset_t bs, int last_bit); +int dm_bit_get_last(dm_bitset_t bs); +int dm_bit_get_prev(dm_bitset_t bs, int last_bit); + +#define DM_BITS_PER_INT (sizeof(int) * CHAR_BIT) + +#define dm_bit(bs, i) \ + ((bs)[((i) / DM_BITS_PER_INT) + 1] & (0x1 << ((i) & (DM_BITS_PER_INT - 1)))) + +#define dm_bit_set(bs, i) \ + ((bs)[((i) / DM_BITS_PER_INT) + 1] |= (0x1 << ((i) & (DM_BITS_PER_INT - 1)))) + +#define dm_bit_clear(bs, i) \ + ((bs)[((i) / DM_BITS_PER_INT) + 1] &= ~(0x1 << ((i) & (DM_BITS_PER_INT - 1)))) + +#define dm_bit_set_all(bs) \ + memset((bs) + 1, -1, ((*(bs) / DM_BITS_PER_INT) + 1) * sizeof(int)) + +#define dm_bit_clear_all(bs) \ + memset((bs) + 1, 0, ((*(bs) / DM_BITS_PER_INT) + 1) * sizeof(int)) + +#define dm_bit_copy(bs1, bs2) \ + memcpy((bs1) + 1, (bs2) + 1, ((*(bs2) / DM_BITS_PER_INT) + 1) * sizeof(int)) + +/* + * Parse a string representation of a bitset into a dm_bitset_t. The + * notation used is identical to the kernel bitmap parser (cpuset etc.) + * and supports both lists ("1,2,3") and ranges ("1-2,5-8"). If the mem + * parameter is NULL memory for the bitset will be allocated using + * dm_malloc(). Otherwise the bitset will be allocated using the supplied + * dm_pool. + */ +dm_bitset_t dm_bitset_parse_list(const char *str, struct dm_pool *mem, + size_t min_num_bits); + +/* Returns number of set bits */ +static inline unsigned hweight32(uint32_t i) +{ + unsigned r = (i & 0x55555555) + ((i >> 1) & 0x55555555); + + r = (r & 0x33333333) + ((r >> 2) & 0x33333333); + r = (r & 0x0F0F0F0F) + ((r >> 4) & 0x0F0F0F0F); + r = (r & 0x00FF00FF) + ((r >> 8) & 0x00FF00FF); + return (r & 0x0000FFFF) + ((r >> 16) & 0x0000FFFF); +} + +/**************** + * hash functions + ****************/ + +struct dm_hash_table; +struct dm_hash_node; + +typedef void (*dm_hash_iterate_fn) (void *data); + +struct dm_hash_table *dm_hash_create(unsigned size_hint) + __attribute__((__warn_unused_result__)); +void dm_hash_destroy(struct dm_hash_table *t); +void dm_hash_wipe(struct dm_hash_table *t); + +void *dm_hash_lookup(struct dm_hash_table *t, const char *key); +int dm_hash_insert(struct dm_hash_table *t, const char *key, void *data); +void dm_hash_remove(struct dm_hash_table *t, const char *key); + +void *dm_hash_lookup_binary(struct dm_hash_table *t, const void *key, uint32_t len); +int dm_hash_insert_binary(struct dm_hash_table *t, const void *key, uint32_t len, + void *data); +void dm_hash_remove_binary(struct dm_hash_table *t, const void *key, uint32_t len); + +unsigned dm_hash_get_num_entries(struct dm_hash_table *t); +void dm_hash_iter(struct dm_hash_table *t, dm_hash_iterate_fn f); + +char *dm_hash_get_key(struct dm_hash_table *t, struct dm_hash_node *n); +void *dm_hash_get_data(struct dm_hash_table *t, struct dm_hash_node *n); +struct dm_hash_node *dm_hash_get_first(struct dm_hash_table *t); +struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_node *n); + +/* + * dm_hash_insert() replaces the value of an existing + * entry with a matching key if one exists. Otherwise + * it adds a new entry. + * + * dm_hash_insert_with_val() inserts a new entry if + * another entry with the same key already exists. + * val_len is the size of the data being inserted. + * + * If two entries with the same key exist, + * (added using dm_hash_insert_allow_multiple), then: + * . dm_hash_lookup() returns the first one it finds, and + * dm_hash_lookup_with_val() returns the one with a matching + * val_len/val. + * . dm_hash_remove() removes the first one it finds, and + * dm_hash_remove_with_val() removes the one with a matching + * val_len/val. + * + * If a single entry with a given key exists, and it has + * zero val_len, then: + * . dm_hash_lookup() returns it + * . dm_hash_lookup_with_val(val_len=0) returns it + * . dm_hash_remove() removes it + * . dm_hash_remove_with_val(val_len=0) removes it + * + * dm_hash_lookup_with_count() is a single call that will + * both lookup a key's value and check if there is more + * than one entry with the given key. + * + * (It is not meant to retrieve all the entries with the + * given key. In the common case where a single entry exists + * for the key, it is useful to have a single call that will + * both look up the value and indicate if multiple values + * exist for the key.) + * + * dm_hash_lookup_with_count: + * . If no entries exist, the function returns NULL, and + * the count is set to 0. + * . If only one entry exists, the value of that entry is + * returned and count is set to 1. + * . If N entries exists, the value of the first entry is + * returned and count is set to N. + */ + +void *dm_hash_lookup_with_val(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len); +void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len); +int dm_hash_insert_allow_multiple(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len); +void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *count); + + +#define dm_hash_iterate(v, h) \ + for (v = dm_hash_get_first((h)); v; \ + v = dm_hash_get_next((h), v)) + +/********* + * selinux + *********/ + +/* + * Obtain SELinux security context assigned for the path and set this + * context for creating a new file system object. This security context + * is global and it is used until reset to default policy behaviour + * by calling 'dm_prepare_selinux_context(NULL, 0)'. + */ +int dm_prepare_selinux_context(const char *path, mode_t mode); +/* + * Set SELinux context for existing file system object. + */ +int dm_set_selinux_context(const char *path, mode_t mode); + +/********************* + * string manipulation + *********************/ + +/* + * Break up the name of a mapped device into its constituent + * Volume Group, Logical Volume and Layer (if present). + * If mem is supplied, the result is allocated from the mempool. + * Otherwise the strings are changed in situ. + */ +int dm_split_lvm_name(struct dm_pool *mem, const char *dmname, + char **vgname, char **lvname, char **layer); + +/* + * Destructively split buffer into NULL-separated words in argv. + * Returns number of words. + */ +int dm_split_words(char *buffer, unsigned max, + unsigned ignore_comments, /* Not implemented */ + char **argv); + +/* + * Returns -1 if buffer too small + */ +int dm_snprintf(char *buf, size_t bufsize, const char *format, ...) + __attribute__ ((format(printf, 3, 4))); + +/* + * Returns pointer to the last component of the path. + */ +const char *dm_basename(const char *path); + +/* + * Returns number of occurrences of 'c' in 'str' of length 'size'. + */ +unsigned dm_count_chars(const char *str, size_t len, const int c); + +/* + * Length of string after escaping double quotes and backslashes. + */ +size_t dm_escaped_len(const char *str); + +/* + * <vg>-<lv>-<layer> or if !layer just <vg>-<lv>. + */ +char *dm_build_dm_name(struct dm_pool *mem, const char *vgname, + const char *lvname, const char *layer); +char *dm_build_dm_uuid(struct dm_pool *mem, const char *prefix, const char *lvid, const char *layer); + +/* + * Copies a string, quoting double quotes with backslashes. + */ +char *dm_escape_double_quotes(char *out, const char *src); + +/* + * Undo quoting in situ. + */ +void dm_unescape_double_quotes(char *src); + +/* + * Unescape colons and "at" signs in situ and save the substrings + * starting at the position of the first unescaped colon and the + * first unescaped "at" sign. This is normally used to unescape + * device names used as PVs. + */ +void dm_unescape_colons_and_at_signs(char *src, + char **substr_first_unquoted_colon, + char **substr_first_unquoted_at_sign); + +/* + * Replacement for strncpy() function. + * + * Copies no more than n bytes from string pointed by src to the buffer + * pointed by dest and ensure string is finished with '\0'. + * Returns 0 if the whole string does not fit. + */ +int dm_strncpy(char *dest, const char *src, size_t n); + +/* + * Recognize unit specifier in the 'units' arg and return a factor + * representing that unit. If the 'units' contains a prefix with digits, + * the 'units' is considered to be a custom unit. + * + * Also, set 'unit_type' output arg to the character that represents + * the unit specified. The 'unit_type' character equals to the unit + * character itself recognized in the 'units' arg for canonical units. + * Otherwise, the 'unit_type' character is set to 'U' for custom unit. + * + * An example for k/K canonical units and 8k/8K custom units: + * + * units unit_type return value (factor) + * k k 1024 + * K K 1000 + * 8k U 1024*8 + * 8K U 1000*8 + * etc... + * + * Recognized units: + * + * h/H - human readable (returns 1 for both) + * b/B - byte (returns 1 for both) + * s/S - sector (returns 512 for both) + * k/K - kilo (returns 1024/1000 respectively) + * m/M - mega (returns 1024^2/1000^2 respectively) + * g/G - giga (returns 1024^3/1000^3 respectively) + * t/T - tera (returns 1024^4/1000^4 respectively) + * p/P - peta (returns 1024^5/1000^5 respectively) + * e/E - exa (returns 1024^6/1000^6 respectively) + * + * Only one units character is allowed in the 'units' arg + * if strict mode is enabled by 'strict' arg. + * + * The 'endptr' output arg, if not NULL, saves the pointer + * in the 'units' string which follows the unit specifier + * recognized (IOW the position where the parsing of the + * unit specifier stopped). + * + * Returns the unit factor or 0 if no unit is recognized. + */ +uint64_t dm_units_to_factor(const char *units, char *unit_type, + int strict, const char **endptr); + +/* + * Type of unit specifier used by dm_size_to_string(). + */ +typedef enum { + DM_SIZE_LONG = 0, /* Megabyte */ + DM_SIZE_SHORT = 1, /* MB or MiB */ + DM_SIZE_UNIT = 2 /* M or m */ +} dm_size_suffix_t; + +/* + * Convert a size (in 512-byte sectors) into a printable string using units of unit_type. + * An upper-case unit_type indicates output units based on powers of 1000 are + * required; a lower-case unit_type indicates powers of 1024. + * For correct operation, unit_factor must be one of: + * 0 - the correct value will be calculated internally; + * or the output from dm_units_to_factor() corresponding to unit_type; + * or 'u' or 'U', an arbitrary number of bytes to use as the power base. + * Set include_suffix to 1 to include a suffix of suffix_type. + * Set use_si_units to 0 for suffixes that don't distinguish between 1000 and 1024. + * Set use_si_units to 1 for a suffix that does distinguish. + */ +const char *dm_size_to_string(struct dm_pool *mem, uint64_t size, + char unit_type, int use_si_units, + uint64_t unit_factor, int include_suffix, + dm_size_suffix_t suffix_type); + +/************************** + * file/stream manipulation + **************************/ + +/* + * Create a directory (with parent directories if necessary). + * Returns 1 on success, 0 on failure. + */ +int dm_create_dir(const char *dir); + +int dm_is_empty_dir(const char *dir); + +/* + * Close a stream, with nicer error checking than fclose's. + * Derived from gnulib's close-stream.c. + * + * Close "stream". Return 0 if successful, and EOF (setting errno) + * otherwise. Upon failure, set errno to 0 if the error number + * cannot be determined. Useful mainly for writable streams. + */ +int dm_fclose(FILE *stream); + +/* + * Returns size of a buffer which is allocated with dm_malloc. + * Pointer to the buffer is stored in *buf. + * Returns -1 on failure leaving buf undefined. + */ +int dm_asprintf(char **buf, const char *format, ...) + __attribute__ ((format(printf, 2, 3))); +int dm_vasprintf(char **buf, const char *format, va_list ap) + __attribute__ ((format(printf, 2, 0))); + +/* + * create lockfile (pidfile) - create and lock a lock file + * @lockfile: location of lock file + * + * Returns: 1 on success, 0 otherwise, errno is handled internally + */ +int dm_create_lockfile(const char* lockfile); + +/* + * Query whether a daemon is running based on its lockfile + * + * Returns: 1 if running, 0 if not + */ +int dm_daemon_is_running(const char* lockfile); + +/********************* + * regular expressions + *********************/ +struct dm_regex; + +/* + * Initialise an array of num patterns for matching. + * Uses memory from mem. + */ +struct dm_regex *dm_regex_create(struct dm_pool *mem, const char * const *patterns, + unsigned num_patterns); + +/* + * Match string s against the patterns. + * Returns the index of the highest pattern in the array that matches, + * or -1 if none match. + */ +int dm_regex_match(struct dm_regex *regex, const char *s); + +/* + * This is useful for regression testing only. The idea is if two + * fingerprints are different, then the two dfas are certainly not + * isomorphic. If two fingerprints _are_ the same then it's very likely + * that the dfas are isomorphic. + * + * This function must be called before any matching is done. + */ +uint32_t dm_regex_fingerprint(struct dm_regex *regex); + +/****************** + * percent handling + ******************/ +/* + * A fixed-point representation of percent values. One percent equals to + * DM_PERCENT_1 as defined below. Values that are not multiples of DM_PERCENT_1 + * represent fractions, with precision of 1/1000000 of a percent. See + * dm_percent_to_float for a conversion to a floating-point representation. + * + * You should always use dm_make_percent when building dm_percent_t values. The + * implementation of dm_make_percent is biased towards the middle: it ensures that + * the result is DM_PERCENT_0 or DM_PERCENT_100 if and only if this is the actual + * value -- it never rounds any intermediate value (> 0 or < 100) to either 0 + * or 100. +*/ +#define DM_PERCENT_CHAR '%' + +typedef enum { + DM_PERCENT_0 = 0, + DM_PERCENT_1 = 1000000, + DM_PERCENT_100 = 100 * DM_PERCENT_1, + DM_PERCENT_INVALID = -1, + DM_PERCENT_FAILED = -2 +} dm_percent_range_t; + +typedef int32_t dm_percent_t; + +float dm_percent_to_float(dm_percent_t percent); +/* + * Return adjusted/rounded float for better percent value printing. + * Function ensures for given precision of digits: + * 100.0% returns only when the value is DM_PERCENT_100 + * for close smaller values rounds to nearest smaller value + * 0.0% returns only for value DM_PERCENT_0 + * for close bigger values rounds to nearest bigger value + * In all other cases returns same value as dm_percent_to_float() + */ +float dm_percent_to_round_float(dm_percent_t percent, unsigned digits); +dm_percent_t dm_make_percent(uint64_t numerator, uint64_t denominator); + +/******************** + * timestamp handling + ********************/ + +/* + * Create a dm_timestamp object to use with dm_timestamp_get. + */ +struct dm_timestamp *dm_timestamp_alloc(void); + +/* + * Update dm_timestamp object to represent the current time. + */ +int dm_timestamp_get(struct dm_timestamp *ts); + +/* + * Copy a timestamp from ts_old to ts_new. + */ +void dm_timestamp_copy(struct dm_timestamp *ts_new, struct dm_timestamp *ts_old); + +/* + * Compare two timestamps. + * + * Return: -1 if ts1 is less than ts2 + * 0 if ts1 is equal to ts2 + * 1 if ts1 is greater than ts2 + */ +int dm_timestamp_compare(struct dm_timestamp *ts1, struct dm_timestamp *ts2); + +/* + * Return the absolute difference in nanoseconds between + * the dm_timestamp objects ts1 and ts2. + * + * Callers that need to know whether ts1 is before, equal to, or after ts2 + * in addition to the magnitude should use dm_timestamp_compare. + */ +uint64_t dm_timestamp_delta(struct dm_timestamp *ts1, struct dm_timestamp *ts2); + +/* + * Destroy a dm_timestamp object. + */ +void dm_timestamp_destroy(struct dm_timestamp *ts); + +/********************* + * reporting functions + *********************/ + +struct dm_report_object_type { + uint32_t id; /* Powers of 2 */ + const char *desc; + const char *prefix; /* field id string prefix (optional) */ + /* FIXME: convert to proper usage of const pointers here */ + void *(*data_fn)(void *object); /* callback from report_object() */ +}; + +struct dm_report_field; + +/* + * dm_report_field_type flags + */ +#define DM_REPORT_FIELD_MASK 0x00000FFF +#define DM_REPORT_FIELD_ALIGN_MASK 0x0000000F +#define DM_REPORT_FIELD_ALIGN_LEFT 0x00000001 +#define DM_REPORT_FIELD_ALIGN_RIGHT 0x00000002 +#define DM_REPORT_FIELD_TYPE_MASK 0x00000FF0 +#define DM_REPORT_FIELD_TYPE_NONE 0x00000000 +#define DM_REPORT_FIELD_TYPE_STRING 0x00000010 +#define DM_REPORT_FIELD_TYPE_NUMBER 0x00000020 +#define DM_REPORT_FIELD_TYPE_SIZE 0x00000040 +#define DM_REPORT_FIELD_TYPE_PERCENT 0x00000080 +#define DM_REPORT_FIELD_TYPE_STRING_LIST 0x00000100 +#define DM_REPORT_FIELD_TYPE_TIME 0x00000200 + +/* For use with reserved values only! */ +#define DM_REPORT_FIELD_RESERVED_VALUE_MASK 0x0000000F +#define DM_REPORT_FIELD_RESERVED_VALUE_NAMED 0x00000001 /* only named value, less strict form of reservation */ +#define DM_REPORT_FIELD_RESERVED_VALUE_RANGE 0x00000002 /* value is range - low and high value defined */ +#define DM_REPORT_FIELD_RESERVED_VALUE_DYNAMIC_VALUE 0x00000004 /* value is computed in runtime */ +#define DM_REPORT_FIELD_RESERVED_VALUE_FUZZY_NAMES 0x00000008 /* value names are recognized in runtime */ + +#define DM_REPORT_FIELD_TYPE_ID_LEN 32 +#define DM_REPORT_FIELD_TYPE_HEADING_LEN 32 + +struct dm_report; +struct dm_report_field_type { + uint32_t type; /* object type id */ + uint32_t flags; /* DM_REPORT_FIELD_* */ + uint32_t offset; /* byte offset in the object */ + int32_t width; /* default width */ + /* string used to specify the field */ + const char id[DM_REPORT_FIELD_TYPE_ID_LEN]; + /* string printed in header */ + const char heading[DM_REPORT_FIELD_TYPE_HEADING_LEN]; + int (*report_fn)(struct dm_report *rh, struct dm_pool *mem, + struct dm_report_field *field, const void *data, + void *private_data); + const char *desc; /* description of the field */ +}; + +/* + * Per-field reserved value. + */ +struct dm_report_field_reserved_value { + /* field_num is the position of the field in 'fields' + array passed to dm_report_init_with_selection */ + uint32_t field_num; + /* the value is of the same type as the field + identified by field_num */ + const void *value; +}; + +/* + * Reserved value is a 'value' that is used directly if any of the 'names' is hit + * or in case of fuzzy names, if such fuzzy name matches. + * + * If type is any of DM_REPORT_FIELD_TYPE_*, the reserved value is recognized + * for all fields of that type. + * + * If type is DM_REPORT_FIELD_TYPE_NONE, the reserved value is recognized + * for the exact field specified - hence the type of the value is automatically + * the same as the type of the field itself. + * + * The array of reserved values is used to initialize reporting with + * selection enabled (see also dm_report_init_with_selection function). + */ +struct dm_report_reserved_value { + const uint32_t type; /* DM_REPORT_FIELD_RESERVED_VALUE_* and DM_REPORT_FIELD_TYPE_* */ + const void *value; /* reserved value: + uint64_t for DM_REPORT_FIELD_TYPE_NUMBER + uint64_t for DM_REPORT_FIELD_TYPE_SIZE (number of 512-byte sectors) + uint64_t for DM_REPORT_FIELD_TYPE_PERCENT + const char* for DM_REPORT_FIELD_TYPE_STRING + struct dm_report_field_reserved_value for DM_REPORT_FIELD_TYPE_NONE + dm_report_reserved_handler* if DM_REPORT_FIELD_RESERVED_VALUE_{DYNAMIC_VALUE,FUZZY_NAMES} is used */ + const char **names; /* null-terminated array of static names for this reserved value */ + const char *description; /* description of the reserved value */ +}; + +/* + * Available actions for dm_report_reserved_value_handler. + */ +typedef enum { + DM_REPORT_RESERVED_PARSE_FUZZY_NAME, + DM_REPORT_RESERVED_GET_DYNAMIC_VALUE, +} dm_report_reserved_action_t; + +/* + * Generic reserved value handler to process reserved value names and/or values. + * + * Actions and their input/output: + * + * DM_REPORT_RESERVED_PARSE_FUZZY_NAME + * data_in: const char *fuzzy_name + * data_out: const char *canonical_name, NULL if fuzzy_name not recognized + * + * DM_REPORT_RESERVED_GET_DYNAMIC_VALUE + * data_in: const char *canonical_name + * data_out: void *value, NULL if canonical_name not recognized + * + * All actions return: + * + * -1 if action not implemented + * 0 on error + * 1 on success + */ +typedef int (*dm_report_reserved_handler) (struct dm_report *rh, + struct dm_pool *mem, + uint32_t field_num, + dm_report_reserved_action_t action, + const void *data_in, + const void **data_out); + +/* + * The dm_report_value_cache_{set,get} are helper functions to store and retrieve + * various values used during reporting (dm_report_field_type.report_fn) and/or + * selection processing (dm_report_reserved_handler instances) to avoid + * recalculation of these values or to share values among calls. + */ +int dm_report_value_cache_set(struct dm_report *rh, const char *name, const void *data); +const void *dm_report_value_cache_get(struct dm_report *rh, const char *name); +/* + * dm_report_init output_flags + */ +#define DM_REPORT_OUTPUT_MASK 0x000000FF +#define DM_REPORT_OUTPUT_ALIGNED 0x00000001 +#define DM_REPORT_OUTPUT_BUFFERED 0x00000002 +#define DM_REPORT_OUTPUT_HEADINGS 0x00000004 +#define DM_REPORT_OUTPUT_FIELD_NAME_PREFIX 0x00000008 +#define DM_REPORT_OUTPUT_FIELD_UNQUOTED 0x00000010 +#define DM_REPORT_OUTPUT_COLUMNS_AS_ROWS 0x00000020 +#define DM_REPORT_OUTPUT_MULTIPLE_TIMES 0x00000040 + +struct dm_report *dm_report_init(uint32_t *report_types, + const struct dm_report_object_type *types, + const struct dm_report_field_type *fields, + const char *output_fields, + const char *output_separator, + uint32_t output_flags, + const char *sort_keys, + void *private_data); +struct dm_report *dm_report_init_with_selection(uint32_t *report_types, + const struct dm_report_object_type *types, + const struct dm_report_field_type *fields, + const char *output_fields, + const char *output_separator, + uint32_t output_flags, + const char *sort_keys, + const char *selection, + const struct dm_report_reserved_value reserved_values[], + void *private_data); +/* + * Report an object, pass it through the selection criteria if they + * are present and display the result on output if it passes the criteria. + */ +int dm_report_object(struct dm_report *rh, void *object); +/* + * The same as dm_report_object, but display the result on output only if + * 'do_output' arg is set. Also, save the result of selection in 'selected' + * arg if it's not NULL (either 1 if the object passes, otherwise 0). + */ +int dm_report_object_is_selected(struct dm_report *rh, void *object, int do_output, int *selected); + +/* + * Compact report output so that if field value is empty for all rows in + * the report, drop the field from output completely (including headers). + * Compact output is applicable only if report is buffered, otherwise + * this function has no effect. + */ +int dm_report_compact_fields(struct dm_report *rh); + +/* + * The same as dm_report_compact_fields, but for selected fields only. + * The "fields" arg is comma separated list of field names (the same format + * as used for "output_fields" arg in dm_report_init fn). + */ +int dm_report_compact_given_fields(struct dm_report *rh, const char *fields); + +/* + * Returns 1 if there is no data waiting to be output. + */ +int dm_report_is_empty(struct dm_report *rh); + +/* + * Destroy report content without doing output. + */ +void dm_report_destroy_rows(struct dm_report *rh); + +int dm_report_output(struct dm_report *rh); + +/* + * Output the report headings for a columns-based report, even if they + * have already been shown. Useful for repeating reports that wish to + * issue a periodic reminder of the column headings. + */ +int dm_report_column_headings(struct dm_report *rh); + +void dm_report_free(struct dm_report *rh); + +/* + * Prefix added to each field name with DM_REPORT_OUTPUT_FIELD_NAME_PREFIX + */ +int dm_report_set_output_field_name_prefix(struct dm_report *rh, + const char *report_prefix); + +int dm_report_set_selection(struct dm_report *rh, const char *selection); + +/* + * Report functions are provided for simple data types. + * They take care of allocating copies of the data. + */ +int dm_report_field_string(struct dm_report *rh, struct dm_report_field *field, + const char *const *data); +int dm_report_field_string_list(struct dm_report *rh, struct dm_report_field *field, + const struct dm_list *data, const char *delimiter); +int dm_report_field_string_list_unsorted(struct dm_report *rh, struct dm_report_field *field, + const struct dm_list *data, const char *delimiter); +int dm_report_field_int32(struct dm_report *rh, struct dm_report_field *field, + const int32_t *data); +int dm_report_field_uint32(struct dm_report *rh, struct dm_report_field *field, + const uint32_t *data); +int dm_report_field_int(struct dm_report *rh, struct dm_report_field *field, + const int *data); +int dm_report_field_uint64(struct dm_report *rh, struct dm_report_field *field, + const uint64_t *data); +int dm_report_field_percent(struct dm_report *rh, struct dm_report_field *field, + const dm_percent_t *data); + +/* + * For custom fields, allocate the data in 'mem' and use + * dm_report_field_set_value(). + * 'sortvalue' may be NULL if it matches 'value' + */ +void dm_report_field_set_value(struct dm_report_field *field, const void *value, + const void *sortvalue); + +/* + * Report group support. + */ +struct dm_report_group; + +typedef enum { + DM_REPORT_GROUP_SINGLE, + DM_REPORT_GROUP_BASIC, + DM_REPORT_GROUP_JSON +} dm_report_group_type_t; + +struct dm_report_group *dm_report_group_create(dm_report_group_type_t type, void *data); +int dm_report_group_push(struct dm_report_group *group, struct dm_report *report, void *data); +int dm_report_group_pop(struct dm_report_group *group); +int dm_report_group_output_and_pop_all(struct dm_report_group *group); +int dm_report_group_destroy(struct dm_report_group *group); + +/* + * Stats counter access methods + * + * Each method returns the corresponding stats counter value from the + * supplied dm_stats handle for the specified region_id and area_id. + * If either region_id or area_id uses one of the special values + * DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT then the region + * or area is selected according to the current state of the dm_stats + * handle's embedded cursor. + * + * Two methods are provided to access counter values: a named function + * for each available counter field and a single function that accepts + * an enum value specifying the required field. New code is encouraged + * to use the enum based interface as calls to the named functions are + * implemented using the enum method internally. + * + * See the kernel documentation for complete descriptions of each + * counter field: + * + * Documentation/device-mapper/statistics.txt + * Documentation/iostats.txt + * + * reads: the number of reads completed + * reads_merged: the number of reads merged + * read_sectors: the number of sectors read + * read_nsecs: the number of nanoseconds spent reading + * writes: the number of writes completed + * writes_merged: the number of writes merged + * write_sectors: the number of sectors written + * write_nsecs: the number of nanoseconds spent writing + * io_in_progress: the number of I/Os currently in progress + * io_nsecs: the number of nanoseconds spent doing I/Os + * weighted_io_nsecs: the weighted number of nanoseconds spent doing I/Os + * total_read_nsecs: the total time spent reading in nanoseconds + * total_write_nsecs: the total time spent writing in nanoseconds + */ + +#define DM_STATS_REGION_CURRENT UINT64_MAX +#define DM_STATS_AREA_CURRENT UINT64_MAX + +typedef enum { + DM_STATS_READS_COUNT, + DM_STATS_READS_MERGED_COUNT, + DM_STATS_READ_SECTORS_COUNT, + DM_STATS_READ_NSECS, + DM_STATS_WRITES_COUNT, + DM_STATS_WRITES_MERGED_COUNT, + DM_STATS_WRITE_SECTORS_COUNT, + DM_STATS_WRITE_NSECS, + DM_STATS_IO_IN_PROGRESS_COUNT, + DM_STATS_IO_NSECS, + DM_STATS_WEIGHTED_IO_NSECS, + DM_STATS_TOTAL_READ_NSECS, + DM_STATS_TOTAL_WRITE_NSECS, + DM_STATS_NR_COUNTERS +} dm_stats_counter_t; + +uint64_t dm_stats_get_counter(const struct dm_stats *dms, + dm_stats_counter_t counter, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_reads(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_reads_merged(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_read_sectors(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_read_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_writes(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_writes_merged(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_write_sectors(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_write_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_io_in_progress(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_io_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_weighted_io_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_total_read_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_total_write_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +/* + * Derived statistics access methods + * + * Each method returns the corresponding value calculated from the + * counters stored in the supplied dm_stats handle for the specified + * region_id and area_id. If either region_id or area_id uses one of the + * special values DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT then + * the region or area is selected according to the current state of the + * dm_stats handle's embedded cursor. + * + * The set of metrics is based on the fields provided by the Linux + * iostats program. + * + * rd_merges_per_sec: the number of reads merged per second + * wr_merges_per_sec: the number of writes merged per second + * reads_per_sec: the number of reads completed per second + * writes_per_sec: the number of writes completed per second + * read_sectors_per_sec: the number of sectors read per second + * write_sectors_per_sec: the number of sectors written per second + * average_request_size: the average size of requests submitted + * service_time: the average service time (in ns) for requests issued + * average_queue_size: the average queue length + * average_wait_time: the average time for requests to be served (in ns) + * average_rd_wait_time: the average read wait time + * average_wr_wait_time: the average write wait time + */ + +typedef enum { + DM_STATS_RD_MERGES_PER_SEC, + DM_STATS_WR_MERGES_PER_SEC, + DM_STATS_READS_PER_SEC, + DM_STATS_WRITES_PER_SEC, + DM_STATS_READ_SECTORS_PER_SEC, + DM_STATS_WRITE_SECTORS_PER_SEC, + DM_STATS_AVERAGE_REQUEST_SIZE, + DM_STATS_AVERAGE_QUEUE_SIZE, + DM_STATS_AVERAGE_WAIT_TIME, + DM_STATS_AVERAGE_RD_WAIT_TIME, + DM_STATS_AVERAGE_WR_WAIT_TIME, + DM_STATS_SERVICE_TIME, + DM_STATS_THROUGHPUT, + DM_STATS_UTILIZATION, + DM_STATS_NR_METRICS +} dm_stats_metric_t; + +int dm_stats_get_metric(const struct dm_stats *dms, int metric, + uint64_t region_id, uint64_t area_id, double *value); + +int dm_stats_get_rd_merges_per_sec(const struct dm_stats *dms, double *rrqm, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_wr_merges_per_sec(const struct dm_stats *dms, double *rrqm, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_reads_per_sec(const struct dm_stats *dms, double *rd_s, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_writes_per_sec(const struct dm_stats *dms, double *wr_s, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_read_sectors_per_sec(const struct dm_stats *dms, + double *rsec_s, uint64_t region_id, + uint64_t area_id); + +int dm_stats_get_write_sectors_per_sec(const struct dm_stats *dms, + double *wr_s, uint64_t region_id, + uint64_t area_id); + +int dm_stats_get_average_request_size(const struct dm_stats *dms, + double *arqsz, uint64_t region_id, + uint64_t area_id); + +int dm_stats_get_service_time(const struct dm_stats *dms, double *svctm, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_average_queue_size(const struct dm_stats *dms, double *qusz, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_average_wait_time(const struct dm_stats *dms, double *await, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_average_rd_wait_time(const struct dm_stats *dms, + double *await, uint64_t region_id, + uint64_t area_id); + +int dm_stats_get_average_wr_wait_time(const struct dm_stats *dms, + double *await, uint64_t region_id, + uint64_t area_id); + +int dm_stats_get_throughput(const struct dm_stats *dms, double *tput, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_utilization(const struct dm_stats *dms, dm_percent_t *util, + uint64_t region_id, uint64_t area_id); + +/* + * Statistics histogram access methods. + * + * Methods to access latency histograms for regions that have them + * enabled. Each histogram contains a configurable number of bins + * spanning a user defined latency interval. + * + * The bin count, upper and lower bin bounds, and bin values are + * made available via the following area methods. + * + * Methods to obtain a simple string representation of the histogram + * and its bounds are also provided. + */ + +/* + * Retrieve a pointer to the histogram associated with the specified + * area. If the area does not have a histogram configured this function + * returns NULL. + * + * The pointer does not need to be freed explicitly by the caller: it + * will become invalid following a subsequent dm_stats_list(), + * dm_stats_populate() or dm_stats_destroy() of the corresponding + * dm_stats handle. + * + * If region_id or area_id is one of the special values + * DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT the current cursor + * value is used to select the region or area. + */ +struct dm_histogram *dm_stats_get_histogram(const struct dm_stats *dms, + uint64_t region_id, + uint64_t area_id); + +/* + * Return the number of bins in the specified histogram handle. + */ +int dm_histogram_get_nr_bins(const struct dm_histogram *dmh); + +/* + * Get the lower bound of the specified bin of the histogram for the + * area specified by region_id and area_id. The value is returned in + * nanoseconds. + */ +uint64_t dm_histogram_get_bin_lower(const struct dm_histogram *dmh, int bin); + +/* + * Get the upper bound of the specified bin of the histogram for the + * area specified by region_id and area_id. The value is returned in + * nanoseconds. + */ +uint64_t dm_histogram_get_bin_upper(const struct dm_histogram *dmh, int bin); + +/* + * Get the width of the specified bin of the histogram for the area + * specified by region_id and area_id. The width is equal to the bin + * upper bound minus the lower bound and yields the range of latency + * values covered by this bin. The value is returned in nanoseconds. + */ +uint64_t dm_histogram_get_bin_width(const struct dm_histogram *dmh, int bin); + +/* + * Get the value of the specified bin of the histogram for the area + * specified by region_id and area_id. + */ +uint64_t dm_histogram_get_bin_count(const struct dm_histogram *dmh, int bin); + +/* + * Get the percentage (relative frequency) of the specified bin of the + * histogram for the area specified by region_id and area_id. + */ +dm_percent_t dm_histogram_get_bin_percent(const struct dm_histogram *dmh, + int bin); + +/* + * Return the total observations (sum of bin counts) for the histogram + * of the area specified by region_id and area_id. + */ +uint64_t dm_histogram_get_sum(const struct dm_histogram *dmh); + +/* + * Histogram formatting flags. + */ +#define DM_HISTOGRAM_SUFFIX 0x1 +#define DM_HISTOGRAM_VALUES 0x2 +#define DM_HISTOGRAM_PERCENT 0X4 +#define DM_HISTOGRAM_BOUNDS_LOWER 0x10 +#define DM_HISTOGRAM_BOUNDS_UPPER 0x20 +#define DM_HISTOGRAM_BOUNDS_RANGE 0x30 + +/* + * Return a string representation of the supplied histogram's values and + * bin boundaries. + * + * The bin argument selects the bin to format. If this argument is less + * than zero all bins will be included in the resulting string. + * + * width specifies a minimum width for the field in characters; if it is + * zero the width will be determined automatically based on the options + * selected for formatting. A value less than zero disables field width + * control: bin boundaries and values will be output with a minimum + * amount of whitespace. + * + * flags is a collection of flag arguments that control the string format: + * + * DM_HISTOGRAM_VALUES - Include bin values in the string. + * DM_HISTOGRAM_SUFFIX - Include time unit suffixes when printing bounds. + * DM_HISTOGRAM_PERCENT - Format bin values as a percentage. + * + * DM_HISTOGRAM_BOUNDS_LOWER - Include the lower bound of each bin. + * DM_HISTOGRAM_BOUNDS_UPPER - Include the upper bound of each bin. + * DM_HISTOGRAM_BOUNDS_RANGE - Show the span of each bin as "lo-up". + * + * The returned pointer does not need to be freed explicitly by the + * caller: it will become invalid following a subsequent + * dm_stats_list(), dm_stats_populate() or dm_stats_destroy() of the + * corresponding dm_stats handle. + */ +const char *dm_histogram_to_string(const struct dm_histogram *dmh, int bin, + int width, int flags); + +/************************* + * config file parse/print + *************************/ +typedef enum { + DM_CFG_INT, + DM_CFG_FLOAT, + DM_CFG_STRING, + DM_CFG_EMPTY_ARRAY +} dm_config_value_type_t; + +struct dm_config_value { + dm_config_value_type_t type; + + union { + int64_t i; + float f; + double d; /* Unused. */ + const char *str; + } v; + + struct dm_config_value *next; /* For arrays */ + uint32_t format_flags; +}; + +struct dm_config_node { + const char *key; + struct dm_config_node *parent, *sib, *child; + struct dm_config_value *v; + int id; +}; + +struct dm_config_tree { + struct dm_config_node *root; + struct dm_config_tree *cascade; + struct dm_pool *mem; + void *custom; +}; + +struct dm_config_tree *dm_config_create(void); +struct dm_config_tree *dm_config_from_string(const char *config_settings); +int dm_config_parse(struct dm_config_tree *cft, const char *start, const char *end); +int dm_config_parse_without_dup_node_check(struct dm_config_tree *cft, const char *start, const char *end); + +void *dm_config_get_custom(struct dm_config_tree *cft); +void dm_config_set_custom(struct dm_config_tree *cft, void *custom); + +/* + * When searching, first_cft is checked before second_cft. + */ +struct dm_config_tree *dm_config_insert_cascaded_tree(struct dm_config_tree *first_cft, struct dm_config_tree *second_cft); + +/* + * If there's a cascaded dm_config_tree, remove the top layer + * and return the layer below. Otherwise return NULL. + */ +struct dm_config_tree *dm_config_remove_cascaded_tree(struct dm_config_tree *cft); + +/* + * Create a new, uncascaded config tree equivalent to the input cascade. + */ +struct dm_config_tree *dm_config_flatten(struct dm_config_tree *cft); + +void dm_config_destroy(struct dm_config_tree *cft); + +/* Simple output line by line. */ +typedef int (*dm_putline_fn)(const char *line, void *baton); +/* More advaced output with config node reference. */ +typedef int (*dm_config_node_out_fn)(const struct dm_config_node *cn, const char *line, void *baton); + +/* + * Specification for advanced config node output. + */ +struct dm_config_node_out_spec { + dm_config_node_out_fn prefix_fn; /* called before processing config node lines */ + dm_config_node_out_fn line_fn; /* called for each config node line */ + dm_config_node_out_fn suffix_fn; /* called after processing config node lines */ +}; + +/* Write the node and any subsequent siblings it has. */ +int dm_config_write_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton); +int dm_config_write_node_out(const struct dm_config_node *cn, const struct dm_config_node_out_spec *out_spec, void *baton); + +/* Write given node only without subsequent siblings. */ +int dm_config_write_one_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton); +int dm_config_write_one_node_out(const struct dm_config_node *cn, const struct dm_config_node_out_spec *out_spec, void *baton); + +struct dm_config_node *dm_config_find_node(const struct dm_config_node *cn, const char *path); +int dm_config_has_node(const struct dm_config_node *cn, const char *path); +int dm_config_remove_node(struct dm_config_node *parent, struct dm_config_node *remove); +const char *dm_config_find_str(const struct dm_config_node *cn, const char *path, const char *fail); +const char *dm_config_find_str_allow_empty(const struct dm_config_node *cn, const char *path, const char *fail); +int dm_config_find_int(const struct dm_config_node *cn, const char *path, int fail); +int64_t dm_config_find_int64(const struct dm_config_node *cn, const char *path, int64_t fail); +float dm_config_find_float(const struct dm_config_node *cn, const char *path, float fail); + +const struct dm_config_node *dm_config_tree_find_node(const struct dm_config_tree *cft, const char *path); +const char *dm_config_tree_find_str(const struct dm_config_tree *cft, const char *path, const char *fail); +const char *dm_config_tree_find_str_allow_empty(const struct dm_config_tree *cft, const char *path, const char *fail); +int dm_config_tree_find_int(const struct dm_config_tree *cft, const char *path, int fail); +int64_t dm_config_tree_find_int64(const struct dm_config_tree *cft, const char *path, int64_t fail); +float dm_config_tree_find_float(const struct dm_config_tree *cft, const char *path, float fail); +int dm_config_tree_find_bool(const struct dm_config_tree *cft, const char *path, int fail); + +/* + * Understands (0, ~0), (y, n), (yes, no), (on, + * off), (true, false). + */ +int dm_config_find_bool(const struct dm_config_node *cn, const char *path, int fail); +int dm_config_value_is_bool(const struct dm_config_value *v); + +int dm_config_get_uint32(const struct dm_config_node *cn, const char *path, uint32_t *result); +int dm_config_get_uint64(const struct dm_config_node *cn, const char *path, uint64_t *result); +int dm_config_get_str(const struct dm_config_node *cn, const char *path, const char **result); +int dm_config_get_list(const struct dm_config_node *cn, const char *path, const struct dm_config_value **result); +int dm_config_get_section(const struct dm_config_node *cn, const char *path, const struct dm_config_node **result); + +unsigned dm_config_maybe_section(const char *str, unsigned len); + +const char *dm_config_parent_name(const struct dm_config_node *n); + +struct dm_config_node *dm_config_clone_node_with_mem(struct dm_pool *mem, const struct dm_config_node *node, int siblings); +struct dm_config_node *dm_config_create_node(struct dm_config_tree *cft, const char *key); +struct dm_config_value *dm_config_create_value(struct dm_config_tree *cft); +struct dm_config_node *dm_config_clone_node(struct dm_config_tree *cft, const struct dm_config_node *cn, int siblings); + +/* + * Common formatting flags applicable to all config node types (lower 16 bits). + */ +#define DM_CONFIG_VALUE_FMT_COMMON_ARRAY 0x00000001 /* value is array */ +#define DM_CONFIG_VALUE_FMT_COMMON_EXTRA_SPACES 0x00000002 /* add spaces in "key = value" pairs in constrast to "key=value" for better readability */ + +/* + * Type-related config node formatting flags (higher 16 bits). + */ +/* int-related formatting flags */ +#define DM_CONFIG_VALUE_FMT_INT_OCTAL 0x00010000 /* print number in octal form */ + +/* string-related formatting flags */ +#define DM_CONFIG_VALUE_FMT_STRING_NO_QUOTES 0x00010000 /* do not print quotes around string value */ + +void dm_config_value_set_format_flags(struct dm_config_value *cv, uint32_t format_flags); +uint32_t dm_config_value_get_format_flags(struct dm_config_value *cv); + +struct dm_pool *dm_config_memory(struct dm_config_tree *cft); + +/* Udev device directory. */ +#define DM_UDEV_DEV_DIR "/dev/" + +/* Cookie prefixes. + * + * The cookie value consists of a prefix (16 bits) and a base (16 bits). + * We can use the prefix to store the flags. These flags are sent to + * kernel within given dm task. When returned back to userspace in + * DM_COOKIE udev environment variable, we can control several aspects + * of udev rules we use by decoding the cookie prefix. When doing the + * notification, we replace the cookie prefix with DM_COOKIE_MAGIC, + * so we notify the right semaphore. + * + * It is still possible to use cookies for passing the flags to udev + * rules even when udev_sync is disabled. The base part of the cookie + * will be zero (there's no notification semaphore) and prefix will be + * set then. However, having udev_sync enabled is highly recommended. + */ +#define DM_COOKIE_MAGIC 0x0D4D +#define DM_UDEV_FLAGS_MASK 0xFFFF0000 +#define DM_UDEV_FLAGS_SHIFT 16 + +/* + * DM_UDEV_DISABLE_DM_RULES_FLAG is set in case we need to disable + * basic device-mapper udev rules that create symlinks in /dev/<DM_DIR> + * directory. However, we can't reliably prevent creating default + * nodes by udev (commonly /dev/dm-X, where X is a number). + */ +#define DM_UDEV_DISABLE_DM_RULES_FLAG 0x0001 +/* + * DM_UDEV_DISABLE_SUBSYTEM_RULES_FLAG is set in case we need to disable + * subsystem udev rules, but still we need the general DM udev rules to + * be applied (to create the nodes and symlinks under /dev and /dev/disk). + */ +#define DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG 0x0002 +/* + * DM_UDEV_DISABLE_DISK_RULES_FLAG is set in case we need to disable + * general DM rules that set symlinks in /dev/disk directory. + */ +#define DM_UDEV_DISABLE_DISK_RULES_FLAG 0x0004 +/* + * DM_UDEV_DISABLE_OTHER_RULES_FLAG is set in case we need to disable + * all the other rules that are not general device-mapper nor subsystem + * related (the rules belong to other software or packages). All foreign + * rules should check this flag directly and they should ignore further + * rule processing for such event. + */ +#define DM_UDEV_DISABLE_OTHER_RULES_FLAG 0x0008 +/* + * DM_UDEV_LOW_PRIORITY_FLAG is set in case we need to instruct the + * udev rules to give low priority to the device that is currently + * processed. For example, this provides a way to select which symlinks + * could be overwritten by high priority ones if their names are equal. + * Common situation is a name based on FS UUID while using origin and + * snapshot devices. + */ +#define DM_UDEV_LOW_PRIORITY_FLAG 0x0010 +/* + * DM_UDEV_DISABLE_LIBRARY_FALLBACK is set in case we need to disable + * libdevmapper's node management. We will rely on udev completely + * and there will be no fallback action provided by libdevmapper if + * udev does something improperly. Using the library fallback code has + * a consequence that you need to take into account: any device node + * or symlink created without udev is not recorded in udev database + * which other applications may read to get complete list of devices. + * For this reason, use of DM_UDEV_DISABLE_LIBRARY_FALLBACK is + * recommended on systems where udev is used. Keep library fallback + * enabled just for exceptional cases where you need to debug udev-related + * problems. If you hit such problems, please contact us through upstream + * LVM2 development mailing list (see also README file). This flag is + * currently not set by default in libdevmapper so you need to set it + * explicitly if you're sure that udev is behaving correctly on your + * setups. + */ +#define DM_UDEV_DISABLE_LIBRARY_FALLBACK 0x0020 +/* + * DM_UDEV_PRIMARY_SOURCE_FLAG is automatically appended by + * libdevmapper for all ioctls generating udev uevents. Once used in + * udev rules, we know if this is a real "primary sourced" event or not. + * We need to distinguish real events originated in libdevmapper from + * any spurious events to gather all missing information (e.g. events + * generated as a result of "udevadm trigger" command or as a result + * of the "watch" udev rule). + */ +#define DM_UDEV_PRIMARY_SOURCE_FLAG 0x0040 + +/* + * Udev flags reserved for use by any device-mapper subsystem. + */ +#define DM_SUBSYSTEM_UDEV_FLAG0 0x0100 +#define DM_SUBSYSTEM_UDEV_FLAG1 0x0200 +#define DM_SUBSYSTEM_UDEV_FLAG2 0x0400 +#define DM_SUBSYSTEM_UDEV_FLAG3 0x0800 +#define DM_SUBSYSTEM_UDEV_FLAG4 0x1000 +#define DM_SUBSYSTEM_UDEV_FLAG5 0x2000 +#define DM_SUBSYSTEM_UDEV_FLAG6 0x4000 +#define DM_SUBSYSTEM_UDEV_FLAG7 0x8000 + +int dm_cookie_supported(void); + +/* + * Udev synchronisation functions. + */ +void dm_udev_set_sync_support(int sync_with_udev); +int dm_udev_get_sync_support(void); +void dm_udev_set_checking(int checking); +int dm_udev_get_checking(void); + +/* + * Default value to get new auto generated cookie created + */ +#define DM_COOKIE_AUTO_CREATE 0 +int dm_udev_create_cookie(uint32_t *cookie); +int dm_udev_complete(uint32_t cookie); +int dm_udev_wait(uint32_t cookie); + +/* + * dm_dev_wait_immediate + * If *ready is 1 on return, the wait is complete. + * If *ready is 0 on return, the wait is incomplete and either + * this function or dm_udev_wait() must be called again. + * Returns 0 on error, when neither function should be called again. + */ +int dm_udev_wait_immediate(uint32_t cookie, int *ready); + +#define DM_DEV_DIR_UMASK 0022 +#define DM_CONTROL_NODE_UMASK 0177 + +#ifdef __cplusplus +} +#endif +#endif /* LIB_DEVICE_MAPPER_H */ diff --git a/device_mapper/libdevmapper.h b/device_mapper/libdevmapper.h deleted file mode 100644 index f7ff4ce..0000000 --- a/device_mapper/libdevmapper.h +++ /dev/null @@ -1,3554 +0,0 @@ -/* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved. - * Copyright (C) 2006 Rackable Systems All rights reserved. - * - * This file is part of the device-mapper userspace tools. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef LIB_DEVICE_MAPPER_H -#define LIB_DEVICE_MAPPER_H - -#include <inttypes.h> -#include <stdarg.h> -#include <sys/types.h> -#include <sys/stat.h> - -#ifdef __linux__ -# include <linux/types.h> -#endif - -#include <limits.h> -#include <string.h> -#include <stdlib.h> -#include <stdio.h> - -#include "base/data-struct/list.h" - -#include "base/data-struct/list.h" - -#ifndef __GNUC__ -# define __typeof__ typeof -#endif - -/* Macros to make string defines */ -#define DM_TO_STRING_EXP(A) #A -#define DM_TO_STRING(A) DM_TO_STRING_EXP(A) - -#define DM_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) - -#ifdef __cplusplus -extern "C" { -#endif - -/***************************************************************** - * The first section of this file provides direct access to the - * individual device-mapper ioctls. Since it is quite laborious to - * build the ioctl arguments for the device-mapper, people are - * encouraged to use this library. - ****************************************************************/ - -/* - * The library user may wish to register their own - * logging function. By default errors go to stderr. - * Use dm_log_with_errno_init(NULL) to restore the default log fn. - * Error messages may have a non-zero errno. - * Debug messages may have a non-zero class. - * Aborts on internal error when env DM_ABORT_ON_INTERNAL_ERRORS is 1 - */ - -typedef void (*dm_log_with_errno_fn) (int level, const char *file, int line, - int dm_errno_or_class, const char *f, ...) - __attribute__ ((format(printf, 5, 6))); - -void dm_log_with_errno_init(dm_log_with_errno_fn fn); -void dm_log_init_verbose(int level); - -/* - * Original version of this function. - * dm_errno is set to 0. - * - * Deprecated: Use the _with_errno_ versions above instead. - */ -typedef void (*dm_log_fn) (int level, const char *file, int line, - const char *f, ...) - __attribute__ ((format(printf, 4, 5))); - -void dm_log_init(dm_log_fn fn); -/* - * For backward-compatibility, indicate that dm_log_init() was used - * to set a non-default value of dm_log(). - */ -int dm_log_is_non_default(void); - -/* - * Number of devices currently in suspended state (via the library). - */ -int dm_get_suspended_counter(void); - -enum { - DM_DEVICE_CREATE, - DM_DEVICE_RELOAD, - DM_DEVICE_REMOVE, - DM_DEVICE_REMOVE_ALL, - - DM_DEVICE_SUSPEND, - DM_DEVICE_RESUME, - - DM_DEVICE_INFO, - DM_DEVICE_DEPS, - DM_DEVICE_RENAME, - - DM_DEVICE_VERSION, - - DM_DEVICE_STATUS, - DM_DEVICE_TABLE, - DM_DEVICE_WAITEVENT, - - DM_DEVICE_LIST, - - DM_DEVICE_CLEAR, - - DM_DEVICE_MKNODES, - - DM_DEVICE_LIST_VERSIONS, - - DM_DEVICE_TARGET_MSG, - - DM_DEVICE_SET_GEOMETRY -}; - -/* - * You will need to build a struct dm_task for - * each ioctl command you want to execute. - */ - -struct dm_pool; -struct dm_task; -struct dm_timestamp; - -struct dm_task *dm_task_create(int type); -void dm_task_destroy(struct dm_task *dmt); - -int dm_task_set_name(struct dm_task *dmt, const char *name); -int dm_task_set_uuid(struct dm_task *dmt, const char *uuid); - -/* - * Retrieve attributes after an info. - */ -struct dm_info { - int exists; - int suspended; - int live_table; - int inactive_table; - int32_t open_count; - uint32_t event_nr; - uint32_t major; - uint32_t minor; /* minor device number */ - int read_only; /* 0:read-write; 1:read-only */ - - int32_t target_count; - - int deferred_remove; - int internal_suspend; -}; - -struct dm_deps { - uint32_t count; - uint32_t filler; - uint64_t device[0]; -}; - -struct dm_names { - uint64_t dev; - uint32_t next; /* Offset to next struct from start of this struct */ - char name[0]; -}; - -struct dm_versions { - uint32_t next; /* Offset to next struct from start of this struct */ - uint32_t version[3]; - - char name[0]; -}; - -int dm_get_library_version(char *version, size_t size); -int dm_task_get_driver_version(struct dm_task *dmt, char *version, size_t size); -int dm_task_get_info(struct dm_task *dmt, struct dm_info *dmi); - -/* - * This function returns dm device's UUID based on the value - * of the mangling mode set during preceding dm_task_run call: - * - unmangled UUID for DM_STRING_MANGLING_{AUTO, HEX}, - * - UUID without any changes for DM_STRING_MANGLING_NONE. - * - * To get mangled or unmangled form of the UUID directly, use - * dm_task_get_uuid_mangled or dm_task_get_uuid_unmangled function. - */ -const char *dm_task_get_uuid(const struct dm_task *dmt); - -struct dm_deps *dm_task_get_deps(struct dm_task *dmt); -struct dm_versions *dm_task_get_versions(struct dm_task *dmt); -const char *dm_task_get_message_response(struct dm_task *dmt); - -/* - * These functions return device-mapper names based on the value - * of the mangling mode set during preceding dm_task_run call: - * - unmangled name for DM_STRING_MANGLING_{AUTO, HEX}, - * - name without any changes for DM_STRING_MANGLING_NONE. - * - * To get mangled or unmangled form of the name directly, use - * dm_task_get_name_mangled or dm_task_get_name_unmangled function. - */ -const char *dm_task_get_name(const struct dm_task *dmt); -struct dm_names *dm_task_get_names(struct dm_task *dmt); - -int dm_task_set_ro(struct dm_task *dmt); -int dm_task_set_newname(struct dm_task *dmt, const char *newname); -int dm_task_set_newuuid(struct dm_task *dmt, const char *newuuid); -int dm_task_set_minor(struct dm_task *dmt, int minor); -int dm_task_set_major(struct dm_task *dmt, int major); -int dm_task_set_major_minor(struct dm_task *dmt, int major, int minor, int allow_default_major_fallback); -int dm_task_set_uid(struct dm_task *dmt, uid_t uid); -int dm_task_set_gid(struct dm_task *dmt, gid_t gid); -int dm_task_set_mode(struct dm_task *dmt, mode_t mode); -/* See also description for DM_UDEV_DISABLE_LIBRARY_FALLBACK flag! */ -int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags); -int dm_task_set_event_nr(struct dm_task *dmt, uint32_t event_nr); -int dm_task_set_geometry(struct dm_task *dmt, const char *cylinders, const char *heads, const char *sectors, const char *start); -int dm_task_set_message(struct dm_task *dmt, const char *message); -int dm_task_set_sector(struct dm_task *dmt, uint64_t sector); -int dm_task_no_flush(struct dm_task *dmt); -int dm_task_no_open_count(struct dm_task *dmt); -int dm_task_skip_lockfs(struct dm_task *dmt); -int dm_task_query_inactive_table(struct dm_task *dmt); -int dm_task_suppress_identical_reload(struct dm_task *dmt); -int dm_task_secure_data(struct dm_task *dmt); -int dm_task_retry_remove(struct dm_task *dmt); -int dm_task_deferred_remove(struct dm_task *dmt); - -/* - * Record timestamp immediately after the ioctl returns. - */ -int dm_task_set_record_timestamp(struct dm_task *dmt); -struct dm_timestamp *dm_task_get_ioctl_timestamp(struct dm_task *dmt); - -/* - * Enable checks for common mistakes such as issuing ioctls in an unsafe order. - */ -int dm_task_enable_checks(struct dm_task *dmt); - -typedef enum { - DM_ADD_NODE_ON_RESUME, /* add /dev/mapper node with dmsetup resume */ - DM_ADD_NODE_ON_CREATE /* add /dev/mapper node with dmsetup create */ -} dm_add_node_t; -int dm_task_set_add_node(struct dm_task *dmt, dm_add_node_t add_node); - -/* - * Control read_ahead. - */ -#define DM_READ_AHEAD_AUTO UINT32_MAX /* Use kernel default readahead */ -#define DM_READ_AHEAD_NONE 0 /* Disable readahead */ - -#define DM_READ_AHEAD_MINIMUM_FLAG 0x1 /* Value supplied is minimum */ - -/* - * Read ahead is set with DM_DEVICE_CREATE with a table or DM_DEVICE_RESUME. - */ -int dm_task_set_read_ahead(struct dm_task *dmt, uint32_t read_ahead, - uint32_t read_ahead_flags); -uint32_t dm_task_get_read_ahead(const struct dm_task *dmt, - uint32_t *read_ahead); - -/* - * Use these to prepare for a create or reload. - */ -int dm_task_add_target(struct dm_task *dmt, - uint64_t start, - uint64_t size, const char *ttype, const char *params); - -/* - * Format major/minor numbers correctly for input to driver. - */ -#define DM_FORMAT_DEV_BUFSIZE 13 /* Minimum bufsize to handle worst case. */ -int dm_format_dev(char *buf, int bufsize, uint32_t dev_major, uint32_t dev_minor); - -/* Use this to retrive target information returned from a STATUS call */ -void *dm_get_next_target(struct dm_task *dmt, - void *next, uint64_t *start, uint64_t *length, - char **target_type, char **params); - -/* - * Following dm_get_status_* functions will allocate approriate status structure - * from passed mempool together with the necessary character arrays. - * Destroying the mempool will release all asociated allocation. - */ - -/* Parse params from STATUS call for mirror target */ -typedef enum { - DM_STATUS_MIRROR_ALIVE = 'A',/* No failures */ - DM_STATUS_MIRROR_FLUSH_FAILED = 'F',/* Mirror out-of-sync */ - DM_STATUS_MIRROR_WRITE_FAILED = 'D',/* Mirror out-of-sync */ - DM_STATUS_MIRROR_SYNC_FAILED = 'S',/* Mirror out-of-sync */ - DM_STATUS_MIRROR_READ_FAILED = 'R',/* Mirror data unaffected */ - DM_STATUS_MIRROR_UNCLASSIFIED = 'U' /* Bug */ -} dm_status_mirror_health_t; - -struct dm_status_mirror { - uint64_t total_regions; - uint64_t insync_regions; - uint32_t dev_count; /* # of devs[] elements (<= 8) */ - struct { - dm_status_mirror_health_t health; - uint32_t major; - uint32_t minor; - } *devs; /* array with individual legs */ - const char *log_type; /* core, disk,.... */ - uint32_t log_count; /* # of logs[] elements */ - struct { - dm_status_mirror_health_t health; - uint32_t major; - uint32_t minor; - } *logs; /* array with individual logs */ -}; - -int dm_get_status_mirror(struct dm_pool *mem, const char *params, - struct dm_status_mirror **status); - -/* Parse params from STATUS call for raid target */ -struct dm_status_raid { - uint64_t reserved; - uint64_t total_regions; /* sectors */ - uint64_t insync_regions; /* sectors */ - uint64_t mismatch_count; - uint32_t dev_count; - char *raid_type; - /* A - alive, a - alive not in-sync, D - dead/failed */ - char *dev_health; - /* idle, frozen, resync, recover, check, repair */ - char *sync_action; - uint64_t data_offset; /* RAID out-of-place reshaping */ -}; - -int dm_get_status_raid(struct dm_pool *mem, const char *params, - struct dm_status_raid **status); - -/* Parse params from STATUS call for cache target */ -struct dm_status_cache { - uint64_t version; /* zero for now */ - - uint32_t metadata_block_size; /* in 512B sectors */ - uint32_t block_size; /* AKA 'chunk_size' */ - - uint64_t metadata_used_blocks; - uint64_t metadata_total_blocks; - - uint64_t used_blocks; - uint64_t dirty_blocks; - uint64_t total_blocks; - - uint64_t read_hits; - uint64_t read_misses; - uint64_t write_hits; - uint64_t write_misses; - - uint64_t demotions; - uint64_t promotions; - - uint64_t feature_flags; /* DM_CACHE_FEATURE_? */ - - int core_argc; - char **core_argv; - - char *policy_name; - int policy_argc; - char **policy_argv; - - unsigned error : 1; /* detected error (switches to fail soon) */ - unsigned fail : 1; /* all I/O fails */ - unsigned needs_check : 1; /* metadata needs check */ - unsigned read_only : 1; /* metadata may not be changed */ - uint32_t reserved : 28; -}; - -int dm_get_status_cache(struct dm_pool *mem, const char *params, - struct dm_status_cache **status); - -/* - * Parse params from STATUS call for snapshot target - * - * Snapshot target's format: - * <= 1.7.0: <used_sectors>/<total_sectors> - * >= 1.8.0: <used_sectors>/<total_sectors> <metadata_sectors> - */ -struct dm_status_snapshot { - uint64_t used_sectors; /* in 512b units */ - uint64_t total_sectors; - uint64_t metadata_sectors; - unsigned has_metadata_sectors : 1; /* set when metadata_sectors is present */ - unsigned invalid : 1; /* set when snapshot is invalidated */ - unsigned merge_failed : 1; /* set when snapshot merge failed */ - unsigned overflow : 1; /* set when snapshot overflows */ -}; - -int dm_get_status_snapshot(struct dm_pool *mem, const char *params, - struct dm_status_snapshot **status); - -/* Parse params from STATUS call for thin_pool target */ -typedef enum { - DM_THIN_DISCARDS_IGNORE, - DM_THIN_DISCARDS_NO_PASSDOWN, - DM_THIN_DISCARDS_PASSDOWN -} dm_thin_discards_t; - -struct dm_status_thin_pool { - uint64_t transaction_id; - uint64_t used_metadata_blocks; - uint64_t total_metadata_blocks; - uint64_t used_data_blocks; - uint64_t total_data_blocks; - uint64_t held_metadata_root; - uint32_t read_only; /* metadata may not be changed */ - dm_thin_discards_t discards; - uint32_t fail : 1; /* all I/O fails */ - uint32_t error_if_no_space : 1; /* otherwise queue_if_no_space */ - uint32_t out_of_data_space : 1; /* metadata may be changed, but data may not be allocated (no rw) */ - uint32_t needs_check : 1; /* metadata needs check */ - uint32_t error : 1; /* detected error (switches to fail soon) */ - uint32_t reserved : 27; -}; - -int dm_get_status_thin_pool(struct dm_pool *mem, const char *params, - struct dm_status_thin_pool **status); - -/* Parse params from STATUS call for thin target */ -struct dm_status_thin { - uint64_t mapped_sectors; - uint64_t highest_mapped_sector; - uint32_t fail : 1; /* Thin volume fails I/O */ - uint32_t reserved : 31; -}; - -int dm_get_status_thin(struct dm_pool *mem, const char *params, - struct dm_status_thin **status); - -/* - * device-mapper statistics support - */ - -/* - * Statistics handle. - * - * Operations on dm_stats objects include managing statistics regions - * and obtaining and manipulating current counter values from the - * kernel. Methods are provided to return baisc count values and to - * derive time-based metrics when a suitable interval estimate is - * provided. - * - * Internally the dm_stats handle contains a pointer to a table of one - * or more dm_stats_region objects representing the regions registered - * with the dm_stats_create_region() method. These in turn point to a - * table of one or more dm_stats_counters objects containing the - * counter sets for each defined area within the region: - * - * dm_stats->dm_stats_region[nr_regions]->dm_stats_counters[nr_areas] - * - * This structure is private to the library and may change in future - * versions: all users should make use of the public interface and treat - * the dm_stats type as an opaque handle. - * - * Regions and counter sets are stored in order of increasing region_id. - * Depending on region specifications and the sequence of create and - * delete operations this may not correspond to increasing sector - * number: users of the library should not assume that this is the case - * unless region creation is deliberately managed to ensure this (by - * always creating regions in strict order of ascending sector address). - * - * Regions may also overlap so the same sector range may be included in - * more than one region or area: applications should be prepared to deal - * with this or manage regions such that it does not occur. - */ -struct dm_stats; - -/* - * Histogram handle. - * - * A histogram object represents the latency histogram values and bin - * boundaries of the histogram associated with a particular area. - * - * Operations on the handle allow the number of bins, bin boundaries, - * counts and relative proportions to be obtained as well as the - * conversion of a histogram or its bounds to a compact string - * representation. - */ -struct dm_histogram; - -/* - * Allocate a dm_stats handle to use for subsequent device-mapper - * statistics operations. A program_id may be specified and will be - * used by default for subsequent operations on this handle. - * - * If program_id is NULL or the empty string a program_id will be - * automatically set to the value contained in /proc/self/comm. - */ -struct dm_stats *dm_stats_create(const char *program_id); - -/* - * Bind a dm_stats handle to the specified device major and minor - * values. Any previous binding is cleared and any preexisting counter - * data contained in the handle is released. - */ -int dm_stats_bind_devno(struct dm_stats *dms, int major, int minor); - -/* - * Bind a dm_stats handle to the specified device name. - * Any previous binding is cleared and any preexisting counter - * data contained in the handle is released. - */ -int dm_stats_bind_name(struct dm_stats *dms, const char *name); - -/* - * Bind a dm_stats handle to the specified device UUID. - * Any previous binding is cleared and any preexisting counter - * data contained in the handle is released. - */ -int dm_stats_bind_uuid(struct dm_stats *dms, const char *uuid); - -/* - * Bind a dm_stats handle to the device backing the file referenced - * by the specified file descriptor. - * - * File descriptor fd must reference a regular file, open for reading, - * in a local file system, backed by a device-mapper device, that - * supports the FIEMAP ioctl, and that returns data describing the - * physical location of extents. - */ -int dm_stats_bind_from_fd(struct dm_stats *dms, int fd); -/* - * Test whether the running kernel supports the precise_timestamps - * feature. Presence of this feature also implies histogram support. - * The library will check this call internally and fails any attempt - * to use nanosecond counters or histograms on kernels that fail to - * meet this check. - */ -int dm_message_supports_precise_timestamps(void); - -/* - * Precise timetamps and histogram support. - * - * Test for the presence of precise_timestamps and histogram support. - */ -int dm_stats_driver_supports_precise(void); -int dm_stats_driver_supports_histogram(void); - -/* - * Returns 1 if the specified region has the precise_timestamps feature - * enabled (i.e. produces nanosecond-precision counter values) or 0 for - * a region using the default milisecond precision. - */ -int dm_stats_get_region_precise_timestamps(const struct dm_stats *dms, - uint64_t region_id); - -/* - * Returns 1 if the region at the current cursor location has the - * precise_timestamps feature enabled (i.e. produces - * nanosecond-precision counter values) or 0 for a region using the - * default milisecond precision. - */ -int dm_stats_get_current_region_precise_timestamps(const struct dm_stats *dms); - -#define DM_STATS_ALL_PROGRAMS "" -/* - * Parse the response from a @stats_list message. dm_stats_list will - * allocate the necessary dm_stats and dm_stats region structures from - * the embedded dm_pool. No counter data will be obtained (the counters - * members of dm_stats_region objects are set to NULL). - * - * A program_id may optionally be supplied; if the argument is non-NULL - * only regions with a matching program_id value will be considered. If - * the argument is NULL then the default program_id associated with the - * dm_stats handle will be used. Passing the special value - * DM_STATS_ALL_PROGRAMS will cause all regions to be queried - * regardless of region program_id. - */ -int dm_stats_list(struct dm_stats *dms, const char *program_id); - -#define DM_STATS_REGIONS_ALL UINT64_MAX -/* - * Populate a dm_stats object with statistics for one or more regions of - * the specified device. - * - * A program_id may optionally be supplied; if the argument is non-NULL - * only regions with a matching program_id value will be considered. If - * the argument is NULL then the default program_id associated with the - * dm_stats handle will be used. Passing the special value - * DM_STATS_ALL_PROGRAMS will cause all regions to be queried - * regardless of region program_id. - * - * Passing the special value DM_STATS_REGIONS_ALL as the region_id - * argument will attempt to retrieve all regions selected by the - * program_id argument. - * - * If region_id is used to request a single region_id to be populated - * the program_id is ignored. - */ -int dm_stats_populate(struct dm_stats *dms, const char *program_id, - uint64_t region_id); - -/* - * Create a new statistics region on the device bound to dms. - * - * start and len specify the region start and length in 512b sectors. - * Passing zero for both start and len will create a region spanning - * the entire device. - * - * Step determines how to subdivide the region into discrete counter - * sets: a positive value specifies the size of areas into which the - * region should be split while a negative value will split the region - * into a number of areas equal to the absolute value of step: - * - * - a region with one area spanning the entire device: - * - * dm_stats_create_region(dms, 0, 0, -1, p, a); - * - * - a region with areas of 1MiB: - * - * dm_stats_create_region(dms, 0, 0, 1 << 11, p, a); - * - * - one 1MiB region starting at 1024 sectors with two areas: - * - * dm_stats_create_region(dms, 1024, 1 << 11, -2, p, a); - * - * If precise is non-zero attempt to create a region with nanosecond - * precision counters using the kernel precise_timestamps feature. - * - * precise - A flag to request nanosecond precision counters - * to be used for this region. - * - * histogram_bounds - specify the boundaries of a latency histogram to - * be tracked for the region. The values are expressed as an array of - * uint64_t terminated with a zero. Values must be in order of ascending - * magnitude and specify the upper bounds of successive histogram bins - * in nanoseconds (with an implicit lower bound of zero on the first bin - * and an implicit upper bound of infinity on the final bin). For - * example: - * - * uint64_t bounds_ary[] = { 1000, 2000, 3000, 0 }; - * - * Specifies a histogram with four bins: 0-1000ns, 1000-2000ns, - * 2000-3000ns and >3000ns. - * - * The smallest latency value that can be tracked for a region not using - * precise_timestamps is 1ms: attempting to create a region with - * histogram boundaries < 1ms will cause the precise_timestamps feature - * to be enabled for that region automatically if it was not requested - * explicitly. - * - * program_id is an optional string argument that identifies the - * program creating the region. If program_id is NULL or the empty - * string the default program_id stored in the handle will be used. - * - * user_data is an optional string argument that is added to the - * content of the aux_data field stored with the statistics region by - * the kernel. - * - * The library may also use this space internally, for example, to - * store a group descriptor or other metadata: in this case the - * library will strip any internal data fields from the value before - * it is returned via a call to dm_stats_get_region_aux_data(). - * - * The user data stored is not accessed by the library or kernel and - * may be used to store an arbitrary data word (embedded whitespace is - * not permitted). - * - * An application using both the library and direct access to the - * @stats_list device-mapper message may see the internal values stored - * in this field by the library. In such cases any string up to and - * including the first '#' in the field must be treated as an opaque - * value and preserved across any external modification of aux_data. - * - * The region_id of the newly-created region is returned in *region_id - * if it is non-NULL. - */ -int dm_stats_create_region(struct dm_stats *dms, uint64_t *region_id, - uint64_t start, uint64_t len, int64_t step, - int precise, struct dm_histogram *bounds, - const char *program_id, const char *user_data); - -/* - * Delete the specified statistics region. This will also mark the - * region as not-present and discard any existing statistics data. - */ -int dm_stats_delete_region(struct dm_stats *dms, uint64_t region_id); - -/* - * Clear the specified statistics region. This requests the kernel to - * zero all counter values (except in-flight I/O). Note that this - * operation is not atomic with respect to reads of the counters; any IO - * events occurring between the last print operation and the clear will - * be lost. This can be avoided by using the atomic print-and-clear - * function of the dm_stats_print_region() call or by using the higher - * level dm_stats_populate() interface. - */ -int dm_stats_clear_region(struct dm_stats *dms, uint64_t region_id); - -/* - * Print the current counter values for the specified statistics region - * and return them as a string. The memory for the string buffer will - * be allocated from the dm_stats handle's private pool and should be - * returned by calling dm_stats_buffer_destroy() when no longer - * required. The pointer will become invalid following any call that - * clears or reinitializes the handle (destroy, list, populate, bind). - * - * This allows applications that wish to access the raw message response - * to obtain it via a dm_stats handle; no parsing of the textual counter - * data is carried out by this function. - * - * Most users are recommended to use the dm_stats_populate() call - * instead since this will automatically parse the statistics data into - * numeric form accessible via the dm_stats_get_*() counter access - * methods. - * - * A subset of the data lines may be requested by setting the - * start_line and num_lines parameters. If both are zero all data - * lines are returned. - * - * If the clear parameter is non-zero the operation will also - * atomically reset all counter values to zero (except in-flight IO). - */ -char *dm_stats_print_region(struct dm_stats *dms, uint64_t region_id, - unsigned start_line, unsigned num_lines, - unsigned clear); - -/* - * Destroy a statistics response buffer obtained from a call to - * dm_stats_print_region(). - */ -void dm_stats_buffer_destroy(struct dm_stats *dms, char *buffer); - -/* - * Determine the number of regions contained in a dm_stats handle - * following a dm_stats_list() or dm_stats_populate() call. - * - * The value returned is the number of registered regions visible with the - * progam_id value used for the list or populate operation and may not be - * equal to the highest present region_id (either due to program_id - * filtering or gaps in the sequence of region_id values). - * - * Always returns zero on an empty handle. - */ -uint64_t dm_stats_get_nr_regions(const struct dm_stats *dms); - -/* - * Determine the number of groups contained in a dm_stats handle - * following a dm_stats_list() or dm_stats_populate() call. - * - * The value returned is the number of registered groups visible with the - * progam_id value used for the list or populate operation and may not be - * equal to the highest present group_id (either due to program_id - * filtering or gaps in the sequence of group_id values). - * - * Always returns zero on an empty handle. - */ -uint64_t dm_stats_get_nr_groups(const struct dm_stats *dms); - -/* - * Test whether region_id is present in this dm_stats handle. - */ -int dm_stats_region_present(const struct dm_stats *dms, uint64_t region_id); - -/* - * Returns the number of areas (counter sets) contained in the specified - * region_id of the supplied dm_stats handle. - */ -uint64_t dm_stats_get_region_nr_areas(const struct dm_stats *dms, - uint64_t region_id); - -/* - * Returns the total number of areas (counter sets) in all regions of the - * given dm_stats object. - */ -uint64_t dm_stats_get_nr_areas(const struct dm_stats *dms); - -/* - * Test whether group_id is present in this dm_stats handle. - */ -int dm_stats_group_present(const struct dm_stats *dms, uint64_t group_id); - -/* - * Return the number of bins in the histogram configuration for the - * specified region or zero if no histogram specification is configured. - * Valid following a dm_stats_list() or dm_stats_populate() operation. - */ -int dm_stats_get_region_nr_histogram_bins(const struct dm_stats *dms, - uint64_t region_id); - -/* - * Parse a histogram string with optional unit suffixes into a - * dm_histogram bounds description. - * - * A histogram string is a string of numbers "n1,n2,n3,..." that - * represent the boundaries of a histogram. The first and final bins - * have implicit lower and upper bounds of zero and infinity - * respectively and boundary values must occur in order of ascending - * magnitude. Unless a unit suffix is given all values are specified in - * nanoseconds. - * - * For example, if bounds_str="300,600,900", the region will be created - * with a histogram containing four bins. Each report will include four - * numbers a:b:c:d. a is the number of requests that took between 0 and - * 300ns to complete, b is the number of requests that took 300-600ns to - * complete, c is the number of requests that took 600-900ns to complete - * and d is the number of requests that took more than 900ns to - * complete. - * - * An optional unit suffix of 's', 'ms', 'us', or 'ns' may be used to - * specify units of seconds, miliseconds, microseconds, or nanoseconds: - * - * bounds_str="1ns,1us,1ms,1s" - * bounds_str="500us,1ms,1500us,2ms" - * bounds_str="200ms,400ms,600ms,800ms,1s" - * - * The smallest valid unit of time for a histogram specification depends - * on whether the region uses precise timestamps: for a region with the - * default milisecond precision the smallest possible histogram boundary - * magnitude is one milisecond: attempting to use a histogram with a - * boundary less than one milisecond when creating a region will cause - * the region to be created with the precise_timestamps feature enabled. - * - * On sucess a pointer to the struct dm_histogram representing the - * bounds values is returned, or NULL in the case of error. The returned - * pointer should be freed using dm_free() when no longer required. - */ -struct dm_histogram *dm_histogram_bounds_from_string(const char *bounds_str); - -/* - * Parse a zero terminated array of uint64_t into a dm_histogram bounds - * description. - * - * Each value in the array specifies the upper bound of a bin in the - * latency histogram in nanoseconds. Values must appear in ascending - * order of magnitude. - * - * The smallest valid unit of time for a histogram specification depends - * on whether the region uses precise timestamps: for a region with the - * default milisecond precision the smallest possible histogram boundary - * magnitude is one milisecond: attempting to use a histogram with a - * boundary less than one milisecond when creating a region will cause - * the region to be created with the precise_timestamps feature enabled. - */ -struct dm_histogram *dm_histogram_bounds_from_uint64(const uint64_t *bounds); - -/* - * Destroy the histogram bounds array obtained from a call to - * dm_histogram_bounds_from_string(). - */ -void dm_histogram_bounds_destroy(struct dm_histogram *bounds); - -/* - * Destroy a dm_stats object and all associated regions, counter - * sets and histograms. - */ -void dm_stats_destroy(struct dm_stats *dms); - -/* - * Counter sampling interval - */ - -/* - * Set the sampling interval for counter data to the specified value in - * either nanoseconds or milliseconds. - * - * The interval is used to calculate time-based metrics from the basic - * counter data: an interval must be set before calling any of the - * metric methods. - * - * For best accuracy the duration should be measured and updated at the - * end of each interval. - * - * All values are stored internally with nanosecond precision and are - * converted to or from ms when the millisecond interfaces are used. - */ -void dm_stats_set_sampling_interval_ns(struct dm_stats *dms, - uint64_t interval_ns); - -void dm_stats_set_sampling_interval_ms(struct dm_stats *dms, - uint64_t interval_ms); - -/* - * Retrieve the configured sampling interval in either nanoseconds or - * milliseconds. - */ -uint64_t dm_stats_get_sampling_interval_ns(const struct dm_stats *dms); -uint64_t dm_stats_get_sampling_interval_ms(const struct dm_stats *dms); - -/* - * Override program_id. This may be used to change the default - * program_id value for an existing handle. If the allow_empty argument - * is non-zero a NULL or empty program_id is permitted. - * - * Use with caution! Most users of the library should set a valid, - * non-NULL program_id for every statistics region created. Failing to - * do so may result in confusing state when multiple programs are - * creating and managing statistics regions. - * - * All users of the library are encouraged to choose an unambiguous, - * unique program_id: this could be based on PID (for programs that - * create, report, and delete regions in a single process), session id, - * executable name, or some other distinguishing string. - * - * Use of the empty string as a program_id does not simplify use of the - * library or the command line tools and use of this value is strongly - * discouraged. - */ -int dm_stats_set_program_id(struct dm_stats *dms, int allow_empty, - const char *program_id); - -/* - * Region properties: size, length & area_len. - * - * Region start and length are returned in units of 512b as specified - * at region creation time. The area_len value gives the size of areas - * into which the region has been subdivided. For regions with a single - * area spanning the range this value is equal to the region length. - * - * For regions created with a specified number of areas the value - * represents the size of the areas into which the kernel divided the - * region excluding any rounding of the last area size. The number of - * areas may be obtained using the dm_stats_nr_areas_region() call. - * - * All values are returned in units of 512b sectors. - */ -int dm_stats_get_region_start(const struct dm_stats *dms, uint64_t *start, - uint64_t region_id); - -int dm_stats_get_region_len(const struct dm_stats *dms, uint64_t *len, - uint64_t region_id); - -int dm_stats_get_region_area_len(const struct dm_stats *dms, - uint64_t *len, uint64_t region_id); - -/* - * Area properties: start, offset and length. - * - * The area length is always equal to the area length of the region - * that contains it and is obtained from dm_stats_get_region_area_len(). - * - * The start of an area is a function of the area_id and the containing - * region's start and area length: it gives the absolute offset into the - * containing device of the beginning of the area. - * - * The offset expresses the area's relative offset into the current - * region. I.e. the area start minus the start offset of the containing - * region. - * - * All values are returned in units of 512b sectors. - */ -int dm_stats_get_area_start(const struct dm_stats *dms, uint64_t *start, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_area_offset(const struct dm_stats *dms, uint64_t *offset, - uint64_t region_id, uint64_t area_id); - -/* - * Retrieve program_id and user aux_data for a specific region. - * - * Only valid following a call to dm_stats_list(). - */ - -/* - * Retrieve program_id for the specified region. - * - * The returned pointer does not need to be freed separately from the - * dm_stats handle but will become invalid after a dm_stats_destroy(), - * dm_stats_list(), dm_stats_populate(), or dm_stats_bind*() of the - * handle from which it was obtained. - */ -const char *dm_stats_get_region_program_id(const struct dm_stats *dms, - uint64_t region_id); - -/* - * Retrieve user aux_data set for the specified region. This function - * will return any stored user aux_data as a string in the memory - * pointed to by the aux_data argument. - * - * Any library internal aux_data fields, such as DMS_GROUP descriptors, - * are stripped before the value is returned. - * - * The returned pointer does not need to be freed separately from the - * dm_stats handle but will become invalid after a dm_stats_destroy(), - * dm_stats_list(), dm_stats_populate(), or dm_stats_bind*() of the - * handle from which it was obtained. - */ -const char *dm_stats_get_region_aux_data(const struct dm_stats *dms, - uint64_t region_id); - -typedef enum { - DM_STATS_OBJECT_TYPE_NONE, - DM_STATS_OBJECT_TYPE_AREA, - DM_STATS_OBJECT_TYPE_REGION, - DM_STATS_OBJECT_TYPE_GROUP -} dm_stats_obj_type_t; - -/* - * Statistics cursor - * - * A dm_stats handle maintains an optional cursor into the statistics - * tables that it stores. Iterators are provided to visit each region, - * area, or group in a handle and accessor methods are provided to - * obtain properties and values for the object at the current cursor - * position. - * - * Using the cursor simplifies walking all regions or groups when - * the tables are sparse (i.e. contains some present and some - * non-present region_id or group_id values either due to program_id - * filtering or the ordering of region and group creation and deletion). - * - * Simple macros are provided to visit each area, region, or group, - * contained in a handle and applications are encouraged to use these - * where possible. - */ - -/* - * Walk flags are used to initialise a dm_stats handle's cursor control - * and to select region or group aggregation when calling a metric or - * counter property method with immediate group, region, and area ID - * values. - * - * Walk flags are stored in the uppermost word of a uint64_t so that - * a region_id or group_id may be encoded in the lower bits. This - * allows an aggregate region_id or group_id to be specified when - * retrieving counter or metric values. - * - * Flags may be ORred together when used to initialise a dm_stats_walk: - * the resulting walk will visit instance of each type specified by - * the flag combination. - */ -#define DM_STATS_WALK_AREA 0x1000000000000ULL -#define DM_STATS_WALK_REGION 0x2000000000000ULL -#define DM_STATS_WALK_GROUP 0x4000000000000ULL - -#define DM_STATS_WALK_ALL 0x7000000000000ULL -#define DM_STATS_WALK_DEFAULT (DM_STATS_WALK_AREA | DM_STATS_WALK_REGION) - -/* - * Skip regions from a DM_STATS_WALK_REGION that contain only a single - * area: in this case the region's aggregate values are identical to - * the values of the single contained area. Setting this flag will - * suppress these duplicate entries during a dm_stats_walk_* with the - * DM_STATS_WALK_REGION flag set. - */ -#define DM_STATS_WALK_SKIP_SINGLE_AREA 0x8000000000000ULL - -/* - * Initialise the cursor control of a dm_stats handle for the specified - * walk type(s). Including a walk flag in the flags argument will cause - * any subsequent walk to visit that type of object (until the next - * call to dm_stats_walk_init()). - */ -int dm_stats_walk_init(struct dm_stats *dms, uint64_t flags); - -/* - * Set the cursor of a dm_stats handle to address the first present - * group, region, or area of the currently configured walk. It is - * valid to attempt to walk a NULL stats handle or a handle containing - * no present regions; in this case any call to dm_stats_walk_next() - * becomes a no-op and all calls to dm_stats_walk_end() return true. - */ -void dm_stats_walk_start(struct dm_stats *dms); - -/* - * Advance the statistics cursor to the next area, or to the next - * present region if at the end of the current region. If the end of - * the region, area, or group tables is reached a subsequent call to - * dm_stats_walk_end() will return 1 and dm_stats_object_type() called - * on the location will return DM_STATS_OBJECT_TYPE_NONE, - */ -void dm_stats_walk_next(struct dm_stats *dms); - -/* - * Force the statistics cursor to advance to the next region. This will - * stop any in-progress area walk (by clearing DM_STATS_WALK_AREA) and - * advance the cursor to the next present region, the first present - * group (if DM_STATS_GROUP_WALK is set), or to the end. In this case a - * subsequent call to dm_stats_walk_end() will return 1 and a call to - * dm_stats_object_type() for the location will return - * DM_STATS_OBJECT_TYPE_NONE. - */ -void dm_stats_walk_next_region(struct dm_stats *dms); - -/* - * Test whether the end of a statistics walk has been reached. - */ -int dm_stats_walk_end(struct dm_stats *dms); - -/* - * Return the type of object at the location specified by region_id - * and area_id. If either region_id or area_id uses one of the special - * values DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT the - * corresponding region or area identifier will be taken from the - * current cursor location. If the cursor location or the value encoded - * by region_id and area_id indicates an aggregate region or group, - * this will be reflected in the value returned. - */ -dm_stats_obj_type_t dm_stats_object_type(const struct dm_stats *dms, - uint64_t region_id, - uint64_t area_id); - -/* - * Return the type of object at the current stats cursor location. - */ -dm_stats_obj_type_t dm_stats_current_object_type(const struct dm_stats *dms); - -/* - * Stats iterators - * - * C 'for' and 'do'/'while' style iterators for dm_stats data. - * - * It is not safe to call any function that modifies the region table - * within the loop body (i.e. dm_stats_list(), dm_stats_populate(), - * dm_stats_init(), or dm_stats_destroy()). - * - * All counter and property (dm_stats_get_*) access methods, as well as - * dm_stats_populate_region() can be safely called from loops. - * - */ - -/* - * Iterate over the regions table visiting each region. - * - * If the region table is empty or unpopulated the loop body will not be - * executed. - */ -#define dm_stats_foreach_region(dms) \ -for (dm_stats_walk_init((dms), DM_STATS_WALK_REGION), \ - dm_stats_walk_start((dms)); \ - !dm_stats_walk_end((dms)); dm_stats_walk_next_region((dms))) - -/* - * Iterate over the regions table visiting each area. - * - * If the region table is empty or unpopulated the loop body will not - * be executed. - */ -#define dm_stats_foreach_area(dms) \ -for (dm_stats_walk_init((dms), DM_STATS_WALK_AREA), \ - dm_stats_walk_start((dms)); \ - !dm_stats_walk_end((dms)); dm_stats_walk_next((dms))) - -/* - * Iterate over the regions table visiting each group. Metric and - * counter methods will return values for the group. - * - * If the group table is empty or unpopulated the loop body will not - * be executed. - */ -#define dm_stats_foreach_group(dms) \ -for (dm_stats_walk_init((dms), DM_STATS_WALK_GROUP), \ - dm_stats_walk_start(dms); \ - !dm_stats_walk_end(dms); \ - dm_stats_walk_next(dms)) - -/* - * Start a walk iterating over the regions contained in dm_stats handle - * 'dms'. - * - * The body of the loop should call dm_stats_walk_next() or - * dm_stats_walk_next_region() to advance to the next element. - * - * The loop body is executed at least once even if the stats handle is - * empty. - */ -#define dm_stats_walk_do(dms) \ -do { \ - dm_stats_walk_start((dms)); \ - do - -/* - * Start a 'while' style loop or end a 'do..while' loop iterating over the - * regions contained in dm_stats handle 'dms'. - */ -#define dm_stats_walk_while(dms) \ - while(!dm_stats_walk_end((dms))); \ -} while (0) - -/* - * Cursor relative property methods - * - * Calls with the prefix dm_stats_get_current_* operate relative to the - * current cursor location, returning properties for the current region - * or area of the supplied dm_stats handle. - * - */ - -/* - * Returns the number of areas (counter sets) contained in the current - * region of the supplied dm_stats handle. - */ -uint64_t dm_stats_get_current_nr_areas(const struct dm_stats *dms); - -/* - * Retrieve the current values of the stats cursor. - */ -uint64_t dm_stats_get_current_region(const struct dm_stats *dms); -uint64_t dm_stats_get_current_area(const struct dm_stats *dms); - -/* - * Current region properties: size, length & area_len. - * - * See the comments for the equivalent dm_stats_get_* versions for a - * complete description of these methods. - * - * All values are returned in units of 512b sectors. - */ -int dm_stats_get_current_region_start(const struct dm_stats *dms, - uint64_t *start); - -int dm_stats_get_current_region_len(const struct dm_stats *dms, - uint64_t *len); - -int dm_stats_get_current_region_area_len(const struct dm_stats *dms, - uint64_t *area_len); - -/* - * Current area properties: start and length. - * - * See the comments for the equivalent dm_stats_get_* versions for a - * complete description of these methods. - * - * All values are returned in units of 512b sectors. - */ -int dm_stats_get_current_area_start(const struct dm_stats *dms, - uint64_t *start); - -int dm_stats_get_current_area_offset(const struct dm_stats *dms, - uint64_t *offset); - -int dm_stats_get_current_area_len(const struct dm_stats *dms, - uint64_t *start); - -/* - * Return a pointer to the program_id string for region at the current - * cursor location. - */ -const char *dm_stats_get_current_region_program_id(const struct dm_stats *dms); - -/* - * Return a pointer to the user aux_data string for the region at the - * current cursor location. - */ -const char *dm_stats_get_current_region_aux_data(const struct dm_stats *dms); - -/* - * Statistics groups and data aggregation. - */ - -/* - * Create a new group in stats handle dms from the group descriptor - * passed in group. The group descriptor is a string containing a list - * of region_id values that will be included in the group. The first - * region_id found will be the group leader. Ranges of identifiers may - * be expressed as "M-N", where M and N are the start and end region_id - * values for the range. - */ -int dm_stats_create_group(struct dm_stats *dms, const char *group, - const char *alias, uint64_t *group_id); - -/* - * Remove the specified group_id. If the remove argument is zero the - * group will be removed but the regions that it contained will remain. - * If remove is non-zero then all regions that belong to the group will - * also be removed. - */ -int dm_stats_delete_group(struct dm_stats *dms, uint64_t group_id, int remove); - -/* - * Set an alias for this group or region. The alias will be returned - * instead of the normal dm-stats name for this region or group. - */ -int dm_stats_set_alias(struct dm_stats *dms, uint64_t group_id, - const char *alias); - -/* - * Returns a pointer to the currently configured alias for id, or the - * name of the dm device the handle is bound to if no alias has been - * set. The pointer will be freed automatically when a new alias is set - * or when the stats handle is cleared. - */ -const char *dm_stats_get_alias(const struct dm_stats *dms, uint64_t id); - -#define DM_STATS_GROUP_NONE UINT64_MAX -/* - * Return the group_id that the specified region_id belongs to, or the - * special value DM_STATS_GROUP_NONE if the region does not belong - * to any group. - */ -uint64_t dm_stats_get_group_id(const struct dm_stats *dms, uint64_t region_id); - -/* - * Store a pointer to a string describing the regions that are members - * of the group specified by group_id in the memory pointed to by buf. - * The string is in the same format as the 'group' argument to - * dm_stats_create_group(). - * - * The pointer does not need to be freed explicitly by the caller: it - * will become invalid following a subsequent dm_stats_list(), - * dm_stats_populate() or dm_stats_destroy() of the corresponding - * dm_stats handle. - */ -int dm_stats_get_group_descriptor(const struct dm_stats *dms, - uint64_t group_id, char **buf); - -/* - * Create regions that correspond to the extents of a file in the - * filesystem and optionally place them into a group. - * - * File descriptor fd must reference a regular file, open for reading, - * in a local file system that supports the FIEMAP ioctl, and that - * returns data describing the physical location of extents. - * - * The file descriptor can be closed by the caller following the call - * to dm_stats_create_regions_from_fd(). - * - * Unless nogroup is non-zero the regions will be placed into a group - * and the group alias set to the value supplied (if alias is NULL no - * group alias will be assigned). - * - * On success the function returns a pointer to an array of uint64_t - * containing the IDs of the newly created regions. The region_id - * array is terminated by the value DM_STATS_REGION_NOT_PRESENT and - * should be freed using dm_free() when no longer required. - * - * On error NULL is returned. - * - * Following a call to dm_stats_create_regions_from_fd() the handle - * is guaranteed to be in a listed state, and to contain any region - * and group identifiers created by the operation. - * - * The group_id for the new group is equal to the region_id value in - * the first array element. - */ -uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd, - int group, int precise, - struct dm_histogram *bounds, - const char *alias); -/* - * Update a group of regions that correspond to the extents of a file - * in the filesystem, adding and removing regions to account for - * allocation changes in the underlying file. - * - * File descriptor fd must reference a regular file, open for reading, - * in a local file system that supports the FIEMAP ioctl, and that - * returns data describing the physical location of extents. - * - * The file descriptor can be closed by the caller following the call - * to dm_stats_update_regions_from_fd(). - * - * On success the function returns a pointer to an array of uint64_t - * containing the IDs of the updated regions (including any existing - * regions that were not modified by the call). - * - * The region_id array is terminated by the special value - * DM_STATS_REGION_NOT_PRESENT and should be freed using dm_free() - * when no longer required. - * - * On error NULL is returned. - * - * Following a call to dm_stats_update_regions_from_fd() the handle - * is guaranteed to be in a listed state, and to contain any region - * and group identifiers created by the operation. - * - * This function cannot be used with file mapped regions that are - * not members of a group: either group the regions, or remove them - * and re-map them with dm_stats_create_regions_from_fd(). - */ -uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, - uint64_t group_id); - - -/* - * The file map monitoring daemon can monitor files in two distinct - * ways: the mode affects the behaviour of the daemon when a file - * under monitoring is renamed or unlinked, and the conditions which - * cause the daemon to terminate. - * - * In both modes, the daemon will always shut down when the group - * being monitored is deleted. - * - * Follow inode: - * The daemon follows the inode of the file, as it was at the time the - * daemon started. The file descriptor referencing the file is kept - * open at all times, and the daemon will exit when it detects that - * the file has been unlinked and it is the last holder of a reference - * to the file. - * - * This mode is useful if the file is expected to be renamed, or moved - * within the file system, while it is being monitored. - * - * Follow path: - * The daemon follows the path that was given on the daemon command - * line. The file descriptor referencing the file is re-opened on each - * iteration of the daemon, and the daemon will exit if no file exists - * at this location (a tolerance is allowed so that a brief delay - * between unlink() and creat() is permitted). - * - * This mode is useful if the file is updated by unlinking the original - * and placing a new file at the same path. - */ - -typedef enum { - DM_FILEMAPD_FOLLOW_INODE, - DM_FILEMAPD_FOLLOW_PATH, - DM_FILEMAPD_FOLLOW_NONE -} dm_filemapd_mode_t; - -/* - * Parse a string representation of a dmfilemapd mode. - * - * Returns a valid dm_filemapd_mode_t value on success, or - * DM_FILEMAPD_FOLLOW_NONE on error. - */ -dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str); - -/* - * Start the dmfilemapd filemap monitoring daemon for the specified - * file descriptor, group, and file system path. The daemon will - * monitor the file for allocation changes, and when a change is - * detected, call dm_stats_update_regions_from_fd() to update the - * mapped regions for the file. - * - * The path provided to dm_stats_start_filemapd() must be an absolute - * path, and should reflect the path of 'fd' at the time that it was - * opened. - * - * The mode parameter controls the behaviour of the daemon when the - * file being monitored is unlinked or moved: see the comments for - * dm_filemapd_mode_t for a full description and possible values. - * - * The daemon can be stopped at any time by sending SIGTERM to the - * daemon pid. - */ -int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, - dm_filemapd_mode_t mode, unsigned foreground, - unsigned verbose); - -/* - * Call this to actually run the ioctl. - */ -int dm_task_run(struct dm_task *dmt); - -/* - * The errno from the last device-mapper ioctl performed by dm_task_run. - */ -int dm_task_get_errno(struct dm_task *dmt); - -/* - * Call this to make or remove the device nodes associated with previously - * issued commands. - */ -void dm_task_update_nodes(void); - -/* - * Mangling support - * - * Character whitelist: 0-9, A-Z, a-z, #+-.:=@_ - * HEX mangling format: \xNN, NN being the hex value of the character. - * (whitelist and format supported by udev) -*/ -typedef enum { - DM_STRING_MANGLING_NONE, /* do not mangle at all */ - DM_STRING_MANGLING_AUTO, /* mangle only if not already mangled with hex, error when mixed */ - DM_STRING_MANGLING_HEX /* always mangle with hex encoding, no matter what the input is */ -} dm_string_mangling_t; - -/* - * Set/get mangling mode used for device-mapper names and uuids. - */ -int dm_set_name_mangling_mode(dm_string_mangling_t name_mangling); -dm_string_mangling_t dm_get_name_mangling_mode(void); - -/* - * Get mangled/unmangled form of the device-mapper name or uuid - * irrespective of the global setting (set by dm_set_name_mangling_mode). - * The name or uuid returned needs to be freed after use by calling dm_free! - */ -char *dm_task_get_name_mangled(const struct dm_task *dmt); -char *dm_task_get_name_unmangled(const struct dm_task *dmt); -char *dm_task_get_uuid_mangled(const struct dm_task *dmt); -char *dm_task_get_uuid_unmangled(const struct dm_task *dmt); - -/* - * Configure the device-mapper directory - */ -int dm_set_dev_dir(const char *dir); -const char *dm_dir(void); - -/* - * Configure sysfs directory, /sys by default - */ -int dm_set_sysfs_dir(const char *dir); -const char *dm_sysfs_dir(void); - -/* - * Configure default UUID prefix string. - * Conventionally this is a short capitalised prefix indicating the subsystem - * that is managing the devices, e.g. "LVM-" or "MPATH-". - * To support stacks of devices from different subsystems, recursive functions - * stop recursing if they reach a device with a different prefix. - */ -int dm_set_uuid_prefix(const char *uuid_prefix); -const char *dm_uuid_prefix(void); - -/* - * Determine whether a major number belongs to device-mapper or not. - */ -int dm_is_dm_major(uint32_t major); - -/* - * Get associated device name for given major and minor number by reading - * the sysfs content. If this is a dm device, get associated dm name, the one - * that appears in /dev/mapper. DM names could be resolved this way only if - * kernel used >= 2.6.29, kernel name is found otherwise (e.g. dm-0). - * If prefer_kernel_name is set, the kernel name is always preferred over - * device-mapper name for dm devices no matter what the kernel version is. - * For non-dm devices, we always get associated kernel name, e.g sda, md0 etc. - * Returns 0 on error or if sysfs is not used (or configured incorrectly), - * otherwise returns 1 and the supplied buffer holds the device name. - */ -int dm_device_get_name(uint32_t major, uint32_t minor, - int prefer_kernel_name, - char *buf, size_t buf_size); - -/* - * Determine whether a device has any holders (devices - * using this device). If sysfs is not used (or configured - * incorrectly), returns 0. - */ -int dm_device_has_holders(uint32_t major, uint32_t minor); - -/* - * Determine whether a device contains mounted filesystem. - * If sysfs is not used (or configured incorrectly), returns 0. - */ -int dm_device_has_mounted_fs(uint32_t major, uint32_t minor); - - -/* - * Callback is invoked for individal mountinfo lines, - * minor, major and mount target are parsed and unmangled. - */ -typedef int (*dm_mountinfo_line_callback_fn) (char *line, unsigned maj, unsigned min, - char *target, void *cb_data); - -/* - * Read all lines from /proc/self/mountinfo, - * for each line calls read_fn callback. - */ -int dm_mountinfo_read(dm_mountinfo_line_callback_fn read_fn, void *cb_data); - -/* - * Initialise library - */ -void dm_lib_init(void) __attribute__((constructor)); - -/* - * Release library resources - */ -void dm_lib_release(void); -void dm_lib_exit(void) __attribute__((destructor)); - -/* An optimisation for clients making repeated calls involving dm ioctls */ -void dm_hold_control_dev(int hold_open); - -/* - * Use NULL for all devices. - */ -int dm_mknodes(const char *name); -int dm_driver_version(char *version, size_t size); - -/****************************************************** - * Functions to build and manipulate trees of devices * - ******************************************************/ -struct dm_tree; -struct dm_tree_node; - -/* - * Initialise an empty dependency tree. - * - * The tree consists of a root node together with one node for each mapped - * device which has child nodes for each device referenced in its table. - * - * Every node in the tree has one or more children and one or more parents. - * - * The root node is the parent/child of every node that doesn't have other - * parents/children. - */ -struct dm_tree *dm_tree_create(void); -void dm_tree_free(struct dm_tree *tree); - -/* - * List of suffixes to be ignored when matching uuids against existing devices. - */ -void dm_tree_set_optional_uuid_suffixes(struct dm_tree *dtree, const char **optional_uuid_suffixes); - -/* - * Add nodes to the tree for a given device and all the devices it uses. - */ -int dm_tree_add_dev(struct dm_tree *tree, uint32_t major, uint32_t minor); -int dm_tree_add_dev_with_udev_flags(struct dm_tree *tree, uint32_t major, - uint32_t minor, uint16_t udev_flags); - -/* - * Add a new node to the tree if it doesn't already exist. - */ -struct dm_tree_node *dm_tree_add_new_dev(struct dm_tree *tree, - const char *name, - const char *uuid, - uint32_t major, uint32_t minor, - int read_only, - int clear_inactive, - void *context); -struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *tree, - const char *name, - const char *uuid, - uint32_t major, - uint32_t minor, - int read_only, - int clear_inactive, - void *context, - uint16_t udev_flags); - -/* - * Search for a node in the tree. - * Set major and minor to 0 or uuid to NULL to get the root node. - */ -struct dm_tree_node *dm_tree_find_node(struct dm_tree *tree, - uint32_t major, - uint32_t minor); -struct dm_tree_node *dm_tree_find_node_by_uuid(struct dm_tree *tree, - const char *uuid); - -/* - * Use this to walk through all children of a given node. - * Set handle to NULL in first call. - * Returns NULL after the last child. - * Set inverted to use inverted tree. - */ -struct dm_tree_node *dm_tree_next_child(void **handle, - const struct dm_tree_node *parent, - uint32_t inverted); - -/* - * Get properties of a node. - */ -const char *dm_tree_node_get_name(const struct dm_tree_node *node); -const char *dm_tree_node_get_uuid(const struct dm_tree_node *node); -const struct dm_info *dm_tree_node_get_info(const struct dm_tree_node *node); -void *dm_tree_node_get_context(const struct dm_tree_node *node); -/* - * Returns 0 when node size and its children is unchanged. - * Returns 1 when node or any of its children has increased size. - * Rerurns -1 when node or any of its children has reduced size. - */ -int dm_tree_node_size_changed(const struct dm_tree_node *dnode); - -/* - * Returns the number of children of the given node (excluding the root node). - * Set inverted for the number of parents. - */ -int dm_tree_node_num_children(const struct dm_tree_node *node, uint32_t inverted); - -/* - * Deactivate a device plus all dependencies. - * Ignores devices that don't have a uuid starting with uuid_prefix. - */ -int dm_tree_deactivate_children(struct dm_tree_node *dnode, - const char *uuid_prefix, - size_t uuid_prefix_len); -/* - * Preload/create a device plus all dependencies. - * Ignores devices that don't have a uuid starting with uuid_prefix. - */ -int dm_tree_preload_children(struct dm_tree_node *dnode, - const char *uuid_prefix, - size_t uuid_prefix_len); - -/* - * Resume a device plus all dependencies. - * Ignores devices that don't have a uuid starting with uuid_prefix. - */ -int dm_tree_activate_children(struct dm_tree_node *dnode, - const char *uuid_prefix, - size_t uuid_prefix_len); - -/* - * Suspend a device plus all dependencies. - * Ignores devices that don't have a uuid starting with uuid_prefix. - */ -int dm_tree_suspend_children(struct dm_tree_node *dnode, - const char *uuid_prefix, - size_t uuid_prefix_len); - -/* - * Skip the filesystem sync when suspending. - * Does nothing with other functions. - * Use this when no snapshots are involved. - */ -void dm_tree_skip_lockfs(struct dm_tree_node *dnode); - -/* - * Set the 'noflush' flag when suspending devices. - * If the kernel supports it, instead of erroring outstanding I/O that - * cannot be completed, the I/O is queued and resubmitted when the - * device is resumed. This affects multipath devices when all paths - * have failed and queue_if_no_path is set, and mirror devices when - * block_on_error is set and the mirror log has failed. - */ -void dm_tree_use_no_flush_suspend(struct dm_tree_node *dnode); - -/* - * Retry removal of each device if not successful. - */ -void dm_tree_retry_remove(struct dm_tree_node *dnode); - -/* - * Is the uuid prefix present in the tree? - * Only returns 0 if every node was checked successfully. - * Returns 1 if the tree walk has to be aborted. - */ -int dm_tree_children_use_uuid(struct dm_tree_node *dnode, - const char *uuid_prefix, - size_t uuid_prefix_len); - -/* - * Construct tables for new nodes before activating them. - */ -int dm_tree_node_add_snapshot_origin_target(struct dm_tree_node *dnode, - uint64_t size, - const char *origin_uuid); -int dm_tree_node_add_snapshot_target(struct dm_tree_node *node, - uint64_t size, - const char *origin_uuid, - const char *cow_uuid, - int persistent, - uint32_t chunk_size); -int dm_tree_node_add_snapshot_merge_target(struct dm_tree_node *node, - uint64_t size, - const char *origin_uuid, - const char *cow_uuid, - const char *merge_uuid, - uint32_t chunk_size); -int dm_tree_node_add_error_target(struct dm_tree_node *node, - uint64_t size); -int dm_tree_node_add_zero_target(struct dm_tree_node *node, - uint64_t size); -int dm_tree_node_add_linear_target(struct dm_tree_node *node, - uint64_t size); -int dm_tree_node_add_striped_target(struct dm_tree_node *node, - uint64_t size, - uint32_t stripe_size); - -#define DM_CRYPT_IV_DEFAULT UINT64_C(-1) /* iv_offset == seg offset */ -/* - * Function accepts one string in cipher specification - * (chainmode and iv should be NULL because included in cipher string) - * or - * separate arguments which will be joined to "cipher-chainmode-iv" - */ -int dm_tree_node_add_crypt_target(struct dm_tree_node *node, - uint64_t size, - const char *cipher, - const char *chainmode, - const char *iv, - uint64_t iv_offset, - const char *key); -int dm_tree_node_add_mirror_target(struct dm_tree_node *node, - uint64_t size); - -/* Mirror log flags */ -#define DM_NOSYNC 0x00000001 /* Known already in sync */ -#define DM_FORCESYNC 0x00000002 /* Force resync */ -#define DM_BLOCK_ON_ERROR 0x00000004 /* On error, suspend I/O */ -#define DM_CORELOG 0x00000008 /* In-memory log */ - -int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node, - uint32_t region_size, - unsigned clustered, - const char *log_uuid, - unsigned area_count, - uint32_t flags); - -int dm_tree_node_add_raid_target(struct dm_tree_node *node, - uint64_t size, - const char *raid_type, - uint32_t region_size, - uint32_t stripe_size, - uint64_t rebuilds, - uint64_t flags); - -/* - * Defines below are based on kernel's dm-cache.c defines - * DM_CACHE_MIN_DATA_BLOCK_SIZE (32 * 1024 >> SECTOR_SHIFT) - * DM_CACHE_MAX_DATA_BLOCK_SIZE (1024 * 1024 * 1024 >> SECTOR_SHIFT) - */ -#define DM_CACHE_MIN_DATA_BLOCK_SIZE (UINT32_C(64)) -#define DM_CACHE_MAX_DATA_BLOCK_SIZE (UINT32_C(2097152)) -/* - * Max supported size for cache pool metadata device. - * Limitation is hardcoded into the kernel and bigger device sizes - * are not accepted. - * - * Limit defined in drivers/md/dm-cache-metadata.h - */ -#define DM_CACHE_METADATA_MAX_SECTORS DM_THIN_METADATA_MAX_SECTORS - -/* - * Define number of elements in rebuild and writemostly arrays - * 'of struct dm_tree_node_raid_params'. - */ - -struct dm_tree_node_raid_params { - const char *raid_type; - - uint32_t stripes; - uint32_t mirrors; - uint32_t region_size; - uint32_t stripe_size; - - /* - * 'rebuilds' and 'writemostly' are bitfields that signify - * which devices in the array are to be rebuilt or marked - * writemostly. The kernel supports up to 253 legs. - * We limit ourselves by choosing a lower value - * for DEFAULT_RAID{1}_MAX_IMAGES in defaults.h. - */ - uint64_t rebuilds; - uint64_t writemostly; - uint32_t writebehind; /* I/Os (kernel default COUNTER_MAX / 2) */ - uint32_t sync_daemon_sleep; /* ms (kernel default = 5sec) */ - uint32_t max_recovery_rate; /* kB/sec/disk */ - uint32_t min_recovery_rate; /* kB/sec/disk */ - uint32_t stripe_cache; /* sectors */ - - uint64_t flags; /* [no]sync */ - uint32_t reserved2; -}; - -/* - * Version 2 of above node raid params struct to keeep API compatibility. - * - * Extended for more than 64 legs (max 253 in the MD kernel runtime!), - * delta_disks for disk add/remove reshaping, - * data_offset for out-of-place reshaping - * and data_copies for odd number of raid10 legs. - */ -#define RAID_BITMAP_SIZE 4 /* 4 * 64 bit elements in rebuilds/writemostly arrays */ -struct dm_tree_node_raid_params_v2 { - const char *raid_type; - - uint32_t stripes; - uint32_t mirrors; - uint32_t region_size; - uint32_t stripe_size; - - int delta_disks; /* +/- number of disks to add/remove (reshaping) */ - int data_offset; /* data offset to set (out-of-place reshaping) */ - - /* - * 'rebuilds' and 'writemostly' are bitfields that signify - * which devices in the array are to be rebuilt or marked - * writemostly. The kernel supports up to 253 legs. - * We limit ourselvs by choosing a lower value - * for DEFAULT_RAID_MAX_IMAGES. - */ - uint64_t rebuilds[RAID_BITMAP_SIZE]; - uint64_t writemostly[RAID_BITMAP_SIZE]; - uint32_t writebehind; /* I/Os (kernel default COUNTER_MAX / 2) */ - uint32_t data_copies; /* RAID # of data copies */ - uint32_t sync_daemon_sleep; /* ms (kernel default = 5sec) */ - uint32_t max_recovery_rate; /* kB/sec/disk */ - uint32_t min_recovery_rate; /* kB/sec/disk */ - uint32_t stripe_cache; /* sectors */ - - uint64_t flags; /* [no]sync */ -}; - -int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node, - uint64_t size, - const struct dm_tree_node_raid_params *p); - -/* Version 2 API function taking dm_tree_node_raid_params_v2 for aforementioned extensions. */ -int dm_tree_node_add_raid_target_with_params_v2(struct dm_tree_node *node, - uint64_t size, - const struct dm_tree_node_raid_params_v2 *p); - -/* Cache feature_flags */ -#define DM_CACHE_FEATURE_WRITEBACK 0x00000001 -#define DM_CACHE_FEATURE_WRITETHROUGH 0x00000002 -#define DM_CACHE_FEATURE_PASSTHROUGH 0x00000004 -#define DM_CACHE_FEATURE_METADATA2 0x00000008 /* cache v1.10 */ - -struct dm_config_node; -/* - * Use for passing cache policy and all its args e.g.: - * - * policy_settings { - * migration_threshold=2048 - * sequention_threashold=100 - * ... - * } - * - * For policy without any parameters use NULL. - */ -int dm_tree_node_add_cache_target(struct dm_tree_node *node, - uint64_t size, - uint64_t feature_flags, /* DM_CACHE_FEATURE_* */ - const char *metadata_uuid, - const char *data_uuid, - const char *origin_uuid, - const char *policy_name, - const struct dm_config_node *policy_settings, - uint32_t data_block_size); - -/* - * FIXME Add individual cache policy pairs <key> = value, like: - * int dm_tree_node_add_cache_policy_arg(struct dm_tree_node *dnode, - * const char *key, uint64_t value); - */ - -/* - * Replicator operation mode - * Note: API for Replicator is not yet stable - */ -typedef enum { - DM_REPLICATOR_SYNC, /* Synchronous replication */ - DM_REPLICATOR_ASYNC_WARN, /* Warn if async replicator is slow */ - DM_REPLICATOR_ASYNC_STALL, /* Stall replicator if not fast enough */ - DM_REPLICATOR_ASYNC_DROP, /* Drop sites out of sync */ - DM_REPLICATOR_ASYNC_FAIL, /* Fail replicator if slow */ - NUM_DM_REPLICATOR_MODES -} dm_replicator_mode_t; - -int dm_tree_node_add_replicator_target(struct dm_tree_node *node, - uint64_t size, - const char *rlog_uuid, - const char *rlog_type, - unsigned rsite_index, - dm_replicator_mode_t mode, - uint32_t async_timeout, - uint64_t fall_behind_data, - uint32_t fall_behind_ios); - -int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node, - uint64_t size, - const char *replicator_uuid, /* Replicator control device */ - uint64_t rdevice_index, - const char *rdev_uuid, /* Rimage device name/uuid */ - unsigned rsite_index, - const char *slog_uuid, - uint32_t slog_flags, /* Mirror log flags */ - uint32_t slog_region_size); -/* End of Replicator API */ - -/* - * FIXME: Defines bellow are based on kernel's dm-thin.c defines - * DATA_DEV_BLOCK_SIZE_MIN_SECTORS (64 * 1024 >> SECTOR_SHIFT) - * DATA_DEV_BLOCK_SIZE_MAX_SECTORS (1024 * 1024 * 1024 >> SECTOR_SHIFT) - */ -#define DM_THIN_MIN_DATA_BLOCK_SIZE (UINT32_C(128)) -#define DM_THIN_MAX_DATA_BLOCK_SIZE (UINT32_C(2097152)) -/* - * Max supported size for thin pool metadata device (17112760320 bytes) - * Limitation is hardcoded into the kernel and bigger device size - * is not accepted. - * drivers/md/dm-thin-metadata.h THIN_METADATA_MAX_SECTORS - */ -#define DM_THIN_MAX_METADATA_SIZE (UINT64_C(255) * (1 << 14) * (4096 / (1 << 9)) - 256 * 1024) - -int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, - uint64_t size, - uint64_t transaction_id, - const char *metadata_uuid, - const char *pool_uuid, - uint32_t data_block_size, - uint64_t low_water_mark, - unsigned skip_block_zeroing); - -/* Supported messages for thin provision target */ -typedef enum { - DM_THIN_MESSAGE_CREATE_SNAP, /* device_id, origin_id */ - DM_THIN_MESSAGE_CREATE_THIN, /* device_id */ - DM_THIN_MESSAGE_DELETE, /* device_id */ - DM_THIN_MESSAGE_SET_TRANSACTION_ID, /* current_id, new_id */ - DM_THIN_MESSAGE_RESERVE_METADATA_SNAP, /* target version >= 1.1 */ - DM_THIN_MESSAGE_RELEASE_METADATA_SNAP, /* target version >= 1.1 */ -} dm_thin_message_t; - -int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node, - dm_thin_message_t type, - uint64_t id1, uint64_t id2); - -/* - * Set thin pool discard features - * ignore - Disable support for discards - * no_passdown - Don't pass discards down to underlying data device, - * just remove the mapping - * Feature is available since version 1.1 of the thin target. - */ -int dm_tree_node_set_thin_pool_discard(struct dm_tree_node *node, - unsigned ignore, - unsigned no_passdown); -/* - * Set error if no space, instead of queueing for thin pool. - */ -int dm_tree_node_set_thin_pool_error_if_no_space(struct dm_tree_node *node, - unsigned error_if_no_space); -/* Start thin pool with metadata in read-only mode */ -int dm_tree_node_set_thin_pool_read_only(struct dm_tree_node *node, - unsigned read_only); -/* - * FIXME: Defines bellow are based on kernel's dm-thin.c defines - * MAX_DEV_ID ((1 << 24) - 1) - */ -#define DM_THIN_MAX_DEVICE_ID (UINT32_C((1 << 24) - 1)) -int dm_tree_node_add_thin_target(struct dm_tree_node *node, - uint64_t size, - const char *pool_uuid, - uint32_t device_id); - -int dm_tree_node_set_thin_external_origin(struct dm_tree_node *node, - const char *external_uuid); - -void dm_tree_node_set_udev_flags(struct dm_tree_node *node, uint16_t udev_flags); - -void dm_tree_node_set_presuspend_node(struct dm_tree_node *node, - struct dm_tree_node *presuspend_node); - -int dm_tree_node_add_target_area(struct dm_tree_node *node, - const char *dev_name, - const char *dlid, - uint64_t offset); - -/* - * Only for temporarily-missing raid devices where changes are tracked. - */ -int dm_tree_node_add_null_area(struct dm_tree_node *node, uint64_t offset); - -/* - * Set readahead (in sectors) after loading the node. - */ -void dm_tree_node_set_read_ahead(struct dm_tree_node *dnode, - uint32_t read_ahead, - uint32_t read_ahead_flags); - -/* - * Set node callback hook before de/activation. - * Callback is called before 'activation' of node for activation tree, - * or 'deactivation' of node for deactivation tree. - */ -typedef enum { - DM_NODE_CALLBACK_PRELOADED, /* Node has preload deps */ - DM_NODE_CALLBACK_DEACTIVATED, /* Node is deactivated */ -} dm_node_callback_t; -typedef int (*dm_node_callback_fn) (struct dm_tree_node *node, - dm_node_callback_t type, void *cb_data); -void dm_tree_node_set_callback(struct dm_tree_node *node, - dm_node_callback_fn cb, void *cb_data); - -void dm_tree_set_cookie(struct dm_tree_node *node, uint32_t cookie); -uint32_t dm_tree_get_cookie(struct dm_tree_node *node); - -/***************************************************************************** - * Library functions - *****************************************************************************/ - -/******************* - * Memory management - *******************/ - -/* - * Never use these functions directly - use the macros following instead. - */ -void *dm_malloc_wrapper(size_t s, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -void *dm_malloc_aligned_wrapper(size_t s, size_t a, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -void *dm_zalloc_wrapper(size_t s, const char *file, int line) - __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); -void *dm_realloc_wrapper(void *p, unsigned int s, const char *file, int line) - __attribute__((__warn_unused_result__)); -void dm_free_wrapper(void *ptr); -char *dm_strdup_wrapper(const char *s, const char *file, int line) - __attribute__((__warn_unused_result__)); -int dm_dump_memory_wrapper(void); -void dm_bounds_check_wrapper(void); - -#define dm_malloc(s) dm_malloc_wrapper((s), __FILE__, __LINE__) -#define dm_malloc_aligned(s, a) dm_malloc_aligned_wrapper((s), (a), __FILE__, __LINE__) -#define dm_zalloc(s) dm_zalloc_wrapper((s), __FILE__, __LINE__) -#define dm_strdup(s) dm_strdup_wrapper((s), __FILE__, __LINE__) -#define dm_free(p) dm_free_wrapper(p) -#define dm_realloc(p, s) dm_realloc_wrapper((p), (s), __FILE__, __LINE__) -#define dm_dump_memory() dm_dump_memory_wrapper() -#define dm_bounds_check() dm_bounds_check_wrapper() - -/* - * The pool allocator is useful when you are going to allocate - * lots of memory, use the memory for a bit, and then free the - * memory in one go. A surprising amount of code has this usage - * profile. - * - * You should think of the pool as an infinite, contiguous chunk - * of memory. The front of this chunk of memory contains - * allocated objects, the second half is free. dm_pool_alloc grabs - * the next 'size' bytes from the free half, in effect moving it - * into the allocated half. This operation is very efficient. - * - * dm_pool_free frees the allocated object *and* all objects - * allocated after it. It is important to note this semantic - * difference from malloc/free. This is also extremely - * efficient, since a single dm_pool_free can dispose of a large - * complex object. - * - * dm_pool_destroy frees all allocated memory. - * - * eg, If you are building a binary tree in your program, and - * know that you are only ever going to insert into your tree, - * and not delete (eg, maintaining a symbol table for a - * compiler). You can create yourself a pool, allocate the nodes - * from it, and when the tree becomes redundant call dm_pool_destroy - * (no nasty iterating through the tree to free nodes). - * - * eg, On the other hand if you wanted to repeatedly insert and - * remove objects into the tree, you would be better off - * allocating the nodes from a free list; you cannot free a - * single arbitrary node with pool. - */ - -struct dm_pool; - -/* constructor and destructor */ -struct dm_pool *dm_pool_create(const char *name, size_t chunk_hint) - __attribute__((__warn_unused_result__)); -void dm_pool_destroy(struct dm_pool *p); - -/* simple allocation/free routines */ -void *dm_pool_alloc(struct dm_pool *p, size_t s) - __attribute__((__warn_unused_result__)); -void *dm_pool_alloc_aligned(struct dm_pool *p, size_t s, unsigned alignment) - __attribute__((__warn_unused_result__)); -void dm_pool_empty(struct dm_pool *p); -void dm_pool_free(struct dm_pool *p, void *ptr); - -/* - * To aid debugging, a pool can be locked. Any modifications made - * to the content of the pool while it is locked can be detected. - * Default compilation is using a crc checksum to notice modifications. - * The pool locking is using the mprotect with the compilation flag - * DEBUG_ENFORCE_POOL_LOCKING to enforce the memory protection. - */ -/* query pool lock status */ -int dm_pool_locked(struct dm_pool *p); -/* mark pool as locked */ -int dm_pool_lock(struct dm_pool *p, int crc) - __attribute__((__warn_unused_result__)); -/* mark pool as unlocked */ -int dm_pool_unlock(struct dm_pool *p, int crc) - __attribute__((__warn_unused_result__)); - -/* - * Object building routines: - * - * These allow you to 'grow' an object, useful for - * building strings, or filling in dynamic - * arrays. - * - * It's probably best explained with an example: - * - * char *build_string(struct dm_pool *mem) - * { - * int i; - * char buffer[16]; - * - * if (!dm_pool_begin_object(mem, 128)) - * return NULL; - * - * for (i = 0; i < 50; i++) { - * snprintf(buffer, sizeof(buffer), "%d, ", i); - * if (!dm_pool_grow_object(mem, buffer, 0)) - * goto bad; - * } - * - * // add null - * if (!dm_pool_grow_object(mem, "\0", 1)) - * goto bad; - * - * return dm_pool_end_object(mem); - * - * bad: - * - * dm_pool_abandon_object(mem); - * return NULL; - *} - * - * So start an object by calling dm_pool_begin_object - * with a guess at the final object size - if in - * doubt make the guess too small. - * - * Then append chunks of data to your object with - * dm_pool_grow_object. Finally get your object with - * a call to dm_pool_end_object. - * - * Setting delta to 0 means it will use strlen(extra). - */ -int dm_pool_begin_object(struct dm_pool *p, size_t hint); -int dm_pool_grow_object(struct dm_pool *p, const void *extra, size_t delta); -void *dm_pool_end_object(struct dm_pool *p); -void dm_pool_abandon_object(struct dm_pool *p); - -/* utilities */ -char *dm_pool_strdup(struct dm_pool *p, const char *str) - __attribute__((__warn_unused_result__)); -char *dm_pool_strndup(struct dm_pool *p, const char *str, size_t n) - __attribute__((__warn_unused_result__)); -void *dm_pool_zalloc(struct dm_pool *p, size_t s) - __attribute__((__warn_unused_result__)); - -/****************** - * bitset functions - ******************/ - -typedef uint32_t *dm_bitset_t; - -dm_bitset_t dm_bitset_create(struct dm_pool *mem, unsigned num_bits); -void dm_bitset_destroy(dm_bitset_t bs); - -int dm_bitset_equal(dm_bitset_t in1, dm_bitset_t in2); - -void dm_bit_and(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2); -void dm_bit_union(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2); -int dm_bit_get_first(dm_bitset_t bs); -int dm_bit_get_next(dm_bitset_t bs, int last_bit); -int dm_bit_get_last(dm_bitset_t bs); -int dm_bit_get_prev(dm_bitset_t bs, int last_bit); - -#define DM_BITS_PER_INT (sizeof(int) * CHAR_BIT) - -#define dm_bit(bs, i) \ - ((bs)[((i) / DM_BITS_PER_INT) + 1] & (0x1 << ((i) & (DM_BITS_PER_INT - 1)))) - -#define dm_bit_set(bs, i) \ - ((bs)[((i) / DM_BITS_PER_INT) + 1] |= (0x1 << ((i) & (DM_BITS_PER_INT - 1)))) - -#define dm_bit_clear(bs, i) \ - ((bs)[((i) / DM_BITS_PER_INT) + 1] &= ~(0x1 << ((i) & (DM_BITS_PER_INT - 1)))) - -#define dm_bit_set_all(bs) \ - memset((bs) + 1, -1, ((*(bs) / DM_BITS_PER_INT) + 1) * sizeof(int)) - -#define dm_bit_clear_all(bs) \ - memset((bs) + 1, 0, ((*(bs) / DM_BITS_PER_INT) + 1) * sizeof(int)) - -#define dm_bit_copy(bs1, bs2) \ - memcpy((bs1) + 1, (bs2) + 1, ((*(bs2) / DM_BITS_PER_INT) + 1) * sizeof(int)) - -/* - * Parse a string representation of a bitset into a dm_bitset_t. The - * notation used is identical to the kernel bitmap parser (cpuset etc.) - * and supports both lists ("1,2,3") and ranges ("1-2,5-8"). If the mem - * parameter is NULL memory for the bitset will be allocated using - * dm_malloc(). Otherwise the bitset will be allocated using the supplied - * dm_pool. - */ -dm_bitset_t dm_bitset_parse_list(const char *str, struct dm_pool *mem, - size_t min_num_bits); - -/* Returns number of set bits */ -static inline unsigned hweight32(uint32_t i) -{ - unsigned r = (i & 0x55555555) + ((i >> 1) & 0x55555555); - - r = (r & 0x33333333) + ((r >> 2) & 0x33333333); - r = (r & 0x0F0F0F0F) + ((r >> 4) & 0x0F0F0F0F); - r = (r & 0x00FF00FF) + ((r >> 8) & 0x00FF00FF); - return (r & 0x0000FFFF) + ((r >> 16) & 0x0000FFFF); -} - -/**************** - * hash functions - ****************/ - -struct dm_hash_table; -struct dm_hash_node; - -typedef void (*dm_hash_iterate_fn) (void *data); - -struct dm_hash_table *dm_hash_create(unsigned size_hint) - __attribute__((__warn_unused_result__)); -void dm_hash_destroy(struct dm_hash_table *t); -void dm_hash_wipe(struct dm_hash_table *t); - -void *dm_hash_lookup(struct dm_hash_table *t, const char *key); -int dm_hash_insert(struct dm_hash_table *t, const char *key, void *data); -void dm_hash_remove(struct dm_hash_table *t, const char *key); - -void *dm_hash_lookup_binary(struct dm_hash_table *t, const void *key, uint32_t len); -int dm_hash_insert_binary(struct dm_hash_table *t, const void *key, uint32_t len, - void *data); -void dm_hash_remove_binary(struct dm_hash_table *t, const void *key, uint32_t len); - -unsigned dm_hash_get_num_entries(struct dm_hash_table *t); -void dm_hash_iter(struct dm_hash_table *t, dm_hash_iterate_fn f); - -char *dm_hash_get_key(struct dm_hash_table *t, struct dm_hash_node *n); -void *dm_hash_get_data(struct dm_hash_table *t, struct dm_hash_node *n); -struct dm_hash_node *dm_hash_get_first(struct dm_hash_table *t); -struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_node *n); - -/* - * dm_hash_insert() replaces the value of an existing - * entry with a matching key if one exists. Otherwise - * it adds a new entry. - * - * dm_hash_insert_with_val() inserts a new entry if - * another entry with the same key already exists. - * val_len is the size of the data being inserted. - * - * If two entries with the same key exist, - * (added using dm_hash_insert_allow_multiple), then: - * . dm_hash_lookup() returns the first one it finds, and - * dm_hash_lookup_with_val() returns the one with a matching - * val_len/val. - * . dm_hash_remove() removes the first one it finds, and - * dm_hash_remove_with_val() removes the one with a matching - * val_len/val. - * - * If a single entry with a given key exists, and it has - * zero val_len, then: - * . dm_hash_lookup() returns it - * . dm_hash_lookup_with_val(val_len=0) returns it - * . dm_hash_remove() removes it - * . dm_hash_remove_with_val(val_len=0) removes it - * - * dm_hash_lookup_with_count() is a single call that will - * both lookup a key's value and check if there is more - * than one entry with the given key. - * - * (It is not meant to retrieve all the entries with the - * given key. In the common case where a single entry exists - * for the key, it is useful to have a single call that will - * both look up the value and indicate if multiple values - * exist for the key.) - * - * dm_hash_lookup_with_count: - * . If no entries exist, the function returns NULL, and - * the count is set to 0. - * . If only one entry exists, the value of that entry is - * returned and count is set to 1. - * . If N entries exists, the value of the first entry is - * returned and count is set to N. - */ - -void *dm_hash_lookup_with_val(struct dm_hash_table *t, const char *key, - const void *val, uint32_t val_len); -void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key, - const void *val, uint32_t val_len); -int dm_hash_insert_allow_multiple(struct dm_hash_table *t, const char *key, - const void *val, uint32_t val_len); -void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *count); - - -#define dm_hash_iterate(v, h) \ - for (v = dm_hash_get_first((h)); v; \ - v = dm_hash_get_next((h), v)) - -/********* - * selinux - *********/ - -/* - * Obtain SELinux security context assigned for the path and set this - * context for creating a new file system object. This security context - * is global and it is used until reset to default policy behaviour - * by calling 'dm_prepare_selinux_context(NULL, 0)'. - */ -int dm_prepare_selinux_context(const char *path, mode_t mode); -/* - * Set SELinux context for existing file system object. - */ -int dm_set_selinux_context(const char *path, mode_t mode); - -/********************* - * string manipulation - *********************/ - -/* - * Break up the name of a mapped device into its constituent - * Volume Group, Logical Volume and Layer (if present). - * If mem is supplied, the result is allocated from the mempool. - * Otherwise the strings are changed in situ. - */ -int dm_split_lvm_name(struct dm_pool *mem, const char *dmname, - char **vgname, char **lvname, char **layer); - -/* - * Destructively split buffer into NULL-separated words in argv. - * Returns number of words. - */ -int dm_split_words(char *buffer, unsigned max, - unsigned ignore_comments, /* Not implemented */ - char **argv); - -/* - * Returns -1 if buffer too small - */ -int dm_snprintf(char *buf, size_t bufsize, const char *format, ...) - __attribute__ ((format(printf, 3, 4))); - -/* - * Returns pointer to the last component of the path. - */ -const char *dm_basename(const char *path); - -/* - * Returns number of occurrences of 'c' in 'str' of length 'size'. - */ -unsigned dm_count_chars(const char *str, size_t len, const int c); - -/* - * Length of string after escaping double quotes and backslashes. - */ -size_t dm_escaped_len(const char *str); - -/* - * <vg>-<lv>-<layer> or if !layer just <vg>-<lv>. - */ -char *dm_build_dm_name(struct dm_pool *mem, const char *vgname, - const char *lvname, const char *layer); -char *dm_build_dm_uuid(struct dm_pool *mem, const char *prefix, const char *lvid, const char *layer); - -/* - * Copies a string, quoting double quotes with backslashes. - */ -char *dm_escape_double_quotes(char *out, const char *src); - -/* - * Undo quoting in situ. - */ -void dm_unescape_double_quotes(char *src); - -/* - * Unescape colons and "at" signs in situ and save the substrings - * starting at the position of the first unescaped colon and the - * first unescaped "at" sign. This is normally used to unescape - * device names used as PVs. - */ -void dm_unescape_colons_and_at_signs(char *src, - char **substr_first_unquoted_colon, - char **substr_first_unquoted_at_sign); - -/* - * Replacement for strncpy() function. - * - * Copies no more than n bytes from string pointed by src to the buffer - * pointed by dest and ensure string is finished with '\0'. - * Returns 0 if the whole string does not fit. - */ -int dm_strncpy(char *dest, const char *src, size_t n); - -/* - * Recognize unit specifier in the 'units' arg and return a factor - * representing that unit. If the 'units' contains a prefix with digits, - * the 'units' is considered to be a custom unit. - * - * Also, set 'unit_type' output arg to the character that represents - * the unit specified. The 'unit_type' character equals to the unit - * character itself recognized in the 'units' arg for canonical units. - * Otherwise, the 'unit_type' character is set to 'U' for custom unit. - * - * An example for k/K canonical units and 8k/8K custom units: - * - * units unit_type return value (factor) - * k k 1024 - * K K 1000 - * 8k U 1024*8 - * 8K U 1000*8 - * etc... - * - * Recognized units: - * - * h/H - human readable (returns 1 for both) - * b/B - byte (returns 1 for both) - * s/S - sector (returns 512 for both) - * k/K - kilo (returns 1024/1000 respectively) - * m/M - mega (returns 1024^2/1000^2 respectively) - * g/G - giga (returns 1024^3/1000^3 respectively) - * t/T - tera (returns 1024^4/1000^4 respectively) - * p/P - peta (returns 1024^5/1000^5 respectively) - * e/E - exa (returns 1024^6/1000^6 respectively) - * - * Only one units character is allowed in the 'units' arg - * if strict mode is enabled by 'strict' arg. - * - * The 'endptr' output arg, if not NULL, saves the pointer - * in the 'units' string which follows the unit specifier - * recognized (IOW the position where the parsing of the - * unit specifier stopped). - * - * Returns the unit factor or 0 if no unit is recognized. - */ -uint64_t dm_units_to_factor(const char *units, char *unit_type, - int strict, const char **endptr); - -/* - * Type of unit specifier used by dm_size_to_string(). - */ -typedef enum { - DM_SIZE_LONG = 0, /* Megabyte */ - DM_SIZE_SHORT = 1, /* MB or MiB */ - DM_SIZE_UNIT = 2 /* M or m */ -} dm_size_suffix_t; - -/* - * Convert a size (in 512-byte sectors) into a printable string using units of unit_type. - * An upper-case unit_type indicates output units based on powers of 1000 are - * required; a lower-case unit_type indicates powers of 1024. - * For correct operation, unit_factor must be one of: - * 0 - the correct value will be calculated internally; - * or the output from dm_units_to_factor() corresponding to unit_type; - * or 'u' or 'U', an arbitrary number of bytes to use as the power base. - * Set include_suffix to 1 to include a suffix of suffix_type. - * Set use_si_units to 0 for suffixes that don't distinguish between 1000 and 1024. - * Set use_si_units to 1 for a suffix that does distinguish. - */ -const char *dm_size_to_string(struct dm_pool *mem, uint64_t size, - char unit_type, int use_si_units, - uint64_t unit_factor, int include_suffix, - dm_size_suffix_t suffix_type); - -/************************** - * file/stream manipulation - **************************/ - -/* - * Create a directory (with parent directories if necessary). - * Returns 1 on success, 0 on failure. - */ -int dm_create_dir(const char *dir); - -int dm_is_empty_dir(const char *dir); - -/* - * Close a stream, with nicer error checking than fclose's. - * Derived from gnulib's close-stream.c. - * - * Close "stream". Return 0 if successful, and EOF (setting errno) - * otherwise. Upon failure, set errno to 0 if the error number - * cannot be determined. Useful mainly for writable streams. - */ -int dm_fclose(FILE *stream); - -/* - * Returns size of a buffer which is allocated with dm_malloc. - * Pointer to the buffer is stored in *buf. - * Returns -1 on failure leaving buf undefined. - */ -int dm_asprintf(char **buf, const char *format, ...) - __attribute__ ((format(printf, 2, 3))); -int dm_vasprintf(char **buf, const char *format, va_list ap) - __attribute__ ((format(printf, 2, 0))); - -/* - * create lockfile (pidfile) - create and lock a lock file - * @lockfile: location of lock file - * - * Returns: 1 on success, 0 otherwise, errno is handled internally - */ -int dm_create_lockfile(const char* lockfile); - -/* - * Query whether a daemon is running based on its lockfile - * - * Returns: 1 if running, 0 if not - */ -int dm_daemon_is_running(const char* lockfile); - -/********************* - * regular expressions - *********************/ -struct dm_regex; - -/* - * Initialise an array of num patterns for matching. - * Uses memory from mem. - */ -struct dm_regex *dm_regex_create(struct dm_pool *mem, const char * const *patterns, - unsigned num_patterns); - -/* - * Match string s against the patterns. - * Returns the index of the highest pattern in the array that matches, - * or -1 if none match. - */ -int dm_regex_match(struct dm_regex *regex, const char *s); - -/* - * This is useful for regression testing only. The idea is if two - * fingerprints are different, then the two dfas are certainly not - * isomorphic. If two fingerprints _are_ the same then it's very likely - * that the dfas are isomorphic. - * - * This function must be called before any matching is done. - */ -uint32_t dm_regex_fingerprint(struct dm_regex *regex); - -/****************** - * percent handling - ******************/ -/* - * A fixed-point representation of percent values. One percent equals to - * DM_PERCENT_1 as defined below. Values that are not multiples of DM_PERCENT_1 - * represent fractions, with precision of 1/1000000 of a percent. See - * dm_percent_to_float for a conversion to a floating-point representation. - * - * You should always use dm_make_percent when building dm_percent_t values. The - * implementation of dm_make_percent is biased towards the middle: it ensures that - * the result is DM_PERCENT_0 or DM_PERCENT_100 if and only if this is the actual - * value -- it never rounds any intermediate value (> 0 or < 100) to either 0 - * or 100. -*/ -#define DM_PERCENT_CHAR '%' - -typedef enum { - DM_PERCENT_0 = 0, - DM_PERCENT_1 = 1000000, - DM_PERCENT_100 = 100 * DM_PERCENT_1, - DM_PERCENT_INVALID = -1, - DM_PERCENT_FAILED = -2 -} dm_percent_range_t; - -typedef int32_t dm_percent_t; - -float dm_percent_to_float(dm_percent_t percent); -/* - * Return adjusted/rounded float for better percent value printing. - * Function ensures for given precision of digits: - * 100.0% returns only when the value is DM_PERCENT_100 - * for close smaller values rounds to nearest smaller value - * 0.0% returns only for value DM_PERCENT_0 - * for close bigger values rounds to nearest bigger value - * In all other cases returns same value as dm_percent_to_float() - */ -float dm_percent_to_round_float(dm_percent_t percent, unsigned digits); -dm_percent_t dm_make_percent(uint64_t numerator, uint64_t denominator); - -/******************** - * timestamp handling - ********************/ - -/* - * Create a dm_timestamp object to use with dm_timestamp_get. - */ -struct dm_timestamp *dm_timestamp_alloc(void); - -/* - * Update dm_timestamp object to represent the current time. - */ -int dm_timestamp_get(struct dm_timestamp *ts); - -/* - * Copy a timestamp from ts_old to ts_new. - */ -void dm_timestamp_copy(struct dm_timestamp *ts_new, struct dm_timestamp *ts_old); - -/* - * Compare two timestamps. - * - * Return: -1 if ts1 is less than ts2 - * 0 if ts1 is equal to ts2 - * 1 if ts1 is greater than ts2 - */ -int dm_timestamp_compare(struct dm_timestamp *ts1, struct dm_timestamp *ts2); - -/* - * Return the absolute difference in nanoseconds between - * the dm_timestamp objects ts1 and ts2. - * - * Callers that need to know whether ts1 is before, equal to, or after ts2 - * in addition to the magnitude should use dm_timestamp_compare. - */ -uint64_t dm_timestamp_delta(struct dm_timestamp *ts1, struct dm_timestamp *ts2); - -/* - * Destroy a dm_timestamp object. - */ -void dm_timestamp_destroy(struct dm_timestamp *ts); - -/********************* - * reporting functions - *********************/ - -struct dm_report_object_type { - uint32_t id; /* Powers of 2 */ - const char *desc; - const char *prefix; /* field id string prefix (optional) */ - /* FIXME: convert to proper usage of const pointers here */ - void *(*data_fn)(void *object); /* callback from report_object() */ -}; - -struct dm_report_field; - -/* - * dm_report_field_type flags - */ -#define DM_REPORT_FIELD_MASK 0x00000FFF -#define DM_REPORT_FIELD_ALIGN_MASK 0x0000000F -#define DM_REPORT_FIELD_ALIGN_LEFT 0x00000001 -#define DM_REPORT_FIELD_ALIGN_RIGHT 0x00000002 -#define DM_REPORT_FIELD_TYPE_MASK 0x00000FF0 -#define DM_REPORT_FIELD_TYPE_NONE 0x00000000 -#define DM_REPORT_FIELD_TYPE_STRING 0x00000010 -#define DM_REPORT_FIELD_TYPE_NUMBER 0x00000020 -#define DM_REPORT_FIELD_TYPE_SIZE 0x00000040 -#define DM_REPORT_FIELD_TYPE_PERCENT 0x00000080 -#define DM_REPORT_FIELD_TYPE_STRING_LIST 0x00000100 -#define DM_REPORT_FIELD_TYPE_TIME 0x00000200 - -/* For use with reserved values only! */ -#define DM_REPORT_FIELD_RESERVED_VALUE_MASK 0x0000000F -#define DM_REPORT_FIELD_RESERVED_VALUE_NAMED 0x00000001 /* only named value, less strict form of reservation */ -#define DM_REPORT_FIELD_RESERVED_VALUE_RANGE 0x00000002 /* value is range - low and high value defined */ -#define DM_REPORT_FIELD_RESERVED_VALUE_DYNAMIC_VALUE 0x00000004 /* value is computed in runtime */ -#define DM_REPORT_FIELD_RESERVED_VALUE_FUZZY_NAMES 0x00000008 /* value names are recognized in runtime */ - -#define DM_REPORT_FIELD_TYPE_ID_LEN 32 -#define DM_REPORT_FIELD_TYPE_HEADING_LEN 32 - -struct dm_report; -struct dm_report_field_type { - uint32_t type; /* object type id */ - uint32_t flags; /* DM_REPORT_FIELD_* */ - uint32_t offset; /* byte offset in the object */ - int32_t width; /* default width */ - /* string used to specify the field */ - const char id[DM_REPORT_FIELD_TYPE_ID_LEN]; - /* string printed in header */ - const char heading[DM_REPORT_FIELD_TYPE_HEADING_LEN]; - int (*report_fn)(struct dm_report *rh, struct dm_pool *mem, - struct dm_report_field *field, const void *data, - void *private_data); - const char *desc; /* description of the field */ -}; - -/* - * Per-field reserved value. - */ -struct dm_report_field_reserved_value { - /* field_num is the position of the field in 'fields' - array passed to dm_report_init_with_selection */ - uint32_t field_num; - /* the value is of the same type as the field - identified by field_num */ - const void *value; -}; - -/* - * Reserved value is a 'value' that is used directly if any of the 'names' is hit - * or in case of fuzzy names, if such fuzzy name matches. - * - * If type is any of DM_REPORT_FIELD_TYPE_*, the reserved value is recognized - * for all fields of that type. - * - * If type is DM_REPORT_FIELD_TYPE_NONE, the reserved value is recognized - * for the exact field specified - hence the type of the value is automatically - * the same as the type of the field itself. - * - * The array of reserved values is used to initialize reporting with - * selection enabled (see also dm_report_init_with_selection function). - */ -struct dm_report_reserved_value { - const uint32_t type; /* DM_REPORT_FIELD_RESERVED_VALUE_* and DM_REPORT_FIELD_TYPE_* */ - const void *value; /* reserved value: - uint64_t for DM_REPORT_FIELD_TYPE_NUMBER - uint64_t for DM_REPORT_FIELD_TYPE_SIZE (number of 512-byte sectors) - uint64_t for DM_REPORT_FIELD_TYPE_PERCENT - const char* for DM_REPORT_FIELD_TYPE_STRING - struct dm_report_field_reserved_value for DM_REPORT_FIELD_TYPE_NONE - dm_report_reserved_handler* if DM_REPORT_FIELD_RESERVED_VALUE_{DYNAMIC_VALUE,FUZZY_NAMES} is used */ - const char **names; /* null-terminated array of static names for this reserved value */ - const char *description; /* description of the reserved value */ -}; - -/* - * Available actions for dm_report_reserved_value_handler. - */ -typedef enum { - DM_REPORT_RESERVED_PARSE_FUZZY_NAME, - DM_REPORT_RESERVED_GET_DYNAMIC_VALUE, -} dm_report_reserved_action_t; - -/* - * Generic reserved value handler to process reserved value names and/or values. - * - * Actions and their input/output: - * - * DM_REPORT_RESERVED_PARSE_FUZZY_NAME - * data_in: const char *fuzzy_name - * data_out: const char *canonical_name, NULL if fuzzy_name not recognized - * - * DM_REPORT_RESERVED_GET_DYNAMIC_VALUE - * data_in: const char *canonical_name - * data_out: void *value, NULL if canonical_name not recognized - * - * All actions return: - * - * -1 if action not implemented - * 0 on error - * 1 on success - */ -typedef int (*dm_report_reserved_handler) (struct dm_report *rh, - struct dm_pool *mem, - uint32_t field_num, - dm_report_reserved_action_t action, - const void *data_in, - const void **data_out); - -/* - * The dm_report_value_cache_{set,get} are helper functions to store and retrieve - * various values used during reporting (dm_report_field_type.report_fn) and/or - * selection processing (dm_report_reserved_handler instances) to avoid - * recalculation of these values or to share values among calls. - */ -int dm_report_value_cache_set(struct dm_report *rh, const char *name, const void *data); -const void *dm_report_value_cache_get(struct dm_report *rh, const char *name); -/* - * dm_report_init output_flags - */ -#define DM_REPORT_OUTPUT_MASK 0x000000FF -#define DM_REPORT_OUTPUT_ALIGNED 0x00000001 -#define DM_REPORT_OUTPUT_BUFFERED 0x00000002 -#define DM_REPORT_OUTPUT_HEADINGS 0x00000004 -#define DM_REPORT_OUTPUT_FIELD_NAME_PREFIX 0x00000008 -#define DM_REPORT_OUTPUT_FIELD_UNQUOTED 0x00000010 -#define DM_REPORT_OUTPUT_COLUMNS_AS_ROWS 0x00000020 -#define DM_REPORT_OUTPUT_MULTIPLE_TIMES 0x00000040 - -struct dm_report *dm_report_init(uint32_t *report_types, - const struct dm_report_object_type *types, - const struct dm_report_field_type *fields, - const char *output_fields, - const char *output_separator, - uint32_t output_flags, - const char *sort_keys, - void *private_data); -struct dm_report *dm_report_init_with_selection(uint32_t *report_types, - const struct dm_report_object_type *types, - const struct dm_report_field_type *fields, - const char *output_fields, - const char *output_separator, - uint32_t output_flags, - const char *sort_keys, - const char *selection, - const struct dm_report_reserved_value reserved_values[], - void *private_data); -/* - * Report an object, pass it through the selection criteria if they - * are present and display the result on output if it passes the criteria. - */ -int dm_report_object(struct dm_report *rh, void *object); -/* - * The same as dm_report_object, but display the result on output only if - * 'do_output' arg is set. Also, save the result of selection in 'selected' - * arg if it's not NULL (either 1 if the object passes, otherwise 0). - */ -int dm_report_object_is_selected(struct dm_report *rh, void *object, int do_output, int *selected); - -/* - * Compact report output so that if field value is empty for all rows in - * the report, drop the field from output completely (including headers). - * Compact output is applicable only if report is buffered, otherwise - * this function has no effect. - */ -int dm_report_compact_fields(struct dm_report *rh); - -/* - * The same as dm_report_compact_fields, but for selected fields only. - * The "fields" arg is comma separated list of field names (the same format - * as used for "output_fields" arg in dm_report_init fn). - */ -int dm_report_compact_given_fields(struct dm_report *rh, const char *fields); - -/* - * Returns 1 if there is no data waiting to be output. - */ -int dm_report_is_empty(struct dm_report *rh); - -/* - * Destroy report content without doing output. - */ -void dm_report_destroy_rows(struct dm_report *rh); - -int dm_report_output(struct dm_report *rh); - -/* - * Output the report headings for a columns-based report, even if they - * have already been shown. Useful for repeating reports that wish to - * issue a periodic reminder of the column headings. - */ -int dm_report_column_headings(struct dm_report *rh); - -void dm_report_free(struct dm_report *rh); - -/* - * Prefix added to each field name with DM_REPORT_OUTPUT_FIELD_NAME_PREFIX - */ -int dm_report_set_output_field_name_prefix(struct dm_report *rh, - const char *report_prefix); - -int dm_report_set_selection(struct dm_report *rh, const char *selection); - -/* - * Report functions are provided for simple data types. - * They take care of allocating copies of the data. - */ -int dm_report_field_string(struct dm_report *rh, struct dm_report_field *field, - const char *const *data); -int dm_report_field_string_list(struct dm_report *rh, struct dm_report_field *field, - const struct dm_list *data, const char *delimiter); -int dm_report_field_string_list_unsorted(struct dm_report *rh, struct dm_report_field *field, - const struct dm_list *data, const char *delimiter); -int dm_report_field_int32(struct dm_report *rh, struct dm_report_field *field, - const int32_t *data); -int dm_report_field_uint32(struct dm_report *rh, struct dm_report_field *field, - const uint32_t *data); -int dm_report_field_int(struct dm_report *rh, struct dm_report_field *field, - const int *data); -int dm_report_field_uint64(struct dm_report *rh, struct dm_report_field *field, - const uint64_t *data); -int dm_report_field_percent(struct dm_report *rh, struct dm_report_field *field, - const dm_percent_t *data); - -/* - * For custom fields, allocate the data in 'mem' and use - * dm_report_field_set_value(). - * 'sortvalue' may be NULL if it matches 'value' - */ -void dm_report_field_set_value(struct dm_report_field *field, const void *value, - const void *sortvalue); - -/* - * Report group support. - */ -struct dm_report_group; - -typedef enum { - DM_REPORT_GROUP_SINGLE, - DM_REPORT_GROUP_BASIC, - DM_REPORT_GROUP_JSON -} dm_report_group_type_t; - -struct dm_report_group *dm_report_group_create(dm_report_group_type_t type, void *data); -int dm_report_group_push(struct dm_report_group *group, struct dm_report *report, void *data); -int dm_report_group_pop(struct dm_report_group *group); -int dm_report_group_output_and_pop_all(struct dm_report_group *group); -int dm_report_group_destroy(struct dm_report_group *group); - -/* - * Stats counter access methods - * - * Each method returns the corresponding stats counter value from the - * supplied dm_stats handle for the specified region_id and area_id. - * If either region_id or area_id uses one of the special values - * DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT then the region - * or area is selected according to the current state of the dm_stats - * handle's embedded cursor. - * - * Two methods are provided to access counter values: a named function - * for each available counter field and a single function that accepts - * an enum value specifying the required field. New code is encouraged - * to use the enum based interface as calls to the named functions are - * implemented using the enum method internally. - * - * See the kernel documentation for complete descriptions of each - * counter field: - * - * Documentation/device-mapper/statistics.txt - * Documentation/iostats.txt - * - * reads: the number of reads completed - * reads_merged: the number of reads merged - * read_sectors: the number of sectors read - * read_nsecs: the number of nanoseconds spent reading - * writes: the number of writes completed - * writes_merged: the number of writes merged - * write_sectors: the number of sectors written - * write_nsecs: the number of nanoseconds spent writing - * io_in_progress: the number of I/Os currently in progress - * io_nsecs: the number of nanoseconds spent doing I/Os - * weighted_io_nsecs: the weighted number of nanoseconds spent doing I/Os - * total_read_nsecs: the total time spent reading in nanoseconds - * total_write_nsecs: the total time spent writing in nanoseconds - */ - -#define DM_STATS_REGION_CURRENT UINT64_MAX -#define DM_STATS_AREA_CURRENT UINT64_MAX - -typedef enum { - DM_STATS_READS_COUNT, - DM_STATS_READS_MERGED_COUNT, - DM_STATS_READ_SECTORS_COUNT, - DM_STATS_READ_NSECS, - DM_STATS_WRITES_COUNT, - DM_STATS_WRITES_MERGED_COUNT, - DM_STATS_WRITE_SECTORS_COUNT, - DM_STATS_WRITE_NSECS, - DM_STATS_IO_IN_PROGRESS_COUNT, - DM_STATS_IO_NSECS, - DM_STATS_WEIGHTED_IO_NSECS, - DM_STATS_TOTAL_READ_NSECS, - DM_STATS_TOTAL_WRITE_NSECS, - DM_STATS_NR_COUNTERS -} dm_stats_counter_t; - -uint64_t dm_stats_get_counter(const struct dm_stats *dms, - dm_stats_counter_t counter, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_reads(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_reads_merged(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_read_sectors(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_read_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_writes(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_writes_merged(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_write_sectors(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_write_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_io_in_progress(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_io_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_weighted_io_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_total_read_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -uint64_t dm_stats_get_total_write_nsecs(const struct dm_stats *dms, - uint64_t region_id, uint64_t area_id); - -/* - * Derived statistics access methods - * - * Each method returns the corresponding value calculated from the - * counters stored in the supplied dm_stats handle for the specified - * region_id and area_id. If either region_id or area_id uses one of the - * special values DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT then - * the region or area is selected according to the current state of the - * dm_stats handle's embedded cursor. - * - * The set of metrics is based on the fields provided by the Linux - * iostats program. - * - * rd_merges_per_sec: the number of reads merged per second - * wr_merges_per_sec: the number of writes merged per second - * reads_per_sec: the number of reads completed per second - * writes_per_sec: the number of writes completed per second - * read_sectors_per_sec: the number of sectors read per second - * write_sectors_per_sec: the number of sectors written per second - * average_request_size: the average size of requests submitted - * service_time: the average service time (in ns) for requests issued - * average_queue_size: the average queue length - * average_wait_time: the average time for requests to be served (in ns) - * average_rd_wait_time: the average read wait time - * average_wr_wait_time: the average write wait time - */ - -typedef enum { - DM_STATS_RD_MERGES_PER_SEC, - DM_STATS_WR_MERGES_PER_SEC, - DM_STATS_READS_PER_SEC, - DM_STATS_WRITES_PER_SEC, - DM_STATS_READ_SECTORS_PER_SEC, - DM_STATS_WRITE_SECTORS_PER_SEC, - DM_STATS_AVERAGE_REQUEST_SIZE, - DM_STATS_AVERAGE_QUEUE_SIZE, - DM_STATS_AVERAGE_WAIT_TIME, - DM_STATS_AVERAGE_RD_WAIT_TIME, - DM_STATS_AVERAGE_WR_WAIT_TIME, - DM_STATS_SERVICE_TIME, - DM_STATS_THROUGHPUT, - DM_STATS_UTILIZATION, - DM_STATS_NR_METRICS -} dm_stats_metric_t; - -int dm_stats_get_metric(const struct dm_stats *dms, int metric, - uint64_t region_id, uint64_t area_id, double *value); - -int dm_stats_get_rd_merges_per_sec(const struct dm_stats *dms, double *rrqm, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_wr_merges_per_sec(const struct dm_stats *dms, double *rrqm, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_reads_per_sec(const struct dm_stats *dms, double *rd_s, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_writes_per_sec(const struct dm_stats *dms, double *wr_s, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_read_sectors_per_sec(const struct dm_stats *dms, - double *rsec_s, uint64_t region_id, - uint64_t area_id); - -int dm_stats_get_write_sectors_per_sec(const struct dm_stats *dms, - double *wr_s, uint64_t region_id, - uint64_t area_id); - -int dm_stats_get_average_request_size(const struct dm_stats *dms, - double *arqsz, uint64_t region_id, - uint64_t area_id); - -int dm_stats_get_service_time(const struct dm_stats *dms, double *svctm, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_average_queue_size(const struct dm_stats *dms, double *qusz, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_average_wait_time(const struct dm_stats *dms, double *await, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_average_rd_wait_time(const struct dm_stats *dms, - double *await, uint64_t region_id, - uint64_t area_id); - -int dm_stats_get_average_wr_wait_time(const struct dm_stats *dms, - double *await, uint64_t region_id, - uint64_t area_id); - -int dm_stats_get_throughput(const struct dm_stats *dms, double *tput, - uint64_t region_id, uint64_t area_id); - -int dm_stats_get_utilization(const struct dm_stats *dms, dm_percent_t *util, - uint64_t region_id, uint64_t area_id); - -/* - * Statistics histogram access methods. - * - * Methods to access latency histograms for regions that have them - * enabled. Each histogram contains a configurable number of bins - * spanning a user defined latency interval. - * - * The bin count, upper and lower bin bounds, and bin values are - * made available via the following area methods. - * - * Methods to obtain a simple string representation of the histogram - * and its bounds are also provided. - */ - -/* - * Retrieve a pointer to the histogram associated with the specified - * area. If the area does not have a histogram configured this function - * returns NULL. - * - * The pointer does not need to be freed explicitly by the caller: it - * will become invalid following a subsequent dm_stats_list(), - * dm_stats_populate() or dm_stats_destroy() of the corresponding - * dm_stats handle. - * - * If region_id or area_id is one of the special values - * DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT the current cursor - * value is used to select the region or area. - */ -struct dm_histogram *dm_stats_get_histogram(const struct dm_stats *dms, - uint64_t region_id, - uint64_t area_id); - -/* - * Return the number of bins in the specified histogram handle. - */ -int dm_histogram_get_nr_bins(const struct dm_histogram *dmh); - -/* - * Get the lower bound of the specified bin of the histogram for the - * area specified by region_id and area_id. The value is returned in - * nanoseconds. - */ -uint64_t dm_histogram_get_bin_lower(const struct dm_histogram *dmh, int bin); - -/* - * Get the upper bound of the specified bin of the histogram for the - * area specified by region_id and area_id. The value is returned in - * nanoseconds. - */ -uint64_t dm_histogram_get_bin_upper(const struct dm_histogram *dmh, int bin); - -/* - * Get the width of the specified bin of the histogram for the area - * specified by region_id and area_id. The width is equal to the bin - * upper bound minus the lower bound and yields the range of latency - * values covered by this bin. The value is returned in nanoseconds. - */ -uint64_t dm_histogram_get_bin_width(const struct dm_histogram *dmh, int bin); - -/* - * Get the value of the specified bin of the histogram for the area - * specified by region_id and area_id. - */ -uint64_t dm_histogram_get_bin_count(const struct dm_histogram *dmh, int bin); - -/* - * Get the percentage (relative frequency) of the specified bin of the - * histogram for the area specified by region_id and area_id. - */ -dm_percent_t dm_histogram_get_bin_percent(const struct dm_histogram *dmh, - int bin); - -/* - * Return the total observations (sum of bin counts) for the histogram - * of the area specified by region_id and area_id. - */ -uint64_t dm_histogram_get_sum(const struct dm_histogram *dmh); - -/* - * Histogram formatting flags. - */ -#define DM_HISTOGRAM_SUFFIX 0x1 -#define DM_HISTOGRAM_VALUES 0x2 -#define DM_HISTOGRAM_PERCENT 0X4 -#define DM_HISTOGRAM_BOUNDS_LOWER 0x10 -#define DM_HISTOGRAM_BOUNDS_UPPER 0x20 -#define DM_HISTOGRAM_BOUNDS_RANGE 0x30 - -/* - * Return a string representation of the supplied histogram's values and - * bin boundaries. - * - * The bin argument selects the bin to format. If this argument is less - * than zero all bins will be included in the resulting string. - * - * width specifies a minimum width for the field in characters; if it is - * zero the width will be determined automatically based on the options - * selected for formatting. A value less than zero disables field width - * control: bin boundaries and values will be output with a minimum - * amount of whitespace. - * - * flags is a collection of flag arguments that control the string format: - * - * DM_HISTOGRAM_VALUES - Include bin values in the string. - * DM_HISTOGRAM_SUFFIX - Include time unit suffixes when printing bounds. - * DM_HISTOGRAM_PERCENT - Format bin values as a percentage. - * - * DM_HISTOGRAM_BOUNDS_LOWER - Include the lower bound of each bin. - * DM_HISTOGRAM_BOUNDS_UPPER - Include the upper bound of each bin. - * DM_HISTOGRAM_BOUNDS_RANGE - Show the span of each bin as "lo-up". - * - * The returned pointer does not need to be freed explicitly by the - * caller: it will become invalid following a subsequent - * dm_stats_list(), dm_stats_populate() or dm_stats_destroy() of the - * corresponding dm_stats handle. - */ -const char *dm_histogram_to_string(const struct dm_histogram *dmh, int bin, - int width, int flags); - -/************************* - * config file parse/print - *************************/ -typedef enum { - DM_CFG_INT, - DM_CFG_FLOAT, - DM_CFG_STRING, - DM_CFG_EMPTY_ARRAY -} dm_config_value_type_t; - -struct dm_config_value { - dm_config_value_type_t type; - - union { - int64_t i; - float f; - double d; /* Unused. */ - const char *str; - } v; - - struct dm_config_value *next; /* For arrays */ - uint32_t format_flags; -}; - -struct dm_config_node { - const char *key; - struct dm_config_node *parent, *sib, *child; - struct dm_config_value *v; - int id; -}; - -struct dm_config_tree { - struct dm_config_node *root; - struct dm_config_tree *cascade; - struct dm_pool *mem; - void *custom; -}; - -struct dm_config_tree *dm_config_create(void); -struct dm_config_tree *dm_config_from_string(const char *config_settings); -int dm_config_parse(struct dm_config_tree *cft, const char *start, const char *end); -int dm_config_parse_without_dup_node_check(struct dm_config_tree *cft, const char *start, const char *end); - -void *dm_config_get_custom(struct dm_config_tree *cft); -void dm_config_set_custom(struct dm_config_tree *cft, void *custom); - -/* - * When searching, first_cft is checked before second_cft. - */ -struct dm_config_tree *dm_config_insert_cascaded_tree(struct dm_config_tree *first_cft, struct dm_config_tree *second_cft); - -/* - * If there's a cascaded dm_config_tree, remove the top layer - * and return the layer below. Otherwise return NULL. - */ -struct dm_config_tree *dm_config_remove_cascaded_tree(struct dm_config_tree *cft); - -/* - * Create a new, uncascaded config tree equivalent to the input cascade. - */ -struct dm_config_tree *dm_config_flatten(struct dm_config_tree *cft); - -void dm_config_destroy(struct dm_config_tree *cft); - -/* Simple output line by line. */ -typedef int (*dm_putline_fn)(const char *line, void *baton); -/* More advaced output with config node reference. */ -typedef int (*dm_config_node_out_fn)(const struct dm_config_node *cn, const char *line, void *baton); - -/* - * Specification for advanced config node output. - */ -struct dm_config_node_out_spec { - dm_config_node_out_fn prefix_fn; /* called before processing config node lines */ - dm_config_node_out_fn line_fn; /* called for each config node line */ - dm_config_node_out_fn suffix_fn; /* called after processing config node lines */ -}; - -/* Write the node and any subsequent siblings it has. */ -int dm_config_write_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton); -int dm_config_write_node_out(const struct dm_config_node *cn, const struct dm_config_node_out_spec *out_spec, void *baton); - -/* Write given node only without subsequent siblings. */ -int dm_config_write_one_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton); -int dm_config_write_one_node_out(const struct dm_config_node *cn, const struct dm_config_node_out_spec *out_spec, void *baton); - -struct dm_config_node *dm_config_find_node(const struct dm_config_node *cn, const char *path); -int dm_config_has_node(const struct dm_config_node *cn, const char *path); -int dm_config_remove_node(struct dm_config_node *parent, struct dm_config_node *remove); -const char *dm_config_find_str(const struct dm_config_node *cn, const char *path, const char *fail); -const char *dm_config_find_str_allow_empty(const struct dm_config_node *cn, const char *path, const char *fail); -int dm_config_find_int(const struct dm_config_node *cn, const char *path, int fail); -int64_t dm_config_find_int64(const struct dm_config_node *cn, const char *path, int64_t fail); -float dm_config_find_float(const struct dm_config_node *cn, const char *path, float fail); - -const struct dm_config_node *dm_config_tree_find_node(const struct dm_config_tree *cft, const char *path); -const char *dm_config_tree_find_str(const struct dm_config_tree *cft, const char *path, const char *fail); -const char *dm_config_tree_find_str_allow_empty(const struct dm_config_tree *cft, const char *path, const char *fail); -int dm_config_tree_find_int(const struct dm_config_tree *cft, const char *path, int fail); -int64_t dm_config_tree_find_int64(const struct dm_config_tree *cft, const char *path, int64_t fail); -float dm_config_tree_find_float(const struct dm_config_tree *cft, const char *path, float fail); -int dm_config_tree_find_bool(const struct dm_config_tree *cft, const char *path, int fail); - -/* - * Understands (0, ~0), (y, n), (yes, no), (on, - * off), (true, false). - */ -int dm_config_find_bool(const struct dm_config_node *cn, const char *path, int fail); -int dm_config_value_is_bool(const struct dm_config_value *v); - -int dm_config_get_uint32(const struct dm_config_node *cn, const char *path, uint32_t *result); -int dm_config_get_uint64(const struct dm_config_node *cn, const char *path, uint64_t *result); -int dm_config_get_str(const struct dm_config_node *cn, const char *path, const char **result); -int dm_config_get_list(const struct dm_config_node *cn, const char *path, const struct dm_config_value **result); -int dm_config_get_section(const struct dm_config_node *cn, const char *path, const struct dm_config_node **result); - -unsigned dm_config_maybe_section(const char *str, unsigned len); - -const char *dm_config_parent_name(const struct dm_config_node *n); - -struct dm_config_node *dm_config_clone_node_with_mem(struct dm_pool *mem, const struct dm_config_node *node, int siblings); -struct dm_config_node *dm_config_create_node(struct dm_config_tree *cft, const char *key); -struct dm_config_value *dm_config_create_value(struct dm_config_tree *cft); -struct dm_config_node *dm_config_clone_node(struct dm_config_tree *cft, const struct dm_config_node *cn, int siblings); - -/* - * Common formatting flags applicable to all config node types (lower 16 bits). - */ -#define DM_CONFIG_VALUE_FMT_COMMON_ARRAY 0x00000001 /* value is array */ -#define DM_CONFIG_VALUE_FMT_COMMON_EXTRA_SPACES 0x00000002 /* add spaces in "key = value" pairs in constrast to "key=value" for better readability */ - -/* - * Type-related config node formatting flags (higher 16 bits). - */ -/* int-related formatting flags */ -#define DM_CONFIG_VALUE_FMT_INT_OCTAL 0x00010000 /* print number in octal form */ - -/* string-related formatting flags */ -#define DM_CONFIG_VALUE_FMT_STRING_NO_QUOTES 0x00010000 /* do not print quotes around string value */ - -void dm_config_value_set_format_flags(struct dm_config_value *cv, uint32_t format_flags); -uint32_t dm_config_value_get_format_flags(struct dm_config_value *cv); - -struct dm_pool *dm_config_memory(struct dm_config_tree *cft); - -/* Udev device directory. */ -#define DM_UDEV_DEV_DIR "/dev/" - -/* Cookie prefixes. - * - * The cookie value consists of a prefix (16 bits) and a base (16 bits). - * We can use the prefix to store the flags. These flags are sent to - * kernel within given dm task. When returned back to userspace in - * DM_COOKIE udev environment variable, we can control several aspects - * of udev rules we use by decoding the cookie prefix. When doing the - * notification, we replace the cookie prefix with DM_COOKIE_MAGIC, - * so we notify the right semaphore. - * - * It is still possible to use cookies for passing the flags to udev - * rules even when udev_sync is disabled. The base part of the cookie - * will be zero (there's no notification semaphore) and prefix will be - * set then. However, having udev_sync enabled is highly recommended. - */ -#define DM_COOKIE_MAGIC 0x0D4D -#define DM_UDEV_FLAGS_MASK 0xFFFF0000 -#define DM_UDEV_FLAGS_SHIFT 16 - -/* - * DM_UDEV_DISABLE_DM_RULES_FLAG is set in case we need to disable - * basic device-mapper udev rules that create symlinks in /dev/<DM_DIR> - * directory. However, we can't reliably prevent creating default - * nodes by udev (commonly /dev/dm-X, where X is a number). - */ -#define DM_UDEV_DISABLE_DM_RULES_FLAG 0x0001 -/* - * DM_UDEV_DISABLE_SUBSYTEM_RULES_FLAG is set in case we need to disable - * subsystem udev rules, but still we need the general DM udev rules to - * be applied (to create the nodes and symlinks under /dev and /dev/disk). - */ -#define DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG 0x0002 -/* - * DM_UDEV_DISABLE_DISK_RULES_FLAG is set in case we need to disable - * general DM rules that set symlinks in /dev/disk directory. - */ -#define DM_UDEV_DISABLE_DISK_RULES_FLAG 0x0004 -/* - * DM_UDEV_DISABLE_OTHER_RULES_FLAG is set in case we need to disable - * all the other rules that are not general device-mapper nor subsystem - * related (the rules belong to other software or packages). All foreign - * rules should check this flag directly and they should ignore further - * rule processing for such event. - */ -#define DM_UDEV_DISABLE_OTHER_RULES_FLAG 0x0008 -/* - * DM_UDEV_LOW_PRIORITY_FLAG is set in case we need to instruct the - * udev rules to give low priority to the device that is currently - * processed. For example, this provides a way to select which symlinks - * could be overwritten by high priority ones if their names are equal. - * Common situation is a name based on FS UUID while using origin and - * snapshot devices. - */ -#define DM_UDEV_LOW_PRIORITY_FLAG 0x0010 -/* - * DM_UDEV_DISABLE_LIBRARY_FALLBACK is set in case we need to disable - * libdevmapper's node management. We will rely on udev completely - * and there will be no fallback action provided by libdevmapper if - * udev does something improperly. Using the library fallback code has - * a consequence that you need to take into account: any device node - * or symlink created without udev is not recorded in udev database - * which other applications may read to get complete list of devices. - * For this reason, use of DM_UDEV_DISABLE_LIBRARY_FALLBACK is - * recommended on systems where udev is used. Keep library fallback - * enabled just for exceptional cases where you need to debug udev-related - * problems. If you hit such problems, please contact us through upstream - * LVM2 development mailing list (see also README file). This flag is - * currently not set by default in libdevmapper so you need to set it - * explicitly if you're sure that udev is behaving correctly on your - * setups. - */ -#define DM_UDEV_DISABLE_LIBRARY_FALLBACK 0x0020 -/* - * DM_UDEV_PRIMARY_SOURCE_FLAG is automatically appended by - * libdevmapper for all ioctls generating udev uevents. Once used in - * udev rules, we know if this is a real "primary sourced" event or not. - * We need to distinguish real events originated in libdevmapper from - * any spurious events to gather all missing information (e.g. events - * generated as a result of "udevadm trigger" command or as a result - * of the "watch" udev rule). - */ -#define DM_UDEV_PRIMARY_SOURCE_FLAG 0x0040 - -/* - * Udev flags reserved for use by any device-mapper subsystem. - */ -#define DM_SUBSYSTEM_UDEV_FLAG0 0x0100 -#define DM_SUBSYSTEM_UDEV_FLAG1 0x0200 -#define DM_SUBSYSTEM_UDEV_FLAG2 0x0400 -#define DM_SUBSYSTEM_UDEV_FLAG3 0x0800 -#define DM_SUBSYSTEM_UDEV_FLAG4 0x1000 -#define DM_SUBSYSTEM_UDEV_FLAG5 0x2000 -#define DM_SUBSYSTEM_UDEV_FLAG6 0x4000 -#define DM_SUBSYSTEM_UDEV_FLAG7 0x8000 - -int dm_cookie_supported(void); - -/* - * Udev synchronisation functions. - */ -void dm_udev_set_sync_support(int sync_with_udev); -int dm_udev_get_sync_support(void); -void dm_udev_set_checking(int checking); -int dm_udev_get_checking(void); - -/* - * Default value to get new auto generated cookie created - */ -#define DM_COOKIE_AUTO_CREATE 0 -int dm_udev_create_cookie(uint32_t *cookie); -int dm_udev_complete(uint32_t cookie); -int dm_udev_wait(uint32_t cookie); - -/* - * dm_dev_wait_immediate - * If *ready is 1 on return, the wait is complete. - * If *ready is 0 on return, the wait is incomplete and either - * this function or dm_udev_wait() must be called again. - * Returns 0 on error, when neither function should be called again. - */ -int dm_udev_wait_immediate(uint32_t cookie, int *ready); - -#define DM_DEV_DIR_UMASK 0022 -#define DM_CONTROL_NODE_UMASK 0177 - -#ifdef __cplusplus -} -#endif -#endif /* LIB_DEVICE_MAPPER_H */ diff --git a/device_mapper/libdm-common.h b/device_mapper/libdm-common.h index 010d876..cf99265 100644 --- a/device_mapper/libdm-common.h +++ b/device_mapper/libdm-common.h @@ -16,7 +16,7 @@ #ifndef LIB_DMCOMMON_H #define LIB_DMCOMMON_H -#include "libdevmapper.h" +#include "device_mapper/all.h" #define DM_DEFAULT_NAME_MANGLING_MODE_ENV_VAR_NAME "DM_DEFAULT_NAME_MANGLING_MODE" diff --git a/device_mapper/misc/dm-logging.h b/device_mapper/misc/dm-logging.h index e355bc5..4db38bd 100644 --- a/device_mapper/misc/dm-logging.h +++ b/device_mapper/misc/dm-logging.h @@ -16,7 +16,7 @@ #ifndef _DM_LOGGING_H #define _DM_LOGGING_H -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" extern dm_log_with_errno_fn dm_log_with_errno; diff --git a/device_mapper/misc/dmlib.h b/device_mapper/misc/dmlib.h index 88b6ac3..fe64bd7 100644 --- a/device_mapper/misc/dmlib.h +++ b/device_mapper/misc/dmlib.h @@ -26,7 +26,7 @@ #define _REENTRANT #define _GNU_SOURCE -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include "lib/misc/util.h" #include "dm-logging.h" diff --git a/device_mapper/vdo/status.c b/device_mapper/vdo/status.c index 4bd15e4..7a26e1a 100644 --- a/device_mapper/vdo/status.c +++ b/device_mapper/vdo/status.c @@ -1,7 +1,7 @@ #include "target.h" // For DM_ARRAY_SIZE! -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include <ctype.h> #include <stdlib.h> diff --git a/lib/config/config.h b/lib/config/config.h index 146aae1..4c8ddac 100644 --- a/lib/config/config.h +++ b/lib/config/config.h @@ -16,7 +16,7 @@ #ifndef _LVM_CONFIG_H #define _LVM_CONFIG_H -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include "lib/device/device.h" /* 16 bits: 3 bits for major, 4 bits for minor, 9 bits for patchlevel */ diff --git a/lib/device/bcache.h b/lib/device/bcache.h index 8f328c7..cb36c30 100644 --- a/lib/device/bcache.h +++ b/lib/device/bcache.h @@ -15,7 +15,7 @@ #ifndef BCACHE_H #define BCACHE_H -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include <linux/fs.h> #include <stdint.h> diff --git a/lib/metadata/pv.h b/lib/metadata/pv.h index d5d91ce..61aa54e 100644 --- a/lib/metadata/pv.h +++ b/lib/metadata/pv.h @@ -16,7 +16,7 @@ #define _LVM_PV_H #include "lib/uuid/uuid.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" struct device; struct format_type; diff --git a/lib/metadata/vg.h b/lib/metadata/vg.h index 6208159..9921b91 100644 --- a/lib/metadata/vg.h +++ b/lib/metadata/vg.h @@ -16,7 +16,7 @@ #define _LVM_VG_H #include "lib/uuid/uuid.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" struct cmd_context; struct format_instance; diff --git a/lib/misc/lib.h b/lib/misc/lib.h index 3ae3aac..0d61f34 100644 --- a/lib/misc/lib.h +++ b/lib/misc/lib.h @@ -79,7 +79,7 @@ #include "lib/misc/intl.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include "lib/misc/util.h" #ifdef DM diff --git a/lib/report/properties.h b/lib/report/properties.h index 38b6111..3d93b08 100644 --- a/lib/report/properties.h +++ b/lib/report/properties.h @@ -14,7 +14,7 @@ #ifndef _LVM_PROPERTIES_H #define _LVM_PROPERTIES_H -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include "lib/metadata/metadata.h" #include "lib/report/report.h" #include "lib/properties/prop_common.h" diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c index 9ba1996..7791e64 100644 --- a/scripts/lvm2_activation_generator_systemd_red_hat.c +++ b/scripts/lvm2_activation_generator_systemd_red_hat.c @@ -27,7 +27,7 @@ #include <unistd.h> #include "configure.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" //---------------------------------------------------------------- diff --git a/test/unit/activation-generator_t.c b/test/unit/activation-generator_t.c index 56871a7..9f6b661 100644 --- a/test/unit/activation-generator_t.c +++ b/test/unit/activation-generator_t.c @@ -16,7 +16,7 @@ #include "framework.h" #include "units.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" //---------------------------------------------------------------- diff --git a/test/unit/bitset_t.c b/test/unit/bitset_t.c index 9b18fcb..12b2a20 100644 --- a/test/unit/bitset_t.c +++ b/test/unit/bitset_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" enum { NR_BITS = 137 diff --git a/test/unit/config_t.c b/test/unit/config_t.c index 21af551..50d388f 100644 --- a/test/unit/config_t.c +++ b/test/unit/config_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" static void *_mem_init(void) { diff --git a/test/unit/dmlist_t.c b/test/unit/dmlist_t.c index 8a9948f..0e33385 100644 --- a/test/unit/dmlist_t.c +++ b/test/unit/dmlist_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" static void test_dmlist_splice(void *fixture) { diff --git a/test/unit/dmstatus_t.c b/test/unit/dmstatus_t.c index f50dd75..ac2015e 100644 --- a/test/unit/dmstatus_t.c +++ b/test/unit/dmstatus_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" static void *_mem_init(void) { diff --git a/test/unit/framework.h b/test/unit/framework.h index 0a8a5f2..0c45596 100644 --- a/test/unit/framework.h +++ b/test/unit/framework.h @@ -1,7 +1,7 @@ #ifndef TEST_UNIT_FRAMEWORK_H #define TEST_UNIT_FRAMEWORK_H -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include <stdbool.h> #include <stdint.h> diff --git a/test/unit/matcher_t.c b/test/unit/matcher_t.c index 296c78a..89b2988 100644 --- a/test/unit/matcher_t.c +++ b/test/unit/matcher_t.c @@ -14,7 +14,7 @@ */ #include "units.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include "matcher_data.h" diff --git a/test/unit/percent_t.c b/test/unit/percent_t.c index 4341480..9b349a9 100644 --- a/test/unit/percent_t.c +++ b/test/unit/percent_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include <stdio.h> #include <string.h> diff --git a/test/unit/string_t.c b/test/unit/string_t.c index 3557247..82c6448 100644 --- a/test/unit/string_t.c +++ b/test/unit/string_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include <stdio.h> #include <string.h> diff --git a/tools/tool.h b/tools/tool.h index 51d530c..a4cef3d 100644 --- a/tools/tool.h +++ b/tools/tool.h @@ -24,7 +24,7 @@ #include <unistd.h> -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include "lib/misc/util.h" #endif /* _LVM_TOOL_H */

1 0

master - libdm: Stop libdm/misc/dmlib.h from including lib/misc/lib.h
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c78239d8605f333915543… Commit: c78239d8605f333915543c0e0c3ccf4f4ef5ee8f Parent: 286c1ba3369d1901480425e305e313e8ea365da4 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 13:01:41 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 13:01:41 2018 +0100 libdm: Stop libdm/misc/dmlib.h from including lib/misc/lib.h --- libdm/misc/dmlib.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 64 insertions(+), 3 deletions(-) diff --git a/libdm/misc/dmlib.h b/libdm/misc/dmlib.h index bc14ece..4c6bcfc 100644 --- a/libdm/misc/dmlib.h +++ b/libdm/misc/dmlib.h @@ -14,13 +14,74 @@ */ /* - * This file must be included first by every device-mapper library source file. + * This file must be included first by every library source file. */ #ifndef _DM_LIB_H #define _DM_LIB_H -#define DM +#include "configure.h" -#include "lib/misc/lib.h" +#define _REENTRANT +#define _GNU_SOURCE + +/* + * Symbol export control macros + * + * DM_EXPORT_SYMBOL(func,ver) + * DM_EXPORT_SYMBOL_BASE(func,ver) + * + * For functions that have multiple implementations these macros control + * symbol export and versioning. + * + * Function definitions that exist in only one version never need to use + * these macros. + * + * Backwards compatible implementations must include a version tag of + * the form "_v1_02_104" as a suffix to the function name and use the + * macro DM_EXPORT_SYMBOL to export the function and bind it to the + * specified version string. + * + * Since versioning is only available when compiling with GCC the entire + * compatibility version should be enclosed in '#if defined(__GNUC__)', + * for example: + * + * int dm_foo(int bar) + * { + * return bar; + * } + * + * #if defined(__GNUC__) + * // Backward compatible dm_foo() version 1.02.104 + * int dm_foo_v1_02_104(void); + * int dm_foo_v1_02_104(void) + * { + * return 0; + * } + * DM_EXPORT_SYMBOL(dm_foo,1_02_104) + * #endif + * + * A prototype for the compatibility version is required as these + * functions must not be declared static. + * + * The DM_EXPORT_SYMBOL_BASE macro is only used to export the base + * versions of library symbols prior to the introduction of symbol + * versioning: it must never be used for new symbols. + */ +#if defined(__GNUC__) +#define DM_EXPORT_SYMBOL(func, ver) \ + __asm__(".symver " #func "_v" #ver ", " #func "@DM_" #ver ) +#define DM_EXPORT_SYMBOL_BASE(func) \ + __asm__(".symver " #func "_base, " #func "@Base" ) +#else +#define DM_EXPORT_SYMBOL(func, ver) +#define DM_EXPORT_SYMBOL_BASE(func) +#endif + +#include "lib/misc/util.h" + +#include "libdm/libdevmapper.h" +#include "libdm/misc/dm-logging.h" + +#include <unistd.h> #endif

1 0

master - base: Move list to base/data-struct
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=88ae928ca3f950fa0ecb8… Commit: 88ae928ca3f950fa0ecb8b8e0aff118b7360a9d7 Parent: 9573ff3a3bbd61fb178ea73e24c689822b9aca85 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 11:24:18 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 11:24:18 2018 +0100 base: Move list to base/data-struct --- base/Makefile | 1 + base/data-struct/list.c | 170 +++++++++++++++++++++++++++++++ base/data-struct/list.h | 209 +++++++++++++++++++++++++++++++++++++++ device_mapper/Makefile | 1 - device_mapper/datastruct/list.c | 168 ------------------------------- device_mapper/libdevmapper.h | 209 +-------------------------------------- 6 files changed, 384 insertions(+), 374 deletions(-) diff --git a/base/Makefile b/base/Makefile index 27f539f..4dcb6b6 100644 --- a/base/Makefile +++ b/base/Makefile @@ -12,6 +12,7 @@ BASE_SOURCE=\ base/data-struct/radix-tree.c \ + base/data-struct/list.c BASE_DEPENDS=$(addprefix $(top_builddir)/,$(subst .c,.d,$(BASE_SOURCE))) BASE_OBJECTS=$(addprefix $(top_builddir)/,$(subst .c,.o,$(BASE_SOURCE))) diff --git a/base/data-struct/list.c b/base/data-struct/list.c new file mode 100644 index 0000000..894e273 --- /dev/null +++ b/base/data-struct/list.c @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "list.h" + +#include <assert.h> +#include <stdlib.h> + +/* + * Initialise a list before use. + * The list head's next and previous pointers point back to itself. + */ +void dm_list_init(struct dm_list *head) +{ + head->n = head->p = head; +} + +/* + * Insert an element before 'head'. + * If 'head' is the list head, this adds an element to the end of the list. + */ +void dm_list_add(struct dm_list *head, struct dm_list *elem) +{ + assert(head->n); + + elem->n = head; + elem->p = head->p; + + head->p->n = elem; + head->p = elem; +} + +/* + * Insert an element after 'head'. + * If 'head' is the list head, this adds an element to the front of the list. + */ +void dm_list_add_h(struct dm_list *head, struct dm_list *elem) +{ + assert(head->n); + + elem->n = head->n; + elem->p = head; + + head->n->p = elem; + head->n = elem; +} + +/* + * Delete an element from its list. + * Note that this doesn't change the element itself - it may still be safe + * to follow its pointers. + */ +void dm_list_del(struct dm_list *elem) +{ + elem->n->p = elem->p; + elem->p->n = elem->n; +} + +/* + * Remove an element from existing list and insert before 'head'. + */ +void dm_list_move(struct dm_list *head, struct dm_list *elem) +{ + dm_list_del(elem); + dm_list_add(head, elem); +} + +/* + * Is the list empty? + */ +int dm_list_empty(const struct dm_list *head) +{ + return head->n == head; +} + +/* + * Is this the first element of the list? + */ +int dm_list_start(const struct dm_list *head, const struct dm_list *elem) +{ + return elem->p == head; +} + +/* + * Is this the last element of the list? + */ +int dm_list_end(const struct dm_list *head, const struct dm_list *elem) +{ + return elem->n == head; +} + +/* + * Return first element of the list or NULL if empty + */ +struct dm_list *dm_list_first(const struct dm_list *head) +{ + return (dm_list_empty(head) ? NULL : head->n); +} + +/* + * Return last element of the list or NULL if empty + */ +struct dm_list *dm_list_last(const struct dm_list *head) +{ + return (dm_list_empty(head) ? NULL : head->p); +} + +/* + * Return the previous element of the list, or NULL if we've reached the start. + */ +struct dm_list *dm_list_prev(const struct dm_list *head, const struct dm_list *elem) +{ + return (dm_list_start(head, elem) ? NULL : elem->p); +} + +/* + * Return the next element of the list, or NULL if we've reached the end. + */ +struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *elem) +{ + return (dm_list_end(head, elem) ? NULL : elem->n); +} + +/* + * Return the number of elements in a list by walking it. + */ +unsigned int dm_list_size(const struct dm_list *head) +{ + unsigned int s = 0; + const struct dm_list *v; + + dm_list_iterate(v, head) + s++; + + return s; +} + +/* + * Join two lists together. + * This moves all the elements of the list 'head1' to the end of the list + * 'head', leaving 'head1' empty. + */ +void dm_list_splice(struct dm_list *head, struct dm_list *head1) +{ + assert(head->n); + assert(head1->n); + + if (dm_list_empty(head1)) + return; + + head1->p->n = head; + head1->n->p = head->p; + + head->p->n = head1->n; + head->p = head1->p; + + dm_list_init(head1); +} diff --git a/base/data-struct/list.h b/base/data-struct/list.h new file mode 100644 index 0000000..1a107d1 --- /dev/null +++ b/base/data-struct/list.h @@ -0,0 +1,209 @@ +#ifndef BASE_DATA_STRUCT_LIST_H +#define BASE_DATA_STRUCT_LIST_H + +//---------------------------------------------------------------- + +/* + * A list consists of a list head plus elements. + * Each element has 'next' and 'previous' pointers. + * The list head's pointers point to the first and the last element. + */ + +struct dm_list { + struct dm_list *n, *p; +}; + +/* + * String list. + */ +struct dm_str_list { + struct dm_list list; + const char *str; +}; + +/* + * Initialise a list before use. + * The list head's next and previous pointers point back to itself. + */ +#define DM_LIST_HEAD_INIT(name) { &(name), &(name) } +#define DM_LIST_INIT(name) struct dm_list name = DM_LIST_HEAD_INIT(name) +void dm_list_init(struct dm_list *head); + +/* + * Insert an element before 'head'. + * If 'head' is the list head, this adds an element to the end of the list. + */ +void dm_list_add(struct dm_list *head, struct dm_list *elem); + +/* + * Insert an element after 'head'. + * If 'head' is the list head, this adds an element to the front of the list. + */ +void dm_list_add_h(struct dm_list *head, struct dm_list *elem); + +/* + * Delete an element from its list. + * Note that this doesn't change the element itself - it may still be safe + * to follow its pointers. + */ +void dm_list_del(struct dm_list *elem); + +/* + * Remove an element from existing list and insert before 'head'. + */ +void dm_list_move(struct dm_list *head, struct dm_list *elem); + +/* + * Join 'head1' to the end of 'head'. + */ +void dm_list_splice(struct dm_list *head, struct dm_list *head1); + +/* + * Is the list empty? + */ +int dm_list_empty(const struct dm_list *head); + +/* + * Is this the first element of the list? + */ +int dm_list_start(const struct dm_list *head, const struct dm_list *elem); + +/* + * Is this the last element of the list? + */ +int dm_list_end(const struct dm_list *head, const struct dm_list *elem); + +/* + * Return first element of the list or NULL if empty + */ +struct dm_list *dm_list_first(const struct dm_list *head); + +/* + * Return last element of the list or NULL if empty + */ +struct dm_list *dm_list_last(const struct dm_list *head); + +/* + * Return the previous element of the list, or NULL if we've reached the start. + */ +struct dm_list *dm_list_prev(const struct dm_list *head, const struct dm_list *elem); + +/* + * Return the next element of the list, or NULL if we've reached the end. + */ +struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *elem); + +/* + * Given the address v of an instance of 'struct dm_list' called 'head' + * contained in a structure of type t, return the containing structure. + */ +#define dm_list_struct_base(v, t, head) \ + ((t *)((const char *)(v) - (const char *)&((t *) 0)->head)) + +/* + * Given the address v of an instance of 'struct dm_list list' contained in + * a structure of type t, return the containing structure. + */ +#define dm_list_item(v, t) dm_list_struct_base((v), t, list) + +/* + * Given the address v of one known element e in a known structure of type t, + * return another element f. + */ +#define dm_struct_field(v, t, e, f) \ + (((t *)((uintptr_t)(v) - (uintptr_t)&((t *) 0)->e))->f) + +/* + * Given the address v of a known element e in a known structure of type t, + * return the list head 'list' + */ +#define dm_list_head(v, t, e) dm_struct_field(v, t, e, list) + +/* + * Set v to each element of a list in turn. + */ +#define dm_list_iterate(v, head) \ + for (v = (head)->n; v != head; v = v->n) + +/* + * Set v to each element in a list in turn, starting from the element + * in front of 'start'. + * You can use this to 'unwind' a list_iterate and back out actions on + * already-processed elements. + * If 'start' is 'head' it walks the list backwards. + */ +#define dm_list_uniterate(v, head, start) \ + for (v = (start)->p; v != head; v = v->p) + +/* + * A safe way to walk a list and delete and free some elements along + * the way. + * t must be defined as a temporary variable of the same type as v. + */ +#define dm_list_iterate_safe(v, t, head) \ + for (v = (head)->n, t = v->n; v != head; v = t, t = v->n) + +/* + * Walk a list, setting 'v' in turn to the containing structure of each item. + * The containing structure should be the same type as 'v'. + * The 'struct dm_list' variable within the containing structure is 'field'. + */ +#define dm_list_iterate_items_gen(v, head, field) \ + for (v = dm_list_struct_base((head)->n, __typeof__(*v), field); \ + &v->field != (head); \ + v = dm_list_struct_base(v->field.n, __typeof__(*v), field)) + +/* + * Walk a list, setting 'v' in turn to the containing structure of each item. + * The containing structure should be the same type as 'v'. + * The list should be 'struct dm_list list' within the containing structure. + */ +#define dm_list_iterate_items(v, head) dm_list_iterate_items_gen(v, (head), list) + +/* + * Walk a list, setting 'v' in turn to the containing structure of each item. + * The containing structure should be the same type as 'v'. + * The 'struct dm_list' variable within the containing structure is 'field'. + * t must be defined as a temporary variable of the same type as v. + */ +#define dm_list_iterate_items_gen_safe(v, t, head, field) \ + for (v = dm_list_struct_base((head)->n, __typeof__(*v), field), \ + t = dm_list_struct_base(v->field.n, __typeof__(*v), field); \ + &v->field != (head); \ + v = t, t = dm_list_struct_base(v->field.n, __typeof__(*v), field)) +/* + * Walk a list, setting 'v' in turn to the containing structure of each item. + * The containing structure should be the same type as 'v'. + * The list should be 'struct dm_list list' within the containing structure. + * t must be defined as a temporary variable of the same type as v. + */ +#define dm_list_iterate_items_safe(v, t, head) \ + dm_list_iterate_items_gen_safe(v, t, (head), list) + +/* + * Walk a list backwards, setting 'v' in turn to the containing structure + * of each item. + * The containing structure should be the same type as 'v'. + * The 'struct dm_list' variable within the containing structure is 'field'. + */ +#define dm_list_iterate_back_items_gen(v, head, field) \ + for (v = dm_list_struct_base((head)->p, __typeof__(*v), field); \ + &v->field != (head); \ + v = dm_list_struct_base(v->field.p, __typeof__(*v), field)) + +/* + * Walk a list backwards, setting 'v' in turn to the containing structure + * of each item. + * The containing structure should be the same type as 'v'. + * The list should be 'struct dm_list list' within the containing structure. + */ +#define dm_list_iterate_back_items(v, head) dm_list_iterate_back_items_gen(v, (head), list) + +/* + * Return the number of elements in a list by walking it. + */ +unsigned int dm_list_size(const struct dm_list *head); + +//---------------------------------------------------------------- + +#endif diff --git a/device_mapper/Makefile b/device_mapper/Makefile index b246f82..4036cb4 100644 --- a/device_mapper/Makefile +++ b/device_mapper/Makefile @@ -13,7 +13,6 @@ DEVICE_MAPPER_SOURCE=\ device_mapper/datastruct/bitset.c \ device_mapper/datastruct/hash.c \ - device_mapper/datastruct/list.c \ device_mapper/libdm-common.c \ device_mapper/libdm-config.c \ device_mapper/libdm-deptree.c \ diff --git a/device_mapper/datastruct/list.c b/device_mapper/datastruct/list.c deleted file mode 100644 index bda8027..0000000 --- a/device_mapper/datastruct/list.c +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "device_mapper/misc/dmlib.h" -#include <assert.h> - -/* - * Initialise a list before use. - * The list head's next and previous pointers point back to itself. - */ -void dm_list_init(struct dm_list *head) -{ - head->n = head->p = head; -} - -/* - * Insert an element before 'head'. - * If 'head' is the list head, this adds an element to the end of the list. - */ -void dm_list_add(struct dm_list *head, struct dm_list *elem) -{ - assert(head->n); - - elem->n = head; - elem->p = head->p; - - head->p->n = elem; - head->p = elem; -} - -/* - * Insert an element after 'head'. - * If 'head' is the list head, this adds an element to the front of the list. - */ -void dm_list_add_h(struct dm_list *head, struct dm_list *elem) -{ - assert(head->n); - - elem->n = head->n; - elem->p = head; - - head->n->p = elem; - head->n = elem; -} - -/* - * Delete an element from its list. - * Note that this doesn't change the element itself - it may still be safe - * to follow its pointers. - */ -void dm_list_del(struct dm_list *elem) -{ - elem->n->p = elem->p; - elem->p->n = elem->n; -} - -/* - * Remove an element from existing list and insert before 'head'. - */ -void dm_list_move(struct dm_list *head, struct dm_list *elem) -{ - dm_list_del(elem); - dm_list_add(head, elem); -} - -/* - * Is the list empty? - */ -int dm_list_empty(const struct dm_list *head) -{ - return head->n == head; -} - -/* - * Is this the first element of the list? - */ -int dm_list_start(const struct dm_list *head, const struct dm_list *elem) -{ - return elem->p == head; -} - -/* - * Is this the last element of the list? - */ -int dm_list_end(const struct dm_list *head, const struct dm_list *elem) -{ - return elem->n == head; -} - -/* - * Return first element of the list or NULL if empty - */ -struct dm_list *dm_list_first(const struct dm_list *head) -{ - return (dm_list_empty(head) ? NULL : head->n); -} - -/* - * Return last element of the list or NULL if empty - */ -struct dm_list *dm_list_last(const struct dm_list *head) -{ - return (dm_list_empty(head) ? NULL : head->p); -} - -/* - * Return the previous element of the list, or NULL if we've reached the start. - */ -struct dm_list *dm_list_prev(const struct dm_list *head, const struct dm_list *elem) -{ - return (dm_list_start(head, elem) ? NULL : elem->p); -} - -/* - * Return the next element of the list, or NULL if we've reached the end. - */ -struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *elem) -{ - return (dm_list_end(head, elem) ? NULL : elem->n); -} - -/* - * Return the number of elements in a list by walking it. - */ -unsigned int dm_list_size(const struct dm_list *head) -{ - unsigned int s = 0; - const struct dm_list *v; - - dm_list_iterate(v, head) - s++; - - return s; -} - -/* - * Join two lists together. - * This moves all the elements of the list 'head1' to the end of the list - * 'head', leaving 'head1' empty. - */ -void dm_list_splice(struct dm_list *head, struct dm_list *head1) -{ - assert(head->n); - assert(head1->n); - - if (dm_list_empty(head1)) - return; - - head1->p->n = head; - head1->n->p = head->p; - - head->p->n = head1->n; - head->p = head1->p; - - dm_list_init(head1); -} diff --git a/device_mapper/libdevmapper.h b/device_mapper/libdevmapper.h index 2438f74..f7ff4ce 100644 --- a/device_mapper/libdevmapper.h +++ b/device_mapper/libdevmapper.h @@ -31,6 +31,10 @@ #include <stdlib.h> #include <stdio.h> +#include "base/data-struct/list.h" + +#include "base/data-struct/list.h" + #ifndef __GNUC__ # define __typeof__ typeof #endif @@ -2366,211 +2370,6 @@ void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *c for (v = dm_hash_get_first((h)); v; \ v = dm_hash_get_next((h), v)) -/**************** - * list functions - ****************/ - -/* - * A list consists of a list head plus elements. - * Each element has 'next' and 'previous' pointers. - * The list head's pointers point to the first and the last element. - */ - -struct dm_list { - struct dm_list *n, *p; -}; - -/* - * String list. - */ -struct dm_str_list { - struct dm_list list; - const char *str; -}; - -/* - * Initialise a list before use. - * The list head's next and previous pointers point back to itself. - */ -#define DM_LIST_HEAD_INIT(name) { &(name), &(name) } -#define DM_LIST_INIT(name) struct dm_list name = DM_LIST_HEAD_INIT(name) -void dm_list_init(struct dm_list *head); - -/* - * Insert an element before 'head'. - * If 'head' is the list head, this adds an element to the end of the list. - */ -void dm_list_add(struct dm_list *head, struct dm_list *elem); - -/* - * Insert an element after 'head'. - * If 'head' is the list head, this adds an element to the front of the list. - */ -void dm_list_add_h(struct dm_list *head, struct dm_list *elem); - -/* - * Delete an element from its list. - * Note that this doesn't change the element itself - it may still be safe - * to follow its pointers. - */ -void dm_list_del(struct dm_list *elem); - -/* - * Remove an element from existing list and insert before 'head'. - */ -void dm_list_move(struct dm_list *head, struct dm_list *elem); - -/* - * Join 'head1' to the end of 'head'. - */ -void dm_list_splice(struct dm_list *head, struct dm_list *head1); - -/* - * Is the list empty? - */ -int dm_list_empty(const struct dm_list *head); - -/* - * Is this the first element of the list? - */ -int dm_list_start(const struct dm_list *head, const struct dm_list *elem); - -/* - * Is this the last element of the list? - */ -int dm_list_end(const struct dm_list *head, const struct dm_list *elem); - -/* - * Return first element of the list or NULL if empty - */ -struct dm_list *dm_list_first(const struct dm_list *head); - -/* - * Return last element of the list or NULL if empty - */ -struct dm_list *dm_list_last(const struct dm_list *head); - -/* - * Return the previous element of the list, or NULL if we've reached the start. - */ -struct dm_list *dm_list_prev(const struct dm_list *head, const struct dm_list *elem); - -/* - * Return the next element of the list, or NULL if we've reached the end. - */ -struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *elem); - -/* - * Given the address v of an instance of 'struct dm_list' called 'head' - * contained in a structure of type t, return the containing structure. - */ -#define dm_list_struct_base(v, t, head) \ - ((t *)((const char *)(v) - (const char *)&((t *) 0)->head)) - -/* - * Given the address v of an instance of 'struct dm_list list' contained in - * a structure of type t, return the containing structure. - */ -#define dm_list_item(v, t) dm_list_struct_base((v), t, list) - -/* - * Given the address v of one known element e in a known structure of type t, - * return another element f. - */ -#define dm_struct_field(v, t, e, f) \ - (((t *)((uintptr_t)(v) - (uintptr_t)&((t *) 0)->e))->f) - -/* - * Given the address v of a known element e in a known structure of type t, - * return the list head 'list' - */ -#define dm_list_head(v, t, e) dm_struct_field(v, t, e, list) - -/* - * Set v to each element of a list in turn. - */ -#define dm_list_iterate(v, head) \ - for (v = (head)->n; v != head; v = v->n) - -/* - * Set v to each element in a list in turn, starting from the element - * in front of 'start'. - * You can use this to 'unwind' a list_iterate and back out actions on - * already-processed elements. - * If 'start' is 'head' it walks the list backwards. - */ -#define dm_list_uniterate(v, head, start) \ - for (v = (start)->p; v != head; v = v->p) - -/* - * A safe way to walk a list and delete and free some elements along - * the way. - * t must be defined as a temporary variable of the same type as v. - */ -#define dm_list_iterate_safe(v, t, head) \ - for (v = (head)->n, t = v->n; v != head; v = t, t = v->n) - -/* - * Walk a list, setting 'v' in turn to the containing structure of each item. - * The containing structure should be the same type as 'v'. - * The 'struct dm_list' variable within the containing structure is 'field'. - */ -#define dm_list_iterate_items_gen(v, head, field) \ - for (v = dm_list_struct_base((head)->n, __typeof__(*v), field); \ - &v->field != (head); \ - v = dm_list_struct_base(v->field.n, __typeof__(*v), field)) - -/* - * Walk a list, setting 'v' in turn to the containing structure of each item. - * The containing structure should be the same type as 'v'. - * The list should be 'struct dm_list list' within the containing structure. - */ -#define dm_list_iterate_items(v, head) dm_list_iterate_items_gen(v, (head), list) - -/* - * Walk a list, setting 'v' in turn to the containing structure of each item. - * The containing structure should be the same type as 'v'. - * The 'struct dm_list' variable within the containing structure is 'field'. - * t must be defined as a temporary variable of the same type as v. - */ -#define dm_list_iterate_items_gen_safe(v, t, head, field) \ - for (v = dm_list_struct_base((head)->n, __typeof__(*v), field), \ - t = dm_list_struct_base(v->field.n, __typeof__(*v), field); \ - &v->field != (head); \ - v = t, t = dm_list_struct_base(v->field.n, __typeof__(*v), field)) -/* - * Walk a list, setting 'v' in turn to the containing structure of each item. - * The containing structure should be the same type as 'v'. - * The list should be 'struct dm_list list' within the containing structure. - * t must be defined as a temporary variable of the same type as v. - */ -#define dm_list_iterate_items_safe(v, t, head) \ - dm_list_iterate_items_gen_safe(v, t, (head), list) - -/* - * Walk a list backwards, setting 'v' in turn to the containing structure - * of each item. - * The containing structure should be the same type as 'v'. - * The 'struct dm_list' variable within the containing structure is 'field'. - */ -#define dm_list_iterate_back_items_gen(v, head, field) \ - for (v = dm_list_struct_base((head)->p, __typeof__(*v), field); \ - &v->field != (head); \ - v = dm_list_struct_base(v->field.p, __typeof__(*v), field)) - -/* - * Walk a list backwards, setting 'v' in turn to the containing structure - * of each item. - * The containing structure should be the same type as 'v'. - * The list should be 'struct dm_list list' within the containing structure. - */ -#define dm_list_iterate_back_items(v, head) dm_list_iterate_back_items_gen(v, (head), list) - -/* - * Return the number of elements in a list by walking it. - */ -unsigned int dm_list_size(const struct dm_list *head); - /********* * selinux *********/

1 0

master - test/unit: Rename Makefile.in -> Makefile
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9573ff3a3bbd61fb178ea… Commit: 9573ff3a3bbd61fb178ea73e24c689822b9aca85 Parent: b67ef90438052d3e01f563cdd25e2268f4e02c20 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 09:50:40 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 09:50:40 2018 +0100 test/unit: Rename Makefile.in -> Makefile There's nothing being expanded. --- configure | 3 +-- configure.ac | 1 - test/unit/Makefile | 47 +++++++++++++++++++++++++++++++++++++++++++++++ test/unit/Makefile.in | 47 ----------------------------------------------- 4 files changed, 48 insertions(+), 50 deletions(-) diff --git a/configure b/configure index 09d20af..953539f 100755 --- a/configure +++ b/configure @@ -13611,7 +13611,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile python/Makefile python/setup .py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/api/python_lvm_unit.py test/unit/Makefile tools/Makefile udev /Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile python/Makefile python/setup .py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/api/python_lvm_unit.py tools/Makefile udev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14371,7 +14371,6 @@ do "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "test/api/Makefile") CONFIG_FILES="$CONFIG_FILES test/api/Makefile" ;; "test/api/python_lvm_unit.py") CONFIG_FILES="$CONFIG_FILES test/api/python_lvm_unit.py" ;; - "test/unit/Makefile") CONFIG_FILES="$CONFIG_FILES test/unit/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "udev/Makefile") CONFIG_FILES="$CONFIG_FILES udev/Makefile" ;; diff --git a/configure.ac b/configure.ac index 9b5d055..d8bfb47 100644 --- a/configure.ac +++ b/configure.ac @@ -1816,7 +1816,6 @@ scripts/Makefile test/Makefile test/api/Makefile test/api/python_lvm_unit.py -test/unit/Makefile tools/Makefile udev/Makefile ]) diff --git a/test/unit/Makefile b/test/unit/Makefile new file mode 100644 index 0000000..e7cc852 --- /dev/null +++ b/test/unit/Makefile @@ -0,0 +1,47 @@ +# Copyright (C) 2011-2018 Red Hat, Inc. All rights reserved. +# +# This file is part of LVM2. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +UNIT_SOURCE=\ + base/data-struct/radix-tree.c \ + device_mapper/vdo/status.c \ + \ + test/unit/activation-generator_t.c \ + test/unit/bcache_t.c \ + test/unit/bcache_utils_t.c \ + test/unit/bitset_t.c \ + test/unit/config_t.c \ + test/unit/dmlist_t.c \ + test/unit/dmstatus_t.c \ + test/unit/io_engine_t.c \ + test/unit/radix_tree_t.c \ + test/unit/matcher_t.c \ + test/unit/framework.c \ + test/unit/percent_t.c \ + test/unit/run.c \ + test/unit/string_t.c \ + test/unit/vdo_t.c + +UNIT_DEPENDS=$(subst .c,.d,$(UNIT_SOURCE)) +UNIT_OBJECTS=$(UNIT_SOURCE:%.c=%.o) +CLEAN_TARGETS+=$(UNIT_DEPENDS) $(UNIT_OBJECTS) + +test/unit/unit-test: $(UNIT_OBJECTS) lib/liblvm-internal.a libdaemon/client/libdaemonclient.a $(INTERNAL_LIBS) + @echo " [LD] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \ + -o $@ $+ $(LIBS) -lm -ldl -laio + +.PHONEY: run-unit-test +run-unit-test: test/unit/unit-test + @echo Running unit tests + LD_LIBRARY_PATH=libdm test/unit/unit-test run + +-include $(UNIT_DEPENDS) diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in deleted file mode 100644 index e7cc852..0000000 --- a/test/unit/Makefile.in +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 2011-2018 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -UNIT_SOURCE=\ - base/data-struct/radix-tree.c \ - device_mapper/vdo/status.c \ - \ - test/unit/activation-generator_t.c \ - test/unit/bcache_t.c \ - test/unit/bcache_utils_t.c \ - test/unit/bitset_t.c \ - test/unit/config_t.c \ - test/unit/dmlist_t.c \ - test/unit/dmstatus_t.c \ - test/unit/io_engine_t.c \ - test/unit/radix_tree_t.c \ - test/unit/matcher_t.c \ - test/unit/framework.c \ - test/unit/percent_t.c \ - test/unit/run.c \ - test/unit/string_t.c \ - test/unit/vdo_t.c - -UNIT_DEPENDS=$(subst .c,.d,$(UNIT_SOURCE)) -UNIT_OBJECTS=$(UNIT_SOURCE:%.c=%.o) -CLEAN_TARGETS+=$(UNIT_DEPENDS) $(UNIT_OBJECTS) - -test/unit/unit-test: $(UNIT_OBJECTS) lib/liblvm-internal.a libdaemon/client/libdaemonclient.a $(INTERNAL_LIBS) - @echo " [LD] $@" - $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \ - -o $@ $+ $(LIBS) -lm -ldl -laio - -.PHONEY: run-unit-test -run-unit-test: test/unit/unit-test - @echo Running unit tests - LD_LIBRARY_PATH=libdm test/unit/unit-test run - --include $(UNIT_DEPENDS)

1 0

master - tests: check pvresize with metadata size
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0e2a358da926b75dabd50… Commit: 0e2a358da926b75dabd5074fcff589cac0f22821 Parent: 59dc9b445d6dba0ae119a2f517f4f665c6c522a9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 8 14:28:47 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:37:31 2018 +0200 tests: check pvresize with metadata size Test new size of a PV can keep also metadata. --- test/shell/pvresize-mdas.sh | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/test/shell/pvresize-mdas.sh b/test/shell/pvresize-mdas.sh index da4119c..240dfb2 100644 --- a/test/shell/pvresize-mdas.sh +++ b/test/shell/pvresize-mdas.sh @@ -26,3 +26,13 @@ pvresize --setphysicalvolumesize 4m -y "$dev1" check pv_field "$dev1" pv_size 4.00m check pv_field "$dev1" pv_mda_count 2 pvs "$dev1" + +# Check physical size is checked agains metadatasize +pvcreate --metadatasize 2m --metadatacopies 1 -y "$dev1" +not pvresize --setphysicalvolumesize 2m -y "$dev1" |& tee out +grep "Size must exceed physical extent start of 6144 sectors on" out +# 3MiB shall pass with 1M default alignment +pvresize --setphysicalvolumesize 3m -y "$dev1" +check pv_field "$dev1" pv_size 3.00m +check pv_field "$dev1" pv_mda_count 1 +pvs "$dev1"

1 0

master - tests: updates test for raid scanning
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=59dc9b445d6dba0ae119a… Commit: 59dc9b445d6dba0ae119a2f517f4f665c6c522a9 Parent: f20e828ec2c6ef6fbd6a271ecbf904a8e7943958 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 5 18:45:08 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:37:31 2018 +0200 tests: updates test for raid scanning --- test/shell/pvcreate-md-fake-hdr.sh | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/test/shell/pvcreate-md-fake-hdr.sh b/test/shell/pvcreate-md-fake-hdr.sh index b89fe43..13d810c 100644 --- a/test/shell/pvcreate-md-fake-hdr.sh +++ b/test/shell/pvcreate-md-fake-hdr.sh @@ -25,6 +25,12 @@ aux extend_filter_LVMTEST "a|/dev/md|" aux prepare_devs 4 +pvcreate "$dev2" +aux prepare_md_dev 0 64 2 "$dev1" "$dev2" +# Incorrectly shows $dev2 as PV for 'raid0' +pvs -vvvv + + vgcreate $SHARED $vg "$dev3" "$dev4" # create 2 disk MD raid1 array

1 0

master - tests: drop unit subdir
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f20e828ec2c6ef6fbd6a2… Commit: f20e828ec2c6ef6fbd6a271ecbf904a8e7943958 Parent: bb7c064b23c90e32ab4e8da610fca2c4e7bac73e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 8 12:37:57 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:37:31 2018 +0200 tests: drop unit subdir Until we resolve top-level making, drop inclusion of subdir Makefile written for top-level usage so at least integrational tests are running. --- test/Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 2b115b4..65ba900 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -27,7 +27,8 @@ datarootdir = @datarootdir@ LVM_TEST_RESULTS ?= results -SUBDIRS = api unit +SUBDIRS = api +# FIXME: resolve testing of: unit SOURCES = lib/not.c lib/harness.c CXXSOURCES = lib/runner.cpp CXXFLAGS += $(EXTRA_EXEC_CFLAGS)

1 0

master - tests: initial testing code for lvs while pvmove runs
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=bb7c064b23c90e32ab4e8… Commit: bb7c064b23c90e32ab4e8da610fca2c4e7bac73e Parent: c93e0932e8d3005d2b0f6e1e66f7fba72f3ac950 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 8 12:51:27 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:37:31 2018 +0200 tests: initial testing code for lvs while pvmove runs --- test/shell/pvmove-lvs.sh | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/test/shell/pvmove-lvs.sh b/test/shell/pvmove-lvs.sh new file mode 100644 index 0000000..754f86a --- /dev/null +++ b/test/shell/pvmove-lvs.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +# Copyright (C) 2018 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +test_description="ensure pvmove works with lvs" +SKIP_WITH_LVMLOCKD=1 + +. lib/inittest + +aux throttle_dm_mirror || skip + +aux prepare_vg 5 180 + +lvcreate -aey -L30 -n $lv1 $vg "$dev1" +lvextend -L+30 $vg/$lv1 "$dev2" +lvextend -L+30 $vg/$lv1 "$dev1" +lvextend -L+30 $vg/$lv1 "$dev2" +lvextend -L+30 $vg/$lv1 "$dev1" + +pvmove -b "$dev1" "$dev5" 2>&1 | tee out + +#lvchange -an $vg/$lv1 +lvs -a $vg + +pvmove --abort + +lvremove -ff $vg

1 0

master - tests: check proper support of fmt2 with cleaner policy
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c93e0932e8d3005d2b0f6… Commit: c93e0932e8d3005d2b0f6e1e66f7fba72f3ac950 Parent: 8b111f28b0cf75951c18f1b7f100e5aa59d4f659 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 8 12:46:47 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:37:31 2018 +0200 tests: check proper support of fmt2 with cleaner policy --- test/shell/cache-metadata2.sh | 10 ++++++++++ test/shell/lvconvert-cache.sh | 5 +++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/test/shell/cache-metadata2.sh b/test/shell/cache-metadata2.sh index 684ae67..57c6e23 100644 --- a/test/shell/cache-metadata2.sh +++ b/test/shell/cache-metadata2.sh @@ -51,6 +51,11 @@ lvs -a -o+cachemetadataformat $vg lvremove -f $vg +lvcreate --type cache-pool --cachepolicy cleaner --cachemetadataformat 1 -L1 $vg/cpool +lvcreate -H -L10 -n $lv1 --cachepool $vg/cpool +check lv_field $vg/$lv1 cachemetadataformat "1" +lvremove -f $vg + if [ -z "$META2" ]; then # for these test we need kernel with metadata2 support @@ -78,6 +83,11 @@ lvconvert --config 'allocation/cache_metadata_format=1' -y -H --cachepool $vg/cp check lv_field $vg/$lv1 cachemetadataformat "1" lvremove -f $vg +lvcreate --type cache-pool --cachepolicy cleaner -L1 $vg/cpool +lvcreate -H -L10 -n $lv1 --cachepool $vg/cpool +check lv_field $vg/$lv1 cachemetadataformat "2" +lvremove -f $vg + fi #lvs -a -o name,cachemetadataformat,kernelmetadataformat,chunksize,cachepolicy,cachemode $vg diff --git a/test/shell/lvconvert-cache.sh b/test/shell/lvconvert-cache.sh index c3742af..b2a2920 100644 --- a/test/shell/lvconvert-cache.sh +++ b/test/shell/lvconvert-cache.sh @@ -106,6 +106,11 @@ fail lvconvert --type cache --cachepool $vg/pool $vg/corigin lvconvert --yes --cache --cachepool $vg/pool $vg/corigin lvremove -ff $vg +# Check we also support conversion that uses 'cleaner' cache policy +lvcreate -n corigin -l 10 $vg +lvcreate -n pool -l 10 $vg +lvconvert --yes --cache --cachepool $vg/pool $vg/corigin --cachepolicy cleaner +lvremove -ff $vg ####################### # Invalid conversions #

1 0

master - cleanup: updates message with dots
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8b111f28b0cf75951c18f… Commit: 8b111f28b0cf75951c18f1b7f100e5aa59d4f659 Parent: bc8c8d2f87a93a5f1c77a928e7400d31788fc6fd Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 5 18:47:03 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:37:31 2018 +0200 cleanup: updates message with dots --- tools/vgcfgrestore.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c index adcd45a..ec2c240 100644 --- a/tools/vgcfgrestore.c +++ b/tools/vgcfgrestore.c @@ -25,7 +25,7 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) if (argc == 1) { vg_name = skip_dev_dir(cmd, argv[0], NULL); if (!validate_name(vg_name)) { - log_error("Volume group name \"%s\" is invalid", vg_name); + log_error("Volume group name \"%s\" is invalid.", vg_name); return EINVALID_CMD_LINE; } } else if (!(arg_is_set(cmd, list_ARG) && arg_is_set(cmd, file_ARG))) { @@ -64,12 +64,12 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) } if (!lock_vol(cmd, vg_name, LCK_VG_WRITE, NULL)) { - log_error("Unable to lock volume group %s", vg_name); + log_error("Unable to lock volume group %s.", vg_name); return ECMD_FAILED; } if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { - log_error("Unable to lock orphans"); + log_error("Unable to lock orphans."); unlock_vg(cmd, NULL, vg_name); return ECMD_FAILED; } @@ -91,7 +91,7 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) } ret = ECMD_PROCESSED; - log_print_unless_silent("Restored volume group %s", vg_name); + log_print_unless_silent("Restored volume group %s.", vg_name); unlock_vg(cmd, NULL, VG_ORPHANS); unlock_vg(cmd, NULL, vg_name);

1 0

master - build: drop exported symbols
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=bc8c8d2f87a93a5f1c77a… Commit: bc8c8d2f87a93a5f1c77a928e7400d31788fc6fd Parent: 5cb4b2a42465f2430c98c8966adeacb0f6a26af3 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 7 23:23:06 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:37:31 2018 +0200 build: drop exported symbols This libs are no longer possible to create, drop maintanence of exported symbols. --- lib/cache_segtype/.exported_symbols | 1 - lib/mirror/.exported_symbols | 1 - lib/raid/.exported_symbols | 1 - lib/snapshot/.exported_symbols | 1 - lib/thin/.exported_symbols | 1 - 5 files changed, 0 insertions(+), 5 deletions(-) diff --git a/lib/cache_segtype/.exported_symbols b/lib/cache_segtype/.exported_symbols deleted file mode 100644 index 95cb3ff..0000000 --- a/lib/cache_segtype/.exported_symbols +++ /dev/null @@ -1 +0,0 @@ -init_cache_segtypes diff --git a/lib/mirror/.exported_symbols b/lib/mirror/.exported_symbols deleted file mode 100644 index 1c92c6a..0000000 --- a/lib/mirror/.exported_symbols +++ /dev/null @@ -1 +0,0 @@ -init_segtype diff --git a/lib/raid/.exported_symbols b/lib/raid/.exported_symbols deleted file mode 100644 index 0d012d6..0000000 --- a/lib/raid/.exported_symbols +++ /dev/null @@ -1 +0,0 @@ -init_multiple_segtypes diff --git a/lib/snapshot/.exported_symbols b/lib/snapshot/.exported_symbols deleted file mode 100644 index 1c92c6a..0000000 --- a/lib/snapshot/.exported_symbols +++ /dev/null @@ -1 +0,0 @@ -init_segtype diff --git a/lib/thin/.exported_symbols b/lib/thin/.exported_symbols deleted file mode 100644 index 1c92c6a..0000000 --- a/lib/thin/.exported_symbols +++ /dev/null @@ -1 +0,0 @@ -init_segtype

1 0

master - cache: cleaner policy also uses fmt2
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5cb4b2a42465f2430c98c… Commit: 5cb4b2a42465f2430c98c8966adeacb0f6a26af3 Parent: 1f5f8382ae09e3ba95486903cf86b29641a0023d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 8 12:37:07 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:37:29 2018 +0200 cache: cleaner policy also uses fmt2 Format 2 is also with cleaner policy. --- WHATS_NEW | 1 + lib/metadata/cache_manip.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a17902d..162b584 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 3.0.0 ============= + Cache can uses metadata format 2 with cleaner policy. Fix check if resized PV can also fit metadata area. Avoid showing internal error in lvs output or pvmoved LVs. Remove clvmd diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index fe91fee..c3bd2ec 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -843,12 +843,13 @@ int cache_set_metadata_format(struct lv_segment *seg, cache_metadata_format_t fo /* * If policy is unselected, but format 2 is selected, policy smq is enforced. - * ATM no other then smq policy is allowed to select format 2. + * ATM no other then smq & cleaner policy is allowed to select format 2. */ if (!seg->policy_name) { if (format == CACHE_METADATA_FORMAT_2) seg->policy_name = "smq"; - } else if (strcmp(seg->policy_name, "smq")) { + } else if (strcmp(seg->policy_name, "smq") && + strcmp(seg->policy_name, "cleaner")) { seg->cache_metadata_format = CACHE_METADATA_FORMAT_1; return 1; }

1 0

master - pvresize: update message
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1f5f8382ae09e3ba95486… Commit: 1f5f8382ae09e3ba95486903cf86b29641a0023d Parent: fb171edd4520a91012eb6ce6652c241609f5f761 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 5 23:09:55 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:36:59 2018 +0200 pvresize: update message There is always at least PV header update even if the size of PV remains same (so it's not really resized). Try to make it a slightly less confusing. --- tools/pvresize.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/pvresize.c b/tools/pvresize.c index 8a65952..e951f11 100644 --- a/tools/pvresize.c +++ b/tools/pvresize.c @@ -96,7 +96,7 @@ int pvresize(struct cmd_context *cmd, int argc, char **argv) ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE | READ_ALLOW_EXPORTED, handle, _pvresize_single); - log_print_unless_silent("%d physical volume(s) resized / %d physical volume(s) " + log_print_unless_silent("%d physical volume(s) resized or updated / %d physical volume(s) " "not resized", params.done, params.total - params.done); out: destroy_processing_handle(cmd, handle);

1 0

master - pvresize: add missing return
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fb171edd4520a91012eb6… Commit: fb171edd4520a91012eb6ce6652c241609f5f761 Parent: 0c62ae3f8920ebb53397b2a904aa2e3dd3e73bed Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 5 21:21:26 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:36:56 2018 +0200 pvresize: add missing return Log error path missed return 0. Also fix some unneded bactraces (since log_error already shows position). --- WHATS_NEW | 1 + lib/metadata/pv_manip.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a727a40..a17902d 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 3.0.0 ============= + Fix check if resized PV can also fit metadata area. Avoid showing internal error in lvs output or pvmoved LVs. Remove clvmd Remove lvmlib (api) diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c index eaaa5e6..5fd80a2 100644 --- a/lib/metadata/pv_manip.c +++ b/lib/metadata/pv_manip.c @@ -566,6 +566,7 @@ static int _pv_resize(struct physical_volume *pv, struct volume_group *vg, uint6 log_error("Size must exceed physical extent start " "of %" PRIu64 " sectors on PV %s.", pv_pe_start(pv), pv_dev_name(pv)); + return 0; } old_pe_count = pv->pe_count; @@ -645,7 +646,7 @@ int pv_resize_single(struct cmd_context *cmd, pv_name, display_size(cmd, new_size), display_size(cmd, size)) == 'n') { log_error("Physical Volume %s not resized.", pv_name); - goto_out; + goto out; } } else if (new_size < size) @@ -653,7 +654,7 @@ int pv_resize_single(struct cmd_context *cmd, pv_name, display_size(cmd, new_size), display_size(cmd, size)) == 'n') { log_error("Physical Volume %s not resized.", pv_name); - goto_out; + goto out; } if (new_size == size)

1 0

master - pvmove: improve lvs
by Zdenek Kabelac 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0c62ae3f8920ebb53397b… Commit: 0c62ae3f8920ebb53397b2a904aa2e3dd3e73bed Parent: b67ef90438052d3e01f563cdd25e2268f4e02c20 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Jun 4 11:05:28 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 8 14:35:42 2018 +0200 pvmove: improve lvs When pvmoving LV - the target for LV is a mirror so the validation that checked the type is matching was incorrect. While we need a more generic enhancment of LVS output for pvmoved LVs, for now at least stop showing internal errors and 'X' symbols in attrs. --- WHATS_NEW | 1 + lib/activate/dev_manager.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index d75ab1b..a727a40 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 3.0.0 ============= + Avoid showing internal error in lvs output or pvmoved LVs. Remove clvmd Remove lvmlib (api) lvconvert: provide possible layouts between linear and striped/raid diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 5dd0e6f..2688bcf 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -178,7 +178,8 @@ static int _get_segment_status_from_target_params(const char *target_name, } /* Validate target_name segtype from DM table with lvm2 metadata segtype */ - if (strcmp(segtype->name, target_name) && + if (!lv_is_locked(seg->lv) && + strcmp(segtype->name, target_name) && /* If kernel's type isn't an exact match is it compatible? */ (!segtype->ops->target_status_compatible || !segtype->ops->target_status_compatible(target_name))) {

1 0

master - liblvm: remove lvmapi
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0d22b58172808f050abea… Commit: 0d22b58172808f050abeacdb5d6a7b7132b91a8c Parent: e6bb780d24246666fa05948ec449a8137280b443 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 09:38:05 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 09:38:05 2018 +0100 liblvm: remove lvmapi This has been deprecated for a while. --- Makefile.in | 21 +- aclocal.m4 | 91 ++- configure | 1996 +--------------------------------------------- configure.ac | 63 +-- include/configure.h.in | 66 +-- liblvm/Doxyfile | 254 ------ liblvm/Makefile.in | 81 -- liblvm/liblvm2app.pc.in | 11 - liblvm/lvm2app.h | 1983 --------------------------------------------- liblvm/lvm_base.c | 216 ----- liblvm/lvm_lv.c | 820 ------------------- liblvm/lvm_misc.c | 168 ---- liblvm/lvm_misc.h | 46 -- liblvm/lvm_prop.c | 74 -- liblvm/lvm_prop.h | 49 -- liblvm/lvm_prop_fields.h | 22 - liblvm/lvm_pv.c | 474 ----------- liblvm/lvm_vg.c | 564 ------------- liblvm/test/vgadd.c | 90 --- liblvm/test/vgshow.c | 95 --- test/api/Makefile.in | 33 - test/api/lvtest.c | 64 -- test/api/pe_start.c | 47 -- test/api/percent.c | 63 -- test/api/test.c | 1110 -------------------------- test/api/thin_percent.c | 78 -- test/api/vglist.c | 73 -- test/api/vgtest.c | 164 ---- 28 files changed, 108 insertions(+), 8708 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7eb6460..ed00696 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,10 +28,6 @@ ifeq ("@INTL@", "yes") SUBDIRS += po endif -ifeq ("@APPLIB@", "yes") - SUBDIRS += liblvm -endif - ifeq ("@PYTHON_BINDINGS@", "yes") SUBDIRS += python endif @@ -43,7 +39,7 @@ endif ifeq ($(MAKECMDGOALS),distclean) SUBDIRS = conf include man test scripts \ libdaemon lib tools daemons libdm \ - udev po liblvm python + udev po python tools.distclean: test.distclean endif DISTCLEAN_DIRS += lcov_reports* @@ -54,18 +50,16 @@ include make.tmpl libdm: include libdaemon: include lib: libdm libdaemon -liblvm: lib daemons: lib libdaemon tools tools: lib libdaemon device-mapper po: tools daemons man: tools all_man: tools -scripts: liblvm libdm +scripts: libdm test: tools daemons lib.device-mapper: include.device-mapper libdm.device-mapper: include.device-mapper -liblvm.device-mapper: include.device-mapper daemons.device-mapper: libdm.device-mapper tools.device-mapper: libdm.device-mapper scripts.device-mapper: include.device-mapper @@ -79,10 +73,6 @@ po.pofile: tools.pofile daemons.pofile pofile: po.pofile endif -ifeq ("@PYTHON_BINDINGS@", "yes") -python: liblvm -endif - ifneq ("$(CFLOW_CMD)", "") tools.cflow: libdm.cflow lib.cflow daemons.cflow: tools.cflow @@ -159,15 +149,10 @@ install_systemd_units: install_all_man: $(MAKE) -C man install_all_man -ifeq ("@PYTHON_BINDINGS@", "yes") -install_python_bindings: - $(MAKE) -C liblvm/python install_python_bindings -endif - install_tmpfiles_configuration: $(MAKE) -C scripts install_tmpfiles_configuration -LCOV_TRACES = libdm.info lib.info liblvm.info tools.info \ +LCOV_TRACES = libdm.info lib.info tools.info \ libdaemon/client.info libdaemon/server.info \ test/unit.info \ daemons/clvmd.info \ diff --git a/aclocal.m4 b/aclocal.m4 index 07ea0b6..c57b129 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,7 +13,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_python_module.html +# https://www.gnu.org/software/autoconf-archive/ax_python_module.html # =========================================================================== # # SYNOPSIS @@ -37,7 +37,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 8 +#serial 9 AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE]) AC_DEFUN([AX_PYTHON_MODULE],[ @@ -69,9 +69,9 @@ AC_DEFUN([AX_PYTHON_MODULE],[ fi ]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 11 (pkg-config-0.29.1) + dnl Copyright �� 2004 Scott James Remnant <scott(a)netsplit.com>. dnl Copyright �� 2012-2015 Dan Nicholson <dbn.lists(a)gmail.com> dnl @@ -112,7 +112,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.1]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -345,7 +345,75 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -378,8 +446,9 @@ AC_DEFUN([AM_PATH_PYTHON], [ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). + dnl FIXME: Remove the need to hard-code Python versions here. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -580,7 +649,7 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/configure b/configure index 38ee4dc..09d20af 100755 --- a/configure +++ b/configure @@ -636,7 +636,6 @@ missingkernel kerneldir interface CMIRRORD_PIDFILE -CLVMD_PIDFILE LVMLOCKD_PIDFILE LVMPOLLD_PIDFILE LVMETAD_PIDFILE @@ -660,9 +659,15 @@ SYSCONFDIR SELINUX_PC SELINUX_LIBS SBINDIR +SALCK_LIBS +SALCK_CFLAGS +SACKPT_LIBS +SACKPT_CFLAGS REPLICATORS READLINE_LIBS RT_LIBS +QUORUM_LIBS +QUORUM_CFLAGS PYTHON3DIR PYTHON2DIR PYTHON3_LIBDIRS @@ -673,6 +678,7 @@ PYTHON3_BINDINGS PYTHON2_BINDINGS PYTHON_BINDINGS PYTHON3 +PYTHON2 PTHREAD_LIBS M_LIBS PKGCONFIG @@ -703,6 +709,8 @@ ELDFLAGS DM_LIB_PATCHLEVEL DMEVENTD_PATH DL_LIBS +DLM_LIBS +DLM_CFLAGS DEVMAPPER DEFAULT_USE_LVMLOCKD DEFAULT_USE_LVMPOLLD @@ -725,11 +733,9 @@ DEFAULT_ARCHIVE_SUBDIR DEBUG COPTIMISE_FLAG CONFDIR +CONFDB_LIBS +CONFDB_CFLAGS CMDLIB -CLVMD_PATH -CLVMD_CMANAGERS -CLVMD -CLUSTER CLDWHOLEARCHIVE CLDNOWHOLEARCHIVE CLDFLAGS @@ -744,12 +750,9 @@ BUILD_LVMDBUSD BUILD_DMEVENTD BUILD_CMIRRORD BLKID_PC -APPLIB MODPROBE_CMD MSGFMT PYTHON3_CONFIG -PYTHON2_CONFIG -PYTHON2 pkgpyexecdir pyexecdir pkgpythondir @@ -760,7 +763,6 @@ PYTHON_PREFIX PYTHON_VERSION PYTHON LVM2CMD_LIB -LVM2APP_LIB UDEV_LIBS UDEV_CFLAGS SYSTEMD_LIBS @@ -781,24 +783,8 @@ LCOV HAVE_WSYNCNAND HAVE_WCLOBBERED HAVE_WJUMP -SACKPT_LIBS -SACKPT_CFLAGS -DLM_LIBS -DLM_CFLAGS CPG_LIBS CPG_CFLAGS -CMAP_LIBS -CMAP_CFLAGS -CONFDB_LIBS -CONFDB_CFLAGS -SALCK_LIBS -SALCK_CFLAGS -QUORUM_LIBS -QUORUM_CFLAGS -COROSYNC_LIBS -COROSYNC_CFLAGS -CMAN_LIBS -CMAN_CFLAGS PKGCONFIGINIT_LIBS PKGCONFIGINIT_CFLAGS PKG_CONFIG_LIBDIR @@ -876,7 +862,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -908,7 +893,6 @@ with_device_gid with_device_mode with_device_nodes_on with_default_name_mangling -with_cluster with_snapshots with_mirrors with_default_mirror_segtype @@ -933,8 +917,6 @@ with_ocfdir with_default_pid_dir with_default_dm_run_dir with_default_run_dir -with_clvmd -with_clvmd_pidfile enable_cmirrord with_cmirrord_pidfile enable_debug @@ -963,12 +945,8 @@ enable_compat enable_units_compat enable_ioctl enable_o_direct -enable_applib enable_cmdlib enable_dbus_service -enable_python_bindings -enable_python2_bindings -enable_python3_bindings enable_pkgconfig enable_write_install enable_fsadm @@ -1013,24 +991,8 @@ PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKGCONFIGINIT_CFLAGS PKGCONFIGINIT_LIBS -CMAN_CFLAGS -CMAN_LIBS -COROSYNC_CFLAGS -COROSYNC_LIBS -QUORUM_CFLAGS -QUORUM_LIBS -SALCK_CFLAGS -SALCK_LIBS -CONFDB_CFLAGS -CONFDB_LIBS -CMAP_CFLAGS -CMAP_LIBS CPG_CFLAGS CPG_LIBS -DLM_CFLAGS -DLM_LIBS -SACKPT_CFLAGS -SACKPT_LIBS VALGRIND_CFLAGS VALGRIND_LIBS LOCKD_SANLOCK_CFLAGS @@ -1084,7 +1046,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1337,15 +1298,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1483,7 +1435,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1636,7 +1588,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1710,15 +1661,8 @@ Optional Features: that do not use KiB-style unit suffixes --disable-ioctl disable ioctl calls to device-mapper in the kernel --disable-o_direct disable O_DIRECT - --enable-applib build application library --enable-cmdlib build shared command library --enable-dbus-service install D-Bus support - --enable-python_bindings - build default Python applib bindings - --enable-python2_bindings - build Python2 applib bindings - --enable-python3_bindings - build Python3 applib bindings --enable-pkgconfig install pkgconfig support --enable-write_install install user writable files --disable-fsadm disable fsadm @@ -1739,8 +1683,6 @@ Optional Packages: create nodes on resume or create [ON=resume] --with-default-name-mangling=MANGLING default name mangling: auto/none/hex [auto] - --with-cluster=TYPE cluster LVM locking support: internal/shared/none - [internal] --with-snapshots=TYPE snapshot support: internal/shared/none [internal] --with-mirrors=TYPE mirror support: internal/shared/none [internal] --with-default-mirror-segtype=TYPE @@ -1771,16 +1713,6 @@ Optional Packages: Default DM run directory. [autodetect] --with-default-run-dir=RUN_DIR Default LVM run directory. [autodetect_run_dir/lvm] - --with-clvmd=TYPE build cluster LVM Daemon - The following cluster manager combinations are valid: - * cman (RHEL5 or equivalent) - * cman,corosync,openais (or selection of them) - * singlenode (localhost only) - * all (autodetect) - * none (disable build) - [none] - --with-clvmd-pidfile=PATH - clvmd pidfile [PID_DIR/clvmd.pid] --with-cmirrord-pidfile=PATH cmirrord pidfile [PID_DIR/cmirrord.pid] --with-optimisation=OPT C optimisation flag [OPT=-O2] @@ -1843,30 +1775,8 @@ Some influential environment variables: C compiler flags for PKGCONFIGINIT, overriding pkg-config PKGCONFIGINIT_LIBS linker flags for PKGCONFIGINIT, overriding pkg-config - CMAN_CFLAGS C compiler flags for CMAN, overriding pkg-config - CMAN_LIBS linker flags for CMAN, overriding pkg-config - COROSYNC_CFLAGS - C compiler flags for COROSYNC, overriding pkg-config - COROSYNC_LIBS - linker flags for COROSYNC, overriding pkg-config - QUORUM_CFLAGS - C compiler flags for QUORUM, overriding pkg-config - QUORUM_LIBS linker flags for QUORUM, overriding pkg-config - SALCK_CFLAGS - C compiler flags for SALCK, overriding pkg-config - SALCK_LIBS linker flags for SALCK, overriding pkg-config - CONFDB_CFLAGS - C compiler flags for CONFDB, overriding pkg-config - CONFDB_LIBS linker flags for CONFDB, overriding pkg-config - CMAP_CFLAGS C compiler flags for CMAP, overriding pkg-config - CMAP_LIBS linker flags for CMAP, overriding pkg-config CPG_CFLAGS C compiler flags for CPG, overriding pkg-config CPG_LIBS linker flags for CPG, overriding pkg-config - DLM_CFLAGS C compiler flags for DLM, overriding pkg-config - DLM_LIBS linker flags for DLM, overriding pkg-config - SACKPT_CFLAGS - C compiler flags for SACKPT, overriding pkg-config - SACKPT_LIBS linker flags for SACKPT, overriding pkg-config VALGRIND_CFLAGS C compiler flags for VALGRIND, overriding pkg-config VALGRIND_LIBS @@ -3172,7 +3082,6 @@ case "$host_os" in ODIRECT=yes DM_IOCTLS=yes SELINUX=yes - CLUSTER=internal FSADM=yes BLKDEACTIVATE=yes ;; @@ -3187,7 +3096,6 @@ case "$host_os" in ODIRECT=no DM_IOCTLS=no SELINUX=no - CLUSTER=none FSADM=no BLKDEACTIVATE=no ;; @@ -8372,26 +8280,6 @@ _ACEOF ################################################################################ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include support for cluster locking" >&5 -$as_echo_n "checking whether to include support for cluster locking... " >&6; } - -# Check whether --with-cluster was given. -if test "${with_cluster+set}" = set; then : - withval=$with_cluster; CLUSTER=$withval -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLUSTER" >&5 -$as_echo "$CLUSTER" >&6; } - -case "$CLUSTER" in - none|shared) ;; - internal) -$as_echo "#define CLUSTER_LOCKING_INTERNAL 1" >>confdefs.h - ;; - *) as_fn_error $? "--with-cluster parameter invalid" "$LINENO" 5 ;; -esac - -################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include snapshots" >&5 $as_echo_n "checking whether to include snapshots... " >&6; } @@ -9893,915 +9781,6 @@ _ACEOF ################################################################################ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build cluster LVM daemon" >&5 -$as_echo_n "checking whether to build cluster LVM daemon... " >&6; } - -# Check whether --with-clvmd was given. -if test "${with_clvmd+set}" = set; then : - withval=$with_clvmd; CLVMD=$withval -else - CLVMD=none -fi - -test "$CLVMD" = yes && CLVMD=all -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLVMD" >&5 -$as_echo "$CLVMD" >&6; } - -test "$CLVMD" != none -a "$CLUSTER" = none && CLUSTER=internal - -test "$CLVMD" != none && pkg_config_init - -CLVMD_CMANAGERS="" -CLVMD_NEEDS_QDISKD=no - -if [ `expr x"$CLVMD" : '.*gulm.*'` != 0 ]; then - as_fn_error $? "Since version 2.02.87 GULM locking is no longer supported." "$LINENO" 5; -fi -if [ `expr x"$CLVMD" : '.*cman.*'` != 0 ]; then - BUILDCMAN=yes - CLVMD_CMANAGERS="$CLVMD_CMANAGERS cman" - CLVMD_NEEDS_QDISKD=yes -fi -if [ `expr x"$CLVMD" : '.*corosync.*'` != 0 ]; then - BUILDCOROSYNC=yes - CLVMD_CMANAGERS="$CLVMD_CMANAGERS corosync" -fi -if [ `expr x"$CLVMD" : '.*openais.*'` != 0 ]; then - BUILDOPENAIS=yes - CLVMD_CMANAGERS="$CLVMD_CMANAGERS openais" -fi -test "$CLVMD_NEEDS_QDISKD" != no && CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" - -soft_bailout() { - NOTFOUND=1 -} - -hard_bailout() { - as_fn_error $? "bailing out" "$LINENO" 5 -} - -if test "$CLVMD" = all; then - bailout=soft_bailout - BUILDCMAN=yes - BUILDCOROSYNC=yes - BUILDOPENAIS=yes -else - bailout=hard_bailout -fi - -check_lib_no_libs() { - lib_no_libs_arg1=$1 - shift - lib_no_libs_arg2=$1 - shift - lib_no_libs_args=$@ - as_ac_Lib=`$as_echo "ac_cv_lib_$lib_no_libs_arg1''_$lib_no_libs_arg2" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $lib_no_libs_arg2 in -l$lib_no_libs_arg1" >&5 -$as_echo_n "checking for $lib_no_libs_arg2 in -l$lib_no_libs_arg1... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$lib_no_libs_arg1 $lib_no_libs_args $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $lib_no_libs_arg2 (); -int -main () -{ -return $lib_no_libs_arg2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" -else - eval "$as_ac_Lib=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_LIB$lib_no_libs_arg1" | $as_tr_cpp` 1 -_ACEOF - - LIBS="-l$lib_no_libs_arg1 $LIBS" - -else - $bailout -fi - - LIBS=$ac_check_lib_save_LIBS -} - -if test "$BUILDCMAN" = yes; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CMAN" >&5 -$as_echo_n "checking for CMAN... " >&6; } - -if test -n "$CMAN_CFLAGS"; then - pkg_cv_CMAN_CFLAGS="$CMAN_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcman\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcman") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CMAN_CFLAGS=`$PKG_CONFIG --cflags "libcman" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$CMAN_LIBS"; then - pkg_cv_CMAN_LIBS="$CMAN_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcman\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcman") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CMAN_LIBS=`$PKG_CONFIG --libs "libcman" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - CMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcman" 2>&1` - else - CMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcman" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$CMAN_PKG_ERRORS" >&5 - - NOTFOUND=0 - for ac_header in libcman.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "libcman.h" "ac_cv_header_libcman_h" "$ac_includes_default" -if test "x$ac_cv_header_libcman_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCMAN_H 1 -_ACEOF - -else - $bailout -fi - -done - - check_lib_no_libs cman cman_init - if test $NOTFOUND = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for libcman, using -lcman" >&5 -$as_echo "no pkg for libcman, using -lcman" >&6; } - CMAN_LIBS="-lcman" - HAVE_CMAN=yes - fi -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - NOTFOUND=0 - for ac_header in libcman.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "libcman.h" "ac_cv_header_libcman_h" "$ac_includes_default" -if test "x$ac_cv_header_libcman_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCMAN_H 1 -_ACEOF - -else - $bailout -fi - -done - - check_lib_no_libs cman cman_init - if test $NOTFOUND = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for libcman, using -lcman" >&5 -$as_echo "no pkg for libcman, using -lcman" >&6; } - CMAN_LIBS="-lcman" - HAVE_CMAN=yes - fi -else - CMAN_CFLAGS=$pkg_cv_CMAN_CFLAGS - CMAN_LIBS=$pkg_cv_CMAN_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_CMAN=yes -fi - CHECKCONFDB=yes - CHECKDLM=yes -fi - -if test "$BUILDCOROSYNC" = yes -o "$BUILDOPENAIS" = yes; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COROSYNC" >&5 -$as_echo_n "checking for COROSYNC... " >&6; } - -if test -n "$COROSYNC_CFLAGS"; then - pkg_cv_COROSYNC_CFLAGS="$COROSYNC_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"corosync\""; } >&5 - ($PKG_CONFIG --exists --print-errors "corosync") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_COROSYNC_CFLAGS=`$PKG_CONFIG --cflags "corosync" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$COROSYNC_LIBS"; then - pkg_cv_COROSYNC_LIBS="$COROSYNC_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"corosync\""; } >&5 - ($PKG_CONFIG --exists --print-errors "corosync") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_COROSYNC_LIBS=`$PKG_CONFIG --libs "corosync" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - COROSYNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "corosync" 2>&1` - else - COROSYNC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "corosync" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$COROSYNC_PKG_ERRORS" >&5 - - $bailout -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - $bailout -else - COROSYNC_CFLAGS=$pkg_cv_COROSYNC_CFLAGS - COROSYNC_LIBS=$pkg_cv_COROSYNC_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_COROSYNC=yes -fi - CHECKCONFDB=yes - CHECKCMAP=yes -fi - -if test "$BUILDCOROSYNC" = yes; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QUORUM" >&5 -$as_echo_n "checking for QUORUM... " >&6; } - -if test -n "$QUORUM_CFLAGS"; then - pkg_cv_QUORUM_CFLAGS="$QUORUM_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libquorum\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libquorum") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_QUORUM_CFLAGS=`$PKG_CONFIG --cflags "libquorum" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$QUORUM_LIBS"; then - pkg_cv_QUORUM_LIBS="$QUORUM_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libquorum\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libquorum") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_QUORUM_LIBS=`$PKG_CONFIG --libs "libquorum" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - QUORUM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libquorum" 2>&1` - else - QUORUM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libquorum" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$QUORUM_PKG_ERRORS" >&5 - - $bailout -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - $bailout -else - QUORUM_CFLAGS=$pkg_cv_QUORUM_CFLAGS - QUORUM_LIBS=$pkg_cv_QUORUM_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_QUORUM=yes -fi - CHECKCPG=yes - CHECKDLM=yes -fi - -if test "$BUILDOPENAIS" = yes; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SALCK" >&5 -$as_echo_n "checking for SALCK... " >&6; } - -if test -n "$SALCK_CFLAGS"; then - pkg_cv_SALCK_CFLAGS="$SALCK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libSaLck\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libSaLck") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SALCK_CFLAGS=`$PKG_CONFIG --cflags "libSaLck" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SALCK_LIBS"; then - pkg_cv_SALCK_LIBS="$SALCK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libSaLck\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libSaLck") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SALCK_LIBS=`$PKG_CONFIG --libs "libSaLck" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SALCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libSaLck" 2>&1` - else - SALCK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libSaLck" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SALCK_PKG_ERRORS" >&5 - - $bailout -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - $bailout -else - SALCK_CFLAGS=$pkg_cv_SALCK_CFLAGS - SALCK_LIBS=$pkg_cv_SALCK_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_SALCK=yes -fi - CHECKCPG=yes -fi - - - -if test "$CHECKCONFDB" = yes; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CONFDB" >&5 -$as_echo_n "checking for CONFDB... " >&6; } - -if test -n "$CONFDB_CFLAGS"; then - pkg_cv_CONFDB_CFLAGS="$CONFDB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libconfdb\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libconfdb") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CONFDB_CFLAGS=`$PKG_CONFIG --cflags "libconfdb" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$CONFDB_LIBS"; then - pkg_cv_CONFDB_LIBS="$CONFDB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libconfdb\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libconfdb") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CONFDB_LIBS=`$PKG_CONFIG --libs "libconfdb" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - CONFDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libconfdb" 2>&1` - else - CONFDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libconfdb" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$CONFDB_PKG_ERRORS" >&5 - - HAVE_CONFDB=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - HAVE_CONFDB=no -else - CONFDB_CFLAGS=$pkg_cv_CONFDB_CFLAGS - CONFDB_LIBS=$pkg_cv_CONFDB_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_CONFDB=yes -fi - - for ac_header in corosync/confdb.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "corosync/confdb.h" "ac_cv_header_corosync_confdb_h" "$ac_includes_default" -if test "x$ac_cv_header_corosync_confdb_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_COROSYNC_CONFDB_H 1 -_ACEOF - HAVE_CONFDB_H=yes -else - HAVE_CONFDB_H=no -fi - -done - - - if test "$HAVE_CONFDB" != yes -a "$HAVE_CONFDB_H" = yes; then - check_lib_no_libs confdb confdb_initialize - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for confdb, using -lconfdb" >&5 -$as_echo "no pkg for confdb, using -lconfdb" >&6; } - CONFDB_LIBS="-lconfdb" - HAVE_CONFDB=yes - fi -fi - - -if test "$CHECKCMAP" = yes; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CMAP" >&5 -$as_echo_n "checking for CMAP... " >&6; } - -if test -n "$CMAP_CFLAGS"; then - pkg_cv_CMAP_CFLAGS="$CMAP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcmap\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcmap") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CMAP_CFLAGS=`$PKG_CONFIG --cflags "libcmap" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$CMAP_LIBS"; then - pkg_cv_CMAP_LIBS="$CMAP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcmap\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcmap") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CMAP_LIBS=`$PKG_CONFIG --libs "libcmap" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - CMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcmap" 2>&1` - else - CMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcmap" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$CMAP_PKG_ERRORS" >&5 - - HAVE_CMAP=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - HAVE_CMAP=no -else - CMAP_CFLAGS=$pkg_cv_CMAP_CFLAGS - CMAP_LIBS=$pkg_cv_CMAP_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_CMAP=yes -fi - - for ac_header in corosync/cmap.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "corosync/cmap.h" "ac_cv_header_corosync_cmap_h" "$ac_includes_default" -if test "x$ac_cv_header_corosync_cmap_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_COROSYNC_CMAP_H 1 -_ACEOF - HAVE_CMAP_H=yes -else - HAVE_CMAP_H=no -fi - -done - - - if test "$HAVE_CMAP" != yes -a "$HAVE_CMAP_H" = yes; then - check_lib_no_libs cmap cmap_initialize - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for cmap, using -lcmap" >&5 -$as_echo "no pkg for cmap, using -lcmap" >&6; } - CMAP_LIBS="-lcmap" - HAVE_CMAP=yes - fi -fi - -if test "$BUILDCOROSYNC" = yes -a \ - "$HAVE_CMAP" != yes -a "$HAVE_CONFDB" != yes -a "$CLVMD" != all; then - as_fn_error $? "bailing out... cmap (corosync >= 2.0) or confdb (corosync < 2.0) library is required" "$LINENO" 5 -fi - -if test "$CHECKCPG" = yes; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPG" >&5 -$as_echo_n "checking for CPG... " >&6; } - -if test -n "$CPG_CFLAGS"; then - pkg_cv_CPG_CFLAGS="$CPG_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcpg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcpg") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CPG_CFLAGS=`$PKG_CONFIG --cflags "libcpg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$CPG_LIBS"; then - pkg_cv_CPG_LIBS="$CPG_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcpg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcpg") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CPG_LIBS=`$PKG_CONFIG --libs "libcpg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - CPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcpg" 2>&1` - else - CPG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcpg" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$CPG_PKG_ERRORS" >&5 - - $bailout -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - $bailout -else - CPG_CFLAGS=$pkg_cv_CPG_CFLAGS - CPG_LIBS=$pkg_cv_CPG_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_CPG=yes -fi -fi - -if test "$CHECKDLM" = yes; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DLM" >&5 -$as_echo_n "checking for DLM... " >&6; } - -if test -n "$DLM_CFLAGS"; then - pkg_cv_DLM_CFLAGS="$DLM_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlm\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libdlm") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_DLM_CFLAGS=`$PKG_CONFIG --cflags "libdlm" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$DLM_LIBS"; then - pkg_cv_DLM_LIBS="$DLM_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlm\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libdlm") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_DLM_LIBS=`$PKG_CONFIG --libs "libdlm" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - DLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm" 2>&1` - else - DLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DLM_PKG_ERRORS" >&5 - - NOTFOUND=0 - for ac_header in libdlm.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "libdlm.h" "ac_cv_header_libdlm_h" "$ac_includes_default" -if test "x$ac_cv_header_libdlm_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDLM_H 1 -_ACEOF - -else - $bailout -fi - -done - - check_lib_no_libs dlm dlm_lock -lpthread - if test $NOTFOUND = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for libdlm, using -ldlm" >&5 -$as_echo "no pkg for libdlm, using -ldlm" >&6; } - DLM_LIBS="-ldlm -lpthread" - HAVE_DLM=yes - fi -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - NOTFOUND=0 - for ac_header in libdlm.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "libdlm.h" "ac_cv_header_libdlm_h" "$ac_includes_default" -if test "x$ac_cv_header_libdlm_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDLM_H 1 -_ACEOF - -else - $bailout -fi - -done - - check_lib_no_libs dlm dlm_lock -lpthread - if test $NOTFOUND = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for libdlm, using -ldlm" >&5 -$as_echo "no pkg for libdlm, using -ldlm" >&6; } - DLM_LIBS="-ldlm -lpthread" - HAVE_DLM=yes - fi -else - DLM_CFLAGS=$pkg_cv_DLM_CFLAGS - DLM_LIBS=$pkg_cv_DLM_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_DLM=yes -fi -fi - -if test "$CLVMD" = all; then - CLVMD=none - CLVMD_CMANAGERS="" - CLVMD_NEEDS_QDISKD=no - if test "$HAVE_CMAN" = yes -a \ - "$HAVE_DLM" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling clvmd cman cluster manager" >&5 -$as_echo "Enabling clvmd cman cluster manager" >&6; } - CLVMD="$CLVMD,cman" - CLVMD_CMANAGERS="$CLVMD_CMANAGERS cman" - CLVMD_NEEDS_QDISKD=yes - fi - if test "$HAVE_COROSYNC" = yes -a \ - "$HAVE_QUORUM" = yes -a \ - "$HAVE_CPG" = yes -a \ - "$HAVE_DLM" = yes; then - if test "$HAVE_CONFDB" = yes -o "$HAVE_CMAP" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling clvmd corosync cluster manager" >&5 -$as_echo "Enabling clvmd corosync cluster manager" >&6; } - CLVMD="$CLVMD,corosync" - CLVMD_CMANAGERS="$CLVMD_CMANAGERS corosync" - fi - fi - if test "$HAVE_COROSYNC" = yes -a \ - "$HAVE_CPG" = yes -a \ - "$HAVE_SALCK" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling clvmd openais cluster manager" >&5 -$as_echo "Enabling clvmd openais cluster manager" >&6; } - CLVMD="$CLVMD,openais" - CLVMD_CMANAGERS="$CLVMD_CMANAGERS openais" - fi - test "$CLVMD_NEEDS_QDISKD" != no && CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" - test "$CLVMD" = none && { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling clvmd build. No cluster manager detected." >&5 -$as_echo "Disabling clvmd build. No cluster manager detected." >&6; } -fi - -if [ `expr x"$CLVMD" : '.*corosync.*'` != 0 ]; then - test "$HAVE_CMAP" = yes && CLVMD_CMANAGERS="$CLVMD_CMANAGERS dlm" -fi - -################################################################################ -if test "$CLVMD" != none; then - -# Check whether --with-clvmd-pidfile was given. -if test "${with_clvmd_pidfile+set}" = set; then : - withval=$with_clvmd_pidfile; CLVMD_PIDFILE=$withval -else - CLVMD_PIDFILE="$DEFAULT_PID_DIR/clvmd.pid" -fi - - -cat >>confdefs.h <<_ACEOF -#define CLVMD_PIDFILE "$CLVMD_PIDFILE" -_ACEOF - -fi - -################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build cluster mirror log daemon" >&5 $as_echo_n "checking whether to build cluster mirror log daemon... " >&6; } # Check whether --enable-cmirrord was given. @@ -10837,89 +9816,6 @@ fi if [ "$BUILD_CMIRRORD" = yes ]; then pkg_config_init - -$as_echo "#define CMIRROR_HAS_CHECKPOINT 1" >>confdefs.h - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SACKPT" >&5 -$as_echo_n "checking for SACKPT... " >&6; } - -if test -n "$SACKPT_CFLAGS"; then - pkg_cv_SACKPT_CFLAGS="$SACKPT_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libSaCkpt\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libSaCkpt") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SACKPT_CFLAGS=`$PKG_CONFIG --cflags "libSaCkpt" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SACKPT_LIBS"; then - pkg_cv_SACKPT_LIBS="$SACKPT_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libSaCkpt\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libSaCkpt") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SACKPT_LIBS=`$PKG_CONFIG --libs "libSaCkpt" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SACKPT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libSaCkpt" 2>&1` - else - SACKPT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libSaCkpt" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SACKPT_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no libSaCkpt, compiling without it" >&5 -$as_echo "no libSaCkpt, compiling without it" >&6; } - -$as_echo "#define CMIRROR_HAS_CHECKPOINT 0" >>confdefs.h - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no libSaCkpt, compiling without it" >&5 -$as_echo "no libSaCkpt, compiling without it" >&6; } - -$as_echo "#define CMIRROR_HAS_CHECKPOINT 0" >>confdefs.h - -else - SACKPT_CFLAGS=$pkg_cv_SACKPT_CFLAGS - SACKPT_LIBS=$pkg_cv_SACKPT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_SACKPT=yes -fi - if test "$HAVE_CPG" != yes; then pkg_failed=no @@ -12550,27 +11446,6 @@ $as_echo "#define O_DIRECT_SUPPORT 1" >>confdefs.h fi ################################################################################ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build liblvm2app.so application library" >&5 -$as_echo_n "checking whether to build liblvm2app.so application library... " >&6; } -# Check whether --enable-applib was given. -if test "${enable_applib+set}" = set; then : - enableval=$enable_applib; APPLIB=$enableval -else - APPLIB=no -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPLIB" >&5 -$as_echo "$APPLIB" >&6; } - -test "$APPLIB" = yes \ - && LVM2APP_LIB=-llvm2app \ - || LVM2APP_LIB= -if test "$APPLIB"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: liblvm2app is deprecated. Use D-Bus API" >&5 -$as_echo "$as_me: WARNING: liblvm2app is deprecated. Use D-Bus API" >&2;} -fi - -################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile liblvm2cmd.so" >&5 $as_echo_n "checking whether to compile liblvm2cmd.so... " >&6; } # Check whether --enable-cmdlib was given. @@ -12605,612 +11480,8 @@ $as_echo "$as_me: WARNING: Building D-Bus support without D-Bus notifications." fi ################################################################################ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Python wrapper for liblvm2app.so" >&5 -$as_echo_n "checking whether to build Python wrapper for liblvm2app.so... " >&6; } -# Check whether --enable-python_bindings was given. -if test "${enable_python_bindings+set}" = set; then : - enableval=$enable_python_bindings; PYTHON_BINDINGS=$enableval -else - PYTHON_BINDINGS=no -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_BINDINGS" >&5 -$as_echo "$PYTHON_BINDINGS" >&6; } - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Python2 wrapper for liblvm2app.so" >&5 -$as_echo_n "checking whether to build Python2 wrapper for liblvm2app.so... " >&6; } -# Check whether --enable-python2_bindings was given. -if test "${enable_python2_bindings+set}" = set; then : - enableval=$enable_python2_bindings; PYTHON2_BINDINGS=$enableval -else - PYTHON2_BINDINGS=no -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON2_BINDINGS" >&5 -$as_echo "$PYTHON2_BINDINGS" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Python3 wrapper for liblvm2app.so" >&5 -$as_echo_n "checking whether to build Python3 wrapper for liblvm2app.so... " >&6; } -# Check whether --enable-python3_bindings was given. -if test "${enable_python3_bindings+set}" = set; then : - enableval=$enable_python3_bindings; PYTHON3_BINDINGS=$enableval -else - PYTHON3_BINDINGS=no -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON3_BINDINGS" >&5 -$as_echo "$PYTHON3_BINDINGS" >&6; } - -if test "$PYTHON_BINDINGS" = yes; then - as_fn_error $? "--enable-python-bindings is replaced by --enable-python2-bindings and --enable-python3-bindings" "$LINENO" 5 -fi - -if test "$PYTHON2_BINDINGS" = yes; then - - - - - - - if test -n "$PYTHON"; then - # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2" >&5 -$as_echo_n "checking whether $PYTHON version is >= 2... " >&6; } - prog="import sys -# split strings by '.' and convert to numeric. Append some zeros -# because we need at least 4 digits for the hex conversion. -# map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '2'.split('.'))) + [0, 0, 0] -minverhex = 0 -# xrange is not present in Python 3.0 and range returns an iterator -for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] -sys.exit(sys.hexversion < minverhex)" - if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 - ($PYTHON -c "$prog") >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Python interpreter is too old" "$LINENO" 5 -fi - am_display_PYTHON=$PYTHON - else - # Otherwise, try each interpreter until we find one that satisfies - # VERSION. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2" >&5 -$as_echo_n "checking for a Python interpreter with version >= 2... " >&6; } -if ${am_cv_pathless_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - - for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do - test "$am_cv_pathless_PYTHON" = none && break - prog="import sys -# split strings by '.' and convert to numeric. Append some zeros -# because we need at least 4 digits for the hex conversion. -# map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '2'.split('.'))) + [0, 0, 0] -minverhex = 0 -# xrange is not present in Python 3.0 and range returns an iterator -for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] -sys.exit(sys.hexversion < minverhex)" - if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 - ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : - break -fi - done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 -$as_echo "$am_cv_pathless_PYTHON" >&6; } - # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. - if test "$am_cv_pathless_PYTHON" = none; then - PYTHON=: - else - # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. -set dummy $am_cv_pathless_PYTHON; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PYTHON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PYTHON=$ac_cv_path_PYTHON -if test -n "$PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -$as_echo "$PYTHON" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - am_display_PYTHON=$am_cv_pathless_PYTHON - fi - - - if test "$PYTHON" = :; then - as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 - else - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 -$as_echo_n "checking for $am_display_PYTHON version... " >&6; } -if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 -else - am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -$as_echo "$am_cv_python_version" >&6; } - PYTHON_VERSION=$am_cv_python_version - - - - PYTHON_PREFIX='${prefix}' - - PYTHON_EXEC_PREFIX='${exec_prefix}' - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 -$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } -if ${am_cv_python_platform+:} false; then : - $as_echo_n "(cached) " >&6 -else - am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 -$as_echo "$am_cv_python_platform" >&6; } - PYTHON_PLATFORM=$am_cv_python_platform - - - # Just factor out some code duplication. - am_python_setup_sysconfig="\ -import sys -# Prefer sysconfig over distutils.sysconfig, for better compatibility -# with python 3.x. See automake bug#10227. -try: - import sysconfig -except ImportError: - can_use_sysconfig = 0 -else: - can_use_sysconfig = 1 -# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: -# <https://github.com/pypa/virtualenv/issues/118> -try: - from platform import python_implementation - if python_implementation() == 'CPython' and sys.version[:3] == '2.7': - can_use_sysconfig = 0 -except ImportError: - pass" - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 -$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } -if ${am_cv_python_pythondir+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$prefix" = xNONE - then - am_py_prefix=$ac_default_prefix - else - am_py_prefix=$prefix - fi - am_cv_python_pythondir=`$PYTHON -c " -$am_python_setup_sysconfig -if can_use_sysconfig: - sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) -else: - from distutils import sysconfig - sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') -sys.stdout.write(sitedir)"` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` - am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` - ;; - *) - case $am_py_prefix in - /usr|/System*) ;; - *) - am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; - esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 -$as_echo "$am_cv_python_pythondir" >&6; } - pythondir=$am_cv_python_pythondir - - - - pkgpythondir=\${pythondir}/$PACKAGE - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 -$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } -if ${am_cv_python_pyexecdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$exec_prefix" = xNONE - then - am_py_exec_prefix=$am_py_prefix - else - am_py_exec_prefix=$exec_prefix - fi - am_cv_python_pyexecdir=`$PYTHON -c " -$am_python_setup_sysconfig -if can_use_sysconfig: - sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) -else: - from distutils import sysconfig - sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') -sys.stdout.write(sitedir)"` - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` - am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` - ;; - *) - case $am_py_exec_prefix in - /usr|/System*) ;; - *) - am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; - esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 -$as_echo "$am_cv_python_pyexecdir" >&6; } - pyexecdir=$am_cv_python_pyexecdir - - - - pkgpyexecdir=\${pyexecdir}/$PACKAGE - - - - fi - - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}python2", so it can be a program name with args. -set dummy ${ac_tool_prefix}python2; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYTHON2+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PYTHON2 in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON2="$PYTHON2" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON2="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PYTHON2=$ac_cv_path_PYTHON2 -if test -n "$PYTHON2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON2" >&5 -$as_echo "$PYTHON2" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PYTHON2"; then - ac_pt_PYTHON2=$PYTHON2 - # Extract the first word of "python2", so it can be a program name with args. -set dummy python2; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PYTHON2+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PYTHON2 in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PYTHON2="$ac_pt_PYTHON2" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PYTHON2="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PYTHON2=$ac_cv_path_ac_pt_PYTHON2 -if test -n "$ac_pt_PYTHON2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PYTHON2" >&5 -$as_echo "$ac_pt_PYTHON2" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PYTHON2" = x; then - PYTHON2="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PYTHON2=$ac_pt_PYTHON2 - fi -else - PYTHON2="$ac_cv_path_PYTHON2" -fi - - test -z "$PYTHON2" && as_fn_error $? "python2 is required for --enable-python2_bindings but cannot be found" "$LINENO" 5 - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}python2-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}python2-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYTHON2_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PYTHON2_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON2_CONFIG="$PYTHON2_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON2_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PYTHON2_CONFIG=$ac_cv_path_PYTHON2_CONFIG -if test -n "$PYTHON2_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON2_CONFIG" >&5 -$as_echo "$PYTHON2_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PYTHON2_CONFIG"; then - ac_pt_PYTHON2_CONFIG=$PYTHON2_CONFIG - # Extract the first word of "python2-config", so it can be a program name with args. -set dummy python2-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PYTHON2_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PYTHON2_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PYTHON2_CONFIG="$ac_pt_PYTHON2_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PYTHON2_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PYTHON2_CONFIG=$ac_cv_path_ac_pt_PYTHON2_CONFIG -if test -n "$ac_pt_PYTHON2_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PYTHON2_CONFIG" >&5 -$as_echo "$ac_pt_PYTHON2_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PYTHON2_CONFIG" = x; then - PYTHON2_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PYTHON2_CONFIG=$ac_pt_PYTHON2_CONFIG - fi -else - PYTHON2_CONFIG="$ac_cv_path_PYTHON2_CONFIG" -fi - - test -z "$PYTHON2_CONFIG" && if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}python-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}python-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYTHON2_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PYTHON2_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON2_CONFIG="$PYTHON2_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON2_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PYTHON2_CONFIG=$ac_cv_path_PYTHON2_CONFIG -if test -n "$PYTHON2_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON2_CONFIG" >&5 -$as_echo "$PYTHON2_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -fi -if test -z "$ac_cv_path_PYTHON2_CONFIG"; then - ac_pt_PYTHON2_CONFIG=$PYTHON2_CONFIG - # Extract the first word of "python-config", so it can be a program name with args. -set dummy python-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PYTHON2_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PYTHON2_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PYTHON2_CONFIG="$ac_pt_PYTHON2_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PYTHON2_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PYTHON2_CONFIG=$ac_cv_path_ac_pt_PYTHON2_CONFIG -if test -n "$ac_pt_PYTHON2_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PYTHON2_CONFIG" >&5 -$as_echo "$ac_pt_PYTHON2_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PYTHON2_CONFIG" = x; then - PYTHON2_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PYTHON2_CONFIG=$ac_pt_PYTHON2_CONFIG - fi -else - PYTHON2_CONFIG="$ac_cv_path_PYTHON2_CONFIG" -fi - - test -z "$PYTHON2_CONFIG" && as_fn_error $? "python headers are required for --enable-python2_bindings but cannot be found" "$LINENO" 5 - PYTHON2_INCDIRS=`"$PYTHON2_CONFIG" --includes` - PYTHON2_LIBDIRS=`"$PYTHON2_CONFIG" --libs` - PYTHON2DIR=$pythondir - PYTHON_BINDINGS=yes -fi - -if test "$PYTHON3_BINDINGS" = yes -o "$BUILD_LVMDBUSD" = yes; then +if test "$BUILD_LVMDBUSD" = yes; then unset PYTHON PYTHON_CONFIG unset am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_platform unset am_cv_python_pythondir am_cv_python_version am_cv_python_pyexecdir @@ -13256,7 +11527,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -13581,9 +11852,7 @@ fi PYTHON3_LIBDIRS=`"$PYTHON3_CONFIG" --libs` PYTHON3DIR=$pythondir test "$PYTHON3_BINDINGS" = yes && PYTHON_BINDINGS=yes -fi -if test "$BUILD_LVMDBUSD" = yes; then # To get this macro, install autoconf-archive package then run autoreconf if test -z $PYTHON; @@ -13649,12 +11918,6 @@ $as_echo "no" >&6; } fi -if test "$PYTHON_BINDINGS" = yes -o "$PYTHON2_BINDINGS" = yes -o "$PYTHON3_BINDINGS" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python bindings are deprecated. Use D-Bus API" >&5 -$as_echo "$as_me: WARNING: Python bindings are deprecated. Use D-Bus API" >&2;} - test "$APPLIB" != yes && as_fn_error $? "Python_bindings require --enable-applib" "$LINENO" 5 -fi - ################################################################################ # Check whether --enable-pkgconfig was given. if test "${enable_pkgconfig+set}" = set; then : @@ -13861,7 +12124,7 @@ fi ################################################################################ -if [ $ "$LVM1" = shared -o "$POOL" = shared -o "$CLUSTER" = shared \ +if [ \( "$LVM1" = shared -o "$POOL" = shared \ $ -a "$STATIC_LINK" = yes ]; then as_fn_error $? "Features cannot be 'shared' when building statically" "$LINENO" 5 fi @@ -14794,208 +13057,6 @@ fi fi -if test "$CLVMD" != none; then - for ac_header in mntent.h netdb.h netinet/in.h pthread.h search.h sys/mount.h sys/socket.h sys/uio.h sys/un.h utmpx.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - as_fn_error $? "bailing out" "$LINENO" 5 -fi - -done - - for ac_func in dup2 getmntent memmove select socket -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -else - hard_bailout -fi -done - - # getmntent is in the standard C library on UNICOS, in -lsun on Irix 4, -# -lseq on Dynix/PTX, -lgen on Unixware. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getmntent" >&5 -$as_echo_n "checking for library containing getmntent... " >&6; } -if ${ac_cv_search_getmntent+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char getmntent (); -int -main () -{ -return getmntent (); - ; - return 0; -} -_ACEOF -for ac_lib in '' sun seq gen; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_getmntent=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_getmntent+:} false; then : - break -fi -done -if ${ac_cv_search_getmntent+:} false; then : - -else - ac_cv_search_getmntent=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getmntent" >&5 -$as_echo "$ac_cv_search_getmntent" >&6; } -ac_res=$ac_cv_search_getmntent -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - ac_cv_func_getmntent=yes - -$as_echo "#define HAVE_GETMNTENT 1" >>confdefs.h - -else - ac_cv_func_getmntent=no -fi - - - for ac_header in sys/select.h sys/socket.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 -$as_echo_n "checking types of arguments for select... " >&6; } -if ${ac_cv_func_select_args+:} false; then : - $as_echo_n "(cached) " >&6 -else - for ac_arg234 in 'fd_set *' 'int *' 'void *'; do - for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do - for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -#ifdef HAVE_SYS_SELECT_H -# include <sys/select.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif - -int -main () -{ -extern int select ($ac_arg1, - $ac_arg234, $ac_arg234, $ac_arg234, - $ac_arg5); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - done -done -# Provide a safe default value. -: "${ac_cv_func_select_args=int,int *,struct timeval *}" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 -$as_echo "$ac_cv_func_select_args" >&6; } -ac_save_IFS=$IFS; IFS=',' -set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'` -IFS=$ac_save_IFS -shift - -cat >>confdefs.h <<_ACEOF -#define SELECT_TYPE_ARG1 $1 -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define SELECT_TYPE_ARG234 ($2) -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define SELECT_TYPE_ARG5 ($3) -_ACEOF - -rm -f conftest* - -fi - -if test "$CLUSTER" != none; then - for ac_header in sys/socket.h sys/un.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - hard_bailout -fi - -done - - for ac_func in socket -do : - ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" -if test "x$ac_cv_func_socket" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SOCKET 1 -_ACEOF - -else - hard_bailout -fi -done - -fi - if test "$BUILD_DMEVENTD" = yes; then for ac_header in arpa/inet.h do : @@ -15200,14 +13261,15 @@ cat >>confdefs.h <<_ACEOF _ACEOF -USRSBINDIR="$(eval echo $(eval echo $usrsbindir))" -CLVMD_PATH="$USRSBINDIR/clvmd" +LVMCONFIG_PATH="$$BINDIR/lvmconfig" cat >>confdefs.h <<_ACEOF -#define CLVMD_PATH "$CLVMD_PATH" +#define LVMCONFIG_PATH "$LVMCONFIG_PATH" _ACEOF +USRSBINDIR="$(eval echo $(eval echo $usrsbindir))" + FSADM_PATH="$SBINDIR/fsadm" cat >>confdefs.h <<_ACEOF @@ -15548,18 +13610,8 @@ _ACEOF - - - - - - - - - - ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Ma kefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2 _monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/api/python_lvm_unit.py test/unit/Makefile tools/Makefile udev/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile python/Makefile python/setup .py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/api/python_lvm_unit.py test/unit/Makefile tools/Makefile udev /Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16258,7 +14310,6 @@ do "make.tmpl") CONFIG_FILES="$CONFIG_FILES make.tmpl" ;; "libdm/make.tmpl") CONFIG_FILES="$CONFIG_FILES libdm/make.tmpl" ;; "daemons/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/Makefile" ;; - "daemons/clvmd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/clvmd/Makefile" ;; "daemons/cmirrord/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/cmirrord/Makefile" ;; "daemons/dmeventd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/Makefile" ;; "daemons/dmeventd/libdevmapper-event.pc") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/libdevmapper-event.pc" ;; @@ -16284,15 +14335,12 @@ do "conf/metadata_profile_template.profile") CONFIG_FILES="$CONFIG_FILES conf/metadata_profile_template.profile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; - "lib/locking/Makefile") CONFIG_FILES="$CONFIG_FILES lib/locking/Makefile" ;; "include/lvm-version.h") CONFIG_FILES="$CONFIG_FILES include/lvm-version.h" ;; "libdaemon/Makefile") CONFIG_FILES="$CONFIG_FILES libdaemon/Makefile" ;; "libdaemon/client/Makefile") CONFIG_FILES="$CONFIG_FILES libdaemon/client/Makefile" ;; "libdaemon/server/Makefile") CONFIG_FILES="$CONFIG_FILES libdaemon/server/Makefile" ;; "libdm/Makefile") CONFIG_FILES="$CONFIG_FILES libdm/Makefile" ;; "libdm/libdevmapper.pc") CONFIG_FILES="$CONFIG_FILES libdm/libdevmapper.pc" ;; - "liblvm/Makefile") CONFIG_FILES="$CONFIG_FILES liblvm/Makefile" ;; - "liblvm/liblvm2app.pc") CONFIG_FILES="$CONFIG_FILES liblvm/liblvm2app.pc" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; @@ -16300,14 +14348,10 @@ do "scripts/blkdeactivate.sh") CONFIG_FILES="$CONFIG_FILES scripts/blkdeactivate.sh" ;; "scripts/blk_availability_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/blk_availability_init_red_hat" ;; "scripts/blk_availability_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/blk_availability_systemd_red_hat.service" ;; - "scripts/clvmd_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/clvmd_init_red_hat" ;; "scripts/cmirrord_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/cmirrord_init_red_hat" ;; "scripts/com.redhat.lvmdbus1.service") CONFIG_FILES="$CONFIG_FILES scripts/com.redhat.lvmdbus1.service" ;; "scripts/dm_event_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/dm_event_systemd_red_hat.service" ;; "scripts/dm_event_systemd_red_hat.socket") CONFIG_FILES="$CONFIG_FILES scripts/dm_event_systemd_red_hat.socket" ;; - "scripts/lvm2_cluster_activation_red_hat.sh") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_cluster_activation_red_hat.sh" ;; - "scripts/lvm2_cluster_activation_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_cluster_activation_systemd_red_hat.service" ;; - "scripts/lvm2_clvmd_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_clvmd_systemd_red_hat.service" ;; "scripts/lvm2_cmirrord_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_cmirrord_systemd_red_hat.service" ;; "scripts/lvm2_lvmdbusd_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmdbusd_systemd_red_hat.service" ;; "scripts/lvm2_lvmetad_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmetad_init_red_hat" ;; diff --git a/configure.ac b/configure.ac index 365df25..9b5d055 100644 --- a/configure.ac +++ b/configure.ac @@ -1109,20 +1109,6 @@ if test "$ODIRECT" = yes; then fi ################################################################################ -dnl -- Enable liblvm2app.so -AC_MSG_CHECKING(whether to build liblvm2app.so application library) -AC_ARG_ENABLE(applib, - AC_HELP_STRING([--enable-applib], [build application library]), - APPLIB=$enableval, APPLIB=no) -AC_MSG_RESULT($APPLIB) -AC_SUBST([LVM2APP_LIB]) -test "$APPLIB" = yes \ - && LVM2APP_LIB=-llvm2app \ - || LVM2APP_LIB= -AS_IF([test "$APPLIB"], - [AC_MSG_WARN([liblvm2app is deprecated. Use D-Bus API])]) - -################################################################################ dnl -- Enable cmdlib AC_MSG_CHECKING(whether to compile liblvm2cmd.so) AC_ARG_ENABLE(cmdlib, @@ -1145,44 +1131,9 @@ AS_IF([test "$NOTIFYDBUS_SUPPORT" = yes && test "BUILD_LVMDBUSD" = yes], [AC_MSG_WARN([Building D-Bus support without D-Bus notifications.])]) ################################################################################ -dnl -- Enable Python liblvm2app bindings -AC_MSG_CHECKING(whether to build Python wrapper for liblvm2app.so) -AC_ARG_ENABLE(python_bindings, - AC_HELP_STRING([--enable-python_bindings], [build default Python applib bindings]), - PYTHON_BINDINGS=$enableval, PYTHON_BINDINGS=no) -AC_MSG_RESULT($PYTHON_BINDINGS) - -AC_MSG_CHECKING(whether to build Python2 wrapper for liblvm2app.so) -AC_ARG_ENABLE(python2_bindings, - AC_HELP_STRING([--enable-python2_bindings], [build Python2 applib bindings]), - PYTHON2_BINDINGS=$enableval, PYTHON2_BINDINGS=no) -AC_MSG_RESULT($PYTHON2_BINDINGS) - - -AC_MSG_CHECKING(whether to build Python3 wrapper for liblvm2app.so) -AC_ARG_ENABLE(python3_bindings, - AC_HELP_STRING([--enable-python3_bindings], [build Python3 applib bindings]), - PYTHON3_BINDINGS=$enableval, PYTHON3_BINDINGS=no) -AC_MSG_RESULT($PYTHON3_BINDINGS) - -if test "$PYTHON_BINDINGS" = yes; then - AC_MSG_ERROR([--enable-python-bindings is replaced by --enable-python2-bindings and --enable-python3-bindings]) -fi +dnl -- Enable Python dbus library -if test "$PYTHON2_BINDINGS" = yes; then - AM_PATH_PYTHON([2]) - AC_PATH_TOOL(PYTHON2, python2) - test -z "$PYTHON2" && AC_MSG_ERROR([python2 is required for --enable-python2_bindings but cannot be found]) - AC_PATH_TOOL(PYTHON2_CONFIG, python2-config) - test -z "$PYTHON2_CONFIG" && AC_PATH_TOOL(PYTHON2_CONFIG, python-config) - test -z "$PYTHON2_CONFIG" && AC_MSG_ERROR([python headers are required for --enable-python2_bindings but cannot be found]) - PYTHON2_INCDIRS=`"$PYTHON2_CONFIG" --includes` - PYTHON2_LIBDIRS=`"$PYTHON2_CONFIG" --libs` - PYTHON2DIR=$pythondir - PYTHON_BINDINGS=yes -fi - -if test "$PYTHON3_BINDINGS" = yes -o "$BUILD_LVMDBUSD" = yes; then +if test "$BUILD_LVMDBUSD" = yes; then unset PYTHON PYTHON_CONFIG unset am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_platform unset am_cv_python_pythondir am_cv_python_version am_cv_python_pyexecdir @@ -1196,19 +1147,12 @@ if test "$PYTHON3_BINDINGS" = yes -o "$BUILD_LVMDBUSD" = yes; then PYTHON3_LIBDIRS=`"$PYTHON3_CONFIG" --libs` PYTHON3DIR=$pythondir test "$PYTHON3_BINDINGS" = yes && PYTHON_BINDINGS=yes -fi -if test "$BUILD_LVMDBUSD" = yes; then # To get this macro, install autoconf-archive package then run autoreconf AC_PYTHON_MODULE([pyudev], [Required], python3) AC_PYTHON_MODULE([dbus], [Required], python3) fi -if test "$PYTHON_BINDINGS" = yes -o "$PYTHON2_BINDINGS" = yes -o "$PYTHON3_BINDINGS" = yes; then - AC_MSG_WARN([Python bindings are deprecated. Use D-Bus API]) - test "$APPLIB" != yes && AC_MSG_ERROR([Python_bindings require --enable-applib]) -fi - ################################################################################ dnl -- Enable pkg-config AC_ARG_ENABLE(pkgconfig, @@ -1656,7 +1600,6 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[[()]]' '{print $2}'` AC_DEFINE_UNQUOTED(LVM_CONFIGURE_LINE, "$CONFIGURE_LINE", [configure command line used]) ################################################################################ -AC_SUBST(APPLIB) AC_SUBST(AWK) AC_SUBST(BLKID_PC) AC_SUBST(BUILD_CMIRRORD) @@ -1843,8 +1786,6 @@ libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc -liblvm/Makefile -liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile diff --git a/include/configure.h.in b/include/configure.h.in index 65a2a6a..b1b2db3 100644 --- a/include/configure.h.in +++ b/include/configure.h.in @@ -28,9 +28,6 @@ /* Path to cmirrord pidfile. */ #undef CMIRRORD_PIDFILE -/* Define to 0 to exclude libSaCkpt. */ -#undef CMIRROR_HAS_CHECKPOINT - /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -185,9 +182,6 @@ /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ #undef HAVE_DOPRNT -/* Define to 1 if you have the `dup2' function. */ -#undef HAVE_DUP2 - /* Define to 1 if you have the <errno.h> header file. */ #undef HAVE_ERRNO_H @@ -209,9 +203,6 @@ /* Define to 1 if getline is available. */ #undef HAVE_GETLINE -/* Define to 1 if you have the `getmntent' function. */ -#undef HAVE_GETMNTENT - /* Define to 1 if getopt_long is available. */ #undef HAVE_GETOPTLONG @@ -236,9 +227,6 @@ /* Define to 1 if dynamic libraries are available. */ #undef HAVE_LIBDL -/* Define to 1 if you have the <libdlm.h> header file. */ -#undef HAVE_LIBDLM_H - /* Define to 1 if you have the <libgen.h> header file. */ #undef HAVE_LIBGEN_H @@ -283,9 +271,6 @@ /* Define to 1 if you have the `memchr' function. */ #undef HAVE_MEMCHR -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -301,30 +286,18 @@ /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP -/* Define to 1 if you have the <mntent.h> header file. */ -#undef HAVE_MNTENT_H - /* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ #undef HAVE_NDIR_H -/* Define to 1 if you have the <netdb.h> header file. */ -#undef HAVE_NETDB_H - -/* Define to 1 if you have the <netinet/in.h> header file. */ -#undef HAVE_NETINET_IN_H - /* Define to 1 if you have the `nl_langinfo' function. */ #undef HAVE_NL_LANGINFO /* Define to 1 if you have the <paths.h> header file. */ #undef HAVE_PATHS_H -/* Define to 1 if you have the <pthread.h> header file. */ -#undef HAVE_PTHREAD_H - /* Define to 1 if the system has the type `ptrdiff_t'. */ #undef HAVE_PTRDIFF_T @@ -350,12 +323,6 @@ /* Define to 1 if you have the `rmdir' function. */ #undef HAVE_RMDIR -/* Define to 1 if you have the <search.h> header file. */ -#undef HAVE_SEARCH_H - -/* Define to 1 if you have the `select' function. */ -#undef HAVE_SELECT - /* Define to 1 to include support for selinux. */ #undef HAVE_SELINUX @@ -377,9 +344,6 @@ /* Define to 1 if you have the <signal.h> header file. */ #undef HAVE_SIGNAL_H -/* Define to 1 if you have the `socket' function. */ -#undef HAVE_SOCKET - /* Define to 1 if `stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG @@ -491,9 +455,6 @@ /* Define to 1 if you have the <sys/mman.h> header file. */ #undef HAVE_SYS_MMAN_H -/* Define to 1 if you have the <sys/mount.h> header file. */ -#undef HAVE_SYS_MOUNT_H - /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */ #undef HAVE_SYS_NDIR_H @@ -504,15 +465,9 @@ /* Define to 1 if you have the <sys/resource.h> header file. */ #undef HAVE_SYS_RESOURCE_H -/* Define to 1 if you have the <sys/select.h> header file. */ -#undef HAVE_SYS_SELECT_H - /* Define to 1 if you have the <sys/sem.h> header file. */ #undef HAVE_SYS_SEM_H -/* Define to 1 if you have the <sys/socket.h> header file. */ -#undef HAVE_SYS_SOCKET_H - /* Define to 1 if you have the <sys/statvfs.h> header file. */ #undef HAVE_SYS_STATVFS_H @@ -528,12 +483,6 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H -/* Define to 1 if you have the <sys/uio.h> header file. */ -#undef HAVE_SYS_UIO_H - -/* Define to 1 if you have the <sys/un.h> header file. */ -#undef HAVE_SYS_UN_H - /* Define to 1 if you have the <sys/utsname.h> header file. */ #undef HAVE_SYS_UTSNAME_H @@ -555,9 +504,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the <utmpx.h> header file. */ -#undef HAVE_UTMPX_H - /* valgrind.h found */ #undef HAVE_VALGRIND @@ -598,6 +544,9 @@ slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK +/* Path to lvmconfig binary. */ +#undef LVMCONFIG_PATH + /* Path to lvmetad pidfile. */ #undef LVMETAD_PIDFILE @@ -669,15 +618,6 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE -/* Define to the type of arg 1 for `select'. */ -#undef SELECT_TYPE_ARG1 - -/* Define to the type of args 2, 3 and 4 for `select'. */ -#undef SELECT_TYPE_ARG234 - -/* Define to the type of arg 5 for `select'. */ -#undef SELECT_TYPE_ARG5 - /* Define to 1 to include built-in support for snapshots. */ #undef SNAPSHOT_INTERNAL diff --git a/liblvm/.exported_symbols b/liblvm/.exported_symbols deleted file mode 100644 index e69de29..0000000 diff --git a/liblvm/Doxyfile b/liblvm/Doxyfile deleted file mode 100644 index 3d2e8e4..0000000 --- a/liblvm/Doxyfile +++ /dev/null @@ -1,254 +0,0 @@ -# Doxyfile 1.5.7.1 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = -PROJECT_NUMBER = -OUTPUT_DIRECTORY = doxygen-output -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = YES -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO -QT_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -OPTIMIZE_FOR_FORTRAN = NO -OPTIMIZE_OUTPUT_VHDL = NO -BUILTIN_STL_SUPPORT = NO -CPP_CLI_SUPPORT = NO -SIP_SUPPORT = NO -IDL_PROPERTY_SUPPORT = YES -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -TYPEDEF_HIDES_STRUCT = NO -SYMBOL_CACHE_SIZE = 0 -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = YES -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -EXTRACT_ANON_NSPACES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_GROUP_NAMES = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO -SHOW_FILES = YES -SHOW_NAMESPACES = YES -FILE_VERSION_FILTER = -LAYOUT_FILE = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = ./ -INPUT_ENCODING = UTF-8 -FILE_PATTERNS = *.c \ - *.h -RECURSIVE = NO -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXCLUDE_SYMBOLS = -EXAMPLE_PATH = ../test/api -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = NO -REFERENCES_RELATION = NO -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -HTML_DYNAMIC_SECTIONS = NO -GENERATE_DOCSET = NO -DOCSET_FEEDNAME = "Doxygen generated docs" -DOCSET_BUNDLE_ID = org.doxygen.Project -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -CHM_INDEX_ENCODING = -BINARY_TOC = NO -TOC_EXPAND = NO -GENERATE_QHP = NO -QCH_FILE = -QHP_NAMESPACE = org.doxygen.Project -QHP_VIRTUAL_FOLDER = doc -QHG_LOCATION = -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = NONE -TREEVIEW_WIDTH = 250 -FORMULA_FONTSIZE = 10 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = YES -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = YES -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = YES -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = ../libdm -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -MSCGEN_PATH = -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -DOT_FONTNAME = FreeSans -DOT_FONTSIZE = 10 -DOT_FONTPATH = -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = YES -CALLER_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -DOT_GRAPH_MAX_NODES = 50 -MAX_DOT_GRAPH_DEPTH = 0 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO diff --git a/liblvm/Makefile.in b/liblvm/Makefile.in deleted file mode 100644 index 210ee37..0000000 --- a/liblvm/Makefile.in +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. -# Copyright (C) 2004-2013 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ - -SOURCES =\ - lvm_misc.c \ - lvm_prop.c \ - lvm_base.c \ - lvm_lv.c \ - lvm_pv.c \ - lvm_vg.c - -LIB_NAME = liblvm2app -LIB_VERSION = $(LIB_VERSION_APP) - -ifeq ("@STATIC_LINK@", "yes") - LIB_STATIC = $(LIB_NAME).a -endif - -LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX) - -CLEAN_TARGETS += liblvm.cflow $(LIB_NAME).a - -EXPORTED_HEADER = $(srcdir)/lvm2app.h -EXPORTED_FN_PREFIX = lvm - -LDDEPS += $(top_builddir)/lib/liblvm-internal.a - -include $(top_builddir)/make.tmpl - -LDFLAGS += -L$(top_builddir)/lib -L$(top_builddir)/daemons/dmeventd -LIBS += $(LVMINTERNAL_LIBS) -laio - -.PHONY: install_dynamic install_static install_include install_pkgconfig - -INSTALL_TYPE = install_dynamic - -ifeq ("@STATIC_LINK@", "yes") - INSTALL_TYPE += install_static -endif - -ifeq ("@PKGCONFIG@", "yes") - INSTALL_TYPE += install_pkgconfig -endif - -install: $(INSTALL_TYPE) install_include - -install_include: $(srcdir)/lvm2app.h - $(INSTALL_DATA) -D $< $(includedir)/$(<F) - -install_dynamic: install_lib_shared - -install_static: $(LIB_STATIC) - $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F) - -install_pkgconfig: $(LIB_NAME).pc - $(INSTALL_DATA) -D $< $(pkgconfigdir)/lvm2app.pc - -liblvm.cflow: $(SOURCES) - set -e; (echo -n "SOURCES += "; \ - echo $(SOURCES) | \ - sed "s/^/ /;s/ / $(top_srcdir)\/liblvm\//g;s/$$//"; \ - ) > $@ - -cflow: liblvm.cflow - -DISTCLEAN_TARGETS += $(LIB_NAME).pc diff --git a/liblvm/liblvm2app.pc.in b/liblvm/liblvm2app.pc.in deleted file mode 100644 index 7d7fd3d..0000000 --- a/liblvm/liblvm2app.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: lvm2app -Description: lvm2 application library -Version: @LVM_MAJOR@.@LVM_LIBAPI@ -Cflags: -I${includedir} -Libs: -L${libdir} -llvm2app -Requires.private: devmapper @BLKID_PC@ diff --git a/liblvm/lvm2app.h b/liblvm/lvm2app.h deleted file mode 100644 index 10ecd2e..0000000 --- a/liblvm/lvm2app.h +++ /dev/null @@ -1,1983 +0,0 @@ -/* - * Copyright (C) 2008-2013 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -#ifndef _LIB_LVM2APP_H -#define _LIB_LVM2APP_H - -#include <libdevmapper.h> - -#include <stdint.h> - -#ifndef _BUILDING_LVM -#warning "liblvm2app is deprecated, use D-Bus API instead." -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/******************************** WARNING *********************************** - * - * NOTE: This API is under development and subject to change at any time. - * - * Please send feedback to lvm-devel(a)redhat.com - * - *********************************** WARNING ********************************/ - -/*************************** Design Overview ********************************/ - -/** - * \mainpage LVM library API - * - * The API is designed around the following basic LVM objects: - * 1) Physical Volume (pv_t) 2) Volume Group (vg_t) 3) Logical Volume (lv_t). - * - * The library provides functions to list the objects in a system, - * get and set object properties (such as names, UUIDs, and sizes), as well - * as create/remove objects and perform more complex operations and - * transformations. Each object instance is represented by a handle, and - * handles are passed to and from the functions to perform the operations. - * - * A central object in the library is the Volume Group, represented by the - * VG handle, vg_t. Performing an operation on a PV or LV object first - * requires obtaining a VG handle. Once the vg_t has been obtained, it can - * be used to enumerate the pv_t and lv_t objects within that vg_t. Attributes - * of these objects can then be queried or changed. - * - * A volume group handle may be obtained with read or write permission. - * Any attempt to change a property of a pv_t, vg_t, or lv_t without - * obtaining write permission on the vg_t will fail with EPERM. - * - * An application first opening a VG read-only, then later wanting to change - * a property of an object must first close the VG and re-open with write - * permission. Currently liblvm provides no mechanism to determine whether - * the VG has changed on-disk in between these operations - this is the - * application's responsiblity. One way the application can ensure the VG - * has not changed is to save the "vg_seqno" field after opening the VG with - * READ permission. If the application later needs to modify the VG, it can - * close the VG and re-open with WRITE permission. It should then check - * whether the original "vg_seqno" obtained with READ permission matches - * the new one obtained with WRITE permission. - */ - -/** - * Retrieve the library version. - * - * The library version is the same format as the full LVM version. - * The format is as follows: - * LVM_MAJOR.LVM_MINOR.LVM_PATCHLEVEL(LVM_LIBAPI)[-LVM_RELEASE] - * An application wishing to determine compatibility with a particular version - * of the library should check at least the LVM_MAJOR, LVM_MINOR, and - * LVM_LIBAPI numbers. For example, assume the full LVM version is - * 2.02.50(1)-1. The application should verify the "2.02" and the "(1)". - * - * \return A string describing the library version. - */ -const char *lvm_library_get_version(void); - -/******************************** structures ********************************/ - -/** - * Opaque C pointers - Internal structures may change without notice between - * releases, whereas this API will be changed much less frequently. Backwards - * compatibility will normally be preserved in future releases. On any occasion - * when the developers do decide to break backwards compatibility in any - * significant way, the LVM_LIBAPI number (included in the library's soname) - * will be incremented. - */ - -/** - * \class lvm_t - * - * This is the base handle that is needed to open and create objects such as - * volume groups and logical volumes. In addition, this handle provides a - * context for error handling information, saving any error number (see - * lvm_errno()) and error message (see lvm_errmsg()) that any function may - * generate. - */ -typedef struct lvm *lvm_t; - -/** - * \class vg_t - * - * The volume group object is a central object in the library, and can be - * either a read-only object or a read-write object depending on the function - * used to obtain the object handle. For example, lvm_vg_create() always - * returns a read/write handle, while lvm_vg_open() has a "mode" argument - * to define the read/write mode of the handle. - */ -typedef struct volume_group *vg_t; - -/** - * \class lv_t - * - * This logical volume object is bound to a vg_t and has the same - * read/write mode as the vg_t. Changes will be written to disk - * when the vg_t gets committed to disk by calling lvm_vg_write(). - */ -typedef struct logical_volume *lv_t; - -/** - * \class pv_t - * - * This physical volume object is bound to a vg_t and has the same - * read/write mode as the vg_t. Changes will be written to disk - * when the vg_t gets committed to disk by calling lvm_vg_write(). - */ -typedef struct physical_volume *pv_t; - -/** - * \class lvseg_t - * - * This lv segment object is bound to a lv_t. - */ -typedef struct lv_segment *lvseg_t; - -/** - * \class pvseg_t - * - * This pv segment object is bound to a pv_t. - */ -typedef struct pv_segment *pvseg_t; - -/** - * \class lv_create_params - * - * This lv_create_params represents the plethora of available options when - * creating a logical volume - */ -typedef struct lvm_lv_create_params *lv_create_params_t; - -/** - * \class pv_create_params - * - * This pv_create_params represents the plethora of available options when - * creating a physical volume - */ -typedef struct lvm_pv_create_params *pv_create_params_t; - -/** - * Logical Volume object list. - * - * Lists of these structures are returned by lvm_vg_list_lvs(). - */ -typedef struct lvm_lv_list { - struct dm_list list; - lv_t lv; -} lv_list_t; - -/** - * Logical Volume Segment object list. - * - * Lists of these structures are returned by lvm_lv_list_lvsegs(). - */ -typedef struct lvm_lvseg_list { - struct dm_list list; - lvseg_t lvseg; -} lvseg_list_t; - -/** - * Physical volume object list. - * - * Lists of these structures are returned by lvm_vg_list_pvs(). - */ -typedef struct lvm_pv_list { - struct dm_list list; - pv_t pv; -} pv_list_t; - -/** - * Physical Volume Segment object list. - * - * Lists of these structures are returned by lvm_pv_list_pvsegs(). - */ -typedef struct lvm_pvseg_list { - struct dm_list list; - pvseg_t pvseg; -} pvseg_list_t; - -/** - * String list. - * - * This string list contains read-only strings. - * Lists of these structures are returned by functions such as - * lvm_list_vg_names() and lvm_list_vg_uuids(). - */ -typedef struct lvm_str_list { - struct dm_list list; - const char *str; -} lvm_str_list_t; - -/** - * Property Value - * - * This structure defines a single LVM property value for an LVM object. - * The structures are returned by functions such as - * lvm_vg_get_property(). - * - * is_settable: indicates whether a 'set' function exists for this property - * is_string: indicates whether this property is a string (1) or not (0) - * is_integer: indicates whether this property is an integer (1) or not (0) - * is_valid: indicates whether 'value' is valid (1) or not (0) - */ -typedef struct lvm_property_value { - uint32_t is_settable:1; - uint32_t is_string:1; - uint32_t is_integer:1; - uint32_t is_valid:1; - uint32_t is_signed:1; - uint32_t padding:27; - union { - const char *string; - uint64_t integer; - int64_t signed_integer; - } value; -} lvm_property_value_t; - -/*************************** generic lvm handling ***************************/ -/** - * Create a LVM handle. - * - * \memberof lvm_t - * - * Once all LVM operations have been completed, use lvm_quit() to release - * the handle and any associated resources. - * - * \param system_dir - * Set an alternative LVM system directory. Use NULL to use the - * default value. If the environment variable LVM_SYSTEM_DIR is set, - * it will override any system_dir setting. - * - * \return - * A valid LVM handle is returned or NULL if there has been a - * memory allocation problem. You have to check if an error occured - * with the lvm_error() function. - */ -lvm_t lvm_init(const char *system_dir); - -/** - * Destroy a LVM handle allocated with lvm_init(). - * - * \memberof lvm_t - * - * This function should be used after all LVM operations are complete or after - * an unrecoverable error. Destroying the LVM handle frees the memory and - * other resources associated with the handle. Once destroyed, the handle - * cannot be used subsequently. - * - * \param libh - * Handle obtained from lvm_init(). - */ -void lvm_quit(lvm_t libh); - -/** - * Reload the original configuration from the system directory. - * - * \memberof lvm_t - * - * This function should be used when any LVM configuration changes in the LVM - * system_dir or by another lvm_config* function, and the change is needed by - * the application. - * - * \param libh - * Handle obtained from lvm_init(). - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_config_reload(lvm_t libh); - -/** - * Override the LVM configuration with a configuration string. - * - * \memberof lvm_t - * - * This function is equivalent to the --config option on lvm commands. - * Once this API has been used to over-ride the configuration, - * use lvm_config_reload() to apply the new settings. - * - * \param libh - * Handle obtained from lvm_init(). - * - * \param config_string - * LVM configuration string to apply. See the lvm.conf file man page - * for the format of the config string. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_config_override(lvm_t libh, const char *config_string); - -/** - * Find a boolean value in the LVM configuration. - * - * \memberof lvm_t - * - * This function finds a boolean value associated with a path - * in current LVM configuration. - * - * \param libh - * Handle obtained from lvm_init(). - * - * \param config_path - * A path in LVM configuration - * - * \param fail - * Value to return if the path is not found. - * - * \return - * boolean value for 'config_path' (success) or the value of 'fail' (error) - */ -int lvm_config_find_bool(lvm_t libh, const char *config_path, int fail); - -/** - * Return stored error no describing last LVM API error. - * - * \memberof lvm_t - * - * Users of liblvm should use lvm_errno to determine the details of a any - * failure of the last call. A basic success or fail is always returned by - * every function, either by returning a 0 or -1, or a non-NULL / NULL. - * If a function has failed, lvm_errno may be used to get a more specific - * error code describing the failure. In this way, lvm_errno may be used - * after every function call, even after a 'get' function call that simply - * returns a value. - * - * \param libh - * Handle obtained from lvm_init(). - * - * \return - * An errno value describing the last LVM error. - */ -int lvm_errno(lvm_t libh); - -/** - * Return stored error message describing last LVM error. - * - * \memberof lvm_t - * - * This function may be used in conjunction with lvm_errno() to obtain more - * specific error information for a function that is known to have failed. - * - * \param libh - * Handle obtained from lvm_init(). - * - * \return - * An error string describing the last LVM error. - */ -const char *lvm_errmsg(lvm_t libh); - -/** - * Scan all devices on the system for VGs and LVM metadata. - * - * \memberof lvm_t - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_scan(lvm_t libh); - -/** - * Return the list of volume group names. - * - * \memberof lvm_t - * - * The memory allocated for the list is tied to the lvm_t handle and will be - * released when lvm_quit() is called. - * - * NOTE: This function normally does not scan devices in the system for LVM - * metadata. To scan the system, use lvm_scan(). - * - * To process the list, use the dm_list iterator functions. For example: - * vg_t vg; - * struct dm_list *vgnames; - * struct lvm_str_list *strl; - * - * vgnames = lvm_list_vg_names(libh); - * dm_list_iterate_items(strl, vgnames) { - * vgname = strl->str; - * vg = lvm_vg_open(libh, vgname, "r"); - * // do something with vg - * lvm_vg_close(vg); - * } - * - * - * \return - * A list with entries of type struct lvm_str_list, containing the - * VG name strings of the Volume Groups known to the system. - * NULL is returned if unable to allocate memory. - * An empty list (verify with dm_list_empty) is returned if no VGs - * exist on the system. - */ -struct dm_list *lvm_list_vg_names(lvm_t libh); - -/** - * Return the list of volume group uuids. - * - * \memberof lvm_t - * - * The memory allocated for the list is tied to the lvm_t handle and will be - * released when lvm_quit() is called. - * - * NOTE: This function normally does not scan devices in the system for LVM - * metadata. To scan the system, use lvm_scan(). - * - * \param libh - * Handle obtained from lvm_init(). - * - * \return - * A list with entries of type struct lvm_str_list, containing the - * VG UUID strings of the Volume Groups known to the system. - * NULL is returned if unable to allocate memory. - * An empty list (verify with dm_list_empty) is returned if no VGs - * exist on the system. - */ -struct dm_list *lvm_list_vg_uuids(lvm_t libh); - -/** - * Return the volume group name given a PV UUID - * - * \memberof lvm_t - * - * The memory allocated for the name is tied to the lvm_t handle and will be - * released when lvm_quit() is called. - * - * NOTE: This function may scan devices in the system for LVM metadata. - * - * \param libh - * Handle obtained from lvm_init(). - * - * \return - * The volume group name for the given PV UUID. - * NULL is returned if the PV UUID is not associated with a volume group. - */ -const char *lvm_vgname_from_pvid(lvm_t libh, const char *pvid); - -/** - * Return the volume group name given a device name - * - * \memberof lvm_t - * - * The memory allocated for the name is tied to the lvm_t handle and will be - * released when lvm_quit() is called. - * - * NOTE: This function may scan devices in the system for LVM metadata. - * - * \param libh - * Handle obtained from lvm_init(). - * - * \return - * The volume group name for the given device name. - * NULL is returned if the device is not an LVM device. - * - */ -const char *lvm_vgname_from_device(lvm_t libh, const char *device); - -/** - * Open an existing VG. - * - * Open a VG for reading or writing. - * - * \memberof lvm_t - * - * \param libh - * Handle obtained from lvm_init(). - * - * \param vgname - * Name of the VG to open. - * - * \param mode - * Open mode - either "r" (read) or "w" (read/write). - * Any other character results in an error with EINVAL set. - * - * \param flags - * Open flags - currently ignored. - * - * \return non-NULL VG handle (success) or NULL (failure). - */ -vg_t lvm_vg_open(lvm_t libh, const char *vgname, const char *mode, - uint32_t flags); - -/** - * Validate a name to be used for new VG construction. - * - * This function checks that the name has no invalid characters, - * the length doesn't exceed maximum and that the VG name isn't already in use - * and that the name adheres to any other limitations. - * - * \param libh - * Valid library handle - * - * \param name - * Name to validate for new VG create. - */ -int lvm_vg_name_validate(lvm_t libh, const char *vg_name); - -/** - * Create a VG with default parameters. - * - * \memberof lvm_t - * - * This function creates a Volume Group object in memory. - * Upon success, other APIs may be used to set non-default parameters. - * For example, to set a non-default extent size, use lvm_vg_set_extent_size(). - * Next, to add physical storage devices to the volume group, use - * lvm_vg_extend() for each device. - * Once all parameters are set appropriately and all devices are added to the - * VG, use lvm_vg_write() to commit the new VG to disk, and lvm_vg_close() to - * release the VG handle. - * - * \param libh - * Handle obtained from lvm_init(). - * - * \param vg_name - * Name of the VG to open. - * - * \return - * non-NULL vg handle (success) or NULL (failure) - */ -vg_t lvm_vg_create(lvm_t libh, const char *vg_name); - -/*************************** volume group handling **************************/ - -/** - * Return a list of LV handles for a given VG handle. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * A list of lvm_lv_list structures containing lv handles for this vg. - * If no LVs exist on the given VG, NULL is returned. - */ -struct dm_list *lvm_vg_list_lvs(vg_t vg); - -/** - * Return a list of PV handles for all. - * - * \memberof lvm_t - * - * \param libh - * Library handle retrieved from lvm_init - * - * \return - * A list of lvm_pv_list structures containing pv handles for all physical - * volumes. If no PVs exist or a global lock was unable to be obtained a - * NULL is returned. Do not attempt to remove one of the PVs until after the - * call to lvm_list_pvs_free has been made. - */ -struct dm_list *lvm_list_pvs(lvm_t libh); - -/** - * Free the resources used by acquiring the pvlist. This should be called as - * soon as possible after processing the needed information from the pv list as - * a global lock is held. - * - * \param pvlist - * PV list to be freed - * - * \return - * 0 on success, else -1 with library errno and text set. - */ -int lvm_list_pvs_free(struct dm_list *pvlist); - -/** - * Create a physical volume. - * \param libh Library handle - * \param pv_name The physical volume name - * \param size Size of physical volume, 0 = use all available. - * \return - * 0 on success, else -1 with library errno and text set. - */ -int lvm_pv_create(lvm_t libh, const char *pv_name, uint64_t size); - -/** - * Create a physical volume parameter object for PV creation. - * - * \param libh Library handle - * \param pv_name Device name - * - * \return - * NULL on error, else valid parameter object to use. - */ -pv_create_params_t lvm_pv_params_create(lvm_t libh, const char *pv_name); - -/** - * Create a parameter object to use in function lvm_pv_create_adv - * - * \param params The params object to get property value from - * \param name The name of the property to retrieve - * - * Available properties: - * - * size zero indicates use detected size of device - * (recommended and default) - * pvmetadatacopies Number of metadata copies (0,1,2) - * pvmetadatasize The approx. size to be to be set aside for metadata - * data_alignment Align the start of the data to a multiple of - * this number - * data_alignment_offset Shift the start of the data area by this addl. - * offset - * zero Set to 1 to zero out first 2048 bytes of - * device, 0 to not (default is 1) - * - * \return - * lvm_property_value - */ -struct lvm_property_value lvm_pv_params_get_property( - const pv_create_params_t params, - const char *name); - -/** - * Sets a property of a PV parameter create object. - * - * \param params The parameter object - * \param name The name of the property to set (see get prop list) - * \param prop The property to set the value on. - */ -int lvm_pv_params_set_property(pv_create_params_t params, const char *name, - struct lvm_property_value *prop); -/** - * Creates a physical volume using the supplied params object. - * - * \param params The parameters to use for physical volume creation - * - * \return - * -1 on error, 0 on success. - */ -int lvm_pv_create_adv(pv_create_params_t params); - -/** - * Remove a physical volume. - * Note: You cannot remove a PV while iterating through the list of PVs as - * locks are held for the PV list. - * \param libh Library handle - * \param pv_name The physical volume name - * \return - * 0 on success, else -1 with library errno and text set. - */ -int lvm_pv_remove(lvm_t libh, const char *pv_name); - -/** - * Return a list of PV handles for a given VG handle. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * A list of lvm_pv_list structures containing pv handles for this vg. - * If no PVs exist on the given VG, NULL is returned. - */ -struct dm_list *lvm_vg_list_pvs(vg_t vg); - -/** - * Write a VG to disk. - * - * \memberof vg_t - * - * This function commits the Volume Group object referenced by the VG handle - * to disk. Upon failure, retry the operation and/or release the VG handle - * with lvm_vg_close(). - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_vg_write(vg_t vg); - -/** - * Remove a VG from the system. - * - * \memberof vg_t - * - * This function removes a Volume Group object in memory, and requires - * calling lvm_vg_write() to commit the removal to disk. - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_vg_remove(vg_t vg); - -/** - * Close a VG opened with lvm_vg_create or lvm_vg_open(). - * - * \memberof vg_t - * - * This function releases a VG handle and any resources associated with the - * handle. - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_vg_close(vg_t vg); - -/** - * Extend a VG by adding a device. - * - * \memberof vg_t - * - * This function requires calling lvm_vg_write() to commit the change to disk. - * After successfully adding a device, use lvm_vg_write() to commit the new VG - * to disk. Upon failure, retry the operation or release the VG handle with - * lvm_vg_close(). - * If the device is not initialized for LVM use, it will be initialized - * before adding to the VG. Although some internal checks are done, - * the caller should be sure the device is not in use by other subsystems - * before calling lvm_vg_extend(). - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param device - * Absolute pathname of device to add to VG. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_vg_extend(vg_t vg, const char *device); - -/** - * Reduce a VG by removing an unused device. - * - * \memberof vg_t - * - * This function requires calling lvm_vg_write() to commit the change to disk. - * After successfully removing a device, use lvm_vg_write() to commit the new VG - * to disk. Upon failure, retry the operation or release the VG handle with - * lvm_vg_close(). - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param device - * Name of device to remove from VG. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_vg_reduce(vg_t vg, const char *device); - -/** - * Add a tag to a VG. - * - * \memberof vg_t - * - * This function requires calling lvm_vg_write() to commit the change to disk. - * After successfully adding a tag, use lvm_vg_write() to commit the - * new VG to disk. Upon failure, retry the operation or release the VG handle - * with lvm_vg_close(). - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param tag - * Tag to add to the VG. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_vg_add_tag(vg_t vg, const char *tag); - -/** - * Remove a tag from a VG. - * - * \memberof vg_t - * - * This function requires calling lvm_vg_write() to commit the change to disk. - * After successfully removing a tag, use lvm_vg_write() to commit the - * new VG to disk. Upon failure, retry the operation or release the VG handle - * with lvm_vg_close(). - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param tag - * Tag to remove from VG. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_vg_remove_tag(vg_t vg, const char *tag); - -/** - * Set the extent size of a VG. - * - * \memberof vg_t - * - * This function requires calling lvm_vg_write() to commit the change to disk. - * After successfully setting a new extent size, use lvm_vg_write() to commit - * the new VG to disk. Upon failure, retry the operation or release the VG - * handle with lvm_vg_close(). - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param new_size - * New extent size in bytes. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_vg_set_extent_size(vg_t vg, uint32_t new_size); - -/** - * Get whether or not a volume group is clustered. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * 1 if the VG is clustered, 0 if not - */ -uint64_t lvm_vg_is_clustered(vg_t vg); - -/** - * Get whether or not a volume group is exported. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * 1 if the VG is exported, 0 if not - */ -uint64_t lvm_vg_is_exported(vg_t vg); - -/** - * Get whether or not a volume group is a partial volume group. - * - * \memberof vg_t - * - * When one or more physical volumes belonging to the volume group - * are missing from the system the volume group is a partial volume - * group. - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * 1 if the VG is PVs, 0 if not - */ -uint64_t lvm_vg_is_partial(vg_t vg); - -/** - * Get the current metadata sequence number of a volume group. - * - * \memberof vg_t - * - * The metadata sequence number is incrented for each metadata change. - * Applications may use the sequence number to determine if any LVM objects - * have changed from a prior query. - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Metadata sequence number. - */ -uint64_t lvm_vg_get_seqno(const vg_t vg); - -/** - * Get the current uuid of a volume group. - * - * \memberof vg_t - * - * The memory allocated for the uuid is tied to the vg_t handle and will be - * released when lvm_vg_close() is called. - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Copy of the uuid string. - */ -const char *lvm_vg_get_uuid(const vg_t vg); - -/** - * Get the current name of a volume group. - * - * \memberof vg_t - * - * The memory allocated for the name is tied to the vg_t handle and will be - * released when lvm_vg_close() is called. - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Copy of the name. - */ -const char *lvm_vg_get_name(const vg_t vg); - -/** - * Get the current size in bytes of a volume group. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Size in bytes. - */ -uint64_t lvm_vg_get_size(const vg_t vg); - -/** - * Get the current unallocated space in bytes of a volume group. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Free size in bytes. - */ -uint64_t lvm_vg_get_free_size(const vg_t vg); - -/** - * Get the current extent size in bytes of a volume group. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Extent size in bytes. - */ -uint64_t lvm_vg_get_extent_size(const vg_t vg); - -/** - * Get the current number of total extents of a volume group. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Extent count. - */ -uint64_t lvm_vg_get_extent_count(const vg_t vg); - -/** - * Get the current number of free extents of a volume group. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Free extent count. - */ -uint64_t lvm_vg_get_free_extent_count(const vg_t vg); - -/** - * Get the current number of physical volumes of a volume group. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Physical volume count. - */ -uint64_t lvm_vg_get_pv_count(const vg_t vg); - -/** - * Get the maximum number of physical volumes allowed in a volume group. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Maximum number of physical volumes allowed in a volume group. - */ -uint64_t lvm_vg_get_max_pv(const vg_t vg); - -/** - * Get the maximum number of logical volumes allowed in a volume group. - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \return - * Maximum number of logical volumes allowed in a volume group. - */ -uint64_t lvm_vg_get_max_lv(const vg_t vg); - -/** - * Return the list of volume group tags. - * - * \memberof vg_t - * - * The memory allocated for the list is tied to the vg_t handle and will be - * released when lvm_vg_close() is called. - * - * To process the list, use the dm_list iterator functions. For example: - * vg_t vg; - * struct dm_list *tags; - * struct lvm_str_list *strl; - * - * tags = lvm_vg_get_tags(vg); - * dm_list_iterate_items(strl, tags) { - * tag = strl->str; - * // do something with tag - * } - * - * - * \return - * A list with entries of type struct lvm_str_list, containing the - * tag strings attached to volume group. - * If no tags are attached to the given VG, an empty list is returned - * (check with dm_list_empty()). - * If there is a problem obtaining the list of tags, NULL is returned. - */ -struct dm_list *lvm_vg_get_tags(const vg_t vg); - -/** - * Get the value of a VG property - * - * \memberof vg_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param name - * Name of property to query. See vgs man page for full list of properties - * that may be queried. - * - * The memory allocated for a string property value is tied to the vg_t - * handle and will be released when lvm_vg_close() is called. - * - * Example: - * lvm_property_value v; - * char *prop_name = "vg_mda_count"; - * - * v = lvm_vg_get_property(vg, prop_name); - * if (!v.is_valid) { - * printf("Invalid property name or unable to query" - * "'%s', errno = %d.\n", prop_name, lvm_errno(libh)); - * return; - * } - * if (v.is_string) - * printf(", value = %s\n", v.value.string); - * if (v.is_integer) - * printf(", value = %"PRIu64"\n", v.value.integer); - * - * - * \return - * lvm_property_value structure that will contain the current - * value of the property. Caller should check 'is_valid' flag before using - * the value. If 'is_valid' is not set, caller should check lvm_errno() - * for specific error. - */ -struct lvm_property_value lvm_vg_get_property(const vg_t vg, const char *name); - -/** - * Set the value of a VG property. Note that the property must be - * a 'settable' property, as evidenced by the 'is_settable' flag - * when querying the property. - * - * \memberof vg_t - * - * The memory allocated for a string property value is tied to the vg_t - * handle and will be released when lvm_vg_close() is called. - * - * Example (integer): - * lvm_property_value copies; - * - * if (lvm_vg_get_property(vg, "vg_mda_copies", &copies) < 0) { - * // Error - unable to query property - * } - * if (!copies.is_settable) { - * // Error - property not settable - * } - * copies.value.integer = 2; - * if (lvm_vg_set_property(vg, "vg_mda_copies", &copies) < 0) { - * // handle error - * } - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_vg_set_property(const vg_t vg, const char *name, - struct lvm_property_value *value); - -/************************** logical volume handling *************************/ - -/** - * Create a linear logical volume. - * This function commits the change to disk and does _not_ require calling - * lvm_vg_write(). - * NOTE: The commit behavior of this function is subject to change - * as the API is developed. - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param name - * Name of logical volume to create. - * - * \param size - * Size of logical volume in extents. - * - * \return - * non-NULL handle to an LV object created, or NULL if creation fails. - * - */ -lv_t lvm_vg_create_lv_linear(vg_t vg, const char *name, uint64_t size); - -/** - * Return a list of lvseg handles for a given LV handle. - * - * \memberof lv_t - * - * \param lv - * Logical volume handle. - * - * \return - * A list of lvm_lvseg_list structures containing lvseg handles for this lv. - */ -struct dm_list *lvm_lv_list_lvsegs(lv_t lv); - -/** - * Lookup an LV handle in a VG by the LV name. - * - * \memberof lv_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param name - * Name of LV to lookup. - * - * \return - * non-NULL handle to the LV 'name' attached to the VG. - * NULL is returned if the LV name is not associated with the VG handle. - */ -lv_t lvm_lv_from_name(vg_t vg, const char *name); - -/** - * Lookup an LV handle in a VG by the LV uuid. - * The form of the uuid may be either the formatted, human-readable form, - * or the non-formatted form. - * - * \memberof lv_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param uuid - * UUID of LV to lookup. - * - * \return - * non-NULL handle to the LV with 'uuid' attached to the VG. - * NULL is returned if the LV uuid is not associated with the VG handle. - */ -lv_t lvm_lv_from_uuid(vg_t vg, const char *uuid); - -/** - * Activate a logical volume. - * - * \memberof lv_t - * - * This function is the equivalent of the lvm command "lvchange -ay". - * - * NOTE: This function cannot currently handle LVs with an in-progress pvmove or - * lvconvert. - * - * \param lv - * Logical volume handle. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_lv_activate(lv_t lv); - -/** - * Deactivate a logical volume. - * - * \memberof lv_t - * - * This function is the equivalent of the lvm command "lvchange -an". - * - * \param lv - * Logical volume handle. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_lv_deactivate(lv_t lv); - -/** - * Remove a logical volume from a volume group. - * - * \memberof lv_t - * - * This function commits the change to disk and does _not_ require calling - * lvm_vg_write(). - * NOTE: The commit behavior of this function is subject to change - * as the API is developed. - * Currently only removing linear LVs are possible. - * - * \param lv - * Logical volume handle. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_vg_remove_lv(lv_t lv); - -/** - * Get the current name of a logical volume. - * - * \memberof lv_t - * - * The memory allocated for the uuid is tied to the vg_t handle and will be - * released when lvm_vg_close() is called. - * - * \param lv - * Logical volume handle. - * - * \return - * Copy of the uuid string. - */ -const char *lvm_lv_get_uuid(const lv_t lv); - -/** - * Get the current uuid of a logical volume. - * - * \memberof lv_t - * - * The memory allocated for the name is tied to the vg_t handle and will be - * released when lvm_vg_close() is called. - * - * \param lv - * Logical volume handle. - * - * \return - * Copy of the name. - */ -const char *lvm_lv_get_name(const lv_t lv); - -/** - * Get the attributes of a logical volume. - * - * \memberof lv_t - * - * The memory allocated for the name is tied to the vg_t handle and will be - * released when lvm_vg_close() is called. - * - * \param lv - * Logical volume handle. - * - * \return - * Copy of the attributes for the logical volume - */ -const char *lvm_lv_get_attr(const lv_t lv); - -/** - * Get the origin of a snapshot. - * - * \memberof lv_t - * - * The memory allocated for the name is tied to the vg_t handle and will be - * released when lvm_vg_close() is called. - * - * \param lv - * Logical volume handle. - * - * \return - * Null if the logical volume is not a snapshot, else origin name. - */ -const char *lvm_lv_get_origin(const lv_t lv); - -/** - * Get the current size in bytes of a logical volume. - * - * \memberof lv_t - * - * \param lv - * Logical volume handle. - * - * \return - * Size in bytes. - */ -uint64_t lvm_lv_get_size(const lv_t lv); - -/** - * Get the value of a LV property - * - * \memberof lv_t - * - * \param lv - * Logical volume handle. - * - * \param name - * Name of property to query. See lvs man page for full list of properties - * that may be queried. - * - * The memory allocated for a string property value is tied to the vg_t - * handle and will be released when lvm_vg_close() is called. - * - * Example: - * lvm_property_value v; - * char *prop_name = "seg_count"; - * - * v = lvm_lv_get_property(lv, prop_name); - * if (!v.is_valid) { - * printf("Invalid property name or unable to query" - * "'%s', errno = %d.\n", prop_name, lvm_errno(libh)); - * return; - * } - * if (v.is_string) - * printf(", value = %s\n", v.value.string); - * if (v.is_integer) - * printf(", value = %"PRIu64"\n", v.value.integer); - * - * \return - * lvm_property_value structure that will contain the current - * value of the property. Caller should check 'is_valid' flag before using - * the value. If 'is_valid' is not set, caller should check lvm_errno() - * for specific error. - */ -struct lvm_property_value lvm_lv_get_property(const lv_t lv, const char *name); - -/** - * Get the value of a LV segment property - * - * \memberof lv_t - * - * \param lvseg - * Logical volume segment handle. - * - * \param name - * Name of property to query. See lvs man page for full list of properties - * that may be queried. - * - * The memory allocated for a string property value is tied to the vg_t - * handle and will be released when lvm_vg_close() is called. - * - * Example: - * lvm_property_value v; - * char *prop_name = "seg_start_pe"; - * - * v = lvm_lvseg_get_property(lvseg, prop_name); - * if (lvm_errno(libh) || !v.is_valid) { - * // handle error - * printf("Invalid property name or unable to query" - * "'%s'.\n", prop_name); - * return; - * } - * if (v.is_string) - * printf(", value = %s\n", v.value.string); - * else - * printf(", value = %"PRIu64"\n", v.value.integer); - * - * \return - * lvm_property_value structure that will contain the current - * value of the property. Caller should check lvm_errno() as well - * as 'is_valid' flag before using the value. - */ -struct lvm_property_value lvm_lvseg_get_property(const lvseg_t lvseg, - const char *name); - -/** - * Get the current activation state of a logical volume. - * - * \memberof lv_t - * - * \param lv - * Logical volume handle. - * - * \return - * 1 if the LV is active in the kernel, 0 if not - */ -uint64_t lvm_lv_is_active(const lv_t lv); - -/** - * Get the current suspended state of a logical volume. - * - * \memberof lv_t - * - * \param lv - * Logical volume handle. - * - * \return - * 1 if the LV is suspended in the kernel, 0 if not - */ -uint64_t lvm_lv_is_suspended(const lv_t lv); - -/** - * Add a tag to an LV. - * - * \memberof lv_t - * - * This function requires calling lvm_vg_write() to commit the change to disk. - * After successfully adding a tag, use lvm_vg_write() to commit the - * new VG to disk. Upon failure, retry the operation or release the VG handle - * with lvm_vg_close(). - * - * \param lv - * Logical volume handle. - * - * \param tag - * Tag to add to an LV. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_lv_add_tag(lv_t lv, const char *tag); - -/** - * Remove a tag from an LV. - * - * \memberof lv_t - * - * This function requires calling lvm_vg_write() to commit the change to disk. - * After successfully removing a tag, use lvm_vg_write() to commit the - * new VG to disk. Upon failure, retry the operation or release the VG handle - * with lvm_vg_close(). - * - * \param lv - * Logical volume handle. - * - * \param tag - * Tag to remove from LV. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_lv_remove_tag(lv_t lv, const char *tag); - -/** - * Return the list of logical volume tags. - * - * \memberof lv_t - * - * The memory allocated for the list is tied to the vg_t handle and will be - * released when lvm_vg_close() is called. - * - * To process the list, use the dm_list iterator functions. For example: - * lv_t lv; - * struct dm_list *tags; - * struct lvm_str_list *strl; - * - * tags = lvm_lv_get_tags(lv); - * dm_list_iterate_items(strl, tags) { - * tag = strl->str; - * // do something with tag - * } - * - * - * \return - * A list with entries of type struct lvm_str_list, containing the - * tag strings attached to volume group. - * If no tags are attached to the LV, an empty list is returned - * (check with dm_list_empty()). - * If there is a problem obtaining the list of tags, NULL is returned. - */ -struct dm_list *lvm_lv_get_tags(const lv_t lv); - -/** - * Rename logical volume to new_name. - * - * \memberof lv_t - * - * \param lv - * Logical volume handle. - * - * \param new_name - * New name of logical volume. - * - * \return - * 0 (success) or -1 (failure). - * - */ -int lvm_lv_rename(lv_t lv, const char *new_name); - -/** - * Resize logical volume to new_size bytes. - * - * \memberof lv_t - * - * \param lv - * Logical volume handle. - * - * \param new_size - * New size in bytes. - * - * \return - * 0 (success) or -1 (failure). - * - */ -int lvm_lv_resize(const lv_t lv, uint64_t new_size); - -/** - * Create a snapshot of a logical volume - * - * \memberof lv_t - * - * \param lv - * Logical volume handle. - * - * \param snap_name - * Name of the snapshot. - * - * \param max_snap_size - * Max snapshot space to use. If you pass zero the same amount of space as - * the origin will be used. - * - * \return - * Valid lv pointer on success, else NULL on error. - * - */ -lv_t lvm_lv_snapshot(const lv_t lv, const char *snap_name, uint64_t max_snap_size); - -/** - * Validate a name to be used for LV creation. - * - * Validates that the name does not contain any invalid characters, max length - * and that the LV name doesn't already exist for this VG. - * - * Note: You can have the same LV name in different VGs, thus the reason this - * function requires that you specify a VG to check against. - * - * \param lv - * Volume group handle. - * - * \param name - * Name to validate - */ -int lvm_lv_name_validate(const vg_t vg, const char *lv_name); - -/** - * Thin provisioning discard policies - */ -typedef enum { - LVM_THIN_DISCARDS_IGNORE, - LVM_THIN_DISCARDS_NO_PASSDOWN, - LVM_THIN_DISCARDS_PASSDOWN, -} lvm_thin_discards_t; - -/** - * Create a thinpool parameter passing object for the specified VG - * - * \param vg - * Volume Group handle. - * - * \param pool_name - * Name of the pool. - * - * \param size - * size of the pool - * - * \param chunk_size - * data block size of the pool - * Default value is DEFAULT_THIN_POOL_CHUNK_SIZE * 2 when 0 passed as chunk_size - * DM_THIN_MIN_DATA_BLOCK_SIZE < chunk_size < DM_THIN_MAX_DATA_BLOCK_SIZE - * - * \param meta_size - * Size of thin pool's metadata logical volume. Allowed range is 2MB-16GB. - * Default value (ie if 0) pool size / pool chunk size * 64 - * - * \param discard - * Thin discard policy - * Note: THIN_DISCARDS_PASSDOWN is the default. - * - * \return - * Valid lv_create_params pointer on success, else NULL on error. - * Note: Memory is associated with the vg, it will get reclaimed when vg is - * closed. - * - */ -lv_create_params_t lvm_lv_params_create_thin_pool(vg_t vg, - const char *pool_name, uint64_t size, uint32_t chunk_size, - uint64_t meta_size, lvm_thin_discards_t discard); - -#define lvm_lv_params_create_thin_pool_default(vg, pool_name, size) \ - lvm_lv_params_create_thin_pool((vg), (pool_name), (size), 0, 0, \ - LVM_THIN_DISCARDS_PASSDOWN) - -/** - * Creates the snapshot parameter passing object for the specified lv. - * - * \param lv - * The logical volume to snapshot - * - * \param snap_name - * Name of snapshot - * - * \param max_snap_size - * Used for old snap shots max size, set to zero for thinp - * - * \return - * Valid lv_create_params pointer on success, else NULL on error. - * Note: Memory is associated with the vg, it will get reclaimed when vg is - * closed. - */ -lv_create_params_t lvm_lv_params_create_snapshot(const lv_t lv, - const char *snap_name, - uint64_t max_snap_size); -/** - * Get the specific value of a lv create parameter by name - * - * \param params lv create parameters - * - * \param name name of parameter - * - * \return - * lvm_property_value structure that will contain the current - * value of the property. Caller should check 'is_valid' flag before using - * the value. If 'is_valid' is not set, caller should check lvm_errno() - * for specific error. - */ -struct lvm_property_value lvm_lv_params_get_property( - const lv_create_params_t params, - const char *name); - - -/** - * Set the specific value of a lv create parameter by name - * - * Note that the property must be a 'settable' property, as evidenced ' - * by the 'is_settable' flag when querying the property. - * - * The memory allocated for a string property value is tied to the vg_t - * handle associated with the lv_create_params_t and will be released when - * lvm_vg_close() is called. - * - * \param params lv create parameters - * - * \param name name of parameter - * - * \param prop Property value to use for setting - * - * \return - * 0 on success, -1 on error. - */ -int lvm_lv_params_set_property(lv_create_params_t params, - const char *name, - struct lvm_property_value *prop); - -/** - * Create a thin LV creation parameters in a given VG & thin pool - * - * \param vg - * Volume Group handle. - * - * \param pool_name - * Name of the pool. - * - * \param lvname - * Name of the LV to create - * - * \param size - * Size of logical volume - * - * \return - * Valid lv_create_params pointer on success, else NULL on error. - * Note: Memory is associated with the vg, it will get reclaimed when vg is - * closed. - * - */ -lv_create_params_t lvm_lv_params_create_thin(const vg_t vg, const char *pool_name, - const char *lvname, uint64_t size); -/** - * Create the actual logical volume. - * - * \param params The parameters object for lv creation - * - * \return - * Valid lv pointer on success, else NULL on error. - */ -lv_t lvm_lv_create(lv_create_params_t params); - -/************************** physical volume handling ************************/ - -/** - * Physical volume handling should not be needed anymore. Only physical volumes - * bound to a vg contain useful information. Therefore the creation, - * modification and the removal of orphan physical volumes is not suported. - */ - -/** - * Get the current uuid of a physical volume. - * - * \memberof pv_t - * - * The memory allocated for the uuid is tied to the vg_t handle and will be - * released when lvm_vg_close() is called. - * - * \param pv - * Physical volume handle. - * - * \return - * Copy of the uuid string. - */ -const char *lvm_pv_get_uuid(const pv_t pv); - -/** - * Get the current name of a physical volume. - * - * \memberof pv_t - * - * The memory allocated for the name is tied to the vg_t handle and will be - * released when lvm_vg_close() is called. - * - * \param pv - * Physical volume handle. - * - * \return - * Copy of the name. - */ -const char *lvm_pv_get_name(const pv_t pv); - -/** - * Get the current number of metadata areas in the physical volume. - * - * \memberof pv_t - * - * \param pv - * Physical volume handle. - * - * \return - * Number of metadata areas in the PV. - */ -uint64_t lvm_pv_get_mda_count(const pv_t pv); - -/** - * Get the current size in bytes of a device underlying a - * physical volume. - * - * \memberof pv_t - * - * \param pv - * Physical volume handle. - * - * \return - * Size in bytes. - */ -uint64_t lvm_pv_get_dev_size(const pv_t pv); - -/** - * Get the current size in bytes of a physical volume. - * - * \memberof pv_t - * - * \param pv - * Physical volume handle. - * - * \return - * Size in bytes. - */ -uint64_t lvm_pv_get_size(const pv_t pv); - -/** - * Get the current unallocated space in bytes of a physical volume. - * - * \memberof pv_t - * - * \param pv - * Physical volume handle. - * - * \return - * Free size in bytes. - */ -uint64_t lvm_pv_get_free(const pv_t pv); - -/** - * Get the value of a PV property - * - * \memberof pv_t - * - * \param pv - * Physical volume handle. - * - * \param name - * Name of property to query. See pvs man page for full list of properties - * that may be queried. - * - * The memory allocated for a string property value is tied to the vg_t handle - * and will be released when lvm_vg_close() is called. For "percent" values - * (those obtained for copy_percent and snap_percent properties), please see - * dm_percent_range_t and lvm_percent_to_float(). - * - * Example: - * lvm_property_value value; - * char *prop_name = "pv_mda_count"; - * - * v = lvm_pv_get_property(pv, prop_name); - * if (!v.is_valid) { - * printf("Invalid property name or unable to query" - * "'%s', errno = %d.\n", prop_name, lvm_errno(libh)); - * return; - * } - * if (v.is_string) - * printf(", value = %s\n", v.value.string); - * if (v.is_integer) - * printf(", value = %"PRIu64"\n", v.value.integer); - * - * \return - * lvm_property_value structure that will contain the current - * value of the property. Caller should check 'is_valid' flag before using - * the value. If 'is_valid' is not set, caller should check lvm_errno() - * for specific error. - */ -struct lvm_property_value lvm_pv_get_property(const pv_t pv, const char *name); - -/** - * Get the value of a PV segment property - * - * \memberof pv_t - * - * \param pvseg - * Physical volume segment handle. - * - * \param name - * Name of property to query. See pvs man page for full list of properties - * that may be queried. - * - * The memory allocated for a string property value is tied to the vg_t - * handle and will be released when lvm_vg_close() is called. - * - * Example: - * lvm_property_value v; - * char *prop_name = "pvseg_start"; - * - * v = lvm_pvseg_get_property(pvseg, prop_name); - * if (lvm_errno(libh) || !v.is_valid) { - * // handle error - * printf("Invalid property name or unable to query" - * "'%s'.\n", prop_name); - * return; - * } - * if (v.is_string) - * printf(", value = %s\n", v.value.string); - * else - * printf(", value = %"PRIu64"\n", v.value.integer); - * - * \return - * lvm_property_value structure that will contain the current - * value of the property. Caller should check lvm_errno() as well - * as 'is_valid' flag before using the value. - */ -struct lvm_property_value lvm_pvseg_get_property(const pvseg_t pvseg, - const char *name); - -/** - * Return a list of pvseg handles for a given PV handle. - * - * \memberof pv_t - * - * \param pv - * Physical volume handle. - * - * \return - * A list of lvm_pvseg_list structures containing pvseg handles for this pv. - */ -struct dm_list *lvm_pv_list_pvsegs(pv_t pv); - -/** - * Lookup an PV handle in a VG by the PV name. - * - * \memberof pv_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param name - * Name of PV to lookup. - * - * \return - * non-NULL handle to the PV 'name' attached to the VG. - * NULL is returned if the PV name is not associated with the VG handle. - */ -pv_t lvm_pv_from_name(vg_t vg, const char *name); - -/** - * Lookup an PV handle in a VG by the PV uuid. - * The form of the uuid may be either the formatted, human-readable form, - * or the non-formatted form. - * - * \memberof pv_t - * - * \param vg - * VG handle obtained from lvm_vg_create() or lvm_vg_open(). - * - * \param uuid - * UUID of PV to lookup. - * - * \return - * non-NULL handle to the PV with 'uuid' attached to the VG. - * NULL is returned if the PV uuid is not associated with the VG handle. - */ -pv_t lvm_pv_from_uuid(vg_t vg, const char *uuid); - -/** - * Resize physical volume to new_size bytes. - * - * \memberof pv_t - * - * \param pv - * Physical volume handle. - * - * \param new_size - * New size in bytes. - * - * \return - * 0 (success) or -1 (failure). - */ -int lvm_pv_resize(const pv_t pv, uint64_t new_size); - -#define PERCENT_0 DM_PERCENT_0 -#define PERCENT_1 DM_PERCENT_1 -#define PERCENT_100 DM_PERCENT_100 -#define PERCENT_INVALID DM_PERCENT_INVALID -#define PERCENT_MERGE_FAILED DM_PERCENT_FAILED - -typedef dm_percent_t percent_t; - -/** - * Convert a (fixed-point) value obtained from the percent-denominated - * *_get_property functions into a floating-point value. - */ -float lvm_percent_to_float(percent_t v); - -#ifdef __cplusplus -} -#endif -#endif /* _LIB_LVM2APP_H */ diff --git a/liblvm/lvm_base.c b/liblvm/lvm_base.c deleted file mode 100644 index 791c629..0000000 --- a/liblvm/lvm_base.c +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright (C) 2008,2009 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "lib/misc/lib.h" -#include "lib/commands/toolcontext.h" -#include "lib/locking/locking.h" -#include "lvm-version.h" -#include "lib/metadata/metadata-exported.h" -#include "liblvm/lvm2app.h" -#include "lvm_misc.h" - -const char *lvm_library_get_version(void) -{ - return LVM_VERSION; -} - -static lvm_t _lvm_init(const char *system_dir) -{ - struct cmd_context *cmd; - - /* FIXME: logging bound to handle - */ - - if (!udev_init_library_context()) - stack; - - /* - * It's not necessary to use name mangling for LVM: - * - the character set used for VG-LV names is subset of udev character set - * - when we check other devices (e.g. device_is_usable fn), we use major:minor, not dm names - */ - dm_set_name_mangling_mode(DM_STRING_MANGLING_NONE); - - /* create context */ - /* FIXME: split create_toolcontext */ - /* FIXME: make all globals configurable */ - cmd = create_toolcontext(0, system_dir, 0, 0, 1, 1); - if (!cmd) - return NULL; - - /* - * FIXME: if an non memory error occured, return the cmd (maybe some - * cleanup needed). - */ - - /* initialization from lvm_run_command */ - init_error_message_produced(0); - - /* FIXME: locking_type config option needed? */ - /* initialize locking */ - if (!init_locking(-1, cmd, 0)) { - /* FIXME: use EAGAIN as error code here */ - lvm_quit((lvm_t) cmd); - return NULL; - } - /* - * FIXME: Use cmd->cmd_line as audit trail for liblvm calls. Used in - * archive() call. Possible example: - * cmd_line = "lvm_vg_create: vg1\nlvm_vg_extend vg1 /dev/sda1\n" - */ - cmd->cmd_line = "liblvm"; - - /* - * Turn off writing to stdout/stderr. - * FIXME Fix lib/ to support a non-interactive mode instead. - */ - log_suppress(1); - - return (lvm_t) cmd; -} - - -lvm_t lvm_init(const char *system_dir) -{ - lvm_t h = NULL; - struct saved_env e = store_user_env(NULL); - h = _lvm_init(system_dir); - restore_user_env(&e); - return h; -} - -void lvm_quit(lvm_t libh) -{ - struct saved_env e = store_user_env((struct cmd_context *)libh); - fin_locking(); - destroy_toolcontext((struct cmd_context *)libh); - udev_fin_library_context(); - restore_user_env(&e); -} - -int lvm_config_reload(lvm_t libh) -{ - int rc = 0; - - /* FIXME: re-init locking needed here? */ - struct saved_env e = store_user_env((struct cmd_context *)libh); - if (!refresh_toolcontext((struct cmd_context *)libh)) - rc = -1; - restore_user_env(&e); - return rc; -} - -/* - * FIXME: submit a patch to document the --config option - */ -int lvm_config_override(lvm_t libh, const char *config_settings) -{ - int rc = 0; - struct cmd_context *cmd = (struct cmd_context *)libh; - struct saved_env e = store_user_env((struct cmd_context *)libh); - - if (!override_config_tree_from_string(cmd, config_settings)) - rc = -1; - restore_user_env(&e); - return rc; -} - -/* - * When full lvm connection is not being used, libh can be NULL - * and this command will internally create a single-use, light-weight - * cmd struct that only has cmd->cft populated from lvm.conf. - */ -int lvm_config_find_bool(lvm_t libh, const char *config_path, int fail) -{ - int rc = 0; - struct cmd_context *cmd; - struct saved_env e; - - if (libh) { - cmd = (struct cmd_context *)libh; - e = store_user_env((struct cmd_context *)libh); - } else { - if (!(cmd = create_config_context())) - return 0; - } - - rc = dm_config_tree_find_bool(cmd->cft, config_path, fail); - - if (libh) - restore_user_env(&e); - else - destroy_config_context(cmd); - return rc; -} - -int lvm_errno(lvm_t libh) -{ - int rc; - struct saved_env e = store_user_env((struct cmd_context *)libh); - rc = stored_errno(); - restore_user_env(&e); - return rc; -} - -const char *lvm_errmsg(lvm_t libh) -{ - const char *rc = NULL; - struct cmd_context *cmd = (struct cmd_context *)libh; - struct saved_env e = store_user_env((struct cmd_context *)libh); - - const char *msg = stored_errmsg_with_clear(); - if (msg) { - rc = dm_pool_strdup(cmd->mem, msg); - free((void *)msg); - } - - restore_user_env(&e); - return rc; -} - -const char *lvm_vgname_from_pvid(lvm_t libh, const char *pvid) -{ - const char *rc = NULL; - struct cmd_context *cmd = (struct cmd_context *)libh; - struct id id; - struct saved_env e = store_user_env((struct cmd_context *)libh); - - if (id_read_format(&id, pvid)) { - rc = find_vgname_from_pvid(cmd, (char *)id.uuid); - } else { - log_error(INTERNAL_ERROR "Unable to convert uuid"); - } - - restore_user_env(&e); - return rc; -} - -const char *lvm_vgname_from_device(lvm_t libh, const char *device) -{ - const char *rc = NULL; - struct cmd_context *cmd = (struct cmd_context *)libh; - struct saved_env e = store_user_env(cmd); - rc = find_vgname_from_pvname(cmd, device); - restore_user_env(&e); - return rc; -} - -/* - * No context to work with, so no ability to save off and restore env is not - * available and is not needed. - */ -float lvm_percent_to_float(percent_t v) -{ - return dm_percent_to_float(v); -} diff --git a/liblvm/lvm_lv.c b/liblvm/lvm_lv.c deleted file mode 100644 index 48774df..0000000 --- a/liblvm/lvm_lv.c +++ /dev/null @@ -1,820 +0,0 @@ -/* - * Copyright (C) 2008-2013 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "lib/misc/lib.h" -#include "lib/metadata/metadata-exported.h" -#include "lib/misc/lvm-string.h" -#include "lib/config/defaults.h" -#include "lib/metadata/segtype.h" -#include "lib/locking/locking.h" -#include "lib/activate/activate.h" -#include "lvm_misc.h" -#include "liblvm/lvm2app.h" - -/* FIXME Improve all the log messages to include context. Which VG/LV as a minimum? */ - -struct lvm_lv_create_params -{ - uint32_t magic; - vg_t vg; - struct lvcreate_params lvp; -}; - -#define LV_CREATE_PARAMS_MAGIC 0xFEED0001 - -static int _lv_check_handle(const lv_t lv, const int vg_writeable) -{ - if (!lv || !lv->vg || vg_read_error(lv->vg)) - return -1; - if (vg_writeable && !vg_check_write_mode(lv->vg)) - return -1; - return 0; -} - -/* FIXME: have lib/report/report.c _disp function call lv_size()? */ -uint64_t lvm_lv_get_size(const lv_t lv) -{ - uint64_t rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = SECTOR_SIZE * lv_size(lv); - restore_user_env(&e); - return rc; -} - -const char *lvm_lv_get_uuid(const lv_t lv) -{ - const char *rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = lv_uuid_dup(lv->vg->vgmem, lv); - restore_user_env(&e); - return rc; -} - -const char *lvm_lv_get_name(const lv_t lv) -{ - const char *rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = dm_pool_strndup(lv->vg->vgmem, lv->name, NAME_LEN+1); - restore_user_env(&e); - return rc; -} - -const char *lvm_lv_get_attr(const lv_t lv) -{ - const char *rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = lv_attr_dup(lv->vg->vgmem, lv); - restore_user_env(&e); - return rc; -} - -const char *lvm_lv_get_origin(const lv_t lv) -{ - const char *rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = lv_origin_dup(lv->vg->vgmem, lv); - restore_user_env(&e); - return rc; -} - -struct lvm_property_value lvm_lv_get_property(const lv_t lv, const char *name) -{ - struct lvm_property_value rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = get_property(NULL, NULL, lv, NULL, NULL, NULL, NULL, name); - restore_user_env(&e); - return rc; -} - -struct lvm_property_value lvm_lvseg_get_property(const lvseg_t lvseg, - const char *name) -{ - struct lvm_property_value rc; - struct saved_env e = store_user_env(lvseg->lv->vg->cmd); - rc = get_property(NULL, NULL, NULL, lvseg, NULL, NULL, NULL, name); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_lv_is_active(const lv_t lv) -{ - uint64_t rc = 0; - struct lvinfo info; - - struct saved_env e = store_user_env(lv->vg->cmd); - - if (lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) && - info.exists && info.live_table) - rc = 1; - - restore_user_env(&e); - return rc; -} - -uint64_t lvm_lv_is_suspended(const lv_t lv) -{ - uint64_t rc = 0; - struct lvinfo info; - struct saved_env e = store_user_env(lv->vg->cmd); - - if (lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) && - info.exists && info.suspended) - rc = 1; - - restore_user_env(&e); - return rc; -} - -static int _lvm_lv_add_tag(lv_t lv, const char *tag) -{ - if (_lv_check_handle(lv, 1)) - return -1; - if (!lv_change_tag(lv, tag, 1)) - return -1; - return 0; -} - -int lvm_lv_add_tag(lv_t lv, const char *tag) -{ - int rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = _lvm_lv_add_tag(lv, tag); - restore_user_env(&e); - return rc; -} - - -static int _lvm_lv_remove_tag(lv_t lv, const char *tag) -{ - if (_lv_check_handle(lv, 1)) - return -1; - if (!lv_change_tag(lv, tag, 0)) - return -1; - return 0; -} - -int lvm_lv_remove_tag(lv_t lv, const char *tag) -{ - int rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = _lvm_lv_remove_tag(lv, tag); - restore_user_env(&e); - return rc; -} - - -struct dm_list *lvm_lv_get_tags(const lv_t lv) -{ - struct dm_list *rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = tag_list_copy(lv->vg->vgmem, &lv->tags); - restore_user_env(&e); - return rc; -} - -/* Set defaults for non-segment specific LV parameters */ -static void _lv_set_default_params(struct lvcreate_params *lp, - vg_t vg, const char *lvname, - uint64_t extents) -{ - lp->zero = 1; - lp->wipe_signatures = 0; - lp->major = -1; - lp->minor = -1; - lp->activate = CHANGE_AY; - lp->lv_name = lvname; /* FIXME: check this for safety */ - lp->pvh = &vg->pvs; - - lp->extents = extents; - lp->permission = LVM_READ | LVM_WRITE; - lp->read_ahead = DM_READ_AHEAD_NONE; - lp->alloc = ALLOC_INHERIT; - dm_list_init(&lp->tags); -} - -static struct segment_type * _get_segtype(struct cmd_context *cmd) { - struct segment_type *rc = get_segtype_from_string(cmd, SEG_TYPE_NAME_STRIPED); - if (!rc) { - log_error(INTERNAL_ERROR "Segtype striped not found."); - } - return rc; -} - -/* Set default for linear segment specific LV parameters */ -static int _lv_set_default_linear_params(struct cmd_context *cmd, - struct lvcreate_params *lp) -{ - if (!(lp->segtype = _get_segtype(cmd))) { - return 0; - } - - lp->stripes = 1; - - return 1; -} - -/* - * FIXME: This function should probably not commit to disk but require calling - * lvm_vg_write. However, this appears to be non-trivial change until - * lv_create_single is refactored by segtype. - */ -static lv_t _lvm_vg_create_lv_linear(vg_t vg, const char *name, uint64_t size) -{ - struct lvcreate_params lp = { 0 }; - uint64_t extents; - struct logical_volume *lv; - - if (vg_read_error(vg)) - return NULL; - if (!vg_check_write_mode(vg)) - return NULL; - - if (!(extents = extents_from_size(vg->cmd, size / SECTOR_SIZE, - vg->extent_size))) { - log_error("Unable to create LV without size."); - return NULL; - } - - _lv_set_default_params(&lp, vg, name, extents); - if (!_lv_set_default_linear_params(vg->cmd, &lp)) - return_NULL; - if (!(lv = lv_create_single(vg, &lp))) - return_NULL; - return (lv_t) lv; -} - -lv_t lvm_vg_create_lv_linear(vg_t vg, const char *name, uint64_t size) -{ - lv_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = _lvm_vg_create_lv_linear(vg, name, size); - restore_user_env(&e); - return rc; -} - -/* - * FIXME: This function should probably not commit to disk but require calling - * lvm_vg_write. - */ -static int _lvm_vg_remove_lv(lv_t lv) -{ - if (!lv || !lv->vg || vg_read_error(lv->vg)) - return -1; - if (!vg_check_write_mode(lv->vg)) - return -1; - if (!lv_remove_single(lv->vg->cmd, lv, DONT_PROMPT, 0)) - return -1; - return 0; -} - -int lvm_vg_remove_lv(lv_t lv) -{ - int rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = _lvm_vg_remove_lv(lv); - restore_user_env(&e); - return rc; -} - -static int _lvm_lv_activate(lv_t lv) -{ - if (!lv || !lv->vg || vg_read_error(lv->vg) || !lv->vg->cmd) - return -1; - - /* FIXME: handle pvmove stuff later */ - if (lv_is_locked(lv)) { - log_error("Unable to activate locked LV"); - return -1; - } - - /* FIXME: handle lvconvert stuff later */ - if (lv_is_converting(lv)) { - log_error("Unable to activate LV with in-progress lvconvert"); - return -1; - } - - if (lv_is_origin(lv) || - lv_is_pvmove(lv) || - seg_only_exclusive(first_seg(lv))) { - log_verbose("Activating logical volume \"%s\" " - "exclusively", lv->name); - if (!activate_lv_excl(lv->vg->cmd, lv)) { - /* FIXME Improve msg */ - log_error("Activate exclusive failed."); - return -1; - } - } else { - log_verbose("Activating logical volume \"%s\"", - lv->name); - if (!activate_lv(lv->vg->cmd, lv)) { - /* FIXME Improve msg */ - log_error("Activate failed."); - return -1; - } - } - return 0; -} - -int lvm_lv_activate(lv_t lv) -{ - int rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = _lvm_lv_activate(lv); - restore_user_env(&e); - return rc; -} - -static int _lvm_lv_deactivate(lv_t lv) -{ - if (!lv || !lv->vg || vg_read_error(lv->vg) || !lv->vg->cmd) - return -1; - - log_verbose("Deactivating logical volume \"%s\"", lv->name); - if (!deactivate_lv(lv->vg->cmd, lv)) { - log_error("Deactivate failed."); - return -1; - } - return 0; -} - -int lvm_lv_deactivate(lv_t lv) -{ - int rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = _lvm_lv_deactivate(lv); - restore_user_env(&e); - return rc; -} - -static struct dm_list *_lvm_lv_list_lvsegs(lv_t lv) -{ - struct dm_list *list; - lvseg_list_t *lvseg; - struct lv_segment *lvl; - - if (dm_list_empty(&lv->segments)) - return NULL; - - if (!(list = dm_pool_zalloc(lv->vg->vgmem, sizeof(*list)))) { - log_errno(ENOMEM, "Memory allocation fail for dm_list."); - return NULL; - } - dm_list_init(list); - - dm_list_iterate_items(lvl, &lv->segments) { - if (!(lvseg = dm_pool_zalloc(lv->vg->vgmem, sizeof(*lvseg)))) { - log_errno(ENOMEM, - "Memory allocation fail for lvm_lvseg_list."); - return NULL; - } - lvseg->lvseg = lvl; - dm_list_add(list, &lvseg->list); - } - return list; -} - -struct dm_list *lvm_lv_list_lvsegs(lv_t lv) -{ - struct dm_list *rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = _lvm_lv_list_lvsegs(lv); - restore_user_env(&e); - return rc; -} - -lv_t lvm_lv_from_name(vg_t vg, const char *name) -{ - lv_t rc = NULL; - struct lv_list *lvl; - - struct saved_env e = store_user_env(vg->cmd); - dm_list_iterate_items(lvl, &vg->lvs) { - if (!strcmp(name, lvl->lv->name)) { - rc = lvl->lv; - break; - } - } - restore_user_env(&e); - return rc; -} - -static lv_t _lvm_lv_from_uuid(vg_t vg, const char *uuid) -{ - struct lv_list *lvl; - struct id id; - - if (strlen(uuid) < ID_LEN) { - log_errno (EINVAL, "Invalid UUID string length"); - return NULL; - } - - if (!id_read_format(&id, uuid)) { - log_errno(EINVAL, "Invalid UUID format."); - return NULL; - } - - dm_list_iterate_items(lvl, &vg->lvs) { - if (id_equal(&vg->id, &lvl->lv->lvid.id[0]) && - id_equal(&id, &lvl->lv->lvid.id[1])) - return lvl->lv; - } - return NULL; -} - -lv_t lvm_lv_from_uuid(vg_t vg, const char *uuid) -{ - lv_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = _lvm_lv_from_uuid(vg, uuid); - restore_user_env(&e); - return rc; -} - -int lvm_lv_rename(lv_t lv, const char *new_name) -{ - int rc = 0; - struct saved_env e = store_user_env(lv->vg->cmd); - if (!lv_rename(lv->vg->cmd, lv, new_name)) { - /* FIXME Improve msg */ - log_error("LV rename failed."); - rc = -1; - } - restore_user_env(&e); - return rc; -} - -int lvm_lv_resize(const lv_t lv, uint64_t new_size) -{ - int rc = 0; - struct lvresize_params lp = { - .sign = SIGN_NONE, - .percent = PERCENT_NONE, - .resize = LV_ANY, - .size = new_size >> SECTOR_SHIFT, - .force = 1, /* Assume the user has a good backup? */ - }; - struct saved_env e = store_user_env(lv->vg->cmd); - - if (!lv_resize(lv, &lp, &lv->vg->pvs)) { - /* FIXME Improve msg */ - log_error("LV resize failed."); - /* FIXME Define consistent symbolic return codes */ - rc = -1; - } - restore_user_env(&e); - return rc; -} - -lv_t lvm_lv_snapshot(const lv_t lv, const char *snap_name, - uint64_t max_snap_size) -{ - lv_t rc = NULL; - struct lvm_lv_create_params *lvcp = NULL; - struct saved_env e = store_user_env(lv->vg->cmd); - - lvcp = lvm_lv_params_create_snapshot(lv, snap_name, max_snap_size); - if (lvcp) { - rc = lvm_lv_create(lvcp); - } - restore_user_env(&e); - return rc; -} - -/* Set defaults for thin pool specific LV parameters */ -static int _lv_set_pool_params(struct lvcreate_params *lp, - vg_t vg, const char *pool_name, - uint64_t extents, uint64_t meta_size) -{ - uint64_t pool_metadata_size; - - _lv_set_default_params(lp, vg, pool_name, extents); - - lp->create_pool = 1; - lp->segtype = get_segtype_from_string(vg->cmd, SEG_TYPE_NAME_THIN_POOL); - lp->stripes = 1; - - if (!meta_size) { - pool_metadata_size = extents * vg->extent_size / - (lp->chunk_size * (SECTOR_SIZE / 64)); - while ((pool_metadata_size > - (DEFAULT_THIN_POOL_OPTIMAL_METADATA_SIZE * 2)) && - lp->chunk_size < DM_THIN_MAX_DATA_BLOCK_SIZE) { - lp->chunk_size <<= 1; - pool_metadata_size >>= 1; - } - } else - pool_metadata_size = meta_size; - - if (pool_metadata_size % vg->extent_size) - pool_metadata_size += - vg->extent_size - pool_metadata_size % vg->extent_size; - - if (!(lp->pool_metadata_extents = - extents_from_size(vg->cmd, pool_metadata_size / SECTOR_SIZE, - vg->extent_size))) - return_0; - - return 1; -} - -static lv_create_params_t _lvm_lv_params_create_thin_pool(vg_t vg, - const char *pool_name, uint64_t size, uint32_t chunk_size, - uint64_t meta_size, lvm_thin_discards_t discard) -{ - uint64_t extents = 0; - struct lvm_lv_create_params *lvcp = NULL; - - if (meta_size > (2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE)) { - log_error("Invalid metadata size"); - return NULL; - } - - if (meta_size && - meta_size < (2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE)) { - log_error("Invalid metadata size"); - return NULL; - } - - if (vg_read_error(vg)) - return NULL; - - if (!vg_check_write_mode(vg)) - return NULL; - - if (pool_name == NULL || !strlen(pool_name)) { - log_error("pool_name invalid"); - return NULL; - } - - if (!(extents = extents_from_size(vg->cmd, size / SECTOR_SIZE, - vg->extent_size))) { - log_error("Unable to create LV thin pool without size."); - return NULL; - } - - lvcp = dm_pool_zalloc(vg->vgmem, sizeof (struct lvm_lv_create_params)); - - if (lvcp) { - lvcp->vg = vg; - switch (discard) { - case LVM_THIN_DISCARDS_IGNORE: - lvcp->lvp.discards = THIN_DISCARDS_IGNORE; - break; - case LVM_THIN_DISCARDS_NO_PASSDOWN: - lvcp->lvp.discards = THIN_DISCARDS_NO_PASSDOWN; - break; - case LVM_THIN_DISCARDS_PASSDOWN: - lvcp->lvp.discards = THIN_DISCARDS_PASSDOWN; - break; - default: - log_error("Invalid discard argument %d for thin pool creation.", discard); - return NULL; - } - lvcp->lvp.zero_new_blocks = THIN_ZERO_YES; - - if (chunk_size) - lvcp->lvp.chunk_size = chunk_size; - else - lvcp->lvp.chunk_size = DEFAULT_THIN_POOL_CHUNK_SIZE * 2; - - if (lvcp->lvp.chunk_size < DM_THIN_MIN_DATA_BLOCK_SIZE || - lvcp->lvp.chunk_size > DM_THIN_MAX_DATA_BLOCK_SIZE) { - log_error("Invalid chunk_size"); - return NULL; - } - - if (!_lv_set_pool_params(&lvcp->lvp, vg, pool_name, extents, meta_size)) - return_NULL; - - lvcp->magic = LV_CREATE_PARAMS_MAGIC; - } - return lvcp; -} - -lv_create_params_t lvm_lv_params_create_thin_pool(vg_t vg, - const char *pool_name, uint64_t size, uint32_t chunk_size, - uint64_t meta_size, lvm_thin_discards_t discard) -{ - lv_create_params_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = _lvm_lv_params_create_thin_pool(vg, pool_name, size, chunk_size, - meta_size, discard); - restore_user_env(&e); - return rc; -} - -/* Set defaults for thin LV specific parameters */ -static int _lv_set_thin_params(struct lvcreate_params *lp, - vg_t vg, const char *pool_name, - const char *lvname, - uint32_t extents) -{ - _lv_set_default_params(lp, vg, lvname, 0); - - lp->pool_name = pool_name; - lp->segtype = get_segtype_from_string(vg->cmd, SEG_TYPE_NAME_THIN); - lp->virtual_extents = extents; - lp->stripes = 1; - - return 1; -} - -static lv_create_params_t _lvm_lv_params_create_snapshot(const lv_t lv, - const char *snap_name, - uint64_t max_snap_size) -{ - uint64_t size = 0; - uint64_t extents = 0; - struct lvm_lv_create_params *lvcp = NULL; - - if (vg_read_error(lv->vg)) { - return NULL; - } - - if (!vg_check_write_mode(lv->vg)) - return NULL; - - if (snap_name == NULL || !strlen(snap_name)) { - log_error("snap_name invalid"); - return NULL; - } - - if (max_snap_size) { - size = max_snap_size >> SECTOR_SHIFT; - if (!(extents = extents_from_size(lv->vg->cmd, size, lv->vg->extent_size))) - return_NULL; - } - - if (!size && !lv_is_thin_volume(lv) ) { - log_error("Origin is not thin, specify size of snapshot"); - return NULL; - } - - lvcp = dm_pool_zalloc(lv->vg->vgmem, sizeof (struct lvm_lv_create_params)); - if (lvcp) { - lvcp->vg = lv->vg; - _lv_set_default_params(&lvcp->lvp, lv->vg, snap_name, extents); - - if (size) { - if (!(lvcp->lvp.segtype = get_segtype_from_string(lv->vg->cmd, SEG_TYPE_NAME_SNAPSHOT))) { - log_error("Segtype snapshot not found."); - return NULL; - } - lvcp->lvp.chunk_size = 8; - lvcp->lvp.snapshot = 1; - } else { - if (!(lvcp->lvp.segtype = get_segtype_from_string(lv->vg->cmd, SEG_TYPE_NAME_THIN))) { - log_error("Segtype thin not found."); - return NULL; - } - - lvcp->lvp.pool_name = first_seg(lv)->pool_lv->name; - } - - lvcp->lvp.stripes = 1; - lvcp->lvp.origin_name = lv->name; - - lvcp->magic = LV_CREATE_PARAMS_MAGIC; - } - - return lvcp; -} - -lv_create_params_t lvm_lv_params_create_snapshot(const lv_t lv, - const char *snap_name, - uint64_t max_snap_size) -{ - lv_create_params_t rc; - struct saved_env e = store_user_env(lv->vg->cmd); - rc = _lvm_lv_params_create_snapshot(lv, snap_name, max_snap_size); - restore_user_env(&e); - return rc; -} - -static lv_create_params_t _lvm_lv_params_create_thin(const vg_t vg, - const char *pool_name, - const char *lvname, uint64_t size) -{ - struct lvm_lv_create_params *lvcp = NULL; - uint32_t extents = 0; - - /* precondition checks */ - if (vg_read_error(vg)) - return NULL; - - if (!vg_check_write_mode(vg)) - return NULL; - - if (pool_name == NULL || !strlen(pool_name)) { - log_error("pool_name invalid"); - return NULL; - } - - if (lvname == NULL || !strlen(lvname)) { - log_error("lvname invalid"); - return NULL; - } - - if (!(extents = extents_from_size(vg->cmd, size / SECTOR_SIZE, - vg->extent_size))) { - log_error("Unable to create thin LV without size."); - return NULL; - } - - lvcp = dm_pool_zalloc(vg->vgmem, sizeof (struct lvm_lv_create_params)); - if (lvcp) { - lvcp->vg = vg; - if (!_lv_set_thin_params(&lvcp->lvp, vg, pool_name, lvname, extents)) - return_NULL; - - lvcp->magic = LV_CREATE_PARAMS_MAGIC; - } - - return lvcp; -} - -lv_create_params_t lvm_lv_params_create_thin(const vg_t vg, const char *pool_name, - const char *lvname, uint64_t size) -{ - lv_create_params_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = _lvm_lv_params_create_thin(vg, pool_name, lvname, size); - restore_user_env(&e); - return rc; -} - -struct lvm_property_value lvm_lv_params_get_property( - const lv_create_params_t params, - const char *name) -{ - struct lvm_property_value rc = { .is_valid = 0 }; - - if (params && params->magic == LV_CREATE_PARAMS_MAGIC) { - struct saved_env e = store_user_env(params->vg->cmd); - rc = get_property(NULL, NULL, NULL, NULL, NULL, &params->lvp, NULL, name); - restore_user_env(&e); - } else - log_error("Invalid lv_create_params parameter"); - - return rc; -} - -int lvm_lv_params_set_property(lv_create_params_t params, const char *name, - struct lvm_property_value *prop) -{ - int rc = -1; - - if (params && params->magic == LV_CREATE_PARAMS_MAGIC) { - struct saved_env e = store_user_env(params->vg->cmd); - rc = set_property(NULL, NULL, NULL, &params->lvp, NULL, name, prop); - restore_user_env(&e); - } else - log_error("Invalid lv_create_params parameter"); - - return rc; -} - -static lv_t _lvm_lv_create(lv_create_params_t params) -{ - struct lv_list *lvl = NULL; - - if (params && params->magic == LV_CREATE_PARAMS_MAGIC) { - if (!params->lvp.segtype) { - log_error("segtype parameter is NULL"); - return_NULL; - } - if (!lv_create_single(params->vg, &params->lvp)) - return_NULL; - - /* - * In some case we are making a thin pool so lv_name is not valid, but - * pool is. - */ - if (!(lvl = find_lv_in_vg(params->vg, - (params->lvp.lv_name) ? params->lvp.lv_name : params->lvp.pool_name))) - return_NULL; - return (lv_t) lvl->lv; - } - log_error("Invalid lv_create_params parameter"); - return NULL; -} - -lv_t lvm_lv_create(lv_create_params_t params) -{ - lv_t rc; - struct saved_env e = store_user_env(params->vg->cmd); - rc = _lvm_lv_create(params); - restore_user_env(&e); - return rc; -} diff --git a/liblvm/lvm_misc.c b/liblvm/lvm_misc.c deleted file mode 100644 index 2b24de2..0000000 --- a/liblvm/lvm_misc.c +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright (C) 2008-2013 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "lib/misc/lib.h" -#include "lib/report/properties.h" -#include "lvm_misc.h" -#include "liblvm/lvm2app.h" -#include "lvm_prop.h" - -struct dm_list *tag_list_copy(struct dm_pool *p, struct dm_list *tag_list) -{ - struct dm_list *list; - lvm_str_list_t *lsl; - struct dm_str_list *sl; - - if (!(list = dm_pool_zalloc(p, sizeof(*list)))) { - log_errno(ENOMEM, "Memory allocation fail for dm_list."); - return NULL; - } - dm_list_init(list); - - dm_list_iterate_items(sl, tag_list) { - if (!(lsl = dm_pool_zalloc(p, sizeof(*lsl)))) { - log_errno(ENOMEM, - "Memory allocation fail for lvm_lv_list."); - return NULL; - } - if (!(lsl->str = dm_pool_strdup(p, sl->str))) { - log_errno(ENOMEM, - "Memory allocation fail for lvm_lv_list->str."); - return NULL; - } - dm_list_add(list, &lsl->list); - } - return list; -} - -struct lvm_property_value get_property(const pv_t pv, const vg_t vg, - const lv_t lv, - const lvseg_t lvseg, - const pvseg_t pvseg, - const struct lvcreate_params *lvcp, - const struct pvcreate_params *pvcp, - const char *name) -{ - struct lvm_property_type prop; - struct lvm_property_value v = { 0 }; - - prop.id = name; - - if (pv) { - if (!pv_get_property(pv, &prop)) - return v; - } else if (vg) { - if (!vg_get_property(vg, &prop)) - return v; - } else if (lv) { - if (!lv_get_property(lv, &prop)) - return v; - } else if (lvseg) { - if (!lvseg_get_property(lvseg, &prop)) - return v; - } else if (pvseg) { - if (!pvseg_get_property(pvseg, &prop)) - return v; - } else if (lvcp) { - if (!lv_create_param_get_property(lvcp, &prop)) - return v; - } else if (pvcp) { - if (!pv_create_param_get_property(pvcp, &prop)) - return v; - } else { - log_errno(EINVAL, "Invalid NULL handle passed to library function."); - return v; - } - - v.is_settable = prop.is_settable; - v.is_string = prop.is_string; - v.is_integer = prop.is_integer; - v.is_signed = prop.is_signed; - if (v.is_string) - v.value.string = prop.value.string; - if (v.is_integer) - v.value.integer = prop.value.integer; - v.is_valid = 1; - return v; -} - - -int set_property(const pv_t pv, const vg_t vg, const lv_t lv, - struct lvcreate_params *lvcp, - struct pvcreate_params *pvcp, - const char *name, - struct lvm_property_value *v) -{ - struct lvm_property_type prop; - - prop.id = name; - if (v->is_string) - prop.value.string = v->value.string; - else - prop.value.integer = v->value.integer; - if (pv) { - if (!pv_set_property(pv, &prop)) { - v->is_valid = 0; - return -1; - } - } else if (vg) { - if (!vg_set_property(vg, &prop)) { - v->is_valid = 0; - return -1; - } - } else if (lv) { - if (!lv_set_property(lv, &prop)) { - v->is_valid = 0; - return -1; - } - } else if (lvcp) { - if (!lv_create_param_set_property(lvcp, &prop)) { - v->is_valid = 0; - return -1; - } - } else if (pvcp) { - if (!pv_create_param_set_property(pvcp, &prop)) { - v->is_valid = 0; - return -1; - } - } else { - return -1; - } - return 0; -} - -/* - * Store anything that may need to be restored back to the user on library - * call exit. Currently the only thing we are preserving is the users umask. - */ -struct saved_env store_user_env(struct cmd_context *cmd) -{ - struct saved_env env = {0}; - - if (cmd) { - env.user_umask = umask(cmd->default_settings.umask); - } else { - env.user_umask = umask(0); - umask(env.user_umask); - } - - return env; -} - -void restore_user_env(const struct saved_env *env) -{ - if (env) { - umask(env->user_umask); - } -} diff --git a/liblvm/lvm_misc.h b/liblvm/lvm_misc.h deleted file mode 100644 index b83a443..0000000 --- a/liblvm/lvm_misc.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2008-2013 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -#ifndef _LVM2APP_MISC_H -#define _LVM2APP_MISC_H - -#include "device_mapper/libdevmapper.h" -#include "liblvm/lvm2app.h" -#include "lib/metadata/metadata-exported.h" -#include "lib/commands/toolcontext.h" - -#include <sys/types.h> -#include <sys/stat.h> - -struct saved_env -{ - mode_t user_umask; -}; - -struct saved_env store_user_env(struct cmd_context *cmd); -void restore_user_env(const struct saved_env *env); - -struct dm_list *tag_list_copy(struct dm_pool *p, struct dm_list *tag_list); -struct lvm_property_value get_property(const pv_t pv, const vg_t vg, - const lv_t lv, const lvseg_t lvseg, - const pvseg_t pvseg, - const struct lvcreate_params *lvcp, - const struct pvcreate_params *pvcp, - const char *name); -int set_property(const pv_t pv, const vg_t vg, const lv_t lv, - struct lvcreate_params *lvcp, - struct pvcreate_params *pvcp, - const char *name, - struct lvm_property_value *value); - -#endif diff --git a/liblvm/lvm_prop.c b/liblvm/lvm_prop.c deleted file mode 100644 index 5d274a6..0000000 --- a/liblvm/lvm_prop.c +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2013 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "lvm_prop.h" -#include "device_mapper/libdevmapper.h" -#include "lib/metadata/metadata.h" - -/* lv create parameters */ -GET_LVCREATEPARAMS_NUM_PROPERTY_FN(skip_zero, lvcp->zero) -SET_LVCREATEPARAMS_NUM_PROPERTY_FN(skip_zero, lvcp->zero) - -/* PV create parameters */ -GET_PVCREATEPARAMS_NUM_PROPERTY_FN(size, pvcp->pva.size) -SET_PVCREATEPARAMS_NUM_PROPERTY_FN(size, pvcp->pva.size) - -GET_PVCREATEPARAMS_NUM_PROPERTY_FN(pvmetadatacopies, pvcp->pva.pvmetadatacopies) -SET_PVCREATEPARAMS_NUM_PROPERTY_FN(pvmetadatacopies, pvcp->pva.pvmetadatacopies) - -GET_PVCREATEPARAMS_NUM_PROPERTY_FN(pvmetadatasize, pvcp->pva.pvmetadatasize) -SET_PVCREATEPARAMS_NUM_PROPERTY_FN(pvmetadatasize, pvcp->pva.pvmetadatasize) - -GET_PVCREATEPARAMS_NUM_PROPERTY_FN(data_alignment, pvcp->pva.data_alignment) -SET_PVCREATEPARAMS_NUM_PROPERTY_FN(data_alignment, pvcp->pva.data_alignment) - -GET_PVCREATEPARAMS_NUM_PROPERTY_FN(data_alignment_offset, pvcp->pva.data_alignment_offset) -SET_PVCREATEPARAMS_NUM_PROPERTY_FN(data_alignment_offset, pvcp->pva.data_alignment_offset) - -GET_PVCREATEPARAMS_NUM_PROPERTY_FN(zero, pvcp->zero) -SET_PVCREATEPARAMS_NUM_PROPERTY_FN(zero, pvcp->zero) - -struct lvm_property_type _lib_properties[] = { -#include "lvm_prop_fields.h" - { 0, "", 0, 0, 0, 0, { .integer = 0 }, prop_not_implemented_get, - prop_not_implemented_set }, -}; - -#undef STR -#undef NUM -#undef FIELD - -int lv_create_param_get_property(const struct lvcreate_params *lvcp, - struct lvm_property_type *prop) -{ - return prop_get_property(_lib_properties, lvcp, prop, LV_CREATE_PARAMS); -} - -int lv_create_param_set_property(struct lvcreate_params *lvcp, - struct lvm_property_type *prop) -{ - return prop_set_property(_lib_properties, lvcp, prop, LV_CREATE_PARAMS); -} - -int pv_create_param_get_property(const struct pvcreate_params *pvcp, - struct lvm_property_type *prop) -{ - return prop_get_property(_lib_properties, pvcp, prop, PV_CREATE_PARAMS); -} - -int pv_create_param_set_property(struct pvcreate_params *pvcp, - struct lvm_property_type *prop) -{ - return prop_set_property(_lib_properties, pvcp, prop, PV_CREATE_PARAMS); -} diff --git a/liblvm/lvm_prop.h b/liblvm/lvm_prop.h deleted file mode 100644 index 5a30a76..0000000 --- a/liblvm/lvm_prop.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2013 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -#include "lib/properties/prop_common.h" - -#ifndef _LIB_LVM_PROP_H -#define _LIB_LVM_PROP_H - -typedef struct lvcreate_params type_lvcreate_params; -typedef struct pvcreate_params type_pvcreate_params; - -#define LV_CREATE_PARAMS 1 -#define PV_CREATE_PARAMS 2 - -#define GET_LVCREATEPARAMS_NUM_PROPERTY_FN(NAME, VALUE)\ - GET_NUM_PROPERTY_FN(NAME, VALUE, lvcreate_params, lvcp) - -#define SET_LVCREATEPARAMS_NUM_PROPERTY_FN(NAME, VALUE) \ - SET_NUM_PROPERTY(NAME, VALUE, lvcreate_params, lvcp) - -#define GET_PVCREATEPARAMS_NUM_PROPERTY_FN(NAME, VALUE)\ - GET_NUM_PROPERTY_FN(NAME, VALUE, pvcreate_params, pvcp) - -#define SET_PVCREATEPARAMS_NUM_PROPERTY_FN(NAME, VALUE) \ - SET_NUM_PROPERTY(NAME, VALUE, pvcreate_params, pvcp) - -int lv_create_param_get_property(const struct lvcreate_params *lvcp, - struct lvm_property_type *prop); - -int lv_create_param_set_property(struct lvcreate_params *lvcp, - struct lvm_property_type *prop); - -int pv_create_param_get_property(const struct pvcreate_params *pvcp, - struct lvm_property_type *prop); - -int pv_create_param_set_property(struct pvcreate_params *pvcp, - struct lvm_property_type *prop); - -#endif diff --git a/liblvm/lvm_prop_fields.h b/liblvm/lvm_prop_fields.h deleted file mode 100644 index 10f1290..0000000 --- a/liblvm/lvm_prop_fields.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2013 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -FIELD(LV_CREATE_PARAMS, lvcreate_params, NUM, "skip_zero", zero, 2, uint32, skip_zero, "Skip zeroing on lv creation", 1) - -FIELD(PV_CREATE_PARAMS, pvcreate_params, NUM, "size", size, 2, uint64_t, size, "PV size", 1) -FIELD(PV_CREATE_PARAMS, pvcreate_params, NUM, "pvmetadatacopies", pvmetadatacopies, 2, uint64_t, pvmetadatacopies, "PV Metadata copies", 1) -FIELD(PV_CREATE_PARAMS, pvcreate_params, NUM, "pvmetadatasize", pvmetadatasize, 2, uint64_t, pvmetadatasize, "PV Metadata size", 1) -FIELD(PV_CREATE_PARAMS, pvcreate_params, NUM, "data_alignment", data_alignment, 2, uint64_t, data_alignment, "Start data to a multiple of value", 1) -FIELD(PV_CREATE_PARAMS, pvcreate_params, NUM, "data_alignment_offset", data_alignment_offset, 2, uint64_t, data_alignment_offset, "Shift the start of the data area", 1) -FIELD(PV_CREATE_PARAMS, pvcreate_params, NUM, "zero", zero, 2, uint64_t, zero, "Zero first 2048 bytes of device", 1) diff --git a/liblvm/lvm_pv.c b/liblvm/lvm_pv.c deleted file mode 100644 index bd6ee4f..0000000 --- a/liblvm/lvm_pv.c +++ /dev/null @@ -1,474 +0,0 @@ -/* - * Copyright (C) 2008-2013 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stddef.h> -#include "lib/misc/lib.h" -#include "lib/metadata/metadata-exported.h" -#include "lib/misc/lvm-string.h" -#include "lib/datastruct/str_list.h" -#include "lvm_misc.h" -#include "liblvm/lvm2app.h" -#include "lib/locking/locking.h" -#include "lib/commands/toolcontext.h" -#include "lvm_misc.h" -#include "lib/cache/lvmetad.h" - -struct lvm_pv_create_params -{ - uint32_t magic; - lvm_t libh; - const char *pv_name; - struct pvcreate_params pv_p; -}; - -#define PV_CREATE_PARAMS_MAGIC 0xFEED0002 - -const char *lvm_pv_get_uuid(const pv_t pv) -{ - const char *rc; - struct saved_env e = store_user_env(pv->vg->cmd); - rc = pv_uuid_dup(pv->vg->vgmem, pv); - restore_user_env(&e); - return rc; -} - -const char *lvm_pv_get_name(const pv_t pv) -{ - const char *rc; - struct saved_env e = store_user_env(pv->vg->cmd); - rc = dm_pool_strndup(pv->vg->vgmem, pv_dev_name(pv), NAME_LEN); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_pv_get_mda_count(const pv_t pv) -{ - uint64_t rc; - struct saved_env e = store_user_env(pv->vg->cmd); - rc = (uint64_t) pv_mda_count(pv); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_pv_get_dev_size(const pv_t pv) -{ - uint64_t rc; - struct saved_env e = store_user_env(pv->vg->cmd); - rc = SECTOR_SIZE * pv_dev_size(pv); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_pv_get_size(const pv_t pv) -{ - uint64_t rc; - struct saved_env e = store_user_env(pv->vg->cmd); - rc = SECTOR_SIZE * pv_size_field(pv); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_pv_get_free(const pv_t pv) -{ - uint64_t rc; - struct saved_env e = store_user_env(pv->vg->cmd); - rc = SECTOR_SIZE * pv_free(pv); - restore_user_env(&e); - return rc; -} - -struct lvm_property_value lvm_pv_get_property(const pv_t pv, const char *name) -{ - struct lvm_property_value rc; - struct saved_env e = store_user_env(pv->vg->cmd); - rc = get_property(pv, NULL, NULL, NULL, NULL, NULL, NULL, name); - restore_user_env(&e); - return rc; -} - -struct lvm_property_value lvm_pvseg_get_property(const pvseg_t pvseg, - const char *name) -{ - struct lvm_property_value rc; - struct saved_env e = store_user_env(pvseg->pv->vg->cmd); - rc = get_property(NULL, NULL, NULL, NULL, pvseg, NULL, NULL, name); - restore_user_env(&e); - return rc; -} - -struct lvm_list_wrapper -{ - unsigned long magic; - struct cmd_context *cmd; - struct dm_list pvslist; - struct dm_list vgslist; -}; - -int lvm_pv_remove(lvm_t libh, const char *pv_name) -{ - int rc = 0; - struct cmd_context *cmd = (struct cmd_context *)libh; - struct saved_env e = store_user_env(cmd); - struct dm_list pv_names; - - dm_list_init(&pv_names); - - if (!str_list_add(cmd->mem, &pv_names, pv_name)) - rc = -1; - - if (rc >= 0 && !pvremove_many(cmd, &pv_names, 0, 0)) - rc = -1; - - restore_user_env(&e); - return rc; -} - -#define PV_LIST_MAGIC 4026907153U - -static struct dm_list *_lvm_list_pvs(lvm_t libh) -{ - struct lvm_list_wrapper *rc = NULL; - struct cmd_context *cmd = (struct cmd_context *)libh; - - /* - * This memory will get cleared when the library handle - * gets closed, don't try to free is as it doesn't work - * like malloc/free do. - */ - if (!(rc = dm_pool_zalloc(cmd->mem, sizeof(*rc)))) { - log_errno(ENOMEM, "Memory allocation fail for pv list."); - return NULL; - } - - if (!lock_vol(cmd, VG_GLOBAL, LCK_VG_WRITE, NULL)) { - log_errno(ENOLCK, "Unable to obtain global lock."); - } else { - dm_list_init(&rc->pvslist); - dm_list_init(&rc->vgslist); - if (!get_pvs_perserve_vg(cmd, &rc->pvslist, &rc->vgslist)) - return_NULL; - - /* - * If we have no PVs we still need to have access to cmd - * pointer in the free call. - */ - rc->cmd = cmd; - rc->magic = PV_LIST_MAGIC; - } - - return &rc->pvslist; -} - -struct dm_list *lvm_list_pvs(lvm_t libh) -{ - struct dm_list *rc; - struct saved_env e = store_user_env((struct cmd_context *)libh); - rc = _lvm_list_pvs(libh); - restore_user_env(&e); - return rc; -} - -int lvm_list_pvs_free(struct dm_list *pvlist) -{ - struct lvm_list_wrapper *to_delete; - struct vg_list *vgl; - struct pv_list *pvl; - struct saved_env e; - - if (pvlist) { - to_delete = dm_list_struct_base(pvlist, struct lvm_list_wrapper, pvslist); - if (to_delete->magic != PV_LIST_MAGIC) { - log_errno(EINVAL, "Not a correct pvlist structure"); - return -1; - } - - /* - * Need to ensure that pointer is valid before we can use reference to - * cmd. - */ - e = store_user_env(to_delete->cmd); - - dm_list_iterate_items(vgl, &to_delete->vgslist) { - release_vg(vgl->vg); - } - - dm_list_iterate_items(pvl, &to_delete->pvslist) - free_pv_fid(pvl->pv); - - unlock_vg(to_delete->cmd, NULL, VG_GLOBAL); - to_delete->magic = 0xA5A5A5A5; - - restore_user_env(&e); - } - - return 0; -} - -static struct dm_list *_lvm_pv_list_pvsegs(pv_t pv) -{ - struct dm_list *list; - pvseg_list_t *pvseg; - struct pv_segment *pvl; - - if (dm_list_empty(&pv->segments)) - return NULL; - - if (!(list = dm_pool_zalloc(pv->vg->vgmem, sizeof(*list)))) { - log_errno(ENOMEM, "Memory allocation fail for dm_list."); - return NULL; - } - - dm_list_init(list); - - dm_list_iterate_items(pvl, &pv->segments) { - if (!(pvseg = dm_pool_zalloc(pv->vg->vgmem, sizeof(*pvseg)))) { - log_errno(ENOMEM, - "Memory allocation fail for lvm_pvseg_list."); - return NULL; - } - pvseg->pvseg = pvl; - dm_list_add(list, &pvseg->list); - } - - return list; -} - -struct dm_list *lvm_pv_list_pvsegs(pv_t pv) -{ - struct dm_list *rc; - struct saved_env e = store_user_env(pv->vg->cmd); - rc = _lvm_pv_list_pvsegs(pv); - restore_user_env(&e); - return rc; -} - -pv_t lvm_pv_from_name(vg_t vg, const char *name) -{ - pv_t rc = NULL; - struct pv_list *pvl; - struct saved_env e = store_user_env(vg->cmd); - - dm_list_iterate_items(pvl, &vg->pvs) - if (!strcmp(name, pv_dev_name(pvl->pv))) { - rc = pvl->pv; - break; - } - - restore_user_env(&e); - return rc; -} - -static pv_t _lvm_pv_from_uuid(vg_t vg, const char *uuid) -{ - struct pv_list *pvl; - struct id id; - - if (strlen(uuid) < ID_LEN) { - log_errno (EINVAL, "Invalid UUID string length"); - return NULL; - } - - if (!id_read_format(&id, uuid)) { - log_errno(EINVAL, "Invalid UUID format."); - return NULL; - } - - dm_list_iterate_items(pvl, &vg->pvs) - if (id_equal(&id, &pvl->pv->id)) - return pvl->pv; - - return NULL; -} - -pv_t lvm_pv_from_uuid(vg_t vg, const char *uuid) -{ - pv_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = _lvm_pv_from_uuid(vg, uuid); - restore_user_env(&e); - return rc; -} - -static int _lvm_pv_resize(const pv_t pv, uint64_t new_size) -{ - uint64_t size = new_size >> SECTOR_SHIFT; - - if (new_size % SECTOR_SIZE) { - log_errno(EINVAL, "Size not a multiple of 512"); - return -1; - } - - if (!vg_check_write_mode(pv->vg)) - return -1; - - if (!pv_resize_single(pv->vg->cmd, pv->vg, pv, size, 1)) { - log_error("PV re-size failed!"); - return -1; - } - - return 0; -} - -int lvm_pv_resize(const pv_t pv, uint64_t new_size) -{ - int rc; - struct saved_env e = store_user_env(pv->vg->cmd); - rc = _lvm_pv_resize(pv, new_size); - restore_user_env(&e); - return rc; -} - -/* - * Common internal code to create a parameter passing object - */ -static struct lvm_pv_create_params *_lvm_pv_params_create( - lvm_t libh, - const char *pv_name, - struct lvm_pv_create_params *pvcp_in) -{ - struct lvm_pv_create_params *pvcp = NULL; - const char *dev = NULL; - struct cmd_context *cmd = (struct cmd_context *)libh; - - if (!pv_name || strlen(pv_name) == 0) { - log_error("Invalid pv_name"); - return NULL; - } - - if (!pvcp_in) { - pvcp = dm_pool_zalloc(cmd->libmem, sizeof(struct lvm_pv_create_params)); - } else { - pvcp = pvcp_in; - } - - if (!pvcp) { - return NULL; - } - - dev = dm_pool_strdup(cmd->libmem, pv_name); - if (!dev) { - return NULL; - } - - pvcreate_params_set_defaults(&pvcp->pv_p); - pvcp->pv_p.yes = 1; - pvcp->pv_p.force = DONT_PROMPT; - pvcp->pv_name = dev; - pvcp->libh = libh; - pvcp->magic = PV_CREATE_PARAMS_MAGIC; - - return pvcp; -} - -pv_create_params_t lvm_pv_params_create(lvm_t libh, const char *pv_name) -{ - pv_create_params_t rc; - struct saved_env e = store_user_env((struct cmd_context *)libh); - rc = _lvm_pv_params_create(libh, pv_name, NULL); - restore_user_env(&e); - return rc; -} - -struct lvm_property_value lvm_pv_params_get_property( - const pv_create_params_t params, - const char *name) -{ - struct lvm_property_value rc = { - .is_valid = 0 - }; - struct saved_env e; - - if (params && params->magic == PV_CREATE_PARAMS_MAGIC) { - e = store_user_env((struct cmd_context *)(params->libh)); - rc = get_property(NULL, NULL, NULL, NULL, NULL, NULL, &params->pv_p, - name); - restore_user_env(&e); - } else { - log_error("Invalid pv_create_params parameter"); - } - - return rc; -} - -int lvm_pv_params_set_property(pv_create_params_t params, const char *name, - struct lvm_property_value *prop) -{ - int rc = -1; - struct saved_env e; - - if (params && params->magic == PV_CREATE_PARAMS_MAGIC) { - e = store_user_env((struct cmd_context *)(params->libh)); - rc = set_property(NULL, NULL, NULL, NULL, &params->pv_p, name, prop); - restore_user_env(&e); - } else { - log_error("Invalid pv_create_params parameter"); - } - return rc; -} - -static int _pv_create(pv_create_params_t params) -{ - struct cmd_context *cmd = (struct cmd_context *)params->libh; - int rc = 0; - - if (params->pv_p.pva.size) { - if (params->pv_p.pva.size % SECTOR_SIZE) { - log_errno(EINVAL, "Size not a multiple of 512"); - return -1; - } - params->pv_p.pva.size = params->pv_p.pva.size >> SECTOR_SHIFT; - } - - if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { - log_errno(EINVAL, "Can't get lock for orphan PVs"); - return -1; - } - - if (!(pvcreate_vol(cmd, params->pv_name, &params->pv_p, 1))) - rc = -1; - - unlock_vg(cmd, NULL, VG_ORPHANS); - return rc; -} - -int lvm_pv_create(lvm_t libh, const char *pv_name, uint64_t size) -{ - struct lvm_pv_create_params pp; - int rc = -1; - struct saved_env e = store_user_env((struct cmd_context *)libh); - - if (_lvm_pv_params_create(libh, pv_name, &pp)) { - pp.pv_p.pva.size = size; - rc = _pv_create(&pp); - } - - restore_user_env(&e); - return rc; -} - -int lvm_pv_create_adv(pv_create_params_t params) -{ - int rc = -1; - struct saved_env e; - - if (params && params->magic == PV_CREATE_PARAMS_MAGIC) { - e = store_user_env((struct cmd_context *)(params->libh)); - rc = _pv_create(params); - restore_user_env(&e); - } else { - log_error("Invalid pv_create_params parameter"); - } - - return rc; -} diff --git a/liblvm/lvm_vg.c b/liblvm/lvm_vg.c deleted file mode 100644 index b55d195..0000000 --- a/liblvm/lvm_vg.c +++ /dev/null @@ -1,564 +0,0 @@ -/* - * Copyright (C) 2008-2013 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "lib/misc/lib.h" -#include "lib/commands/toolcontext.h" -#include "lib/metadata/metadata.h" -#include "lib/format_text/archiver.h" -#include "lib/locking/locking.h" -#include "lib/cache/lvmcache.h" -#include "lib/cache/lvmetad.h" -#include "lvm_misc.h" -#include "liblvm/lvm2app.h" -#include "lib/display/display.h" -#include "lib/cache/lvmetad.h" - -int lvm_vg_add_tag(vg_t vg, const char *tag) -{ - int rc = -1; - struct saved_env e = store_user_env(vg->cmd); - - if (!vg_read_error(vg) && vg_check_write_mode(vg) && - vg_change_tag(vg, tag, 1)) - rc = 0; - restore_user_env(&e); - return rc; -} - - -int lvm_vg_remove_tag(vg_t vg, const char *tag) -{ - int rc = -1; - struct saved_env e = store_user_env(vg->cmd); - - if (!vg_read_error(vg) && vg_check_write_mode(vg) && - vg_change_tag(vg, tag, 0)) - rc = 0; - restore_user_env(&e); - return rc; -} - - -vg_t lvm_vg_create(lvm_t libh, const char *vg_name) -{ - struct volume_group *vg = NULL; - struct saved_env e = store_user_env((struct cmd_context *)libh); - - vg = vg_lock_and_create((struct cmd_context *)libh, vg_name); - /* FIXME: error handling is still TBD */ - if (vg_read_error(vg)) { - release_vg(vg); - vg = NULL; - } else { - vg->open_mode = 'w'; - } - - restore_user_env(&e); - return (vg_t) vg; -} - -static int _lvm_vg_extend(vg_t vg, const char *device) -{ - struct pvcreate_params pp; - - if (vg_read_error(vg)) - return -1; - - if (!vg_check_write_mode(vg)) - return -1; - - if (!lock_vol(vg->cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { - log_error("Can't get lock for orphan PVs"); - return -1; - } - - pvcreate_params_set_defaults(&pp); - if (!vg_extend(vg, 1, &device, &pp)) { - unlock_vg(vg->cmd, NULL, VG_ORPHANS); - return -1; - } - /* - * FIXME: Either commit to disk, or keep holding VG_ORPHANS and - * release in lvm_vg_close(). - */ - unlock_vg(vg->cmd, NULL, VG_ORPHANS); - return 0; -} - -int lvm_vg_extend(vg_t vg, const char *device) -{ - int rc = 0; - struct saved_env e = store_user_env(vg->cmd); - rc = _lvm_vg_extend(vg, device); - restore_user_env(&e); - return rc; -} - -int lvm_vg_reduce(vg_t vg, const char *device) -{ - int rc = -1; - struct saved_env e = store_user_env(vg->cmd); - - if (!vg_read_error(vg) && vg_check_write_mode(vg) && vg_reduce(vg, device)) - rc = 0; - - restore_user_env(&e); - return rc; -} - -int lvm_vg_set_extent_size(vg_t vg, uint32_t new_size) -{ - int rc = -1; - struct saved_env e = store_user_env(vg->cmd); - - if (!vg_read_error(vg) && vg_check_write_mode(vg) && - vg_set_extent_size(vg, new_size / SECTOR_SIZE)) - rc = 0; - - restore_user_env(&e); - return rc; -} - -static int _lvm_vg_write(vg_t vg) -{ - struct pv_list *pvl; - - if (vg_read_error(vg)) - return -1; - if (!vg_check_write_mode(vg)) - return -1; - - if (dm_list_empty(&vg->pvs)) { - if (!vg_remove(vg)) - return -1; - return 0; - } - - if (! dm_list_empty(&vg->removed_pvs)) { - if (!lock_vol(vg->cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) { - log_error("Can't get lock for orphan PVs"); - return 0; - } - } - - if (!archive(vg)) - return -1; - - /* Store VG on disk(s) */ - if (!vg_write(vg) || !vg_commit(vg)) - return -1; - - if (! dm_list_empty(&vg->removed_pvs)) { - dm_list_iterate_items(pvl, &vg->removed_pvs) { - pv_write_orphan(vg->cmd, pvl->pv); - pv_set_fid(pvl->pv, NULL); - /* FIXME: do pvremove / label_remove()? */ - } - dm_list_init(&vg->removed_pvs); - unlock_vg(vg->cmd, NULL, VG_ORPHANS); - } - - return 0; -} - -int lvm_vg_write(vg_t vg) -{ - int rc; - struct saved_env e = store_user_env(vg->cmd); - rc = _lvm_vg_write(vg); - restore_user_env(&e); - return rc; -} - -int lvm_vg_close(vg_t vg) -{ - struct saved_env e = store_user_env(vg->cmd); - if (vg_read_error(vg) == FAILED_LOCKING) - release_vg(vg); - else if (!lvmcache_vgname_is_locked(vg->name)) - release_vg(vg); - else - unlock_and_release_vg(vg->cmd, vg, vg->name); - restore_user_env(&e); - return 0; -} - -int lvm_vg_remove(vg_t vg) -{ - int rc = -1; - struct saved_env e = store_user_env(vg->cmd); - - if (!vg_read_error(vg) && vg_check_write_mode(vg) && vg_remove_check(vg)) { - vg_remove_pvs(vg); - rc = 0; - } - - restore_user_env(&e); - return rc; -} - -static vg_t _lvm_vg_open(lvm_t libh, const char *vgname, const char *mode, - uint32_t flags) -{ - uint32_t internal_flags = 0; - struct volume_group *vg; - - if (!strncmp(mode, "w", 1)) - internal_flags |= READ_FOR_UPDATE; - else if (strncmp(mode, "r", 1)) { - log_errno(EINVAL, "Invalid VG open mode"); - return NULL; - } - - lvmcache_label_scan((struct cmd_context *)libh); - - vg = vg_read((struct cmd_context *)libh, vgname, NULL, internal_flags, 0); - if (vg_read_error(vg)) { - /* FIXME: use log_errno either here in inside vg_read */ - release_vg(vg); - return NULL; - } - /* FIXME: combine this with locking ? */ - vg->open_mode = mode[0]; - - return (vg_t) vg; -} - -vg_t lvm_vg_open(lvm_t libh, const char *vgname, const char *mode, - uint32_t flags) -{ - vg_t rc; - struct saved_env e = store_user_env((struct cmd_context*)libh); - rc = _lvm_vg_open(libh, vgname, mode, flags); - restore_user_env(&e); - return rc; -} - -static struct dm_list *_lvm_vg_list_pvs(vg_t vg) -{ - struct dm_list *list; - pv_list_t *pvs; - struct pv_list *pvl; - - if (dm_list_empty(&vg->pvs)) - return NULL; - - if (!(list = dm_pool_zalloc(vg->vgmem, sizeof(*list)))) { - log_errno(ENOMEM, "Memory allocation fail for dm_list."); - return NULL; - } - dm_list_init(list); - - dm_list_iterate_items(pvl, &vg->pvs) { - if (!(pvs = dm_pool_zalloc(vg->vgmem, sizeof(*pvs)))) { - log_errno(ENOMEM, - "Memory allocation fail for lvm_pv_list."); - return NULL; - } - pvs->pv = pvl->pv; - dm_list_add(list, &pvs->list); - } - return list; -} - -struct dm_list *lvm_vg_list_pvs(vg_t vg) -{ - struct dm_list *rc; - struct saved_env e = store_user_env(vg->cmd); - rc = _lvm_vg_list_pvs(vg); - restore_user_env(&e); - return rc; -} - -static struct dm_list *_lvm_vg_list_lvs(vg_t vg) -{ - struct dm_list *list; - lv_list_t *lvs; - struct lv_list *lvl; - - if (dm_list_empty(&vg->lvs)) - return NULL; - - if (!(list = dm_pool_zalloc(vg->vgmem, sizeof(*list)))) { - log_errno(ENOMEM, "Memory allocation fail for dm_list."); - return NULL; - } - dm_list_init(list); - - dm_list_iterate_items(lvl, &vg->lvs) { - if (!(lvs = dm_pool_zalloc(vg->vgmem, sizeof(*lvs)))) { - log_errno(ENOMEM, - "Memory allocation fail for lvm_lv_list."); - return NULL; - } - lvs->lv = lvl->lv; - dm_list_add(list, &lvs->list); - } - return list; -} - -struct dm_list *lvm_vg_list_lvs(vg_t vg) -{ - struct dm_list *rc; - struct saved_env e = store_user_env(vg->cmd); - rc = _lvm_vg_list_lvs(vg); - restore_user_env(&e); - return rc; -} - -struct dm_list *lvm_vg_get_tags(const vg_t vg) -{ - struct dm_list *rc; - struct saved_env e = store_user_env(vg->cmd); - rc = tag_list_copy(vg->vgmem, &vg->tags); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_get_seqno(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = vg_seqno(vg); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_is_clustered(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = vg_is_clustered(vg); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_is_exported(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = vg_is_exported(vg); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_is_partial(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = (vg_missing_pv_count(vg) != 0); - restore_user_env(&e); - return rc; -} - -/* FIXME: invalid handle? return INTMAX? */ -uint64_t lvm_vg_get_size(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = SECTOR_SIZE * vg_size(vg); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_get_free_size(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = SECTOR_SIZE * vg_free(vg); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_get_extent_size(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = SECTOR_SIZE * vg_extent_size(vg); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_get_extent_count(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = vg_extent_count(vg); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_get_free_extent_count(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = vg_free_count(vg); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_get_pv_count(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = vg_pv_count(vg); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_get_max_pv(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = vg_max_pv(vg); - restore_user_env(&e); - return rc; -} - -uint64_t lvm_vg_get_max_lv(const vg_t vg) -{ - uint64_t rc; - struct saved_env e = store_user_env(vg->cmd); - rc = vg_max_lv(vg); - restore_user_env(&e); - return rc; -} - -const char *lvm_vg_get_uuid(const vg_t vg) -{ - const char *rc; - struct saved_env e = store_user_env(vg->cmd); - rc = vg_uuid_dup(vg); - restore_user_env(&e); - return rc; -} - -const char *lvm_vg_get_name(const vg_t vg) -{ - const char *rc; - struct saved_env e = store_user_env(vg->cmd); - rc = dm_pool_strndup(vg->vgmem, vg->name, NAME_LEN+1); - restore_user_env(&e); - return rc; -} - - -struct lvm_property_value lvm_vg_get_property(const vg_t vg, const char *name) -{ - struct lvm_property_value rc; - struct saved_env e = store_user_env(vg->cmd); - rc = get_property(NULL, vg, NULL, NULL, NULL, NULL, NULL, name); - restore_user_env(&e); - return rc; -} - -int lvm_vg_set_property(const vg_t vg, const char *name, - struct lvm_property_value *value) -{ - /* At this point it is unknown if all property set paths make the - * appropriate copy of the string. We will allocate a copy on the vg so - * that worst case we have two copies which will get freed when the vg gets - * released. - */ - int rc; - struct saved_env e = store_user_env(vg->cmd); - - if (value->is_valid && value->is_string && value->value.string) { - value->value.string = dm_pool_strndup(vg->vgmem, value->value.string, - strlen(value->value.string) + 1); - } - - rc = set_property(NULL, vg, NULL, NULL, NULL, name, value); - restore_user_env(&e); - return rc; -} - -struct dm_list *lvm_list_vg_names(lvm_t libh) -{ - struct dm_list *rc = NULL; - struct saved_env e = store_user_env((struct cmd_context *)libh); - - if (lvmetad_vg_list_to_lvmcache((struct cmd_context *)libh)) { - rc = get_vgnames((struct cmd_context *)libh, 0); - } - restore_user_env(&e); - return rc; -} - -struct dm_list *lvm_list_vg_uuids(lvm_t libh) -{ - struct dm_list *rc = NULL; - struct saved_env e = store_user_env((struct cmd_context *)libh); - - if (lvmetad_vg_list_to_lvmcache((struct cmd_context *)libh)) { - rc = get_vgids((struct cmd_context *)libh, 0); - } - restore_user_env(&e); - return rc; -} - -/* - * FIXME: Elaborate on when to use, side-effects, .cache file, etc - */ -int lvm_scan(lvm_t libh) -{ - int rc = 0; - struct saved_env e = store_user_env((struct cmd_context *)libh); - - if (!lvmcache_label_scan((struct cmd_context *)libh)) - rc = -1; - - restore_user_env(&e); - return rc; -} - -int lvm_lv_name_validate(const vg_t vg, const char *name) -{ - int rc = -1; - name_error_t name_error; - int historical; - - struct saved_env e = store_user_env(vg->cmd); - - name_error = validate_name_detailed(name); - - if (NAME_VALID == name_error) { - if (apply_lvname_restrictions(name)) { - if (!lv_name_is_used_in_vg(vg, name, &historical)) { - rc = 0; - } else { - log_errno(EINVAL, "%sLV name exists in VG", - historical ? "historical " : ""); - } - } - } else { - display_name_error(name_error); - } - - restore_user_env(&e); - return rc; -} - -int lvm_vg_name_validate(lvm_t libh, const char *name) -{ - int rc = -1; - struct cmd_context *cmd = (struct cmd_context *)libh; - struct saved_env e = store_user_env(cmd); - - if (validate_new_vg_name(cmd, name)) - rc = 0; - - restore_user_env(&e); - return rc; -} diff --git a/liblvm/test/vgadd.c b/liblvm/test/vgadd.c deleted file mode 100644 index c96baa7..0000000 --- a/liblvm/test/vgadd.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2009 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdio.h> -#include <unistd.h> -#include <inttypes.h> -#include <assert.h> - -#include "lvm2app.h" - -int main(int argc, char *argv[]) -{ - char *vgname = NULL; - lvm_t handle; - vg_t vg; - lv_t lv; - lvm_str_list_t *sl; - pv_list_t *pvl; - lv_list_t *lvl; - struct dm_list *vgnames; - struct dm_list *vgids; - struct dm_list *pvlist; - struct dm_list *lvlist; - int added = 0; - int ret; - int i; - - vgname = argv[1]; - - handle = lvm_init(NULL); - if (!handle) { - printf("lvm_init failed\n"); - return -1; - } - - vg = lvm_vg_create(handle, vgname); - - for (i = 2; i < argc; i++) { - printf("adding %s to vg\n", argv[i]); - ret = lvm_vg_extend(vg, argv[i]); - - if (ret) { - printf("Failed to add %s to vg\n", argv[i]); - goto out; - } - - added++; - } - - if (!added) { - printf("No PVs added, not writing VG.\n"); - goto out; - } - - printf("writing vg\n"); - ret = lvm_vg_write(vg); - - lvm_vg_close(vg); - - sleep(1); - - vg = lvm_vg_open(handle, vgname, "w", 0); - if (!vg) { - printf("vg open %s failed\n", vgname); - goto out; - } - - lv = lvm_vg_create_lv_linear(vg, "lv0", 1024*1024); - if (!lv) { - printf("lv create failed\n"); - goto out; - } - - lvm_vg_close(vg); -out: - lvm_quit(handle); - - return 0; -} diff --git a/liblvm/test/vgshow.c b/liblvm/test/vgshow.c deleted file mode 100644 index 519f3dd..0000000 --- a/liblvm/test/vgshow.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2009 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdio.h> -#include <unistd.h> -#include <inttypes.h> -#include <assert.h> - -#include "lvm2app.h" - -int main(int argc, char *argv[]) -{ - char *vgname = NULL; - lvm_t handle; - vg_t vg; - lvm_str_list_t *sl; - pv_list_t *pvl; - lv_list_t *lvl; - struct dm_list *vgnames; - struct dm_list *vgids; - struct dm_list *pvlist; - struct dm_list *lvlist; - uint64_t val; - - vgname = argv[1]; - - handle = lvm_init(NULL); - if (!handle) { - printf("lvm_init failed\n"); - return -1; - } - - vgnames = lvm_list_vg_names(handle); - - dm_list_iterate_items(sl, vgnames) - printf("vg name %s\n", sl->str); - - vgids = lvm_list_vg_uuids(handle); - - dm_list_iterate_items(sl, vgids) - printf("vg uuid %s\n", sl->str); - - if (!vgname) { - printf("No vg name arg\n"); - goto out; - } - - vg = lvm_vg_open(handle, vgname, "r", 0); - - if (!vg) { - printf("vg open %s failed\n", vgname); - goto out; - } - - val = lvm_vg_get_seqno(vg); - - printf("vg seqno %llu\n", (unsigned long long)val); - - pvlist = lvm_vg_list_pvs(vg); - - dm_list_iterate_items(pvl, pvlist) { - printf("vg pv name %s\n", lvm_pv_get_name(pvl->pv)); - - val = lvm_pv_get_dev_size(pvl->pv); - - printf("vg pv size %llu\n", (unsigned long long)val); - } - - lvlist = lvm_vg_list_lvs(vg); - - dm_list_iterate_items(lvl, lvlist) { - printf("vg lv name %s\n", lvm_lv_get_name(lvl->lv)); - - val = lvm_lv_get_size(lvl->lv); - - printf("vg lv size %llu\n", (unsigned long long)val); - } - - lvm_vg_close(vg); -out: - lvm_quit(handle); - - return 0; -} diff --git a/test/api/Makefile.in b/test/api/Makefile.in index 6872095..c8d9fc0 100644 --- a/test/api/Makefile.in +++ b/test/api/Makefile.in @@ -16,47 +16,14 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ TARGETS = -ifeq ("@APPLIB@", "yes") -TARGETS += test -SOURCES = test.c - -TARGETS += \ - lvtest.t \ - vglist.t \ - percent.t \ - pe_start.t \ - thin_percent.t \ - vgtest.t - -SOURCES2 = \ - lvtest.c \ - vglist.c \ - percent.c \ - pe_start.c \ - thin_percent.c \ - vgtest.c - -endif - PYTEST = python_lvm_unit.py include $(top_builddir)/make.tmpl DEFS += -D_REENTRANT -DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so -LDFLAGS+=\ - -L$(top_builddir)/liblvm \ - -L$(top_builddir)/daemons/dmeventd -LIBS += @LVM2APP_LIB@ $(DMEVENT_LIBS) - -%.t: %.o $(DEPLIBS) - $(CC) -o $@ $(<) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(LIBS) all: test -x $(PYTEST) || chmod 755 $(PYTEST) -test: $(OBJECTS) $(DEPLIBS) - $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(LIBS) $(READLINE_LIBS) - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status test/api/Makefile diff --git a/test/api/lvtest.c b/test/api/lvtest.c deleted file mode 100644 index 9a5fc22..0000000 --- a/test/api/lvtest.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2010 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#undef NDEBUG - -#include "liblvm/lvm2app.h" -#include "assert.h" - -#define err(args...) \ - do { fprintf(stderr, args); goto bad; } while (0) - -int main(int argc, char *argv[]) -{ - lvm_t handle; - vg_t vg; - lv_t lv; - int r = -1; - - if (!(handle = lvm_init(NULL))) - return -1; - - if (!(vg = lvm_vg_open(handle, argv[1], "w", 0))) - err("VG open %s failed.\n", argv[1]); - - if (!(lv = lvm_lv_from_name(vg, "test"))) - err("LV test not found.\n"); - - if (lvm_lv_deactivate(lv)) - err("LV test deactivation failed.\n"); - - if (lvm_lv_activate(lv)) - err("LV test activation failed.\n"); - - if (lvm_lv_activate(lv)) - err("LV test repeated activation failed.\n"); - - if (lvm_lv_rename(lv, "test1")) - err("LV test rename to test1 failed.\n"); - - if (lvm_lv_rename(lv, "test2")) - err("LV test1 rename to test2 failed.\n"); - - if (lvm_lv_rename(lv, "test")) - err("LV test2 rename to test failed.\n"); - - if (lvm_vg_close(vg)) - err("VG close failed.\n"); - - r = 0; -bad: - lvm_quit(handle); - return r; -} diff --git a/test/api/pe_start.c b/test/api/pe_start.c deleted file mode 100644 index 16b4c0d..0000000 --- a/test/api/pe_start.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2011 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#undef NDEBUG - -#include "liblvm/lvm2app.h" -#include "assert.h" - -int main(int argc, char *argv[]) -{ - lvm_t handle; - vg_t vg = NULL; - pv_t pv; - struct lvm_property_value v; - - handle = lvm_init(NULL); - assert(handle); - - vg = lvm_vg_create(handle, argv[1]); - assert(vg); - - if (lvm_vg_extend(vg, argv[2])) - abort(); - - pv = lvm_pv_from_name(vg, argv[2]); - assert(pv); - - v = lvm_pv_get_property(pv, "pe_start"); - assert(v.is_valid); - fprintf(stderr, "pe_start = %d\n", (int)v.value.integer); - assert(v.value.integer == 2048 * 512); - - lvm_vg_close(vg); - lvm_quit(handle); - return 0; -} diff --git a/test/api/percent.c b/test/api/percent.c deleted file mode 100644 index afc361c..0000000 --- a/test/api/percent.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2010 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#undef NDEBUG - -#include "liblvm/lvm2app.h" -#include "assert.h" - -int main(int argc, char *argv[]) -{ - lvm_t handle; - vg_t vg = NULL; - lv_t lv; - struct lvm_property_value v; - struct lvm_property_value d; - - handle = lvm_init(NULL); - assert(handle); - - vg = lvm_vg_open(handle, argv[1], "r", 0); - assert(vg); - - lv = lvm_lv_from_name(vg, "snap"); - assert(lv); - - v = lvm_lv_get_property(lv, "snap_percent"); - assert(v.is_valid); - assert(v.value.integer == PERCENT_0); - - lv = lvm_lv_from_name(vg, "mirr"); - assert(lv); - - v = lvm_lv_get_property(lv, "copy_percent"); - assert(v.is_valid); - assert(v.value.integer == PERCENT_100); - - lv = lvm_lv_from_name(vg, "snap2"); - assert(lv); - - v = lvm_lv_get_property(lv, "snap_percent"); - assert(v.is_valid); - assert(v.value.integer == 50 * PERCENT_1); - - d = lvm_lv_get_property(lv, "data_percent"); - assert(d.is_valid); - assert(d.value.integer == v.value.integer); - - lvm_vg_close(vg); - - lvm_quit(handle); - return 0; -} diff --git a/test/api/test.c b/test/api/test.c deleted file mode 100644 index a4d200b..0000000 --- a/test/api/test.c +++ /dev/null @@ -1,1110 +0,0 @@ -/* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <ctype.h> - -#include "configure.h" -#include "liblvm/lvm2app.h" - -#ifdef READLINE_SUPPORT -#include <readline/readline.h> - -#define MAX_ARGS 64 - -static int lvm_split(char *str, int *argc, char **argv, int max) -{ - char *b = str, *e; - *argc = 0; - - while (*b) { - while (*b && isspace(*b)) - b++; - - if ((!*b) || ((*argc == 0)&&(*b == '#'))) - break; - - e = b; - while (*e && !isspace(*e)) - e++; - - argv[(*argc)++] = b; - if (!*e) - break; - *e++ = '\0'; - b = e; - if (*argc == max) - break; - } - - if (*argc < max) - argv[*argc] = NULL; - - return *argc; -} - -static void _show_help(void) -{ - printf("'lv_activate vgname lvname: " - "Activate an LV\n"); - printf("'lv_deactivate vgname lvname: " - "Deactivate an LV\n"); - printf("'vg_remove_lv vgname lvname': " - "Remove a LV\n"); - printf("'vg_create_lv_linear vgname lvname size_in_bytes': " - "Create a linear LV\n"); - printf("'scan_vgs': " - "Scan the system for LVM metadata\n"); - printf("'list_vg_names': " - "List the names of the VGs that exist in the system\n"); - printf("'list_vg_ids': " - "List the uuids of the VGs that exist in the system\n"); - printf("'vg_list_pvs vgname': " - "List the PVs that exist in VG vgname\n"); - printf("'pv_list_pvsegs pvname': " - "List the PV segments that exist in PV pvname\n"); - printf("'vg_list_lvs vgname': " - "List the LVs that exist in VG vgname\n"); - printf("'lv_list_lvsegs vgname lvname': " - "List the LV segments that exist in LV vgname/lvname\n"); - printf("'vgs_open': " - "List the VGs that are currently open\n"); - printf("'vgs': " - "List all VGs known to the system\n"); - printf("'vg_extend vgname device: " - "Issue a lvm_vg_extend() API call on VG 'vgname'\n"); - printf("'vg_reduce vgname device: " - "Issue a lvm_vg_reduce() API call on VG 'vgname'\n"); - printf("'vg_open vgname ['r' | 'w']': " - "Issue a lvm_vg_open() API call on VG 'vgname'\n"); - printf("'vg_close vgname': " - "Issue a lvm_vg_close() API call on VG 'vgname'\n"); - printf("'vg_create vgname: " - "Issue a lvm_vg_create() to create VG 'vgname'\n"); - printf("'vg_remove vgname: " - "Issue a lvm_vg_remove() to remove VG 'vgname'\n"); - printf("'config_reload': " - "Issue a lvm_config_reload() API to reload LVM config\n"); - printf("'config_override' device: " - "Issue a lvm_config_override() with accept device filter\n"); - printf("'vg_get_tags vgname': " - "List the tags of a VG\n"); - printf("'lv_get_property vgname lvname property_name': " - "Display the value of LV property\n"); - printf("'vg_get_property vgname property_name': " - "Display the value of VG property\n"); - printf("'pv_get_property pvname property_name': " - "Display the value of PV property\n"); - printf("'vg_set_property vgname property_name': " - "Set the value of VG property\n"); - printf("'lv_get_tags vgname lvname': " - "List the tags of a LV\n"); - printf("'vg_{add|remove}_tag vgname tag': " - "Add/remove a tag from a VG\n"); - printf("'lv_{add|remove}_tag vgname lvname tag': " - "Add/remove a tag from a LV\n"); - printf("'vgname_from_devname device': " - "Lookup a vgname from a device name\n"); - printf("'vgname_from_pvid pvid': " - "Lookup a vgname from a pvid\n"); - printf("'lv_from_uuid vgname lvuuid': " - "Lookup an LV from an LV uuid\n"); - printf("'lv_from_name vgname lvname': " - "Lookup an LV from an LV name\n"); - printf("'pv_from_uuid vgname pvuuid': " - "Lookup an LV from an LV uuid\n"); - printf("'pv_from_name vgname pvname': " - "Lookup an LV from an LV name\n"); - printf("'quit': exit the program\n"); -} - -static struct dm_hash_table *_vgid_hash = NULL; -static struct dm_hash_table *_vgname_hash = NULL; -static struct dm_hash_table *_pvname_hash = NULL; -static struct dm_hash_table *_lvname_hash = NULL; - -static void _hash_destroy_single(struct dm_hash_table **htable) -{ - if (htable && *htable) { - dm_hash_destroy(*htable); - *htable = NULL; - } -} - -static void _hash_destroy(void) -{ - _hash_destroy_single(&_vgname_hash); - _hash_destroy_single(&_vgid_hash); - _hash_destroy_single(&_pvname_hash); - _hash_destroy_single(&_lvname_hash); -} - -static int _hash_create(void) -{ - if (!(_vgname_hash = dm_hash_create(128))) - return 0; - if (!(_pvname_hash = dm_hash_create(128))) { - _hash_destroy_single(&_vgname_hash); - return 0; - } - if (!(_lvname_hash = dm_hash_create(128))) { - _hash_destroy_single(&_vgname_hash); - _hash_destroy_single(&_pvname_hash); - return 0; - } - if (!(_vgid_hash = dm_hash_create(128))) { - _hash_destroy_single(&_vgname_hash); - _hash_destroy_single(&_pvname_hash); - _hash_destroy_single(&_lvname_hash); - return 0; - } - return 1; -} - -/* FIXME: this should be per vg */ -static lv_t _lookup_lv_by_name(const char *name) -{ - lv_t lv; - - if (!name) { - printf ("Invalid LV name\n"); - return NULL; - } - if (!(lv = dm_hash_lookup(_lvname_hash, name))) { - printf ("Can't find %s in LVs - run vg_create_lv first\n", - name); - return NULL; - } - return lv; -} - -static vg_t _lookup_vg_by_name(char **argv, int argc) -{ - vg_t vg; - - if (argc < 2) { - printf ("Please enter vg_name\n"); - return NULL; - } - if (!(vg = dm_hash_lookup(_vgid_hash, argv[1])) && - !(vg = dm_hash_lookup(_vgname_hash, argv[1]))) { - printf ("Can't find %s in open VGs - run vg_open first\n", - argv[1]); - return NULL; - } - return vg; -} - -static pv_t _lookup_pv_by_name(const char *name) -{ - pv_t pv; - - if (!(pv = dm_hash_lookup(_pvname_hash, name))) { - printf ("Can't find %s in open PVs - run vg_open first\n", - name); - return NULL; - } - return pv; -} - -static void _add_lvs_to_lvname_hash(struct dm_list *lvs) -{ - struct lvm_lv_list *lvl; - dm_list_iterate_items(lvl, lvs) { - /* Concatenate VG name with LV name */ - dm_hash_insert(_lvname_hash, lvm_lv_get_name(lvl->lv), lvl->lv); - } -} - -static void _add_pvs_to_pvname_hash(struct dm_list *pvs) -{ - struct lvm_pv_list *pvl; - dm_list_iterate_items(pvl, pvs) { - dm_hash_insert(_pvname_hash, lvm_pv_get_name(pvl->pv), pvl->pv); - } -} - -static void _remove_device_from_pvname_hash(struct dm_list *pvs, const char *name) -{ - struct lvm_pv_list *pvl; - dm_list_iterate_items(pvl, pvs) { - if (!strncmp(lvm_pv_get_name(pvl->pv), name, strlen(name))) - dm_hash_remove(_pvname_hash, name); - } -} -static void _add_device_to_pvname_hash(struct dm_list *pvs, const char *name) -{ - struct lvm_pv_list *pvl; - dm_list_iterate_items(pvl, pvs) { - if (!strncmp(lvm_pv_get_name(pvl->pv), name, strlen(name))) - dm_hash_insert(_pvname_hash, name, pvl->pv); - } -} - -static void _vg_reduce(char **argv, int argc, lvm_t libh) -{ - vg_t vg; - struct dm_list *pvs; - - if (argc < 2) { - printf ("Please enter vg_name\n"); - return; - } - if (!(vg = dm_hash_lookup(_vgid_hash, argv[1])) && - !(vg = dm_hash_lookup(_vgname_hash, argv[1]))) { - printf ("VG not open\n"); - return; - } - if (lvm_vg_reduce(vg, argv[2])) { - printf("Error reducing %s by %s\n", argv[1], argv[2]); - return; - } - - printf("Success reducing vg %s by %s\n", argv[1], argv[2]); - - /* - * Add the device into the hashes for lookups - */ - pvs = lvm_vg_list_pvs(vg); - if (pvs && !dm_list_empty(pvs)) - _remove_device_from_pvname_hash(pvs, argv[2]); -} - -/* Print "Error" or "Success" depending on lvm status */ -static int _lvm_status_to_pass_fail(int rc) -{ - if (rc) - printf("Error "); - else - printf("Success "); - return rc; -} -static void _config_override(char **argv, int argc, lvm_t libh) -{ - int rc; - char tmp[64]; - - if (argc < 2) { - printf ("Please enter device\n"); - return; - } - snprintf(tmp, 63, "devices{filter=[\"a|%s|\", \"r|.*|\"]}", argv[1]); - rc = lvm_config_override(libh, tmp); - _lvm_status_to_pass_fail(rc); - printf("overriding LVM configuration\n"); -} - -static void _config_reload(char **argv, int argc, lvm_t libh) -{ - int rc; - rc = lvm_config_reload(libh); - _lvm_status_to_pass_fail(rc); - printf("reloading LVM configuration\n"); -} - -static void _vg_extend(char **argv, int argc, lvm_t libh) -{ - vg_t vg; - struct dm_list *pvs; - - if (argc < 2) { - printf ("Please enter vg_name\n"); - return; - } - if (!(vg = dm_hash_lookup(_vgid_hash, argv[1])) && - !(vg = dm_hash_lookup(_vgname_hash, argv[1]))) { - printf ("VG not open\n"); - return; - } - if (lvm_vg_extend(vg, argv[2])) { - printf("Error extending %s with %s\n", argv[1], argv[2]); - return; - } - - printf("Success extending vg %s with %s\n", argv[1], argv[2]); - - /* - * Add the device into the hashes for lookups - */ - pvs = lvm_vg_list_pvs(vg); - if (pvs && !dm_list_empty(pvs)) - _add_device_to_pvname_hash(pvs, argv[2]); -} - -static void _vg_open(char **argv, int argc, lvm_t libh) -{ - vg_t vg; - struct dm_list *lvs; - struct dm_list *pvs; - - if (argc < 2) { - printf ("Please enter vg_name\n"); - return; - } - if ((vg = dm_hash_lookup(_vgid_hash, argv[1])) || - (vg = dm_hash_lookup(_vgname_hash, argv[1]))) { - printf ("VG already open\n"); - return; - } - if (argc < 3) - vg = lvm_vg_open(libh, argv[1], "r", 0); - else - vg = lvm_vg_open(libh, argv[1], argv[2], 0); - if (!vg || !lvm_vg_get_name(vg)) { - printf("Error opening %s\n", argv[1]); - return; - } - - printf("Success opening vg %s\n", argv[1]); - dm_hash_insert(_vgname_hash, lvm_vg_get_name(vg), vg); - dm_hash_insert(_vgid_hash, lvm_vg_get_uuid(vg), vg); - - /* - * Add the LVs and PVs into the hashes for lookups - */ - lvs = lvm_vg_list_lvs(vg); - if (lvs && !dm_list_empty(lvs)) - _add_lvs_to_lvname_hash(lvs); - pvs = lvm_vg_list_pvs(vg); - if (pvs && !dm_list_empty(pvs)) - _add_pvs_to_pvname_hash(pvs); -} -/* Lookup the vg and remove it from the vgname and vgid hashes */ -static vg_t _lookup_and_remove_vg(const char *vgname) -{ - vg_t vg=NULL; - - if ((vg = dm_hash_lookup(_vgname_hash, vgname))) { - dm_hash_remove(_vgid_hash, lvm_vg_get_uuid(vg)); - dm_hash_remove(_vgname_hash, lvm_vg_get_name(vg)); - } - if (!vg && (vg = dm_hash_lookup(_vgid_hash, vgname))) { - dm_hash_remove(_vgid_hash, lvm_vg_get_uuid(vg)); - dm_hash_remove(_vgname_hash, lvm_vg_get_name(vg)); - } - return vg; -} - -static void _vg_write(char **argv, int argc) -{ - vg_t vg; - int rc = 0; - - if (argc < 2) { - printf ("Please enter vg_name\n"); - return; - } - vg = _lookup_vg_by_name(argv, argc); - if (!vg) { - printf("Can't find vg_name %s\n", argv[1]); - return; - } - rc = lvm_vg_write(vg); - _lvm_status_to_pass_fail(rc); - printf("writing VG %s\n", lvm_vg_get_name(vg)); -} - -static void _vg_create(char **argv, int argc, lvm_t libh) -{ - vg_t vg; - - if (argc < 2) { - printf ("Please enter vg_name\n"); - return; - } - vg = lvm_vg_create(libh, argv[1]); - if (!vg || !lvm_vg_get_name(vg)) { - printf("Error creating %s\n", argv[1]); - return; - } - - printf("Success creating vg %s\n", argv[1]); - dm_hash_insert(_vgname_hash, lvm_vg_get_name(vg), vg); - dm_hash_insert(_vgid_hash, lvm_vg_get_uuid(vg), vg); -} - -static void _vg_remove(char **argv, int argc) -{ - vg_t vg; - int rc = 0; - - if (argc < 2) { - printf ("Please enter vg_name\n"); - return; - } - vg = _lookup_vg_by_name(argv, argc); - if (!vg) { - printf("Can't find vg_name %s\n", argv[1]); - return; - } - rc = lvm_vg_remove(vg); - _lvm_status_to_pass_fail(rc); - printf("removing VG\n"); -} - -static void _vg_close(char **argv, int argc) -{ - vg_t vg; - int rc = 0; - - if (argc < 2) { - printf ("Please enter vg_name\n"); - return; - } - vg = _lookup_and_remove_vg(argv[1]); - if (!vg) { - printf("Can't find vg_name %s\n", argv[1]); - return; - } - rc = lvm_vg_close(vg); - _lvm_status_to_pass_fail(rc); - printf("closing VG\n"); -} - -static void _show_one_vg(vg_t vg) -{ - printf("%s (%s): sz=%"PRIu64", free=%"PRIu64", #pv=%"PRIu64 - ", seq#=%"PRIu64"\n", - lvm_vg_get_name(vg), lvm_vg_get_uuid(vg), - lvm_vg_get_size(vg), lvm_vg_get_free_size(vg), - lvm_vg_get_pv_count(vg), lvm_vg_get_seqno(vg)); -} - -static void _print_pv(pv_t pv) -{ - if (!pv) - return; - printf("%s (%s): size=%"PRIu64", free=%"PRIu64 - ", dev_size=%"PRIu64", mda_count=%"PRIu64"\n", - lvm_pv_get_name(pv), lvm_pv_get_uuid(pv), - lvm_pv_get_size(pv), lvm_pv_get_free(pv), - lvm_pv_get_dev_size(pv), - lvm_pv_get_mda_count(pv)); -} - -static void _print_lv(vg_t vg, lv_t lv) -{ - if (!lv) - return; - printf("%s/%s (%s): size=%"PRIu64", %sACTIVE / %sSUSPENDED\n", - lvm_vg_get_name(vg), - lvm_lv_get_name(lv), lvm_lv_get_uuid(lv), - lvm_lv_get_size(lv), - lvm_lv_is_active(lv) ? "" : "IN", - lvm_lv_is_suspended(lv) ? "" : "NOT "); -} - -static void _list_open_vgs(void) -{ - dm_hash_iter(_vgid_hash, (dm_hash_iterate_fn) _show_one_vg); -} - -static void _pvs_in_vg(char **argv, int argc) -{ - struct dm_list *pvs; - struct lvm_pv_list *pvl; - vg_t vg; - - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - pvs = lvm_vg_list_pvs(vg); - if (!pvs || dm_list_empty(pvs)) { - printf("No PVs in VG %s\n", lvm_vg_get_name(vg)); - return; - } - printf("PVs in VG %s:\n", lvm_vg_get_name(vg)); - dm_list_iterate_items(pvl, pvs) { - _print_pv(pvl->pv); - } -} - -static void _print_property_value(const char *name, - struct lvm_property_value v) -{ - if (!v.is_valid) - printf("%s = INVALID\n", name); - else if (v.is_string) - printf("%s = %s\n", name, v.value.string); - else - printf("%s = %"PRIu64"\n", name, v.value.integer); -} - -static void _pvsegs_in_pv(char **argv, int argc) -{ - struct dm_list *pvsegs; - struct lvm_pvseg_list *pvl; - pv_t pv; - - if (!(pv = _lookup_pv_by_name(argv[1]))) - return; - pvsegs = lvm_pv_list_pvsegs(pv); - if (!pvsegs || dm_list_empty(pvsegs)) { - printf("No PV segments in pv %s\n", argv[1]); - return; - } - printf("PV segments in pv %s:\n", argv[1]); - dm_list_iterate_items(pvl, pvsegs) { - struct lvm_property_value v; - v = lvm_pvseg_get_property(pvl->pvseg, "pvseg_start"); - _print_property_value("pvseg_start", v); - v = lvm_pvseg_get_property(pvl->pvseg, "pvseg_size"); - _print_property_value("pvseg_size", v); - } -} - -static void _scan_vgs(lvm_t libh) -{ - lvm_scan(libh); -} - -static void _list_vg_names(lvm_t libh) -{ - struct dm_list *list; - struct lvm_str_list *strl; - - list = lvm_list_vg_names(libh); - printf("VG names:\n"); - dm_list_iterate_items(strl, list) { - printf("%s\n", strl->str); - } -} - -static void _list_vg_ids(lvm_t libh) -{ - struct dm_list *list; - struct lvm_str_list *strl; - - list = lvm_list_vg_uuids(libh); - printf("VG uuids:\n"); - dm_list_iterate_items(strl, list) { - printf("%s\n", strl->str); - } -} - -static void _display_tags(struct dm_list *list) -{ - struct lvm_str_list *strl; - if (dm_list_empty(list)) { - printf("No tags exist\n"); - return; - } else if (!list) { - printf("Error obtaining tags\n"); - return; - } - dm_list_iterate_items(strl, list) { - printf("%s\n", strl->str); - } -} - -static void _vg_get_tags(char **argv, int argc) -{ - vg_t vg; - - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - printf("VG tags:\n"); - _display_tags(lvm_vg_get_tags(vg)); -} - -static void _vg_tag(char **argv, int argc, int add) -{ - vg_t vg; - - if (argc < 3) { - printf("Please enter vgname, tag\n"); - return; - } - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - if (add && lvm_vg_add_tag(vg, argv[2])) - printf("Error "); - else if (!add && lvm_vg_remove_tag(vg, argv[2])){ - printf("Error "); - } else { - printf("Success "); - } - printf("%s tag %s to VG %s\n", - add ? "adding":"removing", argv[2], argv[1]); -} - -static void _pv_get_property(char **argv, int argc) -{ - pv_t pv; - struct lvm_property_value v; - - if (argc < 3) { - printf("Please enter pvname, field_id\n"); - return; - } - if (!(pv = _lookup_pv_by_name(argv[1]))) - return; - v = lvm_pv_get_property(pv, argv[2]); - _print_property_value(argv[2], v); -} - -static void _vg_get_property(char **argv, int argc) -{ - vg_t vg; - struct lvm_property_value v; - - if (argc < 3) { - printf("Please enter vgname, field_id\n"); - return; - } - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - v = lvm_vg_get_property(vg, argv[2]); - _print_property_value(argv[2], v); -} - -static void _lv_get_property(char **argv, int argc) -{ - lv_t lv; - struct lvm_property_value v; - - if (argc < 4) { - printf("Please enter vgname, lvname, field_id\n"); - return; - } - if (!(lv = _lookup_lv_by_name(argv[2]))) - return; - v = lvm_lv_get_property(lv, argv[3]); - _print_property_value(argv[3], v); -} - -static void _vg_set_property(char **argv, int argc) -{ - vg_t vg; - struct lvm_property_value value; - int rc; - - if (argc < 4) { - printf("Please enter vgname, field_id, value\n"); - return; - } - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - value = lvm_vg_get_property(vg, argv[2]); - if (!value.is_valid) { - printf("Error obtaining property value\n"); - return; - } - if (value.is_string) - value.value.string = argv[3]; - else - value.value.integer = atoi(argv[3]); - rc = lvm_vg_set_property(vg, argv[2], &value); - if (rc) - printf("Error "); - else - printf("Success "); - printf("setting value of property %s in VG %s\n", - argv[2], argv[1]); -} - -static void _lv_get_tags(char **argv, int argc) -{ - lv_t lv; - - if (argc < 3) { - printf("Please enter vgname, lvname\n"); - return; - } - if (!(lv = _lookup_lv_by_name(argv[2]))) - return; - printf("LV tags:\n"); - _display_tags(lvm_lv_get_tags(lv)); -} - -static void _lv_tag(char **argv, int argc, int add) -{ - lv_t lv; - - if (argc < 3) { - printf("Please enter vgname, lvname\n"); - return; - } - if (!(lv = _lookup_lv_by_name(argv[2]))) - return; - if (add && lvm_lv_add_tag(lv, argv[3])) - printf("Error "); - else if (!add && lvm_lv_remove_tag(lv, argv[3])){ - printf("Error "); - } else { - printf("Success "); - } - printf("%s tag %s to LV %s\n", - add ? "adding":"removing", argv[3], argv[2]); -} - -static void _lv_from_uuid(char **argv, int argc) -{ - vg_t vg; - - if (argc < 3) { - printf("Please enter vgname, lv_uuid\n"); - return; - } - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - _print_lv(vg, lvm_lv_from_uuid(vg, argv[2])); -} - -static void _lv_from_name(char **argv, int argc) -{ - vg_t vg; - - if (argc < 3) { - printf("Please enter vgname, lv_uuid\n"); - return; - } - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - _print_lv(vg, lvm_lv_from_name(vg, argv[2])); -} - -static void _pv_from_uuid(char **argv, int argc) -{ - vg_t vg; - - if (argc < 3) { - printf("Please enter vgname, pv_uuid\n"); - return; - } - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - _print_pv(lvm_pv_from_uuid(vg, argv[2])); -} - -static void _pv_from_name(char **argv, int argc) -{ - vg_t vg; - - if (argc < 3) { - printf("Please enter vgname, pv_uuid\n"); - return; - } - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - _print_pv(lvm_pv_from_name(vg, argv[2])); -} - -static void _vgname_from_pvid(char **argv, int argc, lvm_t libh) -{ - const char *vgname; - - if (argc < 1) { - printf("Please enter pvid\n"); - return; - } - if (!(vgname = lvm_vgname_from_pvid(libh, argv[1]))) { - printf("Error "); - } else { - printf("Success "); - } - printf("looking up vgname=%s from PVID=%s\n", - vgname, argv[1]); -} -static void _vgname_from_devname(char **argv, int argc, lvm_t libh) -{ - const char *vgname; - - if (argc < 1) { - printf("Please enter device\n"); - return; - } - if (!(vgname = lvm_vgname_from_device(libh, argv[1]))) { - printf("Error "); - } else { - printf("Success "); - } - printf("looking up vgname=%s from device name=%s\n", - vgname, argv[1]); -} -static void _lvs_in_vg(char **argv, int argc) -{ - struct dm_list *lvs; - struct lvm_lv_list *lvl; - vg_t vg; - - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - lvs = lvm_vg_list_lvs(vg); - if (!lvs || dm_list_empty(lvs)) { - printf("No LVs in VG %s\n", lvm_vg_get_name(vg)); - return; - } - printf("LVs in VG %s:\n", lvm_vg_get_name(vg)); - dm_list_iterate_items(lvl, lvs) { - _print_lv(vg, lvl->lv); - } -} - -static void _lvsegs_in_lv(char **argv, int argc) -{ - struct dm_list *lvsegs; - struct lvm_lvseg_list *lvl; - lv_t lv; - - if (!(lv = _lookup_lv_by_name(argv[2]))) - return; - lvsegs = lvm_lv_list_lvsegs(lv); - if (!lvsegs || dm_list_empty(lvsegs)) { - printf("No LV segments in lv %s\n", lvm_lv_get_name(lv)); - return; - } - printf("LV segments in lv %s:\n", lvm_lv_get_name(lv)); - dm_list_iterate_items(lvl, lvsegs) { - struct lvm_property_value v; - v = lvm_lvseg_get_property(lvl->lvseg, "segtype"); - _print_property_value("segtype", v); - v = lvm_lvseg_get_property(lvl->lvseg, "seg_start_pe"); - _print_property_value("seg_start_pe", v); - v = lvm_lvseg_get_property(lvl->lvseg, "seg_size"); - _print_property_value("seg_size", v); - v = lvm_lvseg_get_property(lvl->lvseg, "devices"); - _print_property_value("devices", v); - v = lvm_lvseg_get_property(lvl->lvseg, "seg_pe_ranges"); - _print_property_value("seg_pe_ranges", v); - } -} - -static void _lv_deactivate(char **argv, int argc) -{ - lv_t lv; - int rc=0; - - if (argc < 3) { - printf("Please enter vgname, lvname\n"); - return; - } - if (!(lv = _lookup_lv_by_name(argv[2]))) - return; - rc = lvm_lv_deactivate(lv); - _lvm_status_to_pass_fail(rc); - printf("De-activating LV %s in VG %s\n", - argv[2], argv[1]); -} -static void _lv_activate(char **argv, int argc) -{ - lv_t lv; - int rc=0; - - if (argc < 3) { - printf("Please enter vgname, lvname\n"); - return; - } - if (!(lv = _lookup_lv_by_name(argv[2]))) - return; - rc = lvm_lv_activate(lv); - _lvm_status_to_pass_fail(rc); - printf("activating LV %s in VG %s\n", - argv[2], argv[1]); -} - -static void _vg_remove_lv(char **argv, int argc) -{ - lv_t lv; - - if (argc < 3) { - printf("Please enter vgname, lvname\n"); - return; - } - if (!(lv = _lookup_lv_by_name(argv[2]))) - return; - if (lvm_vg_remove_lv(lv)) - printf("Error "); - else { - printf("Success "); - dm_hash_remove(_lvname_hash, argv[2]); - } - printf("removing LV %s in VG %s\n", - argv[2], argv[1]); -} - -static void _vg_create_lv_linear(char **argv, int argc) -{ - vg_t vg; - lv_t lv; - - if (argc < 4) { - printf("Please enter vgname, lvname, and size\n"); - return; - } - if (!(vg = _lookup_vg_by_name(argv, argc))) - return; - lv = lvm_vg_create_lv_linear(vg, argv[2], atol(argv[3])); - if (!lv) - printf("Error "); - else { - printf("Success "); - dm_hash_insert(_lvname_hash, argv[2], lv); - } - printf("creating LV %s in VG %s\n", - argv[2], argv[1]); -} - -static int lvmapi_test_shell(lvm_t libh) -{ - int argc; - char *input = NULL, *args[MAX_ARGS], **argv; - - _hash_create(); - argc=0; - while (1) { - free(input); - input = readline("liblvm> "); - - /* EOF */ - if (!input) { - printf("\n"); - break; - } - - /* empty line */ - if (!*input) - continue; - - argv = args; - - if (lvm_split(input, &argc, argv, MAX_ARGS) == MAX_ARGS) { - printf("Too many arguments, sorry."); - continue; - } - - if (!strcmp(argv[0], "lvm")) { - argv++; - argc--; - } - - if (!argc) - continue; - - if (!strcmp(argv[0], "quit") || !strcmp(argv[0], "exit")) { - printf("Exiting.\n"); - break; - } else if (!strcmp(argv[0], "?") || !strcmp(argv[0], "help")) { - _show_help(); - } else if (!strcmp(argv[0], "config_reload")) { - _config_reload(argv, argc, libh); - } else if (!strcmp(argv[0], "config_override")) { - _config_override(argv, argc, libh); - } else if (!strcmp(argv[0], "vg_extend")) { - _vg_extend(argv, argc, libh); - } else if (!strcmp(argv[0], "vg_reduce")) { - _vg_reduce(argv, argc, libh); - } else if (!strcmp(argv[0], "vg_write")) { - _vg_write(argv, argc); - } else if (!strcmp(argv[0], "vg_open")) { - _vg_open(argv, argc, libh); - } else if (!strcmp(argv[0], "vg_close")) { - _vg_close(argv, argc); - } else if (!strcmp(argv[0], "vg_create")) { - _vg_create(argv, argc, libh); - } else if (!strcmp(argv[0], "vg_remove")) { - _vg_remove(argv, argc); - } else if (!strcmp(argv[0], "lv_activate")) { - _lv_activate(argv, argc); - } else if (!strcmp(argv[0], "lv_deactivate")) { - _lv_deactivate(argv, argc); - } else if (!strcmp(argv[0], "vg_remove_lv")) { - _vg_remove_lv(argv, argc); - } else if (!strcmp(argv[0], "vgs_open")) { - _list_open_vgs(); - } else if (!strcmp(argv[0], "vg_list_pvs")) { - _pvs_in_vg(argv, argc); - } else if (!strcmp(argv[0], "pv_list_pvsegs")) { - _pvsegs_in_pv(argv, argc); - } else if (!strcmp(argv[0], "vg_list_lvs")) { - _lvs_in_vg(argv, argc); - } else if (!strcmp(argv[0], "lv_list_lvsegs")) { - _lvsegs_in_lv(argv, argc); - } else if (!strcmp(argv[0], "list_vg_names")) { - _list_vg_names(libh); - } else if (!strcmp(argv[0], "list_vg_ids")) { - _list_vg_ids(libh); - } else if (!strcmp(argv[0], "scan_vgs")) { - _scan_vgs(libh); - } else if (!strcmp(argv[0], "vg_create_lv_linear")) { - _vg_create_lv_linear(argv, argc); - } else if (!strcmp(argv[0], "vg_add_tag")) { - _vg_tag(argv, argc, 1); - } else if (!strcmp(argv[0], "vg_remove_tag")) { - _vg_tag(argv, argc, 0); - } else if (!strcmp(argv[0], "vg_get_tags")) { - _vg_get_tags(argv, argc); - } else if (!strcmp(argv[0], "lv_get_property")) { - _lv_get_property(argv, argc); - } else if (!strcmp(argv[0], "vg_get_property")) { - _vg_get_property(argv, argc); - } else if (!strcmp(argv[0], "pv_get_property")) { - _pv_get_property(argv, argc); - } else if (!strcmp(argv[0], "vg_set_property")) { - _vg_set_property(argv, argc); - } else if (!strcmp(argv[0], "lv_add_tag")) { - _lv_tag(argv, argc, 1); - } else if (!strcmp(argv[0], "lv_remove_tag")) { - _lv_tag(argv, argc, 0); - } else if (!strcmp(argv[0], "lv_get_tags")) { - _lv_get_tags(argv, argc); - } else if (!strcmp(argv[0], "vgname_from_devname")) { - _vgname_from_devname(argv, argc, libh); - } else if (!strcmp(argv[0], "vgname_from_pvid")) { - _vgname_from_pvid(argv, argc, libh); - } else if (!strcmp(argv[0], "lv_from_uuid")) { - _lv_from_uuid(argv, argc); - } else if (!strcmp(argv[0], "lv_from_name")) { - _lv_from_name(argv, argc); - } else if (!strcmp(argv[0], "pv_from_uuid")) { - _pv_from_uuid(argv, argc); - } else if (!strcmp(argv[0], "pv_from_name")) { - _pv_from_name(argv, argc); - } else { - printf ("Unrecognized command %s\n", argv[0]); - } - } - - dm_hash_iter(_vgname_hash, (dm_hash_iterate_fn) lvm_vg_close); - _hash_destroy(); - free(input); - return 0; -} -#else /* !READLINE_SUPPORT */ -static int lvmapi_test_shell(lvm_t libh) -{ - printf("Build without readline library, no interactive testing.\n"); - return 1; -} -#endif - -int main (int argc, char *argv[]) -{ - lvm_t libh; - - libh = lvm_init(NULL); - if (!libh) { - printf("Unable to open lvm library instance\n"); - return 1; - } - - printf("Library version: %s\n", lvm_library_get_version()); - lvmapi_test_shell(libh); - - lvm_quit(libh); - return 0; -} - diff --git a/test/api/thin_percent.c b/test/api/thin_percent.c deleted file mode 100644 index 7f99abf..0000000 --- a/test/api/thin_percent.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2012 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#undef NDEBUG - -#include "liblvm/lvm2app.h" -#include "assert.h" - -int main(int argc, char *argv[]) -{ - lvm_t handle; - vg_t vg; - lv_t lv; - struct lvm_property_value v; - struct dm_list *lvsegs; - struct lvm_lvseg_list *lvl; - - handle = lvm_init(NULL); - assert(handle); - - vg = lvm_vg_open(handle, argv[1], "r", 0); - assert(vg); - - lv = lvm_lv_from_name(vg, "pool"); - assert(lv); - - lvsegs = lvm_lv_list_lvsegs(lv); - assert(lvsegs && (dm_list_size(lvsegs) == 1)); - dm_list_iterate_items(lvl, lvsegs) { - v = lvm_lvseg_get_property(lvl->lvseg, "discards"); - assert(v.is_valid && v.is_string); - assert(strcmp(v.value.string, "passdown") == 0); - } - - v = lvm_lv_get_property(lv, "data_percent"); - assert(v.is_valid); - assert(v.value.integer == 25 * PERCENT_1); - - - lv = lvm_lv_from_name(vg, "thin"); - assert(lv); - - v = lvm_lv_get_property(lv, "data_percent"); - assert(v.is_valid); - assert(v.value.integer == 50 * PERCENT_1); - - - lv = lvm_lv_from_name(vg, "snap"); - assert(lv); - - v = lvm_lv_get_property(lv, "data_percent"); - assert(v.is_valid); - assert(v.value.integer == 75 * PERCENT_1); - - v = lvm_lv_get_property(lv, "snap_percent"); - assert(v.is_valid); - assert(v.value.integer == (uint64_t) DM_PERCENT_INVALID); - - v = lvm_lv_get_property(lv, "origin"); - assert(v.is_valid); - assert(strcmp(v.value.string, "thin") == 0); - - lvm_vg_close(vg); - lvm_quit(handle); - - return 0; -} diff --git a/test/api/vglist.c b/test/api/vglist.c deleted file mode 100644 index daa21c2..0000000 --- a/test/api/vglist.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) 2009 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdio.h> -#include <unistd.h> -#include <inttypes.h> -#include <assert.h> - -#include "liblvm/lvm2app.h" - -lvm_t handle; -vg_t vg; - -static void start(void) { - handle = lvm_init(NULL); - if (!handle) { - fprintf(stderr, "Unable to lvm_init\n"); - abort(); - } -} - -static void done(int ok) { - if (handle && lvm_errno(handle)) { - fprintf(stderr, "LVM Error: %s\n", lvm_errmsg(handle)); - ok = 0; - } - if (handle) - lvm_quit(handle); - if (!ok) - abort(); -} - -int main(int argc, char *argv[]) -{ - lvm_str_list_t *str; - int i = 0; - struct dm_list *vgnames; - struct dm_list *vgids; - - if (argc != 3) - abort(); - - start(); - vgnames = lvm_list_vg_names(handle); - dm_list_iterate_items(str, vgnames) { - assert(++i <= 1); - assert(!strcmp(str->str, argv[1])); - } - assert(i == 1); - done(1); - - i = 0; - start(); - vgids = lvm_list_vg_uuids(handle); - dm_list_iterate_items(str, vgids) { - assert(++i <= 1); - assert(!strcmp(str->str, argv[2])); - } - assert(i == 1); - done(1); - return 0; -} diff --git a/test/api/vgtest.c b/test/api/vgtest.c deleted file mode 100644 index 6a438d1..0000000 --- a/test/api/vgtest.c +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright (C) 2009 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -/* - * Unit test case for vgcreate and related APIs. - * # gcc -g vgcreate.c -I../../liblvm -I../../include -L../../liblvm \ - * -L../../libdm -ldevmapper -llvm2app - * # export LD_LIBRARY_PATH=`pwd`/../../libdm:`pwd`/../../liblvm - */ -#include <stdio.h> -#include <unistd.h> -#include <inttypes.h> - -#include "liblvm/lvm2app.h" - -lvm_t handle; -vg_t vg; -const char *vg_name; -#define MAX_DEVICES 16 -const char *device[MAX_DEVICES]; -uint64_t size = 4096; - -#define vg_create(vg_name) \ - printf("Creating VG %s\n", vg_name); \ - vg = lvm_vg_create(handle, vg_name); \ - if (!vg) { \ - fprintf(stderr, "Error creating volume group %s\n", vg_name); \ - goto bad; \ - } -#define vg_extend(vg, dev) \ - printf("Extending VG %s by %s\n", vg_name, dev); \ - status = lvm_vg_extend(vg, dev); \ - if (status) { \ - fprintf(stderr, "Error extending volume group %s " \ - "with device %s\n", vg_name, dev); \ - goto bad; \ - } -#define vg_commit(vg) \ - printf("Committing VG %s to disk\n", vg_name); \ - status = lvm_vg_write(vg); \ - if (status) { \ - fprintf(stderr, "Commit of volume group '%s' failed\n", \ - lvm_vg_get_name(vg)); \ - goto bad; \ - } -#define vg_open(vg_name, mode) \ - printf("Opening VG %s %s\n", vg_name, mode); \ - vg = lvm_vg_open(handle, vg_name, mode, 0); \ - if (!vg) { \ - fprintf(stderr, "Error opening volume group %s\n", vg_name); \ - goto bad; \ - } -#define vg_close(vg) \ - printf("Closing VG %s\n", vg_name); \ - if (lvm_vg_close(vg)) { \ - fprintf(stderr, "Error closing volume group %s\n", vg_name); \ - goto bad; \ - } -#define vg_reduce(vg, dev) \ - printf("Reducing VG %s by %s\n", vg_name, dev); \ - status = lvm_vg_reduce(vg, dev); \ - if (status) { \ - fprintf(stderr, "Error reducing volume group %s " \ - "by device %s\n", vg_name, dev); \ - goto bad; \ - } -#define vg_remove(vg) \ - printf("Removing VG %s from system\n", vg_name); \ - status = lvm_vg_remove(vg); \ - if (status) { \ - fprintf(stderr, "Revmoval of volume group '%s' failed\n", \ - vg_name); \ - goto bad; \ - } - -static int init_vgtest(int argc, char *argv[]) -{ - int i; - - if (argc < 4) { - fprintf(stderr, "Usage: %s <vgname> <pv1> <pv2> [... <pvN> ]", - argv[0]); - return -1; - } - vg_name = argv[1]; - for(i=2; i<MAX_DEVICES && i < argc; i++) { - device[i-2] = argv[i]; - } - return 0; -} - -int main(int argc, char *argv[]) -{ - int status; - - if (init_vgtest(argc, argv) < 0) - goto bad; - - /* FIXME: make the below messages verbose-only and print PASS/FAIL*/ - printf("Opening LVM\n"); - handle = lvm_init(NULL); - if (!handle) { - fprintf(stderr, "Unable to lvm_init\n"); - goto bad; - } - - printf("Library version: %s\n", lvm_library_get_version()); - vg_create(vg_name); - vg_extend(vg, device[0]); - - printf("Setting VG %s extent_size to %"PRIu64"\n", vg_name, size); - status = lvm_vg_set_extent_size(vg, size); - if (status) { - fprintf(stderr, "Can not set physical extent " - "size '%"PRIu64"' for '%s'\n", - size, vg_name); - goto bad; - } - - vg_commit(vg); - vg_close(vg); - - vg_open(vg_name, "r"); - vg_close(vg); - - vg_open(vg_name, "w"); - vg_extend(vg, device[1]); - vg_reduce(vg, device[0]); - vg_commit(vg); - vg_close(vg); - - vg_open(vg_name, "w"); - vg_extend(vg, device[0]); - vg_commit(vg); - vg_close(vg); - - vg_open(vg_name, "w"); - vg_remove(vg); - vg_commit(vg); - vg_close(vg); - - lvm_quit(handle); - printf("liblvm vgcreate unit test PASS\n"); - _exit(0); -bad: - printf("liblvm vgcreate unit test FAIL\n"); - if (handle && lvm_errno(handle)) - fprintf(stderr, "LVM Error: %s\n", lvm_errmsg(handle)); - if (vg) - lvm_vg_close(vg); - if (handle) - lvm_quit(handle); - _exit(-1); -}

1 0

master - Merge branch '2018-06-05-remove-applib'
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b67ef90438052d3e01f56… Commit: b67ef90438052d3e01f563cdd25e2268f4e02c20 Parent: cc87f55e256dec59e326163c66c50565b2521659 0d22b58172808f050abeacdb5d6a7b7132b91a8c Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 09:42:22 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 09:42:22 2018 +0100 Merge branch '2018-06-05-remove-applib' Makefile.in | 21 +- aclocal.m4 | 91 ++- configure | 1996 +--------------------------------------------- configure.ac | 63 +-- include/configure.h.in | 66 +-- liblvm/Doxyfile | 254 ------ liblvm/Makefile.in | 81 -- liblvm/liblvm2app.pc.in | 11 - liblvm/lvm2app.h | 1983 --------------------------------------------- liblvm/lvm_base.c | 216 ----- liblvm/lvm_lv.c | 820 ------------------- liblvm/lvm_misc.c | 168 ---- liblvm/lvm_misc.h | 46 -- liblvm/lvm_prop.c | 74 -- liblvm/lvm_prop.h | 49 -- liblvm/lvm_prop_fields.h | 22 - liblvm/lvm_pv.c | 474 ----------- liblvm/lvm_vg.c | 564 ------------- liblvm/test/vgadd.c | 90 --- liblvm/test/vgshow.c | 95 --- test/api/Makefile.in | 33 - test/api/lvtest.c | 64 -- test/api/pe_start.c | 47 -- test/api/percent.c | 63 -- test/api/test.c | 1110 -------------------------- test/api/thin_percent.c | 78 -- test/api/vglist.c | 73 -- test/api/vgtest.c | 164 ---- 28 files changed, 108 insertions(+), 8708 deletions(-)

1 0

master - Update WHATS_NEW
by Joe Thornber 08 Jun '18

08 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=cc87f55e256dec59e3261… Commit: cc87f55e256dec59e326163c66c50565b2521659 Parent: e6bb780d24246666fa05948ec449a8137280b443 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 8 09:42:05 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 8 09:42:05 2018 +0100 Update WHATS_NEW --- WHATS_NEW | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 7737313..d75ab1b 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,7 @@ -Version 2.02.178 - -==================================== +Version 3.0.0 +============= + Remove clvmd + Remove lvmlib (api) lvconvert: provide possible layouts between linear and striped/raid Use versionsort to fix archive file expiry beyond 100000 files.

1 0

master - Rework lock-override options and locking_type settings
by David Teigland 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e6bb780d24246666fa059… Commit: e6bb780d24246666fa05948ec449a8137280b443 Parent: c7c7017f0c12ebab4e1aef9d9a9fabd4ec2adfe3 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jun 7 15:33:02 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Jun 7 16:47:15 2018 -0500 Rework lock-override options and locking_type settings The last commit related to this was incomplete: "Implement lock-override options without locking type" This is further reworking and reduction of the locking.[ch] layer which handled all clustering, but is now only used for file locking. The "locking types" that this layer implemented were removed previously, leaving only the standard file locking. (Some cluster-related artifacts remain to be cleared out later.) Command options to override or modify locking behavior are reimplemented here without using the locking types. Also, deprecated locking_type values are recognized, and implemented as if one of the equivalent override options was set. Options that override file locking are: . --nolocking disables all file locking. . --readonly grants read lock requests without actually taking a file lock, and refuses write lock requests. . --ignorelockingfailure tries to set up file locks and uses them normally if possible. When not possible, it behaves like --readonly, but allows activation. . --sysinit is the same as ignorelockingfailure. . global/metadata_read_only acquires actual read file locks, and refuses write lock requests. (Some of these options could probably be deprecated because they were added as workarounds to various locking_type behaviors that are now deprecated.) The locking_type setting now has one valid value: 1 which refers to standard file locking. Configs that contain deprecated values are recognized and still work in largely the same way: . 0 disabled all locking, now implemented like --nolocking is set. Allow the nolocking option in all commands. . 1 is the normal file locking setting and is unchanged. . 2 was for external locking which was not used, and reverts to normal file locking. . 3 was for cluster/clvm. This reverts to normal file locking, and prints messages about lvmlockd. . 4 was equivalent to readonly, now implemented like --readonly is set. . 5 disabled all locking, now implemented like --nolocking is set. --- lib/commands/toolcontext.h | 1 + lib/config/config_settings.h | 43 +-------- lib/locking/locking.c | 216 ++++++++++++++++++++++++------------------ lib/locking/locking.h | 2 +- lib/misc/lvm-globals.c | 11 -- lib/misc/lvm-globals.h | 4 - lib/misc/sharedlib.c | 2 +- tools/command-lines.in | 4 +- tools/lvmcmdline.c | 53 ++++++----- 9 files changed, 163 insertions(+), 173 deletions(-) diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index b46e301..fee35d4 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -172,6 +172,7 @@ struct cmd_context { unsigned can_use_one_scan:1; unsigned is_clvmd:1; unsigned use_full_md_check:1; + unsigned is_activating:1; /* * Filtering. diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 6cc7b15..32a6476 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -785,51 +785,16 @@ cfg(global_etc_CFG, "etc", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_ETC_D "Location of /etc system configuration directory.\n") cfg(global_locking_type_CFG, "locking_type", global_CFG_SECTION, 0, CFG_TYPE_INT, 1, vsn(1, 0, 0), NULL, 0, NULL, - "Type of locking to use.\n" - "#\n" - "Accepted values:\n" - " 0\n" - " Turns off locking. Warning: this risks metadata corruption if\n" - " commands run concurrently.\n" - " 1\n" - " LVM uses local file-based locking, the standard mode.\n" - " 2\n" - " LVM uses the external shared library locking_library.\n" - " 3\n" - " LVM uses built-in clustered locking with clvmd.\n" - " This is incompatible with lvmetad. If use_lvmetad is enabled,\n" - " LVM prints a warning and disables lvmetad use.\n" - " 4\n" - " LVM uses read-only locking which forbids any operations that\n" - " might change metadata.\n" - " 5\n" - " Offers dummy locking for tools that do not need any locks.\n" - " You should not need to set this directly; the tools will select\n" - " when to use it instead of the configured locking_type.\n" - " Do not use lvmetad or the kernel device-mapper driver with this\n" - " locking type. It is used by the --readonly option that offers\n" - " read-only access to Volume Group metadata that cannot be locked\n" - " safely because it belongs to an inaccessible domain and might be\n" - " in use, for example a virtual machine image or a disk that is\n" - " shared by a clustered machine.\n" - "#\n") + "This setting is no longer used.") cfg(global_wait_for_locks_CFG, "wait_for_locks", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_WAIT_FOR_LOCKS, vsn(2, 2, 50), NULL, 0, NULL, "When disabled, fail if a lock request would block.\n") cfg(global_fallback_to_clustered_locking_CFG, "fallback_to_clustered_locking", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING, vsn(2, 2, 42), NULL, 0, NULL, - "Attempt to use built-in cluster locking if locking_type 2 fails.\n" - "If using external locking (type 2) and initialisation fails, with\n" - "this enabled, an attempt will be made to use the built-in clustered\n" - "locking. Disable this if using a customised locking_library.\n") + "This setting is no longer used.\n") cfg(global_fallback_to_local_locking_CFG, "fallback_to_local_locking", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_LOCAL_LOCKING, vsn(2, 2, 42), NULL, 0, NULL, - "Use locking_type 1 (local) if locking_type 2 or 3 fail.\n" - "If an attempt to initialise type 2 or type 3 locking failed, perhaps\n" - "because cluster components such as clvmd are not running, with this\n" - "enabled, an attempt will be made to use local file-based locking\n" - "(type 1). If this succeeds, only commands against local VGs will\n" - "proceed. VGs marked as clustered will be ignored.\n") + "This setting is no longer used.\n") cfg(global_locking_dir_CFG, "locking_dir", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_LOCK_DIR, vsn(1, 0, 0), "@DEFAULT_LOCK_DIR@", 0, NULL, "Directory to use for LVM command file locks.\n" @@ -849,7 +814,7 @@ cfg(global_library_dir_CFG, "library_dir", global_CFG_SECTION, CFG_DEFAULT_UNDEF "Search this directory first for shared libraries.\n") cfg(global_locking_library_CFG, "locking_library", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_LOCKING_LIB, vsn(1, 0, 0), NULL, 0, NULL, - "The external locking library to use for locking_type 2.\n") + "This setting is no longer used.\n") cfg(global_abort_on_internal_errors_CFG, "abort_on_internal_errors", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_ABORT_ON_INTERNAL_ERRORS, vsn(2, 2, 57), NULL, 0, NULL, "Abort a command that encounters an internal error.\n" diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 4c27a81..7e499bb 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -36,6 +36,8 @@ static int _vg_write_lock_held = 0; /* VG write lock held? */ static int _blocking_supported = 0; static int _file_locking_readonly = 0; static int _file_locking_sysinit = 0; +static int _file_locking_ignorefail = 0; +static int _file_locking_failed = 0; static void _unblock_signals(void) { @@ -85,27 +87,65 @@ static void _update_vg_lock_count(const char *resource, uint32_t flags) } /* - * Select a locking type - * type: locking type; if < 0, then read config tree value + * A mess of options have been introduced over time to override + * or tweak the behavior of file locking. These options are + * allowed in different but overlapping sets of commands + * (see command-lines.in) + * + * --nolocking + * + * Command won't try to set up or use file locks at all. + * + * --readonly + * + * Command will grant any read lock request, without trying + * to acquire an actual file lock. Command will refuse any + * write lock request. + * + * --ignorelockingfailure + * + * Command tries to set up file locks and will use them + * (both read and write) if successful. If command fails + * to set up file locks it falls back to readonly behavior + * above, while allowing activation. + * + * --sysinit + * + * The same as ignorelockingfailure. + * + * global/metadata_read_only + * + * The command acquires actual read locks and refuses + * write lock requests. */ -int init_locking(struct cmd_context *cmd, int file_locking_sysinit, int file_locking_readonly) + +int init_locking(struct cmd_context *cmd, + int file_locking_sysinit, int file_locking_readonly, int file_locking_ignorefail) { int suppress_messages = 0; - if (getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES")) - suppress_messages = 1; - - if (file_locking_sysinit) + if (file_locking_sysinit || getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES")) suppress_messages = 1; _blocking_supported = find_config_tree_bool(cmd, global_wait_for_locks_CFG, NULL); _file_locking_readonly = file_locking_readonly; _file_locking_sysinit = file_locking_sysinit; + _file_locking_ignorefail = file_locking_ignorefail; + + log_debug("File locking settings: readonly:%d sysinit:%d ignorelockingfailure:%d global/metadata_read_only:%d global/wait_for_locks:%d.", + _file_locking_readonly, _file_locking_sysinit, _file_locking_ignorefail, + cmd->metadata_read_only, _blocking_supported); + + if (!init_file_locking(&_locking, cmd, suppress_messages)) { + log_error_suppress(suppress_messages, "File locking initialisation failed."); + + _file_locking_failed = 1; - log_very_verbose("%sFile-based locking selected.", _blocking_supported ? "" : "Non-blocking "); + if (file_locking_sysinit || file_locking_ignorefail) + return 1; - if (!init_file_locking(&_locking, cmd, suppress_messages)) - log_error_suppress(suppress_messages, "File-based locking initialisation failed."); + return 0; + } return 1; } @@ -125,68 +165,12 @@ void fin_locking(void) */ static int _lock_vol(struct cmd_context *cmd, const char *resource, uint32_t flags) { - uint32_t lck_type = flags & LCK_TYPE_MASK; - uint32_t lck_scope = flags & LCK_SCOPE_MASK; int ret = 0; block_signals(flags); - assert(resource); + ret = _locking.lock_resource(cmd, resource, flags, NULL); - if (!*resource) { - log_error(INTERNAL_ERROR "Use of P_orphans is deprecated."); - goto out; - } - - if ((is_orphan_vg(resource) || is_global_vg(resource)) && (flags & LCK_CACHE)) { - log_error(INTERNAL_ERROR "P_%s referenced.", resource); - goto out; - } - - if ((lck_type == LCK_WRITE) && (lck_scope == LCK_VG) && !(flags & LCK_CACHE) && - strcmp(resource, VG_GLOBAL)) { - - /* read only locking set in lvm.conf metadata_read_only */ - - if (cmd->metadata_read_only) { - log_error("Operation prohibited while global/metadata_read_only is set."); - goto out; - } - - /* read only locking set with option --readonly */ - - if (_file_locking_readonly) { - log_error("Read-only locking specified. Write locks are prohibited."); - goto out; - } - - /* read only locking (except activation) set with option --sysinit */ - /* FIXME: sysinit is intended to allow activation, add that exception here */ - - if (_file_locking_sysinit) { - log_error("Read-only sysinit locking specified. Write locks are prohibited."); - goto out; - } - } - - if ((ret = _locking.lock_resource(cmd, resource, flags, NULL))) { - if (lck_scope == LCK_VG && !(flags & LCK_CACHE)) { - if (lck_type != LCK_UNLOCK) - lvmcache_lock_vgname(resource, lck_type == LCK_READ); - dev_reset_error_count(cmd); - } - - _update_vg_lock_count(resource, flags); - } else - stack; - - /* If unlocking, always remove lock from lvmcache even if operation failed. */ - if (lck_scope == LCK_VG && !(flags & LCK_CACHE) && lck_type == LCK_UNLOCK) { - lvmcache_unlock_vgname(resource); - if (!ret) - _update_vg_lock_count(resource, flags); - } -out: _unblock_signals(); return ret; @@ -195,52 +179,102 @@ out: int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const struct logical_volume *lv) { char resource[258] __attribute__((aligned(8))); - int lck_type = flags & LCK_TYPE_MASK; + uint32_t lck_type = flags & LCK_TYPE_MASK; + uint32_t lck_scope = flags & LCK_SCOPE_MASK; - /* file locking disabled */ + if (!_blocking_supported) + flags |= LCK_NONBLOCK; + + if (is_orphan_vg(vol)) + vol = VG_ORPHANS; + + if (!dm_strncpy(resource, vol, sizeof(resource))) { + log_error(INTERNAL_ERROR "Resource name %s is too long.", vol); + return 0; + } + + /* + * File locking is disabled by --nolocking. + */ if (!_locking.flags) - return 1; + goto out_hold; + + /* + * When file locking could not be initialized, --ignorelockingfailure + * and --sysinit behave like --readonly, but allow activation. + */ + if (_file_locking_failed && (_file_locking_sysinit || _file_locking_ignorefail)) { + if (lck_type != LCK_WRITE) + goto out_hold; + + if (cmd->is_activating && (lck_scope == LCK_VG) && !(flags & LCK_CACHE) && strcmp(vol, VG_GLOBAL)) + goto out_hold; - if (flags == LCK_NONE) { - log_debug_locking(INTERNAL_ERROR "%s: LCK_NONE lock requested", vol); - return 1; + goto out_fail; } - switch (flags & LCK_SCOPE_MASK) { - case LCK_VG: - if (!_blocking_supported) - flags |= LCK_NONBLOCK; - - /* Global VG_ORPHANS lock covers all orphan formats. */ - if (is_orphan_vg(vol)) - vol = VG_ORPHANS; - break; - default: - log_error("Unrecognised lock scope: %d", - flags & LCK_SCOPE_MASK); - return 0; + /* + * When --readonly is set, grant read lock requests without trying to + * acquire an actual lock, and refuse write lock requests. + */ + if (_file_locking_readonly) { + if (lck_type != LCK_WRITE) + goto out_hold; + + log_error("Operation prohibited while --readonly is set."); + goto out_fail; } - if (!dm_strncpy(resource, vol, sizeof(resource))) { - log_error(INTERNAL_ERROR "Resource name %s is too long.", vol); - return 0; + /* + * When global/metadata_read_only is set, acquire actual read locks and + * refuse write lock requests. + */ + if (cmd->metadata_read_only) { + if ((lck_type == LCK_WRITE) && (lck_scope == LCK_VG) && !(flags & LCK_CACHE) && strcmp(vol, VG_GLOBAL)) { + log_error("Operation prohibited while global/metadata_read_only is set."); + goto out_fail; + } + + /* continue and acquire a read file lock */ } if (!_lock_vol(cmd, resource, flags)) - return_0; + goto out_fail; /* + * FIXME: I don't think we need this any more. * If a real lock was acquired (i.e. not LCK_CACHE), * perform an immediate unlock unless LCK_HOLD was requested. */ + if ((lck_type == LCK_NULL) || (lck_type == LCK_UNLOCK) || (flags & (LCK_CACHE | LCK_HOLD))) - return 1; + goto out_hold; if (!_lock_vol(cmd, resource, (flags & ~LCK_TYPE_MASK) | LCK_UNLOCK)) return_0; + return 1; + + +out_hold: + /* + * FIXME: other parts of the code want to check if a VG is + * locked by looking in lvmcache. They shouldn't need to + * do that, and we should be able to remove this. + */ + if ((lck_scope == LCK_VG) && !(flags & LCK_CACHE) && (lck_type != LCK_UNLOCK)) + lvmcache_lock_vgname(resource, lck_type == LCK_READ); + else if ((lck_scope == LCK_VG) && !(flags & LCK_CACHE) && (lck_type == LCK_UNLOCK)) + lvmcache_unlock_vgname(resource); + /* FIXME: we shouldn't need to keep track of this either. */ + _update_vg_lock_count(resource, flags); return 1; + +out_fail: + if (lck_type == LCK_UNLOCK) + _update_vg_lock_count(resource, flags); + return 0; } /* Lock a list of LVs */ diff --git a/lib/locking/locking.h b/lib/locking/locking.h index 422f1d8..96f7d86 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -21,7 +21,7 @@ struct logical_volume; -int init_locking(struct cmd_context *cmd, int suppress_messages, int only_read_locks); +int init_locking(struct cmd_context *cmd, int file_locking_sysinit, int file_locking_readonly, int file_locking_ignorefail); void fin_locking(void); void reset_locking(void); int vg_write_lock_held(void); diff --git a/lib/misc/lvm-globals.c b/lib/misc/lvm-globals.c index b76ddb9..9377588 100644 --- a/lib/misc/lvm-globals.c +++ b/lib/misc/lvm-globals.c @@ -34,7 +34,6 @@ static int _trust_cache = 0; /* Don't scan when incomplete VGs encountered */ static int _debug_level = 0; static int _debug_classes_logged = 0; static int _log_cmd_name = 0; -static int _ignorelockingfailure = 0; static int _security_level = SECURITY_LEVEL; static char _cmd_name[30] = ""; static int _mirror_in_sync = 0; @@ -106,11 +105,6 @@ void init_trust_cache(int trustcache) _trust_cache = trustcache; } -void init_ignorelockingfailure(int level) -{ - _ignorelockingfailure = level; -} - void init_security_level(int level) { _security_level = level; @@ -267,11 +261,6 @@ int background_polling(void) return _background_polling; } -int ignorelockingfailure(void) -{ - return _ignorelockingfailure; -} - int security_level(void) { return _security_level; diff --git a/lib/misc/lvm-globals.h b/lib/misc/lvm-globals.h index b383891..55a9399 100644 --- a/lib/misc/lvm-globals.h +++ b/lib/misc/lvm-globals.h @@ -35,8 +35,6 @@ void init_trust_cache(int trustcache); void init_debug(int level); void init_debug_classes_logged(int classes); void init_cmd_name(int status); -void init_ignorelockingfailure(int level); -void init_lockingfailed(int level); void init_security_level(int level); void init_mirror_in_sync(int in_sync); void init_dmeventd_monitor(int reg); @@ -69,8 +67,6 @@ int verbose_level(void); int silent_mode(void); int debug_level(void); int debug_class_is_logged(int class); -int ignorelockingfailure(void); -int lockingfailed(void); int security_level(void); int mirror_in_sync(void); int background_polling(void); diff --git a/lib/misc/sharedlib.c b/lib/misc/sharedlib.c index d594470..4c2d5d9 100644 --- a/lib/misc/sharedlib.c +++ b/lib/misc/sharedlib.c @@ -58,7 +58,7 @@ void *load_shared_library(struct cmd_context *cmd, const char *libname, log_very_verbose("Opening shared %s library %s", desc, path); if (!(library = dlopen(path, RTLD_LAZY | RTLD_GLOBAL))) { - if (silent && ignorelockingfailure()) + if (silent) log_verbose("Unable to open external %s library %s: %s", desc, path, dlerror()); else diff --git a/tools/command-lines.in b/tools/command-lines.in index 409f01c..ad710a4 100644 --- a/tools/command-lines.in +++ b/tools/command-lines.in @@ -187,7 +187,7 @@ # OO_ALL is included in every command automatically. # OO_ALL: --commandprofile String, --config String, --debug, ---driverloaded Bool, --help, --lockopt String, --longhelp, --profile String, --quiet, +--driverloaded Bool, --help, --nolocking, --lockopt String, --longhelp, --profile String, --quiet, --verbose, --version, --yes, --test # @@ -195,7 +195,7 @@ OO_ALL: --commandprofile String, --config String, --debug, # OO_REPORT: --aligned, --all, --binary, --configreport ConfigReport, --foreign, --ignorelockingfailure, --ignoreskippedcluster, --logonly, ---nameprefixes, --noheadings, --nolocking, --nosuffix, +--nameprefixes, --noheadings, --nosuffix, --options String, --readonly, --reportformat ReportFmt, --rows, --select String, --separator String, --shared, --sort String, --trustcache, --unbuffered, --units Units, --unquoted diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 788f007..2578113 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -2323,11 +2323,6 @@ static int _get_current_settings(struct cmd_context *cmd) return EINVALID_CMD_LINE; } - if (arg_is_set(cmd, ignorelockingfailure_ARG) || arg_is_set(cmd, sysinit_ARG)) - init_ignorelockingfailure(1); - else - init_ignorelockingfailure(0); - cmd->ignore_clustered_vgs = arg_is_set(cmd, ignoreskippedcluster_ARG); cmd->include_foreign_vgs = arg_is_set(cmd, foreign_ARG) ? 1 : 0; cmd->include_shared_vgs = arg_is_set(cmd, shared_ARG) ? 1 : 0; @@ -2734,9 +2729,8 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) const char *reason = NULL; int ret = 0; int locking_type; - int file_locking_disable = 0; - int file_locking_sysinit = 0; - int file_locking_readonly = 0; + int nolocking = 0; + int readonly = 0; int monitoring; char *arg_new, *arg; int i; @@ -2865,6 +2859,10 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) if (arg_is_set(cmd, readonly_ARG)) cmd->metadata_read_only = 1; + if ((cmd->command->command_enum == vgchange_activate_CMD) || + (cmd->command->command_enum == lvchange_activate_CMD)) + cmd->is_activating = 1; + /* * Now that all configs, profiles and command lines args are available, * freshly calculate and apply all settings. Specific command line @@ -2911,28 +2909,35 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) goto out; } - if (arg_is_set(cmd, nolocking_ARG) || _cmd_no_meta_proc(cmd)) - file_locking_disable = 1; - - else if (arg_is_set(cmd, sysinit_ARG)) - file_locking_sysinit = 1; - - else if (arg_is_set(cmd, readonly_ARG)) - file_locking_readonly = 1; - + /* Defaults to 1 if not set. */ locking_type = find_config_tree_int(cmd, global_locking_type_CFG, NULL); if (locking_type == 3) - log_warn("WARNING: See lvmlockd(8) for information on using cluster/clvm VGs."); + log_warn("WARNING: see lvmlockd(8) for information on using cluster/clvm VGs."); - if (locking_type != 1) { - log_warn("WARNING: locking_type deprecated, using file locking."); - locking_type = 1; + if ((locking_type == 0) || (locking_type == 5)) { + log_warn("WARNING: locking_type is deprecated, using --nolocking."); + nolocking = 1; + + } else if (locking_type == 4) { + log_warn("WARNING: locking_type is deprecated, using --readonly."); + readonly = 1; + + } else if (locking_type != 1) { + log_warn("WARNING: locking_type is deprecated, using file locking."); } - if (!file_locking_disable) { - /* Set up file locking */ - if (!init_locking(cmd, file_locking_sysinit, file_locking_readonly)) { + if (arg_is_set(cmd, nolocking_ARG) || _cmd_no_meta_proc(cmd)) + nolocking = 1; + + if (arg_is_set(cmd, readonly_ARG)) + readonly = 1; + + if (nolocking) { + if (!_cmd_no_meta_proc(cmd)) + log_warn("WARNING: File locking is disabled."); + } else { + if (!init_locking(cmd, arg_is_set(cmd, sysinit_ARG), readonly, arg_is_set(cmd, ignorelockingfailure_ARG))) { ret = ECMD_FAILED; goto_out; }

1 0

master - man lvmlockd: remove unnecessary reference to lvmetad
by David Teigland 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c7c7017f0c12ebab4e1ae… Commit: c7c7017f0c12ebab4e1aef9d9a9fabd4ec2adfe3 Parent: 60db97ae1d934e0475ec8c5752237ae5965a62d4 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jun 7 13:42:11 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Jun 7 13:44:05 2018 -0500 man lvmlockd: remove unnecessary reference to lvmetad it's optional to use it with lvmlockd --- man/lvmlockd.8_main | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/man/lvmlockd.8_main b/man/lvmlockd.8_main index 9fe569d..cf4c52e 100644 --- a/man/lvmlockd.8_main +++ b/man/lvmlockd.8_main @@ -173,9 +173,6 @@ steps. They can be performed manually or using the system service manager. \[bu] -start lvmetad -.br -\[bu] start lvmlockd .br \[bu] @@ -202,9 +199,6 @@ stop lock manager \[bu] stop lvmlockd .br -\[bu] -stop lvmetad -.br .P

1 0

master - test/unit: activation generator unit tests
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=60db97ae1d934e0475ec8… Commit: 60db97ae1d934e0475ec8c5752237ae5965a62d4 Parent: 00befc04d0406b0443d35bec89ae2af1df2ebd3b Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Thu Jun 7 16:24:42 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:24:42 2018 +0100 test/unit: activation generator unit tests --- test/unit/activation-generator_t.c | 272 ++++++++++++++++++++++++++++++++++++ 1 files changed, 272 insertions(+), 0 deletions(-) diff --git a/test/unit/activation-generator_t.c b/test/unit/activation-generator_t.c new file mode 100644 index 0000000..56871a7 --- /dev/null +++ b/test/unit/activation-generator_t.c @@ -0,0 +1,272 @@ +/* + * Copyright (C) 2018 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "scripts/generator-internals.c" +#include "framework.h" +#include "units.h" + +#include "device_mapper/libdevmapper.h" + +//---------------------------------------------------------------- + +static void _error(const char *format, ...) +{ + va_list ap; + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); +} + +//---------------------------------------------------------------- + +struct bw_test { + const char *input; + const char *prefix; + const char *val; +}; + +static void _test_begins_with(void *fixture) +{ + static struct bw_test _tests[] = { + {"", "foo", NULL}, + {"lskdj", "foo", NULL}, + {"foo", "foobar", NULL}, + {"fish", "fish", ""}, + {"foo=bar ", "foo=", "bar "}, + }; + + unsigned i; + for (i = 0; i < DM_ARRAY_SIZE(_tests); i++) { + const char *val; + struct bw_test *t = _tests + i; + if (t->val) { + if (!_begins_with(t->input, t->prefix, &val)) + test_fail("_begins_with('%s', '%s') failed", t->input, t->prefix); + if (strcmp(val, t->val)) + test_fail("_begins_with('%s', '%s') -> '%s', expected '%s'", + t->input, t->prefix, val, t->val); + } else { + if (_begins_with(t->input, t->prefix, &val)) + test_fail("_begins_with('%s', '%s') unexpectedly succeeded", + t->input, t->prefix); + + } + } +} + +struct pb_test { + const char *input; + bool parsed; + bool result; +}; + +static const char *_bool(bool v) +{ + return v ? "true" : "false"; +} + +static void _test_parse_bool(void *fixture) +{ + static struct pb_test _tests[] = { + {"", false, false}, + {"fish", false, false}, + {"true", false, false}, + {"false", false, false}, + {"1", true, true}, + {" \t 1\t\t", true, true}, + {"0", true, false}, + {" \t0 ", true, false} + }; + + unsigned i; + + for (i = 0; i < DM_ARRAY_SIZE(_tests); i++) { + bool result; + struct pb_test *t = _tests + i; + + if (t->parsed) { + if (!_parse_bool(t->input, &result)) + test_fail("_parse_bool('%s') unexpectedly failed", t->input); + if (result != t->result) + test_fail("_parse_bool('%s') -> %s", t->input, _bool(result)); + } else { + if (_parse_bool(t->input, &result)) + test_fail("_parse_bool('%s') unexpectedly succeeded", t->input); + } + } +} + +struct pl_test { + const char *input; + bool success; + bool use_lvmetad; + bool sysinit_needed; +}; + +static void _test_parse_line(void *fixture) +{ + static struct pl_test _tests[] = { + {"", false, false, false}, + {"sldkjfs", false, false, false}, + {"use_lvmetad=1", true, true, true}, + {"use_lvmetad=0", true, false, true}, + {"use_lvmpolld=1", true, false, false}, + {"use_lvmpolld=0", true, false, true} + }; + + unsigned i; + + for (i = 0; i< DM_ARRAY_SIZE(_tests); i++) { + bool r; + struct config cfg; + struct pl_test *t = _tests + i; + + cfg.use_lvmetad = false; + cfg.sysinit_needed = true; + + r = _parse_line(t->input, &cfg); + if (t->success) { + if (!r) + test_fail("_parse_line('%s') failed", t->input); + + if (cfg.use_lvmetad != t->use_lvmetad) + test_fail("_parse_line('%s') -> use_lvmetad='%s'", + t->input, _bool(cfg.use_lvmetad)); + + if (cfg.sysinit_needed != t->sysinit_needed) + test_fail("_parse_line('%s') -> sysinit_needed='%s'", + t->input, _bool(cfg.sysinit_needed)); + } else if (r) + test_fail("_parse_line('%s') succeeded", t->input); + } +} + +static void _test_get_config_bad_path(void *fixture) +{ + struct config cfg; + + if (_get_config(&cfg, "/usr/bin/no-such-file")) + test_fail("_get_config() succeeded despite a bad lvmconfig path"); +} + +static void _test_get_config_bad_exit(void *fixture) +{ + struct config cfg; + + if (_get_config(&cfg, "/usr/bin/false")) + test_fail("_get_config() succeeded despite a bad lvmconfig exit"); +} + +struct gc_test { + const char *output; + bool success; + bool use_lvmetad; + bool sysinit_needed; +}; + +static const char *_fake_lvmconfig(const char *output) +{ + const char *path = "./fake-lvmconfig"; + + FILE *fp = fopen(path, "w"); + if (!fp) + return NULL; + + fprintf(fp, "#!/usr/bin/sh\n"); + fprintf(fp, "cat <<EOF\n"); + fprintf(fp, "%s", output); + fprintf(fp, "EOF\n"); + + fclose(fp); + chmod(path, 0770); + + return path; +} + +static void _test_get_config(void *fixture) +{ + static struct gc_test _tests[] = { + {"", true, false, true}, + {"lsdjkf\n\n\n", false, false, false}, + + {"use_lvmetad=0\nuse_lvmpolld=1\n", true, false, false}, + {"use_lvmetad=1\nuse_lvmpolld=1\n", true, true, false}, + {"use_lvmetad=1\nuse_lvmpolld=0\n", true, true, true}, + }; + + bool r; + unsigned i; + struct config cfg; + const char *path; + + for (i = 0; i < DM_ARRAY_SIZE(_tests); i++) { + struct gc_test *t = _tests + i; + + cfg.use_lvmetad = false; + cfg.sysinit_needed = true; + + path = _fake_lvmconfig(t->output); + if (!path) + test_fail("couldn't create fake lvmconfig"); + + r = _get_config(&cfg, path); + if (t->success) { + if (!r) + test_fail("_get_config() <- '%s' failed", t->output); + + if (t->use_lvmetad != cfg.use_lvmetad) + test_fail("_get_config() <- '%s', use_lvmetad = %s", + t->output, _bool(cfg.use_lvmetad)); + + if (t->sysinit_needed != cfg.sysinit_needed) + test_fail("_get_config() <- '%s', sysinit = %s", + t->output, _bool(cfg.sysinit_needed)); + } else { + if (r) + test_fail("_get_config() <- '%s' unexpectedly succeeded", t->output); + } + + unlink(path); + } +} + +//---------------------------------------------------------------- + +#define T(path, desc, fn) register_test(ts, "/activation-generator/" path, desc, fn) + +static struct test_suite *_tests(void) +{ + struct test_suite *ts = test_suite_create(NULL, NULL); + if (!ts) { + fprintf(stderr, "out of memory\n"); + exit(1); + }; + + T("begins-with", "Test cases for _begins_with()", _test_begins_with); + T("parse-bool", "Test cases for _parse_bool()", _test_parse_bool); + T("parse-line", "Test cases for _parse_line()", _test_parse_line); + T("get-config-bad-path", "_get_config() needs a valid lvmconfig path", _test_get_config_bad_path); + T("get-config-bad-exit", "lvmconfig bad exit code gets propagated", _test_get_config_bad_exit); + T("get-config", "Test cases for _get_config()", _test_get_config); + + return ts; +} + +void activation_generator_tests(struct dm_list *all_tests) +{ + dm_list_add(all_tests, &_tests()->list); +} + +//----------------------------------------------------------------

1 0

master - Merge branch 'master' of git+ssh://sourceware.org/git/lvm2
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=00befc04d0406b0443d35… Commit: 00befc04d0406b0443d35bec89ae2af1df2ebd3b Parent: 6e6ef95ba65aea0367eb88fa2062e93fe66bbc6e f2ff06d6756bb31779d16915c64361393054cfe7 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Thu Jun 7 16:20:49 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:20:49 2018 +0100 Merge branch 'master' of git+ssh://sourceware.org/git/lvm2

1 0

master - Implement lock-override options without locking type
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6e6ef95ba65aea0367eb8… Commit: 6e6ef95ba65aea0367eb88fa2062e93fe66bbc6e Parent: e966752b867c0fe379737b0bda1e850a19dabf00 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 16:31:59 2018 -0500 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:17:04 2018 +0100 Implement lock-override options without locking type The options: --nolocking, --readonly, --sysinit override, or make exceptions to, the normal file locking behavior. Implement these by just checking for the options in the file locking path instead of using special locking types. --- lib/locking/file_locking.c | 2 +- lib/locking/locking.c | 58 +++++++++++++++++++++++++++++++++--------- lib/locking/locking.h | 2 +- lib/locking/locking_types.h | 18 +------------ tools/lvmcmdline.c | 52 +++++++++++++++++++------------------- 5 files changed, 75 insertions(+), 57 deletions(-) diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index a60a3e5..0bded0e 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -92,7 +92,7 @@ int init_file_locking(struct locking_type *locking, struct cmd_context *cmd, locking->lock_resource = _file_lock_resource; locking->reset_locking = _reset_file_locking; locking->fin_locking = _fin_file_locking; - locking->flags = 0; + locking->flags = LCK_FLOCK; /* Get lockfile directory from config file */ locking_dir = find_config_tree_str(cmd, global_locking_dir_CFG, NULL); diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 4b7d7eb..4c27a81 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -34,6 +34,8 @@ static struct locking_type _locking; static int _vg_lock_count = 0; /* Number of locks held */ static int _vg_write_lock_held = 0; /* VG write lock held? */ static int _blocking_supported = 0; +static int _file_locking_readonly = 0; +static int _file_locking_sysinit = 0; static void _unblock_signals(void) { @@ -46,6 +48,10 @@ void reset_locking(void) { int was_locked = _vg_lock_count; + /* file locking disabled */ + if (!_locking.flags) + return; + _vg_lock_count = 0; _vg_write_lock_held = 0; @@ -82,21 +88,19 @@ static void _update_vg_lock_count(const char *resource, uint32_t flags) * Select a locking type * type: locking type; if < 0, then read config tree value */ -int init_locking(int type, struct cmd_context *cmd, int suppress_messages) +int init_locking(struct cmd_context *cmd, int file_locking_sysinit, int file_locking_readonly) { + int suppress_messages = 0; + if (getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES")) suppress_messages = 1; - if (type < 0) - type = find_config_tree_int(cmd, global_locking_type_CFG, NULL); + if (file_locking_sysinit) + suppress_messages = 1; _blocking_supported = find_config_tree_bool(cmd, global_wait_for_locks_CFG, NULL); - - if (type != 1) - log_warn("WARNING: locking_type deprecated, using file locking."); - - if (type == 3) - log_warn("WARNING: See lvmlockd(8) for information on using cluster/clvm VGs."); + _file_locking_readonly = file_locking_readonly; + _file_locking_sysinit = file_locking_sysinit; log_very_verbose("%sFile-based locking selected.", _blocking_supported ? "" : "Non-blocking "); @@ -108,6 +112,10 @@ int init_locking(int type, struct cmd_context *cmd, int suppress_messages) void fin_locking(void) { + /* file locking disabled */ + if (!_locking.flags) + return; + _locking.fin_locking(); } @@ -135,10 +143,30 @@ static int _lock_vol(struct cmd_context *cmd, const char *resource, uint32_t fla goto out; } - if (cmd->metadata_read_only && lck_type == LCK_WRITE && + if ((lck_type == LCK_WRITE) && (lck_scope == LCK_VG) && !(flags & LCK_CACHE) && strcmp(resource, VG_GLOBAL)) { - log_error("Operation prohibited while global/metadata_read_only is set."); - goto out; + + /* read only locking set in lvm.conf metadata_read_only */ + + if (cmd->metadata_read_only) { + log_error("Operation prohibited while global/metadata_read_only is set."); + goto out; + } + + /* read only locking set with option --readonly */ + + if (_file_locking_readonly) { + log_error("Read-only locking specified. Write locks are prohibited."); + goto out; + } + + /* read only locking (except activation) set with option --sysinit */ + /* FIXME: sysinit is intended to allow activation, add that exception here */ + + if (_file_locking_sysinit) { + log_error("Read-only sysinit locking specified. Write locks are prohibited."); + goto out; + } } if ((ret = _locking.lock_resource(cmd, resource, flags, NULL))) { @@ -169,6 +197,10 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str char resource[258] __attribute__((aligned(8))); int lck_type = flags & LCK_TYPE_MASK; + /* file locking disabled */ + if (!_locking.flags) + return 1; + if (flags == LCK_NONE) { log_debug_locking(INTERNAL_ERROR "%s: LCK_NONE lock requested", vol); return 1; @@ -240,7 +272,7 @@ int vg_write_lock_held(void) int locking_is_clustered(void) { - return (_locking.flags & LCK_CLUSTERED) ? 1 : 0; + return 0; } int sync_local_dev_names(struct cmd_context* cmd) diff --git a/lib/locking/locking.h b/lib/locking/locking.h index 6d7d8e8..422f1d8 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -21,7 +21,7 @@ struct logical_volume; -int init_locking(int type, struct cmd_context *cmd, int suppress_messages); +int init_locking(struct cmd_context *cmd, int suppress_messages, int only_read_locks); void fin_locking(void); void reset_locking(void); int vg_write_lock_held(void); diff --git a/lib/locking/locking_types.h b/lib/locking/locking_types.h index 99aa964..5bb4fe4 100644 --- a/lib/locking/locking_types.h +++ b/lib/locking/locking_types.h @@ -23,12 +23,10 @@ typedef int (*query_resource_fn) (const char *resource, const char *node, int *m typedef void (*fin_lock_fn) (void); typedef void (*reset_lock_fn) (void); -#define LCK_PRE_MEMLOCK 0x00000001 /* Is memlock() needed before calls? */ -#define LCK_CLUSTERED 0x00000002 -#define LCK_SUPPORTS_REMOTE_QUERIES 0x00000004 +#define LCK_FLOCK 0x00000001 struct locking_type { - uint32_t flags; + uint32_t flags; /* 0 means file locking is disabled */ lock_resource_fn lock_resource; query_resource_fn query_resource; @@ -36,17 +34,5 @@ struct locking_type { fin_lock_fn fin_locking; }; -/* - * Locking types - */ -void init_no_locking(struct locking_type *locking, struct cmd_context *cmd, - int suppress_messages); - -void init_dummy_locking(struct locking_type *locking, struct cmd_context *cmd, - int suppress_messages); - -int init_readonly_locking(struct locking_type *locking, struct cmd_context *cmd, - int suppress_messages); - int init_file_locking(struct locking_type *locking, struct cmd_context *cmd, int suppress_messages); diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 4f4e917..788f007 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -2734,6 +2734,9 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) const char *reason = NULL; int ret = 0; int locking_type; + int file_locking_disable = 0; + int file_locking_sysinit = 0; + int file_locking_readonly = 0; int monitoring; char *arg_new, *arg; int i; @@ -2908,34 +2911,31 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) goto out; } - if (_cmd_no_meta_proc(cmd)) - locking_type = 0; - else if (arg_is_set(cmd, readonly_ARG)) { - if (find_config_tree_bool(cmd, global_use_lvmlockd_CFG, NULL)) { - /* - * FIXME: we could use locking_type 5 here if that didn't - * cause CLUSTERED to be set, which conflicts with using lvmlockd. - */ - locking_type = 1; - cmd->lockd_gl_disable = 1; - cmd->lockd_vg_disable = 1; - cmd->lockd_lv_disable = 1; - } else { - locking_type = 5; - } + if (arg_is_set(cmd, nolocking_ARG) || _cmd_no_meta_proc(cmd)) + file_locking_disable = 1; - if (lvmetad_used()) { - lvmetad_make_unused(cmd); - log_verbose("Not using lvmetad because read-only is set."); - } - } else if (arg_is_set(cmd, nolocking_ARG)) - locking_type = 0; - else - locking_type = -1; + else if (arg_is_set(cmd, sysinit_ARG)) + file_locking_sysinit = 1; - if (!init_locking(locking_type, cmd, _cmd_no_meta_proc(cmd) || arg_is_set(cmd, sysinit_ARG))) { - ret = ECMD_FAILED; - goto_out; + else if (arg_is_set(cmd, readonly_ARG)) + file_locking_readonly = 1; + + locking_type = find_config_tree_int(cmd, global_locking_type_CFG, NULL); + + if (locking_type == 3) + log_warn("WARNING: See lvmlockd(8) for information on using cluster/clvm VGs."); + + if (locking_type != 1) { + log_warn("WARNING: locking_type deprecated, using file locking."); + locking_type = 1; + } + + if (!file_locking_disable) { + /* Set up file locking */ + if (!init_locking(cmd, file_locking_sysinit, file_locking_readonly)) { + ret = ECMD_FAILED; + goto_out; + } } if (!_cmd_no_meta_proc(cmd) && !_init_lvmlockd(cmd)) {

1 0

master - tests: system_id remove clustered vg test
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e966752b867c0fe379737… Commit: e966752b867c0fe379737b0bda1e850a19dabf00 Parent: 229582c97caee65799992b1e125243c3193892b9 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 14:35:27 2018 -0500 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:17:04 2018 +0100 tests: system_id remove clustered vg test --- test/shell/system_id.sh | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) diff --git a/test/shell/system_id.sh b/test/shell/system_id.sh index 21c5bd0..ec7953d 100644 --- a/test/shell/system_id.sh +++ b/test/shell/system_id.sh @@ -275,30 +275,6 @@ grep $vg1 err grep "$SID1" err vgremove $vg1 -# vgchange -cy clears system_id, vgchange -cn sets system_id - -SID1=sidfoofile1 -echo "$SID1" > "$SIDFILE" -aux lvmconf "global/system_id_source = file" \ - "global/system_id_file = \"$SIDFILE\"" -# create a vg -vgcreate $vg1 "$dev1" -# normal vgs sees the vg -vgs -o+systemid >err -grep $vg1 err -grep "$SID1" err -# after vgchange -cy there is no systemid -vgchange --yes -cy $vg1 -vgs --config 'global { locking_type=0 }' -o+systemid $vg1 >err -grep $vg1 err -not grep "$SID1" err -# after vgchange -cn there is a systemid -vgchange --config 'global { locking_type=0 }' -cn $vg1 -vgs -o+systemid >err -grep $vg1 err -grep "$SID1" err -vgremove $vg1 - # Test max system_id length (128) and invalid system_id characters. # The 128 length limit is imposed before invalid characters are omitted.

1 0

master - tests: remove -cn option from some commands
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=229582c97caee65799992… Commit: 229582c97caee65799992b1e125243c3193892b9 Parent: da30b4a7865b82c05cd2be1a8eb3bca42c39abb3 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 14:04:19 2018 -0500 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:17:04 2018 +0100 tests: remove -cn option from some commands --- test/shell/vgcfgbackup-lvm1.sh | 2 +- test/shell/vgchange-usage.sh | 8 ++++---- test/shell/vgsplit-usage.sh | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/shell/vgcfgbackup-lvm1.sh b/test/shell/vgcfgbackup-lvm1.sh index a148ec1..9b81e28 100644 --- a/test/shell/vgcfgbackup-lvm1.sh +++ b/test/shell/vgcfgbackup-lvm1.sh @@ -28,7 +28,7 @@ aux lvmconf "backup/backup = 0" # vgcfgbackup correctly stores metadata LVM1 with missing PVs pvcreate -M1 "${DEVICES[@]}" -vgcreate $SHARED -M1 -c n "$vg" "${DEVICES[@]}" +vgcreate $SHARED -M1 "$vg" "${DEVICES[@]}" lvcreate -l1 -n $lv1 $vg "$dev1" pvremove -ff -y "$dev2" not lvcreate -l1 -n $lv1 $vg "$dev3" diff --git a/test/shell/vgchange-usage.sh b/test/shell/vgchange-usage.sh index 1885a64..9fe9bc5 100644 --- a/test/shell/vgchange-usage.sh +++ b/test/shell/vgchange-usage.sh @@ -101,7 +101,7 @@ vgremove -ff $vg test -n "$LVM_TEST_LVMLOCKD" && exit 0 # set cluster bit -vgcreate -cn $vg "$dev1" "$dev2" "$dev3" +vgcreate $vg "$dev1" "$dev2" "$dev3" # check prompt to change cluster bit without giving explicit vg name fail vgchange -cy 2>&1 | tee out grep "y/n" out @@ -121,10 +121,10 @@ if test -e LOCAL_CLVMD ; then # check we do not support conversion of just locally active LVs lvchange -an $vg lvchange -ay $vg - not vgchange -cn $vg + not vgchange $vg lvchange -an $vg lvchange -aey $vg - vgchange -cn $vg + vgchange $vg else # no clvmd is running fail vgchange -cy $vg @@ -136,7 +136,7 @@ else vgs --ignoreskippedcluster $vg 2>&1 | tee out not grep "Skipping clustered volume group" out # reset back to non-clustered VG with disabled locking - vgchange -cn $vg --config 'global{locking_type=0}' $vg + vgchange $vg --config 'global{locking_type=0}' $vg fi check vg_attr_bit cluster $vg "-" diff --git a/test/shell/vgsplit-usage.sh b/test/shell/vgsplit-usage.sh index a112e86..38f3964 100644 --- a/test/shell/vgsplit-usage.sh +++ b/test/shell/vgsplit-usage.sh @@ -96,9 +96,9 @@ grep "Volume group \"$vg2\" exists, but new VG option specified" err vgremove $vg1 $vg2 # vgsplit rejects split because clustered given with existing vg -vgcreate -M$mdatype --clustered n $vg1 "$dev1" "$dev2" -vgcreate -M$mdatype --clustered n $vg2 "$dev3" "$dev4" -not vgsplit --clustered n $vg1 $vg2 "$dev1" 2>err +vgcreate -M$mdatype $vg1 "$dev1" "$dev2" +vgcreate -M$mdatype $vg2 "$dev3" "$dev4" +not vgsplit $vg1 $vg2 "$dev1" 2>err grep "Volume group \"$vg2\" exists, but new VG option specified" err vgremove $vg1 $vg2

1 0

master - Remove locking infrastructure from activation paths
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=da30b4a7865b82c05cd2b… Commit: da30b4a7865b82c05cd2be1a8eb3bca42c39abb3 Parent: 616eeba6f2b33640534e26dea43661724edf3a14 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 5 16:47:24 2018 -0500 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:17:04 2018 +0100 Remove locking infrastructure from activation paths Basic LV functions: activate_lv(), deactivate_lv(), suspend_lv(), resume_lv() were routed through the locking infrastruture on the way to: lv_activate_with_filter(), lv_deactivate(), lv_suspend_if_active(), lv_resume_if_active() This commit removes the locking infrastructure from the middle and calls the later functions directly from the former. There were a couple of ancillary steps that the locking infrastructure added along the way which are still included: - critical section inc/dec during suspend/resume - checking for active component LVs during activate The "activation" file lock (serializing activation) has not been kept because activation commands have been changed to take the VG file lock exclusively which makes the activation lock unused and unnecessary. --- lib/activate/activate.c | 103 ++++++++++++++++++++++++++++++++++++++++---- lib/activate/activate.h | 8 +++ lib/locking/file_locking.c | 48 -------------------- lib/locking/locking.c | 65 ++------------------------- lib/locking/locking.h | 76 -------------------------------- 5 files changed, 107 insertions(+), 193 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index c9ead42..a7e5fe3 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -2424,15 +2424,6 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, if (!activation()) return 1; - if (!laopts->exclusive && - (lv_is_origin(lv) || - seg_only_exclusive(first_seg(lv)))) { - log_error(INTERNAL_ERROR "Trying non-exlusive activation of %s with " - "a volume type %s requiring exclusive activation.", - display_lvname(lv), lvseg_name(first_seg(lv))); - return 0; - } - if (filter && !_passes_activation_filter(cmd, lv)) { log_verbose("Not activating %s since it does not pass " "activation filter.", display_lvname(lv)); @@ -2765,3 +2756,97 @@ int deactivate_lv_with_sub_lv(const struct logical_volume *lv) return 1; } + +int activate_lv(struct cmd_context *cmd, const struct logical_volume *lv) +{ + const struct logical_volume *active_lv; + int ret; + + /* + * When trying activating component LV, make sure none of sub component + * LV or LVs that are using it are active. + */ + if (!lv_is_visible(lv)) + active_lv = lv_holder_is_active(lv); + else + active_lv = lv_component_is_active(lv); + + if (active_lv) { + log_error("Activation of logical volume %s is prohibited while logical volume %s is active.", + display_lvname(lv), display_lvname(active_lv)); + ret = 0; + goto out; + } + + ret = lv_activate_with_filter(cmd, NULL, 0, + (lv->status & LV_NOSCAN) ? 1 : 0, + (lv->status & LV_TEMPORARY) ? 1 : 0, + lv_committed(lv)); +out: + return ret; +} + +int deactivate_lv(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + ret = lv_deactivate(cmd, NULL, lv_committed(lv)); + + return ret; +} + +int suspend_lv(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + critical_section_inc(cmd, "locking for suspend"); + + ret = lv_suspend_if_active(cmd, NULL, 0, 0, lv_committed(lv), lv); + + return ret; +} + +int suspend_lv_origin(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + critical_section_inc(cmd, "locking for suspend"); + + ret = lv_suspend_if_active(cmd, NULL, 1, 0, lv_committed(lv), lv); + + return ret; +} + +int resume_lv(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + ret = lv_resume_if_active(cmd, NULL, 0, 0, 0, lv_committed(lv)); + + critical_section_dec(cmd, "unlocking on resume"); + + return ret; +} + +int resume_lv_origin(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + ret = lv_resume_if_active(cmd, NULL, 1, 0, 0, lv_committed(lv)); + + critical_section_dec(cmd, "unlocking on resume"); + + return ret; +} + +int revert_lv(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + ret = lv_resume_if_active(cmd, NULL, 0, 0, 1, lv_committed(lv)); + + critical_section_dec(cmd, "unlocking on resume"); + + return ret; +} + diff --git a/lib/activate/activate.h b/lib/activate/activate.h index 8b6c4ad..2f0b0a0 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -126,6 +126,14 @@ int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv); int lv_deactivate_any_missing_subdevs(const struct logical_volume *lv); +int activate_lv(struct cmd_context *cmd, const struct logical_volume *lv); +int deactivate_lv(struct cmd_context *cmd, const struct logical_volume *lv); +int suspend_lv(struct cmd_context *cmd, const struct logical_volume *lv); +int suspend_lv_origin(struct cmd_context *cmd, const struct logical_volume *lv); +int resume_lv(struct cmd_context *cmd, const struct logical_volume *lv); +int resume_lv_origin(struct cmd_context *cmd, const struct logical_volume *lv); +int revert_lv(struct cmd_context *cmd, const struct logical_volume *lv); + /* * Returns 1 if info structure has been populated, else 0 on failure. * When lvinfo* is NULL, it returns 1 if the device is locally active, 0 otherwise. diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index d4f47c6..a60a3e5 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -44,20 +44,8 @@ static int _file_lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags, const struct logical_volume *lv) { char lockfile[PATH_MAX]; - unsigned origin_only = (flags & LCK_ORIGIN_ONLY) ? 1 : 0; - unsigned revert = (flags & LCK_REVERT) ? 1 : 0; switch (flags & LCK_SCOPE_MASK) { - case LCK_ACTIVATION: - if (dm_snprintf(lockfile, sizeof(lockfile), - "%s/A_%s", _lock_dir, resource) < 0) { - log_error("Too long locking filename %s/A_%s.", _lock_dir, resource); - return 0; - } - - if (!lock_file(lockfile, flags)) - return_0; - break; case LCK_VG: if (!strcmp(resource, VG_SYNC_NAMES)) fs_unlock(); @@ -84,42 +72,6 @@ static int _file_lock_resource(struct cmd_context *cmd, const char *resource, if (!lock_file(lockfile, flags)) return_0; break; - case LCK_LV: - switch (flags & LCK_TYPE_MASK) { - case LCK_UNLOCK: - log_very_verbose("Unlocking LV %s%s%s", resource, origin_only ? " without snapshots" : "", revert ? " (reverting)" : ""); - if (!lv_resume_if_active(cmd, resource, origin_only, 0, revert, lv_committed(lv))) - return 0; - break; - case LCK_NULL: - log_very_verbose("Locking LV %s (NL)", resource); - if (!lv_deactivate(cmd, resource, lv_committed(lv))) - return 0; - break; - case LCK_READ: - log_very_verbose("Locking LV %s (R)", resource); - if (!lv_activate_with_filter(cmd, resource, 0, (lv->status & LV_NOSCAN) ? 1 : 0, - (lv->status & LV_TEMPORARY) ? 1 : 0, lv_committed(lv))) - return 0; - break; - case LCK_PREAD: - log_very_verbose("Locking LV %s (PR) - ignored", resource); - break; - case LCK_WRITE: - log_very_verbose("Locking LV %s (W)%s", resource, origin_only ? " without snapshots" : ""); - if (!lv_suspend_if_active(cmd, resource, origin_only, 0, lv_committed(lv), lv)) - return 0; - break; - case LCK_EXCL: - log_very_verbose("Locking LV %s (EX)", resource); - if (!lv_activate_with_filter(cmd, resource, 1, (lv->status & LV_NOSCAN) ? 1 : 0, - (lv->status & LV_TEMPORARY) ? 1 : 0, lv_committed(lv))) - return 0; - break; - default: - break; - } - break; default: log_error("Unrecognised lock scope: %d", flags & LCK_SCOPE_MASK); diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 5e28452..4b7d7eb 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -35,30 +35,6 @@ static int _vg_lock_count = 0; /* Number of locks held */ static int _vg_write_lock_held = 0; /* VG write lock held? */ static int _blocking_supported = 0; -typedef enum { - LV_NOOP, - LV_SUSPEND, - LV_RESUME -} lv_operation_t; - -static void _lock_memory(struct cmd_context *cmd, lv_operation_t lv_op) -{ - if (!(_locking.flags & LCK_PRE_MEMLOCK)) - return; - - if (lv_op == LV_SUSPEND) - critical_section_inc(cmd, "locking for suspend"); -} - -static void _unlock_memory(struct cmd_context *cmd, lv_operation_t lv_op) -{ - if (!(_locking.flags & LCK_PRE_MEMLOCK)) - return; - - if (lv_op == LV_RESUME) - critical_section_dec(cmd, "unlocking on resume"); -} - static void _unblock_signals(void) { /* Don't unblock signals while any locks are held */ @@ -139,16 +115,13 @@ void fin_locking(void) * VG locking is by VG name. * FIXME This should become VG uuid. */ -static int _lock_vol(struct cmd_context *cmd, const char *resource, - uint32_t flags, lv_operation_t lv_op, const struct logical_volume *lv) +static int _lock_vol(struct cmd_context *cmd, const char *resource, uint32_t flags) { uint32_t lck_type = flags & LCK_TYPE_MASK; uint32_t lck_scope = flags & LCK_SCOPE_MASK; int ret = 0; - const struct logical_volume *active_lv; block_signals(flags); - _lock_memory(cmd, lv_op); assert(resource); @@ -162,23 +135,13 @@ static int _lock_vol(struct cmd_context *cmd, const char *resource, goto out; } - /* When trying activating component LV, make sure none of - * sub component LV or LVs that are using it are active */ - if (lv && ((lck_type == LCK_READ) || (lck_type == LCK_EXCL)) && - ((!lv_is_visible(lv) && (active_lv = lv_holder_is_active(lv))) || - (active_lv = lv_component_is_active(lv)))) { - log_error("Activation of logical volume %s is prohibited while logical volume %s is active.", - display_lvname(lv), display_lvname(active_lv)); - goto out; - } - if (cmd->metadata_read_only && lck_type == LCK_WRITE && strcmp(resource, VG_GLOBAL)) { log_error("Operation prohibited while global/metadata_read_only is set."); goto out; } - if ((ret = _locking.lock_resource(cmd, resource, flags, lv))) { + if ((ret = _locking.lock_resource(cmd, resource, flags, NULL))) { if (lck_scope == LCK_VG && !(flags & LCK_CACHE)) { if (lck_type != LCK_UNLOCK) lvmcache_lock_vgname(resource, lck_type == LCK_READ); @@ -196,7 +159,6 @@ static int _lock_vol(struct cmd_context *cmd, const char *resource, _update_vg_lock_count(resource, flags); } out: - _unlock_memory(cmd, lv_op); _unblock_signals(); return ret; @@ -205,28 +167,14 @@ out: int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const struct logical_volume *lv) { char resource[258] __attribute__((aligned(8))); - lv_operation_t lv_op; int lck_type = flags & LCK_TYPE_MASK; - switch (flags & (LCK_SCOPE_MASK | LCK_TYPE_MASK)) { - case LCK_LV_SUSPEND: - lv_op = LV_SUSPEND; - break; - case LCK_LV_RESUME: - lv_op = LV_RESUME; - break; - default: lv_op = LV_NOOP; - } - - if (flags == LCK_NONE) { log_debug_locking(INTERNAL_ERROR "%s: LCK_NONE lock requested", vol); return 1; } switch (flags & LCK_SCOPE_MASK) { - case LCK_ACTIVATION: - break; case LCK_VG: if (!_blocking_supported) flags |= LCK_NONBLOCK; @@ -235,10 +183,6 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str if (is_orphan_vg(vol)) vol = VG_ORPHANS; break; - case LCK_LV: - /* All LV locks are non-blocking. */ - flags |= LCK_NONBLOCK; - break; default: log_error("Unrecognised lock scope: %d", flags & LCK_SCOPE_MASK); @@ -250,7 +194,7 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str return 0; } - if (!_lock_vol(cmd, resource, flags, lv_op, lv)) + if (!_lock_vol(cmd, resource, flags)) return_0; /* @@ -261,7 +205,7 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str (flags & (LCK_CACHE | LCK_HOLD))) return 1; - if (!_lock_vol(cmd, resource, (flags & ~LCK_TYPE_MASK) | LCK_UNLOCK, lv_op, lv)) + if (!_lock_vol(cmd, resource, (flags & ~LCK_TYPE_MASK) | LCK_UNLOCK)) return_0; return 1; @@ -312,3 +256,4 @@ int sync_dev_names(struct cmd_context* cmd) return lock_vol(cmd, VG_SYNC_NAMES, LCK_VG_SYNC, NULL); } + diff --git a/lib/locking/locking.h b/lib/locking/locking.h index f3956c2..6d7d8e8 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -94,8 +94,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); */ #define LCK_SCOPE_MASK 0x00001008U #define LCK_VG 0x00000000U /* Volume Group */ -#define LCK_LV 0x00000008U /* Logical Volume */ -#define LCK_ACTIVATION 0x00001000U /* Activation */ /* * Lock bits. @@ -138,9 +136,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); */ #define LCK_NONE (LCK_VG | LCK_NULL) -#define LCK_ACTIVATE_LOCK (LCK_ACTIVATION | LCK_WRITE | LCK_HOLD) -#define LCK_ACTIVATE_UNLOCK (LCK_ACTIVATION | LCK_UNLOCK) - #define LCK_VG_READ (LCK_VG | LCK_READ | LCK_HOLD) #define LCK_VG_WRITE (LCK_VG | LCK_WRITE | LCK_HOLD) #define LCK_VG_UNLOCK (LCK_VG | LCK_UNLOCK) @@ -155,51 +150,8 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); #define LCK_VG_SYNC (LCK_NONE | LCK_CACHE) #define LCK_VG_SYNC_LOCAL (LCK_NONE | LCK_CACHE | LCK_LOCAL) -#define LCK_LV_EXCLUSIVE (LCK_LV | LCK_EXCL) -#define LCK_LV_SUSPEND (LCK_LV | LCK_WRITE) -#define LCK_LV_RESUME (LCK_LV | LCK_UNLOCK) -#define LCK_LV_ACTIVATE (LCK_LV | LCK_READ) -#define LCK_LV_DEACTIVATE (LCK_LV | LCK_NULL) - #define LCK_MASK (LCK_TYPE_MASK | LCK_SCOPE_MASK) -#define lock_lv_vol(cmd, lv, flags) lock_vol(cmd, (lv)->lvid.s, flags, lv) - -/* - * Activation locks are wrapped around activation commands that have to - * be processed atomically one-at-a-time. - * If a VG WRITE lock is held or clustered activation activates simple LV - * an activation lock is redundant. - * - * Some LV types do require taking a lock common for whole group of LVs. - * TODO: For simplicity reasons ATM take a VG activation global lock and - * later more fine-grained component detection algorithm can be added - */ - -#define lv_type_requires_activation_lock(lv) ((lv_is_thin_type(lv) || lv_is_cache_type(lv) || lv_is_mirror_type(lv) || lv_is_raid_type(lv) || lv_is_origin(lv) || lv_is_snapshot(lv)) ? 1 : 0) - -#define lv_activation_lock_name(lv) (lv_type_requires_activation_lock(lv) ? (lv)->vg->name : (lv)->lvid.s) - -#define lv_requires_activation_lock_now(lv) ((!vg_write_lock_held() && (!vg_is_clustered((lv)->vg) || !lv_type_requires_activation_lock(lv))) ? 1 : 0) - -#define lock_activation(cmd, lv) (lv_requires_activation_lock_now(lv) ? lock_vol(cmd, lv_activation_lock_name(lv), LCK_ACTIVATE_LOCK, lv) : 1) -#define unlock_activation(cmd, lv) (lv_requires_activation_lock_now(lv) ? lock_vol(cmd, lv_activation_lock_name(lv), LCK_ACTIVATE_UNLOCK, lv) : 1) - -/* - * Place temporary exclusive 'activation' lock around an LV locking operation - * to serialise it. - */ -#define lock_lv_vol_serially(cmd, lv, flags) \ -({ \ - int rr = 0; \ -\ - if (lock_activation((cmd), (lv))) { \ - rr = lock_lv_vol((cmd), (lv), (flags)); \ - unlock_activation((cmd), (lv)); \ - } \ - rr; \ -}) - #define unlock_vg(cmd, vg, vol) \ do { \ if (vg && !lvmetad_vg_update_finish(vg)) \ @@ -215,34 +167,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); release_vg(vg); \ } while (0) -#define resume_lv(cmd, lv) \ -({ \ - int rr = lock_lv_vol((cmd), (lv), LCK_LV_RESUME); \ - unlock_activation((cmd), (lv)); \ - rr; \ -}) -#define resume_lv_origin(cmd, lv) lock_lv_vol(cmd, lv, LCK_LV_RESUME | LCK_ORIGIN_ONLY) -#define revert_lv(cmd, lv) \ -({ \ - int rr = lock_lv_vol((cmd), (lv), LCK_LV_RESUME | LCK_REVERT); \ -\ - unlock_activation((cmd), (lv)); \ - rr; \ -}) -#define suspend_lv(cmd, lv) \ - (lock_activation((cmd), (lv)) ? lock_lv_vol((cmd), (lv), LCK_LV_SUSPEND | LCK_HOLD) : 0) - -#define suspend_lv_origin(cmd, lv) lock_lv_vol(cmd, lv, LCK_LV_SUSPEND | LCK_HOLD | LCK_ORIGIN_ONLY) - -#define deactivate_lv(cmd, lv) lock_lv_vol_serially(cmd, lv, LCK_LV_DEACTIVATE) - -#define activate_lv(cmd, lv) lock_lv_vol_serially(cmd, lv, LCK_LV_ACTIVATE | LCK_HOLD) - -struct logical_volume; - -#define deactivate_lv_local(cmd, lv) \ - lock_lv_vol_serially(cmd, lv, LCK_LV_DEACTIVATE | LCK_LOCAL) - #define drop_cached_metadata(vg) \ lock_vol((vg)->cmd, (vg)->name, LCK_VG_DROP_CACHE, NULL)

1 0

master - use exclusive file lock on VG for activation
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=616eeba6f2b33640534e2… Commit: 616eeba6f2b33640534e26dea43661724edf3a14 Parent: e7aa51c70f17af10df906a7e123a497c1cf3c1ba Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 11:14:39 2018 -0500 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:17:04 2018 +0100 use exclusive file lock on VG for activation Make activation commands: vgchange -ay, lvchange -ay, pvscan -aay take an exclusive file lock on the VG to serialize multiple concurrent activation commands which could otherwise interfere with each other. --- tools/lvchange.c | 2 +- tools/pvscan.c | 2 +- tools/vgchange.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/lvchange.c b/tools/lvchange.c index a90174e..3ed6b06 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -1386,7 +1386,7 @@ int lvchange_activate_cmd(struct cmd_context *cmd, int argc, char **argv) } else /* Component LVs might be active, support easy deactivation */ cmd->process_component_lvs = 1; - ret = process_each_lv(cmd, argc, argv, NULL, NULL, 0, + ret = process_each_lv(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE, NULL, &_lvchange_activate_check, &_lvchange_activate_single); if (ret != ECMD_PROCESSED) diff --git a/tools/pvscan.c b/tools/pvscan.c index 7cba0f4..61626e6 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -288,7 +288,7 @@ static int _pvscan_autoactivate(struct cmd_context *cmd, struct pvscan_aa_params pp->refresh_all = 1; } - ret = process_each_vg(cmd, 0, NULL, NULL, vgnames, 0, 0, handle, _pvscan_autoactivate_single); + ret = process_each_vg(cmd, 0, NULL, NULL, vgnames, READ_FOR_UPDATE, 0, handle, _pvscan_autoactivate_single); destroy_processing_handle(cmd, handle); diff --git a/tools/vgchange.c b/tools/vgchange.c index a67c3be..b07057f 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -791,7 +791,7 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv) cmd->lockd_vg_enforce_sh = 1; } - if (update) + if (update || arg_is_set(cmd, activate_ARG)) flags |= READ_FOR_UPDATE; if (!(handle = init_processing_handle(cmd, NULL))) {

1 0

master - Remove VG lock ordering check
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e7aa51c70f17af10df906… Commit: e7aa51c70f17af10df906a7e123a497c1cf3c1ba Parent: 18259d5559307f2708e12b9923988319e46572df Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 5 15:16:58 2018 -0500 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:17:04 2018 +0100 Remove VG lock ordering check Four commands lock two VGs at a time: - vgsplit and vgmerge already have their own logic to acquire the locks in the correct order. - vgimportclone and vgrename disable this ordering check. --- lib/cache/lvmcache.c | 66 ------------------------------------------------- lib/cache/lvmcache.h | 1 - lib/locking/locking.c | 6 ---- tools/toollib.c | 8 ------ tools/vgimportclone.c | 4 --- tools/vgrename.c | 5 --- 6 files changed, 0 insertions(+), 90 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index b9aa8a0..774d687 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -77,7 +77,6 @@ static int _has_scanned = 0; static int _vgs_locked = 0; static int _vg_global_lock_held = 0; /* Global lock held when cache wiped? */ static int _found_duplicate_pvs = 0; /* If we never see a duplicate PV we can skip checking for them later. */ -static int _suppress_lock_ordering = 0; int lvmcache_init(struct cmd_context *cmd) { @@ -158,71 +157,6 @@ static void _update_cache_lock_state(const char *vgname, int locked) _update_cache_vginfo_lock_state(vginfo, locked); } -/* - * Ensure vgname2 comes after vgname1 alphabetically. - * Orphan locks come last. - * VG_GLOBAL comes first. - */ -static int _vgname_order_correct(const char *vgname1, const char *vgname2) -{ - if (is_global_vg(vgname1)) - return 1; - - if (is_global_vg(vgname2)) - return 0; - - if (is_orphan_vg(vgname1)) - return 0; - - if (is_orphan_vg(vgname2)) - return 1; - - if (strcmp(vgname1, vgname2) < 0) - return 1; - - return 0; -} - -void lvmcache_lock_ordering(int enable) -{ - _suppress_lock_ordering = !enable; -} - -/* - * Ensure VG locks are acquired in alphabetical order. - */ -int lvmcache_verify_lock_order(const char *vgname) -{ - struct dm_hash_node *n; - const char *vgname2; - - if (_suppress_lock_ordering) - return 1; - - if (!_lock_hash) - return 1; - - dm_hash_iterate(n, _lock_hash) { - if (!dm_hash_get_data(_lock_hash, n)) - return_0; - - if (!(vgname2 = dm_hash_get_key(_lock_hash, n))) { - log_error(INTERNAL_ERROR "VG lock %s hits NULL.", - vgname); - return 0; - } - - if (!_vgname_order_correct(vgname2, vgname)) { - log_errno(EDEADLK, INTERNAL_ERROR "VG lock %s must " - "be requested before %s, not after.", - vgname, vgname2); - return 0; - } - } - - return 1; -} - void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unused))) { if (dm_hash_lookup(_lock_hash, vgname)) diff --git a/lib/cache/lvmcache.h b/lib/cache/lvmcache.h index 5891757..4808a0d 100644 --- a/lib/cache/lvmcache.h +++ b/lib/cache/lvmcache.h @@ -87,7 +87,6 @@ int lvmcache_update_vg(struct volume_group *vg, unsigned precommitted); void lvmcache_lock_vgname(const char *vgname, int read_only); void lvmcache_unlock_vgname(const char *vgname); -int lvmcache_verify_lock_order(const char *vgname); /* Queries */ const struct format_type *lvmcache_fmt_from_vgname(struct cmd_context *cmd, const char *vgname, const char *vgid, unsigned revalidate_labels); diff --git a/lib/locking/locking.c b/lib/locking/locking.c index a4fcaf7..5e28452 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -234,12 +234,6 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str /* Global VG_ORPHANS lock covers all orphan formats. */ if (is_orphan_vg(vol)) vol = VG_ORPHANS; - /* VG locks alphabetical, ORPHAN lock last */ - if ((lck_type != LCK_UNLOCK) && - !(flags & LCK_CACHE) && - !lvmcache_verify_lock_order(vol)) - return_0; - break; case LCK_LV: /* All LV locks are non-blocking. */ diff --git a/tools/toollib.c b/tools/toollib.c index 236e2b1..a4dddd3 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -5414,14 +5414,6 @@ int pvcreate_each_device(struct cmd_context *cmd, } /* - * This function holds the orphans lock while reading VGs to look for - * devices. This means the orphans lock is held while VG locks are - * acquired, which is against lvmcache lock ordering rules, so disable - * the lvmcache lock ordering checks. - */ - lvmcache_lock_ordering(0); - - /* * Clear the cache before acquiring the orphan lock. (Clearing the * cache with locks held is an error.) We want the orphan lock * acquired before process_each_pv. If the orphan lock is not held diff --git a/tools/vgimportclone.c b/tools/vgimportclone.c index 7421912..e37b897 100644 --- a/tools/vgimportclone.c +++ b/tools/vgimportclone.c @@ -342,9 +342,6 @@ retry_name: log_debug("Changing VG %s to %s.", vp.old_vgname, vp.new_vgname); - /* We don't care if the new name comes before the old in lock order. */ - lvmcache_lock_ordering(0); - if (!lock_vol(cmd, vp.new_vgname, LCK_VG_WRITE, NULL)) { log_error("Can't get lock for new VG name %s", vp.new_vgname); goto out; @@ -363,7 +360,6 @@ out: unlock_vg(cmd, NULL, VG_GLOBAL); internal_filter_clear(); init_internal_filtering(0); - lvmcache_lock_ordering(1); destroy_processing_handle(cmd, handle); /* Enable lvmetad again if no duplicates are left. */ diff --git a/tools/vgrename.c b/tools/vgrename.c index 4f2a08b..bbc3087 100644 --- a/tools/vgrename.c +++ b/tools/vgrename.c @@ -99,13 +99,8 @@ static int _vgrename_single(struct cmd_context *cmd, const char *vg_name, * this uuid-for-name case. */ if (vp->lock_vg_old_first || vp->old_name_is_uuid) { - if (vp->old_name_is_uuid) - lvmcache_lock_ordering(0); - if (!_lock_new_vg_for_rename(cmd, vp->vg_name_new)) return ECMD_FAILED; - - lvmcache_lock_ordering(1); } dev_dir = cmd->dev_dir;

1 0

master - Remove unused clvm variations for active LVs
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=18259d5559307f2708e12… Commit: 18259d5559307f2708e12b9923988319e46572df Parent: e4d9099e19591a7f3ad546c180b59a601e0d03da Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 5 13:21:28 2018 -0500 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:17:04 2018 +0100 Remove unused clvm variations for active LVs Different flavors of activate_lv() and lv_is_active() which are meaningful in a clustered VG can be eliminated and replaced with whatever that flavor already falls back to in a local VG. e.g. lv_is_active_exclusive_locally() is distinct from lv_is_active() in a clustered VG, but in a local VG they are equivalent. So, all instances of the variant are replaced with the basic local equivalent. For local VGs, the same behavior remains as before. For shared VGs, lvmlockd was written with the explicit requirement of local behavior from these functions (lvmlockd requires locking_type 1), so the behavior in shared VGs also remains the same. --- lib/activate/activate.c | 131 ++-------------------------------------- lib/activate/activate.h | 6 -- lib/locking/locking.c | 18 +----- lib/locking/locking.h | 10 +--- lib/metadata/cache_manip.c | 6 +- lib/metadata/lv.c | 64 ++------------------ lib/metadata/lv.h | 2 +- lib/metadata/lv_manip.c | 36 +++++------- lib/metadata/mirror.c | 65 ++------------------ lib/metadata/pool_manip.c | 2 +- lib/metadata/raid_manip.c | 46 ++++---------- lib/metadata/snapshot_manip.c | 6 -- lib/metadata/thin_manip.c | 4 +- lib/report/report.c | 40 +------------ tools/lvchange.c | 11 +-- tools/lvconvert.c | 27 ++++----- tools/lvcreate.c | 4 +- tools/polldaemon.c | 4 +- tools/pvmove.c | 8 +-- tools/toollib.c | 4 +- tools/vgchange.c | 16 +----- 21 files changed, 88 insertions(+), 422 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 4c70443..c9ead42 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -374,31 +374,6 @@ int lv_is_active(const struct logical_volume *lv) { return 0; } -int lv_is_active_locally(const struct logical_volume *lv) -{ - return 0; -} -int lv_is_active_remotely(const struct logical_volume *lv) -{ - return 0; -} -int lv_is_active_but_not_locally(const struct logical_volume *lv) -{ - return 0; -} -int lv_is_active_exclusive(const struct logical_volume *lv) -{ - return 0; -} -int lv_is_active_exclusive_locally(const struct logical_volume *lv) -{ - return 0; -} -int lv_is_active_exclusive_remotely(const struct logical_volume *lv) -{ - return 0; -} - int lv_check_transient(struct logical_volume *lv) { return 1; @@ -1471,61 +1446,6 @@ int lvs_in_vg_opened(const struct volume_group *vg) } /* - * _lv_is_active - * @lv: logical volume being queried - * @locally: set if active locally (when provided) - * @remotely: set if active remotely (when provided) - * @exclusive: set if active exclusively (when provided) - * - * Determine whether an LV is active locally or in a cluster. - * In addition to the return code which indicates whether or - * not the LV is active somewhere, two other values are set - * to yield more information about the status of the activation: - * - * return locally exclusively status - * ====== ======= =========== ====== - * 0 0 0 not active - * 1 0 0 active remotely - * 1 0 1 exclusive remotely - * 1 1 0 active locally and possibly remotely - * 1 1 1 exclusive locally (or local && !cluster) - * The VG lock must be held to call this function. - * - * Returns: 0 or 1 - */ -static int _lv_is_active(const struct logical_volume *lv, - int *locally, int *remotely, int *exclusive) -{ - int r, l, e; /* remote, local, and exclusive */ - int skip_cluster_query = 0; - - r = l = e = 0; - - if (_lv_active(lv->vg->cmd, lv)) - l = 1; - - if (l) - e = 1; /* exclusive by definition */ - - if (locally) - *locally = l; - if (exclusive) - *exclusive = e; - if (remotely) - *remotely = r; - - log_very_verbose("%s is %sactive%s%s%s%s", - display_lvname(lv), - (r || l) ? "" : "not ", - (exclusive && e) ? " exclusive" : "", - l ? " locally" : "", - (!skip_cluster_query && l && r) ? " and" : "", - (!skip_cluster_query && r) ? " remotely" : ""); - - return r || l; -} - -/* * Check if "raid4" @segtype is supported by kernel. * * if segment type is not raid4, return 1. @@ -1545,51 +1465,14 @@ int raid4_is_supported(struct cmd_context *cmd, const struct segment_type *segty return 1; } +/* + * The VG lock must be held to call this function. + * + * Returns: 0 or 1 + */ int lv_is_active(const struct logical_volume *lv) { - return _lv_is_active(lv, NULL, NULL, NULL); -} - -int lv_is_active_locally(const struct logical_volume *lv) -{ - int l; - - return _lv_is_active(lv, &l, NULL, NULL) && l; -} - -int lv_is_active_remotely(const struct logical_volume *lv) -{ - int r; - - return _lv_is_active(lv, NULL, &r, NULL) && r; -} - -int lv_is_active_but_not_locally(const struct logical_volume *lv) -{ - int l; - - return _lv_is_active(lv, &l, NULL, NULL) && !l; -} - -int lv_is_active_exclusive(const struct logical_volume *lv) -{ - int e; - - return _lv_is_active(lv, NULL, NULL, &e) && e; -} - -int lv_is_active_exclusive_locally(const struct logical_volume *lv) -{ - int l, e; - - return _lv_is_active(lv, &l, NULL, &e) && l && e; -} - -int lv_is_active_exclusive_remotely(const struct logical_volume *lv) -{ - int l, e; - - return _lv_is_active(lv, &l, NULL, &e) && !l && e; + return _lv_active(lv->vg->cmd, lv); } #ifdef DMEVENTD @@ -1991,7 +1874,7 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume continue; if (!vg_write_lock_held() && lv_is_mirror(lv)) { - mirr_laopts.exclusive = lv_is_active_exclusive_locally(lv) ? 1 : 0; + mirr_laopts.exclusive = lv_is_active(lv) ? 1 : 0; /* * Commands vgchange and lvchange do use read-only lock when changing * monitoring (--monitor y|n). All other use cases hold 'write-lock' diff --git a/lib/activate/activate.h b/lib/activate/activate.h index 8175f68..8b6c4ad 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -191,12 +191,6 @@ int lvs_in_vg_activated(const struct volume_group *vg); int lvs_in_vg_opened(const struct volume_group *vg); int lv_is_active(const struct logical_volume *lv); -int lv_is_active_locally(const struct logical_volume *lv); -int lv_is_active_remotely(const struct logical_volume *lv); -int lv_is_active_but_not_locally(const struct logical_volume *lv); -int lv_is_active_exclusive(const struct logical_volume *lv); -int lv_is_active_exclusive_locally(const struct logical_volume *lv); -int lv_is_active_exclusive_remotely(const struct logical_volume *lv); /* Check is any component LV is active */ const struct logical_volume *lv_component_is_active(const struct logical_volume *lv); diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 0e5658f..a4fcaf7 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -273,16 +273,6 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str return 1; } -/* - * First try to activate exclusively locally. - * Then if the VG is clustered and the LV is not yet active (e.g. due to - * an activation filter) try activating on remote nodes. - */ -int activate_lv_excl(struct cmd_context *cmd, const struct logical_volume *lv) -{ - return activate_lv_excl_local(cmd, lv); -} - /* Lock a list of LVs */ int activate_lvs(struct cmd_context *cmd, struct dm_list *lvs, unsigned exclusive) { @@ -290,13 +280,9 @@ int activate_lvs(struct cmd_context *cmd, struct dm_list *lvs, unsigned exclusiv struct lv_list *lvl; dm_list_iterate_items(lvl, lvs) { - if (!exclusive && !lv_is_active_exclusive(lvl->lv)) { - if (!activate_lv(cmd, lvl->lv)) { - log_error("Failed to activate %s", display_lvname(lvl->lv)); - return 0; - } - } else if (!activate_lv_excl(cmd, lvl->lv)) { + if (!activate_lv(cmd, lvl->lv)) { log_error("Failed to activate %s", display_lvname(lvl->lv)); + dm_list_uniterate(lvh, lvs, &lvl->list) { lvl = dm_list_item(lvh, struct lv_list); if (!deactivate_lv(cmd, lvl->lv)) diff --git a/lib/locking/locking.h b/lib/locking/locking.h index 8b2bced..f3956c2 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -231,20 +231,14 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); }) #define suspend_lv(cmd, lv) \ (lock_activation((cmd), (lv)) ? lock_lv_vol((cmd), (lv), LCK_LV_SUSPEND | LCK_HOLD) : 0) + #define suspend_lv_origin(cmd, lv) lock_lv_vol(cmd, lv, LCK_LV_SUSPEND | LCK_HOLD | LCK_ORIGIN_ONLY) + #define deactivate_lv(cmd, lv) lock_lv_vol_serially(cmd, lv, LCK_LV_DEACTIVATE) #define activate_lv(cmd, lv) lock_lv_vol_serially(cmd, lv, LCK_LV_ACTIVATE | LCK_HOLD) -#define activate_lv_excl_local(cmd, lv) \ - lock_lv_vol_serially(cmd, lv, LCK_LV_EXCLUSIVE | LCK_HOLD | LCK_LOCAL) -#define activate_lv_excl_remote(cmd, lv) \ - lock_lv_vol(cmd, lv, LCK_LV_EXCLUSIVE | LCK_HOLD | LCK_REMOTE) struct logical_volume; -int activate_lv_excl(struct cmd_context *cmd, const struct logical_volume *lv); - -#define activate_lv_local(cmd, lv) \ - lock_lv_vol_serially(cmd, lv, LCK_LV_ACTIVATE | LCK_HOLD | LCK_LOCAL) #define deactivate_lv_local(cmd, lv) \ lock_lv_vol_serially(cmd, lv, LCK_LV_DEACTIVATE | LCK_LOCAL) diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index 0768e6f..fe91fee 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -566,8 +566,8 @@ int lv_cache_remove(struct logical_volume *cache_lv) default: /* Otherwise localy activate volume to sync dirty blocks */ cache_lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(cache_lv->vg->cmd, cache_lv) || - !lv_is_active_locally(cache_lv)) { + if (!activate_lv(cache_lv->vg->cmd, cache_lv) || + !lv_is_active(cache_lv)) { log_error("Failed to active cache locally %s.", display_lvname(cache_lv)); return 0; @@ -969,7 +969,7 @@ int wipe_cache_pool(struct logical_volume *cache_pool_lv) } cache_pool_lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(cache_pool_lv->vg->cmd, cache_pool_lv)) { + if (!activate_lv(cache_pool_lv->vg->cmd, cache_pool_lv)) { log_error("Aborting. Failed to activate cache pool %s.", display_lvname(cache_pool_lv)); return 0; diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index f930633..14d7312 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -1023,7 +1023,7 @@ int lv_raid_image_in_sync(const struct logical_volume *lv) * If the LV is not active locally, * it doesn't make sense to check status */ - if (!lv_is_active_locally(lv)) + if (!lv_is_active(lv)) return 0; /* Assume not in-sync */ if (!lv_is_raid_image(lv)) { @@ -1081,7 +1081,7 @@ int lv_raid_healthy(const struct logical_volume *lv) * If the LV is not active locally, * it doesn't make sense to check status */ - if (!lv_is_active_locally(lv)) + if (!lv_is_active(lv)) return 1; /* assume healthy */ if (!lv_is_raid_type(lv)) { @@ -1446,22 +1446,8 @@ char *lv_host_dup(struct dm_pool *mem, const struct logical_volume *lv) return dm_pool_strdup(mem, lv->hostname ? : ""); } -static int _lv_is_exclusive(struct logical_volume *lv) -{ - struct lv_segment *seg; - - /* Some seg types require exclusive activation */ - /* FIXME Scan recursively */ - dm_list_iterate_items(seg, &lv->segments) - if (seg_only_exclusive(seg)) - return 1; - - /* Origin has no seg type require exlusiveness */ - return lv_is_origin(lv); -} - int lv_active_change(struct cmd_context *cmd, struct logical_volume *lv, - enum activation_change activate, int needs_exclusive) + enum activation_change activate) { const char *ay_with_mode = NULL; @@ -1478,45 +1464,22 @@ int lv_active_change(struct cmd_context *cmd, struct logical_volume *lv, switch (activate) { case CHANGE_AN: + case CHANGE_ALN: log_verbose("Deactivating logical volume %s.", display_lvname(lv)); if (!deactivate_lv(cmd, lv)) return_0; break; - case CHANGE_ALN: - log_verbose("Deactivating logical volume %s locally.", - display_lvname(lv)); - if (!deactivate_lv_local(cmd, lv)) - return_0; - break; + case CHANGE_ALY: case CHANGE_AAY: - if (needs_exclusive || _lv_is_exclusive(lv)) { - log_verbose("Activating logical volume %s exclusively locally.", - display_lvname(lv)); - if (!activate_lv_excl_local(cmd, lv)) - return_0; - } else { - log_verbose("Activating logical volume %s locally.", - display_lvname(lv)); - if (!activate_lv_local(cmd, lv)) - return_0; - } - break; case CHANGE_AEY: -exclusive: - log_verbose("Activating logical volume %s exclusively.", - display_lvname(lv)); - if (!activate_lv_excl(cmd, lv)) - return_0; - break; case CHANGE_ASY: case CHANGE_AY: default: - if (needs_exclusive || _lv_is_exclusive(lv)) - goto exclusive; log_verbose("Activating logical volume %s.", display_lvname(lv)); if (!activate_lv(cmd, lv)) return_0; + break; } if (!is_change_activating(activate) && @@ -1535,23 +1498,10 @@ char *lv_active_dup(struct dm_pool *mem, const struct logical_volume *lv) goto out; } - if (vg_is_clustered(lv->vg)) { - //const struct logical_volume *lvo = lv; - lv = lv_lock_holder(lv); - //log_debug("Holder for %s => %s.", lvo->name, lv->name); - } - if (!lv_is_active(lv)) s = ""; /* not active */ - else if (!vg_is_clustered(lv->vg)) + else s = "active"; - else if (lv_is_active_exclusive(lv)) - /* exclusive cluster activation */ - s = lv_is_active_exclusive_locally(lv) ? - "local exclusive" : "remote exclusive"; - else /* locally active */ - s = lv_is_active_but_not_locally(lv) ? - "remotely" : "locally"; out: return dm_pool_strdup(mem, s); } diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h index 920bcb5..e2e640f 100644 --- a/lib/metadata/lv.h +++ b/lib/metadata/lv.h @@ -153,7 +153,7 @@ char *lvseg_kernel_discards_dup(struct dm_pool *mem, const struct lv_segment *se int lv_set_creation(struct logical_volume *lv, const char *hostname, uint64_t timestamp); int lv_active_change(struct cmd_context *cmd, struct logical_volume *lv, - enum activation_change activate, int needs_exclusive); + enum activation_change activate); /* LV dup functions */ char *lv_attr_dup_with_info_and_seg_status(struct dm_pool *mem, const struct lv_with_info_and_seg_status *lvdm); diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index e023132..dad5953 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -4058,7 +4058,7 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah, for (s = 0; !fail && s < seg->area_count; s++) { meta_lv = seg_metalv(seg, s); - if (!activate_lv_local(meta_lv->vg->cmd, meta_lv)) { + if (!activate_lv(meta_lv->vg->cmd, meta_lv)) { log_error("Failed to activate %s for clearing.", display_lvname(meta_lv)); fail = 1; @@ -4228,7 +4228,7 @@ int lv_extend(struct logical_volume *lv, (lv_is_not_synced(lv))) { dm_percent_t sync_percent = DM_PERCENT_INVALID; - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_error("Unable to read sync percent while LV %s " "is not locally active.", display_lvname(lv)); /* FIXME Support --force */ @@ -4711,7 +4711,7 @@ static int _lvresize_adjust_policy(const struct logical_volume *lv, return 0; } - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_error("Can't read state of locally inactive LV %s.", display_lvname(lv)); return 0; @@ -5571,7 +5571,7 @@ int lv_resize(struct logical_volume *lv, * then use suspend and resume and deactivate pool LV, * instead of searching for an active thin volume. */ - if (!activate_lv_excl(cmd, lock_lv)) { + if (!activate_lv(cmd, lock_lv)) { log_error("Failed to activate %s.", display_lvname(lock_lv)); return 0; } @@ -6788,7 +6788,7 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd, struct segment_type *segtype; struct lv_segment *mapseg; struct lv_names lv_names; - unsigned exclusive = 0, i; + unsigned i; /* create an empty layer LV */ if (dm_snprintf(name, sizeof(name), "%s%s", lv_where->name, layer_suffix) < 0) { @@ -6804,9 +6804,6 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd, return NULL; } - if (lv_is_active_exclusive_locally(lv_where)) - exclusive = 1; - if (lv_is_active(lv_where) && strstr(name, MIRROR_SYNC_LAYER)) { log_very_verbose("Creating transient LV %s for mirror conversion in VG %s.", name, lv_where->vg->name); @@ -6835,10 +6832,7 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd, return NULL; } - if (exclusive) - r = activate_lv_excl(cmd, layer_lv); - else - r = activate_lv(cmd, layer_lv); + r = activate_lv(cmd, layer_lv); if (!r) { log_error("Failed to resume transient LV" @@ -7125,7 +7119,7 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp) /* nothing to do */ return 1; - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_error("Volume \"%s/%s\" is not active locally (volume_list activation filter?).", lv->vg->name, lv->name); return 0; @@ -7491,7 +7485,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, return_NULL; /* New pool is now inactive */ } else { - if (!activate_lv_excl_local(cmd, pool_lv)) { + if (!activate_lv(cmd, pool_lv)) { log_error("Aborting. Failed to locally activate thin pool %s.", display_lvname(pool_lv)); return NULL; @@ -7783,7 +7777,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (seg_is_cache(lp)) { if (vg_is_shared(vg)) { if (is_change_activating(lp->activate)) { - if (!lv_active_change(cmd, lv, CHANGE_AEY, 0)) { + if (!lv_active_change(cmd, lv, CHANGE_AEY)) { log_error("Aborting. Failed to activate LV %s.", display_lvname(lv)); goto revert_new_lv; @@ -7794,7 +7788,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, /* FIXME Support remote exclusive activation? */ /* Not yet 'cache' LV, it is stripe volume for wiping */ - else if (is_change_activating(lp->activate) && !activate_lv_excl_local(cmd, lv)) { + else if (is_change_activating(lp->activate) && !activate_lv(cmd, lv)) { log_error("Aborting. Failed to activate LV %s locally exclusively.", display_lvname(lv)); goto revert_new_lv; @@ -7827,7 +7821,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, /* Avoid multiple thin-pool activations in this case */ if (thin_pool_was_active < 0) thin_pool_was_active = 0; - if (!activate_lv_excl(cmd, pool_lv)) { + if (!activate_lv(cmd, pool_lv)) { log_error("Failed to activate thin pool %s.", display_lvname(pool_lv)); goto revert_new_lv; @@ -7846,7 +7840,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, } backup(vg); - if (!lv_active_change(cmd, lv, lp->activate, 0)) { + if (!lv_active_change(cmd, lv, lp->activate)) { log_error("Failed to activate thin %s.", lv->name); goto deactivate_and_revert_new_lv; } @@ -7860,13 +7854,13 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, } } else if (lp->snapshot) { lv->status |= LV_TEMPORARY; - if (!activate_lv_local(cmd, lv)) { + if (!activate_lv(cmd, lv)) { log_error("Aborting. Failed to activate snapshot " "exception store."); goto revert_new_lv; } lv->status &= ~LV_TEMPORARY; - } else if (!lv_active_change(cmd, lv, lp->activate, 0)) { + } else if (!lv_active_change(cmd, lv, lp->activate)) { log_error("Failed to activate new LV."); goto deactivate_and_revert_new_lv; } @@ -7968,7 +7962,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, */ /* Activate spare snapshot once it is a complete LV */ - if (!lv_active_change(cmd, origin_lv, lp->activate, 1)) { + if (!lv_active_change(cmd, origin_lv, lp->activate)) { log_error("Failed to activate sparce volume %s.", display_lvname(origin_lv)); return NULL; diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 9c775c4..8de1440 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -354,7 +354,7 @@ static int _init_mirror_log(struct cmd_context *cmd, } else if (!lv_update_and_reload((struct logical_volume*) lock_holder)) return_0; - if (!activate_lv_excl_local(cmd, log_lv)) { + if (!activate_lv(cmd, log_lv)) { log_error("Aborting. Failed to activate mirror log."); goto revert_new_lv; } @@ -427,15 +427,10 @@ static int _activate_lv_like_model(struct logical_volume *model, /* FIXME: run all cases through lv_active_change when clvm variants are gone. */ if (vg_is_shared(lv->vg)) - return lv_active_change(lv->vg->cmd, lv, CHANGE_AEY, 0); + return lv_active_change(lv->vg->cmd, lv, CHANGE_AEY); - if (lv_is_active_exclusive(model)) { - if (!activate_lv_excl(lv->vg->cmd, lv)) - return_0; - } else { - if (!activate_lv(lv->vg->cmd, lv)) - return_0; - } + if (!activate_lv(lv->vg->cmd, lv)) + return_0; return 1; } @@ -610,14 +605,7 @@ static int _mirrored_lv_in_sync(struct logical_volume *lv) if (!lv_mirror_percent(lv->vg->cmd, lv, 0, &sync_percent, NULL)) { - if (lv_is_active_but_not_locally(lv)) - log_error("Unable to determine mirror sync status of" - " remotely active LV, %s", - display_lvname(lv)); - else - log_error("Unable to determine mirror " - "sync status of %s.", - display_lvname(lv)); + log_error("Unable to determine mirror sync status of %s.", display_lvname(lv)); return 0; } @@ -1668,7 +1656,6 @@ int remove_mirror_log(struct cmd_context *cmd, int force) { dm_percent_t sync_percent; - struct volume_group *vg = lv->vg; /* Unimplemented features */ if (dm_list_size(&lv->segments) != 1) { @@ -1677,20 +1664,12 @@ int remove_mirror_log(struct cmd_context *cmd, } /* Had disk log, switch to core. */ - if (lv_is_active_locally(lv)) { + if (lv_is_active(lv)) { if (!lv_mirror_percent(cmd, lv, 0, &sync_percent, NULL)) { log_error("Unable to determine mirror sync status."); return 0; } - } else if (lv_is_active(lv)) { - log_error("Unable to determine sync status of " - "remotely active mirror volume %s.", display_lvname(lv)); - return 0; - } else if (vg_is_clustered(vg)) { - log_error("Unable to convert the log of an inactive " - "cluster mirror volume %s.", display_lvname(lv)); - return 0; } else if (force || yes_no_prompt("Full resync required to convert inactive " "mirror volume %s to core log. " "Proceed? [y/n]: ", display_lvname(lv)) == 'y') @@ -1910,22 +1889,11 @@ int add_mirror_log(struct cmd_context *cmd, struct logical_volume *lv, unsigned old_log_count; int r = 0; - if (vg_is_clustered(lv->vg) && (log_count > 1)) { - log_error("Log type, \"mirrored\", is unavailable to cluster mirrors."); - return 0; - } - if (dm_list_size(&lv->segments) != 1) { log_error("Multiple-segment mirror is not supported."); return 0; } - if (lv_is_active_but_not_locally(lv)) { - log_error("Unable to convert the log of a mirror, %s, that is " - "active remotely but not locally.", display_lvname(lv)); - return 0; - } - log_lv = first_seg(lv)->log_lv; old_log_count = (log_lv) ? lv_mirror_count(log_lv) : 0; if (old_log_count == log_count) { @@ -2079,27 +2047,6 @@ int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv, return 0; } - if (vg_is_clustered(lv->vg)) { - /* FIXME: move this test out of this function */ - /* Skip test for pvmove mirrors, it can use local mirror */ - if (!lv_is_pvmove(lv) && !lv_is_locked(lv) && - lv_is_active(lv) && - !lv_is_active_exclusive_locally(lv) && /* lv_is_active_remotely */ - !cluster_mirror_is_available(lv->vg->cmd)) { - log_error("Shared cluster mirrors are not available."); - return 0; - } - - /* - * No mirrored logs for cluster mirrors until - * log daemon is multi-threaded. - */ - if (log_count > 1) { - log_error("Log type, \"mirrored\", is unavailable to cluster mirrors."); - return 0; - } - } - if (lv->vg->lock_type && !strcmp(lv->vg->lock_type, "dlm") && cmd->lockd_lv_sh) { if (!cluster_mirror_is_available(cmd)) { log_error("Shared cluster mirrors are not available."); diff --git a/lib/metadata/pool_manip.c b/lib/metadata/pool_manip.c index 20224d1..80d2e07 100644 --- a/lib/metadata/pool_manip.c +++ b/lib/metadata/pool_manip.c @@ -526,7 +526,7 @@ int create_pool(struct logical_volume *pool_lv, * or directly converted to invisible device via suspend/resume */ pool_lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(pool_lv->vg->cmd, pool_lv)) { + if (!activate_lv(pool_lv->vg->cmd, pool_lv)) { log_error("Aborting. Failed to activate pool metadata %s.", display_lvname(pool_lv)); goto bad; diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 53aa4f1..92e01a2 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -319,7 +319,7 @@ static int _deactivate_and_remove_lvs(struct volume_group *vg, struct dm_list *r return 0; } /* Must get a cluster lock on SubLVs that will be removed. */ - if (!activate_lv_excl_local(vg->cmd, lvl->lv)) + if (!activate_lv(vg->cmd, lvl->lv)) return_0; } @@ -669,7 +669,7 @@ static int _lv_update_and_reload_list(struct logical_volume *lv, int origin_only dm_list_iterate_items(lvl, lv_list) { log_very_verbose("Activating logical volume %s before %s in kernel.", display_lvname(lvl->lv), display_lvname(lock_lv)); - if (!activate_lv_excl_local(vg->cmd, lvl->lv)) { + if (!activate_lv(vg->cmd, lvl->lv)) { log_error("Failed to activate %s before resuming %s.", display_lvname(lvl->lv), display_lvname(lock_lv)); r = 0; /* But lets try with the rest */ @@ -732,9 +732,9 @@ static int _clear_lvs(struct dm_list *lv_list) was_active = alloca(sz); dm_list_iterate_items(lvl, lv_list) - if (!(was_active[i++] = lv_is_active_locally(lvl->lv))) { + if (!(was_active[i++] = lv_is_active(lvl->lv))) { lvl->lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(vg->cmd, lvl->lv)) { + if (!activate_lv(vg->cmd, lvl->lv)) { log_error("Failed to activate localy %s for clearing.", display_lvname(lvl->lv)); r = 0; @@ -2276,7 +2276,7 @@ static int _vg_write_lv_suspend_vg_commit(struct logical_volume *lv, int origin_ /* Helper: function to activate @lv exclusively local */ static int _activate_sub_lv_excl_local(struct logical_volume *lv) { - if (lv && !activate_lv_excl_local(lv->vg->cmd, lv)) { + if (lv && !activate_lv(lv->vg->cmd, lv)) { log_error("Failed to activate %s.", display_lvname(lv)); return 0; } @@ -3258,16 +3258,6 @@ static int _lv_raid_change_image_count(struct logical_volume *lv, int yes, uint3 return r; } - /* - * LV must be either in-active or exclusively active - */ - if (lv_is_active(lv_lock_holder(lv)) && vg_is_clustered(lv->vg) && - !lv_is_active_exclusive_locally(lv_lock_holder(lv))) { - log_error("%s must be active exclusive locally to " - "perform this operation.", display_lvname(lv)); - return 0; - } - if (old_count > new_count) return _raid_remove_images(lv, yes, new_count, allocate_pvs, removal_lvs, commit); @@ -3427,13 +3417,13 @@ int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name, /* FIXME: run all cases through lv_active_change when clvm variants are gone. */ if (vg_is_shared(lvl->lv->vg)) { - if (!lv_active_change(lv->vg->cmd, lvl->lv, CHANGE_AEY, 0)) + if (!lv_active_change(lv->vg->cmd, lvl->lv, CHANGE_AEY)) return_0; - } else if (!activate_lv_excl_local(cmd, lvl->lv)) + } else if (!activate_lv(cmd, lvl->lv)) return_0; dm_list_iterate_items(lvl, &removal_lvs) - if (!activate_lv_excl_local(cmd, lvl->lv)) + if (!activate_lv(cmd, lvl->lv)) return_0; if (!resume_lv(cmd, lv_lock_holder(lv))) { @@ -3539,7 +3529,7 @@ int lv_raid_split_and_track(struct logical_volume *lv, /* Activate the split (and tracking) LV */ /* Preserving exclusive local activation also for tracked LV */ - if (!activate_lv_excl_local(lv->vg->cmd, seg_lv(seg, s))) + if (!activate_lv(lv->vg->cmd, seg_lv(seg, s))) return_0; if (seg->area_count == 2) @@ -5001,7 +4991,7 @@ static int _clear_meta_lvs(struct logical_volume *lv) /* Grab locks first in case of clustered VG */ if (vg_is_clustered(lv->vg)) dm_list_iterate_items(lvl, &meta_lvs) - if (!activate_lv_excl_local(lv->vg->cmd, lvl->lv)) + if (!activate_lv(lv->vg->cmd, lvl->lv)) return_0; /* * Now deactivate the MetaLVs before clearing, so @@ -6520,14 +6510,6 @@ int lv_raid_convert(struct logical_volume *lv, return 0; } - if (vg_is_clustered(lv->vg) && - !lv_is_active_exclusive_locally(lv_lock_holder(lv))) { - /* In clustered VGs, the LV must be active on this node exclusively. */ - log_error("%s must be active exclusive locally to " - "perform this operation.", display_lvname(lv)); - return 0; - } - new_segtype = new_segtype ? : seg->segtype; if (!new_segtype) { log_error(INTERNAL_ERROR "New segtype not specified."); @@ -6810,10 +6792,8 @@ static int _lv_raid_rebuild_or_replace(struct logical_volume *lv, if (lv_is_partial(lv)) lv->vg->cmd->partial_activation = 1; - if (!lv_is_active_exclusive_locally(lv_lock_holder(lv))) { - log_error("%s must be active %sto perform this operation.", - display_lvname(lv), - vg_is_clustered(lv->vg) ? "exclusive locally " : ""); + if (!lv_is_active(lv_lock_holder(lv))) { + log_error("%s must be active to perform this operation.", display_lvname(lv)); return 0; } @@ -7013,7 +6993,7 @@ try_again: * of their new names. */ dm_list_iterate_items(lvl, &old_lvs) - if (!activate_lv_excl_local(lv->vg->cmd, lvl->lv)) + if (!activate_lv(lv->vg->cmd, lvl->lv)) return_0; /* diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c index e3669ef..5ccf251 100644 --- a/lib/metadata/snapshot_manip.c +++ b/lib/metadata/snapshot_manip.c @@ -411,11 +411,5 @@ int validate_snapshot_origin(const struct logical_volume *origin_lv) return 0; } - if (vg_is_clustered(origin_lv->vg) && lv_is_active(origin_lv) && - !lv_is_active_exclusive_locally(origin_lv)) { - log_error("Snapshot origin must be active exclusively."); - return 0; - } - return 1; } diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c index e1522d3..6b2b1e7 100644 --- a/lib/metadata/thin_manip.c +++ b/lib/metadata/thin_manip.c @@ -504,7 +504,7 @@ int update_pool_lv(struct logical_volume *lv, int activate) * as this version has major problem when it does not know * which Node has pool active. */ - if (!activate_lv_excl(lv->vg->cmd, lv)) { + if (!activate_lv(lv->vg->cmd, lv)) { init_dmeventd_monitor(monitored); return_0; } @@ -857,7 +857,7 @@ int check_new_thin_pool(const struct logical_volume *pool_lv) uint64_t transaction_id; /* For transaction_id check LOCAL activation is required */ - if (!activate_lv_excl_local(cmd, pool_lv)) { + if (!activate_lv(cmd, pool_lv)) { log_error("Aborting. Failed to locally activate thin pool %s.", display_lvname(pool_lv)); return 0; diff --git a/lib/report/report.c b/lib/report/report.c index 4a957a7..8039820 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -3559,11 +3559,7 @@ static int _lvactivelocally_disp(struct dm_report *rh, struct dm_pool *mem, if (!activation()) return _binary_undef_disp(rh, mem, field, private); - if (vg_is_clustered(lv->vg)) { - lv = lv_lock_holder(lv); - active_locally = lv_is_active_locally(lv); - } else - active_locally = lv_is_active(lv); + active_locally = lv_is_active(lv); return _binary_disp(rh, mem, field, active_locally, GET_FIRST_RESERVED_NAME(lv_active_locally_y), private); } @@ -3572,38 +3568,12 @@ static int _lvactiveremotely_disp(struct dm_report *rh, struct dm_pool *mem, struct dm_report_field *field, const void *data, void *private) { - const struct logical_volume *lv = (const struct logical_volume *) data; int active_remotely; if (!activation()) return _binary_undef_disp(rh, mem, field, private); - if (vg_is_clustered(lv->vg)) { - lv = lv_lock_holder(lv); - /* FIXME: It seems we have no way to get this info correctly - * with current interface - we'd need to check number - * of responses from the cluster: - * - if number of nodes that responded == 1 - * - and LV is active on local node - * ..then we may say that LV is *not* active remotely. - * - * Otherwise ((responses > 1 && LV active locally) || - * (responses == 1 && LV not active locally)), it's - * active remotely. - * - * We have this info, but hidden underneath the - * locking interface (locking_type.query_resource fn). - * - * For now, let's use 'unknown' for remote status if - * the LV is found active locally until we find a way to - * smuggle the proper information out of the interface. - */ - if (lv_is_active_locally(lv)) - return _binary_undef_disp(rh, mem, field, private); - - active_remotely = lv_is_active_but_not_locally(lv); - } else - active_remotely = 0; + active_remotely = 0; return _binary_disp(rh, mem, field, active_remotely, GET_FIRST_RESERVED_NAME(lv_active_remotely_y), private); } @@ -3618,11 +3588,7 @@ static int _lvactiveexclusively_disp(struct dm_report *rh, struct dm_pool *mem, if (!activation()) return _binary_undef_disp(rh, mem, field, private); - if (vg_is_clustered(lv->vg)) { - lv = lv_lock_holder(lv); - active_exclusively = lv_is_active_exclusive(lv); - } else - active_exclusively = lv_is_active(lv); + active_exclusively = lv_is_active(lv); return _binary_disp(rh, mem, field, active_exclusively, GET_FIRST_RESERVED_NAME(lv_active_exclusively_y), private); } diff --git a/tools/lvchange.c b/tools/lvchange.c index 481cb4c..a90174e 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -294,9 +294,6 @@ static int _reactivate_lv(struct logical_volume *lv, if (!active) return 1; - if (exclusive) - return activate_lv_excl_local(cmd, lv); - return activate_lv(cmd, lv); } @@ -318,7 +315,7 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) dm_list_init(&device_list); - if (lv_is_active_locally(lv)) { + if (lv_is_active(lv)) { if (!lv_check_not_in_use(lv, 1)) { log_error("Can't resync open logical volume %s.", display_lvname(lv)); @@ -335,7 +332,7 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) } active = 1; - if (lv_is_active_exclusive_locally(lv)) + if (lv_is_active(lv)) exclusive = 1; } @@ -411,7 +408,7 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) memlock_unlock(lv->vg->cmd); dm_list_iterate_items(lvl, &device_list) { - if (!activate_lv_excl_local(cmd, lvl->lv)) { + if (!activate_lv(cmd, lvl->lv)) { log_error("Unable to activate %s for %s clearing.", display_lvname(lvl->lv), (seg_is_raid(seg)) ? "metadata area" : "mirror log"); @@ -621,7 +618,7 @@ static int _lvchange_persistent(struct cmd_context *cmd, if (activate != CHANGE_AN) { log_verbose("Re-activating logical volume %s.", display_lvname(lv)); - if (!lv_active_change(cmd, lv, activate, 0)) { + if (!lv_active_change(cmd, lv, activate)) { log_error("%s: reactivation failed.", display_lvname(lv)); backup(lv->vg); return 0; diff --git a/tools/lvconvert.c b/tools/lvconvert.c index aebf3e9..11f7cee 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1767,7 +1767,7 @@ static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volu return 0; } - if (lv_is_active_locally(cow)) { + if (lv_is_active(cow)) { if (!lv_check_not_in_use(cow, 1)) return_0; @@ -1950,7 +1950,7 @@ static int _lvconvert_snapshot(struct cmd_context *cmd, log_warn("WARNING: %s not zeroed.", snap_name); else { lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(cmd, lv) || + if (!activate_lv(cmd, lv) || !wipe_lv(lv, (struct wipe_params) { .do_zero = 1 })) { log_error("Aborting. Failed to wipe snapshot exception store."); return 0; @@ -2037,7 +2037,7 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd, * constructor and DM should prevent appropriate devices from * being open. */ - if (lv_is_active_locally(origin)) { + if (lv_is_active(origin)) { if (!lv_check_not_in_use(origin, 0)) { log_print_unless_silent("Delaying merge since origin is open."); merge_on_activate = 1; @@ -2146,7 +2146,7 @@ static int _lvconvert_merge_thin_snapshot(struct cmd_context *cmd, log_print_unless_silent("Volume %s replaced origin %s.", display_lvname(origin), display_lvname(lv)); - if (origin_is_active && !activate_lv_excl_local(cmd, lv)) { + if (origin_is_active && !activate_lv(cmd, lv)) { log_error("Failed to reactivate origin %s.", display_lvname(lv)); return 0; @@ -2254,13 +2254,13 @@ static int _lvconvert_thin_pool_repair(struct cmd_context *cmd, return 0; } - if (!activate_lv_excl_local(cmd, pmslv)) { + if (!activate_lv(cmd, pmslv)) { log_error("Cannot activate pool metadata spare volume %s.", pmslv->name); return 0; } - if (!activate_lv_excl_local(cmd, mlv)) { + if (!activate_lv(cmd, mlv)) { log_error("Cannot activate thin pool metadata volume %s.", mlv->name); goto deactivate_pmslv; @@ -2452,13 +2452,13 @@ static int _lvconvert_cache_repair(struct cmd_context *cmd, return 0; } - if (!activate_lv_excl_local(cmd, pmslv)) { + if (!activate_lv(cmd, pmslv)) { log_error("Cannot activate pool metadata spare volume %s.", pmslv->name); return 0; } - if (!activate_lv_excl_local(cmd, mlv)) { + if (!activate_lv(cmd, mlv)) { log_error("Cannot activate cache pool metadata volume %s.", mlv->name); goto deactivate_pmslv; @@ -3106,7 +3106,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, if (zero_metadata) { metadata_lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(cmd, metadata_lv)) { + if (!activate_lv(cmd, metadata_lv)) { log_error("Aborting. Failed to activate metadata lv."); goto bad; } @@ -3248,7 +3248,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, } if (activate_pool && - !activate_lv_excl(cmd, pool_lv)) { + !activate_lv(cmd, pool_lv)) { log_error("Failed to activate pool logical volume %s.", display_lvname(pool_lv)); /* Deactivate subvolumes */ @@ -3461,11 +3461,8 @@ static int _lvconvert_repair_pvs_raid(struct cmd_context *cmd, struct logical_vo struct dm_list *failed_pvs; int do_it; - if (!lv_is_active_exclusive_locally(lv_lock_holder(lv))) { - log_error("%s must be active %sto perform this operation.", - display_lvname(lv), - vg_is_clustered(lv->vg) ? - "exclusive locally " : ""); + if (!lv_is_active(lv_lock_holder(lv))) { + log_error("%s must be active to perform this operation.", display_lvname(lv)); return 0; } diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 5c9d448..4009ea5 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -1232,13 +1232,13 @@ static int _determine_cache_argument(struct volume_group *vg, return 1; } else if (vg_is_shared(vg)) { - if (!lv_active_change(cmd, lv, CHANGE_AEY, 0)) { + if (!lv_active_change(cmd, lv, CHANGE_AEY)) { log_error("Cannot activate cache origin %s.", display_lvname(lv)); return 0; } - } else if (!activate_lv_excl_local(cmd, lv)) { + } else if (!activate_lv(cmd, lv)) { log_error("Cannot activate cache origin %s.", display_lvname(lv)); return 0; diff --git a/tools/polldaemon.c b/tools/polldaemon.c index bd99c7b..7ad45ca 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -200,7 +200,7 @@ int wait_for_single_lv(struct cmd_context *cmd, struct poll_operation_id *id, * If the LV is not active locally, the kernel cannot be * queried for its status. We must exit in this case. */ - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_print_unless_silent("%s: Interrupted: No longer active.", id->display_name); ret = 1; goto out; @@ -440,7 +440,7 @@ static int _report_progress(struct cmd_context *cmd, struct poll_operation_id *i goto out; } - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_verbose("%s: Interrupted: No longer active.", id->display_name); ret = 1; goto out; diff --git a/tools/pvmove.c b/tools/pvmove.c index 0fcabb3..c5e3929 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -466,8 +466,7 @@ static struct logical_volume *_set_up_pvmove_lv(struct cmd_context *cmd, * in the case it's NOT active anywhere else, since LOCKED LVs cannot be * later activated by user. */ - if (lv_is_active_remotely(holder) || - (!lv_is_active_locally(holder) && !activate_lv_excl_local(cmd, holder))) { + if ((!lv_is_active(holder) && !activate_lv(cmd, holder))) { lv_skipped = 1; log_print_unless_silent("Skipping LV %s which is not locally exclusive%s.", display_lvname(lv), @@ -532,10 +531,7 @@ static int _activate_lv(struct cmd_context *cmd, struct logical_volume *lv_mirr, { int r = 0; - if (exclusive || lv_is_active_exclusive(lv_mirr)) - r = activate_lv_excl(cmd, lv_mirr); - else - r = activate_lv(cmd, lv_mirr); + r = activate_lv(cmd, lv_mirr); if (!r) stack; diff --git a/tools/toollib.c b/tools/toollib.c index baf84ad..236e2b1 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1034,7 +1034,7 @@ int lv_change_activate(struct cmd_context *cmd, struct logical_volume *lv, return 0; } - if (!lv_active_change(cmd, lv, activate, 0)) + if (!lv_active_change(cmd, lv, activate)) return_0; set_lv_notify(lv->vg->cmd); @@ -1066,7 +1066,7 @@ int lv_refresh(struct cmd_context *cmd, struct logical_volume *lv) * - fortunately: polldaemon will immediately shutdown if the * origin doesn't have a status with a snapshot percentage */ - if (background_polling() && lv_is_merging_origin(lv) && lv_is_active_locally(lv)) + if (background_polling() && lv_is_merging_origin(lv) && lv_is_active(lv)) lv_spawn_background_polling(cmd, lv); return 1; diff --git a/tools/vgchange.c b/tools/vgchange.c index e87277f..a67c3be 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -63,7 +63,7 @@ static int _poll_lvs_in_vg(struct cmd_context *cmd, dm_list_iterate_items(lvl, &vg->lvs) { lv = lvl->lv; - if (lv_is_active_locally(lv) && + if (lv_is_active(lv) && (lv_is_pvmove(lv) || lv_is_converting(lv) || lv_is_merging(lv))) { lv_spawn_background_polling(cmd, lv); count++; @@ -116,20 +116,8 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg, expected_count++; - if (!lv_change_activate(cmd, lv, activate)) { - if (!lv_is_active_exclusive_remotely(lv)) - stack; - else { - /* - * If the LV is active exclusive remotely, - * then ignore it here - */ - log_verbose("%s is exclusively active on a remote node.", - display_lvname(lv)); - expected_count--; /* not accounted */ - } + if (!lv_change_activate(cmd, lv, activate)) continue; - } count++; }

1 0

master - Remove more clvm code
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e4d9099e19591a7f3ad54… Commit: e4d9099e19591a7f3ad546c180b59a601e0d03da Parent: d154dd66382d1bab4c227f6b3aaa12b6ccbb491f Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 5 11:39:07 2018 -0500 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:17:04 2018 +0100 Remove more clvm code --- lib/format_text/archiver.c | 4 ---- lib/locking/locking.h | 15 +++++---------- lib/metadata/metadata.c | 7 ------- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c index 9d7be95..ab80117 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -275,10 +275,6 @@ int backup(struct volume_group *vg) if (is_orphan_vg(vg->name)) return 1; - if (vg_is_clustered(vg)) - if (!remote_backup_metadata(vg)) - stack; - return backup_locally(vg); } diff --git a/lib/locking/locking.h b/lib/locking/locking.h index 8322bae..8b2bced 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -163,10 +163,7 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); #define LCK_MASK (LCK_TYPE_MASK | LCK_SCOPE_MASK) -#define LCK_LV_CLUSTERED(lv) \ - (vg_is_clustered((lv)->vg) ? LCK_CLUSTER_VG : 0) - -#define lock_lv_vol(cmd, lv, flags) lock_vol(cmd, (lv)->lvid.s, flags | LCK_LV_CLUSTERED(lv), lv) +#define lock_lv_vol(cmd, lv, flags) lock_vol(cmd, (lv)->lvid.s, flags, lv) /* * Activation locks are wrapped around activation commands that have to @@ -180,7 +177,9 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); */ #define lv_type_requires_activation_lock(lv) ((lv_is_thin_type(lv) || lv_is_cache_type(lv) || lv_is_mirror_type(lv) || lv_is_raid_type(lv) || lv_is_origin(lv) || lv_is_snapshot(lv)) ? 1 : 0) + #define lv_activation_lock_name(lv) (lv_type_requires_activation_lock(lv) ? (lv)->vg->name : (lv)->lvid.s) + #define lv_requires_activation_lock_now(lv) ((!vg_write_lock_held() && (!vg_is_clustered((lv)->vg) || !lv_type_requires_activation_lock(lv))) ? 1 : 0) #define lock_activation(cmd, lv) (lv_requires_activation_lock_now(lv) ? lock_vol(cmd, lv_activation_lock_name(lv), LCK_ACTIVATE_LOCK, lv) : 1) @@ -246,16 +245,12 @@ int activate_lv_excl(struct cmd_context *cmd, const struct logical_volume *lv); #define activate_lv_local(cmd, lv) \ lock_lv_vol_serially(cmd, lv, LCK_LV_ACTIVATE | LCK_HOLD | LCK_LOCAL) + #define deactivate_lv_local(cmd, lv) \ lock_lv_vol_serially(cmd, lv, LCK_LV_DEACTIVATE | LCK_LOCAL) + #define drop_cached_metadata(vg) \ lock_vol((vg)->cmd, (vg)->name, LCK_VG_DROP_CACHE, NULL) -#define remote_commit_cached_metadata(vg) \ - lock_vol((vg)->cmd, (vg)->name, LCK_VG_COMMIT, NULL) -#define remote_revert_cached_metadata(vg) \ - lock_vol((vg)->cmd, (vg)->name, LCK_VG_REVERT, NULL) -#define remote_backup_metadata(vg) \ - lock_vol((vg)->cmd, (vg)->name, LCK_VG_BACKUP, NULL) int sync_local_dev_names(struct cmd_context* cmd); int sync_dev_names(struct cmd_context* cmd); diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 3f177b0..7c41d78 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3130,10 +3130,6 @@ int vg_commit(struct volume_group *vg) set_vg_notify(vg->cmd); if (cache_updated) { - /* Instruct remote nodes to upgrade cached metadata. */ - if (!remote_commit_cached_metadata(vg)) - stack; // FIXME: What should we do? - /* * We need to clear old_name after a successful commit. * The volume_group structure could be reused later. @@ -3188,9 +3184,6 @@ void vg_revert(struct volume_group *vg) if (!drop_cached_metadata(vg)) log_error("Attempt to drop cached metadata failed " "after reverted update for VG %s.", vg->name); - - if (!remote_revert_cached_metadata(vg)) - stack; // FIXME: What should we do? } static int _check_mda_in_use(struct metadata_area *mda, void *_in_use)

1 0

master - lvmlockd: fix missing lock_type null check
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d154dd66382d1bab4c227… Commit: d154dd66382d1bab4c227f6b3aaa12b6ccbb491f Parent: 1539e51721418768eae894c0179a82cf5ab8e040 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 13:56:02 2018 -0500 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:17:04 2018 +0100 lvmlockd: fix missing lock_type null check Missed checking if vg->lock_type is NULL in commit db8d3bdfa: lvmlockd: enable mirror split and merge with dlm lock_type --- lib/metadata/raid_manip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 4d58d74..53aa4f1 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -3395,7 +3395,7 @@ int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name, lvl->lv->name = split_name; - if (!strcmp(lv->vg->lock_type, "dlm")) + if (lv->vg->lock_type && !strcmp(lv->vg->lock_type, "dlm")) lvl->lv->lock_args = lv->lock_args; if (!vg_write(lv->vg)) {

1 0

master - devices: clean up io error messages
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1539e51721418768eae89… Commit: 1539e51721418768eae894c0179a82cf5ab8e040 Parent: bd8c6cf8628e5898ea89ebbcccfe423dba83a840 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 10:05:08 2018 -0500 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:17:04 2018 +0100 devices: clean up io error messages Remove the io error message from bcache.c since it is not very useful without the device path. Make the io error messages from dev_read_bytes/dev_write_bytes more user friendly. --- lib/device/bcache.c | 1 - lib/label/label.c | 40 ++++++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/lib/device/bcache.c b/lib/device/bcache.c index 8fda0bd..561f68e 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -623,7 +623,6 @@ static void _complete_io(void *context, int err) dm_list_del(&b->list); if (b->error) { - log_warn("bcache io error %d fd %d", b->error, b->fd); dm_list_add(&cache->errored, &b->list); } else { diff --git a/lib/label/label.c b/lib/label/label.c index f36c706..ce995d6 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -1122,14 +1122,15 @@ bool dev_read_bytes(struct device *dev, uint64_t start, size_t len, void *data) if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ if (!label_scan_open(dev)) { - log_error("dev_read_bytes %s cannot open dev", dev_name(dev)); + log_error("Error opening device %s for reading at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); return false; } } if (!bcache_read_bytes(scan_bcache, dev->bcache_fd, start, len, data)) { - log_error("dev_read_bytes %s at %u failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error reading device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } @@ -1151,21 +1152,22 @@ bool dev_write_bytes(struct device *dev, uint64_t start, size_t len, void *data) if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ if (!label_scan_open(dev)) { - log_error("dev_write_bytes %s cannot open dev", dev_name(dev)); + log_error("Error opening device %s for writing at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); return false; } } if (!bcache_write_bytes(scan_bcache, dev->bcache_fd, start, len, data)) { - log_error("dev_write_bytes %s at %u bcache write failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } if (!bcache_flush(scan_bcache)) { - log_error("dev_write_bytes %s at %u bcache flush failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } @@ -1185,21 +1187,22 @@ bool dev_write_zeros(struct device *dev, uint64_t start, size_t len) if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ if (!label_scan_open(dev)) { - log_error("dev_write_zeros %s cannot open dev", dev_name(dev)); + log_error("Error opening device %s for writing at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); return false; } } if (!bcache_zero_bytes(scan_bcache, dev->bcache_fd, start, len)) { - log_error("dev_write_zeros %s at %u bcache write failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } if (!bcache_flush(scan_bcache)) { - log_error("dev_write_zeros %s at %u bcache flush failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } @@ -1219,21 +1222,22 @@ bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t val) if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ if (!label_scan_open(dev)) { - log_error("dev_set_bytes %s cannot open dev", dev_name(dev)); + log_error("Error opening device %s for writing at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); return false; } } if (!bcache_set_bytes(scan_bcache, dev->bcache_fd, start, len, val)) { - log_error("dev_set_bytes %s at %u bcache write failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } if (!bcache_flush(scan_bcache)) { - log_error("dev_set_bytes %s at %u bcache flush failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; }

1 0

master - scripts/lvm2_activation_generator_systemd_red_hat: rewrite to use lvmconfig
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=bd8c6cf8628e5898ea89e… Commit: bd8c6cf8628e5898ea89ebbcccfe423dba83a840 Parent: 74460cd009267564be032a373e78ec5eba67b4ce Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Thu Jun 7 16:15:04 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu Jun 7 16:15:04 2018 +0100 scripts/lvm2_activation_generator_systemd_red_hat: rewrite to use lvmconfig Unit tested the new code, but not run functional tests (assuming they exist). --- configure.ac | 3 + scripts/Makefile.in | 16 +-- scripts/generator-internals.c | 200 +++++++++++++++++ .../lvm2_activation_generator_systemd_red_hat.c | 232 ++++++++++++-------- test/unit/Makefile.in | 6 +- test/unit/units.h | 2 + 6 files changed, 348 insertions(+), 111 deletions(-) diff --git a/configure.ac b/configure.ac index 67f2462..365df25 100644 --- a/configure.ac +++ b/configure.ac @@ -1533,6 +1533,9 @@ SBINDIR="$(eval echo $(eval echo $sbindir))" LVM_PATH="$SBINDIR/lvm" AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) +LVMCONFIG_PATH="$$BINDIR/lvmconfig" +AC_DEFINE_UNQUOTED(LVMCONFIG_PATH, ["$LVMCONFIG_PATH"], [Path to lvmconfig binary.]) + USRSBINDIR="$(eval echo $(eval echo $usrsbindir))" FSADM_PATH="$SBINDIR/fsadm" diff --git a/scripts/Makefile.in b/scripts/Makefile.in index ee39306..208aebf 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -15,21 +15,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -ifeq ("@APPLIB@", "yes") - SOURCES = lvm2_activation_generator_systemd_red_hat.c - TARGETS = lvm2_activation_generator_systemd_red_hat -endif +SOURCES = lvm2_activation_generator_systemd_red_hat.c +TARGETS = lvm2_activation_generator_systemd_red_hat include $(top_builddir)/make.tmpl -ifeq ("@APPLIB@", "yes") - DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so - LDFLAGS += -L$(top_builddir)/liblvm ifeq ("@BUILD_DMEVENTD@", "yes") LDFLAGS += -Wl,-rpath-link,$(top_builddir)/daemons/dmeventd endif - LVMLIBS = @LVM2APP_LIB@ -laio -endif LVM_SCRIPTS = lvmdump.sh lvmconf.sh DM_SCRIPTS = @@ -93,12 +86,7 @@ lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS) $(INTERNAL_LIBS install_systemd_generators: $(INSTALL_DIR) $(systemd_generator_dir) -ifeq ("@APPLIB@", "yes") $(INSTALL_PROGRAM) lvm2_activation_generator_systemd_red_hat $(systemd_generator_dir)/lvm2-activation-generator -else - @echo "WARNING: LVM2 activation systemd generator not installed." \ - "It requires the LVM2 application library to be built as well." -endif install_systemd_units: install_dbus_service $(INSTALL_DIR) $(systemd_unit_dir) diff --git a/scripts/generator-internals.c b/scripts/generator-internals.c new file mode 100644 index 0000000..c38323b --- /dev/null +++ b/scripts/generator-internals.c @@ -0,0 +1,200 @@ +// This file contains the unit testable parts of +// lvm2_activation_generator_systemd_red_hat + +#include <ctype.h> +#include <errno.h> +#include <fcntl.h> +#include <limits.h> /* For PATH_MAX for musl libc */ +#include <stdarg.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <syslog.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <unistd.h> + +//---------------------------------------------------------------- + +static void _error(const char *format, ...) __attribute__ ((format(printf, 1, 2))); + +//---------------------------------------------------------------- + +// I'm rolling my own version of popen() here because I do not want to +// go through the shell. + +struct child_process { + pid_t pid; + FILE *fp; +}; + +static bool _open_child(struct child_process *child, const char *cmd, const char *argv[]) +{ + int r, pipe_fd[2]; + + r = pipe(pipe_fd); + if (r < 0) { + _error("call to pipe() failed: %d\n", r); + return false; + } + + child->pid = fork(); + if (child->pid < 0) { + close(pipe_fd[0]); + close(pipe_fd[1]); + _error("call to fork() failed: %d\n", r); + return false; + } + + if (child->pid == 0) { + // child + close(pipe_fd[0]); + if (pipe_fd[1] != STDOUT_FILENO) { + dup2(pipe_fd[1], STDOUT_FILENO); + close(pipe_fd[1]); + } + + execv(cmd, (char *const *) argv); + // Shouldn't get here unless exec failed. + exit(1); + } else { + // parent + close(pipe_fd[1]); + child->fp = fdopen(pipe_fd[0], "r"); + if (!child->fp) { + _error("call to fdopen() failed\n"); + return false; + } + } + + return true; +} + +// Returns the child's exit status +static bool _close_child(struct child_process *child) +{ + int status; + + fclose(child->fp); + + while (waitpid(child->pid, &status, 0) < 0) + if (errno != EINTR) + return -1; + + if (WIFEXITED(status) && !WEXITSTATUS(status)) + return true; + + return false; +} + +//---------------------------------------------------------------- +// Aquiring config from the lvmconfig process + +#define LVM_CONF_USE_LVMETAD "global/use_lvmetad" +#define LVM_CONF_USE_LVMPOLLD "global/use_lvmpolld" + +struct config { + bool use_lvmetad; + bool sysinit_needed; +}; + +static bool _begins_with(const char *line, const char *prefix, const char **rest) +{ + size_t len = strlen(prefix); + + if (strlen(line) < len) + return false; + + if (strncmp(line, prefix, len)) + return false; + + *rest = line + len; + + return true; +} + +static bool _parse_bool(const char *val, bool * result) +{ + const char *b = val, *e; + + while (*b && isspace(*b)) + b++; + + if (!*b) + goto parse_error; + + e = b; + while (*e && !isspace(*e)) + e++; + + if ((e - b) != 1) + goto parse_error; + + // We only handle '1', or '0' + if (*b == '1') { + *result = true; + return true; + + } else if (*b == '0') { + *result = false; + return true; + } + // Fallthrough + + parse_error: + _error("couldn't parse bool value '%s'\n", val); + return false; +} + +static bool _parse_line(const char *line, struct config *cfg) +{ + const char *val; + + if (_begins_with(line, "use_lvmetad=", &val)) { + return _parse_bool(val, &cfg->use_lvmetad); + + } else if (_begins_with(line, "use_lvmpolld=", &val)) { + bool r; + if (!_parse_bool(val, &r)) + return false; + cfg->sysinit_needed = !r; + return true; + } + + return false; +} + +static bool _get_config(struct config *cfg, const char *lvmconfig_path) +{ + static const char *_argv[] = { + "lvmconfig", LVM_CONF_USE_LVMETAD, LVM_CONF_USE_LVMPOLLD, NULL + }; + + bool r = true; + char buffer[256]; + struct child_process child; + + cfg->use_lvmetad = false; + cfg->sysinit_needed = true; + + if (!_open_child(&child, lvmconfig_path, _argv)) { + _error("couldn't open lvmconfig process\n"); + return false; + } + + while (fgets(buffer, sizeof(buffer), child.fp)) { + if (!_parse_line(buffer, cfg)) { + _error("_parse_line() failed\n"); + r = false; + } + } + + if (!_close_child(&child)) { + _error("lvmconfig failed\n"); + r = false; + } + + return r; +} diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c index 551b29a..9ba1996 100644 --- a/scripts/lvm2_activation_generator_systemd_red_hat.c +++ b/scripts/lvm2_activation_generator_systemd_red_hat.c @@ -12,106 +12,139 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> -#include <unistd.h> +#include <ctype.h> #include <errno.h> +#include <fcntl.h> +#include <limits.h> /* For PATH_MAX for musl libc */ #include <stdarg.h> +#include <stdbool.h> +#include <stdio.h> +#include <string.h> #include <syslog.h> -#include <sys/types.h> #include <sys/stat.h> -#include <fcntl.h> -#include <limits.h> /* For PATH_MAX for musl libc */ -#include "liblvm/lvm2app.h" +#include <sys/types.h> +#include <sys/wait.h> +#include <unistd.h> + #include "configure.h" +#include "device_mapper/libdevmapper.h" -#define KMSG_DEV_PATH "/dev/kmsg" -#define LVM_CONF_USE_LVMETAD "global/use_lvmetad" -#define LVM_CONF_USE_LVMPOLLD "global/use_lvmpolld" +//---------------------------------------------------------------- -#define UNIT_TARGET_LOCAL_FS "local-fs-pre.target" -#define UNIT_TARGET_REMOTE_FS "remote-fs-pre.target" +// Code in this file gets included in the unit tests. +#include "generator-internals.c" -static char unit_path[PATH_MAX]; -static char target_path[PATH_MAX]; -static char message[PATH_MAX + 3]; /* +3 for '<n>' where n is the log level */ -static int kmsg_fd = -1; +//---------------------------------------------------------------- +// Logging -enum { - UNIT_EARLY, - UNIT_MAIN, - UNIT_NET -}; +#define KMSG_DEV_PATH "/dev/kmsg" +static int _kmsg_fd; -static const char *unit_names[] = { - [UNIT_EARLY] = "lvm2-activation-early.service", - [UNIT_MAIN] = "lvm2-activation.service", - [UNIT_NET] = "lvm2-activation-net.service" -}; +static void _log_init(void) +{ + // failing is harmless + _kmsg_fd = open(KMSG_DEV_PATH, O_WRONLY | O_NOCTTY); +} -__attribute__ ((format(printf, 2, 3))) -static void kmsg(int log_level, const char *format, ...) +static void _log_exit(void) +{ + if (_kmsg_fd != -1) + (void) close(_kmsg_fd); +} + +__attribute__ ((format(printf, 1, 2))) +static void _error(const char *format, ...) { - va_list ap; int n; + va_list ap; + char message[PATH_MAX + 3]; /* +3 for '<n>' where n is the log level */ - snprintf(message, 4, "<%d>", log_level); + snprintf(message, 4, "<%d>", LOG_ERR); va_start(ap, format); n = vsnprintf(message + 3, PATH_MAX, format, ap); va_end(ap); - if (kmsg_fd < 0 || (n < 0 || ((unsigned) n + 1 > PATH_MAX))) + if (_kmsg_fd < 0 || (n < 0 || ((unsigned) n + 1 > PATH_MAX))) return; /* The n+4: +3 for "<n>" prefix and +1 for '\0' suffix */ - if (write(kmsg_fd, message, n + 4)) { /* Ignore result code */; } + (void) write(_kmsg_fd, message, n + 4); } -static void lvm_get_use_lvmetad_and_lvmpolld(int *use_lvmetad, int *use_lvmpolld) -{ - *use_lvmetad = *use_lvmpolld = 0; +//---------------------------------------------------------------- - *use_lvmetad = lvm_config_find_bool(NULL, LVM_CONF_USE_LVMETAD, 0); - *use_lvmpolld = lvm_config_find_bool(NULL, LVM_CONF_USE_LVMPOLLD, 0); -} +#define UNIT_TARGET_LOCAL_FS "local-fs-pre.target" +#define UNIT_TARGET_REMOTE_FS "remote-fs-pre.target" + +struct generator { + const char *dir; + struct config cfg; -static int register_unit_with_target(const char *dir, const char *unit, const char *target) + int kmsg_fd; + char unit_path[PATH_MAX]; + char target_path[PATH_MAX]; +}; + +enum { + UNIT_EARLY, + UNIT_MAIN, + UNIT_NET +}; + +static const char *_unit_names[] = { + [UNIT_EARLY] = "lvm2-activation-early.service", + [UNIT_MAIN] = "lvm2-activation.service", + [UNIT_NET] = "lvm2-activation-net.service" +}; + +//---------------------------------------------------------------- + +static int register_unit_with_target(struct generator *gen, const char *unit, + const char *target) { int r = 1; - if (dm_snprintf(target_path, PATH_MAX, "%s/%s.wants", dir, target) < 0) { - r = 0; goto out; + if (dm_snprintf(gen->target_path, PATH_MAX, "%s/%s.wants", gen->dir, target) < 0) { + r = 0; + goto out; } - (void) dm_prepare_selinux_context(target_path, S_IFDIR); - if (mkdir(target_path, 0755) < 0 && errno != EEXIST) { - kmsg(LOG_ERR, "LVM: Failed to create target directory %s: %m.\n", target_path); - r = 0; goto out; + + (void) dm_prepare_selinux_context(gen->target_path, S_IFDIR); + if (mkdir(gen->target_path, 0755) < 0 && errno != EEXIST) { + _error("LVM: Failed to create target directory %s: %m.\n", gen->target_path); + r = 0; + goto out; } - if (dm_snprintf(target_path, PATH_MAX, "%s/%s.wants/%s", dir, target, unit) < 0) { - r = 0; goto out; + if (dm_snprintf + (gen->target_path, PATH_MAX, "%s/%s.wants/%s", gen->dir, target, unit) < 0) { + r = 0; + goto out; } - (void) dm_prepare_selinux_context(target_path, S_IFLNK); - if (symlink(unit_path, target_path) < 0) { - kmsg(LOG_ERR, "LVM: Failed to create symlink for unit %s: %m.\n", unit); + (void) dm_prepare_selinux_context(gen->target_path, S_IFLNK); + if (symlink(gen->unit_path, gen->target_path) < 0) { + _error("LVM: Failed to create symlink for unit %s: %m.\n", unit); r = 0; } -out: + out: dm_prepare_selinux_context(NULL, 0); return r; } -static int generate_unit(const char *dir, int unit, int sysinit_needed) +static int generate_unit(struct generator *gen, int unit) { FILE *f; - const char *unit_name = unit_names[unit]; - const char *target_name = unit == UNIT_NET ? UNIT_TARGET_REMOTE_FS : UNIT_TARGET_LOCAL_FS; + const char *unit_name = _unit_names[unit]; + const char *target_name = + unit == UNIT_NET ? UNIT_TARGET_REMOTE_FS : UNIT_TARGET_LOCAL_FS; - if (dm_snprintf(unit_path, PATH_MAX, "%s/%s", dir, unit_name) < 0) + if (dm_snprintf(gen->unit_path, PATH_MAX, "%s/%s", gen->dir, unit_name) + < 0) return 0; - if (!(f = fopen(unit_path, "wxe"))) { - kmsg(LOG_ERR, "LVM: Failed to create unit file %s: %m.\n", unit_name); + if (!(f = fopen(gen->unit_path, "wxe"))) { + _error("LVM: Failed to create unit file %s: %m.\n", unit_name); return 0; } @@ -124,79 +157,90 @@ static int generate_unit(const char *dir, int unit, int sysinit_needed) "[Unit]\n" "Description=Activation of LVM2 logical volumes\n" "Documentation=man:lvm2-activation-generator(8)\n" - "SourcePath=/etc/lvm/lvm.conf\n" - "DefaultDependencies=no\n", f); + "SourcePath=/etc/lvm/lvm.conf\n" "DefaultDependencies=no\n", f); if (unit == UNIT_NET) { fprintf(f, "After=%s iscsi.service fcoe.service\n" "Before=remote-fs-pre.target shutdown.target\n\n" "[Service]\n" - "ExecStartPre=/usr/bin/udevadm settle\n", unit_names[UNIT_MAIN]); + "ExecStartPre=/usr/bin/udevadm settle\n", _unit_names[UNIT_MAIN]); } else { - if (unit == UNIT_EARLY) { + if (unit == UNIT_EARLY) fputs("After=systemd-udev-settle.service\n" "Before=cryptsetup.target\n", f); - } else - fprintf(f, "After=%s cryptsetup.target\n", unit_names[UNIT_EARLY]); + else + fprintf(f, "After=%s cryptsetup.target\n", _unit_names[UNIT_EARLY]); fputs("Before=local-fs-pre.target shutdown.target\n" - "Wants=systemd-udev-settle.service\n\n" - "[Service]\n", f); + "Wants=systemd-udev-settle.service\n\n" "[Service]\n", f); } fputs("ExecStart=" LVM_PATH " vgchange -aay --ignoreskippedcluster", f); - if (sysinit_needed) - fputs (" --sysinit", f); + if (gen->cfg.sysinit_needed) + fputs(" --sysinit", f); fputs("\nType=oneshot\n", f); if (fclose(f) < 0) { - kmsg(LOG_ERR, "LVM: Failed to write unit file %s: %m.\n", unit_name); + _error("LVM: Failed to write unit file %s: %m.\n", unit_name); return 0; } - if (!register_unit_with_target(dir, unit_name, target_name)) { - kmsg(LOG_ERR, "LVM: Failed to register unit %s with target %s.\n", unit_name, target_name); + if (!register_unit_with_target(gen, unit_name, target_name)) { + _error("LVM: Failed to register unit %s with target %s.\n", + unit_name, target_name); return 0; } return 1; } -int main(int argc, char *argv[]) +static bool _parse_command_line(struct generator *gen, int argc, const char **argv) { - int use_lvmetad, use_lvmpolld, sysinit_needed; - const char *dir; - int r = EXIT_SUCCESS; - mode_t old_mask; - - kmsg_fd = open(KMSG_DEV_PATH, O_WRONLY|O_NOCTTY); - if (argc != 4) { - kmsg(LOG_ERR, "LVM: Incorrect number of arguments for activation generator.\n"); - r = EXIT_FAILURE; goto out; + _error("LVM: Incorrect number of arguments for activation generator.\n"); + return false; } - /* If lvmetad used, rely on autoactivation instead of direct activation. */ - lvm_get_use_lvmetad_and_lvmpolld(&use_lvmetad, &use_lvmpolld); - if (use_lvmetad) - goto out; + gen->dir = argv[1]; + return true; +} + +static bool _run(int argc, const char **argv) +{ + bool r; + mode_t old_mask; + struct generator gen; + + if (!_parse_command_line(&gen, argc, argv)) + return false; + + if (!_get_config(&gen.cfg, LVMCONFIG_PATH)) + return false; - dir = argv[1]; + if (gen.cfg.use_lvmetad) + // If lvmetad used, rely on autoactivation instead of direct activation. + return true; /* mark lvm2-activation.*.service as world-accessible */ old_mask = umask(0022); - sysinit_needed = !use_lvmpolld; + r = generate_unit(&gen, UNIT_EARLY) && + generate_unit(&gen, UNIT_MAIN) && generate_unit(&gen, UNIT_NET); - if (!generate_unit(dir, UNIT_EARLY, sysinit_needed) || - !generate_unit(dir, UNIT_MAIN, sysinit_needed) || - !generate_unit(dir, UNIT_NET, sysinit_needed)) - r = EXIT_FAILURE; umask(old_mask); -out: - if (r) - kmsg(LOG_ERR, "LVM: Activation generator failed.\n"); - if (kmsg_fd != -1) - (void) close(kmsg_fd); + return r; } + +int main(int argc, const char **argv) +{ + bool r; + + _log_init(); + r = _run(argc, argv); + if (!r) + _error("LVM: Activation generator failed.\n"); + _log_exit(); + + return r ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in index 994968c..e7cc852 100644 --- a/test/unit/Makefile.in +++ b/test/unit/Makefile.in @@ -14,6 +14,7 @@ UNIT_SOURCE=\ base/data-struct/radix-tree.c \ device_mapper/vdo/status.c \ \ + test/unit/activation-generator_t.c \ test/unit/bcache_t.c \ test/unit/bcache_utils_t.c \ test/unit/bitset_t.c \ @@ -32,12 +33,11 @@ UNIT_SOURCE=\ UNIT_DEPENDS=$(subst .c,.d,$(UNIT_SOURCE)) UNIT_OBJECTS=$(UNIT_SOURCE:%.c=%.o) CLEAN_TARGETS+=$(UNIT_DEPENDS) $(UNIT_OBJECTS) -UNIT_LDLIBS += $(LVMINTERNAL_LIBS) -laio -test/unit/unit-test: $(UNIT_OBJECTS) lib/liblvm-internal.a $(INTERNAL_LIBS) +test/unit/unit-test: $(UNIT_OBJECTS) lib/liblvm-internal.a libdaemon/client/libdaemonclient.a $(INTERNAL_LIBS) @echo " [LD] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \ - -o $@ $+ $(UNIT_LDLIBS) -lm + -o $@ $+ $(LIBS) -lm -ldl -laio .PHONEY: run-unit-test run-unit-test: test/unit/unit-test diff --git a/test/unit/units.h b/test/unit/units.h index d7ac6ad..bc0db8d 100644 --- a/test/unit/units.h +++ b/test/unit/units.h @@ -20,6 +20,7 @@ //----------------------------------------------------------------- // Declare the function that adds tests suites here ... +void activation_generator_tests(struct dm_list *suites); void bcache_tests(struct dm_list *suites); void bcache_utils_tests(struct dm_list *suites); void bitset_tests(struct dm_list *suites); @@ -36,6 +37,7 @@ void vdo_tests(struct dm_list *suites); // ... and call it in here. static inline void register_all_tests(struct dm_list *suites) { + activation_generator_tests(suites); bcache_tests(suites); bcache_utils_tests(suites); bitset_tests(suites);

1 0

master - device_mapper: fixup a couple of includes
by Joe Thornber 07 Jun '18

07 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=74460cd009267564be032… Commit: 74460cd009267564be032a373e78ec5eba67b4ce Parent: 3e781ea446bb7ddc9a494cbba6b6104dd51c3910 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Wed Jun 6 14:45:16 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Wed Jun 6 14:45:16 2018 +0100 device_mapper: fixup a couple of includes "libdevmapper.h" -> "device_mapper/libdevmapper.h" --- device_mapper/misc/dm-logging.h | 2 +- device_mapper/misc/dmlib.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device_mapper/misc/dm-logging.h b/device_mapper/misc/dm-logging.h index a35480e..e355bc5 100644 --- a/device_mapper/misc/dm-logging.h +++ b/device_mapper/misc/dm-logging.h @@ -16,7 +16,7 @@ #ifndef _DM_LOGGING_H #define _DM_LOGGING_H -#include "libdevmapper.h" +#include "device_mapper/libdevmapper.h" extern dm_log_with_errno_fn dm_log_with_errno; diff --git a/device_mapper/misc/dmlib.h b/device_mapper/misc/dmlib.h index ba376bc..88b6ac3 100644 --- a/device_mapper/misc/dmlib.h +++ b/device_mapper/misc/dmlib.h @@ -26,7 +26,7 @@ #define _REENTRANT #define _GNU_SOURCE -#include "libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include "lib/misc/util.h" #include "dm-logging.h"

1 0

master - Implement lock-override options without locking type
by David Teigland 06 Jun '18

06 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f2ff06d6756bb31779d16… Commit: f2ff06d6756bb31779d16915c64361393054cfe7 Parent: 55521be2cbe28b0580fafafff6151cf4b6a219ea Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 16:31:59 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 6 16:31:59 2018 -0500 Implement lock-override options without locking type The options: --nolocking, --readonly, --sysinit override, or make exceptions to, the normal file locking behavior. Implement these by just checking for the options in the file locking path instead of using special locking types. --- lib/locking/file_locking.c | 2 +- lib/locking/locking.c | 58 +++++++++++++++++++++++++++++++++--------- lib/locking/locking.h | 2 +- lib/locking/locking_types.h | 18 +------------ tools/lvmcmdline.c | 52 +++++++++++++++++++------------------- 5 files changed, 75 insertions(+), 57 deletions(-) diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index a60a3e5..0bded0e 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -92,7 +92,7 @@ int init_file_locking(struct locking_type *locking, struct cmd_context *cmd, locking->lock_resource = _file_lock_resource; locking->reset_locking = _reset_file_locking; locking->fin_locking = _fin_file_locking; - locking->flags = 0; + locking->flags = LCK_FLOCK; /* Get lockfile directory from config file */ locking_dir = find_config_tree_str(cmd, global_locking_dir_CFG, NULL); diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 4b7d7eb..4c27a81 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -34,6 +34,8 @@ static struct locking_type _locking; static int _vg_lock_count = 0; /* Number of locks held */ static int _vg_write_lock_held = 0; /* VG write lock held? */ static int _blocking_supported = 0; +static int _file_locking_readonly = 0; +static int _file_locking_sysinit = 0; static void _unblock_signals(void) { @@ -46,6 +48,10 @@ void reset_locking(void) { int was_locked = _vg_lock_count; + /* file locking disabled */ + if (!_locking.flags) + return; + _vg_lock_count = 0; _vg_write_lock_held = 0; @@ -82,21 +88,19 @@ static void _update_vg_lock_count(const char *resource, uint32_t flags) * Select a locking type * type: locking type; if < 0, then read config tree value */ -int init_locking(int type, struct cmd_context *cmd, int suppress_messages) +int init_locking(struct cmd_context *cmd, int file_locking_sysinit, int file_locking_readonly) { + int suppress_messages = 0; + if (getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES")) suppress_messages = 1; - if (type < 0) - type = find_config_tree_int(cmd, global_locking_type_CFG, NULL); + if (file_locking_sysinit) + suppress_messages = 1; _blocking_supported = find_config_tree_bool(cmd, global_wait_for_locks_CFG, NULL); - - if (type != 1) - log_warn("WARNING: locking_type deprecated, using file locking."); - - if (type == 3) - log_warn("WARNING: See lvmlockd(8) for information on using cluster/clvm VGs."); + _file_locking_readonly = file_locking_readonly; + _file_locking_sysinit = file_locking_sysinit; log_very_verbose("%sFile-based locking selected.", _blocking_supported ? "" : "Non-blocking "); @@ -108,6 +112,10 @@ int init_locking(int type, struct cmd_context *cmd, int suppress_messages) void fin_locking(void) { + /* file locking disabled */ + if (!_locking.flags) + return; + _locking.fin_locking(); } @@ -135,10 +143,30 @@ static int _lock_vol(struct cmd_context *cmd, const char *resource, uint32_t fla goto out; } - if (cmd->metadata_read_only && lck_type == LCK_WRITE && + if ((lck_type == LCK_WRITE) && (lck_scope == LCK_VG) && !(flags & LCK_CACHE) && strcmp(resource, VG_GLOBAL)) { - log_error("Operation prohibited while global/metadata_read_only is set."); - goto out; + + /* read only locking set in lvm.conf metadata_read_only */ + + if (cmd->metadata_read_only) { + log_error("Operation prohibited while global/metadata_read_only is set."); + goto out; + } + + /* read only locking set with option --readonly */ + + if (_file_locking_readonly) { + log_error("Read-only locking specified. Write locks are prohibited."); + goto out; + } + + /* read only locking (except activation) set with option --sysinit */ + /* FIXME: sysinit is intended to allow activation, add that exception here */ + + if (_file_locking_sysinit) { + log_error("Read-only sysinit locking specified. Write locks are prohibited."); + goto out; + } } if ((ret = _locking.lock_resource(cmd, resource, flags, NULL))) { @@ -169,6 +197,10 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str char resource[258] __attribute__((aligned(8))); int lck_type = flags & LCK_TYPE_MASK; + /* file locking disabled */ + if (!_locking.flags) + return 1; + if (flags == LCK_NONE) { log_debug_locking(INTERNAL_ERROR "%s: LCK_NONE lock requested", vol); return 1; @@ -240,7 +272,7 @@ int vg_write_lock_held(void) int locking_is_clustered(void) { - return (_locking.flags & LCK_CLUSTERED) ? 1 : 0; + return 0; } int sync_local_dev_names(struct cmd_context* cmd) diff --git a/lib/locking/locking.h b/lib/locking/locking.h index 6d7d8e8..422f1d8 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -21,7 +21,7 @@ struct logical_volume; -int init_locking(int type, struct cmd_context *cmd, int suppress_messages); +int init_locking(struct cmd_context *cmd, int suppress_messages, int only_read_locks); void fin_locking(void); void reset_locking(void); int vg_write_lock_held(void); diff --git a/lib/locking/locking_types.h b/lib/locking/locking_types.h index 99aa964..5bb4fe4 100644 --- a/lib/locking/locking_types.h +++ b/lib/locking/locking_types.h @@ -23,12 +23,10 @@ typedef int (*query_resource_fn) (const char *resource, const char *node, int *m typedef void (*fin_lock_fn) (void); typedef void (*reset_lock_fn) (void); -#define LCK_PRE_MEMLOCK 0x00000001 /* Is memlock() needed before calls? */ -#define LCK_CLUSTERED 0x00000002 -#define LCK_SUPPORTS_REMOTE_QUERIES 0x00000004 +#define LCK_FLOCK 0x00000001 struct locking_type { - uint32_t flags; + uint32_t flags; /* 0 means file locking is disabled */ lock_resource_fn lock_resource; query_resource_fn query_resource; @@ -36,17 +34,5 @@ struct locking_type { fin_lock_fn fin_locking; }; -/* - * Locking types - */ -void init_no_locking(struct locking_type *locking, struct cmd_context *cmd, - int suppress_messages); - -void init_dummy_locking(struct locking_type *locking, struct cmd_context *cmd, - int suppress_messages); - -int init_readonly_locking(struct locking_type *locking, struct cmd_context *cmd, - int suppress_messages); - int init_file_locking(struct locking_type *locking, struct cmd_context *cmd, int suppress_messages); diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 4f4e917..788f007 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -2734,6 +2734,9 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) const char *reason = NULL; int ret = 0; int locking_type; + int file_locking_disable = 0; + int file_locking_sysinit = 0; + int file_locking_readonly = 0; int monitoring; char *arg_new, *arg; int i; @@ -2908,34 +2911,31 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) goto out; } - if (_cmd_no_meta_proc(cmd)) - locking_type = 0; - else if (arg_is_set(cmd, readonly_ARG)) { - if (find_config_tree_bool(cmd, global_use_lvmlockd_CFG, NULL)) { - /* - * FIXME: we could use locking_type 5 here if that didn't - * cause CLUSTERED to be set, which conflicts with using lvmlockd. - */ - locking_type = 1; - cmd->lockd_gl_disable = 1; - cmd->lockd_vg_disable = 1; - cmd->lockd_lv_disable = 1; - } else { - locking_type = 5; - } + if (arg_is_set(cmd, nolocking_ARG) || _cmd_no_meta_proc(cmd)) + file_locking_disable = 1; - if (lvmetad_used()) { - lvmetad_make_unused(cmd); - log_verbose("Not using lvmetad because read-only is set."); - } - } else if (arg_is_set(cmd, nolocking_ARG)) - locking_type = 0; - else - locking_type = -1; + else if (arg_is_set(cmd, sysinit_ARG)) + file_locking_sysinit = 1; - if (!init_locking(locking_type, cmd, _cmd_no_meta_proc(cmd) || arg_is_set(cmd, sysinit_ARG))) { - ret = ECMD_FAILED; - goto_out; + else if (arg_is_set(cmd, readonly_ARG)) + file_locking_readonly = 1; + + locking_type = find_config_tree_int(cmd, global_locking_type_CFG, NULL); + + if (locking_type == 3) + log_warn("WARNING: See lvmlockd(8) for information on using cluster/clvm VGs."); + + if (locking_type != 1) { + log_warn("WARNING: locking_type deprecated, using file locking."); + locking_type = 1; + } + + if (!file_locking_disable) { + /* Set up file locking */ + if (!init_locking(cmd, file_locking_sysinit, file_locking_readonly)) { + ret = ECMD_FAILED; + goto_out; + } } if (!_cmd_no_meta_proc(cmd) && !_init_lvmlockd(cmd)) {

1 0

master - tests: system_id remove clustered vg test
by David Teigland 06 Jun '18

06 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=55521be2cbe28b0580faf… Commit: 55521be2cbe28b0580fafafff6151cf4b6a219ea Parent: 802382e21ff600307f7c16f4651966d9a7c21252 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 14:35:27 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 6 14:35:27 2018 -0500 tests: system_id remove clustered vg test --- test/shell/system_id.sh | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) diff --git a/test/shell/system_id.sh b/test/shell/system_id.sh index 21c5bd0..ec7953d 100644 --- a/test/shell/system_id.sh +++ b/test/shell/system_id.sh @@ -275,30 +275,6 @@ grep $vg1 err grep "$SID1" err vgremove $vg1 -# vgchange -cy clears system_id, vgchange -cn sets system_id - -SID1=sidfoofile1 -echo "$SID1" > "$SIDFILE" -aux lvmconf "global/system_id_source = file" \ - "global/system_id_file = \"$SIDFILE\"" -# create a vg -vgcreate $vg1 "$dev1" -# normal vgs sees the vg -vgs -o+systemid >err -grep $vg1 err -grep "$SID1" err -# after vgchange -cy there is no systemid -vgchange --yes -cy $vg1 -vgs --config 'global { locking_type=0 }' -o+systemid $vg1 >err -grep $vg1 err -not grep "$SID1" err -# after vgchange -cn there is a systemid -vgchange --config 'global { locking_type=0 }' -cn $vg1 -vgs -o+systemid >err -grep $vg1 err -grep "$SID1" err -vgremove $vg1 - # Test max system_id length (128) and invalid system_id characters. # The 128 length limit is imposed before invalid characters are omitted.

1 0

master - Remove locking infrastructure from activation paths
by David Teigland 06 Jun '18

06 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b7da704566a6542c86cc1… Commit: b7da704566a6542c86cc1fcc186a66aa016b6802 Parent: 58a9254252a4c837601c15aabdae53d2f3c06edc Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 5 16:47:24 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 6 13:58:34 2018 -0500 Remove locking infrastructure from activation paths Basic LV functions: activate_lv(), deactivate_lv(), suspend_lv(), resume_lv() were routed through the locking infrastruture on the way to: lv_activate_with_filter(), lv_deactivate(), lv_suspend_if_active(), lv_resume_if_active() This commit removes the locking infrastructure from the middle and calls the later functions directly from the former. There were a couple of ancillary steps that the locking infrastructure added along the way which are still included: - critical section inc/dec during suspend/resume - checking for active component LVs during activate The "activation" file lock (serializing activation) has not been kept because activation commands have been changed to take the VG file lock exclusively which makes the activation lock unused and unnecessary. --- lib/activate/activate.c | 103 ++++++++++++++++++++++++++++++++++++++++---- lib/activate/activate.h | 8 +++ lib/locking/file_locking.c | 48 -------------------- lib/locking/locking.c | 65 ++------------------------- lib/locking/locking.h | 76 -------------------------------- 5 files changed, 107 insertions(+), 193 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index c9ead42..a7e5fe3 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -2424,15 +2424,6 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, if (!activation()) return 1; - if (!laopts->exclusive && - (lv_is_origin(lv) || - seg_only_exclusive(first_seg(lv)))) { - log_error(INTERNAL_ERROR "Trying non-exlusive activation of %s with " - "a volume type %s requiring exclusive activation.", - display_lvname(lv), lvseg_name(first_seg(lv))); - return 0; - } - if (filter && !_passes_activation_filter(cmd, lv)) { log_verbose("Not activating %s since it does not pass " "activation filter.", display_lvname(lv)); @@ -2765,3 +2756,97 @@ int deactivate_lv_with_sub_lv(const struct logical_volume *lv) return 1; } + +int activate_lv(struct cmd_context *cmd, const struct logical_volume *lv) +{ + const struct logical_volume *active_lv; + int ret; + + /* + * When trying activating component LV, make sure none of sub component + * LV or LVs that are using it are active. + */ + if (!lv_is_visible(lv)) + active_lv = lv_holder_is_active(lv); + else + active_lv = lv_component_is_active(lv); + + if (active_lv) { + log_error("Activation of logical volume %s is prohibited while logical volume %s is active.", + display_lvname(lv), display_lvname(active_lv)); + ret = 0; + goto out; + } + + ret = lv_activate_with_filter(cmd, NULL, 0, + (lv->status & LV_NOSCAN) ? 1 : 0, + (lv->status & LV_TEMPORARY) ? 1 : 0, + lv_committed(lv)); +out: + return ret; +} + +int deactivate_lv(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + ret = lv_deactivate(cmd, NULL, lv_committed(lv)); + + return ret; +} + +int suspend_lv(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + critical_section_inc(cmd, "locking for suspend"); + + ret = lv_suspend_if_active(cmd, NULL, 0, 0, lv_committed(lv), lv); + + return ret; +} + +int suspend_lv_origin(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + critical_section_inc(cmd, "locking for suspend"); + + ret = lv_suspend_if_active(cmd, NULL, 1, 0, lv_committed(lv), lv); + + return ret; +} + +int resume_lv(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + ret = lv_resume_if_active(cmd, NULL, 0, 0, 0, lv_committed(lv)); + + critical_section_dec(cmd, "unlocking on resume"); + + return ret; +} + +int resume_lv_origin(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + ret = lv_resume_if_active(cmd, NULL, 1, 0, 0, lv_committed(lv)); + + critical_section_dec(cmd, "unlocking on resume"); + + return ret; +} + +int revert_lv(struct cmd_context *cmd, const struct logical_volume *lv) +{ + int ret; + + ret = lv_resume_if_active(cmd, NULL, 0, 0, 1, lv_committed(lv)); + + critical_section_dec(cmd, "unlocking on resume"); + + return ret; +} + diff --git a/lib/activate/activate.h b/lib/activate/activate.h index 8b6c4ad..2f0b0a0 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -126,6 +126,14 @@ int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv); int lv_deactivate_any_missing_subdevs(const struct logical_volume *lv); +int activate_lv(struct cmd_context *cmd, const struct logical_volume *lv); +int deactivate_lv(struct cmd_context *cmd, const struct logical_volume *lv); +int suspend_lv(struct cmd_context *cmd, const struct logical_volume *lv); +int suspend_lv_origin(struct cmd_context *cmd, const struct logical_volume *lv); +int resume_lv(struct cmd_context *cmd, const struct logical_volume *lv); +int resume_lv_origin(struct cmd_context *cmd, const struct logical_volume *lv); +int revert_lv(struct cmd_context *cmd, const struct logical_volume *lv); + /* * Returns 1 if info structure has been populated, else 0 on failure. * When lvinfo* is NULL, it returns 1 if the device is locally active, 0 otherwise. diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index d4f47c6..a60a3e5 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -44,20 +44,8 @@ static int _file_lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags, const struct logical_volume *lv) { char lockfile[PATH_MAX]; - unsigned origin_only = (flags & LCK_ORIGIN_ONLY) ? 1 : 0; - unsigned revert = (flags & LCK_REVERT) ? 1 : 0; switch (flags & LCK_SCOPE_MASK) { - case LCK_ACTIVATION: - if (dm_snprintf(lockfile, sizeof(lockfile), - "%s/A_%s", _lock_dir, resource) < 0) { - log_error("Too long locking filename %s/A_%s.", _lock_dir, resource); - return 0; - } - - if (!lock_file(lockfile, flags)) - return_0; - break; case LCK_VG: if (!strcmp(resource, VG_SYNC_NAMES)) fs_unlock(); @@ -84,42 +72,6 @@ static int _file_lock_resource(struct cmd_context *cmd, const char *resource, if (!lock_file(lockfile, flags)) return_0; break; - case LCK_LV: - switch (flags & LCK_TYPE_MASK) { - case LCK_UNLOCK: - log_very_verbose("Unlocking LV %s%s%s", resource, origin_only ? " without snapshots" : "", revert ? " (reverting)" : ""); - if (!lv_resume_if_active(cmd, resource, origin_only, 0, revert, lv_committed(lv))) - return 0; - break; - case LCK_NULL: - log_very_verbose("Locking LV %s (NL)", resource); - if (!lv_deactivate(cmd, resource, lv_committed(lv))) - return 0; - break; - case LCK_READ: - log_very_verbose("Locking LV %s (R)", resource); - if (!lv_activate_with_filter(cmd, resource, 0, (lv->status & LV_NOSCAN) ? 1 : 0, - (lv->status & LV_TEMPORARY) ? 1 : 0, lv_committed(lv))) - return 0; - break; - case LCK_PREAD: - log_very_verbose("Locking LV %s (PR) - ignored", resource); - break; - case LCK_WRITE: - log_very_verbose("Locking LV %s (W)%s", resource, origin_only ? " without snapshots" : ""); - if (!lv_suspend_if_active(cmd, resource, origin_only, 0, lv_committed(lv), lv)) - return 0; - break; - case LCK_EXCL: - log_very_verbose("Locking LV %s (EX)", resource); - if (!lv_activate_with_filter(cmd, resource, 1, (lv->status & LV_NOSCAN) ? 1 : 0, - (lv->status & LV_TEMPORARY) ? 1 : 0, lv_committed(lv))) - return 0; - break; - default: - break; - } - break; default: log_error("Unrecognised lock scope: %d", flags & LCK_SCOPE_MASK); diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 5e28452..4b7d7eb 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -35,30 +35,6 @@ static int _vg_lock_count = 0; /* Number of locks held */ static int _vg_write_lock_held = 0; /* VG write lock held? */ static int _blocking_supported = 0; -typedef enum { - LV_NOOP, - LV_SUSPEND, - LV_RESUME -} lv_operation_t; - -static void _lock_memory(struct cmd_context *cmd, lv_operation_t lv_op) -{ - if (!(_locking.flags & LCK_PRE_MEMLOCK)) - return; - - if (lv_op == LV_SUSPEND) - critical_section_inc(cmd, "locking for suspend"); -} - -static void _unlock_memory(struct cmd_context *cmd, lv_operation_t lv_op) -{ - if (!(_locking.flags & LCK_PRE_MEMLOCK)) - return; - - if (lv_op == LV_RESUME) - critical_section_dec(cmd, "unlocking on resume"); -} - static void _unblock_signals(void) { /* Don't unblock signals while any locks are held */ @@ -139,16 +115,13 @@ void fin_locking(void) * VG locking is by VG name. * FIXME This should become VG uuid. */ -static int _lock_vol(struct cmd_context *cmd, const char *resource, - uint32_t flags, lv_operation_t lv_op, const struct logical_volume *lv) +static int _lock_vol(struct cmd_context *cmd, const char *resource, uint32_t flags) { uint32_t lck_type = flags & LCK_TYPE_MASK; uint32_t lck_scope = flags & LCK_SCOPE_MASK; int ret = 0; - const struct logical_volume *active_lv; block_signals(flags); - _lock_memory(cmd, lv_op); assert(resource); @@ -162,23 +135,13 @@ static int _lock_vol(struct cmd_context *cmd, const char *resource, goto out; } - /* When trying activating component LV, make sure none of - * sub component LV or LVs that are using it are active */ - if (lv && ((lck_type == LCK_READ) || (lck_type == LCK_EXCL)) && - ((!lv_is_visible(lv) && (active_lv = lv_holder_is_active(lv))) || - (active_lv = lv_component_is_active(lv)))) { - log_error("Activation of logical volume %s is prohibited while logical volume %s is active.", - display_lvname(lv), display_lvname(active_lv)); - goto out; - } - if (cmd->metadata_read_only && lck_type == LCK_WRITE && strcmp(resource, VG_GLOBAL)) { log_error("Operation prohibited while global/metadata_read_only is set."); goto out; } - if ((ret = _locking.lock_resource(cmd, resource, flags, lv))) { + if ((ret = _locking.lock_resource(cmd, resource, flags, NULL))) { if (lck_scope == LCK_VG && !(flags & LCK_CACHE)) { if (lck_type != LCK_UNLOCK) lvmcache_lock_vgname(resource, lck_type == LCK_READ); @@ -196,7 +159,6 @@ static int _lock_vol(struct cmd_context *cmd, const char *resource, _update_vg_lock_count(resource, flags); } out: - _unlock_memory(cmd, lv_op); _unblock_signals(); return ret; @@ -205,28 +167,14 @@ out: int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const struct logical_volume *lv) { char resource[258] __attribute__((aligned(8))); - lv_operation_t lv_op; int lck_type = flags & LCK_TYPE_MASK; - switch (flags & (LCK_SCOPE_MASK | LCK_TYPE_MASK)) { - case LCK_LV_SUSPEND: - lv_op = LV_SUSPEND; - break; - case LCK_LV_RESUME: - lv_op = LV_RESUME; - break; - default: lv_op = LV_NOOP; - } - - if (flags == LCK_NONE) { log_debug_locking(INTERNAL_ERROR "%s: LCK_NONE lock requested", vol); return 1; } switch (flags & LCK_SCOPE_MASK) { - case LCK_ACTIVATION: - break; case LCK_VG: if (!_blocking_supported) flags |= LCK_NONBLOCK; @@ -235,10 +183,6 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str if (is_orphan_vg(vol)) vol = VG_ORPHANS; break; - case LCK_LV: - /* All LV locks are non-blocking. */ - flags |= LCK_NONBLOCK; - break; default: log_error("Unrecognised lock scope: %d", flags & LCK_SCOPE_MASK); @@ -250,7 +194,7 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str return 0; } - if (!_lock_vol(cmd, resource, flags, lv_op, lv)) + if (!_lock_vol(cmd, resource, flags)) return_0; /* @@ -261,7 +205,7 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str (flags & (LCK_CACHE | LCK_HOLD))) return 1; - if (!_lock_vol(cmd, resource, (flags & ~LCK_TYPE_MASK) | LCK_UNLOCK, lv_op, lv)) + if (!_lock_vol(cmd, resource, (flags & ~LCK_TYPE_MASK) | LCK_UNLOCK)) return_0; return 1; @@ -312,3 +256,4 @@ int sync_dev_names(struct cmd_context* cmd) return lock_vol(cmd, VG_SYNC_NAMES, LCK_VG_SYNC, NULL); } + diff --git a/lib/locking/locking.h b/lib/locking/locking.h index f3956c2..6d7d8e8 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -94,8 +94,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); */ #define LCK_SCOPE_MASK 0x00001008U #define LCK_VG 0x00000000U /* Volume Group */ -#define LCK_LV 0x00000008U /* Logical Volume */ -#define LCK_ACTIVATION 0x00001000U /* Activation */ /* * Lock bits. @@ -138,9 +136,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); */ #define LCK_NONE (LCK_VG | LCK_NULL) -#define LCK_ACTIVATE_LOCK (LCK_ACTIVATION | LCK_WRITE | LCK_HOLD) -#define LCK_ACTIVATE_UNLOCK (LCK_ACTIVATION | LCK_UNLOCK) - #define LCK_VG_READ (LCK_VG | LCK_READ | LCK_HOLD) #define LCK_VG_WRITE (LCK_VG | LCK_WRITE | LCK_HOLD) #define LCK_VG_UNLOCK (LCK_VG | LCK_UNLOCK) @@ -155,51 +150,8 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); #define LCK_VG_SYNC (LCK_NONE | LCK_CACHE) #define LCK_VG_SYNC_LOCAL (LCK_NONE | LCK_CACHE | LCK_LOCAL) -#define LCK_LV_EXCLUSIVE (LCK_LV | LCK_EXCL) -#define LCK_LV_SUSPEND (LCK_LV | LCK_WRITE) -#define LCK_LV_RESUME (LCK_LV | LCK_UNLOCK) -#define LCK_LV_ACTIVATE (LCK_LV | LCK_READ) -#define LCK_LV_DEACTIVATE (LCK_LV | LCK_NULL) - #define LCK_MASK (LCK_TYPE_MASK | LCK_SCOPE_MASK) -#define lock_lv_vol(cmd, lv, flags) lock_vol(cmd, (lv)->lvid.s, flags, lv) - -/* - * Activation locks are wrapped around activation commands that have to - * be processed atomically one-at-a-time. - * If a VG WRITE lock is held or clustered activation activates simple LV - * an activation lock is redundant. - * - * Some LV types do require taking a lock common for whole group of LVs. - * TODO: For simplicity reasons ATM take a VG activation global lock and - * later more fine-grained component detection algorithm can be added - */ - -#define lv_type_requires_activation_lock(lv) ((lv_is_thin_type(lv) || lv_is_cache_type(lv) || lv_is_mirror_type(lv) || lv_is_raid_type(lv) || lv_is_origin(lv) || lv_is_snapshot(lv)) ? 1 : 0) - -#define lv_activation_lock_name(lv) (lv_type_requires_activation_lock(lv) ? (lv)->vg->name : (lv)->lvid.s) - -#define lv_requires_activation_lock_now(lv) ((!vg_write_lock_held() && (!vg_is_clustered((lv)->vg) || !lv_type_requires_activation_lock(lv))) ? 1 : 0) - -#define lock_activation(cmd, lv) (lv_requires_activation_lock_now(lv) ? lock_vol(cmd, lv_activation_lock_name(lv), LCK_ACTIVATE_LOCK, lv) : 1) -#define unlock_activation(cmd, lv) (lv_requires_activation_lock_now(lv) ? lock_vol(cmd, lv_activation_lock_name(lv), LCK_ACTIVATE_UNLOCK, lv) : 1) - -/* - * Place temporary exclusive 'activation' lock around an LV locking operation - * to serialise it. - */ -#define lock_lv_vol_serially(cmd, lv, flags) \ -({ \ - int rr = 0; \ -\ - if (lock_activation((cmd), (lv))) { \ - rr = lock_lv_vol((cmd), (lv), (flags)); \ - unlock_activation((cmd), (lv)); \ - } \ - rr; \ -}) - #define unlock_vg(cmd, vg, vol) \ do { \ if (vg && !lvmetad_vg_update_finish(vg)) \ @@ -215,34 +167,6 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); release_vg(vg); \ } while (0) -#define resume_lv(cmd, lv) \ -({ \ - int rr = lock_lv_vol((cmd), (lv), LCK_LV_RESUME); \ - unlock_activation((cmd), (lv)); \ - rr; \ -}) -#define resume_lv_origin(cmd, lv) lock_lv_vol(cmd, lv, LCK_LV_RESUME | LCK_ORIGIN_ONLY) -#define revert_lv(cmd, lv) \ -({ \ - int rr = lock_lv_vol((cmd), (lv), LCK_LV_RESUME | LCK_REVERT); \ -\ - unlock_activation((cmd), (lv)); \ - rr; \ -}) -#define suspend_lv(cmd, lv) \ - (lock_activation((cmd), (lv)) ? lock_lv_vol((cmd), (lv), LCK_LV_SUSPEND | LCK_HOLD) : 0) - -#define suspend_lv_origin(cmd, lv) lock_lv_vol(cmd, lv, LCK_LV_SUSPEND | LCK_HOLD | LCK_ORIGIN_ONLY) - -#define deactivate_lv(cmd, lv) lock_lv_vol_serially(cmd, lv, LCK_LV_DEACTIVATE) - -#define activate_lv(cmd, lv) lock_lv_vol_serially(cmd, lv, LCK_LV_ACTIVATE | LCK_HOLD) - -struct logical_volume; - -#define deactivate_lv_local(cmd, lv) \ - lock_lv_vol_serially(cmd, lv, LCK_LV_DEACTIVATE | LCK_LOCAL) - #define drop_cached_metadata(vg) \ lock_vol((vg)->cmd, (vg)->name, LCK_VG_DROP_CACHE, NULL)

1 0

master - tests: remove -cn option from some commands
by David Teigland 06 Jun '18

06 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=802382e21ff600307f7c1… Commit: 802382e21ff600307f7c16f4651966d9a7c21252 Parent: b7da704566a6542c86cc1fcc186a66aa016b6802 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 14:04:19 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 6 14:04:19 2018 -0500 tests: remove -cn option from some commands --- test/shell/vgcfgbackup-lvm1.sh | 2 +- test/shell/vgchange-usage.sh | 8 ++++---- test/shell/vgsplit-usage.sh | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/shell/vgcfgbackup-lvm1.sh b/test/shell/vgcfgbackup-lvm1.sh index a148ec1..9b81e28 100644 --- a/test/shell/vgcfgbackup-lvm1.sh +++ b/test/shell/vgcfgbackup-lvm1.sh @@ -28,7 +28,7 @@ aux lvmconf "backup/backup = 0" # vgcfgbackup correctly stores metadata LVM1 with missing PVs pvcreate -M1 "${DEVICES[@]}" -vgcreate $SHARED -M1 -c n "$vg" "${DEVICES[@]}" +vgcreate $SHARED -M1 "$vg" "${DEVICES[@]}" lvcreate -l1 -n $lv1 $vg "$dev1" pvremove -ff -y "$dev2" not lvcreate -l1 -n $lv1 $vg "$dev3" diff --git a/test/shell/vgchange-usage.sh b/test/shell/vgchange-usage.sh index 1885a64..9fe9bc5 100644 --- a/test/shell/vgchange-usage.sh +++ b/test/shell/vgchange-usage.sh @@ -101,7 +101,7 @@ vgremove -ff $vg test -n "$LVM_TEST_LVMLOCKD" && exit 0 # set cluster bit -vgcreate -cn $vg "$dev1" "$dev2" "$dev3" +vgcreate $vg "$dev1" "$dev2" "$dev3" # check prompt to change cluster bit without giving explicit vg name fail vgchange -cy 2>&1 | tee out grep "y/n" out @@ -121,10 +121,10 @@ if test -e LOCAL_CLVMD ; then # check we do not support conversion of just locally active LVs lvchange -an $vg lvchange -ay $vg - not vgchange -cn $vg + not vgchange $vg lvchange -an $vg lvchange -aey $vg - vgchange -cn $vg + vgchange $vg else # no clvmd is running fail vgchange -cy $vg @@ -136,7 +136,7 @@ else vgs --ignoreskippedcluster $vg 2>&1 | tee out not grep "Skipping clustered volume group" out # reset back to non-clustered VG with disabled locking - vgchange -cn $vg --config 'global{locking_type=0}' $vg + vgchange $vg --config 'global{locking_type=0}' $vg fi check vg_attr_bit cluster $vg "-" diff --git a/test/shell/vgsplit-usage.sh b/test/shell/vgsplit-usage.sh index a112e86..38f3964 100644 --- a/test/shell/vgsplit-usage.sh +++ b/test/shell/vgsplit-usage.sh @@ -96,9 +96,9 @@ grep "Volume group \"$vg2\" exists, but new VG option specified" err vgremove $vg1 $vg2 # vgsplit rejects split because clustered given with existing vg -vgcreate -M$mdatype --clustered n $vg1 "$dev1" "$dev2" -vgcreate -M$mdatype --clustered n $vg2 "$dev3" "$dev4" -not vgsplit --clustered n $vg1 $vg2 "$dev1" 2>err +vgcreate -M$mdatype $vg1 "$dev1" "$dev2" +vgcreate -M$mdatype $vg2 "$dev3" "$dev4" +not vgsplit $vg1 $vg2 "$dev1" 2>err grep "Volume group \"$vg2\" exists, but new VG option specified" err vgremove $vg1 $vg2

1 0

master - use exclusive file lock on VG for activation
by David Teigland 06 Jun '18

06 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=58a9254252a4c837601c1… Commit: 58a9254252a4c837601c15aabdae53d2f3c06edc Parent: d2d8dd7f7f21798cac37d9cc6a7cdcb290a63f4f Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 11:14:39 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 6 13:58:34 2018 -0500 use exclusive file lock on VG for activation Make activation commands: vgchange -ay, lvchange -ay, pvscan -aay take an exclusive file lock on the VG to serialize multiple concurrent activation commands which could otherwise interfere with each other. --- tools/lvchange.c | 2 +- tools/pvscan.c | 2 +- tools/vgchange.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/lvchange.c b/tools/lvchange.c index a90174e..3ed6b06 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -1386,7 +1386,7 @@ int lvchange_activate_cmd(struct cmd_context *cmd, int argc, char **argv) } else /* Component LVs might be active, support easy deactivation */ cmd->process_component_lvs = 1; - ret = process_each_lv(cmd, argc, argv, NULL, NULL, 0, + ret = process_each_lv(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE, NULL, &_lvchange_activate_check, &_lvchange_activate_single); if (ret != ECMD_PROCESSED) diff --git a/tools/pvscan.c b/tools/pvscan.c index 7cba0f4..61626e6 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -288,7 +288,7 @@ static int _pvscan_autoactivate(struct cmd_context *cmd, struct pvscan_aa_params pp->refresh_all = 1; } - ret = process_each_vg(cmd, 0, NULL, NULL, vgnames, 0, 0, handle, _pvscan_autoactivate_single); + ret = process_each_vg(cmd, 0, NULL, NULL, vgnames, READ_FOR_UPDATE, 0, handle, _pvscan_autoactivate_single); destroy_processing_handle(cmd, handle); diff --git a/tools/vgchange.c b/tools/vgchange.c index a67c3be..b07057f 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -791,7 +791,7 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv) cmd->lockd_vg_enforce_sh = 1; } - if (update) + if (update || arg_is_set(cmd, activate_ARG)) flags |= READ_FOR_UPDATE; if (!(handle = init_processing_handle(cmd, NULL))) {

1 0

master - Remove VG lock ordering check
by David Teigland 06 Jun '18

06 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d2d8dd7f7f21798cac37d… Commit: d2d8dd7f7f21798cac37d9cc6a7cdcb290a63f4f Parent: c157c43f7cca085651fab13937ee11e526fe88cf Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 5 15:16:58 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 6 13:58:34 2018 -0500 Remove VG lock ordering check Four commands lock two VGs at a time: - vgsplit and vgmerge already have their own logic to acquire the locks in the correct order. - vgimportclone and vgrename disable this ordering check. --- lib/cache/lvmcache.c | 66 ------------------------------------------------- lib/cache/lvmcache.h | 1 - lib/locking/locking.c | 6 ---- tools/toollib.c | 8 ------ tools/vgimportclone.c | 4 --- tools/vgrename.c | 5 --- 6 files changed, 0 insertions(+), 90 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index b9aa8a0..774d687 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -77,7 +77,6 @@ static int _has_scanned = 0; static int _vgs_locked = 0; static int _vg_global_lock_held = 0; /* Global lock held when cache wiped? */ static int _found_duplicate_pvs = 0; /* If we never see a duplicate PV we can skip checking for them later. */ -static int _suppress_lock_ordering = 0; int lvmcache_init(struct cmd_context *cmd) { @@ -158,71 +157,6 @@ static void _update_cache_lock_state(const char *vgname, int locked) _update_cache_vginfo_lock_state(vginfo, locked); } -/* - * Ensure vgname2 comes after vgname1 alphabetically. - * Orphan locks come last. - * VG_GLOBAL comes first. - */ -static int _vgname_order_correct(const char *vgname1, const char *vgname2) -{ - if (is_global_vg(vgname1)) - return 1; - - if (is_global_vg(vgname2)) - return 0; - - if (is_orphan_vg(vgname1)) - return 0; - - if (is_orphan_vg(vgname2)) - return 1; - - if (strcmp(vgname1, vgname2) < 0) - return 1; - - return 0; -} - -void lvmcache_lock_ordering(int enable) -{ - _suppress_lock_ordering = !enable; -} - -/* - * Ensure VG locks are acquired in alphabetical order. - */ -int lvmcache_verify_lock_order(const char *vgname) -{ - struct dm_hash_node *n; - const char *vgname2; - - if (_suppress_lock_ordering) - return 1; - - if (!_lock_hash) - return 1; - - dm_hash_iterate(n, _lock_hash) { - if (!dm_hash_get_data(_lock_hash, n)) - return_0; - - if (!(vgname2 = dm_hash_get_key(_lock_hash, n))) { - log_error(INTERNAL_ERROR "VG lock %s hits NULL.", - vgname); - return 0; - } - - if (!_vgname_order_correct(vgname2, vgname)) { - log_errno(EDEADLK, INTERNAL_ERROR "VG lock %s must " - "be requested before %s, not after.", - vgname, vgname2); - return 0; - } - } - - return 1; -} - void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unused))) { if (dm_hash_lookup(_lock_hash, vgname)) diff --git a/lib/cache/lvmcache.h b/lib/cache/lvmcache.h index 5891757..4808a0d 100644 --- a/lib/cache/lvmcache.h +++ b/lib/cache/lvmcache.h @@ -87,7 +87,6 @@ int lvmcache_update_vg(struct volume_group *vg, unsigned precommitted); void lvmcache_lock_vgname(const char *vgname, int read_only); void lvmcache_unlock_vgname(const char *vgname); -int lvmcache_verify_lock_order(const char *vgname); /* Queries */ const struct format_type *lvmcache_fmt_from_vgname(struct cmd_context *cmd, const char *vgname, const char *vgid, unsigned revalidate_labels); diff --git a/lib/locking/locking.c b/lib/locking/locking.c index a4fcaf7..5e28452 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -234,12 +234,6 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str /* Global VG_ORPHANS lock covers all orphan formats. */ if (is_orphan_vg(vol)) vol = VG_ORPHANS; - /* VG locks alphabetical, ORPHAN lock last */ - if ((lck_type != LCK_UNLOCK) && - !(flags & LCK_CACHE) && - !lvmcache_verify_lock_order(vol)) - return_0; - break; case LCK_LV: /* All LV locks are non-blocking. */ diff --git a/tools/toollib.c b/tools/toollib.c index 236e2b1..a4dddd3 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -5414,14 +5414,6 @@ int pvcreate_each_device(struct cmd_context *cmd, } /* - * This function holds the orphans lock while reading VGs to look for - * devices. This means the orphans lock is held while VG locks are - * acquired, which is against lvmcache lock ordering rules, so disable - * the lvmcache lock ordering checks. - */ - lvmcache_lock_ordering(0); - - /* * Clear the cache before acquiring the orphan lock. (Clearing the * cache with locks held is an error.) We want the orphan lock * acquired before process_each_pv. If the orphan lock is not held diff --git a/tools/vgimportclone.c b/tools/vgimportclone.c index 7421912..e37b897 100644 --- a/tools/vgimportclone.c +++ b/tools/vgimportclone.c @@ -342,9 +342,6 @@ retry_name: log_debug("Changing VG %s to %s.", vp.old_vgname, vp.new_vgname); - /* We don't care if the new name comes before the old in lock order. */ - lvmcache_lock_ordering(0); - if (!lock_vol(cmd, vp.new_vgname, LCK_VG_WRITE, NULL)) { log_error("Can't get lock for new VG name %s", vp.new_vgname); goto out; @@ -363,7 +360,6 @@ out: unlock_vg(cmd, NULL, VG_GLOBAL); internal_filter_clear(); init_internal_filtering(0); - lvmcache_lock_ordering(1); destroy_processing_handle(cmd, handle); /* Enable lvmetad again if no duplicates are left. */ diff --git a/tools/vgrename.c b/tools/vgrename.c index 4f2a08b..bbc3087 100644 --- a/tools/vgrename.c +++ b/tools/vgrename.c @@ -99,13 +99,8 @@ static int _vgrename_single(struct cmd_context *cmd, const char *vg_name, * this uuid-for-name case. */ if (vp->lock_vg_old_first || vp->old_name_is_uuid) { - if (vp->old_name_is_uuid) - lvmcache_lock_ordering(0); - if (!_lock_new_vg_for_rename(cmd, vp->vg_name_new)) return ECMD_FAILED; - - lvmcache_lock_ordering(1); } dev_dir = cmd->dev_dir;

1 0

master - Remove unused clvm variations for active LVs
by David Teigland 06 Jun '18

06 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c157c43f7cca085651fab… Commit: c157c43f7cca085651fab13937ee11e526fe88cf Parent: eb600292455b1b2b2e88db74e13b7db848701b92 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 5 13:21:28 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 6 13:58:34 2018 -0500 Remove unused clvm variations for active LVs Different flavors of activate_lv() and lv_is_active() which are meaningful in a clustered VG can be eliminated and replaced with whatever that flavor already falls back to in a local VG. e.g. lv_is_active_exclusive_locally() is distinct from lv_is_active() in a clustered VG, but in a local VG they are equivalent. So, all instances of the variant are replaced with the basic local equivalent. For local VGs, the same behavior remains as before. For shared VGs, lvmlockd was written with the explicit requirement of local behavior from these functions (lvmlockd requires locking_type 1), so the behavior in shared VGs also remains the same. --- lib/activate/activate.c | 131 ++-------------------------------------- lib/activate/activate.h | 6 -- lib/locking/locking.c | 18 +----- lib/locking/locking.h | 10 +--- lib/metadata/cache_manip.c | 6 +- lib/metadata/lv.c | 64 ++------------------ lib/metadata/lv.h | 2 +- lib/metadata/lv_manip.c | 36 +++++------- lib/metadata/mirror.c | 65 ++------------------ lib/metadata/pool_manip.c | 2 +- lib/metadata/raid_manip.c | 46 ++++---------- lib/metadata/snapshot_manip.c | 6 -- lib/metadata/thin_manip.c | 4 +- lib/report/report.c | 40 +------------ tools/lvchange.c | 11 +-- tools/lvconvert.c | 27 ++++----- tools/lvcreate.c | 4 +- tools/polldaemon.c | 4 +- tools/pvmove.c | 8 +-- tools/toollib.c | 4 +- tools/vgchange.c | 16 +----- 21 files changed, 88 insertions(+), 422 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 4c70443..c9ead42 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -374,31 +374,6 @@ int lv_is_active(const struct logical_volume *lv) { return 0; } -int lv_is_active_locally(const struct logical_volume *lv) -{ - return 0; -} -int lv_is_active_remotely(const struct logical_volume *lv) -{ - return 0; -} -int lv_is_active_but_not_locally(const struct logical_volume *lv) -{ - return 0; -} -int lv_is_active_exclusive(const struct logical_volume *lv) -{ - return 0; -} -int lv_is_active_exclusive_locally(const struct logical_volume *lv) -{ - return 0; -} -int lv_is_active_exclusive_remotely(const struct logical_volume *lv) -{ - return 0; -} - int lv_check_transient(struct logical_volume *lv) { return 1; @@ -1471,61 +1446,6 @@ int lvs_in_vg_opened(const struct volume_group *vg) } /* - * _lv_is_active - * @lv: logical volume being queried - * @locally: set if active locally (when provided) - * @remotely: set if active remotely (when provided) - * @exclusive: set if active exclusively (when provided) - * - * Determine whether an LV is active locally or in a cluster. - * In addition to the return code which indicates whether or - * not the LV is active somewhere, two other values are set - * to yield more information about the status of the activation: - * - * return locally exclusively status - * ====== ======= =========== ====== - * 0 0 0 not active - * 1 0 0 active remotely - * 1 0 1 exclusive remotely - * 1 1 0 active locally and possibly remotely - * 1 1 1 exclusive locally (or local && !cluster) - * The VG lock must be held to call this function. - * - * Returns: 0 or 1 - */ -static int _lv_is_active(const struct logical_volume *lv, - int *locally, int *remotely, int *exclusive) -{ - int r, l, e; /* remote, local, and exclusive */ - int skip_cluster_query = 0; - - r = l = e = 0; - - if (_lv_active(lv->vg->cmd, lv)) - l = 1; - - if (l) - e = 1; /* exclusive by definition */ - - if (locally) - *locally = l; - if (exclusive) - *exclusive = e; - if (remotely) - *remotely = r; - - log_very_verbose("%s is %sactive%s%s%s%s", - display_lvname(lv), - (r || l) ? "" : "not ", - (exclusive && e) ? " exclusive" : "", - l ? " locally" : "", - (!skip_cluster_query && l && r) ? " and" : "", - (!skip_cluster_query && r) ? " remotely" : ""); - - return r || l; -} - -/* * Check if "raid4" @segtype is supported by kernel. * * if segment type is not raid4, return 1. @@ -1545,51 +1465,14 @@ int raid4_is_supported(struct cmd_context *cmd, const struct segment_type *segty return 1; } +/* + * The VG lock must be held to call this function. + * + * Returns: 0 or 1 + */ int lv_is_active(const struct logical_volume *lv) { - return _lv_is_active(lv, NULL, NULL, NULL); -} - -int lv_is_active_locally(const struct logical_volume *lv) -{ - int l; - - return _lv_is_active(lv, &l, NULL, NULL) && l; -} - -int lv_is_active_remotely(const struct logical_volume *lv) -{ - int r; - - return _lv_is_active(lv, NULL, &r, NULL) && r; -} - -int lv_is_active_but_not_locally(const struct logical_volume *lv) -{ - int l; - - return _lv_is_active(lv, &l, NULL, NULL) && !l; -} - -int lv_is_active_exclusive(const struct logical_volume *lv) -{ - int e; - - return _lv_is_active(lv, NULL, NULL, &e) && e; -} - -int lv_is_active_exclusive_locally(const struct logical_volume *lv) -{ - int l, e; - - return _lv_is_active(lv, &l, NULL, &e) && l && e; -} - -int lv_is_active_exclusive_remotely(const struct logical_volume *lv) -{ - int l, e; - - return _lv_is_active(lv, &l, NULL, &e) && !l && e; + return _lv_active(lv->vg->cmd, lv); } #ifdef DMEVENTD @@ -1991,7 +1874,7 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume continue; if (!vg_write_lock_held() && lv_is_mirror(lv)) { - mirr_laopts.exclusive = lv_is_active_exclusive_locally(lv) ? 1 : 0; + mirr_laopts.exclusive = lv_is_active(lv) ? 1 : 0; /* * Commands vgchange and lvchange do use read-only lock when changing * monitoring (--monitor y|n). All other use cases hold 'write-lock' diff --git a/lib/activate/activate.h b/lib/activate/activate.h index 8175f68..8b6c4ad 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -191,12 +191,6 @@ int lvs_in_vg_activated(const struct volume_group *vg); int lvs_in_vg_opened(const struct volume_group *vg); int lv_is_active(const struct logical_volume *lv); -int lv_is_active_locally(const struct logical_volume *lv); -int lv_is_active_remotely(const struct logical_volume *lv); -int lv_is_active_but_not_locally(const struct logical_volume *lv); -int lv_is_active_exclusive(const struct logical_volume *lv); -int lv_is_active_exclusive_locally(const struct logical_volume *lv); -int lv_is_active_exclusive_remotely(const struct logical_volume *lv); /* Check is any component LV is active */ const struct logical_volume *lv_component_is_active(const struct logical_volume *lv); diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 0e5658f..a4fcaf7 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -273,16 +273,6 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str return 1; } -/* - * First try to activate exclusively locally. - * Then if the VG is clustered and the LV is not yet active (e.g. due to - * an activation filter) try activating on remote nodes. - */ -int activate_lv_excl(struct cmd_context *cmd, const struct logical_volume *lv) -{ - return activate_lv_excl_local(cmd, lv); -} - /* Lock a list of LVs */ int activate_lvs(struct cmd_context *cmd, struct dm_list *lvs, unsigned exclusive) { @@ -290,13 +280,9 @@ int activate_lvs(struct cmd_context *cmd, struct dm_list *lvs, unsigned exclusiv struct lv_list *lvl; dm_list_iterate_items(lvl, lvs) { - if (!exclusive && !lv_is_active_exclusive(lvl->lv)) { - if (!activate_lv(cmd, lvl->lv)) { - log_error("Failed to activate %s", display_lvname(lvl->lv)); - return 0; - } - } else if (!activate_lv_excl(cmd, lvl->lv)) { + if (!activate_lv(cmd, lvl->lv)) { log_error("Failed to activate %s", display_lvname(lvl->lv)); + dm_list_uniterate(lvh, lvs, &lvl->list) { lvl = dm_list_item(lvh, struct lv_list); if (!deactivate_lv(cmd, lvl->lv)) diff --git a/lib/locking/locking.h b/lib/locking/locking.h index 8b2bced..f3956c2 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -231,20 +231,14 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); }) #define suspend_lv(cmd, lv) \ (lock_activation((cmd), (lv)) ? lock_lv_vol((cmd), (lv), LCK_LV_SUSPEND | LCK_HOLD) : 0) + #define suspend_lv_origin(cmd, lv) lock_lv_vol(cmd, lv, LCK_LV_SUSPEND | LCK_HOLD | LCK_ORIGIN_ONLY) + #define deactivate_lv(cmd, lv) lock_lv_vol_serially(cmd, lv, LCK_LV_DEACTIVATE) #define activate_lv(cmd, lv) lock_lv_vol_serially(cmd, lv, LCK_LV_ACTIVATE | LCK_HOLD) -#define activate_lv_excl_local(cmd, lv) \ - lock_lv_vol_serially(cmd, lv, LCK_LV_EXCLUSIVE | LCK_HOLD | LCK_LOCAL) -#define activate_lv_excl_remote(cmd, lv) \ - lock_lv_vol(cmd, lv, LCK_LV_EXCLUSIVE | LCK_HOLD | LCK_REMOTE) struct logical_volume; -int activate_lv_excl(struct cmd_context *cmd, const struct logical_volume *lv); - -#define activate_lv_local(cmd, lv) \ - lock_lv_vol_serially(cmd, lv, LCK_LV_ACTIVATE | LCK_HOLD | LCK_LOCAL) #define deactivate_lv_local(cmd, lv) \ lock_lv_vol_serially(cmd, lv, LCK_LV_DEACTIVATE | LCK_LOCAL) diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index 0768e6f..fe91fee 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -566,8 +566,8 @@ int lv_cache_remove(struct logical_volume *cache_lv) default: /* Otherwise localy activate volume to sync dirty blocks */ cache_lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(cache_lv->vg->cmd, cache_lv) || - !lv_is_active_locally(cache_lv)) { + if (!activate_lv(cache_lv->vg->cmd, cache_lv) || + !lv_is_active(cache_lv)) { log_error("Failed to active cache locally %s.", display_lvname(cache_lv)); return 0; @@ -969,7 +969,7 @@ int wipe_cache_pool(struct logical_volume *cache_pool_lv) } cache_pool_lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(cache_pool_lv->vg->cmd, cache_pool_lv)) { + if (!activate_lv(cache_pool_lv->vg->cmd, cache_pool_lv)) { log_error("Aborting. Failed to activate cache pool %s.", display_lvname(cache_pool_lv)); return 0; diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index f930633..14d7312 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -1023,7 +1023,7 @@ int lv_raid_image_in_sync(const struct logical_volume *lv) * If the LV is not active locally, * it doesn't make sense to check status */ - if (!lv_is_active_locally(lv)) + if (!lv_is_active(lv)) return 0; /* Assume not in-sync */ if (!lv_is_raid_image(lv)) { @@ -1081,7 +1081,7 @@ int lv_raid_healthy(const struct logical_volume *lv) * If the LV is not active locally, * it doesn't make sense to check status */ - if (!lv_is_active_locally(lv)) + if (!lv_is_active(lv)) return 1; /* assume healthy */ if (!lv_is_raid_type(lv)) { @@ -1446,22 +1446,8 @@ char *lv_host_dup(struct dm_pool *mem, const struct logical_volume *lv) return dm_pool_strdup(mem, lv->hostname ? : ""); } -static int _lv_is_exclusive(struct logical_volume *lv) -{ - struct lv_segment *seg; - - /* Some seg types require exclusive activation */ - /* FIXME Scan recursively */ - dm_list_iterate_items(seg, &lv->segments) - if (seg_only_exclusive(seg)) - return 1; - - /* Origin has no seg type require exlusiveness */ - return lv_is_origin(lv); -} - int lv_active_change(struct cmd_context *cmd, struct logical_volume *lv, - enum activation_change activate, int needs_exclusive) + enum activation_change activate) { const char *ay_with_mode = NULL; @@ -1478,45 +1464,22 @@ int lv_active_change(struct cmd_context *cmd, struct logical_volume *lv, switch (activate) { case CHANGE_AN: + case CHANGE_ALN: log_verbose("Deactivating logical volume %s.", display_lvname(lv)); if (!deactivate_lv(cmd, lv)) return_0; break; - case CHANGE_ALN: - log_verbose("Deactivating logical volume %s locally.", - display_lvname(lv)); - if (!deactivate_lv_local(cmd, lv)) - return_0; - break; + case CHANGE_ALY: case CHANGE_AAY: - if (needs_exclusive || _lv_is_exclusive(lv)) { - log_verbose("Activating logical volume %s exclusively locally.", - display_lvname(lv)); - if (!activate_lv_excl_local(cmd, lv)) - return_0; - } else { - log_verbose("Activating logical volume %s locally.", - display_lvname(lv)); - if (!activate_lv_local(cmd, lv)) - return_0; - } - break; case CHANGE_AEY: -exclusive: - log_verbose("Activating logical volume %s exclusively.", - display_lvname(lv)); - if (!activate_lv_excl(cmd, lv)) - return_0; - break; case CHANGE_ASY: case CHANGE_AY: default: - if (needs_exclusive || _lv_is_exclusive(lv)) - goto exclusive; log_verbose("Activating logical volume %s.", display_lvname(lv)); if (!activate_lv(cmd, lv)) return_0; + break; } if (!is_change_activating(activate) && @@ -1535,23 +1498,10 @@ char *lv_active_dup(struct dm_pool *mem, const struct logical_volume *lv) goto out; } - if (vg_is_clustered(lv->vg)) { - //const struct logical_volume *lvo = lv; - lv = lv_lock_holder(lv); - //log_debug("Holder for %s => %s.", lvo->name, lv->name); - } - if (!lv_is_active(lv)) s = ""; /* not active */ - else if (!vg_is_clustered(lv->vg)) + else s = "active"; - else if (lv_is_active_exclusive(lv)) - /* exclusive cluster activation */ - s = lv_is_active_exclusive_locally(lv) ? - "local exclusive" : "remote exclusive"; - else /* locally active */ - s = lv_is_active_but_not_locally(lv) ? - "remotely" : "locally"; out: return dm_pool_strdup(mem, s); } diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h index 920bcb5..e2e640f 100644 --- a/lib/metadata/lv.h +++ b/lib/metadata/lv.h @@ -153,7 +153,7 @@ char *lvseg_kernel_discards_dup(struct dm_pool *mem, const struct lv_segment *se int lv_set_creation(struct logical_volume *lv, const char *hostname, uint64_t timestamp); int lv_active_change(struct cmd_context *cmd, struct logical_volume *lv, - enum activation_change activate, int needs_exclusive); + enum activation_change activate); /* LV dup functions */ char *lv_attr_dup_with_info_and_seg_status(struct dm_pool *mem, const struct lv_with_info_and_seg_status *lvdm); diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index e023132..dad5953 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -4058,7 +4058,7 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah, for (s = 0; !fail && s < seg->area_count; s++) { meta_lv = seg_metalv(seg, s); - if (!activate_lv_local(meta_lv->vg->cmd, meta_lv)) { + if (!activate_lv(meta_lv->vg->cmd, meta_lv)) { log_error("Failed to activate %s for clearing.", display_lvname(meta_lv)); fail = 1; @@ -4228,7 +4228,7 @@ int lv_extend(struct logical_volume *lv, (lv_is_not_synced(lv))) { dm_percent_t sync_percent = DM_PERCENT_INVALID; - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_error("Unable to read sync percent while LV %s " "is not locally active.", display_lvname(lv)); /* FIXME Support --force */ @@ -4711,7 +4711,7 @@ static int _lvresize_adjust_policy(const struct logical_volume *lv, return 0; } - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_error("Can't read state of locally inactive LV %s.", display_lvname(lv)); return 0; @@ -5571,7 +5571,7 @@ int lv_resize(struct logical_volume *lv, * then use suspend and resume and deactivate pool LV, * instead of searching for an active thin volume. */ - if (!activate_lv_excl(cmd, lock_lv)) { + if (!activate_lv(cmd, lock_lv)) { log_error("Failed to activate %s.", display_lvname(lock_lv)); return 0; } @@ -6788,7 +6788,7 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd, struct segment_type *segtype; struct lv_segment *mapseg; struct lv_names lv_names; - unsigned exclusive = 0, i; + unsigned i; /* create an empty layer LV */ if (dm_snprintf(name, sizeof(name), "%s%s", lv_where->name, layer_suffix) < 0) { @@ -6804,9 +6804,6 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd, return NULL; } - if (lv_is_active_exclusive_locally(lv_where)) - exclusive = 1; - if (lv_is_active(lv_where) && strstr(name, MIRROR_SYNC_LAYER)) { log_very_verbose("Creating transient LV %s for mirror conversion in VG %s.", name, lv_where->vg->name); @@ -6835,10 +6832,7 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd, return NULL; } - if (exclusive) - r = activate_lv_excl(cmd, layer_lv); - else - r = activate_lv(cmd, layer_lv); + r = activate_lv(cmd, layer_lv); if (!r) { log_error("Failed to resume transient LV" @@ -7125,7 +7119,7 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp) /* nothing to do */ return 1; - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_error("Volume \"%s/%s\" is not active locally (volume_list activation filter?).", lv->vg->name, lv->name); return 0; @@ -7491,7 +7485,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, return_NULL; /* New pool is now inactive */ } else { - if (!activate_lv_excl_local(cmd, pool_lv)) { + if (!activate_lv(cmd, pool_lv)) { log_error("Aborting. Failed to locally activate thin pool %s.", display_lvname(pool_lv)); return NULL; @@ -7783,7 +7777,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (seg_is_cache(lp)) { if (vg_is_shared(vg)) { if (is_change_activating(lp->activate)) { - if (!lv_active_change(cmd, lv, CHANGE_AEY, 0)) { + if (!lv_active_change(cmd, lv, CHANGE_AEY)) { log_error("Aborting. Failed to activate LV %s.", display_lvname(lv)); goto revert_new_lv; @@ -7794,7 +7788,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, /* FIXME Support remote exclusive activation? */ /* Not yet 'cache' LV, it is stripe volume for wiping */ - else if (is_change_activating(lp->activate) && !activate_lv_excl_local(cmd, lv)) { + else if (is_change_activating(lp->activate) && !activate_lv(cmd, lv)) { log_error("Aborting. Failed to activate LV %s locally exclusively.", display_lvname(lv)); goto revert_new_lv; @@ -7827,7 +7821,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, /* Avoid multiple thin-pool activations in this case */ if (thin_pool_was_active < 0) thin_pool_was_active = 0; - if (!activate_lv_excl(cmd, pool_lv)) { + if (!activate_lv(cmd, pool_lv)) { log_error("Failed to activate thin pool %s.", display_lvname(pool_lv)); goto revert_new_lv; @@ -7846,7 +7840,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, } backup(vg); - if (!lv_active_change(cmd, lv, lp->activate, 0)) { + if (!lv_active_change(cmd, lv, lp->activate)) { log_error("Failed to activate thin %s.", lv->name); goto deactivate_and_revert_new_lv; } @@ -7860,13 +7854,13 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, } } else if (lp->snapshot) { lv->status |= LV_TEMPORARY; - if (!activate_lv_local(cmd, lv)) { + if (!activate_lv(cmd, lv)) { log_error("Aborting. Failed to activate snapshot " "exception store."); goto revert_new_lv; } lv->status &= ~LV_TEMPORARY; - } else if (!lv_active_change(cmd, lv, lp->activate, 0)) { + } else if (!lv_active_change(cmd, lv, lp->activate)) { log_error("Failed to activate new LV."); goto deactivate_and_revert_new_lv; } @@ -7968,7 +7962,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, */ /* Activate spare snapshot once it is a complete LV */ - if (!lv_active_change(cmd, origin_lv, lp->activate, 1)) { + if (!lv_active_change(cmd, origin_lv, lp->activate)) { log_error("Failed to activate sparce volume %s.", display_lvname(origin_lv)); return NULL; diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 9c775c4..8de1440 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -354,7 +354,7 @@ static int _init_mirror_log(struct cmd_context *cmd, } else if (!lv_update_and_reload((struct logical_volume*) lock_holder)) return_0; - if (!activate_lv_excl_local(cmd, log_lv)) { + if (!activate_lv(cmd, log_lv)) { log_error("Aborting. Failed to activate mirror log."); goto revert_new_lv; } @@ -427,15 +427,10 @@ static int _activate_lv_like_model(struct logical_volume *model, /* FIXME: run all cases through lv_active_change when clvm variants are gone. */ if (vg_is_shared(lv->vg)) - return lv_active_change(lv->vg->cmd, lv, CHANGE_AEY, 0); + return lv_active_change(lv->vg->cmd, lv, CHANGE_AEY); - if (lv_is_active_exclusive(model)) { - if (!activate_lv_excl(lv->vg->cmd, lv)) - return_0; - } else { - if (!activate_lv(lv->vg->cmd, lv)) - return_0; - } + if (!activate_lv(lv->vg->cmd, lv)) + return_0; return 1; } @@ -610,14 +605,7 @@ static int _mirrored_lv_in_sync(struct logical_volume *lv) if (!lv_mirror_percent(lv->vg->cmd, lv, 0, &sync_percent, NULL)) { - if (lv_is_active_but_not_locally(lv)) - log_error("Unable to determine mirror sync status of" - " remotely active LV, %s", - display_lvname(lv)); - else - log_error("Unable to determine mirror " - "sync status of %s.", - display_lvname(lv)); + log_error("Unable to determine mirror sync status of %s.", display_lvname(lv)); return 0; } @@ -1668,7 +1656,6 @@ int remove_mirror_log(struct cmd_context *cmd, int force) { dm_percent_t sync_percent; - struct volume_group *vg = lv->vg; /* Unimplemented features */ if (dm_list_size(&lv->segments) != 1) { @@ -1677,20 +1664,12 @@ int remove_mirror_log(struct cmd_context *cmd, } /* Had disk log, switch to core. */ - if (lv_is_active_locally(lv)) { + if (lv_is_active(lv)) { if (!lv_mirror_percent(cmd, lv, 0, &sync_percent, NULL)) { log_error("Unable to determine mirror sync status."); return 0; } - } else if (lv_is_active(lv)) { - log_error("Unable to determine sync status of " - "remotely active mirror volume %s.", display_lvname(lv)); - return 0; - } else if (vg_is_clustered(vg)) { - log_error("Unable to convert the log of an inactive " - "cluster mirror volume %s.", display_lvname(lv)); - return 0; } else if (force || yes_no_prompt("Full resync required to convert inactive " "mirror volume %s to core log. " "Proceed? [y/n]: ", display_lvname(lv)) == 'y') @@ -1910,22 +1889,11 @@ int add_mirror_log(struct cmd_context *cmd, struct logical_volume *lv, unsigned old_log_count; int r = 0; - if (vg_is_clustered(lv->vg) && (log_count > 1)) { - log_error("Log type, \"mirrored\", is unavailable to cluster mirrors."); - return 0; - } - if (dm_list_size(&lv->segments) != 1) { log_error("Multiple-segment mirror is not supported."); return 0; } - if (lv_is_active_but_not_locally(lv)) { - log_error("Unable to convert the log of a mirror, %s, that is " - "active remotely but not locally.", display_lvname(lv)); - return 0; - } - log_lv = first_seg(lv)->log_lv; old_log_count = (log_lv) ? lv_mirror_count(log_lv) : 0; if (old_log_count == log_count) { @@ -2079,27 +2047,6 @@ int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv, return 0; } - if (vg_is_clustered(lv->vg)) { - /* FIXME: move this test out of this function */ - /* Skip test for pvmove mirrors, it can use local mirror */ - if (!lv_is_pvmove(lv) && !lv_is_locked(lv) && - lv_is_active(lv) && - !lv_is_active_exclusive_locally(lv) && /* lv_is_active_remotely */ - !cluster_mirror_is_available(lv->vg->cmd)) { - log_error("Shared cluster mirrors are not available."); - return 0; - } - - /* - * No mirrored logs for cluster mirrors until - * log daemon is multi-threaded. - */ - if (log_count > 1) { - log_error("Log type, \"mirrored\", is unavailable to cluster mirrors."); - return 0; - } - } - if (lv->vg->lock_type && !strcmp(lv->vg->lock_type, "dlm") && cmd->lockd_lv_sh) { if (!cluster_mirror_is_available(cmd)) { log_error("Shared cluster mirrors are not available."); diff --git a/lib/metadata/pool_manip.c b/lib/metadata/pool_manip.c index 20224d1..80d2e07 100644 --- a/lib/metadata/pool_manip.c +++ b/lib/metadata/pool_manip.c @@ -526,7 +526,7 @@ int create_pool(struct logical_volume *pool_lv, * or directly converted to invisible device via suspend/resume */ pool_lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(pool_lv->vg->cmd, pool_lv)) { + if (!activate_lv(pool_lv->vg->cmd, pool_lv)) { log_error("Aborting. Failed to activate pool metadata %s.", display_lvname(pool_lv)); goto bad; diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 53aa4f1..92e01a2 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -319,7 +319,7 @@ static int _deactivate_and_remove_lvs(struct volume_group *vg, struct dm_list *r return 0; } /* Must get a cluster lock on SubLVs that will be removed. */ - if (!activate_lv_excl_local(vg->cmd, lvl->lv)) + if (!activate_lv(vg->cmd, lvl->lv)) return_0; } @@ -669,7 +669,7 @@ static int _lv_update_and_reload_list(struct logical_volume *lv, int origin_only dm_list_iterate_items(lvl, lv_list) { log_very_verbose("Activating logical volume %s before %s in kernel.", display_lvname(lvl->lv), display_lvname(lock_lv)); - if (!activate_lv_excl_local(vg->cmd, lvl->lv)) { + if (!activate_lv(vg->cmd, lvl->lv)) { log_error("Failed to activate %s before resuming %s.", display_lvname(lvl->lv), display_lvname(lock_lv)); r = 0; /* But lets try with the rest */ @@ -732,9 +732,9 @@ static int _clear_lvs(struct dm_list *lv_list) was_active = alloca(sz); dm_list_iterate_items(lvl, lv_list) - if (!(was_active[i++] = lv_is_active_locally(lvl->lv))) { + if (!(was_active[i++] = lv_is_active(lvl->lv))) { lvl->lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(vg->cmd, lvl->lv)) { + if (!activate_lv(vg->cmd, lvl->lv)) { log_error("Failed to activate localy %s for clearing.", display_lvname(lvl->lv)); r = 0; @@ -2276,7 +2276,7 @@ static int _vg_write_lv_suspend_vg_commit(struct logical_volume *lv, int origin_ /* Helper: function to activate @lv exclusively local */ static int _activate_sub_lv_excl_local(struct logical_volume *lv) { - if (lv && !activate_lv_excl_local(lv->vg->cmd, lv)) { + if (lv && !activate_lv(lv->vg->cmd, lv)) { log_error("Failed to activate %s.", display_lvname(lv)); return 0; } @@ -3258,16 +3258,6 @@ static int _lv_raid_change_image_count(struct logical_volume *lv, int yes, uint3 return r; } - /* - * LV must be either in-active or exclusively active - */ - if (lv_is_active(lv_lock_holder(lv)) && vg_is_clustered(lv->vg) && - !lv_is_active_exclusive_locally(lv_lock_holder(lv))) { - log_error("%s must be active exclusive locally to " - "perform this operation.", display_lvname(lv)); - return 0; - } - if (old_count > new_count) return _raid_remove_images(lv, yes, new_count, allocate_pvs, removal_lvs, commit); @@ -3427,13 +3417,13 @@ int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name, /* FIXME: run all cases through lv_active_change when clvm variants are gone. */ if (vg_is_shared(lvl->lv->vg)) { - if (!lv_active_change(lv->vg->cmd, lvl->lv, CHANGE_AEY, 0)) + if (!lv_active_change(lv->vg->cmd, lvl->lv, CHANGE_AEY)) return_0; - } else if (!activate_lv_excl_local(cmd, lvl->lv)) + } else if (!activate_lv(cmd, lvl->lv)) return_0; dm_list_iterate_items(lvl, &removal_lvs) - if (!activate_lv_excl_local(cmd, lvl->lv)) + if (!activate_lv(cmd, lvl->lv)) return_0; if (!resume_lv(cmd, lv_lock_holder(lv))) { @@ -3539,7 +3529,7 @@ int lv_raid_split_and_track(struct logical_volume *lv, /* Activate the split (and tracking) LV */ /* Preserving exclusive local activation also for tracked LV */ - if (!activate_lv_excl_local(lv->vg->cmd, seg_lv(seg, s))) + if (!activate_lv(lv->vg->cmd, seg_lv(seg, s))) return_0; if (seg->area_count == 2) @@ -5001,7 +4991,7 @@ static int _clear_meta_lvs(struct logical_volume *lv) /* Grab locks first in case of clustered VG */ if (vg_is_clustered(lv->vg)) dm_list_iterate_items(lvl, &meta_lvs) - if (!activate_lv_excl_local(lv->vg->cmd, lvl->lv)) + if (!activate_lv(lv->vg->cmd, lvl->lv)) return_0; /* * Now deactivate the MetaLVs before clearing, so @@ -6520,14 +6510,6 @@ int lv_raid_convert(struct logical_volume *lv, return 0; } - if (vg_is_clustered(lv->vg) && - !lv_is_active_exclusive_locally(lv_lock_holder(lv))) { - /* In clustered VGs, the LV must be active on this node exclusively. */ - log_error("%s must be active exclusive locally to " - "perform this operation.", display_lvname(lv)); - return 0; - } - new_segtype = new_segtype ? : seg->segtype; if (!new_segtype) { log_error(INTERNAL_ERROR "New segtype not specified."); @@ -6810,10 +6792,8 @@ static int _lv_raid_rebuild_or_replace(struct logical_volume *lv, if (lv_is_partial(lv)) lv->vg->cmd->partial_activation = 1; - if (!lv_is_active_exclusive_locally(lv_lock_holder(lv))) { - log_error("%s must be active %sto perform this operation.", - display_lvname(lv), - vg_is_clustered(lv->vg) ? "exclusive locally " : ""); + if (!lv_is_active(lv_lock_holder(lv))) { + log_error("%s must be active to perform this operation.", display_lvname(lv)); return 0; } @@ -7013,7 +6993,7 @@ try_again: * of their new names. */ dm_list_iterate_items(lvl, &old_lvs) - if (!activate_lv_excl_local(lv->vg->cmd, lvl->lv)) + if (!activate_lv(lv->vg->cmd, lvl->lv)) return_0; /* diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c index e3669ef..5ccf251 100644 --- a/lib/metadata/snapshot_manip.c +++ b/lib/metadata/snapshot_manip.c @@ -411,11 +411,5 @@ int validate_snapshot_origin(const struct logical_volume *origin_lv) return 0; } - if (vg_is_clustered(origin_lv->vg) && lv_is_active(origin_lv) && - !lv_is_active_exclusive_locally(origin_lv)) { - log_error("Snapshot origin must be active exclusively."); - return 0; - } - return 1; } diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c index e1522d3..6b2b1e7 100644 --- a/lib/metadata/thin_manip.c +++ b/lib/metadata/thin_manip.c @@ -504,7 +504,7 @@ int update_pool_lv(struct logical_volume *lv, int activate) * as this version has major problem when it does not know * which Node has pool active. */ - if (!activate_lv_excl(lv->vg->cmd, lv)) { + if (!activate_lv(lv->vg->cmd, lv)) { init_dmeventd_monitor(monitored); return_0; } @@ -857,7 +857,7 @@ int check_new_thin_pool(const struct logical_volume *pool_lv) uint64_t transaction_id; /* For transaction_id check LOCAL activation is required */ - if (!activate_lv_excl_local(cmd, pool_lv)) { + if (!activate_lv(cmd, pool_lv)) { log_error("Aborting. Failed to locally activate thin pool %s.", display_lvname(pool_lv)); return 0; diff --git a/lib/report/report.c b/lib/report/report.c index 4a957a7..8039820 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -3559,11 +3559,7 @@ static int _lvactivelocally_disp(struct dm_report *rh, struct dm_pool *mem, if (!activation()) return _binary_undef_disp(rh, mem, field, private); - if (vg_is_clustered(lv->vg)) { - lv = lv_lock_holder(lv); - active_locally = lv_is_active_locally(lv); - } else - active_locally = lv_is_active(lv); + active_locally = lv_is_active(lv); return _binary_disp(rh, mem, field, active_locally, GET_FIRST_RESERVED_NAME(lv_active_locally_y), private); } @@ -3572,38 +3568,12 @@ static int _lvactiveremotely_disp(struct dm_report *rh, struct dm_pool *mem, struct dm_report_field *field, const void *data, void *private) { - const struct logical_volume *lv = (const struct logical_volume *) data; int active_remotely; if (!activation()) return _binary_undef_disp(rh, mem, field, private); - if (vg_is_clustered(lv->vg)) { - lv = lv_lock_holder(lv); - /* FIXME: It seems we have no way to get this info correctly - * with current interface - we'd need to check number - * of responses from the cluster: - * - if number of nodes that responded == 1 - * - and LV is active on local node - * ..then we may say that LV is *not* active remotely. - * - * Otherwise ((responses > 1 && LV active locally) || - * (responses == 1 && LV not active locally)), it's - * active remotely. - * - * We have this info, but hidden underneath the - * locking interface (locking_type.query_resource fn). - * - * For now, let's use 'unknown' for remote status if - * the LV is found active locally until we find a way to - * smuggle the proper information out of the interface. - */ - if (lv_is_active_locally(lv)) - return _binary_undef_disp(rh, mem, field, private); - - active_remotely = lv_is_active_but_not_locally(lv); - } else - active_remotely = 0; + active_remotely = 0; return _binary_disp(rh, mem, field, active_remotely, GET_FIRST_RESERVED_NAME(lv_active_remotely_y), private); } @@ -3618,11 +3588,7 @@ static int _lvactiveexclusively_disp(struct dm_report *rh, struct dm_pool *mem, if (!activation()) return _binary_undef_disp(rh, mem, field, private); - if (vg_is_clustered(lv->vg)) { - lv = lv_lock_holder(lv); - active_exclusively = lv_is_active_exclusive(lv); - } else - active_exclusively = lv_is_active(lv); + active_exclusively = lv_is_active(lv); return _binary_disp(rh, mem, field, active_exclusively, GET_FIRST_RESERVED_NAME(lv_active_exclusively_y), private); } diff --git a/tools/lvchange.c b/tools/lvchange.c index 481cb4c..a90174e 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -294,9 +294,6 @@ static int _reactivate_lv(struct logical_volume *lv, if (!active) return 1; - if (exclusive) - return activate_lv_excl_local(cmd, lv); - return activate_lv(cmd, lv); } @@ -318,7 +315,7 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) dm_list_init(&device_list); - if (lv_is_active_locally(lv)) { + if (lv_is_active(lv)) { if (!lv_check_not_in_use(lv, 1)) { log_error("Can't resync open logical volume %s.", display_lvname(lv)); @@ -335,7 +332,7 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) } active = 1; - if (lv_is_active_exclusive_locally(lv)) + if (lv_is_active(lv)) exclusive = 1; } @@ -411,7 +408,7 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) memlock_unlock(lv->vg->cmd); dm_list_iterate_items(lvl, &device_list) { - if (!activate_lv_excl_local(cmd, lvl->lv)) { + if (!activate_lv(cmd, lvl->lv)) { log_error("Unable to activate %s for %s clearing.", display_lvname(lvl->lv), (seg_is_raid(seg)) ? "metadata area" : "mirror log"); @@ -621,7 +618,7 @@ static int _lvchange_persistent(struct cmd_context *cmd, if (activate != CHANGE_AN) { log_verbose("Re-activating logical volume %s.", display_lvname(lv)); - if (!lv_active_change(cmd, lv, activate, 0)) { + if (!lv_active_change(cmd, lv, activate)) { log_error("%s: reactivation failed.", display_lvname(lv)); backup(lv->vg); return 0; diff --git a/tools/lvconvert.c b/tools/lvconvert.c index aebf3e9..11f7cee 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1767,7 +1767,7 @@ static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volu return 0; } - if (lv_is_active_locally(cow)) { + if (lv_is_active(cow)) { if (!lv_check_not_in_use(cow, 1)) return_0; @@ -1950,7 +1950,7 @@ static int _lvconvert_snapshot(struct cmd_context *cmd, log_warn("WARNING: %s not zeroed.", snap_name); else { lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(cmd, lv) || + if (!activate_lv(cmd, lv) || !wipe_lv(lv, (struct wipe_params) { .do_zero = 1 })) { log_error("Aborting. Failed to wipe snapshot exception store."); return 0; @@ -2037,7 +2037,7 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd, * constructor and DM should prevent appropriate devices from * being open. */ - if (lv_is_active_locally(origin)) { + if (lv_is_active(origin)) { if (!lv_check_not_in_use(origin, 0)) { log_print_unless_silent("Delaying merge since origin is open."); merge_on_activate = 1; @@ -2146,7 +2146,7 @@ static int _lvconvert_merge_thin_snapshot(struct cmd_context *cmd, log_print_unless_silent("Volume %s replaced origin %s.", display_lvname(origin), display_lvname(lv)); - if (origin_is_active && !activate_lv_excl_local(cmd, lv)) { + if (origin_is_active && !activate_lv(cmd, lv)) { log_error("Failed to reactivate origin %s.", display_lvname(lv)); return 0; @@ -2254,13 +2254,13 @@ static int _lvconvert_thin_pool_repair(struct cmd_context *cmd, return 0; } - if (!activate_lv_excl_local(cmd, pmslv)) { + if (!activate_lv(cmd, pmslv)) { log_error("Cannot activate pool metadata spare volume %s.", pmslv->name); return 0; } - if (!activate_lv_excl_local(cmd, mlv)) { + if (!activate_lv(cmd, mlv)) { log_error("Cannot activate thin pool metadata volume %s.", mlv->name); goto deactivate_pmslv; @@ -2452,13 +2452,13 @@ static int _lvconvert_cache_repair(struct cmd_context *cmd, return 0; } - if (!activate_lv_excl_local(cmd, pmslv)) { + if (!activate_lv(cmd, pmslv)) { log_error("Cannot activate pool metadata spare volume %s.", pmslv->name); return 0; } - if (!activate_lv_excl_local(cmd, mlv)) { + if (!activate_lv(cmd, mlv)) { log_error("Cannot activate cache pool metadata volume %s.", mlv->name); goto deactivate_pmslv; @@ -3106,7 +3106,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, if (zero_metadata) { metadata_lv->status |= LV_TEMPORARY; - if (!activate_lv_excl_local(cmd, metadata_lv)) { + if (!activate_lv(cmd, metadata_lv)) { log_error("Aborting. Failed to activate metadata lv."); goto bad; } @@ -3248,7 +3248,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, } if (activate_pool && - !activate_lv_excl(cmd, pool_lv)) { + !activate_lv(cmd, pool_lv)) { log_error("Failed to activate pool logical volume %s.", display_lvname(pool_lv)); /* Deactivate subvolumes */ @@ -3461,11 +3461,8 @@ static int _lvconvert_repair_pvs_raid(struct cmd_context *cmd, struct logical_vo struct dm_list *failed_pvs; int do_it; - if (!lv_is_active_exclusive_locally(lv_lock_holder(lv))) { - log_error("%s must be active %sto perform this operation.", - display_lvname(lv), - vg_is_clustered(lv->vg) ? - "exclusive locally " : ""); + if (!lv_is_active(lv_lock_holder(lv))) { + log_error("%s must be active to perform this operation.", display_lvname(lv)); return 0; } diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 5c9d448..4009ea5 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -1232,13 +1232,13 @@ static int _determine_cache_argument(struct volume_group *vg, return 1; } else if (vg_is_shared(vg)) { - if (!lv_active_change(cmd, lv, CHANGE_AEY, 0)) { + if (!lv_active_change(cmd, lv, CHANGE_AEY)) { log_error("Cannot activate cache origin %s.", display_lvname(lv)); return 0; } - } else if (!activate_lv_excl_local(cmd, lv)) { + } else if (!activate_lv(cmd, lv)) { log_error("Cannot activate cache origin %s.", display_lvname(lv)); return 0; diff --git a/tools/polldaemon.c b/tools/polldaemon.c index bd99c7b..7ad45ca 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -200,7 +200,7 @@ int wait_for_single_lv(struct cmd_context *cmd, struct poll_operation_id *id, * If the LV is not active locally, the kernel cannot be * queried for its status. We must exit in this case. */ - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_print_unless_silent("%s: Interrupted: No longer active.", id->display_name); ret = 1; goto out; @@ -440,7 +440,7 @@ static int _report_progress(struct cmd_context *cmd, struct poll_operation_id *i goto out; } - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_verbose("%s: Interrupted: No longer active.", id->display_name); ret = 1; goto out; diff --git a/tools/pvmove.c b/tools/pvmove.c index 0fcabb3..c5e3929 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -466,8 +466,7 @@ static struct logical_volume *_set_up_pvmove_lv(struct cmd_context *cmd, * in the case it's NOT active anywhere else, since LOCKED LVs cannot be * later activated by user. */ - if (lv_is_active_remotely(holder) || - (!lv_is_active_locally(holder) && !activate_lv_excl_local(cmd, holder))) { + if ((!lv_is_active(holder) && !activate_lv(cmd, holder))) { lv_skipped = 1; log_print_unless_silent("Skipping LV %s which is not locally exclusive%s.", display_lvname(lv), @@ -532,10 +531,7 @@ static int _activate_lv(struct cmd_context *cmd, struct logical_volume *lv_mirr, { int r = 0; - if (exclusive || lv_is_active_exclusive(lv_mirr)) - r = activate_lv_excl(cmd, lv_mirr); - else - r = activate_lv(cmd, lv_mirr); + r = activate_lv(cmd, lv_mirr); if (!r) stack; diff --git a/tools/toollib.c b/tools/toollib.c index baf84ad..236e2b1 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1034,7 +1034,7 @@ int lv_change_activate(struct cmd_context *cmd, struct logical_volume *lv, return 0; } - if (!lv_active_change(cmd, lv, activate, 0)) + if (!lv_active_change(cmd, lv, activate)) return_0; set_lv_notify(lv->vg->cmd); @@ -1066,7 +1066,7 @@ int lv_refresh(struct cmd_context *cmd, struct logical_volume *lv) * - fortunately: polldaemon will immediately shutdown if the * origin doesn't have a status with a snapshot percentage */ - if (background_polling() && lv_is_merging_origin(lv) && lv_is_active_locally(lv)) + if (background_polling() && lv_is_merging_origin(lv) && lv_is_active(lv)) lv_spawn_background_polling(cmd, lv); return 1; diff --git a/tools/vgchange.c b/tools/vgchange.c index e87277f..a67c3be 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -63,7 +63,7 @@ static int _poll_lvs_in_vg(struct cmd_context *cmd, dm_list_iterate_items(lvl, &vg->lvs) { lv = lvl->lv; - if (lv_is_active_locally(lv) && + if (lv_is_active(lv) && (lv_is_pvmove(lv) || lv_is_converting(lv) || lv_is_merging(lv))) { lv_spawn_background_polling(cmd, lv); count++; @@ -116,20 +116,8 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg, expected_count++; - if (!lv_change_activate(cmd, lv, activate)) { - if (!lv_is_active_exclusive_remotely(lv)) - stack; - else { - /* - * If the LV is active exclusive remotely, - * then ignore it here - */ - log_verbose("%s is exclusively active on a remote node.", - display_lvname(lv)); - expected_count--; /* not accounted */ - } + if (!lv_change_activate(cmd, lv, activate)) continue; - } count++; }

1 0

master - Remove more clvm code
by David Teigland 06 Jun '18

06 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=eb600292455b1b2b2e88d… Commit: eb600292455b1b2b2e88db74e13b7db848701b92 Parent: 3c657adc0a2c9026fef3186147f0d9a11b071c3b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 5 11:39:07 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 6 13:58:34 2018 -0500 Remove more clvm code --- lib/format_text/archiver.c | 4 ---- lib/locking/locking.h | 15 +++++---------- lib/metadata/metadata.c | 7 ------- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c index 9d7be95..ab80117 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -275,10 +275,6 @@ int backup(struct volume_group *vg) if (is_orphan_vg(vg->name)) return 1; - if (vg_is_clustered(vg)) - if (!remote_backup_metadata(vg)) - stack; - return backup_locally(vg); } diff --git a/lib/locking/locking.h b/lib/locking/locking.h index 8322bae..8b2bced 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -163,10 +163,7 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); #define LCK_MASK (LCK_TYPE_MASK | LCK_SCOPE_MASK) -#define LCK_LV_CLUSTERED(lv) \ - (vg_is_clustered((lv)->vg) ? LCK_CLUSTER_VG : 0) - -#define lock_lv_vol(cmd, lv, flags) lock_vol(cmd, (lv)->lvid.s, flags | LCK_LV_CLUSTERED(lv), lv) +#define lock_lv_vol(cmd, lv, flags) lock_vol(cmd, (lv)->lvid.s, flags, lv) /* * Activation locks are wrapped around activation commands that have to @@ -180,7 +177,9 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); */ #define lv_type_requires_activation_lock(lv) ((lv_is_thin_type(lv) || lv_is_cache_type(lv) || lv_is_mirror_type(lv) || lv_is_raid_type(lv) || lv_is_origin(lv) || lv_is_snapshot(lv)) ? 1 : 0) + #define lv_activation_lock_name(lv) (lv_type_requires_activation_lock(lv) ? (lv)->vg->name : (lv)->lvid.s) + #define lv_requires_activation_lock_now(lv) ((!vg_write_lock_held() && (!vg_is_clustered((lv)->vg) || !lv_type_requires_activation_lock(lv))) ? 1 : 0) #define lock_activation(cmd, lv) (lv_requires_activation_lock_now(lv) ? lock_vol(cmd, lv_activation_lock_name(lv), LCK_ACTIVATE_LOCK, lv) : 1) @@ -246,16 +245,12 @@ int activate_lv_excl(struct cmd_context *cmd, const struct logical_volume *lv); #define activate_lv_local(cmd, lv) \ lock_lv_vol_serially(cmd, lv, LCK_LV_ACTIVATE | LCK_HOLD | LCK_LOCAL) + #define deactivate_lv_local(cmd, lv) \ lock_lv_vol_serially(cmd, lv, LCK_LV_DEACTIVATE | LCK_LOCAL) + #define drop_cached_metadata(vg) \ lock_vol((vg)->cmd, (vg)->name, LCK_VG_DROP_CACHE, NULL) -#define remote_commit_cached_metadata(vg) \ - lock_vol((vg)->cmd, (vg)->name, LCK_VG_COMMIT, NULL) -#define remote_revert_cached_metadata(vg) \ - lock_vol((vg)->cmd, (vg)->name, LCK_VG_REVERT, NULL) -#define remote_backup_metadata(vg) \ - lock_vol((vg)->cmd, (vg)->name, LCK_VG_BACKUP, NULL) int sync_local_dev_names(struct cmd_context* cmd); int sync_dev_names(struct cmd_context* cmd); diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 3f177b0..7c41d78 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3130,10 +3130,6 @@ int vg_commit(struct volume_group *vg) set_vg_notify(vg->cmd); if (cache_updated) { - /* Instruct remote nodes to upgrade cached metadata. */ - if (!remote_commit_cached_metadata(vg)) - stack; // FIXME: What should we do? - /* * We need to clear old_name after a successful commit. * The volume_group structure could be reused later. @@ -3188,9 +3184,6 @@ void vg_revert(struct volume_group *vg) if (!drop_cached_metadata(vg)) log_error("Attempt to drop cached metadata failed " "after reverted update for VG %s.", vg->name); - - if (!remote_revert_cached_metadata(vg)) - stack; // FIXME: What should we do? } static int _check_mda_in_use(struct metadata_area *mda, void *_in_use)

1 0

master - lvmlockd: fix missing lock_type null check
by David Teigland 06 Jun '18

06 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3c657adc0a2c9026fef31… Commit: 3c657adc0a2c9026fef3186147f0d9a11b071c3b Parent: c67bd8b47b755a33104e942abc49e516d2a6dace Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 13:56:02 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 6 13:58:03 2018 -0500 lvmlockd: fix missing lock_type null check Missed checking if vg->lock_type is NULL in commit db8d3bdfa: lvmlockd: enable mirror split and merge with dlm lock_type --- lib/metadata/raid_manip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 4d58d74..53aa4f1 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -3395,7 +3395,7 @@ int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name, lvl->lv->name = split_name; - if (!strcmp(lv->vg->lock_type, "dlm")) + if (lv->vg->lock_type && !strcmp(lv->vg->lock_type, "dlm")) lvl->lv->lock_args = lv->lock_args; if (!vg_write(lv->vg)) {

1 0

master - devices: clean up io error messages
by David Teigland 06 Jun '18

06 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c67bd8b47b755a33104e9… Commit: c67bd8b47b755a33104e942abc49e516d2a6dace Parent: 3e781ea446bb7ddc9a494cbba6b6104dd51c3910 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 6 10:05:08 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 6 10:08:25 2018 -0500 devices: clean up io error messages Remove the io error message from bcache.c since it is not very useful without the device path. Make the io error messages from dev_read_bytes/dev_write_bytes more user friendly. --- lib/device/bcache.c | 1 - lib/label/label.c | 40 ++++++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/lib/device/bcache.c b/lib/device/bcache.c index 8fda0bd..561f68e 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -623,7 +623,6 @@ static void _complete_io(void *context, int err) dm_list_del(&b->list); if (b->error) { - log_warn("bcache io error %d fd %d", b->error, b->fd); dm_list_add(&cache->errored, &b->list); } else { diff --git a/lib/label/label.c b/lib/label/label.c index f36c706..ce995d6 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -1122,14 +1122,15 @@ bool dev_read_bytes(struct device *dev, uint64_t start, size_t len, void *data) if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ if (!label_scan_open(dev)) { - log_error("dev_read_bytes %s cannot open dev", dev_name(dev)); + log_error("Error opening device %s for reading at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); return false; } } if (!bcache_read_bytes(scan_bcache, dev->bcache_fd, start, len, data)) { - log_error("dev_read_bytes %s at %u failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error reading device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } @@ -1151,21 +1152,22 @@ bool dev_write_bytes(struct device *dev, uint64_t start, size_t len, void *data) if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ if (!label_scan_open(dev)) { - log_error("dev_write_bytes %s cannot open dev", dev_name(dev)); + log_error("Error opening device %s for writing at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); return false; } } if (!bcache_write_bytes(scan_bcache, dev->bcache_fd, start, len, data)) { - log_error("dev_write_bytes %s at %u bcache write failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } if (!bcache_flush(scan_bcache)) { - log_error("dev_write_bytes %s at %u bcache flush failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } @@ -1185,21 +1187,22 @@ bool dev_write_zeros(struct device *dev, uint64_t start, size_t len) if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ if (!label_scan_open(dev)) { - log_error("dev_write_zeros %s cannot open dev", dev_name(dev)); + log_error("Error opening device %s for writing at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); return false; } } if (!bcache_zero_bytes(scan_bcache, dev->bcache_fd, start, len)) { - log_error("dev_write_zeros %s at %u bcache write failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } if (!bcache_flush(scan_bcache)) { - log_error("dev_write_zeros %s at %u bcache flush failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } @@ -1219,21 +1222,22 @@ bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t val) if (dev->bcache_fd <= 0) { /* This is not often needed, perhaps only with lvmetad. */ if (!label_scan_open(dev)) { - log_error("dev_set_bytes %s cannot open dev", dev_name(dev)); + log_error("Error opening device %s for writing at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); return false; } } if (!bcache_set_bytes(scan_bcache, dev->bcache_fd, start, len, val)) { - log_error("dev_set_bytes %s at %u bcache write failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; } if (!bcache_flush(scan_bcache)) { - log_error("dev_set_bytes %s at %u bcache flush failed invalidate fd %d", - dev_name(dev), (uint32_t)start, dev->bcache_fd); + log_error("Error writing device %s at %llu length %u.", + dev_name(dev), (unsigned long long)start, (uint32_t)len); label_scan_invalidate(dev); return false; }

1 0

master - Remove clvmd and associated code
by David Teigland 05 Jun '18

05 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3e781ea446bb7ddc9a494… Commit: 3e781ea446bb7ddc9a494cbba6b6104dd51c3910 Parent: 11384637fb57c0fdefe5940cf27285ebdcc1dbc6 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 5 10:47:01 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 5 11:09:13 2018 -0500 Remove clvmd and associated code More code reduction and simplification can follow. --- configure.ac | 289 +----- daemons/Makefile.in | 8 +- daemons/clvmd/.gitignore | 1 - daemons/clvmd/Makefile.in | 94 -- daemons/clvmd/clvm.h | 85 -- daemons/clvmd/clvmd-cman.c | 505 -------- daemons/clvmd/clvmd-command.c | 415 ------- daemons/clvmd/clvmd-common.h | 27 - daemons/clvmd/clvmd-comms.h | 119 -- daemons/clvmd/clvmd-corosync.c | 662 ----------- daemons/clvmd/clvmd-openais.c | 687 ----------- daemons/clvmd/clvmd-singlenode.c | 382 ------ daemons/clvmd/clvmd.c | 2422 -------------------------------------- daemons/clvmd/clvmd.h | 126 -- daemons/clvmd/lvm-functions.c | 927 --------------- daemons/clvmd/lvm-functions.h | 40 - daemons/clvmd/refresh_clvmd.c | 382 ------ daemons/clvmd/refresh_clvmd.h | 19 - daemons/cmirrord/Makefile.in | 6 +- daemons/cmirrord/cluster.c | 3 + include/configure.h.in | 18 - lib/Makefile.in | 13 +- lib/activate/activate.c | 214 +---- lib/cache/lvmcache.c | 395 ------- lib/locking/Makefile.in | 26 - lib/locking/cluster_locking.c | 636 ---------- lib/locking/external_locking.c | 106 -- lib/locking/locking.c | 152 +--- lib/locking/locking_types.h | 6 - lib/locking/no_locking.c | 126 -- lib/metadata/lv.c | 10 - lib/metadata/lv_manip.c | 20 - lib/metadata/metadata.c | 126 +-- lib/metadata/metadata.h | 9 - lib/metadata/vg.c | 50 - lib/metadata/vg.h | 1 - lib/mirror/mirrored.c | 15 +- tools/args.h | 13 +- tools/command-lines.in | 4 +- tools/lvchange.c | 29 - tools/lvconvert.c | 13 - tools/lvmcmdline.c | 5 - tools/pvmove.c | 4 - tools/toollib.c | 59 +- tools/vgchange.c | 139 --- tools/vgcreate.c | 11 +- tools/vgsplit.c | 1 - 47 files changed, 36 insertions(+), 9364 deletions(-) diff --git a/configure.ac b/configure.ac index 751a784..67f2462 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,6 @@ case "$host_os" in ODIRECT=yes DM_IOCTLS=yes SELINUX=yes - CLUSTER=internal FSADM=yes BLKDEACTIVATE=yes ;; @@ -61,7 +60,6 @@ case "$host_os" in ODIRECT=no DM_IOCTLS=no SELINUX=no - CLUSTER=none FSADM=no BLKDEACTIVATE=no ;; @@ -283,22 +281,6 @@ AC_MSG_RESULT($MANGLING) AC_DEFINE_UNQUOTED([DEFAULT_DM_NAME_MANGLING], $mangling, [Define default name mangling behaviour]) ################################################################################ -dnl -- cluster_locking inclusion type -AC_MSG_CHECKING(whether to include support for cluster locking) -AC_ARG_WITH(cluster, - AC_HELP_STRING([--with-cluster=TYPE], - [cluster LVM locking support: internal/shared/none [internal]]), - CLUSTER=$withval) -AC_MSG_RESULT($CLUSTER) - -case "$CLUSTER" in - none|shared) ;; - internal) AC_DEFINE([CLUSTER_LOCKING_INTERNAL], 1, - [Define to 1 to include built-in support for clustered LVM locking.]) ;; - *) AC_MSG_ERROR([--with-cluster parameter invalid]) ;; -esac - -################################################################################ dnl -- snapshots inclusion type AC_MSG_CHECKING(whether to include snapshots) AC_ARG_WITH(snapshots, @@ -672,241 +654,6 @@ AC_DEFINE_UNQUOTED(DEFAULT_RUN_DIR, ["$DEFAULT_RUN_DIR"], [Default LVM run directory.]) ################################################################################ -dnl -- Build cluster LVM daemon -AC_MSG_CHECKING(whether to build cluster LVM daemon) -AC_ARG_WITH(clvmd, - [ --with-clvmd=TYPE build cluster LVM Daemon - The following cluster manager combinations are valid: - * cman (RHEL5 or equivalent) - * cman,corosync,openais (or selection of them) - * singlenode (localhost only) - * all (autodetect) - * none (disable build) - [[none]]], - CLVMD=$withval, CLVMD=none) -test "$CLVMD" = yes && CLVMD=all -AC_MSG_RESULT($CLVMD) - -dnl -- If clvmd enabled without cluster locking, automagically include it -test "$CLVMD" != none -a "$CLUSTER" = none && CLUSTER=internal - -dnl -- init pkgconfig if required -test "$CLVMD" != none && pkg_config_init - -dnl -- Express clvmd init script Required-Start / Required-Stop -CLVMD_CMANAGERS="" -dnl -- On RHEL4/RHEL5, qdiskd is started from a separate init script. -dnl -- Enable if we are build for cman. -CLVMD_NEEDS_QDISKD=no - -dnl -- define build types -if [[ `expr x"$CLVMD" : '.*gulm.*'` != 0 ]]; then - AC_MSG_ERROR([Since version 2.02.87 GULM locking is no longer supported.]); -fi -if [[ `expr x"$CLVMD" : '.*cman.*'` != 0 ]]; then - BUILDCMAN=yes - CLVMD_CMANAGERS="$CLVMD_CMANAGERS cman" - CLVMD_NEEDS_QDISKD=yes -fi -if [[ `expr x"$CLVMD" : '.*corosync.*'` != 0 ]]; then - BUILDCOROSYNC=yes - CLVMD_CMANAGERS="$CLVMD_CMANAGERS corosync" -fi -if [[ `expr x"$CLVMD" : '.*openais.*'` != 0 ]]; then - BUILDOPENAIS=yes - CLVMD_CMANAGERS="$CLVMD_CMANAGERS openais" -fi -test "$CLVMD_NEEDS_QDISKD" != no && CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" - -dnl -- define a soft bailout if we are autodetecting -soft_bailout() { - NOTFOUND=1 -} - -hard_bailout() { - AC_MSG_ERROR([bailing out]) -} - -dnl -- if clvmd=all then set soft_bailout (we do not want to error) -dnl -- and set all builds to yes. We need to do this here -dnl -- to skip the openais|corosync sanity check above. -if test "$CLVMD" = all; then - bailout=soft_bailout - BUILDCMAN=yes - BUILDCOROSYNC=yes - BUILDOPENAIS=yes -else - bailout=hard_bailout -fi - -dnl -- helper macro to check libs without adding them to LIBS -check_lib_no_libs() { - lib_no_libs_arg1=$1 - shift - lib_no_libs_arg2=$1 - shift - lib_no_libs_args=$@ - AC_CHECK_LIB([$lib_no_libs_arg1], - [$lib_no_libs_arg2],, - [$bailout], - [$lib_no_libs_args]) - LIBS=$ac_check_lib_save_LIBS -} - -dnl -- Look for cman libraries if required. -if test "$BUILDCMAN" = yes; then - PKG_CHECK_MODULES(CMAN, libcman, [HAVE_CMAN=yes], - [NOTFOUND=0 - AC_CHECK_HEADERS(libcman.h,,$bailout) - check_lib_no_libs cman cman_init - if test $NOTFOUND = 0; then - AC_MSG_RESULT([no pkg for libcman, using -lcman]) - CMAN_LIBS="-lcman" - HAVE_CMAN=yes - fi]) - CHECKCONFDB=yes - CHECKDLM=yes -fi - -dnl -- Look for corosync that is required also for openais build -dnl -- only enough recent version of corosync ship pkg-config files. -dnl -- We can safely rely on that to detect the correct bits. -if test "$BUILDCOROSYNC" = yes -o "$BUILDOPENAIS" = yes; then - PKG_CHECK_MODULES(COROSYNC, corosync, [HAVE_COROSYNC=yes], $bailout) - CHECKCONFDB=yes - CHECKCMAP=yes -fi - -dnl -- Look for corosync libraries if required. -if test "$BUILDCOROSYNC" = yes; then - PKG_CHECK_MODULES(QUORUM, libquorum, [HAVE_QUORUM=yes], $bailout) - CHECKCPG=yes - CHECKDLM=yes -fi - -dnl -- Look for openais libraries if required. -if test "$BUILDOPENAIS" = yes; then - PKG_CHECK_MODULES(SALCK, libSaLck, [HAVE_SALCK=yes], $bailout) - CHECKCPG=yes -fi - -dnl -- Below are checks for libraries common to more than one build. - -dnl -- Check confdb library. -dnl -- mandatory for corosync < 2.0 build. -dnl -- optional for openais/cman build. - -if test "$CHECKCONFDB" = yes; then - PKG_CHECK_MODULES(CONFDB, libconfdb, - [HAVE_CONFDB=yes], [HAVE_CONFDB=no]) - - AC_CHECK_HEADERS([corosync/confdb.h], - [HAVE_CONFDB_H=yes], [HAVE_CONFDB_H=no]) - - if test "$HAVE_CONFDB" != yes -a "$HAVE_CONFDB_H" = yes; then - check_lib_no_libs confdb confdb_initialize - AC_MSG_RESULT([no pkg for confdb, using -lconfdb]) - CONFDB_LIBS="-lconfdb" - HAVE_CONFDB=yes - fi -fi - -dnl -- Check cmap library -dnl -- mandatory for corosync >= 2.0 build. - -if test "$CHECKCMAP" = yes; then - PKG_CHECK_MODULES(CMAP, libcmap, - [HAVE_CMAP=yes], [HAVE_CMAP=no]) - - AC_CHECK_HEADERS([corosync/cmap.h], - [HAVE_CMAP_H=yes], [HAVE_CMAP_H=no]) - - if test "$HAVE_CMAP" != yes -a "$HAVE_CMAP_H" = yes; then - check_lib_no_libs cmap cmap_initialize - AC_MSG_RESULT([no pkg for cmap, using -lcmap]) - CMAP_LIBS="-lcmap" - HAVE_CMAP=yes - fi -fi - -if test "$BUILDCOROSYNC" = yes -a \ - "$HAVE_CMAP" != yes -a "$HAVE_CONFDB" != yes -a "$CLVMD" != all; then - AC_MSG_ERROR([bailing out... cmap (corosync >= 2.0) or confdb (corosync < 2.0) library is required]) -fi - -dnl -- Check cpg library. -if test "$CHECKCPG" = yes; then - PKG_CHECK_MODULES(CPG, libcpg, [HAVE_CPG=yes], [$bailout]) -fi - -dnl -- Check dlm library. -if test "$CHECKDLM" = yes; then - PKG_CHECK_MODULES(DLM, libdlm, [HAVE_DLM=yes], - [NOTFOUND=0 - AC_CHECK_HEADERS(libdlm.h,,[$bailout]) - check_lib_no_libs dlm dlm_lock -lpthread - if test $NOTFOUND = 0; then - AC_MSG_RESULT([no pkg for libdlm, using -ldlm]) - DLM_LIBS="-ldlm -lpthread" - HAVE_DLM=yes - fi]) -fi - -dnl -- If we are autodetecting, we need to re-create -dnl -- the depedencies checks and set a proper CLVMD, -dnl -- together with init script Required-Start/Stop entries. -if test "$CLVMD" = all; then - CLVMD=none - CLVMD_CMANAGERS="" - CLVMD_NEEDS_QDISKD=no - if test "$HAVE_CMAN" = yes -a \ - "$HAVE_DLM" = yes; then - AC_MSG_RESULT([Enabling clvmd cman cluster manager]) - CLVMD="$CLVMD,cman" - CLVMD_CMANAGERS="$CLVMD_CMANAGERS cman" - CLVMD_NEEDS_QDISKD=yes - fi - if test "$HAVE_COROSYNC" = yes -a \ - "$HAVE_QUORUM" = yes -a \ - "$HAVE_CPG" = yes -a \ - "$HAVE_DLM" = yes; then - if test "$HAVE_CONFDB" = yes -o "$HAVE_CMAP" = yes; then - AC_MSG_RESULT([Enabling clvmd corosync cluster manager]) - CLVMD="$CLVMD,corosync" - CLVMD_CMANAGERS="$CLVMD_CMANAGERS corosync" - fi - fi - if test "$HAVE_COROSYNC" = yes -a \ - "$HAVE_CPG" = yes -a \ - "$HAVE_SALCK" = yes; then - AC_MSG_RESULT([Enabling clvmd openais cluster manager]) - CLVMD="$CLVMD,openais" - CLVMD_CMANAGERS="$CLVMD_CMANAGERS openais" - fi - test "$CLVMD_NEEDS_QDISKD" != no && CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" - test "$CLVMD" = none && AC_MSG_RESULT([Disabling clvmd build. No cluster manager detected.]) -fi - -dnl -- Fixup CLVMD_CMANAGERS with new corosync -dnl -- clvmd built with corosync >= 2.0 needs dlm (either init or systemd service) -dnl -- to be started. -if [[ `expr x"$CLVMD" : '.*corosync.*'` != 0 ]]; then - test "$HAVE_CMAP" = yes && CLVMD_CMANAGERS="$CLVMD_CMANAGERS dlm" -fi - -################################################################################ -dnl -- clvmd pidfile -if test "$CLVMD" != none; then - AC_ARG_WITH(clvmd-pidfile, - AC_HELP_STRING([--with-clvmd-pidfile=PATH], - [clvmd pidfile [PID_DIR/clvmd.pid]]), - CLVMD_PIDFILE=$withval, - CLVMD_PIDFILE="$DEFAULT_PID_DIR/clvmd.pid") - AC_DEFINE_UNQUOTED(CLVMD_PIDFILE, ["$CLVMD_PIDFILE"], - [Path to clvmd pidfile.]) -fi - -################################################################################ dnl -- Build cluster mirror log daemon AC_MSG_CHECKING(whether to build cluster mirror log daemon) AC_ARG_ENABLE(cmirrord, @@ -934,11 +681,6 @@ dnl -- Look for corosync libraries if required. if [[ "$BUILD_CMIRRORD" = yes ]]; then pkg_config_init - AC_DEFINE([CMIRROR_HAS_CHECKPOINT], 1, [Define to 1 to include libSaCkpt.]) - PKG_CHECK_MODULES(SACKPT, libSaCkpt, [HAVE_SACKPT=yes], - [AC_MSG_RESULT([no libSaCkpt, compiling without it]) - AC_DEFINE([CMIRROR_HAS_CHECKPOINT], 0, [Define to 0 to exclude libSaCkpt.])]) - if test "$HAVE_CPG" != yes; then PKG_CHECK_MODULES(CPG, libcpg) fi @@ -1538,7 +1280,7 @@ AC_CHECK_LIB(dl, dlopen, ################################################################################ dnl -- Check for shared/static conflicts -if [[ $ "$LVM1" = shared -o "$POOL" = shared -o "$CLUSTER" = shared \ +if [[ \( "$LVM1" = shared -o "$POOL" = shared \ $ -a "$STATIC_LINK" = yes ]]; then AC_MSG_ERROR([Features cannot be 'shared' when building statically]) fi @@ -1758,18 +1500,6 @@ if test "$BUILD_LVMPOLLD" = yes; then AC_FUNC_STRERROR_R fi -if test "$CLVMD" != none; then - AC_CHECK_HEADERS(mntent.h netdb.h netinet/in.h pthread.h search.h sys/mount.h sys/socket.h sys/uio.h sys/un.h utmpx.h,,AC_MSG_ERROR(bailing out)) - AC_CHECK_FUNCS(dup2 getmntent memmove select socket,,hard_bailout) - AC_FUNC_GETMNTENT - AC_FUNC_SELECT_ARGTYPES -fi - -if test "$CLUSTER" != none; then - AC_CHECK_HEADERS(sys/socket.h sys/un.h,,hard_bailout) - AC_CHECK_FUNCS(socket,,hard_bailout) -fi - if test "$BUILD_DMEVENTD" = yes; then AC_CHECK_HEADERS(arpa/inet.h,,hard_bailout) fi @@ -1804,8 +1534,6 @@ LVM_PATH="$SBINDIR/lvm" AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) USRSBINDIR="$(eval echo $(eval echo $usrsbindir))" -CLVMD_PATH="$USRSBINDIR/clvmd" -AC_DEFINE_UNQUOTED(CLVMD_PATH, ["$CLVMD_PATH"], [Path to clvmd binary.]) FSADM_PATH="$SBINDIR/fsadm" AC_DEFINE_UNQUOTED(FSADM_PATH, ["$FSADM_PATH"], [Path to fsadm binary.]) @@ -1944,14 +1672,6 @@ AC_SUBST(CHMOD) AC_SUBST(CLDFLAGS) AC_SUBST(CLDNOWHOLEARCHIVE) AC_SUBST(CLDWHOLEARCHIVE) -AC_SUBST(CLUSTER) -AC_SUBST(CLVMD) -AC_SUBST(CLVMD_CMANAGERS) -AC_SUBST(CLVMD_PATH) -AC_SUBST(CMAN_CFLAGS) -AC_SUBST(CMAN_LIBS) -AC_SUBST(CMAP_CFLAGS) -AC_SUBST(CMAP_LIBS) AC_SUBST(CMDLIB) AC_SUBST(CONFDB_CFLAGS) AC_SUBST(CONFDB_LIBS) @@ -2067,7 +1787,6 @@ AC_SUBST(DMEVENTD_PIDFILE) AC_SUBST(LVMETAD_PIDFILE) AC_SUBST(LVMPOLLD_PIDFILE) AC_SUBST(LVMLOCKD_PIDFILE) -AC_SUBST(CLVMD_PIDFILE) AC_SUBST(CMIRRORD_PIDFILE) AC_SUBST(interface) AC_SUBST(kerneldir) @@ -2090,7 +1809,6 @@ Makefile make.tmpl libdm/make.tmpl daemons/Makefile -daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc @@ -2116,7 +1834,6 @@ conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile -lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile @@ -2132,14 +1849,10 @@ python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service -scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket -scripts/lvm2_cluster_activation_red_hat.sh -scripts/lvm2_cluster_activation_systemd_red_hat.service -scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat diff --git a/daemons/Makefile.in b/daemons/Makefile.in index ebbd740..8edaefa 100644 --- a/daemons/Makefile.in +++ b/daemons/Makefile.in @@ -15,11 +15,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -.PHONY: dmeventd clvmd cmirrord lvmetad lvmpolld lvmlockd - -ifneq ("@CLVMD@", "none") - SUBDIRS += clvmd -endif +.PHONY: dmeventd cmirrord lvmetad lvmpolld lvmlockd ifeq ("@BUILD_CMIRRORD@", "yes") SUBDIRS += cmirrord @@ -53,7 +49,7 @@ ifeq ("@BUILD_DMFILEMAPD@", "yes") endif ifeq ($(MAKECMDGOALS),distclean) - SUBDIRS = clvmd cmirrord dmeventd lvmetad lvmpolld lvmlockd lvmdbusd dmfilemapd + SUBDIRS = cmirrord dmeventd lvmetad lvmpolld lvmlockd lvmdbusd dmfilemapd endif include $(top_builddir)/make.tmpl diff --git a/daemons/clvmd/.gitignore b/daemons/clvmd/.gitignore deleted file mode 100644 index 816032f..0000000 --- a/daemons/clvmd/.gitignore +++ /dev/null @@ -1 +0,0 @@ -clvmd diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in deleted file mode 100644 index 622a603..0000000 --- a/daemons/clvmd/Makefile.in +++ /dev/null @@ -1,94 +0,0 @@ -# -# Copyright (C) 2004 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ - -CMAN_LIBS = @CMAN_LIBS@ -CMAN_CFLAGS = @CMAN_CFLAGS@ -CMAP_LIBS = @CMAP_LIBS@ -CMAP_CFLAGS = @CMAP_CFLAGS@ -CONFDB_LIBS = @CONFDB_LIBS@ -CONFDB_CFLAGS = @CONFDB_CFLAGS@ -CPG_LIBS = @CPG_LIBS@ -CPG_CFLAGS = @CPG_CFLAGS@ -DLM_LIBS = @DLM_LIBS@ -DLM_CFLAGS = @DLM_CFLAGS@ -QUORUM_LIBS = @QUORUM_LIBS@ -QUORUM_CFLAGS = @QUORUM_CFLAGS@ -SALCK_LIBS = @SALCK_LIBS@ -SALCK_CFLAGS = @SALCK_CFLAGS@ - -SOURCES = \ - clvmd-command.c\ - clvmd.c\ - lvm-functions.c\ - refresh_clvmd.c - -ifneq (,$(findstring cman,, "@CLVMD@,")) - SOURCES += clvmd-cman.c - LMLIBS += $(CMAN_LIBS) $(CONFDB_LIBS) $(DLM_LIBS) - CFLAGS += $(CMAN_CFLAGS) $(CONFDB_CFLAGS) $(DLM_CFLAGS) - DEFS += -DUSE_CMAN -endif - -ifneq (,$(findstring openais,, "@CLVMD@,")) - SOURCES += clvmd-openais.c - LMLIBS += $(CONFDB_LIBS) $(CPG_LIBS) $(SALCK_LIBS) - CFLAGS += $(CONFDB_CFLAGS) $(CPG_CFLAGS) $(SALCK_CFLAGS) - DEFS += -DUSE_OPENAIS -endif - -ifneq (,$(findstring corosync,, "@CLVMD@,")) - SOURCES += clvmd-corosync.c - LMLIBS += $(CMAP_LIBS) $(CONFDB_LIBS) $(CPG_LIBS) $(DLM_LIBS) $(QUORUM_LIBS) - CFLAGS += $(CMAP_CFLAGS) $(CONFDB_CFLAGS) $(CPG_CFLAGS) $(DLM_CFLAGS) $(QUORUM_CFLAGS) - DEFS += -DUSE_COROSYNC -endif - -ifneq (,$(findstring singlenode,, "@CLVMD@,")) - SOURCES += clvmd-singlenode.c - DEFS += -DUSE_SINGLENODE -endif - -ifeq ($(MAKECMDGOALS),distclean) - SOURCES += clvmd-cman.c - SOURCES += clvmd-openais.c - SOURCES += clvmd-corosync.c - SOURCES += clvmd-singlenode.c -endif - -TARGETS = \ - clvmd - -include $(top_builddir)/make.tmpl - -LIBS += $(LVMINTERNAL_LIBS) $(PTHREAD_LIBS) -laio -CFLAGS += -fno-strict-aliasing $(EXTRA_EXEC_CFLAGS) - -INSTALL_TARGETS = \ - install_clvmd - -clvmd: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a $(INTERNAL_LIBS) - $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ - -o clvmd $+ $(LMLIBS) $(LIBS) - -.PHONY: install_clvmd - -install_clvmd: $(TARGETS) - $(INSTALL_PROGRAM) -D clvmd $(usrsbindir)/clvmd - -install: $(INSTALL_TARGETS) - -install_cluster: $(INSTALL_TARGETS) diff --git a/daemons/clvmd/clvm.h b/daemons/clvmd/clvm.h deleted file mode 100644 index ae0a13a..0000000 --- a/daemons/clvmd/clvm.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* Definitions for CLVMD server and clients */ - -/* - * The protocol spoken over the cluster and across the local socket. - */ - -#ifndef _CLVM_H -#define _CLVM_H - -#include "configure.h" -#include <inttypes.h> - -struct clvm_header { - uint8_t cmd; /* See below */ - uint8_t flags; /* See below */ - uint16_t xid; /* Transaction ID */ - uint32_t clientid; /* Only used in Daemon->Daemon comms */ - int32_t status; /* For replies, whether request succeeded */ - uint32_t arglen; /* Length of argument below. - If >1500 then it will be passed - around the cluster in the system LV */ - char node[1]; /* Actually a NUL-terminated string, node name. - If this is empty then the command is - forwarded to all cluster nodes unless - FLAG_LOCAL or FLAG_REMOTE is also set. */ - char args[1]; /* Arguments for the command follow the - node name, This member is only - valid if the node name is empty */ -} __attribute__ ((packed)); - -/* Flags */ -#define CLVMD_FLAG_LOCAL 1 /* Only do this on the local node */ -#define CLVMD_FLAG_SYSTEMLV 2 /* Data in system LV under my node name */ -#define CLVMD_FLAG_NODEERRS 4 /* Reply has errors in node-specific portion */ -#define CLVMD_FLAG_REMOTE 8 /* Do this on all nodes except for the local node */ - -/* Name of the local socket to communicate between lvm and clvmd */ -#define CLVMD_SOCKNAME DEFAULT_RUN_DIR "/clvmd.sock" - -/* Internal commands & replies */ -#define CLVMD_CMD_REPLY 1 -#define CLVMD_CMD_VERSION 2 /* Send version around cluster when we start */ -#define CLVMD_CMD_GOAWAY 3 /* Die if received this - we are running - an incompatible version */ -#define CLVMD_CMD_TEST 4 /* Just for mucking about */ - -#define CLVMD_CMD_LOCK 30 -#define CLVMD_CMD_UNLOCK 31 - -/* Lock/Unlock commands */ -#define CLVMD_CMD_LOCK_LV 50 -#define CLVMD_CMD_LOCK_VG 51 -#define CLVMD_CMD_LOCK_QUERY 52 - -/* Misc functions */ -#define CLVMD_CMD_REFRESH 40 -#define CLVMD_CMD_GET_CLUSTERNAME 41 -#define CLVMD_CMD_SET_DEBUG 42 -#define CLVMD_CMD_VG_BACKUP 43 -#define CLVMD_CMD_RESTART 44 -#define CLVMD_CMD_SYNC_NAMES 45 - -/* Used internally by some callers, but not part of the protocol.*/ -#ifndef NODE_ALL -# define NODE_ALL "*" -# define NODE_LOCAL "." -# define NODE_REMOTE "^" -#endif - -#endif diff --git a/daemons/clvmd/clvmd-cman.c b/daemons/clvmd/clvmd-cman.c deleted file mode 100644 index 8cf7f17..0000000 --- a/daemons/clvmd/clvmd-cman.c +++ /dev/null @@ -1,505 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * CMAN communication layer for clvmd. - */ - -#include "clvmd-common.h" - -#include <pthread.h> - -#include "clvmd-comms.h" -#include "daemons/clvmd/clvm.h" -#include "clvmd.h" -#include "lvm-functions.h" - -#include <libdlm.h> - -#include <syslog.h> - -#define LOCKSPACE_NAME "clvmd" - -struct clvmd_node -{ - struct cman_node *node; - int clvmd_up; -}; - -static int num_nodes; -static struct cman_node *nodes = NULL; -static struct cman_node this_node; -static int count_nodes; /* size of allocated nodes array */ -static struct dm_hash_table *node_updown_hash; -static dlm_lshandle_t *lockspace; -static cman_handle_t c_handle; - -static void count_clvmds_running(void); -static void get_members(void); -static int nodeid_from_csid(const char *csid); -static int name_from_nodeid(int nodeid, char *name); -static void event_callback(cman_handle_t handle, void *private, int reason, int arg); -static void data_callback(cman_handle_t handle, void *private, - char *buf, int len, uint8_t port, int nodeid); - -struct lock_wait { - pthread_cond_t cond; - pthread_mutex_t mutex; - struct dlm_lksb lksb; -}; - -static int _init_cluster(void) -{ - node_updown_hash = dm_hash_create(100); - - /* Open the cluster communication socket */ - c_handle = cman_init(NULL); - if (!c_handle) { - syslog(LOG_ERR, "Can't open cluster manager socket: %m"); - return -1; - } - DEBUGLOG("Connected to CMAN\n"); - - if (cman_start_recv_data(c_handle, data_callback, CLUSTER_PORT_CLVMD)) { - syslog(LOG_ERR, "Can't bind cluster socket: %m"); - return -1; - } - - if (cman_start_notification(c_handle, event_callback)) { - syslog(LOG_ERR, "Can't start cluster event listening"); - return -1; - } - - /* Get the cluster members list */ - get_members(); - count_clvmds_running(); - - DEBUGLOG("CMAN initialisation complete\n"); - - /* Create a lockspace for LV & VG locks to live in */ - lockspace = dlm_open_lockspace(LOCKSPACE_NAME); - if (!lockspace) { - lockspace = dlm_create_lockspace(LOCKSPACE_NAME, 0600); - if (!lockspace) { - syslog(LOG_ERR, "Unable to create DLM lockspace for CLVM: %m"); - return -1; - } - DEBUGLOG("Created DLM lockspace for CLVMD.\n"); - } else - DEBUGLOG("Opened existing DLM lockspace for CLVMD.\n"); - - dlm_ls_pthread_init(lockspace); - DEBUGLOG("DLM initialisation complete\n"); - return 0; -} - -static void _cluster_init_completed(void) -{ - clvmd_cluster_init_completed(); -} - -static int _get_main_cluster_fd(void) -{ - return cman_get_fd(c_handle); -} - -static int _get_num_nodes(void) -{ - int i; - int nnodes = 0; - - /* return number of ACTIVE nodes */ - for (i=0; i<num_nodes; i++) { - if (nodes[i].cn_member && nodes[i].cn_nodeid) - nnodes++; - } - return nnodes; -} - -/* send_message with the fd check removed */ -static int _cluster_send_message(const void *buf, int msglen, const char *csid, - const char *errtext) -{ - int nodeid = 0; - - if (csid) - memcpy(&nodeid, csid, CMAN_MAX_CSID_LEN); - - if (cman_send_data(c_handle, buf, msglen, 0, CLUSTER_PORT_CLVMD, nodeid) <= 0) - { - log_error("%s", errtext); - } - return msglen; -} - -static void _get_our_csid(char *csid) -{ - if (this_node.cn_nodeid == 0) { - cman_get_node(c_handle, 0, &this_node); - } - memcpy(csid, &this_node.cn_nodeid, CMAN_MAX_CSID_LEN); -} - -/* Call a callback routine for each node is that known (down means not running a clvmd) */ -static int _cluster_do_node_callback(struct local_client *client, - void (*callback) (struct local_client *, - const char *, - int)) -{ - int i; - int somedown = 0; - - for (i = 0; i < _get_num_nodes(); i++) { - if (nodes[i].cn_member && nodes[i].cn_nodeid) { - int up = (int)(long)dm_hash_lookup_binary(node_updown_hash, (char *)&nodes[i].cn_nodeid, sizeof(int)); - - callback(client, (char *)&nodes[i].cn_nodeid, up); - if (!up) - somedown = -1; - } - } - return somedown; -} - -/* Process OOB messages from the cluster socket */ -static void event_callback(cman_handle_t handle, void *private, int reason, int arg) -{ - char namebuf[MAX_CLUSTER_MEMBER_NAME_LEN]; - - switch (reason) { - case CMAN_REASON_PORTCLOSED: - name_from_nodeid(arg, namebuf); - log_notice("clvmd on node %s has died\n", namebuf); - DEBUGLOG("Got port closed message, removing node %s\n", namebuf); - - dm_hash_insert_binary(node_updown_hash, (char *)&arg, sizeof(int), (void *)0); - break; - - case CMAN_REASON_STATECHANGE: - DEBUGLOG("Got state change message, re-reading members list\n"); - get_members(); - break; - -#if defined(LIBCMAN_VERSION) && LIBCMAN_VERSION >= 2 - case CMAN_REASON_PORTOPENED: - /* Ignore this, wait for startup message from clvmd itself */ - break; - - case CMAN_REASON_TRY_SHUTDOWN: - DEBUGLOG("Got try shutdown, sending OK\n"); - cman_replyto_shutdown(c_handle, 1); - break; -#endif - default: - /* ERROR */ - DEBUGLOG("Got unknown event callback message: %d\n", reason); - break; - } -} - -static struct local_client *cman_client; -static int _cluster_fd_callback(struct local_client *fd, char *buf, int len, - const char *csid, - struct local_client **new_client) -{ - - /* Save this for data_callback */ - cman_client = fd; - - /* We never return a new client */ - *new_client = NULL; - - return cman_dispatch(c_handle, 0); -} - - -static void data_callback(cman_handle_t handle, void *private, - char *buf, int len, uint8_t port, int nodeid) -{ - /* Ignore looped back messages */ - if (nodeid == this_node.cn_nodeid) - return; - process_message(cman_client, buf, len, (char *)&nodeid); -} - -static void _add_up_node(const char *csid) -{ - /* It's up ! */ - int nodeid = nodeid_from_csid(csid); - - dm_hash_insert_binary(node_updown_hash, (char *)&nodeid, sizeof(int), (void *)1); - DEBUGLOG("Added new node %d to updown list\n", nodeid); -} - -static void _cluster_closedown(void) -{ - dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1); - cman_finish(c_handle); -} - -static int is_listening(int nodeid) -{ - int status; - - do { - status = cman_is_listening(c_handle, nodeid, CLUSTER_PORT_CLVMD); - if (status < 0 && errno == EBUSY) { /* Don't busywait */ - sleep(1); - errno = EBUSY; /* In case sleep trashes it */ - } - } - while (status < 0 && errno == EBUSY); - - return status; -} - -/* Populate the list of CLVMDs running. - called only at startup time */ -static void count_clvmds_running(void) -{ - int i; - - for (i = 0; i < num_nodes; i++) { - int nodeid = nodes[i].cn_nodeid; - - if (is_listening(nodeid) == 1) - dm_hash_insert_binary(node_updown_hash, (void *)&nodeid, sizeof(int), (void*)1); - else - dm_hash_insert_binary(node_updown_hash, (void *)&nodeid, sizeof(int), (void*)0); - } -} - -/* Get a list of active cluster members */ -static void get_members(void) -{ - int retnodes; - int status; - int i; - int high_nodeid = 0; - - num_nodes = cman_get_node_count(c_handle); - if (num_nodes == -1) { - log_error("Unable to get node count"); - return; - } - - /* Not enough room for new nodes list ? */ - if (num_nodes > count_nodes && nodes) { - free(nodes); - nodes = NULL; - } - - if (nodes == NULL) { - count_nodes = num_nodes + 10; /* Overallocate a little */ - nodes = malloc(count_nodes * sizeof(struct cman_node)); - if (!nodes) { - log_error("Unable to allocate nodes array\n"); - exit(5); - } - } - - status = cman_get_nodes(c_handle, count_nodes, &retnodes, nodes); - if (status < 0) { - log_error("Unable to get node details"); - exit(6); - } - - /* Get the highest nodeid */ - for (i=0; i<retnodes; i++) { - if (nodes[i].cn_nodeid > high_nodeid) - high_nodeid = nodes[i].cn_nodeid; - } -} - - -/* Convert a node name to a CSID */ -static int _csid_from_name(char *csid, const char *name) -{ - int i; - - for (i = 0; i < num_nodes; i++) { - if (strcmp(name, nodes[i].cn_name) == 0) { - memcpy(csid, &nodes[i].cn_nodeid, CMAN_MAX_CSID_LEN); - return 0; - } - } - return -1; -} - -/* Convert a CSID to a node name */ -static int _name_from_csid(const char *csid, char *name) -{ - int i; - - for (i = 0; i < num_nodes; i++) { - if (memcmp(csid, &nodes[i].cn_nodeid, CMAN_MAX_CSID_LEN) == 0) { - strcpy(name, nodes[i].cn_name); - return 0; - } - } - /* Who?? */ - strcpy(name, "Unknown"); - return -1; -} - -/* Convert a node ID to a node name */ -static int name_from_nodeid(int nodeid, char *name) -{ - int i; - - for (i = 0; i < num_nodes; i++) { - if (nodeid == nodes[i].cn_nodeid) { - strcpy(name, nodes[i].cn_name); - return 0; - } - } - /* Who?? */ - strcpy(name, "Unknown"); - return -1; -} - -/* Convert a CSID to a node ID */ -static int nodeid_from_csid(const char *csid) -{ - int nodeid; - - memcpy(&nodeid, csid, CMAN_MAX_CSID_LEN); - - return nodeid; -} - -static int _is_quorate(void) -{ - return cman_is_quorate(c_handle); -} - -static void sync_ast_routine(void *arg) -{ - struct lock_wait *lwait = arg; - - pthread_mutex_lock(&lwait->mutex); - pthread_cond_signal(&lwait->cond); - pthread_mutex_unlock(&lwait->mutex); -} - -static int _sync_lock(const char *resource, int mode, int flags, int *lockid) -{ - int status; - struct lock_wait lwait; - - if (!lockid) { - errno = EINVAL; - return -1; - } - - DEBUGLOG("sync_lock: '%s' mode:%d flags=%d\n", resource,mode,flags); - /* Conversions need the lockid in the LKSB */ - if (flags & LKF_CONVERT) - lwait.lksb.sb_lkid = *lockid; - - pthread_cond_init(&lwait.cond, NULL); - pthread_mutex_init(&lwait.mutex, NULL); - pthread_mutex_lock(&lwait.mutex); - - status = dlm_ls_lock(lockspace, - mode, - &lwait.lksb, - flags, - resource, - strlen(resource), - 0, sync_ast_routine, &lwait, NULL, NULL); - if (status) - return status; - - /* Wait for it to complete */ - pthread_cond_wait(&lwait.cond, &lwait.mutex); - pthread_mutex_unlock(&lwait.mutex); - - *lockid = lwait.lksb.sb_lkid; - - errno = lwait.lksb.sb_status; - DEBUGLOG("sync_lock: returning lkid %x\n", *lockid); - if (lwait.lksb.sb_status) - return -1; - else - return 0; -} - -static int _sync_unlock(const char *resource /* UNUSED */, int lockid) -{ - int status; - struct lock_wait lwait; - - DEBUGLOG("sync_unlock: '%s' lkid:%x\n", resource, lockid); - - pthread_cond_init(&lwait.cond, NULL); - pthread_mutex_init(&lwait.mutex, NULL); - pthread_mutex_lock(&lwait.mutex); - - status = dlm_ls_unlock(lockspace, lockid, 0, &lwait.lksb, &lwait); - - if (status) - return status; - - /* Wait for it to complete */ - pthread_cond_wait(&lwait.cond, &lwait.mutex); - pthread_mutex_unlock(&lwait.mutex); - - errno = lwait.lksb.sb_status; - if (lwait.lksb.sb_status != EUNLOCK) - return -1; - else - return 0; - -} - -static int _get_cluster_name(char *buf, int buflen) -{ - cman_cluster_t cluster_info; - int status; - - status = cman_get_cluster(c_handle, &cluster_info); - if (!status) { - strncpy(buf, cluster_info.ci_name, buflen); - } - return status; -} - -static struct cluster_ops _cluster_cman_ops = { - .name = "cman", - .cluster_init_completed = _cluster_init_completed, - .cluster_send_message = _cluster_send_message, - .name_from_csid = _name_from_csid, - .csid_from_name = _csid_from_name, - .get_num_nodes = _get_num_nodes, - .cluster_fd_callback = _cluster_fd_callback, - .get_main_cluster_fd = _get_main_cluster_fd, - .cluster_do_node_callback = _cluster_do_node_callback, - .is_quorate = _is_quorate, - .get_our_csid = _get_our_csid, - .add_up_node = _add_up_node, - .cluster_closedown = _cluster_closedown, - .get_cluster_name = _get_cluster_name, - .sync_lock = _sync_lock, - .sync_unlock = _sync_unlock, -}; - -struct cluster_ops *init_cman_cluster(void) -{ - if (!_init_cluster()) - return &_cluster_cman_ops; - else - return NULL; -} diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c deleted file mode 100644 index 342adda..0000000 --- a/daemons/clvmd/clvmd-command.c +++ /dev/null @@ -1,415 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - - CLVMD Cluster LVM daemon command processor. - - To add commands to the daemon simply add a processor in do_command and return - and messages back in buf and the length in *retlen. The initial value of - buflen is the maximum size of the buffer. if buf is not large enough then it - may be reallocated by the functions in here to a suitable size bearing in - mind that anything larger than the passed-in size will have to be returned - using the system LV and so performance will suffer. - - The status return will be negated and passed back to the originating node. - - pre- and post- command routines are called only on the local node. The - purpose is primarily to get and release locks, though the pre- routine should - also do any other local setups required by the command (if any) and can - return a failure code that prevents the command from being distributed around - the cluster - - The pre- and post- routines are run in their own thread so can block as long - they like, do_command is run in the main clvmd thread so should not block for - too long. If the pre-command returns an error code (!=0) then the command - will not be propogated around the cluster but the post-command WILL be called - - Also note that the pre and post routine are *always* called on the local - node, even if the command to be executed was only requested to run on a - remote node. It may peek inside the client structure to check the status of - the command. - - The clients of the daemon must, naturally, understand the return messages and - codes. - - Routines in here may only READ the values in the client structure passed in - apart from client->private which they are free to do what they like with. - -*/ - -#include "clvmd-common.h" -#include "clvmd-comms.h" -#include "daemons/clvmd/clvm.h" -#include "clvmd.h" -#include "lib/misc/lvm-globals.h" -#include "lvm-functions.h" - -#include "lib/locking/locking.h" - -#include <sys/utsname.h> - -extern struct cluster_ops *clops; -static int restart_clvmd(void); - -/* This is where all the real work happens: - NOTE: client will be NULL when this is executed on a remote node */ -int do_command(struct local_client *client, struct clvm_header *msg, int msglen, - char **buf, int buflen, int *retlen) -{ - char *args = msg->node + strlen(msg->node) + 1; - int arglen = msglen - sizeof(struct clvm_header) - strlen(msg->node); - int status = 0; - char *lockname; - const char *locktype; - struct utsname nodeinfo; - unsigned char lock_cmd; - unsigned char lock_flags; - - /* Do the command */ - switch (msg->cmd) { - /* Just a test message */ - case CLVMD_CMD_TEST: - if (arglen > buflen) { - char *new_buf; - buflen = arglen + 200; - new_buf = realloc(*buf, buflen); - if (new_buf == NULL) { - status = errno; - free (*buf); - } - *buf = new_buf; - } - if (*buf) { - if (uname(&nodeinfo)) - memset(&nodeinfo, 0, sizeof(nodeinfo)); - - *retlen = 1 + dm_snprintf(*buf, buflen, - "TEST from %s: %s v%s", - nodeinfo.nodename, args, - nodeinfo.release); - } - break; - - case CLVMD_CMD_LOCK_VG: - lock_cmd = args[0]; - lock_flags = args[1]; - lockname = &args[2]; - /* Check to see if the VG is in use by LVM1 */ - do_lock_vg(lock_cmd, lock_flags, lockname); - break; - - case CLVMD_CMD_LOCK_LV: - /* This is the biggie */ - lock_cmd = args[0]; - lock_flags = args[1]; - lockname = &args[2]; - status = do_lock_lv(lock_cmd, lock_flags, lockname); - /* Replace EIO with something less scary */ - if (status == EIO) { - *retlen = 1 + dm_snprintf(*buf, buflen, "%s", - get_last_lvm_error()); - return EIO; - } - break; - - case CLVMD_CMD_LOCK_QUERY: - lockname = &args[2]; - if (buflen < 3) - return EIO; - if ((locktype = do_lock_query(lockname))) - *retlen = 1 + dm_snprintf(*buf, buflen, "%s", locktype); - break; - - case CLVMD_CMD_REFRESH: - do_refresh_cache(); - break; - - case CLVMD_CMD_SYNC_NAMES: - lvm_do_fs_unlock(); - break; - - case CLVMD_CMD_SET_DEBUG: - clvmd_set_debug((debug_t) args[0]); - break; - - case CLVMD_CMD_RESTART: - status = restart_clvmd(); - break; - - case CLVMD_CMD_GET_CLUSTERNAME: - status = clops->get_cluster_name(*buf, buflen); - if (!status) - *retlen = strlen(*buf)+1; - break; - - case CLVMD_CMD_VG_BACKUP: - /* - * Do not run backup on local node, caller should do that. - */ - if (!client) - lvm_do_backup(&args[2]); - break; - - default: - /* Won't get here because command is validated in pre_command */ - break; - } - - /* Check the status of the command and return the error text */ - if (status) { - if (*buf) - *retlen = dm_snprintf(*buf, buflen, "%s", strerror(status)) + 1; - else - *retlen = 0; - } - - return status; -} - -static int lock_vg(struct local_client *client) -{ - struct dm_hash_table *lock_hash; - struct clvm_header *header = - (struct clvm_header *) client->bits.localsock.cmd; - unsigned char lock_cmd; - int lock_mode; - char *args = header->node + strlen(header->node) + 1; - int lkid; - int status; - char *lockname; - - /* - * Keep a track of VG locks in our own hash table. In current - * practice there should only ever be more than two VGs locked - * if a user tries to merge lots of them at once - */ - if (!client->bits.localsock.private) { - if (!(lock_hash = dm_hash_create(3))) - return ENOMEM; - client->bits.localsock.private = (void *) lock_hash; - } else - lock_hash = (struct dm_hash_table *) client->bits.localsock.private; - - lock_cmd = args[0] & (LCK_NONBLOCK | LCK_HOLD | LCK_SCOPE_MASK | LCK_TYPE_MASK); - lock_mode = ((int) lock_cmd & LCK_TYPE_MASK); - /* lock_flags = args[1]; */ - lockname = &args[2]; - DEBUGLOG("(%p) doing PRE command LOCK_VG '%s' at %x\n", client, lockname, lock_cmd); - - if (lock_mode == LCK_UNLOCK) { - if (!(lkid = (int) (long) dm_hash_lookup(lock_hash, lockname))) - return EINVAL; - - if ((status = sync_unlock(lockname, lkid))) - status = errno; - else - dm_hash_remove(lock_hash, lockname); - } else { - /* Read locks need to be PR; other modes get passed through */ - if (lock_mode == LCK_READ) - lock_mode = LCK_PREAD; - - if ((status = sync_lock(lockname, lock_mode, (lock_cmd & LCK_NONBLOCK) ? LCKF_NOQUEUE : 0, &lkid))) - status = errno; - else if (!dm_hash_insert(lock_hash, lockname, (void *) (long) lkid)) - return ENOMEM; - } - - return status; -} - - -/* Pre-command is a good place to get locks that are needed only for the duration - of the commands around the cluster (don't forget to free them in post-command), - and to sanity check the command arguments */ -int do_pre_command(struct local_client *client) -{ - struct clvm_header *header = - (struct clvm_header *) client->bits.localsock.cmd; - unsigned char lock_cmd; - unsigned char lock_flags; - char *args = header->node + strlen(header->node) + 1; - int lockid = 0; - int status = 0; - char *lockname; - - switch (header->cmd) { - case CLVMD_CMD_TEST: - status = sync_lock("CLVMD_TEST", LCK_EXCL, 0, &lockid); - client->bits.localsock.private = (void *)(long)lockid; - break; - - case CLVMD_CMD_LOCK_VG: - lockname = &args[2]; - /* We take out a real lock unless LCK_CACHE was set */ - if (!strncmp(lockname, "V_", 2) || - !strncmp(lockname, "P_#", 3)) - status = lock_vg(client); - break; - - case CLVMD_CMD_LOCK_LV: - lock_cmd = args[0]; - lock_flags = args[1]; - lockname = &args[2]; - status = pre_lock_lv(lock_cmd, lock_flags, lockname); - break; - - case CLVMD_CMD_REFRESH: - case CLVMD_CMD_GET_CLUSTERNAME: - case CLVMD_CMD_SET_DEBUG: - case CLVMD_CMD_VG_BACKUP: - case CLVMD_CMD_SYNC_NAMES: - case CLVMD_CMD_LOCK_QUERY: - case CLVMD_CMD_RESTART: - break; - - default: - log_error("Unknown command %d received\n", header->cmd); - status = EINVAL; - } - return status; -} - -/* Note that the post-command routine is called even if the pre-command or the real command - failed */ -int do_post_command(struct local_client *client) -{ - struct clvm_header *header = - (struct clvm_header *) client->bits.localsock.cmd; - int status = 0; - unsigned char lock_cmd; - unsigned char lock_flags; - char *args = header->node + strlen(header->node) + 1; - char *lockname; - - switch (header->cmd) { - case CLVMD_CMD_TEST: - status = sync_unlock("CLVMD_TEST", (int) (long) client->bits.localsock.private); - client->bits.localsock.private = NULL; - break; - - case CLVMD_CMD_LOCK_LV: - lock_cmd = args[0]; - lock_flags = args[1]; - lockname = &args[2]; - status = post_lock_lv(lock_cmd, lock_flags, lockname); - break; - - default: - /* Nothing to do here */ - break; - } - return status; -} - - -/* Called when the client is about to be deleted */ -void cmd_client_cleanup(struct local_client *client) -{ - struct dm_hash_node *v; - struct dm_hash_table *lock_hash; - int lkid; - char *lockname; - - DEBUGLOG("(%p) Client thread cleanup\n", client); - if (!client->bits.localsock.private) - return; - - lock_hash = (struct dm_hash_table *)client->bits.localsock.private; - - dm_hash_iterate(v, lock_hash) { - lkid = (int)(long)dm_hash_get_data(lock_hash, v); - lockname = dm_hash_get_key(lock_hash, v); - DEBUGLOG("(%p) Cleanup: Unlocking lock %s %x\n", client, lockname, lkid); - (void) sync_unlock(lockname, lkid); - } - - dm_hash_destroy(lock_hash); - client->bits.localsock.private = NULL; -} - -static int restart_clvmd(void) -{ - const char **argv; - char *lv_name; - int argc = 0, max_locks = 0; - struct dm_hash_node *hn = NULL; - char debug_arg[16]; - const char *clvmd = getenv("LVM_CLVMD_BINARY") ? : CLVMD_PATH; - - DEBUGLOG("clvmd restart requested\n"); - - /* Count exclusively-open LVs */ - do { - hn = get_next_excl_lock(hn, &lv_name); - if (lv_name) { - max_locks++; - if (!*lv_name) - break; /* FIXME: Is this error ? */ - } - } while (hn); - - /* clvmd + locks (-E uuid) + debug (-d X) + NULL */ - if (!(argv = malloc((max_locks * 2 + 6) * sizeof(*argv)))) - goto_out; - - /* - * Build the command-line - */ - argv[argc++] = "clvmd"; - - /* Propagate debug options */ - if (clvmd_get_debug()) { - if (dm_snprintf(debug_arg, sizeof(debug_arg), "-d%u", clvmd_get_debug()) < 0) - goto_out; - argv[argc++] = debug_arg; - } - - /* Propagate foreground options */ - if (clvmd_get_foreground()) - argv[argc++] = "-f"; - - argv[argc++] = "-I"; - argv[argc++] = clops->name; - - /* Now add the exclusively-open LVs */ - hn = NULL; - do { - hn = get_next_excl_lock(hn, &lv_name); - if (lv_name) { - if (!*lv_name) - break; /* FIXME: Is this error ? */ - argv[argc++] = "-E"; - argv[argc++] = lv_name; - DEBUGLOG("excl lock: %s\n", lv_name); - } - } while (hn); - argv[argc] = NULL; - - /* Exec new clvmd */ - DEBUGLOG("--- Restarting %s ---\n", clvmd); - for (argc = 1; argv[argc]; argc++) DEBUGLOG("--- %d: %s\n", argc, argv[argc]); - - /* NOTE: This will fail when downgrading! */ - execvp(clvmd, (char **)argv); -out: - /* We failed */ - DEBUGLOG("Restart of clvmd failed.\n"); - - free(argv); - - return EIO; -} diff --git a/daemons/clvmd/clvmd-common.h b/daemons/clvmd/clvmd-common.h deleted file mode 100644 index fb1c487..0000000 --- a/daemons/clvmd/clvmd-common.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2010 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * This file must be included first by every clvmd source file. - */ -#ifndef _LVM_CLVMD_COMMON_H -#define _LVM_CLVMD_COMMON_H - -#define _REENTRANT - -#include "tools/tool.h" - -#include "lib/log/lvm-logging.h" - -#endif diff --git a/daemons/clvmd/clvmd-comms.h b/daemons/clvmd/clvmd-comms.h deleted file mode 100644 index f94077c..0000000 --- a/daemons/clvmd/clvmd-comms.h +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Abstraction layer for clvmd cluster communications - */ - -#ifndef _CLVMD_COMMS_H -#define _CLVMD_COMMS_H - -struct local_client; - -struct cluster_ops { - const char *name; - void (*cluster_init_completed) (void); - - int (*cluster_send_message) (const void *buf, int msglen, - const char *csid, - const char *errtext); - int (*name_from_csid) (const char *csid, char *name); - int (*csid_from_name) (char *csid, const char *name); - int (*get_num_nodes) (void); - int (*cluster_fd_callback) (struct local_client *fd, char *buf, int len, - const char *csid, - struct local_client **new_client); - int (*get_main_cluster_fd) (void); /* gets accept FD or cman cluster socket */ - int (*cluster_do_node_callback) (struct local_client *client, - void (*callback) (struct local_client *, - const char *csid, - int node_up)); - int (*is_quorate) (void); - - void (*get_our_csid) (char *csid); - void (*add_up_node) (const char *csid); - void (*reread_config) (void); - void (*cluster_closedown) (void); - - int (*get_cluster_name)(char *buf, int buflen); - - int (*sync_lock) (const char *resource, int mode, - int flags, int *lockid); - int (*sync_unlock) (const char *resource, int lockid); - -}; - -#ifdef USE_CMAN -# include <netinet/in.h> -# include "libcman.h" -# define CMAN_MAX_CSID_LEN 4 -# ifndef MAX_CSID_LEN -# define MAX_CSID_LEN CMAN_MAX_CSID_LEN -# endif -# undef MAX_CLUSTER_MEMBER_NAME_LEN -# define MAX_CLUSTER_MEMBER_NAME_LEN CMAN_MAX_NODENAME_LEN -# define CMAN_MAX_CLUSTER_MESSAGE 1500 -# define CLUSTER_PORT_CLVMD 11 -struct cluster_ops *init_cman_cluster(void); -#endif - -#ifdef USE_OPENAIS -# include <openais/saAis.h> -# include <corosync/totem/totem.h> -# define OPENAIS_CSID_LEN (sizeof(int)) -# define OPENAIS_MAX_CLUSTER_MESSAGE MESSAGE_SIZE_MAX -# define OPENAIS_MAX_CLUSTER_MEMBER_NAME_LEN SA_MAX_NAME_LENGTH -# ifndef MAX_CLUSTER_MEMBER_NAME_LEN -# define MAX_CLUSTER_MEMBER_NAME_LEN SA_MAX_NAME_LENGTH -# endif -# ifndef CMAN_MAX_CLUSTER_MESSAGE -# define CMAN_MAX_CLUSTER_MESSAGE MESSAGE_SIZE_MAX -# endif -# ifndef MAX_CSID_LEN -# define MAX_CSID_LEN sizeof(int) -# endif -struct cluster_ops *init_openais_cluster(void); -#endif - -#ifdef USE_COROSYNC -# include <corosync/corotypes.h> -# define COROSYNC_CSID_LEN (sizeof(int)) -# define COROSYNC_MAX_CLUSTER_MESSAGE 65535 -# define COROSYNC_MAX_CLUSTER_MEMBER_NAME_LEN CS_MAX_NAME_LENGTH -# ifndef MAX_CLUSTER_MEMBER_NAME_LEN -# define MAX_CLUSTER_MEMBER_NAME_LEN CS_MAX_NAME_LENGTH -# endif -# ifndef CMAN_MAX_CLUSTER_MESSAGE -# define CMAN_MAX_CLUSTER_MESSAGE 65535 -# endif -# ifndef MAX_CSID_LEN -# define MAX_CSID_LEN sizeof(int) -# endif -struct cluster_ops *init_corosync_cluster(void); -#endif - -#ifdef USE_SINGLENODE -# define SINGLENODE_CSID_LEN (sizeof(int)) -# ifndef MAX_CLUSTER_MEMBER_NAME_LEN -# define MAX_CLUSTER_MEMBER_NAME_LEN 64 -# endif -# define SINGLENODE_MAX_CLUSTER_MESSAGE 65535 -# ifndef MAX_CSID_LEN -# define MAX_CSID_LEN sizeof(int) -# endif -struct cluster_ops *init_singlenode_cluster(void); -#endif - -#endif diff --git a/daemons/clvmd/clvmd-corosync.c b/daemons/clvmd/clvmd-corosync.c deleted file mode 100644 index 6a9705d..0000000 --- a/daemons/clvmd/clvmd-corosync.c +++ /dev/null @@ -1,662 +0,0 @@ -/* - * Copyright (C) 2009-2012 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * This provides the interface between clvmd and corosync/DLM as the cluster - * and lock manager. - */ - -#include "clvmd-common.h" - -#include <pthread.h> - -#include "daemons/clvmd/clvm.h" -#include "clvmd-comms.h" -#include "clvmd.h" -#include "lvm-functions.h" - -#include "lib/locking/locking.h" - -#include <corosync/cpg.h> -#include <corosync/quorum.h> - -#ifdef HAVE_COROSYNC_CONFDB_H -# include <corosync/confdb.h> -#elif defined HAVE_COROSYNC_CMAP_H -# include <corosync/cmap.h> -#else -# error "Either HAVE_COROSYNC_CONFDB_H or HAVE_COROSYNC_CMAP_H must be defined." -#endif - -#include <libdlm.h> - -#include <syslog.h> - -/* Timeout value for several corosync calls */ -#define LOCKSPACE_NAME "clvmd" - -static void corosync_cpg_deliver_callback (cpg_handle_t handle, - const struct cpg_name *groupName, - uint32_t nodeid, - uint32_t pid, - void *msg, - size_t msg_len); -static void corosync_cpg_confchg_callback(cpg_handle_t handle, - const struct cpg_name *groupName, - const struct cpg_address *member_list, size_t member_list_entries, - const struct cpg_address *left_list, size_t left_list_entries, - const struct cpg_address *joined_list, size_t joined_list_entries); -static void _cluster_closedown(void); - -/* Hash list of nodes in the cluster */ -static struct dm_hash_table *node_hash; - -/* Number of active nodes */ -static int num_nodes; -static unsigned int our_nodeid; - -static struct local_client *cluster_client; - -/* Corosync handles */ -static cpg_handle_t cpg_handle; -static quorum_handle_t quorum_handle; - -/* DLM Handle */ -static dlm_lshandle_t *lockspace; - -static struct cpg_name cpg_group_name; - -/* Corosync callback structs */ -cpg_callbacks_t corosync_cpg_callbacks = { - .cpg_deliver_fn = corosync_cpg_deliver_callback, - .cpg_confchg_fn = corosync_cpg_confchg_callback, -}; - -quorum_callbacks_t quorum_callbacks = { - .quorum_notify_fn = NULL, -}; - -struct node_info -{ - enum {NODE_DOWN, NODE_CLVMD} state; - int nodeid; -}; - - -/* Set errno to something approximating the right value and return 0 or -1 */ -static int cs_to_errno(cs_error_t err) -{ - switch(err) - { - case CS_OK: - return 0; - case CS_ERR_LIBRARY: - errno = EINVAL; - break; - case CS_ERR_VERSION: - errno = EINVAL; - break; - case CS_ERR_INIT: - errno = EINVAL; - break; - case CS_ERR_TIMEOUT: - errno = ETIME; - break; - case CS_ERR_TRY_AGAIN: - errno = EAGAIN; - break; - case CS_ERR_INVALID_PARAM: - errno = EINVAL; - break; - case CS_ERR_NO_MEMORY: - errno = ENOMEM; - break; - case CS_ERR_BAD_HANDLE: - errno = EINVAL; - break; - case CS_ERR_BUSY: - errno = EBUSY; - break; - case CS_ERR_ACCESS: - errno = EPERM; - break; - case CS_ERR_NOT_EXIST: - errno = ENOENT; - break; - case CS_ERR_NAME_TOO_LONG: - errno = ENAMETOOLONG; - break; - case CS_ERR_EXIST: - errno = EEXIST; - break; - case CS_ERR_NO_SPACE: - errno = ENOSPC; - break; - case CS_ERR_INTERRUPT: - errno = EINTR; - break; - case CS_ERR_NAME_NOT_FOUND: - errno = ENOENT; - break; - case CS_ERR_NO_RESOURCES: - errno = ENOMEM; - break; - case CS_ERR_NOT_SUPPORTED: - errno = EOPNOTSUPP; - break; - case CS_ERR_BAD_OPERATION: - errno = EINVAL; - break; - case CS_ERR_FAILED_OPERATION: - errno = EIO; - break; - case CS_ERR_MESSAGE_ERROR: - errno = EIO; - break; - case CS_ERR_QUEUE_FULL: - errno = EXFULL; - break; - case CS_ERR_QUEUE_NOT_AVAILABLE: - errno = EINVAL; - break; - case CS_ERR_BAD_FLAGS: - errno = EINVAL; - break; - case CS_ERR_TOO_BIG: - errno = E2BIG; - break; - case CS_ERR_NO_SECTIONS: - errno = ENOMEM; - break; - default: - errno = EINVAL; - break; - } - return -1; -} - -static char *print_corosync_csid(const char *csid) -{ - static char buf[128]; - int id; - - memcpy(&id, csid, sizeof(int)); - sprintf(buf, "%d", id); - return buf; -} - -static void corosync_cpg_deliver_callback (cpg_handle_t handle, - const struct cpg_name *groupName, - uint32_t nodeid, - uint32_t pid, - void *msg, - size_t msg_len) -{ - int target_nodeid; - - memcpy(&target_nodeid, msg, COROSYNC_CSID_LEN); - - DEBUGLOG("%u got message from nodeid %d for %d. len %zd\n", - our_nodeid, nodeid, target_nodeid, msg_len-4); - - if (nodeid != our_nodeid) - if (target_nodeid == our_nodeid || target_nodeid == 0) - process_message(cluster_client, (char *)msg+COROSYNC_CSID_LEN, - msg_len-COROSYNC_CSID_LEN, (char*)&nodeid); -} - -static void corosync_cpg_confchg_callback(cpg_handle_t handle, - const struct cpg_name *groupName, - const struct cpg_address *member_list, size_t member_list_entries, - const struct cpg_address *left_list, size_t left_list_entries, - const struct cpg_address *joined_list, size_t joined_list_entries) -{ - int i; - struct node_info *ninfo; - - DEBUGLOG("confchg callback. %zd joined, %zd left, %zd members\n", - joined_list_entries, left_list_entries, member_list_entries); - - for (i=0; i<joined_list_entries; i++) { - ninfo = dm_hash_lookup_binary(node_hash, - (char *)&joined_list[i].nodeid, - COROSYNC_CSID_LEN); - if (!ninfo) { - ninfo = malloc(sizeof(struct node_info)); - if (!ninfo) { - break; - } - else { - ninfo->nodeid = joined_list[i].nodeid; - dm_hash_insert_binary(node_hash, - (char *)&ninfo->nodeid, - COROSYNC_CSID_LEN, ninfo); - } - } - ninfo->state = NODE_CLVMD; - } - - for (i=0; i<left_list_entries; i++) { - ninfo = dm_hash_lookup_binary(node_hash, - (char *)&left_list[i].nodeid, - COROSYNC_CSID_LEN); - if (ninfo) - ninfo->state = NODE_DOWN; - } - - num_nodes = member_list_entries; -} - -static int _init_cluster(void) -{ - cs_error_t err; - -#ifdef QUORUM_SET /* corosync/quorum.h */ - uint32_t quorum_type; -#endif - - node_hash = dm_hash_create(100); - - err = cpg_initialize(&cpg_handle, - &corosync_cpg_callbacks); - if (err != CS_OK) { - syslog(LOG_ERR, "Cannot initialise Corosync CPG service: %d", - err); - DEBUGLOG("Cannot initialise Corosync CPG service: %d", err); - return cs_to_errno(err); - } - -#ifdef QUORUM_SET - err = quorum_initialize(&quorum_handle, - &quorum_callbacks, - &quorum_type); - - if (quorum_type != QUORUM_SET) { - syslog(LOG_ERR, "Corosync quorum service is not configured"); - DEBUGLOG("Corosync quorum service is not configured"); - return EINVAL; - } -#else - err = quorum_initialize(&quorum_handle, - &quorum_callbacks); -#endif - - if (err != CS_OK) { - syslog(LOG_ERR, "Cannot initialise Corosync quorum service: %d", - err); - DEBUGLOG("Cannot initialise Corosync quorum service: %d", err); - return cs_to_errno(err); - } - - /* Create a lockspace for LV & VG locks to live in */ - lockspace = dlm_open_lockspace(LOCKSPACE_NAME); - if (!lockspace) { - lockspace = dlm_create_lockspace(LOCKSPACE_NAME, 0600); - if (!lockspace) { - syslog(LOG_ERR, "Unable to create DLM lockspace for CLVM: %m"); - return -1; - } - DEBUGLOG("Created DLM lockspace for CLVMD.\n"); - } else - DEBUGLOG("Opened existing DLM lockspace for CLVMD.\n"); - - dlm_ls_pthread_init(lockspace); - DEBUGLOG("DLM initialisation complete\n"); - - /* Connect to the clvmd group */ - strcpy((char *)cpg_group_name.value, "clvmd"); - cpg_group_name.length = strlen((char *)cpg_group_name.value); - err = cpg_join(cpg_handle, &cpg_group_name); - if (err != CS_OK) { - cpg_finalize(cpg_handle); - quorum_finalize(quorum_handle); - dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1); - syslog(LOG_ERR, "Cannot join clvmd process group"); - DEBUGLOG("Cannot join clvmd process group: %d\n", err); - return cs_to_errno(err); - } - - err = cpg_local_get(cpg_handle, - &our_nodeid); - if (err != CS_OK) { - cpg_finalize(cpg_handle); - quorum_finalize(quorum_handle); - dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1); - syslog(LOG_ERR, "Cannot get local node id\n"); - return cs_to_errno(err); - } - DEBUGLOG("Our local node id is %d\n", our_nodeid); - - DEBUGLOG("Connected to Corosync\n"); - - return 0; -} - -static void _cluster_closedown(void) -{ - dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1); - cpg_finalize(cpg_handle); - quorum_finalize(quorum_handle); -} - -static void _get_our_csid(char *csid) -{ - memcpy(csid, &our_nodeid, sizeof(int)); -} - -/* Corosync doesn't really have nmode names so we - just use the node ID in hex instead */ -static int _csid_from_name(char *csid, const char *name) -{ - int nodeid; - struct node_info *ninfo; - - if (sscanf(name, "%x", &nodeid) == 1) { - ninfo = dm_hash_lookup_binary(node_hash, csid, COROSYNC_CSID_LEN); - if (ninfo) - return nodeid; - } - return -1; -} - -static int _name_from_csid(const char *csid, char *name) -{ - struct node_info *ninfo; - - ninfo = dm_hash_lookup_binary(node_hash, csid, COROSYNC_CSID_LEN); - if (!ninfo) - { - sprintf(name, "UNKNOWN %s", print_corosync_csid(csid)); - return -1; - } - - sprintf(name, "%x", ninfo->nodeid); - return 0; -} - -static int _get_num_nodes(void) -{ - DEBUGLOG("num_nodes = %d\n", num_nodes); - return num_nodes; -} - -/* Node is now known to be running a clvmd */ -static void _add_up_node(const char *csid) -{ - struct node_info *ninfo; - - ninfo = dm_hash_lookup_binary(node_hash, csid, COROSYNC_CSID_LEN); - if (!ninfo) { - DEBUGLOG("corosync_add_up_node no node_hash entry for csid %s\n", - print_corosync_csid(csid)); - return; - } - - DEBUGLOG("corosync_add_up_node %d\n", ninfo->nodeid); - - ninfo->state = NODE_CLVMD; - - return; -} - -/* Call a callback for each node, so the caller knows whether it's up or down */ -static int _cluster_do_node_callback(struct local_client *master_client, - void (*callback)(struct local_client *, - const char *csid, int node_up)) -{ - struct dm_hash_node *hn; - struct node_info *ninfo; - - dm_hash_iterate(hn, node_hash) - { - char csid[COROSYNC_CSID_LEN]; - - ninfo = dm_hash_get_data(node_hash, hn); - memcpy(csid, dm_hash_get_key(node_hash, hn), COROSYNC_CSID_LEN); - - DEBUGLOG("down_callback. node %d, state = %d\n", ninfo->nodeid, - ninfo->state); - - if (ninfo->state == NODE_CLVMD) - callback(master_client, csid, 1); - } - return 0; -} - -/* Real locking */ -static int _lock_resource(const char *resource, int mode, int flags, int *lockid) -{ - struct dlm_lksb lksb; - int err; - - DEBUGLOG("lock_resource '%s', flags=%d, mode=%d\n", resource, flags, mode); - - if (flags & LKF_CONVERT) - lksb.sb_lkid = *lockid; - - err = dlm_ls_lock_wait(lockspace, - mode, - &lksb, - flags, - resource, - strlen(resource), - 0, - NULL, NULL, NULL); - - if (err != 0) - { - DEBUGLOG("dlm_ls_lock returned %d\n", errno); - return err; - } - if (lksb.sb_status != 0) - { - DEBUGLOG("dlm_ls_lock returns lksb.sb_status %d\n", lksb.sb_status); - errno = lksb.sb_status; - return -1; - } - - DEBUGLOG("lock_resource returning %d, lock_id=%x\n", err, lksb.sb_lkid); - - *lockid = lksb.sb_lkid; - - return 0; -} - - -static int _unlock_resource(const char *resource, int lockid) -{ - struct dlm_lksb lksb; - int err; - - DEBUGLOG("unlock_resource: %s lockid: %x\n", resource, lockid); - lksb.sb_lkid = lockid; - - err = dlm_ls_unlock_wait(lockspace, - lockid, - 0, - &lksb); - if (err != 0) - { - DEBUGLOG("Unlock returned %d\n", err); - return err; - } - if (lksb.sb_status != EUNLOCK) - { - DEBUGLOG("dlm_ls_unlock_wait returns lksb.sb_status: %d\n", lksb.sb_status); - errno = lksb.sb_status; - return -1; - } - - - return 0; -} - -static int _is_quorate(void) -{ - int quorate; - if (quorum_getquorate(quorum_handle, &quorate) == CS_OK) - return quorate; - else - return 0; -} - -static int _get_main_cluster_fd(void) -{ - int select_fd; - - cpg_fd_get(cpg_handle, &select_fd); - return select_fd; -} - -static int _cluster_fd_callback(struct local_client *fd, char *buf, int len, - const char *csid, - struct local_client **new_client) -{ - cluster_client = fd; - *new_client = NULL; - cpg_dispatch(cpg_handle, CS_DISPATCH_ONE); - return 1; -} - -static int _cluster_send_message(const void *buf, int msglen, const char *csid, - const char *errtext) -{ - static pthread_mutex_t _mutex = PTHREAD_MUTEX_INITIALIZER; - struct iovec iov[2]; - cs_error_t err; - int target_node; - - if (csid) - memcpy(&target_node, csid, COROSYNC_CSID_LEN); - else - target_node = 0; - - iov[0].iov_base = &target_node; - iov[0].iov_len = sizeof(int); - iov[1].iov_base = (char *)buf; - iov[1].iov_len = msglen; - - pthread_mutex_lock(&_mutex); - err = cpg_mcast_joined(cpg_handle, CPG_TYPE_AGREED, iov, 2); - pthread_mutex_unlock(&_mutex); - - return cs_to_errno(err); -} - -#ifdef HAVE_COROSYNC_CONFDB_H -/* - * We are not necessarily connected to a Red Hat Cluster system, - * but if we are, this returns the cluster name from cluster.conf. - * I've used confdb rather than ccs to reduce the inter-package - * dependancies as well as to allow people to set a cluster name - * for themselves even if they are not running on RH cluster. - */ -static int _get_cluster_name(char *buf, int buflen) -{ - confdb_handle_t handle; - int result; - size_t namelen = buflen; - hdb_handle_t cluster_handle; - confdb_callbacks_t callbacks = { - .confdb_key_change_notify_fn = NULL, - .confdb_object_create_change_notify_fn = NULL, - .confdb_object_delete_change_notify_fn = NULL - }; - - /* This is a default in case everything else fails */ - strncpy(buf, "Corosync", buflen); - - /* Look for a cluster name in confdb */ - result = confdb_initialize (&handle, &callbacks); - if (result != CS_OK) - return 0; - - result = confdb_object_find_start(handle, OBJECT_PARENT_HANDLE); - if (result != CS_OK) - goto out; - - result = confdb_object_find(handle, OBJECT_PARENT_HANDLE, (void *)"cluster", strlen("cluster"), &cluster_handle); - if (result != CS_OK) - goto out; - - result = confdb_key_get(handle, cluster_handle, (void *)"name", strlen("name"), buf, &namelen); - if (result != CS_OK) - goto out; - - buf[namelen] = '\0'; - -out: - confdb_finalize(handle); - return 0; -} - -#elif defined HAVE_COROSYNC_CMAP_H - -static int _get_cluster_name(char *buf, int buflen) -{ - cmap_handle_t cmap_handle = 0; - int result; - char *name = NULL; - - /* This is a default in case everything else fails */ - strncpy(buf, "Corosync", buflen); - - /* Look for a cluster name in cmap */ - result = cmap_initialize(&cmap_handle); - if (result != CS_OK) - return 0; - - result = cmap_get_string(cmap_handle, "totem.cluster_name", &name); - if (result != CS_OK) - goto out; - - memset(buf, 0, buflen); - strncpy(buf, name, buflen - 1); - -out: - if (name) - free(name); - cmap_finalize(cmap_handle); - return 0; -} - -#endif - -static struct cluster_ops _cluster_corosync_ops = { - .name = "corosync", - .cluster_init_completed = NULL, - .cluster_send_message = _cluster_send_message, - .name_from_csid = _name_from_csid, - .csid_from_name = _csid_from_name, - .get_num_nodes = _get_num_nodes, - .cluster_fd_callback = _cluster_fd_callback, - .get_main_cluster_fd = _get_main_cluster_fd, - .cluster_do_node_callback = _cluster_do_node_callback, - .is_quorate = _is_quorate, - .get_our_csid = _get_our_csid, - .add_up_node = _add_up_node, - .reread_config = NULL, - .cluster_closedown = _cluster_closedown, - .get_cluster_name = _get_cluster_name, - .sync_lock = _lock_resource, - .sync_unlock = _unlock_resource, -}; - -struct cluster_ops *init_corosync_cluster(void) -{ - if (!_init_cluster()) - return &_cluster_corosync_ops; - else - return NULL; -} diff --git a/daemons/clvmd/clvmd-openais.c b/daemons/clvmd/clvmd-openais.c deleted file mode 100644 index 6b4fb10..0000000 --- a/daemons/clvmd/clvmd-openais.c +++ /dev/null @@ -1,687 +0,0 @@ -/* - * Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * This provides the interface between clvmd and OpenAIS as the cluster - * and lock manager. - */ - -#include "clvmd-common.h" - -#include <pthread.h> -#include <fcntl.h> -#include <syslog.h> - -#include <openais/saAis.h> -#include <openais/saLck.h> - -#include <corosync/corotypes.h> -#include <corosync/cpg.h> - -#include "lib/locking/locking.h" -#include "daemons/clvmd/clvm.h" -#include "clvmd-comms.h" -#include "lvm-functions.h" -#include "clvmd.h" - -/* Timeout value for several openais calls */ -#define TIMEOUT 10 - -static void openais_cpg_deliver_callback (cpg_handle_t handle, - const struct cpg_name *groupName, - uint32_t nodeid, - uint32_t pid, - void *msg, - size_t msg_len); -static void openais_cpg_confchg_callback(cpg_handle_t handle, - const struct cpg_name *groupName, - const struct cpg_address *member_list, size_t member_list_entries, - const struct cpg_address *left_list, size_t left_list_entries, - const struct cpg_address *joined_list, size_t joined_list_entries); - -static void _cluster_closedown(void); - -/* Hash list of nodes in the cluster */ -static struct dm_hash_table *node_hash; - -/* For associating lock IDs & resource handles */ -static struct dm_hash_table *lock_hash; - -/* Number of active nodes */ -static int num_nodes; -static unsigned int our_nodeid; - -static struct local_client *cluster_client; - -/* OpenAIS handles */ -static cpg_handle_t cpg_handle; -static SaLckHandleT lck_handle; - -static struct cpg_name cpg_group_name; - -/* Openais callback structs */ -cpg_callbacks_t openais_cpg_callbacks = { - .cpg_deliver_fn = openais_cpg_deliver_callback, - .cpg_confchg_fn = openais_cpg_confchg_callback, -}; - -struct node_info -{ - enum {NODE_UNKNOWN, NODE_DOWN, NODE_UP, NODE_CLVMD} state; - int nodeid; -}; - -struct lock_info -{ - SaLckResourceHandleT res_handle; - SaLckLockIdT lock_id; - SaNameT lock_name; -}; - -/* Set errno to something approximating the right value and return 0 or -1 */ -static int ais_to_errno(SaAisErrorT err) -{ - switch(err) - { - case SA_AIS_OK: - return 0; - case SA_AIS_ERR_LIBRARY: - errno = EINVAL; - break; - case SA_AIS_ERR_VERSION: - errno = EINVAL; - break; - case SA_AIS_ERR_INIT: - errno = EINVAL; - break; - case SA_AIS_ERR_TIMEOUT: - errno = ETIME; - break; - case SA_AIS_ERR_TRY_AGAIN: - errno = EAGAIN; - break; - case SA_AIS_ERR_INVALID_PARAM: - errno = EINVAL; - break; - case SA_AIS_ERR_NO_MEMORY: - errno = ENOMEM; - break; - case SA_AIS_ERR_BAD_HANDLE: - errno = EINVAL; - break; - case SA_AIS_ERR_BUSY: - errno = EBUSY; - break; - case SA_AIS_ERR_ACCESS: - errno = EPERM; - break; - case SA_AIS_ERR_NOT_EXIST: - errno = ENOENT; - break; - case SA_AIS_ERR_NAME_TOO_LONG: - errno = ENAMETOOLONG; - break; - case SA_AIS_ERR_EXIST: - errno = EEXIST; - break; - case SA_AIS_ERR_NO_SPACE: - errno = ENOSPC; - break; - case SA_AIS_ERR_INTERRUPT: - errno = EINTR; - break; - case SA_AIS_ERR_NAME_NOT_FOUND: - errno = ENOENT; - break; - case SA_AIS_ERR_NO_RESOURCES: - errno = ENOMEM; - break; - case SA_AIS_ERR_NOT_SUPPORTED: - errno = EOPNOTSUPP; - break; - case SA_AIS_ERR_BAD_OPERATION: - errno = EINVAL; - break; - case SA_AIS_ERR_FAILED_OPERATION: - errno = EIO; - break; - case SA_AIS_ERR_MESSAGE_ERROR: - errno = EIO; - break; - case SA_AIS_ERR_QUEUE_FULL: - errno = EXFULL; - break; - case SA_AIS_ERR_QUEUE_NOT_AVAILABLE: - errno = EINVAL; - break; - case SA_AIS_ERR_BAD_FLAGS: - errno = EINVAL; - break; - case SA_AIS_ERR_TOO_BIG: - errno = E2BIG; - break; - case SA_AIS_ERR_NO_SECTIONS: - errno = ENOMEM; - break; - default: - errno = EINVAL; - break; - } - return -1; -} - -static char *print_openais_csid(const char *csid) -{ - static char buf[128]; - int id; - - memcpy(&id, csid, sizeof(int)); - sprintf(buf, "%d", id); - return buf; -} - -static int add_internal_client(int fd, fd_callback_t callback) -{ - struct local_client *client; - - DEBUGLOG("Add_internal_client, fd = %d\n", fd); - - if (!(client = dm_zalloc(sizeof(*client)))) { - DEBUGLOG("malloc failed\n"); - return -1; - } - - client->fd = fd; - client->type = CLUSTER_INTERNAL; - client->callback = callback; - add_client(client); - - /* Set Close-on-exec */ - fcntl(fd, F_SETFD, 1); - - return 0; -} - -static void openais_cpg_deliver_callback (cpg_handle_t handle, - const struct cpg_name *groupName, - uint32_t nodeid, - uint32_t pid, - void *msg, - size_t msg_len) -{ - int target_nodeid; - - memcpy(&target_nodeid, msg, OPENAIS_CSID_LEN); - - DEBUGLOG("%u got message from nodeid %d for %d. len %" PRIsize_t "\n", - our_nodeid, nodeid, target_nodeid, msg_len-4); - - if (nodeid != our_nodeid) - if (target_nodeid == our_nodeid || target_nodeid == 0) - process_message(cluster_client, (char *)msg+OPENAIS_CSID_LEN, - msg_len-OPENAIS_CSID_LEN, (char*)&nodeid); -} - -static void openais_cpg_confchg_callback(cpg_handle_t handle, - const struct cpg_name *groupName, - const struct cpg_address *member_list, size_t member_list_entries, - const struct cpg_address *left_list, size_t left_list_entries, - const struct cpg_address *joined_list, size_t joined_list_entries) -{ - int i; - struct node_info *ninfo; - - DEBUGLOG("confchg callback. %" PRIsize_t " joined, " - FMTsize_t " left, %" PRIsize_t " members\n", - joined_list_entries, left_list_entries, member_list_entries); - - for (i=0; i<joined_list_entries; i++) { - ninfo = dm_hash_lookup_binary(node_hash, - (char *)&joined_list[i].nodeid, - OPENAIS_CSID_LEN); - if (!ninfo) { - ninfo = malloc(sizeof(struct node_info)); - if (!ninfo) { - break; - } - else { - ninfo->nodeid = joined_list[i].nodeid; - dm_hash_insert_binary(node_hash, - (char *)&ninfo->nodeid, - OPENAIS_CSID_LEN, ninfo); - } - } - ninfo->state = NODE_CLVMD; - } - - for (i=0; i<left_list_entries; i++) { - ninfo = dm_hash_lookup_binary(node_hash, - (char *)&left_list[i].nodeid, - OPENAIS_CSID_LEN); - if (ninfo) - ninfo->state = NODE_DOWN; - } - - for (i=0; i<member_list_entries; i++) { - if (member_list[i].nodeid == 0) continue; - ninfo = dm_hash_lookup_binary(node_hash, - (char *)&member_list[i].nodeid, - OPENAIS_CSID_LEN); - if (!ninfo) { - ninfo = malloc(sizeof(struct node_info)); - if (!ninfo) { - break; - } - else { - ninfo->nodeid = member_list[i].nodeid; - dm_hash_insert_binary(node_hash, - (char *)&ninfo->nodeid, - OPENAIS_CSID_LEN, ninfo); - } - } - ninfo->state = NODE_CLVMD; - } - - num_nodes = member_list_entries; -} - -static int lck_dispatch(struct local_client *client, char *buf, int len, - const char *csid, struct local_client **new_client) -{ - *new_client = NULL; - saLckDispatch(lck_handle, SA_DISPATCH_ONE); - return 1; -} - -static int _init_cluster(void) -{ - SaAisErrorT err; - SaVersionT ver = { 'B', 1, 1 }; - int select_fd; - - node_hash = dm_hash_create(100); - lock_hash = dm_hash_create(10); - - err = cpg_initialize(&cpg_handle, - &openais_cpg_callbacks); - if (err != SA_AIS_OK) { - syslog(LOG_ERR, "Cannot initialise OpenAIS CPG service: %d", - err); - DEBUGLOG("Cannot initialise OpenAIS CPG service: %d", err); - return ais_to_errno(err); - } - - err = saLckInitialize(&lck_handle, - NULL, - &ver); - if (err != SA_AIS_OK) { - cpg_initialize(&cpg_handle, &openais_cpg_callbacks); - syslog(LOG_ERR, "Cannot initialise OpenAIS lock service: %d", - err); - DEBUGLOG("Cannot initialise OpenAIS lock service: %d\n\n", err); - return ais_to_errno(err); - } - - /* Connect to the clvmd group */ - strcpy((char *)cpg_group_name.value, "clvmd"); - cpg_group_name.length = strlen((char *)cpg_group_name.value); - err = cpg_join(cpg_handle, &cpg_group_name); - if (err != SA_AIS_OK) { - cpg_finalize(cpg_handle); - saLckFinalize(lck_handle); - syslog(LOG_ERR, "Cannot join clvmd process group"); - DEBUGLOG("Cannot join clvmd process group: %d\n", err); - return ais_to_errno(err); - } - - err = cpg_local_get(cpg_handle, - &our_nodeid); - if (err != SA_AIS_OK) { - cpg_finalize(cpg_handle); - saLckFinalize(lck_handle); - syslog(LOG_ERR, "Cannot get local node id\n"); - return ais_to_errno(err); - } - DEBUGLOG("Our local node id is %d\n", our_nodeid); - - saLckSelectionObjectGet(lck_handle, (SaSelectionObjectT *)&select_fd); - add_internal_client(select_fd, lck_dispatch); - - DEBUGLOG("Connected to OpenAIS\n"); - - return 0; -} - -static void _cluster_closedown(void) -{ - saLckFinalize(lck_handle); - cpg_finalize(cpg_handle); -} - -static void _get_our_csid(char *csid) -{ - memcpy(csid, &our_nodeid, sizeof(int)); -} - -/* OpenAIS doesn't really have nmode names so we - just use the node ID in hex instead */ -static int _csid_from_name(char *csid, const char *name) -{ - int nodeid; - struct node_info *ninfo; - - if (sscanf(name, "%x", &nodeid) == 1) { - ninfo = dm_hash_lookup_binary(node_hash, csid, OPENAIS_CSID_LEN); - if (ninfo) - return nodeid; - } - return -1; -} - -static int _name_from_csid(const char *csid, char *name) -{ - struct node_info *ninfo; - - ninfo = dm_hash_lookup_binary(node_hash, csid, OPENAIS_CSID_LEN); - if (!ninfo) - { - sprintf(name, "UNKNOWN %s", print_openais_csid(csid)); - return -1; - } - - sprintf(name, "%x", ninfo->nodeid); - return 0; -} - -static int _get_num_nodes() -{ - DEBUGLOG("num_nodes = %d\n", num_nodes); - return num_nodes; -} - -/* Node is now known to be running a clvmd */ -static void _add_up_node(const char *csid) -{ - struct node_info *ninfo; - - ninfo = dm_hash_lookup_binary(node_hash, csid, OPENAIS_CSID_LEN); - if (!ninfo) { - DEBUGLOG("openais_add_up_node no node_hash entry for csid %s\n", - print_openais_csid(csid)); - return; - } - - DEBUGLOG("openais_add_up_node %d\n", ninfo->nodeid); - - ninfo->state = NODE_CLVMD; -} - -/* Call a callback for each node, so the caller knows whether it's up or down */ -static int _cluster_do_node_callback(struct local_client *master_client, - void (*callback)(struct local_client *, - const char *csid, int node_up)) -{ - struct dm_hash_node *hn; - struct node_info *ninfo; - int somedown = 0; - - dm_hash_iterate(hn, node_hash) - { - char csid[OPENAIS_CSID_LEN]; - - ninfo = dm_hash_get_data(node_hash, hn); - memcpy(csid, dm_hash_get_key(node_hash, hn), OPENAIS_CSID_LEN); - - DEBUGLOG("down_callback. node %d, state = %d\n", ninfo->nodeid, - ninfo->state); - - if (ninfo->state != NODE_DOWN) - callback(master_client, csid, ninfo->state == NODE_CLVMD); - if (ninfo->state != NODE_CLVMD) - somedown = -1; - } - return somedown; -} - -/* Real locking */ -static int _lock_resource(char *resource, int mode, int flags, int *lockid) -{ - struct lock_info *linfo; - SaLckResourceHandleT res_handle; - SaAisErrorT err; - SaLckLockIdT lock_id; - SaLckLockStatusT lockStatus; - - /* This needs to be converted from DLM/LVM2 value for OpenAIS LCK */ - if (flags & LCK_NONBLOCK) flags = SA_LCK_LOCK_NO_QUEUE; - - linfo = malloc(sizeof(struct lock_info)); - if (!linfo) - return -1; - - DEBUGLOG("lock_resource '%s', flags=%d, mode=%d\n", resource, flags, mode); - - linfo->lock_name.length = strlen(resource)+1; - strcpy((char *)linfo->lock_name.value, resource); - - err = saLckResourceOpen(lck_handle, &linfo->lock_name, - SA_LCK_RESOURCE_CREATE, TIMEOUT, &res_handle); - if (err != SA_AIS_OK) - { - DEBUGLOG("ResourceOpen returned %d\n", err); - free(linfo); - return ais_to_errno(err); - } - - err = saLckResourceLock( - res_handle, - &lock_id, - mode, - flags, - 0, - SA_TIME_END, - &lockStatus); - if (err != SA_AIS_OK && lockStatus != SA_LCK_LOCK_GRANTED) - { - free(linfo); - saLckResourceClose(res_handle); - return ais_to_errno(err); - } - - /* Wait for it to complete */ - - DEBUGLOG("lock_resource returning %d, lock_id=%" PRIx64 "\n", - err, lock_id); - - linfo->lock_id = lock_id; - linfo->res_handle = res_handle; - - dm_hash_insert(lock_hash, resource, linfo); - - return ais_to_errno(err); -} - - -static int _unlock_resource(char *resource, int lockid) -{ - SaAisErrorT err; - struct lock_info *linfo; - - DEBUGLOG("unlock_resource %s\n", resource); - linfo = dm_hash_lookup(lock_hash, resource); - if (!linfo) - return 0; - - DEBUGLOG("unlock_resource: lockid: %" PRIx64 "\n", linfo->lock_id); - err = saLckResourceUnlock(linfo->lock_id, SA_TIME_END); - if (err != SA_AIS_OK) - { - DEBUGLOG("Unlock returned %d\n", err); - return ais_to_errno(err); - } - - /* Release the resource */ - dm_hash_remove(lock_hash, resource); - saLckResourceClose(linfo->res_handle); - free(linfo); - - return ais_to_errno(err); -} - -static int _sync_lock(const char *resource, int mode, int flags, int *lockid) -{ - int status; - char lock1[strlen(resource)+3]; - char lock2[strlen(resource)+3]; - - snprintf(lock1, sizeof(lock1), "%s-1", resource); - snprintf(lock2, sizeof(lock2), "%s-2", resource); - - switch (mode) - { - case LCK_EXCL: - status = _lock_resource(lock1, SA_LCK_EX_LOCK_MODE, flags, lockid); - if (status) - goto out; - - /* If we can't get this lock too then bail out */ - status = _lock_resource(lock2, SA_LCK_EX_LOCK_MODE, LCK_NONBLOCK, - lockid); - if (status == SA_LCK_LOCK_NOT_QUEUED) - { - _unlock_resource(lock1, *lockid); - status = -1; - errno = EAGAIN; - } - break; - - case LCK_PREAD: - case LCK_READ: - status = _lock_resource(lock1, SA_LCK_PR_LOCK_MODE, flags, lockid); - if (status) - goto out; - _unlock_resource(lock2, *lockid); - break; - - case LCK_WRITE: - status = _lock_resource(lock2, SA_LCK_EX_LOCK_MODE, flags, lockid); - if (status) - goto out; - _unlock_resource(lock1, *lockid); - break; - - default: - status = -1; - errno = EINVAL; - break; - } -out: - *lockid = mode; - return status; -} - -static int _sync_unlock(const char *resource, int lockid) -{ - int status = 0; - char lock1[strlen(resource)+3]; - char lock2[strlen(resource)+3]; - - snprintf(lock1, sizeof(lock1), "%s-1", resource); - snprintf(lock2, sizeof(lock2), "%s-2", resource); - - _unlock_resource(lock1, lockid); - _unlock_resource(lock2, lockid); - - return status; -} - -/* We are always quorate ! */ -static int _is_quorate() -{ - return 1; -} - -static int _get_main_cluster_fd(void) -{ - int select_fd; - - cpg_fd_get(cpg_handle, &select_fd); - return select_fd; -} - -static int _cluster_fd_callback(struct local_client *fd, char *buf, int len, - const char *csid, - struct local_client **new_client) -{ - cluster_client = fd; - *new_client = NULL; - cpg_dispatch(cpg_handle, SA_DISPATCH_ONE); - return 1; -} - -static int _cluster_send_message(const void *buf, int msglen, const char *csid, - const char *errtext) -{ - struct iovec iov[2]; - SaAisErrorT err; - int target_node; - - if (csid) - memcpy(&target_node, csid, OPENAIS_CSID_LEN); - else - target_node = 0; - - iov[0].iov_base = &target_node; - iov[0].iov_len = sizeof(int); - iov[1].iov_base = (char *)buf; - iov[1].iov_len = msglen; - - err = cpg_mcast_joined(cpg_handle, CPG_TYPE_AGREED, iov, 2); - return ais_to_errno(err); -} - -/* We don't have a cluster name to report here */ -static int _get_cluster_name(char *buf, int buflen) -{ - strncpy(buf, "OpenAIS", buflen); - return 0; -} - -static struct cluster_ops _cluster_openais_ops = { - .name = "openais", - .cluster_init_completed = NULL, - .cluster_send_message = _cluster_send_message, - .name_from_csid = _name_from_csid, - .csid_from_name = _csid_from_name, - .get_num_nodes = _get_num_nodes, - .cluster_fd_callback = _cluster_fd_callback, - .get_main_cluster_fd = _get_main_cluster_fd, - .cluster_do_node_callback = _cluster_do_node_callback, - .is_quorate = _is_quorate, - .get_our_csid = _get_our_csid, - .add_up_node = _add_up_node, - .reread_config = NULL, - .cluster_closedown = _cluster_closedown, - .get_cluster_name = _get_cluster_name, - .sync_lock = _sync_lock, - .sync_unlock = _sync_unlock, -}; - -struct cluster_ops *init_openais_cluster(void) -{ - if (!_init_cluster()) - return &_cluster_openais_ops; - - return NULL; -} diff --git a/daemons/clvmd/clvmd-singlenode.c b/daemons/clvmd/clvmd-singlenode.c deleted file mode 100644 index 2d53f13..0000000 --- a/daemons/clvmd/clvmd-singlenode.c +++ /dev/null @@ -1,382 +0,0 @@ -/* - * Copyright (C) 2009-2013 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "clvmd-common.h" - -#include <pthread.h> - -#include "lib/locking/locking.h" -#include "daemons/clvmd/clvm.h" -#include "clvmd-comms.h" -#include "clvmd.h" - -#include <sys/un.h> -#include <sys/socket.h> -#include <fcntl.h> - -static const char SINGLENODE_CLVMD_SOCKNAME[] = DEFAULT_RUN_DIR "/clvmd_singlenode.sock"; -static int listen_fd = -1; - -static struct dm_hash_table *_locks; -static int _lockid; - -static pthread_mutex_t _lock_mutex = PTHREAD_MUTEX_INITIALIZER; -/* Using one common condition for all locks for simplicity */ -static pthread_cond_t _lock_cond = PTHREAD_COND_INITIALIZER; - -struct lock { - struct dm_list list; - int lockid; - int mode; -}; - -static void close_comms(void) -{ - if (listen_fd != -1 && close(listen_fd)) - stack; - (void)unlink(SINGLENODE_CLVMD_SOCKNAME); - listen_fd = -1; -} - -static int init_comms(void) -{ - mode_t old_mask; - struct sockaddr_un addr = { .sun_family = AF_UNIX }; - - if (!dm_strncpy(addr.sun_path, SINGLENODE_CLVMD_SOCKNAME, - sizeof(addr.sun_path))) { - DEBUGLOG("%s: singlenode socket name too long.", - SINGLENODE_CLVMD_SOCKNAME); - return -1; - } - - close_comms(); - - (void) dm_prepare_selinux_context(SINGLENODE_CLVMD_SOCKNAME, S_IFSOCK); - old_mask = umask(0077); - - listen_fd = socket(PF_UNIX, SOCK_STREAM, 0); - if (listen_fd < 0) { - DEBUGLOG("Can't create local socket: %s\n", strerror(errno)); - goto error; - } - /* Set Close-on-exec */ - if (fcntl(listen_fd, F_SETFD, 1)) { - DEBUGLOG("Setting CLOEXEC on client fd failed: %s\n", strerror(errno)); - goto error; - } - - if (bind(listen_fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - DEBUGLOG("Can't bind local socket: %s\n", strerror(errno)); - goto error; - } - if (listen(listen_fd, 10) < 0) { - DEBUGLOG("Can't listen local socket: %s\n", strerror(errno)); - goto error; - } - - umask(old_mask); - (void) dm_prepare_selinux_context(NULL, 0); - return 0; -error: - umask(old_mask); - (void) dm_prepare_selinux_context(NULL, 0); - close_comms(); - return -1; -} - -static int _init_cluster(void) -{ - int r; - - if (!(_locks = dm_hash_create(128))) { - DEBUGLOG("Failed to allocate single-node hash table.\n"); - return 1; - } - - r = init_comms(); - if (r) { - dm_hash_destroy(_locks); - _locks = NULL; - return r; - } - - DEBUGLOG("Single-node cluster initialised.\n"); - return 0; -} - -static void _cluster_closedown(void) -{ - close_comms(); - - /* If there is any awaited resource, kill it softly */ - pthread_mutex_lock(&_lock_mutex); - dm_hash_destroy(_locks); - _locks = NULL; - _lockid = 0; - pthread_cond_broadcast(&_lock_cond); /* wakeup waiters */ - pthread_mutex_unlock(&_lock_mutex); -} - -static void _get_our_csid(char *csid) -{ - int nodeid = 1; - memcpy(csid, &nodeid, sizeof(int)); -} - -static int _csid_from_name(char *csid, const char *name) -{ - return 1; -} - -static int _name_from_csid(const char *csid, char *name) -{ - strcpy(name, "SINGLENODE"); - return 0; -} - -static int _get_num_nodes(void) -{ - return 1; -} - -/* Node is now known to be running a clvmd */ -static void _add_up_node(const char *csid) -{ -} - -/* Call a callback for each node, so the caller knows whether it's up or down */ -static int _cluster_do_node_callback(struct local_client *master_client, - void (*callback)(struct local_client *, - const char *csid, int node_up)) -{ - return 0; -} - -int _lock_file(const char *file, uint32_t flags); - -static const char *_get_mode(int mode) -{ - switch (mode) { - case LCK_NULL: return "NULL"; - case LCK_READ: return "READ"; - case LCK_PREAD: return "PREAD"; - case LCK_WRITE: return "WRITE"; - case LCK_EXCL: return "EXCLUSIVE"; - case LCK_UNLOCK: return "UNLOCK"; - default: return "????"; - } -} - -/* Real locking */ -static int _lock_resource(const char *resource, int mode, int flags, int *lockid) -{ - /* DLM table of allowed transition states */ - static const int _dlm_table[6][6] = { - /* Mode NL CR CW PR PW EX */ - /* NL */ { 1, 1, 1, 1, 1, 1}, - /* CR */ { 1, 1, 1, 1, 1, 0}, - /* CW */ { 1, 1, 1, 0, 0, 0}, - /* PR */ { 1, 1, 0, 1, 0, 0}, - /* PW */ { 1, 1, 0, 0, 0, 0}, - /* EX */ { 1, 0, 0, 0, 0, 0} - }; - - struct lock *lck = NULL, *lckt; - struct dm_list *head; - - DEBUGLOG("Locking resource %s, flags=0x%02x (%s%s%s), mode=%s (%d)\n", - resource, flags, - (flags & LCKF_NOQUEUE) ? "NOQUEUE" : "", - ((flags & (LCKF_NOQUEUE | LCKF_CONVERT)) == - (LCKF_NOQUEUE | LCKF_CONVERT)) ? "|" : "", - (flags & LCKF_CONVERT) ? "CONVERT" : "", - _get_mode(mode), mode); - - mode &= LCK_TYPE_MASK; - pthread_mutex_lock(&_lock_mutex); - -retry: - if (!(head = dm_hash_lookup(_locks, resource))) { - if (flags & LCKF_CONVERT) { - /* In real DLM, lock is identified only by lockid, resource is not used */ - DEBUGLOG("Unlocked resource %s cannot be converted\n", resource); - goto_bad; - } - /* Add new locked resource */ - if (!(head = dm_malloc(sizeof(struct dm_list))) || - !dm_hash_insert(_locks, resource, head)) { - dm_free(head); - goto_bad; - } - - dm_list_init(head); - } else /* Update/convert locked resource */ - dm_list_iterate_items(lck, head) { - /* Check is all locks are compatible with requested lock */ - if (flags & LCKF_CONVERT) { - if (lck->lockid != *lockid) - continue; - - DEBUGLOG("Converting resource %s lockid=%d mode:%s -> %s...\n", - resource, lck->lockid, _get_mode(lck->mode), _get_mode(mode)); - dm_list_iterate_items(lckt, head) { - if ((lckt->lockid != *lockid) && - !_dlm_table[mode][lckt->mode]) { - if (!(flags & LCKF_NOQUEUE) && - /* TODO: Real dlm uses here conversion queues */ - !pthread_cond_wait(&_lock_cond, &_lock_mutex) && - _locks) /* End of the game? */ - goto retry; - goto bad; - } - } - lck->mode = mode; /* Lock is now converted */ - goto out; - } else if (!_dlm_table[mode][lck->mode]) { - DEBUGLOG("Resource %s already locked lockid=%d, mode:%s\n", - resource, lck->lockid, _get_mode(lck->mode)); - if (!(flags & LCKF_NOQUEUE) && - !pthread_cond_wait(&_lock_cond, &_lock_mutex) && - _locks) { /* End of the game? */ - DEBUGLOG("Resource %s retrying lock in mode:%s...\n", - resource, _get_mode(mode)); - goto retry; - } - goto bad; - } - } - - if (!(flags & LCKF_CONVERT)) { - if (!(lck = dm_malloc(sizeof(struct lock)))) - goto_bad; - - *lockid = lck->lockid = ++_lockid; - lck->mode = mode; - dm_list_add(head, &lck->list); - } -out: - pthread_cond_broadcast(&_lock_cond); /* to wakeup waiters */ - pthread_mutex_unlock(&_lock_mutex); - DEBUGLOG("Locked resource %s, lockid=%d, mode=%s\n", - resource, lck->lockid, _get_mode(lck->mode)); - - return 0; -bad: - pthread_cond_broadcast(&_lock_cond); /* to wakeup waiters */ - pthread_mutex_unlock(&_lock_mutex); - DEBUGLOG("Failed to lock resource %s\n", resource); - - return 1; /* fail */ -} - -static int _unlock_resource(const char *resource, int lockid) -{ - struct lock *lck; - struct dm_list *head; - int r = 1; - - if (lockid < 0) { - DEBUGLOG("Not tracking unlock of lockid -1: %s, lockid=%d\n", - resource, lockid); - return 1; - } - - DEBUGLOG("Unlocking resource %s, lockid=%d\n", resource, lockid); - pthread_mutex_lock(&_lock_mutex); - pthread_cond_broadcast(&_lock_cond); /* wakeup waiters */ - - if (!(head = dm_hash_lookup(_locks, resource))) { - pthread_mutex_unlock(&_lock_mutex); - DEBUGLOG("Resource %s is not locked.\n", resource); - return 1; - } - - dm_list_iterate_items(lck, head) - if (lck->lockid == lockid) { - dm_list_del(&lck->list); - dm_free(lck); - r = 0; - goto out; - } - - DEBUGLOG("Resource %s has wrong lockid %d.\n", resource, lockid); -out: - if (dm_list_empty(head)) { - //DEBUGLOG("Resource %s is no longer hashed (lockid=%d).\n", resource, lockid); - dm_hash_remove(_locks, resource); - dm_free(head); - } - - pthread_mutex_unlock(&_lock_mutex); - - return r; -} - -static int _is_quorate(void) -{ - return 1; -} - -static int _get_main_cluster_fd(void) -{ - return listen_fd; -} - -static int _cluster_fd_callback(struct local_client *fd, char *buf, int len, - const char *csid, - struct local_client **new_client) -{ - return 1; -} - -static int _cluster_send_message(const void *buf, int msglen, - const char *csid, - const char *errtext) -{ - return 0; -} - -static int _get_cluster_name(char *buf, int buflen) -{ - return dm_strncpy(buf, "localcluster", buflen) ? 0 : 1; -} - -static struct cluster_ops _cluster_singlenode_ops = { - .name = "singlenode", - .cluster_init_completed = NULL, - .cluster_send_message = _cluster_send_message, - .name_from_csid = _name_from_csid, - .csid_from_name = _csid_from_name, - .get_num_nodes = _get_num_nodes, - .cluster_fd_callback = _cluster_fd_callback, - .get_main_cluster_fd = _get_main_cluster_fd, - .cluster_do_node_callback = _cluster_do_node_callback, - .is_quorate = _is_quorate, - .get_our_csid = _get_our_csid, - .add_up_node = _add_up_node, - .reread_config = NULL, - .cluster_closedown = _cluster_closedown, - .get_cluster_name = _get_cluster_name, - .sync_lock = _lock_resource, - .sync_unlock = _unlock_resource, -}; - -struct cluster_ops *init_singlenode_cluster(void) -{ - if (!_init_cluster()) - return &_cluster_singlenode_ops; - - return NULL; -} diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c deleted file mode 100644 index 73f4711..0000000 --- a/daemons/clvmd/clvmd.c +++ /dev/null @@ -1,2422 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2014 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * CLVMD: Cluster LVM daemon - */ - -#include "clvmd-common.h" - -#include "clvmd-comms.h" -#include "daemons/clvmd/clvm.h" -#include "clvmd.h" -#include "lvm-functions.h" -#include "lvm-version.h" -#include "refresh_clvmd.h" - -#ifdef HAVE_COROSYNC_CONFDB_H -#include <corosync/confdb.h> -#endif - -#include <pthread.h> -#include <getopt.h> -#include <ctype.h> -#include <stdarg.h> - -#include <fcntl.h> -#include <netinet/in.h> -#include <signal.h> -#include <stddef.h> -#include <syslog.h> -#include <sys/un.h> -#include <sys/utsname.h> - -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - -#define MAX_RETRIES 4 -#define MAX_MISSING_LEN 8000 /* Max supported clvmd message size ? */ - -#define ISLOCAL_CSID(c) (memcmp(c, our_csid, max_csid_len) == 0) - -/* Head of the fd list. Also contains - the cluster_socket details */ -static struct local_client local_client_head; -static int _local_client_count = 0; - -static unsigned short global_xid = 0; /* Last transaction ID issued */ - -struct cluster_ops *clops = NULL; - -static char our_csid[MAX_CSID_LEN]; -static unsigned max_csid_len; -static unsigned max_cluster_message; -static unsigned max_cluster_member_name_len; - -static void _add_client(struct local_client *new_client, struct local_client *existing_client) -{ - _local_client_count++; - DEBUGLOG("(%p) Adding listener for fd %d. (Now %d monitored fds.)\n", new_client, new_client->fd, _local_client_count); - new_client->next = existing_client->next; - existing_client->next = new_client; -} - -int add_client(struct local_client *new_client) -{ - _add_client(new_client, &local_client_head); - - return 0; -} - -/* Returns 0 if delfd is found and removed from list */ -static int _del_client(struct local_client *delfd) -{ - struct local_client *lastfd, *thisfd; - - for (lastfd = &local_client_head; (thisfd = lastfd->next); lastfd = thisfd) - if (thisfd == delfd) { - DEBUGLOG("(%p) Removing listener for fd %d\n", thisfd, thisfd->fd); - lastfd->next = delfd->next; - _local_client_count--; - return 0; - } - - return 1; -} - -/* Structure of items on the LVM thread list */ -struct lvm_thread_cmd { - struct dm_list list; - - struct local_client *client; - struct clvm_header *msg; - char csid[MAX_CSID_LEN]; - int remote; /* Flag */ - int msglen; - unsigned short xid; -}; - -struct lvm_startup_params { - struct dm_hash_table *excl_uuid; -}; - -static debug_t debug = DEBUG_OFF; -static int foreground_mode = 0; -static pthread_t lvm_thread; -/* Stack size 128KiB for thread, must be bigger then DEFAULT_RESERVED_STACK */ -static const size_t STACK_SIZE = 128 * 1024; -static pthread_attr_t stack_attr; -static int lvm_thread_exit = 0; -static pthread_mutex_t lvm_thread_mutex; -static pthread_mutex_t _debuglog_mutex = PTHREAD_MUTEX_INITIALIZER; -static pthread_cond_t lvm_thread_cond; -static pthread_barrier_t lvm_start_barrier; -static struct dm_list lvm_cmd_head; -static volatile sig_atomic_t quit = 0; -static volatile sig_atomic_t reread_config = 0; -static int child_pipe[2]; - -/* Reasons the daemon failed initialisation */ -#define DFAIL_INIT 1 -#define DFAIL_LOCAL_SOCK 2 -#define DFAIL_CLUSTER_IF 3 -#define DFAIL_MALLOC 4 -#define DFAIL_TIMEOUT 5 -#define SUCCESS 0 - -typedef enum {IF_AUTO, IF_CMAN, IF_OPENAIS, IF_COROSYNC, IF_SINGLENODE} if_type_t; - -/* Prototypes for code further down */ -static void sigusr2_handler(int sig); -static void sighup_handler(int sig); -static void sigterm_handler(int sig); -static void send_local_reply(struct local_client *client, int status, - int clientid); -static void free_reply(struct local_client *client); -static void send_version_message(void); -static void *pre_and_post_thread(void *arg); -static int send_message(void *buf, int msglen, const char *csid, int fd, - const char *errtext); -static int read_from_local_sock(struct local_client *thisfd); -static int cleanup_zombie(struct local_client *thisfd); -static int process_local_command(struct clvm_header *msg, int msglen, - struct local_client *client, - unsigned short xid); -static void process_remote_command(struct clvm_header *msg, int msglen, int fd, - const char *csid); -static int process_reply(const struct clvm_header *msg, int msglen, - const char *csid); -static int open_local_sock(void); -static void close_local_sock(int local_socket); -static int check_local_clvmd(void); -static struct local_client *find_client(int clientid); -static void main_loop(int cmd_timeout); -static void be_daemon(int start_timeout); -static int check_all_clvmds_running(struct local_client *client); -static int local_rendezvous_callback(struct local_client *thisfd, char *buf, - int len, const char *csid, - struct local_client **new_client); -static void *lvm_thread_fn(void *) __attribute__((noreturn)); -static int add_to_lvmqueue(struct local_client *client, struct clvm_header *msg, - int msglen, const char *csid); -static int distribute_command(struct local_client *thisfd); -static void hton_clvm(struct clvm_header *hdr); -static void ntoh_clvm(struct clvm_header *hdr); -static void add_reply_to_list(struct local_client *client, int status, - const char *csid, const char *buf, int len); -static if_type_t parse_cluster_interface(char *ifname); -static if_type_t get_cluster_type(void); - -static void usage(const char *prog, FILE *file) -{ - fprintf(file, "Usage: %s [options]\n" - " -C Sets debug level (from -d) on all clvmd instances clusterwide\n" - " -d[<n>] Set debug logging (0:none, 1:stderr (implies -f option), 2:syslog)\n" - " -E<uuid> Take this lock uuid as exclusively locked resource (for restart)\n" - " -f Don't fork, run in the foreground\n" - " -h Show this help information\n" - " -I<cmgr> Cluster manager (default: auto)\n" - " Available cluster managers: " -#ifdef USE_COROSYNC - "corosync " -#endif -#ifdef USE_CMAN - "cman " -#endif -#ifdef USE_OPENAIS - "openais " -#endif -#ifdef USE_SINGLENODE - "singlenode " -#endif - "\n" - " -R Tell all running clvmds in the cluster to reload their device cache\n" - " -S Restart clvmd, preserving exclusive locks\n" - " -t<secs> Command timeout (default: 60 seconds)\n" - " -T<secs> Startup timeout (default: 0 seconds)\n" - " -V Show version of clvmd\n" - "\n", prog); -} - -/* Called to signal the parent how well we got on during initialisation */ -static void child_init_signal(int status) -{ - if (child_pipe[1]) { - /* FIXME Use a proper wrapper around write */ - if (write(child_pipe[1], &status, sizeof(status)) < 0) - log_sys_error("write", "child_pipe"); - if (close(child_pipe[1])) - log_sys_error("close", "child_pipe"); - } -} - -static __attribute__((noreturn)) void child_init_signal_and_exit(int status) -{ - child_init_signal(status); - exit(status); -} - -static void safe_close(int *fd) -{ - if (*fd >= 0) { - int to_close = *fd; - *fd = -1; - if (close(to_close)) - log_sys_error("close", ""); /* path */ - } -} - -void debuglog(const char *fmt, ...) -{ - time_t P; - va_list ap; - static int syslog_init = 0; - char buf_ctime[64]; - - switch (clvmd_get_debug()) { - case DEBUG_STDERR: - pthread_mutex_lock(&_debuglog_mutex); - va_start(ap,fmt); - time(&P); - fprintf(stderr, "CLVMD[%x]: %.15s ", (int)pthread_self(), ctime_r(&P, buf_ctime) + 4); - vfprintf(stderr, fmt, ap); - va_end(ap); - fflush(stderr); - pthread_mutex_unlock(&_debuglog_mutex); - break; - case DEBUG_SYSLOG: - pthread_mutex_lock(&_debuglog_mutex); - if (!syslog_init) { - openlog("clvmd", LOG_PID, LOG_DAEMON); - syslog_init = 1; - } - - va_start(ap,fmt); - vsyslog(LOG_DEBUG, fmt, ap); - va_end(ap); - pthread_mutex_unlock(&_debuglog_mutex); - break; - case DEBUG_OFF: - break; - } -} - -void clvmd_set_debug(debug_t new_debug) -{ - if (!foreground_mode && new_debug == DEBUG_STDERR) - new_debug = DEBUG_SYSLOG; - - if (new_debug > DEBUG_SYSLOG) - new_debug = DEBUG_SYSLOG; - - debug = new_debug; -} - -debug_t clvmd_get_debug(void) -{ - return debug; -} - -int clvmd_get_foreground(void) -{ - return foreground_mode; -} - -static const char *decode_cmd(unsigned char cmdl) -{ - static char buf[128]; - const char *command; - - switch (cmdl) { - case CLVMD_CMD_TEST: - command = "TEST"; - break; - case CLVMD_CMD_LOCK_VG: - command = "LOCK_VG"; - break; - case CLVMD_CMD_LOCK_LV: - command = "LOCK_LV"; - break; - case CLVMD_CMD_REFRESH: - command = "REFRESH"; - break; - case CLVMD_CMD_SET_DEBUG: - command = "SET_DEBUG"; - break; - case CLVMD_CMD_GET_CLUSTERNAME: - command = "GET_CLUSTERNAME"; - break; - case CLVMD_CMD_VG_BACKUP: - command = "VG_BACKUP"; - break; - case CLVMD_CMD_REPLY: - command = "REPLY"; - break; - case CLVMD_CMD_VERSION: - command = "VERSION"; - break; - case CLVMD_CMD_GOAWAY: - command = "GOAWAY"; - break; - case CLVMD_CMD_LOCK: - command = "LOCK"; - break; - case CLVMD_CMD_UNLOCK: - command = "UNLOCK"; - break; - case CLVMD_CMD_LOCK_QUERY: - command = "LOCK_QUERY"; - break; - case CLVMD_CMD_RESTART: - command = "RESTART"; - break; - case CLVMD_CMD_SYNC_NAMES: - command = "SYNC_NAMES"; - break; - default: - command = "unknown"; - break; - } - - snprintf(buf, sizeof(buf), "%s (0x%x)", command, cmdl); - - return buf; -} - -static void remove_lockfile(void) -{ - if (unlink(CLVMD_PIDFILE)) - log_sys_error("unlink", CLVMD_PIDFILE); -} - -/* - * clvmd require dm-ioctl capability for operation - */ -static void check_permissions(void) -{ - if (getuid() || geteuid()) { - log_error("Cannot run as a non-root user."); - - /* - * Fail cleanly here if not run as root, instead of failing - * later when attempting a root-only operation - * Preferred exit code from an initscript for this. - */ - exit(4); - } -} - -int main(int argc, char *argv[]) -{ - int local_sock; - struct local_client *newfd, *delfd; - struct lvm_startup_params lvm_params; - int opt; - int cmd_timeout = DEFAULT_CMD_TIMEOUT; - int start_timeout = 0; - if_type_t cluster_iface = IF_AUTO; - sigset_t ss; - debug_t debug_opt = DEBUG_OFF; - debug_t debug_arg = DEBUG_OFF; - int clusterwide_opt = 0; - mode_t old_mask; - int ret = 1; - - struct option longopts[] = { - { "help", 0, 0, 'h' }, - { NULL, 0, 0, 0 } - }; - - if (!(lvm_params.excl_uuid = dm_hash_create(128))) { - fprintf(stderr, "Failed to allocate hash table\n"); - return 1; - } - - /* Deal with command-line arguments */ - opterr = 0; - optind = 0; - while ((opt = getopt_long(argc, argv, "Vhfd:t:RST:CI:E:", - longopts, NULL)) != -1) { - switch (opt) { - case 'h': - usage(argv[0], stdout); - exit(0); - - case 'R': - check_permissions(); - ret = (refresh_clvmd(1) == 1) ? 0 : 1; - goto out; - - case 'S': - check_permissions(); - ret = (restart_clvmd(clusterwide_opt) == 1) ? 0 : 1; - goto out; - - case 'C': - clusterwide_opt = 1; - break; - - case 'd': - debug_opt = DEBUG_STDERR; - debug_arg = (debug_t) atoi(optarg); - if (debug_arg == DEBUG_STDERR) - foreground_mode = 1; - break; - - case 'f': - foreground_mode = 1; - break; - case 't': - cmd_timeout = atoi(optarg); - if (!cmd_timeout) { - fprintf(stderr, "command timeout is invalid\n"); - usage(argv[0], stderr); - exit(1); - } - break; - case 'I': - cluster_iface = parse_cluster_interface(optarg); - break; - case 'E': - if (!dm_hash_insert(lvm_params.excl_uuid, optarg, optarg)) { - fprintf(stderr, "Failed to allocate hash entry\n"); - goto out; - } - break; - case 'T': - start_timeout = atoi(optarg); - if (start_timeout <= 0) { - fprintf(stderr, "startup timeout is invalid\n"); - usage(argv[0], stderr); - exit(1); - } - break; - - case 'V': - printf("Cluster LVM daemon version: %s\n", LVM_VERSION); - printf("Protocol version: %d.%d.%d\n", - CLVMD_MAJOR_VERSION, CLVMD_MINOR_VERSION, - CLVMD_PATCH_VERSION); - exit(0); - break; - - default: - usage(argv[0], stderr); - exit(2); - } - } - - check_permissions(); - - /* - * Switch to C locale to avoid reading large locale-archive file - * used by some glibc (on some distributions it takes over 100MB). - * Daemon currently needs to use mlockall(). - */ - if (setenv("LC_ALL", "C", 1)) - perror("Cannot set LC_ALL to C"); - - /* Setting debug options on an existing clvmd */ - if (debug_opt && !check_local_clvmd()) { - dm_hash_destroy(lvm_params.excl_uuid); - return debug_clvmd(debug_arg, clusterwide_opt)==1?0:1; - } - - clvmd_set_debug(debug_arg); - - /* Fork into the background (unless requested not to) */ - if (!foreground_mode) - be_daemon(start_timeout); - - (void) dm_prepare_selinux_context(DEFAULT_RUN_DIR, S_IFDIR); - old_mask = umask(0077); - if (dm_create_dir(DEFAULT_RUN_DIR) == 0) { - DEBUGLOG("clvmd: unable to create %s directory\n", - DEFAULT_RUN_DIR); - umask(old_mask); - exit(1); - } - umask(old_mask); - - /* Create pidfile */ - (void) dm_prepare_selinux_context(CLVMD_PIDFILE, S_IFREG); - if (dm_create_lockfile(CLVMD_PIDFILE) == 0) { - DEBUGLOG("clvmd: unable to create lockfile\n"); - exit(1); - } - (void) dm_prepare_selinux_context(NULL, 0); - - atexit(remove_lockfile); - - DEBUGLOG("CLVMD started\n"); - - /* Open the Unix socket we listen for commands on. - We do this before opening the cluster socket so that - potential clients will block rather than error if we are running - but the cluster is not ready yet */ - local_sock = open_local_sock(); - if (local_sock < 0) { - child_init_signal_and_exit(DFAIL_LOCAL_SOCK); - /* NOTREACHED */ - } - - /* Set up signal handlers, USR1 is for cluster change notifications (in cman) - USR2 causes child threads to exit. - (HUP used to cause gulm to re-read the nodes list from CCS.) - PIPE should be ignored */ - signal(SIGUSR2, sigusr2_handler); - signal(SIGHUP, sighup_handler); - signal(SIGPIPE, SIG_IGN); - - /* Block SIGUSR2/SIGINT/SIGTERM in process */ - sigemptyset(&ss); - sigaddset(&ss, SIGUSR2); - sigaddset(&ss, SIGINT); - sigaddset(&ss, SIGTERM); - sigprocmask(SIG_BLOCK, &ss, NULL); - - /* Initialise the LVM thread variables */ - dm_list_init(&lvm_cmd_head); - if (pthread_attr_init(&stack_attr) || - pthread_attr_setstacksize(&stack_attr, STACK_SIZE + getpagesize())) { - log_sys_error("pthread_attr_init", ""); - exit(1); - } - pthread_mutex_init(&lvm_thread_mutex, NULL); - pthread_cond_init(&lvm_thread_cond, NULL); - pthread_barrier_init(&lvm_start_barrier, NULL, 2); - init_lvhash(); - - /* Start the cluster interface */ - if (cluster_iface == IF_AUTO) - cluster_iface = get_cluster_type(); - -#ifdef USE_CMAN - if ((cluster_iface == IF_AUTO || cluster_iface == IF_CMAN) && - (clops = init_cman_cluster())) { - max_csid_len = CMAN_MAX_CSID_LEN; - max_cluster_message = CMAN_MAX_CLUSTER_MESSAGE; - max_cluster_member_name_len = CMAN_MAX_NODENAME_LEN; - syslog(LOG_NOTICE, "Cluster LVM daemon started - connected to CMAN"); - } -#endif -#ifdef USE_COROSYNC - if (!clops) - if (((cluster_iface == IF_AUTO || cluster_iface == IF_COROSYNC) && - (clops = init_corosync_cluster()))) { - max_csid_len = COROSYNC_CSID_LEN; - max_cluster_message = COROSYNC_MAX_CLUSTER_MESSAGE; - max_cluster_member_name_len = COROSYNC_MAX_CLUSTER_MEMBER_NAME_LEN; - syslog(LOG_NOTICE, "Cluster LVM daemon started - connected to Corosync"); - } -#endif -#ifdef USE_OPENAIS - if (!clops) - if ((cluster_iface == IF_AUTO || cluster_iface == IF_OPENAIS) && - (clops = init_openais_cluster())) { - max_csid_len = OPENAIS_CSID_LEN; - max_cluster_message = OPENAIS_MAX_CLUSTER_MESSAGE; - max_cluster_member_name_len = OPENAIS_MAX_CLUSTER_MEMBER_NAME_LEN; - syslog(LOG_NOTICE, "Cluster LVM daemon started - connected to OpenAIS"); - } -#endif -#ifdef USE_SINGLENODE - if (!clops) - if (cluster_iface == IF_SINGLENODE && (clops = init_singlenode_cluster())) { - max_csid_len = SINGLENODE_CSID_LEN; - max_cluster_message = SINGLENODE_MAX_CLUSTER_MESSAGE; - max_cluster_member_name_len = MAX_CLUSTER_MEMBER_NAME_LEN; - syslog(LOG_NOTICE, "Cluster LVM daemon started - running in single-node mode"); - } -#endif - - if (!clops) { - DEBUGLOG("Can't initialise cluster interface\n"); - log_error("Can't initialise cluster interface."); - child_init_signal_and_exit(DFAIL_CLUSTER_IF); - /* NOTREACHED */ - } - DEBUGLOG("Cluster ready, doing some more initialisation\n"); - - /* Save our CSID */ - clops->get_our_csid(our_csid); - - /* Initialise the FD list head */ - local_client_head.fd = clops->get_main_cluster_fd(); - local_client_head.type = CLUSTER_MAIN_SOCK; - local_client_head.callback = clops->cluster_fd_callback; - _local_client_count++; - - /* Add the local socket to the list */ - if (!(newfd = dm_zalloc(sizeof(struct local_client)))) { - child_init_signal_and_exit(DFAIL_MALLOC); - /* NOTREACHED */ - } - - newfd->fd = local_sock; - newfd->type = LOCAL_RENDEZVOUS; - newfd->callback = local_rendezvous_callback; - - (void) add_client(newfd); - - /* This needs to be started after cluster initialisation - as it may need to take out locks */ - DEBUGLOG("Starting LVM thread\n"); - DEBUGLOG("(%p) Main cluster socket fd %d with local socket %d (%p)\n", - &local_client_head, local_client_head.fd, newfd->fd, newfd); - - /* Don't let anyone else to do work until we are started */ - if (pthread_create(&lvm_thread, &stack_attr, lvm_thread_fn, &lvm_params)) { - log_sys_error("pthread_create", ""); - goto out; - } - - /* Don't start until the LVM thread is ready */ - pthread_barrier_wait(&lvm_start_barrier); - - /* Tell the rest of the cluster our version number */ - if (clops->cluster_init_completed) - clops->cluster_init_completed(); - - DEBUGLOG("clvmd ready for work\n"); - child_init_signal(SUCCESS); - - /* Try to shutdown neatly */ - signal(SIGTERM, sigterm_handler); - signal(SIGINT, sigterm_handler); - - /* Do some work */ - main_loop(cmd_timeout); - - pthread_mutex_lock(&lvm_thread_mutex); - lvm_thread_exit = 1; - pthread_cond_signal(&lvm_thread_cond); - pthread_mutex_unlock(&lvm_thread_mutex); - if ((errno = pthread_join(lvm_thread, NULL))) - log_sys_error("pthread_join", ""); - - close_local_sock(local_sock); - - while ((delfd = local_client_head.next)) { - local_client_head.next = delfd->next; - _local_client_count--; - /* Failing cleanup_zombie leaks... */ - if (delfd->type == LOCAL_SOCK && !cleanup_zombie(delfd)) - cmd_client_cleanup(delfd); /* calls sync_unlock */ - if (delfd->fd != local_sock) - safe_close(&(delfd->fd)); - dm_free(delfd); - } - - DEBUGLOG("cluster_closedown\n"); - destroy_lvhash(); - clops->cluster_closedown(); - - ret = 0; -out: - dm_hash_destroy(lvm_params.excl_uuid); - - return ret; -} - -/* Called when the cluster layer has completed initialisation. - We send the version message */ -void clvmd_cluster_init_completed(void) -{ - send_version_message(); -} - -/* Data on a connected socket */ -static int local_sock_callback(struct local_client *thisfd, char *buf, int len, - const char *csid, - struct local_client **new_client) -{ - *new_client = NULL; - return read_from_local_sock(thisfd); -} - -/* Data on a connected socket */ -static int local_rendezvous_callback(struct local_client *thisfd, char *buf, - int len, const char *csid, - struct local_client **new_client) -{ - /* Someone connected to our local socket, accept it. */ - - struct sockaddr_un socka; - struct local_client *newfd; - socklen_t sl = sizeof(socka); - int client_fd = accept(thisfd->fd, (struct sockaddr *) &socka, &sl); - - if (client_fd == -1 && errno == EINTR) - return 1; - - if (client_fd >= 0) { - if (!(newfd = dm_zalloc(sizeof(*newfd)))) { - if (close(client_fd)) - log_sys_error("close", "socket"); - return 1; - } - - pthread_cond_init(&newfd->bits.localsock.cond, NULL); - pthread_mutex_init(&newfd->bits.localsock.mutex, NULL); - - if (fcntl(client_fd, F_SETFD, 1)) - DEBUGLOG("(%p) Setting CLOEXEC on client fd %d failed: %s\n", thisfd, client_fd, strerror(errno)); - - newfd->fd = client_fd; - newfd->type = LOCAL_SOCK; - newfd->callback = local_sock_callback; - newfd->bits.localsock.all_success = 1; - DEBUGLOG("(%p) Got new connection on fd %d\n", newfd, newfd->fd); - *new_client = newfd; - } - return 1; -} - -static int local_pipe_callback(struct local_client *thisfd, char *buf, - int maxlen, const char *csid, - struct local_client **new_client) -{ - int len; - char buffer[PIPE_BUF]; - struct local_client *sock_client = thisfd->bits.pipe.client; - int status = -1; /* in error by default */ - - len = read(thisfd->fd, buffer, sizeof(int)); - if (len == -1 && errno == EINTR) - return 1; - - if (len == sizeof(int)) - memcpy(&status, buffer, sizeof(int)); - - DEBUGLOG("(%p) Read on pipe %d, %d bytes, status %d\n", - thisfd, thisfd->fd, len, status); - - /* EOF on pipe or an error, close it */ - if (len <= 0) { - void *ret = &status; - if (close(thisfd->fd)) - log_sys_error("close", "local_pipe"); - - /* Clear out the cross-link */ - if (thisfd->bits.pipe.client) - thisfd->bits.pipe.client->bits.localsock.pipe_client = NULL; - - /* Reap child thread */ - if (thisfd->bits.pipe.threadid) { - if ((errno = pthread_join(thisfd->bits.pipe.threadid, &ret))) - log_sys_error("pthread_join", ""); - - thisfd->bits.pipe.threadid = 0; - if (thisfd->bits.pipe.client) - thisfd->bits.pipe.client->bits.localsock.threadid = 0; - } - return -1; - } else { - DEBUGLOG("(%p) Background routine status was %d, sock_client %p\n", - thisfd, status, sock_client); - /* But has the client gone away ?? */ - if (!sock_client) { - DEBUGLOG("(%p) Got pipe response for dead client, ignoring it\n", thisfd); - } else { - /* If error then just return that code */ - if (status) - send_local_reply(sock_client, status, - sock_client->fd); - else { - /* FIXME: closer inspect this code since state is write thread protected */ - pthread_mutex_lock(&sock_client->bits.localsock.mutex); - if (sock_client->bits.localsock.state == POST_COMMAND) { - pthread_mutex_unlock(&sock_client->bits.localsock.mutex); - send_local_reply(sock_client, 0, - sock_client->fd); - } else { - /* PRE_COMMAND finished. */ - pthread_mutex_unlock(&sock_client->bits.localsock.mutex); - if ((status = distribute_command(sock_client))) - send_local_reply(sock_client, EFBIG, - sock_client->fd); - } - } - } - } - return len; -} - -/* If a noed is up, look for it in the reply array, if it's not there then - add one with "ETIMEDOUT". - NOTE: This won't race with real replies because they happen in the same thread. -*/ -static void timedout_callback(struct local_client *client, const char *csid, - int node_up) -{ - struct node_reply *reply; - char nodename[max_cluster_member_name_len]; - - if (!node_up) - return; - - clops->name_from_csid(csid, nodename); - DEBUGLOG("(%p) Checking for a reply from %s\n", client, nodename); - pthread_mutex_lock(&client->bits.localsock.mutex); - - reply = client->bits.localsock.replies; - while (reply && strcmp(reply->node, nodename) != 0) - reply = reply->next; - - pthread_mutex_unlock(&client->bits.localsock.mutex); - - if (!reply) { - DEBUGLOG("(%p) Node %s timed-out\n", client, nodename); - add_reply_to_list(client, ETIMEDOUT, csid, - "Command timed out", 18); - } -} - -/* Called when the request has timed out on at least one node. We fill in - the remaining node entries with ETIMEDOUT and return. - - By the time we get here the node that caused - the timeout could have gone down, in which case we will never get the expected - number of replies that triggers the post command so we need to do it here -*/ -static void request_timed_out(struct local_client *client) -{ - DEBUGLOG("(%p) Request timed-out. padding\n", client); - clops->cluster_do_node_callback(client, timedout_callback); - - if (!client->bits.localsock.threadid) - return; - - pthread_mutex_lock(&client->bits.localsock.mutex); - - if (!client->bits.localsock.finished && - (client->bits.localsock.num_replies != - client->bits.localsock.expected_replies)) { - /* Post-process the command */ - client->bits.localsock.state = POST_COMMAND; - pthread_cond_signal(&client->bits.localsock.cond); - } - - pthread_mutex_unlock(&client->bits.localsock.mutex); -} - -/* This is where the real work happens */ -static void main_loop(int cmd_timeout) -{ - sigset_t ss; - - DEBUGLOG("Using timeout of %d seconds\n", cmd_timeout); - - sigemptyset(&ss); - sigaddset(&ss, SIGINT); - sigaddset(&ss, SIGTERM); - pthread_sigmask(SIG_UNBLOCK, &ss, NULL); - /* Main loop */ - while (!quit) { - fd_set in; - int select_status; - struct local_client *thisfd, *nextfd; - struct timeval tv = { cmd_timeout, 0 }; - int quorate = clops->is_quorate(); - int client_count = 0; - int max_fd = 0; - - /* Wait on the cluster FD and all local sockets/pipes */ - local_client_head.fd = clops->get_main_cluster_fd(); - FD_ZERO(&in); - - for (thisfd = &local_client_head; thisfd; thisfd = thisfd->next) { - client_count++; - max_fd = max(max_fd, thisfd->fd); - } - - if (max_fd > FD_SETSIZE - 32) { - fprintf(stderr, "WARNING: There are too many connections to clvmd. Investigate and take action now!\n"); - fprintf(stderr, "WARNING: Your cluster may freeze up if the number of clvmd file descriptors (%d) exceeds %d.\n", max_fd + 1, FD_SETSIZE); - } - - for (thisfd = &local_client_head; thisfd; thisfd = nextfd) { - nextfd = thisfd->next; - - if (thisfd->removeme && !cleanup_zombie(thisfd)) { - /* cleanup_zombie might have removed the next list element */ - nextfd = thisfd->next; - - (void) _del_client(thisfd); - - DEBUGLOG("(%p) removeme set with %d monitored fds remaining\n", thisfd, _local_client_count); - - /* Queue cleanup, this also frees the client struct */ - add_to_lvmqueue(thisfd, NULL, 0, NULL); - continue; - } - - if (thisfd->removeme) - continue; - - /* if the cluster is not quorate then don't listen for new requests */ - if ((thisfd->type != LOCAL_RENDEZVOUS && - thisfd->type != LOCAL_SOCK) || quorate) - if (thisfd->fd < FD_SETSIZE) - FD_SET(thisfd->fd, &in); - } - - select_status = select(FD_SETSIZE, &in, NULL, NULL, &tv); - - if (reread_config) { - int saved_errno = errno; - - reread_config = 0; - DEBUGLOG("got SIGHUP\n"); - if (clops->reread_config) - clops->reread_config(); - errno = saved_errno; - } - - if (select_status > 0) { - char csid[MAX_CSID_LEN]; - char buf[max_cluster_message]; - - for (thisfd = &local_client_head; thisfd; thisfd = thisfd->next) { - if (thisfd->fd < FD_SETSIZE && FD_ISSET(thisfd->fd, &in)) { - struct local_client *newfd = NULL; - int ret; - - /* FIXME Remove from main thread in case it blocks! */ - /* Do callback */ - ret = thisfd->callback(thisfd, buf, sizeof(buf), - csid, &newfd); - /* Ignore EAGAIN */ - if (ret < 0 && (errno == EAGAIN || errno == EINTR)) { - continue; - } - - /* Got error or EOF: Remove it from the list safely */ - if (ret <= 0) { - int type = thisfd->type; - - /* If the cluster socket shuts down, so do we */ - if (type == CLUSTER_MAIN_SOCK || - type == CLUSTER_INTERNAL) - goto closedown; - - DEBUGLOG("(%p) ret == %d, errno = %d. removing client\n", - thisfd, ret, errno); - thisfd->removeme = 1; - continue; - } - - /* New client...simply add it to the list */ - if (newfd) { - _add_client(newfd, thisfd); - thisfd = newfd; - } - } - } - } - - /* Select timed out. Check for clients that have been waiting too long for a response */ - if (select_status == 0) { - time_t the_time = time(NULL); - - for (thisfd = &local_client_head; thisfd; thisfd = thisfd->next) { - if (thisfd->type == LOCAL_SOCK && - thisfd->bits.localsock.sent_out && - (thisfd->bits.localsock.sent_time + cmd_timeout) < the_time && - thisfd->bits.localsock.expected_replies != - thisfd->bits.localsock.num_replies) { - /* Send timed out message + replies we already have */ - DEBUGLOG("Request to client %p timed-out (send: %ld, now: %ld)\n", - thisfd, thisfd->bits.localsock.sent_time, the_time); - - thisfd->bits.localsock.all_success = 0; - - request_timed_out(thisfd); - } - } - } - if (select_status < 0) { - if (errno == EINTR) - continue; - -#ifdef DEBUG - perror("select error"); - exit(-1); -#endif - } - } - - closedown: - if (quit) - DEBUGLOG("SIGTERM received\n"); -} - -static __attribute__ ((noreturn)) void wait_for_child(int c_pipe, int timeout) -{ - int child_status; - fd_set fds; - struct timeval tv = {timeout, 0}; - - FD_ZERO(&fds); - FD_SET(c_pipe, &fds); - - switch (select(c_pipe+1, &fds, NULL, NULL, timeout? &tv: NULL)) { - case 0: - fprintf(stderr, "clvmd startup timed out\n"); - exit(DFAIL_TIMEOUT); - case 1: - if (read(c_pipe, &child_status, sizeof(child_status)) != - sizeof(child_status)) { - fprintf(stderr, "clvmd failed in initialisation\n"); - exit(DFAIL_INIT); - } - - switch (child_status) { - case SUCCESS: - break; - case DFAIL_INIT: - fprintf(stderr, "clvmd failed in initialisation\n"); - break; - case DFAIL_LOCAL_SOCK: - fprintf(stderr, "clvmd could not create local socket\n"); - fprintf(stderr, "Another clvmd is probably already running\n"); - break; - case DFAIL_CLUSTER_IF: - fprintf(stderr, "clvmd could not connect to cluster manager\n"); - fprintf(stderr, "Consult syslog for more information\n"); - break; - case DFAIL_MALLOC: - fprintf(stderr, "clvmd failed, not enough memory\n"); - break; - default: - fprintf(stderr, "clvmd failed, error was %d\n", child_status); - break; - } - exit(child_status); - default: - fprintf(stderr, "clvmd startup, select failed: %s\n", strerror(errno)); - exit(DFAIL_INIT); - } -} - -/* - * Fork into the background and detach from our parent process. - * In the interests of user-friendliness we wait for the daemon - * to complete initialisation before returning its status - * the the user. - */ -static void be_daemon(int timeout) -{ - int devnull = open("/dev/null", O_RDWR); - if (devnull == -1) { - perror("Can't open /dev/null"); - exit(3); - } - - if (pipe(child_pipe)) { - perror("Error creating pipe"); - exit(3); - } - - switch (fork()) { - case -1: - perror("clvmd: can't fork"); - exit(2); - - case 0: /* Child */ - (void) close(child_pipe[0]); - break; - - default: /* Parent */ - (void) close(devnull); - (void) close(child_pipe[1]); - wait_for_child(child_pipe[0], timeout); /* noreturn */ - } - - /* Detach ourself from the calling environment */ - if ((dup2(devnull, STDIN_FILENO) == -1) || - (dup2(devnull, STDOUT_FILENO) == -1) || - (dup2(devnull, STDERR_FILENO) == -1)) { - perror("Error setting terminal FDs to /dev/null"); - log_error("Error setting terminal FDs to /dev/null: %m"); - exit(5); - } - - if ((devnull > STDERR_FILENO) && close(devnull)) { - log_sys_error("close", "/dev/null"); - exit(7); - } - - if (chdir("/")) { - log_error("Error setting current directory to /: %m"); - exit(6); - } - - setsid(); -} - -static int verify_message(char *buf, int len) -{ - struct clvm_header *h = (struct clvm_header *)buf; - - if (len < (int)sizeof(struct clvm_header)) { - log_error("verify_message short len %d.", len); - return -1; - } - - switch (h->cmd) { - case CLVMD_CMD_REPLY: - case CLVMD_CMD_VERSION: - case CLVMD_CMD_GOAWAY: - case CLVMD_CMD_TEST: - case CLVMD_CMD_LOCK: - case CLVMD_CMD_UNLOCK: - case CLVMD_CMD_LOCK_LV: - case CLVMD_CMD_LOCK_VG: - case CLVMD_CMD_LOCK_QUERY: - case CLVMD_CMD_REFRESH: - case CLVMD_CMD_GET_CLUSTERNAME: - case CLVMD_CMD_SET_DEBUG: - case CLVMD_CMD_VG_BACKUP: - case CLVMD_CMD_RESTART: - case CLVMD_CMD_SYNC_NAMES: - break; - default: - log_error("verify_message bad cmd %x.", h->cmd); - return -1; - } - - /* TODO: we may be able to narrow len/flags/clientid/arglen checks based on cmd */ - - if (h->flags & ~(CLVMD_FLAG_LOCAL | CLVMD_FLAG_SYSTEMLV | CLVMD_FLAG_NODEERRS | CLVMD_FLAG_REMOTE)) { - log_error("verify_message bad flags %x.", h->flags); - return -1; - } - - if (h->arglen > max_cluster_message) { - log_error("verify_message bad arglen %x max %d.", h->arglen, max_cluster_message); - return -1; - } - - return 0; -} - -static void dump_message(char *buf, int len) -{ - unsigned char row[8]; - char str[9]; - int i, j = 0; - - str[8] = '\0'; - if (len > 128) - len = 128; - - for (i = 0; i < len; ++i) { - row[j] = buf[i]; - str[j] = (isprint(buf[i])) ? buf[i] : ' '; - - if (i + 1 == len) { - for (;j < 8; ++j) { - row[j] = 0; - str[j] = ' '; - } - - log_error("%02x %02x %02x %02x %02x %02x %02x %02x [%s]", - row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], str); - j = 0; - } - } -} - -static int cleanup_zombie(struct local_client *thisfd) -{ - int *status; - struct local_client *pipe_client; - - if (thisfd->type != LOCAL_SOCK) - return 0; - - if (!thisfd->bits.localsock.cleanup_needed) - return 0; - - DEBUGLOG("(%p) EOF on local socket %d: inprogress=%d\n", - thisfd, thisfd->fd, thisfd->bits.localsock.in_progress); - - if ((pipe_client = thisfd->bits.localsock.pipe_client)) - pipe_client = pipe_client->bits.pipe.client; - - /* If the client went away in mid command then tidy up */ - if (thisfd->bits.localsock.in_progress) { - DEBUGLOG("Sending SIGUSR2 to pre&post thread (%p in-progress)\n", pipe_client); - pthread_kill(thisfd->bits.localsock.threadid, SIGUSR2); - if (pthread_mutex_trylock(&thisfd->bits.localsock.mutex)) - return 1; - thisfd->bits.localsock.state = POST_COMMAND; - thisfd->bits.localsock.finished = 1; - pthread_cond_signal(&thisfd->bits.localsock.cond); - pthread_mutex_unlock(&thisfd->bits.localsock.mutex); - - /* Free any unsent buffers */ - free_reply(thisfd); - } - - /* Kill the subthread & free resources */ - if (thisfd->bits.localsock.threadid) { - DEBUGLOG("(%p) Waiting for pre&post thread\n", pipe_client); - pthread_mutex_lock(&thisfd->bits.localsock.mutex); - thisfd->bits.localsock.state = PRE_COMMAND; - thisfd->bits.localsock.finished = 1; - pthread_cond_signal(&thisfd->bits.localsock.cond); - pthread_mutex_unlock(&thisfd->bits.localsock.mutex); - - if ((errno = pthread_join(thisfd->bits.localsock.threadid, - (void **) &status))) - log_sys_error("pthread_join", ""); - - DEBUGLOG("(%p) Joined pre&post thread\n", pipe_client); - - thisfd->bits.localsock.threadid = 0; - - /* Remove the pipe client */ - if (thisfd->bits.localsock.pipe_client) { - struct local_client *delfd = thisfd->bits.localsock.pipe_client; - - (void) close(delfd->fd); /* Close pipe */ - (void) close(thisfd->bits.localsock.pipe); - - /* Remove pipe client */ - if (!_del_client(delfd)) { - dm_free(delfd); - thisfd->bits.localsock.pipe_client = NULL; - } - } - } - - /* Free the command buffer */ - dm_free(thisfd->bits.localsock.cmd); - - safe_close(&(thisfd->fd)); - thisfd->bits.localsock.cleanup_needed = 0; - - return 0; -} - -/* Called when we have a read from the local socket. - was in the main loop but it's grown up and is a big girl now */ -static int read_from_local_sock(struct local_client *thisfd) -{ - int len; - int argslen; - int missing_len; - char buffer[PIPE_BUF + 1]; - char csid[MAX_CSID_LEN]; - int comms_pipe[2]; - struct local_client *newfd; - struct clvm_header *inheader = (struct clvm_header *) buffer; - int status; - - len = read(thisfd->fd, buffer, sizeof(buffer) - 1); - if (len == -1 && errno == EINTR) - return 1; - - DEBUGLOG("(%p) Read on local socket %d, len = %d\n", thisfd, thisfd->fd, len); - - if (len && verify_message(buffer, len) < 0) { - log_error("read_from_local_sock from %d len %d bad verify.", - thisfd->fd, len); - dump_message(buffer, len); - /* force error handling below */ - len = 0; - } - - /* EOF or error on socket */ - if (len <= 0) { - thisfd->bits.localsock.cleanup_needed = 1; - (void) cleanup_zombie(thisfd); /* ignore errors here */ - return 0; - } - - buffer[len] = 0; /* Ensure \0 terminated */ - - /* Fill in the client ID */ - inheader->clientid = htonl(thisfd->fd); - - /* If we are already busy then return an error */ - if (thisfd->bits.localsock.in_progress) { - struct clvm_header reply = { - .cmd = CLVMD_CMD_REPLY, - .status = EBUSY - }; - send_message(&reply, sizeof(reply), our_csid, thisfd->fd, - "Error sending EBUSY reply to local user"); - return len; - } - - /* See if we have the whole message */ - argslen = len - strlen(inheader->node) - sizeof(struct clvm_header); - missing_len = inheader->arglen - argslen; - - if (missing_len < 0) - missing_len = 0; - - /* We need at least sizeof(struct clvm_header) bytes in buffer */ - if (len < (int)sizeof(struct clvm_header) || /* Already handled in verify_message() */ - argslen < 0 || missing_len > MAX_MISSING_LEN) { - struct clvm_header reply = { - .cmd = CLVMD_CMD_REPLY, - .status = EINVAL - }; - send_message(&reply, sizeof(reply), our_csid, thisfd->fd, - "Error sending EINVAL reply to local user"); - return 0; - } - - /* Free any old buffer space */ - dm_free(thisfd->bits.localsock.cmd); - - /* Save the message */ - if (!(thisfd->bits.localsock.cmd = dm_malloc(len + missing_len))) { - struct clvm_header reply = { - .cmd = CLVMD_CMD_REPLY, - .status = ENOMEM - }; - send_message(&reply, sizeof(reply), our_csid, thisfd->fd, - "Error sending ENOMEM reply to local user"); - return 0; - } - memcpy(thisfd->bits.localsock.cmd, buffer, len); - thisfd->bits.localsock.cmd_len = len + missing_len; - inheader = (struct clvm_header *) thisfd->bits.localsock.cmd; - - /* If we don't have the full message then read the rest now */ - if (missing_len) { - char *argptr = inheader->node + strlen(inheader->node) + 1; - - while (missing_len > 0) { - DEBUGLOG("(%p) got %d bytes, need another %d (total %d)\n", - thisfd, argslen, missing_len, inheader->arglen); - len = read(thisfd->fd, argptr + argslen, missing_len); - if (len == -1 && errno == EINTR) - continue; - - if (len <= 0) { - /* EOF or error on socket */ - DEBUGLOG("(%p) EOF on local socket\n", thisfd); - dm_free(thisfd->bits.localsock.cmd); - thisfd->bits.localsock.cmd = NULL; - return 0; - } - - missing_len -= len; - argslen += len; - } - } - - /* Only run the command if all the cluster nodes are running CLVMD */ - if (((inheader->flags & CLVMD_FLAG_LOCAL) == 0) && - (check_all_clvmds_running(thisfd) == -1)) { - thisfd->bits.localsock.expected_replies = 0; - thisfd->bits.localsock.num_replies = 0; - send_local_reply(thisfd, EHOSTDOWN, thisfd->fd); - return len; - } - - /* Check the node name for validity */ - if (inheader->node[0] && clops->csid_from_name(csid, inheader->node)) { - /* Error, node is not in the cluster */ - struct clvm_header reply = { - .cmd = CLVMD_CMD_REPLY, - .status = ENOENT - }; - - DEBUGLOG("(%p) Unknown node: '%s'\n", thisfd, inheader->node); - send_message(&reply, sizeof(reply), our_csid, thisfd->fd, - "Error sending ENOENT reply to local user"); - thisfd->bits.localsock.expected_replies = 0; - thisfd->bits.localsock.num_replies = 0; - thisfd->bits.localsock.in_progress = FALSE; - thisfd->bits.localsock.sent_out = FALSE; - return len; - } - - /* If we already have a subthread then just signal it to start */ - if (thisfd->bits.localsock.threadid) { - pthread_mutex_lock(&thisfd->bits.localsock.mutex); - thisfd->bits.localsock.state = PRE_COMMAND; - pthread_cond_signal(&thisfd->bits.localsock.cond); - pthread_mutex_unlock(&thisfd->bits.localsock.mutex); - return len; - } - - /* Create a pipe and add the reading end to our FD list */ - if (pipe(comms_pipe)) { - struct clvm_header reply = { - .cmd = CLVMD_CMD_REPLY, - .status = EBUSY - }; - - DEBUGLOG("(%p) Creating pipe failed: %s\n", thisfd, strerror(errno)); - send_message(&reply, sizeof(reply), our_csid, thisfd->fd, - "Error sending EBUSY reply to local user"); - return len; - } - - if (!(newfd = dm_zalloc(sizeof(*newfd)))) { - struct clvm_header reply = { - .cmd = CLVMD_CMD_REPLY, - .status = ENOMEM - }; - - (void) close(comms_pipe[0]); - (void) close(comms_pipe[1]); - - send_message(&reply, sizeof(reply), our_csid, thisfd->fd, - "Error sending ENOMEM reply to local user"); - return len; - } - - DEBUGLOG("(%p) Creating pipe, [%d, %d]\n", thisfd, comms_pipe[0], comms_pipe[1]); - - if (fcntl(comms_pipe[0], F_SETFD, 1)) - DEBUGLOG("setting CLOEXEC on pipe[0] failed: %s\n", strerror(errno)); - if (fcntl(comms_pipe[1], F_SETFD, 1)) - DEBUGLOG("setting CLOEXEC on pipe[1] failed: %s\n", strerror(errno)); - - newfd->fd = comms_pipe[0]; - newfd->type = THREAD_PIPE; - newfd->callback = local_pipe_callback; - newfd->bits.pipe.client = thisfd; - - _add_client(newfd, thisfd); - - /* Store a cross link to the pipe */ - thisfd->bits.localsock.pipe_client = newfd; - thisfd->bits.localsock.pipe = comms_pipe[1]; - - /* Make sure the thread has a copy of it's own ID */ - newfd->bits.pipe.threadid = thisfd->bits.localsock.threadid; - - /* Run the pre routine */ - thisfd->bits.localsock.in_progress = TRUE; - thisfd->bits.localsock.state = PRE_COMMAND; - thisfd->bits.localsock.cleanup_needed = 1; - DEBUGLOG("(%p) Creating pre&post thread for pipe fd %d\n", newfd, newfd->fd); - status = pthread_create(&thisfd->bits.localsock.threadid, - &stack_attr, pre_and_post_thread, thisfd); - DEBUGLOG("(%p) Created pre&post thread, state = %d\n", newfd, status); - - return len; -} - -/* Add a file descriptor from the cluster or comms interface to - our list of FDs for select -*/ - -/* Called when the pre-command has completed successfully - we - now execute the real command on all the requested nodes */ -static int distribute_command(struct local_client *thisfd) -{ - struct clvm_header *inheader = - (struct clvm_header *) thisfd->bits.localsock.cmd; - int len = thisfd->bits.localsock.cmd_len; - - thisfd->xid = global_xid++; - DEBUGLOG("(%p) distribute command: XID = %d, flags=0x%x (%s%s)\n", - thisfd, thisfd->xid, inheader->flags, - (inheader->flags & CLVMD_FLAG_LOCAL) ? "LOCAL" : "", - (inheader->flags & CLVMD_FLAG_REMOTE) ? "REMOTE" : ""); - - /* Forward it to other nodes in the cluster if needed */ - if (!(inheader->flags & CLVMD_FLAG_LOCAL)) { - /* if node is empty then do it on the whole cluster */ - if (inheader->node[0] == '\0') { - thisfd->bits.localsock.expected_replies = - clops->get_num_nodes(); - thisfd->bits.localsock.num_replies = 0; - thisfd->bits.localsock.sent_time = time(NULL); - thisfd->bits.localsock.in_progress = TRUE; - thisfd->bits.localsock.sent_out = TRUE; - - /* - * Send to local node first, even if CLVMD_FLAG_REMOTE - * is set so we still get a reply if this is the - * only node. - */ - add_to_lvmqueue(thisfd, inheader, len, NULL); - - DEBUGLOG("(%p) Sending message to all cluster nodes\n", thisfd); - inheader->xid = thisfd->xid; - send_message(inheader, len, NULL, -1, - "Error forwarding message to cluster"); - } else { - /* Do it on a single node */ - char csid[MAX_CSID_LEN]; - - if (clops->csid_from_name(csid, inheader->node)) - /* This has already been checked so should not happen */ - return 0; - - /* OK, found a node... */ - thisfd->bits.localsock.in_progress = TRUE; - thisfd->bits.localsock.expected_replies = 1; - thisfd->bits.localsock.num_replies = 0; - - /* Are we the requested node ?? */ - if (memcmp(csid, our_csid, max_csid_len) == 0) { - DEBUGLOG("(%p) Doing command on local node only\n", thisfd); - add_to_lvmqueue(thisfd, inheader, len, NULL); - } else { - DEBUGLOG("(%p) Sending message to single node: %s\n", - thisfd, inheader->node); - inheader->xid = thisfd->xid; - send_message(inheader, len, csid, -1, - "Error forwarding message to cluster node"); - } - } - } else { - /* Local explicitly requested, ignore nodes */ - thisfd->bits.localsock.in_progress = TRUE; - thisfd->bits.localsock.expected_replies = 1; - thisfd->bits.localsock.num_replies = 0; - DEBUGLOG("(%p) Doing command explicitly on local node only\n", thisfd); - add_to_lvmqueue(thisfd, inheader, len, NULL); - } - - return 0; -} - -/* Process a command from a remote node and return the result */ -static void process_remote_command(struct clvm_header *msg, int msglen, int fd, - const char *csid) -{ - char *replyargs; - char nodename[max_cluster_member_name_len]; - int replylen = 0; - int buflen = max_cluster_message - sizeof(struct clvm_header) - 1; - int status; - - /* Get the node name as we /may/ need it later */ - clops->name_from_csid(csid, nodename); - - DEBUGLOG("process_remote_command %s for clientid 0x%x XID %d on node %s\n", - decode_cmd(msg->cmd), msg->clientid, msg->xid, nodename); - - /* Check for GOAWAY and sulk */ - if (msg->cmd == CLVMD_CMD_GOAWAY) { - DEBUGLOG("Told to go away by %s\n", nodename); - log_error("Told to go away by %s.", nodename); - exit(99); - } - - /* Version check is internal - don't bother exposing it in clvmd-command.c */ - if (msg->cmd == CLVMD_CMD_VERSION) { - int version_nums[3]; - char node[256]; - - memcpy(version_nums, msg->args, sizeof(version_nums)); - - clops->name_from_csid(csid, node); - DEBUGLOG("Remote node %s is version %d.%d.%d\n", - node, ntohl(version_nums[0]), - ntohl(version_nums[1]), ntohl(version_nums[2])); - - if (ntohl(version_nums[0]) != CLVMD_MAJOR_VERSION) { - struct clvm_header byebyemsg = { - .cmd = CLVMD_CMD_GOAWAY - }; - - DEBUGLOG("Telling node %s to go away because of incompatible version number\n", - node); - log_notice("Telling node %s to go away because of incompatible version number %d.%d.%d\n", - node, ntohl(version_nums[0]), - ntohl(version_nums[1]), ntohl(version_nums[2])); - - clops->cluster_send_message(&byebyemsg, sizeof(byebyemsg), our_csid, - "Error Sending GOAWAY message"); - } else - clops->add_up_node(csid); - - return; - } - - /* Allocate a default reply buffer */ - if ((replyargs = dm_malloc(max_cluster_message - sizeof(struct clvm_header)))) - /* Run the command */ - /* FIXME: usage of init_test() is unprotected */ - status = do_command(NULL, msg, msglen, &replyargs, - buflen, &replylen); - else - status = ENOMEM; - - /* If it wasn't a reply, then reply */ - if (msg->cmd != CLVMD_CMD_REPLY) { - char *aggreply; - - aggreply = dm_realloc(replyargs, replylen + sizeof(struct clvm_header)); - if (aggreply) { - struct clvm_header *agghead = - (struct clvm_header *) aggreply; - - replyargs = aggreply; - /* Move it up so there's room for a header in front of the data */ - memmove(aggreply + offsetof(struct clvm_header, args), - replyargs, replylen); - - agghead->xid = msg->xid; - agghead->cmd = CLVMD_CMD_REPLY; - agghead->status = status; - agghead->flags = 0; - agghead->clientid = msg->clientid; - agghead->arglen = replylen; - agghead->node[0] = '\0'; - send_message(aggreply, sizeof(struct clvm_header) + replylen, - csid, fd, "Error sending command reply"); - } else { - /* Return a failure response */ - struct clvm_header reply = { - .cmd = CLVMD_CMD_REPLY, - .status = ENOMEM, - .clientid = msg->clientid - }; - DEBUGLOG("Error attempting to realloc return buffer\n"); - send_message(&reply, sizeof(reply), csid, fd, - "Error sending ENOMEM command reply"); - } - } - - dm_free(replyargs); -} - -/* Add a reply to a command to the list of replies for this client. - If we have got a full set then send them to the waiting client down the local - socket */ -static void add_reply_to_list(struct local_client *client, int status, - const char *csid, const char *buf, int len) -{ - struct node_reply *reply; - - /* Add it to the list of replies */ - if (!(reply = dm_zalloc(sizeof(*reply)))) { - /* It's all gone horribly wrong... */ - send_local_reply(client, ENOMEM, client->fd); - return; - } - - reply->status = status; - clops->name_from_csid(csid, reply->node); - DEBUGLOG("(%p) Reply from node %s: %d bytes\n", client, reply->node, len); - - if (len > 0) { - if (!(reply->replymsg = dm_malloc(len))) - reply->status = ENOMEM; - else - memcpy(reply->replymsg, buf, len); - } else - reply->replymsg = NULL; - - pthread_mutex_lock(&client->bits.localsock.mutex); - - if (client->bits.localsock.finished) { - dm_free(reply->replymsg); - dm_free(reply); - } else { - /* Hook it onto the reply chain */ - reply->next = client->bits.localsock.replies; - client->bits.localsock.replies = reply; - - /* If we have the whole lot then do the post-process */ - /* Post-process the command */ - if (++client->bits.localsock.num_replies == - client->bits.localsock.expected_replies) { - client->bits.localsock.state = POST_COMMAND; - pthread_cond_signal(&client->bits.localsock.cond); - } - DEBUGLOG("(%p) Got %d replies, expecting: %d\n", - client, client->bits.localsock.num_replies, - client->bits.localsock.expected_replies); - } - pthread_mutex_unlock(&client->bits.localsock.mutex); -} - -/* This is the thread that runs the PRE and post commands for a particular connection */ -static __attribute__ ((noreturn)) void *pre_and_post_thread(void *arg) -{ - struct local_client *client = (struct local_client *) arg; - int status; - int write_status; - sigset_t ss; - int pipe_fd = client->bits.localsock.pipe; - - DEBUGLOG("(%p) Pre&post thread pipe fd %d\n", client, pipe_fd); - pthread_mutex_lock(&client->bits.localsock.mutex); - - /* Ignore SIGUSR1 (handled by master process) but enable - SIGUSR2 (kills subthreads) */ - sigemptyset(&ss); - sigaddset(&ss, SIGUSR1); - pthread_sigmask(SIG_BLOCK, &ss, NULL); - - sigdelset(&ss, SIGUSR1); - sigaddset(&ss, SIGUSR2); - pthread_sigmask(SIG_UNBLOCK, &ss, NULL); - - /* Loop around doing PRE and POST functions until the client goes away */ - while (!client->bits.localsock.finished) { - /* Execute the code */ - /* FIXME: usage of init_test() is unprotected as in do_command() */ - if ((status = do_pre_command(client))) - client->bits.localsock.all_success = 0; - - DEBUGLOG("(%p) Pre&post thread writes status %d down to pipe fd %d\n", - client, status, pipe_fd); - - /* Tell the parent process we have finished this bit */ - while ((write_status = write(pipe_fd, &status, sizeof(int))) != sizeof(int)) - if (write_status >=0 || (errno != EINTR && errno != EAGAIN)) { - log_error("Error sending to pipe: %m"); - break; - } - - if (status) { - client->bits.localsock.state = POST_COMMAND; - goto next_pre; - } - - /* We may need to wait for the condition variable before running the post command */ - if (client->bits.localsock.state != POST_COMMAND && - !client->bits.localsock.finished) { - DEBUGLOG("(%p) Pre&post thread waiting to do post command, state = %d\n", - client, client->bits.localsock.state); - pthread_cond_wait(&client->bits.localsock.cond, - &client->bits.localsock.mutex); - } - - DEBUGLOG("(%p) Pre&post thread got post command condition...\n", client); - - /* POST function must always run, even if the client aborts */ - status = 0; - do_post_command(client); - - while ((write_status = write(pipe_fd, &status, sizeof(int))) != sizeof(int)) - if (write_status >=0 || (errno != EINTR && errno != EAGAIN)) { - log_error("Error sending to pipe: %m"); - break; - } -next_pre: - if (client->bits.localsock.state != PRE_COMMAND && - !client->bits.localsock.finished) { - DEBUGLOG("(%p) Pre&post thread waiting for next pre command\n", client); - pthread_cond_wait(&client->bits.localsock.cond, - &client->bits.localsock.mutex); - } - - DEBUGLOG("(%p) Pre&post thread got pre command condition...\n", client); - } - pthread_mutex_unlock(&client->bits.localsock.mutex); - DEBUGLOG("(%p) Pre&post thread finished\n", client); - - pthread_exit(NULL); -} - -/* Process a command on the local node and store the result */ -static int process_local_command(struct clvm_header *msg, int msglen, - struct local_client *client, - unsigned short xid) -{ - char *replybuf; - int buflen = max_cluster_message - sizeof(struct clvm_header) - 1; - int replylen = 0; - int status; - - if (!(replybuf = dm_malloc(max_cluster_message))) - return -1; - - DEBUGLOG("(%p) process_local_command: %s msg=%p, msglen =%d\n", - client, decode_cmd(msg->cmd), msg, msglen); - - /* If remote flag is set, just set a successful status code. */ - if (msg->flags & CLVMD_FLAG_REMOTE) - status = 0; - else - status = do_command(client, msg, msglen, &replybuf, buflen, &replylen); - - if (status) - client->bits.localsock.all_success = 0; - - /* If we took too long then discard the reply */ - if (xid == client->xid) - add_reply_to_list(client, status, our_csid, replybuf, replylen); - else - DEBUGLOG("(%p) Local command took too long, discarding xid %d, current is %d\n", - client, xid, client->xid); - - dm_free(replybuf); - - return status; -} - -static int process_reply(const struct clvm_header *msg, int msglen, const char *csid) -{ - struct local_client *client; - - if (!(client = find_client(msg->clientid))) { - DEBUGLOG("Got message for unknown client 0x%x\n", - msg->clientid); - log_error("Got message for unknown client 0x%x.", - msg->clientid); - return -1; - } - - if (msg->status) - client->bits.localsock.all_success = 0; - - /* Gather replies together for this client id */ - if (msg->xid == client->xid) - add_reply_to_list(client, msg->status, csid, msg->args, - msg->arglen); - else - DEBUGLOG("Discarding reply with old XID %d, current = %d\n", - msg->xid, client->xid); - - return 0; -} - -/* Send an aggregated reply back to the client */ -static void send_local_reply(struct local_client *client, int status, int fd) -{ - struct clvm_header *clientreply; - struct node_reply *thisreply = client->bits.localsock.replies; - char *replybuf; - char *ptr; - int message_len = 0; - - DEBUGLOG("(%p) Send local reply\n", client); - - /* Work out the total size of the reply */ - while (thisreply) { - if (thisreply->replymsg) - message_len += strlen(thisreply->replymsg) + 1; - else - message_len++; - - message_len += strlen(thisreply->node) + 1 + sizeof(int); - - thisreply = thisreply->next; - } - - /* Add in the size of our header */ - message_len = message_len + sizeof(struct clvm_header); - if (!(replybuf = dm_malloc(message_len))) { - DEBUGLOG("(%p) Memory allocation fails\n", client); - return; - } - - clientreply = (struct clvm_header *) replybuf; - clientreply->status = status; - clientreply->cmd = CLVMD_CMD_REPLY; - clientreply->node[0] = '\0'; - clientreply->xid = 0; - clientreply->clientid = 0; - clientreply->flags = 0; - - ptr = clientreply->args; - - /* Add in all the replies, and free them as we go */ - thisreply = client->bits.localsock.replies; - while (thisreply) { - struct node_reply *tempreply = thisreply; - - strcpy(ptr, thisreply->node); - ptr += strlen(thisreply->node) + 1; - - if (thisreply->status) - clientreply->flags |= CLVMD_FLAG_NODEERRS; - - memcpy(ptr, &thisreply->status, sizeof(int)); - ptr += sizeof(int); - - if (thisreply->replymsg) { - strcpy(ptr, thisreply->replymsg); - ptr += strlen(thisreply->replymsg) + 1; - } else { - ptr[0] = '\0'; - ptr++; - } - thisreply = thisreply->next; - - dm_free(tempreply->replymsg); - dm_free(tempreply); - } - - /* Terminate with an empty node name */ - *ptr = '\0'; - - clientreply->arglen = ptr - clientreply->args; - - /* And send it */ - send_message(replybuf, message_len, our_csid, fd, - "Error sending REPLY to client"); - dm_free(replybuf); - - /* Reset comms variables */ - client->bits.localsock.replies = NULL; - client->bits.localsock.expected_replies = 0; - client->bits.localsock.in_progress = FALSE; - client->bits.localsock.sent_out = FALSE; -} - -/* Just free a reply chain baceuse it wasn't used. */ -static void free_reply(struct local_client *client) -{ - /* Add in all the replies, and free them as we go */ - struct node_reply *thisreply = client->bits.localsock.replies; - while (thisreply) { - struct node_reply *tempreply = thisreply; - - thisreply = thisreply->next; - - dm_free(tempreply->replymsg); - dm_free(tempreply); - } - client->bits.localsock.replies = NULL; -} - -/* Send our version number to the cluster */ -static void send_version_message(void) -{ - char message[sizeof(struct clvm_header) + sizeof(int) * 3]; - struct clvm_header *msg = (struct clvm_header *) message; - int version_nums[3] = { - htonl(CLVMD_MAJOR_VERSION), - htonl(CLVMD_MINOR_VERSION), - htonl(CLVMD_PATCH_VERSION) - }; - - msg->cmd = CLVMD_CMD_VERSION; - msg->status = 0; - msg->flags = 0; - msg->clientid = 0; - msg->arglen = sizeof(version_nums); - - memcpy(&msg->args, version_nums, sizeof(version_nums)); - - hton_clvm(msg); - - clops->cluster_send_message(message, sizeof(message), NULL, - "Error Sending version number"); -} - -/* Send a message to either a local client or another server */ -static int send_message(void *buf, int msglen, const char *csid, int fd, - const char *errtext) -{ - int len = 0; - int ptr; - struct timespec delay; - struct timespec remtime; - int retry_cnt = 0; - - /* Send remote messages down the cluster socket */ - if (!csid || !ISLOCAL_CSID(csid)) { - hton_clvm((struct clvm_header *) buf); - return clops->cluster_send_message(buf, msglen, csid, errtext); - } - - if (fd < 0) - return 0; - - /* Make sure it all goes */ - for (ptr = 0; ptr < msglen;) { - if ((len = write(fd, (char*)buf + ptr, msglen - ptr)) <= 0) { - if (errno == EINTR) - continue; - if ((errno == EAGAIN || errno == EIO || errno == ENOSPC) && - ++retry_cnt < MAX_RETRIES) { - delay.tv_sec = 0; - delay.tv_nsec = 100000; - remtime.tv_sec = 0; - remtime.tv_nsec = 0; - (void) nanosleep (&delay, &remtime); - continue; - } - DEBUGLOG("%s", errtext); - log_error("%s", errtext); - break; - } - ptr += len; - } - - return len; -} - -static int process_work_item(struct lvm_thread_cmd *cmd) -{ - /* If msg is NULL then this is a cleanup request */ - if (cmd->msg == NULL) { - DEBUGLOG("(%p) process_work_item: free\n", cmd->client); - cmd_client_cleanup(cmd->client); - pthread_mutex_destroy(&cmd->client->bits.localsock.mutex); - pthread_cond_destroy(&cmd->client->bits.localsock.cond); - dm_free(cmd->client); - return 0; - } - - if (!cmd->remote) { - DEBUGLOG("(%p) process_work_item: local\n", cmd->client); - process_local_command(cmd->msg, cmd->msglen, cmd->client, - cmd->xid); - } else { - DEBUGLOG("(%p) process_work_item: remote\n", cmd->client); - process_remote_command(cmd->msg, cmd->msglen, cmd->client->fd, - cmd->csid); - } - - return 0; -} - -/* - * Routine that runs in the "LVM thread". - */ -static void *lvm_thread_fn(void *arg) -{ - sigset_t ss; - struct lvm_startup_params *lvm_params = arg; - struct lvm_thread_cmd *cmd; - - DEBUGLOG("LVM thread function started\n"); - - /* Ignore SIGUSR1 & 2 */ - sigemptyset(&ss); - sigaddset(&ss, SIGUSR1); - sigaddset(&ss, SIGUSR2); - pthread_sigmask(SIG_BLOCK, &ss, NULL); - - /* Initialise the interface to liblvm */ - init_clvm(lvm_params->excl_uuid); - - /* Allow others to get moving */ - pthread_barrier_wait(&lvm_start_barrier); - DEBUGLOG("LVM thread ready for work.\n"); - - /* Now wait for some actual work */ - pthread_mutex_lock(&lvm_thread_mutex); - - for (;;) { - while (!dm_list_empty(&lvm_cmd_head)) { - cmd = dm_list_item(dm_list_first(&lvm_cmd_head), - struct lvm_thread_cmd); - dm_list_del(&cmd->list); - pthread_mutex_unlock(&lvm_thread_mutex); - - process_work_item(cmd); - dm_free(cmd->msg); - dm_free(cmd); - - pthread_mutex_lock(&lvm_thread_mutex); - } - - if (lvm_thread_exit) - break; - - DEBUGLOG("LVM thread waiting for work\n"); - pthread_cond_wait(&lvm_thread_cond, &lvm_thread_mutex); - } - - pthread_mutex_unlock(&lvm_thread_mutex); - DEBUGLOG("LVM thread exits\n"); - - destroy_lvm(); - - pthread_exit(NULL); -} - -/* Pass down some work to the LVM thread */ -static int add_to_lvmqueue(struct local_client *client, struct clvm_header *msg, - int msglen, const char *csid) -{ - struct lvm_thread_cmd *cmd; - - if (!(cmd = dm_malloc(sizeof(*cmd)))) - return ENOMEM; - - if (msglen) { - if (!(cmd->msg = dm_malloc(msglen))) { - log_error("Unable to allocate buffer space."); - dm_free(cmd); - return -1; - } - memcpy(cmd->msg, msg, msglen); - } - else - cmd->msg = NULL; - - cmd->client = client; - cmd->msglen = msglen; - cmd->xid = client->xid; - - if (csid) { - memcpy(cmd->csid, csid, max_csid_len); - cmd->remote = 1; - } else - cmd->remote = 0; - - DEBUGLOG("(%p) add_to_lvmqueue: cmd=%p, msg=%p, len=%d, csid=%p, xid=%d\n", - client, cmd, msg, msglen, csid, cmd->xid); - pthread_mutex_lock(&lvm_thread_mutex); - if (lvm_thread_exit) { - pthread_mutex_unlock(&lvm_thread_mutex); - dm_free(cmd->msg); - dm_free(cmd); - return -1; /* We are about to exit */ - } - dm_list_add(&lvm_cmd_head, &cmd->list); - pthread_cond_signal(&lvm_thread_cond); - pthread_mutex_unlock(&lvm_thread_mutex); - - return 0; -} - -/* Return 0 if we can talk to an existing clvmd */ -/* - * FIXME: - * - * This function returns only -1 or 0, but there are - * different levels of errors, some of them should stop - * further execution of clvmd thus another state is needed - * and some error message need to be only informational. - */ -static int check_local_clvmd(void) -{ - int local_socket; - int ret = 0; - struct sockaddr_un sockaddr = { .sun_family = AF_UNIX }; - - if (!dm_strncpy(sockaddr.sun_path, CLVMD_SOCKNAME, sizeof(sockaddr.sun_path))) { - log_error("%s: clvmd socket name too long.", CLVMD_SOCKNAME); - return -1; - } - - /* Open local socket */ - if ((local_socket = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { - log_sys_error("socket", "local socket"); - return -1; - } - - if (connect(local_socket,(struct sockaddr *) &sockaddr, - sizeof(sockaddr))) { - /* connection failure is expected state */ - if (errno == ENOENT) - log_sys_debug("connect", "local socket"); - else - log_sys_error("connect", "local socket"); - ret = -1; - } - - if (close(local_socket)) - log_sys_error("close", "local socket"); - - return ret; -} - -static void close_local_sock(int local_socket) -{ - if (local_socket != -1 && close(local_socket)) - log_sys_error("close", CLVMD_SOCKNAME); - - if (CLVMD_SOCKNAME[0] != '\0' && unlink(CLVMD_SOCKNAME)) - stack; -} - -/* Open the local socket, that's the one we talk to libclvm down */ -static int open_local_sock(void) -{ - mode_t old_mask; - int local_socket = -1; - struct sockaddr_un sockaddr = { .sun_family = AF_UNIX }; - - if (!dm_strncpy(sockaddr.sun_path, CLVMD_SOCKNAME, sizeof(sockaddr.sun_path))) { - log_error("%s: clvmd socket name too long.", CLVMD_SOCKNAME); - return -1; - } - - close_local_sock(local_socket); - - (void) dm_prepare_selinux_context(CLVMD_SOCKNAME, S_IFSOCK); - old_mask = umask(0077); - - /* Open local socket */ - if ((local_socket = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { - log_error("Can't create local socket: %m"); - goto error; - } - - /* Set Close-on-exec & non-blocking */ - if (fcntl(local_socket, F_SETFD, 1)) - DEBUGLOG("setting CLOEXEC on local_socket failed: %s\n", strerror(errno)); - if (fcntl(local_socket, F_SETFL, fcntl(local_socket, F_GETFL, 0) | O_NONBLOCK)) - DEBUGLOG("setting O_NONBLOCK on local_socket failed: %s\n", strerror(errno)); - - - if (bind(local_socket, (struct sockaddr *) &sockaddr, sizeof(sockaddr))) { - log_error("can't bind local socket: %m"); - goto error; - } - if (listen(local_socket, 1) != 0) { - log_error("listen local: %m"); - goto error; - } - - umask(old_mask); - (void) dm_prepare_selinux_context(NULL, 0); - return local_socket; -error: - close_local_sock(local_socket); - umask(old_mask); - (void) dm_prepare_selinux_context(NULL, 0); - return -1; -} - -void process_message(struct local_client *client, char *buf, int len, - const char *csid) -{ - char nodename[max_cluster_member_name_len]; - struct clvm_header *inheader = (struct clvm_header *) buf; - ntoh_clvm(inheader); /* Byteswap fields */ - - if (verify_message(buf, len) < 0) { - clops->name_from_csid(csid, nodename); - log_error("process_message from %s len %d bad verify.", nodename, len); - dump_message(buf, len); - return; - } - - if (inheader->cmd == CLVMD_CMD_REPLY) - process_reply(inheader, len, csid); - else - add_to_lvmqueue(client, inheader, len, csid); -} - - -static void check_all_callback(struct local_client *client, const char *csid, - int node_up) -{ - if (!node_up) - add_reply_to_list(client, EHOSTDOWN, csid, "CLVMD not running", 18); -} - -/* Check to see if all CLVMDs are running (ie one on - every node in the cluster). - If not, returns -1 and prints out a list of errant nodes */ -static int check_all_clvmds_running(struct local_client *client) -{ - DEBUGLOG("(%p) check_all_clvmds_running\n", client); - - return clops->cluster_do_node_callback(client, check_all_callback); -} - -/* Return a local_client struct given a client ID. - client IDs are in network byte order */ -static struct local_client *find_client(int clientid) -{ - struct local_client *thisfd; - - for (thisfd = &local_client_head; thisfd; thisfd = thisfd->next) - if (thisfd->fd == (int)ntohl(clientid)) - return thisfd; - - return NULL; -} - -/* Byte-swapping routines for the header so we - work in a heterogeneous environment */ -static void hton_clvm(struct clvm_header *hdr) -{ - hdr->status = htonl(hdr->status); - hdr->arglen = htonl(hdr->arglen); - hdr->xid = htons(hdr->xid); - /* Don't swap clientid as it's only a token as far as - remote nodes are concerned */ -} - -static void ntoh_clvm(struct clvm_header *hdr) -{ - hdr->status = ntohl(hdr->status); - hdr->arglen = ntohl(hdr->arglen); - hdr->xid = ntohs(hdr->xid); -} - -/* Handler for SIGUSR2 - sent to kill subthreads */ -static void sigusr2_handler(int sig) -{ - DEBUGLOG("SIGUSR2 received\n"); -} - -static void sigterm_handler(int sig) -{ - quit = 1; -} - -static void sighup_handler(int sig) -{ - reread_config = 1; -} - -int sync_lock(const char *resource, int mode, int flags, int *lockid) -{ - return clops->sync_lock(resource, mode, flags, lockid); -} - -int sync_unlock(const char *resource, int lockid) -{ - return clops->sync_unlock(resource, lockid); -} - -static if_type_t parse_cluster_interface(char *ifname) -{ - if_type_t iface = IF_AUTO; - - if (!strcmp(ifname, "auto")) - iface = IF_AUTO; - else if (!strcmp(ifname, "cman")) - iface = IF_CMAN; - else if (!strcmp(ifname, "openais")) - iface = IF_OPENAIS; - else if (!strcmp(ifname, "corosync")) - iface = IF_COROSYNC; - else if (!strcmp(ifname, "singlenode")) - iface = IF_SINGLENODE; - - return iface; -} - -/* - * Try and find a cluster system in corosync's objdb, if it is running. This is - * only called if the command-line option is not present, and if it fails - * we still try the interfaces in order. - */ -static if_type_t get_cluster_type(void) -{ -#ifdef HAVE_COROSYNC_CONFDB_H - confdb_handle_t handle; - if_type_t type = IF_AUTO; - int result; - char buf[255]; - size_t namelen = sizeof(buf); - hdb_handle_t cluster_handle; - hdb_handle_t clvmd_handle; - confdb_callbacks_t callbacks = { 0 }; - - result = confdb_initialize (&handle, &callbacks); - if (result != CS_OK) - return type; - - result = confdb_object_find_start(handle, OBJECT_PARENT_HANDLE); - if (result != CS_OK) - goto out; - - result = confdb_object_find(handle, OBJECT_PARENT_HANDLE, (void *)"cluster", strlen("cluster"), &cluster_handle); - if (result != CS_OK) - goto out; - - result = confdb_object_find_start(handle, cluster_handle); - if (result != CS_OK) - goto out; - - result = confdb_object_find(handle, cluster_handle, (void *)"clvmd", strlen("clvmd"), &clvmd_handle); - if (result != CS_OK) - goto out; - - result = confdb_key_get(handle, clvmd_handle, (void *)"interface", strlen("interface"), buf, &namelen); - if (result != CS_OK) - goto out; - - if (namelen >= sizeof(buf)) - namelen = sizeof(buf) - 1; - - buf[namelen] = '\0'; - type = parse_cluster_interface(buf); - DEBUGLOG("got interface type '%s' from confdb\n", buf); -out: - confdb_finalize(handle); - return type; -#else - return IF_AUTO; -#endif -} diff --git a/daemons/clvmd/clvmd.h b/daemons/clvmd/clvmd.h deleted file mode 100644 index edaee88..0000000 --- a/daemons/clvmd/clvmd.h +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _CLVMD_H -#define _CLVMD_H - -#define CLVMD_MAJOR_VERSION 0 -#define CLVMD_MINOR_VERSION 2 -#define CLVMD_PATCH_VERSION 1 - -/* Default time (in seconds) we will wait for all remote commands to execute - before declaring them dead */ -#define DEFAULT_CMD_TIMEOUT 60 - -/* One of these for each reply we get from command execution on a node */ -struct node_reply { - char node[MAX_CLUSTER_MEMBER_NAME_LEN]; - char *replymsg; - int status; - struct node_reply *next; -}; - -typedef enum {DEBUG_OFF, DEBUG_STDERR, DEBUG_SYSLOG} debug_t; - -/* - * These exist for the use of local sockets only when we are - * collecting responses from all cluster nodes - */ -struct localsock_bits { - struct node_reply *replies; - int num_replies; - int expected_replies; - time_t sent_time; /* So we can check for timeouts */ - int in_progress; /* Only execute one cmd at a time per client */ - int sent_out; /* Flag to indicate that a command was sent - to remote nodes */ - void *private; /* Private area for command processor use */ - void *cmd; /* Whole command as passed down local socket */ - int cmd_len; /* Length of above */ - int pipe; /* Pipe to send PRE completion status down */ - int finished; /* Flag to tell subthread to exit */ - int all_success; /* Set to 0 if any node (or the pre_command) - failed */ - int cleanup_needed; /* helper for cleanup_zombie */ - struct local_client *pipe_client; - pthread_t threadid; - enum { PRE_COMMAND, POST_COMMAND } state; - pthread_mutex_t mutex; /* Main thread and worker synchronisation */ - pthread_cond_t cond; -}; - -/* Entries for PIPE clients */ -struct pipe_bits { - struct local_client *client; /* Actual (localsock) client */ - pthread_t threadid; /* Our own copy of the thread id */ -}; - -/* Entries for Network socket clients */ -struct netsock_bits { - void *private; - int flags; -}; - -typedef int (*fd_callback_t) (struct local_client * fd, char *buf, int len, - const char *csid, - struct local_client ** new_client); - -/* One of these for each fd we are listening on */ -struct local_client { - int fd; - enum { CLUSTER_MAIN_SOCK, CLUSTER_DATA_SOCK, LOCAL_RENDEZVOUS, - LOCAL_SOCK, THREAD_PIPE, CLUSTER_INTERNAL } type; - struct local_client *next; - unsigned short xid; - fd_callback_t callback; - uint8_t removeme; - - union { - struct localsock_bits localsock; - struct pipe_bits pipe; - struct netsock_bits net; - } bits; -}; - -#define DEBUGLOG(fmt, args...) debuglog(fmt, ## args) - -#ifndef max -#define max(a,b) ((a)>(b)?(a):(b)) -#endif - -/* The real command processor is in clvmd-command.c */ -extern int do_command(struct local_client *client, struct clvm_header *msg, - int msglen, char **buf, int buflen, int *retlen); - -/* Pre and post command routines are called only on the local node */ -extern int do_pre_command(struct local_client *client); -extern int do_post_command(struct local_client *client); -extern void cmd_client_cleanup(struct local_client *client); -extern int add_client(struct local_client *new_client); - -extern void clvmd_cluster_init_completed(void); -extern void process_message(struct local_client *client, char *buf, - int len, const char *csid); -extern void debuglog(const char *fmt, ... ) - __attribute__ ((format(printf, 1, 2))); - -void clvmd_set_debug(debug_t new_de); -debug_t clvmd_get_debug(void); -int clvmd_get_foreground(void); - -int sync_lock(const char *resource, int mode, int flags, int *lockid); -int sync_unlock(const char *resource, int lockid); - -#endif diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c deleted file mode 100644 index ed82959..0000000 --- a/daemons/clvmd/lvm-functions.c +++ /dev/null @@ -1,927 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "clvmd-common.h" - -#include <pthread.h> - -#include "daemons/clvmd/clvm.h" -#include "clvmd-comms.h" -#include "clvmd.h" -#include "lvm-functions.h" - -/* LVM2 headers */ -#include "lib/commands/toolcontext.h" -#include "lib/cache/lvmcache.h" -#include "lib/misc/lvm-globals.h" -#include "lib/activate/activate.h" -#include "lib/format_text/archiver.h" -#include "lib/mm/memlock.h" - -#include <syslog.h> - -static struct cmd_context *cmd = NULL; -static struct dm_hash_table *lv_hash = NULL; -static pthread_mutex_t lv_hash_lock; -static pthread_mutex_t lvm_lock; -static char last_error[1024]; - -struct lv_info { - int lock_id; - int lock_mode; -}; - -static const char *decode_full_locking_cmd(uint32_t cmdl) -{ - static char buf[128]; - const char *type; - const char *scope; - const char *command; - - switch (cmdl & LCK_TYPE_MASK) { - case LCK_NULL: - type = "NULL"; - break; - case LCK_READ: - type = "READ"; - break; - case LCK_PREAD: - type = "PREAD"; - break; - case LCK_WRITE: - type = "WRITE"; - break; - case LCK_EXCL: - type = "EXCL"; - break; - case LCK_UNLOCK: - type = "UNLOCK"; - break; - default: - type = "unknown"; - break; - } - - switch (cmdl & LCK_SCOPE_MASK) { - case LCK_VG: - scope = "VG"; - command = "LCK_VG"; - break; - case LCK_LV: - scope = "LV"; - switch (cmdl & LCK_MASK) { - case LCK_LV_EXCLUSIVE & LCK_MASK: - command = "LCK_LV_EXCLUSIVE"; - break; - case LCK_LV_SUSPEND & LCK_MASK: - command = "LCK_LV_SUSPEND"; - break; - case LCK_LV_RESUME & LCK_MASK: - command = "LCK_LV_RESUME"; - break; - case LCK_LV_ACTIVATE & LCK_MASK: - command = "LCK_LV_ACTIVATE"; - break; - case LCK_LV_DEACTIVATE & LCK_MASK: - command = "LCK_LV_DEACTIVATE"; - break; - default: - command = "unknown"; - break; - } - break; - default: - scope = "unknown"; - command = "unknown"; - break; - } - - sprintf(buf, "0x%x %s (%s|%s%s%s%s%s)", cmdl, command, type, scope, - cmdl & LCK_NONBLOCK ? "|NONBLOCK" : "", - cmdl & LCK_HOLD ? "|HOLD" : "", - cmdl & LCK_CLUSTER_VG ? "|CLUSTER_VG" : "", - cmdl & LCK_CACHE ? "|CACHE" : ""); - - return buf; -} - -/* - * Only processes 8 bits: excludes LCK_CACHE. - */ -static const char *decode_locking_cmd(unsigned char cmdl) -{ - return decode_full_locking_cmd((uint32_t) cmdl); -} - -static const char *decode_flags(unsigned char flags) -{ - static char buf[128]; - int len; - - len = sprintf(buf, "0x%x ( %s%s%s%s%s%s%s%s)", flags, - flags & LCK_PARTIAL_MODE ? "PARTIAL_MODE|" : "", - flags & LCK_MIRROR_NOSYNC_MODE ? "MIRROR_NOSYNC|" : "", - flags & LCK_DMEVENTD_MONITOR_MODE ? "DMEVENTD_MONITOR|" : "", - flags & LCK_ORIGIN_ONLY_MODE ? "ORIGIN_ONLY|" : "", - flags & LCK_TEST_MODE ? "TEST|" : "", - flags & LCK_CONVERT_MODE ? "CONVERT|" : "", - flags & LCK_DMEVENTD_MONITOR_IGNORE ? "DMEVENTD_MONITOR_IGNORE|" : "", - flags & LCK_REVERT_MODE ? "REVERT|" : ""); - - if (len > 1) - buf[len - 2] = ' '; - else - buf[0] = '\0'; - - return buf; -} - -char *get_last_lvm_error(void) -{ - return last_error; -} - -/* - * Hash lock info helpers - */ -static struct lv_info *lookup_info(const char *resource) -{ - struct lv_info *lvi; - - pthread_mutex_lock(&lv_hash_lock); - lvi = dm_hash_lookup(lv_hash, resource); - pthread_mutex_unlock(&lv_hash_lock); - - return lvi; -} - -static int insert_info(const char *resource, struct lv_info *lvi) -{ - int ret; - - pthread_mutex_lock(&lv_hash_lock); - ret = dm_hash_insert(lv_hash, resource, lvi); - pthread_mutex_unlock(&lv_hash_lock); - - return ret; -} - -static void remove_info(const char *resource) -{ - int num_open; - - pthread_mutex_lock(&lv_hash_lock); - dm_hash_remove(lv_hash, resource); - - /* When last lock is remove, validate there are not left opened devices */ - if (!dm_hash_get_first(lv_hash)) { - if (critical_section()) - log_error(INTERNAL_ERROR "No volumes are locked however clvmd is in activation mode critical section."); - if ((num_open = dev_cache_check_for_open_devices())) - log_error(INTERNAL_ERROR "No volumes are locked however %d devices are still open.", num_open); - } - - pthread_mutex_unlock(&lv_hash_lock); -} - -/* - * Return the mode a lock is currently held at (or -1 if not held) - */ -static int get_current_lock(char *resource) -{ - struct lv_info *lvi; - - if ((lvi = lookup_info(resource))) - return lvi->lock_mode; - - return -1; -} - - -void init_lvhash(void) -{ - /* Create hash table for keeping LV locks & status */ - lv_hash = dm_hash_create(1024); - pthread_mutex_init(&lv_hash_lock, NULL); - pthread_mutex_init(&lvm_lock, NULL); -} - -/* Called at shutdown to tidy the lockspace */ -void destroy_lvhash(void) -{ - struct dm_hash_node *v; - struct lv_info *lvi; - char *resource; - int status; - - pthread_mutex_lock(&lv_hash_lock); - - dm_hash_iterate(v, lv_hash) { - lvi = dm_hash_get_data(lv_hash, v); - resource = dm_hash_get_key(lv_hash, v); - - if ((status = sync_unlock(resource, lvi->lock_id))) - DEBUGLOG("unlock_all. unlock failed(%d): %s\n", - status, strerror(errno)); - dm_free(lvi); - } - - dm_hash_destroy(lv_hash); - lv_hash = NULL; - - pthread_mutex_unlock(&lv_hash_lock); -} - -/* Gets a real lock and keeps the info in the hash table */ -static int hold_lock(char *resource, int mode, int flags) -{ - int status; - int saved_errno; - struct lv_info *lvi; - - /* Mask off invalid options */ - flags &= LCKF_NOQUEUE | LCKF_CONVERT; - - lvi = lookup_info(resource); - - if (lvi) { - if (lvi->lock_mode == mode) { - DEBUGLOG("hold_lock, lock mode %d already held\n", - mode); - return 0; - } - if ((lvi->lock_mode == LCK_EXCL) && (mode == LCK_WRITE)) { - DEBUGLOG("hold_lock, lock already held LCK_EXCL, " - "ignoring LCK_WRITE request\n"); - return 0; - } - } - - /* Only allow explicit conversions */ - if (lvi && !(flags & LCKF_CONVERT)) { - errno = EBUSY; - return -1; - } - if (lvi) { - /* Already exists - convert it */ - status = sync_lock(resource, mode, flags, &lvi->lock_id); - saved_errno = errno; - if (!status) - lvi->lock_mode = mode; - else - DEBUGLOG("hold_lock. convert to %d failed: %s\n", mode, - strerror(errno)); - errno = saved_errno; - } else { - if (!(lvi = dm_malloc(sizeof(struct lv_info)))) { - errno = ENOMEM; - return -1; - } - - lvi->lock_mode = mode; - lvi->lock_id = 0; - status = sync_lock(resource, mode, flags & ~LCKF_CONVERT, &lvi->lock_id); - saved_errno = errno; - if (status) { - dm_free(lvi); - DEBUGLOG("hold_lock. lock at %d failed: %s\n", mode, - strerror(errno)); - } else - if (!insert_info(resource, lvi)) { - errno = ENOMEM; - return -1; - } - - errno = saved_errno; - } - return status; -} - -/* Unlock and remove it from the hash table */ -static int hold_unlock(char *resource) -{ - struct lv_info *lvi; - int status; - int saved_errno; - - if (!(lvi = lookup_info(resource))) { - DEBUGLOG("hold_unlock, lock not already held\n"); - return 0; - } - - status = sync_unlock(resource, lvi->lock_id); - saved_errno = errno; - if (!status) { - remove_info(resource); - dm_free(lvi); - } else { - DEBUGLOG("hold_unlock. unlock failed(%d): %s\n", status, - strerror(errno)); - } - - errno = saved_errno; - return status; -} - -/* Watch the return codes here. - liblvm API functions return 1(true) for success, 0(false) for failure and don't set errno. - libdlm API functions return 0 for success, -1 for failure and do set errno. - These functions here return 0 for success or >0 for failure (where the retcode is errno) -*/ - -/* Activate LV exclusive or non-exclusive */ -static int do_activate_lv(char *resource, unsigned char command, unsigned char lock_flags, int mode) -{ - int oldmode; - int status; - int activate_lv; - int exclusive = 0; - struct lvinfo lvi; - - /* Is it already open ? */ - oldmode = get_current_lock(resource); - if (oldmode == mode && (command & LCK_CLUSTER_VG)) { - DEBUGLOG("do_activate_lv, lock already held at %d\n", oldmode); - return 0; /* Nothing to do */ - } - - /* Does the config file want us to activate this LV ? */ - if (!lv_activation_filter(cmd, resource, &activate_lv, NULL)) - return EIO; - - if (!activate_lv) - return 0; /* Success, we did nothing! */ - - /* Do we need to activate exclusively? */ - if ((activate_lv == 2) || (mode == LCK_EXCL)) { - exclusive = 1; - mode = LCK_EXCL; - } - - /* - * Try to get the lock if it's a clustered volume group. - * Use lock conversion only if requested, to prevent implicit conversion - * of exclusive lock to shared one during activation. - */ - if (!test_mode() && command & LCK_CLUSTER_VG) { - status = hold_lock(resource, mode, LCKF_NOQUEUE | ((lock_flags & LCK_CONVERT_MODE) ? LCKF_CONVERT:0)); - if (status) { - /* Return an LVM-sensible error for this. - * Forcing EIO makes the upper level return this text - * rather than the strerror text for EAGAIN. - */ - if (errno == EAGAIN) { - sprintf(last_error, "Volume is busy on another node"); - errno = EIO; - } - return errno; - } - } - - /* If it's suspended then resume it */ - if (!lv_info_by_lvid(cmd, resource, 0, &lvi, 0, 0)) - goto error; - - if (lvi.suspended) { - critical_section_inc(cmd, "resuming"); - if (!lv_resume(cmd, resource, 0, NULL)) { - critical_section_dec(cmd, "resumed"); - goto error; - } - } - - /* Now activate it */ - if (!lv_activate(cmd, resource, exclusive, 0, 0, NULL)) - goto error; - - return 0; - -error: - if (!test_mode() && (oldmode == -1 || oldmode != mode)) - (void)hold_unlock(resource); - return EIO; -} - -/* Resume the LV if it was active */ -static int do_resume_lv(char *resource, unsigned char command, unsigned char lock_flags) -{ - int oldmode, origin_only, exclusive, revert; - - /* Is it open ? */ - oldmode = get_current_lock(resource); - if (oldmode == -1 && (command & LCK_CLUSTER_VG)) { - DEBUGLOG("do_resume_lv, lock not already held\n"); - return 0; /* We don't need to do anything */ - } - origin_only = (lock_flags & LCK_ORIGIN_ONLY_MODE) ? 1 : 0; - exclusive = (oldmode == LCK_EXCL) ? 1 : 0; - revert = (lock_flags & LCK_REVERT_MODE) ? 1 : 0; - - if (!lv_resume_if_active(cmd, resource, origin_only, exclusive, revert, NULL)) - return EIO; - - return 0; -} - -/* Suspend the device if active */ -static int do_suspend_lv(char *resource, unsigned char command, unsigned char lock_flags) -{ - int oldmode; - unsigned origin_only = (lock_flags & LCK_ORIGIN_ONLY_MODE) ? 1 : 0; - unsigned exclusive; - - /* Is it open ? */ - oldmode = get_current_lock(resource); - if (oldmode == -1 && (command & LCK_CLUSTER_VG)) { - DEBUGLOG("do_suspend_lv, lock not already held\n"); - return 0; /* Not active, so it's OK */ - } - - exclusive = (oldmode == LCK_EXCL) ? 1 : 0; - - /* Always call lv_suspend to read commited and precommited data */ - if (!lv_suspend_if_active(cmd, resource, origin_only, exclusive, NULL, NULL)) - return EIO; - - return 0; -} - -static int do_deactivate_lv(char *resource, unsigned char command, unsigned char lock_flags) -{ - int oldmode; - int status; - - /* Is it open ? */ - oldmode = get_current_lock(resource); - if (oldmode == -1 && (command & LCK_CLUSTER_VG)) { - DEBUGLOG("do_deactivate_lock, lock not already held\n"); - return 0; /* We don't need to do anything */ - } - - if (!lv_deactivate(cmd, resource, NULL)) - return EIO; - - if (!test_mode() && command & LCK_CLUSTER_VG) { - status = hold_unlock(resource); - if (status) - return errno; - } - - return 0; -} - -const char *do_lock_query(char *resource) -{ - int mode; - const char *type; - - mode = get_current_lock(resource); - switch (mode) { - case LCK_NULL: type = "NL"; break; - case LCK_READ: type = "CR"; break; - case LCK_PREAD:type = "PR"; break; - case LCK_WRITE:type = "PW"; break; - case LCK_EXCL: type = "EX"; break; - default: type = NULL; - } - - DEBUGLOG("do_lock_query: resource '%s', mode %i (%s)\n", resource, mode, type ?: "--"); - - return type; -} - -/* This is the LOCK_LV part that happens on all nodes in the cluster - - it is responsible for the interaction with device-mapper and LVM */ -int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource) -{ - int status = 0; - - DEBUGLOG("do_lock_lv: resource '%s', cmd = %s, flags = %s, critical_section = %d\n", - resource, decode_locking_cmd(command), decode_flags(lock_flags), critical_section()); - - if (!cmd->initialized.config || config_files_changed(cmd)) { - /* Reinitialise various settings inc. logging, filters */ - if (do_refresh_cache()) { - log_error("Updated config file invalid. Aborting."); - return EINVAL; - } - } - - pthread_mutex_lock(&lvm_lock); - init_test((lock_flags & LCK_TEST_MODE) ? 1 : 0); - - if (lock_flags & LCK_MIRROR_NOSYNC_MODE) - init_mirror_in_sync(1); - - if (lock_flags & LCK_DMEVENTD_MONITOR_IGNORE) - init_dmeventd_monitor(DMEVENTD_MONITOR_IGNORE); - else { - if (lock_flags & LCK_DMEVENTD_MONITOR_MODE) - init_dmeventd_monitor(1); - else - init_dmeventd_monitor(0); - } - - cmd->partial_activation = (lock_flags & LCK_PARTIAL_MODE) ? 1 : 0; - - /* clvmd should never try to read suspended device */ - init_ignore_suspended_devices(1); - - switch (command & LCK_MASK) { - case LCK_LV_EXCLUSIVE: - status = do_activate_lv(resource, command, lock_flags, LCK_EXCL); - break; - - case LCK_LV_SUSPEND: - status = do_suspend_lv(resource, command, lock_flags); - break; - - case LCK_UNLOCK: - case LCK_LV_RESUME: /* if active */ - status = do_resume_lv(resource, command, lock_flags); - break; - - case LCK_LV_ACTIVATE: - status = do_activate_lv(resource, command, lock_flags, LCK_READ); - break; - - case LCK_LV_DEACTIVATE: - status = do_deactivate_lv(resource, command, lock_flags); - break; - - default: - DEBUGLOG("Invalid LV command 0x%x\n", command); - status = EINVAL; - break; - } - - if (lock_flags & LCK_MIRROR_NOSYNC_MODE) - init_mirror_in_sync(0); - - cmd->partial_activation = 0; - - /* clean the pool for another command */ - dm_pool_empty(cmd->mem); - init_test(0); - pthread_mutex_unlock(&lvm_lock); - - DEBUGLOG("Command return is %d, critical_section is %d\n", status, critical_section()); - return status; -} - -/* Functions to do on the local node only BEFORE the cluster-wide stuff above happens */ -int pre_lock_lv(unsigned char command, unsigned char lock_flags, char *resource) -{ - /* Nearly all the stuff happens cluster-wide. Apart from SUSPEND. Here we get the - lock out on this node (because we are the node modifying the metadata) - before suspending cluster-wide. - LCKF_CONVERT is used always, local node is going to modify metadata - */ - if ((command & (LCK_SCOPE_MASK | LCK_TYPE_MASK)) == LCK_LV_SUSPEND && - (command & LCK_CLUSTER_VG)) { - DEBUGLOG("pre_lock_lv: resource '%s', cmd = %s, flags = %s\n", - resource, decode_locking_cmd(command), decode_flags(lock_flags)); - - if (!(lock_flags & LCK_TEST_MODE) && - hold_lock(resource, LCK_WRITE, LCKF_NOQUEUE | LCKF_CONVERT)) - return errno; - } - return 0; -} - -/* Functions to do on the local node only AFTER the cluster-wide stuff above happens */ -int post_lock_lv(unsigned char command, unsigned char lock_flags, - char *resource) -{ - int status; - unsigned origin_only = (lock_flags & LCK_ORIGIN_ONLY_MODE) ? 1 : 0; - - /* Opposite of above, done on resume after a metadata update */ - if ((command & (LCK_SCOPE_MASK | LCK_TYPE_MASK)) == LCK_LV_RESUME && - (command & LCK_CLUSTER_VG)) { - int oldmode; - - DEBUGLOG("post_lock_lv: resource '%s', cmd = %s, flags = %s\n", - resource, decode_locking_cmd(command), decode_flags(lock_flags)); - - /* If the lock state is PW then restore it to what it was */ - oldmode = get_current_lock(resource); - if (oldmode == LCK_WRITE) { - struct lvinfo lvi; - - pthread_mutex_lock(&lvm_lock); - status = lv_info_by_lvid(cmd, resource, origin_only, &lvi, 0, 0); - pthread_mutex_unlock(&lvm_lock); - if (!status) - return EIO; - - if (!(lock_flags & LCK_TEST_MODE)) { - if (lvi.exists) { - if (hold_lock(resource, LCK_READ, LCKF_CONVERT)) - return errno; - } else if (hold_unlock(resource)) - return errno; - } - } - } - return 0; -} - -int do_refresh_cache(void) -{ - DEBUGLOG("Refreshing context\n"); - log_notice("Refreshing context"); - - pthread_mutex_lock(&lvm_lock); - - if (!refresh_toolcontext(cmd)) { - pthread_mutex_unlock(&lvm_lock); - return -1; - } - - init_ignore_suspended_devices(1); - lvmcache_label_scan(cmd); - label_scan_destroy(cmd); /* destroys bcache (to close devs), keeps lvmcache */ - dm_pool_empty(cmd->mem); - - pthread_mutex_unlock(&lvm_lock); - - return 0; -} - -/* - * Handle VG lock - drop metadata or update lvmcache state - */ -void do_lock_vg(unsigned char command, unsigned char lock_flags, char *resource) -{ - uint32_t lock_cmd = command; - char *vgname = resource + 2; - - lock_cmd &= (LCK_SCOPE_MASK | LCK_TYPE_MASK | LCK_HOLD); - - /* - * Check if LCK_CACHE should be set. All P_ locks except # are cache related. - */ - if (strncmp(resource, "P_#", 3) && !strncmp(resource, "P_", 2)) - lock_cmd |= LCK_CACHE; - - DEBUGLOG("do_lock_vg: resource '%s', cmd = %s, flags = %s, critical_section = %d\n", - resource, decode_full_locking_cmd(lock_cmd), decode_flags(lock_flags), critical_section()); - - /* P_#global causes a full cache refresh */ - if (!strcmp(resource, "P_" VG_GLOBAL)) { - do_refresh_cache(); - return; - } - - pthread_mutex_lock(&lvm_lock); - init_test((lock_flags & LCK_TEST_MODE) ? 1 : 0); - - switch (lock_cmd) { - case LCK_VG_COMMIT: - DEBUGLOG("vg_commit notification for VG %s\n", vgname); - lvmcache_commit_metadata(vgname); - break; - case LCK_VG_REVERT: - DEBUGLOG("vg_revert notification for VG %s\n", vgname); - lvmcache_drop_metadata(vgname, 1); - break; - case LCK_VG_DROP_CACHE: - default: - DEBUGLOG("Invalidating cached metadata for VG %s\n", vgname); - lvmcache_drop_metadata(vgname, 0); - } - - init_test(0); - pthread_mutex_unlock(&lvm_lock); -} - -/* - * Ideally, clvmd should be started before any LVs are active - * but this may not be the case... - * I suppose this also comes in handy if clvmd crashes, not that it would! - */ -static int get_initial_state(struct dm_hash_table *excl_uuid) -{ - int lock_mode; - char lv[65], vg[65], flags[26], vg_flags[26]; /* with space for '\0' */ - char uuid[65]; - char line[255]; - char *lvs_cmd; - const char *lvm_binary = getenv("LVM_BINARY") ? : LVM_PATH; - FILE *lvs; - - if (dm_asprintf(&lvs_cmd, "%s lvs --config 'log{command_names=0 prefix=\"\"}' " - "--nolocking --noheadings -o vg_uuid,lv_uuid,lv_attr,vg_attr", - lvm_binary) < 0) - return_0; - - /* FIXME: Maybe link and use liblvm2cmd directly instead of fork */ - if (!(lvs = popen(lvs_cmd, "r"))) { - dm_free(lvs_cmd); - return 0; - } - - while (fgets(line, sizeof(line), lvs)) { - if (sscanf(line, "%64s %64s %25s %25s\n", vg, lv, flags, vg_flags) == 4) { - - /* States: s:suspended a:active S:dropped snapshot I:invalid snapshot */ - if (strlen(vg) == 38 && /* is is a valid UUID ? */ - (flags[4] == 'a' || flags[4] == 's') && /* is it active or suspended? */ - vg_flags[5] == 'c') { /* is it clustered ? */ - /* Convert hyphen-separated UUIDs into one */ - memcpy(&uuid[0], &vg[0], 6); - memcpy(&uuid[6], &vg[7], 4); - memcpy(&uuid[10], &vg[12], 4); - memcpy(&uuid[14], &vg[17], 4); - memcpy(&uuid[18], &vg[22], 4); - memcpy(&uuid[22], &vg[27], 4); - memcpy(&uuid[26], &vg[32], 6); - memcpy(&uuid[32], &lv[0], 6); - memcpy(&uuid[38], &lv[7], 4); - memcpy(&uuid[42], &lv[12], 4); - memcpy(&uuid[46], &lv[17], 4); - memcpy(&uuid[50], &lv[22], 4); - memcpy(&uuid[54], &lv[27], 4); - memcpy(&uuid[58], &lv[32], 6); - uuid[64] = '\0'; - - /* Look for this lock in the list of EX locks - we were passed on the command-line */ - lock_mode = (dm_hash_lookup(excl_uuid, uuid)) ? - LCK_EXCL : LCK_READ; - - DEBUGLOG("getting initial lock for %s\n", uuid); - if (hold_lock(uuid, lock_mode, LCKF_NOQUEUE)) - DEBUGLOG("Failed to hold lock %s\n", uuid); - } - } - } - if (pclose(lvs)) - DEBUGLOG("lvs pclose failed: %s\n", strerror(errno)); - - dm_free(lvs_cmd); - - return 1; -} - -static void lvm2_log_fn(int level, const char *file, int line, int dm_errno, - const char *message) -{ - - /* Send messages to the normal LVM2 logging system too, - so we get debug output when it's asked for. - We need to NULL the function ptr otherwise it will just call - back into here! */ - init_log_fn(NULL); - print_log(level, file, line, dm_errno, "%s", message); - init_log_fn(lvm2_log_fn); - - /* - * Ignore non-error messages, but store the latest one for returning - * to the user. - */ - if (level != _LOG_ERR && level != _LOG_FATAL) - return; - - (void) dm_strncpy(last_error, message, sizeof(last_error)); -} - -/* This checks some basic cluster-LVM configuration stuff */ -static void check_config(void) -{ - int locking_type; - - locking_type = find_config_tree_int(cmd, global_locking_type_CFG, NULL); - - if (locking_type == 3) /* compiled-in cluster support */ - return; - - if (locking_type == 2) { /* External library, check name */ - const char *libname; - - libname = find_config_tree_str(cmd, global_locking_library_CFG, NULL); - if (libname && strstr(libname, "liblvm2clusterlock.so")) - return; - - log_error("Incorrect LVM locking library specified in lvm.conf, cluster operations may not work."); - return; - } - log_error("locking_type not set correctly in lvm.conf, cluster operations will not work."); -} - -/* Backups up the LVM metadata if it's changed */ -void lvm_do_backup(const char *vgname) -{ - struct volume_group * vg; - int consistent = 0; - - DEBUGLOG("Triggering backup of VG metadata for %s.\n", vgname); - - pthread_mutex_lock(&lvm_lock); - - vg = vg_read_internal(cmd, vgname, NULL /*vgid*/, 0, WARN_PV_READ, &consistent); - - if (vg && consistent) - check_current_backup(vg); - else - log_error("Error backing up metadata, can't find VG for group %s", vgname); - - release_vg(vg); - dm_pool_empty(cmd->mem); - - pthread_mutex_unlock(&lvm_lock); -} - -struct dm_hash_node *get_next_excl_lock(struct dm_hash_node *v, char **name) -{ - struct lv_info *lvi; - - *name = NULL; - if (!v) - v = dm_hash_get_first(lv_hash); - - do { - if (v) { - lvi = dm_hash_get_data(lv_hash, v); - DEBUGLOG("Looking for EX locks. found %x mode %d\n", lvi->lock_id, lvi->lock_mode); - - if (lvi->lock_mode == LCK_EXCL) { - *name = dm_hash_get_key(lv_hash, v); - } - v = dm_hash_get_next(lv_hash, v); - } - } while (v && !*name); - - if (*name) - DEBUGLOG("returning EXclusive UUID %s\n", *name); - return v; -} - -void lvm_do_fs_unlock(void) -{ - pthread_mutex_lock(&lvm_lock); - DEBUGLOG("Syncing device names\n"); - fs_unlock(); - pthread_mutex_unlock(&lvm_lock); -} - -/* Called to initialise the LVM context of the daemon */ -int init_clvm(struct dm_hash_table *excl_uuid) -{ - /* Use LOG_DAEMON for syslog messages instead of LOG_USER */ - init_syslog(LOG_DAEMON); - openlog("clvmd", LOG_PID, LOG_DAEMON); - - /* Initialise already held locks */ - if (!get_initial_state(excl_uuid)) - log_error("Cannot load initial lock states."); - - if (!udev_init_library_context()) - stack; - - if (!(cmd = create_toolcontext(1, NULL, 0, 1, 1, 1))) { - log_error("Failed to allocate command context"); - udev_fin_library_context(); - return 0; - } - - if (stored_errno()) { - destroy_toolcontext(cmd); - return 0; - } - - cmd->cmd_line = "clvmd"; - - /* Check lvm.conf is setup for cluster-LVM */ - check_config(); - init_ignore_suspended_devices(1); - - /* Trap log messages so we can pass them back to the user */ - init_log_fn(lvm2_log_fn); - memlock_inc_daemon(cmd); - - return 1; -} - -void destroy_lvm(void) -{ - if (cmd) { - memlock_dec_daemon(cmd); - destroy_toolcontext(cmd); - udev_fin_library_context(); - cmd = NULL; - } -} diff --git a/daemons/clvmd/lvm-functions.h b/daemons/clvmd/lvm-functions.h deleted file mode 100644 index 6785997..0000000 --- a/daemons/clvmd/lvm-functions.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* Functions in lvm-functions.c */ - -#ifndef _LVM_FUNCTIONS_H -#define _LVM_FUNCTIONS_H - -extern int pre_lock_lv(unsigned char lock_cmd, unsigned char lock_flags, - char *resource); -extern int do_lock_lv(unsigned char lock_cmd, unsigned char lock_flags, - char *resource); -extern const char *do_lock_query(char *resource); -extern int post_lock_lv(unsigned char lock_cmd, unsigned char lock_flags, - char *resource); -extern int do_refresh_cache(void); -extern int init_clvm(struct dm_hash_table *excl_uuid); -extern void destroy_lvm(void); -extern void init_lvhash(void); -extern void destroy_lvhash(void); -extern void lvm_do_backup(const char *vgname); -extern char *get_last_lvm_error(void); -extern void do_lock_vg(unsigned char command, unsigned char lock_flags, - char *resource); -extern struct dm_hash_node *get_next_excl_lock(struct dm_hash_node *v, char **name); -void lvm_do_fs_unlock(void); - -#endif diff --git a/daemons/clvmd/refresh_clvmd.c b/daemons/clvmd/refresh_clvmd.c deleted file mode 100644 index c80e09f..0000000 --- a/daemons/clvmd/refresh_clvmd.c +++ /dev/null @@ -1,382 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* FIXME Remove duplicated functions from this file. */ - -/* - * Send a command to a running clvmd from the command-line - */ - -#include "clvmd-common.h" - -#include "daemons/clvmd/clvm.h" -#include "refresh_clvmd.h" - -#include <stddef.h> -#include <sys/socket.h> -#include <sys/un.h> - -typedef struct lvm_response { - char node[255]; - char *response; - int status; - int len; -} lvm_response_t; - -/* - * This gets stuck at the start of memory we allocate so we - * can sanity-check it at deallocation time - */ -#define LVM_SIGNATURE 0x434C564D - -static int _clvmd_sock = -1; - -/* Open connection to the clvm daemon */ -static int _open_local_sock(void) -{ - int local_socket; - struct sockaddr_un sockaddr = { .sun_family = AF_UNIX }; - - if (!dm_strncpy(sockaddr.sun_path, CLVMD_SOCKNAME, sizeof(sockaddr.sun_path))) { - fprintf(stderr, "%s: clvmd socket name too long.", CLVMD_SOCKNAME); - return -1; - } - - /* Open local socket */ - if ((local_socket = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { - fprintf(stderr, "Local socket creation failed: %s", strerror(errno)); - return -1; - } - - if (connect(local_socket,(struct sockaddr *) &sockaddr, - sizeof(sockaddr))) { - int saved_errno = errno; - - fprintf(stderr, "connect() failed on local socket: %s\n", - strerror(errno)); - if (close(local_socket)) - return -1; - - errno = saved_errno; - return -1; - } - - return local_socket; -} - -/* Send a request and return the status */ -static int _send_request(const char *inbuf, int inlen, char **retbuf, int no_response) -{ - char outbuf[PIPE_BUF]; - struct clvm_header *outheader = (struct clvm_header *) outbuf; - int len; - unsigned off; - int buflen; - int err; - - /* Send it to CLVMD */ - rewrite: - if ( (err = write(_clvmd_sock, inbuf, inlen)) != inlen) { - if (err == -1 && errno == EINTR) - goto rewrite; - fprintf(stderr, "Error writing data to clvmd: %s", strerror(errno)); - return 0; - } - if (no_response) - return 1; - - /* Get the response */ - reread: - if ((len = read(_clvmd_sock, outbuf, sizeof(struct clvm_header))) < 0) { - if (errno == EINTR) - goto reread; - fprintf(stderr, "Error reading data from clvmd: %s", strerror(errno)); - return 0; - } - - if (len == 0) { - fprintf(stderr, "EOF reading CLVMD"); - errno = ENOTCONN; - return 0; - } - - /* Allocate buffer */ - buflen = len + outheader->arglen; - *retbuf = dm_malloc(buflen); - if (!*retbuf) { - errno = ENOMEM; - return 0; - } - - /* Copy the header */ - memcpy(*retbuf, outbuf, len); - outheader = (struct clvm_header *) *retbuf; - - /* Read the returned values */ - off = 1; /* we've already read the first byte */ - while (off <= outheader->arglen && len > 0) { - len = read(_clvmd_sock, outheader->args + off, - buflen - off - offsetof(struct clvm_header, args)); - if (len > 0) - off += len; - } - - /* Was it an error ? */ - if (outheader->status != 0) { - errno = outheader->status; - - /* Only return an error here if there are no node-specific - errors present in the message that might have more detail */ - if (!(outheader->flags & CLVMD_FLAG_NODEERRS)) { - fprintf(stderr, "cluster request failed: %s\n", strerror(errno)); - return 0; - } - - } - - return 1; -} - -/* Build the structure header and parse-out wildcard node names */ -static void _build_header(struct clvm_header *head, int cmd, const char *node, - unsigned int len) -{ - head->cmd = cmd; - head->status = 0; - head->flags = 0; - head->xid = 0; - head->clientid = 0; - if (len) - /* 1 byte is used from struct clvm_header.args[1], so -> len - 1 */ - head->arglen = len - 1; - else { - head->arglen = 0; - *head->args = '\0'; - } - - /* - * Translate special node names. - */ - if (!node || !strcmp(node, NODE_ALL)) - head->node[0] = '\0'; - else if (!strcmp(node, NODE_LOCAL)) { - head->node[0] = '\0'; - head->flags = CLVMD_FLAG_LOCAL; - } else - strcpy(head->node, node); -} - -/* - * Send a message to a(or all) node(s) in the cluster and wait for replies - */ -static int _cluster_request(char cmd, const char *node, void *data, int len, - lvm_response_t ** response, int *num, int no_response) -{ - char outbuf[sizeof(struct clvm_header) + len + strlen(node) + 1]; - char *inptr; - char *retbuf = NULL; - int status; - int i; - int num_responses = 0; - struct clvm_header *head = (struct clvm_header *) outbuf; - lvm_response_t *rarray; - - *num = 0; - - if (_clvmd_sock == -1) - _clvmd_sock = _open_local_sock(); - - if (_clvmd_sock == -1) - return 0; - - _build_header(head, cmd, node, len); - if (len) - memcpy(head->node + strlen(head->node) + 1, data, len); - - status = _send_request(outbuf, sizeof(struct clvm_header) + - strlen(head->node) + len, &retbuf, no_response); - if (!status || no_response) - goto out; - - /* Count the number of responses we got */ - head = (struct clvm_header *) retbuf; - inptr = head->args; - while (inptr[0]) { - num_responses++; - inptr += strlen(inptr) + 1; - inptr += sizeof(int); - inptr += strlen(inptr) + 1; - } - - /* - * Allocate response array. - * With an extra pair of INTs on the front to sanity - * check the pointer when we are given it back to free - */ - *response = NULL; - if (!(rarray = dm_malloc(sizeof(lvm_response_t) * num_responses + - sizeof(int) * 2))) { - errno = ENOMEM; - status = 0; - goto out; - } - - /* Unpack the response into an lvm_response_t array */ - inptr = head->args; - i = 0; - while (inptr[0]) { - strcpy(rarray[i].node, inptr); - inptr += strlen(inptr) + 1; - - memcpy(&rarray[i].status, inptr, sizeof(int)); - inptr += sizeof(int); - - rarray[i].response = dm_malloc(strlen(inptr) + 1); - if (rarray[i].response == NULL) { - /* Free up everything else and return error */ - int j; - for (j = 0; j < i; j++) - dm_free(rarray[i].response); - dm_free(rarray); - errno = ENOMEM; - status = 0; - goto out; - } - - strcpy(rarray[i].response, inptr); - rarray[i].len = strlen(inptr); - inptr += strlen(inptr) + 1; - i++; - } - *num = num_responses; - *response = rarray; - - out: - dm_free(retbuf); - - return status; -} - -/* Free reply array */ -static int _cluster_free_request(lvm_response_t * response, int num) -{ - int i; - - for (i = 0; i < num; i++) { - dm_free(response[i].response); - } - - dm_free(response); - - return 1; -} - -int refresh_clvmd(int all_nodes) -{ - int num_responses; - char args[1]; // No args really. - lvm_response_t *response = NULL; - int saved_errno; - int status; - int i; - - status = _cluster_request(CLVMD_CMD_REFRESH, all_nodes ? NODE_ALL : NODE_LOCAL, args, 0, &response, &num_responses, 0); - - /* If any nodes were down then display them and return an error */ - for (i = 0; i < num_responses; i++) { - if (response[i].status == EHOSTDOWN) { - fprintf(stderr, "clvmd not running on node %s", - response[i].node); - status = 0; - errno = response[i].status; - } else if (response[i].status) { - fprintf(stderr, "Error resetting node %s: %s", - response[i].node, - response[i].response[0] ? - response[i].response : - strerror(response[i].status)); - status = 0; - errno = response[i].status; - } - } - - saved_errno = errno; - _cluster_free_request(response, num_responses); - errno = saved_errno; - - return status; -} - -int restart_clvmd(int all_nodes) -{ - int dummy, status; - - status = _cluster_request(CLVMD_CMD_RESTART, all_nodes ? NODE_ALL : NODE_LOCAL, NULL, 0, NULL, &dummy, 1); - - /* - * FIXME: we cannot receive response, clvmd re-exec before it. - * but also should not close socket too early (the whole rq is dropped then). - * FIXME: This should be handled this way: - * - client waits for RESTART ack (and socket close) - * - server restarts - * - client checks that server is ready again (VERSION command?) - */ - usleep(500000); - - return status; -} - -int debug_clvmd(int level, int clusterwide) -{ - int num_responses; - char args[1]; - const char *nodes; - lvm_response_t *response = NULL; - int saved_errno; - int status; - int i; - - args[0] = level; - if (clusterwide) - nodes = NODE_ALL; - else - nodes = NODE_LOCAL; - - status = _cluster_request(CLVMD_CMD_SET_DEBUG, nodes, args, 1, &response, &num_responses, 0); - - /* If any nodes were down then display them and return an error */ - for (i = 0; i < num_responses; i++) { - if (response[i].status == EHOSTDOWN) { - fprintf(stderr, "clvmd not running on node %s", - response[i].node); - status = 0; - errno = response[i].status; - } else if (response[i].status) { - fprintf(stderr, "Error setting debug on node %s: %s", - response[i].node, - response[i].response[0] ? - response[i].response : - strerror(response[i].status)); - status = 0; - errno = response[i].status; - } - } - - saved_errno = errno; - _cluster_free_request(response, num_responses); - errno = saved_errno; - - return status; -} diff --git a/daemons/clvmd/refresh_clvmd.h b/daemons/clvmd/refresh_clvmd.h deleted file mode 100644 index b9d775e..0000000 --- a/daemons/clvmd/refresh_clvmd.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2007 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -int refresh_clvmd(int all_nodes); -int restart_clvmd(int all_nodes); -int debug_clvmd(int level, int clusterwide); - diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in index fc0ef6d..b6bab2d 100644 --- a/daemons/cmirrord/Makefile.in +++ b/daemons/cmirrord/Makefile.in @@ -17,8 +17,6 @@ top_builddir = @top_builddir@ CPG_LIBS = @CPG_LIBS@ CPG_CFLAGS = @CPG_CFLAGS@ -SACKPT_LIBS = @SACKPT_LIBS@ -SACKPT_CFLAGS = @SACKPT_CFLAGS@ SOURCES = clogd.c cluster.c compat.c functions.c link_mon.c local.c logging.c @@ -26,8 +24,8 @@ TARGETS = cmirrord include $(top_builddir)/make.tmpl -LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS) -CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS) $(EXTRA_EXEC_CFLAGS) +LMLIBS += $(CPG_LIBS) +CFLAGS += $(CPG_CFLAGS) $(EXTRA_EXEC_CFLAGS) LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) cmirrord: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a diff --git a/daemons/cmirrord/cluster.c b/daemons/cmirrord/cluster.c index 6bb9d63..c516447 100644 --- a/daemons/cmirrord/cluster.c +++ b/daemons/cmirrord/cluster.c @@ -18,6 +18,9 @@ #include "local.h" #include "lib/mm/xlate.h" +/* FIXME: remove this and the code */ +#define CMIRROR_HAS_CHECKPOINT 0 + #include <corosync/cpg.h> #include <errno.h> #include <signal.h> diff --git a/include/configure.h.in b/include/configure.h.in index 15fd150..65a2a6a 100644 --- a/include/configure.h.in +++ b/include/configure.h.in @@ -25,15 +25,6 @@ /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID -/* Define to 1 to include built-in support for clustered LVM locking. */ -#undef CLUSTER_LOCKING_INTERNAL - -/* Path to clvmd binary. */ -#undef CLVMD_PATH - -/* Path to clvmd pidfile. */ -#undef CLVMD_PIDFILE - /* Path to cmirrord pidfile. */ #undef CMIRRORD_PIDFILE @@ -178,12 +169,6 @@ /* Define to 1 if you have the `clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME -/* Define to 1 if you have the <corosync/cmap.h> header file. */ -#undef HAVE_COROSYNC_CMAP_H - -/* Define to 1 if you have the <corosync/confdb.h> header file. */ -#undef HAVE_COROSYNC_CONFDB_H - /* Define to 1 if you have the <ctype.h> header file. */ #undef HAVE_CTYPE_H @@ -248,9 +233,6 @@ /* Define to 1 if you have the <libaio.h> header file. */ #undef HAVE_LIBAIO_H -/* Define to 1 if you have the <libcman.h> header file. */ -#undef HAVE_LIBCMAN_H - /* Define to 1 if dynamic libraries are available. */ #undef HAVE_LIBDL diff --git a/lib/Makefile.in b/lib/Makefile.in index 1d42235..4b64ce0 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -16,10 +16,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -ifeq ("@CLUSTER@", "shared") - SUBDIRS += locking -endif - SOURCES =\ activate/activate.c \ cache/lvmcache.c \ @@ -66,7 +62,6 @@ SOURCES =\ label/label.c \ locking/file_locking.c \ locking/locking.c \ - locking/no_locking.c \ log/log.c \ metadata/cache_manip.c \ metadata/lv.c \ @@ -107,10 +102,6 @@ SOURCES =\ uuid/uuid.c \ zero/zero.c -ifeq ("@CLUSTER@", "internal") - SOURCES += locking/cluster_locking.c -endif - ifeq ("@DEVMAPPER@", "yes") SOURCES +=\ activate/dev_manager.c \ @@ -118,9 +109,7 @@ ifeq ("@DEVMAPPER@", "yes") endif ifeq ("@HAVE_LIBDL@", "yes") - SOURCES +=\ - locking/external_locking.c \ - misc/sharedlib.c + SOURCES += misc/sharedlib.c endif ifeq ("@BUILD_LVMETAD@", "yes") diff --git a/lib/activate/activate.c b/lib/activate/activate.c index a15a2d7..4c70443 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -669,9 +669,7 @@ static int _lv_info(struct cmd_context *cmd, const struct logical_volume *lv, * in progress - as only those could lead to opened files */ if (with_open_count) { - if (locking_is_clustered() && !sync_local_dev_names(cmd)) /* Wait to have udev in sync */ - return_0; - else if (fs_has_non_delete_ops()) + if (fs_has_non_delete_ops()) fs_unlock(); /* For non clustered - wait if there are non-delete ops */ } @@ -724,21 +722,6 @@ int lv_info(struct cmd_context *cmd, const struct logical_volume *lv, int use_la return _lv_info(cmd, lv, use_layer, info, NULL, NULL, with_open_count, with_read_ahead); } -int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s, int use_layer, - struct lvinfo *info, int with_open_count, int with_read_ahead) -{ - int r; - struct logical_volume *lv; - - if (!(lv = lv_from_lvid(cmd, lvid_s, 0))) - return 0; - - r = lv_info(cmd, lv, use_layer, info, with_open_count, with_read_ahead); - release_vg(lv->vg); - - return r; -} - /* * Returns 1 if lv_with_info_and_seg_status info structure populated, * else 0 on failure or if device not active locally. @@ -1521,47 +1504,9 @@ static int _lv_is_active(const struct logical_volume *lv, if (_lv_active(lv->vg->cmd, lv)) l = 1; - if (!vg_is_clustered(lv->vg)) { - if (l) - e = 1; /* exclusive by definition */ - goto out; - } - - /* Active locally, and the caller doesn't care about exclusive or remotely */ - if (l && !exclusive && !remotely) - skip_cluster_query = 1; - - if (skip_cluster_query) - goto out; - - if ((r = cluster_lock_held(lv->lvid.s, "", &e)) >= 0) { - if (l && e) - r = 0; /* exclusive locally */ - goto out; - } - - /* - * If lock query is not supported (due to interfacing with old - * code), then we cannot evaluate exclusivity properly. - * - * Old users of this function will never be affected by this, - * since they are only concerned about active vs. not active. - * New users of this function who specifically ask for 'exclusive' - * will be given a warning message. - */ - log_warn("WARNING: Unable to determine exclusivity of %s.", display_lvname(lv)); - - e = 0; + if (l) + e = 1; /* exclusive by definition */ - /* Also set remotely as a precaution, as we don't know */ - r = 1; - - /* - * We used to attempt activate_lv_excl_local(lv->vg->cmd, lv) here, - * but it's unreliable. - */ - -out: if (locally) *locally = l; if (exclusive) @@ -2146,75 +2091,11 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s, struct dm_pool *mem = NULL; struct dm_list suspend_lvs; struct lv_list *lvl; - const union lvid *lvid = (const union lvid *) lvid_s; - const char *vgid = (const char *)lvid->id[0].uuid; - struct volume_group *vg; - struct volume_group *vg_pre; int found; if (!activation()) return 1; - if (!cmd->is_clvmd) - goto skip_read; - - if (lv && lv_pre) - goto skip_read; - - if (!(vg = lvmcache_get_saved_vg(vgid, 0))) { - log_debug("lv_suspend did not find saved_vg %.8s so reading", vgid); - if (!(vg = vg_read_by_vgid(cmd, vgid, 0))) { - log_error("lv_suspend could not read vgid %.8s", vgid); - goto out; - } - log_debug("lv_suspend using read vg %s %d %p", vg->name, vg->seqno, vg); - } else { - log_debug("lv_suspend using saved_vg %s %d %p", vg->name, vg->seqno, vg); - } - - if (!(vg_pre = lvmcache_get_saved_vg(vgid, 1))) { - log_debug("lv_suspend did not find pre saved_vg %.8s so reading", vgid); - if (!(vg_pre = vg_read_by_vgid(cmd, vgid, 1))) { - log_error("lv_suspend could not read pre vgid %.8s", vgid); - goto out; - } - log_debug("lv_suspend using pre read vg %s %d %p", vg_pre->name, vg_pre->seqno, vg_pre); - } else { - log_debug("lv_suspend using pre saved_vg %s %d %p", vg_pre->name, vg_pre->seqno, vg_pre); - } - - /* - * Note that vg and vg_pre returned by vg_read_by_vgid will - * not be the same as saved_vg_old/saved_vg_new that would - * be returned by lvmcache_get_saved_vg() because the saved_vg's - * are copies of the vg struct that is created by _vg_read. - * (Should we grab and use the saved_vg to use here instead of - * the vg returned by vg_read_by_vgid?) - */ - - if ((vg->status & EXPORTED_VG) || (vg_pre->status & EXPORTED_VG)) { - log_error("Volume group \"%s\" is exported", vg->name); - goto out; - } - - lv = lv_to_free = find_lv_in_vg_by_lvid(vg, lvid); - lv_pre = lv_pre_to_free = find_lv_in_vg_by_lvid(vg_pre, lvid); - - if (!lv || !lv_pre) { - log_error("lv_suspend could not find lv %p lv_pre %p vg %p vg_pre %p vgid %s", - lv, lv_pre, vg, vg_pre, vgid); - goto out; - } - -skip_read: - /* lv comes from committed metadata */ - if (!lv && !(lv_to_free = lv = lv_from_lvid(cmd, lvid_s, 0))) - goto_out; - - /* Use precommitted metadata if present */ - if (!lv_pre && !(lv_pre_to_free = lv_pre = lv_from_lvid(cmd, lvid_s, 1))) - goto_out; - /* Ignore origin_only unless LV is origin in both old and new metadata */ /* or LV is thin or thin pool volume */ if (!lv_is_thin_volume(lv) && !lv_is_thin_pool(lv) && @@ -2231,19 +2112,6 @@ skip_read: if (!lv_info(cmd, lv, laopts->origin_only, &info, 0, 0)) goto_out; - /* - * Save old and new (current and precommitted) versions of the - * VG metadata for lv_resume() to use, since lv_resume can't - * read metadata given that devices are suspended. lv_resume() - * will resume LVs using the old/current metadata if the vg_commit - * did happen (or failed), and it will resume LVs using the - * new/precommitted metadata if the vg_commit succeeded. - */ - if (cmd->is_clvmd) { - lvmcache_save_vg(lv->vg, 0); - lvmcache_save_vg(lv_pre->vg, 1); - } - if (!info.exists || info.suspended) { if (!error_if_not_suspended) { r = 1; @@ -2451,55 +2319,12 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s, const struct logical_volume *lv) { struct dm_list *snh; - struct volume_group *vg = NULL; - struct logical_volume *lv_found = NULL; - const union lvid *lvid; - const char *vgid; struct lvinfo info; int r = 0; if (!activation()) return 1; - /* - * When called in clvmd, lvid_s is set and lv is not. We need to - * get the VG metadata without reading disks because devs are - * suspended. lv_suspend() saved old and new VG metadata for us - * to use here. If vg_commit() happened, lvmcache_get_saved_vg_latest - * will return the new metadata for us to use in resuming LVs. - * If vg_commit() did not happen, lvmcache_get_saved_vg_latest - * returns the old metadata which we use to resume LVs. - */ - if (!lv && lvid_s) { - lvid = (const union lvid *) lvid_s; - vgid = (const char *)lvid->id[0].uuid; - - if ((vg = lvmcache_get_saved_vg_latest(vgid))) { - log_debug_activation("Resuming LVID %s found saved vg seqno %d %s", lvid_s, vg->seqno, vg->name); - if ((lv_found = find_lv_in_vg_by_lvid(vg, lvid))) { - log_debug_activation("Resuming LVID %s found saved LV %s", lvid_s, display_lvname(lv_found)); - lv = lv_found; - } else - log_debug_activation("Resuming LVID %s did not find saved LV", lvid_s); - } else - log_debug_activation("Resuming LVID %s did not find saved VG", lvid_s); - - /* - * resume must have been called without a preceding suspend, - * so we need to read the vg. - */ - - if (!lv) { - log_debug_activation("Resuming LVID %s reading VG", lvid_s); - if (!(lv_found = lv_from_lvid(cmd, lvid_s, 0))) { - log_debug_activation("Resuming LVID %s failed to read VG", lvid_s); - goto out; - } - - lv = lv_found; - } - } - if (!lv_is_origin(lv) && !lv_is_thin_volume(lv) && !lv_is_thin_pool(lv)) laopts->origin_only = 0; @@ -2620,9 +2445,6 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s, const struct logi if (!activation()) return 1; - if (!lv && !(lv_to_free = lv = lv_from_lvid(cmd, lvid_s, 0))) - goto out; - if (test_mode()) { _skip("Deactivating %s.", display_lvname(lv)); r = 1; @@ -2694,45 +2516,31 @@ out: int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s, int *activate_lv, const struct logical_volume *lv) { - const struct logical_volume *lv_to_free = NULL; - int r = 0; - if (!activation()) { *activate_lv = 1; return 1; } - if (!lv && !(lv_to_free = lv = lv_from_lvid(cmd, lvid_s, 0))) - goto_out; - if (!_passes_activation_filter(cmd, lv)) { log_verbose("Not activating %s since it does not pass " "activation filter.", display_lvname(lv)); *activate_lv = 0; } else *activate_lv = 1; - r = 1; -out: - if (lv_to_free) - release_vg(lv_to_free->vg); - return r; + return 1; } static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, struct lv_activate_opts *laopts, int filter, const struct logical_volume *lv) { - const struct logical_volume *lv_to_free = NULL; struct lvinfo info; int r = 0; if (!activation()) return 1; - if (!lv && !(lv_to_free = lv = lv_from_lvid(cmd, lvid_s, 0))) - goto out; - if (!laopts->exclusive && (lv_is_origin(lv) || seg_only_exclusive(first_seg(lv)))) { @@ -2771,16 +2579,6 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, goto out; } - /* - * Check if cmirrord is running for clustered mirrors. - */ - if (!laopts->exclusive && vg_is_clustered(lv->vg) && - lv_is_mirror(lv) && !lv_is_raid(lv) && - !cluster_mirror_is_available(lv->vg->cmd)) { - log_error("Shared cluster mirrors are not available."); - goto out; - } - if (test_mode()) { _skip("Activating %s.", display_lvname(lv)); r = 1; @@ -2823,11 +2621,7 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, if (r && !monitor_dev_for_events(cmd, lv, laopts, 1)) stack; - out: - if (lv_to_free) - release_vg(lv_to_free->vg); - return r; } diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 527f0a6..b9aa8a0 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -65,38 +65,10 @@ struct lvmcache_vginfo { int scan_summary_mismatch; /* vgsummary from devs had mismatching seqno or checksum */ }; -struct saved_vg { - /* - * saved_vg_* are used only by clvmd. - * It is not related to lvmcache or vginfo. - * - * For activation/deactivation, these are used to avoid - * clvmd rereading a VG for each LV that is activated. - * - * For suspend/resume, this is used to avoid disk reads - * while devices are suspended: - * In suspend, both old (current) and new (precommitted) - * metadata is saved. (Each in three forms: buffer, cft, - * and vg). In resume, if the vg was committed - * (saved_vg_committed is set), then LVs are resumed - * using the new metadata, but if the vg wasn't committed, - * then LVs are resumed using the old metadata. - * - * saved_vg_committed is set to 1 when clvmd gets - * LCK_VG_COMMIT from vg_commit(). - */ - char vgid[ID_LEN + 1]; - int saved_vg_committed; - struct volume_group *saved_vg_old; - struct volume_group *saved_vg_new; - struct dm_list saved_vg_to_free; -}; - static struct dm_hash_table *_pvid_hash = NULL; static struct dm_hash_table *_vgid_hash = NULL; static struct dm_hash_table *_vgname_hash = NULL; static struct dm_hash_table *_lock_hash = NULL; -static struct dm_hash_table *_saved_vg_hash = NULL; static DM_LIST_INIT(_vginfos); static DM_LIST_INIT(_found_duplicate_devs); static DM_LIST_INIT(_unused_duplicate_devs); @@ -131,11 +103,6 @@ int lvmcache_init(struct cmd_context *cmd) if (!(_lock_hash = dm_hash_create(128))) return 0; - if (cmd->is_clvmd) { - if (!(_saved_vg_hash = dm_hash_create(128))) - return 0; - } - /* * Reinitialising the cache clears the internal record of * which locks are held. The global lock can be held during @@ -191,357 +158,6 @@ static void _update_cache_lock_state(const char *vgname, int locked) _update_cache_vginfo_lock_state(vginfo, locked); } -static struct saved_vg *_saved_vg_from_vgid(const char *vgid) -{ - struct saved_vg *svg; - char id[ID_LEN + 1] __attribute__((aligned(8))); - - /* vgid not necessarily NULL-terminated */ - (void) dm_strncpy(id, vgid, sizeof(id)); - - if (!(svg = dm_hash_lookup(_saved_vg_hash, id))) { - log_debug_cache("lvmcache: no saved_vg for vgid \"%s\"", id); - return NULL; - } - - return svg; -} - -static void _saved_vg_inval(struct saved_vg *svg, int inval_old, int inval_new) -{ - struct vg_list *vgl; - - /* - * In practice there appears to only ever be a single invalidated vg, - * so making saved_vg_to_free a list instead of a pointer is overkill. - * But, without proof otherwise, safer to keep the list. - */ - - if (inval_old && svg->saved_vg_old) { - log_debug_cache("lvmcache: inval saved_vg %s old %p", - svg->saved_vg_old->name, svg->saved_vg_old); - - if ((vgl = dm_zalloc(sizeof(*vgl)))) { - vgl->vg = svg->saved_vg_old; - dm_list_add(&svg->saved_vg_to_free, &vgl->list); - } - - svg->saved_vg_old = NULL; - } - - if (inval_new && svg->saved_vg_new) { - log_debug_cache("lvmcache: inval saved_vg %s new pre %p", - svg->saved_vg_new->name, svg->saved_vg_new); - - if ((vgl = dm_zalloc(sizeof(*vgl)))) { - vgl->vg = svg->saved_vg_new; - dm_list_add(&svg->saved_vg_to_free, &vgl->list); - } - svg->saved_vg_new = NULL; - } -} - -static void _saved_vg_free(struct saved_vg *svg, int free_old, int free_new) -{ - struct vg_list *vgl, *vgl2; - struct volume_group *vg; - - if (free_old) { - if ((vg = svg->saved_vg_old)) { - log_debug_cache("lvmcache: free saved_vg old %s %.8s %d old %p", - vg->name, (char *)&vg->id, vg->seqno, vg); - - vg->saved_in_clvmd = 0; - release_vg(vg); - svg->saved_vg_old = NULL; - vg = NULL; - } - - dm_list_iterate_items_safe(vgl, vgl2, &svg->saved_vg_to_free) { - log_debug_cache("lvmcache: free saved_vg_to_free %s %.8s %d %p", - vgl->vg->name, (char *)&vgl->vg->id, vgl->vg->seqno, vgl->vg); - - dm_list_del(&vgl->list); - vgl->vg->saved_in_clvmd = 0; - release_vg(vgl->vg); - } - } - - if (free_new) { - if ((vg = svg->saved_vg_new)) { - log_debug_cache("lvmcache: free saved_vg pre %s %.8s %d %p", - vg->name, (char *)&vg->id, vg->seqno, vg); - - vg->saved_in_clvmd = 0; - release_vg(vg); - svg->saved_vg_new = NULL; - vg = NULL; - } - } -} - -static void _drop_metadata(const char *vgname, int drop_precommitted) -{ - struct lvmcache_vginfo *vginfo; - struct saved_vg *svg; - - if (!(vginfo = lvmcache_vginfo_from_vgname(vgname, NULL))) - return; - - if (!(svg = _saved_vg_from_vgid(vginfo->vgid))) - return; - - if (drop_precommitted) - _saved_vg_free(svg, 0, 1); - else - _saved_vg_free(svg, 1, 1); -} - -void lvmcache_save_vg(struct volume_group *vg, int precommitted) -{ - struct saved_vg *svg; - struct format_instance *fid; - struct format_instance_ctx fic; - struct volume_group *save_vg = NULL; - struct dm_config_tree *save_cft = NULL; - const struct format_type *fmt; - char *save_buf = NULL; - size_t size; - int new = precommitted; - int old = !precommitted; - - if (!(svg = _saved_vg_from_vgid((const char *)&vg->id))) { - /* Nothing is saved yet for this vg */ - - if (!(svg = dm_zalloc(sizeof(*svg)))) - return; - - dm_list_init(&svg->saved_vg_to_free); - - dm_strncpy(svg->vgid, (const char *)vg->id.uuid, sizeof(svg->vgid)); - - if (!dm_hash_insert(_saved_vg_hash, svg->vgid, svg)) { - log_error("lvmcache: failed to insert saved_vg %s", svg->vgid); - return; - } - } else { - /* Nothing to do if we've already saved this seqno */ - - if (old && svg->saved_vg_old && (svg->saved_vg_old->seqno == vg->seqno)) - return; - - if (new && svg->saved_vg_new && (svg->saved_vg_new->seqno == vg->seqno)) - return; - - /* Invalidate the existing saved_vg that will be replaced */ - - _saved_vg_inval(svg, old, new); - } - - - if (!(size = export_vg_to_buffer(vg, &save_buf))) - goto_bad; - - fmt = vg->fid->fmt; - fic.type = FMT_INSTANCE_MDAS | FMT_INSTANCE_AUX_MDAS; - fic.context.vg_ref.vg_name = vg->name; - fic.context.vg_ref.vg_id = svg->vgid; - - if (!(fid = fmt->ops->create_instance(fmt, &fic))) - goto_bad; - - if (!(save_cft = config_tree_from_string_without_dup_node_check(save_buf))) - goto_bad; - - if (!(save_vg = import_vg_from_config_tree(save_cft, fid))) - goto_bad; - - dm_free(save_buf); - dm_config_destroy(save_cft); - - save_vg->saved_in_clvmd = 1; - - if (old) { - svg->saved_vg_old = save_vg; - log_debug_cache("lvmcache: saved old vg %s seqno %d %p", - save_vg->name, save_vg->seqno, save_vg); - } else { - svg->saved_vg_new = save_vg; - log_debug_cache("lvmcache: saved pre vg %s seqno %d %p", - save_vg->name, save_vg->seqno, save_vg); - } - return; - -bad: - if (save_buf) - dm_free(save_buf); - if (save_cft) - dm_config_destroy(save_cft); - - _saved_vg_inval(svg, old, new); - log_debug_cache("lvmcache: failed to save pre %d vg %s", precommitted, vg->name); -} - -struct volume_group *lvmcache_get_saved_vg(const char *vgid, int precommitted) -{ - struct saved_vg *svg; - struct volume_group *vg = NULL; - int new = precommitted; - int old = !precommitted; - - if (!(svg = _saved_vg_from_vgid(vgid))) - goto out; - - /* - * Once new is returned, then also return new if old is requested, - * i.e. new becomes both old and new once it's used. - */ - - if (new) - vg = svg->saved_vg_new; - else if (old) - vg = svg->saved_vg_old; - - if (vg && old) { - if (!svg->saved_vg_new) - log_debug_cache("lvmcache: get old saved_vg %d %s %p", - vg->seqno, vg->name, vg); - else - log_debug_cache("lvmcache: get old saved_vg %d %s %p new is %d %p", - vg->seqno, vg->name, vg, - svg->saved_vg_new->seqno, - svg->saved_vg_new); - } - - if (vg && new) { - if (!svg->saved_vg_old) - log_debug_cache("lvmcache: get new saved_vg %d %s %p", - vg->seqno, vg->name, vg); - else - log_debug_cache("lvmcache: get new saved_vg %d %s %p old is %d %p", - vg->seqno, vg->name, vg, - svg->saved_vg_old->seqno, - svg->saved_vg_old); - - if (svg->saved_vg_old && (svg->saved_vg_old->seqno < vg->seqno)) { - log_debug_cache("lvmcache: inval saved_vg_old %d %p for new %d %p %s", - svg->saved_vg_old->seqno, svg->saved_vg_old, - vg->seqno, vg, vg->name); - - _saved_vg_inval(svg, 1, 0); - } - } - - if (!vg && new && svg->saved_vg_old) - log_warn("lvmcache_get_saved_vg pre %d wanted new but only have old %d %s", - precommitted, - svg->saved_vg_old->seqno, - svg->saved_vg_old->name); - - if (!vg && old && svg->saved_vg_new) - log_warn("lvmcache_get_saved_vg pre %d wanted old but only have new %d %s", - precommitted, - svg->saved_vg_new->seqno, - svg->saved_vg_new->name); -out: - if (!vg) - log_debug_cache("lvmcache: no saved pre %d %s", precommitted, vgid); - return vg; -} - -struct volume_group *lvmcache_get_saved_vg_latest(const char *vgid) -{ - struct saved_vg *svg; - struct volume_group *vg = NULL; - int old = 0; - int new = 0; - - if (!(svg = _saved_vg_from_vgid(vgid))) - goto out; - - if (svg->saved_vg_committed) { - vg = svg->saved_vg_new; - new = 1; - } else { - vg = svg->saved_vg_old; - old = 1; - } - - if (vg && old) { - if (!svg->saved_vg_new) - log_debug_cache("lvmcache: get_latest old saved_vg %d %s %p", - vg->seqno, vg->name, vg); - else - log_debug_cache("lvmcache: get_latest old saved_vg %d %s %p new is %d %p", - vg->seqno, vg->name, vg, - svg->saved_vg_new->seqno, - svg->saved_vg_new); - } - - if (vg && new) { - if (!svg->saved_vg_old) - log_debug_cache("lvmcache: get_latest new saved_vg %d %s %p", - vg->seqno, vg->name, vg); - else - log_debug_cache("lvmcache: get_latest new saved_vg %d %s %p old is %d %p", - vg->seqno, vg->name, vg, - svg->saved_vg_old->seqno, - svg->saved_vg_old); - - if (svg->saved_vg_old && (svg->saved_vg_old->seqno < vg->seqno)) { - log_debug_cache("lvmcache: inval saved_vg_old %d %p for new %d %p %s", - svg->saved_vg_old->seqno, svg->saved_vg_old, - vg->seqno, vg, vg->name); - - _saved_vg_inval(svg, 1, 0); - } - } -out: - if (!vg) - log_debug_cache("lvmcache: no saved vg latest %s", vgid); - return vg; -} - -void lvmcache_drop_saved_vgid(const char *vgid) -{ - struct saved_vg *svg; - - if ((svg = _saved_vg_from_vgid(vgid))) - _saved_vg_inval(svg, 1, 1); -} - -/* - * Remote node uses this to upgrade precommitted metadata to commited state - * when receives vg_commit notification. - * (Note that devices can be suspended here, if so, precommitted metadata are already read.) - */ -void lvmcache_commit_metadata(const char *vgname) -{ - struct lvmcache_vginfo *vginfo; - struct saved_vg *svg; - - if (!(vginfo = lvmcache_vginfo_from_vgname(vgname, NULL))) - return; - - if ((svg = _saved_vg_from_vgid(vginfo->vgid))) - svg->saved_vg_committed = 1; -} - -void lvmcache_drop_metadata(const char *vgname, int drop_precommitted) -{ - if (!_saved_vg_hash) - return; - - if (lvmcache_vgname_is_locked(VG_GLOBAL)) - return; - - /* For VG_ORPHANS, we need to invalidate all labels on orphan PVs. */ - if (!strcmp(vgname, VG_ORPHANS)) { - _drop_metadata(FMT_TEXT_ORPHAN_VG_NAME, 0); - } else - _drop_metadata(vgname, drop_precommitted); -} - /* * Ensure vgname2 comes after vgname1 alphabetically. * Orphan locks come last. @@ -2514,11 +2130,6 @@ static void _lvmcache_destroy_lockname(struct dm_hash_node *n) dm_hash_get_key(_lock_hash, n)); } -static void _destroy_saved_vg(struct saved_vg *svg) -{ - _saved_vg_free(svg, 1, 1); -} - void lvmcache_destroy(struct cmd_context *cmd, int retain_orphans, int reset) { struct dm_hash_node *n; @@ -2555,12 +2166,6 @@ void lvmcache_destroy(struct cmd_context *cmd, int retain_orphans, int reset) _lock_hash = NULL; } - if (_saved_vg_hash) { - dm_hash_iter(_saved_vg_hash, (dm_hash_iterate_fn) _destroy_saved_vg); - dm_hash_destroy(_saved_vg_hash); - _saved_vg_hash = NULL; - } - if (!dm_list_empty(&_vginfos)) log_error(INTERNAL_ERROR "_vginfos list should be empty"); dm_list_init(&_vginfos); diff --git a/lib/locking/Makefile.in b/lib/locking/Makefile.in deleted file mode 100644 index 78f380f..0000000 --- a/lib/locking/Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. -# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ - -SOURCES = cluster_locking.c - -LIB_SHARED = liblvm2clusterlock.$(LIB_SUFFIX) -LIB_VERSION = $(LIB_VERSION_LVM) - -include $(top_builddir)/make.tmpl - -install install_cluster: install_lvm2_plugin diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c deleted file mode 100644 index 0830b48..0000000 --- a/lib/locking/cluster_locking.c +++ /dev/null @@ -1,636 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Locking functions for LVM. - * The main purpose of this part of the library is to serialise LVM - * management operations across a cluster. - */ - -#include "lib/misc/lib.h" -#include "daemons/clvmd/clvm.h" -#include "lib/misc/lvm-string.h" -#include "lib/locking/locking.h" -#include "locking_types.h" -#include "lib/commands/toolcontext.h" - -#include <assert.h> -#include <stddef.h> -#include <sys/socket.h> -#include <sys/un.h> -#include <unistd.h> - -#ifndef CLUSTER_LOCKING_INTERNAL -int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags, const struct logical_volume *lv __attribute__((unused))); -int query_resource(const char *resource, const char *node, int *mode); -void locking_end(void); -int locking_init(int type, struct dm_config_tree *cf, uint32_t *flags); -#endif - -typedef struct lvm_response { - char node[255]; - char *response; - int status; - int len; -} lvm_response_t; - -/* - * This gets stuck at the start of memory we allocate so we - * can sanity-check it at deallocation time - */ -#define LVM_SIGNATURE 0x434C564D - -/* - * NOTE: the LVMD uses the socket FD as the client ID, this means - * that any client that calls fork() will inherit the context of - * it's parent. - */ -static int _clvmd_sock = -1; - -/* FIXME Install SIGPIPE handler? */ - -/* Open connection to the Cluster Manager daemon */ -static int _open_local_sock(int suppress_messages) -{ - int local_socket; - struct sockaddr_un sockaddr = { .sun_family = AF_UNIX }; - - if (!dm_strncpy(sockaddr.sun_path, CLVMD_SOCKNAME, sizeof(sockaddr.sun_path))) { - log_error("%s: clvmd socket name too long.", CLVMD_SOCKNAME); - return -1; - } - - /* Open local socket */ - if ((local_socket = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { - log_error_suppress(suppress_messages, "Local socket " - "creation failed: %s", strerror(errno)); - return -1; - } - - - if (connect(local_socket,(struct sockaddr *) &sockaddr, - sizeof(sockaddr))) { - int saved_errno = errno; - - log_error_suppress(suppress_messages, "connect() failed " - "on local socket: %s", strerror(errno)); - if (close(local_socket)) - stack; - - errno = saved_errno; - return -1; - } - - return local_socket; -} - -/* Send a request and return the status */ -static int _send_request(char *inbuf, int inlen, char **retbuf) -{ - char outbuf[PIPE_BUF] __attribute__((aligned(8))); - struct clvm_header *outheader = (struct clvm_header *) outbuf; - int len; - unsigned off; - int buflen; - int err; - - /* Send it to CLVMD */ - rewrite: - if ( (err = write(_clvmd_sock, inbuf, inlen)) != inlen) { - if (err == -1 && errno == EINTR) - goto rewrite; - log_error("Error writing data to clvmd: %s", strerror(errno)); - return 0; - } - - /* Get the response */ - reread: - if ((len = read(_clvmd_sock, outbuf, sizeof(struct clvm_header))) < 0) { - if (errno == EINTR) - goto reread; - log_error("Error reading data from clvmd: %s", strerror(errno)); - return 0; - } - - if (len == 0) { - log_error("EOF reading CLVMD"); - errno = ENOTCONN; - return 0; - } - - /* Allocate buffer */ - buflen = len + outheader->arglen; - *retbuf = dm_malloc(buflen); - if (!*retbuf) { - errno = ENOMEM; - return 0; - } - - /* Copy the header */ - memcpy(*retbuf, outbuf, len); - outheader = (struct clvm_header *) *retbuf; - - /* Read the returned values */ - off = 1; /* we've already read the first byte */ - while (off <= outheader->arglen && len > 0) { - len = read(_clvmd_sock, outheader->args + off, - buflen - off - offsetof(struct clvm_header, args)); - if (len > 0) - off += len; - } - - /* Was it an error ? */ - if (outheader->status != 0) { - errno = outheader->status; - - /* Only return an error here if there are no node-specific - errors present in the message that might have more detail */ - if (!(outheader->flags & CLVMD_FLAG_NODEERRS)) { - log_error("cluster request failed: %s", strerror(errno)); - return 0; - } - - } - - return 1; -} - -/* Build the structure header and parse-out wildcard node names */ -/* FIXME: Cleanup implicit casts of clvmd_cmd (int, char, uint8_t, etc). */ -static void _build_header(struct clvm_header *head, int clvmd_cmd, const char *node, - int len) -{ - head->cmd = clvmd_cmd; - head->status = 0; - head->flags = 0; - head->xid = 0; - head->clientid = 0; - head->arglen = len; - - /* - * Handle special node names. - */ - if (!node || !strcmp(node, NODE_ALL)) - head->node[0] = '\0'; - else if (!strcmp(node, NODE_LOCAL)) { - head->node[0] = '\0'; - head->flags = CLVMD_FLAG_LOCAL; - } else if (!strcmp(node, NODE_REMOTE)) { - head->node[0] = '\0'; - head->flags = CLVMD_FLAG_REMOTE; - } else - strcpy(head->node, node); -} - -/* - * Send a message to a(or all) node(s) in the cluster and wait for replies - */ -static int _cluster_request(char clvmd_cmd, const char *node, void *data, int len, - lvm_response_t ** response, int *num) -{ - char outbuf[sizeof(struct clvm_header) + len + strlen(node) + 1] __attribute__((aligned(8))); - char *inptr; - char *retbuf = NULL; - int status; - int i; - int num_responses = 0; - struct clvm_header *head = (struct clvm_header *) outbuf; - lvm_response_t *rarray; - - *num = 0; - - if (_clvmd_sock == -1) { - if ((_clvmd_sock = _open_local_sock(0)) == -1) - return_0; - } - - /* 1 byte is used from struct clvm_header.args[1], so -> len - 1 */ - _build_header(head, clvmd_cmd, node, len - 1); - memcpy(head->node + strlen(head->node) + 1, data, len); - - status = _send_request(outbuf, sizeof(struct clvm_header) + - strlen(head->node) + len - 1, &retbuf); - if (!status) - goto_out; - - /* Count the number of responses we got */ - head = (struct clvm_header *) retbuf; - inptr = head->args; - while (inptr[0]) { - num_responses++; - inptr += strlen(inptr) + 1; - inptr += sizeof(int); - inptr += strlen(inptr) + 1; - } - - /* - * Allocate response array. - * With an extra pair of INTs on the front to sanity - * check the pointer when we are given it back to free - */ - *response = NULL; - if (!(rarray = dm_malloc(sizeof(lvm_response_t) * num_responses))) { - errno = ENOMEM; - status = 0; - goto_out; - } - - /* Unpack the response into an lvm_response_t array */ - inptr = head->args; - i = 0; - while (inptr[0]) { - strcpy(rarray[i].node, inptr); - inptr += strlen(inptr) + 1; - - memcpy(&rarray[i].status, inptr, sizeof(int)); - inptr += sizeof(int); - - rarray[i].response = dm_malloc(strlen(inptr) + 1); - if (rarray[i].response == NULL) { - /* Free up everything else and return error */ - int j; - for (j = 0; j < i; j++) - dm_free(rarray[i].response); - dm_free(rarray); - errno = ENOMEM; - status = 0; - goto_out; - } - - strcpy(rarray[i].response, inptr); - rarray[i].len = strlen(inptr); - inptr += strlen(inptr) + 1; - i++; - } - *num = num_responses; - *response = rarray; - - out: - dm_free(retbuf); - - return status; -} - -/* Free reply array */ -static int _cluster_free_request(lvm_response_t * response, int num) -{ - int i; - - for (i = 0; i < num; i++) { - dm_free(response[i].response); - } - - dm_free(response); - - return 1; -} - -static int _lock_for_cluster(struct cmd_context *cmd, unsigned char clvmd_cmd, - uint32_t flags, const char *name) -{ - /* TODO: convert to global usable solution and move static into cmd */ - static unsigned char last_clvmd_cmd = 0; - int status; - int i; - char *args; - const char *node = ""; - int len; - int dmeventd_mode; - int saved_errno; - lvm_response_t *response = NULL; - int num_responses; - - assert(name); - - len = strlen(name) + 3; - args = alloca(len); - strcpy(args + 2, name); - - /* args[0] holds bottom 8 bits except LCK_LOCAL (0x40). */ - args[0] = flags & (LCK_SCOPE_MASK | LCK_TYPE_MASK | LCK_NONBLOCK | LCK_HOLD | LCK_CLUSTER_VG); - - args[1] = 0; - - if (flags & LCK_ORIGIN_ONLY) - args[1] |= LCK_ORIGIN_ONLY_MODE; - - if (flags & LCK_REVERT) - args[1] |= LCK_REVERT_MODE; - - if (mirror_in_sync()) - args[1] |= LCK_MIRROR_NOSYNC_MODE; - - if (test_mode()) - args[1] |= LCK_TEST_MODE; - - /* - * We propagate dmeventd_monitor_mode() to clvmd faithfully, since - * dmeventd monitoring is tied to activation which happens inside clvmd - * when locking_type = 3. - */ - dmeventd_mode = dmeventd_monitor_mode(); - if (dmeventd_mode == DMEVENTD_MONITOR_IGNORE) - args[1] |= LCK_DMEVENTD_MONITOR_IGNORE; - - if (dmeventd_mode) - args[1] |= LCK_DMEVENTD_MONITOR_MODE; - - if (cmd->partial_activation) - args[1] |= LCK_PARTIAL_MODE; - - /* - * VG locks are just that: locks, and have no side effects - * so we only need to do them on the local node because all - * locks are cluster-wide. - * - * P_ locks /do/ get distributed across the cluster because they might - * have side-effects. - * - * SYNC_NAMES and VG_BACKUP use the VG name directly without prefix. - */ - if (clvmd_cmd == CLVMD_CMD_SYNC_NAMES) { - if (flags & LCK_LOCAL) { - node = NODE_LOCAL; - if (clvmd_cmd == last_clvmd_cmd) { - log_debug("Skipping redundant local sync command."); - return 1; - } - } - } else if (clvmd_cmd != CLVMD_CMD_VG_BACKUP) { - if (strncmp(name, "P_", 2) && - (clvmd_cmd == CLVMD_CMD_LOCK_VG || - (flags & LCK_LOCAL) || - !(flags & LCK_CLUSTER_VG))) - node = NODE_LOCAL; - else if (flags & LCK_REMOTE) - node = NODE_REMOTE; - } - - last_clvmd_cmd = clvmd_cmd; - status = _cluster_request(clvmd_cmd, node, args, len, - &response, &num_responses); - - /* If any nodes were down then display them and return an error */ - for (i = 0; i < num_responses; i++) { - if (response[i].status == EHOSTDOWN) { - log_error("clvmd not running on node %s", - response[i].node); - status = 0; - errno = response[i].status; - } else if (response[i].status) { - log_error("Error locking on node %s: %s", - response[i].node, - response[i].response[0] ? - response[i].response : - strerror(response[i].status)); - status = 0; - errno = response[i].status; - } - } - - saved_errno = errno; - _cluster_free_request(response, num_responses); - errno = saved_errno; - - return status; -} - -/* API entry point for LVM */ -#ifdef CLUSTER_LOCKING_INTERNAL -static int _lock_resource(struct cmd_context *cmd, const char *resource, - uint32_t flags, const struct logical_volume *lv __attribute__((unused))) -#else - int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags, const struct logical_volume *lv __attribute__((unused))) -#endif -{ - char lockname[PATH_MAX]; - int clvmd_cmd = 0; - const char *lock_scope; - const char *lock_type; - - assert(strlen(resource) < sizeof(lockname)); - assert(resource); - - switch (flags & LCK_SCOPE_MASK) { - case LCK_ACTIVATION: - return 1; - case LCK_VG: - if (!strcmp(resource, VG_SYNC_NAMES)) { - log_very_verbose("Requesting sync names."); - return _lock_for_cluster(cmd, CLVMD_CMD_SYNC_NAMES, - flags & ~LCK_HOLD, resource); - } - if (flags == LCK_VG_BACKUP) { - log_very_verbose("Requesting backup of VG metadata for %s", - resource); - return _lock_for_cluster(cmd, CLVMD_CMD_VG_BACKUP, - LCK_CLUSTER_VG, resource); - } - - /* If the VG name is empty then lock the unused PVs */ - if (dm_snprintf(lockname, sizeof(lockname), "%c_%s", - (is_orphan_vg(resource) || - is_global_vg(resource) || - (flags & LCK_CACHE)) ? 'P' : 'V', - resource) < 0) { - log_error("Locking resource %s too long.", resource); - return 0; - } - - lock_scope = "VG"; - clvmd_cmd = CLVMD_CMD_LOCK_VG; - /* - * Old clvmd does not expect LCK_HOLD which was already processed - * in lock_vol, mask it for compatibility reasons. - */ - if (flags != LCK_VG_COMMIT && flags != LCK_VG_REVERT) - flags &= ~LCK_HOLD; - - break; - - case LCK_LV: - clvmd_cmd = CLVMD_CMD_LOCK_LV; - strcpy(lockname, resource); - lock_scope = "LV"; - flags &= ~LCK_HOLD; /* Mask off HOLD flag */ - break; - - default: - log_error("Unrecognised lock scope: %d", - flags & LCK_SCOPE_MASK); - return 0; - } - - switch(flags & LCK_TYPE_MASK) { - case LCK_UNLOCK: - lock_type = "UN"; - break; - case LCK_NULL: - lock_type = "NL"; - break; - case LCK_READ: - lock_type = "CR"; - break; - case LCK_PREAD: - lock_type = "PR"; - break; - case LCK_WRITE: - lock_type = "PW"; - break; - case LCK_EXCL: - lock_type = "EX"; - break; - default: - log_error("Unrecognised lock type: %u", - flags & LCK_TYPE_MASK); - return 0; - } - - log_very_verbose("Locking %s %s %s (%s%s%s%s%s%s%s%s%s) (0x%x)", lock_scope, lockname, - lock_type, lock_scope, - flags & LCK_NONBLOCK ? "|NONBLOCK" : "", - flags & LCK_HOLD ? "|HOLD" : "", - flags & LCK_CLUSTER_VG ? "|CLUSTER" : "", - flags & LCK_LOCAL ? "|LOCAL" : "", - flags & LCK_REMOTE ? "|REMOTE" : "", - flags & LCK_CACHE ? "|CACHE" : "", - flags & LCK_ORIGIN_ONLY ? "|ORIGIN_ONLY" : "", - flags & LCK_REVERT ? "|REVERT" : "", - flags); - - /* Send a message to the cluster manager */ - return _lock_for_cluster(cmd, clvmd_cmd, flags, lockname); -} - -static int _decode_lock_type(const char *response) -{ - if (!response) - return LCK_NULL; - - if (!strcmp(response, "EX")) - return LCK_EXCL; - - if (!strcmp(response, "CR")) - return LCK_READ; - - if (!strcmp(response, "PR")) - return LCK_PREAD; - - return_0; -} - -#ifdef CLUSTER_LOCKING_INTERNAL -static int _query_resource(const char *resource, const char *node, int *mode) -#else -int query_resource(const char *resource, const char *node, int *mode) -#endif -{ - int i, status, len, num_responses, saved_errno; - char *args; - lvm_response_t *response = NULL; - - saved_errno = errno; - len = strlen(resource) + 3; - args = alloca(len); - strcpy(args + 2, resource); - - args[0] = 0; - args[1] = 0; - - status = _cluster_request(CLVMD_CMD_LOCK_QUERY, node, args, len, - &response, &num_responses); - *mode = LCK_NULL; - for (i = 0; i < num_responses; i++) { - if (response[i].status == EHOSTDOWN) - continue; - - if (!response[i].response[0]) - continue; - - /* - * All nodes should use CR, or exactly one node - * should hold EX. (PR is obsolete) - * If two nodes report different locks, - * something is broken - just return more important mode. - */ - if (_decode_lock_type(response[i].response) > *mode) - *mode = _decode_lock_type(response[i].response); - - log_debug_locking("Lock held for %s, node %s : %s", resource, - response[i].node, response[i].response); - } - - _cluster_free_request(response, num_responses); - errno = saved_errno; - - return status; -} - -#ifdef CLUSTER_LOCKING_INTERNAL -static void _locking_end(void) -#else -void locking_end(void) -#endif -{ - if (_clvmd_sock != -1 && close(_clvmd_sock)) - stack; - - _clvmd_sock = -1; -} - -#ifdef CLUSTER_LOCKING_INTERNAL -static void _reset_locking(void) -#else -void reset_locking(void) -#endif -{ - if (close(_clvmd_sock)) - stack; - - _clvmd_sock = _open_local_sock(0); - if (_clvmd_sock == -1) - stack; -} - -#ifdef CLUSTER_LOCKING_INTERNAL -int init_cluster_locking(struct locking_type *locking, struct cmd_context *cmd, - int suppress_messages) -{ - locking->lock_resource = _lock_resource; - locking->query_resource = _query_resource; - locking->fin_locking = _locking_end; - locking->reset_locking = _reset_locking; - locking->flags = LCK_PRE_MEMLOCK | LCK_CLUSTERED | LCK_SUPPORTS_REMOTE_QUERIES; - - _clvmd_sock = _open_local_sock(suppress_messages); - if (_clvmd_sock == -1) - return 0; - - return 1; -} -#else -int locking_init(int type, struct dm_config_tree *cf, uint32_t *flags) -{ - _clvmd_sock = _open_local_sock(0); - if (_clvmd_sock == -1) - return 0; - - /* Ask LVM to lock memory before calling us */ - *flags |= LCK_PRE_MEMLOCK; - *flags |= LCK_CLUSTERED; - - return 1; -} -#endif diff --git a/lib/locking/external_locking.c b/lib/locking/external_locking.c deleted file mode 100644 index a1169a5..0000000 --- a/lib/locking/external_locking.c +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "lib/misc/lib.h" -#include "locking_types.h" -#include "lib/config/defaults.h" -#include "lib/misc/sharedlib.h" -#include "lib/commands/toolcontext.h" -#include "lib/activate/activate.h" - -static void *_locking_lib = NULL; -static void (*_reset_fn) (void) = NULL; -static void (*_end_fn) (void) = NULL; -static int (*_lock_fn) (struct cmd_context * cmd, const char *resource, - uint32_t flags) = NULL; -static int (*_init_fn) (int type, struct dm_config_tree * cft, - uint32_t *flags) = NULL; -static int (*_lock_query_fn) (const char *resource, int *mode) = NULL; - -static int _lock_resource(struct cmd_context *cmd, const char *resource, - uint32_t flags, const struct logical_volume *lv __attribute__((unused))) -{ - if (!_lock_fn) - return 0; - - if (!strcmp(resource, VG_SYNC_NAMES)) { - /* Hide this lock request from external locking */ - fs_unlock(); - return 1; - } - - return _lock_fn(cmd, resource, flags); -} - -static void _fin_external_locking(void) -{ - if (_end_fn) - _end_fn(); - - dlclose(_locking_lib); - - _locking_lib = NULL; - _init_fn = NULL; - _end_fn = NULL; - _lock_fn = NULL; - _reset_fn = NULL; -} - -static void _reset_external_locking(void) -{ - if (_reset_fn) - _reset_fn(); -} - -int init_external_locking(struct locking_type *locking, struct cmd_context *cmd, - int suppress_messages) -{ - const char *libname; - - if (_locking_lib) { - log_error_suppress(suppress_messages, "External locking already initialised"); - return 1; - } - - locking->lock_resource = _lock_resource; - locking->fin_locking = _fin_external_locking; - locking->reset_locking = _reset_external_locking; - locking->flags = 0; - - if (!(libname = find_config_tree_str(cmd, global_locking_library_CFG, NULL))) - return_0; - - if (!(_locking_lib = load_shared_library(cmd, libname, "locking", 1))) - return_0; - - /* Get the functions we need */ - if (!(_init_fn = dlsym(_locking_lib, "locking_init")) || - !(_lock_fn = dlsym(_locking_lib, "lock_resource")) || - !(_reset_fn = dlsym(_locking_lib, "reset_locking")) || - !(_end_fn = dlsym(_locking_lib, "locking_end"))) { - log_error_suppress(suppress_messages, "Shared library %s does " - "not contain locking functions", libname); - dlclose(_locking_lib); - _locking_lib = NULL; - return 0; - } - - if (!(_lock_query_fn = dlsym(_locking_lib, "query_resource"))) - log_warn_suppress(suppress_messages, "WARNING: %s: _query_resource() " - "missing: Using inferior activation method.", libname); - - log_verbose("Loaded external locking library %s", libname); - return _init_fn(2, cmd->cft, &locking->flags); -} diff --git a/lib/locking/locking.c b/lib/locking/locking.c index db6233b..0e5658f 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -116,101 +116,16 @@ int init_locking(int type, struct cmd_context *cmd, int suppress_messages) _blocking_supported = find_config_tree_bool(cmd, global_wait_for_locks_CFG, NULL); - switch (type) { - case 0: - init_no_locking(&_locking, cmd, suppress_messages); - log_warn_suppress(suppress_messages, - "WARNING: Locking disabled. Be careful! " - "This could corrupt your metadata."); - return 1; - - case 1: - log_very_verbose("%sFile-based locking selected.", - _blocking_supported ? "" : "Non-blocking "); + if (type != 1) + log_warn("WARNING: locking_type deprecated, using file locking."); - if (!init_file_locking(&_locking, cmd, suppress_messages)) { - log_error_suppress(suppress_messages, - "File-based locking initialisation failed."); - break; - } - return 1; - -#ifdef HAVE_LIBDL - case 2: - if (!is_static()) { - log_very_verbose("External locking selected."); - if (init_external_locking(&_locking, cmd, suppress_messages)) - return 1; - } - if (!find_config_tree_bool(cmd, global_fallback_to_clustered_locking_CFG, NULL)) { - log_error_suppress(suppress_messages, "External locking initialisation failed."); - break; - } -#endif - - log_very_verbose("Falling back to internal clustered locking."); - /* Fall through */ - - case 3: -#ifdef CLUSTER_LOCKING_INTERNAL - log_very_verbose("Cluster locking selected."); - if (!init_cluster_locking(&_locking, cmd, suppress_messages)) { - log_error_suppress(suppress_messages, - "Internal cluster locking initialisation failed."); - break; - } - return 1; -#else - log_warn("WARNING: Using locking_type=1, ignoring locking_type=3."); + if (type == 3) log_warn("WARNING: See lvmlockd(8) for information on using cluster/clvm VGs."); - type = 1; - log_very_verbose("%sFile-based locking selected.", - _blocking_supported ? "" : "Non-blocking "); + log_very_verbose("%sFile-based locking selected.", _blocking_supported ? "" : "Non-blocking "); - if (!init_file_locking(&_locking, cmd, suppress_messages)) { - log_error_suppress(suppress_messages, - "File-based locking initialisation failed."); - break; - } - return 1; -#endif - - case 4: - log_verbose("Read-only locking selected. " - "Only read operations permitted."); - if (!init_readonly_locking(&_locking, cmd, suppress_messages)) - break; - return 1; - - case 5: - init_dummy_locking(&_locking, cmd, suppress_messages); - log_verbose("Locking disabled for read-only access."); - return 1; - - default: - log_error("Unknown locking type requested."); - return 0; - } - - if ((type == 2 || type == 3) && - find_config_tree_bool(cmd, global_fallback_to_local_locking_CFG, NULL)) { - log_warn_suppress(suppress_messages, "WARNING: Falling back to local file-based locking."); - log_warn_suppress(suppress_messages, - "Volume Groups with the clustered attribute will " - "be inaccessible."); - if (init_file_locking(&_locking, cmd, suppress_messages)) - return 1; - - log_error_suppress(suppress_messages, - "File-based locking initialisation failed."); - } - - if (!ignorelockingfailure()) - return 0; - - log_verbose("Locking disabled - only read operations permitted."); - init_readonly_locking(&_locking, cmd, suppress_messages); + if (!init_file_locking(&_locking, cmd, suppress_messages)) + log_error_suppress(suppress_messages, "File-based locking initialisation failed."); return 1; } @@ -325,13 +240,6 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str !lvmcache_verify_lock_order(vol)) return_0; - if ((flags == LCK_VG_DROP_CACHE) || - (strcmp(vol, VG_GLOBAL) && strcmp(vol, VG_SYNC_NAMES))) { - /* Skip dropping cache for internal VG names #global, #sync_names */ - log_debug_locking("Dropping cache for %s.", vol); - lvmcache_drop_metadata(vol, 0); - } - break; case LCK_LV: /* All LV locks are non-blocking. */ @@ -372,24 +280,7 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str */ int activate_lv_excl(struct cmd_context *cmd, const struct logical_volume *lv) { - /* Non-clustered VGs are only activated locally. */ - if (!vg_is_clustered(lv->vg)) - return activate_lv_excl_local(cmd, lv); - - if (lv_is_active_exclusive_locally(lv)) - return 1; - - if (!activate_lv_excl_local(cmd, lv)) - return_0; - - if (lv_is_active_exclusive(lv)) - return 1; - - /* FIXME Deal with error return codes. */ - if (!activate_lv_excl_remote(cmd, lv)) - return_0; - - return 1; + return activate_lv_excl_local(cmd, lv); } /* Lock a list of LVs */ @@ -428,35 +319,6 @@ int locking_is_clustered(void) return (_locking.flags & LCK_CLUSTERED) ? 1 : 0; } -int locking_supports_remote_queries(void) -{ - return (_locking.flags & LCK_SUPPORTS_REMOTE_QUERIES) ? 1 : 0; -} - -int cluster_lock_held(const char *vol, const char *node, int *exclusive) -{ - int mode = LCK_NULL; - - if (!locking_is_clustered()) - return 0; - - if (!_locking.query_resource) - return -1; - - /* - * If an error occured, expect that volume is active - */ - if (!_locking.query_resource(vol, node, &mode)) { - stack; - return 1; - } - - if (exclusive) - *exclusive = (mode == LCK_EXCL); - - return mode == LCK_NULL ? 0 : 1; -} - int sync_local_dev_names(struct cmd_context* cmd) { memlock_unlock(cmd); diff --git a/lib/locking/locking_types.h b/lib/locking/locking_types.h index c4c832a..99aa964 100644 --- a/lib/locking/locking_types.h +++ b/lib/locking/locking_types.h @@ -50,9 +50,3 @@ int init_readonly_locking(struct locking_type *locking, struct cmd_context *cmd, int init_file_locking(struct locking_type *locking, struct cmd_context *cmd, int suppress_messages); - -int init_external_locking(struct locking_type *locking, struct cmd_context *cmd, - int suppress_messages); - -int init_cluster_locking(struct locking_type *locking, struct cmd_context *cmd, - int suppress_messages); diff --git a/lib/locking/no_locking.c b/lib/locking/no_locking.c deleted file mode 100644 index fa066cc..0000000 --- a/lib/locking/no_locking.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. - * - * This file is part of LVM2. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "lib/misc/lib.h" -#include "lib/locking/locking.h" -#include "locking_types.h" -#include "lib/misc/lvm-string.h" -#include "lib/activate/activate.h" - -/* - * No locking - */ - -static void _no_fin_locking(void) -{ -} - -static void _no_reset_locking(void) -{ -} - -static int _no_lock_resource(struct cmd_context *cmd, const char *resource, - uint32_t flags, const struct logical_volume *lv) -{ - switch (flags & LCK_SCOPE_MASK) { - case LCK_ACTIVATION: - break; - case LCK_VG: - if (!strcmp(resource, VG_SYNC_NAMES)) - fs_unlock(); - break; - case LCK_LV: - switch (flags & LCK_TYPE_MASK) { - case LCK_NULL: - return lv_deactivate(cmd, resource, lv_committed(lv)); - case LCK_UNLOCK: - return lv_resume_if_active(cmd, resource, (flags & LCK_ORIGIN_ONLY) ? 1: 0, 0, - (flags & LCK_REVERT) ? 1 : 0, lv_committed(lv)); - case LCK_READ: - return lv_activate_with_filter(cmd, resource, 0, (lv->status & LV_NOSCAN) ? 1 : 0, - (lv->status & LV_TEMPORARY) ? 1 : 0, lv_committed(lv)); - case LCK_WRITE: - return lv_suspend_if_active(cmd, resource, (flags & LCK_ORIGIN_ONLY) ? 1 : 0, 0, - lv_committed(lv), lv); - case LCK_EXCL: - return lv_activate_with_filter(cmd, resource, 1, (lv->status & LV_NOSCAN) ? 1 : 0, - (lv->status & LV_TEMPORARY) ? 1 : 0, lv_committed(lv)); - default: - break; - } - break; - default: - log_error("Unrecognised lock scope: %d", - flags & LCK_SCOPE_MASK); - return 0; - } - - return 1; -} - -static int _no_query_resource(const char *resource, const char *node, int *mode) -{ - log_very_verbose("Locking is disabled: Treating lock %s as not held.", - resource); - return 1; -} - -static int _readonly_lock_resource(struct cmd_context *cmd, - const char *resource, - uint32_t flags, const struct logical_volume *lv) -{ - if ((flags & LCK_TYPE_MASK) == LCK_WRITE && - (flags & LCK_SCOPE_MASK) == LCK_VG && - !(flags & LCK_CACHE) && - strcmp(resource, VG_GLOBAL)) { - log_error("Read-only locking type set. " - "Write locks are prohibited."); - return 0; - } - - return _no_lock_resource(cmd, resource, flags, lv); -} - -void init_no_locking(struct locking_type *locking, struct cmd_context *cmd __attribute__((unused)), - int suppress_messages) -{ - locking->lock_resource = _no_lock_resource; - locking->query_resource = _no_query_resource; - locking->reset_locking = _no_reset_locking; - locking->fin_locking = _no_fin_locking; - locking->flags = LCK_CLUSTERED; -} - -int init_readonly_locking(struct locking_type *locking, struct cmd_context *cmd __attribute__((unused)), - int suppress_messages) -{ - locking->lock_resource = _readonly_lock_resource; - locking->query_resource = _no_query_resource; - locking->reset_locking = _no_reset_locking; - locking->fin_locking = _no_fin_locking; - locking->flags = 0; - - return 1; -} - -void init_dummy_locking(struct locking_type *locking, struct cmd_context *cmd __attribute__((unused)), - int suppress_messages) -{ - locking->lock_resource = _readonly_lock_resource; - locking->query_resource = _no_query_resource; - locking->reset_locking = _no_reset_locking; - locking->fin_locking = _no_fin_locking; - locking->flags = LCK_CLUSTERED; -} diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index 68507dc..f930633 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -1478,21 +1478,11 @@ int lv_active_change(struct cmd_context *cmd, struct logical_volume *lv, switch (activate) { case CHANGE_AN: -deactivate: log_verbose("Deactivating logical volume %s.", display_lvname(lv)); if (!deactivate_lv(cmd, lv)) return_0; break; case CHANGE_ALN: - if (vg_is_clustered(lv->vg) && (needs_exclusive || _lv_is_exclusive(lv))) { - if (!lv_is_active_locally(lv)) { - log_error("Cannot deactivate remotely exclusive device %s locally.", - display_lvname(lv)); - return 0; - } - /* Unlock whole exclusive activation */ - goto deactivate; - } log_verbose("Deactivating logical volume %s locally.", display_lvname(lv)); if (!deactivate_lv_local(cmd, lv)) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index b78e5d0..e023132 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -7366,7 +7366,6 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, struct logical_volume *lv, *origin_lv = NULL; struct logical_volume *pool_lv = NULL; struct logical_volume *tmp_lv; - const struct logical_volume *lock_lv; struct lv_segment *seg, *pool_seg; int thin_pool_was_active = -1; /* not scanned, inactive, active */ int historical; @@ -7528,18 +7527,6 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, log_error("Caching of origin cache volume smaller then chunk size is unsupported."); return NULL; } - - /* Validate cache origin is exclusively active */ - lock_lv = lv_lock_holder(origin_lv); - if (vg_is_clustered(origin_lv->vg) && - locking_is_clustered() && - locking_supports_remote_queries() && - lv_is_active(lock_lv) && - !lv_is_active_exclusive(lock_lv)) { - log_error("Cannot cache not exclusively active origin volume %s.", - display_lvname(origin_lv)); - return NULL; - } } else if (seg_is_cache(lp)) { if (!pool_lv) { log_error(INTERNAL_ERROR "Pool LV for cache is missing."); @@ -7555,13 +7542,6 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (!(create_segtype = get_segtype_from_string(vg->cmd, SEG_TYPE_NAME_STRIPED))) return_0; } else if (seg_is_mirrored(lp) || (seg_is_raid(lp) && !seg_is_any_raid0(lp))) { - if (is_change_activating(lp->activate) && (lp->activate != CHANGE_AEY) && - vg_is_clustered(vg) && seg_is_mirrored(lp) && !seg_is_raid(lp) && - !cluster_mirror_is_available(vg->cmd)) { - log_error("Shared cluster mirrors are not available."); - return NULL; - } - if (!(lp->region_size = adjusted_mirror_region_size(vg->cmd, vg->extent_size, lp->extents, diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 1bbea19..3f177b0 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -1843,13 +1843,6 @@ int vgs_are_compatible(struct cmd_context *cmd __attribute__((unused)), return 0; } - /* Clustering attribute must be the same */ - if (vg_is_clustered(vg_to) != vg_is_clustered(vg_from)) { - log_error("Clustered attribute differs for \"%s\" and \"%s\"", - vg_to->name, vg_from->name); - return 0; - } - /* Check no conflicts with LV names */ dm_list_iterate_items(lvl1, &vg_to->lvs) { name1 = lvl1->lv->name; @@ -4564,123 +4557,6 @@ void free_pv_fid(struct physical_volume *pv) pv_set_fid(pv, NULL); } -/* This is only called by lv_from_lvid, which is only called from - * activate.c so we know the appropriate VG lock is already held and - * the vg_read_internal is therefore safe. - */ -struct volume_group *vg_read_by_vgid(struct cmd_context *cmd, - const char *vgid, - unsigned precommitted) -{ - const char *vgname; - struct volume_group *vg; - uint32_t warn_flags = WARN_PV_READ | WARN_INCONSISTENT; - int consistent = 0; - - /* - * When using lvmlockd we should never reach this point. - * The VG is locked, then vg_read() is done, which gets - * the latest VG from lvmetad, or disk if lvmetad has - * been invalidated. When we get here the VG should - * always be cached and returned above. - */ - if (lvmlockd_use()) - log_error(INTERNAL_ERROR "vg_read_by_vgid failed with lvmlockd"); - - if ((vg = lvmcache_get_saved_vg(vgid, precommitted))) { - log_debug_metadata("lvmcache: using saved_vg %s seqno %d pre %d %p", - vg->name, vg->seqno, precommitted, vg); - return vg; - } - - /* Mustn't scan if memory locked: ensure cache gets pre-populated! */ - if (critical_section()) - log_debug_metadata("Reading VG by vgid in critical section pre %d vgid %.8s", precommitted, vgid); - - if (!(vgname = lvmcache_vgname_from_vgid(cmd->mem, vgid))) { - log_debug_metadata("Reading VG by vgid %.8s no VG name found, retrying.", vgid); - lvmcache_destroy(cmd, 1, 0); - label_scan_destroy(cmd); - lvmcache_label_scan(cmd); - warn_flags |= SKIP_RESCAN; - } - - if (!(vgname = lvmcache_vgname_from_vgid(cmd->mem, vgid))) { - log_debug_metadata("Reading VG by vgid %.8s no VG name found.", vgid); - return NULL; - } - - consistent = 0; - - label_scan_setup_bcache(); - - if (!(vg = _vg_read(cmd, vgname, vgid, 0, warn_flags, &consistent, precommitted))) { - log_error("Rescan devices to look for missing VG."); - goto scan; - } - - if (vg_missing_pv_count(vg)) { - log_error("Rescan devices to look for missing PVs."); - release_vg(vg); - goto scan; - } - - label_scan_destroy(cmd); /* drop bcache to close devs, keep lvmcache */ - lvmcache_save_vg(vg, precommitted); - return vg; - - scan: - lvmcache_destroy(cmd, 1, 0); - label_scan_destroy(cmd); - lvmcache_label_scan(cmd); - warn_flags |= SKIP_RESCAN; - - if (!(vg = _vg_read(cmd, vgname, vgid, 0, warn_flags, &consistent, precommitted))) - goto fail; - - label_scan_destroy(cmd); /* drop bcache to close devs, keep lvmcache */ - - lvmcache_save_vg(vg, precommitted); - return vg; - - fail: - label_scan_destroy(cmd); /* drop bache to close devs, keep lvmcache */ - log_debug_metadata("Reading VG by vgid %.8s not found.", vgid); - return NULL; -} - -/* Only called by activate.c */ -struct logical_volume *lv_from_lvid(struct cmd_context *cmd, const char *lvid_s, - unsigned precommitted) -{ - struct logical_volume *lv; - struct volume_group *vg; - const union lvid *lvid; - - lvid = (const union lvid *) lvid_s; - - log_very_verbose("Finding %svolume group for uuid %s", precommitted ? "precommitted " : "", lvid_s); - if (!(vg = vg_read_by_vgid(cmd, (const char *)lvid->id[0].uuid, precommitted))) { - log_error("Reading VG not found for LVID %s", lvid_s); - return NULL; - } - - log_verbose("Found volume group \"%s\" %p", vg->name, vg); - if (vg->status & EXPORTED_VG) { - log_error("Volume group \"%s\" is exported", vg->name); - goto out; - } - if (!(lv = find_lv_in_vg_by_lvid(vg, lvid))) { - log_very_verbose("Can't find logical volume id %s", lvid_s); - goto out; - } - - return lv; -out: - release_vg(vg); - return NULL; -} - const char *find_vgname_from_pvid(struct cmd_context *cmd, const char *pvid) { @@ -5127,7 +5003,7 @@ int vg_flag_write_locked(struct volume_group *vg) static int _access_vg_clustered(struct cmd_context *cmd, const struct volume_group *vg) { - if (vg_is_clustered(vg) && !locking_is_clustered()) { + if (vg_is_clustered(vg)) { if (!cmd->ignore_clustered_vgs) log_error("Skipping clustered volume group %s", vg->name); else diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index 3d6750f..129267c 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -374,18 +374,9 @@ int add_pv_to_vg(struct volume_group *vg, const char *pv_name, struct logical_volume *find_lv_in_vg_by_lvid(struct volume_group *vg, const union lvid *lvid); -struct volume_group *vg_read_by_vgid(struct cmd_context *cmd, - const char *vgid, - unsigned precommitted); - struct lv_list *find_lv_in_lv_list(const struct dm_list *ll, const struct logical_volume *lv); -/* Find LV with given lvid (used during activation) */ -struct logical_volume *lv_from_lvid(struct cmd_context *cmd, - const char *lvid_s, - unsigned precommitted); - /* FIXME Merge these functions with ones above */ struct physical_volume *find_pv(struct volume_group *vg, struct device *dev); diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c index b44c7ca..db382d0 100644 --- a/lib/metadata/vg.c +++ b/lib/metadata/vg.c @@ -612,56 +612,6 @@ int vg_set_alloc_policy(struct volume_group *vg, alloc_policy_t alloc) return 1; } -/* - * Setting the cluster attribute marks active volumes exclusive. - * - * FIXME: resolve logic with reacquiring proper top-level LV locks - * and we likely can't giveup DLM locks for active LVs... - */ -int vg_set_clustered(struct volume_group *vg, int clustered) -{ - struct lv_list *lvl; - int fail = 0; - - if (vg_is_clustered(vg) && - locking_is_clustered() && - locking_supports_remote_queries() && - !clustered) { - /* - * If the volume is locally active but not exclusively - * we cannot determine when other nodes also use - * locally active (CR lock), so refuse conversion. - */ - dm_list_iterate_items(lvl, &vg->lvs) - if ((lv_lock_holder(lvl->lv) == lvl->lv) && - lv_is_active(lvl->lv) && - !lv_is_active_exclusive_locally(lvl->lv)) { - /* Show all non-local-exclusively active LVs - * this includes i.e. clustered mirrors */ - log_error("Can't change cluster attribute with " - "active logical volume %s.", - display_lvname(lvl->lv)); - fail = 1; - } - - if (fail) { - log_print_unless_silent("Conversion is supported only for " - "locally exclusive volumes."); - return 0; - } - } - - if (clustered) - vg->status |= CLUSTERED; - else - vg->status &= ~CLUSTERED; - - log_debug_metadata("Setting volume group %s as %sclustered.", - vg->name, clustered ? "" : "not " ); - - return 1; -} - /* The input string has already been validated. */ int vg_set_system_id(struct volume_group *vg, const char *system_id) diff --git a/lib/metadata/vg.h b/lib/metadata/vg.h index 3d24bba..6208159 100644 --- a/lib/metadata/vg.h +++ b/lib/metadata/vg.h @@ -181,7 +181,6 @@ char *vg_lock_args_dup(const struct volume_group *vg); uint32_t vg_seqno(const struct volume_group *vg); uint64_t vg_status(const struct volume_group *vg); int vg_set_alloc_policy(struct volume_group *vg, alloc_policy_t alloc); -int vg_set_clustered(struct volume_group *vg, int clustered); int vg_set_system_id(struct volume_group *vg, const char *system_id); int vg_set_lock_type(struct volume_group *vg, const char *lock_type); uint64_t vg_size(const struct volume_group *vg); diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c index 6746b1a..4110dec 100644 --- a/lib/mirror/mirrored.c +++ b/lib/mirror/mirrored.c @@ -278,14 +278,7 @@ static int _add_log(struct dm_pool *mem, struct lv_segment *seg, char *log_dlid = NULL; uint32_t log_flags = 0; - /* - * Use clustered mirror log for non-exclusive activation - * in clustered VG. - */ - if (!laopts->exclusive && vg_is_clustered(seg->lv->vg)) - clustered = 1; - - else if (seg->lv->vg->lock_type && !strcmp(seg->lv->vg->lock_type, "dlm")) { + if (seg->lv->vg->lock_type && !strcmp(seg->lv->vg->lock_type, "dlm")) { /* * If shared lock was used due to -asy, then we set clustered * to use a clustered mirror log with cmirrod. @@ -521,12 +514,6 @@ static int _mirrored_modules_needed(struct dm_pool *mem, !list_segment_modules(mem, first_seg(seg->log_lv), modules)) return_0; - if (vg_is_clustered(seg->lv->vg) && - !str_list_add(mem, modules, MODULE_NAME_CLUSTERED_MIRROR)) { - log_error("cluster log string list allocation failed"); - return 0; - } - if (!str_list_add(mem, modules, MODULE_NAME_MIRROR)) { log_error("mirror string list allocation failed"); return 0; diff --git a/tools/args.h b/tools/args.h index 603a0cf..2434f4b 100644 --- a/tools/args.h +++ b/tools/args.h @@ -949,17 +949,8 @@ arg(chunksize_ARG, 'c', "chunksize", sizekb_VAL, 0, 0, "See \\fBlvmthin\\fP(7) and \\fBlvmcache\\fP(7) for more information.\n") arg(clustered_ARG, 'c', "clustered", bool_VAL, 0, 0, - "#vgcreate\n" - "Create a clustered VG using clvmd if LVM is compiled with cluster support.\n" - "This allows multiple hosts to share a VG on shared devices.\n" - "clvmd and a lock manager must be configured and running.\n" - "(A clustered VG using clvmd is different from a shared VG using lvmlockd.)\n" - "See \\fBclvmd\\fP(8) for more information about clustered VGs.\n" - "#vgchange\n" - "Change the clustered property of a VG using clvmd.\n" - "See \\fBclvmd\\fP(8) for more information about clustered VGs.\n" - "#vgsplit\n" - "Specifies the clustered property of the new VG.\n") + "This option was specific to clvm and is now replaced by\n" + "the --shared option with \\fBlvmlockd\\fP(8).\n") arg(colon_ARG, 'c', "colon", 0, 0, 0, "Generate colon separated output for easier parsing in scripts or programs.\n" diff --git a/tools/command-lines.in b/tools/command-lines.in index 9d407d0..409f01c 100644 --- a/tools/command-lines.in +++ b/tools/command-lines.in @@ -1482,7 +1482,7 @@ OO_VGCHANGE: --autobackup Bool, --ignoremonitoring, --ignoreskippedcluster, OO_VGCHANGE_META: --addtag Tag, --deltag Tag, --logicalvolume Uint32, --maxphysicalvolumes Uint32, --alloc Alloc, --uuid, ---clustered Bool, --pvmetadatacopies MetadataCopiesPV, --vgmetadatacopies MetadataCopiesVG, +--pvmetadatacopies MetadataCopiesPV, --vgmetadatacopies MetadataCopiesVG, --physicalextentsize SizeMB, --resizeable Bool, --profile String, --detachprofile, --metadataprofile String @@ -1692,7 +1692,7 @@ ID: vgscan_general OO_VGSPLIT: --autobackup Bool # used only when the destination VG is new -OO_VGSPLIT_NEW: --alloc Alloc, --clustered Bool, +OO_VGSPLIT_NEW: --alloc Alloc, --maxlogicalvolumes Uint32, --maxphysicalvolumes Uint32, --metadatatype MetadataType, --vgmetadatacopies MetadataCopiesVG diff --git a/tools/lvchange.c b/tools/lvchange.c index 036b851..481cb4c 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -74,13 +74,6 @@ static int _lvchange_permission(struct cmd_context *cmd, return 0; } - if (lv_is_mirrored(lv) && vg_is_clustered(lv->vg) && - lv_info(cmd, lv, 0, &info, 0, 0) && info.exists) { - log_error("Cannot change permissions of mirror %s while active.", - display_lvname(lv)); - return 0; - } - if (lv_access & LVM_WRITE) { lv->status |= LVM_WRITE; log_verbose("Setting logical volume %s read/write.", @@ -362,12 +355,6 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) return 0; } - if (vg_is_clustered(lv->vg) && lv_is_active(lv)) { - log_error("Can't get exclusive access to clustered volume %s.", - display_lvname(lv)); - return 0; - } - if (monitored != DMEVENTD_MONITOR_IGNORE) init_dmeventd_monitor(monitored); init_mirror_in_sync(0); @@ -617,16 +604,6 @@ static int _lvchange_persistent(struct cmd_context *cmd, } activate = CHANGE_AEY; - if (vg_is_clustered(lv->vg) && - locking_is_clustered() && - locking_supports_remote_queries() && - !lv_is_active_exclusive_locally(lv)) { - /* Reliable reactivate only locally */ - log_print_unless_silent("Remotely active LV %s needs " - "individual reactivation.", - display_lvname(lv)); - activate = CHANGE_ALY; - } } /* Ensuring LV is not active */ @@ -1255,12 +1232,6 @@ static int _lvchange_properties_check(struct cmd_context *cmd, return 0; } - if (vg_is_clustered(lv->vg) && lv_is_cache_origin(lv) && lv_is_raid(lv)) { - log_error("Unable to change internal LV %s directly in a cluster.", - display_lvname(lv)); - return 0; - } - return 1; } diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 536b925..aebf3e9 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -780,15 +780,6 @@ static int _lvconvert_mirrors_parse_params(struct cmd_context *cmd, *new_log_count = arg_int_value(cmd, mirrorlog_ARG, lp->corelog ? MIRROR_LOG_CORE : DEFAULT_MIRRORLOG); - /* - * No mirrored logs for cluster mirrors until - * log daemon is multi-threaded. - */ - if ((*new_log_count == MIRROR_LOG_MIRRORED) && vg_is_clustered(lv->vg)) { - log_error("Log type, \"mirrored\", is unavailable to cluster mirrors."); - return 0; - } - log_verbose("Setting logging type to %s.", get_mirror_log_name(*new_log_count)); /* @@ -2054,10 +2045,6 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd, log_print_unless_silent("Delaying merge since snapshot is open."); merge_on_activate = 1; } - } else if (vg_is_clustered(origin->vg) && lv_is_active(origin)) { - /* When it's active somewhere else */ - log_print_unless_silent("Delaying merge since origin is remotely active."); - merge_on_activate = 1; } init_snapshot_merge(snap_seg, origin); diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index be2a31b..4f4e917 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -2698,11 +2698,6 @@ static int _init_lvmlockd(struct cmd_context *cmd) } } - if (use_lvmlockd && locking_is_clustered()) { - log_error("ERROR: configuration setting use_lvmlockd cannot be used with clustered locking_type 3."); - return 0; - } - lvmlockd_disconnect(); /* start over when tool context is refreshed */ lvmlockd_socket = getenv("LVM_LVMLOCKD_SOCKET"); if (!lvmlockd_socket) diff --git a/tools/pvmove.c b/tools/pvmove.c index 1daf364..0fcabb3 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -67,10 +67,6 @@ static int _pvmove_target_present(struct cmd_context *cmd, int clustered) static unsigned _pvmove_is_exclusive(struct cmd_context *cmd, struct volume_group *vg) { - if (vg_is_clustered(vg)) - if (!_pvmove_target_present(cmd, 1)) - return 1; - return 0; } diff --git a/tools/toollib.c b/tools/toollib.c index 832fae6..baf84ad 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -726,7 +726,6 @@ int vgcreate_params_set_defaults(struct cmd_context *cmd, vp_def->max_pv = vg->max_pv; vp_def->max_lv = vg->max_lv; vp_def->alloc = vg->alloc; - vp_def->clustered = vg_is_clustered(vg); vp_def->vgmetadatacopies = vg->mda_copies; vp_def->system_id = vg->system_id; /* No need to clone this */ } else { @@ -741,7 +740,6 @@ int vgcreate_params_set_defaults(struct cmd_context *cmd, vp_def->max_pv = DEFAULT_MAX_PV; vp_def->max_lv = DEFAULT_MAX_LV; vp_def->alloc = DEFAULT_ALLOC_POLICY; - vp_def->clustered = DEFAULT_CLUSTERED; vp_def->vgmetadatacopies = DEFAULT_VGMETADATACOPIES; vp_def->system_id = cmd->system_id; } @@ -761,11 +759,14 @@ int vgcreate_params_set_from_args(struct cmd_context *cmd, { const char *system_id_arg_str; const char *lock_type = NULL; - int locking_type; int use_lvmlockd; - int use_clvmd; lock_type_t lock_type_num; + if (arg_is_set(cmd, clustered_ARG)) { + log_error("The clustered option is deprecated, see --shared."); + return 0; + } + vp_new->vg_name = skip_dev_dir(cmd, vp_def->vg_name, NULL); vp_new->max_lv = arg_uint_value(cmd, maxlogicalvolumes_ARG, vp_def->max_lv); @@ -904,16 +905,9 @@ int vgcreate_params_set_from_args(struct cmd_context *cmd, * - 'vgcreate' (neither option) creates a local VG */ - locking_type = find_config_tree_int(cmd, global_locking_type_CFG, NULL); use_lvmlockd = find_config_tree_bool(cmd, global_use_lvmlockd_CFG, NULL); - use_clvmd = (locking_type == 3); if (arg_is_set(cmd, locktype_ARG)) { - if (arg_is_set(cmd, clustered_ARG)) { - log_error("A lock type cannot be specified with --clustered."); - return 0; - } - lock_type = arg_str_value(cmd, locktype_ARG, ""); if (arg_is_set(cmd, shared_ARG) && !is_lockd_type(lock_type)) { @@ -921,26 +915,6 @@ int vgcreate_params_set_from_args(struct cmd_context *cmd, return 0; } - } else if (arg_is_set(cmd, clustered_ARG)) { - const char *arg_str = arg_str_value(cmd, clustered_ARG, ""); - int clustery = strcmp(arg_str, "y") ? 0 : 1; - - if (use_clvmd) { - lock_type = clustery ? "clvm" : "none"; - - } else if (use_lvmlockd) { - log_error("lvmlockd is configured, use --shared with lvmlockd, and --clustered with clvmd."); - return 0; - - } else { - if (clustery) { - log_error("The --clustered option requires clvmd (locking_type=3)."); - return 0; - } - - lock_type = "none"; - } - } else if (arg_is_set(cmd, shared_ARG)) { int found_multiple = 0; @@ -953,20 +927,13 @@ int vgcreate_params_set_from_args(struct cmd_context *cmd, return 0; } - } else if (use_clvmd) { - log_error("Use --shared with lvmlockd, and --clustered with clvmd."); - return 0; - } else { log_error("Using a shared lock type requires lvmlockd."); return 0; } } else { - if (use_clvmd) - lock_type = locking_is_clustered() ? "clvm" : "none"; - else - lock_type = "none"; + lock_type = "none"; } /* @@ -977,6 +944,7 @@ int vgcreate_params_set_from_args(struct cmd_context *cmd, switch (lock_type_num) { case LOCK_TYPE_INVALID: + case LOCK_TYPE_CLVM: log_error("lock_type %s is invalid", lock_type); return 0; @@ -987,12 +955,6 @@ int vgcreate_params_set_from_args(struct cmd_context *cmd, return 0; } break; - case LOCK_TYPE_CLVM: - if (!use_clvmd) { - log_error("Using clvm requires locking_type 3."); - return 0; - } - break; case LOCK_TYPE_NONE: break; }; @@ -1001,16 +963,11 @@ int vgcreate_params_set_from_args(struct cmd_context *cmd, * The vg is not owned by one host/system_id. * Locking coordinates access from multiple hosts. */ - if (lock_type_num == LOCK_TYPE_DLM || lock_type_num == LOCK_TYPE_SANLOCK || lock_type_num == LOCK_TYPE_CLVM) + if (lock_type_num == LOCK_TYPE_DLM || lock_type_num == LOCK_TYPE_SANLOCK) vp_new->system_id = NULL; vp_new->lock_type = lock_type; - if (lock_type_num == LOCK_TYPE_CLVM) - vp_new->clustered = 1; - else - vp_new->clustered = 0; - log_debug("Setting lock_type to %s", vp_new->lock_type); return 1; } diff --git a/tools/vgchange.c b/tools/vgchange.c index ee6c3b9..e87277f 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -308,84 +308,6 @@ static int _vgchange_resizeable(struct cmd_context *cmd, return 1; } -static int _vgchange_clustered(struct cmd_context *cmd, - struct volume_group *vg) -{ - int clustered = arg_int_value(cmd, clustered_ARG, 0); - const char *lock_type = arg_str_value(cmd, locktype_ARG, NULL); - struct lv_list *lvl; - struct lv_segment *mirror_seg; - - if (find_config_tree_bool(cmd, global_use_lvmlockd_CFG, NULL)) { - log_error("lvmlockd requires using the vgchange --lock-type option."); - return 0; - } - - if (lock_type && !strcmp(lock_type, "clvm")) - clustered = 1; - - if (clustered && vg_is_clustered(vg)) { - if (vg->system_id && *vg->system_id) - log_warn("WARNING: Clearing invalid system ID %s from volume group %s.", - vg->system_id, vg->name); - else { - log_error("Volume group \"%s\" is already clustered", vg->name); - return 0; - } - } - - if (!clustered && !vg_is_clustered(vg)) { - if ((!vg->system_id || !*vg->system_id) && cmd->system_id && *cmd->system_id) - log_warn("Setting missing system ID on Volume Group %s to %s.", - vg->name, cmd->system_id); - else { - log_error("Volume group \"%s\" is already not clustered", - vg->name); - return 0; - } - } - - if (clustered && !arg_is_set(cmd, yes_ARG)) { - if (!clvmd_is_running()) { - if (yes_no_prompt("LVM cluster daemon (clvmd) is not running. " - "Make volume group \"%s\" clustered " - "anyway? [y/n]: ", vg->name) == 'n') { - log_error("No volume groups changed."); - return 0; - } - - } else if (!locking_is_clustered() && - (yes_no_prompt("LVM locking type is not clustered. " - "Make volume group \"%s\" clustered " - "anyway? [y/n]: ", vg->name) == 'n')) { - log_error("No volume groups changed."); - return 0; - } -#ifdef CMIRROR_REGION_COUNT_LIMIT - dm_list_iterate_items(lvl, &vg->lvs) { - if (!lv_is_mirror(lvl->lv)) - continue; - mirror_seg = first_seg(lvl->lv); - if ((lvl->lv->size / mirror_seg->region_size) > - CMIRROR_REGION_COUNT_LIMIT) { - log_error("Unable to convert %s to clustered mode:" - " Mirror region size of %s is too small.", - vg->name, lvl->lv->name); - return 0; - } - } -#endif - } - - if (!vg_set_system_id(vg, clustered ? NULL : cmd->system_id)) - return_0; - - if (!vg_set_clustered(vg, clustered)) - return_0; - - return 1; -} - static int _vgchange_logicalvolume(struct cmd_context *cmd, struct volume_group *vg) { @@ -676,7 +598,6 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name, { int ret = ECMD_PROCESSED; unsigned i; - struct lv_list *lvl; static const struct { int arg; @@ -690,7 +611,6 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name, { physicalextentsize_ARG, &_vgchange_pesize }, { uuid_ARG, &_vgchange_uuid }, { alloc_ARG, &_vgchange_alloc }, - { clustered_ARG, &_vgchange_clustered }, { vgmetadatacopies_ARG, &_vgchange_metadata_copies }, { metadataprofile_ARG, &_vgchange_profile }, { profile_ARG, &_vgchange_profile }, @@ -731,31 +651,6 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name, backup(vg); log_print_unless_silent("Volume group \"%s\" successfully changed", vg->name); - - /* FIXME: fix clvmd bug and take DLM lock for non clustered VGs. */ - if (arg_is_set(cmd, clustered_ARG) && - vg_is_clustered(vg) && /* just switched to clustered */ - locking_is_clustered() && - locking_supports_remote_queries()) - dm_list_iterate_items(lvl, &vg->lvs) { - if ((lv_lock_holder(lvl->lv) != lvl->lv) || - !lv_is_active(lvl->lv)) - continue; - - if (!activate_lv_excl_local(cmd, lvl->lv) || - !lv_is_active_exclusive_locally(lvl->lv)) { - log_error("Can't reactive logical volume %s, " - "please fix manually.", - display_lvname(lvl->lv)); - ret = ECMD_FAILED; - } - - if (lv_is_mirror(lvl->lv)) - /* Give hint for clustered mirroring */ - log_print_unless_silent("For clustered mirroring of %s " - "deactivation and activation is needed.", - display_lvname(lvl->lv)); - } } if (arg_is_set(cmd, activate_ARG)) { @@ -810,7 +705,6 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv) arg_is_set(cmd, resizeable_ARG) || arg_is_set(cmd, uuid_ARG) || arg_is_set(cmd, physicalextentsize_ARG) || - arg_is_set(cmd, clustered_ARG) || arg_is_set(cmd, alloc_ARG) || arg_is_set(cmd, vgmetadatacopies_ARG); @@ -965,22 +859,6 @@ static int _vgchange_locktype(struct cmd_context *cmd, struct volume_group *vg) } /* - * When lvm is currently using clvm, this function is just an alternative - * to vgchange -c{y,n}, and can: - * - change none to clvm - * - change clvm to none - * - it CANNOT change to or from a lockd type - */ - if (locking_is_clustered()) { - if (is_lockd_type(lock_type)) { - log_error("Changing to lock type %s requires lvmlockd.", lock_type); - return 0; - } - - return _vgchange_clustered(cmd, vg); - } - - /* * When lvm is currently using lvmlockd, this function can: * - change none to lockd type * - change none to clvm (with warning about not being able to use it) @@ -996,14 +874,6 @@ static int _vgchange_locktype(struct cmd_context *cmd, struct volume_group *vg) return 0; } - /* none to clvm */ - if (!strcmp(vg->lock_type, "none") && !strcmp(lock_type, "clvm")) { - log_warn("New clvm lock type will not be usable with lvmlockd."); - vg->status |= CLUSTERED; - vg->lock_type = "clvm"; /* this is optional */ - return 1; - } - /* clvm to none */ if (!strcmp(vg->lock_type, "clvm") && !strcmp(lock_type, "none")) { vg->status &= ~CLUSTERED; @@ -1033,15 +903,6 @@ static int _vgchange_locktype(struct cmd_context *cmd, struct volume_group *vg) lvl->lv->lock_args = NULL; } - /* ... to clvm */ - if (!strcmp(lock_type, "clvm")) { - log_warn("New clvm lock type will not be usable with lvmlockd."); - vg->status |= CLUSTERED; - vg->lock_type = "clvm"; /* this is optional */ - vg->system_id = NULL; - return 1; - } - /* ... to lockd type */ if (is_lockd_type(lock_type)) { /* diff --git a/tools/vgcreate.c b/tools/vgcreate.c index 52c4825..94f95ec 100644 --- a/tools/vgcreate.c +++ b/tools/vgcreate.c @@ -23,7 +23,6 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv) struct vgcreate_params vp_def; struct volume_group *vg; const char *tag; - const char *clustered_message = ""; char *vg_name; struct arg_value_group_list *current_group; @@ -135,7 +134,6 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv) !vg_set_max_lv(vg, vp_new.max_lv) || !vg_set_max_pv(vg, vp_new.max_pv) || !vg_set_alloc_policy(vg, vp_new.alloc) || - !vg_set_clustered(vg, vp_new.clustered) || !vg_set_system_id(vg, vp_new.system_id) || !vg_set_mda_copies(vg, vp_new.vgmetadatacopies)) goto_bad; @@ -167,11 +165,6 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv) } } - if (vg_is_clustered(vg)) - clustered_message = "Clustered "; - else if (locking_is_clustered()) - clustered_message = "Non-clustered "; - if (!archive(vg)) goto_bad; @@ -197,8 +190,8 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv) backup(vg); - log_print_unless_silent("%s%colume group \"%s\" successfully created%s%s", - clustered_message, *clustered_message ? 'v' : 'V', vg->name, + log_print_unless_silent("Volume group \"%s\" successfully created%s%s", + vg->name, vg->system_id ? " with system ID " : "", vg->system_id ? : ""); /* diff --git a/tools/vgsplit.c b/tools/vgsplit.c index e30a671..1e46e7e 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -646,7 +646,6 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) !vg_set_max_lv(vg_to, vp_new.max_lv) || !vg_set_max_pv(vg_to, vp_new.max_pv) || !vg_set_alloc_policy(vg_to, vp_new.alloc) || - !vg_set_clustered(vg_to, vp_new.clustered) || !vg_set_system_id(vg_to, vp_new.system_id) || !vg_set_mda_copies(vg_to, vp_new.vgmetadatacopies)) goto_bad;

1 0

master - WHATS_NEW
by Heinz Mauelshagen 05 Jun '18

05 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=11384637fb57c0fdefe59… Commit: 11384637fb57c0fdefe5940cf27285ebdcc1dbc6 Parent: 3810fd8d0d9cfcc519355f995d9cc70dca2811fd Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Tue Jun 5 16:24:19 2018 +0200 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Tue Jun 5 16:24:19 2018 +0200 WHATS_NEW --- WHATS_NEW | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 25707ab..7737313 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.178 - ==================================== + lvconvert: provide possible layouts between linear and striped/raid Use versionsort to fix archive file expiry beyond 100000 files. Version 2.02.178-rc1 - 24th May 2018

1 0

master - test: add convcenience conversion tests linear <-> striped
by Heinz Mauelshagen 05 Jun '18

05 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3810fd8d0d9cfcc519355… Commit: 3810fd8d0d9cfcc519355f995d9cc70dca2811fd Parent: bd7cdd0b09ba123b064937fddde08daacbed7dab Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed May 30 12:50:34 2018 +0200 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Tue Jun 5 16:23:18 2018 +0200 test: add convcenience conversion tests linear <-> striped Add tests for linear <-> striped|raid* conversions. Add region_size config to reshape tests to avoid test failures in case of it being defined unexpectedly in lvm.conf. Related: rhbz1439925 Related: rhbz1447809 --- test/shell/lvchange-rebuild-raid.sh | 2 +- ...ert-raid-reshape-linear_to_raid6-single-type.sh | 102 ++++++++++++++++++++ ...t-raid-reshape-linear_to_striped-single-type.sh | 80 +++++++++++++++ .../lvconvert-raid-reshape-linear_to_striped.sh | 2 + ...t-raid-reshape-striped_to_linear-single-type.sh | 89 +++++++++++++++++ .../lvconvert-raid-reshape-striped_to_linear.sh | 9 ++- .../lvconvert-raid-reshape-stripes-load-fail.sh | 9 +- test/shell/lvconvert-raid-restripe-linear.sh | 76 +++++++++++++++ 8 files changed, 363 insertions(+), 6 deletions(-) diff --git a/test/shell/lvchange-rebuild-raid.sh b/test/shell/lvchange-rebuild-raid.sh index 913a88d..22acb92 100644 --- a/test/shell/lvchange-rebuild-raid.sh +++ b/test/shell/lvchange-rebuild-raid.sh @@ -17,7 +17,7 @@ SKIP_WITH_LVMPOLLD=1 aux have_raid 1 3 2 || skip v1_9_0=0 -aux have_raid 1 9 && v1_9_0=1 +aux have_raid 1 9 0 && v1_9_0=1 aux prepare_vg 8 get_devs diff --git a/test/shell/lvconvert-raid-reshape-linear_to_raid6-single-type.sh b/test/shell/lvconvert-raid-reshape-linear_to_raid6-single-type.sh new file mode 100644 index 0000000..f01e7ef --- /dev/null +++ b/test/shell/lvconvert-raid-reshape-linear_to_raid6-single-type.sh @@ -0,0 +1,102 @@ +#!/usr/bin/env bash + +# Copyright (C) 2018 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +. lib/inittest + +# Ensure expected default region size +aux lvmconf 'activation/raid_region_size = 512' + +which mkfs.ext4 || skip +aux have_raid 1 13 1 || skip + +# Temporarily skip reshape tests on single-core CPUs until there's a fix for +# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20 +aux have_multi_core || skip +aux prepare_vg 5 + +# +# Test multi step linear -> striped conversion +# + +# Create linear LV +lvcreate -aey -L 16M -n $lv $vg +check lv_field $vg/$lv segtype "linear" +check lv_field $vg/$lv stripes 1 +check lv_field $vg/$lv data_stripes 1 +echo y|mkfs -t ext4 $DM_DEV_DIR/$vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Convert linear -> raid1 (takeover) +lvconvert -y --type raid6 --stripes 3 --stripesize 64K --regionsize 128K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_field $vg/$lv segtype "raid1" +check lv_field $vg/$lv stripes 2 +check lv_field $vg/$lv data_stripes 2 +check lv_field $vg/$lv regionsize "128.00k" +aux wait_for_sync $vg $lv +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Convert raid1 -> raid5_ls (takeover) +lvconvert -y --type raid6 --stripes 3 --stripesize 64K --regionsize 128K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_field $vg/$lv segtype "raid5_ls" +check lv_field $vg/$lv stripes 2 +check lv_field $vg/$lv data_stripes 1 +check lv_field $vg/$lv stripesize "64.00k" +check lv_field $vg/$lv regionsize "128.00k" + +# Convert raid5_ls adding stripes (reshape) +lvconvert -y --type raid6 --stripes 3 --stripesize 64K --regionsize 128K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_first_seg_field $vg/$lv segtype "raid5_ls" +check lv_first_seg_field $vg/$lv stripes 4 +check lv_first_seg_field $vg/$lv data_stripes 3 +check lv_first_seg_field $vg/$lv stripesize "64.00k" +check lv_first_seg_field $vg/$lv regionsize "128.00k" +check lv_first_seg_field $vg/$lv reshape_len_le 8 +aux wait_for_sync $vg $lv +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Convert raid5_ls -> raid6_ls_6 (takeover) +lvconvert -y --type raid6 --stripes 3 --stripesize 64K --regionsize 128K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_first_seg_field $vg/$lv segtype "raid6_ls_6" +check lv_first_seg_field $vg/$lv stripes 5 +check lv_first_seg_field $vg/$lv data_stripes 3 +check lv_first_seg_field $vg/$lv stripesize "64.00k" +check lv_first_seg_field $vg/$lv regionsize "128.00k" +check lv_first_seg_field $vg/$lv reshape_len_le 0 + +# Convert raid6_ls_6 -> raid6(_zr) (reshape) +lvconvert -y --type raid6 --stripes 3 --stripesize 64K --regionsize 128K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_first_seg_field $vg/$lv segtype "raid6" +check lv_first_seg_field $vg/$lv stripes 5 +check lv_first_seg_field $vg/$lv data_stripes 3 +check lv_first_seg_field $vg/$lv stripesize "64.00k" +check lv_first_seg_field $vg/$lv regionsize "128.00k" +check lv_first_seg_field $vg/$lv reshape_len_le 10 + +# Remove reshape space +lvconvert -y --type raid6 --stripes 3 --stripesize 64K --regionsize 128K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_first_seg_field $vg/$lv segtype "raid6" +check lv_first_seg_field $vg/$lv stripes 5 +check lv_first_seg_field $vg/$lv data_stripes 3 +check lv_first_seg_field $vg/$lv stripesize "64.00k" +check lv_first_seg_field $vg/$lv regionsize "128.00k" +check lv_first_seg_field $vg/$lv reshape_len_le 0 + +vgremove -ff $vg diff --git a/test/shell/lvconvert-raid-reshape-linear_to_striped-single-type.sh b/test/shell/lvconvert-raid-reshape-linear_to_striped-single-type.sh new file mode 100644 index 0000000..7e31cb9 --- /dev/null +++ b/test/shell/lvconvert-raid-reshape-linear_to_striped-single-type.sh @@ -0,0 +1,80 @@ +#!/usr/bin/env bash + +# Copyright (C) 2018 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +. lib/inittest + +aux lvmconf 'activation/raid_region_size = 512' + +which mkfs.ext4 || skip +aux have_raid 1 13 1 || skip + +# Temporarily skip reshape tests on single-core CPUs until there's a fix for +# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20 +aux have_multi_core || skip +aux prepare_vg 5 + +# +# Test multi step linear -> striped conversion +# + +# Create linear LV +lvcreate -aey -L 16M -n $lv $vg +check lv_field $vg/$lv segtype "linear" +check lv_field $vg/$lv stripes 1 +check lv_field $vg/$lv data_stripes 1 +echo y|mkfs -t ext4 $DM_DEV_DIR/$vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Convert linear -> raid1 +lvconvert -y --type striped --stripes 4 --stripesize 64K --regionsize 128K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_field $vg/$lv segtype "raid1" +check lv_field $vg/$lv stripes 2 +check lv_field $vg/$lv data_stripes 2 +check lv_field $vg/$lv regionsize "128.00k" +aux wait_for_sync $vg $lv +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Convert raid1 -> raid5_n +lvconvert -y --type striped --stripes 4 --stripesize 64K --regionsize 128K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_field $vg/$lv segtype "raid5_n" +check lv_field $vg/$lv stripes 2 +check lv_field $vg/$lv data_stripes 1 +check lv_field $vg/$lv stripesize "64.00k" +check lv_field $vg/$lv regionsize "128.00k" + +# Convert raid5_n adding stripes +lvconvert -y --type striped --stripes 4 --stripesize 64K --regionsize 128K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_first_seg_field $vg/$lv segtype "raid5_n" +check lv_first_seg_field $vg/$lv data_stripes 4 +check lv_first_seg_field $vg/$lv stripes 5 +check lv_first_seg_field $vg/$lv data_stripes 4 +check lv_first_seg_field $vg/$lv stripesize "64.00k" +check lv_first_seg_field $vg/$lv regionsize "128.00k" +check lv_first_seg_field $vg/$lv reshape_len_le 10 +aux wait_for_sync $vg $lv +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Convert raid5_n -> striped +lvconvert -y --type striped --stripes 4 --stripesize 64K --regionsize 128K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_first_seg_field $vg/$lv segtype "striped" +check lv_first_seg_field $vg/$lv stripes 4 +check lv_first_seg_field $vg/$lv data_stripes 4 +check lv_first_seg_field $vg/$lv stripesize "64.00k" + +vgremove -ff $vg diff --git a/test/shell/lvconvert-raid-reshape-linear_to_striped.sh b/test/shell/lvconvert-raid-reshape-linear_to_striped.sh index 55d4c18..04e2d62 100644 --- a/test/shell/lvconvert-raid-reshape-linear_to_striped.sh +++ b/test/shell/lvconvert-raid-reshape-linear_to_striped.sh @@ -14,6 +14,8 @@ SKIP_WITH_LVMPOLLD=1 . lib/inittest +aux lvmconf 'activation/raid_region_size = 512' + which mkfs.ext4 || skip aux have_raid 1 12 0 || skip diff --git a/test/shell/lvconvert-raid-reshape-striped_to_linear-single-type.sh b/test/shell/lvconvert-raid-reshape-striped_to_linear-single-type.sh new file mode 100644 index 0000000..476fb10 --- /dev/null +++ b/test/shell/lvconvert-raid-reshape-striped_to_linear-single-type.sh @@ -0,0 +1,89 @@ +#!/usr/bin/env bash + +# Copyright (C) 2018 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +. lib/inittest + +aux lvmconf 'activation/raid_region_size = 512' + +which mkfs.ext4 || skip +aux have_raid 1 13 1 || skip + +# Temporarily skip reshape tests on single-core CPUs until there's a fix for +# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20 +aux have_multi_core || skip + +aux prepare_vg 5 + +# +# Test multi step striped -> linear conversion +# + +# Create 4-way striped LV +lvcreate -aey --type striped -L 16M --stripes 4 --stripesize 64K -n $lv $vg +check lv_first_seg_field $vg/$lv segtype "striped" +check lv_first_seg_field $vg/$lv stripes 4 +check lv_first_seg_field $vg/$lv data_stripes 4 +check lv_first_seg_field $vg/$lv stripesize "64.00k" +echo y|mkfs -t ext4 $DM_DEV_DIR/$vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +lvextend -y -L64M $DM_DEV_DIR/$vg/$lv + +# Convert striped -> raid5_n +lvconvert -y --type linear $vg/$lv +check lv_field $vg/$lv segtype "raid5_n" +check lv_field $vg/$lv data_stripes 4 +check lv_field $vg/$lv stripes 5 +check lv_field $vg/$lv data_stripes 4 +check lv_field $vg/$lv stripesize "64.00k" +check lv_field $vg/$lv regionsize "512.00k" +check lv_field $vg/$lv reshape_len_le 0 +aux wait_for_sync $vg $lv +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Restripe raid5_n LV to single data stripe +# +# Need --force in order to remove stripes thus shrinking LV size! +lvconvert -y --force --type linear $vg/$lv +aux wait_for_sync $vg $lv 1 +fsck -fn $DM_DEV_DIR/$vg/$lv +# Remove the now freed stripes +lvconvert -y --type linear $vg/$lv +check lv_field $vg/$lv segtype "raid5_n" +check lv_field $vg/$lv stripes 2 +check lv_field $vg/$lv data_stripes 1 +check lv_field $vg/$lv stripesize "64.00k" +check lv_field $vg/$lv regionsize "512.00k" +check lv_field $vg/$lv reshape_len_le 4 + +# Convert raid5_n -> raid1 +lvconvert -y --type linear $vg/$lv +check lv_field $vg/$lv segtype "raid1" +check lv_field $vg/$lv stripes 2 +check lv_field $vg/$lv data_stripes 2 +check lv_field $vg/$lv stripesize 0 +check lv_field $vg/$lv regionsize "512.00k" +check lv_field $vg/$lv reshape_len_le "" +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Convert raid1 -> linear +lvconvert -y --type linear $vg/$lv +check lv_first_seg_field $vg/$lv segtype "linear" +check lv_first_seg_field $vg/$lv stripes 1 +check lv_first_seg_field $vg/$lv data_stripes 1 +check lv_first_seg_field $vg/$lv stripesize 0 +check lv_first_seg_field $vg/$lv regionsize 0 +fsck -fn $DM_DEV_DIR/$vg/$lv + +vgremove -ff $vg diff --git a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh index ed3769d..ccbe6ad 100644 --- a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh +++ b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh @@ -15,6 +15,8 @@ SKIP_WITH_LVMPOLLD=1 . lib/inittest +aux lvmconf 'activation/raid_region_size = 512' + which mkfs.ext4 || skip aux have_raid 1 12 0 || skip @@ -51,7 +53,9 @@ aux wait_for_sync $vg $lv1 fsck -fn $DM_DEV_DIR/$vg/$lv1 # Extend raid5_n LV by factor 4 to keep size once linear -lvresize -y -L 64 $vg/$lv1 +lvresize -y -L 64M $vg/$lv1 +aux wait_for_sync $vg $lv1 + check lv_field $vg/$lv1 segtype "raid5_n" check lv_field $vg/$lv1 data_stripes 4 check lv_field $vg/$lv1 stripes 5 @@ -87,6 +91,7 @@ check lv_first_seg_field $vg/$lv1 stripes 2 check lv_first_seg_field $vg/$lv1 stripesize "32.00k" check lv_first_seg_field $vg/$lv1 regionsize "1.00m" check lv_first_seg_field $vg/$lv1 reshape_len_le 4 +fsck -fn $DM_DEV_DIR/$vg/$lv1 # Convert raid5_n to raid1 lvconvert -y --type raid1 $vg/$lv1 @@ -97,6 +102,7 @@ check lv_first_seg_field $vg/$lv1 stripes 2 check lv_first_seg_field $vg/$lv1 stripesize "0" check lv_first_seg_field $vg/$lv1 regionsize "1.00m" check lv_first_seg_field $vg/$lv1 reshape_len_le "" +fsck -fn $DM_DEV_DIR/$vg/$lv1 # Convert raid1 -> linear lvconvert -y --type linear $vg/$lv1 @@ -107,5 +113,6 @@ check lv_first_seg_field $vg/$lv1 stripes 1 check lv_first_seg_field $vg/$lv1 stripesize "0" check lv_first_seg_field $vg/$lv1 regionsize "0" check lv_first_seg_field $vg/$lv1 reshape_len_le "" +fsck -fn $DM_DEV_DIR/$vg/$lv1 vgremove -ff $vg diff --git a/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh b/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh index feaf1e2..c7ccad8 100644 --- a/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh +++ b/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh @@ -46,6 +46,7 @@ check lv_first_seg_field $vg/$lv1 stripesize "64.00k" check lv_first_seg_field $vg/$lv1 data_stripes 10 check lv_first_seg_field $vg/$lv1 stripes 11 echo y|mkfs -t ext4 /dev/$vg/$lv1 +fsck -fn /dev/$vg/$lv1 mkdir -p $mount_dir mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir @@ -53,8 +54,8 @@ mkdir -p $mount_dir/1 $mount_dir/2 echo 3 >/proc/sys/vm/drop_caches -cp -r /usr/bin $mount_dir/1 >/dev/null 2>/dev/null & -cp -r /usr/bin $mount_dir/2 >/dev/null 2>/dev/null & +cp -r /usr/bin $mount_dir/1 &>/dev/null & +cp -r /usr/bin $mount_dir/2 &>/dev/null & sync & aux wait_for_sync $vg $lv1 @@ -69,11 +70,11 @@ check lv_first_seg_field $vg/$lv1 stripesize "64.00k" check lv_first_seg_field $vg/$lv1 data_stripes 15 check lv_first_seg_field $vg/$lv1 stripes 16 -rm -fr $mount_dir/2 -sync kill -9 %% wait +rm -fr $mount_dir/[12] +sync umount $mount_dir fsck -fn "$DM_DEV_DIR/$vg/$lv1" diff --git a/test/shell/lvconvert-raid-restripe-linear.sh b/test/shell/lvconvert-raid-restripe-linear.sh new file mode 100644 index 0000000..0ac8a04 --- /dev/null +++ b/test/shell/lvconvert-raid-restripe-linear.sh @@ -0,0 +1,76 @@ +#!/usr/bin/env bash + +# Copyright (C) 2017 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +. lib/inittest + +which mkfs.ext4 || skip +aux have_raid 1 12 0 || skip + +# Temporarily skip reshape tests on single-core CPUs until there's a fix for +# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20 +aux have_multi_core || skip +aux prepare_vg 5 + +# +# Test single step linear -> striped conversion +# + +# Create linear LV +lvcreate -aey -L 16M -n $lv $vg +check lv_field $vg/$lv segtype "linear" +check lv_field $vg/$lv stripes 1 +check lv_field $vg/$lv data_stripes 1 +echo y|mkfs -t ext4 $DM_DEV_DIR/$vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Convert linear -> raid1 +not lvconvert -y --stripes 4 $vg/$lv +not lvconvert -y --stripes 4 --stripesize 64K $vg/$lv +not lvconvert -y --stripes 4 --stripesize 64K --regionsize 512K $vg/$lv +lvconvert -y --type striped --stripes 4 --stripesize 64K --regionsize 512K $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv +check lv_field $vg/$lv segtype "raid1" +check lv_field $vg/$lv stripes 2 +check lv_field $vg/$lv data_stripes 2 +check lv_field $vg/$lv regionsize "512.00k" +aux wait_for_sync $vg $lv +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Convert raid1 -> raid5_n +lvconvert -y --type striped --stripes 4 --stripesize 64K --regionsize 512K $vg/$lv +check lv_field $vg/$lv segtype "raid5_n" +check lv_field $vg/$lv stripes 2 +check lv_field $vg/$lv data_stripes 1 +check lv_field $vg/$lv stripesize "64.00k" +check lv_field $vg/$lv regionsize "512.00k" +fsck -fn $DM_DEV_DIR/$vg/$lv + +# Convert raid5_n adding stripes +lvconvert -y --type striped --stripes 4 --stripesize 64K --regionsize 512K $vg/$lv +check lv_first_seg_field $vg/$lv segtype "raid5_n" +check lv_first_seg_field $vg/$lv data_stripes 4 +check lv_first_seg_field $vg/$lv stripes 5 +check lv_first_seg_field $vg/$lv stripesize "64.00k" +check lv_first_seg_field $vg/$lv regionsize "512.00k" +check lv_first_seg_field $vg/$lv reshape_len_le 10 +aux wait_for_sync $vg $lv +fsck -fn $DM_DEV_DIR/$vg/$lv +resize2fs $DM_DEV_DIR/$vg/$lv + +# Convert raid5_n -> striped +lvconvert -y --type striped $vg/$lv +fsck -fn $DM_DEV_DIR/$vg/$lv + +vgremove -ff $vg

1 0

master - lvconvert: support linear <-> striped convenience conversions
by Heinz Mauelshagen 05 Jun '18

05 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=bd7cdd0b09ba123b06493… Commit: bd7cdd0b09ba123b064937fddde08daacbed7dab Parent: de66704253653305e4513637735a078af00912b7 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed May 30 12:49:15 2018 +0200 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Tue Jun 5 16:23:18 2018 +0200 lvconvert: support linear <-> striped convenience conversions "lvconvert --type {linear|striped|raid*} ..." on a striped/linear LV provides convenience interim type to convert to the requested final layout similar to the given raid* <-> raid* conveninece types. Whilst on it, add missing raid5_n convenince type from raid5* to raid10. Resolves: rhbz1439925 Resolves: rhbz1447809 Resolves: rhbz1573255 --- lib/metadata/raid_manip.c | 172 ++++++++++++++++++++++++++++++--------------- tools/lvconvert.c | 110 ++++++++++------------------- 2 files changed, 154 insertions(+), 128 deletions(-) diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 9b4cb83..4d58d74 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -4526,17 +4526,18 @@ static struct possible_takeover_reshape_type _possible_takeover_reshape_types[] .current_areas = 1, .options = ALLOW_REGION_SIZE }, - { .current_types = SEG_STRIPED_TARGET, /* linear, i.e. seg->area_count = 1 */ - .possible_types = SEG_RAID0|SEG_RAID0_META, - .current_areas = 1, - .options = ALLOW_STRIPE_SIZE }, - /* raid0* -> raid1 */ { .current_types = SEG_RAID0|SEG_RAID0_META, /* seg->area_count = 1 */ .possible_types = SEG_RAID1, .current_areas = 1, .options = ALLOW_REGION_SIZE }, + /* raid5_n -> linear through interim raid1 */ + { .current_types = SEG_RAID5_N, + .possible_types = SEG_STRIPED_TARGET, + .current_areas = 2, + .options = ALLOW_NONE }, + /* striped,raid0* <-> striped,raid0* */ { .current_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META, .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META, @@ -4547,13 +4548,13 @@ static struct possible_takeover_reshape_type _possible_takeover_reshape_types[] { .current_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META, .possible_types = SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6|SEG_RAID10_NEAR, .current_areas = ~0U, - .options = ALLOW_REGION_SIZE }, + .options = ALLOW_REGION_SIZE|ALLOW_STRIPES }, /* raid4,raid5_n,raid6_n_6,raid10_near -> striped/raid0* */ { .current_types = SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6|SEG_RAID10_NEAR, .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META, .current_areas = ~0U, - .options = ALLOW_NONE }, + .options = ALLOW_STRIPES }, /* raid4,raid5_n,raid6_n_6 <-> raid4,raid5_n,raid6_n_6 */ { .current_types = SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6, @@ -4640,7 +4641,8 @@ static struct possible_takeover_reshape_type *_get_possible_takeover_reshape_typ for ( ; pt->current_types; pt++) if ((seg_from->segtype->flags & pt->current_types) && (segtype_to ? (segtype_to->flags & pt->possible_types) : 1)) - if (seg_from->area_count <= pt->current_areas) + if ((seg_from->area_count == pt->current_areas) || + (seg_from->area_count > 1 && seg_from->area_count <= pt->current_areas)) return pt; return NULL; @@ -4816,7 +4818,7 @@ typedef int (*takeover_fn_t)(TAKEOVER_FN_ARGS); /* * Unsupported takeover functions. */ -static int _takeover_noop(TAKEOVER_FN_ARGS) +static int _takeover_same_layout(const struct logical_volume *lv) { log_error("Logical volume %s is already of requested type %s.", display_lvname(lv), lvseg_name(first_seg(lv))); @@ -4824,6 +4826,11 @@ static int _takeover_noop(TAKEOVER_FN_ARGS) return 0; } +static int _takeover_noop(TAKEOVER_FN_ARGS) +{ + return _takeover_same_layout(lv); +} + static int _takeover_unsupported(TAKEOVER_FN_ARGS) { struct lv_segment *seg = first_seg(lv); @@ -5618,7 +5625,9 @@ static int _takeover_from_linear_to_raid0(TAKEOVER_FN_ARGS) static int _takeover_from_linear_to_raid1(TAKEOVER_FN_ARGS) { - return _takeover_unsupported_yet(lv, new_stripes, new_segtype); + first_seg(lv)->region_size = new_region_size; + + return _lv_raid_change_image_count(lv, 1, 2, allocate_pvs, NULL, 1, 0); } static int _takeover_from_linear_to_raid10(TAKEOVER_FN_ARGS) @@ -6102,23 +6111,34 @@ static uint64_t _raid_segtype_flag_5_to_6(const struct segment_type *segtype) /* FIXME: do this like _conversion_options_allowed()? */ static int _set_convenient_raid145610_segtype_to(const struct lv_segment *seg_from, const struct segment_type **segtype, + uint32_t *new_image_count, + uint32_t *stripes, int yes) { uint64_t seg_flag = 0; struct cmd_context *cmd = seg_from->lv->vg->cmd; const struct segment_type *segtype_sav = *segtype; + /* Linear -> striped request */ + if (seg_is_striped(seg_from) && + seg_from->area_count == 1 && + segtype_is_striped(*segtype)) + ; /* Bail out if same RAID level is requested. */ - if (_is_same_level(seg_from->segtype, *segtype)) + else if (_is_same_level(seg_from->segtype, *segtype)) return 1; log_debug("Checking LV %s requested %s segment type for convenience", display_lvname(seg_from->lv), (*segtype)->name); - /* striped/raid0 -> raid5/6 */ if (seg_is_striped(seg_from) || seg_is_any_raid0(seg_from)) { + /* linear -> raid*, interim/first conversion is to raid1 */ + if (seg_from->area_count == 1) + seg_flag = SEG_RAID1; + /* If this is any raid5 conversion request -> enforce raid5_n, because we convert from striped */ - if (segtype_is_any_raid5(*segtype) && !segtype_is_raid5_n(*segtype)) + else if (((segtype_is_striped(*segtype) && !segtype_is_any_raid0(*segtype)) || segtype_is_any_raid5(*segtype)) && + !segtype_is_raid5_n(*segtype)) seg_flag = SEG_RAID5_N; /* If this is any raid6 conversion request -> enforce raid6_n_6, because we convert from striped */ @@ -6143,40 +6163,71 @@ static int _set_convenient_raid145610_segtype_to(const struct lv_segment *seg_fr /* raid4/raid5 -> striped/raid0/raid1/raid6/raid10 */ } else if (seg_is_raid4(seg_from) || seg_is_any_raid5(seg_from)) { - if (segtype_is_raid1(*segtype) && - seg_from->area_count != 2) { + if ((segtype_is_raid1(*segtype) || segtype_is_linear(*segtype)) && seg_is_raid5_n(seg_from)) { + if (seg_from->area_count != 2) { + log_error("Converting %s LV %s to 2 stripes first.", + lvseg_name(seg_from), display_lvname(seg_from->lv)); + *new_image_count = 2; + seg_flag = SEG_RAID5_N; + } else + seg_flag = SEG_RAID1; + + } else if (segtype_is_raid1(*segtype) && seg_from->area_count != 2) { log_error("Convert %s LV %s to 2 stripes first (i.e. --stripes 1).", lvseg_name(seg_from), display_lvname(seg_from->lv)); return 0; - } - - if (seg_is_raid4(seg_from) && - segtype_is_any_raid5(*segtype) && - !segtype_is_raid5_n(*segtype)) - seg_flag = SEG_RAID5_N; - else if (seg_is_any_raid5(seg_from) && - segtype_is_raid4(*segtype) && + } else if (seg_is_raid4(seg_from) && + (segtype_is_linear(*segtype) || segtype_is_any_raid5(*segtype)) && !segtype_is_raid5_n(*segtype)) seg_flag = SEG_RAID5_N; - else if (segtype_is_raid10(*segtype)) { - if (seg_from->area_count < 3) { + else if (seg_is_raid5_n(seg_from) && seg_from->area_count == 2) { + if (*stripes >= 2) { + log_error("Converting %s LV %s to %u stripes first.", + lvseg_name(seg_from), display_lvname(seg_from->lv), *stripes); + *new_image_count = *stripes + seg_from->segtype->parity_devs; + seg_flag = SEG_RAID5_N; + } else { log_error("Convert %s LV %s to minimum 3 stripes first (i.e. --stripes 2).", lvseg_name(seg_from), display_lvname(seg_from->lv)); return 0; } + } else if (seg_is_any_raid5(seg_from) && + (segtype_is_linear(*segtype) || segtype_is_raid4(*segtype)) && + !segtype_is_raid5_n(*segtype)) + seg_flag = SEG_RAID5_N; - seg_flag = seg_is_raid5_n(seg_from) ? SEG_RAID0_META : SEG_RAID5_N; + else if (segtype_is_raid10(*segtype)) { + if (seg_from->area_count < 3) { + if (*stripes >= 2) { + log_error("Converting %s LV %s to %u stripes first.", + lvseg_name(seg_from), display_lvname(seg_from->lv), *stripes); + *new_image_count = *stripes + seg_from->segtype->parity_devs; + seg_flag = SEG_RAID5_N; + } else { + log_error("Convert %s LV %s to minimum 3 stripes first (i.e. --stripes 2).", + lvseg_name(seg_from), display_lvname(seg_from->lv)); + return 0; + } + } else + seg_flag = seg_is_raid5_n(seg_from) ? SEG_RAID0_META : SEG_RAID5_N; } else if (segtype_is_any_raid6(*segtype)) { - if (seg_from->area_count < 4) { - log_error("Convert %s LV %s to minimum 4 stripes first (i.e. --stripes 3).", - lvseg_name(seg_from), display_lvname(seg_from->lv)); - return 0; - } + if (seg_from->area_count < 4 && + seg_is_any_raid5(seg_from)) { + if (*stripes >= 3) { + log_error("Converting %s LV %s to %u stripes first.", + lvseg_name(seg_from), display_lvname(seg_from->lv), *stripes); + *new_image_count = *stripes + seg_from->segtype->parity_devs; + seg_flag = SEG_RAID5_LS; + } else { + log_error("Convert %s LV %s to minimum 4 stripes first (i.e. --stripes 3).", + lvseg_name(seg_from), display_lvname(seg_from->lv)); + return 0; + } - if (seg_is_raid4(seg_from) && !segtype_is_raid6_n_6(*segtype)) + } else if (seg_is_raid4(seg_from) && !segtype_is_raid6_n_6(*segtype)) seg_flag = SEG_RAID6_N_6; else seg_flag = _raid_seg_flag_5_to_6(seg_from); @@ -6193,9 +6244,9 @@ static int _set_convenient_raid145610_segtype_to(const struct lv_segment *seg_fr } else if (segtype_is_any_raid10(*segtype)) { seg_flag = seg_is_raid6_n_6(seg_from) ? SEG_RAID0_META : SEG_RAID6_N_6; - } else if ((segtype_is_striped(*segtype) || segtype_is_any_raid0(*segtype)) && - !seg_is_raid6_n_6(seg_from)) { - seg_flag = SEG_RAID6_N_6; + } else if (segtype_is_striped(*segtype) || segtype_is_any_raid0(*segtype)) { + if (!seg_is_raid6_n_6(seg_from)) + seg_flag = SEG_RAID6_N_6; } else if (segtype_is_raid4(*segtype) && !seg_is_raid6_n_6(seg_from)) { seg_flag = SEG_RAID6_N_6; @@ -6331,41 +6382,48 @@ static int _conversion_options_allowed(const struct lv_segment *seg_from, int yes, uint32_t new_image_count, int new_data_copies, int new_region_size, - int stripes, unsigned new_stripe_size_supplied) + uint32_t *stripes, unsigned new_stripe_size_supplied) { int r = 1; - uint32_t opts; + uint32_t count = new_image_count, opts; + + /* Linear -> linear rejection */ + if ((seg_is_linear(seg_from) || seg_is_striped(seg_from)) && + seg_from->area_count == 1 && + segtype_is_striped(*segtype_to) && + *stripes < 2) + return _takeover_same_layout(seg_from->lv); - if (!new_image_count && !_set_convenient_raid145610_segtype_to(seg_from, segtype_to, yes)) + if (!new_image_count && !_set_convenient_raid145610_segtype_to(seg_from, segtype_to, &count, stripes, yes)) return_0; + if (new_image_count != count) + *stripes = count - seg_from->segtype->parity_devs; + if (!_get_allowed_conversion_options(seg_from, *segtype_to, new_image_count, &opts)) { - log_error("Unable to convert LV %s from %s to %s.", - display_lvname(seg_from->lv), lvseg_name(seg_from), (*segtype_to)->name); + if (strcmp(lvseg_name(seg_from), (*segtype_to)->name)) + log_error("Unable to convert LV %s from %s to %s.", + display_lvname(seg_from->lv), lvseg_name(seg_from), (*segtype_to)->name); + else + _takeover_same_layout(seg_from->lv); + return 0; } - if (stripes > 1 && !(opts & ALLOW_STRIPES)) { - if (!_log_prohibited_option(seg_from, *segtype_to, "--stripes")) - stack; - r = 0; + if (*stripes > 1 && !(opts & ALLOW_STRIPES)) { + _log_prohibited_option(seg_from, *segtype_to, "--stripes"); + *stripes = seg_from->area_count; } - if (new_stripe_size_supplied && !(opts & ALLOW_STRIPE_SIZE)) { - if (!_log_prohibited_option(seg_from, *segtype_to, "-I/--stripesize")) - stack; - r = 0; - } + if (new_stripe_size_supplied && !(opts & ALLOW_STRIPE_SIZE)) + _log_prohibited_option(seg_from, *segtype_to, "-I/--stripesize"); - if (new_region_size && !(opts & ALLOW_REGION_SIZE)) { - if (!_log_prohibited_option(seg_from, *segtype_to, "-R/--regionsize")) - stack; - r = 0; - } + if (new_region_size && new_region_size != seg_from->region_size && !(opts & ALLOW_REGION_SIZE)) + _log_prohibited_option(seg_from, *segtype_to, "-R/--regionsize"); /* Can't reshape stripes or stripe size when performing a takeover! */ if (!_is_same_level(seg_from->segtype, *segtype_to)) { - if (stripes && stripes != _data_rimages_count(seg_from, seg_from->area_count)) + if (*stripes && *stripes != _data_rimages_count(seg_from, seg_from->area_count)) log_warn("WARNING: ignoring --stripes option on takeover of %s (reshape afterwards).", display_lvname(seg_from->lv)); @@ -6501,7 +6559,7 @@ int lv_raid_convert(struct logical_volume *lv, */ if (!_conversion_options_allowed(seg, &new_segtype, yes, 0 /* Takeover */, 0 /*new_data_copies*/, new_region_size, - new_stripes, new_stripe_size_supplied)) + &stripes, new_stripe_size_supplied)) return _log_possible_conversion_types(lv, new_segtype); /* https://bugzilla.redhat.com/1439399 */ diff --git a/tools/lvconvert.c b/tools/lvconvert.c index be4b1d0..536b925 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -238,6 +238,14 @@ static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp) break; case CONV_OTHER: + if (arg_is_set(cmd, regionsize_ARG)) { + lp->region_size = arg_uint_value(cmd, regionsize_ARG, 0); + lp->region_size_supplied = 1; + } else { + lp->region_size = get_default_region_size(cmd); + lp->region_size_supplied = 0; + } + if (_mirror_or_raid_type_requested(cmd, lp->type_str) || lp->mirrorlog || lp->corelog) { /* Mirrors (and some RAID functions) */ if (arg_is_set(cmd, chunksize_ARG)) { @@ -250,14 +258,6 @@ static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp) return 0; } - if (arg_is_set(cmd, regionsize_ARG)) { - lp->region_size = arg_uint_value(cmd, regionsize_ARG, 0); - lp->region_size_supplied = 1; - } else { - lp->region_size = get_default_region_size(cmd); - lp->region_size_supplied = 0; - } - /* FIXME man page says in one place that --type and --mirrors can't be mixed */ if (lp->mirrors_supplied && !lp->mirrors) /* down-converting to linear/stripe? */ @@ -265,7 +265,7 @@ static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp) } else if (_raid0_type_requested(lp->type_str) || _striped_type_requested(lp->type_str)) { /* striped or linear or raid0 */ if (arg_from_list_is_set(cmd, "cannot be used with --type raid0 or --type striped or --type linear", - chunksize_ARG, corelog_ARG, mirrors_ARG, mirrorlog_ARG, regionsize_ARG, zero_ARG, + chunksize_ARG, corelog_ARG, mirrors_ARG, mirrorlog_ARG, zero_ARG, -1)) return_0; } /* else segtype will default to current type */ @@ -1258,11 +1258,11 @@ static int _is_valid_raid_conversion(const struct segment_type *from_segtype, if (!from_segtype) return 1; - if (from_segtype == to_segtype) - return 1; - - /* Support raid0 <-> striped conversions */ + /* linear/striped/raid0 <-> striped/raid0/linear (restriping via raid) */ if (segtype_is_striped(from_segtype) && segtype_is_striped(to_segtype)) + return 0; + + if (from_segtype == to_segtype) return 1; if (!segtype_is_raid(from_segtype) && !segtype_is_raid(to_segtype)) @@ -1305,45 +1305,18 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l lp->mirrors = 0; } - /* Can only change image count for raid1 and linear */ - if (lp->mirrors_supplied) { - if (_raid0_type_requested(lp->type_str)) { - log_error("--mirrors/-m is not compatible with conversion to %s.", - lp->type_str); - return 0; - } - if (!seg_is_mirrored(seg) && !seg_is_linear(seg)) { - log_error("--mirrors/-m is not compatible with %s.", - lvseg_name(seg)); - return 0; - } - if (seg_is_raid10(seg)) { - log_error("--mirrors/-m cannot be changed with %s.", - lvseg_name(seg)); - return 0; - } - } - if (!_lvconvert_validate_thin(lv, lp)) return_0; - if (!_is_valid_raid_conversion(seg->segtype, lp->segtype)) + if (!_is_valid_raid_conversion(seg->segtype, lp->segtype) && + !lp->mirrors_supplied) goto try_new_takeover_or_reshape; - if (seg_is_linear(seg) && !lp->mirrors_supplied) { - if (_raid0_type_requested(lp->type_str)) { - log_error("Linear LV %s cannot be converted to %s.", - display_lvname(lv), lp->type_str); - return 0; - } + if (seg_is_striped(seg) && !lp->mirrors_supplied) + goto try_new_takeover_or_reshape; - if (!strcmp(lp->type_str, SEG_TYPE_NAME_RAID1)) { - log_error("Raid conversions of LV %s require -m/--mirrors.", - display_lvname(lv)); - return 0; - } + if (seg_is_linear(seg) && !lp->mirrors_supplied) goto try_new_takeover_or_reshape; - } /* Change number of RAID1 images */ if (lp->mirrors_supplied || lp->keep_mimages) { @@ -1381,6 +1354,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l return lv_raid_split(lv, lp->yes, lp->lv_split_name, image_count, lp->pvh); if (lp->mirrors_supplied) { + if ((seg_is_striped(seg) && seg->area_count == 1) || seg_is_raid1(seg)) { /* ??? */ if (!*lp->type_str || !strcmp(lp->type_str, SEG_TYPE_NAME_RAID1) || !strcmp(lp->type_str, SEG_TYPE_NAME_LINEAR) || (!strcmp(lp->type_str, SEG_TYPE_NAME_STRIPED) && image_count == 1)) { if (image_count > DEFAULT_RAID1_MAX_IMAGES) { @@ -1398,6 +1372,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l return 1; } + } goto try_new_takeover_or_reshape; } @@ -1440,7 +1415,6 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l } try_new_takeover_or_reshape: - if (!_raid4_conversion_supported(lv, lp)) return 0; @@ -1450,24 +1424,15 @@ try_new_takeover_or_reshape: if (!arg_is_set(cmd, type_ARG)) lp->segtype = NULL; - /* Only let raid4 through for now. */ - if (!lp->segtype || - (lp->type_str && lp->type_str[0] && lp->segtype != seg->segtype && - ((seg_is_raid4(seg) && seg_is_striped(lp) && lp->stripes > 1) || - (seg_is_striped(seg) && seg->area_count > 1 && seg_is_raid4(lp))))) { - if (!lv_raid_convert(lv, lp->segtype, - lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size, - (lp->region_size_supplied || !seg->region_size) ? - lp->region_size : seg->region_size , lp->pvh)) - return_0; - - log_print_unless_silent("Logical volume %s successfully converted.", - display_lvname(lv)); - return 1; - } + if (!lv_raid_convert(lv, lp->segtype, + lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size, + (lp->region_size_supplied || !seg->region_size) ? + lp->region_size : seg->region_size , lp->pvh)) + return_0; - log_error("Conversion operation not yet supported."); - return 0; + log_print_unless_silent("Logical volume %s successfully converted.", + display_lvname(lv)); + return 1; } /* @@ -1692,21 +1657,24 @@ static int _convert_striped(struct cmd_context *cmd, struct logical_volume *lv, struct lvconvert_params *lp) { const char *mirrors_type = find_config_tree_str(cmd, global_mirror_segtype_default_CFG, NULL); + int raid_type = *lp->type_str && !strncmp(lp->type_str, "raid", 4); - if (!strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR)) - return _convert_striped_mirror(cmd, lv, lp); + if (!raid_type) { + if (!strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR)) + return _convert_striped_mirror(cmd, lv, lp); - if (segtype_is_raid(lp->segtype)) - return _convert_striped_raid(cmd, lv, lp); - - /* --mirrors can mean --type mirror or --type raid1 depending on config setting. */ + /* --mirrors can mean --type mirror or --type raid1 depending on config setting. */ - if (arg_is_set(cmd, mirrors_ARG) && mirrors_type && !strcmp(mirrors_type, SEG_TYPE_NAME_MIRROR)) - return _convert_striped_mirror(cmd, lv, lp); + if (arg_is_set(cmd, mirrors_ARG) && mirrors_type && !strcmp(mirrors_type, SEG_TYPE_NAME_MIRROR)) + return _convert_striped_mirror(cmd, lv, lp); + } if (arg_is_set(cmd, mirrors_ARG) && mirrors_type && !strcmp(mirrors_type, SEG_TYPE_NAME_RAID1)) return _convert_striped_raid(cmd, lv, lp); + if (segtype_is_striped(lp->segtype) || segtype_is_raid(lp->segtype)) + return _convert_striped_raid(cmd, lv, lp); + log_error("Unknown operation on striped or linear LV %s.", display_lvname(lv)); return 0; }

1 0

master - segtype: add linear
by Heinz Mauelshagen 05 Jun '18

05 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=de66704253653305e4513… Commit: de66704253653305e4513637735a078af00912b7 Parent: 2eda683a205d1ad2463cf60d783bc63d9833717e Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed May 30 12:44:24 2018 +0200 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Tue Jun 5 16:23:18 2018 +0200 segtype: add linear Add linear segtype addressing FIXME in preparation for linear <-> striped convenience conversion support --- lib/commands/toolcontext.c | 1 + lib/metadata/segtype.c | 4 ---- lib/metadata/segtype.h | 4 +++- lib/striped/striped.c | 19 ++++++++++++++----- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 7d0640a..8eaece6 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -1462,6 +1462,7 @@ static int _init_segtypes(struct cmd_context *cmd) struct segment_type *segtype; struct segtype_library seglib = { .cmd = cmd, .lib = NULL }; struct segment_type *(*init_segtype_array[])(struct cmd_context *cmd) = { + init_linear_segtype, init_striped_segtype, init_zero_segtype, init_error_segtype, diff --git a/lib/metadata/segtype.c b/lib/metadata/segtype.c index 2fdbaa3..a6f6203 100644 --- a/lib/metadata/segtype.c +++ b/lib/metadata/segtype.c @@ -22,10 +22,6 @@ struct segment_type *get_segtype_from_string(struct cmd_context *cmd, { struct segment_type *segtype; - /* FIXME Register this properly within striped.c */ - if (!strcmp(str, SEG_TYPE_NAME_LINEAR)) - str = SEG_TYPE_NAME_STRIPED; - dm_list_iterate_items(segtype, &cmd->segtypes) if (!strcmp(segtype->name, str)) return segtype; diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h index fe19b34..5484c23 100644 --- a/lib/metadata/segtype.h +++ b/lib/metadata/segtype.h @@ -68,6 +68,7 @@ struct dev_manager; #define SEG_RAID6 SEG_RAID6_ZR #define SEG_STRIPED_TARGET (1ULL << 39) +#define SEG_LINEAR_TARGET (1ULL << 40) #define SEG_UNKNOWN (1ULL << 63) @@ -105,7 +106,7 @@ struct dev_manager; #define SEG_TYPE_NAME_RAID6_RS_6 "raid6_rs_6" #define SEG_TYPE_NAME_RAID6_N_6 "raid6_n_6" -#define segtype_is_linear(segtype) (!strcmp(segtype->name, SEG_TYPE_NAME_LINEAR)) +#define segtype_is_linear(segtype) (!strcmp((segtype)->name, SEG_TYPE_NAME_LINEAR)) #define segtype_is_striped_target(segtype) ((segtype)->flags & SEG_STRIPED_TARGET ? 1 : 0) #define segtype_is_cache(segtype) ((segtype)->flags & SEG_CACHE ? 1 : 0) #define segtype_is_cache_pool(segtype) ((segtype)->flags & SEG_CACHE_POOL ? 1 : 0) @@ -274,6 +275,7 @@ struct segtype_library; int lvm_register_segtype(struct segtype_library *seglib, struct segment_type *segtype); +struct segment_type *init_linear_segtype(struct cmd_context *cmd); struct segment_type *init_striped_segtype(struct cmd_context *cmd); struct segment_type *init_zero_segtype(struct cmd_context *cmd); struct segment_type *init_error_segtype(struct cmd_context *cmd); diff --git a/lib/striped/striped.c b/lib/striped/striped.c index 9c8408c..a9854a2 100644 --- a/lib/striped/striped.c +++ b/lib/striped/striped.c @@ -230,7 +230,7 @@ static struct segtype_handler _striped_ops = { .destroy = _striped_destroy, }; -struct segment_type *init_striped_segtype(struct cmd_context *cmd) +static struct segment_type *_init_segtype(struct cmd_context *cmd, const char *name, uint64_t target) { struct segment_type *segtype = dm_zalloc(sizeof(*segtype)); @@ -238,11 +238,20 @@ struct segment_type *init_striped_segtype(struct cmd_context *cmd) return_NULL; segtype->ops = &_striped_ops; - segtype->name = SEG_TYPE_NAME_STRIPED; - segtype->flags = SEG_STRIPED_TARGET | - SEG_CAN_SPLIT | SEG_AREAS_STRIPED; + segtype->name = name; + segtype->flags = target | SEG_CAN_SPLIT | SEG_AREAS_STRIPED; log_very_verbose("Initialised segtype: %s", segtype->name); - return segtype; } + +struct segment_type *init_striped_segtype(struct cmd_context *cmd) +{ + return _init_segtype(cmd, SEG_TYPE_NAME_STRIPED, SEG_STRIPED_TARGET); +} + + +struct segment_type *init_linear_segtype(struct cmd_context *cmd) +{ + return _init_segtype(cmd, SEG_TYPE_NAME_LINEAR, SEG_LINEAR_TARGET); +}

1 0

master - build: base/Makefile
by Joe Thornber 04 Jun '18

04 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2eda683a205d1ad2463cf… Commit: 2eda683a205d1ad2463cf60d783bc63d9833717e Parent: 232918fb86e1ee254ae5e4c9aece4615d828c9bb Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Mon Jun 4 15:37:35 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Mon Jun 4 15:37:35 2018 +0100 build: base/Makefile .gitignore hid it. --- base/Makefile | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/base/Makefile b/base/Makefile new file mode 100644 index 0000000..27f539f --- /dev/null +++ b/base/Makefile @@ -0,0 +1,29 @@ +# Copyright (C) 2018 Red Hat, Inc. All rights reserved. +# +# This file is part of the device-mapper userspace tools. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU Lesser General Public License v.2.1. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +BASE_SOURCE=\ + base/data-struct/radix-tree.c \ + +BASE_DEPENDS=$(addprefix $(top_builddir)/,$(subst .c,.d,$(BASE_SOURCE))) +BASE_OBJECTS=$(addprefix $(top_builddir)/,$(subst .c,.o,$(BASE_SOURCE))) +CLEAN_TARGETS+=$(BASE_DEPENDS) $(BASE_OBJECTS) + +-include $(BASE_DEPENDS) + +$(BASE_OBJECTS): INCLUDES+=-I$(top_srcdir)/base/ + +$(top_builddir)/base/libbase.a: $(BASE_OBJECTS) + @echo " [AR] $@" + $(Q) $(RM) $@ + $(Q) $(AR) rsv $@ $(BASE_OBJECTS) > /dev/null + +CLEAN_TARGETS+=$(top_builddir)/base/libbase.a

1 0

master - build: libbase.a
by Joe Thornber 04 Jun '18

04 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=232918fb86e1ee254ae5e… Commit: 232918fb86e1ee254ae5e4c9aece4615d828c9bb Parent: 29abba378520a270c3a9385724c8ef5df66497b1 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Mon Jun 4 13:53:07 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Mon Jun 4 13:53:07 2018 +0100 build: libbase.a --- Makefile.in | 1 + daemons/clvmd/Makefile.in | 2 +- daemons/dmeventd/Makefile.in | 2 +- daemons/lvmetad/Makefile.in | 8 ++++---- daemons/lvmlockd/Makefile.in | 6 ++---- daemons/lvmpolld/Makefile.in | 3 +-- lib/Makefile.in | 1 - libdm/make.tmpl.in | 4 ++-- make.tmpl.in | 8 ++++++-- scripts/Makefile.in | 4 ++-- test/api/Makefile.in | 3 +-- test/unit/Makefile.in | 2 +- tools/Makefile.in | 8 ++++---- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile.in b/Makefile.in index 851447e..7eb6460 100644 --- a/Makefile.in +++ b/Makefile.in @@ -214,6 +214,7 @@ endif include test/unit/Makefile include $(top_srcdir)/device_mapper/Makefile +include $(top_srcdir)/base/Makefile ifneq ($(shell which ctags),) .PHONY: tags diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in index 9e096b5..622a603 100644 --- a/daemons/clvmd/Makefile.in +++ b/daemons/clvmd/Makefile.in @@ -80,7 +80,7 @@ CFLAGS += -fno-strict-aliasing $(EXTRA_EXEC_CFLAGS) INSTALL_TARGETS = \ install_clvmd -clvmd: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a $(top_builddir)/device_mapper/libdevice-mapper.a +clvmd: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a $(INTERNAL_LIBS) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ -o clvmd $+ $(LMLIBS) $(LIBS) diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in index e43bb2b..56a9e35 100644 --- a/daemons/dmeventd/Makefile.in +++ b/daemons/dmeventd/Makefile.in @@ -61,7 +61,7 @@ LIBS += $(PTHREAD_LIBS) dmeventd: $(LIB_SHARED) dmeventd.o $(CC) $(CFLAGS) -L. $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) dmeventd.o \ - -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) -lm + -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(INTERNAL_LIBS) $(LIBS) -lm dmeventd.static: $(LIB_STATIC) dmeventd.o $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \ diff --git a/daemons/lvmetad/Makefile.in b/daemons/lvmetad/Makefile.in index f652db8..5738bbe 100644 --- a/daemons/lvmetad/Makefile.in +++ b/daemons/lvmetad/Makefile.in @@ -36,13 +36,13 @@ LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_LIBS) -lm lvmetad: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a \ - $(top_builddir)/device_mapper/libdevice-mapper.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(top_builddir)/device_mapper/libdevice-mapper.a -ldaemonserver $(LIBS) + $(INTERNAL_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -ldaemonserver $(INTERNAL_LIBS) $(LIBS) lvmetactl: lvmetactl.o $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a \ - $(top_builddir)/device_mapper/libdevice-mapper.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmetactl.o $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) + $(INTERNAL_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmetactl.o $(INTERNAL_LIBS) $(LIBS) CLEAN_TARGETS += lvmetactl.o diff --git a/daemons/lvmlockd/Makefile.in b/daemons/lvmlockd/Makefile.in index 7c58fe2..6dcc207 100644 --- a/daemons/lvmlockd/Makefile.in +++ b/daemons/lvmlockd/Makefile.in @@ -42,12 +42,10 @@ LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_LIBS) lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver \ - $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver $(INTERNAL_LIBS) $(LIBS) lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o \ - $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(INTERNAL_LIBS) $(LIBS) install_lvmlockd: lvmlockd $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) diff --git a/daemons/lvmpolld/Makefile.in b/daemons/lvmpolld/Makefile.in index 229a87e..8bf2556 100644 --- a/daemons/lvmpolld/Makefile.in +++ b/daemons/lvmpolld/Makefile.in @@ -34,8 +34,7 @@ LIBS += $(DAEMON_LIBS) -ldaemonserver $(PTHREAD_LIBS) lvmpolld: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \ - $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(INTERNAL_LIBS) $(LIBS) install_lvmpolld: lvmpolld $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) diff --git a/lib/Makefile.in b/lib/Makefile.in index 4fb4fcf..1d42235 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -21,7 +21,6 @@ ifeq ("@CLUSTER@", "shared") endif SOURCES =\ - ../base/data-struct/radix-tree.c \ activate/activate.c \ cache/lvmcache.c \ cache_segtype/cache.c \ diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in index b9672dc..fc29034 100644 --- a/libdm/make.tmpl.in +++ b/libdm/make.tmpl.in @@ -342,7 +342,7 @@ SUBDIRS.distclean := $(SUBDIRS:=.distclean) TARGETS += $(LIB_SHARED) $(LIB_STATIC) -all: $(top_builddir)/device_mapper/libdevice-mapper.a $(SUBDIRS) $(TARGETS) +all: $(SUBDIRS) $(TARGETS) install: all $(SUBDIRS.install) install_cluster: all $(SUBDIRS.install_cluster) @@ -351,7 +351,7 @@ install_lvm2: $(SUBDIRS.install_lvm2) install_ocf: $(SUBDIRS.install_ocf) cflow: $(SUBDIRS.cflow) -$(SUBDIRS): $(SUBDIRS.device-mapper) $(top_builddir)/device_mapper/libdevice-mapper.a +$(SUBDIRS): $(SUBDIRS.device-mapper) $(MAKE) -C $@ $(SUBDIRS.device-mapper): diff --git a/make.tmpl.in b/make.tmpl.in index b9672dc..0790d7b 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -342,7 +342,11 @@ SUBDIRS.distclean := $(SUBDIRS:=.distclean) TARGETS += $(LIB_SHARED) $(LIB_STATIC) -all: $(top_builddir)/device_mapper/libdevice-mapper.a $(SUBDIRS) $(TARGETS) +INTERNAL_LIBS=\ + $(top_builddir)/device_mapper/libdevice-mapper.a \ + $(top_builddir)/base/libbase.a + +all: $(INTERNAL_LIBS) $(SUBDIRS) $(TARGETS) install: all $(SUBDIRS.install) install_cluster: all $(SUBDIRS.install_cluster) @@ -351,7 +355,7 @@ install_lvm2: $(SUBDIRS.install_lvm2) install_ocf: $(SUBDIRS.install_ocf) cflow: $(SUBDIRS.cflow) -$(SUBDIRS): $(SUBDIRS.device-mapper) $(top_builddir)/device_mapper/libdevice-mapper.a +$(SUBDIRS): $(SUBDIRS.device-mapper) $(INTERNAL_LIBS) $(MAKE) -C $@ $(SUBDIRS.device-mapper): diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 194d2e2..ee39306 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -88,8 +88,8 @@ endif CFLAGS_lvm2_activation_generator_systemd_red_hat.o += $(EXTRA_EXEC_CFLAGS) -lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS) $(top_builddir)/device_mapper/libdevice-mapper.a - $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) $(LVMLIBS) $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) +lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS) $(INTERNAL_LIBS) + $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) $(LVMLIBS) $(INTERNAL_LIBS) $(LIBS) install_systemd_generators: $(INSTALL_DIR) $(systemd_generator_dir) diff --git a/test/api/Makefile.in b/test/api/Makefile.in index d010394..6872095 100644 --- a/test/api/Makefile.in +++ b/test/api/Makefile.in @@ -46,8 +46,7 @@ DEFS += -D_REENTRANT DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so LDFLAGS+=\ -L$(top_builddir)/liblvm \ - -L$(top_builddir)/daemons/dmeventd \ - -L$(top_builddir)/device_mapper/libdevice-mapper.a + -L$(top_builddir)/daemons/dmeventd LIBS += @LVM2APP_LIB@ $(DMEVENT_LIBS) %.t: %.o $(DEPLIBS) diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in index ca36c57..994968c 100644 --- a/test/unit/Makefile.in +++ b/test/unit/Makefile.in @@ -34,7 +34,7 @@ UNIT_OBJECTS=$(UNIT_SOURCE:%.c=%.o) CLEAN_TARGETS+=$(UNIT_DEPENDS) $(UNIT_OBJECTS) UNIT_LDLIBS += $(LVMINTERNAL_LIBS) -laio -test/unit/unit-test: $(UNIT_OBJECTS) lib/liblvm-internal.a device_mapper/libdevice-mapper.a +test/unit/unit-test: $(UNIT_OBJECTS) lib/liblvm-internal.a $(INTERNAL_LIBS) @echo " [LD] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \ -o $@ $+ $(UNIT_LDLIBS) -lm diff --git a/tools/Makefile.in b/tools/Makefile.in index d4514a2..2dbd93b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -122,12 +122,12 @@ device-mapper: $(TARGETS_DM) CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) -dmsetup: dmsetup.o $(top_builddir)/device_mapper/libdevice-mapper.a +dmsetup: dmsetup.o $(INTERNAL_LIBS) @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ -o $@ $+ $(LIBS) -lm -dmsetup.static: dmsetup.o $(top_builddir)/device_mapper/libdevice-mapper.a +dmsetup.static: dmsetup.o $(INTERNAL_LIBS) @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ -o $@ $+ $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) @@ -138,7 +138,7 @@ CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS) INCLUDES += -I$(top_builddir)/tools -lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a $(top_builddir)/device_mapper/libdevice-mapper.a +lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a $(INTERNAL_LIBS) @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $+ \ $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -lm @@ -157,7 +157,7 @@ ifeq ("@BUILD_LVMETAD@", "yes") lvm: $(top_builddir)/libdaemon/client/libdaemonclient.a endif -lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(top_builddir)/device_mapper/libdevice-mapper.a +lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(INTERNAL_LIBS) @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)

1 0

master - build: get separate builddir working again
by Joe Thornber 04 Jun '18

04 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=29abba378520a270c3a93… Commit: 29abba378520a270c3a9385724c8ef5df66497b1 Parent: 66b10275c5ce7328cd5fb0f00a52de6c76e45481 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Mon Jun 4 13:22:14 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Mon Jun 4 13:22:14 2018 +0100 build: get separate builddir working again --- Makefile.in | 2 +- device_mapper/Makefile | 10 +++++----- device_mapper/datastruct/bitset.c | 2 +- device_mapper/datastruct/hash.c | 2 +- device_mapper/datastruct/list.c | 2 +- device_mapper/ioctl/libdm-iface.c | 10 +++++----- device_mapper/mm/dbg_malloc.c | 2 +- device_mapper/mm/pool-fast.c | 2 +- device_mapper/mm/pool.c | 2 +- device_mapper/regex/matcher.c | 2 +- device_mapper/regex/parse_rx.c | 2 +- device_mapper/regex/ttree.c | 2 +- libdm/make.tmpl.in | 29 ++++++++++++++++++++--------- make.tmpl.in | 19 +++++++++++++------ 14 files changed, 53 insertions(+), 35 deletions(-) diff --git a/Makefile.in b/Makefile.in index 00b4f1e..851447e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -213,7 +213,7 @@ endif endif include test/unit/Makefile -include device_mapper/Makefile +include $(top_srcdir)/device_mapper/Makefile ifneq ($(shell which ctags),) .PHONY: tags diff --git a/device_mapper/Makefile b/device_mapper/Makefile index 999c3ba..b246f82 100644 --- a/device_mapper/Makefile +++ b/device_mapper/Makefile @@ -30,17 +30,17 @@ DEVICE_MAPPER_SOURCE=\ device_mapper/regex/ttree.c \ device_mapper/ioctl/libdm-iface.c -DEVICE_MAPPER_DEPENDS=$(subst .c,.d,$(DEVICE_MAPPER_SOURCE)) -DEVICE_MAPPER_OBJECTS=$(subst .c,.o,$(DEVICE_MAPPER_SOURCE)) +DEVICE_MAPPER_DEPENDS=$(addprefix $(top_builddir)/,$(subst .c,.d,$(DEVICE_MAPPER_SOURCE))) +DEVICE_MAPPER_OBJECTS=$(addprefix $(top_builddir)/,$(subst .c,.o,$(DEVICE_MAPPER_SOURCE))) CLEAN_TARGETS+=$(DEVICE_MAPPER_DEPENDS) $(DEVICE_MAPPER_OBJECTS) -include $(DEVICE_MAPPER_DEPENDS) -$(DEVICE_MAPPER_OBJECTS): INCLUDES+=-Idevice_mapper/ +$(DEVICE_MAPPER_OBJECTS): INCLUDES+=-I$(top_srcdir)/device_mapper/ -device_mapper/libdevice-mapper.a: $(DEVICE_MAPPER_OBJECTS) +$(top_builddir)/device_mapper/libdevice-mapper.a: $(DEVICE_MAPPER_OBJECTS) @echo " [AR] $@" $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(DEVICE_MAPPER_OBJECTS) > /dev/null -CLEAN_TARGETS+=device_mapper/libdevice-mapper.a +CLEAN_TARGETS+=$(top_builddir)/device_mapper/libdevice-mapper.a diff --git a/device_mapper/datastruct/bitset.c b/device_mapper/datastruct/bitset.c index 6ae99d3..f093ac0 100644 --- a/device_mapper/datastruct/bitset.c +++ b/device_mapper/datastruct/bitset.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "misc/dmlib.h" +#include "device_mapper/misc/dmlib.h" #include <ctype.h> diff --git a/device_mapper/datastruct/hash.c b/device_mapper/datastruct/hash.c index 9b9c939..59e719b 100644 --- a/device_mapper/datastruct/hash.c +++ b/device_mapper/datastruct/hash.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "misc/dmlib.h" +#include "device_mapper/misc/dmlib.h" struct dm_hash_node { struct dm_hash_node *next; diff --git a/device_mapper/datastruct/list.c b/device_mapper/datastruct/list.c index 86c3e4e..bda8027 100644 --- a/device_mapper/datastruct/list.c +++ b/device_mapper/datastruct/list.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "misc/dmlib.h" +#include "device_mapper/misc/dmlib.h" #include <assert.h> /* diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c index 4825f1d..3e1b445 100644 --- a/device_mapper/ioctl/libdm-iface.c +++ b/device_mapper/ioctl/libdm-iface.c @@ -13,9 +13,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "misc/dmlib.h" -#include "libdm-targets.h" -#include "libdm-common.h" +#include "device_mapper/misc/dmlib.h" +#include "device_mapper/ioctl/libdm-targets.h" +#include "device_mapper/libdm-common.h" #include <stddef.h> #include <fcntl.h> @@ -26,7 +26,7 @@ #include <unistd.h> #ifdef __linux__ -# include "misc/kdev_t.h" +# include "device_mapper/misc/kdev_t.h" # include <linux/limits.h> #else # define MAJOR(x) major((x)) @@ -34,7 +34,7 @@ # define MKDEV(x,y) makedev((x),(y)) #endif -#include "misc/dm-ioctl.h" +#include "device_mapper/misc/dm-ioctl.h" /* * Ensure build compatibility. diff --git a/device_mapper/mm/dbg_malloc.c b/device_mapper/mm/dbg_malloc.c index a17203c..b169f8b 100644 --- a/device_mapper/mm/dbg_malloc.c +++ b/device_mapper/mm/dbg_malloc.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "misc/dmlib.h" +#include "device_mapper/misc/dmlib.h" #ifdef VALGRIND_POOL #include "memcheck.h" diff --git a/device_mapper/mm/pool-fast.c b/device_mapper/mm/pool-fast.c index 895872e..b83c693 100644 --- a/device_mapper/mm/pool-fast.c +++ b/device_mapper/mm/pool-fast.c @@ -17,7 +17,7 @@ #include "memcheck.h" #endif -#include "misc/dmlib.h" +#include "device_mapper/misc/dmlib.h" #include <stddef.h> /* For musl libc */ #include <malloc.h> diff --git a/device_mapper/mm/pool.c b/device_mapper/mm/pool.c index a710704..20d7fd9 100644 --- a/device_mapper/mm/pool.c +++ b/device_mapper/mm/pool.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "misc/dmlib.h" +#include "device_mapper/misc/dmlib.h" #include <sys/mman.h> #include <pthread.h> diff --git a/device_mapper/regex/matcher.c b/device_mapper/regex/matcher.c index 375c1ab..b3870e0 100644 --- a/device_mapper/regex/matcher.c +++ b/device_mapper/regex/matcher.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "misc/dmlib.h" +#include "device_mapper/misc/dmlib.h" #include "parse_rx.h" #include "ttree.h" #include "assert.h" diff --git a/device_mapper/regex/parse_rx.c b/device_mapper/regex/parse_rx.c index cc83bfe..563d2ae 100644 --- a/device_mapper/regex/parse_rx.c +++ b/device_mapper/regex/parse_rx.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "misc/dmlib.h" +#include "device_mapper/misc/dmlib.h" #include "parse_rx.h" #ifdef DEBUG diff --git a/device_mapper/regex/ttree.c b/device_mapper/regex/ttree.c index 62c5bf7..27b775e 100644 --- a/device_mapper/regex/ttree.c +++ b/device_mapper/regex/ttree.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "misc/dmlib.h" +#include "device_mapper/misc/dmlib.h" #include "ttree.h" struct node { diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in index 7e3f4a4..b9672dc 100644 --- a/libdm/make.tmpl.in +++ b/libdm/make.tmpl.in @@ -58,6 +58,7 @@ PYTHON3 = @PYTHON3@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile LIBS = @LIBS@ +LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm # Extra libraries always linked with static binaries STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) DEFS += @DEFS@ @@ -68,7 +69,9 @@ CLDFLAGS += @CLDFLAGS@ ELDFLAGS += @ELDFLAGS@ LDDEPS += @LDDEPS@ LIB_SUFFIX = @LIB_SUFFIX@ -LVMINTERNAL_LIBS = -llvm-internal $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) +LVMINTERNAL_LIBS=\ + -llvm-internal \ + $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) DL_LIBS = @DL_LIBS@ RT_LIBS = @RT_LIBS@ M_LIBS = @M_LIBS@ @@ -308,6 +311,7 @@ LIB_VERSION_APP := $(shell $(AWK) -F '[(). ]' '{printf "%s.%s",$$1,$$4}' $(top_s INCLUDES += -I$(top_srcdir) -I$(srcdir) -I$(top_builddir)/include + DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \ $(top_builddir)/Makefile @@ -338,7 +342,7 @@ SUBDIRS.distclean := $(SUBDIRS:=.distclean) TARGETS += $(LIB_SHARED) $(LIB_STATIC) -all: $(SUBDIRS) $(TARGETS) +all: $(top_builddir)/device_mapper/libdevice-mapper.a $(SUBDIRS) $(TARGETS) install: all $(SUBDIRS.install) install_cluster: all $(SUBDIRS.install_cluster) @@ -347,7 +351,7 @@ install_lvm2: $(SUBDIRS.install_lvm2) install_ocf: $(SUBDIRS.install_ocf) cflow: $(SUBDIRS.cflow) -$(SUBDIRS): $(SUBDIRS.device-mapper) +$(SUBDIRS): $(SUBDIRS.device-mapper) $(top_builddir)/device_mapper/libdevice-mapper.a $(MAKE) -C $@ $(SUBDIRS.device-mapper): @@ -440,14 +444,12 @@ endif .LIBPATTERNS = lib%.so lib%.a -DEPFLAGS=-MT $@ -MMD -MP -MF $*.d - # still needed in 2018 for 32bit builds DEFS+=-D_FILE_OFFSET_BITS=64 %.o: %.c @echo " [CC] $<" - $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ + $(Q) $(CC) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ %.o: %.cpp @echo " [CXX] $<" @@ -507,9 +509,18 @@ $(LIB_STATIC): $(OBJECTS) $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null -%.d: -.PRECIOUS: %.d - +%.d: %.c + @echo " [DEP] $<" + $(Q) $(MKDIR_P) $(dir $@); \ + set -e; \ + FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \ + DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \ + $(CC) -MM $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) -o $@ $<; \ + sed -i "s/$.*$\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \ + DEPLIST=`sed 's/ \\\\//;s/.*://;' < $@`; \ + echo $$DEPLIST | fmt -1 | sed 's/ //g;s/$.*$/\1:/' >> $@; \ + [ -s $@ ] || $(RM) $@ + %.mo: %.po @echo " [MSGFMT] $<" $(Q) $(MSGFMT) -o $@ $< diff --git a/make.tmpl.in b/make.tmpl.in index 16a8571..b9672dc 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -444,14 +444,12 @@ endif .LIBPATTERNS = lib%.so lib%.a -DEPFLAGS=-MT $@ -MMD -MP -MF $*.d - # still needed in 2018 for 32bit builds DEFS+=-D_FILE_OFFSET_BITS=64 %.o: %.c @echo " [CC] $<" - $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ + $(Q) $(CC) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ %.o: %.cpp @echo " [CXX] $<" @@ -511,9 +509,18 @@ $(LIB_STATIC): $(OBJECTS) $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null -%.d: -.PRECIOUS: %.d - +%.d: %.c + @echo " [DEP] $<" + $(Q) $(MKDIR_P) $(dir $@); \ + set -e; \ + FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \ + DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \ + $(CC) -MM $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) -o $@ $<; \ + sed -i "s/$.*$\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \ + DEPLIST=`sed 's/ \\\\//;s/.*://;' < $@`; \ + echo $$DEPLIST | fmt -1 | sed 's/ //g;s/$.*$/\1:/' >> $@; \ + [ -s $@ ] || $(RM) $@ + %.mo: %.po @echo " [MSGFMT] $<" $(Q) $(MSGFMT) -o $@ $<

1 0

master - build: More tweaks to python include dirs.
by Joe Thornber 04 Jun '18

04 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=66b10275c5ce7328cd5fb… Commit: 66b10275c5ce7328cd5fb0f00a52de6c76e45481 Parent: f6eeb218b20685b1bf0f76b24c5697901896bdec Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Mon Jun 4 12:28:17 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Mon Jun 4 12:28:17 2018 +0100 build: More tweaks to python include dirs. --- python/setup.py.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/setup.py.in b/python/setup.py.in index c39e4fc..07b79df 100644 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -22,7 +22,7 @@ liblvm = Extension('lvm', sources = ['liblvm_python.c'], libraries= ['lvm2app', 'devmapper'], library_dirs= ['@top_builddir@/liblvm', '@top_builddir@/libdm'], - include_dirs= ['@top_builddir@']) + include_dirs= ['@top_builddir@/include', '@top_srcdir@']) setup (name='lvm', version=@LVM_VERSION@,

1 0

master - Merge branch 'master' of git+ssh://sourceware.org/git/lvm2
by Joe Thornber 04 Jun '18

04 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f6eeb218b20685b1bf0f7… Commit: f6eeb218b20685b1bf0f76b24c5697901896bdec Parent: 891f8dc19d7b9c5a72971200fad2b29b13e43bfa 1140d70893e4f246a46fa360d20838ceafa690ec Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Mon Jun 4 11:59:49 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Mon Jun 4 11:59:49 2018 +0100 Merge branch 'master' of git+ssh://sourceware.org/git/lvm2 daemons/lvmlockd/Makefile.in | 6 ++- daemons/lvmpolld/Makefile.in | 3 +- include/.gitignore | 3 -- include/Makefile.in | 83 +++++++++++++++++++++++++++++++++++++++++- lib/activate/activate.h | 2 +- lib/metadata/lv.c | 2 +- 6 files changed, 90 insertions(+), 9 deletions(-)

1 0

master - build: Get python dir building without the include/ dir
by Joe Thornber 04 Jun '18

04 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=891f8dc19d7b9c5a72971… Commit: 891f8dc19d7b9c5a72971200fad2b29b13e43bfa Parent: 21a5be2364574de43e2afe55a250ccced02df008 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Mon Jun 4 11:59:13 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Mon Jun 4 11:59:13 2018 +0100 build: Get python dir building without the include/ dir --- python/setup.py.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/setup.py.in b/python/setup.py.in index d09b791..c39e4fc 100644 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -22,7 +22,7 @@ liblvm = Extension('lvm', sources = ['liblvm_python.c'], libraries= ['lvm2app', 'devmapper'], library_dirs= ['@top_builddir@/liblvm', '@top_builddir@/libdm'], - include_dirs= ['@top_builddir@/include']) + include_dirs= ['@top_builddir@']) setup (name='lvm', version=@LVM_VERSION@,

1 0

master - build: fixes
by Zdenek Kabelac 04 Jun '18

04 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1140d70893e4f246a46fa… Commit: 1140d70893e4f246a46fa360d20838ceafa690ec Parent: eebf070d32b491fb08f7defccc08f9bcefb9aba2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Jun 4 12:25:48 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 4 12:28:13 2018 +0200 build: fixes --- daemons/lvmlockd/Makefile.in | 6 ++++-- daemons/lvmpolld/Makefile.in | 3 ++- lib/activate/activate.h | 2 +- lib/metadata/lv.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/daemons/lvmlockd/Makefile.in b/daemons/lvmlockd/Makefile.in index 9e2297f..7c58fe2 100644 --- a/daemons/lvmlockd/Makefile.in +++ b/daemons/lvmlockd/Makefile.in @@ -42,10 +42,12 @@ LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_LIBS) lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver \ + $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o \ + $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) install_lvmlockd: lvmlockd $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) diff --git a/daemons/lvmpolld/Makefile.in b/daemons/lvmpolld/Makefile.in index 69c4a8d..229a87e 100644 --- a/daemons/lvmpolld/Makefile.in +++ b/daemons/lvmpolld/Makefile.in @@ -34,7 +34,8 @@ LIBS += $(DAEMON_LIBS) -ldaemonserver $(PTHREAD_LIBS) lvmpolld: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \ + $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) install_lvmpolld: lvmpolld $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) diff --git a/lib/activate/activate.h b/lib/activate/activate.h index 60ee4a7..8175f68 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -210,7 +210,7 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume const struct lv_activate_opts *laopts, int monitor); #ifdef DMEVENTD -# include "libdevmapper-event.h" +# include "daemons/dmeventd/libdevmapper-event.h" char *get_monitor_dso_path(struct cmd_context *cmd, int id); int target_registered_with_dmeventd(struct cmd_context *cmd, const char *dso, const struct logical_volume *lv, int *pending, int *monitored); diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index 54edc88..68507dc 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -290,7 +290,7 @@ char *lvseg_cachemode_dup(struct dm_pool *mem, const struct lv_segment *seg) } #ifdef DMEVENTD -# include "libdevmapper-event.h" +# include "daemons/dmeventd/libdevmapper-event.h" #endif char *lvseg_monitor_dup(struct dm_pool *mem, const struct lv_segment *seg) {

1 0

master - build: remove any leftover file
by Zdenek Kabelac 04 Jun '18

04 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=eebf070d32b491fb08f7d… Commit: eebf070d32b491fb08f7defccc08f9bcefb9aba2 Parent: 21a5be2364574de43e2afe55a250ccced02df008 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Jun 4 12:16:30 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Jun 4 12:26:38 2018 +0200 build: remove any leftover file In case repository is used after building older version of lvm2 (i.e. git bisect) make sure clean erases any possible old symlinks. --- include/.gitignore | 3 -- include/Makefile.in | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 4 deletions(-) diff --git a/include/.gitignore b/include/.gitignore index 4971e07..424c745 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,4 +1 @@ -.symlinks -.symlinks_created - *.h diff --git a/include/Makefile.in b/include/Makefile.in index cbbc003..efe263c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,6 +1,6 @@ # # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. -# Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved. +# Copyright (C) 2004-2018 Red Hat, Inc. All rights reserved. # # This file is part of LVM2. # @@ -19,3 +19,84 @@ top_builddir = @top_builddir@ include $(top_builddir)/make.tmpl DISTCLEAN_TARGETS += .configure.h lvm-version.h +CLEAN_TARGETS += \ + activate.h \ + archiver.h \ + bcache.h \ + btree.h \ + clvm.h \ + config-util.h \ + config.h \ + config_settings.h \ + crc.h \ + daemon-client.h \ + daemon-io.h \ + defaults.h \ + dev-cache.h \ + dev-ext-udev-constants.h \ + dev-type.h \ + device-types.h \ + device.h \ + display.h \ + dm-ioctl.h \ + dm-log-userspace.h \ + dm-logging.h \ + dmlib.h \ + filter.h \ + format-text.h \ + format1.h \ + format_pool.h \ + intl.h \ + kdev_t.h \ + label.h \ + last-path-component.h \ + lib.h \ + libdevmapper-event.h \ + libdevmapper.h \ + locking.h \ + log.h \ + lv.h \ + lvm-exec.h \ + lvm-file.h \ + lvm-flock.h \ + lvm-globals.h \ + lvm-logging.h \ + lvm-maths.h \ + lvm-percent.h \ + lvm-signal.h \ + lvm-string.h \ + lvm-wrappers.h \ + lvm2app.h \ + lvm2cmd.h \ + lvmcache.h \ + lvmetad-client.h \ + lvmetad.h \ + lvmlockd-client.h \ + lvmlockd.h \ + lvmnotify.h \ + lvmpolld-client.h \ + lvmpolld-protocol.h \ + lv_alloc.h \ + memlock.h \ + metadata-exported.h \ + metadata.h \ + pogen.h \ + polldaemon.h \ + polling_ops.h \ + properties.h \ + prop_common.h \ + pv.h \ + pv_alloc.h \ + report.h \ + segtype.h \ + sharedlib.h \ + str_list.h \ + targets.h \ + text_export.h \ + text_import.h \ + tool.h \ + toolcontext.h \ + util.h \ + uuid.h \ + vg.h \ + xlate.h

1 0

master - build: link lvm2_activation_generator_systemd_red_hat with libdevice-mapper.a
by Joe Thornber 04 Jun '18

04 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=21a5be2364574de43e2af… Commit: 21a5be2364574de43e2afe55a250ccced02df008 Parent: 6a1f458bb7a95b5cf71e4e8bf9d030ce739ab039 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Mon Jun 4 10:00:44 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Mon Jun 4 10:00:44 2018 +0100 build: link lvm2_activation_generator_systemd_red_hat with libdevice-mapper.a --- scripts/Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.in b/scripts/Makefile.in index eeac881..194d2e2 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -88,8 +88,8 @@ endif CFLAGS_lvm2_activation_generator_systemd_red_hat.o += $(EXTRA_EXEC_CFLAGS) -lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS) - $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) $(LVMLIBS) +lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS) $(top_builddir)/device_mapper/libdevice-mapper.a + $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) $(LVMLIBS) $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) install_systemd_generators: $(INSTALL_DIR) $(systemd_generator_dir)

1 0

master - build: compile fixes
by Zdenek Kabelac 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6a1f458bb7a95b5cf71e4… Commit: 6a1f458bb7a95b5cf71e4e8bf9d030ce739ab039 Parent: 4d19321fd36fd6bf3f6170363f51be9ab39c03a7 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 1 20:24:45 2018 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 1 21:12:31 2018 +0200 build: compile fixes --- lib/locking/lvmlockd.c | 2 +- lib/lvmpolld/lvmpolld-client.h | 2 +- lib/metadata/mirror.c | 2 +- tools/pvmove.c | 2 +- tools/pvscan.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index 103286d..21a9696 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -1111,7 +1111,7 @@ int lockd_stop_vg(struct cmd_context *cmd, struct volume_group *vg) int result; int ret; - if (!vg_is_shared(vg))) + if (!vg_is_shared(vg)) return 1; if (!_use_lvmlockd) return 0; diff --git a/lib/lvmpolld/lvmpolld-client.h b/lib/lvmpolld/lvmpolld-client.h index 16495b6..659b11b 100644 --- a/lib/lvmpolld/lvmpolld-client.h +++ b/lib/lvmpolld/lvmpolld-client.h @@ -16,7 +16,7 @@ #define _LVM_LVMPOLLD_CLIENT_H # ifdef LVMPOLLD_SUPPORT -# include "daemon-client.h" +# include "libdaemon/client/daemon-client.h" # define LVMPOLLD_SOCKET DEFAULT_RUN_DIR "/lvmpolld.socket" diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 5b01873..9c775c4 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -426,7 +426,7 @@ static int _activate_lv_like_model(struct logical_volume *model, { /* FIXME: run all cases through lv_active_change when clvm variants are gone. */ - if (vg_is_shared(vg)) + if (vg_is_shared(lv->vg)) return lv_active_change(lv->vg->cmd, lv, CHANGE_AEY, 0); if (lv_is_active_exclusive(model)) { diff --git a/tools/pvmove.c b/tools/pvmove.c index 68194b8..1daf364 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -642,7 +642,7 @@ static int _pvmove_setup_single(struct cmd_context *cmd, * other hosts. For LVs that are active on multiple hosts (sh), we * would need to used cluster mirrors. */ - if (vg_is_shared(vg))) { + if (vg_is_shared(vg)) { if (!lv) { log_error("pvmove in a shared VG requires a named LV."); return ECMD_FAILED; diff --git a/tools/pvscan.c b/tools/pvscan.c index c7c2744..7cba0f4 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -197,7 +197,7 @@ static int _pvscan_autoactivate_single(struct cmd_context *cmd, const char *vg_n if (vg_is_exported(vg)) return ECMD_PROCESSED; - if (vg_is_shared(vg))) + if (vg_is_shared(vg)) return ECMD_PROCESSED; log_debug("pvscan autoactivating VG %s.", vg_name);

1 0

master - Merge branch 'master' of git+ssh://sourceware.org/git/lvm2
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4d19321fd36fd6bf3f617… Commit: 4d19321fd36fd6bf3f6170363f51be9ab39c03a7 Parent: 02c4901d893a1b833260a7cbb66b9ad285d7ce39 7b5b1a9b6f03e9452c7a9d602247e61e808c316b Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 1 19:19:11 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 1 19:19:11 2018 +0100 Merge branch 'master' of git+ssh://sourceware.org/git/lvm2 lib/cache/lvmcache.c | 6 ++++-- lib/cache/lvmetad.c | 6 +++--- lib/label/label.c | 2 +- lib/locking/lvmlockd.c | 12 ++++++------ lib/metadata/lv_manip.c | 2 +- lib/metadata/metadata.c | 26 ++++++++++++++------------ lib/metadata/mirror.c | 2 +- lib/metadata/raid_manip.c | 2 +- lib/metadata/vg.c | 2 +- tools/lvconvert.c | 14 +++++++------- tools/lvcreate.c | 4 ++-- tools/pvmove.c | 2 +- tools/pvscan.c | 2 +- tools/vgchange.c | 2 +- tools/vgcreate.c | 2 +- tools/vgexport.c | 2 +- tools/vgimport.c | 2 +- tools/vgmerge.c | 2 +- tools/vgsplit.c | 2 +- 19 files changed, 49 insertions(+), 45 deletions(-)

1 0

master - build: get clvmd building again
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=02c4901d893a1b833260a… Commit: 02c4901d893a1b833260a7cbb66b9ad285d7ce39 Parent: c4497ee9e849d2d6c74412de21c6c3823d4de5f1 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 1 19:18:36 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 1 19:18:36 2018 +0100 build: get clvmd building again --- daemons/clvmd/Makefile.in | 4 ++-- make.tmpl.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in index 47a3411..9e096b5 100644 --- a/daemons/clvmd/Makefile.in +++ b/daemons/clvmd/Makefile.in @@ -80,9 +80,9 @@ CFLAGS += -fno-strict-aliasing $(EXTRA_EXEC_CFLAGS) INSTALL_TARGETS = \ install_clvmd -clvmd: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a +clvmd: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a $(top_builddir)/device_mapper/libdevice-mapper.a $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ - -o clvmd $(OBJECTS) $(LMLIBS) $(LIBS) + -o clvmd $+ $(LMLIBS) $(LIBS) .PHONY: install_clvmd diff --git a/make.tmpl.in b/make.tmpl.in index ad927b0..16a8571 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -58,7 +58,7 @@ PYTHON3 = @PYTHON3@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile LIBS = @LIBS@ -LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) +LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm # Extra libraries always linked with static binaries STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) DEFS += @DEFS@

1 0

master - scan: clean exit for alloc failure
by David Teigland 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7b5b1a9b6f03e9452c7a9… Commit: 7b5b1a9b6f03e9452c7a9d602247e61e808c316b Parent: 0625c7f372a8481e21752b1fc930984ba7c900db Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 1 10:40:28 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 1 13:15:22 2018 -0500 scan: clean exit for alloc failure --- lib/label/label.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/label/label.c b/lib/label/label.c index 427caa9..f36c706 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -832,7 +832,7 @@ int label_scan(struct cmd_context *cmd) while ((dev = dev_iter_get(iter))) { if (!(devl = dm_zalloc(sizeof(*devl)))) - return 0; + continue; devl->dev = dev; dm_list_add(&all_devs, &devl->list);

1 0

master - devs: clear coverity warning about null info
by David Teigland 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0625c7f372a8481e21752… Commit: 0625c7f372a8481e21752b1fc930984ba7c900db Parent: 09177b53dddadf89f976ad72ec293c61d0eee9ba Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 1 10:15:48 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 1 13:15:22 2018 -0500 devs: clear coverity warning about null info a theoretical possibility. --- lib/cache/lvmcache.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 68170d8..527f0a6 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -1010,7 +1010,8 @@ static void _filter_duplicate_devs(struct cmd_context *cmd) dm_list_iterate_items_safe(devl, devl2, &_unused_duplicate_devs) { - info = lvmcache_info_from_pvid(devl->dev->pvid, NULL, 0); + if (!(info = lvmcache_info_from_pvid(devl->dev->pvid, NULL, 0))) + continue; if (MAJOR(info->dev->dev) == dt->md_major) { log_debug_devs("Ignoring md component duplicate %s", dev_name(devl->dev)); @@ -1038,7 +1039,8 @@ static void _warn_duplicate_devs(struct cmd_context *cmd) dm_list_iterate_items_safe(devl, devl2, &_unused_duplicate_devs) { /* info for the preferred device that we're actually using */ - info = lvmcache_info_from_pvid(devl->dev->pvid, NULL, 0); + if (!(info = lvmcache_info_from_pvid(devl->dev->pvid, NULL, 0))) + continue; if (!id_write_format((const struct id *)info->dev->pvid, uuid, sizeof(uuid))) stack;

1 0

master - lvmlockd: clarify lock_type use for coverity
by David Teigland 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=09177b53dddadf89f976a… Commit: 09177b53dddadf89f976ad72ec293c61d0eee9ba Parent: b6f0f20da25ac4ab6b5294129fd2f383bf818062 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 1 10:12:04 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 1 13:15:22 2018 -0500 lvmlockd: clarify lock_type use for coverity Make it clearer when vg->lock_type will be used so coverity doesn't worry about it. --- lib/metadata/metadata.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 6525cf9..1bbea19 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -2929,13 +2929,15 @@ int vg_write(struct volume_group *vg) struct lv_list *lvl; int revert = 0, wrote = 0; - dm_list_iterate_items(lvl, &vg->lvs) { - if (lvl->lv->lock_args && !strcmp(lvl->lv->lock_args, "pending")) { - if (!lockd_init_lv_args(vg->cmd, vg, lvl->lv, vg->lock_type, &lvl->lv->lock_args)) { - log_error("Cannot allocate lock for new LV."); - return 0; + if (vg_is_shared(vg)) { + dm_list_iterate_items(lvl, &vg->lvs) { + if (lvl->lv->lock_args && !strcmp(lvl->lv->lock_args, "pending")) { + if (!lockd_init_lv_args(vg->cmd, vg, lvl->lv, vg->lock_type, &lvl->lv->lock_args)) { + log_error("Cannot allocate lock for new LV."); + return 0; + } + lvl->lv->new_lock_args = 1; } - lvl->lv->new_lock_args = 1; } }

1 0

master - lvmlockd: primarily use vg_is_shared
by David Teigland 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b6f0f20da25ac4ab6b529… Commit: b6f0f20da25ac4ab6b5294129fd2f383bf818062 Parent: c4497ee9e849d2d6c74412de21c6c3823d4de5f1 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 1 10:04:54 2018 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 1 13:15:22 2018 -0500 lvmlockd: primarily use vg_is_shared to check if a vg uses an lvmlockd lock_type, instead of the equivalent but longer is_lockd_type. --- lib/cache/lvmetad.c | 6 +++--- lib/locking/lvmlockd.c | 12 ++++++------ lib/metadata/lv_manip.c | 2 +- lib/metadata/metadata.c | 12 ++++++------ lib/metadata/mirror.c | 2 +- lib/metadata/raid_manip.c | 2 +- lib/metadata/vg.c | 2 +- tools/lvconvert.c | 14 +++++++------- tools/lvcreate.c | 4 ++-- tools/pvmove.c | 2 +- tools/pvscan.c | 2 +- tools/vgchange.c | 2 +- tools/vgcreate.c | 2 +- tools/vgexport.c | 2 +- tools/vgimport.c | 2 +- tools/vgmerge.c | 2 +- tools/vgsplit.c | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index aa1edc9..fc46c07 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -1069,14 +1069,14 @@ struct volume_group *lvmetad_vg_lookup(struct cmd_context *cmd, const char *vgna * host. */ - if (is_lockd_type(vg->lock_type) && cmd->include_shared_vgs) { + if (vg_is_shared(vg) && cmd->include_shared_vgs) { log_debug_lvmetad("Rescan VG %s because including shared", vgname); rescan = 1; - } else if (is_lockd_type(vg->lock_type) && cmd->lockd_vg_rescan) { + } else if (vg_is_shared(vg) && cmd->lockd_vg_rescan) { log_debug_lvmetad("Rescan VG %s because no lvmlockd lock is held", vgname); rescan = 1; } else if (dm_config_find_node(reply.cft->root, "vg_invalid")) { - if (!is_lockd_type(vg->lock_type)) { + if (!vg_is_shared(vg)) { /* Can happen if a previous command failed/crashed without updating lvmetad. */ log_warn("WARNING: Reading VG %s from disk because lvmetad metadata is invalid.", vgname); } else { diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index 8750c32..103286d 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -1020,7 +1020,7 @@ int lockd_start_vg(struct cmd_context *cmd, struct volume_group *vg, int start_i memset(uuid, 0, sizeof(uuid)); - if (!is_lockd_type(vg->lock_type)) + if (!vg_is_shared(vg)) return 1; if (!_use_lvmlockd) { @@ -1111,7 +1111,7 @@ int lockd_stop_vg(struct cmd_context *cmd, struct volume_group *vg) int result; int ret; - if (!is_lockd_type(vg->lock_type)) + if (!vg_is_shared(vg))) return 1; if (!_use_lvmlockd) return 0; @@ -1996,7 +1996,7 @@ int lockd_vg_update(struct volume_group *vg) int result; int ret; - if (!is_lockd_type(vg->lock_type)) + if (!vg_is_shared(vg)) return 1; if (!_use_lvmlockd) return 0; @@ -2253,7 +2253,7 @@ static int _lockd_lv_mirror(struct cmd_context *cmd, struct logical_volume *lv, int lockd_lv(struct cmd_context *cmd, struct logical_volume *lv, const char *def_mode, uint32_t flags) { - if (!is_lockd_type(lv->vg->lock_type)) + if (!vg_is_shared(lv->vg)) return 1; if (!_use_lvmlockd) { @@ -2586,7 +2586,7 @@ int lockd_rename_vg_before(struct cmd_context *cmd, struct volume_group *vg) int result; int ret; - if (!is_lockd_type(vg->lock_type)) + if (!vg_is_shared(vg)) return 1; if (!_use_lvmlockd) return 0; @@ -2650,7 +2650,7 @@ int lockd_rename_vg_final(struct cmd_context *cmd, struct volume_group *vg, int int result; int ret; - if (!is_lockd_type(vg->lock_type)) + if (!vg_is_shared(vg)) return 1; if (!_use_lvmlockd) return 0; diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index c36f60f..b78e5d0 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -7801,7 +7801,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, lv->status |= LV_TEMPORARY; if (seg_is_cache(lp)) { - if (is_lockd_type(lv->vg->lock_type)) { + if (vg_is_shared(vg)) { if (is_change_activating(lp->activate)) { if (!lv_active_change(cmd, lv, CHANGE_AEY, 0)) { log_error("Aborting. Failed to activate LV %s.", diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 87b9616..6525cf9 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -2576,7 +2576,7 @@ int vg_validate(struct volume_group *vg) goto out; } - if (is_lockd_type(vg->lock_type)) { + if (vg_is_shared(vg)) { if (!vg->lock_args) { log_error(INTERNAL_ERROR "VG %s with lock_type %s without lock_args", vg->name, vg->lock_type); @@ -2612,7 +2612,7 @@ int vg_validate(struct volume_group *vg) } dm_list_iterate_items(lvl, &vg->lvs) { - if (is_lockd_type(vg->lock_type)) { + if (vg_is_shared(vg)) { if (lockd_lv_uses_lock(lvl->lv)) { if (vg->skip_validate_lock_args) continue; @@ -3556,7 +3556,7 @@ static int _repair_inconsistent_vg(struct volume_group *vg, uint32_t lockd_state return 0; } - if (is_lockd_type(vg->lock_type) && !(lockd_state & LDST_EX)) { + if (vg_is_shared(vg) && !(lockd_state & LDST_EX)) { log_verbose("Skip metadata repair for shared VG without exclusive lock."); return 0; } @@ -3602,7 +3602,7 @@ static int _wipe_outdated_pvs(struct cmd_context *cmd, struct volume_group *vg, return 0; } - if (is_lockd_type(vg->lock_type) && !(lockd_state & LDST_EX)) { + if (vg_is_shared(vg) && !(lockd_state & LDST_EX)) { log_verbose("Skip wiping outdated PVs for shared VG without exclusive lock."); return 0; } @@ -3684,7 +3684,7 @@ static int _check_or_repair_pv_ext(struct cmd_context *cmd, "VG %s but not marked as used.", pv_dev_name(pvl->pv), vg->name); *inconsistent_pvs = 1; - } else if (is_lockd_type(vg->lock_type) && !(lockd_state & LDST_EX)) { + } else if (vg_is_shared(vg) && !(lockd_state & LDST_EX)) { log_warn("Skip repair of PV %s that is in shared " "VG %s but not marked as used.", pv_dev_name(pvl->pv), vg->name); @@ -5260,7 +5260,7 @@ static int _access_vg_lock_type(struct cmd_context *cmd, struct volume_group *vg /* * Local VG requires no lock from lvmlockd. */ - if (!is_lockd_type(vg->lock_type)) + if (!vg_is_shared(vg)) return 1; /* diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 1aa35fb..5b01873 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -426,7 +426,7 @@ static int _activate_lv_like_model(struct logical_volume *model, { /* FIXME: run all cases through lv_active_change when clvm variants are gone. */ - if (is_lockd_type(lv->vg->lock_type)) + if (vg_is_shared(vg)) return lv_active_change(lv->vg->cmd, lv, CHANGE_AEY, 0); if (lv_is_active_exclusive(model)) { diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index f53915b..9b4cb83 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -3426,7 +3426,7 @@ int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name, /* FIXME: run all cases through lv_active_change when clvm variants are gone. */ - if (is_lockd_type(lvl->lv->vg->lock_type)) { + if (vg_is_shared(lvl->lv->vg)) { if (!lv_active_change(lv->vg->cmd, lvl->lv, CHANGE_AEY, 0)) return_0; } else if (!activate_lv_excl_local(cmd, lvl->lv)) diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c index 71f6e14..b44c7ca 100644 --- a/lib/metadata/vg.c +++ b/lib/metadata/vg.c @@ -709,7 +709,7 @@ char *vg_attr_dup(struct dm_pool *mem, const struct volume_group *vg) if (vg_is_clustered(vg)) repstr[5] = 'c'; - else if (is_lockd_type(vg->lock_type)) + else if (vg_is_shared(vg)) repstr[5] = 's'; else repstr[5] = '-'; diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 1f7fd79..be4b1d0 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1802,7 +1802,7 @@ static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volu return 0; } - if (is_lockd_type(vg->lock_type)) { + if (vg_is_shared(vg)) { /* FIXME: we need to create a lock for the new LV. */ log_error("Unable to split snapshots in VG with lock_type %s.", vg->lock_type); return 0; @@ -2622,7 +2622,7 @@ static int _lvconvert_to_thin_with_external(struct cmd_context *cmd, */ lvc.lv_name = origin_name; - if (is_lockd_type(vg->lock_type)) { + if (vg_is_shared(vg)) { /* * FIXME: external origins don't work in lockd VGs. * Prior to the lvconvert, there's a lock associated with @@ -2936,7 +2936,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, zero_metadata = (to_cachepool) ? arg_int_value(cmd, zero_ARG, 1) : 1; /* An existing LV needs to have its lock freed once it becomes a data LV. */ - if (is_lockd_type(vg->lock_type) && lv->lock_args) { + if (vg_is_shared(vg) && lv->lock_args) { lockd_data_args = dm_pool_strdup(cmd->mem, lv->lock_args); lockd_data_name = dm_pool_strdup(cmd->mem, lv->name); memcpy(&lockd_data_id, &lv->lvid.id[1], sizeof(struct id)); @@ -2975,7 +2975,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, } /* An existing LV needs to have its lock freed once it becomes a meta LV. */ - if (is_lockd_type(vg->lock_type) && metadata_lv->lock_args) { + if (vg_is_shared(vg) && metadata_lv->lock_args) { lockd_meta_args = dm_pool_strdup(cmd->mem, metadata_lv->lock_args); lockd_meta_name = dm_pool_strdup(cmd->mem, metadata_lv->name); memcpy(&lockd_meta_id, &metadata_lv->lvid.id[1], sizeof(struct id)); @@ -3241,7 +3241,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, * Locks are removed from existing LVs that are being converted to * data and meta LVs (they are unlocked and deleted below.) */ - if (is_lockd_type(vg->lock_type)) { + if (vg_is_shared(vg)) { if (to_cachepool) { data_lv->lock_args = NULL; metadata_lv->lock_args = NULL; @@ -3851,7 +3851,7 @@ static int _lvconvert_combine_split_snapshot_single(struct cmd_context *cmd, { const char *origin_name = cmd->position_argv[0]; - if (is_lockd_type(lv->vg->lock_type)) { + if (vg_is_shared(lv->vg)) { log_error("Unable to combine split snapshots in VG with lock_type %s", lv->vg->lock_type); return ECMD_FAILED; } @@ -4225,7 +4225,7 @@ static int _lvconvert_swap_pool_metadata_single(struct cmd_context *cmd, struct logical_volume *metadata_lv; const char *metadata_name; - if (is_lockd_type(lv->vg->lock_type)) { + if (vg_is_shared(lv->vg)) { /* FIXME: need to swap locks betwen LVs? */ log_error("Unable to swap pool metadata in VG with lock_type %s", lv->vg->lock_type); goto out; diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 867cde1..5c9d448 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -1231,7 +1231,7 @@ static int _determine_cache_argument(struct volume_group *vg, display_lvname(lv)); return 1; - } else if (is_lockd_type(vg->lock_type)) { + } else if (vg_is_shared(vg)) { if (!lv_active_change(cmd, lv, CHANGE_AEY, 0)) { log_error("Cannot activate cache origin %s.", display_lvname(lv)); @@ -1645,7 +1645,7 @@ static int _lvcreate_single(struct cmd_context *cmd, const char *vg_name, lp->snapshot ? " as snapshot of " : "", lp->snapshot ? lp->origin_name : "", lp->segtype->name); - if (is_lockd_type(vg->lock_type)) { + if (vg_is_shared(vg)) { if (cmd->command->command_enum == lvcreate_thin_vol_with_thinpool_or_sparse_snapshot_CMD) { log_error("Use lvconvert to create thin pools and cache pools in a shared VG."); goto out; diff --git a/tools/pvmove.c b/tools/pvmove.c index 2f7bf60..68194b8 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -642,7 +642,7 @@ static int _pvmove_setup_single(struct cmd_context *cmd, * other hosts. For LVs that are active on multiple hosts (sh), we * would need to used cluster mirrors. */ - if (is_lockd_type(vg->lock_type)) { + if (vg_is_shared(vg))) { if (!lv) { log_error("pvmove in a shared VG requires a named LV."); return ECMD_FAILED; diff --git a/tools/pvscan.c b/tools/pvscan.c index e31c7f9..c7c2744 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -197,7 +197,7 @@ static int _pvscan_autoactivate_single(struct cmd_context *cmd, const char *vg_n if (vg_is_exported(vg)) return ECMD_PROCESSED; - if (is_lockd_type(vg->lock_type)) + if (vg_is_shared(vg))) return ECMD_PROCESSED; log_debug("pvscan autoactivating VG %s.", vg_name); diff --git a/tools/vgchange.c b/tools/vgchange.c index e231c86..ee6c3b9 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -631,7 +631,7 @@ static int _vgchange_lock_start(struct cmd_context *cmd, struct volume_group *vg int auto_opt = 0; int r; - if (!is_lockd_type(vg->lock_type)) + if (!vg_is_shared(vg)) return 1; if (arg_is_set(cmd, force_ARG)) diff --git a/tools/vgcreate.c b/tools/vgcreate.c index e9f9073..52c4825 100644 --- a/tools/vgcreate.c +++ b/tools/vgcreate.c @@ -207,7 +207,7 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv) * used after this command completes (otherwise, the VG can only be * read without locks until the lockspace is done starting.) */ - if (is_lockd_type(vg->lock_type)) { + if (vg_is_shared(vg)) { const char *start_opt = arg_str_value(cmd, lockopt_ARG, NULL); if (!lockd_start_vg(cmd, vg, 1)) { diff --git a/tools/vgexport.c b/tools/vgexport.c index 76cf819..86dad3a 100644 --- a/tools/vgexport.c +++ b/tools/vgexport.c @@ -28,7 +28,7 @@ static int vgexport_single(struct cmd_context *cmd __attribute__((unused)), goto bad; } - if (is_lockd_type(vg->lock_type)) { + if (vg_is_shared(vg)) { struct lv_list *lvl; dm_list_iterate_items(lvl, &vg->lvs) { if (!lockd_lv_uses_lock(lvl->lv)) diff --git a/tools/vgimport.c b/tools/vgimport.c index ea50198..8ef8709 100644 --- a/tools/vgimport.c +++ b/tools/vgimport.c @@ -38,7 +38,7 @@ static int _vgimport_single(struct cmd_context *cmd, vg->status &= ~EXPORTED_VG; - if (!is_lockd_type(vg->lock_type)) + if (!vg_is_shared(vg)) vg->system_id = cmd->system_id ? dm_pool_strdup(vg->vgmem, cmd->system_id) : NULL; dm_list_iterate_items(pvl, &vg->pvs) { diff --git a/tools/vgmerge.c b/tools/vgmerge.c index 67c3498..920ed73 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -26,7 +26,7 @@ static struct volume_group *_vgmerge_vg_read(struct cmd_context *cmd, return NULL; } - if (is_lockd_type(vg->lock_type)) { + if (vg_is_shared(vg)) { log_error("vgmerge not allowed for lock_type %s", vg->lock_type); unlock_and_release_vg(cmd, vg, vg_name); return NULL; diff --git a/tools/vgsplit.c b/tools/vgsplit.c index 2d39111..e30a671 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -517,7 +517,7 @@ static struct volume_group *_vgsplit_from(struct cmd_context *cmd, return NULL; } - if (is_lockd_type(vg_from->lock_type)) { + if (vg_is_shared(vg_from)) { log_error("vgsplit not allowed for lock_type %s", vg_from->lock_type); unlock_and_release_vg(cmd, vg_from, vg_name_from); return NULL;

1 0

master - build: Link with -lrt
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c4497ee9e849d2d6c7441… Commit: c4497ee9e849d2d6c74412de21c6c3823d4de5f1 Parent: 15a8142f6df6d7ce26ca71f2434d6cd44ef2265c Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 1 17:20:48 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 1 17:20:48 2018 +0100 build: Link with -lrt Needed for older version of glibc --- make.tmpl.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/make.tmpl.in b/make.tmpl.in index c2d81c0..ad927b0 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -58,7 +58,7 @@ PYTHON3 = @PYTHON3@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile LIBS = @LIBS@ -LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) +LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) # Extra libraries always linked with static binaries STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) DEFS += @DEFS@

1 0

master - build: make sure selinux, udev and blkid libraries are linked.
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=15a8142f6df6d7ce26ca7… Commit: 15a8142f6df6d7ce26ca71f2434d6cd44ef2265c Parent: dbba1e9b93bac348c0df556b160676234cc8a8c4 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 1 16:53:20 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 1 16:53:20 2018 +0100 build: make sure selinux, udev and blkid libraries are linked. Fixes breakage from the recent libdm split. Though these didn't ever appear to be linked (could they have piggy backed from libdevmapper.so being linked to them?). --- make.tmpl.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/make.tmpl.in b/make.tmpl.in index 10075d4..c2d81c0 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -58,6 +58,7 @@ PYTHON3 = @PYTHON3@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile LIBS = @LIBS@ +LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) # Extra libraries always linked with static binaries STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) DEFS += @DEFS@

1 0

master - Merge branch 'master' into 2018-05-11-fork-libdm
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=dbba1e9b93bac348c0df5… Commit: dbba1e9b93bac348c0df556b160676234cc8a8c4 Parent: 89fdc0b5889d24fe785e7fa4c2be13659d1ed0b2 cb379c86c4b468858b781695934d5ad5957108d2 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 1 13:04:12 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 1 13:04:12 2018 +0100 Merge branch 'master' into 2018-05-11-fork-libdm .gitignore | 52 +++- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 27 +- WHATS_NEW_DM | 7 +- base/data-struct/radix-tree.c | 394 +++++++++++++++++--- base/data-struct/radix-tree.h | 25 +- daemons/clvmd/lvm-functions.c | 2 +- daemons/lvmdbusd/Makefile.in | 2 + daemons/lvmdbusd/lv.py | 2 +- daemons/lvmlockd/lvmlockd-core.c | 38 ++- doc/release-notes/2.02.178 | 53 +++ lib/Makefile.in | 1 + lib/cache/lvmcache.c | 125 ++++++- lib/cache/lvmcache.h | 2 + lib/cache/lvmetad.c | 2 + lib/device/bcache.c | 226 ++++++----- lib/device/dev-cache.c | 189 ++++++++-- lib/device/dev-cache.h | 2 + lib/device/device.h | 1 + lib/filters/filter-md.c | 89 ++++- lib/filters/filter-persistent.c | 10 +- lib/format_text/archive.c | 4 +- lib/label/label.c | 160 ++++++++- lib/label/label.h | 1 + lib/locking/locking.c | 16 +- lib/locking/lvmlockd.c | 37 ++- lib/metadata/cache_manip.c | 4 +- lib/metadata/lv_manip.c | 22 +- lib/metadata/metadata-exported.h | 3 +- lib/metadata/metadata-liblvm.c | 13 +- lib/metadata/metadata.c | 104 +++--- lib/metadata/mirror.c | 8 + lib/metadata/raid_manip.c | 20 +- lib/metadata/thin_manip.c | 2 +- lib/report/columns.h | 1 + lib/report/properties.c | 2 + lib/report/report.c | 8 + lib/report/values.h | 1 + liblvm/test/vgadd.c | 90 +++++ liblvm/test/vgshow.c | 95 +++++ make.tmpl.in | 1 + man/dmeventd.8_main | 4 +- man/lvmlockd.8_main | 14 +- man/vgexport.8_des | 19 +- man/vgexport.8_pregen | 19 +- scripts/code-stats.rb | 90 +++++ test/Makefile.in | 32 +- test/api/Makefile.in | 5 + test/api/pytest.sh | 12 +- test/api/python_lvm_unit.py.in | 10 +- test/api/vgtest.c | 2 +- test/dbus/lvmdbustest.py | 16 +- test/dbus/testlib.py | 2 +- test/dbus/validatestate.py | 2 +- test/lib/aux.sh | 34 +- test/lib/flavour-udev-lvmlockd-dlm.sh | 1 - test/lib/flavour-udev-lvmlockd-sanlock.sh | 1 - test/lib/flavour-udev-lvmlockd-test-lvmetad.sh | 9 + test/lib/flavour-udev-lvmlockd-test.sh | 1 - test/lib/inittest.sh | 4 +- test/shell/000-basic.sh | 2 +- test/shell/activate-minor.sh | 2 +- test/shell/activate-missing-segment.sh | 2 +- test/shell/activate-missing.sh | 2 +- test/shell/activate-partial.sh | 2 +- test/shell/activation-skip.sh | 2 +- test/shell/backup-read-only.sh | 2 +- test/shell/cache-metadata2.sh | 2 +- test/shell/component-cache.sh | 2 +- test/shell/component-raid.sh | 2 +- test/shell/component-thin.sh | 2 +- test/shell/covercmd.sh | 4 +- test/shell/discards-thin.sh | 6 +- test/shell/dmeventd-restart.sh | 2 +- test/shell/dmstats-create.sh | 1 + test/shell/dmstats-report.sh | 1 + test/shell/dumpconfig.sh | 2 +- test/shell/error-usage.sh | 2 +- test/shell/fsadm-crypt.sh | 2 +- test/shell/fsadm-renamed.sh | 2 +- test/shell/fsadm.sh | 2 +- test/shell/inconsistent-metadata.sh | 4 +- test/shell/listings.sh | 9 +- test/shell/lock-blocking.sh | 6 +- test/shell/lock-parallel.sh | 2 +- test/shell/losetup-partscan.sh | 6 +- test/shell/lv-ancestry.sh | 3 +- test/shell/lvchange-cache-mode.sh | 2 +- test/shell/lvchange-cache-old.sh | 4 +- test/shell/lvchange-cache-syncaction-raid.sh | 2 +- test/shell/lvchange-cache.sh | 2 +- test/shell/lvchange-mirror.sh | 2 +- test/shell/lvchange-partial-raid10.sh | 2 +- test/shell/lvchange-partial.sh | 2 +- test/shell/lvchange-raid-transient-failures.sh | 2 +- test/shell/lvchange-raid.sh | 2 +- test/shell/lvchange-raid1-writemostly.sh | 2 +- test/shell/lvchange-rebuild-raid.sh | 2 +- test/shell/lvchange-syncaction-raid.sh | 2 +- test/shell/lvchange-thin.sh | 6 +- test/shell/lvconvert-cache-abort.sh | 2 +- test/shell/lvconvert-cache-chunks.sh | 2 +- test/shell/lvconvert-cache-raid.sh | 3 +- test/shell/lvconvert-cache-smq.sh | 2 +- test/shell/lvconvert-m-raid1-degraded.sh | 2 +- test/shell/lvconvert-mirror-basic.sh | 2 +- test/shell/lvconvert-mirror-updown.sh | 4 +- test/shell/lvconvert-mirror.sh | 4 +- test/shell/lvconvert-raid-allocation.sh | 4 +- test/shell/lvconvert-raid-regionsize.sh | 2 +- .../lvconvert-raid-reshape-linear_to_striped.sh | 1 - test/shell/lvconvert-raid-reshape-load.sh | 4 +- .../lvconvert-raid-reshape-striped_to_linear.sh | 2 +- .../lvconvert-raid-reshape-stripes-load-fail.sh | 4 +- .../lvconvert-raid-reshape-stripes-load-reload.sh | 4 +- test/shell/lvconvert-raid-reshape-stripes-load.sh | 4 +- test/shell/lvconvert-raid-reshape.sh | 4 +- test/shell/lvconvert-raid-status-validation.sh | 4 +- .../shell/lvconvert-raid-takeover-alloc-failure.sh | 2 +- test/shell/lvconvert-raid-takeover-thin.sh | 2 +- test/shell/lvconvert-raid-takeover.sh | 2 +- test/shell/lvconvert-raid.sh | 3 +- test/shell/lvconvert-raid0_to_raid10.sh | 4 +- test/shell/lvconvert-raid10.sh | 4 +- test/shell/lvconvert-raid456.sh | 2 +- test/shell/lvconvert-raid5_to_raid10.sh | 2 +- test/shell/lvconvert-repair-cache.sh | 2 +- test/shell/lvconvert-repair-dmeventd.sh | 2 +- test/shell/lvconvert-repair-mirror.sh | 4 +- test/shell/lvconvert-repair-policy.sh | 2 +- test/shell/lvconvert-repair-raid-dmeventd.sh | 2 +- test/shell/lvconvert-repair-raid.sh | 2 +- test/shell/lvconvert-repair-replace.sh | 12 +- test/shell/lvconvert-repair-snapshot.sh | 2 +- test/shell/lvconvert-repair-thin-raid.sh | 2 +- test/shell/lvconvert-repair-transient-dmeventd.sh | 2 +- test/shell/lvconvert-repair-transient.sh | 2 +- test/shell/lvconvert-repair.sh | 8 +- test/shell/lvconvert-thin-raid.sh | 1 - test/shell/lvconvert-twostep.sh | 2 +- test/shell/lvcreate-cache-fail.sh | 4 +- test/shell/lvcreate-cache-no-tools.sh | 2 +- test/shell/lvcreate-cache-raid.sh | 2 +- test/shell/lvcreate-cache-snapshot.sh | 3 +- test/shell/lvcreate-cache.sh | 2 +- test/shell/lvcreate-large-raid.sh | 4 +- test/shell/lvcreate-mirror.sh | 2 +- test/shell/lvcreate-missing.sh | 2 +- test/shell/lvcreate-operation.sh | 4 +- test/shell/lvcreate-pvtags.sh | 3 +- test/shell/lvcreate-raid-nosync.sh | 2 +- test/shell/lvcreate-raid-volume_list.sh | 4 +- test/shell/lvcreate-raid.sh | 4 +- test/shell/lvcreate-raid10.sh | 2 +- test/shell/lvcreate-repair.sh | 5 +- test/shell/lvcreate-signature-wiping.sh | 2 +- test/shell/lvcreate-small-snap.sh | 4 +- test/shell/lvcreate-striped-mirror.sh | 2 +- test/shell/lvcreate-thin-big.sh | 4 +- test/shell/lvcreate-thin-cache.sh | 4 +- test/shell/lvcreate-thin-external-size.sh | 4 +- test/shell/lvcreate-thin-external.sh | 4 +- test/shell/lvcreate-thin-power2.sh | 4 +- test/shell/lvcreate-thin-snap.sh | 4 +- test/shell/lvcreate-thin.sh | 4 +- test/shell/lvcreate-usage.sh | 10 +- test/shell/lvextend-percent-extents.sh | 4 +- test/shell/lvextend-snapshot-dmeventd.sh | 1 - test/shell/lvextend-snapshot-policy.sh | 2 +- test/shell/lvextend-thin-cache.sh | 2 +- test/shell/lvextend-thin-data-dmeventd.sh | 4 +- test/shell/lvextend-thin-metadata-dmeventd.sh | 4 +- test/shell/lvextend-thin-raid.sh | 2 +- test/shell/lvextend-thin.sh | 2 +- test/shell/lvm-init.sh | 2 +- test/shell/lvmetad-pvs.sh | 2 +- test/shell/lvmetad-pvscan-md.sh | 3 +- test/shell/lvmlockd-hello-world.sh | 2 +- test/shell/lvrename-cache-thin.sh | 2 +- test/shell/lvresize-full.sh | 2 +- test/shell/lvresize-mirror.sh | 2 +- test/shell/lvresize-raid.sh | 4 +- test/shell/lvresize-raid10.sh | 2 +- test/shell/lvresize-rounding.sh | 6 +- test/shell/lvresize-thin-metadata.sh | 2 +- test/shell/lvresize-usage.sh | 2 +- test/shell/lvs-cache.sh | 2 +- test/shell/mda-rollback.sh | 4 +- test/shell/mdata-strings.sh | 3 +- test/shell/metadata-balance.sh | 49 ++-- test/shell/metadata-dirs.sh | 14 +- test/shell/metadata.sh | 7 +- test/shell/mirror-names.sh | 2 +- test/shell/mirror-vgreduce-removemissing.sh | 4 +- test/shell/name-mangling.sh | 2 +- test/shell/nomda-missing.sh | 4 +- test/shell/nomda-restoremissing.sh | 2 +- test/shell/orphan-ondisk.sh | 2 +- test/shell/pool-labels.sh | 2 +- test/shell/process-each-duplicate-pvs.sh | 40 ++- test/shell/process-each-lv.sh | 2 + test/shell/process-each-pv-nomda.sh | 2 +- test/shell/process-each-pvresize.sh | 8 +- test/shell/process-each-vgreduce.sh | 16 +- test/shell/profiles-cache.sh | 2 +- test/shell/profiles-thin.sh | 6 +- test/shell/profiles.sh | 4 +- test/shell/pv-check-dev-size.sh | 8 +- test/shell/pv-duplicate-uuid.sh | 7 +- test/shell/pv-ext-update.sh | 1 + test/shell/pv-min-size.sh | 2 +- test/shell/pv-range-overflow.sh | 2 +- test/shell/pvchange-usage.sh | 10 +- test/shell/pvcreate-bootloaderarea.sh | 4 +- test/shell/pvcreate-md-fake-hdr.sh | 94 +++++ test/shell/pvcreate-metadata0.sh | 4 +- test/shell/pvcreate-operation-md.sh | 19 +- test/shell/pvcreate-operation.sh | 16 +- test/shell/pvcreate-usage.sh | 18 +- test/shell/pvmove-restart.sh | 6 +- test/shell/pvremove-thin.sh | 2 +- test/shell/pvremove-usage.sh | 6 +- test/shell/pvremove-warnings.sh | 4 +- test/shell/pvresize-mdas.sh | 2 +- test/shell/read-ahead.sh | 2 +- test/shell/relative-sign-options.sh | 1 + test/shell/report-fields.sh | 2 +- test/shell/report-hidden.sh | 2 +- test/shell/select-report.sh | 8 +- test/shell/select-tools-thin.sh | 4 +- test/shell/select-tools.sh | 6 +- test/shell/snapshot-autoumount-dmeventd.sh | 2 +- test/shell/snapshot-cluster.sh | 2 +- test/shell/snapshot-maxsize.sh | 4 +- test/shell/snapshot-merge-stack.sh | 2 +- test/shell/snapshot-merge.sh | 2 +- test/shell/snapshot-reactivate.sh | 2 +- test/shell/snapshot-rename.sh | 2 +- test/shell/snapshots-of-mirrors.sh | 2 +- test/shell/stray-device-node.sh | 4 +- test/shell/system_id.sh | 2 + test/shell/tags.sh | 16 +- test/shell/test-partition.sh | 2 +- test/shell/thin-autoumount-dmeventd.sh | 2 +- test/shell/thin-defaults.sh | 2 +- test/shell/thin-dmeventd-warns.sh | 2 +- test/shell/thin-foreign-dmeventd.sh | 2 +- test/shell/thin-large.sh | 2 +- test/shell/thin-merge.sh | 2 +- test/shell/thin-overprovisioning.sh | 2 +- test/shell/thin-resize-match.sh | 2 +- test/shell/thin-restore.sh | 2 +- test/shell/thin-vglock.sh | 2 +- test/shell/thin-volume-list.sh | 2 +- test/shell/topology-support.sh | 8 +- test/shell/unknown-segment.sh | 2 +- test/shell/unlost-pv.sh | 2 +- test/shell/vg-check-devs-used.sh | 3 +- test/shell/vg-name-from-env.sh | 6 +- test/shell/vgcfgbackup-lvm1.sh | 4 +- test/shell/vgcfgbackup-usage.sh | 8 +- test/shell/vgchange-many.sh | 4 +- test/shell/vgchange-maxlv.sh | 6 +- test/shell/vgchange-partial.sh | 2 +- test/shell/vgchange-sysinit.sh | 10 +- test/shell/vgchange-usage.sh | 7 +- test/shell/vgck.sh | 2 +- test/shell/vgcreate-many-pvs.sh | 6 +- test/shell/vgcreate-usage.sh | 89 +++--- test/shell/vgextend-restoremissing.sh | 2 +- test/shell/vgextend-usage.sh | 22 +- test/shell/vgimportclone.sh | 5 +- test/shell/vgreduce-removemissing-snapshot.sh | 2 +- test/shell/vgreduce-usage.sh | 14 +- test/shell/vgremove-corrupt-vg.sh | 2 +- test/shell/vgsplit-stacked.sh | 6 +- test/shell/zero-usage.sh | 2 +- test/unit/radix_tree_t.c | 275 +++++++++++++- tools/lvchange.c | 8 +- tools/lvconvert.c | 4 +- tools/lvcreate.c | 14 +- tools/pvremove.c | 13 +- tools/reporter.c | 2 + tools/toollib.c | 4 +- tools/vgimportclone.c | 15 +- 286 files changed, 2624 insertions(+), 889 deletions(-) diff --cc lib/device/bcache.c index d224436,d9bacf8..8fda0bd --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@@ -14,9 -14,11 +14,11 @@@ #define _GNU_SOURCE -#include "bcache.h" +#include "lib/device/bcache.h" + + #include "base/data-struct/radix-tree.h" -#include "lvm-logging.h" -#include "log.h" +#include "lib/log/lvm-logging.h" +#include "lib/log/log.h" #include <errno.h> #include <fcntl.h> diff --cc lib/metadata/raid_manip.c index cef0427,0c631b4..f53915b --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@@ -12,15 -12,16 +12,16 @@@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "archiver.h" -#include "metadata.h" -#include "toolcontext.h" -#include "segtype.h" -#include "display.h" -#include "activate.h" -#include "lv_alloc.h" -#include "lvm-string.h" -#include "lvmlockd.h" +#include "lib/misc/lib.h" +#include "lib/format_text/archiver.h" +#include "lib/metadata/metadata.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" +#include "lib/display/display.h" +#include "lib/activate/activate.h" +#include "lib/metadata/lv_alloc.h" +#include "lib/misc/lvm-string.h" ++#include "lib/locking/lvmlockd.h" typedef int (*fn_on_lv_t)(struct logical_volume *lv, void *data); static int _eliminate_extracted_lvs_optional_write_vg(struct volume_group *vg, diff --cc make.tmpl.in index c4d9d58,1f999ec..10075d4 --- a/make.tmpl.in +++ b/make.tmpl.in @@@ -310,8 -308,10 +310,9 @@@ LIB_VERSION_APP := $(shell $(AWK) -F '[ INCLUDES += -I$(top_srcdir) -I$(srcdir) -I$(top_builddir)/include -INC_LNS = $(top_builddir)/include/.symlinks_created + DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \ - $(top_builddir)/Makefile $(INC_LNS) + $(top_builddir)/Makefile OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o) POTFILES = $(SOURCES:%.c=%.pot)

1 0

master - Merge branch 'master' into 2018-05-11-fork-libdm
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=89fdc0b5889d24fe785e7… Commit: 89fdc0b5889d24fe785e7fa4c2be13659d1ed0b2 Parent: ccc35e2647b3b78f2fb0d62c25f21fcccbf58950 7c852c75c3b3e719d57d3410bf0c2a5e61d67f4e Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Wed May 16 13:43:02 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Wed May 16 13:43:02 2018 +0100 Merge branch 'master' into 2018-05-11-fork-libdm Makefile.in | 8 +- WHATS_NEW | 4 + conf/example.conf.in | 27 +- configure | 5 +- configure.ac | 3 +- daemons/lvmlockd/Makefile.in | 2 + doc/lvm-disk-reading.txt | 107 ++++ include/configure.h.in | 3 + lib/cache/lvmcache.c | 68 ++- lib/cache/lvmcache.h | 1 - lib/config/config_settings.h | 2 +- lib/device/bcache.c | 3 +- lib/device/dev-cache.c | 1 - lib/device/dev-io.c | 35 +- lib/device/dev-md.c | 10 +- lib/device/dev-type.c | 3 + lib/device/device.h | 2 - lib/label/label.c | 205 ++++--- lib/label/label.h | 4 +- lib/metadata/metadata-liblvm.c | 3 +- lib/metadata/metadata.c | 4 +- lib/misc/lvm-exec.c | 1 - liblvm/lvm_vg.c | 2 + man/lvconvert.8_pregen | 8 +- man/pvcreate.8_pregen | 7 +- man/vgcfgrestore.8_pregen | 9 +- man/vgconvert.8_pregen | 14 +- man/vgcreate.8_pregen | 7 +- man/vgextend.8_pregen | 7 +- man/vgsplit.8_pregen | 7 +- python/setup.py.in | 2 +- test/Makefile.in | 15 +- test/api/pytest.sh | 4 +- test/api/python_lvm_unit.py | 1048 ---------------------------------- test/api/python_lvm_unit.py.in | 1048 ++++++++++++++++++++++++++++++++++ test/lib/aux.sh | 76 +++- test/lib/check.sh | 3 +- test/lib/inittest.sh | 20 +- test/shell/fsadm-crypt.sh | 4 + test/shell/fsadm-renamed.sh | 2 +- test/shell/lvconvert-mirror.sh | 22 +- test/shell/lvconvert-raid-reshape.sh | 2 +- test/shell/lvconvert-snapshot.sh | 2 +- test/shell/lvcreate-small-snap.sh | 12 +- test/shell/lvmetad-disabled.sh | 6 +- test/shell/mirror-names.sh | 16 +- test/shell/pvmove-abort-all.sh | 21 +- test/shell/pvmove-abort.sh | 21 +- test/shell/snapshot-maxsize.sh | 2 +- test/shell/snapshot-usage.sh | 26 +- test/shell/thin-merge.sh | 1 + test/shell/topology-support.sh | 2 +- test/shell/vgcreate-usage.sh | 6 +- test/unit/Makefile.in | 6 +- test/unit/bcache_t.c | 43 ++- test/unit/bcache_utils_t.c | 31 +- test/unit/io_engine_t.c | 7 +- test/unit/unit-test.sh | 23 + tools/polldaemon.c | 11 +- tools/pvck.c | 28 +- tools/toollib.c | 3 +- 61 files changed, 1692 insertions(+), 1383 deletions(-) diff --cc Makefile.in index a1c8746,e2f5a84..00b4f1e --- a/Makefile.in +++ b/Makefile.in @@@ -61,6 -61,9 +61,7 @@@ po: tools daemon man: tools all_man: tools scripts: liblvm libdm + test: tools daemons -unit-test: lib -run-unit-test: unit-test lib.device-mapper: include.device-mapper libdm.device-mapper: include.device-mapper @@@ -96,7 -99,7 +97,7 @@@ endi DISTCLEAN_TARGETS += cscope.out CLEAN_DIRS += autom4te.cache - check check_system check_cluster check_local check_lvmetad check_lvmpolld check_lvmlockd_test check_lvmlockd_dlm check_lvmlockd_sanlock: all -check check_system check_cluster check_local check_lvmetad check_lvmpolld check_lvmlockd_test check_lvmlockd_dlm check_lvmlockd_sanlock unit-test run-unit-test: test ++check check_system check_cluster check_local check_lvmetad check_lvmpolld check_lvmlockd_test check_lvmlockd_dlm check_lvmlockd_sanlock: test $(MAKE) -C test $(@) conf.generate man.generate: tools diff --cc configure index 60f51d6,7d945df..38ee4dc --- a/configure +++ b/configure @@@ -15559,7 -15559,7 +15559,7 @@@ _ACEO ################################################################################ - ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/M akefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm 2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile" -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile device_mapper/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm /libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring _init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/api/python_lvm_unit.py test/unit/Makefile tools/Makefile udev/Makefile" ++ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/M akefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm 2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/api/python_lvm_unit.py test/unit/Makefile tools/Makefile udev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure diff --cc lib/device/bcache.c index d213758e7,30df54a..d224436 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@@ -14,9 -14,9 +14,9 @@@ #define _GNU_SOURCE -#include "bcache.h" -#include "lvm-logging.h" -#include "log.h" +#include "lib/device/bcache.h" - #include "device_mapper/misc/dm-logging.h" ++#include "lib/log/lvm-logging.h" +#include "lib/log/log.h" #include <errno.h> #include <fcntl.h> diff --cc lib/device/dev-io.c index 225fb36,9a03d3a..65b3db4 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@@ -13,12 -13,11 +13,11 @@@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "device.h" -#include "metadata.h" -#include "memlock.h" -#include "locking.h" +#include "lib/misc/lib.h" +#include "lib/device/device.h" +#include "lib/metadata/metadata.h" - #include "lib/cache/lvmcache.h" +#include "lib/mm/memlock.h" +#include "lib/locking/locking.h" #include <limits.h> #include <sys/stat.h> diff --cc test/unit/Makefile.in index 54b7d72,cb92fb1..ca36c57 --- a/test/unit/Makefile.in +++ b/test/unit/Makefile.in @@@ -10,38 -10,49 +10,38 @@@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ - -SOURCES=\ - radix-tree.c \ - status.c \ +UNIT_SOURCE=\ + base/data-struct/radix-tree.c \ + device_mapper/vdo/status.c \ \ - bcache_t.c \ - bcache_utils_t.c \ - bitset_t.c \ - config_t.c \ - dmlist_t.c \ - dmstatus_t.c \ - framework.c \ - io_engine_t.c \ - matcher_t.c \ - percent_t.c \ - radix_tree_t.c \ - run.c \ - string_t.c \ - vdo_t.c - -TARGETS += unit-test - -# Using vpath for other src dirs -# FIXME: hopefully later we will just link libs without need to extract sources -# via usage of vpath -vpath %.c \ - $(top_srcdir)/base/data-struct \ - $(top_srcdir)/device_mapper/vdo - -include $(top_builddir)/make.tmpl - -UNIT_LDLIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio -INCLUDES += -I$(top_srcdir) - -unit-test: $(OBJECTS) $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX) $(top_builddir)/lib/liblvm-internal.a + test/unit/bcache_t.c \ + test/unit/bcache_utils_t.c \ + test/unit/bitset_t.c \ + test/unit/config_t.c \ + test/unit/dmlist_t.c \ + test/unit/dmstatus_t.c \ + test/unit/io_engine_t.c \ + test/unit/radix_tree_t.c \ + test/unit/matcher_t.c \ + test/unit/framework.c \ + test/unit/percent_t.c \ + test/unit/run.c \ + test/unit/string_t.c \ + test/unit/vdo_t.c + +UNIT_DEPENDS=$(subst .c,.d,$(UNIT_SOURCE)) +UNIT_OBJECTS=$(UNIT_SOURCE:%.c=%.o) +CLEAN_TARGETS+=$(UNIT_DEPENDS) $(UNIT_OBJECTS) +UNIT_LDLIBS += $(LVMINTERNAL_LIBS) -laio + - test/unit/unit-test: $(UNIT_OBJECTS) device_mapper/libdevice-mapper.a lib/liblvm-internal.a ++test/unit/unit-test: $(UNIT_OBJECTS) lib/liblvm-internal.a device_mapper/libdevice-mapper.a @echo " [LD] $@" -- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) -L$(top_builddir)/libdm \ - -o $@ $(UNIT_OBJECTS) $(UNIT_LDLIBS) - -o $@ $(OBJECTS) $(UNIT_LDLIBS) ++ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \ ++ -o $@ $+ $(UNIT_LDLIBS) -lm -.PHONY: run-unit-test -run-unit-test: unit-test +.PHONEY: run-unit-test +run-unit-test: test/unit/unit-test @echo Running unit tests - LD_LIBRARY_PATH=$(top_builddir)/libdm ./unit-test run + LD_LIBRARY_PATH=libdm test/unit/unit-test run + +-include $(UNIT_DEPENDS) diff --cc test/unit/bcache_utils_t.c index 2c3bb0e,9ddc194..66780ea --- a/test/unit/bcache_utils_t.c +++ b/test/unit/bcache_utils_t.c @@@ -14,6 -14,10 +14,10 @@@ #define _GNU_SOURCE -#include "bcache.h" ++#include "lib/device/bcache.h" + #include "framework.h" + #include "units.h" + #include <errno.h> #include <stdio.h> #include <stdlib.h>

1 0

master - device-mapper: Fork libdm internally.
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ccc35e2647b3b78f2fb0d… Commit: ccc35e2647b3b78f2fb0d62c25f21fcccbf58950 Parent: 7f97c7ea9ade36bab817aca9eeee5c5177550127 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Mon May 14 12:16:43 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Wed May 16 13:00:50 2018 +0100 device-mapper: Fork libdm internally. The device-mapper directory now holds a copy of libdm source. At the moment this code is identical to libdm. Over time code will migrate out to appropriate places (see doc/refactoring.txt). The libdm directory still exists, and contains the source for the libdevmapper shared library, which we will continue to ship (though not neccessarily update). All code using libdm should now use the version in device-mapper. --- Makefile.in | 3 +- configure | 3 +- configure.ac | 1 + daemons/clvmd/Makefile.in | 2 +- daemons/cmirrord/Makefile.in | 1 - daemons/cmirrord/cluster.h | 4 +- daemons/cmirrord/functions.h | 2 +- daemons/dmeventd/Makefile.in | 7 +- daemons/dmeventd/dmeventd.c | 2 +- daemons/dmeventd/libdevmapper-event.c | 6 +- daemons/dmeventd/libdevmapper-event.pc.in | 1 - daemons/dmeventd/plugins/lvm2/Makefile.in | 2 +- daemons/dmeventd/plugins/mirror/Makefile.in | 2 +- daemons/dmeventd/plugins/raid/Makefile.in | 2 +- daemons/dmeventd/plugins/snapshot/Makefile.in | 2 +- daemons/dmeventd/plugins/thin/Makefile.in | 2 +- daemons/dmfilemapd/Makefile.in | 3 +- daemons/dmfilemapd/dmfilemapd.c | 2 +- daemons/lvmetad/Makefile.in | 12 +- daemons/lvmlockd/Makefile.in | 2 +- daemons/lvmlockd/lvmlockd-core.c | 2 +- daemons/lvmpolld/Makefile.in | 2 +- device-mapper/Makefile | 20 - device-mapper/vdo/status.c | 248 -- device-mapper/vdo/target.h | 68 - device_mapper/Makefile | 46 + device_mapper/datastruct/bitset.c | 258 ++ device_mapper/datastruct/hash.c | 392 ++ device_mapper/datastruct/list.c | 168 + device_mapper/ioctl/libdm-iface.c | 2196 +++++++++++ device_mapper/ioctl/libdm-targets.h | 88 + device_mapper/libdevmapper.h | 3755 ++++++++++++++++++ device_mapper/libdm-common.c | 2691 +++++++++++++ device_mapper/libdm-common.h | 58 + device_mapper/libdm-config.c | 1486 +++++++ device_mapper/libdm-deptree.c | 3853 +++++++++++++++++++ device_mapper/libdm-file.c | 261 ++ device_mapper/libdm-report.c | 5104 +++++++++++++++++++++++++ device_mapper/libdm-stats.c | 5095 ++++++++++++++++++++++++ device_mapper/libdm-string.c | 718 ++++ device_mapper/libdm-targets.c | 565 +++ device_mapper/libdm-timestamp.c | 178 + device_mapper/misc/dm-ioctl.h | 364 ++ device_mapper/misc/dm-log-userspace.h | 418 ++ device_mapper/misc/dm-logging.h | 34 + device_mapper/misc/dmlib.h | 33 + device_mapper/misc/kdev_t.h | 22 + device_mapper/mm/dbg_malloc.c | 413 ++ device_mapper/mm/pool-debug.c | 292 ++ device_mapper/mm/pool-fast.c | 363 ++ device_mapper/mm/pool.c | 189 + device_mapper/regex/matcher.c | 575 +++ device_mapper/regex/parse_rx.c | 667 ++++ device_mapper/regex/parse_rx.h | 55 + device_mapper/regex/ttree.c | 114 + device_mapper/regex/ttree.h | 26 + device_mapper/vdo/status.c | 248 ++ device_mapper/vdo/target.h | 68 + lib/config/config.h | 2 +- lib/device/bcache.c | 2 +- lib/device/bcache.h | 2 +- lib/device/dev-cache.c | 2 +- lib/metadata/pv.h | 2 +- lib/metadata/vg.h | 2 +- lib/misc/lib.h | 2 +- lib/report/properties.h | 2 +- libdaemon/client/config-util.c | 2 +- libdaemon/client/daemon-client.c | 2 +- libdm/Makefile.in | 2 +- libdm/make.tmpl.in | 578 +++ liblvm/Makefile.in | 2 +- liblvm/lvm_misc.h | 2 +- liblvm/lvm_prop.c | 2 +- make.tmpl.in | 8 +- scripts/Makefile.in | 4 +- test/api/Makefile.in | 9 +- test/unit/Makefile.in | 6 +- test/unit/bitset_t.c | 2 +- test/unit/config_t.c | 2 +- test/unit/dmlist_t.c | 2 +- test/unit/dmstatus_t.c | 2 +- test/unit/framework.h | 2 +- test/unit/matcher_t.c | 2 +- test/unit/percent_t.c | 2 +- test/unit/string_t.c | 2 +- test/unit/vdo_t.c | 2 +- tools/Makefile.in | 19 +- tools/dmsetup.c | 2 +- tools/tool.h | 2 +- 89 files changed, 31454 insertions(+), 414 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3274f17..a1c8746 100644 --- a/Makefile.in +++ b/Makefile.in @@ -211,8 +211,7 @@ endif endif include test/unit/Makefile - -include device-mapper/Makefile +include device_mapper/Makefile ifneq ($(shell which ctags),) .PHONY: tags diff --git a/configure b/configure index 3b88dad..60f51d6 100755 --- a/configure +++ b/configure @@ -15559,7 +15559,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/li blvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_syst emd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Ma kefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2 _monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16256,6 +16256,7 @@ do "include/configure.h") CONFIG_HEADERS="$CONFIG_HEADERS include/configure.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "make.tmpl") CONFIG_FILES="$CONFIG_FILES make.tmpl" ;; + "libdm/make.tmpl") CONFIG_FILES="$CONFIG_FILES libdm/make.tmpl" ;; "daemons/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/Makefile" ;; "daemons/clvmd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/clvmd/Makefile" ;; "daemons/cmirrord/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/cmirrord/Makefile" ;; diff --git a/configure.ac b/configure.ac index a05f051..8dc9c18 100644 --- a/configure.ac +++ b/configure.ac @@ -2088,6 +2088,7 @@ dnl -- keep utility scripts running properly AC_CONFIG_FILES([ Makefile make.tmpl +libdm/make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in index 83af00e..47a3411 100644 --- a/daemons/clvmd/Makefile.in +++ b/daemons/clvmd/Makefile.in @@ -74,7 +74,7 @@ TARGETS = \ include $(top_builddir)/make.tmpl -LIBS += $(LVMINTERNAL_LIBS) -ldevmapper $(PTHREAD_LIBS) -laio +LIBS += $(LVMINTERNAL_LIBS) $(PTHREAD_LIBS) -laio CFLAGS += -fno-strict-aliasing $(EXTRA_EXEC_CFLAGS) INSTALL_TARGETS = \ diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in index 96e0db8..fc0ef6d 100644 --- a/daemons/cmirrord/Makefile.in +++ b/daemons/cmirrord/Makefile.in @@ -26,7 +26,6 @@ TARGETS = cmirrord include $(top_builddir)/make.tmpl -LIBS += -ldevmapper LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS) CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS) $(EXTRA_EXEC_CFLAGS) LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) diff --git a/daemons/cmirrord/cluster.h b/daemons/cmirrord/cluster.h index 0efbd64..54ddd79 100644 --- a/daemons/cmirrord/cluster.h +++ b/daemons/cmirrord/cluster.h @@ -12,8 +12,8 @@ #ifndef _LVM_CLOG_CLUSTER_H #define _LVM_CLOG_CLUSTER_H -#include "libdm/misc/dm-log-userspace.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/misc/dm-log-userspace.h" +#include "device_mapper/libdevmapper.h" #define DM_ULOG_RESPONSE 0x1000U /* in last byte of 32-bit value */ #define DM_ULOG_CHECKPOINT_READY 21 diff --git a/daemons/cmirrord/functions.h b/daemons/cmirrord/functions.h index c770459..8a7301d 100644 --- a/daemons/cmirrord/functions.h +++ b/daemons/cmirrord/functions.h @@ -12,7 +12,7 @@ #ifndef _LVM_CLOG_FUNCTIONS_H #define _LVM_CLOG_FUNCTIONS_H -#include "libdm/misc/dm-log-userspace.h" +#include "device_mapper/misc/dm-log-userspace.h" #include "cluster.h" #define LOG_RESUMED 1 diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in index d5241eb..e43bb2b 100644 --- a/daemons/dmeventd/Makefile.in +++ b/daemons/dmeventd/Makefile.in @@ -57,13 +57,13 @@ all: device-mapper device-mapper: $(TARGETS) CFLAGS_dmeventd.o += $(EXTRA_EXEC_CFLAGS) -LIBS += -ldevmapper $(PTHREAD_LIBS) +LIBS += $(PTHREAD_LIBS) dmeventd: $(LIB_SHARED) dmeventd.o $(CC) $(CFLAGS) -L. $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) dmeventd.o \ - -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) + -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) -lm -dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a +dmeventd.static: $(LIB_STATIC) dmeventd.o $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \ -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) $(STATIC_LIBS) @@ -73,7 +73,6 @@ endif ifneq ("$(CFLOW_CMD)", "") CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) --include $(top_builddir)/libdm/libdevmapper.cflow -include $(top_builddir)/lib/liblvm-internal.cflow -include $(top_builddir)/lib/liblvm2cmd.cflow -include $(top_builddir)/daemons/dmeventd/$(LIB_NAME).cflow diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c index 438cf16..533186b 100644 --- a/daemons/dmeventd/dmeventd.c +++ b/daemons/dmeventd/dmeventd.c @@ -16,7 +16,7 @@ * dmeventd - dm event daemon to monitor active mapped devices */ -#include "libdm/misc/dm-logging.h" +#include "device_mapper/misc/dm-logging.h" #include "daemons/dmeventd/libdevmapper-event.h" #include "dmeventd.h" diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index a75924c..7f07228 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -12,10 +12,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libdm/misc/dm-logging.h" -#include "libdm/misc/dmlib.h" +#include "device_mapper/misc/dm-logging.h" +#include "device_mapper/misc/dmlib.h" #include "daemons/dmeventd/libdevmapper-event.h" #include "dmeventd.h" +#include "lib/misc/intl.h" #include <fcntl.h> #include <sys/file.h> @@ -25,6 +26,7 @@ #include <arpa/inet.h> /* for htonl, ntohl */ #include <pthread.h> #include <syslog.h> +#include <unistd.h> static int _debug_level = 0; static int _use_syslog = 0; diff --git a/daemons/dmeventd/libdevmapper-event.pc.in b/daemons/dmeventd/libdevmapper-event.pc.in index 839433f..fcad5bc 100644 --- a/daemons/dmeventd/libdevmapper-event.pc.in +++ b/daemons/dmeventd/libdevmapper-event.pc.in @@ -8,4 +8,3 @@ Description: device-mapper event library Version: @DM_LIB_PATCHLEVEL@ Cflags: -I${includedir} Libs: -L${libdir} -ldevmapper-event -Requires.private: devmapper diff --git a/daemons/dmeventd/plugins/lvm2/Makefile.in b/daemons/dmeventd/plugins/lvm2/Makefile.in index 956d31e..7e4696c 100644 --- a/daemons/dmeventd/plugins/lvm2/Makefile.in +++ b/daemons/dmeventd/plugins/lvm2/Makefile.in @@ -24,7 +24,7 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS) +LIBS += @LVM2CMD_LIB@ $(PTHREAD_LIBS) install_lvm2: install_lib_shared diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in index 1d9666d..22832dd 100644 --- a/daemons/dmeventd/plugins/mirror/Makefile.in +++ b/daemons/dmeventd/plugins/mirror/Makefile.in @@ -30,7 +30,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow include $(top_builddir)/make.tmpl -LIBS += -ldevmapper-event-lvm2 -ldevmapper +LIBS += -ldevmapper-event-lvm2 install_lvm2: install_dm_plugin diff --git a/daemons/dmeventd/plugins/raid/Makefile.in b/daemons/dmeventd/plugins/raid/Makefile.in index 1bca8b2..54343b1 100644 --- a/daemons/dmeventd/plugins/raid/Makefile.in +++ b/daemons/dmeventd/plugins/raid/Makefile.in @@ -29,7 +29,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow include $(top_builddir)/make.tmpl -LIBS += -ldevmapper-event-lvm2 -ldevmapper +LIBS += -ldevmapper-event-lvm2 install_lvm2: install_dm_plugin diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in index 5eb7a47..75f4342 100644 --- a/daemons/dmeventd/plugins/snapshot/Makefile.in +++ b/daemons/dmeventd/plugins/snapshot/Makefile.in @@ -26,7 +26,7 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -LIBS += -ldevmapper-event-lvm2 -ldevmapper +LIBS += -ldevmapper-event-lvm2 install_lvm2: install_dm_plugin diff --git a/daemons/dmeventd/plugins/thin/Makefile.in b/daemons/dmeventd/plugins/thin/Makefile.in index f54ee2d..9f1c2b3 100644 --- a/daemons/dmeventd/plugins/thin/Makefile.in +++ b/daemons/dmeventd/plugins/thin/Makefile.in @@ -29,7 +29,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow include $(top_builddir)/make.tmpl -LIBS += -ldevmapper-event-lvm2 -ldevmapper +LIBS += -ldevmapper-event-lvm2 install_lvm2: install_dm_plugin diff --git a/daemons/dmfilemapd/Makefile.in b/daemons/dmfilemapd/Makefile.in index 8a4938b..1afd6b8 100644 --- a/daemons/dmfilemapd/Makefile.in +++ b/daemons/dmfilemapd/Makefile.in @@ -35,13 +35,12 @@ all: device-mapper device-mapper: $(TARGETS) CFLAGS_dmfilemapd.o += $(EXTRA_EXEC_CFLAGS) -LIBS += -ldevmapper dmfilemapd: $(LIB_SHARED) dmfilemapd.o $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ -o $@ dmfilemapd.o $(DL_LIBS) $(LIBS) -dmfilemapd.static: $(LIB_STATIC) dmfilemapd.o $(interfacebuilddir)/libdevmapper.a +dmfilemapd.static: $(LIB_STATIC) dmfilemapd.o $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L$(interfacebuilddir) \ -o $@ dmfilemapd.o $(DL_LIBS) $(LIBS) $(STATIC_LIBS) diff --git a/daemons/dmfilemapd/dmfilemapd.c b/daemons/dmfilemapd/dmfilemapd.c index 7fc95c8..4e048ff 100644 --- a/daemons/dmfilemapd/dmfilemapd.c +++ b/daemons/dmfilemapd/dmfilemapd.c @@ -16,7 +16,7 @@ #include "tools/tool.h" -#include "libdm/misc/dm-logging.h" +#include "device_mapper/misc/dm-logging.h" #include "lib/config/defaults.h" diff --git a/daemons/lvmetad/Makefile.in b/daemons/lvmetad/Makefile.in index 1d901aa..f652db8 100644 --- a/daemons/lvmetad/Makefile.in +++ b/daemons/lvmetad/Makefile.in @@ -32,15 +32,17 @@ CFLAGS_lvmetactl.o += $(EXTRA_EXEC_CFLAGS) CFLAGS_lvmetad-core.o += $(EXTRA_EXEC_CFLAGS) INCLUDES += -I$(top_srcdir)/libdaemon/server LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -LIBS += $(RT_LIBS) $(DAEMON_LIBS) -ldevmapper $(PTHREAD_LIBS) +LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_LIBS) -lm lvmetad: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ - $(top_builddir)/libdaemon/server/libdaemonserver.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -ldaemonserver $(LIBS) + $(top_builddir)/libdaemon/server/libdaemonserver.a \ + $(top_builddir)/device_mapper/libdevice-mapper.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(top_builddir)/device_mapper/libdevice-mapper.a -ldaemonserver $(LIBS) lvmetactl: lvmetactl.o $(top_builddir)/libdaemon/client/libdaemonclient.a \ - $(top_builddir)/libdaemon/server/libdaemonserver.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmetactl.o $(LIBS) + $(top_builddir)/libdaemon/server/libdaemonserver.a \ + $(top_builddir)/device_mapper/libdevice-mapper.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmetactl.o $(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS) CLEAN_TARGETS += lvmetactl.o diff --git a/daemons/lvmlockd/Makefile.in b/daemons/lvmlockd/Makefile.in index 8f16d06..5046399 100644 --- a/daemons/lvmlockd/Makefile.in +++ b/daemons/lvmlockd/Makefile.in @@ -36,7 +36,7 @@ include $(top_builddir)/make.tmpl CFLAGS += $(EXTRA_EXEC_CFLAGS) INCLUDES += -I$(top_srcdir)/libdaemon/server LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -LIBS += $(RT_LIBS) $(DAEMON_LIBS) -ldevmapper $(PTHREAD_LIBS) +LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_LIBS) lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c index e75d02b..f1a2a20 100644 --- a/daemons/lvmlockd/lvmlockd-core.c +++ b/daemons/lvmlockd/lvmlockd-core.c @@ -19,7 +19,7 @@ #include "lvm-version.h" #include "daemons/lvmetad/lvmetad-client.h" #include "daemons/lvmlockd/lvmlockd-client.h" -#include "libdm/misc/dm-ioctl.h" +#include "device_mapper/misc/dm-ioctl.h" /* #include <assert.h> */ #include <errno.h> diff --git a/daemons/lvmpolld/Makefile.in b/daemons/lvmpolld/Makefile.in index 483758d..69c4a8d 100644 --- a/daemons/lvmpolld/Makefile.in +++ b/daemons/lvmpolld/Makefile.in @@ -30,7 +30,7 @@ include $(top_builddir)/make.tmpl CFLAGS += $(EXTRA_EXEC_CFLAGS) INCLUDES += -I$(top_srcdir)/libdaemon/server LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -LIBS += $(DAEMON_LIBS) -ldaemonserver -ldevmapper $(PTHREAD_LIBS) +LIBS += $(DAEMON_LIBS) -ldaemonserver $(PTHREAD_LIBS) lvmpolld: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a diff --git a/device-mapper/Makefile b/device-mapper/Makefile deleted file mode 100644 index 76e19f0..0000000 --- a/device-mapper/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2018 Red Hat, Inc. All rights reserved. -# -# This file is part of LVM2. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -DM_SOURCE=\ - device-mapper/vdo/status.c - -DM_DEPENDS=$(subst .c,.d,$(DM_SOURCE)) -DM_OBJECTS=$(DM_SOURCE:%.c=%.o) -CLEAN_TARGETS+=$(DM_DEPENDS) $(DM_OBJECTS) - --include $(DM_DEPENDS) diff --git a/device-mapper/vdo/status.c b/device-mapper/vdo/status.c deleted file mode 100644 index 1739a7e..0000000 --- a/device-mapper/vdo/status.c +++ /dev/null @@ -1,248 +0,0 @@ -#include "target.h" - -// For DM_ARRAY_SIZE! -#include "libdm/libdevmapper.h" - -#include <ctype.h> -#include <stdlib.h> -#include <string.h> - -//---------------------------------------------------------------- - -static char *_tok_cpy(const char *b, const char *e) -{ - char *new = malloc((e - b) + 1); - char *ptr = new; - - if (new) { - while (b != e) - *ptr++ = *b++; - *ptr = '\0'; - } - - return new; -} - -static bool _tok_eq(const char *b, const char *e, const char *str) -{ - while (b != e) { - if (!*str || *b != *str) - return false; - - b++; - str++; - } - - return !*str; -} - -static bool _parse_operating_mode(const char *b, const char *e, void *context) -{ - static struct { - const char *str; - enum vdo_operating_mode mode; - } _table[] = { - {"recovering", VDO_MODE_RECOVERING}, - {"read-only", VDO_MODE_READ_ONLY}, - {"normal", VDO_MODE_NORMAL} - }; - - enum vdo_operating_mode *r = context; - unsigned i; - for (i = 0; i < DM_ARRAY_SIZE(_table); i++) { - if (_tok_eq(b, e, _table[i].str)) { - *r = _table[i].mode; - return true; - } - } - - return false; -} - -static bool _parse_compression_state(const char *b, const char *e, void *context) -{ - static struct { - const char *str; - enum vdo_compression_state state; - } _table[] = { - {"online", VDO_COMPRESSION_ONLINE}, - {"offline", VDO_COMPRESSION_OFFLINE} - }; - - enum vdo_compression_state *r = context; - unsigned i; - for (i = 0; i < DM_ARRAY_SIZE(_table); i++) { - if (_tok_eq(b, e, _table[i].str)) { - *r = _table[i].state; - return true; - } - } - - return false; -} - -static bool _parse_recovering(const char *b, const char *e, void *context) -{ - bool *r = context; - - if (_tok_eq(b, e, "recovering")) - *r = true; - - else if (_tok_eq(b, e, "-")) - *r = false; - - else - return false; - - return true; -} - -static bool _parse_index_state(const char *b, const char *e, void *context) -{ - static struct { - const char *str; - enum vdo_index_state state; - } _table[] = { - {"error", VDO_INDEX_ERROR}, - {"closed", VDO_INDEX_CLOSED}, - {"opening", VDO_INDEX_OPENING}, - {"closing", VDO_INDEX_CLOSING}, - {"offline", VDO_INDEX_OFFLINE}, - {"online", VDO_INDEX_ONLINE}, - {"unknown", VDO_INDEX_UNKNOWN} - }; - - enum vdo_index_state *r = context; - unsigned i; - for (i = 0; i < DM_ARRAY_SIZE(_table); i++) { - if (_tok_eq(b, e, _table[i].str)) { - *r = _table[i].state; - return true; - } - } - - return false; -} - -static bool _parse_uint64(const char *b, const char *e, void *context) -{ - uint64_t *r = context, n; - - n = 0; - while (b != e) { - if (!isdigit(*b)) - return false; - - n = (n * 10) + (*b - '0'); - b++; - } - - *r = n; - return true; -} - -static const char *_eat_space(const char *b, const char *e) -{ - while (b != e && isspace(*b)) - b++; - - return b; -} - -static const char *_next_tok(const char *b, const char *e) -{ - const char *te = b; - while (te != e && !isspace(*te)) - te++; - - return te == b ? NULL : te; -} - -static void _set_error(struct vdo_status_parse_result *result, const char *fmt, ...) - __attribute__ ((format(printf, 2, 3))); - -static void _set_error(struct vdo_status_parse_result *result, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vsnprintf(result->error, sizeof(result->error), fmt, ap); - va_end(ap); -} - -static bool _parse_field(const char **b, const char *e, - bool (*p_fn)(const char *, const char *, void *), - void *field, const char *field_name, - struct vdo_status_parse_result *result) -{ - const char *te; - - te = _next_tok(*b, e); - if (!te) { - _set_error(result, "couldn't get token for '%s'", field_name); - return false; - } - - if (!p_fn(*b, te, field)) { - _set_error(result, "couldn't parse '%s'", field_name); - return false; - } - - *b = _eat_space(te, e); - return true; - -} - -bool vdo_status_parse(const char *input, struct vdo_status_parse_result *result) -{ - const char *b = b = input; - const char *e = input + strlen(input); - const char *te; - struct vdo_status *s = malloc(sizeof(*s)); - - if (!s) { - _set_error(result, "out of memory"); - return false; - } - - b = _eat_space(b, e); - te = _next_tok(b, e); - if (!te) { - _set_error(result, "couldn't get token for device"); - free(s); - return false; - } - - s->device = _tok_cpy(b, te); - if (!s->device) { - _set_error(result, "out of memory"); - free(s); - return false; - } - - b = _eat_space(te, e); - -#define XX(p, f, fn) if (!_parse_field(&b, e, p, f, fn, result)) goto bad; - XX(_parse_operating_mode, &s->operating_mode, "operating mode"); - XX(_parse_recovering, &s->recovering, "recovering"); - XX(_parse_index_state, &s->index_state, "index state"); - XX(_parse_compression_state, &s->compression_state, "compression state"); - XX(_parse_uint64, &s->used_blocks, "used blocks"); - XX(_parse_uint64, &s->total_blocks, "total blocks"); -#undef XX - - if (b != e) { - _set_error(result, "too many tokens"); - goto bad; - } - - result->status = s; - return true; - -bad: - free(s->device); - free(s); - return false; -} - -//---------------------------------------------------------------- diff --git a/device-mapper/vdo/target.h b/device-mapper/vdo/target.h deleted file mode 100644 index 3137e2c..0000000 --- a/device-mapper/vdo/target.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2018 Red Hat, Inc. All rights reserved. - * - * This file is part of the device-mapper userspace tools. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License v.2.1. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef DEVICE_MAPPER_VDO_TARGET_H -#define DEVICE_MAPPER_VDO_TARGET_H - -#include <stdbool.h> -#include <stdint.h> - -//---------------------------------------------------------------- - -enum vdo_operating_mode { - VDO_MODE_RECOVERING, - VDO_MODE_READ_ONLY, - VDO_MODE_NORMAL -}; - -enum vdo_compression_state { - VDO_COMPRESSION_ONLINE, - VDO_COMPRESSION_OFFLINE -}; - -enum vdo_index_state { - VDO_INDEX_ERROR, - VDO_INDEX_CLOSED, - VDO_INDEX_OPENING, - VDO_INDEX_CLOSING, - VDO_INDEX_OFFLINE, - VDO_INDEX_ONLINE, - VDO_INDEX_UNKNOWN -}; - -struct vdo_status { - char *device; - enum vdo_operating_mode operating_mode; - bool recovering; - enum vdo_index_state index_state; - enum vdo_compression_state compression_state; - uint64_t used_blocks; - uint64_t total_blocks; -}; - -void vdo_status_destroy(struct vdo_status *s); - -#define VDO_MAX_ERROR 256 - -struct vdo_status_parse_result { - char error[VDO_MAX_ERROR]; - struct vdo_status *status; -}; - -// Parses the status line from the kernel target. -bool vdo_status_parse(const char *input, struct vdo_status_parse_result *result); - -//---------------------------------------------------------------- - -#endif diff --git a/device_mapper/Makefile b/device_mapper/Makefile new file mode 100644 index 0000000..999c3ba --- /dev/null +++ b/device_mapper/Makefile @@ -0,0 +1,46 @@ +# Copyright (C) 2018 Red Hat, Inc. All rights reserved. +# +# This file is part of the device-mapper userspace tools. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU Lesser General Public License v.2.1. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +DEVICE_MAPPER_SOURCE=\ + device_mapper/datastruct/bitset.c \ + device_mapper/datastruct/hash.c \ + device_mapper/datastruct/list.c \ + device_mapper/libdm-common.c \ + device_mapper/libdm-config.c \ + device_mapper/libdm-deptree.c \ + device_mapper/libdm-file.c \ + device_mapper/libdm-report.c \ + device_mapper/libdm-stats.c \ + device_mapper/libdm-string.c \ + device_mapper/libdm-targets.c \ + device_mapper/libdm-timestamp.c \ + device_mapper/mm/dbg_malloc.c \ + device_mapper/mm/pool.c \ + device_mapper/regex/matcher.c \ + device_mapper/regex/parse_rx.c \ + device_mapper/regex/ttree.c \ + device_mapper/ioctl/libdm-iface.c + +DEVICE_MAPPER_DEPENDS=$(subst .c,.d,$(DEVICE_MAPPER_SOURCE)) +DEVICE_MAPPER_OBJECTS=$(subst .c,.o,$(DEVICE_MAPPER_SOURCE)) +CLEAN_TARGETS+=$(DEVICE_MAPPER_DEPENDS) $(DEVICE_MAPPER_OBJECTS) + +-include $(DEVICE_MAPPER_DEPENDS) + +$(DEVICE_MAPPER_OBJECTS): INCLUDES+=-Idevice_mapper/ + +device_mapper/libdevice-mapper.a: $(DEVICE_MAPPER_OBJECTS) + @echo " [AR] $@" + $(Q) $(RM) $@ + $(Q) $(AR) rsv $@ $(DEVICE_MAPPER_OBJECTS) > /dev/null + +CLEAN_TARGETS+=device_mapper/libdevice-mapper.a diff --git a/device_mapper/datastruct/bitset.c b/device_mapper/datastruct/bitset.c new file mode 100644 index 0000000..6ae99d3 --- /dev/null +++ b/device_mapper/datastruct/bitset.c @@ -0,0 +1,258 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" + +#include <ctype.h> + +/* FIXME: calculate this. */ +#define INT_SHIFT 5 + +dm_bitset_t dm_bitset_create(struct dm_pool *mem, unsigned num_bits) +{ + unsigned n = (num_bits / DM_BITS_PER_INT) + 2; + size_t size = sizeof(int) * n; + dm_bitset_t bs; + + if (mem) + bs = dm_pool_zalloc(mem, size); + else + bs = dm_zalloc(size); + + if (!bs) + return NULL; + + *bs = num_bits; + + return bs; +} + +void dm_bitset_destroy(dm_bitset_t bs) +{ + dm_free(bs); +} + +int dm_bitset_equal(dm_bitset_t in1, dm_bitset_t in2) +{ + int i; + + for (i = (in1[0] / DM_BITS_PER_INT) + 1; i; i--) + if (in1[i] != in2[i]) + return 0; + + return 1; +} + +void dm_bit_and(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2) +{ + int i; + + for (i = (in1[0] / DM_BITS_PER_INT) + 1; i; i--) + out[i] = in1[i] & in2[i]; +} +void dm_bit_union(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2) +{ + int i; + for (i = (in1[0] / DM_BITS_PER_INT) + 1; i; i--) + out[i] = in1[i] | in2[i]; +} + +static int _test_word(uint32_t test, int bit) +{ + uint32_t tb = test >> bit; + + return (tb ? ffs(tb) + bit - 1 : -1); +} + +static int _test_word_rev(uint32_t test, int bit) +{ + uint32_t tb = test << (DM_BITS_PER_INT - 1 - bit); + + return (tb ? bit - clz(tb) : -1); +} + +int dm_bit_get_next(dm_bitset_t bs, int last_bit) +{ + int bit, word; + uint32_t test; + + last_bit++; /* otherwise we'll return the same bit again */ + + /* + * bs[0] holds number of bits + */ + while (last_bit < (int) bs[0]) { + word = last_bit >> INT_SHIFT; + test = bs[word + 1]; + bit = last_bit & (DM_BITS_PER_INT - 1); + + if ((bit = _test_word(test, bit)) >= 0) + return (word * DM_BITS_PER_INT) + bit; + + last_bit = last_bit - (last_bit & (DM_BITS_PER_INT - 1)) + + DM_BITS_PER_INT; + } + + return -1; +} + +int dm_bit_get_prev(dm_bitset_t bs, int last_bit) +{ + int bit, word; + uint32_t test; + + last_bit--; /* otherwise we'll return the same bit again */ + + /* + * bs[0] holds number of bits + */ + while (last_bit >= 0) { + word = last_bit >> INT_SHIFT; + test = bs[word + 1]; + bit = last_bit & (DM_BITS_PER_INT - 1); + + if ((bit = _test_word_rev(test, bit)) >= 0) + return (word * DM_BITS_PER_INT) + bit; + + last_bit = (last_bit & ~(DM_BITS_PER_INT - 1)) - 1; + } + + return -1; +} + +int dm_bit_get_first(dm_bitset_t bs) +{ + return dm_bit_get_next(bs, -1); +} + +int dm_bit_get_last(dm_bitset_t bs) +{ + return dm_bit_get_prev(bs, bs[0] + 1); +} + +/* + * Based on the Linux kernel __bitmap_parselist from lib/bitmap.c + */ +dm_bitset_t dm_bitset_parse_list(const char *str, struct dm_pool *mem, + size_t min_num_bits) +{ + unsigned a, b; + int c, old_c, totaldigits, ndigits, nmaskbits; + int at_start, in_range; + dm_bitset_t mask = NULL; + const char *start = str; + size_t len; + +scan: + len = strlen(str); + totaldigits = c = 0; + nmaskbits = 0; + do { + at_start = 1; + in_range = 0; + a = b = 0; + ndigits = totaldigits; + + /* Get the next value or range of values */ + while (len) { + old_c = c; + c = *str++; + len--; + if (isspace(c)) + continue; + + /* A '\0' or a ',' signal the end of a value or range */ + if (c == '\0' || c == ',') + break; + /* + * whitespaces between digits are not allowed, + * but it's ok if whitespaces are on head or tail. + * when old_c is whilespace, + * if totaldigits == ndigits, whitespace is on head. + * if whitespace is on tail, it should not run here. + * as c was ',' or '\0', + * the last code line has broken the current loop. + */ + if ((totaldigits != ndigits) && isspace(old_c)) + goto_bad; + + if (c == '-') { + if (at_start || in_range) + goto_bad; + b = 0; + in_range = 1; + at_start = 1; + continue; + } + + if (!isdigit(c)) + goto_bad; + + b = b * 10 + (c - '0'); + if (!in_range) + a = b; + at_start = 0; + totaldigits++; + } + if (ndigits == totaldigits) + continue; + /* if no digit is after '-', it's wrong */ + if (at_start && in_range) + goto_bad; + if (!(a <= b)) + goto_bad; + if (b >= nmaskbits) + nmaskbits = b + 1; + while ((a <= b) && mask) { + dm_bit_set(mask, a); + a++; + } + } while (len && c == ','); + + if (!mask) { + if (min_num_bits && (nmaskbits < min_num_bits)) + nmaskbits = min_num_bits; + + if (!(mask = dm_bitset_create(mem, nmaskbits))) + goto_bad; + str = start; + goto scan; + } + + return mask; +bad: + if (mask) { + if (mem) + dm_pool_free(mem, mask); + else + dm_bitset_destroy(mask); + } + return NULL; +} + +#if defined(__GNUC__) +/* + * Maintain backward compatibility with older versions that did not + * accept a 'min_num_bits' argument to dm_bitset_parse_list(). + */ +dm_bitset_t dm_bitset_parse_list_v1_02_129(const char *str, struct dm_pool *mem); +dm_bitset_t dm_bitset_parse_list_v1_02_129(const char *str, struct dm_pool *mem) +{ + return dm_bitset_parse_list(str, mem, 0); +} + +#else /* if defined(__GNUC__) */ + +#endif diff --git a/device_mapper/datastruct/hash.c b/device_mapper/datastruct/hash.c new file mode 100644 index 0000000..9b9c939 --- /dev/null +++ b/device_mapper/datastruct/hash.c @@ -0,0 +1,392 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" + +struct dm_hash_node { + struct dm_hash_node *next; + void *data; + unsigned data_len; + unsigned keylen; + char key[0]; +}; + +struct dm_hash_table { + unsigned num_nodes; + unsigned num_slots; + struct dm_hash_node **slots; +}; + +/* Permutation of the Integers 0 through 255 */ +static unsigned char _nums[] = { + 1, 14, 110, 25, 97, 174, 132, 119, 138, 170, 125, 118, 27, 233, 140, 51, + 87, 197, 177, 107, 234, 169, 56, 68, 30, 7, 173, 73, 188, 40, 36, 65, + 49, 213, 104, 190, 57, 211, 148, 223, 48, 115, 15, 2, 67, 186, 210, 28, + 12, 181, 103, 70, 22, 58, 75, 78, 183, 167, 238, 157, 124, 147, 172, + 144, + 176, 161, 141, 86, 60, 66, 128, 83, 156, 241, 79, 46, 168, 198, 41, 254, + 178, 85, 253, 237, 250, 154, 133, 88, 35, 206, 95, 116, 252, 192, 54, + 221, + 102, 218, 255, 240, 82, 106, 158, 201, 61, 3, 89, 9, 42, 155, 159, 93, + 166, 80, 50, 34, 175, 195, 100, 99, 26, 150, 16, 145, 4, 33, 8, 189, + 121, 64, 77, 72, 208, 245, 130, 122, 143, 55, 105, 134, 29, 164, 185, + 194, + 193, 239, 101, 242, 5, 171, 126, 11, 74, 59, 137, 228, 108, 191, 232, + 139, + 6, 24, 81, 20, 127, 17, 91, 92, 251, 151, 225, 207, 21, 98, 113, 112, + 84, 226, 18, 214, 199, 187, 13, 32, 94, 220, 224, 212, 247, 204, 196, + 43, + 249, 236, 45, 244, 111, 182, 153, 136, 129, 90, 217, 202, 19, 165, 231, + 71, + 230, 142, 96, 227, 62, 179, 246, 114, 162, 53, 160, 215, 205, 180, 47, + 109, + 44, 38, 31, 149, 135, 0, 216, 52, 63, 23, 37, 69, 39, 117, 146, 184, + 163, 200, 222, 235, 248, 243, 219, 10, 152, 131, 123, 229, 203, 76, 120, + 209 +}; + +static struct dm_hash_node *_create_node(const char *str, unsigned len) +{ + struct dm_hash_node *n = dm_malloc(sizeof(*n) + len); + + if (n) { + memcpy(n->key, str, len); + n->keylen = len; + } + + return n; +} + +static unsigned long _hash(const char *str, unsigned len) +{ + unsigned long h = 0, g; + unsigned i; + + for (i = 0; i < len; i++) { + h <<= 4; + h += _nums[(unsigned char) *str++]; + g = h & ((unsigned long) 0xf << 16u); + if (g) { + h ^= g >> 16u; + h ^= g >> 5u; + } + } + + return h; +} + +struct dm_hash_table *dm_hash_create(unsigned size_hint) +{ + size_t len; + unsigned new_size = 16u; + struct dm_hash_table *hc = dm_zalloc(sizeof(*hc)); + + if (!hc) + return_0; + + /* round size hint up to a power of two */ + while (new_size < size_hint) + new_size = new_size << 1; + + hc->num_slots = new_size; + len = sizeof(*(hc->slots)) * new_size; + if (!(hc->slots = dm_zalloc(len))) + goto_bad; + + return hc; + + bad: + dm_free(hc->slots); + dm_free(hc); + return 0; +} + +static void _free_nodes(struct dm_hash_table *t) +{ + struct dm_hash_node *c, *n; + unsigned i; + + for (i = 0; i < t->num_slots; i++) + for (c = t->slots[i]; c; c = n) { + n = c->next; + dm_free(c); + } +} + +void dm_hash_destroy(struct dm_hash_table *t) +{ + _free_nodes(t); + dm_free(t->slots); + dm_free(t); +} + +static struct dm_hash_node **_find(struct dm_hash_table *t, const void *key, + uint32_t len) +{ + unsigned h = _hash(key, len) & (t->num_slots - 1); + struct dm_hash_node **c; + + for (c = &t->slots[h]; *c; c = &((*c)->next)) { + if ((*c)->keylen != len) + continue; + + if (!memcmp(key, (*c)->key, len)) + break; + } + + return c; +} + +void *dm_hash_lookup_binary(struct dm_hash_table *t, const void *key, + uint32_t len) +{ + struct dm_hash_node **c = _find(t, key, len); + + return *c ? (*c)->data : 0; +} + +int dm_hash_insert_binary(struct dm_hash_table *t, const void *key, + uint32_t len, void *data) +{ + struct dm_hash_node **c = _find(t, key, len); + + if (*c) + (*c)->data = data; + else { + struct dm_hash_node *n = _create_node(key, len); + + if (!n) + return 0; + + n->data = data; + n->next = 0; + *c = n; + t->num_nodes++; + } + + return 1; +} + +void dm_hash_remove_binary(struct dm_hash_table *t, const void *key, + uint32_t len) +{ + struct dm_hash_node **c = _find(t, key, len); + + if (*c) { + struct dm_hash_node *old = *c; + *c = (*c)->next; + dm_free(old); + t->num_nodes--; + } +} + +void *dm_hash_lookup(struct dm_hash_table *t, const char *key) +{ + return dm_hash_lookup_binary(t, key, strlen(key) + 1); +} + +int dm_hash_insert(struct dm_hash_table *t, const char *key, void *data) +{ + return dm_hash_insert_binary(t, key, strlen(key) + 1, data); +} + +void dm_hash_remove(struct dm_hash_table *t, const char *key) +{ + dm_hash_remove_binary(t, key, strlen(key) + 1); +} + +static struct dm_hash_node **_find_str_with_val(struct dm_hash_table *t, + const void *key, const void *val, + uint32_t len, uint32_t val_len) +{ + struct dm_hash_node **c; + unsigned h; + + h = _hash(key, len) & (t->num_slots - 1); + + for (c = &t->slots[h]; *c; c = &((*c)->next)) { + if ((*c)->keylen != len) + continue; + + if (!memcmp(key, (*c)->key, len) && (*c)->data) { + if (((*c)->data_len == val_len) && + !memcmp(val, (*c)->data, val_len)) + return c; + } + } + + return NULL; +} + +int dm_hash_insert_allow_multiple(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len) +{ + struct dm_hash_node *n; + struct dm_hash_node *first; + int len = strlen(key) + 1; + unsigned h; + + n = _create_node(key, len); + if (!n) + return 0; + + n->data = (void *)val; + n->data_len = val_len; + + h = _hash(key, len) & (t->num_slots - 1); + + first = t->slots[h]; + + if (first) + n->next = first; + else + n->next = 0; + t->slots[h] = n; + + t->num_nodes++; + return 1; +} + +/* + * Look through multiple entries with the same key for one that has a + * matching val and return that. If none have maching val, return NULL. + */ +void *dm_hash_lookup_with_val(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len) +{ + struct dm_hash_node **c; + + c = _find_str_with_val(t, key, val, strlen(key) + 1, val_len); + + return (c && *c) ? (*c)->data : 0; +} + +/* + * Look through multiple entries with the same key for one that has a + * matching val and remove that. + */ +void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len) +{ + struct dm_hash_node **c; + + c = _find_str_with_val(t, key, val, strlen(key) + 1, val_len); + + if (c && *c) { + struct dm_hash_node *old = *c; + *c = (*c)->next; + dm_free(old); + t->num_nodes--; + } +} + +/* + * Look up the value for a key and count how many + * entries have the same key. + * + * If no entries have key, return NULL and set count to 0. + * + * If one entry has the key, the function returns the val, + * and sets count to 1. + * + * If N entries have the key, the function returns the val + * from the first entry, and sets count to N. + */ +void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *count) +{ + struct dm_hash_node **c; + struct dm_hash_node **c1 = NULL; + uint32_t len = strlen(key) + 1; + unsigned h; + + *count = 0; + + h = _hash(key, len) & (t->num_slots - 1); + + for (c = &t->slots[h]; *c; c = &((*c)->next)) { + if ((*c)->keylen != len) + continue; + + if (!memcmp(key, (*c)->key, len)) { + (*count)++; + if (!c1) + c1 = c; + } + } + + if (!c1) + return NULL; + else + return *c1 ? (*c1)->data : 0; +} + +unsigned dm_hash_get_num_entries(struct dm_hash_table *t) +{ + return t->num_nodes; +} + +void dm_hash_iter(struct dm_hash_table *t, dm_hash_iterate_fn f) +{ + struct dm_hash_node *c, *n; + unsigned i; + + for (i = 0; i < t->num_slots; i++) + for (c = t->slots[i]; c; c = n) { + n = c->next; + f(c->data); + } +} + +void dm_hash_wipe(struct dm_hash_table *t) +{ + _free_nodes(t); + memset(t->slots, 0, sizeof(struct dm_hash_node *) * t->num_slots); + t->num_nodes = 0u; +} + +char *dm_hash_get_key(struct dm_hash_table *t __attribute__((unused)), + struct dm_hash_node *n) +{ + return n->key; +} + +void *dm_hash_get_data(struct dm_hash_table *t __attribute__((unused)), + struct dm_hash_node *n) +{ + return n->data; +} + +static struct dm_hash_node *_next_slot(struct dm_hash_table *t, unsigned s) +{ + struct dm_hash_node *c = NULL; + unsigned i; + + for (i = s; i < t->num_slots && !c; i++) + c = t->slots[i]; + + return c; +} + +struct dm_hash_node *dm_hash_get_first(struct dm_hash_table *t) +{ + return _next_slot(t, 0); +} + +struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_node *n) +{ + unsigned h = _hash(n->key, n->keylen) & (t->num_slots - 1); + + return n->next ? n->next : _next_slot(t, h + 1); +} diff --git a/device_mapper/datastruct/list.c b/device_mapper/datastruct/list.c new file mode 100644 index 0000000..86c3e4e --- /dev/null +++ b/device_mapper/datastruct/list.c @@ -0,0 +1,168 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" +#include <assert.h> + +/* + * Initialise a list before use. + * The list head's next and previous pointers point back to itself. + */ +void dm_list_init(struct dm_list *head) +{ + head->n = head->p = head; +} + +/* + * Insert an element before 'head'. + * If 'head' is the list head, this adds an element to the end of the list. + */ +void dm_list_add(struct dm_list *head, struct dm_list *elem) +{ + assert(head->n); + + elem->n = head; + elem->p = head->p; + + head->p->n = elem; + head->p = elem; +} + +/* + * Insert an element after 'head'. + * If 'head' is the list head, this adds an element to the front of the list. + */ +void dm_list_add_h(struct dm_list *head, struct dm_list *elem) +{ + assert(head->n); + + elem->n = head->n; + elem->p = head; + + head->n->p = elem; + head->n = elem; +} + +/* + * Delete an element from its list. + * Note that this doesn't change the element itself - it may still be safe + * to follow its pointers. + */ +void dm_list_del(struct dm_list *elem) +{ + elem->n->p = elem->p; + elem->p->n = elem->n; +} + +/* + * Remove an element from existing list and insert before 'head'. + */ +void dm_list_move(struct dm_list *head, struct dm_list *elem) +{ + dm_list_del(elem); + dm_list_add(head, elem); +} + +/* + * Is the list empty? + */ +int dm_list_empty(const struct dm_list *head) +{ + return head->n == head; +} + +/* + * Is this the first element of the list? + */ +int dm_list_start(const struct dm_list *head, const struct dm_list *elem) +{ + return elem->p == head; +} + +/* + * Is this the last element of the list? + */ +int dm_list_end(const struct dm_list *head, const struct dm_list *elem) +{ + return elem->n == head; +} + +/* + * Return first element of the list or NULL if empty + */ +struct dm_list *dm_list_first(const struct dm_list *head) +{ + return (dm_list_empty(head) ? NULL : head->n); +} + +/* + * Return last element of the list or NULL if empty + */ +struct dm_list *dm_list_last(const struct dm_list *head) +{ + return (dm_list_empty(head) ? NULL : head->p); +} + +/* + * Return the previous element of the list, or NULL if we've reached the start. + */ +struct dm_list *dm_list_prev(const struct dm_list *head, const struct dm_list *elem) +{ + return (dm_list_start(head, elem) ? NULL : elem->p); +} + +/* + * Return the next element of the list, or NULL if we've reached the end. + */ +struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *elem) +{ + return (dm_list_end(head, elem) ? NULL : elem->n); +} + +/* + * Return the number of elements in a list by walking it. + */ +unsigned int dm_list_size(const struct dm_list *head) +{ + unsigned int s = 0; + const struct dm_list *v; + + dm_list_iterate(v, head) + s++; + + return s; +} + +/* + * Join two lists together. + * This moves all the elements of the list 'head1' to the end of the list + * 'head', leaving 'head1' empty. + */ +void dm_list_splice(struct dm_list *head, struct dm_list *head1) +{ + assert(head->n); + assert(head1->n); + + if (dm_list_empty(head1)) + return; + + head1->p->n = head; + head1->n->p = head->p; + + head->p->n = head1->n; + head->p = head1->p; + + dm_list_init(head1); +} diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c new file mode 100644 index 0000000..4825f1d --- /dev/null +++ b/device_mapper/ioctl/libdm-iface.c @@ -0,0 +1,2196 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2013 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" +#include "libdm-targets.h" +#include "libdm-common.h" + +#include <stddef.h> +#include <fcntl.h> +#include <dirent.h> +#include <sys/ioctl.h> +#include <sys/utsname.h> +#include <limits.h> +#include <unistd.h> + +#ifdef __linux__ +# include "misc/kdev_t.h" +# include <linux/limits.h> +#else +# define MAJOR(x) major((x)) +# define MINOR(x) minor((x)) +# define MKDEV(x,y) makedev((x),(y)) +#endif + +#include "misc/dm-ioctl.h" + +/* + * Ensure build compatibility. + * The hard-coded versions here are the highest present + * in the _cmd_data arrays. + */ + +#if !((DM_VERSION_MAJOR == 4 && DM_VERSION_MINOR >= 6)) +#error The version of dm-ioctl.h included is incompatible. +#endif + +/* FIXME This should be exported in device-mapper.h */ +#define DM_NAME "device-mapper" + +#define PROC_MISC "/proc/misc" +#define PROC_DEVICES "/proc/devices" +#define MISC_NAME "misc" + +#define NUMBER_OF_MAJORS 4096 + +/* + * Static minor number assigned since kernel version 2.6.36. + * The original definition is in kernel's include/linux/miscdevice.h. + * This number is also visible in modules.devname exported by depmod + * utility (support included in module-init-tools version >= 3.12). + */ +#define MAPPER_CTRL_MINOR 236 +#define MISC_MAJOR 10 + +/* dm major version no for running kernel */ +static unsigned _dm_version = DM_VERSION_MAJOR; +static unsigned _dm_version_minor = 0; +static unsigned _dm_version_patchlevel = 0; +static int _log_suppress = 0; +static struct dm_timestamp *_dm_ioctl_timestamp = NULL; + +/* + * If the kernel dm driver only supports one major number + * we store it in _dm_device_major. Otherwise we indicate + * which major numbers have been claimed by device-mapper + * in _dm_bitset. + */ +static unsigned _dm_multiple_major_support = 1; +static dm_bitset_t _dm_bitset = NULL; +static uint32_t _dm_device_major = 0; + +static int _control_fd = -1; +static int _hold_control_fd_open = 0; +static int _version_checked = 0; +static int _version_ok = 1; +static unsigned _ioctl_buffer_double_factor = 0; + +const int _dm_compat = 0; + +/* *INDENT-OFF* */ +static struct cmd_data _cmd_data_v4[] = { + {"create", DM_DEV_CREATE, {4, 0, 0}}, + {"reload", DM_TABLE_LOAD, {4, 0, 0}}, + {"remove", DM_DEV_REMOVE, {4, 0, 0}}, + {"remove_all", DM_REMOVE_ALL, {4, 0, 0}}, + {"suspend", DM_DEV_SUSPEND, {4, 0, 0}}, + {"resume", DM_DEV_SUSPEND, {4, 0, 0}}, + {"info", DM_DEV_STATUS, {4, 0, 0}}, + {"deps", DM_TABLE_DEPS, {4, 0, 0}}, + {"rename", DM_DEV_RENAME, {4, 0, 0}}, + {"version", DM_VERSION, {4, 0, 0}}, + {"status", DM_TABLE_STATUS, {4, 0, 0}}, + {"table", DM_TABLE_STATUS, {4, 0, 0}}, + {"waitevent", DM_DEV_WAIT, {4, 0, 0}}, + {"names", DM_LIST_DEVICES, {4, 0, 0}}, + {"clear", DM_TABLE_CLEAR, {4, 0, 0}}, + {"mknodes", DM_DEV_STATUS, {4, 0, 0}}, +#ifdef DM_LIST_VERSIONS + {"versions", DM_LIST_VERSIONS, {4, 1, 0}}, +#endif +#ifdef DM_TARGET_MSG + {"message", DM_TARGET_MSG, {4, 2, 0}}, +#endif +#ifdef DM_DEV_SET_GEOMETRY + {"setgeometry", DM_DEV_SET_GEOMETRY, {4, 6, 0}}, +#endif +}; +/* *INDENT-ON* */ + +#define ALIGNMENT 8 + +/* FIXME Rejig library to record & use errno instead */ +#ifndef DM_EXISTS_FLAG +# define DM_EXISTS_FLAG 0x00000004 +#endif + +static char *_align(char *ptr, unsigned int a) +{ + register unsigned long agn = --a; + + return (char *) (((unsigned long) ptr + agn) & ~agn); +} + +#ifdef DM_IOCTLS +static unsigned _kernel_major = 0; +static unsigned _kernel_minor = 0; +static unsigned _kernel_release = 0; + +static int _uname(void) +{ + static int _uts_set = 0; + struct utsname _uts; + int parts; + + if (_uts_set) + return 1; + + if (uname(&_uts)) { + log_error("uname failed: %s", strerror(errno)); + return 0; + } + + parts = sscanf(_uts.release, "%u.%u.%u", + &_kernel_major, &_kernel_minor, &_kernel_release); + + /* Kernels with a major number of 2 always had 3 parts. */ + if (parts < 1 || (_kernel_major < 3 && parts < 3)) { + log_error("Could not determine kernel version used."); + return 0; + } + + _uts_set = 1; + return 1; +} + +int get_uname_version(unsigned *major, unsigned *minor, unsigned *release) +{ + if (!_uname()) + return_0; + + *major = _kernel_major; + *minor = _kernel_minor; + *release = _kernel_release; + + return 1; +} +/* + * Set number to NULL to populate _dm_bitset - otherwise first + * match is returned. + * Returns: + * 0 - error + * 1 - success - number found + * 2 - success - number not found (only if require_module_loaded=0) + */ +static int _get_proc_number(const char *file, const char *name, + uint32_t *number, int require_module_loaded) +{ + FILE *fl; + char nm[256]; + char *line = NULL; + size_t len; + uint32_t num; + + if (!(fl = fopen(file, "r"))) { + log_sys_error("fopen", file); + return 0; + } + + while (getline(&line, &len, fl) != -1) { + if (sscanf(line, "%d %255s\n", &num, &nm[0]) == 2) { + if (!strcmp(name, nm)) { + if (number) { + *number = num; + if (fclose(fl)) + log_sys_error("fclose", file); + free(line); + return 1; + } + dm_bit_set(_dm_bitset, num); + } + } + } + if (fclose(fl)) + log_sys_error("fclose", file); + free(line); + + if (number) { + if (require_module_loaded) { + log_error("%s: No entry for %s found", file, name); + return 0; + } + + return 2; + } + + return 1; +} + +static int _control_device_number(uint32_t *major, uint32_t *minor) +{ + if (!_get_proc_number(PROC_DEVICES, MISC_NAME, major, 1) || + !_get_proc_number(PROC_MISC, DM_NAME, minor, 1)) { + *major = 0; + return 0; + } + + return 1; +} + +/* + * Returns 1 if it exists on returning; 0 if it doesn't; -1 if it's wrong. + */ +static int _control_exists(const char *control, uint32_t major, uint32_t minor) +{ + struct stat buf; + + if (stat(control, &buf) < 0) { + if (errno != ENOENT) + log_sys_error("stat", control); + return 0; + } + + if (!S_ISCHR(buf.st_mode)) { + log_verbose("%s: Wrong inode type", control); + if (!unlink(control)) + return 0; + log_sys_error("unlink", control); + return -1; + } + + if (major && buf.st_rdev != MKDEV((dev_t)major, (dev_t)minor)) { + log_verbose("%s: Wrong device number: (%u, %u) instead of " + "(%u, %u)", control, + MAJOR(buf.st_mode), MINOR(buf.st_mode), + major, minor); + if (!unlink(control)) + return 0; + log_sys_error("unlink", control); + return -1; + } + + return 1; +} + +static int _create_control(const char *control, uint32_t major, uint32_t minor) +{ + int ret; + mode_t old_umask; + + /* + * Return if the control already exists with intended major/minor + * or there's an error unlinking an apparently incorrect one. + */ + ret = _control_exists(control, major, minor); + if (ret == -1) + return_0; /* Failed to unlink existing incorrect node */ + if (ret) + return 1; /* Already exists and correct */ + + (void) dm_prepare_selinux_context(dm_dir(), S_IFDIR); + old_umask = umask(DM_DEV_DIR_UMASK); + ret = dm_create_dir(dm_dir()); + umask(old_umask); + (void) dm_prepare_selinux_context(NULL, 0); + + if (!ret) + return_0; + + log_verbose("Creating device %s (%u, %u)", control, major, minor); + + (void) dm_prepare_selinux_context(control, S_IFCHR); + old_umask = umask(DM_CONTROL_NODE_UMASK); + if (mknod(control, S_IFCHR | S_IRUSR | S_IWUSR, + MKDEV((dev_t)major, (dev_t)minor)) < 0) { + log_sys_error("mknod", control); + ret = 0; + } + umask(old_umask); + (void) dm_prepare_selinux_context(NULL, 0); + + return ret; +} +#endif + +/* + * FIXME Update bitset in long-running process if dm claims new major numbers. + */ +/* + * If require_module_loaded=0, caller is responsible to check + * whether _dm_device_major or _dm_bitset is really set. If + * it's not, it means the module is not loaded. + */ +static int _create_dm_bitset(int require_module_loaded) +{ + int r; + +#ifdef DM_IOCTLS + if (_dm_bitset || _dm_device_major) + return 1; + + if (!_uname()) + return 0; + + /* + * 2.6 kernels are limited to one major number. + * Assume 2.4 kernels are patched not to. + * FIXME Check _dm_version and _dm_version_minor if 2.6 changes this. + */ + if (KERNEL_VERSION(_kernel_major, _kernel_minor, _kernel_release) >= + KERNEL_VERSION(2, 6, 0)) + _dm_multiple_major_support = 0; + + if (!_dm_multiple_major_support) { + if (!_get_proc_number(PROC_DEVICES, DM_NAME, &_dm_device_major, + require_module_loaded)) + return 0; + return 1; + } + + /* Multiple major numbers supported */ + if (!(_dm_bitset = dm_bitset_create(NULL, NUMBER_OF_MAJORS))) + return 0; + + r = _get_proc_number(PROC_DEVICES, DM_NAME, NULL, require_module_loaded); + if (!r || r == 2) { + dm_bitset_destroy(_dm_bitset); + _dm_bitset = NULL; + /* + * It's not an error if we didn't find anything and we + * didn't require module to be loaded at the same time. + */ + return r == 2; + } + + return 1; +#else + return 0; +#endif +} + +int dm_is_dm_major(uint32_t major) +{ + if (!_create_dm_bitset(0)) + return 0; + + if (_dm_multiple_major_support) { + if (!_dm_bitset) + return 0; + return dm_bit(_dm_bitset, major) ? 1 : 0; + } + + if (!_dm_device_major) + return 0; + + return (major == _dm_device_major) ? 1 : 0; +} + +static void _close_control_fd(void) +{ + if (_control_fd != -1) { + if (close(_control_fd) < 0) + log_sys_error("close", "_control_fd"); + _control_fd = -1; + } +} + +#ifdef DM_IOCTLS +static int _open_and_assign_control_fd(const char *control) +{ + if ((_control_fd = open(control, O_RDWR)) < 0) { + log_sys_error("open", control); + return 0; + } + + return 1; +} +#endif + +static int _open_control(void) +{ +#ifdef DM_IOCTLS + char control[PATH_MAX]; + uint32_t major = MISC_MAJOR; + uint32_t minor = MAPPER_CTRL_MINOR; + + if (_control_fd != -1) + return 1; + + if (!_uname()) + return 0; + + if (dm_snprintf(control, sizeof(control), "%s/%s", dm_dir(), DM_CONTROL_NODE) < 0) + goto_bad; + + /* + * Prior to 2.6.36 the minor number should be looked up in /proc. + */ + if ((KERNEL_VERSION(_kernel_major, _kernel_minor, _kernel_release) < + KERNEL_VERSION(2, 6, 36)) && + !_control_device_number(&major, &minor)) + goto_bad; + + /* + * Create the node with correct major and minor if not already done. + * Udev may already have created /dev/mapper/control + * from the modules.devname file generated by depmod. + */ + if (!_create_control(control, major, minor)) + goto_bad; + + /* + * As of 2.6.36 kernels, the open can trigger autoloading dm-mod. + */ + if (!_open_and_assign_control_fd(control)) + goto_bad; + + if (!_create_dm_bitset(1)) { + log_error("Failed to set up list of device-mapper major numbers"); + return 0; + } + + return 1; + +bad: + log_error("Failure to communicate with kernel device-mapper driver."); + if (!geteuid()) + log_error("Check that device-mapper is available in the kernel."); + return 0; +#else + return 1; +#endif +} + +static void _dm_zfree_string(char *string) +{ + if (string) { + memset(string, 0, strlen(string)); + dm_free(string); + } +} + +static void _dm_zfree_dmi(struct dm_ioctl *dmi) +{ + if (dmi) { + memset(dmi, 0, dmi->data_size); + dm_free(dmi); + } +} + +static void _dm_task_free_targets(struct dm_task *dmt) +{ + struct target *t, *n; + + for (t = dmt->head; t; t = n) { + n = t->next; + _dm_zfree_string(t->params); + dm_free(t->type); + dm_free(t); + } + + dmt->head = dmt->tail = NULL; +} + +void dm_task_destroy(struct dm_task *dmt) +{ + _dm_task_free_targets(dmt); + _dm_zfree_dmi(dmt->dmi.v4); + dm_free(dmt->dev_name); + dm_free(dmt->mangled_dev_name); + dm_free(dmt->newname); + dm_free(dmt->message); + dm_free(dmt->geometry); + dm_free(dmt->uuid); + dm_free(dmt->mangled_uuid); + dm_free(dmt); +} + +/* + * Protocol Version 4 functions. + */ + +int dm_task_get_driver_version(struct dm_task *dmt, char *version, size_t size) +{ + unsigned *v; + + if (!dmt->dmi.v4) { + if (version) + version[0] = '\0'; + return 0; + } + + v = dmt->dmi.v4->version; + _dm_version_minor = v[1]; + _dm_version_patchlevel = v[2]; + if (version && + (snprintf(version, size, "%u.%u.%u", v[0], v[1], v[2]) < 0)) { + log_error("Buffer for version is to short."); + if (size > 0) + version[0] = '\0'; + return 0; + } + + return 1; +} + +static int _check_version(char *version, size_t size, int log_suppress) +{ + struct dm_task *task; + int r; + + if (!(task = dm_task_create(DM_DEVICE_VERSION))) { + log_error("Failed to get device-mapper version"); + version[0] = '\0'; + return 0; + } + + if (log_suppress) + _log_suppress = 1; + + r = dm_task_run(task); + if (!dm_task_get_driver_version(task, version, size)) + stack; + dm_task_destroy(task); + _log_suppress = 0; + + return r; +} + +/* + * Find out device-mapper's major version number the first time + * this is called and whether or not we support it. + */ +int dm_check_version(void) +{ + char libversion[64] = "", dmversion[64] = ""; + const char *compat = ""; + + if (_version_checked) + return _version_ok; + + _version_checked = 1; + + if (_check_version(dmversion, sizeof(dmversion), _dm_compat)) + return 1; + + if (!_dm_compat) + goto_bad; + + log_verbose("device-mapper ioctl protocol version %u failed. " + "Trying protocol version 1.", _dm_version); + _dm_version = 1; + if (_check_version(dmversion, sizeof(dmversion), 0)) { + log_verbose("Using device-mapper ioctl protocol version 1"); + return 1; + } + + compat = "(compat)"; + + bad: + dm_get_library_version(libversion, sizeof(libversion)); + + log_error("Incompatible libdevmapper %s%s and kernel driver %s.", + *libversion ? libversion : "(unknown version)", compat, + *dmversion ? dmversion : "(unknown version)"); + + _version_ok = 0; + return 0; +} + +int dm_cookie_supported(void) +{ + return (dm_check_version() && + _dm_version >= 4 && + _dm_version_minor >= 15); +} + +static int _dm_inactive_supported(void) +{ + int inactive_supported = 0; + + if (dm_check_version() && _dm_version >= 4) { + if (_dm_version_minor >= 16) + inactive_supported = 1; /* upstream */ + else if (_dm_version_minor == 11 && + (_dm_version_patchlevel >= 6 && + _dm_version_patchlevel <= 40)) { + inactive_supported = 1; /* RHEL 5.7 */ + } + } + + return inactive_supported; +} + +int dm_message_supports_precise_timestamps(void) +{ + /* + * 4.32.0 supports "precise_timestamps" and "histogram:" options + * to @stats_create messages but lacks the ability to report + * these properties via a subsequent @stats_list: require at + * least 4.33.0 in order to use these features. + */ + if (dm_check_version() && _dm_version >= 4) + if (_dm_version_minor >= 33) + return 1; + return 0; +} + +void *dm_get_next_target(struct dm_task *dmt, void *next, + uint64_t *start, uint64_t *length, + char **target_type, char **params) +{ + struct target *t = (struct target *) next; + + if (!t) + t = dmt->head; + + if (!t) { + *start = 0; + *length = 0; + *target_type = 0; + *params = 0; + return NULL; + } + + *start = t->start; + *length = t->length; + *target_type = t->type; + *params = t->params; + + return t->next; +} + +/* Unmarshall the target info returned from a status call */ +static int _unmarshal_status(struct dm_task *dmt, struct dm_ioctl *dmi) +{ + char *outbuf = (char *) dmi + dmi->data_start; + char *outptr = outbuf; + uint32_t i; + struct dm_target_spec *spec; + + _dm_task_free_targets(dmt); + + for (i = 0; i < dmi->target_count; i++) { + spec = (struct dm_target_spec *) outptr; + if (!dm_task_add_target(dmt, spec->sector_start, + spec->length, + spec->target_type, + outptr + sizeof(*spec))) { + return 0; + } + + outptr = outbuf + spec->next; + } + + return 1; +} + +int dm_format_dev(char *buf, int bufsize, uint32_t dev_major, + uint32_t dev_minor) +{ + int r; + + if (bufsize < 8) + return 0; + + r = snprintf(buf, (size_t) bufsize, "%u:%u", dev_major, dev_minor); + if (r < 0 || r > bufsize - 1) + return 0; + + return 1; +} + +int dm_task_get_info(struct dm_task *dmt, struct dm_info *info) +{ + if (!dmt->dmi.v4) + return 0; + + memset(info, 0, sizeof(*info)); + + info->exists = dmt->dmi.v4->flags & DM_EXISTS_FLAG ? 1 : 0; + if (!info->exists) + return 1; + + info->suspended = dmt->dmi.v4->flags & DM_SUSPEND_FLAG ? 1 : 0; + info->read_only = dmt->dmi.v4->flags & DM_READONLY_FLAG ? 1 : 0; + info->live_table = dmt->dmi.v4->flags & DM_ACTIVE_PRESENT_FLAG ? 1 : 0; + info->inactive_table = dmt->dmi.v4->flags & DM_INACTIVE_PRESENT_FLAG ? + 1 : 0; + info->deferred_remove = dmt->dmi.v4->flags & DM_DEFERRED_REMOVE; + info->internal_suspend = (dmt->dmi.v4->flags & DM_INTERNAL_SUSPEND_FLAG) ? 1 : 0; + info->target_count = dmt->dmi.v4->target_count; + info->open_count = dmt->dmi.v4->open_count; + info->event_nr = dmt->dmi.v4->event_nr; + info->major = MAJOR(dmt->dmi.v4->dev); + info->minor = MINOR(dmt->dmi.v4->dev); + + return 1; +} + +uint32_t dm_task_get_read_ahead(const struct dm_task *dmt, uint32_t *read_ahead) +{ + const char *dev_name; + + *read_ahead = 0; + + if (!dmt->dmi.v4 || !(dmt->dmi.v4->flags & DM_EXISTS_FLAG)) + return 0; + + if (*dmt->dmi.v4->name) + dev_name = dmt->dmi.v4->name; + else if (!(dev_name = DEV_NAME(dmt))) { + log_error("Get read ahead request failed: device name unrecorded."); + return 0; + } + + return get_dev_node_read_ahead(dev_name, MAJOR(dmt->dmi.v4->dev), + MINOR(dmt->dmi.v4->dev), read_ahead); +} + +struct dm_deps *dm_task_get_deps(struct dm_task *dmt) +{ + return (struct dm_deps *) (((char *) dmt->dmi.v4) + + dmt->dmi.v4->data_start); +} + +struct dm_names *dm_task_get_names(struct dm_task *dmt) +{ + return (struct dm_names *) (((char *) dmt->dmi.v4) + + dmt->dmi.v4->data_start); +} + +struct dm_versions *dm_task_get_versions(struct dm_task *dmt) +{ + return (struct dm_versions *) (((char *) dmt->dmi.v4) + + dmt->dmi.v4->data_start); +} + +const char *dm_task_get_message_response(struct dm_task *dmt) +{ + const char *start, *end; + + if (!(dmt->dmi.v4->flags & DM_DATA_OUT_FLAG)) + return NULL; + + start = (const char *) dmt->dmi.v4 + dmt->dmi.v4->data_start; + end = (const char *) dmt->dmi.v4 + dmt->dmi.v4->data_size; + + if (end < start) { + log_error(INTERNAL_ERROR "Corrupted message structure returned: start %d > end %d", (int)dmt->dmi.v4->data_start, (int)dmt->dmi.v4->data_size); + return NULL; + } + + if (!memchr(start, 0, end - start)) { + log_error(INTERNAL_ERROR "Message response doesn't contain terminating NUL character"); + return NULL; + } + + return start; +} + +int dm_task_set_ro(struct dm_task *dmt) +{ + dmt->read_only = 1; + return 1; +} + +int dm_task_set_read_ahead(struct dm_task *dmt, uint32_t read_ahead, + uint32_t read_ahead_flags) +{ + dmt->read_ahead = read_ahead; + dmt->read_ahead_flags = read_ahead_flags; + + return 1; +} + +int dm_task_suppress_identical_reload(struct dm_task *dmt) +{ + dmt->suppress_identical_reload = 1; + return 1; +} + +int dm_task_set_add_node(struct dm_task *dmt, dm_add_node_t add_node) +{ + switch (add_node) { + case DM_ADD_NODE_ON_RESUME: + case DM_ADD_NODE_ON_CREATE: + dmt->add_node = add_node; + return 1; + default: + log_error("Unknown add node parameter"); + return 0; + } +} + +int dm_task_set_newuuid(struct dm_task *dmt, const char *newuuid) +{ + dm_string_mangling_t mangling_mode = dm_get_name_mangling_mode(); + char mangled_uuid[DM_UUID_LEN]; + int r = 0; + + if (strlen(newuuid) >= DM_UUID_LEN) { + log_error("Uuid \"%s\" too long", newuuid); + return 0; + } + + if (!check_multiple_mangled_string_allowed(newuuid, "new UUID", mangling_mode)) + return_0; + + if (mangling_mode != DM_STRING_MANGLING_NONE && + (r = mangle_string(newuuid, "new UUID", strlen(newuuid), mangled_uuid, + sizeof(mangled_uuid), mangling_mode)) < 0) { + log_error("Failed to mangle new device UUID \"%s\"", newuuid); + return 0; + } + + if (r) { + log_debug_activation("New device uuid mangled [%s]: %s --> %s", + mangling_mode == DM_STRING_MANGLING_AUTO ? "auto" : "hex", + newuuid, mangled_uuid); + newuuid = mangled_uuid; + } + + dm_free(dmt->newname); + if (!(dmt->newname = dm_strdup(newuuid))) { + log_error("dm_task_set_newuuid: strdup(%s) failed", newuuid); + return 0; + } + dmt->new_uuid = 1; + + return 1; +} + +int dm_task_set_message(struct dm_task *dmt, const char *message) +{ + dm_free(dmt->message); + if (!(dmt->message = dm_strdup(message))) { + log_error("dm_task_set_message: strdup failed"); + return 0; + } + + return 1; +} + +int dm_task_set_sector(struct dm_task *dmt, uint64_t sector) +{ + dmt->sector = sector; + + return 1; +} + +int dm_task_set_geometry(struct dm_task *dmt, const char *cylinders, const char *heads, + const char *sectors, const char *start) +{ + dm_free(dmt->geometry); + if (dm_asprintf(&(dmt->geometry), "%s %s %s %s", + cylinders, heads, sectors, start) < 0) { + log_error("dm_task_set_geometry: sprintf failed"); + return 0; + } + + return 1; +} + +int dm_task_no_flush(struct dm_task *dmt) +{ + dmt->no_flush = 1; + + return 1; +} + +int dm_task_no_open_count(struct dm_task *dmt) +{ + dmt->no_open_count = 1; + + return 1; +} + +int dm_task_skip_lockfs(struct dm_task *dmt) +{ + dmt->skip_lockfs = 1; + + return 1; +} + +int dm_task_secure_data(struct dm_task *dmt) +{ + dmt->secure_data = 1; + + return 1; +} + +int dm_task_retry_remove(struct dm_task *dmt) +{ + dmt->retry_remove = 1; + + return 1; +} + +int dm_task_deferred_remove(struct dm_task *dmt) +{ + dmt->deferred_remove = 1; + + return 1; +} + +int dm_task_query_inactive_table(struct dm_task *dmt) +{ + dmt->query_inactive_table = 1; + + return 1; +} + +int dm_task_set_event_nr(struct dm_task *dmt, uint32_t event_nr) +{ + dmt->event_nr = event_nr; + + return 1; +} + +int dm_task_set_record_timestamp(struct dm_task *dmt) +{ + if (!_dm_ioctl_timestamp) + _dm_ioctl_timestamp = dm_timestamp_alloc(); + + if (!_dm_ioctl_timestamp) + return_0; + + dmt->record_timestamp = 1; + + return 1; +} + +struct dm_timestamp *dm_task_get_ioctl_timestamp(struct dm_task *dmt) +{ + return dmt->record_timestamp ? _dm_ioctl_timestamp : NULL; +} + +struct target *create_target(uint64_t start, uint64_t len, const char *type, + const char *params) +{ + struct target *t; + + if (strlen(type) >= DM_MAX_TYPE_NAME) { + log_error("Target type name %s is too long.", type); + return NULL; + } + + if (!(t = dm_zalloc(sizeof(*t)))) { + log_error("create_target: malloc(%" PRIsize_t ") failed", + sizeof(*t)); + return NULL; + } + + if (!(t->params = dm_strdup(params))) { + log_error("create_target: strdup(params) failed"); + goto bad; + } + + if (!(t->type = dm_strdup(type))) { + log_error("create_target: strdup(type) failed"); + goto bad; + } + + t->start = start; + t->length = len; + return t; + + bad: + _dm_zfree_string(t->params); + dm_free(t->type); + dm_free(t); + return NULL; +} + +static char *_add_target(struct target *t, char *out, char *end) +{ + char *out_sp = out; + struct dm_target_spec sp; + size_t sp_size = sizeof(struct dm_target_spec); + unsigned int backslash_count = 0; + int len; + char *pt; + + if (strlen(t->type) >= sizeof(sp.target_type)) { + log_error("Target type name %s is too long.", t->type); + return NULL; + } + + sp.status = 0; + sp.sector_start = t->start; + sp.length = t->length; + strncpy(sp.target_type, t->type, sizeof(sp.target_type) - 1); + sp.target_type[sizeof(sp.target_type) - 1] = '\0'; + + out += sp_size; + pt = t->params; + + while (*pt) + if (*pt++ == '\\') + backslash_count++; + len = strlen(t->params) + backslash_count; + + if ((out >= end) || (out + len + 1) >= end) { + log_error("Ran out of memory building ioctl parameter"); + return NULL; + } + + if (backslash_count) { + /* replace "\" with "\\" */ + pt = t->params; + do { + if (*pt == '\\') + *out++ = '\\'; + *out++ = *pt++; + } while (*pt); + *out++ = '\0'; + } + else { + strcpy(out, t->params); + out += len + 1; + } + + /* align next block */ + out = _align(out, ALIGNMENT); + + sp.next = out - out_sp; + memcpy(out_sp, &sp, sp_size); + + return out; +} + +static int _lookup_dev_name(uint64_t dev, char *buf, size_t len) +{ + struct dm_names *names; + unsigned next = 0; + struct dm_task *dmt; + int r = 0; + + if (!(dmt = dm_task_create(DM_DEVICE_LIST))) + return 0; + + if (!dm_task_run(dmt)) + goto out; + + if (!(names = dm_task_get_names(dmt))) + goto out; + + if (!names->dev) + goto out; + + do { + names = (struct dm_names *)((char *) names + next); + if (names->dev == dev) { + strncpy(buf, names->name, len); + r = 1; + break; + } + next = names->next; + } while (next); + + out: + dm_task_destroy(dmt); + return r; +} + +static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count) +{ + const size_t min_size = 16 * 1024; + const int (*version)[3]; + + struct dm_ioctl *dmi; + struct target *t; + struct dm_target_msg *tmsg; + size_t len = sizeof(struct dm_ioctl); + char *b, *e; + int count = 0; + + for (t = dmt->head; t; t = t->next) { + len += sizeof(struct dm_target_spec); + len += strlen(t->params) + 1 + ALIGNMENT; + count++; + } + + if (count && (dmt->sector || dmt->message)) { + log_error("targets and message are incompatible"); + return NULL; + } + + if (count && dmt->newname) { + log_error("targets and rename are incompatible"); + return NULL; + } + + if (count && dmt->geometry) { + log_error("targets and geometry are incompatible"); + return NULL; + } + + if (dmt->newname && (dmt->sector || dmt->message)) { + log_error("message and rename are incompatible"); + return NULL; + } + + if (dmt->newname && dmt->geometry) { + log_error("geometry and rename are incompatible"); + return NULL; + } + + if (dmt->geometry && (dmt->sector || dmt->message)) { + log_error("geometry and message are incompatible"); + return NULL; + } + + if (dmt->sector && !dmt->message) { + log_error("message is required with sector"); + return NULL; + } + + if (dmt->newname) + len += strlen(dmt->newname) + 1; + + if (dmt->message) + len += sizeof(struct dm_target_msg) + strlen(dmt->message) + 1; + + if (dmt->geometry) + len += strlen(dmt->geometry) + 1; + + /* + * Give len a minimum size so that we have space to store + * dependencies or status information. + */ + if (len < min_size) + len = min_size; + + /* Increase buffer size if repeating because buffer was too small */ + while (repeat_count--) + len *= 2; + + if (!(dmi = dm_zalloc(len))) + return NULL; + + version = &_cmd_data_v4[dmt->type].version; + + dmi->version[0] = (*version)[0]; + dmi->version[1] = (*version)[1]; + dmi->version[2] = (*version)[2]; + + dmi->data_size = len; + dmi->data_start = sizeof(struct dm_ioctl); + + if (dmt->minor >= 0) { + if (!_dm_multiple_major_support && dmt->allow_default_major_fallback && + dmt->major != (int) _dm_device_major) { + log_verbose("Overriding major number of %d " + "with %u for persistent device.", + dmt->major, _dm_device_major); + dmt->major = _dm_device_major; + } + + if (dmt->major <= 0) { + log_error("Missing major number for persistent device."); + goto bad; + } + + dmi->flags |= DM_PERSISTENT_DEV_FLAG; + dmi->dev = MKDEV((dev_t)dmt->major, (dev_t)dmt->minor); + } + + /* Does driver support device number referencing? */ + if (_dm_version_minor < 3 && !DEV_NAME(dmt) && !DEV_UUID(dmt) && dmi->dev) { + if (!_lookup_dev_name(dmi->dev, dmi->name, sizeof(dmi->name))) { + log_error("Unable to find name for device (%" PRIu32 + ":%" PRIu32 ")", dmt->major, dmt->minor); + goto bad; + } + log_verbose("device (%" PRIu32 ":%" PRIu32 ") is %s " + "for compatibility with old kernel", + dmt->major, dmt->minor, dmi->name); + } + + /* FIXME Until resume ioctl supplies name, use dev_name for readahead */ + if (DEV_NAME(dmt) && (dmt->type != DM_DEVICE_RESUME || dmt->minor < 0 || + dmt->major < 0)) + strncpy(dmi->name, DEV_NAME(dmt), sizeof(dmi->name)); + + if (DEV_UUID(dmt)) + strncpy(dmi->uuid, DEV_UUID(dmt), sizeof(dmi->uuid)); + + if (dmt->type == DM_DEVICE_SUSPEND) + dmi->flags |= DM_SUSPEND_FLAG; + if (dmt->no_flush) { + if (_dm_version_minor < 12) + log_verbose("No flush flag unsupported by kernel. " + "Buffers will be flushed."); + else + dmi->flags |= DM_NOFLUSH_FLAG; + } + if (dmt->read_only) + dmi->flags |= DM_READONLY_FLAG; + if (dmt->skip_lockfs) + dmi->flags |= DM_SKIP_LOCKFS_FLAG; + if (dmt->deferred_remove && (dmt->type == DM_DEVICE_REMOVE || dmt->type == DM_DEVICE_REMOVE_ALL)) + dmi->flags |= DM_DEFERRED_REMOVE; + + if (dmt->secure_data) { + if (_dm_version_minor < 20) + log_verbose("Secure data flag unsupported by kernel. " + "Buffers will not be wiped after use."); + dmi->flags |= DM_SECURE_DATA_FLAG; + } + if (dmt->query_inactive_table) { + if (!_dm_inactive_supported()) + log_warn("WARNING: Inactive table query unsupported " + "by kernel. It will use live table."); + dmi->flags |= DM_QUERY_INACTIVE_TABLE_FLAG; + } + if (dmt->new_uuid) { + if (_dm_version_minor < 19) { + log_error("WARNING: Setting UUID unsupported by " + "kernel. Aborting operation."); + goto bad; + } + dmi->flags |= DM_UUID_FLAG; + } + + dmi->target_count = count; + dmi->event_nr = dmt->event_nr; + + b = (char *) (dmi + 1); + e = (char *) dmi + len; + + for (t = dmt->head; t; t = t->next) + if (!(b = _add_target(t, b, e))) + goto_bad; + + if (dmt->newname) + strcpy(b, dmt->newname); + + if (dmt->message) { + tmsg = (struct dm_target_msg *) b; + tmsg->sector = dmt->sector; + strcpy(tmsg->message, dmt->message); + } + + if (dmt->geometry) + strcpy(b, dmt->geometry); + + return dmi; + + bad: + _dm_zfree_dmi(dmi); + return NULL; +} + +static int _process_mapper_dir(struct dm_task *dmt) +{ + struct dirent *dirent; + DIR *d; + const char *dir; + int r = 1; + + dir = dm_dir(); + if (!(d = opendir(dir))) { + log_sys_error("opendir", dir); + return 0; + } + + while ((dirent = readdir(d))) { + if (!strcmp(dirent->d_name, ".") || + !strcmp(dirent->d_name, "..") || + !strcmp(dirent->d_name, "control")) + continue; + if (!dm_task_set_name(dmt, dirent->d_name)) { + r = 0; + stack; + continue; /* try next name */ + } + if (!dm_task_run(dmt)) { + r = 0; + stack; /* keep going */ + } + } + + if (closedir(d)) + log_sys_error("closedir", dir); + + return r; +} + +static int _process_all_v4(struct dm_task *dmt) +{ + struct dm_task *task; + struct dm_names *names; + unsigned next = 0; + int r = 1; + + if (!(task = dm_task_create(DM_DEVICE_LIST))) + return 0; + + if (!dm_task_run(task)) { + r = 0; + goto out; + } + + if (!(names = dm_task_get_names(task))) { + r = 0; + goto out; + } + + if (!names->dev) + goto out; + + do { + names = (struct dm_names *)((char *) names + next); + if (!dm_task_set_name(dmt, names->name)) { + r = 0; + goto out; + } + if (!dm_task_run(dmt)) + r = 0; + next = names->next; + } while (next); + + out: + dm_task_destroy(task); + return r; +} + +static int _mknodes_v4(struct dm_task *dmt) +{ + (void) _process_mapper_dir(dmt); + + return _process_all_v4(dmt); +} + +/* + * If an operation that uses a cookie fails, decrement the + * semaphore instead of udev. + */ +static int _udev_complete(struct dm_task *dmt) +{ + uint16_t base; + + if (dmt->cookie_set && + (base = dmt->event_nr & ~DM_UDEV_FLAGS_MASK)) + /* strip flags from the cookie and use cookie magic instead */ + return dm_udev_complete(base | (DM_COOKIE_MAGIC << + DM_UDEV_FLAGS_SHIFT)); + + return 1; +} + +#ifdef DM_IOCTLS +static int _check_uevent_generated(struct dm_ioctl *dmi) +{ + if (!dm_check_version() || + _dm_version < 4 || + _dm_version_minor < 17) + /* can't check, assume uevent is generated */ + return 1; + + return dmi->flags & DM_UEVENT_GENERATED_FLAG; +} +#endif + +static int _create_and_load_v4(struct dm_task *dmt) +{ + struct dm_task *task; + int r; + uint32_t cookie; + + /* Use new task struct to create the device */ + if (!(task = dm_task_create(DM_DEVICE_CREATE))) { + _udev_complete(dmt); + return_0; + } + + /* Copy across relevant fields */ + if (dmt->dev_name && !dm_task_set_name(task, dmt->dev_name)) + goto_bad; + + if (dmt->uuid && !dm_task_set_uuid(task, dmt->uuid)) + goto_bad; + + task->major = dmt->major; + task->minor = dmt->minor; + task->uid = dmt->uid; + task->gid = dmt->gid; + task->mode = dmt->mode; + /* FIXME: Just for udev_check in dm_task_run. Can we avoid this? */ + task->event_nr = dmt->event_nr & DM_UDEV_FLAGS_MASK; + task->cookie_set = dmt->cookie_set; + task->add_node = dmt->add_node; + + if (!dm_task_run(task)) + goto_bad; + + dm_task_destroy(task); + + /* Next load the table */ + if (!(task = dm_task_create(DM_DEVICE_RELOAD))) { + stack; + _udev_complete(dmt); + goto revert; + } + + /* Copy across relevant fields */ + if (dmt->dev_name && !dm_task_set_name(task, dmt->dev_name)) { + stack; + dm_task_destroy(task); + _udev_complete(dmt); + goto revert; + } + + task->read_only = dmt->read_only; + task->head = dmt->head; + task->tail = dmt->tail; + task->secure_data = dmt->secure_data; + + r = dm_task_run(task); + + task->head = NULL; + task->tail = NULL; + dm_task_destroy(task); + + if (!r) { + stack; + _udev_complete(dmt); + goto revert; + } + + /* Use the original structure last so the info will be correct */ + dmt->type = DM_DEVICE_RESUME; + dm_free(dmt->uuid); + dmt->uuid = NULL; + dm_free(dmt->mangled_uuid); + dmt->mangled_uuid = NULL; + + if (dm_task_run(dmt)) + return 1; + + revert: + dmt->type = DM_DEVICE_REMOVE; + dm_free(dmt->uuid); + dmt->uuid = NULL; + dm_free(dmt->mangled_uuid); + dmt->mangled_uuid = NULL; + + /* + * Also udev-synchronize "remove" dm task that is a part of this revert! + * But only if the original dm task was supposed to be synchronized. + */ + if (dmt->cookie_set) { + cookie = (dmt->event_nr & ~DM_UDEV_FLAGS_MASK) | + (DM_COOKIE_MAGIC << DM_UDEV_FLAGS_SHIFT); + if (!dm_task_set_cookie(dmt, &cookie, + (dmt->event_nr & DM_UDEV_FLAGS_MASK) >> + DM_UDEV_FLAGS_SHIFT)) + stack; /* keep going */ + } + + if (!dm_task_run(dmt)) + log_error("Failed to revert device creation."); + + return 0; + + bad: + dm_task_destroy(task); + _udev_complete(dmt); + + return 0; +} + +uint64_t dm_task_get_existing_table_size(struct dm_task *dmt) +{ + return dmt->existing_table_size; +} + +static int _reload_with_suppression_v4(struct dm_task *dmt) +{ + struct dm_task *task; + struct target *t1, *t2; + size_t len; + int r; + + /* New task to get existing table information */ + if (!(task = dm_task_create(DM_DEVICE_TABLE))) { + log_error("Failed to create device-mapper task struct"); + return 0; + } + + /* Copy across relevant fields */ + if (dmt->dev_name && !dm_task_set_name(task, dmt->dev_name)) { + dm_task_destroy(task); + return 0; + } + + if (dmt->uuid && !dm_task_set_uuid(task, dmt->uuid)) { + dm_task_destroy(task); + return 0; + } + + task->major = dmt->major; + task->minor = dmt->minor; + + r = dm_task_run(task); + + if (!r) { + dm_task_destroy(task); + return r; + } + + /* Store existing table size */ + t2 = task->head; + while (t2 && t2->next) + t2 = t2->next; + dmt->existing_table_size = t2 ? t2->start + t2->length : 0; + + if (((task->dmi.v4->flags & DM_READONLY_FLAG) ? 1 : 0) != dmt->read_only) + goto no_match; + + t1 = dmt->head; + t2 = task->head; + + while (t1 && t2) { + len = strlen(t2->params); + while (len-- > 0 && t2->params[len] == ' ') + t2->params[len] = '\0'; + if ((t1->start != t2->start) || + (t1->length != t2->length) || + (strcmp(t1->type, t2->type)) || + (strcmp(t1->params, t2->params))) + goto no_match; + t1 = t1->next; + t2 = t2->next; + } + + if (!t1 && !t2) { + dmt->dmi.v4 = task->dmi.v4; + task->dmi.v4 = NULL; + dm_task_destroy(task); + return 1; + } + +no_match: + dm_task_destroy(task); + + /* Now do the original reload */ + dmt->suppress_identical_reload = 0; + r = dm_task_run(dmt); + + return r; +} + +static int _check_children_not_suspended_v4(struct dm_task *dmt, uint64_t device) +{ + struct dm_task *task; + struct dm_info info; + struct dm_deps *deps; + int r = 0; + uint32_t i; + + /* Find dependencies */ + if (!(task = dm_task_create(DM_DEVICE_DEPS))) + return 0; + + /* Copy across or set relevant fields */ + if (device) { + task->major = MAJOR(device); + task->minor = MINOR(device); + } else { + if (dmt->dev_name && !dm_task_set_name(task, dmt->dev_name)) + goto out; + + if (dmt->uuid && !dm_task_set_uuid(task, dmt->uuid)) + goto out; + + task->major = dmt->major; + task->minor = dmt->minor; + } + + task->uid = dmt->uid; + task->gid = dmt->gid; + task->mode = dmt->mode; + /* FIXME: Just for udev_check in dm_task_run. Can we avoid this? */ + task->event_nr = dmt->event_nr & DM_UDEV_FLAGS_MASK; + task->cookie_set = dmt->cookie_set; + task->add_node = dmt->add_node; + + if (!(r = dm_task_run(task))) + goto out; + + if (!dm_task_get_info(task, &info) || !info.exists) + goto out; + + /* + * Warn if any of the devices this device depends upon are already + * suspended: I/O could become trapped between the two devices. + */ + if (info.suspended) { + if (!device) + log_debug_activation("Attempting to suspend a device that is already suspended " + "(%u:%u)", info.major, info.minor); + else + log_error(INTERNAL_ERROR "Attempt to suspend device %s%s%s%.0d%s%.0d%s%s" + "that uses already-suspended device (%u:%u)", + DEV_NAME(dmt) ? : "", DEV_UUID(dmt) ? : "", + dmt->major > 0 ? "(" : "", + dmt->major > 0 ? dmt->major : 0, + dmt->major > 0 ? ":" : "", + dmt->minor > 0 ? dmt->minor : 0, + dmt->major > 0 && dmt->minor == 0 ? "0" : "", + dmt->major > 0 ? ") " : "", + info.major, info.minor); + + /* No need for further recursion */ + r = 1; + goto out; + } + + if (!(deps = dm_task_get_deps(task))) + goto out; + + for (i = 0; i < deps->count; i++) { + /* Only recurse with dm devices */ + if (MAJOR(deps->device[i]) != _dm_device_major) + continue; + + if (!_check_children_not_suspended_v4(task, deps->device[i])) + goto out; + } + + r = 1; + +out: + dm_task_destroy(task); + + return r; +} + +static int _suspend_with_validation_v4(struct dm_task *dmt) +{ + /* Avoid recursion */ + dmt->enable_checks = 0; + + /* + * Ensure we can't leave any I/O trapped between suspended devices. + */ + if (!_check_children_not_suspended_v4(dmt, 0)) + return 0; + + /* Finally, perform the original suspend. */ + return dm_task_run(dmt); +} + +static const char *_sanitise_message(char *message) +{ + const char *sanitised_message = message ?: ""; + + /* FIXME: Check for whitespace variations. */ + /* This traps what cryptsetup sends us. */ + if (message && !strncasecmp(message, "key set", 7)) + sanitised_message = "key set"; + + return sanitised_message; +} + +#ifdef DM_IOCTLS +static int _do_dm_ioctl_unmangle_string(char *str, const char *str_name, + char *buf, size_t buf_size, + dm_string_mangling_t mode) +{ + int r; + + if (mode == DM_STRING_MANGLING_NONE) + return 1; + + if (!check_multiple_mangled_string_allowed(str, str_name, mode)) + return_0; + + if ((r = unmangle_string(str, str_name, strlen(str), buf, buf_size, mode)) < 0) { + log_debug_activation("_do_dm_ioctl_unmangle_string: failed to " + "unmangle %s \"%s\"", str_name, str); + return 0; + } + + if (r) + memcpy(str, buf, strlen(buf) + 1); + + return 1; +} + +static int _dm_ioctl_unmangle_names(int type, struct dm_ioctl *dmi) +{ + char buf[DM_NAME_LEN]; + struct dm_names *names; + unsigned next = 0; + char *name; + int r = 1; + + if ((name = dmi->name)) + r = _do_dm_ioctl_unmangle_string(name, "name", buf, sizeof(buf), + dm_get_name_mangling_mode()); + + if (type == DM_DEVICE_LIST && + ((names = ((struct dm_names *) ((char *)dmi + dmi->data_start)))) && + names->dev) { + do { + names = (struct dm_names *)((char *) names + next); + r = _do_dm_ioctl_unmangle_string(names->name, "name", + buf, sizeof(buf), + dm_get_name_mangling_mode()); + next = names->next; + } while (next); + } + + return r; +} + +static int _dm_ioctl_unmangle_uuids(int type, struct dm_ioctl *dmi) +{ + char buf[DM_UUID_LEN]; + char *uuid = dmi->uuid; + + if (uuid) + return _do_dm_ioctl_unmangle_string(uuid, "UUID", buf, sizeof(buf), + dm_get_name_mangling_mode()); + + return 1; +} +#endif + +static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, + unsigned buffer_repeat_count, + unsigned retry_repeat_count, + int *retryable) +{ + struct dm_ioctl *dmi; + int ioctl_with_uevent; + int r; + + dmt->ioctl_errno = 0; + + dmi = _flatten(dmt, buffer_repeat_count); + if (!dmi) { + log_error("Couldn't create ioctl argument."); + return NULL; + } + + if (dmt->type == DM_DEVICE_TABLE) + dmi->flags |= DM_STATUS_TABLE_FLAG; + + dmi->flags |= DM_EXISTS_FLAG; /* FIXME */ + + if (dmt->no_open_count) + dmi->flags |= DM_SKIP_BDGET_FLAG; + + ioctl_with_uevent = dmt->type == DM_DEVICE_RESUME || + dmt->type == DM_DEVICE_REMOVE || + dmt->type == DM_DEVICE_RENAME; + + if (ioctl_with_uevent && dm_cookie_supported()) { + /* + * Always mark events coming from libdevmapper as + * "primary sourced". This is needed to distinguish + * any spurious events so we can act appropriately. + * This needs to be applied even when udev_sync is + * not used because udev flags could be used alone. + */ + dmi->event_nr |= DM_UDEV_PRIMARY_SOURCE_FLAG << + DM_UDEV_FLAGS_SHIFT; + + /* + * Prevent udev vs. libdevmapper race when processing nodes + * and symlinks. This can happen when the udev rules are + * installed and udev synchronisation code is enabled in + * libdevmapper but the software using libdevmapper does not + * make use of it (by not calling dm_task_set_cookie before). + * We need to instruct the udev rules not to be applied at + * all in this situation so we can gracefully fallback to + * libdevmapper's node and symlink creation code. + */ + if (!dmt->cookie_set && dm_udev_get_sync_support()) { + log_debug_activation("Cookie value is not set while trying to call %s " + "ioctl. Please, consider using libdevmapper's udev " + "synchronisation interface or disable it explicitly " + "by calling dm_udev_set_sync_support(0).", + dmt->type == DM_DEVICE_RESUME ? "DM_DEVICE_RESUME" : + dmt->type == DM_DEVICE_REMOVE ? "DM_DEVICE_REMOVE" : + "DM_DEVICE_RENAME"); + log_debug_activation("Switching off device-mapper and all subsystem related " + "udev rules. Falling back to libdevmapper node creation."); + /* + * Disable general dm and subsystem rules but keep + * dm disk rules if not flagged out explicitly before. + * We need /dev/disk content for the software that expects it. + */ + dmi->event_nr |= (DM_UDEV_DISABLE_DM_RULES_FLAG | + DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG) << + DM_UDEV_FLAGS_SHIFT; + } + } + + log_debug_activation("dm %s %s%s %s%s%s %s%.0d%s%.0d%s" + "%s[ %s%s%s%s%s%s%s%s%s] %.0" PRIu64 " %s [%u] (*%u)", + _cmd_data_v4[dmt->type].name, + dmt->new_uuid ? "UUID " : "", + dmi->name, dmi->uuid, dmt->newname ? " " : "", + dmt->newname ? dmt->newname : "", + dmt->major > 0 ? "(" : "", + dmt->major > 0 ? dmt->major : 0, + dmt->major > 0 ? ":" : "", + dmt->minor > 0 ? dmt->minor : 0, + dmt->major > 0 && dmt->minor == 0 ? "0" : "", + dmt->major > 0 ? ") " : "", + dmt->no_open_count ? "noopencount " : "opencount ", + dmt->no_flush ? "noflush " : "flush ", + dmt->read_only ? "readonly " : "", + dmt->skip_lockfs ? "skiplockfs " : "", + dmt->retry_remove ? "retryremove " : "", + dmt->deferred_remove ? "deferredremove " : "", + dmt->secure_data ? "securedata " : "", + dmt->query_inactive_table ? "inactive " : "", + dmt->enable_checks ? "enablechecks " : "", + dmt->sector, _sanitise_message(dmt->message), + dmi->data_size, retry_repeat_count); +#ifdef DM_IOCTLS + r = ioctl(_control_fd, command, dmi); + + if (dmt->record_timestamp) + if (!dm_timestamp_get(_dm_ioctl_timestamp)) + stack; + + if (r < 0 && dmt->expected_errno != errno) { + dmt->ioctl_errno = errno; + if (dmt->ioctl_errno == ENXIO && ((dmt->type == DM_DEVICE_INFO) || + (dmt->type == DM_DEVICE_MKNODES) || + (dmt->type == DM_DEVICE_STATUS))) + dmi->flags &= ~DM_EXISTS_FLAG; /* FIXME */ + else { + if (_log_suppress || dmt->ioctl_errno == EINTR) + log_verbose("device-mapper: %s ioctl on %s %s%s%.0d%s%.0d%s%s " + "failed: %s", + _cmd_data_v4[dmt->type].name, + dmi->name, dmi->uuid, + dmt->major > 0 ? "(" : "", + dmt->major > 0 ? dmt->major : 0, + dmt->major > 0 ? ":" : "", + dmt->minor > 0 ? dmt->minor : 0, + dmt->major > 0 && dmt->minor == 0 ? "0" : "", + dmt->major > 0 ? ")" : "", + strerror(dmt->ioctl_errno)); + else + log_error("device-mapper: %s ioctl on %s %s%s%.0d%s%.0d%s%s " + "failed: %s", + _cmd_data_v4[dmt->type].name, + dmi->name, dmi->uuid, + dmt->major > 0 ? "(" : "", + dmt->major > 0 ? dmt->major : 0, + dmt->major > 0 ? ":" : "", + dmt->minor > 0 ? dmt->minor : 0, + dmt->major > 0 && dmt->minor == 0 ? "0" : "", + dmt->major > 0 ? ")" : "", + strerror(dmt->ioctl_errno)); + + /* + * It's sometimes worth retrying after EBUSY in case + * it's a transient failure caused by an asynchronous + * process quickly scanning the device. + */ + *retryable = dmt->ioctl_errno == EBUSY; + + goto error; + } + } + + if (ioctl_with_uevent && dm_udev_get_sync_support() && + !_check_uevent_generated(dmi)) { + log_debug_activation("Uevent not generated! Calling udev_complete " + "internally to avoid process lock-up."); + _udev_complete(dmt); + } + + if (!_dm_ioctl_unmangle_names(dmt->type, dmi)) + goto error; + + if (dmt->type != DM_DEVICE_REMOVE && + !_dm_ioctl_unmangle_uuids(dmt->type, dmi)) + goto error; + +#else /* Userspace alternative for testing */ + goto error; +#endif + return dmi; + +error: + _dm_zfree_dmi(dmi); + return NULL; +} + +void dm_task_update_nodes(void) +{ + update_devs(); +} + +#define DM_IOCTL_RETRIES 25 +#define DM_RETRY_USLEEP_DELAY 200000 + +int dm_task_get_errno(struct dm_task *dmt) +{ + return dmt->ioctl_errno; +} + +int dm_task_run(struct dm_task *dmt) +{ + struct dm_ioctl *dmi; + unsigned command; + int check_udev; + int rely_on_udev; + int suspended_counter; + unsigned ioctl_retry = 1; + int retryable = 0; + const char *dev_name = DEV_NAME(dmt); + const char *dev_uuid = DEV_UUID(dmt); + + if ((unsigned) dmt->type >= DM_ARRAY_SIZE(_cmd_data_v4)) { + log_error(INTERNAL_ERROR "unknown device-mapper task %d", + dmt->type); + return 0; + } + + command = _cmd_data_v4[dmt->type].cmd; + + /* Old-style creation had a table supplied */ + if (dmt->type == DM_DEVICE_CREATE && dmt->head) + return _create_and_load_v4(dmt); + + if (dmt->type == DM_DEVICE_MKNODES && !dev_name && + !dev_uuid && dmt->major <= 0) + return _mknodes_v4(dmt); + + if ((dmt->type == DM_DEVICE_RELOAD) && dmt->suppress_identical_reload) + return _reload_with_suppression_v4(dmt); + + if ((dmt->type == DM_DEVICE_SUSPEND) && dmt->enable_checks) + return _suspend_with_validation_v4(dmt); + + if (!_open_control()) { + _udev_complete(dmt); + return_0; + } + + if ((suspended_counter = dm_get_suspended_counter()) && + dmt->type == DM_DEVICE_RELOAD) + log_error(INTERNAL_ERROR "Performing unsafe table load while %d device(s) " + "are known to be suspended: " + "%s%s%s %s%.0d%s%.0d%s%s", + suspended_counter, + dev_name ? : "", + dev_uuid ? " UUID " : "", + dev_uuid ? : "", + dmt->major > 0 ? "(" : "", + dmt->major > 0 ? dmt->major : 0, + dmt->major > 0 ? ":" : "", + dmt->minor > 0 ? dmt->minor : 0, + dmt->major > 0 && dmt->minor == 0 ? "0" : "", + dmt->major > 0 ? ") " : ""); + + /* FIXME Detect and warn if cookie set but should not be. */ +repeat_ioctl: + if (!(dmi = _do_dm_ioctl(dmt, command, _ioctl_buffer_double_factor, + ioctl_retry, &retryable))) { + /* + * Async udev rules that scan devices commonly cause transient + * failures. Normally you'd expect the user to have made sure + * nothing was using the device before issuing REMOVE, so it's + * worth retrying in case the failure is indeed transient. + */ + if (retryable && dmt->type == DM_DEVICE_REMOVE && + dmt->retry_remove && ++ioctl_retry <= DM_IOCTL_RETRIES) { + usleep(DM_RETRY_USLEEP_DELAY); + goto repeat_ioctl; + } + + _udev_complete(dmt); + return 0; + } + + if (dmi->flags & DM_BUFFER_FULL_FLAG) { + switch (dmt->type) { + case DM_DEVICE_LIST_VERSIONS: + case DM_DEVICE_LIST: + case DM_DEVICE_DEPS: + case DM_DEVICE_STATUS: + case DM_DEVICE_TABLE: + case DM_DEVICE_WAITEVENT: + case DM_DEVICE_TARGET_MSG: + _ioctl_buffer_double_factor++; + _dm_zfree_dmi(dmi); + goto repeat_ioctl; + default: + log_error("WARNING: libdevmapper buffer too small for data"); + } + } + + /* + * Are we expecting a udev operation to occur that we need to check for? + */ + check_udev = dmt->cookie_set && + !(dmt->event_nr >> DM_UDEV_FLAGS_SHIFT & + DM_UDEV_DISABLE_DM_RULES_FLAG); + + rely_on_udev = dmt->cookie_set ? (dmt->event_nr >> DM_UDEV_FLAGS_SHIFT & + DM_UDEV_DISABLE_LIBRARY_FALLBACK) : 0; + + switch (dmt->type) { + case DM_DEVICE_CREATE: + if ((dmt->add_node == DM_ADD_NODE_ON_CREATE) && + dev_name && *dev_name && !rely_on_udev) + add_dev_node(dev_name, MAJOR(dmi->dev), + MINOR(dmi->dev), dmt->uid, dmt->gid, + dmt->mode, check_udev, rely_on_udev); + break; + case DM_DEVICE_REMOVE: + /* FIXME Kernel needs to fill in dmi->name */ + if (dev_name && !rely_on_udev) + rm_dev_node(dev_name, check_udev, rely_on_udev); + break; + + case DM_DEVICE_RENAME: + /* FIXME Kernel needs to fill in dmi->name */ + if (!dmt->new_uuid && dev_name) + rename_dev_node(dev_name, dmt->newname, + check_udev, rely_on_udev); + break; + + case DM_DEVICE_RESUME: + if ((dmt->add_node == DM_ADD_NODE_ON_RESUME) && + dev_name && *dev_name) + add_dev_node(dev_name, MAJOR(dmi->dev), + MINOR(dmi->dev), dmt->uid, dmt->gid, + dmt->mode, check_udev, rely_on_udev); + /* FIXME Kernel needs to fill in dmi->name */ + set_dev_node_read_ahead(dev_name, + MAJOR(dmi->dev), MINOR(dmi->dev), + dmt->read_ahead, dmt->read_ahead_flags); + break; + + case DM_DEVICE_MKNODES: + if (dmi->flags & DM_EXISTS_FLAG) + add_dev_node(dmi->name, MAJOR(dmi->dev), + MINOR(dmi->dev), dmt->uid, + dmt->gid, dmt->mode, 0, rely_on_udev); + else if (dev_name) + rm_dev_node(dev_name, 0, rely_on_udev); + break; + + case DM_DEVICE_STATUS: + case DM_DEVICE_TABLE: + case DM_DEVICE_WAITEVENT: + if (!_unmarshal_status(dmt, dmi)) + goto bad; + break; + } + + /* Was structure reused? */ + _dm_zfree_dmi(dmt->dmi.v4); + dmt->dmi.v4 = dmi; + return 1; + + bad: + _dm_zfree_dmi(dmi); + return 0; +} + +void dm_hold_control_dev(int hold_open) +{ + _hold_control_fd_open = hold_open ? 1 : 0; + + log_debug("Hold of control device is now %sset.", + _hold_control_fd_open ? "" : "un"); +} + +void dm_lib_release(void) +{ + if (!_hold_control_fd_open) + _close_control_fd(); + dm_timestamp_destroy(_dm_ioctl_timestamp); + _dm_ioctl_timestamp = NULL; + update_devs(); +} + +void dm_pools_check_leaks(void); + +void dm_lib_exit(void) +{ + int suspended_counter; + static unsigned _exited = 0; + + if (_exited++) + return; + + if ((suspended_counter = dm_get_suspended_counter())) + log_error("libdevmapper exiting with %d device(s) still suspended.", suspended_counter); + + dm_lib_release(); + selinux_release(); + if (_dm_bitset) + dm_bitset_destroy(_dm_bitset); + _dm_bitset = NULL; + dm_pools_check_leaks(); + dm_dump_memory(); + _version_ok = 1; + _version_checked = 0; +} + +#if defined(__GNUC__) +/* + * Maintain binary backward compatibility. + * Version script mechanism works with 'gcc' compatible compilers only. + */ + +/* + * This following code is here to retain ABI compatibility after adding + * the field deferred_remove to struct dm_info in version 1.02.89. + * + * Binaries linked against version 1.02.88 of libdevmapper or earlier + * will use this function that returns dm_info without the + * deferred_remove field. + * + * Binaries compiled against version 1.02.89 onwards will use + * the new function dm_task_get_info_with_deferred_remove due to the + * #define. + * + * N.B. Keep this function at the end of the file to make sure that + * no code in this file accidentally calls it. + */ + +int dm_task_get_info_base(struct dm_task *dmt, struct dm_info *info); +int dm_task_get_info_base(struct dm_task *dmt, struct dm_info *info) +{ + struct dm_info new_info; + + if (!dm_task_get_info(dmt, &new_info)) + return 0; + + memcpy(info, &new_info, offsetof(struct dm_info, deferred_remove)); + + return 1; +} + +int dm_task_get_info_with_deferred_remove(struct dm_task *dmt, struct dm_info *info); +int dm_task_get_info_with_deferred_remove(struct dm_task *dmt, struct dm_info *info) +{ + struct dm_info new_info; + + if (!dm_task_get_info(dmt, &new_info)) + return 0; + + memcpy(info, &new_info, offsetof(struct dm_info, internal_suspend)); + + return 1; +} +#endif diff --git a/device_mapper/ioctl/libdm-targets.h b/device_mapper/ioctl/libdm-targets.h new file mode 100644 index 0000000..b5b20d5 --- /dev/null +++ b/device_mapper/ioctl/libdm-targets.h @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef LIB_DMTARGETS_H +#define LIB_DMTARGETS_H + +#include <inttypes.h> +#include <sys/types.h> + +struct dm_ioctl; + +struct target { + uint64_t start; + uint64_t length; + char *type; + char *params; + + struct target *next; +}; + +struct dm_task { + int type; + char *dev_name; + char *mangled_dev_name; + + struct target *head, *tail; + + int read_only; + uint32_t event_nr; + int major; + int minor; + int allow_default_major_fallback; + uid_t uid; + gid_t gid; + mode_t mode; + uint32_t read_ahead; + uint32_t read_ahead_flags; + union { + struct dm_ioctl *v4; + } dmi; + char *newname; + char *message; + char *geometry; + uint64_t sector; + int no_flush; + int no_open_count; + int skip_lockfs; + int query_inactive_table; + int suppress_identical_reload; + dm_add_node_t add_node; + uint64_t existing_table_size; + int cookie_set; + int new_uuid; + int secure_data; + int retry_remove; + int deferred_remove; + int enable_checks; + int expected_errno; + int ioctl_errno; + + int record_timestamp; + + char *uuid; + char *mangled_uuid; +}; + +struct cmd_data { + const char *name; + const unsigned cmd; + const int version[3]; +}; + +int dm_check_version(void); +uint64_t dm_task_get_existing_table_size(struct dm_task *dmt); + +#endif diff --git a/device_mapper/libdevmapper.h b/device_mapper/libdevmapper.h new file mode 100644 index 0000000..2438f74 --- /dev/null +++ b/device_mapper/libdevmapper.h @@ -0,0 +1,3755 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved. + * Copyright (C) 2006 Rackable Systems All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef LIB_DEVICE_MAPPER_H +#define LIB_DEVICE_MAPPER_H + +#include <inttypes.h> +#include <stdarg.h> +#include <sys/types.h> +#include <sys/stat.h> + +#ifdef __linux__ +# include <linux/types.h> +#endif + +#include <limits.h> +#include <string.h> +#include <stdlib.h> +#include <stdio.h> + +#ifndef __GNUC__ +# define __typeof__ typeof +#endif + +/* Macros to make string defines */ +#define DM_TO_STRING_EXP(A) #A +#define DM_TO_STRING(A) DM_TO_STRING_EXP(A) + +#define DM_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************************************************** + * The first section of this file provides direct access to the + * individual device-mapper ioctls. Since it is quite laborious to + * build the ioctl arguments for the device-mapper, people are + * encouraged to use this library. + ****************************************************************/ + +/* + * The library user may wish to register their own + * logging function. By default errors go to stderr. + * Use dm_log_with_errno_init(NULL) to restore the default log fn. + * Error messages may have a non-zero errno. + * Debug messages may have a non-zero class. + * Aborts on internal error when env DM_ABORT_ON_INTERNAL_ERRORS is 1 + */ + +typedef void (*dm_log_with_errno_fn) (int level, const char *file, int line, + int dm_errno_or_class, const char *f, ...) + __attribute__ ((format(printf, 5, 6))); + +void dm_log_with_errno_init(dm_log_with_errno_fn fn); +void dm_log_init_verbose(int level); + +/* + * Original version of this function. + * dm_errno is set to 0. + * + * Deprecated: Use the _with_errno_ versions above instead. + */ +typedef void (*dm_log_fn) (int level, const char *file, int line, + const char *f, ...) + __attribute__ ((format(printf, 4, 5))); + +void dm_log_init(dm_log_fn fn); +/* + * For backward-compatibility, indicate that dm_log_init() was used + * to set a non-default value of dm_log(). + */ +int dm_log_is_non_default(void); + +/* + * Number of devices currently in suspended state (via the library). + */ +int dm_get_suspended_counter(void); + +enum { + DM_DEVICE_CREATE, + DM_DEVICE_RELOAD, + DM_DEVICE_REMOVE, + DM_DEVICE_REMOVE_ALL, + + DM_DEVICE_SUSPEND, + DM_DEVICE_RESUME, + + DM_DEVICE_INFO, + DM_DEVICE_DEPS, + DM_DEVICE_RENAME, + + DM_DEVICE_VERSION, + + DM_DEVICE_STATUS, + DM_DEVICE_TABLE, + DM_DEVICE_WAITEVENT, + + DM_DEVICE_LIST, + + DM_DEVICE_CLEAR, + + DM_DEVICE_MKNODES, + + DM_DEVICE_LIST_VERSIONS, + + DM_DEVICE_TARGET_MSG, + + DM_DEVICE_SET_GEOMETRY +}; + +/* + * You will need to build a struct dm_task for + * each ioctl command you want to execute. + */ + +struct dm_pool; +struct dm_task; +struct dm_timestamp; + +struct dm_task *dm_task_create(int type); +void dm_task_destroy(struct dm_task *dmt); + +int dm_task_set_name(struct dm_task *dmt, const char *name); +int dm_task_set_uuid(struct dm_task *dmt, const char *uuid); + +/* + * Retrieve attributes after an info. + */ +struct dm_info { + int exists; + int suspended; + int live_table; + int inactive_table; + int32_t open_count; + uint32_t event_nr; + uint32_t major; + uint32_t minor; /* minor device number */ + int read_only; /* 0:read-write; 1:read-only */ + + int32_t target_count; + + int deferred_remove; + int internal_suspend; +}; + +struct dm_deps { + uint32_t count; + uint32_t filler; + uint64_t device[0]; +}; + +struct dm_names { + uint64_t dev; + uint32_t next; /* Offset to next struct from start of this struct */ + char name[0]; +}; + +struct dm_versions { + uint32_t next; /* Offset to next struct from start of this struct */ + uint32_t version[3]; + + char name[0]; +}; + +int dm_get_library_version(char *version, size_t size); +int dm_task_get_driver_version(struct dm_task *dmt, char *version, size_t size); +int dm_task_get_info(struct dm_task *dmt, struct dm_info *dmi); + +/* + * This function returns dm device's UUID based on the value + * of the mangling mode set during preceding dm_task_run call: + * - unmangled UUID for DM_STRING_MANGLING_{AUTO, HEX}, + * - UUID without any changes for DM_STRING_MANGLING_NONE. + * + * To get mangled or unmangled form of the UUID directly, use + * dm_task_get_uuid_mangled or dm_task_get_uuid_unmangled function. + */ +const char *dm_task_get_uuid(const struct dm_task *dmt); + +struct dm_deps *dm_task_get_deps(struct dm_task *dmt); +struct dm_versions *dm_task_get_versions(struct dm_task *dmt); +const char *dm_task_get_message_response(struct dm_task *dmt); + +/* + * These functions return device-mapper names based on the value + * of the mangling mode set during preceding dm_task_run call: + * - unmangled name for DM_STRING_MANGLING_{AUTO, HEX}, + * - name without any changes for DM_STRING_MANGLING_NONE. + * + * To get mangled or unmangled form of the name directly, use + * dm_task_get_name_mangled or dm_task_get_name_unmangled function. + */ +const char *dm_task_get_name(const struct dm_task *dmt); +struct dm_names *dm_task_get_names(struct dm_task *dmt); + +int dm_task_set_ro(struct dm_task *dmt); +int dm_task_set_newname(struct dm_task *dmt, const char *newname); +int dm_task_set_newuuid(struct dm_task *dmt, const char *newuuid); +int dm_task_set_minor(struct dm_task *dmt, int minor); +int dm_task_set_major(struct dm_task *dmt, int major); +int dm_task_set_major_minor(struct dm_task *dmt, int major, int minor, int allow_default_major_fallback); +int dm_task_set_uid(struct dm_task *dmt, uid_t uid); +int dm_task_set_gid(struct dm_task *dmt, gid_t gid); +int dm_task_set_mode(struct dm_task *dmt, mode_t mode); +/* See also description for DM_UDEV_DISABLE_LIBRARY_FALLBACK flag! */ +int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags); +int dm_task_set_event_nr(struct dm_task *dmt, uint32_t event_nr); +int dm_task_set_geometry(struct dm_task *dmt, const char *cylinders, const char *heads, const char *sectors, const char *start); +int dm_task_set_message(struct dm_task *dmt, const char *message); +int dm_task_set_sector(struct dm_task *dmt, uint64_t sector); +int dm_task_no_flush(struct dm_task *dmt); +int dm_task_no_open_count(struct dm_task *dmt); +int dm_task_skip_lockfs(struct dm_task *dmt); +int dm_task_query_inactive_table(struct dm_task *dmt); +int dm_task_suppress_identical_reload(struct dm_task *dmt); +int dm_task_secure_data(struct dm_task *dmt); +int dm_task_retry_remove(struct dm_task *dmt); +int dm_task_deferred_remove(struct dm_task *dmt); + +/* + * Record timestamp immediately after the ioctl returns. + */ +int dm_task_set_record_timestamp(struct dm_task *dmt); +struct dm_timestamp *dm_task_get_ioctl_timestamp(struct dm_task *dmt); + +/* + * Enable checks for common mistakes such as issuing ioctls in an unsafe order. + */ +int dm_task_enable_checks(struct dm_task *dmt); + +typedef enum { + DM_ADD_NODE_ON_RESUME, /* add /dev/mapper node with dmsetup resume */ + DM_ADD_NODE_ON_CREATE /* add /dev/mapper node with dmsetup create */ +} dm_add_node_t; +int dm_task_set_add_node(struct dm_task *dmt, dm_add_node_t add_node); + +/* + * Control read_ahead. + */ +#define DM_READ_AHEAD_AUTO UINT32_MAX /* Use kernel default readahead */ +#define DM_READ_AHEAD_NONE 0 /* Disable readahead */ + +#define DM_READ_AHEAD_MINIMUM_FLAG 0x1 /* Value supplied is minimum */ + +/* + * Read ahead is set with DM_DEVICE_CREATE with a table or DM_DEVICE_RESUME. + */ +int dm_task_set_read_ahead(struct dm_task *dmt, uint32_t read_ahead, + uint32_t read_ahead_flags); +uint32_t dm_task_get_read_ahead(const struct dm_task *dmt, + uint32_t *read_ahead); + +/* + * Use these to prepare for a create or reload. + */ +int dm_task_add_target(struct dm_task *dmt, + uint64_t start, + uint64_t size, const char *ttype, const char *params); + +/* + * Format major/minor numbers correctly for input to driver. + */ +#define DM_FORMAT_DEV_BUFSIZE 13 /* Minimum bufsize to handle worst case. */ +int dm_format_dev(char *buf, int bufsize, uint32_t dev_major, uint32_t dev_minor); + +/* Use this to retrive target information returned from a STATUS call */ +void *dm_get_next_target(struct dm_task *dmt, + void *next, uint64_t *start, uint64_t *length, + char **target_type, char **params); + +/* + * Following dm_get_status_* functions will allocate approriate status structure + * from passed mempool together with the necessary character arrays. + * Destroying the mempool will release all asociated allocation. + */ + +/* Parse params from STATUS call for mirror target */ +typedef enum { + DM_STATUS_MIRROR_ALIVE = 'A',/* No failures */ + DM_STATUS_MIRROR_FLUSH_FAILED = 'F',/* Mirror out-of-sync */ + DM_STATUS_MIRROR_WRITE_FAILED = 'D',/* Mirror out-of-sync */ + DM_STATUS_MIRROR_SYNC_FAILED = 'S',/* Mirror out-of-sync */ + DM_STATUS_MIRROR_READ_FAILED = 'R',/* Mirror data unaffected */ + DM_STATUS_MIRROR_UNCLASSIFIED = 'U' /* Bug */ +} dm_status_mirror_health_t; + +struct dm_status_mirror { + uint64_t total_regions; + uint64_t insync_regions; + uint32_t dev_count; /* # of devs[] elements (<= 8) */ + struct { + dm_status_mirror_health_t health; + uint32_t major; + uint32_t minor; + } *devs; /* array with individual legs */ + const char *log_type; /* core, disk,.... */ + uint32_t log_count; /* # of logs[] elements */ + struct { + dm_status_mirror_health_t health; + uint32_t major; + uint32_t minor; + } *logs; /* array with individual logs */ +}; + +int dm_get_status_mirror(struct dm_pool *mem, const char *params, + struct dm_status_mirror **status); + +/* Parse params from STATUS call for raid target */ +struct dm_status_raid { + uint64_t reserved; + uint64_t total_regions; /* sectors */ + uint64_t insync_regions; /* sectors */ + uint64_t mismatch_count; + uint32_t dev_count; + char *raid_type; + /* A - alive, a - alive not in-sync, D - dead/failed */ + char *dev_health; + /* idle, frozen, resync, recover, check, repair */ + char *sync_action; + uint64_t data_offset; /* RAID out-of-place reshaping */ +}; + +int dm_get_status_raid(struct dm_pool *mem, const char *params, + struct dm_status_raid **status); + +/* Parse params from STATUS call for cache target */ +struct dm_status_cache { + uint64_t version; /* zero for now */ + + uint32_t metadata_block_size; /* in 512B sectors */ + uint32_t block_size; /* AKA 'chunk_size' */ + + uint64_t metadata_used_blocks; + uint64_t metadata_total_blocks; + + uint64_t used_blocks; + uint64_t dirty_blocks; + uint64_t total_blocks; + + uint64_t read_hits; + uint64_t read_misses; + uint64_t write_hits; + uint64_t write_misses; + + uint64_t demotions; + uint64_t promotions; + + uint64_t feature_flags; /* DM_CACHE_FEATURE_? */ + + int core_argc; + char **core_argv; + + char *policy_name; + int policy_argc; + char **policy_argv; + + unsigned error : 1; /* detected error (switches to fail soon) */ + unsigned fail : 1; /* all I/O fails */ + unsigned needs_check : 1; /* metadata needs check */ + unsigned read_only : 1; /* metadata may not be changed */ + uint32_t reserved : 28; +}; + +int dm_get_status_cache(struct dm_pool *mem, const char *params, + struct dm_status_cache **status); + +/* + * Parse params from STATUS call for snapshot target + * + * Snapshot target's format: + * <= 1.7.0: <used_sectors>/<total_sectors> + * >= 1.8.0: <used_sectors>/<total_sectors> <metadata_sectors> + */ +struct dm_status_snapshot { + uint64_t used_sectors; /* in 512b units */ + uint64_t total_sectors; + uint64_t metadata_sectors; + unsigned has_metadata_sectors : 1; /* set when metadata_sectors is present */ + unsigned invalid : 1; /* set when snapshot is invalidated */ + unsigned merge_failed : 1; /* set when snapshot merge failed */ + unsigned overflow : 1; /* set when snapshot overflows */ +}; + +int dm_get_status_snapshot(struct dm_pool *mem, const char *params, + struct dm_status_snapshot **status); + +/* Parse params from STATUS call for thin_pool target */ +typedef enum { + DM_THIN_DISCARDS_IGNORE, + DM_THIN_DISCARDS_NO_PASSDOWN, + DM_THIN_DISCARDS_PASSDOWN +} dm_thin_discards_t; + +struct dm_status_thin_pool { + uint64_t transaction_id; + uint64_t used_metadata_blocks; + uint64_t total_metadata_blocks; + uint64_t used_data_blocks; + uint64_t total_data_blocks; + uint64_t held_metadata_root; + uint32_t read_only; /* metadata may not be changed */ + dm_thin_discards_t discards; + uint32_t fail : 1; /* all I/O fails */ + uint32_t error_if_no_space : 1; /* otherwise queue_if_no_space */ + uint32_t out_of_data_space : 1; /* metadata may be changed, but data may not be allocated (no rw) */ + uint32_t needs_check : 1; /* metadata needs check */ + uint32_t error : 1; /* detected error (switches to fail soon) */ + uint32_t reserved : 27; +}; + +int dm_get_status_thin_pool(struct dm_pool *mem, const char *params, + struct dm_status_thin_pool **status); + +/* Parse params from STATUS call for thin target */ +struct dm_status_thin { + uint64_t mapped_sectors; + uint64_t highest_mapped_sector; + uint32_t fail : 1; /* Thin volume fails I/O */ + uint32_t reserved : 31; +}; + +int dm_get_status_thin(struct dm_pool *mem, const char *params, + struct dm_status_thin **status); + +/* + * device-mapper statistics support + */ + +/* + * Statistics handle. + * + * Operations on dm_stats objects include managing statistics regions + * and obtaining and manipulating current counter values from the + * kernel. Methods are provided to return baisc count values and to + * derive time-based metrics when a suitable interval estimate is + * provided. + * + * Internally the dm_stats handle contains a pointer to a table of one + * or more dm_stats_region objects representing the regions registered + * with the dm_stats_create_region() method. These in turn point to a + * table of one or more dm_stats_counters objects containing the + * counter sets for each defined area within the region: + * + * dm_stats->dm_stats_region[nr_regions]->dm_stats_counters[nr_areas] + * + * This structure is private to the library and may change in future + * versions: all users should make use of the public interface and treat + * the dm_stats type as an opaque handle. + * + * Regions and counter sets are stored in order of increasing region_id. + * Depending on region specifications and the sequence of create and + * delete operations this may not correspond to increasing sector + * number: users of the library should not assume that this is the case + * unless region creation is deliberately managed to ensure this (by + * always creating regions in strict order of ascending sector address). + * + * Regions may also overlap so the same sector range may be included in + * more than one region or area: applications should be prepared to deal + * with this or manage regions such that it does not occur. + */ +struct dm_stats; + +/* + * Histogram handle. + * + * A histogram object represents the latency histogram values and bin + * boundaries of the histogram associated with a particular area. + * + * Operations on the handle allow the number of bins, bin boundaries, + * counts and relative proportions to be obtained as well as the + * conversion of a histogram or its bounds to a compact string + * representation. + */ +struct dm_histogram; + +/* + * Allocate a dm_stats handle to use for subsequent device-mapper + * statistics operations. A program_id may be specified and will be + * used by default for subsequent operations on this handle. + * + * If program_id is NULL or the empty string a program_id will be + * automatically set to the value contained in /proc/self/comm. + */ +struct dm_stats *dm_stats_create(const char *program_id); + +/* + * Bind a dm_stats handle to the specified device major and minor + * values. Any previous binding is cleared and any preexisting counter + * data contained in the handle is released. + */ +int dm_stats_bind_devno(struct dm_stats *dms, int major, int minor); + +/* + * Bind a dm_stats handle to the specified device name. + * Any previous binding is cleared and any preexisting counter + * data contained in the handle is released. + */ +int dm_stats_bind_name(struct dm_stats *dms, const char *name); + +/* + * Bind a dm_stats handle to the specified device UUID. + * Any previous binding is cleared and any preexisting counter + * data contained in the handle is released. + */ +int dm_stats_bind_uuid(struct dm_stats *dms, const char *uuid); + +/* + * Bind a dm_stats handle to the device backing the file referenced + * by the specified file descriptor. + * + * File descriptor fd must reference a regular file, open for reading, + * in a local file system, backed by a device-mapper device, that + * supports the FIEMAP ioctl, and that returns data describing the + * physical location of extents. + */ +int dm_stats_bind_from_fd(struct dm_stats *dms, int fd); +/* + * Test whether the running kernel supports the precise_timestamps + * feature. Presence of this feature also implies histogram support. + * The library will check this call internally and fails any attempt + * to use nanosecond counters or histograms on kernels that fail to + * meet this check. + */ +int dm_message_supports_precise_timestamps(void); + +/* + * Precise timetamps and histogram support. + * + * Test for the presence of precise_timestamps and histogram support. + */ +int dm_stats_driver_supports_precise(void); +int dm_stats_driver_supports_histogram(void); + +/* + * Returns 1 if the specified region has the precise_timestamps feature + * enabled (i.e. produces nanosecond-precision counter values) or 0 for + * a region using the default milisecond precision. + */ +int dm_stats_get_region_precise_timestamps(const struct dm_stats *dms, + uint64_t region_id); + +/* + * Returns 1 if the region at the current cursor location has the + * precise_timestamps feature enabled (i.e. produces + * nanosecond-precision counter values) or 0 for a region using the + * default milisecond precision. + */ +int dm_stats_get_current_region_precise_timestamps(const struct dm_stats *dms); + +#define DM_STATS_ALL_PROGRAMS "" +/* + * Parse the response from a @stats_list message. dm_stats_list will + * allocate the necessary dm_stats and dm_stats region structures from + * the embedded dm_pool. No counter data will be obtained (the counters + * members of dm_stats_region objects are set to NULL). + * + * A program_id may optionally be supplied; if the argument is non-NULL + * only regions with a matching program_id value will be considered. If + * the argument is NULL then the default program_id associated with the + * dm_stats handle will be used. Passing the special value + * DM_STATS_ALL_PROGRAMS will cause all regions to be queried + * regardless of region program_id. + */ +int dm_stats_list(struct dm_stats *dms, const char *program_id); + +#define DM_STATS_REGIONS_ALL UINT64_MAX +/* + * Populate a dm_stats object with statistics for one or more regions of + * the specified device. + * + * A program_id may optionally be supplied; if the argument is non-NULL + * only regions with a matching program_id value will be considered. If + * the argument is NULL then the default program_id associated with the + * dm_stats handle will be used. Passing the special value + * DM_STATS_ALL_PROGRAMS will cause all regions to be queried + * regardless of region program_id. + * + * Passing the special value DM_STATS_REGIONS_ALL as the region_id + * argument will attempt to retrieve all regions selected by the + * program_id argument. + * + * If region_id is used to request a single region_id to be populated + * the program_id is ignored. + */ +int dm_stats_populate(struct dm_stats *dms, const char *program_id, + uint64_t region_id); + +/* + * Create a new statistics region on the device bound to dms. + * + * start and len specify the region start and length in 512b sectors. + * Passing zero for both start and len will create a region spanning + * the entire device. + * + * Step determines how to subdivide the region into discrete counter + * sets: a positive value specifies the size of areas into which the + * region should be split while a negative value will split the region + * into a number of areas equal to the absolute value of step: + * + * - a region with one area spanning the entire device: + * + * dm_stats_create_region(dms, 0, 0, -1, p, a); + * + * - a region with areas of 1MiB: + * + * dm_stats_create_region(dms, 0, 0, 1 << 11, p, a); + * + * - one 1MiB region starting at 1024 sectors with two areas: + * + * dm_stats_create_region(dms, 1024, 1 << 11, -2, p, a); + * + * If precise is non-zero attempt to create a region with nanosecond + * precision counters using the kernel precise_timestamps feature. + * + * precise - A flag to request nanosecond precision counters + * to be used for this region. + * + * histogram_bounds - specify the boundaries of a latency histogram to + * be tracked for the region. The values are expressed as an array of + * uint64_t terminated with a zero. Values must be in order of ascending + * magnitude and specify the upper bounds of successive histogram bins + * in nanoseconds (with an implicit lower bound of zero on the first bin + * and an implicit upper bound of infinity on the final bin). For + * example: + * + * uint64_t bounds_ary[] = { 1000, 2000, 3000, 0 }; + * + * Specifies a histogram with four bins: 0-1000ns, 1000-2000ns, + * 2000-3000ns and >3000ns. + * + * The smallest latency value that can be tracked for a region not using + * precise_timestamps is 1ms: attempting to create a region with + * histogram boundaries < 1ms will cause the precise_timestamps feature + * to be enabled for that region automatically if it was not requested + * explicitly. + * + * program_id is an optional string argument that identifies the + * program creating the region. If program_id is NULL or the empty + * string the default program_id stored in the handle will be used. + * + * user_data is an optional string argument that is added to the + * content of the aux_data field stored with the statistics region by + * the kernel. + * + * The library may also use this space internally, for example, to + * store a group descriptor or other metadata: in this case the + * library will strip any internal data fields from the value before + * it is returned via a call to dm_stats_get_region_aux_data(). + * + * The user data stored is not accessed by the library or kernel and + * may be used to store an arbitrary data word (embedded whitespace is + * not permitted). + * + * An application using both the library and direct access to the + * @stats_list device-mapper message may see the internal values stored + * in this field by the library. In such cases any string up to and + * including the first '#' in the field must be treated as an opaque + * value and preserved across any external modification of aux_data. + * + * The region_id of the newly-created region is returned in *region_id + * if it is non-NULL. + */ +int dm_stats_create_region(struct dm_stats *dms, uint64_t *region_id, + uint64_t start, uint64_t len, int64_t step, + int precise, struct dm_histogram *bounds, + const char *program_id, const char *user_data); + +/* + * Delete the specified statistics region. This will also mark the + * region as not-present and discard any existing statistics data. + */ +int dm_stats_delete_region(struct dm_stats *dms, uint64_t region_id); + +/* + * Clear the specified statistics region. This requests the kernel to + * zero all counter values (except in-flight I/O). Note that this + * operation is not atomic with respect to reads of the counters; any IO + * events occurring between the last print operation and the clear will + * be lost. This can be avoided by using the atomic print-and-clear + * function of the dm_stats_print_region() call or by using the higher + * level dm_stats_populate() interface. + */ +int dm_stats_clear_region(struct dm_stats *dms, uint64_t region_id); + +/* + * Print the current counter values for the specified statistics region + * and return them as a string. The memory for the string buffer will + * be allocated from the dm_stats handle's private pool and should be + * returned by calling dm_stats_buffer_destroy() when no longer + * required. The pointer will become invalid following any call that + * clears or reinitializes the handle (destroy, list, populate, bind). + * + * This allows applications that wish to access the raw message response + * to obtain it via a dm_stats handle; no parsing of the textual counter + * data is carried out by this function. + * + * Most users are recommended to use the dm_stats_populate() call + * instead since this will automatically parse the statistics data into + * numeric form accessible via the dm_stats_get_*() counter access + * methods. + * + * A subset of the data lines may be requested by setting the + * start_line and num_lines parameters. If both are zero all data + * lines are returned. + * + * If the clear parameter is non-zero the operation will also + * atomically reset all counter values to zero (except in-flight IO). + */ +char *dm_stats_print_region(struct dm_stats *dms, uint64_t region_id, + unsigned start_line, unsigned num_lines, + unsigned clear); + +/* + * Destroy a statistics response buffer obtained from a call to + * dm_stats_print_region(). + */ +void dm_stats_buffer_destroy(struct dm_stats *dms, char *buffer); + +/* + * Determine the number of regions contained in a dm_stats handle + * following a dm_stats_list() or dm_stats_populate() call. + * + * The value returned is the number of registered regions visible with the + * progam_id value used for the list or populate operation and may not be + * equal to the highest present region_id (either due to program_id + * filtering or gaps in the sequence of region_id values). + * + * Always returns zero on an empty handle. + */ +uint64_t dm_stats_get_nr_regions(const struct dm_stats *dms); + +/* + * Determine the number of groups contained in a dm_stats handle + * following a dm_stats_list() or dm_stats_populate() call. + * + * The value returned is the number of registered groups visible with the + * progam_id value used for the list or populate operation and may not be + * equal to the highest present group_id (either due to program_id + * filtering or gaps in the sequence of group_id values). + * + * Always returns zero on an empty handle. + */ +uint64_t dm_stats_get_nr_groups(const struct dm_stats *dms); + +/* + * Test whether region_id is present in this dm_stats handle. + */ +int dm_stats_region_present(const struct dm_stats *dms, uint64_t region_id); + +/* + * Returns the number of areas (counter sets) contained in the specified + * region_id of the supplied dm_stats handle. + */ +uint64_t dm_stats_get_region_nr_areas(const struct dm_stats *dms, + uint64_t region_id); + +/* + * Returns the total number of areas (counter sets) in all regions of the + * given dm_stats object. + */ +uint64_t dm_stats_get_nr_areas(const struct dm_stats *dms); + +/* + * Test whether group_id is present in this dm_stats handle. + */ +int dm_stats_group_present(const struct dm_stats *dms, uint64_t group_id); + +/* + * Return the number of bins in the histogram configuration for the + * specified region or zero if no histogram specification is configured. + * Valid following a dm_stats_list() or dm_stats_populate() operation. + */ +int dm_stats_get_region_nr_histogram_bins(const struct dm_stats *dms, + uint64_t region_id); + +/* + * Parse a histogram string with optional unit suffixes into a + * dm_histogram bounds description. + * + * A histogram string is a string of numbers "n1,n2,n3,..." that + * represent the boundaries of a histogram. The first and final bins + * have implicit lower and upper bounds of zero and infinity + * respectively and boundary values must occur in order of ascending + * magnitude. Unless a unit suffix is given all values are specified in + * nanoseconds. + * + * For example, if bounds_str="300,600,900", the region will be created + * with a histogram containing four bins. Each report will include four + * numbers a:b:c:d. a is the number of requests that took between 0 and + * 300ns to complete, b is the number of requests that took 300-600ns to + * complete, c is the number of requests that took 600-900ns to complete + * and d is the number of requests that took more than 900ns to + * complete. + * + * An optional unit suffix of 's', 'ms', 'us', or 'ns' may be used to + * specify units of seconds, miliseconds, microseconds, or nanoseconds: + * + * bounds_str="1ns,1us,1ms,1s" + * bounds_str="500us,1ms,1500us,2ms" + * bounds_str="200ms,400ms,600ms,800ms,1s" + * + * The smallest valid unit of time for a histogram specification depends + * on whether the region uses precise timestamps: for a region with the + * default milisecond precision the smallest possible histogram boundary + * magnitude is one milisecond: attempting to use a histogram with a + * boundary less than one milisecond when creating a region will cause + * the region to be created with the precise_timestamps feature enabled. + * + * On sucess a pointer to the struct dm_histogram representing the + * bounds values is returned, or NULL in the case of error. The returned + * pointer should be freed using dm_free() when no longer required. + */ +struct dm_histogram *dm_histogram_bounds_from_string(const char *bounds_str); + +/* + * Parse a zero terminated array of uint64_t into a dm_histogram bounds + * description. + * + * Each value in the array specifies the upper bound of a bin in the + * latency histogram in nanoseconds. Values must appear in ascending + * order of magnitude. + * + * The smallest valid unit of time for a histogram specification depends + * on whether the region uses precise timestamps: for a region with the + * default milisecond precision the smallest possible histogram boundary + * magnitude is one milisecond: attempting to use a histogram with a + * boundary less than one milisecond when creating a region will cause + * the region to be created with the precise_timestamps feature enabled. + */ +struct dm_histogram *dm_histogram_bounds_from_uint64(const uint64_t *bounds); + +/* + * Destroy the histogram bounds array obtained from a call to + * dm_histogram_bounds_from_string(). + */ +void dm_histogram_bounds_destroy(struct dm_histogram *bounds); + +/* + * Destroy a dm_stats object and all associated regions, counter + * sets and histograms. + */ +void dm_stats_destroy(struct dm_stats *dms); + +/* + * Counter sampling interval + */ + +/* + * Set the sampling interval for counter data to the specified value in + * either nanoseconds or milliseconds. + * + * The interval is used to calculate time-based metrics from the basic + * counter data: an interval must be set before calling any of the + * metric methods. + * + * For best accuracy the duration should be measured and updated at the + * end of each interval. + * + * All values are stored internally with nanosecond precision and are + * converted to or from ms when the millisecond interfaces are used. + */ +void dm_stats_set_sampling_interval_ns(struct dm_stats *dms, + uint64_t interval_ns); + +void dm_stats_set_sampling_interval_ms(struct dm_stats *dms, + uint64_t interval_ms); + +/* + * Retrieve the configured sampling interval in either nanoseconds or + * milliseconds. + */ +uint64_t dm_stats_get_sampling_interval_ns(const struct dm_stats *dms); +uint64_t dm_stats_get_sampling_interval_ms(const struct dm_stats *dms); + +/* + * Override program_id. This may be used to change the default + * program_id value for an existing handle. If the allow_empty argument + * is non-zero a NULL or empty program_id is permitted. + * + * Use with caution! Most users of the library should set a valid, + * non-NULL program_id for every statistics region created. Failing to + * do so may result in confusing state when multiple programs are + * creating and managing statistics regions. + * + * All users of the library are encouraged to choose an unambiguous, + * unique program_id: this could be based on PID (for programs that + * create, report, and delete regions in a single process), session id, + * executable name, or some other distinguishing string. + * + * Use of the empty string as a program_id does not simplify use of the + * library or the command line tools and use of this value is strongly + * discouraged. + */ +int dm_stats_set_program_id(struct dm_stats *dms, int allow_empty, + const char *program_id); + +/* + * Region properties: size, length & area_len. + * + * Region start and length are returned in units of 512b as specified + * at region creation time. The area_len value gives the size of areas + * into which the region has been subdivided. For regions with a single + * area spanning the range this value is equal to the region length. + * + * For regions created with a specified number of areas the value + * represents the size of the areas into which the kernel divided the + * region excluding any rounding of the last area size. The number of + * areas may be obtained using the dm_stats_nr_areas_region() call. + * + * All values are returned in units of 512b sectors. + */ +int dm_stats_get_region_start(const struct dm_stats *dms, uint64_t *start, + uint64_t region_id); + +int dm_stats_get_region_len(const struct dm_stats *dms, uint64_t *len, + uint64_t region_id); + +int dm_stats_get_region_area_len(const struct dm_stats *dms, + uint64_t *len, uint64_t region_id); + +/* + * Area properties: start, offset and length. + * + * The area length is always equal to the area length of the region + * that contains it and is obtained from dm_stats_get_region_area_len(). + * + * The start of an area is a function of the area_id and the containing + * region's start and area length: it gives the absolute offset into the + * containing device of the beginning of the area. + * + * The offset expresses the area's relative offset into the current + * region. I.e. the area start minus the start offset of the containing + * region. + * + * All values are returned in units of 512b sectors. + */ +int dm_stats_get_area_start(const struct dm_stats *dms, uint64_t *start, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_area_offset(const struct dm_stats *dms, uint64_t *offset, + uint64_t region_id, uint64_t area_id); + +/* + * Retrieve program_id and user aux_data for a specific region. + * + * Only valid following a call to dm_stats_list(). + */ + +/* + * Retrieve program_id for the specified region. + * + * The returned pointer does not need to be freed separately from the + * dm_stats handle but will become invalid after a dm_stats_destroy(), + * dm_stats_list(), dm_stats_populate(), or dm_stats_bind*() of the + * handle from which it was obtained. + */ +const char *dm_stats_get_region_program_id(const struct dm_stats *dms, + uint64_t region_id); + +/* + * Retrieve user aux_data set for the specified region. This function + * will return any stored user aux_data as a string in the memory + * pointed to by the aux_data argument. + * + * Any library internal aux_data fields, such as DMS_GROUP descriptors, + * are stripped before the value is returned. + * + * The returned pointer does not need to be freed separately from the + * dm_stats handle but will become invalid after a dm_stats_destroy(), + * dm_stats_list(), dm_stats_populate(), or dm_stats_bind*() of the + * handle from which it was obtained. + */ +const char *dm_stats_get_region_aux_data(const struct dm_stats *dms, + uint64_t region_id); + +typedef enum { + DM_STATS_OBJECT_TYPE_NONE, + DM_STATS_OBJECT_TYPE_AREA, + DM_STATS_OBJECT_TYPE_REGION, + DM_STATS_OBJECT_TYPE_GROUP +} dm_stats_obj_type_t; + +/* + * Statistics cursor + * + * A dm_stats handle maintains an optional cursor into the statistics + * tables that it stores. Iterators are provided to visit each region, + * area, or group in a handle and accessor methods are provided to + * obtain properties and values for the object at the current cursor + * position. + * + * Using the cursor simplifies walking all regions or groups when + * the tables are sparse (i.e. contains some present and some + * non-present region_id or group_id values either due to program_id + * filtering or the ordering of region and group creation and deletion). + * + * Simple macros are provided to visit each area, region, or group, + * contained in a handle and applications are encouraged to use these + * where possible. + */ + +/* + * Walk flags are used to initialise a dm_stats handle's cursor control + * and to select region or group aggregation when calling a metric or + * counter property method with immediate group, region, and area ID + * values. + * + * Walk flags are stored in the uppermost word of a uint64_t so that + * a region_id or group_id may be encoded in the lower bits. This + * allows an aggregate region_id or group_id to be specified when + * retrieving counter or metric values. + * + * Flags may be ORred together when used to initialise a dm_stats_walk: + * the resulting walk will visit instance of each type specified by + * the flag combination. + */ +#define DM_STATS_WALK_AREA 0x1000000000000ULL +#define DM_STATS_WALK_REGION 0x2000000000000ULL +#define DM_STATS_WALK_GROUP 0x4000000000000ULL + +#define DM_STATS_WALK_ALL 0x7000000000000ULL +#define DM_STATS_WALK_DEFAULT (DM_STATS_WALK_AREA | DM_STATS_WALK_REGION) + +/* + * Skip regions from a DM_STATS_WALK_REGION that contain only a single + * area: in this case the region's aggregate values are identical to + * the values of the single contained area. Setting this flag will + * suppress these duplicate entries during a dm_stats_walk_* with the + * DM_STATS_WALK_REGION flag set. + */ +#define DM_STATS_WALK_SKIP_SINGLE_AREA 0x8000000000000ULL + +/* + * Initialise the cursor control of a dm_stats handle for the specified + * walk type(s). Including a walk flag in the flags argument will cause + * any subsequent walk to visit that type of object (until the next + * call to dm_stats_walk_init()). + */ +int dm_stats_walk_init(struct dm_stats *dms, uint64_t flags); + +/* + * Set the cursor of a dm_stats handle to address the first present + * group, region, or area of the currently configured walk. It is + * valid to attempt to walk a NULL stats handle or a handle containing + * no present regions; in this case any call to dm_stats_walk_next() + * becomes a no-op and all calls to dm_stats_walk_end() return true. + */ +void dm_stats_walk_start(struct dm_stats *dms); + +/* + * Advance the statistics cursor to the next area, or to the next + * present region if at the end of the current region. If the end of + * the region, area, or group tables is reached a subsequent call to + * dm_stats_walk_end() will return 1 and dm_stats_object_type() called + * on the location will return DM_STATS_OBJECT_TYPE_NONE, + */ +void dm_stats_walk_next(struct dm_stats *dms); + +/* + * Force the statistics cursor to advance to the next region. This will + * stop any in-progress area walk (by clearing DM_STATS_WALK_AREA) and + * advance the cursor to the next present region, the first present + * group (if DM_STATS_GROUP_WALK is set), or to the end. In this case a + * subsequent call to dm_stats_walk_end() will return 1 and a call to + * dm_stats_object_type() for the location will return + * DM_STATS_OBJECT_TYPE_NONE. + */ +void dm_stats_walk_next_region(struct dm_stats *dms); + +/* + * Test whether the end of a statistics walk has been reached. + */ +int dm_stats_walk_end(struct dm_stats *dms); + +/* + * Return the type of object at the location specified by region_id + * and area_id. If either region_id or area_id uses one of the special + * values DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT the + * corresponding region or area identifier will be taken from the + * current cursor location. If the cursor location or the value encoded + * by region_id and area_id indicates an aggregate region or group, + * this will be reflected in the value returned. + */ +dm_stats_obj_type_t dm_stats_object_type(const struct dm_stats *dms, + uint64_t region_id, + uint64_t area_id); + +/* + * Return the type of object at the current stats cursor location. + */ +dm_stats_obj_type_t dm_stats_current_object_type(const struct dm_stats *dms); + +/* + * Stats iterators + * + * C 'for' and 'do'/'while' style iterators for dm_stats data. + * + * It is not safe to call any function that modifies the region table + * within the loop body (i.e. dm_stats_list(), dm_stats_populate(), + * dm_stats_init(), or dm_stats_destroy()). + * + * All counter and property (dm_stats_get_*) access methods, as well as + * dm_stats_populate_region() can be safely called from loops. + * + */ + +/* + * Iterate over the regions table visiting each region. + * + * If the region table is empty or unpopulated the loop body will not be + * executed. + */ +#define dm_stats_foreach_region(dms) \ +for (dm_stats_walk_init((dms), DM_STATS_WALK_REGION), \ + dm_stats_walk_start((dms)); \ + !dm_stats_walk_end((dms)); dm_stats_walk_next_region((dms))) + +/* + * Iterate over the regions table visiting each area. + * + * If the region table is empty or unpopulated the loop body will not + * be executed. + */ +#define dm_stats_foreach_area(dms) \ +for (dm_stats_walk_init((dms), DM_STATS_WALK_AREA), \ + dm_stats_walk_start((dms)); \ + !dm_stats_walk_end((dms)); dm_stats_walk_next((dms))) + +/* + * Iterate over the regions table visiting each group. Metric and + * counter methods will return values for the group. + * + * If the group table is empty or unpopulated the loop body will not + * be executed. + */ +#define dm_stats_foreach_group(dms) \ +for (dm_stats_walk_init((dms), DM_STATS_WALK_GROUP), \ + dm_stats_walk_start(dms); \ + !dm_stats_walk_end(dms); \ + dm_stats_walk_next(dms)) + +/* + * Start a walk iterating over the regions contained in dm_stats handle + * 'dms'. + * + * The body of the loop should call dm_stats_walk_next() or + * dm_stats_walk_next_region() to advance to the next element. + * + * The loop body is executed at least once even if the stats handle is + * empty. + */ +#define dm_stats_walk_do(dms) \ +do { \ + dm_stats_walk_start((dms)); \ + do + +/* + * Start a 'while' style loop or end a 'do..while' loop iterating over the + * regions contained in dm_stats handle 'dms'. + */ +#define dm_stats_walk_while(dms) \ + while(!dm_stats_walk_end((dms))); \ +} while (0) + +/* + * Cursor relative property methods + * + * Calls with the prefix dm_stats_get_current_* operate relative to the + * current cursor location, returning properties for the current region + * or area of the supplied dm_stats handle. + * + */ + +/* + * Returns the number of areas (counter sets) contained in the current + * region of the supplied dm_stats handle. + */ +uint64_t dm_stats_get_current_nr_areas(const struct dm_stats *dms); + +/* + * Retrieve the current values of the stats cursor. + */ +uint64_t dm_stats_get_current_region(const struct dm_stats *dms); +uint64_t dm_stats_get_current_area(const struct dm_stats *dms); + +/* + * Current region properties: size, length & area_len. + * + * See the comments for the equivalent dm_stats_get_* versions for a + * complete description of these methods. + * + * All values are returned in units of 512b sectors. + */ +int dm_stats_get_current_region_start(const struct dm_stats *dms, + uint64_t *start); + +int dm_stats_get_current_region_len(const struct dm_stats *dms, + uint64_t *len); + +int dm_stats_get_current_region_area_len(const struct dm_stats *dms, + uint64_t *area_len); + +/* + * Current area properties: start and length. + * + * See the comments for the equivalent dm_stats_get_* versions for a + * complete description of these methods. + * + * All values are returned in units of 512b sectors. + */ +int dm_stats_get_current_area_start(const struct dm_stats *dms, + uint64_t *start); + +int dm_stats_get_current_area_offset(const struct dm_stats *dms, + uint64_t *offset); + +int dm_stats_get_current_area_len(const struct dm_stats *dms, + uint64_t *start); + +/* + * Return a pointer to the program_id string for region at the current + * cursor location. + */ +const char *dm_stats_get_current_region_program_id(const struct dm_stats *dms); + +/* + * Return a pointer to the user aux_data string for the region at the + * current cursor location. + */ +const char *dm_stats_get_current_region_aux_data(const struct dm_stats *dms); + +/* + * Statistics groups and data aggregation. + */ + +/* + * Create a new group in stats handle dms from the group descriptor + * passed in group. The group descriptor is a string containing a list + * of region_id values that will be included in the group. The first + * region_id found will be the group leader. Ranges of identifiers may + * be expressed as "M-N", where M and N are the start and end region_id + * values for the range. + */ +int dm_stats_create_group(struct dm_stats *dms, const char *group, + const char *alias, uint64_t *group_id); + +/* + * Remove the specified group_id. If the remove argument is zero the + * group will be removed but the regions that it contained will remain. + * If remove is non-zero then all regions that belong to the group will + * also be removed. + */ +int dm_stats_delete_group(struct dm_stats *dms, uint64_t group_id, int remove); + +/* + * Set an alias for this group or region. The alias will be returned + * instead of the normal dm-stats name for this region or group. + */ +int dm_stats_set_alias(struct dm_stats *dms, uint64_t group_id, + const char *alias); + +/* + * Returns a pointer to the currently configured alias for id, or the + * name of the dm device the handle is bound to if no alias has been + * set. The pointer will be freed automatically when a new alias is set + * or when the stats handle is cleared. + */ +const char *dm_stats_get_alias(const struct dm_stats *dms, uint64_t id); + +#define DM_STATS_GROUP_NONE UINT64_MAX +/* + * Return the group_id that the specified region_id belongs to, or the + * special value DM_STATS_GROUP_NONE if the region does not belong + * to any group. + */ +uint64_t dm_stats_get_group_id(const struct dm_stats *dms, uint64_t region_id); + +/* + * Store a pointer to a string describing the regions that are members + * of the group specified by group_id in the memory pointed to by buf. + * The string is in the same format as the 'group' argument to + * dm_stats_create_group(). + * + * The pointer does not need to be freed explicitly by the caller: it + * will become invalid following a subsequent dm_stats_list(), + * dm_stats_populate() or dm_stats_destroy() of the corresponding + * dm_stats handle. + */ +int dm_stats_get_group_descriptor(const struct dm_stats *dms, + uint64_t group_id, char **buf); + +/* + * Create regions that correspond to the extents of a file in the + * filesystem and optionally place them into a group. + * + * File descriptor fd must reference a regular file, open for reading, + * in a local file system that supports the FIEMAP ioctl, and that + * returns data describing the physical location of extents. + * + * The file descriptor can be closed by the caller following the call + * to dm_stats_create_regions_from_fd(). + * + * Unless nogroup is non-zero the regions will be placed into a group + * and the group alias set to the value supplied (if alias is NULL no + * group alias will be assigned). + * + * On success the function returns a pointer to an array of uint64_t + * containing the IDs of the newly created regions. The region_id + * array is terminated by the value DM_STATS_REGION_NOT_PRESENT and + * should be freed using dm_free() when no longer required. + * + * On error NULL is returned. + * + * Following a call to dm_stats_create_regions_from_fd() the handle + * is guaranteed to be in a listed state, and to contain any region + * and group identifiers created by the operation. + * + * The group_id for the new group is equal to the region_id value in + * the first array element. + */ +uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd, + int group, int precise, + struct dm_histogram *bounds, + const char *alias); +/* + * Update a group of regions that correspond to the extents of a file + * in the filesystem, adding and removing regions to account for + * allocation changes in the underlying file. + * + * File descriptor fd must reference a regular file, open for reading, + * in a local file system that supports the FIEMAP ioctl, and that + * returns data describing the physical location of extents. + * + * The file descriptor can be closed by the caller following the call + * to dm_stats_update_regions_from_fd(). + * + * On success the function returns a pointer to an array of uint64_t + * containing the IDs of the updated regions (including any existing + * regions that were not modified by the call). + * + * The region_id array is terminated by the special value + * DM_STATS_REGION_NOT_PRESENT and should be freed using dm_free() + * when no longer required. + * + * On error NULL is returned. + * + * Following a call to dm_stats_update_regions_from_fd() the handle + * is guaranteed to be in a listed state, and to contain any region + * and group identifiers created by the operation. + * + * This function cannot be used with file mapped regions that are + * not members of a group: either group the regions, or remove them + * and re-map them with dm_stats_create_regions_from_fd(). + */ +uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, + uint64_t group_id); + + +/* + * The file map monitoring daemon can monitor files in two distinct + * ways: the mode affects the behaviour of the daemon when a file + * under monitoring is renamed or unlinked, and the conditions which + * cause the daemon to terminate. + * + * In both modes, the daemon will always shut down when the group + * being monitored is deleted. + * + * Follow inode: + * The daemon follows the inode of the file, as it was at the time the + * daemon started. The file descriptor referencing the file is kept + * open at all times, and the daemon will exit when it detects that + * the file has been unlinked and it is the last holder of a reference + * to the file. + * + * This mode is useful if the file is expected to be renamed, or moved + * within the file system, while it is being monitored. + * + * Follow path: + * The daemon follows the path that was given on the daemon command + * line. The file descriptor referencing the file is re-opened on each + * iteration of the daemon, and the daemon will exit if no file exists + * at this location (a tolerance is allowed so that a brief delay + * between unlink() and creat() is permitted). + * + * This mode is useful if the file is updated by unlinking the original + * and placing a new file at the same path. + */ + +typedef enum { + DM_FILEMAPD_FOLLOW_INODE, + DM_FILEMAPD_FOLLOW_PATH, + DM_FILEMAPD_FOLLOW_NONE +} dm_filemapd_mode_t; + +/* + * Parse a string representation of a dmfilemapd mode. + * + * Returns a valid dm_filemapd_mode_t value on success, or + * DM_FILEMAPD_FOLLOW_NONE on error. + */ +dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str); + +/* + * Start the dmfilemapd filemap monitoring daemon for the specified + * file descriptor, group, and file system path. The daemon will + * monitor the file for allocation changes, and when a change is + * detected, call dm_stats_update_regions_from_fd() to update the + * mapped regions for the file. + * + * The path provided to dm_stats_start_filemapd() must be an absolute + * path, and should reflect the path of 'fd' at the time that it was + * opened. + * + * The mode parameter controls the behaviour of the daemon when the + * file being monitored is unlinked or moved: see the comments for + * dm_filemapd_mode_t for a full description and possible values. + * + * The daemon can be stopped at any time by sending SIGTERM to the + * daemon pid. + */ +int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, + dm_filemapd_mode_t mode, unsigned foreground, + unsigned verbose); + +/* + * Call this to actually run the ioctl. + */ +int dm_task_run(struct dm_task *dmt); + +/* + * The errno from the last device-mapper ioctl performed by dm_task_run. + */ +int dm_task_get_errno(struct dm_task *dmt); + +/* + * Call this to make or remove the device nodes associated with previously + * issued commands. + */ +void dm_task_update_nodes(void); + +/* + * Mangling support + * + * Character whitelist: 0-9, A-Z, a-z, #+-.:=@_ + * HEX mangling format: \xNN, NN being the hex value of the character. + * (whitelist and format supported by udev) +*/ +typedef enum { + DM_STRING_MANGLING_NONE, /* do not mangle at all */ + DM_STRING_MANGLING_AUTO, /* mangle only if not already mangled with hex, error when mixed */ + DM_STRING_MANGLING_HEX /* always mangle with hex encoding, no matter what the input is */ +} dm_string_mangling_t; + +/* + * Set/get mangling mode used for device-mapper names and uuids. + */ +int dm_set_name_mangling_mode(dm_string_mangling_t name_mangling); +dm_string_mangling_t dm_get_name_mangling_mode(void); + +/* + * Get mangled/unmangled form of the device-mapper name or uuid + * irrespective of the global setting (set by dm_set_name_mangling_mode). + * The name or uuid returned needs to be freed after use by calling dm_free! + */ +char *dm_task_get_name_mangled(const struct dm_task *dmt); +char *dm_task_get_name_unmangled(const struct dm_task *dmt); +char *dm_task_get_uuid_mangled(const struct dm_task *dmt); +char *dm_task_get_uuid_unmangled(const struct dm_task *dmt); + +/* + * Configure the device-mapper directory + */ +int dm_set_dev_dir(const char *dir); +const char *dm_dir(void); + +/* + * Configure sysfs directory, /sys by default + */ +int dm_set_sysfs_dir(const char *dir); +const char *dm_sysfs_dir(void); + +/* + * Configure default UUID prefix string. + * Conventionally this is a short capitalised prefix indicating the subsystem + * that is managing the devices, e.g. "LVM-" or "MPATH-". + * To support stacks of devices from different subsystems, recursive functions + * stop recursing if they reach a device with a different prefix. + */ +int dm_set_uuid_prefix(const char *uuid_prefix); +const char *dm_uuid_prefix(void); + +/* + * Determine whether a major number belongs to device-mapper or not. + */ +int dm_is_dm_major(uint32_t major); + +/* + * Get associated device name for given major and minor number by reading + * the sysfs content. If this is a dm device, get associated dm name, the one + * that appears in /dev/mapper. DM names could be resolved this way only if + * kernel used >= 2.6.29, kernel name is found otherwise (e.g. dm-0). + * If prefer_kernel_name is set, the kernel name is always preferred over + * device-mapper name for dm devices no matter what the kernel version is. + * For non-dm devices, we always get associated kernel name, e.g sda, md0 etc. + * Returns 0 on error or if sysfs is not used (or configured incorrectly), + * otherwise returns 1 and the supplied buffer holds the device name. + */ +int dm_device_get_name(uint32_t major, uint32_t minor, + int prefer_kernel_name, + char *buf, size_t buf_size); + +/* + * Determine whether a device has any holders (devices + * using this device). If sysfs is not used (or configured + * incorrectly), returns 0. + */ +int dm_device_has_holders(uint32_t major, uint32_t minor); + +/* + * Determine whether a device contains mounted filesystem. + * If sysfs is not used (or configured incorrectly), returns 0. + */ +int dm_device_has_mounted_fs(uint32_t major, uint32_t minor); + + +/* + * Callback is invoked for individal mountinfo lines, + * minor, major and mount target are parsed and unmangled. + */ +typedef int (*dm_mountinfo_line_callback_fn) (char *line, unsigned maj, unsigned min, + char *target, void *cb_data); + +/* + * Read all lines from /proc/self/mountinfo, + * for each line calls read_fn callback. + */ +int dm_mountinfo_read(dm_mountinfo_line_callback_fn read_fn, void *cb_data); + +/* + * Initialise library + */ +void dm_lib_init(void) __attribute__((constructor)); + +/* + * Release library resources + */ +void dm_lib_release(void); +void dm_lib_exit(void) __attribute__((destructor)); + +/* An optimisation for clients making repeated calls involving dm ioctls */ +void dm_hold_control_dev(int hold_open); + +/* + * Use NULL for all devices. + */ +int dm_mknodes(const char *name); +int dm_driver_version(char *version, size_t size); + +/****************************************************** + * Functions to build and manipulate trees of devices * + ******************************************************/ +struct dm_tree; +struct dm_tree_node; + +/* + * Initialise an empty dependency tree. + * + * The tree consists of a root node together with one node for each mapped + * device which has child nodes for each device referenced in its table. + * + * Every node in the tree has one or more children and one or more parents. + * + * The root node is the parent/child of every node that doesn't have other + * parents/children. + */ +struct dm_tree *dm_tree_create(void); +void dm_tree_free(struct dm_tree *tree); + +/* + * List of suffixes to be ignored when matching uuids against existing devices. + */ +void dm_tree_set_optional_uuid_suffixes(struct dm_tree *dtree, const char **optional_uuid_suffixes); + +/* + * Add nodes to the tree for a given device and all the devices it uses. + */ +int dm_tree_add_dev(struct dm_tree *tree, uint32_t major, uint32_t minor); +int dm_tree_add_dev_with_udev_flags(struct dm_tree *tree, uint32_t major, + uint32_t minor, uint16_t udev_flags); + +/* + * Add a new node to the tree if it doesn't already exist. + */ +struct dm_tree_node *dm_tree_add_new_dev(struct dm_tree *tree, + const char *name, + const char *uuid, + uint32_t major, uint32_t minor, + int read_only, + int clear_inactive, + void *context); +struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *tree, + const char *name, + const char *uuid, + uint32_t major, + uint32_t minor, + int read_only, + int clear_inactive, + void *context, + uint16_t udev_flags); + +/* + * Search for a node in the tree. + * Set major and minor to 0 or uuid to NULL to get the root node. + */ +struct dm_tree_node *dm_tree_find_node(struct dm_tree *tree, + uint32_t major, + uint32_t minor); +struct dm_tree_node *dm_tree_find_node_by_uuid(struct dm_tree *tree, + const char *uuid); + +/* + * Use this to walk through all children of a given node. + * Set handle to NULL in first call. + * Returns NULL after the last child. + * Set inverted to use inverted tree. + */ +struct dm_tree_node *dm_tree_next_child(void **handle, + const struct dm_tree_node *parent, + uint32_t inverted); + +/* + * Get properties of a node. + */ +const char *dm_tree_node_get_name(const struct dm_tree_node *node); +const char *dm_tree_node_get_uuid(const struct dm_tree_node *node); +const struct dm_info *dm_tree_node_get_info(const struct dm_tree_node *node); +void *dm_tree_node_get_context(const struct dm_tree_node *node); +/* + * Returns 0 when node size and its children is unchanged. + * Returns 1 when node or any of its children has increased size. + * Rerurns -1 when node or any of its children has reduced size. + */ +int dm_tree_node_size_changed(const struct dm_tree_node *dnode); + +/* + * Returns the number of children of the given node (excluding the root node). + * Set inverted for the number of parents. + */ +int dm_tree_node_num_children(const struct dm_tree_node *node, uint32_t inverted); + +/* + * Deactivate a device plus all dependencies. + * Ignores devices that don't have a uuid starting with uuid_prefix. + */ +int dm_tree_deactivate_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len); +/* + * Preload/create a device plus all dependencies. + * Ignores devices that don't have a uuid starting with uuid_prefix. + */ +int dm_tree_preload_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len); + +/* + * Resume a device plus all dependencies. + * Ignores devices that don't have a uuid starting with uuid_prefix. + */ +int dm_tree_activate_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len); + +/* + * Suspend a device plus all dependencies. + * Ignores devices that don't have a uuid starting with uuid_prefix. + */ +int dm_tree_suspend_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len); + +/* + * Skip the filesystem sync when suspending. + * Does nothing with other functions. + * Use this when no snapshots are involved. + */ +void dm_tree_skip_lockfs(struct dm_tree_node *dnode); + +/* + * Set the 'noflush' flag when suspending devices. + * If the kernel supports it, instead of erroring outstanding I/O that + * cannot be completed, the I/O is queued and resubmitted when the + * device is resumed. This affects multipath devices when all paths + * have failed and queue_if_no_path is set, and mirror devices when + * block_on_error is set and the mirror log has failed. + */ +void dm_tree_use_no_flush_suspend(struct dm_tree_node *dnode); + +/* + * Retry removal of each device if not successful. + */ +void dm_tree_retry_remove(struct dm_tree_node *dnode); + +/* + * Is the uuid prefix present in the tree? + * Only returns 0 if every node was checked successfully. + * Returns 1 if the tree walk has to be aborted. + */ +int dm_tree_children_use_uuid(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len); + +/* + * Construct tables for new nodes before activating them. + */ +int dm_tree_node_add_snapshot_origin_target(struct dm_tree_node *dnode, + uint64_t size, + const char *origin_uuid); +int dm_tree_node_add_snapshot_target(struct dm_tree_node *node, + uint64_t size, + const char *origin_uuid, + const char *cow_uuid, + int persistent, + uint32_t chunk_size); +int dm_tree_node_add_snapshot_merge_target(struct dm_tree_node *node, + uint64_t size, + const char *origin_uuid, + const char *cow_uuid, + const char *merge_uuid, + uint32_t chunk_size); +int dm_tree_node_add_error_target(struct dm_tree_node *node, + uint64_t size); +int dm_tree_node_add_zero_target(struct dm_tree_node *node, + uint64_t size); +int dm_tree_node_add_linear_target(struct dm_tree_node *node, + uint64_t size); +int dm_tree_node_add_striped_target(struct dm_tree_node *node, + uint64_t size, + uint32_t stripe_size); + +#define DM_CRYPT_IV_DEFAULT UINT64_C(-1) /* iv_offset == seg offset */ +/* + * Function accepts one string in cipher specification + * (chainmode and iv should be NULL because included in cipher string) + * or + * separate arguments which will be joined to "cipher-chainmode-iv" + */ +int dm_tree_node_add_crypt_target(struct dm_tree_node *node, + uint64_t size, + const char *cipher, + const char *chainmode, + const char *iv, + uint64_t iv_offset, + const char *key); +int dm_tree_node_add_mirror_target(struct dm_tree_node *node, + uint64_t size); + +/* Mirror log flags */ +#define DM_NOSYNC 0x00000001 /* Known already in sync */ +#define DM_FORCESYNC 0x00000002 /* Force resync */ +#define DM_BLOCK_ON_ERROR 0x00000004 /* On error, suspend I/O */ +#define DM_CORELOG 0x00000008 /* In-memory log */ + +int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node, + uint32_t region_size, + unsigned clustered, + const char *log_uuid, + unsigned area_count, + uint32_t flags); + +int dm_tree_node_add_raid_target(struct dm_tree_node *node, + uint64_t size, + const char *raid_type, + uint32_t region_size, + uint32_t stripe_size, + uint64_t rebuilds, + uint64_t flags); + +/* + * Defines below are based on kernel's dm-cache.c defines + * DM_CACHE_MIN_DATA_BLOCK_SIZE (32 * 1024 >> SECTOR_SHIFT) + * DM_CACHE_MAX_DATA_BLOCK_SIZE (1024 * 1024 * 1024 >> SECTOR_SHIFT) + */ +#define DM_CACHE_MIN_DATA_BLOCK_SIZE (UINT32_C(64)) +#define DM_CACHE_MAX_DATA_BLOCK_SIZE (UINT32_C(2097152)) +/* + * Max supported size for cache pool metadata device. + * Limitation is hardcoded into the kernel and bigger device sizes + * are not accepted. + * + * Limit defined in drivers/md/dm-cache-metadata.h + */ +#define DM_CACHE_METADATA_MAX_SECTORS DM_THIN_METADATA_MAX_SECTORS + +/* + * Define number of elements in rebuild and writemostly arrays + * 'of struct dm_tree_node_raid_params'. + */ + +struct dm_tree_node_raid_params { + const char *raid_type; + + uint32_t stripes; + uint32_t mirrors; + uint32_t region_size; + uint32_t stripe_size; + + /* + * 'rebuilds' and 'writemostly' are bitfields that signify + * which devices in the array are to be rebuilt or marked + * writemostly. The kernel supports up to 253 legs. + * We limit ourselves by choosing a lower value + * for DEFAULT_RAID{1}_MAX_IMAGES in defaults.h. + */ + uint64_t rebuilds; + uint64_t writemostly; + uint32_t writebehind; /* I/Os (kernel default COUNTER_MAX / 2) */ + uint32_t sync_daemon_sleep; /* ms (kernel default = 5sec) */ + uint32_t max_recovery_rate; /* kB/sec/disk */ + uint32_t min_recovery_rate; /* kB/sec/disk */ + uint32_t stripe_cache; /* sectors */ + + uint64_t flags; /* [no]sync */ + uint32_t reserved2; +}; + +/* + * Version 2 of above node raid params struct to keeep API compatibility. + * + * Extended for more than 64 legs (max 253 in the MD kernel runtime!), + * delta_disks for disk add/remove reshaping, + * data_offset for out-of-place reshaping + * and data_copies for odd number of raid10 legs. + */ +#define RAID_BITMAP_SIZE 4 /* 4 * 64 bit elements in rebuilds/writemostly arrays */ +struct dm_tree_node_raid_params_v2 { + const char *raid_type; + + uint32_t stripes; + uint32_t mirrors; + uint32_t region_size; + uint32_t stripe_size; + + int delta_disks; /* +/- number of disks to add/remove (reshaping) */ + int data_offset; /* data offset to set (out-of-place reshaping) */ + + /* + * 'rebuilds' and 'writemostly' are bitfields that signify + * which devices in the array are to be rebuilt or marked + * writemostly. The kernel supports up to 253 legs. + * We limit ourselvs by choosing a lower value + * for DEFAULT_RAID_MAX_IMAGES. + */ + uint64_t rebuilds[RAID_BITMAP_SIZE]; + uint64_t writemostly[RAID_BITMAP_SIZE]; + uint32_t writebehind; /* I/Os (kernel default COUNTER_MAX / 2) */ + uint32_t data_copies; /* RAID # of data copies */ + uint32_t sync_daemon_sleep; /* ms (kernel default = 5sec) */ + uint32_t max_recovery_rate; /* kB/sec/disk */ + uint32_t min_recovery_rate; /* kB/sec/disk */ + uint32_t stripe_cache; /* sectors */ + + uint64_t flags; /* [no]sync */ +}; + +int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node, + uint64_t size, + const struct dm_tree_node_raid_params *p); + +/* Version 2 API function taking dm_tree_node_raid_params_v2 for aforementioned extensions. */ +int dm_tree_node_add_raid_target_with_params_v2(struct dm_tree_node *node, + uint64_t size, + const struct dm_tree_node_raid_params_v2 *p); + +/* Cache feature_flags */ +#define DM_CACHE_FEATURE_WRITEBACK 0x00000001 +#define DM_CACHE_FEATURE_WRITETHROUGH 0x00000002 +#define DM_CACHE_FEATURE_PASSTHROUGH 0x00000004 +#define DM_CACHE_FEATURE_METADATA2 0x00000008 /* cache v1.10 */ + +struct dm_config_node; +/* + * Use for passing cache policy and all its args e.g.: + * + * policy_settings { + * migration_threshold=2048 + * sequention_threashold=100 + * ... + * } + * + * For policy without any parameters use NULL. + */ +int dm_tree_node_add_cache_target(struct dm_tree_node *node, + uint64_t size, + uint64_t feature_flags, /* DM_CACHE_FEATURE_* */ + const char *metadata_uuid, + const char *data_uuid, + const char *origin_uuid, + const char *policy_name, + const struct dm_config_node *policy_settings, + uint32_t data_block_size); + +/* + * FIXME Add individual cache policy pairs <key> = value, like: + * int dm_tree_node_add_cache_policy_arg(struct dm_tree_node *dnode, + * const char *key, uint64_t value); + */ + +/* + * Replicator operation mode + * Note: API for Replicator is not yet stable + */ +typedef enum { + DM_REPLICATOR_SYNC, /* Synchronous replication */ + DM_REPLICATOR_ASYNC_WARN, /* Warn if async replicator is slow */ + DM_REPLICATOR_ASYNC_STALL, /* Stall replicator if not fast enough */ + DM_REPLICATOR_ASYNC_DROP, /* Drop sites out of sync */ + DM_REPLICATOR_ASYNC_FAIL, /* Fail replicator if slow */ + NUM_DM_REPLICATOR_MODES +} dm_replicator_mode_t; + +int dm_tree_node_add_replicator_target(struct dm_tree_node *node, + uint64_t size, + const char *rlog_uuid, + const char *rlog_type, + unsigned rsite_index, + dm_replicator_mode_t mode, + uint32_t async_timeout, + uint64_t fall_behind_data, + uint32_t fall_behind_ios); + +int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node, + uint64_t size, + const char *replicator_uuid, /* Replicator control device */ + uint64_t rdevice_index, + const char *rdev_uuid, /* Rimage device name/uuid */ + unsigned rsite_index, + const char *slog_uuid, + uint32_t slog_flags, /* Mirror log flags */ + uint32_t slog_region_size); +/* End of Replicator API */ + +/* + * FIXME: Defines bellow are based on kernel's dm-thin.c defines + * DATA_DEV_BLOCK_SIZE_MIN_SECTORS (64 * 1024 >> SECTOR_SHIFT) + * DATA_DEV_BLOCK_SIZE_MAX_SECTORS (1024 * 1024 * 1024 >> SECTOR_SHIFT) + */ +#define DM_THIN_MIN_DATA_BLOCK_SIZE (UINT32_C(128)) +#define DM_THIN_MAX_DATA_BLOCK_SIZE (UINT32_C(2097152)) +/* + * Max supported size for thin pool metadata device (17112760320 bytes) + * Limitation is hardcoded into the kernel and bigger device size + * is not accepted. + * drivers/md/dm-thin-metadata.h THIN_METADATA_MAX_SECTORS + */ +#define DM_THIN_MAX_METADATA_SIZE (UINT64_C(255) * (1 << 14) * (4096 / (1 << 9)) - 256 * 1024) + +int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, + uint64_t size, + uint64_t transaction_id, + const char *metadata_uuid, + const char *pool_uuid, + uint32_t data_block_size, + uint64_t low_water_mark, + unsigned skip_block_zeroing); + +/* Supported messages for thin provision target */ +typedef enum { + DM_THIN_MESSAGE_CREATE_SNAP, /* device_id, origin_id */ + DM_THIN_MESSAGE_CREATE_THIN, /* device_id */ + DM_THIN_MESSAGE_DELETE, /* device_id */ + DM_THIN_MESSAGE_SET_TRANSACTION_ID, /* current_id, new_id */ + DM_THIN_MESSAGE_RESERVE_METADATA_SNAP, /* target version >= 1.1 */ + DM_THIN_MESSAGE_RELEASE_METADATA_SNAP, /* target version >= 1.1 */ +} dm_thin_message_t; + +int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node, + dm_thin_message_t type, + uint64_t id1, uint64_t id2); + +/* + * Set thin pool discard features + * ignore - Disable support for discards + * no_passdown - Don't pass discards down to underlying data device, + * just remove the mapping + * Feature is available since version 1.1 of the thin target. + */ +int dm_tree_node_set_thin_pool_discard(struct dm_tree_node *node, + unsigned ignore, + unsigned no_passdown); +/* + * Set error if no space, instead of queueing for thin pool. + */ +int dm_tree_node_set_thin_pool_error_if_no_space(struct dm_tree_node *node, + unsigned error_if_no_space); +/* Start thin pool with metadata in read-only mode */ +int dm_tree_node_set_thin_pool_read_only(struct dm_tree_node *node, + unsigned read_only); +/* + * FIXME: Defines bellow are based on kernel's dm-thin.c defines + * MAX_DEV_ID ((1 << 24) - 1) + */ +#define DM_THIN_MAX_DEVICE_ID (UINT32_C((1 << 24) - 1)) +int dm_tree_node_add_thin_target(struct dm_tree_node *node, + uint64_t size, + const char *pool_uuid, + uint32_t device_id); + +int dm_tree_node_set_thin_external_origin(struct dm_tree_node *node, + const char *external_uuid); + +void dm_tree_node_set_udev_flags(struct dm_tree_node *node, uint16_t udev_flags); + +void dm_tree_node_set_presuspend_node(struct dm_tree_node *node, + struct dm_tree_node *presuspend_node); + +int dm_tree_node_add_target_area(struct dm_tree_node *node, + const char *dev_name, + const char *dlid, + uint64_t offset); + +/* + * Only for temporarily-missing raid devices where changes are tracked. + */ +int dm_tree_node_add_null_area(struct dm_tree_node *node, uint64_t offset); + +/* + * Set readahead (in sectors) after loading the node. + */ +void dm_tree_node_set_read_ahead(struct dm_tree_node *dnode, + uint32_t read_ahead, + uint32_t read_ahead_flags); + +/* + * Set node callback hook before de/activation. + * Callback is called before 'activation' of node for activation tree, + * or 'deactivation' of node for deactivation tree. + */ +typedef enum { + DM_NODE_CALLBACK_PRELOADED, /* Node has preload deps */ + DM_NODE_CALLBACK_DEACTIVATED, /* Node is deactivated */ +} dm_node_callback_t; +typedef int (*dm_node_callback_fn) (struct dm_tree_node *node, + dm_node_callback_t type, void *cb_data); +void dm_tree_node_set_callback(struct dm_tree_node *node, + dm_node_callback_fn cb, void *cb_data); + +void dm_tree_set_cookie(struct dm_tree_node *node, uint32_t cookie); +uint32_t dm_tree_get_cookie(struct dm_tree_node *node); + +/***************************************************************************** + * Library functions + *****************************************************************************/ + +/******************* + * Memory management + *******************/ + +/* + * Never use these functions directly - use the macros following instead. + */ +void *dm_malloc_wrapper(size_t s, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +void *dm_malloc_aligned_wrapper(size_t s, size_t a, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +void *dm_zalloc_wrapper(size_t s, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +void *dm_realloc_wrapper(void *p, unsigned int s, const char *file, int line) + __attribute__((__warn_unused_result__)); +void dm_free_wrapper(void *ptr); +char *dm_strdup_wrapper(const char *s, const char *file, int line) + __attribute__((__warn_unused_result__)); +int dm_dump_memory_wrapper(void); +void dm_bounds_check_wrapper(void); + +#define dm_malloc(s) dm_malloc_wrapper((s), __FILE__, __LINE__) +#define dm_malloc_aligned(s, a) dm_malloc_aligned_wrapper((s), (a), __FILE__, __LINE__) +#define dm_zalloc(s) dm_zalloc_wrapper((s), __FILE__, __LINE__) +#define dm_strdup(s) dm_strdup_wrapper((s), __FILE__, __LINE__) +#define dm_free(p) dm_free_wrapper(p) +#define dm_realloc(p, s) dm_realloc_wrapper((p), (s), __FILE__, __LINE__) +#define dm_dump_memory() dm_dump_memory_wrapper() +#define dm_bounds_check() dm_bounds_check_wrapper() + +/* + * The pool allocator is useful when you are going to allocate + * lots of memory, use the memory for a bit, and then free the + * memory in one go. A surprising amount of code has this usage + * profile. + * + * You should think of the pool as an infinite, contiguous chunk + * of memory. The front of this chunk of memory contains + * allocated objects, the second half is free. dm_pool_alloc grabs + * the next 'size' bytes from the free half, in effect moving it + * into the allocated half. This operation is very efficient. + * + * dm_pool_free frees the allocated object *and* all objects + * allocated after it. It is important to note this semantic + * difference from malloc/free. This is also extremely + * efficient, since a single dm_pool_free can dispose of a large + * complex object. + * + * dm_pool_destroy frees all allocated memory. + * + * eg, If you are building a binary tree in your program, and + * know that you are only ever going to insert into your tree, + * and not delete (eg, maintaining a symbol table for a + * compiler). You can create yourself a pool, allocate the nodes + * from it, and when the tree becomes redundant call dm_pool_destroy + * (no nasty iterating through the tree to free nodes). + * + * eg, On the other hand if you wanted to repeatedly insert and + * remove objects into the tree, you would be better off + * allocating the nodes from a free list; you cannot free a + * single arbitrary node with pool. + */ + +struct dm_pool; + +/* constructor and destructor */ +struct dm_pool *dm_pool_create(const char *name, size_t chunk_hint) + __attribute__((__warn_unused_result__)); +void dm_pool_destroy(struct dm_pool *p); + +/* simple allocation/free routines */ +void *dm_pool_alloc(struct dm_pool *p, size_t s) + __attribute__((__warn_unused_result__)); +void *dm_pool_alloc_aligned(struct dm_pool *p, size_t s, unsigned alignment) + __attribute__((__warn_unused_result__)); +void dm_pool_empty(struct dm_pool *p); +void dm_pool_free(struct dm_pool *p, void *ptr); + +/* + * To aid debugging, a pool can be locked. Any modifications made + * to the content of the pool while it is locked can be detected. + * Default compilation is using a crc checksum to notice modifications. + * The pool locking is using the mprotect with the compilation flag + * DEBUG_ENFORCE_POOL_LOCKING to enforce the memory protection. + */ +/* query pool lock status */ +int dm_pool_locked(struct dm_pool *p); +/* mark pool as locked */ +int dm_pool_lock(struct dm_pool *p, int crc) + __attribute__((__warn_unused_result__)); +/* mark pool as unlocked */ +int dm_pool_unlock(struct dm_pool *p, int crc) + __attribute__((__warn_unused_result__)); + +/* + * Object building routines: + * + * These allow you to 'grow' an object, useful for + * building strings, or filling in dynamic + * arrays. + * + * It's probably best explained with an example: + * + * char *build_string(struct dm_pool *mem) + * { + * int i; + * char buffer[16]; + * + * if (!dm_pool_begin_object(mem, 128)) + * return NULL; + * + * for (i = 0; i < 50; i++) { + * snprintf(buffer, sizeof(buffer), "%d, ", i); + * if (!dm_pool_grow_object(mem, buffer, 0)) + * goto bad; + * } + * + * // add null + * if (!dm_pool_grow_object(mem, "\0", 1)) + * goto bad; + * + * return dm_pool_end_object(mem); + * + * bad: + * + * dm_pool_abandon_object(mem); + * return NULL; + *} + * + * So start an object by calling dm_pool_begin_object + * with a guess at the final object size - if in + * doubt make the guess too small. + * + * Then append chunks of data to your object with + * dm_pool_grow_object. Finally get your object with + * a call to dm_pool_end_object. + * + * Setting delta to 0 means it will use strlen(extra). + */ +int dm_pool_begin_object(struct dm_pool *p, size_t hint); +int dm_pool_grow_object(struct dm_pool *p, const void *extra, size_t delta); +void *dm_pool_end_object(struct dm_pool *p); +void dm_pool_abandon_object(struct dm_pool *p); + +/* utilities */ +char *dm_pool_strdup(struct dm_pool *p, const char *str) + __attribute__((__warn_unused_result__)); +char *dm_pool_strndup(struct dm_pool *p, const char *str, size_t n) + __attribute__((__warn_unused_result__)); +void *dm_pool_zalloc(struct dm_pool *p, size_t s) + __attribute__((__warn_unused_result__)); + +/****************** + * bitset functions + ******************/ + +typedef uint32_t *dm_bitset_t; + +dm_bitset_t dm_bitset_create(struct dm_pool *mem, unsigned num_bits); +void dm_bitset_destroy(dm_bitset_t bs); + +int dm_bitset_equal(dm_bitset_t in1, dm_bitset_t in2); + +void dm_bit_and(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2); +void dm_bit_union(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2); +int dm_bit_get_first(dm_bitset_t bs); +int dm_bit_get_next(dm_bitset_t bs, int last_bit); +int dm_bit_get_last(dm_bitset_t bs); +int dm_bit_get_prev(dm_bitset_t bs, int last_bit); + +#define DM_BITS_PER_INT (sizeof(int) * CHAR_BIT) + +#define dm_bit(bs, i) \ + ((bs)[((i) / DM_BITS_PER_INT) + 1] & (0x1 << ((i) & (DM_BITS_PER_INT - 1)))) + +#define dm_bit_set(bs, i) \ + ((bs)[((i) / DM_BITS_PER_INT) + 1] |= (0x1 << ((i) & (DM_BITS_PER_INT - 1)))) + +#define dm_bit_clear(bs, i) \ + ((bs)[((i) / DM_BITS_PER_INT) + 1] &= ~(0x1 << ((i) & (DM_BITS_PER_INT - 1)))) + +#define dm_bit_set_all(bs) \ + memset((bs) + 1, -1, ((*(bs) / DM_BITS_PER_INT) + 1) * sizeof(int)) + +#define dm_bit_clear_all(bs) \ + memset((bs) + 1, 0, ((*(bs) / DM_BITS_PER_INT) + 1) * sizeof(int)) + +#define dm_bit_copy(bs1, bs2) \ + memcpy((bs1) + 1, (bs2) + 1, ((*(bs2) / DM_BITS_PER_INT) + 1) * sizeof(int)) + +/* + * Parse a string representation of a bitset into a dm_bitset_t. The + * notation used is identical to the kernel bitmap parser (cpuset etc.) + * and supports both lists ("1,2,3") and ranges ("1-2,5-8"). If the mem + * parameter is NULL memory for the bitset will be allocated using + * dm_malloc(). Otherwise the bitset will be allocated using the supplied + * dm_pool. + */ +dm_bitset_t dm_bitset_parse_list(const char *str, struct dm_pool *mem, + size_t min_num_bits); + +/* Returns number of set bits */ +static inline unsigned hweight32(uint32_t i) +{ + unsigned r = (i & 0x55555555) + ((i >> 1) & 0x55555555); + + r = (r & 0x33333333) + ((r >> 2) & 0x33333333); + r = (r & 0x0F0F0F0F) + ((r >> 4) & 0x0F0F0F0F); + r = (r & 0x00FF00FF) + ((r >> 8) & 0x00FF00FF); + return (r & 0x0000FFFF) + ((r >> 16) & 0x0000FFFF); +} + +/**************** + * hash functions + ****************/ + +struct dm_hash_table; +struct dm_hash_node; + +typedef void (*dm_hash_iterate_fn) (void *data); + +struct dm_hash_table *dm_hash_create(unsigned size_hint) + __attribute__((__warn_unused_result__)); +void dm_hash_destroy(struct dm_hash_table *t); +void dm_hash_wipe(struct dm_hash_table *t); + +void *dm_hash_lookup(struct dm_hash_table *t, const char *key); +int dm_hash_insert(struct dm_hash_table *t, const char *key, void *data); +void dm_hash_remove(struct dm_hash_table *t, const char *key); + +void *dm_hash_lookup_binary(struct dm_hash_table *t, const void *key, uint32_t len); +int dm_hash_insert_binary(struct dm_hash_table *t, const void *key, uint32_t len, + void *data); +void dm_hash_remove_binary(struct dm_hash_table *t, const void *key, uint32_t len); + +unsigned dm_hash_get_num_entries(struct dm_hash_table *t); +void dm_hash_iter(struct dm_hash_table *t, dm_hash_iterate_fn f); + +char *dm_hash_get_key(struct dm_hash_table *t, struct dm_hash_node *n); +void *dm_hash_get_data(struct dm_hash_table *t, struct dm_hash_node *n); +struct dm_hash_node *dm_hash_get_first(struct dm_hash_table *t); +struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_node *n); + +/* + * dm_hash_insert() replaces the value of an existing + * entry with a matching key if one exists. Otherwise + * it adds a new entry. + * + * dm_hash_insert_with_val() inserts a new entry if + * another entry with the same key already exists. + * val_len is the size of the data being inserted. + * + * If two entries with the same key exist, + * (added using dm_hash_insert_allow_multiple), then: + * . dm_hash_lookup() returns the first one it finds, and + * dm_hash_lookup_with_val() returns the one with a matching + * val_len/val. + * . dm_hash_remove() removes the first one it finds, and + * dm_hash_remove_with_val() removes the one with a matching + * val_len/val. + * + * If a single entry with a given key exists, and it has + * zero val_len, then: + * . dm_hash_lookup() returns it + * . dm_hash_lookup_with_val(val_len=0) returns it + * . dm_hash_remove() removes it + * . dm_hash_remove_with_val(val_len=0) removes it + * + * dm_hash_lookup_with_count() is a single call that will + * both lookup a key's value and check if there is more + * than one entry with the given key. + * + * (It is not meant to retrieve all the entries with the + * given key. In the common case where a single entry exists + * for the key, it is useful to have a single call that will + * both look up the value and indicate if multiple values + * exist for the key.) + * + * dm_hash_lookup_with_count: + * . If no entries exist, the function returns NULL, and + * the count is set to 0. + * . If only one entry exists, the value of that entry is + * returned and count is set to 1. + * . If N entries exists, the value of the first entry is + * returned and count is set to N. + */ + +void *dm_hash_lookup_with_val(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len); +void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len); +int dm_hash_insert_allow_multiple(struct dm_hash_table *t, const char *key, + const void *val, uint32_t val_len); +void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *count); + + +#define dm_hash_iterate(v, h) \ + for (v = dm_hash_get_first((h)); v; \ + v = dm_hash_get_next((h), v)) + +/**************** + * list functions + ****************/ + +/* + * A list consists of a list head plus elements. + * Each element has 'next' and 'previous' pointers. + * The list head's pointers point to the first and the last element. + */ + +struct dm_list { + struct dm_list *n, *p; +}; + +/* + * String list. + */ +struct dm_str_list { + struct dm_list list; + const char *str; +}; + +/* + * Initialise a list before use. + * The list head's next and previous pointers point back to itself. + */ +#define DM_LIST_HEAD_INIT(name) { &(name), &(name) } +#define DM_LIST_INIT(name) struct dm_list name = DM_LIST_HEAD_INIT(name) +void dm_list_init(struct dm_list *head); + +/* + * Insert an element before 'head'. + * If 'head' is the list head, this adds an element to the end of the list. + */ +void dm_list_add(struct dm_list *head, struct dm_list *elem); + +/* + * Insert an element after 'head'. + * If 'head' is the list head, this adds an element to the front of the list. + */ +void dm_list_add_h(struct dm_list *head, struct dm_list *elem); + +/* + * Delete an element from its list. + * Note that this doesn't change the element itself - it may still be safe + * to follow its pointers. + */ +void dm_list_del(struct dm_list *elem); + +/* + * Remove an element from existing list and insert before 'head'. + */ +void dm_list_move(struct dm_list *head, struct dm_list *elem); + +/* + * Join 'head1' to the end of 'head'. + */ +void dm_list_splice(struct dm_list *head, struct dm_list *head1); + +/* + * Is the list empty? + */ +int dm_list_empty(const struct dm_list *head); + +/* + * Is this the first element of the list? + */ +int dm_list_start(const struct dm_list *head, const struct dm_list *elem); + +/* + * Is this the last element of the list? + */ +int dm_list_end(const struct dm_list *head, const struct dm_list *elem); + +/* + * Return first element of the list or NULL if empty + */ +struct dm_list *dm_list_first(const struct dm_list *head); + +/* + * Return last element of the list or NULL if empty + */ +struct dm_list *dm_list_last(const struct dm_list *head); + +/* + * Return the previous element of the list, or NULL if we've reached the start. + */ +struct dm_list *dm_list_prev(const struct dm_list *head, const struct dm_list *elem); + +/* + * Return the next element of the list, or NULL if we've reached the end. + */ +struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *elem); + +/* + * Given the address v of an instance of 'struct dm_list' called 'head' + * contained in a structure of type t, return the containing structure. + */ +#define dm_list_struct_base(v, t, head) \ + ((t *)((const char *)(v) - (const char *)&((t *) 0)->head)) + +/* + * Given the address v of an instance of 'struct dm_list list' contained in + * a structure of type t, return the containing structure. + */ +#define dm_list_item(v, t) dm_list_struct_base((v), t, list) + +/* + * Given the address v of one known element e in a known structure of type t, + * return another element f. + */ +#define dm_struct_field(v, t, e, f) \ + (((t *)((uintptr_t)(v) - (uintptr_t)&((t *) 0)->e))->f) + +/* + * Given the address v of a known element e in a known structure of type t, + * return the list head 'list' + */ +#define dm_list_head(v, t, e) dm_struct_field(v, t, e, list) + +/* + * Set v to each element of a list in turn. + */ +#define dm_list_iterate(v, head) \ + for (v = (head)->n; v != head; v = v->n) + +/* + * Set v to each element in a list in turn, starting from the element + * in front of 'start'. + * You can use this to 'unwind' a list_iterate and back out actions on + * already-processed elements. + * If 'start' is 'head' it walks the list backwards. + */ +#define dm_list_uniterate(v, head, start) \ + for (v = (start)->p; v != head; v = v->p) + +/* + * A safe way to walk a list and delete and free some elements along + * the way. + * t must be defined as a temporary variable of the same type as v. + */ +#define dm_list_iterate_safe(v, t, head) \ + for (v = (head)->n, t = v->n; v != head; v = t, t = v->n) + +/* + * Walk a list, setting 'v' in turn to the containing structure of each item. + * The containing structure should be the same type as 'v'. + * The 'struct dm_list' variable within the containing structure is 'field'. + */ +#define dm_list_iterate_items_gen(v, head, field) \ + for (v = dm_list_struct_base((head)->n, __typeof__(*v), field); \ + &v->field != (head); \ + v = dm_list_struct_base(v->field.n, __typeof__(*v), field)) + +/* + * Walk a list, setting 'v' in turn to the containing structure of each item. + * The containing structure should be the same type as 'v'. + * The list should be 'struct dm_list list' within the containing structure. + */ +#define dm_list_iterate_items(v, head) dm_list_iterate_items_gen(v, (head), list) + +/* + * Walk a list, setting 'v' in turn to the containing structure of each item. + * The containing structure should be the same type as 'v'. + * The 'struct dm_list' variable within the containing structure is 'field'. + * t must be defined as a temporary variable of the same type as v. + */ +#define dm_list_iterate_items_gen_safe(v, t, head, field) \ + for (v = dm_list_struct_base((head)->n, __typeof__(*v), field), \ + t = dm_list_struct_base(v->field.n, __typeof__(*v), field); \ + &v->field != (head); \ + v = t, t = dm_list_struct_base(v->field.n, __typeof__(*v), field)) +/* + * Walk a list, setting 'v' in turn to the containing structure of each item. + * The containing structure should be the same type as 'v'. + * The list should be 'struct dm_list list' within the containing structure. + * t must be defined as a temporary variable of the same type as v. + */ +#define dm_list_iterate_items_safe(v, t, head) \ + dm_list_iterate_items_gen_safe(v, t, (head), list) + +/* + * Walk a list backwards, setting 'v' in turn to the containing structure + * of each item. + * The containing structure should be the same type as 'v'. + * The 'struct dm_list' variable within the containing structure is 'field'. + */ +#define dm_list_iterate_back_items_gen(v, head, field) \ + for (v = dm_list_struct_base((head)->p, __typeof__(*v), field); \ + &v->field != (head); \ + v = dm_list_struct_base(v->field.p, __typeof__(*v), field)) + +/* + * Walk a list backwards, setting 'v' in turn to the containing structure + * of each item. + * The containing structure should be the same type as 'v'. + * The list should be 'struct dm_list list' within the containing structure. + */ +#define dm_list_iterate_back_items(v, head) dm_list_iterate_back_items_gen(v, (head), list) + +/* + * Return the number of elements in a list by walking it. + */ +unsigned int dm_list_size(const struct dm_list *head); + +/********* + * selinux + *********/ + +/* + * Obtain SELinux security context assigned for the path and set this + * context for creating a new file system object. This security context + * is global and it is used until reset to default policy behaviour + * by calling 'dm_prepare_selinux_context(NULL, 0)'. + */ +int dm_prepare_selinux_context(const char *path, mode_t mode); +/* + * Set SELinux context for existing file system object. + */ +int dm_set_selinux_context(const char *path, mode_t mode); + +/********************* + * string manipulation + *********************/ + +/* + * Break up the name of a mapped device into its constituent + * Volume Group, Logical Volume and Layer (if present). + * If mem is supplied, the result is allocated from the mempool. + * Otherwise the strings are changed in situ. + */ +int dm_split_lvm_name(struct dm_pool *mem, const char *dmname, + char **vgname, char **lvname, char **layer); + +/* + * Destructively split buffer into NULL-separated words in argv. + * Returns number of words. + */ +int dm_split_words(char *buffer, unsigned max, + unsigned ignore_comments, /* Not implemented */ + char **argv); + +/* + * Returns -1 if buffer too small + */ +int dm_snprintf(char *buf, size_t bufsize, const char *format, ...) + __attribute__ ((format(printf, 3, 4))); + +/* + * Returns pointer to the last component of the path. + */ +const char *dm_basename(const char *path); + +/* + * Returns number of occurrences of 'c' in 'str' of length 'size'. + */ +unsigned dm_count_chars(const char *str, size_t len, const int c); + +/* + * Length of string after escaping double quotes and backslashes. + */ +size_t dm_escaped_len(const char *str); + +/* + * <vg>-<lv>-<layer> or if !layer just <vg>-<lv>. + */ +char *dm_build_dm_name(struct dm_pool *mem, const char *vgname, + const char *lvname, const char *layer); +char *dm_build_dm_uuid(struct dm_pool *mem, const char *prefix, const char *lvid, const char *layer); + +/* + * Copies a string, quoting double quotes with backslashes. + */ +char *dm_escape_double_quotes(char *out, const char *src); + +/* + * Undo quoting in situ. + */ +void dm_unescape_double_quotes(char *src); + +/* + * Unescape colons and "at" signs in situ and save the substrings + * starting at the position of the first unescaped colon and the + * first unescaped "at" sign. This is normally used to unescape + * device names used as PVs. + */ +void dm_unescape_colons_and_at_signs(char *src, + char **substr_first_unquoted_colon, + char **substr_first_unquoted_at_sign); + +/* + * Replacement for strncpy() function. + * + * Copies no more than n bytes from string pointed by src to the buffer + * pointed by dest and ensure string is finished with '\0'. + * Returns 0 if the whole string does not fit. + */ +int dm_strncpy(char *dest, const char *src, size_t n); + +/* + * Recognize unit specifier in the 'units' arg and return a factor + * representing that unit. If the 'units' contains a prefix with digits, + * the 'units' is considered to be a custom unit. + * + * Also, set 'unit_type' output arg to the character that represents + * the unit specified. The 'unit_type' character equals to the unit + * character itself recognized in the 'units' arg for canonical units. + * Otherwise, the 'unit_type' character is set to 'U' for custom unit. + * + * An example for k/K canonical units and 8k/8K custom units: + * + * units unit_type return value (factor) + * k k 1024 + * K K 1000 + * 8k U 1024*8 + * 8K U 1000*8 + * etc... + * + * Recognized units: + * + * h/H - human readable (returns 1 for both) + * b/B - byte (returns 1 for both) + * s/S - sector (returns 512 for both) + * k/K - kilo (returns 1024/1000 respectively) + * m/M - mega (returns 1024^2/1000^2 respectively) + * g/G - giga (returns 1024^3/1000^3 respectively) + * t/T - tera (returns 1024^4/1000^4 respectively) + * p/P - peta (returns 1024^5/1000^5 respectively) + * e/E - exa (returns 1024^6/1000^6 respectively) + * + * Only one units character is allowed in the 'units' arg + * if strict mode is enabled by 'strict' arg. + * + * The 'endptr' output arg, if not NULL, saves the pointer + * in the 'units' string which follows the unit specifier + * recognized (IOW the position where the parsing of the + * unit specifier stopped). + * + * Returns the unit factor or 0 if no unit is recognized. + */ +uint64_t dm_units_to_factor(const char *units, char *unit_type, + int strict, const char **endptr); + +/* + * Type of unit specifier used by dm_size_to_string(). + */ +typedef enum { + DM_SIZE_LONG = 0, /* Megabyte */ + DM_SIZE_SHORT = 1, /* MB or MiB */ + DM_SIZE_UNIT = 2 /* M or m */ +} dm_size_suffix_t; + +/* + * Convert a size (in 512-byte sectors) into a printable string using units of unit_type. + * An upper-case unit_type indicates output units based on powers of 1000 are + * required; a lower-case unit_type indicates powers of 1024. + * For correct operation, unit_factor must be one of: + * 0 - the correct value will be calculated internally; + * or the output from dm_units_to_factor() corresponding to unit_type; + * or 'u' or 'U', an arbitrary number of bytes to use as the power base. + * Set include_suffix to 1 to include a suffix of suffix_type. + * Set use_si_units to 0 for suffixes that don't distinguish between 1000 and 1024. + * Set use_si_units to 1 for a suffix that does distinguish. + */ +const char *dm_size_to_string(struct dm_pool *mem, uint64_t size, + char unit_type, int use_si_units, + uint64_t unit_factor, int include_suffix, + dm_size_suffix_t suffix_type); + +/************************** + * file/stream manipulation + **************************/ + +/* + * Create a directory (with parent directories if necessary). + * Returns 1 on success, 0 on failure. + */ +int dm_create_dir(const char *dir); + +int dm_is_empty_dir(const char *dir); + +/* + * Close a stream, with nicer error checking than fclose's. + * Derived from gnulib's close-stream.c. + * + * Close "stream". Return 0 if successful, and EOF (setting errno) + * otherwise. Upon failure, set errno to 0 if the error number + * cannot be determined. Useful mainly for writable streams. + */ +int dm_fclose(FILE *stream); + +/* + * Returns size of a buffer which is allocated with dm_malloc. + * Pointer to the buffer is stored in *buf. + * Returns -1 on failure leaving buf undefined. + */ +int dm_asprintf(char **buf, const char *format, ...) + __attribute__ ((format(printf, 2, 3))); +int dm_vasprintf(char **buf, const char *format, va_list ap) + __attribute__ ((format(printf, 2, 0))); + +/* + * create lockfile (pidfile) - create and lock a lock file + * @lockfile: location of lock file + * + * Returns: 1 on success, 0 otherwise, errno is handled internally + */ +int dm_create_lockfile(const char* lockfile); + +/* + * Query whether a daemon is running based on its lockfile + * + * Returns: 1 if running, 0 if not + */ +int dm_daemon_is_running(const char* lockfile); + +/********************* + * regular expressions + *********************/ +struct dm_regex; + +/* + * Initialise an array of num patterns for matching. + * Uses memory from mem. + */ +struct dm_regex *dm_regex_create(struct dm_pool *mem, const char * const *patterns, + unsigned num_patterns); + +/* + * Match string s against the patterns. + * Returns the index of the highest pattern in the array that matches, + * or -1 if none match. + */ +int dm_regex_match(struct dm_regex *regex, const char *s); + +/* + * This is useful for regression testing only. The idea is if two + * fingerprints are different, then the two dfas are certainly not + * isomorphic. If two fingerprints _are_ the same then it's very likely + * that the dfas are isomorphic. + * + * This function must be called before any matching is done. + */ +uint32_t dm_regex_fingerprint(struct dm_regex *regex); + +/****************** + * percent handling + ******************/ +/* + * A fixed-point representation of percent values. One percent equals to + * DM_PERCENT_1 as defined below. Values that are not multiples of DM_PERCENT_1 + * represent fractions, with precision of 1/1000000 of a percent. See + * dm_percent_to_float for a conversion to a floating-point representation. + * + * You should always use dm_make_percent when building dm_percent_t values. The + * implementation of dm_make_percent is biased towards the middle: it ensures that + * the result is DM_PERCENT_0 or DM_PERCENT_100 if and only if this is the actual + * value -- it never rounds any intermediate value (> 0 or < 100) to either 0 + * or 100. +*/ +#define DM_PERCENT_CHAR '%' + +typedef enum { + DM_PERCENT_0 = 0, + DM_PERCENT_1 = 1000000, + DM_PERCENT_100 = 100 * DM_PERCENT_1, + DM_PERCENT_INVALID = -1, + DM_PERCENT_FAILED = -2 +} dm_percent_range_t; + +typedef int32_t dm_percent_t; + +float dm_percent_to_float(dm_percent_t percent); +/* + * Return adjusted/rounded float for better percent value printing. + * Function ensures for given precision of digits: + * 100.0% returns only when the value is DM_PERCENT_100 + * for close smaller values rounds to nearest smaller value + * 0.0% returns only for value DM_PERCENT_0 + * for close bigger values rounds to nearest bigger value + * In all other cases returns same value as dm_percent_to_float() + */ +float dm_percent_to_round_float(dm_percent_t percent, unsigned digits); +dm_percent_t dm_make_percent(uint64_t numerator, uint64_t denominator); + +/******************** + * timestamp handling + ********************/ + +/* + * Create a dm_timestamp object to use with dm_timestamp_get. + */ +struct dm_timestamp *dm_timestamp_alloc(void); + +/* + * Update dm_timestamp object to represent the current time. + */ +int dm_timestamp_get(struct dm_timestamp *ts); + +/* + * Copy a timestamp from ts_old to ts_new. + */ +void dm_timestamp_copy(struct dm_timestamp *ts_new, struct dm_timestamp *ts_old); + +/* + * Compare two timestamps. + * + * Return: -1 if ts1 is less than ts2 + * 0 if ts1 is equal to ts2 + * 1 if ts1 is greater than ts2 + */ +int dm_timestamp_compare(struct dm_timestamp *ts1, struct dm_timestamp *ts2); + +/* + * Return the absolute difference in nanoseconds between + * the dm_timestamp objects ts1 and ts2. + * + * Callers that need to know whether ts1 is before, equal to, or after ts2 + * in addition to the magnitude should use dm_timestamp_compare. + */ +uint64_t dm_timestamp_delta(struct dm_timestamp *ts1, struct dm_timestamp *ts2); + +/* + * Destroy a dm_timestamp object. + */ +void dm_timestamp_destroy(struct dm_timestamp *ts); + +/********************* + * reporting functions + *********************/ + +struct dm_report_object_type { + uint32_t id; /* Powers of 2 */ + const char *desc; + const char *prefix; /* field id string prefix (optional) */ + /* FIXME: convert to proper usage of const pointers here */ + void *(*data_fn)(void *object); /* callback from report_object() */ +}; + +struct dm_report_field; + +/* + * dm_report_field_type flags + */ +#define DM_REPORT_FIELD_MASK 0x00000FFF +#define DM_REPORT_FIELD_ALIGN_MASK 0x0000000F +#define DM_REPORT_FIELD_ALIGN_LEFT 0x00000001 +#define DM_REPORT_FIELD_ALIGN_RIGHT 0x00000002 +#define DM_REPORT_FIELD_TYPE_MASK 0x00000FF0 +#define DM_REPORT_FIELD_TYPE_NONE 0x00000000 +#define DM_REPORT_FIELD_TYPE_STRING 0x00000010 +#define DM_REPORT_FIELD_TYPE_NUMBER 0x00000020 +#define DM_REPORT_FIELD_TYPE_SIZE 0x00000040 +#define DM_REPORT_FIELD_TYPE_PERCENT 0x00000080 +#define DM_REPORT_FIELD_TYPE_STRING_LIST 0x00000100 +#define DM_REPORT_FIELD_TYPE_TIME 0x00000200 + +/* For use with reserved values only! */ +#define DM_REPORT_FIELD_RESERVED_VALUE_MASK 0x0000000F +#define DM_REPORT_FIELD_RESERVED_VALUE_NAMED 0x00000001 /* only named value, less strict form of reservation */ +#define DM_REPORT_FIELD_RESERVED_VALUE_RANGE 0x00000002 /* value is range - low and high value defined */ +#define DM_REPORT_FIELD_RESERVED_VALUE_DYNAMIC_VALUE 0x00000004 /* value is computed in runtime */ +#define DM_REPORT_FIELD_RESERVED_VALUE_FUZZY_NAMES 0x00000008 /* value names are recognized in runtime */ + +#define DM_REPORT_FIELD_TYPE_ID_LEN 32 +#define DM_REPORT_FIELD_TYPE_HEADING_LEN 32 + +struct dm_report; +struct dm_report_field_type { + uint32_t type; /* object type id */ + uint32_t flags; /* DM_REPORT_FIELD_* */ + uint32_t offset; /* byte offset in the object */ + int32_t width; /* default width */ + /* string used to specify the field */ + const char id[DM_REPORT_FIELD_TYPE_ID_LEN]; + /* string printed in header */ + const char heading[DM_REPORT_FIELD_TYPE_HEADING_LEN]; + int (*report_fn)(struct dm_report *rh, struct dm_pool *mem, + struct dm_report_field *field, const void *data, + void *private_data); + const char *desc; /* description of the field */ +}; + +/* + * Per-field reserved value. + */ +struct dm_report_field_reserved_value { + /* field_num is the position of the field in 'fields' + array passed to dm_report_init_with_selection */ + uint32_t field_num; + /* the value is of the same type as the field + identified by field_num */ + const void *value; +}; + +/* + * Reserved value is a 'value' that is used directly if any of the 'names' is hit + * or in case of fuzzy names, if such fuzzy name matches. + * + * If type is any of DM_REPORT_FIELD_TYPE_*, the reserved value is recognized + * for all fields of that type. + * + * If type is DM_REPORT_FIELD_TYPE_NONE, the reserved value is recognized + * for the exact field specified - hence the type of the value is automatically + * the same as the type of the field itself. + * + * The array of reserved values is used to initialize reporting with + * selection enabled (see also dm_report_init_with_selection function). + */ +struct dm_report_reserved_value { + const uint32_t type; /* DM_REPORT_FIELD_RESERVED_VALUE_* and DM_REPORT_FIELD_TYPE_* */ + const void *value; /* reserved value: + uint64_t for DM_REPORT_FIELD_TYPE_NUMBER + uint64_t for DM_REPORT_FIELD_TYPE_SIZE (number of 512-byte sectors) + uint64_t for DM_REPORT_FIELD_TYPE_PERCENT + const char* for DM_REPORT_FIELD_TYPE_STRING + struct dm_report_field_reserved_value for DM_REPORT_FIELD_TYPE_NONE + dm_report_reserved_handler* if DM_REPORT_FIELD_RESERVED_VALUE_{DYNAMIC_VALUE,FUZZY_NAMES} is used */ + const char **names; /* null-terminated array of static names for this reserved value */ + const char *description; /* description of the reserved value */ +}; + +/* + * Available actions for dm_report_reserved_value_handler. + */ +typedef enum { + DM_REPORT_RESERVED_PARSE_FUZZY_NAME, + DM_REPORT_RESERVED_GET_DYNAMIC_VALUE, +} dm_report_reserved_action_t; + +/* + * Generic reserved value handler to process reserved value names and/or values. + * + * Actions and their input/output: + * + * DM_REPORT_RESERVED_PARSE_FUZZY_NAME + * data_in: const char *fuzzy_name + * data_out: const char *canonical_name, NULL if fuzzy_name not recognized + * + * DM_REPORT_RESERVED_GET_DYNAMIC_VALUE + * data_in: const char *canonical_name + * data_out: void *value, NULL if canonical_name not recognized + * + * All actions return: + * + * -1 if action not implemented + * 0 on error + * 1 on success + */ +typedef int (*dm_report_reserved_handler) (struct dm_report *rh, + struct dm_pool *mem, + uint32_t field_num, + dm_report_reserved_action_t action, + const void *data_in, + const void **data_out); + +/* + * The dm_report_value_cache_{set,get} are helper functions to store and retrieve + * various values used during reporting (dm_report_field_type.report_fn) and/or + * selection processing (dm_report_reserved_handler instances) to avoid + * recalculation of these values or to share values among calls. + */ +int dm_report_value_cache_set(struct dm_report *rh, const char *name, const void *data); +const void *dm_report_value_cache_get(struct dm_report *rh, const char *name); +/* + * dm_report_init output_flags + */ +#define DM_REPORT_OUTPUT_MASK 0x000000FF +#define DM_REPORT_OUTPUT_ALIGNED 0x00000001 +#define DM_REPORT_OUTPUT_BUFFERED 0x00000002 +#define DM_REPORT_OUTPUT_HEADINGS 0x00000004 +#define DM_REPORT_OUTPUT_FIELD_NAME_PREFIX 0x00000008 +#define DM_REPORT_OUTPUT_FIELD_UNQUOTED 0x00000010 +#define DM_REPORT_OUTPUT_COLUMNS_AS_ROWS 0x00000020 +#define DM_REPORT_OUTPUT_MULTIPLE_TIMES 0x00000040 + +struct dm_report *dm_report_init(uint32_t *report_types, + const struct dm_report_object_type *types, + const struct dm_report_field_type *fields, + const char *output_fields, + const char *output_separator, + uint32_t output_flags, + const char *sort_keys, + void *private_data); +struct dm_report *dm_report_init_with_selection(uint32_t *report_types, + const struct dm_report_object_type *types, + const struct dm_report_field_type *fields, + const char *output_fields, + const char *output_separator, + uint32_t output_flags, + const char *sort_keys, + const char *selection, + const struct dm_report_reserved_value reserved_values[], + void *private_data); +/* + * Report an object, pass it through the selection criteria if they + * are present and display the result on output if it passes the criteria. + */ +int dm_report_object(struct dm_report *rh, void *object); +/* + * The same as dm_report_object, but display the result on output only if + * 'do_output' arg is set. Also, save the result of selection in 'selected' + * arg if it's not NULL (either 1 if the object passes, otherwise 0). + */ +int dm_report_object_is_selected(struct dm_report *rh, void *object, int do_output, int *selected); + +/* + * Compact report output so that if field value is empty for all rows in + * the report, drop the field from output completely (including headers). + * Compact output is applicable only if report is buffered, otherwise + * this function has no effect. + */ +int dm_report_compact_fields(struct dm_report *rh); + +/* + * The same as dm_report_compact_fields, but for selected fields only. + * The "fields" arg is comma separated list of field names (the same format + * as used for "output_fields" arg in dm_report_init fn). + */ +int dm_report_compact_given_fields(struct dm_report *rh, const char *fields); + +/* + * Returns 1 if there is no data waiting to be output. + */ +int dm_report_is_empty(struct dm_report *rh); + +/* + * Destroy report content without doing output. + */ +void dm_report_destroy_rows(struct dm_report *rh); + +int dm_report_output(struct dm_report *rh); + +/* + * Output the report headings for a columns-based report, even if they + * have already been shown. Useful for repeating reports that wish to + * issue a periodic reminder of the column headings. + */ +int dm_report_column_headings(struct dm_report *rh); + +void dm_report_free(struct dm_report *rh); + +/* + * Prefix added to each field name with DM_REPORT_OUTPUT_FIELD_NAME_PREFIX + */ +int dm_report_set_output_field_name_prefix(struct dm_report *rh, + const char *report_prefix); + +int dm_report_set_selection(struct dm_report *rh, const char *selection); + +/* + * Report functions are provided for simple data types. + * They take care of allocating copies of the data. + */ +int dm_report_field_string(struct dm_report *rh, struct dm_report_field *field, + const char *const *data); +int dm_report_field_string_list(struct dm_report *rh, struct dm_report_field *field, + const struct dm_list *data, const char *delimiter); +int dm_report_field_string_list_unsorted(struct dm_report *rh, struct dm_report_field *field, + const struct dm_list *data, const char *delimiter); +int dm_report_field_int32(struct dm_report *rh, struct dm_report_field *field, + const int32_t *data); +int dm_report_field_uint32(struct dm_report *rh, struct dm_report_field *field, + const uint32_t *data); +int dm_report_field_int(struct dm_report *rh, struct dm_report_field *field, + const int *data); +int dm_report_field_uint64(struct dm_report *rh, struct dm_report_field *field, + const uint64_t *data); +int dm_report_field_percent(struct dm_report *rh, struct dm_report_field *field, + const dm_percent_t *data); + +/* + * For custom fields, allocate the data in 'mem' and use + * dm_report_field_set_value(). + * 'sortvalue' may be NULL if it matches 'value' + */ +void dm_report_field_set_value(struct dm_report_field *field, const void *value, + const void *sortvalue); + +/* + * Report group support. + */ +struct dm_report_group; + +typedef enum { + DM_REPORT_GROUP_SINGLE, + DM_REPORT_GROUP_BASIC, + DM_REPORT_GROUP_JSON +} dm_report_group_type_t; + +struct dm_report_group *dm_report_group_create(dm_report_group_type_t type, void *data); +int dm_report_group_push(struct dm_report_group *group, struct dm_report *report, void *data); +int dm_report_group_pop(struct dm_report_group *group); +int dm_report_group_output_and_pop_all(struct dm_report_group *group); +int dm_report_group_destroy(struct dm_report_group *group); + +/* + * Stats counter access methods + * + * Each method returns the corresponding stats counter value from the + * supplied dm_stats handle for the specified region_id and area_id. + * If either region_id or area_id uses one of the special values + * DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT then the region + * or area is selected according to the current state of the dm_stats + * handle's embedded cursor. + * + * Two methods are provided to access counter values: a named function + * for each available counter field and a single function that accepts + * an enum value specifying the required field. New code is encouraged + * to use the enum based interface as calls to the named functions are + * implemented using the enum method internally. + * + * See the kernel documentation for complete descriptions of each + * counter field: + * + * Documentation/device-mapper/statistics.txt + * Documentation/iostats.txt + * + * reads: the number of reads completed + * reads_merged: the number of reads merged + * read_sectors: the number of sectors read + * read_nsecs: the number of nanoseconds spent reading + * writes: the number of writes completed + * writes_merged: the number of writes merged + * write_sectors: the number of sectors written + * write_nsecs: the number of nanoseconds spent writing + * io_in_progress: the number of I/Os currently in progress + * io_nsecs: the number of nanoseconds spent doing I/Os + * weighted_io_nsecs: the weighted number of nanoseconds spent doing I/Os + * total_read_nsecs: the total time spent reading in nanoseconds + * total_write_nsecs: the total time spent writing in nanoseconds + */ + +#define DM_STATS_REGION_CURRENT UINT64_MAX +#define DM_STATS_AREA_CURRENT UINT64_MAX + +typedef enum { + DM_STATS_READS_COUNT, + DM_STATS_READS_MERGED_COUNT, + DM_STATS_READ_SECTORS_COUNT, + DM_STATS_READ_NSECS, + DM_STATS_WRITES_COUNT, + DM_STATS_WRITES_MERGED_COUNT, + DM_STATS_WRITE_SECTORS_COUNT, + DM_STATS_WRITE_NSECS, + DM_STATS_IO_IN_PROGRESS_COUNT, + DM_STATS_IO_NSECS, + DM_STATS_WEIGHTED_IO_NSECS, + DM_STATS_TOTAL_READ_NSECS, + DM_STATS_TOTAL_WRITE_NSECS, + DM_STATS_NR_COUNTERS +} dm_stats_counter_t; + +uint64_t dm_stats_get_counter(const struct dm_stats *dms, + dm_stats_counter_t counter, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_reads(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_reads_merged(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_read_sectors(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_read_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_writes(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_writes_merged(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_write_sectors(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_write_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_io_in_progress(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_io_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_weighted_io_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_total_read_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +uint64_t dm_stats_get_total_write_nsecs(const struct dm_stats *dms, + uint64_t region_id, uint64_t area_id); + +/* + * Derived statistics access methods + * + * Each method returns the corresponding value calculated from the + * counters stored in the supplied dm_stats handle for the specified + * region_id and area_id. If either region_id or area_id uses one of the + * special values DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT then + * the region or area is selected according to the current state of the + * dm_stats handle's embedded cursor. + * + * The set of metrics is based on the fields provided by the Linux + * iostats program. + * + * rd_merges_per_sec: the number of reads merged per second + * wr_merges_per_sec: the number of writes merged per second + * reads_per_sec: the number of reads completed per second + * writes_per_sec: the number of writes completed per second + * read_sectors_per_sec: the number of sectors read per second + * write_sectors_per_sec: the number of sectors written per second + * average_request_size: the average size of requests submitted + * service_time: the average service time (in ns) for requests issued + * average_queue_size: the average queue length + * average_wait_time: the average time for requests to be served (in ns) + * average_rd_wait_time: the average read wait time + * average_wr_wait_time: the average write wait time + */ + +typedef enum { + DM_STATS_RD_MERGES_PER_SEC, + DM_STATS_WR_MERGES_PER_SEC, + DM_STATS_READS_PER_SEC, + DM_STATS_WRITES_PER_SEC, + DM_STATS_READ_SECTORS_PER_SEC, + DM_STATS_WRITE_SECTORS_PER_SEC, + DM_STATS_AVERAGE_REQUEST_SIZE, + DM_STATS_AVERAGE_QUEUE_SIZE, + DM_STATS_AVERAGE_WAIT_TIME, + DM_STATS_AVERAGE_RD_WAIT_TIME, + DM_STATS_AVERAGE_WR_WAIT_TIME, + DM_STATS_SERVICE_TIME, + DM_STATS_THROUGHPUT, + DM_STATS_UTILIZATION, + DM_STATS_NR_METRICS +} dm_stats_metric_t; + +int dm_stats_get_metric(const struct dm_stats *dms, int metric, + uint64_t region_id, uint64_t area_id, double *value); + +int dm_stats_get_rd_merges_per_sec(const struct dm_stats *dms, double *rrqm, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_wr_merges_per_sec(const struct dm_stats *dms, double *rrqm, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_reads_per_sec(const struct dm_stats *dms, double *rd_s, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_writes_per_sec(const struct dm_stats *dms, double *wr_s, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_read_sectors_per_sec(const struct dm_stats *dms, + double *rsec_s, uint64_t region_id, + uint64_t area_id); + +int dm_stats_get_write_sectors_per_sec(const struct dm_stats *dms, + double *wr_s, uint64_t region_id, + uint64_t area_id); + +int dm_stats_get_average_request_size(const struct dm_stats *dms, + double *arqsz, uint64_t region_id, + uint64_t area_id); + +int dm_stats_get_service_time(const struct dm_stats *dms, double *svctm, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_average_queue_size(const struct dm_stats *dms, double *qusz, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_average_wait_time(const struct dm_stats *dms, double *await, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_average_rd_wait_time(const struct dm_stats *dms, + double *await, uint64_t region_id, + uint64_t area_id); + +int dm_stats_get_average_wr_wait_time(const struct dm_stats *dms, + double *await, uint64_t region_id, + uint64_t area_id); + +int dm_stats_get_throughput(const struct dm_stats *dms, double *tput, + uint64_t region_id, uint64_t area_id); + +int dm_stats_get_utilization(const struct dm_stats *dms, dm_percent_t *util, + uint64_t region_id, uint64_t area_id); + +/* + * Statistics histogram access methods. + * + * Methods to access latency histograms for regions that have them + * enabled. Each histogram contains a configurable number of bins + * spanning a user defined latency interval. + * + * The bin count, upper and lower bin bounds, and bin values are + * made available via the following area methods. + * + * Methods to obtain a simple string representation of the histogram + * and its bounds are also provided. + */ + +/* + * Retrieve a pointer to the histogram associated with the specified + * area. If the area does not have a histogram configured this function + * returns NULL. + * + * The pointer does not need to be freed explicitly by the caller: it + * will become invalid following a subsequent dm_stats_list(), + * dm_stats_populate() or dm_stats_destroy() of the corresponding + * dm_stats handle. + * + * If region_id or area_id is one of the special values + * DM_STATS_REGION_CURRENT or DM_STATS_AREA_CURRENT the current cursor + * value is used to select the region or area. + */ +struct dm_histogram *dm_stats_get_histogram(const struct dm_stats *dms, + uint64_t region_id, + uint64_t area_id); + +/* + * Return the number of bins in the specified histogram handle. + */ +int dm_histogram_get_nr_bins(const struct dm_histogram *dmh); + +/* + * Get the lower bound of the specified bin of the histogram for the + * area specified by region_id and area_id. The value is returned in + * nanoseconds. + */ +uint64_t dm_histogram_get_bin_lower(const struct dm_histogram *dmh, int bin); + +/* + * Get the upper bound of the specified bin of the histogram for the + * area specified by region_id and area_id. The value is returned in + * nanoseconds. + */ +uint64_t dm_histogram_get_bin_upper(const struct dm_histogram *dmh, int bin); + +/* + * Get the width of the specified bin of the histogram for the area + * specified by region_id and area_id. The width is equal to the bin + * upper bound minus the lower bound and yields the range of latency + * values covered by this bin. The value is returned in nanoseconds. + */ +uint64_t dm_histogram_get_bin_width(const struct dm_histogram *dmh, int bin); + +/* + * Get the value of the specified bin of the histogram for the area + * specified by region_id and area_id. + */ +uint64_t dm_histogram_get_bin_count(const struct dm_histogram *dmh, int bin); + +/* + * Get the percentage (relative frequency) of the specified bin of the + * histogram for the area specified by region_id and area_id. + */ +dm_percent_t dm_histogram_get_bin_percent(const struct dm_histogram *dmh, + int bin); + +/* + * Return the total observations (sum of bin counts) for the histogram + * of the area specified by region_id and area_id. + */ +uint64_t dm_histogram_get_sum(const struct dm_histogram *dmh); + +/* + * Histogram formatting flags. + */ +#define DM_HISTOGRAM_SUFFIX 0x1 +#define DM_HISTOGRAM_VALUES 0x2 +#define DM_HISTOGRAM_PERCENT 0X4 +#define DM_HISTOGRAM_BOUNDS_LOWER 0x10 +#define DM_HISTOGRAM_BOUNDS_UPPER 0x20 +#define DM_HISTOGRAM_BOUNDS_RANGE 0x30 + +/* + * Return a string representation of the supplied histogram's values and + * bin boundaries. + * + * The bin argument selects the bin to format. If this argument is less + * than zero all bins will be included in the resulting string. + * + * width specifies a minimum width for the field in characters; if it is + * zero the width will be determined automatically based on the options + * selected for formatting. A value less than zero disables field width + * control: bin boundaries and values will be output with a minimum + * amount of whitespace. + * + * flags is a collection of flag arguments that control the string format: + * + * DM_HISTOGRAM_VALUES - Include bin values in the string. + * DM_HISTOGRAM_SUFFIX - Include time unit suffixes when printing bounds. + * DM_HISTOGRAM_PERCENT - Format bin values as a percentage. + * + * DM_HISTOGRAM_BOUNDS_LOWER - Include the lower bound of each bin. + * DM_HISTOGRAM_BOUNDS_UPPER - Include the upper bound of each bin. + * DM_HISTOGRAM_BOUNDS_RANGE - Show the span of each bin as "lo-up". + * + * The returned pointer does not need to be freed explicitly by the + * caller: it will become invalid following a subsequent + * dm_stats_list(), dm_stats_populate() or dm_stats_destroy() of the + * corresponding dm_stats handle. + */ +const char *dm_histogram_to_string(const struct dm_histogram *dmh, int bin, + int width, int flags); + +/************************* + * config file parse/print + *************************/ +typedef enum { + DM_CFG_INT, + DM_CFG_FLOAT, + DM_CFG_STRING, + DM_CFG_EMPTY_ARRAY +} dm_config_value_type_t; + +struct dm_config_value { + dm_config_value_type_t type; + + union { + int64_t i; + float f; + double d; /* Unused. */ + const char *str; + } v; + + struct dm_config_value *next; /* For arrays */ + uint32_t format_flags; +}; + +struct dm_config_node { + const char *key; + struct dm_config_node *parent, *sib, *child; + struct dm_config_value *v; + int id; +}; + +struct dm_config_tree { + struct dm_config_node *root; + struct dm_config_tree *cascade; + struct dm_pool *mem; + void *custom; +}; + +struct dm_config_tree *dm_config_create(void); +struct dm_config_tree *dm_config_from_string(const char *config_settings); +int dm_config_parse(struct dm_config_tree *cft, const char *start, const char *end); +int dm_config_parse_without_dup_node_check(struct dm_config_tree *cft, const char *start, const char *end); + +void *dm_config_get_custom(struct dm_config_tree *cft); +void dm_config_set_custom(struct dm_config_tree *cft, void *custom); + +/* + * When searching, first_cft is checked before second_cft. + */ +struct dm_config_tree *dm_config_insert_cascaded_tree(struct dm_config_tree *first_cft, struct dm_config_tree *second_cft); + +/* + * If there's a cascaded dm_config_tree, remove the top layer + * and return the layer below. Otherwise return NULL. + */ +struct dm_config_tree *dm_config_remove_cascaded_tree(struct dm_config_tree *cft); + +/* + * Create a new, uncascaded config tree equivalent to the input cascade. + */ +struct dm_config_tree *dm_config_flatten(struct dm_config_tree *cft); + +void dm_config_destroy(struct dm_config_tree *cft); + +/* Simple output line by line. */ +typedef int (*dm_putline_fn)(const char *line, void *baton); +/* More advaced output with config node reference. */ +typedef int (*dm_config_node_out_fn)(const struct dm_config_node *cn, const char *line, void *baton); + +/* + * Specification for advanced config node output. + */ +struct dm_config_node_out_spec { + dm_config_node_out_fn prefix_fn; /* called before processing config node lines */ + dm_config_node_out_fn line_fn; /* called for each config node line */ + dm_config_node_out_fn suffix_fn; /* called after processing config node lines */ +}; + +/* Write the node and any subsequent siblings it has. */ +int dm_config_write_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton); +int dm_config_write_node_out(const struct dm_config_node *cn, const struct dm_config_node_out_spec *out_spec, void *baton); + +/* Write given node only without subsequent siblings. */ +int dm_config_write_one_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton); +int dm_config_write_one_node_out(const struct dm_config_node *cn, const struct dm_config_node_out_spec *out_spec, void *baton); + +struct dm_config_node *dm_config_find_node(const struct dm_config_node *cn, const char *path); +int dm_config_has_node(const struct dm_config_node *cn, const char *path); +int dm_config_remove_node(struct dm_config_node *parent, struct dm_config_node *remove); +const char *dm_config_find_str(const struct dm_config_node *cn, const char *path, const char *fail); +const char *dm_config_find_str_allow_empty(const struct dm_config_node *cn, const char *path, const char *fail); +int dm_config_find_int(const struct dm_config_node *cn, const char *path, int fail); +int64_t dm_config_find_int64(const struct dm_config_node *cn, const char *path, int64_t fail); +float dm_config_find_float(const struct dm_config_node *cn, const char *path, float fail); + +const struct dm_config_node *dm_config_tree_find_node(const struct dm_config_tree *cft, const char *path); +const char *dm_config_tree_find_str(const struct dm_config_tree *cft, const char *path, const char *fail); +const char *dm_config_tree_find_str_allow_empty(const struct dm_config_tree *cft, const char *path, const char *fail); +int dm_config_tree_find_int(const struct dm_config_tree *cft, const char *path, int fail); +int64_t dm_config_tree_find_int64(const struct dm_config_tree *cft, const char *path, int64_t fail); +float dm_config_tree_find_float(const struct dm_config_tree *cft, const char *path, float fail); +int dm_config_tree_find_bool(const struct dm_config_tree *cft, const char *path, int fail); + +/* + * Understands (0, ~0), (y, n), (yes, no), (on, + * off), (true, false). + */ +int dm_config_find_bool(const struct dm_config_node *cn, const char *path, int fail); +int dm_config_value_is_bool(const struct dm_config_value *v); + +int dm_config_get_uint32(const struct dm_config_node *cn, const char *path, uint32_t *result); +int dm_config_get_uint64(const struct dm_config_node *cn, const char *path, uint64_t *result); +int dm_config_get_str(const struct dm_config_node *cn, const char *path, const char **result); +int dm_config_get_list(const struct dm_config_node *cn, const char *path, const struct dm_config_value **result); +int dm_config_get_section(const struct dm_config_node *cn, const char *path, const struct dm_config_node **result); + +unsigned dm_config_maybe_section(const char *str, unsigned len); + +const char *dm_config_parent_name(const struct dm_config_node *n); + +struct dm_config_node *dm_config_clone_node_with_mem(struct dm_pool *mem, const struct dm_config_node *node, int siblings); +struct dm_config_node *dm_config_create_node(struct dm_config_tree *cft, const char *key); +struct dm_config_value *dm_config_create_value(struct dm_config_tree *cft); +struct dm_config_node *dm_config_clone_node(struct dm_config_tree *cft, const struct dm_config_node *cn, int siblings); + +/* + * Common formatting flags applicable to all config node types (lower 16 bits). + */ +#define DM_CONFIG_VALUE_FMT_COMMON_ARRAY 0x00000001 /* value is array */ +#define DM_CONFIG_VALUE_FMT_COMMON_EXTRA_SPACES 0x00000002 /* add spaces in "key = value" pairs in constrast to "key=value" for better readability */ + +/* + * Type-related config node formatting flags (higher 16 bits). + */ +/* int-related formatting flags */ +#define DM_CONFIG_VALUE_FMT_INT_OCTAL 0x00010000 /* print number in octal form */ + +/* string-related formatting flags */ +#define DM_CONFIG_VALUE_FMT_STRING_NO_QUOTES 0x00010000 /* do not print quotes around string value */ + +void dm_config_value_set_format_flags(struct dm_config_value *cv, uint32_t format_flags); +uint32_t dm_config_value_get_format_flags(struct dm_config_value *cv); + +struct dm_pool *dm_config_memory(struct dm_config_tree *cft); + +/* Udev device directory. */ +#define DM_UDEV_DEV_DIR "/dev/" + +/* Cookie prefixes. + * + * The cookie value consists of a prefix (16 bits) and a base (16 bits). + * We can use the prefix to store the flags. These flags are sent to + * kernel within given dm task. When returned back to userspace in + * DM_COOKIE udev environment variable, we can control several aspects + * of udev rules we use by decoding the cookie prefix. When doing the + * notification, we replace the cookie prefix with DM_COOKIE_MAGIC, + * so we notify the right semaphore. + * + * It is still possible to use cookies for passing the flags to udev + * rules even when udev_sync is disabled. The base part of the cookie + * will be zero (there's no notification semaphore) and prefix will be + * set then. However, having udev_sync enabled is highly recommended. + */ +#define DM_COOKIE_MAGIC 0x0D4D +#define DM_UDEV_FLAGS_MASK 0xFFFF0000 +#define DM_UDEV_FLAGS_SHIFT 16 + +/* + * DM_UDEV_DISABLE_DM_RULES_FLAG is set in case we need to disable + * basic device-mapper udev rules that create symlinks in /dev/<DM_DIR> + * directory. However, we can't reliably prevent creating default + * nodes by udev (commonly /dev/dm-X, where X is a number). + */ +#define DM_UDEV_DISABLE_DM_RULES_FLAG 0x0001 +/* + * DM_UDEV_DISABLE_SUBSYTEM_RULES_FLAG is set in case we need to disable + * subsystem udev rules, but still we need the general DM udev rules to + * be applied (to create the nodes and symlinks under /dev and /dev/disk). + */ +#define DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG 0x0002 +/* + * DM_UDEV_DISABLE_DISK_RULES_FLAG is set in case we need to disable + * general DM rules that set symlinks in /dev/disk directory. + */ +#define DM_UDEV_DISABLE_DISK_RULES_FLAG 0x0004 +/* + * DM_UDEV_DISABLE_OTHER_RULES_FLAG is set in case we need to disable + * all the other rules that are not general device-mapper nor subsystem + * related (the rules belong to other software or packages). All foreign + * rules should check this flag directly and they should ignore further + * rule processing for such event. + */ +#define DM_UDEV_DISABLE_OTHER_RULES_FLAG 0x0008 +/* + * DM_UDEV_LOW_PRIORITY_FLAG is set in case we need to instruct the + * udev rules to give low priority to the device that is currently + * processed. For example, this provides a way to select which symlinks + * could be overwritten by high priority ones if their names are equal. + * Common situation is a name based on FS UUID while using origin and + * snapshot devices. + */ +#define DM_UDEV_LOW_PRIORITY_FLAG 0x0010 +/* + * DM_UDEV_DISABLE_LIBRARY_FALLBACK is set in case we need to disable + * libdevmapper's node management. We will rely on udev completely + * and there will be no fallback action provided by libdevmapper if + * udev does something improperly. Using the library fallback code has + * a consequence that you need to take into account: any device node + * or symlink created without udev is not recorded in udev database + * which other applications may read to get complete list of devices. + * For this reason, use of DM_UDEV_DISABLE_LIBRARY_FALLBACK is + * recommended on systems where udev is used. Keep library fallback + * enabled just for exceptional cases where you need to debug udev-related + * problems. If you hit such problems, please contact us through upstream + * LVM2 development mailing list (see also README file). This flag is + * currently not set by default in libdevmapper so you need to set it + * explicitly if you're sure that udev is behaving correctly on your + * setups. + */ +#define DM_UDEV_DISABLE_LIBRARY_FALLBACK 0x0020 +/* + * DM_UDEV_PRIMARY_SOURCE_FLAG is automatically appended by + * libdevmapper for all ioctls generating udev uevents. Once used in + * udev rules, we know if this is a real "primary sourced" event or not. + * We need to distinguish real events originated in libdevmapper from + * any spurious events to gather all missing information (e.g. events + * generated as a result of "udevadm trigger" command or as a result + * of the "watch" udev rule). + */ +#define DM_UDEV_PRIMARY_SOURCE_FLAG 0x0040 + +/* + * Udev flags reserved for use by any device-mapper subsystem. + */ +#define DM_SUBSYSTEM_UDEV_FLAG0 0x0100 +#define DM_SUBSYSTEM_UDEV_FLAG1 0x0200 +#define DM_SUBSYSTEM_UDEV_FLAG2 0x0400 +#define DM_SUBSYSTEM_UDEV_FLAG3 0x0800 +#define DM_SUBSYSTEM_UDEV_FLAG4 0x1000 +#define DM_SUBSYSTEM_UDEV_FLAG5 0x2000 +#define DM_SUBSYSTEM_UDEV_FLAG6 0x4000 +#define DM_SUBSYSTEM_UDEV_FLAG7 0x8000 + +int dm_cookie_supported(void); + +/* + * Udev synchronisation functions. + */ +void dm_udev_set_sync_support(int sync_with_udev); +int dm_udev_get_sync_support(void); +void dm_udev_set_checking(int checking); +int dm_udev_get_checking(void); + +/* + * Default value to get new auto generated cookie created + */ +#define DM_COOKIE_AUTO_CREATE 0 +int dm_udev_create_cookie(uint32_t *cookie); +int dm_udev_complete(uint32_t cookie); +int dm_udev_wait(uint32_t cookie); + +/* + * dm_dev_wait_immediate + * If *ready is 1 on return, the wait is complete. + * If *ready is 0 on return, the wait is incomplete and either + * this function or dm_udev_wait() must be called again. + * Returns 0 on error, when neither function should be called again. + */ +int dm_udev_wait_immediate(uint32_t cookie, int *ready); + +#define DM_DEV_DIR_UMASK 0022 +#define DM_CONTROL_NODE_UMASK 0177 + +#ifdef __cplusplus +} +#endif +#endif /* LIB_DEVICE_MAPPER_H */ diff --git a/device_mapper/libdm-common.c b/device_mapper/libdm-common.c new file mode 100644 index 0000000..bcf12cb --- /dev/null +++ b/device_mapper/libdm-common.c @@ -0,0 +1,2691 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "device_mapper/misc/dmlib.h" +#include "ioctl/libdm-targets.h" +#include "libdm-common.h" +#include "misc/kdev_t.h" +#include "misc/dm-ioctl.h" + +#include <stdarg.h> +#include <sys/param.h> +#include <sys/ioctl.h> +#include <fcntl.h> +#include <dirent.h> +#include <unistd.h> + +#ifdef UDEV_SYNC_SUPPORT +# include <sys/types.h> +# include <sys/ipc.h> +# include <sys/sem.h> +# include <libudev.h> +#endif + +#ifdef __linux__ +# include <linux/fs.h> +#endif + +#ifdef HAVE_SELINUX +# include <selinux/selinux.h> +#endif +#ifdef HAVE_SELINUX_LABEL_H +# include <selinux/label.h> +#endif + +#define DM_DEFAULT_NAME_MANGLING_MODE_ENV_VAR_NAME "DM_DEFAULT_NAME_MANGLING_MODE" + +#define DEV_DIR "/dev/" + +#ifdef UDEV_SYNC_SUPPORT +#ifdef _SEM_SEMUN_UNDEFINED +union semun +{ + int val; /* value for SETVAL */ + struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */ + unsigned short int *array; /* array for GETALL & SETALL */ + struct seminfo *__buf; /* buffer for IPC_INFO */ +}; +#endif +#endif + +static char _dm_dir[PATH_MAX] = DEV_DIR DM_DIR; +static char _sysfs_dir[PATH_MAX] = "/sys/"; +static char _path0[PATH_MAX]; /* path buffer, safe 4kB on stack */ +static const char _mountinfo[] = "/proc/self/mountinfo"; + +#define DM_MAX_UUID_PREFIX_LEN 15 +static char _default_uuid_prefix[DM_MAX_UUID_PREFIX_LEN + 1] = "LVM-"; + +static int _verbose = 0; +static int _suspended_dev_counter = 0; +static dm_string_mangling_t _name_mangling_mode = DEFAULT_DM_NAME_MANGLING; + +#ifdef HAVE_SELINUX_LABEL_H +static struct selabel_handle *_selabel_handle = NULL; +#endif + +static int _udev_disabled = 0; + +#ifdef UDEV_SYNC_SUPPORT +static int _semaphore_supported = -1; +static int _udev_running = -1; +static int _sync_with_udev = 1; +static int _udev_checking = 1; +#endif + +void dm_lib_init(void) +{ + const char *env; + + if (getenv("DM_DISABLE_UDEV")) + _udev_disabled = 1; + + _name_mangling_mode = DEFAULT_DM_NAME_MANGLING; + if ((env = getenv(DM_DEFAULT_NAME_MANGLING_MODE_ENV_VAR_NAME))) { + if (!strcasecmp(env, "none")) + _name_mangling_mode = DM_STRING_MANGLING_NONE; + else if (!strcasecmp(env, "auto")) + _name_mangling_mode = DM_STRING_MANGLING_AUTO; + else if (!strcasecmp(env, "hex")) + _name_mangling_mode = DM_STRING_MANGLING_HEX; + } +} + +/* + * Library users can provide their own logging + * function. + */ + +__attribute__((format(printf, 5, 0))) +static void _default_log_line(int level, const char *file, + int line, int dm_errno_or_class, + const char *f, va_list ap) +{ + static int _abort_on_internal_errors = -1; + static int _debug_with_line_numbers = -1; + FILE *out = log_stderr(level) ? stderr : stdout; + + level = log_level(level); + + if (level <= _LOG_WARN || _verbose) { + if (level < _LOG_WARN) + out = stderr; + + if (_debug_with_line_numbers < 0) + /* Set when env DM_DEBUG_WITH_LINE_NUMBERS is not "0" */ + _debug_with_line_numbers = + strcmp(getenv("DM_DEBUG_WITH_LINE_NUMBERS") ? : "0", "0"); + + if (_debug_with_line_numbers) + fprintf(out, "%s:%d ", file, line); + + vfprintf(out, f, ap); + fputc('\n', out); + } + + if (_abort_on_internal_errors < 0) + /* Set when env DM_ABORT_ON_INTERNAL_ERRORS is not "0" */ + _abort_on_internal_errors = + strcmp(getenv("DM_ABORT_ON_INTERNAL_ERRORS") ? : "0", "0"); + + if (_abort_on_internal_errors && + !strncmp(f, INTERNAL_ERROR, sizeof(INTERNAL_ERROR) - 1)) + abort(); +} + +__attribute__((format(printf, 5, 6))) +static void _default_log_with_errno(int level, + const char *file, int line, int dm_errno_or_class, + const char *f, ...) +{ + va_list ap; + + va_start(ap, f); + _default_log_line(level, file, line, dm_errno_or_class, f, ap); + va_end(ap); +} + +__attribute__((format(printf, 4, 5))) +static void _default_log(int level, const char *file, + int line, const char *f, ...) +{ + va_list ap; + + va_start(ap, f); + _default_log_line(level, file, line, 0, f, ap); + va_end(ap); +} + +dm_log_fn dm_log = _default_log; +dm_log_with_errno_fn dm_log_with_errno = _default_log_with_errno; + +/* + * Wrapper function to reformat new messages to and + * old style logging which had not used errno parameter + * + * As we cannot simply pass '...' to old function we + * need to process arg list locally and just pass '%s' + buffer + */ +__attribute__((format(printf, 5, 6))) +static void _log_to_default_log(int level, + const char *file, int line, int dm_errno_or_class, + const char *f, ...) +{ + int n; + va_list ap; + char buf[2 * PATH_MAX + 256]; /* big enough for most messages */ + + va_start(ap, f); + n = vsnprintf(buf, sizeof(buf), f, ap); + va_end(ap); + + if (n > 0) /* Could be truncated */ + dm_log(level, file, line, "%s", buf); +} + +/* + * Wrapper function take 'old' style message without errno + * and log it via new logging function with errno arg + * + * This minor case may happen if new libdm is used with old + * recompiled tool that would decided to use new logging, + * but still would like to use old binary plugins. + */ +__attribute__((format(printf, 4, 5))) +static void _log_to_default_log_with_errno(int level, + const char *file, int line, const char *f, ...) +{ + int n; + va_list ap; + char buf[2 * PATH_MAX + 256]; /* big enough for most messages */ + + va_start(ap, f); + n = vsnprintf(buf, sizeof(buf), f, ap); + va_end(ap); + + if (n > 0) /* Could be truncated */ + dm_log_with_errno(level, file, line, 0, "%s", buf); +} + +void dm_log_init(dm_log_fn fn) +{ + if (fn) { + dm_log = fn; + dm_log_with_errno = _log_to_default_log; + } else { + dm_log = _default_log; + dm_log_with_errno = _default_log_with_errno; + } +} + +int dm_log_is_non_default(void) +{ + return (dm_log == _default_log && dm_log_with_errno == _default_log_with_errno) ? 0 : 1; +} + +void dm_log_with_errno_init(dm_log_with_errno_fn fn) +{ + if (fn) { + dm_log = _log_to_default_log_with_errno; + dm_log_with_errno = fn; + } else { + dm_log = _default_log; + dm_log_with_errno = _default_log_with_errno; + } +} + +void dm_log_init_verbose(int level) +{ + _verbose = level; +} + +static int _build_dev_path(char *buffer, size_t len, const char *dev_name) +{ + int r; + + /* If there's a /, assume caller knows what they're doing */ + if (strchr(dev_name, '/')) + r = dm_strncpy(buffer, dev_name, len); + else + r = (dm_snprintf(buffer, len, "%s/%s", + _dm_dir, dev_name) < 0) ? 0 : 1; + if (!r) + log_error("Failed to build dev path for \"%s\".", dev_name); + + return r; +} + +int dm_get_library_version(char *version, size_t size) +{ + return dm_strncpy(version, DM_LIB_VERSION, size); +} + +void inc_suspended(void) +{ + _suspended_dev_counter++; + log_debug_activation("Suspended device counter increased to %d", _suspended_dev_counter); +} + +void dec_suspended(void) +{ + if (!_suspended_dev_counter) { + log_error("Attempted to decrement suspended device counter below zero."); + return; + } + + _suspended_dev_counter--; + log_debug_activation("Suspended device counter reduced to %d", _suspended_dev_counter); +} + +int dm_get_suspended_counter(void) +{ + return _suspended_dev_counter; +} + +int dm_set_name_mangling_mode(dm_string_mangling_t name_mangling_mode) +{ + _name_mangling_mode = name_mangling_mode; + + return 1; +} + +dm_string_mangling_t dm_get_name_mangling_mode(void) +{ + return _name_mangling_mode; +} + +struct dm_task *dm_task_create(int type) +{ + struct dm_task *dmt = dm_zalloc(sizeof(*dmt)); + + if (!dmt) { + log_error("dm_task_create: malloc(%" PRIsize_t ") failed", + sizeof(*dmt)); + return NULL; + } + + if (!dm_check_version()) { + dm_free(dmt); + return_NULL; + } + + dmt->type = type; + dmt->minor = -1; + dmt->major = -1; + dmt->allow_default_major_fallback = 1; + dmt->uid = DM_DEVICE_UID; + dmt->gid = DM_DEVICE_GID; + dmt->mode = DM_DEVICE_MODE; + dmt->no_open_count = 0; + dmt->read_ahead = DM_READ_AHEAD_AUTO; + dmt->read_ahead_flags = 0; + dmt->event_nr = 0; + dmt->cookie_set = 0; + dmt->query_inactive_table = 0; + dmt->new_uuid = 0; + dmt->secure_data = 0; + dmt->record_timestamp = 0; + + return dmt; +} + +/* + * Find the name associated with a given device number by scanning _dm_dir. + */ +static int _find_dm_name_of_device(dev_t st_rdev, char *buf, size_t buf_len) +{ + const char *name; + char path[PATH_MAX]; + struct dirent *dirent; + DIR *d; + struct stat st; + int r = 0; + + if (!(d = opendir(_dm_dir))) { + log_sys_error("opendir", _dm_dir); + return 0; + } + + while ((dirent = readdir(d))) { + name = dirent->d_name; + + if (!strcmp(name, ".") || !strcmp(name, "..")) + continue; + + if (dm_snprintf(path, sizeof(path), "%s/%s", _dm_dir, + name) == -1) { + log_error("Couldn't create path for %s", name); + continue; + } + + if (stat(path, &st)) + continue; + + if (st.st_rdev == st_rdev) { + strncpy(buf, name, buf_len); + r = 1; + break; + } + } + + if (closedir(d)) + log_sys_error("closedir", _dm_dir); + + return r; +} + +static int _is_whitelisted_char(char c) +{ + /* + * Actually, DM supports any character in a device name. + * This whitelist is just for proper integration with udev. + */ + if ((c >= '0' && c <= '9') || + (c >= 'A' && c <= 'Z') || + (c >= 'a' && c <= 'z') || + strchr("#+-.:=@_", c) != NULL) + return 1; + + return 0; +} + +int check_multiple_mangled_string_allowed(const char *str, const char *str_name, + dm_string_mangling_t mode) +{ + if (mode == DM_STRING_MANGLING_AUTO && strstr(str, "\\x5cx")) { + log_error("The %s \"%s\" seems to be mangled more than once. " + "This is not allowed in auto mode.", str_name, str); + return 0; + } + + return 1; +} + +/* + * Mangle all characters in the input string which are not on a whitelist + * with '\xNN' format where NN is the hex value of the character. + */ +int mangle_string(const char *str, const char *str_name, size_t len, + char *buf, size_t buf_len, dm_string_mangling_t mode) +{ + int need_mangling = -1; /* -1 don't know yet, 0 no, 1 yes */ + size_t i, j; + + if (!str || !buf) + return -1; + + /* Is there anything to do at all? */ + if (!*str || !len) + return 0; + + if (buf_len < DM_NAME_LEN) { + log_error(INTERNAL_ERROR "mangle_string: supplied buffer too small"); + return -1; + } + + if (mode == DM_STRING_MANGLING_NONE) + mode = DM_STRING_MANGLING_AUTO; + + for (i = 0, j = 0; str[i]; i++) { + if (mode == DM_STRING_MANGLING_AUTO) { + /* + * Detect already mangled part of the string and keep it. + * Return error on mixture of mangled/not mangled! + */ + if (str[i] == '\\' && str[i+1] == 'x') { + if ((len - i < 4) || (need_mangling == 1)) + goto bad1; + if (buf_len - j < 4) + goto bad2; + + memcpy(&buf[j], &str[i], 4); + i+=3; j+=4; + + need_mangling = 0; + continue; + } + } + + if (_is_whitelisted_char(str[i])) { + /* whitelisted, keep it. */ + if (buf_len - j < 1) + goto bad2; + buf[j] = str[i]; + j++; + } else { + /* + * Not on a whitelist, mangle it. + * Return error on mixture of mangled/not mangled + * unless a DM_STRING_MANGLING_HEX is used!. + */ + if ((mode != DM_STRING_MANGLING_HEX) && (need_mangling == 0)) + goto bad1; + if (buf_len - j < 4) + goto bad2; + + sprintf(&buf[j], "\\x%02x", (unsigned char) str[i]); + j+=4; + + need_mangling = 1; + } + } + + if (buf_len - j < 1) + goto bad2; + buf[j] = '\0'; + + /* All chars in the string whitelisted? */ + if (need_mangling == -1) + need_mangling = 0; + + return need_mangling; + +bad1: + log_error("The %s \"%s\" contains mixed mangled and unmangled " + "characters or it's already mangled improperly.", str_name, str); + return -1; +bad2: + log_error("Mangled form of the %s too long for \"%s\".", str_name, str); + return -1; +} + +/* + * Try to unmangle supplied string. + * Return value: -1 on error, 0 when no unmangling needed, 1 when unmangling applied + */ +int unmangle_string(const char *str, const char *str_name, size_t len, + char *buf, size_t buf_len, dm_string_mangling_t mode) +{ + int strict = mode != DM_STRING_MANGLING_NONE; + char str_rest[DM_NAME_LEN]; + size_t i, j; + int code; + int r = 0; + + if (!str || !buf) + return -1; + + /* Is there anything to do at all? */ + if (!*str || !len) + return 0; + + if (buf_len < DM_NAME_LEN) { + log_error(INTERNAL_ERROR "unmangle_string: supplied buffer too small"); + return -1; + } + + for (i = 0, j = 0; str[i]; i++, j++) { + if (strict && !(_is_whitelisted_char(str[i]) || str[i]=='\\')) { + log_error("The %s \"%s\" should be mangled but " + "it contains blacklisted characters.", str_name, str); + j=0; r=-1; + goto out; + } + + if (str[i] == '\\' && str[i+1] == 'x') { + if (!sscanf(&str[i+2], "%2x%s", &code, str_rest)) { + log_debug_activation("Hex encoding mismatch detected in %s \"%s\" " + "while trying to unmangle it.", str_name, str); + goto out; + } + buf[j] = (unsigned char) code; + + /* skip the encoded part we've just decoded! */ + i+= 3; + + /* unmangling applied */ + r = 1; + } else + buf[j] = str[i]; + } + +out: + buf[j] = '\0'; + return r; +} + +static int _dm_task_set_name(struct dm_task *dmt, const char *name, + dm_string_mangling_t mangling_mode) +{ + char mangled_name[DM_NAME_LEN]; + int r = 0; + + dm_free(dmt->dev_name); + dmt->dev_name = NULL; + dm_free(dmt->mangled_dev_name); + dmt->mangled_dev_name = NULL; + + if (strlen(name) >= DM_NAME_LEN) { + log_error("Name \"%s\" too long.", name); + return 0; + } + + if (!check_multiple_mangled_string_allowed(name, "name", mangling_mode)) + return_0; + + if (mangling_mode != DM_STRING_MANGLING_NONE && + (r = mangle_string(name, "name", strlen(name), mangled_name, + sizeof(mangled_name), mangling_mode)) < 0) { + log_error("Failed to mangle device name \"%s\".", name); + return 0; + } + + /* Store mangled_dev_name only if it differs from dev_name! */ + if (r) { + log_debug_activation("Device name mangled [%s]: %s --> %s", + mangling_mode == DM_STRING_MANGLING_AUTO ? "auto" : "hex", + name, mangled_name); + if (!(dmt->mangled_dev_name = dm_strdup(mangled_name))) { + log_error("_dm_task_set_name: dm_strdup(%s) failed", mangled_name); + return 0; + } + } + + if (!(dmt->dev_name = dm_strdup(name))) { + log_error("_dm_task_set_name: strdup(%s) failed", name); + return 0; + } + + return 1; +} + +static int _dm_task_set_name_from_path(struct dm_task *dmt, const char *path, + const char *name) +{ + char buf[PATH_MAX]; + struct stat st1, st2; + const char *final_name = NULL; + size_t len; + + if (dmt->type == DM_DEVICE_CREATE) { + log_error("Name \"%s\" invalid. It contains \"/\".", path); + return 0; + } + + if (!stat(path, &st1)) { + /* + * Found directly. + * If supplied path points to same device as last component + * under /dev/mapper, use that name directly. + */ + if (dm_snprintf(buf, sizeof(buf), "%s/%s", _dm_dir, name) == -1) { + log_error("Couldn't create path for %s", name); + return 0; + } + + if (!stat(buf, &st2) && (st1.st_rdev == st2.st_rdev)) + final_name = name; + } else { + /* Not found. */ + /* If there is exactly one '/' try a prefix of /dev */ + if ((len = strlen(path)) < 3 || path[0] == '/' || + dm_count_chars(path, len, '/') != 1) { + log_error("Device %s not found", path); + return 0; + } + if (dm_snprintf(buf, sizeof(buf), "%s/../%s", _dm_dir, path) == -1) { + log_error("Couldn't create /dev path for %s", path); + return 0; + } + if (stat(buf, &st1)) { + log_error("Device %s not found", path); + return 0; + } + /* Found */ + } + + /* + * If we don't have the dm name yet, Call _find_dm_name_of_device() to + * scan _dm_dir for a match. + */ + if (!final_name) { + if (_find_dm_name_of_device(st1.st_rdev, buf, sizeof(buf))) + final_name = buf; + else { + log_error("Device %s not found", name); + return 0; + } + } + + /* This is an already existing path - do not mangle! */ + return _dm_task_set_name(dmt, final_name, DM_STRING_MANGLING_NONE); +} + +int dm_task_set_name(struct dm_task *dmt, const char *name) +{ + char *pos; + + /* Path supplied for existing device? */ + if ((pos = strrchr(name, '/'))) + return _dm_task_set_name_from_path(dmt, name, pos + 1); + + return _dm_task_set_name(dmt, name, dm_get_name_mangling_mode()); +} + +const char *dm_task_get_name(const struct dm_task *dmt) +{ + return (dmt->dmi.v4->name); +} + +static char *_task_get_string_mangled(const char *str, const char *str_name, + char *buf, size_t buf_size, + dm_string_mangling_t mode) +{ + char *rs; + int r; + + if ((r = mangle_string(str, str_name, strlen(str), buf, buf_size, mode)) < 0) + return NULL; + + if (!(rs = r ? dm_strdup(buf) : dm_strdup(str))) + log_error("_task_get_string_mangled: dm_strdup failed"); + + return rs; +} + +static char *_task_get_string_unmangled(const char *str, const char *str_name, + char *buf, size_t buf_size, + dm_string_mangling_t mode) +{ + char *rs; + int r = 0; + + /* + * Unless the mode used is 'none', the string + * is *already* unmangled on ioctl return! + */ + if (mode == DM_STRING_MANGLING_NONE && + (r = unmangle_string(str, str_name, strlen(str), buf, buf_size, mode)) < 0) + return NULL; + + if (!(rs = r ? dm_strdup(buf) : dm_strdup(str))) + log_error("_task_get_string_unmangled: dm_strdup failed"); + + return rs; +} + +char *dm_task_get_name_mangled(const struct dm_task *dmt) +{ + const char *s = dm_task_get_name(dmt); + char buf[DM_NAME_LEN]; + char *rs; + + if (!(rs = _task_get_string_mangled(s, "name", buf, sizeof(buf), dm_get_name_mangling_mode()))) + log_error("Failed to mangle device name \"%s\".", s); + + return rs; +} + +char *dm_task_get_name_unmangled(const struct dm_task *dmt) +{ + const char *s = dm_task_get_name(dmt); + char buf[DM_NAME_LEN]; + char *rs; + + if (!(rs = _task_get_string_unmangled(s, "name", buf, sizeof(buf), dm_get_name_mangling_mode()))) + log_error("Failed to unmangle device name \"%s\".", s); + + return rs; +} + +const char *dm_task_get_uuid(const struct dm_task *dmt) +{ + return (dmt->dmi.v4->uuid); +} + +char *dm_task_get_uuid_mangled(const struct dm_task *dmt) +{ + const char *s = dm_task_get_uuid(dmt); + char buf[DM_UUID_LEN]; + char *rs; + + if (!(rs = _task_get_string_mangled(s, "UUID", buf, sizeof(buf), dm_get_name_mangling_mode()))) + log_error("Failed to mangle device uuid \"%s\".", s); + + return rs; +} + +char *dm_task_get_uuid_unmangled(const struct dm_task *dmt) +{ + const char *s = dm_task_get_uuid(dmt); + char buf[DM_UUID_LEN]; + char *rs; + + if (!(rs = _task_get_string_unmangled(s, "UUID", buf, sizeof(buf), dm_get_name_mangling_mode()))) + log_error("Failed to unmangle device uuid \"%s\".", s); + + return rs; +} + +int dm_task_set_newname(struct dm_task *dmt, const char *newname) +{ + dm_string_mangling_t mangling_mode = dm_get_name_mangling_mode(); + char mangled_name[DM_NAME_LEN]; + int r = 0; + + if (strchr(newname, '/')) { + log_error("Name \"%s\" invalid. It contains \"/\".", newname); + return 0; + } + + if (strlen(newname) >= DM_NAME_LEN) { + log_error("Name \"%s\" too long", newname); + return 0; + } + + if (!*newname) { + log_error("Non empty new name is required."); + return 0; + } + + if (!check_multiple_mangled_string_allowed(newname, "new name", mangling_mode)) + return_0; + + if (mangling_mode != DM_STRING_MANGLING_NONE && + (r = mangle_string(newname, "new name", strlen(newname), mangled_name, + sizeof(mangled_name), mangling_mode)) < 0) { + log_error("Failed to mangle new device name \"%s\"", newname); + return 0; + } + + if (r) { + log_debug_activation("New device name mangled [%s]: %s --> %s", + mangling_mode == DM_STRING_MANGLING_AUTO ? "auto" : "hex", + newname, mangled_name); + newname = mangled_name; + } + + dm_free(dmt->newname); + if (!(dmt->newname = dm_strdup(newname))) { + log_error("dm_task_set_newname: strdup(%s) failed", newname); + return 0; + } + + dmt->new_uuid = 0; + + return 1; +} + +int dm_task_set_uuid(struct dm_task *dmt, const char *uuid) +{ + char mangled_uuid[DM_UUID_LEN]; + dm_string_mangling_t mangling_mode = dm_get_name_mangling_mode(); + int r = 0; + + dm_free(dmt->uuid); + dmt->uuid = NULL; + dm_free(dmt->mangled_uuid); + dmt->mangled_uuid = NULL; + + if (!check_multiple_mangled_string_allowed(uuid, "UUID", mangling_mode)) + return_0; + + if (mangling_mode != DM_STRING_MANGLING_NONE && + (r = mangle_string(uuid, "UUID", strlen(uuid), mangled_uuid, + sizeof(mangled_uuid), mangling_mode)) < 0) { + log_error("Failed to mangle device uuid \"%s\".", uuid); + return 0; + } + + if (r) { + log_debug_activation("Device uuid mangled [%s]: %s --> %s", + mangling_mode == DM_STRING_MANGLING_AUTO ? "auto" : "hex", + uuid, mangled_uuid); + + if (!(dmt->mangled_uuid = dm_strdup(mangled_uuid))) { + log_error("dm_task_set_uuid: dm_strdup(%s) failed", mangled_uuid); + return 0; + } + } + + if (!(dmt->uuid = dm_strdup(uuid))) { + log_error("dm_task_set_uuid: strdup(%s) failed", uuid); + return 0; + } + + return 1; +} + +int dm_task_set_major(struct dm_task *dmt, int major) +{ + dmt->major = major; + dmt->allow_default_major_fallback = 0; + + return 1; +} + +int dm_task_set_minor(struct dm_task *dmt, int minor) +{ + dmt->minor = minor; + + return 1; +} + +int dm_task_set_major_minor(struct dm_task *dmt, int major, int minor, + int allow_default_major_fallback) +{ + dmt->major = major; + dmt->minor = minor; + dmt->allow_default_major_fallback = allow_default_major_fallback; + + return 1; +} + +int dm_task_set_uid(struct dm_task *dmt, uid_t uid) +{ + dmt->uid = uid; + + return 1; +} + +int dm_task_set_gid(struct dm_task *dmt, gid_t gid) +{ + dmt->gid = gid; + + return 1; +} + +int dm_task_set_mode(struct dm_task *dmt, mode_t mode) +{ + dmt->mode = mode; + + return 1; +} + +int dm_task_enable_checks(struct dm_task *dmt) +{ + dmt->enable_checks = 1; + + return 1; +} + +int dm_task_add_target(struct dm_task *dmt, uint64_t start, uint64_t size, + const char *ttype, const char *params) +{ + struct target *t = create_target(start, size, ttype, params); + if (!t) + return_0; + + if (!dmt->head) + dmt->head = dmt->tail = t; + else { + dmt->tail->next = t; + dmt->tail = t; + } + + return 1; +} + +#ifdef HAVE_SELINUX +static int _selabel_lookup(const char *path, mode_t mode, + security_context_t *scontext) +{ +#ifdef HAVE_SELINUX_LABEL_H + if (!_selabel_handle && + !(_selabel_handle = selabel_open(SELABEL_CTX_FILE, NULL, 0))) { + log_error("selabel_open failed: %s", strerror(errno)); + return 0; + } + + if (selabel_lookup(_selabel_handle, scontext, path, mode)) { + log_debug_activation("selabel_lookup failed for %s: %s", + path, strerror(errno)); + return 0; + } +#else + if (matchpathcon(path, mode, scontext)) { + log_debug_activation("matchpathcon failed for %s: %s", + path, strerror(errno)); + return 0; + } +#endif + return 1; +} +#endif + +#ifdef HAVE_SELINUX +static int _is_selinux_enabled(void) +{ + static int _tested = 0; + static int _enabled; + + if (!_tested) { + _tested = 1; + _enabled = is_selinux_enabled(); + } + + return _enabled; +} +#endif + +int dm_prepare_selinux_context(const char *path, mode_t mode) +{ +#ifdef HAVE_SELINUX + security_context_t scontext = NULL; + + if (_is_selinux_enabled() <= 0) + return 1; + + if (path) { + if (!_selabel_lookup(path, mode, &scontext)) + return_0; + + log_debug_activation("Preparing SELinux context for %s to %s.", path, scontext); + } + else + log_debug_activation("Resetting SELinux context to default value."); + + if (setfscreatecon(scontext) < 0) { + log_sys_error("setfscreatecon", (path ? : "SELinux context reset")); + freecon(scontext); + return 0; + } + + freecon(scontext); +#endif + return 1; +} + +int dm_set_selinux_context(const char *path, mode_t mode) +{ +#ifdef HAVE_SELINUX + security_context_t scontext = NULL; + + if (_is_selinux_enabled() <= 0) + return 1; + + if (!_selabel_lookup(path, mode, &scontext)) + return_0; + + log_debug_activation("Setting SELinux context for %s to %s.", path, scontext); + + if ((lsetfilecon(path, scontext) < 0) && (errno != ENOTSUP)) { + log_sys_error("lsetfilecon", path); + freecon(scontext); + return 0; + } + + freecon(scontext); +#endif + return 1; +} + +void selinux_release(void) +{ +#ifdef HAVE_SELINUX_LABEL_H + if (_selabel_handle) + selabel_close(_selabel_handle); + _selabel_handle = NULL; +#endif +} + +static int _warn_if_op_needed(int warn_if_udev_failed) +{ + return warn_if_udev_failed && dm_udev_get_sync_support() && dm_udev_get_checking(); +} + +static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor, + uid_t uid, gid_t gid, mode_t mode, int warn_if_udev_failed) +{ + char path[PATH_MAX]; + struct stat info; + dev_t dev = MKDEV((dev_t)major, (dev_t)minor); + mode_t old_mask; + + if (!_build_dev_path(path, sizeof(path), dev_name)) + return_0; + + if (stat(path, &info) >= 0) { + if (!S_ISBLK(info.st_mode)) { + log_error("A non-block device file at '%s' " + "is already present", path); + return 0; + } + + /* If right inode already exists we don't touch uid etc. */ + if (info.st_rdev == dev) + return 1; + + if (unlink(path) < 0) { + log_error("Unable to unlink device node for '%s'", + dev_name); + return 0; + } + } else if (_warn_if_op_needed(warn_if_udev_failed)) + log_warn("%s not set up by udev: Falling back to direct " + "node creation.", path); + + (void) dm_prepare_selinux_context(path, S_IFBLK); + old_mask = umask(0); + + /* The node may already have been created by udev. So ignore EEXIST. */ + if (mknod(path, S_IFBLK | mode, dev) < 0 && errno != EEXIST) { + log_error("%s: mknod for %s failed: %s", path, dev_name, strerror(errno)); + umask(old_mask); + (void) dm_prepare_selinux_context(NULL, 0); + return 0; + } + umask(old_mask); + (void) dm_prepare_selinux_context(NULL, 0); + + if (chown(path, uid, gid) < 0) { + log_sys_error("chown", path); + return 0; + } + + log_debug_activation("Created %s", path); + + return 1; +} + +static int _rm_dev_node(const char *dev_name, int warn_if_udev_failed) +{ + char path[PATH_MAX]; + struct stat info; + + if (!_build_dev_path(path, sizeof(path), dev_name)) + return_0; + if (lstat(path, &info) < 0) + return 1; + else if (_warn_if_op_needed(warn_if_udev_failed)) + log_warn("Node %s was not removed by udev. " + "Falling back to direct node removal.", path); + + /* udev may already have deleted the node. Ignore ENOENT. */ + if (unlink(path) < 0 && errno != ENOENT) { + log_error("Unable to unlink device node for '%s'", dev_name); + return 0; + } + + log_debug_activation("Removed %s", path); + + return 1; +} + +static int _rename_dev_node(const char *old_name, const char *new_name, + int warn_if_udev_failed) +{ + char oldpath[PATH_MAX]; + char newpath[PATH_MAX]; + struct stat info, info2; + struct stat *info_block_dev; + + if (!_build_dev_path(oldpath, sizeof(oldpath), old_name) || + !_build_dev_path(newpath, sizeof(newpath), new_name)) + return_0; + + if (lstat(newpath, &info) == 0) { + if (S_ISLNK(info.st_mode)) { + if (stat(newpath, &info2) == 0) + info_block_dev = &info2; + else { + log_sys_error("stat", newpath); + return 0; + } + } else + info_block_dev = &info; + + if (!S_ISBLK(info_block_dev->st_mode)) { + log_error("A non-block device file at '%s' " + "is already present", newpath); + return 0; + } + else if (_warn_if_op_needed(warn_if_udev_failed)) { + if (lstat(oldpath, &info) < 0 && + errno == ENOENT) + /* assume udev already deleted this */ + return 1; + + log_warn("The node %s should have been renamed to %s " + "by udev but old node is still present. " + "Falling back to direct old node removal.", + oldpath, newpath); + return _rm_dev_node(old_name, 0); + } + + if (unlink(newpath) < 0) { + if (errno == EPERM) { + /* devfs, entry has already been renamed */ + return 1; + } + log_error("Unable to unlink device node for '%s'", + new_name); + return 0; + } + } + else if (_warn_if_op_needed(warn_if_udev_failed)) + log_warn("The node %s should have been renamed to %s " + "by udev but new node is not present. " + "Falling back to direct node rename.", + oldpath, newpath); + + /* udev may already have renamed the node. Ignore ENOENT. */ + /* FIXME: when renaming to target mangling mode "none" with udev + * while there are some blacklisted characters in the node name, + * udev will remove the old_node, but fails to properly rename + * to new_node. The libdevmapper code tries to call + * rename(old_node,new_node), but that won't do anything + * since the old node is already removed by udev. + * For example renaming 'a\x20b' to 'a b': + * - udev removes 'a\x20b' + * - udev creates 'a' and 'b' (since it considers the ' ' as a delimiter + * - libdevmapper checks udev has done the rename properly + * - libdevmapper calls stat(new_node) and it does not see it + * - libdevmapper calls rename(old_node,new_node) + * - the rename is a NOP since the old_node does not exist anymore + * + * However, this situation is very rare - why would anyone need + * to rename to an unsupported mode??? So a fix for this would be + * just for completeness. + */ + if (rename(oldpath, newpath) < 0 && errno != ENOENT) { + log_error("Unable to rename device node from '%s' to '%s'", + old_name, new_name); + return 0; + } + + log_debug_activation("Renamed %s to %s", oldpath, newpath); + + return 1; +} + +#ifdef __linux__ +static int _open_dev_node(const char *dev_name) +{ + int fd = -1; + char path[PATH_MAX]; + + if (!_build_dev_path(path, sizeof(path), dev_name)) + return fd; + + if ((fd = open(path, O_RDONLY, 0)) < 0) + log_sys_error("open", path); + + return fd; +} + +int get_dev_node_read_ahead(const char *dev_name, uint32_t major, uint32_t minor, + uint32_t *read_ahead) +{ + char buf[24]; + int len; + int r = 1; + int fd; + long read_ahead_long; + + /* + * If we know the device number, use sysfs if we can. + * Otherwise use BLKRAGET ioctl. + */ + if (*_sysfs_dir && major != 0) { + if (dm_snprintf(_path0, sizeof(_path0), "%sdev/block/%" PRIu32 + ":%" PRIu32 "/bdi/read_ahead_kb", _sysfs_dir, + major, minor) < 0) { + log_error("Failed to build sysfs_path."); + return 0; + } + + if ((fd = open(_path0, O_RDONLY, 0)) != -1) { + /* Reading from sysfs, expecting number\n */ + if ((len = read(fd, buf, sizeof(buf) - 1)) < 1) { + log_sys_error("read", _path0); + r = 0; + } else { + buf[len] = 0; /* kill \n and ensure \0 */ + *read_ahead = atoi(buf) * 2; + log_debug_activation("%s (%d:%d): read ahead is %" PRIu32, + dev_name, major, minor, *read_ahead); + } + + if (close(fd)) + log_sys_debug("close", _path0); + + return r; + } + + log_sys_debug("open", _path0); + /* Fall back to use dev_name */ + } + + /* + * Open/close dev_name may block the process + * (i.e. overfilled thin pool volume) + */ + if (!*dev_name) { + log_error("Empty device name passed to BLKRAGET"); + return 0; + } + + if ((fd = _open_dev_node(dev_name)) < 0) + return_0; + + if (ioctl(fd, BLKRAGET, &read_ahead_long)) { + log_sys_error("BLKRAGET", dev_name); + *read_ahead = 0; + r = 0; + } else { + *read_ahead = (uint32_t) read_ahead_long; + log_debug_activation("%s: read ahead is %" PRIu32, dev_name, *read_ahead); + } + + if (close(fd)) + log_sys_debug("close", dev_name); + + return r; +} + +static int _set_read_ahead(const char *dev_name, uint32_t major, uint32_t minor, + uint32_t read_ahead) +{ + char buf[24]; + int len; + int r = 1; + int fd; + long read_ahead_long = (long) read_ahead; + + log_debug_activation("%s (%d:%d): Setting read ahead to %" PRIu32, dev_name, + major, minor, read_ahead); + + /* + * If we know the device number, use sysfs if we can. + * Otherwise use BLKRASET ioctl. RA is set after resume. + */ + if (*_sysfs_dir && major != 0) { + if (dm_snprintf(_path0, sizeof(_path0), "%sdev/block/%" PRIu32 + ":%" PRIu32 "/bdi/read_ahead_kb", + _sysfs_dir, major, minor) < 0) { + log_error("Failed to build sysfs_path."); + return 0; + } + + /* Sysfs is kB based, round up to kB */ + if ((len = dm_snprintf(buf, sizeof(buf), FMTu32, + (read_ahead + 1) / 2)) < 0) { + log_error("Failed to build size in kB."); + return 0; + } + + if ((fd = open(_path0, O_WRONLY, 0)) != -1) { + if (write(fd, buf, len) < len) { + log_sys_error("write", _path0); + r = 0; + } + + if (close(fd)) + log_sys_debug("close", _path0); + + return r; + } + + log_sys_debug("open", _path0); + /* Fall back to use dev_name */ + } + + if (!*dev_name) { + log_error("Empty device name passed to BLKRAGET"); + return 0; + } + + if ((fd = _open_dev_node(dev_name)) < 0) + return_0; + + if (ioctl(fd, BLKRASET, read_ahead_long)) { + log_sys_error("BLKRASET", dev_name); + r = 0; + } + + if (close(fd)) + log_sys_debug("close", dev_name); + + return r; +} + +static int _set_dev_node_read_ahead(const char *dev_name, + uint32_t major, uint32_t minor, + uint32_t read_ahead, uint32_t read_ahead_flags) +{ + uint32_t current_read_ahead; + + if (read_ahead == DM_READ_AHEAD_AUTO) + return 1; + + if (read_ahead == DM_READ_AHEAD_NONE) + read_ahead = 0; + + if (read_ahead_flags & DM_READ_AHEAD_MINIMUM_FLAG) { + if (!get_dev_node_read_ahead(dev_name, major, minor, &current_read_ahead)) + return_0; + + if (current_read_ahead >= read_ahead) { + log_debug_activation("%s: retaining kernel read ahead of %" PRIu32 + " (requested %" PRIu32 ")", + dev_name, current_read_ahead, read_ahead); + return 1; + } + } + + return _set_read_ahead(dev_name, major, minor, read_ahead); +} + +#else + +int get_dev_node_read_ahead(const char *dev_name, uint32_t *read_ahead) +{ + *read_ahead = 0; + + return 1; +} + +static int _set_dev_node_read_ahead(const char *dev_name, + uint32_t major, uint32_t minor, + uint32_t read_ahead, uint32_t read_ahead_flags) +{ + return 1; +} +#endif + +typedef enum { + NODE_ADD, + NODE_DEL, + NODE_RENAME, + NODE_READ_AHEAD, + NUM_NODES +} node_op_t; + +static int _do_node_op(node_op_t type, const char *dev_name, uint32_t major, + uint32_t minor, uid_t uid, gid_t gid, mode_t mode, + const char *old_name, uint32_t read_ahead, + uint32_t read_ahead_flags, int warn_if_udev_failed) +{ + switch (type) { + case NODE_ADD: + return _add_dev_node(dev_name, major, minor, uid, gid, + mode, warn_if_udev_failed); + case NODE_DEL: + return _rm_dev_node(dev_name, warn_if_udev_failed); + case NODE_RENAME: + return _rename_dev_node(old_name, dev_name, warn_if_udev_failed); + case NODE_READ_AHEAD: + return _set_dev_node_read_ahead(dev_name, major, minor, + read_ahead, read_ahead_flags); + default: + ; /* NOTREACHED */ + } + + return 1; +} + +static DM_LIST_INIT(_node_ops); +static int _count_node_ops[NUM_NODES]; + +struct node_op_parms { + struct dm_list list; + node_op_t type; + char *dev_name; + uint32_t major; + uint32_t minor; + uid_t uid; + gid_t gid; + mode_t mode; + uint32_t read_ahead; + uint32_t read_ahead_flags; + char *old_name; + int warn_if_udev_failed; + unsigned rely_on_udev; + char names[0]; +}; + +static void _store_str(char **pos, char **ptr, const char *str) +{ + strcpy(*pos, str); + *ptr = *pos; + *pos += strlen(*ptr) + 1; +} + +static void _del_node_op(struct node_op_parms *nop) +{ + _count_node_ops[nop->type]--; + dm_list_del(&nop->list); + dm_free(nop); + +} + +/* Check if there is other the type of node operation stacked */ +static int _other_node_ops(node_op_t type) +{ + unsigned i; + + for (i = 0; i < NUM_NODES; i++) + if (type != i && _count_node_ops[i]) + return 1; + return 0; +} + +static void _log_node_op(const char *action_str, struct node_op_parms *nop) +{ + const char *rely = nop->rely_on_udev ? " [trust_udev]" : "" ; + const char *verify = nop->warn_if_udev_failed ? " [verify_udev]" : ""; + + switch (nop->type) { + case NODE_ADD: + log_debug_activation("%s: %s NODE_ADD (%" PRIu32 ",%" PRIu32 ") %u:%u 0%o%s%s", + nop->dev_name, action_str, nop->major, nop->minor, nop->uid, nop->gid, nop->mode, + rely, verify); + break; + case NODE_DEL: + log_debug_activation("%s: %s NODE_DEL%s%s", nop->dev_name, action_str, rely, verify); + break; + case NODE_RENAME: + log_debug_activation("%s: %s NODE_RENAME to %s%s%s", nop->old_name, action_str, nop->dev_name, rely, verify); + break; + case NODE_READ_AHEAD: + log_debug_activation("%s: %s NODE_READ_AHEAD %" PRIu32 " (flags=%" PRIu32 ")%s%s", + nop->dev_name, action_str, nop->read_ahead, nop->read_ahead_flags, rely, verify); + break; + default: + ; /* NOTREACHED */ + } +} + +static int _stack_node_op(node_op_t type, const char *dev_name, uint32_t major, + uint32_t minor, uid_t uid, gid_t gid, mode_t mode, + const char *old_name, uint32_t read_ahead, + uint32_t read_ahead_flags, int warn_if_udev_failed, + unsigned rely_on_udev) +{ + struct node_op_parms *nop; + struct dm_list *noph, *nopht; + size_t len = strlen(dev_name) + strlen(old_name) + 2; + char *pos; + + /* + * Note: warn_if_udev_failed must have valid content + */ + if ((type == NODE_DEL) && _other_node_ops(type)) + /* + * Ignore any outstanding operations on the node if deleting it. + */ + dm_list_iterate_safe(noph, nopht, &_node_ops) { + nop = dm_list_item(noph, struct node_op_parms); + if (!strcmp(dev_name, nop->dev_name)) { + _log_node_op("Unstacking", nop); + _del_node_op(nop); + if (!_other_node_ops(type)) + break; /* no other non DEL ops */ + } + } + else if ((type == NODE_ADD) && _count_node_ops[NODE_DEL]) + /* + * Ignore previous DEL operation on added node. + * (No other operations for this device then DEL could be stacked here). + */ + dm_list_iterate_safe(noph, nopht, &_node_ops) { + nop = dm_list_item(noph, struct node_op_parms); + if ((nop->type == NODE_DEL) && + !strcmp(dev_name, nop->dev_name)) { + _log_node_op("Unstacking", nop); + _del_node_op(nop); + break; /* no other DEL ops */ + } + } + else if (type == NODE_RENAME) + /* + * Ignore any outstanding operations if renaming it. + * + * Currently RENAME operation happens through 'suspend -> resume'. + * On 'resume' device is added with read_ahead settings, so it is + * safe to remove any stacked ADD, RENAME, READ_AHEAD operation + * There cannot be any DEL operation on the renamed device. + */ + dm_list_iterate_safe(noph, nopht, &_node_ops) { + nop = dm_list_item(noph, struct node_op_parms); + if (!strcmp(old_name, nop->dev_name)) { + _log_node_op("Unstacking", nop); + _del_node_op(nop); + } + } + else if (type == NODE_READ_AHEAD) { + /* udev doesn't process readahead */ + rely_on_udev = 0; + warn_if_udev_failed = 0; + } + + if (!(nop = dm_malloc(sizeof(*nop) + len))) { + log_error("Insufficient memory to stack mknod operation"); + return 0; + } + + pos = nop->names; + nop->type = type; + nop->major = major; + nop->minor = minor; + nop->uid = uid; + nop->gid = gid; + nop->mode = mode; + nop->read_ahead = read_ahead; + nop->read_ahead_flags = read_ahead_flags; + nop->rely_on_udev = rely_on_udev; + + /* + * Clear warn_if_udev_failed if rely_on_udev is set. It doesn't get + * checked in this case - this just removes the flag from log messages. + */ + nop->warn_if_udev_failed = rely_on_udev ? 0 : warn_if_udev_failed; + + _store_str(&pos, &nop->dev_name, dev_name); + _store_str(&pos, &nop->old_name, old_name); + + _count_node_ops[type]++; + dm_list_add(&_node_ops, &nop->list); + + _log_node_op("Stacking", nop); + + return 1; +} + +static void _pop_node_ops(void) +{ + struct dm_list *noph, *nopht; + struct node_op_parms *nop; + + dm_list_iterate_safe(noph, nopht, &_node_ops) { + nop = dm_list_item(noph, struct node_op_parms); + if (!nop->rely_on_udev) { + _log_node_op("Processing", nop); + _do_node_op(nop->type, nop->dev_name, nop->major, nop->minor, + nop->uid, nop->gid, nop->mode, nop->old_name, + nop->read_ahead, nop->read_ahead_flags, + nop->warn_if_udev_failed); + } else + _log_node_op("Skipping", nop); + _del_node_op(nop); + } +} + +int add_dev_node(const char *dev_name, uint32_t major, uint32_t minor, + uid_t uid, gid_t gid, mode_t mode, int check_udev, unsigned rely_on_udev) +{ + return _stack_node_op(NODE_ADD, dev_name, major, minor, uid, + gid, mode, "", 0, 0, check_udev, rely_on_udev); +} + +int rename_dev_node(const char *old_name, const char *new_name, int check_udev, unsigned rely_on_udev) +{ + return _stack_node_op(NODE_RENAME, new_name, 0, 0, 0, + 0, 0, old_name, 0, 0, check_udev, rely_on_udev); +} + +int rm_dev_node(const char *dev_name, int check_udev, unsigned rely_on_udev) +{ + return _stack_node_op(NODE_DEL, dev_name, 0, 0, 0, + 0, 0, "", 0, 0, check_udev, rely_on_udev); +} + +int set_dev_node_read_ahead(const char *dev_name, + uint32_t major, uint32_t minor, + uint32_t read_ahead, uint32_t read_ahead_flags) +{ + if (read_ahead == DM_READ_AHEAD_AUTO) + return 1; + + return _stack_node_op(NODE_READ_AHEAD, dev_name, major, minor, 0, 0, + 0, "", read_ahead, read_ahead_flags, 0, 0); +} + +void update_devs(void) +{ + _pop_node_ops(); +} + +static int _canonicalize_and_set_dir(const char *src, const char *suffix, size_t max_len, char *dir) +{ + size_t len; + const char *slash; + + if (*src != '/') { + log_debug_activation("Invalid directory value, %s: " + "not an absolute name.", src); + return 0; + } + + len = strlen(src); + slash = src[len-1] == '/' ? "" : "/"; + + if (dm_snprintf(dir, max_len, "%s%s%s", src, slash, suffix ? suffix : "") < 0) { + log_debug_activation("Invalid directory value, %s: name too long.", src); + return 0; + } + + return 1; +} + +int dm_set_dev_dir(const char *dev_dir) +{ + return _canonicalize_and_set_dir(dev_dir, DM_DIR, sizeof _dm_dir, _dm_dir); +} + +const char *dm_dir(void) +{ + return _dm_dir; +} + +int dm_set_sysfs_dir(const char *sysfs_dir) +{ + if (!sysfs_dir || !*sysfs_dir) { + _sysfs_dir[0] = '\0'; + return 1; + } + + return _canonicalize_and_set_dir(sysfs_dir, NULL, sizeof _sysfs_dir, _sysfs_dir); +} + +const char *dm_sysfs_dir(void) +{ + return _sysfs_dir; +} + +/* + * Replace existing uuid_prefix provided it isn't too long. + */ +int dm_set_uuid_prefix(const char *uuid_prefix) +{ + if (!uuid_prefix) + return_0; + + if (strlen(uuid_prefix) > DM_MAX_UUID_PREFIX_LEN) { + log_error("New uuid prefix %s too long.", uuid_prefix); + return 0; + } + + strcpy(_default_uuid_prefix, uuid_prefix); + + return 1; +} + +const char *dm_uuid_prefix(void) +{ + return _default_uuid_prefix; +} + +static int _is_octal(int a) +{ + return (((a) & ~7) == '0'); +} + +/* Convert mangled mountinfo into normal ASCII string */ +static void _unmangle_mountinfo_string(const char *src, char *buf) +{ + while (*src) { + if ((*src == '\\') && + _is_octal(src[1]) && _is_octal(src[2]) && _is_octal(src[3])) { + *buf++ = 64 * (src[1] & 7) + 8 * (src[2] & 7) + (src[3] & 7); + src += 4; + } else + *buf++ = *src++; + } + *buf = '\0'; +} + +/* Parse one line of mountinfo and unmangled target line */ +static int _mountinfo_parse_line(const char *line, unsigned *maj, unsigned *min, char *buf) +{ + char root[PATH_MAX + 1]; /* sscanf needs extra '\0' */ + char target[PATH_MAX + 1]; + char *devmapper; + struct dm_task *dmt; + struct dm_info info; + unsigned i; + + /* TODO: maybe detect availability of %ms glib support ? */ + if (sscanf(line, "%*u %*u %u:%u %" DM_TO_STRING(PATH_MAX) + "s %" DM_TO_STRING(PATH_MAX) "s", + maj, min, root, target) < 4) { + log_error("Failed to parse mountinfo line."); + return 0; + } + + /* btrfs fakes device numbers, but there is still /dev/mapper name + * placed in mountinfo, so try to detect proper major:minor via this */ + if (*maj == 0 && (devmapper = strstr(line, "/dev/mapper/"))) { + if (!(dmt = dm_task_create(DM_DEVICE_INFO))) { + log_error("Mount info task creation failed."); + return 0; + } + devmapper += 12; /* skip fixed prefix */ + for (i = 0; devmapper[i] && devmapper[i] != ' ' && i < sizeof(root); ++i) + root[i] = devmapper[i]; + root[i] = 0; + _unmangle_mountinfo_string(root, buf); + buf[DM_NAME_LEN] = 0; /* cut away */ + + if (dm_task_set_name(dmt, buf) && + dm_task_no_open_count(dmt) && + dm_task_run(dmt) && + dm_task_get_info(dmt, &info)) { + log_debug("Replacing mountinfo device (%u:%u) with matching DM device %s (%u:%u).", + *maj, *min, buf, info.major, info.minor); + *maj = info.major; + *min = info.minor; + } + dm_task_destroy(dmt); + } + + _unmangle_mountinfo_string(target, buf); + + return 1; +} + +/* + * Function to operate on individal mountinfo line, + * minor, major and mount target are parsed and unmangled + */ +int dm_mountinfo_read(dm_mountinfo_line_callback_fn read_fn, void *cb_data) +{ + FILE *minfo; + char buffer[2 * PATH_MAX]; + char target[PATH_MAX]; + unsigned maj, min; + int r = 1; + + if (!(minfo = fopen(_mountinfo, "r"))) { + if (errno != ENOENT) + log_sys_error("fopen", _mountinfo); + else + log_sys_debug("fopen", _mountinfo); + return 0; + } + + while (!feof(minfo) && fgets(buffer, sizeof(buffer), minfo)) + if (!_mountinfo_parse_line(buffer, &maj, &min, target) || + !read_fn(buffer, maj, min, target, cb_data)) { + stack; + r = 0; + break; + } + + if (fclose(minfo)) + log_sys_error("fclose", _mountinfo); + + return r; +} + +static int _sysfs_get_dm_name(uint32_t major, uint32_t minor, char *buf, size_t buf_size) +{ + char *sysfs_path, *temp_buf = NULL; + FILE *fp = NULL; + int r = 0; + size_t len; + + if (!(sysfs_path = dm_malloc(PATH_MAX)) || + !(temp_buf = dm_malloc(PATH_MAX))) { + log_error("_sysfs_get_dm_name: failed to allocate temporary buffers"); + goto bad; + } + + if (dm_snprintf(sysfs_path, PATH_MAX, "%sdev/block/%" PRIu32 ":%" PRIu32 + "/dm/name", _sysfs_dir, major, minor) < 0) { + log_error("_sysfs_get_dm_name: dm_snprintf failed"); + goto bad; + } + + if (!(fp = fopen(sysfs_path, "r"))) { + if (errno != ENOENT) + log_sys_error("fopen", sysfs_path); + else + log_sys_debug("fopen", sysfs_path); + goto bad; + } + + if (!fgets(temp_buf, PATH_MAX, fp)) { + log_sys_error("fgets", sysfs_path); + goto bad; + } + + len = strlen(temp_buf); + + if (len > buf_size) { + log_error("_sysfs_get_dm_name: supplied buffer too small"); + goto bad; + } + + temp_buf[len ? len - 1 : 0] = '\0'; /* \n */ + strcpy(buf, temp_buf); + r = 1; +bad: + if (fp && fclose(fp)) + log_sys_error("fclose", sysfs_path); + + dm_free(temp_buf); + dm_free(sysfs_path); + + return r; +} + +static int _sysfs_get_kernel_name(uint32_t major, uint32_t minor, char *buf, size_t buf_size) +{ + char *name, *sysfs_path, *temp_buf = NULL; + ssize_t size; + size_t len; + int r = 0; + + if (!(sysfs_path = dm_malloc(PATH_MAX)) || + !(temp_buf = dm_malloc(PATH_MAX))) { + log_error("_sysfs_get_kernel_name: failed to allocate temporary buffers"); + goto bad; + } + + if (dm_snprintf(sysfs_path, PATH_MAX, "%sdev/block/%" PRIu32 ":%" PRIu32, + _sysfs_dir, major, minor) < 0) { + log_error("_sysfs_get_kernel_name: dm_snprintf failed"); + goto bad; + } + + if ((size = readlink(sysfs_path, temp_buf, PATH_MAX - 1)) < 0) { + if (errno != ENOENT) + log_sys_error("readlink", sysfs_path); + else + log_sys_debug("readlink", sysfs_path); + goto bad; + } + temp_buf[size] = '\0'; + + if (!(name = strrchr(temp_buf, '/'))) { + log_error("Could not locate device kernel name in sysfs path %s", temp_buf); + goto bad; + } + name += 1; + len = size - (name - temp_buf) + 1; + + if (len > buf_size) { + log_error("_sysfs_get_kernel_name: output buffer too small"); + goto bad; + } + + strcpy(buf, name); + r = 1; +bad: + dm_free(temp_buf); + dm_free(sysfs_path); + + return r; +} + +int dm_device_get_name(uint32_t major, uint32_t minor, int prefer_kernel_name, + char *buf, size_t buf_size) +{ + if (!*_sysfs_dir) + return 0; + + /* + * device-mapper devices and prefer_kernel_name = 0 + * get dm name by reading /sys/dev/block/major:minor/dm/name, + * fallback to _sysfs_get_kernel_name if not successful + */ + if (dm_is_dm_major(major) && !prefer_kernel_name) { + if (_sysfs_get_dm_name(major, minor, buf, buf_size)) + return 1; + else + stack; + } + + /* + * non-device-mapper devices or prefer_kernel_name = 1 + * get kernel name using readlink /sys/dev/block/major:minor -> .../dm-X + */ + return _sysfs_get_kernel_name(major, minor, buf, buf_size); +} + +int dm_device_has_holders(uint32_t major, uint32_t minor) +{ + char sysfs_path[PATH_MAX]; + struct stat st; + + if (!*_sysfs_dir) + return 0; + + if (dm_snprintf(sysfs_path, PATH_MAX, "%sdev/block/%" PRIu32 + ":%" PRIu32 "/holders", _sysfs_dir, major, minor) < 0) { + log_warn("WARNING: sysfs_path dm_snprintf failed."); + return 0; + } + + if (stat(sysfs_path, &st)) { + if (errno != ENOENT) + log_sys_debug("stat", sysfs_path); + return 0; + } + + return !dm_is_empty_dir(sysfs_path); +} + +static int _mounted_fs_on_device(const char *kernel_dev_name) +{ + char sysfs_path[PATH_MAX]; + struct dirent *dirent; + DIR *d; + struct stat st; + int r = 0; + + if (dm_snprintf(sysfs_path, PATH_MAX, "%sfs", _sysfs_dir) < 0) { + log_warn("WARNING: sysfs_path dm_snprintf failed."); + return 0; + } + + if (!(d = opendir(sysfs_path))) { + if (errno != ENOENT) + log_sys_debug("opendir", sysfs_path); + return 0; + } + + while ((dirent = readdir(d))) { + if (!strcmp(dirent->d_name, ".") || !strcmp(dirent->d_name, "..")) + continue; + + if (dm_snprintf(sysfs_path, PATH_MAX, "%sfs/%s/%s", + _sysfs_dir, dirent->d_name, kernel_dev_name) < 0) { + log_warn("WARNING: sysfs_path dm_snprintf failed."); + break; + } + + if (!stat(sysfs_path, &st)) { + /* found! */ + r = 1; + break; + } + else if (errno != ENOENT) { + log_sys_debug("stat", sysfs_path); + break; + } + } + + if (closedir(d)) + log_sys_debug("closedir", kernel_dev_name); + + return r; +} + +struct mountinfo_s { + unsigned maj; + unsigned min; + int mounted; +}; + +static int _device_has_mounted_fs(char *buffer, unsigned major, unsigned minor, + char *target, void *cb_data) +{ + struct mountinfo_s *data = cb_data; + char kernel_dev_name[PATH_MAX]; + + if ((major == data->maj) && (minor == data->min)) { + if (!dm_device_get_name(major, minor, 1, kernel_dev_name, + sizeof(kernel_dev_name))) { + stack; + *kernel_dev_name = '\0'; + } + log_verbose("Device %s (%u:%u) appears to be mounted on %s.", + kernel_dev_name, major, minor, target); + data->mounted = 1; + } + + return 1; +} + +int dm_device_has_mounted_fs(uint32_t major, uint32_t minor) +{ + char kernel_dev_name[PATH_MAX]; + struct mountinfo_s data = { + .maj = major, + .min = minor, + }; + + if (!dm_mountinfo_read(_device_has_mounted_fs, &data)) + stack; + + if (data.mounted) + return 1; + /* + * TODO: Verify dm_mountinfo_read() is superset + * and remove sysfs check (namespaces) + */ + /* Get kernel device name first */ + if (!dm_device_get_name(major, minor, 1, kernel_dev_name, PATH_MAX)) + return 0; + + /* Check /sys/fs/<fs_name>/<kernel_dev_name> presence */ + return _mounted_fs_on_device(kernel_dev_name); +} + +int dm_mknodes(const char *name) +{ + struct dm_task *dmt; + int r = 0; + + if (!(dmt = dm_task_create(DM_DEVICE_MKNODES))) + return_0; + + if (name && !dm_task_set_name(dmt, name)) + goto out; + + if (!dm_task_no_open_count(dmt)) + goto out; + + r = dm_task_run(dmt); + +out: + dm_task_destroy(dmt); + return r; +} + +int dm_driver_version(char *version, size_t size) +{ + struct dm_task *dmt; + int r = 0; + + if (!(dmt = dm_task_create(DM_DEVICE_VERSION))) + return_0; + + if (!dm_task_run(dmt)) + log_error("Failed to get driver version"); + + if (!dm_task_get_driver_version(dmt, version, size)) + goto out; + + r = 1; + +out: + dm_task_destroy(dmt); + return r; +} + +static void _set_cookie_flags(struct dm_task *dmt, uint16_t flags) +{ + if (!dm_cookie_supported()) + return; + + if (_udev_disabled) { + /* + * If udev is disabled, hardcode this functionality: + * - we want libdm to create the nodes + * - we don't want the /dev/mapper and any subsystem + * related content to be created by udev if udev + * rules are installed + */ + flags &= ~DM_UDEV_DISABLE_LIBRARY_FALLBACK; + flags |= DM_UDEV_DISABLE_DM_RULES_FLAG | DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG; + } + + dmt->event_nr = flags << DM_UDEV_FLAGS_SHIFT; +} + +#ifndef UDEV_SYNC_SUPPORT +void dm_udev_set_sync_support(int sync_with_udev) +{ +} + +int dm_udev_get_sync_support(void) +{ + return 0; +} + +void dm_udev_set_checking(int checking) +{ +} + +int dm_udev_get_checking(void) +{ + return 0; +} + +int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) +{ + _set_cookie_flags(dmt, flags); + + *cookie = 0; + dmt->cookie_set = 1; + + return 1; +} + +int dm_udev_complete(uint32_t cookie) +{ + return 1; +} + +int dm_udev_wait(uint32_t cookie) +{ + update_devs(); + + return 1; +} + +int dm_udev_wait_immediate(uint32_t cookie, int *ready) +{ + update_devs(); + *ready = 1; + + return 1; +} + +#else /* UDEV_SYNC_SUPPORT */ + +static int _check_semaphore_is_supported(void) +{ + int maxid; + union semun arg; + struct seminfo seminfo; + + arg.__buf = &seminfo; + maxid = semctl(0, 0, SEM_INFO, arg); + + if (maxid < 0) { + log_warn("Kernel not configured for semaphores (System V IPC). " + "Not using udev synchronisation code."); + return 0; + } + + return 1; +} + +static int _check_udev_is_running(void) +{ + struct udev *udev; + struct udev_queue *udev_queue; + int r; + + if (!(udev = udev_new())) + goto_bad; + + if (!(udev_queue = udev_queue_new(udev))) { + udev_unref(udev); + goto_bad; + } + + if (!(r = udev_queue_get_udev_is_active(udev_queue))) + log_debug_activation("Udev is not running. " + "Not using udev synchronisation code."); + + udev_queue_unref(udev_queue); + udev_unref(udev); + + return r; + +bad: + log_error("Could not get udev state. Assuming udev is not running."); + return 0; +} + +static void _check_udev_sync_requirements_once(void) +{ + if (_semaphore_supported < 0) + _semaphore_supported = _check_semaphore_is_supported(); + + if (_udev_running < 0) { + _udev_running = _check_udev_is_running(); + if (_udev_disabled && _udev_running) + log_warn("Udev is running and DM_DISABLE_UDEV environment variable is set. " + "Bypassing udev, device-mapper library will manage device " + "nodes in device directory."); + } +} + +void dm_udev_set_sync_support(int sync_with_udev) +{ + _check_udev_sync_requirements_once(); + _sync_with_udev = sync_with_udev; +} + +int dm_udev_get_sync_support(void) +{ + _check_udev_sync_requirements_once(); + + return !_udev_disabled && _semaphore_supported && + dm_cookie_supported() &&_udev_running && _sync_with_udev; +} + +void dm_udev_set_checking(int checking) +{ + if ((_udev_checking = checking)) + log_debug_activation("DM udev checking enabled"); + else + log_debug_activation("DM udev checking disabled"); +} + +int dm_udev_get_checking(void) +{ + return _udev_checking; +} + +static int _get_cookie_sem(uint32_t cookie, int *semid) +{ + if (cookie >> 16 != DM_COOKIE_MAGIC) { + log_error("Could not continue to access notification " + "semaphore identified by cookie value %" + PRIu32 " (0x%x). Incorrect cookie prefix.", + cookie, cookie); + return 0; + } + + if ((*semid = semget((key_t) cookie, 1, 0)) >= 0) + return 1; + + switch (errno) { + case ENOENT: + log_error("Could not find notification " + "semaphore identified by cookie " + "value %" PRIu32 " (0x%x)", + cookie, cookie); + break; + case EACCES: + log_error("No permission to access " + "notificaton semaphore identified " + "by cookie value %" PRIu32 " (0x%x)", + cookie, cookie); + break; + default: + log_error("Failed to access notification " + "semaphore identified by cookie " + "value %" PRIu32 " (0x%x): %s", + cookie, cookie, strerror(errno)); + break; + } + + return 0; +} + +static int _udev_notify_sem_inc(uint32_t cookie, int semid) +{ + struct sembuf sb = {0, 1, 0}; + int val; + + if (semop(semid, &sb, 1) < 0) { + log_error("semid %d: semop failed for cookie 0x%" PRIx32 ": %s", + semid, cookie, strerror(errno)); + return 0; + } + + if ((val = semctl(semid, 0, GETVAL)) < 0) { + log_error("semid %d: sem_ctl GETVAL failed for " + "cookie 0x%" PRIx32 ": %s", + semid, cookie, strerror(errno)); + return 0; + } + + log_debug_activation("Udev cookie 0x%" PRIx32 " (semid %d) incremented to %d", + cookie, semid, val); + + return 1; +} + +static int _udev_notify_sem_dec(uint32_t cookie, int semid) +{ + struct sembuf sb = {0, -1, IPC_NOWAIT}; + int val; + + if ((val = semctl(semid, 0, GETVAL)) < 0) { + log_error("semid %d: sem_ctl GETVAL failed for " + "cookie 0x%" PRIx32 ": %s", + semid, cookie, strerror(errno)); + return 0; + } + + if (semop(semid, &sb, 1) < 0) { + switch (errno) { + case EAGAIN: + log_error("semid %d: semop failed for cookie " + "0x%" PRIx32 ": " + "incorrect semaphore state", + semid, cookie); + break; + default: + log_error("semid %d: semop failed for cookie " + "0x%" PRIx32 ": %s", + semid, cookie, strerror(errno)); + break; + } + return 0; + } + + log_debug_activation("Udev cookie 0x%" PRIx32 " (semid %d) decremented to %d", + cookie, semid, val - 1); + + return 1; +} + +static int _udev_notify_sem_destroy(uint32_t cookie, int semid) +{ + if (semctl(semid, 0, IPC_RMID, 0) < 0) { + log_error("Could not cleanup notification semaphore " + "identified by cookie value %" PRIu32 " (0x%x): %s", + cookie, cookie, strerror(errno)); + return 0; + } + + log_debug_activation("Udev cookie 0x%" PRIx32 " (semid %d) destroyed", cookie, + semid); + + return 1; +} + +static int _udev_notify_sem_create(uint32_t *cookie, int *semid) +{ + int fd; + int gen_semid; + int val; + uint16_t base_cookie; + uint32_t gen_cookie; + union semun sem_arg; + + if ((fd = open("/dev/urandom", O_RDONLY)) < 0) { + log_error("Failed to open /dev/urandom " + "to create random cookie value"); + *cookie = 0; + return 0; + } + + /* Generate random cookie value. Be sure it is unique and non-zero. */ + do { + /* FIXME Handle non-error returns from read(). Move _io() into libdm? */ + if (read(fd, &base_cookie, sizeof(base_cookie)) != sizeof(base_cookie)) { + log_error("Failed to initialize notification cookie"); + goto bad; + } + + gen_cookie = DM_COOKIE_MAGIC << 16 | base_cookie; + + if (base_cookie && (gen_semid = semget((key_t) gen_cookie, + 1, 0600 | IPC_CREAT | IPC_EXCL)) < 0) { + switch (errno) { + case EEXIST: + /* if the semaphore key exists, we + * simply generate another random one */ + base_cookie = 0; + break; + case ENOMEM: + log_error("Not enough memory to create " + "notification semaphore"); + goto bad; + case ENOSPC: + log_error("Limit for the maximum number " + "of semaphores reached. You can " + "check and set the limits in " + "/proc/sys/kernel/sem."); + goto bad; + default: + log_error("Failed to create notification " + "semaphore: %s", strerror(errno)); + goto bad; + } + } + } while (!base_cookie); + + log_debug_activation("Udev cookie 0x%" PRIx32 " (semid %d) created", + gen_cookie, gen_semid); + + sem_arg.val = 1; + + if (semctl(gen_semid, 0, SETVAL, sem_arg) < 0) { + log_error("semid %d: semctl failed: %s", gen_semid, strerror(errno)); + /* We have to destroy just created semaphore + * so it won't stay in the system. */ + (void) _udev_notify_sem_destroy(gen_cookie, gen_semid); + goto bad; + } + + if ((val = semctl(gen_semid, 0, GETVAL)) < 0) { + log_error("semid %d: sem_ctl GETVAL failed for " + "cookie 0x%" PRIx32 ": %s", + gen_semid, gen_cookie, strerror(errno)); + goto bad; + } + + log_debug_activation("Udev cookie 0x%" PRIx32 " (semid %d) incremented to %d", + gen_cookie, gen_semid, val); + + if (close(fd)) + stack; + + *semid = gen_semid; + *cookie = gen_cookie; + + return 1; + +bad: + if (close(fd)) + stack; + + *cookie = 0; + + return 0; +} + +int dm_udev_create_cookie(uint32_t *cookie) +{ + int semid; + + if (!dm_udev_get_sync_support()) { + *cookie = 0; + return 1; + } + + return _udev_notify_sem_create(cookie, &semid); +} + +static const char *_task_type_disp(int type) +{ + switch(type) { + case DM_DEVICE_CREATE: + return "CREATE"; + case DM_DEVICE_RELOAD: + return "RELOAD"; + case DM_DEVICE_REMOVE: + return "REMOVE"; + case DM_DEVICE_REMOVE_ALL: + return "REMOVE_ALL"; + case DM_DEVICE_SUSPEND: + return "SUSPEND"; + case DM_DEVICE_RESUME: + return "RESUME"; + case DM_DEVICE_INFO: + return "INFO"; + case DM_DEVICE_DEPS: + return "DEPS"; + case DM_DEVICE_RENAME: + return "RENAME"; + case DM_DEVICE_VERSION: + return "VERSION"; + case DM_DEVICE_STATUS: + return "STATUS"; + case DM_DEVICE_TABLE: + return "TABLE"; + case DM_DEVICE_WAITEVENT: + return "WAITEVENT"; + case DM_DEVICE_LIST: + return "LIST"; + case DM_DEVICE_CLEAR: + return "CLEAR"; + case DM_DEVICE_MKNODES: + return "MKNODES"; + case DM_DEVICE_LIST_VERSIONS: + return "LIST_VERSIONS"; + case DM_DEVICE_TARGET_MSG: + return "TARGET_MSG"; + case DM_DEVICE_SET_GEOMETRY: + return "SET_GEOMETRY"; + } + return "unknown"; +} + +int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) +{ + int semid; + + _set_cookie_flags(dmt, flags); + + if (!dm_udev_get_sync_support()) { + *cookie = 0; + dmt->cookie_set = 1; + return 1; + } + + if (*cookie) { + if (!_get_cookie_sem(*cookie, &semid)) + goto_bad; + } else if (!_udev_notify_sem_create(cookie, &semid)) + goto_bad; + + if (!_udev_notify_sem_inc(*cookie, semid)) { + log_error("Could not set notification semaphore " + "identified by cookie value %" PRIu32 " (0x%x)", + *cookie, *cookie); + goto bad; + } + + dmt->event_nr |= ~DM_UDEV_FLAGS_MASK & *cookie; + dmt->cookie_set = 1; + + log_debug_activation("Udev cookie 0x%" PRIx32 " (semid %d) assigned to " + "%s task(%d) with flags%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s (0x%" PRIx16 ")", + *cookie, semid, _task_type_disp(dmt->type), dmt->type, + (flags & DM_UDEV_DISABLE_DM_RULES_FLAG) ? " DISABLE_DM_RULES" : "", + (flags & DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG) ? " DISABLE_SUBSYSTEM_RULES" : "", + (flags & DM_UDEV_DISABLE_DISK_RULES_FLAG) ? " DISABLE_DISK_RULES" : "", + (flags & DM_UDEV_DISABLE_OTHER_RULES_FLAG) ? " DISABLE_OTHER_RULES" : "", + (flags & DM_UDEV_LOW_PRIORITY_FLAG) ? " LOW_PRIORITY" : "", + (flags & DM_UDEV_DISABLE_LIBRARY_FALLBACK) ? " DISABLE_LIBRARY_FALLBACK" : "", + (flags & DM_UDEV_PRIMARY_SOURCE_FLAG) ? " PRIMARY_SOURCE" : "", + (flags & DM_SUBSYSTEM_UDEV_FLAG0) ? " SUBSYSTEM_0" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG1) ? " SUBSYSTEM_1" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG2) ? " SUBSYSTEM_2" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG3) ? " SUBSYSTEM_3" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG4) ? " SUBSYSTEM_4" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG5) ? " SUBSYSTEM_5" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG6) ? " SUBSYSTEM_6" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG7) ? " SUBSYSTEM_7" : " ", + flags); + + return 1; + +bad: + dmt->event_nr = 0; + return 0; +} + +int dm_udev_complete(uint32_t cookie) +{ + int semid; + + if (!cookie || !dm_udev_get_sync_support()) + return 1; + + if (!_get_cookie_sem(cookie, &semid)) + return_0; + + if (!_udev_notify_sem_dec(cookie, semid)) { + log_error("Could not signal waiting process using notification " + "semaphore identified by cookie value %" PRIu32 " (0x%x)", + cookie, cookie); + return 0; + } + + return 1; +} + +/* + * If *nowait is set, return immediately leaving it set if the semaphore + * is not ready to be decremented to 0. *nowait is cleared if the wait + * succeeds. + */ +static int _udev_wait(uint32_t cookie, int *nowait) +{ + int semid; + struct sembuf sb = {0, 0, 0}; + int val; + + if (!cookie || !dm_udev_get_sync_support()) + return 1; + + if (!_get_cookie_sem(cookie, &semid)) + return_0; + + /* Return immediately if the semaphore value exceeds 1? */ + if (*nowait) { + if ((val = semctl(semid, 0, GETVAL)) < 0) { + log_error("semid %d: sem_ctl GETVAL failed for " + "cookie 0x%" PRIx32 ": %s", + semid, cookie, strerror(errno)); + return 0; + } + + if (val > 1) + return 1; + + *nowait = 0; + } + + if (!_udev_notify_sem_dec(cookie, semid)) { + log_error("Failed to set a proper state for notification " + "semaphore identified by cookie value %" PRIu32 " (0x%x) " + "to initialize waiting for incoming notifications.", + cookie, cookie); + (void) _udev_notify_sem_destroy(cookie, semid); + return 0; + } + + log_debug_activation("Udev cookie 0x%" PRIx32 " (semid %d) waiting for zero", + cookie, semid); + +repeat_wait: + if (semop(semid, &sb, 1) < 0) { + if (errno == EINTR) + goto repeat_wait; + else if (errno == EIDRM) + return 1; + + log_error("Could not set wait state for notification semaphore " + "identified by cookie value %" PRIu32 " (0x%x): %s", + cookie, cookie, strerror(errno)); + (void) _udev_notify_sem_destroy(cookie, semid); + return 0; + } + + return _udev_notify_sem_destroy(cookie, semid); +} + +int dm_udev_wait(uint32_t cookie) +{ + int nowait = 0; + int r = _udev_wait(cookie, &nowait); + + update_devs(); + + return r; +} + +int dm_udev_wait_immediate(uint32_t cookie, int *ready) +{ + int nowait = 1; + int r = _udev_wait(cookie, &nowait); + + if (r && nowait) { + *ready = 0; + return 1; + } + + update_devs(); + *ready = 1; + + return r; +} +#endif /* UDEV_SYNC_SUPPORT */ diff --git a/device_mapper/libdm-common.h b/device_mapper/libdm-common.h new file mode 100644 index 0000000..010d876 --- /dev/null +++ b/device_mapper/libdm-common.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef LIB_DMCOMMON_H +#define LIB_DMCOMMON_H + +#include "libdevmapper.h" + +#define DM_DEFAULT_NAME_MANGLING_MODE_ENV_VAR_NAME "DM_DEFAULT_NAME_MANGLING_MODE" + +#define DEV_NAME(dmt) (dmt->mangled_dev_name ? : dmt->dev_name) +#define DEV_UUID(DMT) (dmt->mangled_uuid ? : dmt->uuid) + +int mangle_string(const char *str, const char *str_name, size_t len, + char *buf, size_t buf_len, dm_string_mangling_t mode); + +int unmangle_string(const char *str, const char *str_name, size_t len, + char *buf, size_t buf_len, dm_string_mangling_t mode); + +int check_multiple_mangled_string_allowed(const char *str, const char *str_name, + dm_string_mangling_t mode); + +struct target *create_target(uint64_t start, + uint64_t len, + const char *type, const char *params); + +int add_dev_node(const char *dev_name, uint32_t minor, uint32_t major, + uid_t uid, gid_t gid, mode_t mode, int check_udev, unsigned rely_on_udev); +int rm_dev_node(const char *dev_name, int check_udev, unsigned rely_on_udev); +int rename_dev_node(const char *old_name, const char *new_name, + int check_udev, unsigned rely_on_udev); +int get_dev_node_read_ahead(const char *dev_name, uint32_t major, uint32_t minor, + uint32_t *read_ahead); +int set_dev_node_read_ahead(const char *dev_name, uint32_t major, uint32_t minor, + uint32_t read_ahead, uint32_t read_ahead_flags); +void update_devs(void); +void selinux_release(void); + +void inc_suspended(void); +void dec_suspended(void); + +int parse_thin_pool_status(const char *params, struct dm_status_thin_pool *s); + +int get_uname_version(unsigned *major, unsigned *minor, unsigned *release); + +#endif diff --git a/device_mapper/libdm-config.c b/device_mapper/libdm-config.c new file mode 100644 index 0000000..fd4d929 --- /dev/null +++ b/device_mapper/libdm-config.c @@ -0,0 +1,1486 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" + +#include <sys/stat.h> +#include <sys/mman.h> +#include <unistd.h> +#include <fcntl.h> +#include <ctype.h> +#include <stdarg.h> + +#define SECTION_B_CHAR '{' +#define SECTION_E_CHAR '}' + +enum { + TOK_INT, + TOK_FLOAT, + TOK_STRING, /* Single quotes */ + TOK_STRING_ESCAPED, /* Double quotes */ + TOK_STRING_BARE, /* No quotes */ + TOK_EQ, + TOK_SECTION_B, + TOK_SECTION_E, + TOK_ARRAY_B, + TOK_ARRAY_E, + TOK_IDENTIFIER, + TOK_COMMA, + TOK_EOF +}; + +struct parser { + const char *fb, *fe; /* file limits */ + + int t; /* token limits and type */ + const char *tb, *te; + + int line; /* line number we are on */ + + struct dm_pool *mem; + int no_dup_node_check; /* whether to disable dup node checking */ +}; + +struct config_output { + struct dm_pool *mem; + dm_putline_fn putline; + const struct dm_config_node_out_spec *spec; + void *baton; +}; + +static void _get_token(struct parser *p, int tok_prev); +static void _eat_space(struct parser *p); +static struct dm_config_node *_file(struct parser *p); +static struct dm_config_node *_section(struct parser *p, struct dm_config_node *parent); +static struct dm_config_value *_value(struct parser *p); +static struct dm_config_value *_type(struct parser *p); +static int _match_aux(struct parser *p, int t); +static struct dm_config_value *_create_value(struct dm_pool *mem); +static struct dm_config_node *_create_node(struct dm_pool *mem); +static char *_dup_tok(struct parser *p); +static char *_dup_token(struct dm_pool *mem, const char *b, const char *e); + +static const int _sep = '/'; + +#define MAX_INDENT 32 + +#define match(t) do {\ + if (!_match_aux(p, (t))) {\ + log_error("Parse error at byte %" PRIptrdiff_t " (line %d): unexpected token", \ + p->tb - p->fb + 1, p->line); \ + return 0;\ + } \ +} while(0) + +static int _tok_match(const char *str, const char *b, const char *e) +{ + while (*str && (b != e)) { + if (*str++ != *b++) + return 0; + } + + return !(*str || (b != e)); +} + +struct dm_config_tree *dm_config_create(void) +{ + struct dm_config_tree *cft; + struct dm_pool *mem = dm_pool_create("config", 10 * 1024); + + if (!mem) { + log_error("Failed to allocate config pool."); + return 0; + } + + if (!(cft = dm_pool_zalloc(mem, sizeof(*cft)))) { + log_error("Failed to allocate config tree."); + dm_pool_destroy(mem); + return 0; + } + cft->mem = mem; + + return cft; +} + +void dm_config_set_custom(struct dm_config_tree *cft, void *custom) +{ + cft->custom = custom; +} + +void *dm_config_get_custom(struct dm_config_tree *cft) +{ + return cft->custom; +} + +void dm_config_destroy(struct dm_config_tree *cft) +{ + dm_pool_destroy(cft->mem); +} + +/* + * If there's a cascaded dm_config_tree, remove and return it, otherwise + * return NULL. + */ +struct dm_config_tree *dm_config_remove_cascaded_tree(struct dm_config_tree *cft) +{ + struct dm_config_tree *second_cft; + + if (!cft) + return NULL; + + second_cft = cft->cascade; + cft->cascade = NULL; + + return second_cft; +} + +/* + * When searching, first_cft is checked before second_cft. + */ +struct dm_config_tree *dm_config_insert_cascaded_tree(struct dm_config_tree *first_cft, struct dm_config_tree *second_cft) +{ + first_cft->cascade = second_cft; + + return first_cft; +} + +static struct dm_config_node *_config_reverse(struct dm_config_node *head) +{ + struct dm_config_node *left = head, *middle = NULL, *right = NULL; + + while (left) { + right = middle; + middle = left; + left = left->sib; + middle->sib = right; + middle->child = _config_reverse(middle->child); + } + + return middle; +} + +static int _do_dm_config_parse(struct dm_config_tree *cft, const char *start, const char *end, int no_dup_node_check) +{ + /* TODO? if (start == end) return 1; */ + + struct parser *p; + if (!(p = dm_pool_alloc(cft->mem, sizeof(*p)))) + return_0; + + p->mem = cft->mem; + p->fb = start; + p->fe = end; + p->tb = p->te = p->fb; + p->line = 1; + p->no_dup_node_check = no_dup_node_check; + + _get_token(p, TOK_SECTION_E); + if (!(cft->root = _file(p))) + return_0; + + cft->root = _config_reverse(cft->root); + + return 1; +} + +int dm_config_parse(struct dm_config_tree *cft, const char *start, const char *end) +{ + return _do_dm_config_parse(cft, start, end, 0); +} + +int dm_config_parse_without_dup_node_check(struct dm_config_tree *cft, const char *start, const char *end) +{ + return _do_dm_config_parse(cft, start, end, 1); +} + +struct dm_config_tree *dm_config_from_string(const char *config_settings) +{ + struct dm_config_tree *cft; + + if (!(cft = dm_config_create())) + return_NULL; + + if (!dm_config_parse(cft, config_settings, config_settings + strlen(config_settings))) { + dm_config_destroy(cft); + return_NULL; + } + + return cft; +} + +static int _line_start(struct config_output *out) +{ + if (!dm_pool_begin_object(out->mem, 128)) { + log_error("dm_pool_begin_object failed for config line"); + return 0; + } + + return 1; +} + +__attribute__ ((format(printf, 2, 3))) +static int _line_append(struct config_output *out, const char *fmt, ...) +{ + char buf[4096]; + char *dyn_buf = NULL; + va_list ap; + int n; + + /* + * We should be fine with the 4096 char buffer 99% of the time, + * but if we need to go beyond that, allocate the buffer dynamically. + */ + + va_start(ap, fmt); + n = vsnprintf(buf, sizeof(buf), fmt, ap); + va_end(ap); + + if (n < 0) { + log_error("vsnprintf failed for config line"); + return 0; + } + + if (n > (int) sizeof buf - 1) { + /* + * Fixed size buffer with sizeof buf is not enough, + * so try dynamically allocated buffer now... + */ + va_start(ap, fmt); + n = dm_vasprintf(&dyn_buf, fmt, ap); + va_end(ap); + + if (n < 0) { + log_error("dm_vasprintf failed for config line"); + return 0; + } + } + + if (!dm_pool_grow_object(out->mem, dyn_buf ? : buf, 0)) { + log_error("dm_pool_grow_object failed for config line"); + dm_free(dyn_buf); + return 0; + } + + dm_free(dyn_buf); + + return 1; +} + +#define line_append(args...) do {if (!_line_append(out, args)) {return_0;}} while (0) + +static int _line_end(const struct dm_config_node *cn, struct config_output *out) +{ + const char *line; + + if (!dm_pool_grow_object(out->mem, "\0", 1)) { + log_error("dm_pool_grow_object failed for config line"); + return 0; + } + + line = dm_pool_end_object(out->mem); + + if (!out->putline && !out->spec) + return 0; + + if (out->putline) + out->putline(line, out->baton); + + if (out->spec && out->spec->line_fn) + out->spec->line_fn(cn, line, out->baton); + + return 1; +} + +static int _write_value(struct config_output *out, const struct dm_config_value *v) +{ + char *buf; + const char *s; + + switch (v->type) { + case DM_CFG_STRING: + buf = alloca(dm_escaped_len(v->v.str)); + s = (v->format_flags & DM_CONFIG_VALUE_FMT_STRING_NO_QUOTES) ? "" : "\""; + line_append("%s%s%s", s, dm_escape_double_quotes(buf, v->v.str), s); + break; + + case DM_CFG_FLOAT: + line_append("%f", v->v.f); + break; + + case DM_CFG_INT: + if (v->format_flags & DM_CONFIG_VALUE_FMT_INT_OCTAL) + line_append("0%" PRIo64, v->v.i); + else + line_append(FMTd64, v->v.i); + break; + + case DM_CFG_EMPTY_ARRAY: + s = (v->format_flags & DM_CONFIG_VALUE_FMT_COMMON_EXTRA_SPACES) ? " " : ""; + line_append("[%s]", s); + break; + + default: + log_error("_write_value: Unknown value type: %d", v->type); + + } + + return 1; +} + +static int _write_config(const struct dm_config_node *n, int only_one, + struct config_output *out, int level) +{ + const char *extra_space; + int format_array; + char space[MAX_INDENT + 1]; + int l = (level < MAX_INDENT) ? level : MAX_INDENT; + int i; + char *escaped_key = NULL; + + if (!n) + return 1; + + for (i = 0; i < l; i++) + space[i] = '\t'; + space[i] = '\0'; + + do { + extra_space = (n->v && (n->v->format_flags & DM_CONFIG_VALUE_FMT_COMMON_EXTRA_SPACES)) ? " " : ""; + format_array = (n->v && (n->v->format_flags & DM_CONFIG_VALUE_FMT_COMMON_ARRAY)); + + if (out->spec && out->spec->prefix_fn) + out->spec->prefix_fn(n, space, out->baton); + + if (!_line_start(out)) + return_0; + if (strchr(n->key, '#') || strchr(n->key, '"') || strchr(n->key, '!')) { + escaped_key = alloca(dm_escaped_len(n->key) + 2); + *escaped_key = '"'; + dm_escape_double_quotes(escaped_key + 1, n->key); + strcat(escaped_key, "\""); + } + line_append("%s%s", space, escaped_key ? escaped_key : n->key); + escaped_key = NULL; + if (!n->v) { + /* it's a sub section */ + line_append(" {"); + if (!_line_end(n, out)) + return_0; + if (!_write_config(n->child, 0, out, level + 1)) + return_0; + if (!_line_start(out)) + return_0; + line_append("%s}", space); + } else { + /* it's a value */ + const struct dm_config_value *v = n->v; + line_append("%s=%s", extra_space, extra_space); + if (v->next) { + line_append("[%s", extra_space); + while (v && v->type != DM_CFG_EMPTY_ARRAY) { + if (!_write_value(out, v)) + return_0; + v = v->next; + if (v && v->type != DM_CFG_EMPTY_ARRAY) + line_append(",%s", extra_space); + } + line_append("%s]", extra_space); + } else { + if (format_array && (v->type != DM_CFG_EMPTY_ARRAY)) + line_append("[%s", extra_space); + if (!_write_value(out, v)) + return_0; + if (format_array && (v->type != DM_CFG_EMPTY_ARRAY)) + line_append("%s]", extra_space); + } + } + if (!_line_end(n, out)) + return_0; + + if (out->spec && out->spec->suffix_fn) + out->spec->suffix_fn(n, space, out->baton); + + n = n->sib; + } while (n && !only_one); + /* FIXME: add error checking */ + return 1; +} + +static int _write_node(const struct dm_config_node *cn, int only_one, + dm_putline_fn putline, + const struct dm_config_node_out_spec *out_spec, + void *baton) +{ + struct config_output out = { + .mem = dm_pool_create("config_output", 1024), + .putline = putline, + .spec = out_spec, + .baton = baton + }; + + if (!out.mem) + return_0; + + if (!_write_config(cn, only_one, &out, 0)) { + dm_pool_destroy(out.mem); + return_0; + } + dm_pool_destroy(out.mem); + return 1; +} + +int dm_config_write_one_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton) +{ + return _write_node(cn, 1, putline, NULL, baton); +} + +int dm_config_write_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton) +{ + return _write_node(cn, 0, putline, NULL, baton); +} + +int dm_config_write_one_node_out(const struct dm_config_node *cn, + const struct dm_config_node_out_spec *out_spec, + void *baton) +{ + return _write_node(cn, 1, NULL, out_spec, baton); +} + +int dm_config_write_node_out(const struct dm_config_node *cn, + const struct dm_config_node_out_spec *out_spec, + void *baton) +{ + return _write_node(cn, 0, NULL, out_spec, baton); +} + +/* + * parser + */ +static char *_dup_string_tok(struct parser *p) +{ + char *str; + + p->tb++, p->te--; /* strip "'s */ + + if (p->te < p->tb) { + log_error("Parse error at byte %" PRIptrdiff_t " (line %d): " + "expected a string token.", + p->tb - p->fb + 1, p->line); + return NULL; + } + + if (!(str = _dup_tok(p))) + return_NULL; + + p->te++; + + return str; +} + +static struct dm_config_node *_file(struct parser *p) +{ + struct dm_config_node root = { 0 }; + root.key = "<root>"; + + while (p->t != TOK_EOF) + if (!_section(p, &root)) + return_NULL; + return root.child; +} + +static struct dm_config_node *_make_node(struct dm_pool *mem, + const char *key_b, const char *key_e, + struct dm_config_node *parent) +{ + struct dm_config_node *n; + + if (!(n = _create_node(mem))) + return_NULL; + + n->key = _dup_token(mem, key_b, key_e); + if (parent) { + n->parent = parent; + n->sib = parent->child; + parent->child = n; + } + return n; +} + +/* when mem is not NULL, we create the path if it doesn't exist yet */ +static struct dm_config_node *_find_or_make_node(struct dm_pool *mem, + struct dm_config_node *parent, + const char *path, + int no_dup_node_check) +{ + const char *e; + struct dm_config_node *cn = parent ? parent->child : NULL; + struct dm_config_node *cn_found = NULL; + + while (cn || mem) { + /* trim any leading slashes */ + while (*path && (*path == _sep)) + path++; + + /* find the end of this segment */ + for (e = path; *e && (*e != _sep); e++) ; + + /* hunt for the node */ + cn_found = NULL; + + if (!no_dup_node_check) { + while (cn) { + if (_tok_match(cn->key, path, e)) { + /* Inefficient */ + if (!cn_found) + cn_found = cn; + else + log_warn("WARNING: Ignoring duplicate" + " config node: %s (" + "seeking %s)", cn->key, path); + } + + cn = cn->sib; + } + } + + if (!cn_found && mem) { + if (!(cn_found = _make_node(mem, path, e, parent))) + return_NULL; + } + + if (cn_found && *e) { + parent = cn_found; + cn = cn_found->child; + } else + return cn_found; + path = e; + } + + return NULL; +} + +static struct dm_config_node *_section(struct parser *p, struct dm_config_node *parent) +{ + /* IDENTIFIER SECTION_B_CHAR VALUE* SECTION_E_CHAR */ + + struct dm_config_node *root; + struct dm_config_value *value; + char *str; + + if (p->t == TOK_STRING_ESCAPED) { + if (!(str = _dup_string_tok(p))) + return_NULL; + dm_unescape_double_quotes(str); + + match(TOK_STRING_ESCAPED); + } else if (p->t == TOK_STRING) { + if (!(str = _dup_string_tok(p))) + return_NULL; + + match(TOK_STRING); + } else { + if (!(str = _dup_tok(p))) + return_NULL; + + match(TOK_IDENTIFIER); + } + + if (!strlen(str)) { + log_error("Parse error at byte %" PRIptrdiff_t " (line %d): empty section identifier", + p->tb - p->fb + 1, p->line); + return NULL; + } + + if (!(root = _find_or_make_node(p->mem, parent, str, p->no_dup_node_check))) + return_NULL; + + if (p->t == TOK_SECTION_B) { + match(TOK_SECTION_B); + while (p->t != TOK_SECTION_E) { + if (!(_section(p, root))) + return_NULL; + } + match(TOK_SECTION_E); + } else { + match(TOK_EQ); + if (!(value = _value(p))) + return_NULL; + if (root->v) + log_warn("WARNING: Ignoring duplicate" + " config value: %s", str); + root->v = value; + } + + return root; +} + +static struct dm_config_value *_value(struct parser *p) +{ + /* '[' TYPE* ']' | TYPE */ + struct dm_config_value *h = NULL, *l, *ll = NULL; + if (p->t == TOK_ARRAY_B) { + match(TOK_ARRAY_B); + while (p->t != TOK_ARRAY_E) { + if (!(l = _type(p))) + return_NULL; + + if (!h) + h = l; + else + ll->next = l; + ll = l; + + if (p->t == TOK_COMMA) + match(TOK_COMMA); + } + match(TOK_ARRAY_E); + /* + * Special case for an empty array. + */ + if (!h) { + if (!(h = _create_value(p->mem))) { + log_error("Failed to allocate value"); + return NULL; + } + + h->type = DM_CFG_EMPTY_ARRAY; + } + + } else + if (!(h = _type(p))) + return_NULL; + + return h; +} + +static struct dm_config_value *_type(struct parser *p) +{ + /* [+-]{0,1}[0-9]+ | [0-9]*\.[0-9]* | ".*" */ + struct dm_config_value *v = _create_value(p->mem); + char *str; + + if (!v) { + log_error("Failed to allocate type value"); + return NULL; + } + + switch (p->t) { + case TOK_INT: + v->type = DM_CFG_INT; + errno = 0; + v->v.i = strtoll(p->tb, NULL, 0); /* FIXME: check error */ + if (errno) { + log_error("Failed to read int token."); + return NULL; + } + match(TOK_INT); + break; + + case TOK_FLOAT: + v->type = DM_CFG_FLOAT; + errno = 0; + v->v.f = strtod(p->tb, NULL); /* FIXME: check error */ + if (errno) { + log_error("Failed to read float token."); + return NULL; + } + match(TOK_FLOAT); + break; + + case TOK_STRING: + v->type = DM_CFG_STRING; + + if (!(v->v.str = _dup_string_tok(p))) + return_NULL; + + match(TOK_STRING); + break; + + case TOK_STRING_BARE: + v->type = DM_CFG_STRING; + + if (!(v->v.str = _dup_tok(p))) + return_NULL; + + match(TOK_STRING_BARE); + break; + + case TOK_STRING_ESCAPED: + v->type = DM_CFG_STRING; + + if (!(str = _dup_string_tok(p))) + return_NULL; + dm_unescape_double_quotes(str); + v->v.str = str; + match(TOK_STRING_ESCAPED); + break; + + default: + log_error("Parse error at byte %" PRIptrdiff_t " (line %d): expected a value", + p->tb - p->fb + 1, p->line); + return NULL; + } + return v; +} + +static int _match_aux(struct parser *p, int t) +{ + if (p->t != t) + return 0; + + _get_token(p, t); + return 1; +} + +/* + * tokeniser + */ +static void _get_token(struct parser *p, int tok_prev) +{ + int values_allowed = 0; + + const char *te; + + p->tb = p->te; + _eat_space(p); + if (p->tb == p->fe || !*p->tb) { + p->t = TOK_EOF; + return; + } + + /* Should next token be interpreted as value instead of identifier? */ + if (tok_prev == TOK_EQ || tok_prev == TOK_ARRAY_B || + tok_prev == TOK_COMMA) + values_allowed = 1; + + p->t = TOK_INT; /* fudge so the fall through for + floats works */ + + te = p->te; + switch (*te) { + case SECTION_B_CHAR: + p->t = TOK_SECTION_B; + te++; + break; + + case SECTION_E_CHAR: + p->t = TOK_SECTION_E; + te++; + break; + + case '[': + p->t = TOK_ARRAY_B; + te++; + break; + + case ']': + p->t = TOK_ARRAY_E; + te++; + break; + + case ',': + p->t = TOK_COMMA; + te++; + break; + + case '=': + p->t = TOK_EQ; + te++; + break; + + case '"': + p->t = TOK_STRING_ESCAPED; + te++; + while ((te != p->fe) && (*te) && (*te != '"')) { + if ((*te == '\\') && (te + 1 != p->fe) && + *(te + 1)) + te++; + te++; + } + + if ((te != p->fe) && (*te)) + te++; + break; + + case '\'': + p->t = TOK_STRING; + te++; + while ((te != p->fe) && (*te) && (*te != '\'')) + te++; + + if ((te != p->fe) && (*te)) + te++; + break; + + case '.': + p->t = TOK_FLOAT; + /* Fall through */ + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '+': + case '-': + if (values_allowed) { + while (++te != p->fe) { + if (!isdigit((int) *te)) { + if (*te == '.') { + if (p->t != TOK_FLOAT) { + p->t = TOK_FLOAT; + continue; + } + } + break; + } + } + break; + } + /* fall through */ + + default: + p->t = TOK_IDENTIFIER; + while ((te != p->fe) && (*te) && !isspace(*te) && + (*te != '#') && (*te != '=') && + (*te != SECTION_B_CHAR) && + (*te != SECTION_E_CHAR)) + te++; + if (values_allowed) + p->t = TOK_STRING_BARE; + break; + } + + p->te = te; +} + +static void _eat_space(struct parser *p) +{ + while (p->tb != p->fe) { + if (*p->te == '#') + while ((p->te != p->fe) && (*p->te != '\n') && (*p->te)) + ++p->te; + + else if (!isspace(*p->te)) + break; + + while ((p->te != p->fe) && isspace(*p->te)) { + if (*p->te == '\n') + ++p->line; + ++p->te; + } + + p->tb = p->te; + } +} + +/* + * memory management + */ +static struct dm_config_value *_create_value(struct dm_pool *mem) +{ + return dm_pool_zalloc(mem, sizeof(struct dm_config_value)); +} + +static struct dm_config_node *_create_node(struct dm_pool *mem) +{ + return dm_pool_zalloc(mem, sizeof(struct dm_config_node)); +} + +static char *_dup_token(struct dm_pool *mem, const char *b, const char *e) +{ + size_t len = e - b; + char *str = dm_pool_alloc(mem, len + 1); + if (!str) { + log_error("Failed to duplicate token."); + return 0; + } + memcpy(str, b, len); + str[len] = '\0'; + return str; +} + +static char *_dup_tok(struct parser *p) +{ + return _dup_token(p->mem, p->tb, p->te); +} + +/* + * Utility functions + */ + +/* + * node_lookup_fn is either: + * _find_config_node to perform a lookup starting from a given config_node + * in a config_tree; + * or + * _find_first_config_node to find the first config_node in a set of + * cascaded trees. + */ +typedef const struct dm_config_node *node_lookup_fn(const void *start, const char *path); + +static const struct dm_config_node *_find_config_node(const void *start, const char *path) { + struct dm_config_node dummy = { .child = (void *) start }; + return _find_or_make_node(NULL, &dummy, path, 0); +} + +static const struct dm_config_node *_find_first_config_node(const void *start, const char *path) +{ + const struct dm_config_tree *cft = start; + const struct dm_config_node *cn = NULL; + + while (cft) { + if ((cn = _find_config_node(cft->root, path))) + return cn; + cft = cft->cascade; + } + + return NULL; +} + +static const char *_find_config_str(const void *start, node_lookup_fn find_fn, + const char *path, const char *fail, int allow_empty) +{ + const struct dm_config_node *n = find_fn(start, path); + + /* Empty strings are ignored if allow_empty is set */ + if (n && n->v) { + if ((n->v->type == DM_CFG_STRING) && + (allow_empty || (*n->v->v.str))) { + /* log_very_verbose("Setting %s to %s", path, n->v->v.str); */ + return n->v->v.str; + } + if ((n->v->type != DM_CFG_STRING) || (!allow_empty && fail)) + log_warn("WARNING: Ignoring unsupported value for %s.", path); + } + + if (fail) + log_very_verbose("%s not found in config: defaulting to %s", + path, fail); + return fail; +} + +const char *dm_config_find_str(const struct dm_config_node *cn, + const char *path, const char *fail) +{ + return _find_config_str(cn, _find_config_node, path, fail, 0); +} + +const char *dm_config_find_str_allow_empty(const struct dm_config_node *cn, + const char *path, const char *fail) +{ + return _find_config_str(cn, _find_config_node, path, fail, 1); +} + +static int64_t _find_config_int64(const void *start, node_lookup_fn find, + const char *path, int64_t fail) +{ + const struct dm_config_node *n = find(start, path); + + if (n && n->v && n->v->type == DM_CFG_INT) { + /* log_very_verbose("Setting %s to %" PRId64, path, n->v->v.i); */ + return n->v->v.i; + } + + log_very_verbose("%s not found in config: defaulting to %" PRId64, + path, fail); + return fail; +} + +static float _find_config_float(const void *start, node_lookup_fn find, + const char *path, float fail) +{ + const struct dm_config_node *n = find(start, path); + + if (n && n->v && n->v->type == DM_CFG_FLOAT) { + /* log_very_verbose("Setting %s to %f", path, n->v->v.f); */ + return n->v->v.f; + } + + log_very_verbose("%s not found in config: defaulting to %f", + path, fail); + + return fail; + +} + +static int _str_in_array(const char *str, const char * const values[]) +{ + int i; + + for (i = 0; values[i]; i++) + if (!strcasecmp(str, values[i])) + return 1; + + return 0; +} + +static int _str_to_bool(const char *str, int fail) +{ + const char * const _true_values[] = { "y", "yes", "on", "true", NULL }; + const char * const _false_values[] = { "n", "no", "off", "false", NULL }; + + if (_str_in_array(str, _true_values)) + return 1; + + if (_str_in_array(str, _false_values)) + return 0; + + return fail; +} + +static int _find_config_bool(const void *start, node_lookup_fn find, + const char *path, int fail) +{ + const struct dm_config_node *n = find(start, path); + const struct dm_config_value *v; + int b; + + if (n) { + v = n->v; + + switch (v->type) { + case DM_CFG_INT: + b = v->v.i ? 1 : 0; + /* log_very_verbose("Setting %s to %d", path, b); */ + return b; + + case DM_CFG_STRING: + b = _str_to_bool(v->v.str, fail); + /* log_very_verbose("Setting %s to %d", path, b); */ + return b; + default: + ; + } + } + + log_very_verbose("%s not found in config: defaulting to %d", + path, fail); + + return fail; +} + +/*********************************** + * node-based lookup + **/ + +struct dm_config_node *dm_config_find_node(const struct dm_config_node *cn, + const char *path) +{ + return (struct dm_config_node *) _find_config_node(cn, path); +} + +int dm_config_find_int(const struct dm_config_node *cn, const char *path, int fail) +{ + /* FIXME Add log_error message on overflow */ + return (int) _find_config_int64(cn, _find_config_node, path, (int64_t) fail); +} + +int64_t dm_config_find_int64(const struct dm_config_node *cn, const char *path, int64_t fail) +{ + return _find_config_int64(cn, _find_config_node, path, fail); +} + +float dm_config_find_float(const struct dm_config_node *cn, const char *path, + float fail) +{ + return _find_config_float(cn, _find_config_node, path, fail); +} + +int dm_config_find_bool(const struct dm_config_node *cn, const char *path, int fail) +{ + return _find_config_bool(cn, _find_config_node, path, fail); +} + +int dm_config_value_is_bool(const struct dm_config_value *v) { + if (!v) + return 0; + + switch(v->type) { + case DM_CFG_INT: + return 1; + case DM_CFG_STRING: + return _str_to_bool(v->v.str, -1) != -1; + default: + return 0; + } +} + +/*********************************** + * tree-based lookup + **/ + +const struct dm_config_node *dm_config_tree_find_node(const struct dm_config_tree *cft, + const char *path) +{ + return _find_first_config_node(cft, path); +} + +const char *dm_config_tree_find_str(const struct dm_config_tree *cft, const char *path, + const char *fail) +{ + return _find_config_str(cft, _find_first_config_node, path, fail, 0); +} + +const char *dm_config_tree_find_str_allow_empty(const struct dm_config_tree *cft, const char *path, + const char *fail) +{ + return _find_config_str(cft, _find_first_config_node, path, fail, 1); +} + +int dm_config_tree_find_int(const struct dm_config_tree *cft, const char *path, int fail) +{ + /* FIXME Add log_error message on overflow */ + return (int) _find_config_int64(cft, _find_first_config_node, path, (int64_t) fail); +} + +int64_t dm_config_tree_find_int64(const struct dm_config_tree *cft, const char *path, int64_t fail) +{ + return _find_config_int64(cft, _find_first_config_node, path, fail); +} + +float dm_config_tree_find_float(const struct dm_config_tree *cft, const char *path, + float fail) +{ + return _find_config_float(cft, _find_first_config_node, path, fail); +} + +int dm_config_tree_find_bool(const struct dm_config_tree *cft, const char *path, int fail) +{ + return _find_config_bool(cft, _find_first_config_node, path, fail); +} + +/************************************/ + + +int dm_config_get_uint32(const struct dm_config_node *cn, const char *path, + uint32_t *result) +{ + const struct dm_config_node *n; + + n = _find_config_node(cn, path); + + if (!n || !n->v || n->v->type != DM_CFG_INT) + return 0; + + if (result) + *result = n->v->v.i; + return 1; +} + +int dm_config_get_uint64(const struct dm_config_node *cn, const char *path, + uint64_t *result) +{ + const struct dm_config_node *n; + + n = _find_config_node(cn, path); + + if (!n || !n->v || n->v->type != DM_CFG_INT) + return 0; + + if (result) + *result = (uint64_t) n->v->v.i; + return 1; +} + +int dm_config_get_str(const struct dm_config_node *cn, const char *path, + const char **result) +{ + const struct dm_config_node *n; + + n = _find_config_node(cn, path); + + if (!n || !n->v || n->v->type != DM_CFG_STRING) + return 0; + + if (result) + *result = n->v->v.str; + return 1; +} + +int dm_config_get_list(const struct dm_config_node *cn, const char *path, + const struct dm_config_value **result) +{ + const struct dm_config_node *n; + + n = _find_config_node(cn, path); + /* TODO when we represent single-item lists consistently, add a check + * for n->v->next != NULL */ + if (!n || !n->v) + return 0; + + if (result) + *result = n->v; + return 1; +} + +int dm_config_get_section(const struct dm_config_node *cn, const char *path, + const struct dm_config_node **result) +{ + const struct dm_config_node *n; + + n = _find_config_node(cn, path); + if (!n || n->v) + return 0; + + if (result) + *result = n; + return 1; +} + +int dm_config_has_node(const struct dm_config_node *cn, const char *path) +{ + return _find_config_node(cn, path) ? 1 : 0; +} + +/* + * Convert a token type to the char it represents. + */ +static char _token_type_to_char(int type) +{ + switch (type) { + case TOK_SECTION_B: + return SECTION_B_CHAR; + case TOK_SECTION_E: + return SECTION_E_CHAR; + default: + return 0; + } +} + +/* + * Returns: + * # of 'type' tokens in 'str'. + */ +static unsigned _count_tokens(const char *str, unsigned len, int type) +{ + char c; + + c = _token_type_to_char(type); + + return dm_count_chars(str, len, c); +} + +const char *dm_config_parent_name(const struct dm_config_node *n) +{ + return (n->parent ? n->parent->key : "(root)"); +} +/* + * Heuristic function to make a quick guess as to whether a text + * region probably contains a valid config "section". (Useful for + * scanning areas of the disk for old metadata.) + * Config sections contain various tokens, may contain other sections + * and strings, and are delimited by begin (type 'TOK_SECTION_B') and + * end (type 'TOK_SECTION_E') tokens. As a quick heuristic, we just + * count the number of begin and end tokens, and see if they are + * non-zero and the counts match. + * Full validation of the section should be done with another function + * (for example, read_config_fd). + * + * Returns: + * 0 - probably is not a valid config section + * 1 - probably _is_ a valid config section + */ +unsigned dm_config_maybe_section(const char *str, unsigned len) +{ + int begin_count; + int end_count; + + begin_count = _count_tokens(str, len, TOK_SECTION_B); + end_count = _count_tokens(str, len, TOK_SECTION_E); + + if (begin_count && end_count && (begin_count == end_count)) + return 1; + else + return 0; +} + +__attribute__((nonnull(1, 2))) +static struct dm_config_value *_clone_config_value(struct dm_pool *mem, + const struct dm_config_value *v) +{ + struct dm_config_value *new_cv; + + if (!(new_cv = _create_value(mem))) { + log_error("Failed to clone config value."); + return NULL; + } + + new_cv->type = v->type; + if (v->type == DM_CFG_STRING) { + if (!(new_cv->v.str = dm_pool_strdup(mem, v->v.str))) { + log_error("Failed to clone config string value."); + return NULL; + } + } else + new_cv->v = v->v; + + if (v->next && !(new_cv->next = _clone_config_value(mem, v->next))) + return_NULL; + + return new_cv; +} + +struct dm_config_node *dm_config_clone_node_with_mem(struct dm_pool *mem, const struct dm_config_node *cn, int siblings) +{ + struct dm_config_node *new_cn; + + if (!cn) { + log_error("Cannot clone NULL config node."); + return NULL; + } + + if (!(new_cn = _create_node(mem))) { + log_error("Failed to clone config node."); + return NULL; + } + + if ((cn->key && !(new_cn->key = dm_pool_strdup(mem, cn->key)))) { + log_error("Failed to clone config node key."); + return NULL; + } + + new_cn->id = cn->id; + + if ((cn->v && !(new_cn->v = _clone_config_value(mem, cn->v))) || + (cn->child && !(new_cn->child = dm_config_clone_node_with_mem(mem, cn->child, 1))) || + (siblings && cn->sib && !(new_cn->sib = dm_config_clone_node_with_mem(mem, cn->sib, siblings)))) + return_NULL; /* 'new_cn' released with mem pool */ + + return new_cn; +} + +struct dm_config_node *dm_config_clone_node(struct dm_config_tree *cft, const struct dm_config_node *node, int sib) +{ + return dm_config_clone_node_with_mem(cft->mem, node, sib); +} + +struct dm_config_node *dm_config_create_node(struct dm_config_tree *cft, const char *key) +{ + struct dm_config_node *cn; + + if (!(cn = _create_node(cft->mem))) { + log_error("Failed to create config node."); + return NULL; + } + if (!(cn->key = dm_pool_strdup(cft->mem, key))) { + log_error("Failed to create config node's key."); + return NULL; + } + cn->parent = NULL; + cn->v = NULL; + + return cn; +} + +struct dm_config_value *dm_config_create_value(struct dm_config_tree *cft) +{ + return _create_value(cft->mem); +} + +void dm_config_value_set_format_flags(struct dm_config_value *cv, uint32_t format_flags) +{ + if (!cv) + return; + + cv->format_flags = format_flags; +} + +uint32_t dm_config_value_get_format_flags(struct dm_config_value *cv) +{ + if (!cv) + return 0; + + return cv->format_flags; +} + +struct dm_pool *dm_config_memory(struct dm_config_tree *cft) +{ + return cft->mem; +} + +static int _override_path(const char *path, struct dm_config_node *node, void *baton) +{ + struct dm_config_tree *cft = baton; + struct dm_config_node dummy, *target; + dummy.child = cft->root; + if (!(target = _find_or_make_node(cft->mem, &dummy, path, 0))) + return_0; + if (!(target->v = _clone_config_value(cft->mem, node->v))) + return_0; + cft->root = dummy.child; + return 1; +} + +static int _enumerate(const char *path, struct dm_config_node *cn, int (*cb)(const char *, struct dm_config_node *, void *), void *baton) +{ + char *sub = NULL; + + while (cn) { + if (dm_asprintf(&sub, "%s/%s", path, cn->key) < 0) + return_0; + if (cn->child) { + if (!_enumerate(sub, cn->child, cb, baton)) + goto_bad; + } else + if (!cb(sub, cn, baton)) + goto_bad; + dm_free(sub); + cn = cn->sib; + } + return 1; +bad: + dm_free(sub); + return 0; +} + +struct dm_config_tree *dm_config_flatten(struct dm_config_tree *cft) +{ + struct dm_config_tree *res = dm_config_create(), *done = NULL, *current = NULL; + + if (!res) + return_NULL; + + while (done != cft) { + current = cft; + while (current->cascade != done) + current = current->cascade; + _enumerate("", current->root, _override_path, res); + done = current; + } + + return res; +} + +int dm_config_remove_node(struct dm_config_node *parent, struct dm_config_node *rem_node) +{ + struct dm_config_node *cn = parent->child, *last = NULL; + while (cn) { + if (cn == rem_node) { + if (last) + last->sib = cn->sib; + else + parent->child = cn->sib; + return 1; + } + last = cn; + cn = cn->sib; + } + return 0; +} diff --git a/device_mapper/libdm-deptree.c b/device_mapper/libdm-deptree.c new file mode 100644 index 0000000..fab3e06 --- /dev/null +++ b/device_mapper/libdm-deptree.c @@ -0,0 +1,3853 @@ +/* + * Copyright (C) 2005-2017 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" +#include "ioctl/libdm-targets.h" +#include "libdm-common.h" +#include "misc/kdev_t.h" +#include "misc/dm-ioctl.h" + +#include <stdarg.h> +#include <sys/param.h> +#include <sys/utsname.h> + +#define MAX_TARGET_PARAMSIZE 500000 + +/* Supported segment types */ +enum { + SEG_CACHE, + SEG_CRYPT, + SEG_ERROR, + SEG_LINEAR, + SEG_MIRRORED, + SEG_SNAPSHOT, + SEG_SNAPSHOT_ORIGIN, + SEG_SNAPSHOT_MERGE, + SEG_STRIPED, + SEG_ZERO, + SEG_THIN_POOL, + SEG_THIN, + SEG_RAID0, + SEG_RAID0_META, + SEG_RAID1, + SEG_RAID10, + SEG_RAID4, + SEG_RAID5_N, + SEG_RAID5_LA, + SEG_RAID5_RA, + SEG_RAID5_LS, + SEG_RAID5_RS, + SEG_RAID6_N_6, + SEG_RAID6_ZR, + SEG_RAID6_NR, + SEG_RAID6_NC, + SEG_RAID6_LS_6, + SEG_RAID6_RS_6, + SEG_RAID6_LA_6, + SEG_RAID6_RA_6, +}; + +/* FIXME Add crypt and multipath support */ + +static const struct { + unsigned type; + const char target[16]; +} _dm_segtypes[] = { + { SEG_CACHE, "cache" }, + { SEG_CRYPT, "crypt" }, + { SEG_ERROR, "error" }, + { SEG_LINEAR, "linear" }, + { SEG_MIRRORED, "mirror" }, + { SEG_SNAPSHOT, "snapshot" }, + { SEG_SNAPSHOT_ORIGIN, "snapshot-origin" }, + { SEG_SNAPSHOT_MERGE, "snapshot-merge" }, + { SEG_STRIPED, "striped" }, + { SEG_ZERO, "zero"}, + { SEG_THIN_POOL, "thin-pool"}, + { SEG_THIN, "thin"}, + { SEG_RAID0, "raid0"}, + { SEG_RAID0_META, "raid0_meta"}, + { SEG_RAID1, "raid1"}, + { SEG_RAID10, "raid10"}, + { SEG_RAID4, "raid4"}, + { SEG_RAID5_N, "raid5_n"}, + { SEG_RAID5_LA, "raid5_la"}, + { SEG_RAID5_RA, "raid5_ra"}, + { SEG_RAID5_LS, "raid5_ls"}, + { SEG_RAID5_RS, "raid5_rs"}, + { SEG_RAID6_N_6,"raid6_n_6"}, + { SEG_RAID6_ZR, "raid6_zr"}, + { SEG_RAID6_NR, "raid6_nr"}, + { SEG_RAID6_NC, "raid6_nc"}, + { SEG_RAID6_LS_6, "raid6_ls_6"}, + { SEG_RAID6_RS_6, "raid6_rs_6"}, + { SEG_RAID6_LA_6, "raid6_la_6"}, + { SEG_RAID6_RA_6, "raid6_ra_6"}, + + + /* + * WARNING: Since 'raid' target overloads this 1:1 mapping table + * for search do not add new enum elements past them! + */ + { SEG_RAID5_LS, "raid5"}, /* same as "raid5_ls" (default for MD also) */ + { SEG_RAID6_ZR, "raid6"}, /* same as "raid6_zr" */ + { SEG_RAID10, "raid10_near"}, /* same as "raid10" */ +}; + +/* Some segment types have a list of areas of other devices attached */ +struct seg_area { + struct dm_list list; + + struct dm_tree_node *dev_node; + + uint64_t offset; +}; + +struct dm_thin_message { + dm_thin_message_t type; + union { + struct { + uint32_t device_id; + uint32_t origin_id; + } m_create_snap; + struct { + uint32_t device_id; + } m_create_thin; + struct { + uint32_t device_id; + } m_delete; + struct { + uint64_t current_id; + uint64_t new_id; + } m_set_transaction_id; + } u; +}; + +struct thin_message { + struct dm_list list; + struct dm_thin_message message; + int expected_errno; +}; + +/* Per-segment properties */ +struct load_segment { + struct dm_list list; + + unsigned type; + + uint64_t size; + + unsigned area_count; /* Linear + Striped + Mirrored + Crypt */ + struct dm_list areas; /* Linear + Striped + Mirrored + Crypt */ + + uint32_t stripe_size; /* Striped + raid */ + + int persistent; /* Snapshot */ + uint32_t chunk_size; /* Snapshot */ + struct dm_tree_node *cow; /* Snapshot */ + struct dm_tree_node *origin; /* Snapshot + Snapshot origin + Cache */ + struct dm_tree_node *merge; /* Snapshot */ + + struct dm_tree_node *log; /* Mirror */ + uint32_t region_size; /* Mirror + raid */ + unsigned clustered; /* Mirror */ + unsigned mirror_area_count; /* Mirror */ + uint32_t flags; /* Mirror + raid + Cache */ + char *uuid; /* Clustered mirror log */ + + const char *policy_name; /* Cache */ + unsigned policy_argc; /* Cache */ + struct dm_config_node *policy_settings; /* Cache */ + + const char *cipher; /* Crypt */ + const char *chainmode; /* Crypt */ + const char *iv; /* Crypt */ + uint64_t iv_offset; /* Crypt */ + const char *key; /* Crypt */ + + int delta_disks; /* raid reshape number of disks */ + int data_offset; /* raid reshape data offset on disk to set */ + uint64_t rebuilds[RAID_BITMAP_SIZE]; /* raid */ + uint64_t writemostly[RAID_BITMAP_SIZE]; /* raid */ + uint32_t writebehind; /* raid */ + uint32_t max_recovery_rate; /* raid kB/sec/disk */ + uint32_t min_recovery_rate; /* raid kB/sec/disk */ + uint32_t data_copies; /* raid10 data_copies */ + + struct dm_tree_node *metadata; /* Thin_pool + Cache */ + struct dm_tree_node *pool; /* Thin_pool, Thin */ + struct dm_tree_node *external; /* Thin */ + struct dm_list thin_messages; /* Thin_pool */ + uint64_t transaction_id; /* Thin_pool */ + uint64_t low_water_mark; /* Thin_pool */ + uint32_t data_block_size; /* Thin_pool + cache */ + unsigned skip_block_zeroing; /* Thin_pool */ + unsigned ignore_discard; /* Thin_pool target vsn 1.1 */ + unsigned no_discard_passdown; /* Thin_pool target vsn 1.1 */ + unsigned error_if_no_space; /* Thin pool target vsn 1.10 */ + unsigned read_only; /* Thin pool target vsn 1.3 */ + uint32_t device_id; /* Thin */ + +}; + +/* Per-device properties */ +struct load_properties { + int read_only; + uint32_t major; + uint32_t minor; + + uint32_t read_ahead; + uint32_t read_ahead_flags; + + unsigned segment_count; + int size_changed; + struct dm_list segs; + + const char *new_name; + + /* If immediate_dev_node is set to 1, try to create the dev node + * as soon as possible (e.g. in preload stage even during traversal + * and processing of dm tree). This will also flush all stacked dev + * node operations, synchronizing with udev. + */ + unsigned immediate_dev_node; + + /* + * If the device size changed from zero and this is set, + * don't resume the device immediately, even if the device + * has parents. This works provided the parents do not + * validate the device size and is required by pvmove to + * avoid starting the mirror resync operation too early. + */ + unsigned delay_resume_if_new; + + /* + * Preload tree normally only loads and not resume, but there is + * automatic resume when target is extended, as it's believed + * there can be no i/o flying to this 'new' extedend space + * from any device above. Reason is that preloaded target above + * may actually need to see its bigger subdevice before it + * gets suspended. As long as devices are simple linears + * there is no problem to resume bigger device in preload (before commit). + * However complex targets like thin-pool (raid,cache...) + * they shall not be resumed before their commit. + */ + unsigned delay_resume_if_extended; + + /* + * Call node_send_messages(), set to 2 if there are messages + * When != 0, it validates matching transaction id, thus thin-pools + * where transation_id is passed as 0 are never validated, this + * allows external managment of thin-pool TID. + */ + unsigned send_messages; + /* Skip suspending node's children, used when sending messages to thin-pool */ + int skip_suspend; +}; + +/* Two of these used to join two nodes with uses and used_by. */ +struct dm_tree_link { + struct dm_list list; + struct dm_tree_node *node; +}; + +struct dm_tree_node { + struct dm_tree *dtree; + + const char *name; + const char *uuid; + struct dm_info info; + + struct dm_list uses; /* Nodes this node uses */ + struct dm_list used_by; /* Nodes that use this node */ + + int activation_priority; /* 0 gets activated first */ + int implicit_deps; /* 1 device only implicitly referenced */ + + uint16_t udev_flags; /* Udev control flags */ + + void *context; /* External supplied context */ + + struct load_properties props; /* For creation/table (re)load */ + + /* + * If presuspend of child node is needed + * Note: only direct child is allowed + */ + struct dm_tree_node *presuspend_node; + + /* Callback */ + dm_node_callback_fn callback; + void *callback_data; + + /* + * TODO: + * Add advanced code which tracks of send ioctls and their + * proper revert operation for more advanced recovery + * Current code serves mostly only to recovery when + * thin pool metadata check fails and command would + * have left active thin data and metadata subvolumes. + */ + struct dm_list activated; /* Head of activated nodes for preload revert */ + struct dm_list activated_list; /* List of activated nodes for preload revert */ +}; + +struct dm_tree { + struct dm_pool *mem; + struct dm_hash_table *devs; + struct dm_hash_table *uuids; + struct dm_tree_node root; + int skip_lockfs; /* 1 skips lockfs (for non-snapshots) */ + int no_flush; /* 1 sets noflush (mirrors/multipath) */ + int retry_remove; /* 1 retries remove if not successful */ + uint32_t cookie; + char buf[DM_NAME_LEN + 32]; /* print buffer for device_name (major:minor) */ + const char **optional_uuid_suffixes; /* uuid suffixes ignored when matching */ +}; + +/* + * Tree functions. + */ +struct dm_tree *dm_tree_create(void) +{ + struct dm_pool *dmem; + struct dm_tree *dtree; + + if (!(dmem = dm_pool_create("dtree", 1024)) || + !(dtree = dm_pool_zalloc(dmem, sizeof(*dtree)))) { + log_error("Failed to allocate dtree."); + if (dmem) + dm_pool_destroy(dmem); + return NULL; + } + + dtree->root.dtree = dtree; + dm_list_init(&dtree->root.uses); + dm_list_init(&dtree->root.used_by); + dm_list_init(&dtree->root.activated); + dtree->skip_lockfs = 0; + dtree->no_flush = 0; + dtree->mem = dmem; + dtree->optional_uuid_suffixes = NULL; + + if (!(dtree->devs = dm_hash_create(8))) { + log_error("dtree hash creation failed"); + dm_pool_destroy(dtree->mem); + return NULL; + } + + if (!(dtree->uuids = dm_hash_create(32))) { + log_error("dtree uuid hash creation failed"); + dm_hash_destroy(dtree->devs); + dm_pool_destroy(dtree->mem); + return NULL; + } + + return dtree; +} + +void dm_tree_free(struct dm_tree *dtree) +{ + if (!dtree) + return; + + dm_hash_destroy(dtree->uuids); + dm_hash_destroy(dtree->devs); + dm_pool_destroy(dtree->mem); +} + +void dm_tree_set_cookie(struct dm_tree_node *node, uint32_t cookie) +{ + node->dtree->cookie = cookie; +} + +uint32_t dm_tree_get_cookie(struct dm_tree_node *node) +{ + return node->dtree->cookie; +} + +void dm_tree_skip_lockfs(struct dm_tree_node *dnode) +{ + dnode->dtree->skip_lockfs = 1; +} + +void dm_tree_use_no_flush_suspend(struct dm_tree_node *dnode) +{ + dnode->dtree->no_flush = 1; +} + +void dm_tree_retry_remove(struct dm_tree_node *dnode) +{ + dnode->dtree->retry_remove = 1; +} + +/* + * Node functions. + */ +static int _nodes_are_linked(const struct dm_tree_node *parent, + const struct dm_tree_node *child) +{ + struct dm_tree_link *dlink; + + dm_list_iterate_items(dlink, &parent->uses) + if (dlink->node == child) + return 1; + + return 0; +} + +static int _link(struct dm_list *list, struct dm_tree_node *node) +{ + struct dm_tree_link *dlink; + + if (!(dlink = dm_pool_alloc(node->dtree->mem, sizeof(*dlink)))) { + log_error("dtree link allocation failed"); + return 0; + } + + dlink->node = node; + dm_list_add(list, &dlink->list); + + return 1; +} + +static int _link_nodes(struct dm_tree_node *parent, + struct dm_tree_node *child) +{ + if (_nodes_are_linked(parent, child)) + return 1; + + if (!_link(&parent->uses, child)) + return 0; + + if (!_link(&child->used_by, parent)) + return 0; + + return 1; +} + +static void _unlink(struct dm_list *list, struct dm_tree_node *node) +{ + struct dm_tree_link *dlink; + + dm_list_iterate_items(dlink, list) + if (dlink->node == node) { + dm_list_del(&dlink->list); + break; + } +} + +static void _unlink_nodes(struct dm_tree_node *parent, + struct dm_tree_node *child) +{ + if (!_nodes_are_linked(parent, child)) + return; + + _unlink(&parent->uses, child); + _unlink(&child->used_by, parent); +} + +static int _add_to_toplevel(struct dm_tree_node *node) +{ + return _link_nodes(&node->dtree->root, node); +} + +static void _remove_from_toplevel(struct dm_tree_node *node) +{ + _unlink_nodes(&node->dtree->root, node); +} + +static int _add_to_bottomlevel(struct dm_tree_node *node) +{ + return _link_nodes(node, &node->dtree->root); +} + +static void _remove_from_bottomlevel(struct dm_tree_node *node) +{ + _unlink_nodes(node, &node->dtree->root); +} + +static int _link_tree_nodes(struct dm_tree_node *parent, struct dm_tree_node *child) +{ + /* Don't link to root node if child already has a parent */ + if (parent == &parent->dtree->root) { + if (dm_tree_node_num_children(child, 1)) + return 1; + } else + _remove_from_toplevel(child); + + if (child == &child->dtree->root) { + if (dm_tree_node_num_children(parent, 0)) + return 1; + } else + _remove_from_bottomlevel(parent); + + return _link_nodes(parent, child); +} + +static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree, + const char *name, + const char *uuid, + struct dm_info *info, + void *context, + uint16_t udev_flags) +{ + struct dm_tree_node *node; + dev_t dev; + + if (!(node = dm_pool_zalloc(dtree->mem, sizeof(*node))) || + !(node->name = dm_pool_strdup(dtree->mem, name)) || + !(node->uuid = dm_pool_strdup(dtree->mem, uuid))) { + log_error("_create_dm_tree_node alloc failed."); + return NULL; + } + + node->dtree = dtree; + node->info = *info; + node->context = context; + node->udev_flags = udev_flags; + + dm_list_init(&node->uses); + dm_list_init(&node->used_by); + dm_list_init(&node->activated); + dm_list_init(&node->props.segs); + + dev = MKDEV((dev_t)info->major, (dev_t)info->minor); + + if (!dm_hash_insert_binary(dtree->devs, (const char *) &dev, + sizeof(dev), node)) { + log_error("dtree node hash insertion failed"); + dm_pool_free(dtree->mem, node); + return NULL; + } + + if (*uuid && !dm_hash_insert(dtree->uuids, uuid, node)) { + log_error("dtree uuid hash insertion failed"); + dm_hash_remove_binary(dtree->devs, (const char *) &dev, + sizeof(dev)); + dm_pool_free(dtree->mem, node); + return NULL; + } + + return node; +} + +static struct dm_tree_node *_find_dm_tree_node(struct dm_tree *dtree, + uint32_t major, uint32_t minor) +{ + dev_t dev = MKDEV((dev_t)major, (dev_t)minor); + + return dm_hash_lookup_binary(dtree->devs, (const char *) &dev, + sizeof(dev)); +} + +void dm_tree_set_optional_uuid_suffixes(struct dm_tree *dtree, const char **optional_uuid_suffixes) +{ + dtree->optional_uuid_suffixes = optional_uuid_suffixes; +} + +static struct dm_tree_node *_find_dm_tree_node_by_uuid(struct dm_tree *dtree, + const char *uuid) +{ + struct dm_tree_node *node; + const char *default_uuid_prefix; + size_t default_uuid_prefix_len; + const char *suffix, *suffix_position; + char uuid_without_suffix[DM_UUID_LEN]; + unsigned i = 0; + const char **suffix_list = dtree->optional_uuid_suffixes; + + if ((node = dm_hash_lookup(dtree->uuids, uuid))) { + log_debug("Matched uuid %s in deptree.", uuid); + return node; + } + + default_uuid_prefix = dm_uuid_prefix(); + default_uuid_prefix_len = strlen(default_uuid_prefix); + + if (suffix_list && (suffix_position = rindex(uuid, '-'))) { + while ((suffix = suffix_list[i++])) { + if (strcmp(suffix_position + 1, suffix)) + continue; + + (void) strncpy(uuid_without_suffix, uuid, sizeof(uuid_without_suffix)); + uuid_without_suffix[suffix_position - uuid] = '\0'; + + if ((node = dm_hash_lookup(dtree->uuids, uuid_without_suffix))) { + log_debug("Matched uuid %s (missing suffix -%s) in deptree.", uuid_without_suffix, suffix); + return node; + } + + break; + }; + } + + if (strncmp(uuid, default_uuid_prefix, default_uuid_prefix_len)) + return NULL; + + if ((node = dm_hash_lookup(dtree->uuids, uuid + default_uuid_prefix_len))) { + log_debug("Matched uuid %s (missing prefix) in deptree.", uuid + default_uuid_prefix_len); + return node; + } + + log_debug("Not matched uuid %s in deptree.", uuid); + return NULL; +} + +/* Return node's device_name (major:minor) for debug messages */ +static const char *_node_name(struct dm_tree_node *dnode) +{ + if (dm_snprintf(dnode->dtree->buf, sizeof(dnode->dtree->buf), + "%s (" FMTu32 ":" FMTu32 ")", + dnode->name ? dnode->name : "", + dnode->info.major, dnode->info.minor) < 0) { + stack; + return dnode->name; + } + + return dnode->dtree->buf; +} + +void dm_tree_node_set_udev_flags(struct dm_tree_node *dnode, uint16_t udev_flags) + +{ + if (udev_flags != dnode->udev_flags) + log_debug_activation("Resetting %s udev_flags from 0x%x to 0x%x.", + _node_name(dnode), + dnode->udev_flags, udev_flags); + dnode->udev_flags = udev_flags; +} + +void dm_tree_node_set_read_ahead(struct dm_tree_node *dnode, + uint32_t read_ahead, + uint32_t read_ahead_flags) +{ + dnode->props.read_ahead = read_ahead; + dnode->props.read_ahead_flags = read_ahead_flags; +} + +void dm_tree_node_set_presuspend_node(struct dm_tree_node *node, + struct dm_tree_node *presuspend_node) +{ + node->presuspend_node = presuspend_node; +} + +const char *dm_tree_node_get_name(const struct dm_tree_node *node) +{ + return node->info.exists ? node->name : ""; +} + +const char *dm_tree_node_get_uuid(const struct dm_tree_node *node) +{ + return node->info.exists ? node->uuid : ""; +} + +const struct dm_info *dm_tree_node_get_info(const struct dm_tree_node *node) +{ + return &node->info; +} + +void *dm_tree_node_get_context(const struct dm_tree_node *node) +{ + return node->context; +} + +int dm_tree_node_size_changed(const struct dm_tree_node *dnode) +{ + return dnode->props.size_changed; +} + +int dm_tree_node_num_children(const struct dm_tree_node *node, uint32_t inverted) +{ + if (inverted) { + if (_nodes_are_linked(&node->dtree->root, node)) + return 0; + return dm_list_size(&node->used_by); + } + + if (_nodes_are_linked(node, &node->dtree->root)) + return 0; + + return dm_list_size(&node->uses); +} + +/* + * Returns 1 if no prefix supplied + */ +static int _uuid_prefix_matches(const char *uuid, const char *uuid_prefix, size_t uuid_prefix_len) +{ + const char *default_uuid_prefix = dm_uuid_prefix(); + size_t default_uuid_prefix_len = strlen(default_uuid_prefix); + + if (!uuid_prefix) + return 1; + + if (!strncmp(uuid, uuid_prefix, uuid_prefix_len)) + return 1; + + /* Handle transition: active device uuids might be missing the prefix */ + if (uuid_prefix_len <= 4) + return 0; + + if (!strncmp(uuid, default_uuid_prefix, default_uuid_prefix_len)) + return 0; + + if (strncmp(uuid_prefix, default_uuid_prefix, default_uuid_prefix_len)) + return 0; + + if (!strncmp(uuid, uuid_prefix + default_uuid_prefix_len, uuid_prefix_len - default_uuid_prefix_len)) + return 1; + + return 0; +} + +/* + * Returns 1 if no children. + */ +static int _children_suspended(struct dm_tree_node *node, + uint32_t inverted, + const char *uuid_prefix, + size_t uuid_prefix_len) +{ + struct dm_list *list; + struct dm_tree_link *dlink; + const struct dm_info *dinfo; + const char *uuid; + + if (inverted) { + if (_nodes_are_linked(&node->dtree->root, node)) + return 1; + list = &node->used_by; + } else { + if (_nodes_are_linked(node, &node->dtree->root)) + return 1; + list = &node->uses; + } + + dm_list_iterate_items(dlink, list) { + if (!(uuid = dm_tree_node_get_uuid(dlink->node))) { + stack; + continue; + } + + /* Ignore if it doesn't belong to this VG */ + if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) + continue; + + /* Ignore if parent node wants to presuspend this node */ + if (dlink->node->presuspend_node == node) + continue; + + if (!(dinfo = dm_tree_node_get_info(dlink->node))) + return_0; /* FIXME Is this normal? */ + + if (!dinfo->suspended) + return 0; + } + + return 1; +} + +/* + * Set major and minor to zero for root of tree. + */ +struct dm_tree_node *dm_tree_find_node(struct dm_tree *dtree, + uint32_t major, + uint32_t minor) +{ + if (!major && !minor) + return &dtree->root; + + return _find_dm_tree_node(dtree, major, minor); +} + +/* + * Set uuid to NULL for root of tree. + */ +struct dm_tree_node *dm_tree_find_node_by_uuid(struct dm_tree *dtree, + const char *uuid) +{ + if (!uuid || !*uuid) + return &dtree->root; + + return _find_dm_tree_node_by_uuid(dtree, uuid); +} + +/* + * First time set *handle to NULL. + * Set inverted to invert the tree. + */ +struct dm_tree_node *dm_tree_next_child(void **handle, + const struct dm_tree_node *parent, + uint32_t inverted) +{ + struct dm_list **dlink = (struct dm_list **) handle; + const struct dm_list *use_list; + + if (inverted) + use_list = &parent->used_by; + else + use_list = &parent->uses; + + if (!*dlink) + *dlink = dm_list_first(use_list); + else + *dlink = dm_list_next(use_list, *dlink); + + return (*dlink) ? dm_list_item(*dlink, struct dm_tree_link)->node : NULL; +} + +static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint32_t minor, + const char **name, const char **uuid, unsigned inactive_table, + struct dm_info *info, struct dm_deps **deps) +{ + memset(info, 0, sizeof(*info)); + *name = ""; + *uuid = ""; + *deps = NULL; + + if (!dm_is_dm_major(major)) { + info->major = major; + info->minor = minor; + return 1; + } + + if (!(*dmt = dm_task_create(DM_DEVICE_DEPS))) + return_0; + + if (!dm_task_set_major(*dmt, major) || !dm_task_set_minor(*dmt, minor)) { + log_error("_deps: failed to set major:minor for (" FMTu32 ":" FMTu32 ").", + major, minor); + goto failed; + } + + if (inactive_table && !dm_task_query_inactive_table(*dmt)) { + log_error("_deps: failed to set inactive table for (%" PRIu32 ":%" PRIu32 ")", + major, minor); + goto failed; + } + + if (!dm_task_run(*dmt)) { + log_error("_deps: task run failed for (%" PRIu32 ":%" PRIu32 ")", + major, minor); + goto failed; + } + + if (!dm_task_get_info(*dmt, info)) { + log_error("_deps: failed to get info for (%" PRIu32 ":%" PRIu32 ")", + major, minor); + goto failed; + } + + if (info->exists) { + if (info->major != major) { + log_error("Inconsistent dtree major number: %u != %u", + major, info->major); + goto failed; + } + if (info->minor != minor) { + log_error("Inconsistent dtree minor number: %u != %u", + minor, info->minor); + goto failed; + } + *name = dm_task_get_name(*dmt); + *uuid = dm_task_get_uuid(*dmt); + *deps = dm_task_get_deps(*dmt); + } + + return 1; + +failed: + dm_task_destroy(*dmt); + *dmt = NULL; + + return 0; +} + +/* + * Deactivate a device with its dependencies if the uuid prefix matches. + */ +static int _info_by_dev(uint32_t major, uint32_t minor, int with_open_count, + struct dm_info *info, struct dm_pool *mem, + const char **name, const char **uuid) +{ + struct dm_task *dmt; + int r = 0; + + if (!(dmt = dm_task_create(DM_DEVICE_INFO))) + return_0; + + if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) { + log_error("_info_by_dev: Failed to set device number."); + goto out; + } + + if (!with_open_count && !dm_task_no_open_count(dmt)) + log_warn("WARNING: Failed to disable open_count."); + + if (!dm_task_run(dmt)) + goto_out; + + if (!dm_task_get_info(dmt, info)) + goto_out; + + if (name && !(*name = dm_pool_strdup(mem, dm_task_get_name(dmt)))) { + log_error("name pool_strdup failed"); + goto out; + } + + if (uuid && !(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(dmt)))) { + log_error("uuid pool_strdup failed"); + goto out; + } + + r = 1; +out: + dm_task_destroy(dmt); + + return r; +} + +static int _check_device_not_in_use(const char *name, struct dm_info *info) +{ + const char *reason; + + if (!info->exists) + return 1; + + /* If sysfs is not used, use open_count information only. */ + if (!*dm_sysfs_dir()) { + if (!info->open_count) + return 1; + reason = "in use"; + } else if (dm_device_has_holders(info->major, info->minor)) + reason = "is used by another device"; + else if (dm_device_has_mounted_fs(info->major, info->minor)) + reason = "constains a filesystem in use"; + else + return 1; + + log_error("Device %s (" FMTu32 ":" FMTu32 ") %s.", + name, info->major, info->minor, reason); + return 0; +} + +/* Check if all parent nodes of given node have open_count == 0 */ +static int _node_has_closed_parents(struct dm_tree_node *node, + const char *uuid_prefix, + size_t uuid_prefix_len) +{ + struct dm_tree_link *dlink; + const struct dm_info *dinfo; + struct dm_info info; + const char *uuid; + + /* Iterate through parents of this node */ + dm_list_iterate_items(dlink, &node->used_by) { + if (!(uuid = dm_tree_node_get_uuid(dlink->node))) { + stack; + continue; + } + + /* Ignore if it doesn't belong to this VG */ + if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) + continue; + + if (!(dinfo = dm_tree_node_get_info(dlink->node))) + return_0; /* FIXME Is this normal? */ + + /* Refresh open_count */ + if (!_info_by_dev(dinfo->major, dinfo->minor, 1, &info, NULL, NULL, NULL)) + return_0; + + if (!info.exists) + continue; + + if (info.open_count) { + log_debug_activation("Node %s %d:%d has open_count %d", uuid_prefix, + dinfo->major, dinfo->minor, info.open_count); + return 0; + } + } + + return 1; +} + +static int _deactivate_node(const char *name, uint32_t major, uint32_t minor, + uint32_t *cookie, uint16_t udev_flags, int retry) +{ + struct dm_task *dmt; + int r = 0; + + log_verbose("Removing %s (%" PRIu32 ":%" PRIu32 ")", name, major, minor); + + if (!(dmt = dm_task_create(DM_DEVICE_REMOVE))) { + log_error("Deactivation dm_task creation failed for %s", name); + return 0; + } + + if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) { + log_error("Failed to set device number for %s deactivation", name); + goto out; + } + + if (!dm_task_no_open_count(dmt)) + log_warn("WARNING: Failed to disable open_count."); + + if (cookie) + if (!dm_task_set_cookie(dmt, cookie, udev_flags)) + goto out; + + if (retry) + dm_task_retry_remove(dmt); + + r = dm_task_run(dmt); + + /* FIXME Until kernel returns actual name so dm-iface.c can handle it */ + rm_dev_node(name, dmt->cookie_set && !(udev_flags & DM_UDEV_DISABLE_DM_RULES_FLAG), + dmt->cookie_set && (udev_flags & DM_UDEV_DISABLE_LIBRARY_FALLBACK)); + + /* FIXME Remove node from tree or mark invalid? */ + +out: + dm_task_destroy(dmt); + + return r; +} + +static int _node_clear_table(struct dm_tree_node *dnode, uint16_t udev_flags) +{ + struct dm_task *dmt = NULL, *deps_dmt = NULL; + struct dm_info *info = &dnode->info, deps_info; + struct dm_deps *deps = NULL; + const char *name, *uuid, *depname, *depuuid; + const char *default_uuid_prefix; + size_t default_uuid_prefix_len; + uint32_t i; + int r = 0; + + if (!(name = dm_tree_node_get_name(dnode))) { + log_error("_node_clear_table failed: missing name"); + return 0; + } + + /* Is there a table? */ + if (!info->exists || !info->inactive_table) + return 1; + + /* Get devices used by inactive table that's about to be deleted. */ + if (!_deps(&deps_dmt, dnode->dtree->mem, info->major, info->minor, &depname, &depuuid, 1, info, &deps)) { + log_error("Failed to obtain dependencies for %s before clearing table.", name); + return 0; + } + + log_verbose("Clearing inactive table %s (%" PRIu32 ":%" PRIu32 ")", + name, info->major, info->minor); + + if (!(dmt = dm_task_create(DM_DEVICE_CLEAR))) { + log_error("Table clear dm_task creation failed for %s", name); + goto out; + } + + if (!dm_task_set_major(dmt, info->major) || + !dm_task_set_minor(dmt, info->minor)) { + log_error("Failed to set device number for %s table clear", name); + goto out; + } + + r = dm_task_run(dmt); + + if (!dm_task_get_info(dmt, info)) { + log_error("_node_clear_table failed: info missing after running task for %s", name); + r = 0; + } + + if (!r || !deps) + goto_out; + + /* + * Remove (incomplete) devices that the inactive table referred to but + * which are not in the tree, no longer referenced and don't have a live + * table. + */ + default_uuid_prefix = dm_uuid_prefix(); + default_uuid_prefix_len = strlen(default_uuid_prefix); + + for (i = 0; i < deps->count; i++) { + /* If already in tree, assume it's under control */ + if (_find_dm_tree_node(dnode->dtree, MAJOR(deps->device[i]), MINOR(deps->device[i]))) + continue; + + if (!_info_by_dev(MAJOR(deps->device[i]), MINOR(deps->device[i]), 1, + &deps_info, dnode->dtree->mem, &name, &uuid)) + goto_out; + + /* Proceed if device is an 'orphan' - unreferenced and without a live table. */ + if (!deps_info.exists || deps_info.live_table || deps_info.open_count) + continue; + + if (strncmp(uuid, default_uuid_prefix, default_uuid_prefix_len)) + continue; + + /* Remove device. */ + if (!_deactivate_node(name, deps_info.major, deps_info.minor, &dnode->dtree->cookie, udev_flags, 0)) { + log_error("Failed to deactivate no-longer-used device %s (%" + PRIu32 ":%" PRIu32 ")", name, deps_info.major, deps_info.minor); + } else if (deps_info.suspended) + dec_suspended(); + } + +out: + if (dmt) + dm_task_destroy(dmt); + + if (deps_dmt) + dm_task_destroy(deps_dmt); + + return r; +} + +struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *dtree, + const char *name, + const char *uuid, + uint32_t major, + uint32_t minor, + int read_only, + int clear_inactive, + void *context, + uint16_t udev_flags) +{ + struct dm_tree_node *dnode; + struct dm_info info = { 0 }; + + if (!name || !uuid) { + log_error("Cannot add device without name and uuid."); + return NULL; + } + + /* Do we need to add node to tree? */ + if (!(dnode = dm_tree_find_node_by_uuid(dtree, uuid))) { + if (!(dnode = _create_dm_tree_node(dtree, name, uuid, &info, + context, 0))) + return_NULL; + + /* Attach to root node until a table is supplied */ + if (!_add_to_toplevel(dnode) || !_add_to_bottomlevel(dnode)) + return_NULL; + + dnode->props.major = major; + dnode->props.minor = minor; + } else if (strcmp(name, dnode->name)) { + /* Do we need to rename node? */ + if (!(dnode->props.new_name = dm_pool_strdup(dtree->mem, name))) { + log_error("name pool_strdup failed"); + return NULL; + } + } + + dnode->props.read_only = read_only ? 1 : 0; + dnode->props.read_ahead = DM_READ_AHEAD_AUTO; + dnode->props.read_ahead_flags = 0; + + if (clear_inactive && !_node_clear_table(dnode, udev_flags)) + return_NULL; + + dnode->context = context; + dnode->udev_flags = udev_flags; + + return dnode; +} + +struct dm_tree_node *dm_tree_add_new_dev(struct dm_tree *dtree, const char *name, + const char *uuid, uint32_t major, uint32_t minor, + int read_only, int clear_inactive, void *context) +{ + return dm_tree_add_new_dev_with_udev_flags(dtree, name, uuid, major, minor, + read_only, clear_inactive, context, 0); +} + +static struct dm_tree_node *_add_dev(struct dm_tree *dtree, + struct dm_tree_node *parent, + uint32_t major, uint32_t minor, + uint16_t udev_flags, + int implicit_deps) +{ + struct dm_task *dmt = NULL; + struct dm_info info; + struct dm_deps *deps = NULL; + const char *name = NULL; + const char *uuid = NULL; + struct dm_tree_node *node = NULL; + uint32_t i; + int new = 0; + + /* Already in tree? */ + if (!(node = _find_dm_tree_node(dtree, major, minor))) { + if (!_deps(&dmt, dtree->mem, major, minor, &name, &uuid, 0, &info, &deps)) + return_NULL; + + if (!(node = _create_dm_tree_node(dtree, name, uuid, &info, + NULL, udev_flags))) + goto_out; + new = 1; + node->implicit_deps = implicit_deps; + } else if (!implicit_deps && node->implicit_deps) { + node->udev_flags = udev_flags; + node->implicit_deps = 0; + } + + if (!_link_tree_nodes(parent, node)) { + node = NULL; + goto_out; + } + + /* If node was already in tree, no need to recurse. */ + if (!new) + goto out; + + /* Can't recurse if not a mapped device or there are no dependencies */ + if (!node->info.exists || !deps || !deps->count) { + if (!_add_to_bottomlevel(node)) { + stack; + node = NULL; + } + goto out; + } + + /* Add dependencies to tree */ + for (i = 0; i < deps->count; i++) + /* Implicit devices are by default temporary */ + if (!_add_dev(dtree, node, MAJOR(deps->device[i]), + MINOR(deps->device[i]), udev_flags | + DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG | + DM_UDEV_DISABLE_DISK_RULES_FLAG | + DM_UDEV_DISABLE_OTHER_RULES_FLAG, 1)) { + node = NULL; + goto_out; + } + +out: + if (dmt) + dm_task_destroy(dmt); + + return node; +} + +int dm_tree_add_dev(struct dm_tree *dtree, uint32_t major, uint32_t minor) +{ + return _add_dev(dtree, &dtree->root, major, minor, 0, 0) ? 1 : 0; +} + +int dm_tree_add_dev_with_udev_flags(struct dm_tree *dtree, uint32_t major, + uint32_t minor, uint16_t udev_flags) +{ + return _add_dev(dtree, &dtree->root, major, minor, udev_flags, 0) ? 1 : 0; +} + +static int _rename_node(const char *old_name, const char *new_name, uint32_t major, + uint32_t minor, uint32_t *cookie, uint16_t udev_flags) +{ + struct dm_task *dmt; + int r = 0; + + log_verbose("Renaming %s (%" PRIu32 ":%" PRIu32 ") to %s", old_name, major, minor, new_name); + + if (!(dmt = dm_task_create(DM_DEVICE_RENAME))) { + log_error("Rename dm_task creation failed for %s", old_name); + return 0; + } + + if (!dm_task_set_name(dmt, old_name)) { + log_error("Failed to set name for %s rename.", old_name); + goto out; + } + + if (!dm_task_set_newname(dmt, new_name)) + goto_out; + + if (!dm_task_no_open_count(dmt)) + log_warn("WARNING: Failed to disable open_count."); + + if (!dm_task_set_cookie(dmt, cookie, udev_flags)) + goto out; + + r = dm_task_run(dmt); + +out: + dm_task_destroy(dmt); + + return r; +} + +/* FIXME Merge with _suspend_node? */ +static int _resume_node(const char *name, uint32_t major, uint32_t minor, + uint32_t read_ahead, uint32_t read_ahead_flags, + struct dm_info *newinfo, uint32_t *cookie, + uint16_t udev_flags, int already_suspended) +{ + struct dm_task *dmt; + int r = 0; + + log_verbose("Resuming %s (" FMTu32 ":" FMTu32 ").", name, major, minor); + + if (!(dmt = dm_task_create(DM_DEVICE_RESUME))) { + log_debug_activation("Suspend dm_task creation failed for %s.", name); + return 0; + } + + /* FIXME Kernel should fill in name on return instead */ + if (!dm_task_set_name(dmt, name)) { + log_debug_activation("Failed to set device name for %s resumption.", name); + goto out; + } + + if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) { + log_error("Failed to set device number for %s resumption.", name); + goto out; + } + + if (!dm_task_no_open_count(dmt)) + log_warn("WARNING: Failed to disable open_count."); + + if (!dm_task_set_read_ahead(dmt, read_ahead, read_ahead_flags)) + log_warn("WARNING: Failed to set read ahead."); + + if (!dm_task_set_cookie(dmt, cookie, udev_flags)) + goto_out; + + if (!(r = dm_task_run(dmt))) + goto_out; + + if (already_suspended) + dec_suspended(); + + if (!(r = dm_task_get_info(dmt, newinfo))) + stack; + +out: + dm_task_destroy(dmt); + + return r; +} + +static int _suspend_node(const char *name, uint32_t major, uint32_t minor, + int skip_lockfs, int no_flush, struct dm_info *newinfo) +{ + struct dm_task *dmt; + int r = 0; + + log_verbose("Suspending %s (%" PRIu32 ":%" PRIu32 ")%s%s", + name, major, minor, + skip_lockfs ? "" : " with filesystem sync", + no_flush ? "" : " with device flush"); + + if (!(dmt = dm_task_create(DM_DEVICE_SUSPEND))) { + log_error("Suspend dm_task creation failed for %s", name); + return 0; + } + + if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) { + log_error("Failed to set device number for %s suspension.", name); + goto out; + } + + if (!dm_task_no_open_count(dmt)) + log_warn("WARNING: Failed to disable open_count."); + + if (skip_lockfs && !dm_task_skip_lockfs(dmt)) + log_warn("WARNING: Failed to set skip_lockfs flag."); + + if (no_flush && !dm_task_no_flush(dmt)) + log_warn("WARNING: Failed to set no_flush flag."); + + if ((r = dm_task_run(dmt))) { + inc_suspended(); + r = dm_task_get_info(dmt, newinfo); + } +out: + dm_task_destroy(dmt); + + return r; +} + +static int _thin_pool_get_status(struct dm_tree_node *dnode, + struct dm_status_thin_pool *s) +{ + struct dm_task *dmt; + int r = 0; + uint64_t start, length; + char *type = NULL; + char *params = NULL; + + if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) + return_0; + + if (!dm_task_set_major(dmt, dnode->info.major) || + !dm_task_set_minor(dmt, dnode->info.minor)) { + log_error("Failed to set major minor."); + goto out; + } + + if (!dm_task_no_flush(dmt)) + log_warn("WARNING: Can't set no_flush flag."); /* Non fatal */ + + if (!dm_task_run(dmt)) + goto_out; + + dm_get_next_target(dmt, NULL, &start, &length, &type, &params); + + if (!type || (strcmp(type, "thin-pool") != 0)) { + log_error("Expected thin-pool target for %s and got %s.", + _node_name(dnode), type ? : "no target"); + goto out; + } + + if (!parse_thin_pool_status(params, s)) + goto_out; + + log_debug_activation("Found transaction id %" PRIu64 " for thin pool %s " + "with status line: %s.", + s->transaction_id, _node_name(dnode), params); + + r = 1; +out: + dm_task_destroy(dmt); + + return r; +} + +static int _thin_pool_node_message(struct dm_tree_node *dnode, struct thin_message *tm) +{ + struct dm_task *dmt; + struct dm_thin_message *m = &tm->message; + char buf[64]; + int r; + + switch (m->type) { + case DM_THIN_MESSAGE_CREATE_SNAP: + r = dm_snprintf(buf, sizeof(buf), "create_snap %u %u", + m->u.m_create_snap.device_id, + m->u.m_create_snap.origin_id); + break; + case DM_THIN_MESSAGE_CREATE_THIN: + r = dm_snprintf(buf, sizeof(buf), "create_thin %u", + m->u.m_create_thin.device_id); + break; + case DM_THIN_MESSAGE_DELETE: + r = dm_snprintf(buf, sizeof(buf), "delete %u", + m->u.m_delete.device_id); + break; + case DM_THIN_MESSAGE_SET_TRANSACTION_ID: + r = dm_snprintf(buf, sizeof(buf), + "set_transaction_id %" PRIu64 " %" PRIu64, + m->u.m_set_transaction_id.current_id, + m->u.m_set_transaction_id.new_id); + break; + case DM_THIN_MESSAGE_RESERVE_METADATA_SNAP: /* target vsn 1.1 */ + r = dm_snprintf(buf, sizeof(buf), "reserve_metadata_snap"); + break; + case DM_THIN_MESSAGE_RELEASE_METADATA_SNAP: /* target vsn 1.1 */ + r = dm_snprintf(buf, sizeof(buf), "release_metadata_snap"); + break; + default: + r = -1; + } + + if (r < 0) { + log_error("Failed to prepare message."); + return 0; + } + + r = 0; + + if (!(dmt = dm_task_create(DM_DEVICE_TARGET_MSG))) + return_0; + + if (!dm_task_set_major(dmt, dnode->info.major) || + !dm_task_set_minor(dmt, dnode->info.minor)) { + log_error("Failed to set message major minor."); + goto out; + } + + if (!dm_task_set_message(dmt, buf)) + goto_out; + + /* Internal functionality of dm_task */ + dmt->expected_errno = tm->expected_errno; + + if (!dm_task_run(dmt)) { + log_error("Failed to process thin pool message \"%s\".", buf); + goto out; + } + + r = 1; +out: + dm_task_destroy(dmt); + + return r; +} + +static struct load_segment *_get_last_load_segment(struct dm_tree_node *node) +{ + if (dm_list_empty(&node->props.segs)) { + log_error("Node %s is missing a segment.", _node_name(node)); + return NULL; + } + + return dm_list_item(dm_list_last(&node->props.segs), struct load_segment); +} + +/* For preload pass only validate pool's transaction_id */ +static int _node_send_messages(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len, + int send) +{ + struct load_segment *seg; + struct thin_message *tmsg; + struct dm_status_thin_pool stp; + const char *uuid; + int have_messages; + + if (!dnode->info.exists) + return 1; + + if (!(seg = _get_last_load_segment(dnode))) + return_0; + + if (seg->type != SEG_THIN_POOL) + return 1; + + if (!(uuid = dm_tree_node_get_uuid(dnode))) + return_0; + + if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) { + log_debug_activation("UUID \"%s\" does not match.", uuid); + return 1; + } + + if (!_thin_pool_get_status(dnode, &stp)) + return_0; + + have_messages = !dm_list_empty(&seg->thin_messages) ? 1 : 0; + if (stp.transaction_id == seg->transaction_id) { + dnode->props.send_messages = 0; /* messages already committed */ + if (have_messages) + log_debug_activation("Thin pool %s transaction_id matches %" + PRIu64 ", skipping messages.", + _node_name(dnode), stp.transaction_id); + return 1; + } + + /* Error if there are no stacked messages or id mismatches */ + if ((stp.transaction_id + 1) != seg->transaction_id) { + log_error("Thin pool %s transaction_id is %" PRIu64 ", while expected %" PRIu64 ".", + _node_name(dnode), stp.transaction_id, seg->transaction_id - have_messages); + return 0; + } + + if (!have_messages || !send) + return 1; /* transaction_id is matching */ + + dm_list_iterate_items(tmsg, &seg->thin_messages) { + if (!(_thin_pool_node_message(dnode, tmsg))) + return_0; + if (tmsg->message.type == DM_THIN_MESSAGE_SET_TRANSACTION_ID) { + if (!_thin_pool_get_status(dnode, &stp)) + return_0; + if (stp.transaction_id != tmsg->message.u.m_set_transaction_id.new_id) { + log_error("Thin pool %s transaction_id is %" PRIu64 + " and does not match expected %" PRIu64 ".", + _node_name(dnode), stp.transaction_id, + tmsg->message.u.m_set_transaction_id.new_id); + return 0; + } + } + } + + dnode->props.send_messages = 0; /* messages posted */ + + return 1; +} + +/* + * FIXME Don't attempt to deactivate known internal dependencies. + */ +static int _dm_tree_deactivate_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len, + unsigned level) +{ + int r = 1; + void *handle = NULL; + struct dm_tree_node *child = dnode; + struct dm_info info; + const struct dm_info *dinfo; + const char *name; + const char *uuid; + + while ((child = dm_tree_next_child(&handle, dnode, 0))) { + if (!(dinfo = dm_tree_node_get_info(child))) { + stack; + continue; + } + + if (!(name = dm_tree_node_get_name(child))) { + stack; + continue; + } + + if (!(uuid = dm_tree_node_get_uuid(child))) { + stack; + continue; + } + + /* Ignore if it doesn't belong to this VG */ + if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) + continue; + + /* Refresh open_count */ + if (!_info_by_dev(dinfo->major, dinfo->minor, 1, &info, NULL, NULL, NULL)) + return_0; + + if (!info.exists) + continue; + + if (info.open_count) { + /* Skip internal non-toplevel opened nodes */ + if (level) + continue; + + /* When retry is not allowed, error */ + if (!child->dtree->retry_remove) { + log_error("Unable to deactivate open %s (" FMTu32 ":" + FMTu32 ").", name, info.major, info.minor); + r = 0; + continue; + } + + /* Check toplevel node for holders/mounted fs */ + if (!_check_device_not_in_use(name, &info)) { + stack; + r = 0; + continue; + } + /* Go on with retry */ + } + + /* Also checking open_count in parent nodes of presuspend_node */ + if ((child->presuspend_node && + !_node_has_closed_parents(child->presuspend_node, + uuid_prefix, uuid_prefix_len))) { + /* Only report error from (likely non-internal) dependency at top level */ + if (!level) { + log_error("Unable to deactivate open %s (" FMTu32 ":" + FMTu32 ").", name, info.major, info.minor); + r = 0; + } + continue; + } + + /* Suspend child node first if requested */ + if (child->presuspend_node && + !dm_tree_suspend_children(child, uuid_prefix, uuid_prefix_len)) + continue; + + if (!_deactivate_node(name, info.major, info.minor, + &child->dtree->cookie, child->udev_flags, + (level == 0) ? child->dtree->retry_remove : 0)) { + log_error("Unable to deactivate %s (" FMTu32 ":" + FMTu32 ").", name, info.major, info.minor); + r = 0; + continue; + } + + if (info.suspended && info.live_table) + dec_suspended(); + + if (child->callback && + !child->callback(child, DM_NODE_CALLBACK_DEACTIVATED, + child->callback_data)) + stack; + /* FIXME Deactivation must currently ignore failure + * here so that lvremove can continue: we need an + * alternative way to handle this state without + * setting r=0. Or better, skip calling thin_check + * entirely if the device is about to be removed. */ + + if (dm_tree_node_num_children(child, 0) && + !_dm_tree_deactivate_children(child, uuid_prefix, uuid_prefix_len, level + 1)) + return_0; + } + + return r; +} + +int dm_tree_deactivate_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len) +{ + return _dm_tree_deactivate_children(dnode, uuid_prefix, uuid_prefix_len, 0); +} + +int dm_tree_suspend_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len) +{ + int r = 1; + void *handle = NULL; + struct dm_tree_node *child = dnode; + struct dm_info info, newinfo; + const struct dm_info *dinfo; + const char *name; + const char *uuid; + + /* Suspend nodes at this level of the tree */ + while ((child = dm_tree_next_child(&handle, dnode, 0))) { + if (!(dinfo = dm_tree_node_get_info(child))) { + stack; + continue; + } + + if (!(name = dm_tree_node_get_name(child))) { + stack; + continue; + } + + if (!(uuid = dm_tree_node_get_uuid(child))) { + stack; + continue; + } + + /* Ignore if it doesn't belong to this VG */ + if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) + continue; + + /* Ensure immediate parents are already suspended */ + if (!_children_suspended(child, 1, uuid_prefix, uuid_prefix_len)) + continue; + + if (!_info_by_dev(dinfo->major, dinfo->minor, 0, &info, NULL, NULL, NULL)) + return_0; + + if (!info.exists || info.suspended) + continue; + + /* If child has some real messages send them */ + if ((child->props.send_messages > 1) && r) { + if (!(r = _node_send_messages(child, uuid_prefix, uuid_prefix_len, 1))) + stack; + else { + log_debug_activation("Sent messages to thin-pool %s and " + "skipping suspend of its children.", + _node_name(child)); + child->props.skip_suspend++; + } + continue; + } + + if (!_suspend_node(name, info.major, info.minor, + child->dtree->skip_lockfs, + child->dtree->no_flush, &newinfo)) { + log_error("Unable to suspend %s (" FMTu32 ":" + FMTu32 ")", name, info.major, info.minor); + r = 0; + continue; + } + + /* Update cached info */ + child->info = newinfo; + } + + /* Then suspend any child nodes */ + handle = NULL; + + while ((child = dm_tree_next_child(&handle, dnode, 0))) { + if (child->props.skip_suspend) + continue; + + if (!(uuid = dm_tree_node_get_uuid(child))) { + stack; + continue; + } + + /* Ignore if it doesn't belong to this VG */ + if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) + continue; + + if (dm_tree_node_num_children(child, 0)) + if (!dm_tree_suspend_children(child, uuid_prefix, uuid_prefix_len)) + return_0; + } + + return r; +} + +/* + * _rename_conflict_exists + * @dnode + * @node + * @resolvable + * + * Check if there is a rename conflict with existing peers in + * this tree. 'resolvable' is set if the conflicting node will + * also be undergoing a rename. (Allowing that node to rename + * first would clear the conflict.) + * + * Returns: 1 if conflict, 0 otherwise + */ +static int _rename_conflict_exists(struct dm_tree_node *parent, + struct dm_tree_node *node, + int *resolvable) +{ + void *handle = NULL; + const char *name = dm_tree_node_get_name(node); + const char *sibling_name; + struct dm_tree_node *sibling; + + *resolvable = 0; + + if (!name) + return_0; + + while ((sibling = dm_tree_next_child(&handle, parent, 0))) { + if (sibling == node) + continue; + + if (!(sibling_name = dm_tree_node_get_name(sibling))) { + stack; + continue; + } + + if (!strcmp(node->props.new_name, sibling_name)) { + if (sibling->props.new_name) + *resolvable = 1; + return 1; + } + } + + return 0; +} + +int dm_tree_activate_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len) +{ + int r = 1; + int resolvable_name_conflict, awaiting_peer_rename = 0; + void *handle = NULL; + struct dm_tree_node *child = dnode; + const char *name; + const char *uuid; + int priority; + + /* Activate children first */ + while ((child = dm_tree_next_child(&handle, dnode, 0))) { + if (!(uuid = dm_tree_node_get_uuid(child))) { + stack; + continue; + } + + if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) + continue; + + if (dm_tree_node_num_children(child, 0)) + if (!dm_tree_activate_children(child, uuid_prefix, uuid_prefix_len)) + return_0; + } + + handle = NULL; + + for (priority = 0; priority < 3; priority++) { + awaiting_peer_rename = 0; + while ((child = dm_tree_next_child(&handle, dnode, 0))) { + if (priority != child->activation_priority) + continue; + + if (!(uuid = dm_tree_node_get_uuid(child))) { + stack; + continue; + } + + if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) + continue; + + if (!(name = dm_tree_node_get_name(child))) { + stack; + continue; + } + + /* Rename? */ + if (child->props.new_name) { + if (_rename_conflict_exists(dnode, child, &resolvable_name_conflict) && + resolvable_name_conflict) { + awaiting_peer_rename++; + continue; + } + if (!_rename_node(name, child->props.new_name, child->info.major, + child->info.minor, &child->dtree->cookie, + child->udev_flags)) { + log_error("Failed to rename %s (%" PRIu32 + ":%" PRIu32 ") to %s", name, child->info.major, + child->info.minor, child->props.new_name); + return 0; + } + child->name = child->props.new_name; + child->props.new_name = NULL; + } + + if (!child->info.inactive_table && !child->info.suspended) + continue; + + if (!_resume_node(child->name, child->info.major, child->info.minor, + child->props.read_ahead, child->props.read_ahead_flags, + &child->info, &child->dtree->cookie, child->udev_flags, child->info.suspended)) { + log_error("Unable to resume %s.", _node_name(child)); + r = 0; + continue; + } + } + if (awaiting_peer_rename) + priority--; /* redo priority level */ + } + + /* + * FIXME: Implement delayed error reporting + * activation should be stopped only in the case, + * the submission of transation_id message fails, + * resume should continue further, just whole command + * has to report failure. + */ + if (r && (dnode->props.send_messages > 1) && + !(r = _node_send_messages(dnode, uuid_prefix, uuid_prefix_len, 1))) + stack; + + return r; +} + +static int _create_node(struct dm_tree_node *dnode) +{ + int r = 0; + struct dm_task *dmt; + + log_verbose("Creating %s", dnode->name); + + if (!(dmt = dm_task_create(DM_DEVICE_CREATE))) { + log_error("Create dm_task creation failed for %s", dnode->name); + return 0; + } + + if (!dm_task_set_name(dmt, dnode->name)) { + log_error("Failed to set device name for %s", dnode->name); + goto out; + } + + if (!dm_task_set_uuid(dmt, dnode->uuid)) { + log_error("Failed to set uuid for %s", dnode->name); + goto out; + } + + if (dnode->props.major && + (!dm_task_set_major(dmt, dnode->props.major) || + !dm_task_set_minor(dmt, dnode->props.minor))) { + log_error("Failed to set device number for %s creation.", dnode->name); + goto out; + } + + if (dnode->props.read_only && !dm_task_set_ro(dmt)) { + log_error("Failed to set read only flag for %s", dnode->name); + goto out; + } + + if (!dm_task_no_open_count(dmt)) + log_warn("WARNING: Failed to disable open_count."); + + if ((r = dm_task_run(dmt))) { + if (!(r = dm_task_get_info(dmt, &dnode->info))) + /* + * This should not be possible to occur. However, + * we print an error message anyway for the more + * absurd cases (e.g. memory corruption) so there + * is never any question as to which one failed. + */ + log_error(INTERNAL_ERROR + "Unable to get DM task info for %s.", + dnode->name); + } +out: + dm_task_destroy(dmt); + + return r; +} + +/* + * _remove_node + * + * This function is only used to remove a DM device that has failed + * to load any table. + */ +static int _remove_node(struct dm_tree_node *dnode) +{ + if (!dnode->info.exists) + return 1; + + if (dnode->info.live_table || dnode->info.inactive_table) { + log_error(INTERNAL_ERROR + "_remove_node called on device with loaded table(s)."); + return 0; + } + + if (!_deactivate_node(dnode->name, dnode->info.major, dnode->info.minor, + &dnode->dtree->cookie, dnode->udev_flags, 0)) { + log_error("Failed to clean-up device with no table: %s.", + _node_name(dnode)); + return 0; + } + return 1; +} + +static int _build_dev_string(char *devbuf, size_t bufsize, struct dm_tree_node *node) +{ + if (!dm_format_dev(devbuf, bufsize, node->info.major, node->info.minor)) { + log_error("Failed to format %s device number for %s as dm " + "target (%u,%u)", + node->name, node->uuid, node->info.major, node->info.minor); + return 0; + } + + return 1; +} + +/* simplify string emiting code */ +#define EMIT_PARAMS(p, str...)\ +do {\ + int w;\ + if ((w = dm_snprintf(params + p, paramsize - (size_t) p, str)) < 0) {\ + stack; /* Out of space */\ + return -1;\ + }\ + p += w;\ +} while (0) + +/* + * _emit_areas_line + * + * Returns: 1 on success, 0 on failure + */ +static int _emit_areas_line(struct dm_task *dmt __attribute__((unused)), + struct load_segment *seg, char *params, + size_t paramsize, int *pos) +{ + struct seg_area *area; + char devbuf[DM_FORMAT_DEV_BUFSIZE]; + unsigned first_time = 1; + + dm_list_iterate_items(area, &seg->areas) { + switch (seg->type) { + case SEG_RAID0: + case SEG_RAID0_META: + case SEG_RAID1: + case SEG_RAID10: + case SEG_RAID4: + case SEG_RAID5_N: + case SEG_RAID5_LA: + case SEG_RAID5_RA: + case SEG_RAID5_LS: + case SEG_RAID5_RS: + case SEG_RAID6_N_6: + case SEG_RAID6_ZR: + case SEG_RAID6_NR: + case SEG_RAID6_NC: + case SEG_RAID6_LS_6: + case SEG_RAID6_RS_6: + case SEG_RAID6_LA_6: + case SEG_RAID6_RA_6: + if (!area->dev_node) { + EMIT_PARAMS(*pos, " -"); + break; + } + if (!_build_dev_string(devbuf, sizeof(devbuf), area->dev_node)) + return_0; + + EMIT_PARAMS(*pos, " %s", devbuf); + break; + default: + if (!_build_dev_string(devbuf, sizeof(devbuf), area->dev_node)) + return_0; + + EMIT_PARAMS(*pos, "%s%s %" PRIu64, first_time ? "" : " ", + devbuf, area->offset); + } + + first_time = 0; + } + + return 1; +} + +/* + * Returns: 1 on success, 0 on failure + */ +static int _mirror_emit_segment_line(struct dm_task *dmt, struct load_segment *seg, + char *params, size_t paramsize) +{ + int block_on_error = 0; + int handle_errors = 0; + int dm_log_userspace = 0; + unsigned log_parm_count; + int pos = 0; + char logbuf[DM_FORMAT_DEV_BUFSIZE]; + const char *logtype; + unsigned kmaj = 0, kmin = 0, krel = 0; + + if (!get_uname_version(&kmaj, &kmin, &krel)) + return_0; + + if ((seg->flags & DM_BLOCK_ON_ERROR)) { + /* + * Originally, block_on_error was an argument to the log + * portion of the mirror CTR table. It was renamed to + * "handle_errors" and now resides in the 'features' + * section of the mirror CTR table (i.e. at the end). + * + * We can identify whether to use "block_on_error" or + * "handle_errors" by the dm-mirror module's version + * number (>= 1.12) or by the kernel version (>= 2.6.22). + */ + if (KERNEL_VERSION(kmaj, kmin, krel) >= KERNEL_VERSION(2, 6, 22)) + handle_errors = 1; + else + block_on_error = 1; + } + + if (seg->clustered) { + /* Cluster mirrors require a UUID */ + if (!seg->uuid) + return_0; + + /* + * Cluster mirrors used to have their own log + * types. Now they are accessed through the + * userspace log type. + * + * The dm-log-userspace module was added to the + * 2.6.31 kernel. + */ + if (KERNEL_VERSION(kmaj, kmin, krel) >= KERNEL_VERSION(2, 6, 31)) + dm_log_userspace = 1; + } + + /* Region size */ + log_parm_count = 1; + + /* [no]sync, block_on_error etc. */ + log_parm_count += hweight32(seg->flags); + + /* "handle_errors" is a feature arg now */ + if (handle_errors) + log_parm_count--; + + /* DM_CORELOG does not count in the param list */ + if (seg->flags & DM_CORELOG) + log_parm_count--; + + if (seg->clustered) { + log_parm_count++; /* For UUID */ + + if (!dm_log_userspace) + EMIT_PARAMS(pos, "clustered-"); + else + /* For clustered-* type field inserted later */ + log_parm_count++; + } + + if (!seg->log) + logtype = "core"; + else { + logtype = "disk"; + log_parm_count++; + if (!_build_dev_string(logbuf, sizeof(logbuf), seg->log)) + return_0; + } + + if (dm_log_userspace) + EMIT_PARAMS(pos, "userspace %u %s clustered-%s", + log_parm_count, seg->uuid, logtype); + else + EMIT_PARAMS(pos, "%s %u", logtype, log_parm_count); + + if (seg->log) + EMIT_PARAMS(pos, " %s", logbuf); + + EMIT_PARAMS(pos, " %u", seg->region_size); + + if (seg->clustered && !dm_log_userspace) + EMIT_PARAMS(pos, " %s", seg->uuid); + + if ((seg->flags & DM_NOSYNC)) + EMIT_PARAMS(pos, " nosync"); + else if ((seg->flags & DM_FORCESYNC)) + EMIT_PARAMS(pos, " sync"); + + if (block_on_error) + EMIT_PARAMS(pos, " block_on_error"); + + EMIT_PARAMS(pos, " %u ", seg->mirror_area_count); + + if (_emit_areas_line(dmt, seg, params, paramsize, &pos) <= 0) + return_0; + + if (handle_errors) + EMIT_PARAMS(pos, " 1 handle_errors"); + + return 1; +} + +static int _2_if_value(unsigned p) +{ + return p ? 2 : 0; +} + +/* Return number of bits passed in @bits assuming 2 * 64 bit size */ +static int _get_params_count(const uint64_t *bits) +{ + int r = 0; + int i = RAID_BITMAP_SIZE; + + while (i--) { + r += 2 * hweight32(bits[i] & 0xFFFFFFFF); + r += 2 * hweight32(bits[i] >> 32); + } + + return r; +} + +/* + * Get target version (major, minor and patchlevel) for @target_name + * + * FIXME: this function is derived from liblvm. + * Integrate with move of liblvm functions + * to libdm in future library layer purge + * (e.g. expose as API dm_target_version()?) + */ +static int _target_version(const char *target_name, uint32_t *maj, + uint32_t *min, uint32_t *patchlevel) +{ + int r = 0; + struct dm_task *dmt; + struct dm_versions *target, *last_target = NULL; + + log_very_verbose("Getting target version for %s", target_name); + if (!(dmt = dm_task_create(DM_DEVICE_LIST_VERSIONS))) + return_0; + + if (!dm_task_run(dmt)) { + log_debug_activation("Failed to get %s target versions", target_name); + /* Assume this was because LIST_VERSIONS isn't supported */ + *maj = *min = *patchlevel = 0; + r = 1; + } else + for (target = dm_task_get_versions(dmt); + target != last_target; + last_target = target, target = (struct dm_versions *)((char *) target + target->next)) + if (!strcmp(target_name, target->name)) { + *maj = target->version[0]; + *min = target->version[1]; + *patchlevel = target->version[2]; + log_very_verbose("Found %s target " + "v%" PRIu32 ".%" PRIu32 ".%" PRIu32 ".", + target_name, *maj, *min, *patchlevel); + r = 1; + break; + } + + dm_task_destroy(dmt); + + return r; +} + +static int _raid_emit_segment_line(struct dm_task *dmt, uint32_t major, + uint32_t minor, struct load_segment *seg, + uint64_t *seg_start, char *params, + size_t paramsize) +{ + uint32_t i; + uint32_t area_count = seg->area_count / 2; + uint32_t maj, min, patchlevel; + int param_count = 1; /* mandatory 'chunk size'/'stripe size' arg */ + int pos = 0; + unsigned type; + + if (seg->area_count % 2) + return 0; + + if ((seg->flags & DM_NOSYNC) || (seg->flags & DM_FORCESYNC)) + param_count++; + + param_count += _2_if_value(seg->data_offset) + + _2_if_value(seg->delta_disks) + + _2_if_value(seg->region_size) + + _2_if_value(seg->writebehind) + + _2_if_value(seg->min_recovery_rate) + + _2_if_value(seg->max_recovery_rate) + + _2_if_value(seg->data_copies > 1); + + /* rebuilds and writemostly are BITMAP_SIZE * 64 bits */ + param_count += _get_params_count(seg->rebuilds); + param_count += _get_params_count(seg->writemostly); + + if ((seg->type == SEG_RAID1) && seg->stripe_size) + log_info("WARNING: Ignoring RAID1 stripe size"); + + /* Kernel only expects "raid0", not "raid0_meta" */ + type = seg->type; + if (type == SEG_RAID0_META) + type = SEG_RAID0; + + EMIT_PARAMS(pos, "%s %d %u", + type == SEG_RAID10 ? "raid10" : _dm_segtypes[type].target, + param_count, seg->stripe_size); + + if (!_target_version("raid", &maj, &min, &patchlevel)) + return_0; + + /* + * Target version prior to 1.9.0 and >= 1.11.0 emit + * order of parameters as of kernel target documentation + */ + if (maj > 1 || (maj == 1 && (min < 9 || min >= 11))) { + if (seg->flags & DM_NOSYNC) + EMIT_PARAMS(pos, " nosync"); + else if (seg->flags & DM_FORCESYNC) + EMIT_PARAMS(pos, " sync"); + + for (i = 0; i < area_count; i++) + if (seg->rebuilds[i/64] & (1ULL << (i%64))) + EMIT_PARAMS(pos, " rebuild %u", i); + + if (seg->min_recovery_rate) + EMIT_PARAMS(pos, " min_recovery_rate %u", + seg->min_recovery_rate); + + if (seg->max_recovery_rate) + EMIT_PARAMS(pos, " max_recovery_rate %u", + seg->max_recovery_rate); + + for (i = 0; i < area_count; i++) + if (seg->writemostly[i/64] & (1ULL << (i%64))) + EMIT_PARAMS(pos, " write_mostly %u", i); + + if (seg->writebehind) + EMIT_PARAMS(pos, " max_write_behind %u", seg->writebehind); + + if (seg->region_size) + EMIT_PARAMS(pos, " region_size %u", seg->region_size); + + if (seg->data_copies > 1 && type == SEG_RAID10) + EMIT_PARAMS(pos, " raid10_copies %u", seg->data_copies); + + if (seg->delta_disks) + EMIT_PARAMS(pos, " delta_disks %d", seg->delta_disks); + + /* If seg-data_offset == 1, kernel needs a zero offset to adjust to it */ + if (seg->data_offset) + EMIT_PARAMS(pos, " data_offset %d", seg->data_offset == 1 ? 0 : seg->data_offset); + + /* Target version >= 1.9.0 && < 1.11.0 had a table line parameter ordering flaw */ + } else { + if (seg->data_copies > 1 && type == SEG_RAID10) + EMIT_PARAMS(pos, " raid10_copies %u", seg->data_copies); + + if (seg->flags & DM_NOSYNC) + EMIT_PARAMS(pos, " nosync"); + else if (seg->flags & DM_FORCESYNC) + EMIT_PARAMS(pos, " sync"); + + if (seg->region_size) + EMIT_PARAMS(pos, " region_size %u", seg->region_size); + + /* If seg-data_offset == 1, kernel needs a zero offset to adjust to it */ + if (seg->data_offset) + EMIT_PARAMS(pos, " data_offset %d", seg->data_offset == 1 ? 0 : seg->data_offset); + + if (seg->delta_disks) + EMIT_PARAMS(pos, " delta_disks %d", seg->delta_disks); + + for (i = 0; i < area_count; i++) + if (seg->rebuilds[i/64] & (1ULL << (i%64))) + EMIT_PARAMS(pos, " rebuild %u", i); + + for (i = 0; i < area_count; i++) + if (seg->writemostly[i/64] & (1ULL << (i%64))) + EMIT_PARAMS(pos, " write_mostly %u", i); + + if (seg->writebehind) + EMIT_PARAMS(pos, " max_write_behind %u", seg->writebehind); + + if (seg->max_recovery_rate) + EMIT_PARAMS(pos, " max_recovery_rate %u", + seg->max_recovery_rate); + + if (seg->min_recovery_rate) + EMIT_PARAMS(pos, " min_recovery_rate %u", + seg->min_recovery_rate); + } + + /* Print number of metadata/data device pairs */ + EMIT_PARAMS(pos, " %u", area_count); + + if (_emit_areas_line(dmt, seg, params, paramsize, &pos) <= 0) + return_0; + + return 1; +} + +static int _cache_emit_segment_line(struct dm_task *dmt, + struct load_segment *seg, + char *params, size_t paramsize) +{ + int pos = 0; + /* unsigned feature_count; */ + char data[DM_FORMAT_DEV_BUFSIZE]; + char metadata[DM_FORMAT_DEV_BUFSIZE]; + char origin[DM_FORMAT_DEV_BUFSIZE]; + const char *name; + struct dm_config_node *cn; + + /* Cache Dev */ + if (!_build_dev_string(data, sizeof(data), seg->pool)) + return_0; + + /* Metadata Dev */ + if (!_build_dev_string(metadata, sizeof(metadata), seg->metadata)) + return_0; + + /* Origin Dev */ + if (!_build_dev_string(origin, sizeof(origin), seg->origin)) + return_0; + + EMIT_PARAMS(pos, "%s %s %s", metadata, data, origin); + + /* Data block size */ + EMIT_PARAMS(pos, " %u", seg->data_block_size); + + /* Features */ + /* feature_count = hweight32(seg->flags); */ + /* EMIT_PARAMS(pos, " %u", feature_count); */ + if (seg->flags & DM_CACHE_FEATURE_METADATA2) + EMIT_PARAMS(pos, " 2 metadata2 "); + else + EMIT_PARAMS(pos, " 1 "); + + if (seg->flags & DM_CACHE_FEATURE_PASSTHROUGH) + EMIT_PARAMS(pos, "passthrough"); + else if (seg->flags & DM_CACHE_FEATURE_WRITEBACK) + EMIT_PARAMS(pos, "writeback"); + else + EMIT_PARAMS(pos, "writethrough"); + + /* Cache Policy */ + name = seg->policy_name ? : "default"; + + EMIT_PARAMS(pos, " %s", name); + + EMIT_PARAMS(pos, " %u", seg->policy_argc * 2); + if (seg->policy_settings) + for (cn = seg->policy_settings->child; cn; cn = cn->sib) + EMIT_PARAMS(pos, " %s %" PRIu64, cn->key, cn->v->v.i); + + return 1; +} + +static int _thin_pool_emit_segment_line(struct dm_task *dmt, + struct load_segment *seg, + char *params, size_t paramsize) +{ + int pos = 0; + char pool[DM_FORMAT_DEV_BUFSIZE], metadata[DM_FORMAT_DEV_BUFSIZE]; + int features = (seg->error_if_no_space ? 1 : 0) + + (seg->read_only ? 1 : 0) + + (seg->ignore_discard ? 1 : 0) + + (seg->no_discard_passdown ? 1 : 0) + + (seg->skip_block_zeroing ? 1 : 0); + + if (!_build_dev_string(metadata, sizeof(metadata), seg->metadata)) + return_0; + + if (!_build_dev_string(pool, sizeof(pool), seg->pool)) + return_0; + + EMIT_PARAMS(pos, "%s %s %d %" PRIu64 " %d%s%s%s%s%s", metadata, pool, + seg->data_block_size, seg->low_water_mark, features, + seg->skip_block_zeroing ? " skip_block_zeroing" : "", + seg->ignore_discard ? " ignore_discard" : "", + seg->no_discard_passdown ? " no_discard_passdown" : "", + seg->error_if_no_space ? " error_if_no_space" : "", + seg->read_only ? " read_only" : "" + ); + + return 1; +} + +static int _thin_emit_segment_line(struct dm_task *dmt, + struct load_segment *seg, + char *params, size_t paramsize) +{ + int pos = 0; + char pool[DM_FORMAT_DEV_BUFSIZE]; + char external[DM_FORMAT_DEV_BUFSIZE + 1]; + + if (!_build_dev_string(pool, sizeof(pool), seg->pool)) + return_0; + + if (!seg->external) + *external = 0; + else { + *external = ' '; + if (!_build_dev_string(external + 1, sizeof(external) - 1, + seg->external)) + return_0; + } + + EMIT_PARAMS(pos, "%s %d%s", pool, seg->device_id, external); + + return 1; +} + +static int _emit_segment_line(struct dm_task *dmt, uint32_t major, + uint32_t minor, struct load_segment *seg, + uint64_t *seg_start, char *params, + size_t paramsize) +{ + int pos = 0; + int r; + int target_type_is_raid = 0; + char originbuf[DM_FORMAT_DEV_BUFSIZE], cowbuf[DM_FORMAT_DEV_BUFSIZE]; + + switch(seg->type) { + case SEG_ERROR: + case SEG_ZERO: + case SEG_LINEAR: + break; + case SEG_MIRRORED: + /* Mirrors are pretty complicated - now in separate function */ + r = _mirror_emit_segment_line(dmt, seg, params, paramsize); + if (!r) + return_0; + break; + case SEG_SNAPSHOT: + case SEG_SNAPSHOT_MERGE: + if (!_build_dev_string(originbuf, sizeof(originbuf), seg->origin)) + return_0; + if (!_build_dev_string(cowbuf, sizeof(cowbuf), seg->cow)) + return_0; + EMIT_PARAMS(pos, "%s %s %c %d", originbuf, cowbuf, + seg->persistent ? 'P' : 'N', seg->chunk_size); + break; + case SEG_SNAPSHOT_ORIGIN: + if (!_build_dev_string(originbuf, sizeof(originbuf), seg->origin)) + return_0; + EMIT_PARAMS(pos, "%s", originbuf); + break; + case SEG_STRIPED: + EMIT_PARAMS(pos, "%u %u ", seg->area_count, seg->stripe_size); + break; + case SEG_CRYPT: + EMIT_PARAMS(pos, "%s%s%s%s%s %s %" PRIu64 " ", seg->cipher, + seg->chainmode ? "-" : "", seg->chainmode ?: "", + seg->iv ? "-" : "", seg->iv ?: "", seg->key, + seg->iv_offset != DM_CRYPT_IV_DEFAULT ? + seg->iv_offset : *seg_start); + break; + case SEG_RAID0: + case SEG_RAID0_META: + case SEG_RAID1: + case SEG_RAID10: + case SEG_RAID4: + case SEG_RAID5_N: + case SEG_RAID5_LA: + case SEG_RAID5_RA: + case SEG_RAID5_LS: + case SEG_RAID5_RS: + case SEG_RAID6_N_6: + case SEG_RAID6_ZR: + case SEG_RAID6_NR: + case SEG_RAID6_NC: + case SEG_RAID6_LS_6: + case SEG_RAID6_RS_6: + case SEG_RAID6_LA_6: + case SEG_RAID6_RA_6: + target_type_is_raid = 1; + r = _raid_emit_segment_line(dmt, major, minor, seg, seg_start, + params, paramsize); + if (!r) + return_0; + + break; + case SEG_THIN_POOL: + if (!_thin_pool_emit_segment_line(dmt, seg, params, paramsize)) + return_0; + break; + case SEG_THIN: + if (!_thin_emit_segment_line(dmt, seg, params, paramsize)) + return_0; + break; + case SEG_CACHE: + if (!_cache_emit_segment_line(dmt, seg, params, paramsize)) + return_0; + break; + } + + switch(seg->type) { + case SEG_ERROR: + case SEG_SNAPSHOT: + case SEG_SNAPSHOT_ORIGIN: + case SEG_SNAPSHOT_MERGE: + case SEG_ZERO: + case SEG_THIN_POOL: + case SEG_THIN: + case SEG_CACHE: + break; + case SEG_CRYPT: + case SEG_LINEAR: + case SEG_STRIPED: + if ((r = _emit_areas_line(dmt, seg, params, paramsize, &pos)) <= 0) { + stack; + return r; + } + if (!params[0]) { + log_error("No parameters supplied for %s target " + "%u:%u.", _dm_segtypes[seg->type].target, + major, minor); + return 0; + } + break; + } + + log_debug_activation("Adding target to (%" PRIu32 ":%" PRIu32 "): %" PRIu64 + " %" PRIu64 " %s %s", major, minor, + *seg_start, seg->size, target_type_is_raid ? "raid" : + _dm_segtypes[seg->type].target, params); + + if (!dm_task_add_target(dmt, *seg_start, seg->size, + target_type_is_raid ? "raid" : + _dm_segtypes[seg->type].target, params)) + return_0; + + *seg_start += seg->size; + + return 1; +} + +#undef EMIT_PARAMS + +static int _emit_segment(struct dm_task *dmt, uint32_t major, uint32_t minor, + struct load_segment *seg, uint64_t *seg_start) +{ + char *params; + size_t paramsize = 4096; /* FIXME: too small for long RAID lines when > 64 devices supported */ + int ret; + + do { + if (!(params = dm_malloc(paramsize))) { + log_error("Insufficient space for target parameters."); + return 0; + } + + params[0] = '\0'; + ret = _emit_segment_line(dmt, major, minor, seg, seg_start, + params, paramsize); + dm_free(params); + + if (!ret) + stack; + + if (ret >= 0) + return ret; + + log_debug_activation("Insufficient space in params[%" PRIsize_t + "] for target parameters.", paramsize); + + paramsize *= 2; + } while (paramsize < MAX_TARGET_PARAMSIZE); + + log_error("Target parameter size too big. Aborting."); + return 0; +} + +static int _load_node(struct dm_tree_node *dnode) +{ + int r = 0; + struct dm_task *dmt; + struct load_segment *seg; + uint64_t seg_start = 0, existing_table_size; + + log_verbose("Loading table for %s.", _node_name(dnode)); + + if (!(dmt = dm_task_create(DM_DEVICE_RELOAD))) { + log_error("Reload dm_task creation failed for %s.", _node_name(dnode)); + return 0; + } + + if (!dm_task_set_major(dmt, dnode->info.major) || + !dm_task_set_minor(dmt, dnode->info.minor)) { + log_error("Failed to set device number for %s reload.", _node_name(dnode)); + goto out; + } + + if (dnode->props.read_only && !dm_task_set_ro(dmt)) { + log_error("Failed to set read only flag for %s.", _node_name(dnode)); + goto out; + } + + if (!dm_task_no_open_count(dmt)) + log_warn("WARNING: Failed to disable open_count."); + + dm_list_iterate_items(seg, &dnode->props.segs) + if (!_emit_segment(dmt, dnode->info.major, dnode->info.minor, + seg, &seg_start)) + goto_out; + + if (!dm_task_suppress_identical_reload(dmt)) + log_warn("WARNING: Failed to suppress reload of identical tables."); + + if ((r = dm_task_run(dmt))) { + r = dm_task_get_info(dmt, &dnode->info); + if (r && !dnode->info.inactive_table) + log_verbose("Suppressed %s identical table reload.", + _node_name(dnode)); + + existing_table_size = dm_task_get_existing_table_size(dmt); + if ((dnode->props.size_changed = + (existing_table_size == seg_start) ? 0 : + (existing_table_size > seg_start) ? -1 : 1)) { + /* + * Kernel usually skips size validation on zero-length devices + * now so no need to preload them. + */ + /* FIXME In which kernel version did this begin? */ + if (!existing_table_size && dnode->props.delay_resume_if_new) + dnode->props.size_changed = 0; + + log_debug_activation("Table size changed from %" PRIu64 " to %" + PRIu64 " for %s.%s", existing_table_size, + seg_start, _node_name(dnode), + dnode->props.size_changed ? "" : " (Ignoring.)"); + + /* + * FIXME: code here has known design problem. + * LVM2 does NOT resize thin-pool on top of other LV in 2 steps - + * where raid would be resized with 1st. transaction + * followed by 2nd. thin-pool resize - RHBZ #1285063 + */ + if (existing_table_size && dnode->props.delay_resume_if_extended) { + log_debug_activation("Resume of table of extended device %s delayed.", + _node_name(dnode)); + dnode->props.size_changed = 0; + } + } + } + + dnode->props.segment_count = 0; + +out: + dm_task_destroy(dmt); + + return r; +} + +/* + * Currently try to deactivate only nodes created during preload. + * New node is always attached to the front of activated_list + */ +static int _dm_tree_revert_activated(struct dm_tree_node *parent) +{ + struct dm_tree_node *child; + + dm_list_iterate_items_gen(child, &parent->activated, activated_list) { + log_debug_activation("Reverting %s.", _node_name(child)); + if (child->callback) { + log_debug_activation("Dropping callback for %s.", _node_name(child)); + child->callback = NULL; + } + if (!_deactivate_node(child->name, child->info.major, child->info.minor, + &child->dtree->cookie, child->udev_flags, 0)) { + log_error("Unable to deactivate %s.", _node_name(child)); + return 0; + } + if (!_dm_tree_revert_activated(child)) + return_0; + } + + return 1; +} + +int dm_tree_preload_children(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len) +{ + int r = 1, node_created = 0; + void *handle = NULL; + struct dm_tree_node *child; + int update_devs_flag = 0; + + /* Preload children first */ + while ((child = dm_tree_next_child(&handle, dnode, 0))) { + /* Propagate delay of resume from parent node */ + if (dnode->props.delay_resume_if_new > 1) + child->props.delay_resume_if_new = dnode->props.delay_resume_if_new; + + /* Skip existing non-device-mapper devices */ + if (!child->info.exists && child->info.major) + continue; + + /* Ignore if it doesn't belong to this VG */ + if (child->info.exists && + !_uuid_prefix_matches(child->uuid, uuid_prefix, uuid_prefix_len)) + continue; + + if (dm_tree_node_num_children(child, 0)) + if (!dm_tree_preload_children(child, uuid_prefix, uuid_prefix_len)) + return_0; + + /* FIXME Cope if name exists with no uuid? */ + if (!child->info.exists && !(node_created = _create_node(child))) + return_0; + + /* Propagate delayed resume from exteded child node */ + if (child->props.delay_resume_if_extended) + dnode->props.delay_resume_if_extended = 1; + + if (!child->info.inactive_table && + child->props.segment_count && + !_load_node(child)) { + /* + * If the table load does not succeed, we remove the + * device in the kernel that would otherwise have an + * empty table. This makes the create + load of the + * device atomic. However, if other dependencies have + * already been created and loaded; this code is + * insufficient to remove those - only the node + * encountering the table load failure is removed. + */ + if (node_created && !_remove_node(child)) + return_0; + return_0; + } + + /* No resume for a device without parents or with unchanged or smaller size */ + if (!dm_tree_node_num_children(child, 1) || (child->props.size_changed <= 0)) + continue; + + if (!child->info.inactive_table && !child->info.suspended) + continue; + + if (!_resume_node(child->name, child->info.major, child->info.minor, + child->props.read_ahead, child->props.read_ahead_flags, + &child->info, &child->dtree->cookie, child->udev_flags, + child->info.suspended)) { + log_error("Unable to resume %s.", _node_name(child)); + /* If the device was not previously active, we might as well remove this node. */ + if (!child->info.live_table && + !_deactivate_node(child->name, child->info.major, child->info.minor, + &child->dtree->cookie, child->udev_flags, 0)) + log_error("Unable to deactivate %s.", _node_name(child)); + r = 0; + /* Each child is handled independently */ + continue; + } + + if (node_created) { + /* Collect newly introduced devices for revert */ + dm_list_add_h(&dnode->activated, &child->activated_list); + + /* When creating new node also check transaction_id. */ + if (child->props.send_messages && + !_node_send_messages(child, uuid_prefix, uuid_prefix_len, 0)) { + stack; + if (!dm_udev_wait(dm_tree_get_cookie(dnode))) + stack; + dm_tree_set_cookie(dnode, 0); + (void) _dm_tree_revert_activated(dnode); + r = 0; + continue; + } + } + + /* + * Prepare for immediate synchronization with udev and flush all stacked + * dev node operations if requested by immediate_dev_node property. But + * finish processing current level in the tree first. + */ + if (child->props.immediate_dev_node) + update_devs_flag = 1; + } + + if (update_devs_flag || + (r && !dnode->info.exists && dnode->callback)) { + if (!dm_udev_wait(dm_tree_get_cookie(dnode))) + stack; + dm_tree_set_cookie(dnode, 0); + + if (r && !dnode->info.exists && dnode->callback && + !dnode->callback(dnode, DM_NODE_CALLBACK_PRELOADED, + dnode->callback_data)) + { + /* Try to deactivate what has been activated in preload phase */ + (void) _dm_tree_revert_activated(dnode); + return_0; + } + } + + return r; +} + +/* + * Returns 1 if unsure. + */ +int dm_tree_children_use_uuid(struct dm_tree_node *dnode, + const char *uuid_prefix, + size_t uuid_prefix_len) +{ + void *handle = NULL; + struct dm_tree_node *child = dnode; + const char *uuid; + + while ((child = dm_tree_next_child(&handle, dnode, 0))) { + if (!(uuid = dm_tree_node_get_uuid(child))) { + log_warn("WARNING: Failed to get uuid for dtree node %s.", + _node_name(child)); + return 1; + } + + if (_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len)) + return 1; + + if (dm_tree_node_num_children(child, 0)) + dm_tree_children_use_uuid(child, uuid_prefix, uuid_prefix_len); + } + + return 0; +} + +/* + * Target functions + */ +static struct load_segment *_add_segment(struct dm_tree_node *dnode, unsigned type, uint64_t size) +{ + struct load_segment *seg; + + if (!(seg = dm_pool_zalloc(dnode->dtree->mem, sizeof(*seg)))) { + log_error("dtree node segment allocation failed"); + return NULL; + } + + seg->type = type; + seg->size = size; + dm_list_init(&seg->areas); + dm_list_add(&dnode->props.segs, &seg->list); + dnode->props.segment_count++; + + return seg; +} + +int dm_tree_node_add_snapshot_origin_target(struct dm_tree_node *dnode, + uint64_t size, + const char *origin_uuid) +{ + struct load_segment *seg; + struct dm_tree_node *origin_node; + + if (!(seg = _add_segment(dnode, SEG_SNAPSHOT_ORIGIN, size))) + return_0; + + if (!(origin_node = dm_tree_find_node_by_uuid(dnode->dtree, origin_uuid))) { + log_error("Couldn't find snapshot origin uuid %s.", origin_uuid); + return 0; + } + + seg->origin = origin_node; + if (!_link_tree_nodes(dnode, origin_node)) + return_0; + + /* Resume snapshot origins after new snapshots */ + dnode->activation_priority = 1; + + /* + * Don't resume the origin immediately in case it is a non-trivial + * target that must not be active more than once concurrently! + */ + origin_node->props.delay_resume_if_new = 1; + + return 1; +} + +static int _add_snapshot_target(struct dm_tree_node *node, + uint64_t size, + const char *origin_uuid, + const char *cow_uuid, + const char *merge_uuid, + int persistent, + uint32_t chunk_size) +{ + struct load_segment *seg; + struct dm_tree_node *origin_node, *cow_node, *merge_node; + unsigned seg_type; + + seg_type = !merge_uuid ? SEG_SNAPSHOT : SEG_SNAPSHOT_MERGE; + + if (!(seg = _add_segment(node, seg_type, size))) + return_0; + + if (!(origin_node = dm_tree_find_node_by_uuid(node->dtree, origin_uuid))) { + log_error("Couldn't find snapshot origin uuid %s.", origin_uuid); + return 0; + } + + seg->origin = origin_node; + if (!_link_tree_nodes(node, origin_node)) + return_0; + + if (!(cow_node = dm_tree_find_node_by_uuid(node->dtree, cow_uuid))) { + log_error("Couldn't find snapshot COW device uuid %s.", cow_uuid); + return 0; + } + + seg->cow = cow_node; + if (!_link_tree_nodes(node, cow_node)) + return_0; + + seg->persistent = persistent ? 1 : 0; + seg->chunk_size = chunk_size; + + if (merge_uuid) { + if (!(merge_node = dm_tree_find_node_by_uuid(node->dtree, merge_uuid))) { + /* not a pure error, merging snapshot may have been deactivated */ + log_verbose("Couldn't find merging snapshot uuid %s.", merge_uuid); + } else { + seg->merge = merge_node; + /* must not link merging snapshot, would undermine activation_priority below */ + } + + /* Resume snapshot-merge (acting origin) after other snapshots */ + node->activation_priority = 1; + if (seg->merge) { + /* Resume merging snapshot after snapshot-merge */ + seg->merge->activation_priority = 2; + } + } + + return 1; +} + + +int dm_tree_node_add_snapshot_target(struct dm_tree_node *node, + uint64_t size, + const char *origin_uuid, + const char *cow_uuid, + int persistent, + uint32_t chunk_size) +{ + return _add_snapshot_target(node, size, origin_uuid, cow_uuid, + NULL, persistent, chunk_size); +} + +int dm_tree_node_add_snapshot_merge_target(struct dm_tree_node *node, + uint64_t size, + const char *origin_uuid, + const char *cow_uuid, + const char *merge_uuid, + uint32_t chunk_size) +{ + return _add_snapshot_target(node, size, origin_uuid, cow_uuid, + merge_uuid, 1, chunk_size); +} + +int dm_tree_node_add_error_target(struct dm_tree_node *node, + uint64_t size) +{ + if (!_add_segment(node, SEG_ERROR, size)) + return_0; + + return 1; +} + +int dm_tree_node_add_zero_target(struct dm_tree_node *node, + uint64_t size) +{ + if (!_add_segment(node, SEG_ZERO, size)) + return_0; + + return 1; +} + +int dm_tree_node_add_linear_target(struct dm_tree_node *node, + uint64_t size) +{ + if (!_add_segment(node, SEG_LINEAR, size)) + return_0; + + return 1; +} + +int dm_tree_node_add_striped_target(struct dm_tree_node *node, + uint64_t size, + uint32_t stripe_size) +{ + struct load_segment *seg; + + if (!(seg = _add_segment(node, SEG_STRIPED, size))) + return_0; + + seg->stripe_size = stripe_size; + + return 1; +} + +int dm_tree_node_add_crypt_target(struct dm_tree_node *node, + uint64_t size, + const char *cipher, + const char *chainmode, + const char *iv, + uint64_t iv_offset, + const char *key) +{ + struct load_segment *seg; + + if (!(seg = _add_segment(node, SEG_CRYPT, size))) + return_0; + + seg->cipher = cipher; + seg->chainmode = chainmode; + seg->iv = iv; + seg->iv_offset = iv_offset; + seg->key = key; + + return 1; +} + +int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node, + uint32_t region_size, + unsigned clustered, + const char *log_uuid, + unsigned area_count, + uint32_t flags) +{ + struct dm_tree_node *log_node = NULL; + struct load_segment *seg; + + if (!(seg = _get_last_load_segment(node))) + return_0; + + if (log_uuid) { + if (!(seg->uuid = dm_pool_strdup(node->dtree->mem, log_uuid))) { + log_error("log uuid pool_strdup failed"); + return 0; + } + if ((flags & DM_CORELOG)) + /* For pvmove: immediate resume (for size validation) isn't needed. */ + /* pvmove flag passed via unused UUID and its suffix */ + node->props.delay_resume_if_new = strstr(log_uuid, "pvmove") ? 2 : 1; + else { + if (!(log_node = dm_tree_find_node_by_uuid(node->dtree, log_uuid))) { + log_error("Couldn't find mirror log uuid %s.", log_uuid); + return 0; + } + + if (clustered) + log_node->props.immediate_dev_node = 1; + + /* The kernel validates the size of disk logs. */ + /* FIXME Propagate to any devices below */ + log_node->props.delay_resume_if_new = 0; + + if (!_link_tree_nodes(node, log_node)) + return_0; + } + } + + seg->log = log_node; + seg->region_size = region_size; + seg->clustered = clustered; + seg->mirror_area_count = area_count; + seg->flags = flags; + + return 1; +} + +int dm_tree_node_add_mirror_target(struct dm_tree_node *node, + uint64_t size) +{ + if (!_add_segment(node, SEG_MIRRORED, size)) + return_0; + + return 1; +} + +int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node, + uint64_t size, + const struct dm_tree_node_raid_params *p) +{ + unsigned i; + struct load_segment *seg = NULL; + + for (i = 0; i < DM_ARRAY_SIZE(_dm_segtypes) && !seg; ++i) + if (!strcmp(p->raid_type, _dm_segtypes[i].target)) + if (!(seg = _add_segment(node, + _dm_segtypes[i].type, size))) + return_0; + if (!seg) { + log_error("Unsupported raid type %s.", p->raid_type); + return 0; + } + + seg->region_size = p->region_size; + seg->stripe_size = p->stripe_size; + seg->area_count = 0; + memset(seg->rebuilds, 0, sizeof(seg->rebuilds)); + seg->rebuilds[0] = p->rebuilds; + memset(seg->writemostly, 0, sizeof(seg->writemostly)); + seg->writemostly[0] = p->writemostly; + seg->writebehind = p->writebehind; + seg->min_recovery_rate = p->min_recovery_rate; + seg->max_recovery_rate = p->max_recovery_rate; + seg->flags = p->flags; + + return 1; +} + +int dm_tree_node_add_raid_target(struct dm_tree_node *node, + uint64_t size, + const char *raid_type, + uint32_t region_size, + uint32_t stripe_size, + uint64_t rebuilds, + uint64_t flags) +{ + struct dm_tree_node_raid_params params = { + .raid_type = raid_type, + .region_size = region_size, + .stripe_size = stripe_size, + .rebuilds = rebuilds, + .flags = flags + }; + + return dm_tree_node_add_raid_target_with_params(node, size, &params); +} + +/* + * Version 2 of dm_tree_node_add_raid_target() allowing for: + * + * - maximum 253 legs in a raid set (MD kernel limitation) + * - delta_disks for disk add/remove reshaping + * - data_offset for out-of-place reshaping + * - data_copies to cope witth odd numbers of raid10 disks + */ +int dm_tree_node_add_raid_target_with_params_v2(struct dm_tree_node *node, + uint64_t size, + const struct dm_tree_node_raid_params_v2 *p) +{ + unsigned i; + struct load_segment *seg = NULL; + + for (i = 0; i < DM_ARRAY_SIZE(_dm_segtypes) && !seg; ++i) + if (!strcmp(p->raid_type, _dm_segtypes[i].target)) + if (!(seg = _add_segment(node, + _dm_segtypes[i].type, size))) + return_0; + if (!seg) { + log_error("Unsupported raid type %s.", p->raid_type); + return 0; + } + + seg->region_size = p->region_size; + seg->stripe_size = p->stripe_size; + seg->area_count = 0; + seg->delta_disks = p->delta_disks; + seg->data_offset = p->data_offset; + memcpy(seg->rebuilds, p->rebuilds, sizeof(seg->rebuilds)); + memcpy(seg->writemostly, p->writemostly, sizeof(seg->writemostly)); + seg->writebehind = p->writebehind; + seg->data_copies = p->data_copies; + seg->min_recovery_rate = p->min_recovery_rate; + seg->max_recovery_rate = p->max_recovery_rate; + seg->flags = p->flags; + + return 1; +} + +int dm_tree_node_add_cache_target(struct dm_tree_node *node, + uint64_t size, + uint64_t feature_flags, /* DM_CACHE_FEATURE_* */ + const char *metadata_uuid, + const char *data_uuid, + const char *origin_uuid, + const char *policy_name, + const struct dm_config_node *policy_settings, + uint32_t data_block_size) +{ + struct dm_config_node *cn; + struct load_segment *seg; + static const uint64_t _modemask = + DM_CACHE_FEATURE_PASSTHROUGH | + DM_CACHE_FEATURE_WRITETHROUGH | + DM_CACHE_FEATURE_WRITEBACK; + + /* Detect unknown (bigger) feature bit */ + if (feature_flags >= (DM_CACHE_FEATURE_METADATA2 * 2)) { + log_error("Unsupported cache's feature flags set " FMTu64 ".", + feature_flags); + return 0; + } + + switch (feature_flags & _modemask) { + case DM_CACHE_FEATURE_PASSTHROUGH: + case DM_CACHE_FEATURE_WRITEBACK: + if (strcmp(policy_name, "cleaner") == 0) { + /* Enforce writethrough mode for cleaner policy */ + feature_flags = ~_modemask; + feature_flags |= DM_CACHE_FEATURE_WRITETHROUGH; + } + /* Fall through */ + case DM_CACHE_FEATURE_WRITETHROUGH: + break; + default: + log_error("Invalid cache's feature flag " FMTu64 ".", + feature_flags); + return 0; + } + + if (data_block_size < DM_CACHE_MIN_DATA_BLOCK_SIZE) { + log_error("Data block size %u is lower then %u sectors.", + data_block_size, DM_CACHE_MIN_DATA_BLOCK_SIZE); + return 0; + } + + if (data_block_size > DM_CACHE_MAX_DATA_BLOCK_SIZE) { + log_error("Data block size %u is higher then %u sectors.", + data_block_size, DM_CACHE_MAX_DATA_BLOCK_SIZE); + return 0; + } + + if (!(seg = _add_segment(node, SEG_CACHE, size))) + return_0; + + if (!(seg->pool = dm_tree_find_node_by_uuid(node->dtree, + data_uuid))) { + log_error("Missing cache's data uuid %s.", + data_uuid); + return 0; + } + if (!_link_tree_nodes(node, seg->pool)) + return_0; + + if (!(seg->metadata = dm_tree_find_node_by_uuid(node->dtree, + metadata_uuid))) { + log_error("Missing cache's metadata uuid %s.", + metadata_uuid); + return 0; + } + if (!_link_tree_nodes(node, seg->metadata)) + return_0; + + if (!(seg->origin = dm_tree_find_node_by_uuid(node->dtree, + origin_uuid))) { + log_error("Missing cache's origin uuid %s.", + metadata_uuid); + return 0; + } + if (!_link_tree_nodes(node, seg->origin)) + return_0; + + seg->data_block_size = data_block_size; + seg->flags = feature_flags; + seg->policy_name = policy_name; + + /* FIXME: better validation missing */ + if (policy_settings) { + if (!(seg->policy_settings = dm_config_clone_node_with_mem(node->dtree->mem, policy_settings, 0))) + return_0; + + for (cn = seg->policy_settings->child; cn; cn = cn->sib) { + if (!cn->v || (cn->v->type != DM_CFG_INT)) { + /* For now only <key> = <int> pairs are supported */ + log_error("Cache policy parameter %s is without integer value.", cn->key); + return 0; + } + seg->policy_argc++; + } + } + + return 1; +} + +int dm_tree_node_add_replicator_target(struct dm_tree_node *node, + uint64_t size, + const char *rlog_uuid, + const char *rlog_type, + unsigned rsite_index, + dm_replicator_mode_t mode, + uint32_t async_timeout, + uint64_t fall_behind_data, + uint32_t fall_behind_ios) +{ + log_error("Replicator segment is unsupported."); + return 0; +} + +/* Appends device node to Replicator */ +int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node, + uint64_t size, + const char *replicator_uuid, + uint64_t rdevice_index, + const char *rdev_uuid, + unsigned rsite_index, + const char *slog_uuid, + uint32_t slog_flags, + uint32_t slog_region_size) +{ + log_error("Replicator targer is unsupported."); + return 0; +} + +static struct load_segment *_get_single_load_segment(struct dm_tree_node *node, + unsigned type) +{ + struct load_segment *seg; + + if (!(seg = _get_last_load_segment(node))) + return_NULL; + + /* Never used past _load_node(), so can test segment_count */ + if (node->props.segment_count != 1) { + log_error("Node %s must have only one segment.", + _dm_segtypes[type].target); + return NULL; + } + + if (seg->type != type) { + log_error("Node %s has segment type %s.", + _dm_segtypes[type].target, + _dm_segtypes[seg->type].target); + return NULL; + } + + return seg; +} + +static int _thin_validate_device_id(uint32_t device_id) +{ + if (device_id > DM_THIN_MAX_DEVICE_ID) { + log_error("Device id %u is higher then %u.", + device_id, DM_THIN_MAX_DEVICE_ID); + return 0; + } + + return 1; +} + +int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, + uint64_t size, + uint64_t transaction_id, + const char *metadata_uuid, + const char *pool_uuid, + uint32_t data_block_size, + uint64_t low_water_mark, + unsigned skip_block_zeroing) +{ + struct load_segment *seg, *mseg; + uint64_t devsize = 0; + + if (data_block_size < DM_THIN_MIN_DATA_BLOCK_SIZE) { + log_error("Data block size %u is lower then %u sectors.", + data_block_size, DM_THIN_MIN_DATA_BLOCK_SIZE); + return 0; + } + + if (data_block_size > DM_THIN_MAX_DATA_BLOCK_SIZE) { + log_error("Data block size %u is higher then %u sectors.", + data_block_size, DM_THIN_MAX_DATA_BLOCK_SIZE); + return 0; + } + + if (!(seg = _add_segment(node, SEG_THIN_POOL, size))) + return_0; + + if (!(seg->metadata = dm_tree_find_node_by_uuid(node->dtree, metadata_uuid))) { + log_error("Missing metadata uuid %s.", metadata_uuid); + return 0; + } + + if (!_link_tree_nodes(node, seg->metadata)) + return_0; + + /* FIXME: more complex target may need more tweaks */ + dm_list_iterate_items(mseg, &seg->metadata->props.segs) { + devsize += mseg->size; + if (devsize > DM_THIN_MAX_METADATA_SIZE) { + log_debug_activation("Ignoring %" PRIu64 " of device.", + devsize - DM_THIN_MAX_METADATA_SIZE); + mseg->size -= (devsize - DM_THIN_MAX_METADATA_SIZE); + devsize = DM_THIN_MAX_METADATA_SIZE; + /* FIXME: drop remaining segs */ + } + } + + if (!(seg->pool = dm_tree_find_node_by_uuid(node->dtree, pool_uuid))) { + log_error("Missing pool uuid %s.", pool_uuid); + return 0; + } + + if (!_link_tree_nodes(node, seg->pool)) + return_0; + + /* Clean flag delay_resume_if_new - so corelog gets resumed */ + seg->metadata->props.delay_resume_if_new = 0; + seg->pool->props.delay_resume_if_new = 0; + + /* Preload must not resume extended running thin-pool before it's committed */ + node->props.delay_resume_if_extended = 1; + + /* Validate only transaction_id > 0 when activating thin-pool */ + node->props.send_messages = transaction_id ? 1 : 0; + seg->transaction_id = transaction_id; + seg->low_water_mark = low_water_mark; + seg->data_block_size = data_block_size; + seg->skip_block_zeroing = skip_block_zeroing; + dm_list_init(&seg->thin_messages); + + return 1; +} + +int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node, + dm_thin_message_t type, + uint64_t id1, uint64_t id2) +{ + struct thin_message *tm; + struct load_segment *seg; + + if (!(seg = _get_single_load_segment(node, SEG_THIN_POOL))) + return_0; + + if (!(tm = dm_pool_zalloc(node->dtree->mem, sizeof (*tm)))) { + log_error("Failed to allocate thin message."); + return 0; + } + + switch (type) { + case DM_THIN_MESSAGE_CREATE_SNAP: + /* If the thin origin is active, it must be suspend first! */ + if (id1 == id2) { + log_error("Cannot use same device id for origin and its snapshot."); + return 0; + } + if (!_thin_validate_device_id(id1) || + !_thin_validate_device_id(id2)) + return_0; + tm->message.u.m_create_snap.device_id = id1; + tm->message.u.m_create_snap.origin_id = id2; + break; + case DM_THIN_MESSAGE_CREATE_THIN: + if (!_thin_validate_device_id(id1)) + return_0; + tm->message.u.m_create_thin.device_id = id1; + tm->expected_errno = EEXIST; + break; + case DM_THIN_MESSAGE_DELETE: + if (!_thin_validate_device_id(id1)) + return_0; + tm->message.u.m_delete.device_id = id1; + tm->expected_errno = ENODATA; + break; + case DM_THIN_MESSAGE_SET_TRANSACTION_ID: + if ((id1 + 1) != id2) { + log_error("New transaction id must be sequential."); + return 0; /* FIXME: Maybe too strict here? */ + } + if (id2 != seg->transaction_id) { + log_error("Current transaction id is different from thin pool."); + return 0; /* FIXME: Maybe too strict here? */ + } + tm->message.u.m_set_transaction_id.current_id = id1; + tm->message.u.m_set_transaction_id.new_id = id2; + break; + default: + log_error("Unsupported message type %d.", (int) type); + return 0; + } + + tm->message.type = type; + dm_list_add(&seg->thin_messages, &tm->list); + /* Higher value >1 identifies there are really some messages */ + node->props.send_messages = 2; + + return 1; +} + +int dm_tree_node_set_thin_pool_discard(struct dm_tree_node *node, + unsigned ignore, + unsigned no_passdown) +{ + struct load_segment *seg; + + if (!(seg = _get_single_load_segment(node, SEG_THIN_POOL))) + return_0; + + seg->ignore_discard = ignore; + seg->no_discard_passdown = no_passdown; + + return 1; +} + +int dm_tree_node_set_thin_pool_error_if_no_space(struct dm_tree_node *node, + unsigned error_if_no_space) +{ + struct load_segment *seg; + + if (!(seg = _get_single_load_segment(node, SEG_THIN_POOL))) + return_0; + + seg->error_if_no_space = error_if_no_space; + + return 1; +} + +int dm_tree_node_set_thin_pool_read_only(struct dm_tree_node *node, + unsigned read_only) +{ + struct load_segment *seg; + + if (!(seg = _get_single_load_segment(node, SEG_THIN_POOL))) + return_0; + + seg->read_only = read_only; + + return 1; +} + +int dm_tree_node_add_thin_target(struct dm_tree_node *node, + uint64_t size, + const char *pool_uuid, + uint32_t device_id) +{ + struct dm_tree_node *pool; + struct load_segment *seg; + + if (!(pool = dm_tree_find_node_by_uuid(node->dtree, pool_uuid))) { + log_error("Missing thin pool uuid %s.", pool_uuid); + return 0; + } + + if (!_link_tree_nodes(node, pool)) + return_0; + + if (!_thin_validate_device_id(device_id)) + return_0; + + if (!(seg = _add_segment(node, SEG_THIN, size))) + return_0; + + seg->pool = pool; + seg->device_id = device_id; + + return 1; +} + +int dm_tree_node_set_thin_external_origin(struct dm_tree_node *node, + const char *external_uuid) +{ + struct dm_tree_node *external; + struct load_segment *seg; + + if (!(seg = _get_single_load_segment(node, SEG_THIN))) + return_0; + + if (!(external = dm_tree_find_node_by_uuid(node->dtree, + external_uuid))) { + log_error("Missing thin external origin uuid %s.", + external_uuid); + return 0; + } + + if (!_link_tree_nodes(node, external)) + return_0; + + seg->external = external; + + return 1; +} + +static int _add_area(struct dm_tree_node *node, struct load_segment *seg, struct dm_tree_node *dev_node, uint64_t offset) +{ + struct seg_area *area; + + if (!(area = dm_pool_zalloc(node->dtree->mem, sizeof (*area)))) { + log_error("Failed to allocate target segment area."); + return 0; + } + + area->dev_node = dev_node; + area->offset = offset; + + dm_list_add(&seg->areas, &area->list); + seg->area_count++; + + return 1; +} + +int dm_tree_node_add_target_area(struct dm_tree_node *node, + const char *dev_name, + const char *uuid, + uint64_t offset) +{ + struct load_segment *seg; + struct stat info; + struct dm_tree_node *dev_node; + + if ((!dev_name || !*dev_name) && (!uuid || !*uuid)) { + log_error("dm_tree_node_add_target_area called without device"); + return 0; + } + + if (uuid) { + if (!(dev_node = dm_tree_find_node_by_uuid(node->dtree, uuid))) { + log_error("Couldn't find area uuid %s.", uuid); + return 0; + } + if (!_link_tree_nodes(node, dev_node)) + return_0; + } else { + if (stat(dev_name, &info) < 0) { + log_error("Device %s not found.", dev_name); + return 0; + } + + if (!S_ISBLK(info.st_mode)) { + log_error("Device %s is not a block device.", dev_name); + return 0; + } + + /* FIXME Check correct macro use */ + if (!(dev_node = _add_dev(node->dtree, node, MAJOR(info.st_rdev), + MINOR(info.st_rdev), 0, 0))) + return_0; + } + + if (!(seg = _get_last_load_segment(node))) + return_0; + + if (!_add_area(node, seg, dev_node, offset)) + return_0; + + return 1; +} + +int dm_tree_node_add_null_area(struct dm_tree_node *node, uint64_t offset) +{ + struct load_segment *seg; + + if (!(seg = _get_last_load_segment(node))) + return_0; + + switch (seg->type) { + case SEG_RAID0: + case SEG_RAID0_META: + case SEG_RAID1: + case SEG_RAID4: + case SEG_RAID5_N: + case SEG_RAID5_LA: + case SEG_RAID5_RA: + case SEG_RAID5_LS: + case SEG_RAID5_RS: + case SEG_RAID6_N_6: + case SEG_RAID6_ZR: + case SEG_RAID6_NR: + case SEG_RAID6_NC: + case SEG_RAID6_LS_6: + case SEG_RAID6_RS_6: + case SEG_RAID6_LA_6: + case SEG_RAID6_RA_6: + break; + default: + log_error("dm_tree_node_add_null_area() called on an unsupported segment type"); + return 0; + } + + if (!_add_area(node, seg, NULL, offset)) + return_0; + + return 1; +} + +void dm_tree_node_set_callback(struct dm_tree_node *dnode, + dm_node_callback_fn cb, void *data) +{ + dnode->callback = cb; + dnode->callback_data = data; +} + +#if defined(__GNUC__) +/* + * Backward compatible implementations. + * + * Keep these at the end of the file to make sure that + * no code in this file accidentally calls it. + */ + +/* Backward compatible dm_tree_node_size_changed() implementations. */ +int dm_tree_node_size_changed_base(const struct dm_tree_node *dnode); +int dm_tree_node_size_changed_base(const struct dm_tree_node *dnode) +{ + /* Base does not make difference between smaller and bigger */ + return dm_tree_node_size_changed(dnode) ? 1 : 0; +} + +/* + * Retain ABI compatibility after adding the DM_CACHE_FEATURE_METADATA2 + * in version 1.02.138. + * + * Binaries compiled against version 1.02.138 onwards will use + * the new function dm_tree_node_add_cache_target which detects unknown + * feature flags and returns error for them. + */ +int dm_tree_node_add_cache_target_base(struct dm_tree_node *node, + uint64_t size, + uint64_t feature_flags, /* DM_CACHE_FEATURE_* */ + const char *metadata_uuid, + const char *data_uuid, + const char *origin_uuid, + const char *policy_name, + const struct dm_config_node *policy_settings, + uint32_t data_block_size); +int dm_tree_node_add_cache_target_base(struct dm_tree_node *node, + uint64_t size, + uint64_t feature_flags, + const char *metadata_uuid, + const char *data_uuid, + const char *origin_uuid, + const char *policy_name, + const struct dm_config_node *policy_settings, + uint32_t data_block_size) +{ + /* Old version supported only these FEATURE bits, others were ignored so masked them */ + static const uint64_t _mask = + DM_CACHE_FEATURE_WRITEBACK | + DM_CACHE_FEATURE_WRITETHROUGH | + DM_CACHE_FEATURE_PASSTHROUGH; + + return dm_tree_node_add_cache_target(node, size, feature_flags & _mask, + metadata_uuid, data_uuid, origin_uuid, + policy_name, policy_settings, data_block_size); +} +#endif diff --git a/device_mapper/libdm-file.c b/device_mapper/libdm-file.c new file mode 100644 index 0000000..5c6d223 --- /dev/null +++ b/device_mapper/libdm-file.c @@ -0,0 +1,261 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" + +#include <sys/file.h> +#include <fcntl.h> +#include <dirent.h> +#include <unistd.h> + +static int _is_dir(const char *path) +{ + struct stat st; + + if (stat(path, &st) < 0) { + log_sys_error("stat", path); + return 0; + } + + if (!S_ISDIR(st.st_mode)) { + log_error("Existing path %s is not " + "a directory.", path); + return 0; + } + + return 1; +} + +static int _create_dir_recursive(const char *dir) +{ + char *orig, *s; + int rc, r = 0; + + log_verbose("Creating directory \"%s\"", dir); + /* Create parent directories */ + orig = s = dm_strdup(dir); + if (!s) { + log_error("Failed to duplicate directory name."); + return 0; + } + + while ((s = strchr(s, '/')) != NULL) { + *s = '\0'; + if (*orig) { + rc = mkdir(orig, 0777); + if (rc < 0) { + if (errno == EEXIST) { + if (!_is_dir(orig)) + goto_out; + } else { + if (errno != EROFS) + log_sys_error("mkdir", orig); + goto out; + } + } + } + *s++ = '/'; + } + + /* Create final directory */ + rc = mkdir(dir, 0777); + if (rc < 0) { + if (errno == EEXIST) { + if (!_is_dir(dir)) + goto_out; + } else { + if (errno != EROFS) + log_sys_error("mkdir", orig); + goto out; + } + } + + r = 1; +out: + dm_free(orig); + return r; +} + +int dm_create_dir(const char *dir) +{ + struct stat info; + + if (!*dir) + return 1; + + if (stat(dir, &info) == 0 && S_ISDIR(info.st_mode)) + return 1; + + if (!_create_dir_recursive(dir)) + return_0; + + return 1; +} + +int dm_is_empty_dir(const char *dir) +{ + struct dirent *dirent; + DIR *d; + + if (!(d = opendir(dir))) { + log_sys_error("opendir", dir); + return 0; + } + + while ((dirent = readdir(d))) + if (strcmp(dirent->d_name, ".") && strcmp(dirent->d_name, "..")) + break; + + if (closedir(d)) + log_sys_error("closedir", dir); + + return dirent ? 0 : 1; +} + +int dm_fclose(FILE *stream) +{ + int prev_fail = ferror(stream); + int fclose_fail = fclose(stream); + + /* If there was a previous failure, but fclose succeeded, + clear errno, since ferror does not set it, and its value + may be unrelated to the ferror-reported failure. */ + if (prev_fail && !fclose_fail) + errno = 0; + + return prev_fail || fclose_fail ? EOF : 0; +} + +int dm_create_lockfile(const char *lockfile) +{ + int fd, value; + size_t bufferlen; + ssize_t write_out; + struct flock lock; + char buffer[50]; + int retries = 0; + + if ((fd = open(lockfile, O_CREAT | O_WRONLY, + (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH))) < 0) { + log_error("Cannot open lockfile [%s], error was [%s]", + lockfile, strerror(errno)); + return 0; + } + + lock.l_type = F_WRLCK; + lock.l_start = 0; + lock.l_whence = SEEK_SET; + lock.l_len = 0; +retry_fcntl: + if (fcntl(fd, F_SETLK, &lock) < 0) { + switch (errno) { + case EINTR: + goto retry_fcntl; + case EACCES: + case EAGAIN: + if (retries == 20) { + log_error("Cannot lock lockfile [%s], error was [%s]", + lockfile, strerror(errno)); + break; + } else { + ++ retries; + usleep(1000); + goto retry_fcntl; + } + default: + log_error("process is already running"); + } + + goto fail_close; + } + + if (ftruncate(fd, 0) < 0) { + log_error("Cannot truncate pidfile [%s], error was [%s]", + lockfile, strerror(errno)); + + goto fail_close_unlink; + } + + snprintf(buffer, sizeof(buffer), "%u\n", getpid()); + + bufferlen = strlen(buffer); + write_out = write(fd, buffer, bufferlen); + + if ((write_out < 0) || (write_out == 0 && errno)) { + log_error("Cannot write pid to pidfile [%s], error was [%s]", + lockfile, strerror(errno)); + + goto fail_close_unlink; + } + + if ((write_out == 0) || ((size_t)write_out < bufferlen)) { + log_error("Cannot write pid to pidfile [%s], shortwrite of" + "[%" PRIsize_t "] bytes, expected [%" PRIsize_t "]\n", + lockfile, write_out, bufferlen); + + goto fail_close_unlink; + } + + if ((value = fcntl(fd, F_GETFD, 0)) < 0) { + log_error("Cannot get close-on-exec flag from pidfile [%s], " + "error was [%s]", lockfile, strerror(errno)); + + goto fail_close_unlink; + } + value |= FD_CLOEXEC; + if (fcntl(fd, F_SETFD, value) < 0) { + log_error("Cannot set close-on-exec flag from pidfile [%s], " + "error was [%s]", lockfile, strerror(errno)); + + goto fail_close_unlink; + } + + return 1; + +fail_close_unlink: + if (unlink(lockfile)) + log_sys_debug("unlink", lockfile); +fail_close: + if (close(fd)) + log_sys_debug("close", lockfile); + + return 0; +} + +int dm_daemon_is_running(const char* lockfile) +{ + int fd; + struct flock lock; + + if((fd = open(lockfile, O_RDONLY)) < 0) + return 0; + + lock.l_type = F_WRLCK; + lock.l_start = 0; + lock.l_whence = SEEK_SET; + lock.l_len = 0; + if (fcntl(fd, F_GETLK, &lock) < 0) { + log_error("Cannot check lock status of lockfile [%s], error was [%s]", + lockfile, strerror(errno)); + if (close(fd)) + stack; + return 0; + } + + if (close(fd)) + stack; + + return (lock.l_type == F_UNLCK) ? 0 : 1; +} diff --git a/device_mapper/libdm-report.c b/device_mapper/libdm-report.c new file mode 100644 index 0000000..3a48c3f --- /dev/null +++ b/device_mapper/libdm-report.c @@ -0,0 +1,5104 @@ +/* + * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" + +#include <ctype.h> +#include <math.h> /* fabs() */ +#include <float.h> /* DBL_EPSILON */ +#include <time.h> + +/* + * Internal flags + */ +#define RH_SORT_REQUIRED 0x00000100 +#define RH_HEADINGS_PRINTED 0x00000200 +#define RH_FIELD_CALC_NEEDED 0x00000400 +#define RH_ALREADY_REPORTED 0x00000800 + +struct selection { + struct dm_pool *mem; + struct selection_node *selection_root; + int add_new_fields; +}; + +struct report_group_item; + +struct dm_report { + struct dm_pool *mem; + + /** + * Cache the first row allocated so that all rows and fields + * can be disposed of in a single dm_pool_free() call. + */ + struct row *first_row; + + /* To report all available types */ +#define REPORT_TYPES_ALL UINT32_MAX + uint32_t report_types; + const char *output_field_name_prefix; + const char *field_prefix; + uint32_t flags; + const char *separator; + + uint32_t keys_count; + + /* Ordered list of fields needed for this report */ + struct dm_list field_props; + + /* Rows of report data */ + struct dm_list rows; + + /* Array of field definitions */ + const struct dm_report_field_type *fields; + const char **canonical_field_ids; + const struct dm_report_object_type *types; + + /* To store caller private data */ + void *private; + + /* Selection handle */ + struct selection *selection; + + /* Null-terminated array of reserved values */ + const struct dm_report_reserved_value *reserved_values; + struct dm_hash_table *value_cache; + + struct report_group_item *group_item; +}; + +struct dm_report_group { + dm_report_group_type_t type; + struct dm_pool *mem; + struct dm_list items; + int indent; +}; + +struct report_group_item { + struct dm_list list; + struct dm_report_group *group; + struct dm_report *report; + union { + uint32_t orig_report_flags; + uint32_t finished_count; + } store; + struct report_group_item *parent; + unsigned output_done:1; + unsigned needs_closing:1; + void *data; +}; + +/* + * Internal per-field flags + */ +#define FLD_HIDDEN 0x00001000 +#define FLD_SORT_KEY 0x00002000 +#define FLD_ASCENDING 0x00004000 +#define FLD_DESCENDING 0x00008000 +#define FLD_COMPACTED 0x00010000 +#define FLD_COMPACT_ONE 0x00020000 + +struct field_properties { + struct dm_list list; + uint32_t field_num; + uint32_t sort_posn; + int32_t initial_width; + int32_t width; /* current width: adjusted by dm_report_object() */ + const struct dm_report_object_type *type; + uint32_t flags; + int implicit; +}; + +/* + * Report selection + */ +struct op_def { + const char *string; + uint32_t flags; + const char *desc; +}; + +#define FLD_CMP_MASK 0x0FF00000 +#define FLD_CMP_UNCOMPARABLE 0x00100000 +#define FLD_CMP_EQUAL 0x00200000 +#define FLD_CMP_NOT 0x00400000 +#define FLD_CMP_GT 0x00800000 +#define FLD_CMP_LT 0x01000000 +#define FLD_CMP_REGEX 0x02000000 +#define FLD_CMP_NUMBER 0x04000000 +#define FLD_CMP_TIME 0x08000000 +/* + * #define FLD_CMP_STRING 0x10000000 + * We could define FLD_CMP_STRING here for completeness here, + * but it's not needed - we can check operator compatibility with + * field type by using FLD_CMP_REGEX, FLD_CMP_NUMBER and + * FLD_CMP_TIME flags only. + */ + +/* + * When defining operators, always define longer one before + * shorter one if one is a prefix of another! + * (e.g. =~ comes before =) +*/ +static struct op_def _op_cmp[] = { + { "=~", FLD_CMP_REGEX, "Matching regular expression. [regex]" }, + { "!~", FLD_CMP_REGEX|FLD_CMP_NOT, "Not matching regular expression. [regex]" }, + { "=", FLD_CMP_EQUAL, "Equal to. [number, size, percent, string, string list, time]" }, + { "!=", FLD_CMP_NOT|FLD_CMP_EQUAL, "Not equal to. [number, size, percent, string, string_list, time]" }, + { ">=", FLD_CMP_NUMBER|FLD_CMP_TIME|FLD_CMP_GT|FLD_CMP_EQUAL, "Greater than or equal to. [number, size, percent, time]" }, + { ">", FLD_CMP_NUMBER|FLD_CMP_TIME|FLD_CMP_GT, "Greater than. [number, size, percent, time]" }, + { "<=", FLD_CMP_NUMBER|FLD_CMP_TIME|FLD_CMP_LT|FLD_CMP_EQUAL, "Less than or equal to. [number, size, percent, time]" }, + { "<", FLD_CMP_NUMBER|FLD_CMP_TIME|FLD_CMP_LT, "Less than. [number, size, percent, time]" }, + { "since", FLD_CMP_TIME|FLD_CMP_GT|FLD_CMP_EQUAL, "Since specified time (same as '>='). [time]" }, + { "after", FLD_CMP_TIME|FLD_CMP_GT, "After specified time (same as '>'). [time]"}, + { "until", FLD_CMP_TIME|FLD_CMP_LT|FLD_CMP_EQUAL, "Until specified time (same as '<='). [time]"}, + { "before", FLD_CMP_TIME|FLD_CMP_LT, "Before specified time (same as '<'). [time]"}, + { NULL, 0, NULL } +}; + +#define SEL_MASK 0x000000FF +#define SEL_ITEM 0x00000001 +#define SEL_AND 0x00000002 +#define SEL_OR 0x00000004 + +#define SEL_MODIFIER_MASK 0x00000F00 +#define SEL_MODIFIER_NOT 0x00000100 + +#define SEL_PRECEDENCE_MASK 0x0000F000 +#define SEL_PRECEDENCE_PS 0x00001000 +#define SEL_PRECEDENCE_PE 0x00002000 + +#define SEL_LIST_MASK 0x000F0000 +#define SEL_LIST_LS 0x00010000 +#define SEL_LIST_LE 0x00020000 +#define SEL_LIST_SUBSET_LS 0x00040000 +#define SEL_LIST_SUBSET_LE 0x00080000 + +static struct op_def _op_log[] = { + { "&&", SEL_AND, "All fields must match" }, + { ",", SEL_AND, "All fields must match" }, + { "||", SEL_OR, "At least one field must match" }, + { "#", SEL_OR, "At least one field must match" }, + { "!", SEL_MODIFIER_NOT, "Logical negation" }, + { "(", SEL_PRECEDENCE_PS, "Left parenthesis" }, + { ")", SEL_PRECEDENCE_PE, "Right parenthesis" }, + { "[", SEL_LIST_LS, "List start" }, + { "]", SEL_LIST_LE, "List end"}, + { "{", SEL_LIST_SUBSET_LS, "List subset start"}, + { "}", SEL_LIST_SUBSET_LE, "List subset end"}, + { NULL, 0, NULL}, +}; + +struct selection_str_list { + struct dm_str_list str_list; + unsigned type; /* either SEL_AND or SEL_OR */ +}; + +struct field_selection_value { + union { + const char *s; + uint64_t i; + time_t t; + double d; + struct dm_regex *r; + struct selection_str_list *l; + } v; + struct field_selection_value *next; +}; + +struct field_selection { + struct field_properties *fp; + uint32_t flags; + struct field_selection_value *value; +}; + +struct selection_node { + struct dm_list list; + uint32_t type; + union { + struct field_selection *item; + struct dm_list set; + } selection; +}; + +struct reserved_value_wrapper { + const char *matched_name; + const struct dm_report_reserved_value *reserved; + const void *value; +}; + +/* + * Report data field + */ +struct dm_report_field { + struct dm_list list; + struct field_properties *props; + + const char *report_string; /* Formatted ready for display */ + const void *sort_value; /* Raw value for sorting */ +}; + +struct row { + struct dm_list list; + struct dm_report *rh; + struct dm_list fields; /* Fields in display order */ + struct dm_report_field *(*sort_fields)[]; /* Fields in sort order */ + int selected; + struct dm_report_field *field_sel_status; +}; + +/* + * Implicit report types and fields. + */ +#define SPECIAL_REPORT_TYPE 0x80000000 +#define SPECIAL_FIELD_SELECTED_ID "selected" +#define SPECIAL_FIELD_HELP_ID "help" +#define SPECIAL_FIELD_HELP_ALT_ID "?" + +static void *_null_returning_fn(void *obj __attribute__((unused))) +{ + return NULL; +} + +static int _no_report_fn(struct dm_report *rh __attribute__((unused)), + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field __attribute__((unused)), + const void *data __attribute__((unused)), + void *private __attribute__((unused))) +{ + return 1; +} + +static int _selected_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, + const void *data, + void *private __attribute__((unused))) +{ + const struct row *row = (const struct row *)data; + return dm_report_field_int(rh, field, &row->selected); +} + +static const struct dm_report_object_type _implicit_special_report_types[] = { + { SPECIAL_REPORT_TYPE, "Special", "special_", _null_returning_fn }, + { 0, "", "", NULL } +}; + +static const struct dm_report_field_type _implicit_special_report_fields[] = { + { SPECIAL_REPORT_TYPE, DM_REPORT_FIELD_TYPE_NUMBER | FLD_CMP_UNCOMPARABLE , 0, 8, SPECIAL_FIELD_HELP_ID, "Help", _no_report_fn, "Show help." }, + { SPECIAL_REPORT_TYPE, DM_REPORT_FIELD_TYPE_NUMBER | FLD_CMP_UNCOMPARABLE , 0, 8, SPECIAL_FIELD_HELP_ALT_ID, "Help", _no_report_fn, "Show help." }, + { 0, 0, 0, 0, "", "", 0, 0} +}; + +static const struct dm_report_field_type _implicit_special_report_fields_with_selection[] = { + { SPECIAL_REPORT_TYPE, DM_REPORT_FIELD_TYPE_NUMBER, 0, 8, SPECIAL_FIELD_SELECTED_ID, "Selected", _selected_disp, "Set if item passes selection criteria." }, + { SPECIAL_REPORT_TYPE, DM_REPORT_FIELD_TYPE_NUMBER | FLD_CMP_UNCOMPARABLE , 0, 8, SPECIAL_FIELD_HELP_ID, "Help", _no_report_fn, "Show help." }, + { SPECIAL_REPORT_TYPE, DM_REPORT_FIELD_TYPE_NUMBER | FLD_CMP_UNCOMPARABLE , 0, 8, SPECIAL_FIELD_HELP_ALT_ID, "Help", _no_report_fn, "Show help." }, + { 0, 0, 0, 0, "", "", 0, 0} +}; + +static const struct dm_report_object_type *_implicit_report_types = _implicit_special_report_types; +static const struct dm_report_field_type *_implicit_report_fields = _implicit_special_report_fields; + +static const struct dm_report_object_type *_find_type(struct dm_report *rh, + uint32_t report_type) +{ + const struct dm_report_object_type *t; + + for (t = _implicit_report_types; t->data_fn; t++) + if (t->id == report_type) + return t; + + for (t = rh->types; t->data_fn; t++) + if (t->id == report_type) + return t; + + return NULL; +} + +/* + * Data-munging functions to prepare each data type for display and sorting + */ + +int dm_report_field_string(struct dm_report *rh, + struct dm_report_field *field, const char *const *data) +{ + char *repstr; + + if (!(repstr = dm_pool_strdup(rh->mem, *data))) { + log_error("dm_report_field_string: dm_pool_strdup failed"); + return 0; + } + + field->report_string = repstr; + field->sort_value = (const void *) field->report_string; + + return 1; +} + +int dm_report_field_percent(struct dm_report *rh, + struct dm_report_field *field, + const dm_percent_t *data) +{ + char *repstr; + uint64_t *sortval; + + if (!(sortval = dm_pool_alloc(rh->mem, sizeof(uint64_t)))) { + log_error("dm_report_field_percent: dm_pool_alloc failed for sort_value."); + return 0; + } + + *sortval = (uint64_t)(*data); + + if (*data == DM_PERCENT_INVALID) { + dm_report_field_set_value(field, "", sortval); + return 1; + } + + if (!(repstr = dm_pool_alloc(rh->mem, 8))) { + dm_pool_free(rh->mem, sortval); + log_error("dm_report_field_percent: dm_pool_alloc failed for percent report string."); + return 0; + } + + if (dm_snprintf(repstr, 7, "%.2f", dm_percent_to_round_float(*data, 2)) < 0) { + dm_pool_free(rh->mem, sortval); + log_error("dm_report_field_percent: percentage too large."); + return 0; + } + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + +struct str_list_sort_value_item { + unsigned pos; + size_t len; +}; + +struct str_list_sort_value { + const char *value; + struct str_list_sort_value_item *items; +}; + +struct str_list_sort_item { + const char *str; + struct str_list_sort_value_item item; +}; + +static int _str_list_sort_item_cmp(const void *a, const void *b) +{ + const struct str_list_sort_item *slsi_a = (const struct str_list_sort_item *) a; + const struct str_list_sort_item *slsi_b = (const struct str_list_sort_item *) b; + + return strcmp(slsi_a->str, slsi_b->str); +} + +static int _report_field_string_list(struct dm_report *rh, + struct dm_report_field *field, + const struct dm_list *data, + const char *delimiter, + int sort) +{ + static const char _string_list_grow_object_failed_msg[] = "dm_report_field_string_list: dm_pool_grow_object_failed"; + struct str_list_sort_value *sort_value = NULL; + unsigned int list_size, pos, i; + struct str_list_sort_item *arr = NULL; + struct dm_str_list *sl; + size_t delimiter_len, len; + void *object; + int r = 0; + + if (!(sort_value = dm_pool_zalloc(rh->mem, sizeof(struct str_list_sort_value)))) { + log_error("dm_report_field_string_list: dm_pool_zalloc failed for sort_value"); + return 0; + } + + list_size = dm_list_size(data); + + /* + * Sort value stores the pointer to the report_string and then + * position and length for each list element withing the report_string. + * The first element stores number of elements in 'len' (therefore + * list_size + 1 is used below for the extra element). + * For example, with this input: + * sort = 0; (we don't want to report sorted) + * report_string = "abc,xy,defgh"; (this is reported) + * + * ...we end up with: + * sort_value->value = report_string; (we'll use the original report_string for indices) + * sort_value->items[0] = {0,3}; (we have 3 items) + * sort_value->items[1] = {0,3}; ("abc") + * sort_value->items[2] = {7,5}; ("defgh") + * sort_value->items[3] = {4,2}; ("xy") + * + * The items alone are always sorted while in report_string they can be + * sorted or not (based on "sort" arg) - it depends on how we prefer to + * display the list. Having items sorted internally helps with searching + * through them. + */ + if (!(sort_value->items = dm_pool_zalloc(rh->mem, (list_size + 1) * sizeof(struct str_list_sort_value_item)))) { + log_error("dm_report_fiel_string_list: dm_pool_zalloc failed for sort value items"); + goto out; + } + sort_value->items[0].len = list_size; + + /* zero items */ + if (!list_size) { + sort_value->value = field->report_string = ""; + field->sort_value = sort_value; + return 1; + } + + /* one item */ + if (list_size == 1) { + sl = (struct dm_str_list *) dm_list_first(data); + if (!sl || + !(sort_value->value = field->report_string = dm_pool_strdup(rh->mem, sl->str))) { + log_error("dm_report_field_string_list: dm_pool_strdup failed"); + goto out; + } + sort_value->items[1].pos = 0; + sort_value->items[1].len = strlen(sl->str); + field->sort_value = sort_value; + return 1; + } + + /* more than one item - sort the list */ + if (!(arr = dm_malloc(sizeof(struct str_list_sort_item) * list_size))) { + log_error("dm_report_field_string_list: dm_malloc failed"); + goto out; + } + + if (!(dm_pool_begin_object(rh->mem, 256))) { + log_error(_string_list_grow_object_failed_msg); + goto out; + } + + if (!delimiter) + delimiter = ","; + delimiter_len = strlen(delimiter); + + i = pos = len = 0; + dm_list_iterate_items(sl, data) { + arr[i].str = sl->str; + if (!sort) { + /* sorted outpud not required - report the list as it is */ + len = strlen(sl->str); + if (!dm_pool_grow_object(rh->mem, arr[i].str, len) || + (i+1 != list_size && !dm_pool_grow_object(rh->mem, delimiter, delimiter_len))) { + log_error(_string_list_grow_object_failed_msg); + goto out; + } + arr[i].item.pos = pos; + arr[i].item.len = len; + pos = i+1 == list_size ? pos+len : pos+len+delimiter_len; + } + i++; + } + + qsort(arr, i, sizeof(struct str_list_sort_item), _str_list_sort_item_cmp); + + for (i = 0, pos = 0; i < list_size; i++) { + if (sort) { + /* sorted output required - report the list as sorted */ + len = strlen(arr[i].str); + if (!dm_pool_grow_object(rh->mem, arr[i].str, len) || + (i+1 != list_size && !dm_pool_grow_object(rh->mem, delimiter, delimiter_len))) { + log_error(_string_list_grow_object_failed_msg); + goto out; + } + /* + * Save position and length of the string + * element in report_string for sort_value. + * Use i+1 here since items[0] stores list size!!! + */ + sort_value->items[i+1].pos = pos; + sort_value->items[i+1].len = len; + pos = i+1 == list_size ? pos+len : pos+len+delimiter_len; + } else { + sort_value->items[i+1].pos = arr[i].item.pos; + sort_value->items[i+1].len = arr[i].item.len; + } + } + + if (!dm_pool_grow_object(rh->mem, "\0", 1)) { + log_error(_string_list_grow_object_failed_msg); + goto out; + } + + object = dm_pool_end_object(rh->mem); + sort_value->value = object; + field->sort_value = sort_value; + field->report_string = object; + r = 1; +out: + if (!r && sort_value) + dm_pool_free(rh->mem, sort_value); + dm_free(arr); + + return r; +} + +int dm_report_field_string_list(struct dm_report *rh, + struct dm_report_field *field, + const struct dm_list *data, + const char *delimiter) +{ + return _report_field_string_list(rh, field, data, delimiter, 1); +} + +int dm_report_field_string_list_unsorted(struct dm_report *rh, + struct dm_report_field *field, + const struct dm_list *data, + const char *delimiter) +{ + /* + * The raw value is always sorted, just the string reported is unsorted. + * Having the raw value always sorted helps when matching selection list + * with selection criteria. + */ + return _report_field_string_list(rh, field, data, delimiter, 0); +} + +int dm_report_field_int(struct dm_report *rh, + struct dm_report_field *field, const int *data) +{ + const int value = *data; + uint64_t *sortval; + char *repstr; + + if (!(repstr = dm_pool_zalloc(rh->mem, 13))) { + log_error("dm_report_field_int: dm_pool_alloc failed"); + return 0; + } + + if (!(sortval = dm_pool_alloc(rh->mem, sizeof(int64_t)))) { + log_error("dm_report_field_int: dm_pool_alloc failed"); + return 0; + } + + if (dm_snprintf(repstr, 12, "%d", value) < 0) { + log_error("dm_report_field_int: int too big: %d", value); + return 0; + } + + *sortval = (uint64_t) value; + field->sort_value = sortval; + field->report_string = repstr; + + return 1; +} + +int dm_report_field_uint32(struct dm_report *rh, + struct dm_report_field *field, const uint32_t *data) +{ + const uint32_t value = *data; + uint64_t *sortval; + char *repstr; + + if (!(repstr = dm_pool_zalloc(rh->mem, 12))) { + log_error("dm_report_field_uint32: dm_pool_alloc failed"); + return 0; + } + + if (!(sortval = dm_pool_alloc(rh->mem, sizeof(uint64_t)))) { + log_error("dm_report_field_uint32: dm_pool_alloc failed"); + return 0; + } + + if (dm_snprintf(repstr, 11, "%u", value) < 0) { + log_error("dm_report_field_uint32: uint32 too big: %u", value); + return 0; + } + + *sortval = (uint64_t) value; + field->sort_value = sortval; + field->report_string = repstr; + + return 1; +} + +int dm_report_field_int32(struct dm_report *rh, + struct dm_report_field *field, const int32_t *data) +{ + const int32_t value = *data; + uint64_t *sortval; + char *repstr; + + if (!(repstr = dm_pool_zalloc(rh->mem, 13))) { + log_error("dm_report_field_int32: dm_pool_alloc failed"); + return 0; + } + + if (!(sortval = dm_pool_alloc(rh->mem, sizeof(int64_t)))) { + log_error("dm_report_field_int32: dm_pool_alloc failed"); + return 0; + } + + if (dm_snprintf(repstr, 12, "%d", value) < 0) { + log_error("dm_report_field_int32: int32 too big: %d", value); + return 0; + } + + *sortval = (uint64_t) value; + field->sort_value = sortval; + field->report_string = repstr; + + return 1; +} + +int dm_report_field_uint64(struct dm_report *rh, + struct dm_report_field *field, const uint64_t *data) +{ + const uint64_t value = *data; + uint64_t *sortval; + char *repstr; + + if (!(repstr = dm_pool_zalloc(rh->mem, 22))) { + log_error("dm_report_field_uint64: dm_pool_alloc failed"); + return 0; + } + + if (!(sortval = dm_pool_alloc(rh->mem, sizeof(uint64_t)))) { + log_error("dm_report_field_uint64: dm_pool_alloc failed"); + return 0; + } + + if (dm_snprintf(repstr, 21, FMTu64 , value) < 0) { + log_error("dm_report_field_uint64: uint64 too big: %" PRIu64, value); + return 0; + } + + *sortval = value; + field->sort_value = sortval; + field->report_string = repstr; + + return 1; +} + +/* + * Helper functions for custom report functions + */ +void dm_report_field_set_value(struct dm_report_field *field, const void *value, const void *sortvalue) +{ + field->report_string = (const char *) value; + field->sort_value = sortvalue ? : value; + + if ((field->sort_value == value) && + (field->props->flags & DM_REPORT_FIELD_TYPE_NUMBER)) + log_warn(INTERNAL_ERROR "Using string as sort value for numerical field."); +} + +static const char *_get_field_type_name(unsigned field_type) +{ + switch (field_type) { + case DM_REPORT_FIELD_TYPE_STRING: return "string"; + case DM_REPORT_FIELD_TYPE_NUMBER: return "number"; + case DM_REPORT_FIELD_TYPE_SIZE: return "size"; + case DM_REPORT_FIELD_TYPE_PERCENT: return "percent"; + case DM_REPORT_FIELD_TYPE_TIME: return "time"; + case DM_REPORT_FIELD_TYPE_STRING_LIST: return "string list"; + default: return "unknown"; + } +} + +/* + * show help message + */ +static size_t _get_longest_field_id_len(const struct dm_report_field_type *fields) +{ + uint32_t f; + size_t id_len = 0; + + for (f = 0; fields[f].report_fn; f++) + if (strlen(fields[f].id) > id_len) + id_len = strlen(fields[f].id); + + return id_len; +} + +static void _display_fields_more(struct dm_report *rh, + const struct dm_report_field_type *fields, + size_t id_len, int display_all_fields_item, + int display_field_types) +{ + uint32_t f; + const struct dm_report_object_type *type; + const char *desc, *last_desc = ""; + + for (f = 0; fields[f].report_fn; f++) + if (strlen(fields[f].id) > id_len) + id_len = strlen(fields[f].id); + + for (type = rh->types; type->data_fn; type++) + if (strlen(type->prefix) + 3 > id_len) + id_len = strlen(type->prefix) + 3; + + for (f = 0; fields[f].report_fn; f++) { + if ((type = _find_type(rh, fields[f].type)) && type->desc) + desc = type->desc; + else + desc = " "; + if (desc != last_desc) { + if (*last_desc) + log_warn(" "); + log_warn("%s Fields", desc); + log_warn("%*.*s", (int) strlen(desc) + 7, + (int) strlen(desc) + 7, + "-------------------------------------------------------------------------------"); + if (display_all_fields_item && type->id != SPECIAL_REPORT_TYPE) + log_warn(" %sall%-*s - %s", type->prefix, + (int) (id_len - 3 - strlen(type->prefix)), "", + "All fields in this section."); + } + /* FIXME Add line-wrapping at terminal width (or 80 cols) */ + log_warn(" %-*s - %s%s%s%s%s", (int) id_len, fields[f].id, fields[f].desc, + display_field_types ? " [" : "", + display_field_types ? fields[f].flags & FLD_CMP_UNCOMPARABLE ? "unselectable " : "" : "", + display_field_types ? _get_field_type_name(fields[f].flags & DM_REPORT_FIELD_TYPE_MASK) : "", + display_field_types ? "]" : ""); + last_desc = desc; + } +} + +/* + * show help message + */ +static void _display_fields(struct dm_report *rh, int display_all_fields_item, + int display_field_types) +{ + size_t tmp, id_len = 0; + + if ((tmp = _get_longest_field_id_len(_implicit_report_fields)) > id_len) + id_len = tmp; + if ((tmp = _get_longest_field_id_len(rh->fields)) > id_len) + id_len = tmp; + + _display_fields_more(rh, rh->fields, id_len, display_all_fields_item, + display_field_types); + log_warn(" "); + _display_fields_more(rh, _implicit_report_fields, id_len, + display_all_fields_item, display_field_types); + +} + +/* + * Initialise report handle + */ +static int _copy_field(struct dm_report *rh, struct field_properties *dest, + uint32_t field_num, int implicit) +{ + const struct dm_report_field_type *fields = implicit ? _implicit_report_fields + : rh->fields; + + dest->field_num = field_num; + dest->initial_width = fields[field_num].width; + dest->width = fields[field_num].width; /* adjusted in _do_report_object() */ + dest->flags = fields[field_num].flags & DM_REPORT_FIELD_MASK; + dest->implicit = implicit; + + /* set object type method */ + dest->type = _find_type(rh, fields[field_num].type); + if (!dest->type) { + log_error("dm_report: field not match: %s", + fields[field_num].id); + return 0; + } + + return 1; +} + +static struct field_properties * _add_field(struct dm_report *rh, + uint32_t field_num, int implicit, + uint32_t flags) +{ + struct field_properties *fp; + + if (!(fp = dm_pool_zalloc(rh->mem, sizeof(*fp)))) { + log_error("dm_report: struct field_properties allocation " + "failed"); + return NULL; + } + + if (!_copy_field(rh, fp, field_num, implicit)) { + stack; + dm_pool_free(rh->mem, fp); + return NULL; + } + + fp->flags |= flags; + + /* + * Place hidden fields at the front so dm_list_end() will + * tell us when we've reached the last visible field. + */ + if (fp->flags & FLD_HIDDEN) + dm_list_add_h(&rh->field_props, &fp->list); + else + dm_list_add(&rh->field_props, &fp->list); + + return fp; +} + +static int _get_canonical_field_name(const char *field, + size_t flen, + char *canonical_field, + size_t fcanonical_len, + int *differs) +{ + size_t i; + int diff = 0; + + for (i = 0; *field && flen; field++, flen--) { + if (*field == '_') { + diff = 1; + continue; + } + if ((i + 1) >= fcanonical_len) { + canonical_field[0] = '\0'; + log_error("%s: field name too long.", field); + return 0; + } + canonical_field[i++] = *field; + } + + canonical_field[i] = '\0'; + if (differs) + *differs = diff; + return 1; +} + +/* + * Compare canonical_name1 against canonical_name2 or prefix + * plus canonical_name2. Canonical name is a name where all + * superfluous characters are removed (underscores for now). + * Both names are always null-terminated. + */ +static int _is_same_field(const char *canonical_name1, const char *canonical_name2, + const char *prefix) +{ + size_t prefix_len; + + /* Exact match? */ + if (!strcasecmp(canonical_name1, canonical_name2)) + return 1; + + /* Match including prefix? */ + prefix_len = strlen(prefix) - 1; + if (!strncasecmp(prefix, canonical_name1, prefix_len) && + !strcasecmp(canonical_name1 + prefix_len, canonical_name2)) + return 1; + + return 0; +} + +/* + * Check for a report type prefix + "all" match. + */ +static void _all_match_combine(const struct dm_report_object_type *types, + unsigned unprefixed_all_matched, + const char *field, size_t flen, + uint32_t *report_types) +{ + char field_canon[DM_REPORT_FIELD_TYPE_ID_LEN]; + const struct dm_report_object_type *t; + size_t prefix_len; + + if (!_get_canonical_field_name(field, flen, field_canon, sizeof(field_canon), NULL)) + return; + flen = strlen(field_canon); + + for (t = types; t->data_fn; t++) { + prefix_len = strlen(t->prefix) - 1; + + if (!strncasecmp(t->prefix, field_canon, prefix_len) && + ((unprefixed_all_matched && (flen == prefix_len)) || + (!strncasecmp(field_canon + prefix_len, "all", 3) && + (flen == prefix_len + 3)))) + *report_types |= t->id; + } +} + +static uint32_t _all_match(struct dm_report *rh, const char *field, size_t flen) +{ + uint32_t report_types = 0; + unsigned unprefixed_all_matched = 0; + + if (!strncasecmp(field, "all", 3) && flen == 3) { + /* If there's no report prefix, match all report types */ + if (!(flen = strlen(rh->field_prefix))) + return rh->report_types ? : REPORT_TYPES_ALL; + + /* otherwise include all fields beginning with the report prefix. */ + unprefixed_all_matched = 1; + field = rh->field_prefix; + report_types = rh->report_types; + } + + /* Combine all report types that have a matching prefix. */ + _all_match_combine(rh->types, unprefixed_all_matched, field, flen, &report_types); + + return report_types; +} + +/* + * Add all fields with a matching type. + */ +static int _add_all_fields(struct dm_report *rh, uint32_t type) +{ + uint32_t f; + + for (f = 0; rh->fields[f].report_fn; f++) + if ((rh->fields[f].type & type) && !_add_field(rh, f, 0, 0)) + return 0; + + return 1; +} + +static int _get_field(struct dm_report *rh, const char *field, size_t flen, + uint32_t *f_ret, int *implicit) +{ + char field_canon[DM_REPORT_FIELD_TYPE_ID_LEN]; + uint32_t f; + + if (!flen) + return 0; + + if (!_get_canonical_field_name(field, flen, field_canon, sizeof(field_canon), NULL)) + return_0; + + for (f = 0; _implicit_report_fields[f].report_fn; f++) { + if (_is_same_field(_implicit_report_fields[f].id, field_canon, rh->field_prefix)) { + *f_ret = f; + *implicit = 1; + return 1; + } + } + + for (f = 0; rh->fields[f].report_fn; f++) { + if (_is_same_field(rh->canonical_field_ids[f], field_canon, rh->field_prefix)) { + *f_ret = f; + *implicit = 0; + return 1; + } + } + + return 0; +} + +static int _field_match(struct dm_report *rh, const char *field, size_t flen, + unsigned report_type_only) +{ + uint32_t f, type; + int implicit; + + if (!flen) + return 0; + + if ((_get_field(rh, field, flen, &f, &implicit))) { + if (report_type_only) { + rh->report_types |= implicit ? _implicit_report_fields[f].type + : rh->fields[f].type; + return 1; + } + + return _add_field(rh, f, implicit, 0) ? 1 : 0; + } + + if ((type = _all_match(rh, field, flen))) { + if (report_type_only) { + rh->report_types |= type; + return 1; + } + + return _add_all_fields(rh, type); + } + + return 0; +} + +static int _add_sort_key(struct dm_report *rh, uint32_t field_num, int implicit, + uint32_t flags, unsigned report_type_only) +{ + struct field_properties *fp, *found = NULL; + const struct dm_report_field_type *fields = implicit ? _implicit_report_fields + : rh->fields; + + dm_list_iterate_items(fp, &rh->field_props) { + if ((fp->implicit == implicit) && (fp->field_num == field_num)) { + found = fp; + break; + } + } + + if (!found) { + if (report_type_only) + rh->report_types |= fields[field_num].type; + else if (!(found = _add_field(rh, field_num, implicit, FLD_HIDDEN))) + return_0; + } + + if (report_type_only) + return 1; + + if (found->flags & FLD_SORT_KEY) { + log_warn("dm_report: Ignoring duplicate sort field: %s.", + fields[field_num].id); + return 1; + } + + found->flags |= FLD_SORT_KEY; + found->sort_posn = rh->keys_count++; + found->flags |= flags; + + return 1; +} + +static int _key_match(struct dm_report *rh, const char *key, size_t len, + unsigned report_type_only) +{ + char key_canon[DM_REPORT_FIELD_TYPE_ID_LEN]; + uint32_t f; + uint32_t flags; + + if (!len) + return 0; + + if (*key == '+') { + key++; + len--; + flags = FLD_ASCENDING; + } else if (*key == '-') { + key++; + len--; + flags = FLD_DESCENDING; + } else + flags = FLD_ASCENDING; + + if (!len) { + log_error("dm_report: Missing sort field name"); + return 0; + } + + if (!_get_canonical_field_name(key, len, key_canon, sizeof(key_canon), NULL)) + return_0; + + for (f = 0; _implicit_report_fields[f].report_fn; f++) + if (_is_same_field(_implicit_report_fields[f].id, key_canon, rh->field_prefix)) + return _add_sort_key(rh, f, 1, flags, report_type_only); + + for (f = 0; rh->fields[f].report_fn; f++) + if (_is_same_field(rh->canonical_field_ids[f], key_canon, rh->field_prefix)) + return _add_sort_key(rh, f, 0, flags, report_type_only); + + return 0; +} + +static int _parse_fields(struct dm_report *rh, const char *format, + unsigned report_type_only) +{ + const char *ws; /* Word start */ + const char *we = format; /* Word end */ + + while (*we) { + /* Allow consecutive commas */ + while (*we && *we == ',') + we++; + + /* start of the field name */ + ws = we; + while (*we && *we != ',') + we++; + + if (!_field_match(rh, ws, (size_t) (we - ws), report_type_only)) { + _display_fields(rh, 1, 0); + log_warn(" "); + log_error("Unrecognised field: %.*s", (int) (we - ws), ws); + return 0; + } + } + + return 1; +} + +static int _parse_keys(struct dm_report *rh, const char *keys, + unsigned report_type_only) +{ + const char *ws; /* Word start */ + const char *we = keys; /* Word end */ + + if (!keys) + return 1; + + while (*we) { + /* Allow consecutive commas */ + while (*we && *we == ',') + we++; + ws = we; + while (*we && *we != ',') + we++; + if (!_key_match(rh, ws, (size_t) (we - ws), report_type_only)) { + _display_fields(rh, 1, 0); + log_warn(" "); + log_error("dm_report: Unrecognised field: %.*s", (int) (we - ws), ws); + return 0; + } + } + + return 1; +} + +static int _contains_reserved_report_type(const struct dm_report_object_type *types) +{ + const struct dm_report_object_type *type, *implicit_type; + + for (implicit_type = _implicit_report_types; implicit_type->data_fn; implicit_type++) { + for (type = types; type->data_fn; type++) { + if (implicit_type->id & type->id) { + log_error(INTERNAL_ERROR "dm_report_init: definition of report " + "types given contains reserved identifier"); + return 1; + } + } + } + + return 0; +} + +static void _dm_report_init_update_types(struct dm_report *rh, uint32_t *report_types) +{ + const struct dm_report_object_type *type; + + if (!report_types) + return; + + *report_types = rh->report_types; + /* + * Do not include implicit types as these are not understood by + * dm_report_init caller - the caller doesn't know how to check + * these types anyway. + */ + for (type = _implicit_report_types; type->data_fn; type++) + *report_types &= ~type->id; +} + +static int _help_requested(struct dm_report *rh) +{ + struct field_properties *fp; + + dm_list_iterate_items(fp, &rh->field_props) { + if (fp->implicit && + (!strcmp(_implicit_report_fields[fp->field_num].id, SPECIAL_FIELD_HELP_ID) || + !strcmp(_implicit_report_fields[fp->field_num].id, SPECIAL_FIELD_HELP_ALT_ID))) + return 1; + } + + return 0; +} + +static int _canonicalize_field_ids(struct dm_report *rh) +{ + size_t registered_field_count = 0, i; + char canonical_field[DM_REPORT_FIELD_TYPE_ID_LEN]; + char *canonical_field_dup; + int differs; + + while (*rh->fields[registered_field_count].id) + registered_field_count++; + + if (!(rh->canonical_field_ids = dm_pool_alloc(rh->mem, registered_field_count * sizeof(const char *)))) { + log_error("_canonicalize_field_ids: dm_pool_alloc failed"); + return 0; + } + + for (i = 0; i < registered_field_count; i++) { + if (!_get_canonical_field_name(rh->fields[i].id, strlen(rh->fields[i].id), + canonical_field, sizeof(canonical_field), &differs)) + return_0; + + if (differs) { + if (!(canonical_field_dup = dm_pool_strdup(rh->mem, canonical_field))) { + log_error("_canonicalize_field_dup: dm_pool_alloc failed."); + return 0; + } + rh->canonical_field_ids[i] = canonical_field_dup; + } else + rh->canonical_field_ids[i] = rh->fields[i].id; + } + + return 1; +} + +struct dm_report *dm_report_init(uint32_t *report_types, + const struct dm_report_object_type *types, + const struct dm_report_field_type *fields, + const char *output_fields, + const char *output_separator, + uint32_t output_flags, + const char *sort_keys, + void *private_data) +{ + struct dm_report *rh; + const struct dm_report_object_type *type; + + if (_contains_reserved_report_type(types)) + return_NULL; + + if (!(rh = dm_zalloc(sizeof(*rh)))) { + log_error("dm_report_init: dm_malloc failed"); + return NULL; + } + + /* + * rh->report_types is updated in _parse_fields() and _parse_keys() + * to contain all types corresponding to the fields specified by + * fields or keys. + */ + if (report_types) + rh->report_types = *report_types; + + rh->separator = output_separator; + rh->fields = fields; + rh->types = types; + rh->private = private_data; + + rh->flags |= output_flags & DM_REPORT_OUTPUT_MASK; + + /* With columns_as_rows we must buffer and not align. */ + if (output_flags & DM_REPORT_OUTPUT_COLUMNS_AS_ROWS) { + if (!(output_flags & DM_REPORT_OUTPUT_BUFFERED)) + rh->flags |= DM_REPORT_OUTPUT_BUFFERED; + if (output_flags & DM_REPORT_OUTPUT_ALIGNED) + rh->flags &= ~DM_REPORT_OUTPUT_ALIGNED; + } + + if (output_flags & DM_REPORT_OUTPUT_BUFFERED) + rh->flags |= RH_SORT_REQUIRED; + + rh->flags |= RH_FIELD_CALC_NEEDED; + + dm_list_init(&rh->field_props); + dm_list_init(&rh->rows); + + if ((type = _find_type(rh, rh->report_types)) && type->prefix) + rh->field_prefix = type->prefix; + else + rh->field_prefix = ""; + + if (!(rh->mem = dm_pool_create("report", 10 * 1024))) { + log_error("dm_report_init: allocation of memory pool failed"); + dm_free(rh); + return NULL; + } + + if (!_canonicalize_field_ids(rh)) { + dm_report_free(rh); + return NULL; + } + + /* + * To keep the code needed to add the "all" field to a minimum, we parse + * the field lists twice. The first time we only update the report type. + * FIXME Use one pass instead and expand the "all" field afterwards. + */ + if (!_parse_fields(rh, output_fields, 1) || + !_parse_keys(rh, sort_keys, 1)) { + dm_report_free(rh); + return NULL; + } + + /* Generate list of fields for output based on format string & flags */ + if (!_parse_fields(rh, output_fields, 0) || + !_parse_keys(rh, sort_keys, 0)) { + dm_report_free(rh); + return NULL; + } + + /* + * Return updated types value for further compatility check by caller. + */ + _dm_report_init_update_types(rh, report_types); + + if (_help_requested(rh)) { + _display_fields(rh, 1, 0); + log_warn(" "); + rh->flags |= RH_ALREADY_REPORTED; + } + + return rh; +} + +void dm_report_free(struct dm_report *rh) +{ + if (rh->selection) + dm_pool_destroy(rh->selection->mem); + if (rh->value_cache) + dm_hash_destroy(rh->value_cache); + dm_pool_destroy(rh->mem); + dm_free(rh); +} + +static char *_toupperstr(char *str) +{ + char *u = str; + + do + *u = toupper(*u); + while (*u++); + + return str; +} + +int dm_report_set_output_field_name_prefix(struct dm_report *rh, const char *output_field_name_prefix) +{ + char *prefix; + + if (!(prefix = dm_pool_strdup(rh->mem, output_field_name_prefix))) { + log_error("dm_report_set_output_field_name_prefix: dm_pool_strdup failed"); + return 0; + } + + rh->output_field_name_prefix = _toupperstr(prefix); + + return 1; +} + +/* + * Create a row of data for an object + */ +static void *_report_get_field_data(struct dm_report *rh, + struct field_properties *fp, void *object) +{ + const struct dm_report_field_type *fields = fp->implicit ? _implicit_report_fields + : rh->fields; + + char *ret = fp->type->data_fn(object); + + if (!ret) + return NULL; + + return (void *)(ret + fields[fp->field_num].offset); +} + +static void *_report_get_implicit_field_data(struct dm_report *rh __attribute__((unused)), + struct field_properties *fp, struct row *row) +{ + if (!strcmp(_implicit_report_fields[fp->field_num].id, SPECIAL_FIELD_SELECTED_ID)) + return row; + + return NULL; +} + +static int _dbl_equal(double d1, double d2) +{ + return fabs(d1 - d2) < DBL_EPSILON; +} + +static int _dbl_greater(double d1, double d2) +{ + return (d1 > d2) && !_dbl_equal(d1, d2); +} + +static int _dbl_less(double d1, double d2) +{ + return (d1 < d2) && !_dbl_equal(d1, d2); +} + +static int _dbl_greater_or_equal(double d1, double d2) +{ + return _dbl_greater(d1, d2) || _dbl_equal(d1, d2); +} + +static int _dbl_less_or_equal(double d1, double d2) +{ + return _dbl_less(d1, d2) || _dbl_equal(d1, d2); +} + +#define _uint64 *(const uint64_t *) +#define _uint64arr(var,index) ((const uint64_t *)(var))[(index)] +#define _str (const char *) +#define _dbl *(const double *) +#define _dblarr(var,index) ((const double *)(var))[(index)] + +static int _do_check_value_is_strictly_reserved(unsigned type, const void *res_val, int res_range, + const void *val, struct field_selection *fs) +{ + int sel_range = fs ? fs->value->next != NULL : 0; + + switch (type & DM_REPORT_FIELD_TYPE_MASK) { + case DM_REPORT_FIELD_TYPE_NUMBER: + if (res_range && sel_range) { + /* both reserved value and selection value are ranges */ + if (((_uint64 val >= _uint64arr(res_val,0)) && (_uint64 val <= _uint64arr(res_val,1))) || + (fs && ((fs->value->v.i == _uint64arr(res_val,0)) && (fs->value->next->v.i == _uint64arr(res_val,1))))) + return 1; + } else if (res_range) { + /* only reserved value is a range */ + if (((_uint64 val >= _uint64arr(res_val,0)) && (_uint64 val <= _uint64arr(res_val,1))) || + (fs && ((fs->value->v.i >= _uint64arr(res_val,0)) && (fs->value->v.i <= _uint64arr(res_val,1))))) + return 1; + } else if (sel_range) { + /* only selection value is a range */ + if (((_uint64 val >= _uint64 res_val) && (_uint64 val <= _uint64 res_val)) || + (fs && ((fs->value->v.i >= _uint64 res_val) && (fs->value->next->v.i <= _uint64 res_val)))) + return 1; + } else { + /* neither selection value nor reserved value is a range */ + if ((_uint64 val == _uint64 res_val) || + (fs && (fs->value->v.i == _uint64 res_val))) + return 1; + } + break; + + case DM_REPORT_FIELD_TYPE_STRING: + /* there are no ranges for string type yet */ + if ((!strcmp(_str val, _str res_val)) || + (fs && (!strcmp(fs->value->v.s, _str res_val)))) + return 1; + break; + + case DM_REPORT_FIELD_TYPE_SIZE: + if (res_range && sel_range) { + /* both reserved value and selection value are ranges */ + if ((_dbl_greater_or_equal(_dbl val, _dblarr(res_val,0)) && _dbl_less_or_equal(_dbl val, _dblarr(res_val,1))) || + (fs && (_dbl_equal(fs->value->v.d, _dblarr(res_val,0)) && (_dbl_equal(fs->value->next->v.d, _dblarr(res_val,1)))))) + return 1; + } else if (res_range) { + /* only reserved value is a range */ + if ((_dbl_greater_or_equal(_dbl val, _dblarr(res_val,0)) && _dbl_less_or_equal(_dbl val, _dblarr(res_val,1))) || + (fs && (_dbl_greater_or_equal(fs->value->v.d, _dblarr(res_val,0)) && _dbl_less_or_equal(fs->value->v.d, _dblarr(res_val,1))))) + return 1; + } else if (sel_range) { + /* only selection value is a range */ + if ((_dbl_greater_or_equal(_dbl val, _dbl res_val) && (_dbl_less_or_equal(_dbl val, _dbl res_val))) || + (fs && (_dbl_greater_or_equal(fs->value->v.d, _dbl res_val) && _dbl_less_or_equal(fs->value->next->v.d, _dbl res_val)))) + return 1; + } else { + /* neither selection value nor reserved value is a range */ + if ((_dbl_equal(_dbl val, _dbl res_val)) || + (fs && (_dbl_equal(fs->value->v.d, _dbl res_val)))) + return 1; + } + break; + + case DM_REPORT_FIELD_TYPE_STRING_LIST: + /* FIXME Add comparison for string list */ + break; + case DM_REPORT_FIELD_TYPE_TIME: + /* FIXME Add comparison for time */ + break; + } + + return 0; +} + +/* + * Used to check whether a value of certain type used in selection is reserved. + */ +static int _check_value_is_strictly_reserved(struct dm_report *rh, uint32_t field_num, unsigned type, + const void *val, struct field_selection *fs) +{ + const struct dm_report_reserved_value *iter = rh->reserved_values; + const struct dm_report_field_reserved_value *frv; + int res_range; + + if (!iter) + return 0; + + while (iter->value) { + /* Only check strict reserved values, not the weaker form ("named" reserved value). */ + if (!(iter->type & DM_REPORT_FIELD_RESERVED_VALUE_NAMED)) { + res_range = iter->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE; + if ((iter->type & DM_REPORT_FIELD_TYPE_MASK) == DM_REPORT_FIELD_TYPE_NONE) { + frv = (const struct dm_report_field_reserved_value *) iter->value; + if (frv->field_num == field_num && _do_check_value_is_strictly_reserved(type, frv->value, res_range, val, fs)) + return 1; + } else if (iter->type & type && _do_check_value_is_strictly_reserved(type, iter->value, res_range, val, fs)) + return 1; + } + iter++; + } + + return 0; +} + +static int _cmp_field_int(struct dm_report *rh, uint32_t field_num, const char *field_id, + uint64_t val, struct field_selection *fs) +{ + int range = fs->value->next != NULL; + const uint64_t sel1 = fs->value->v.i; + const uint64_t sel2 = range ? fs->value->next->v.i : 0; + + switch(fs->flags & FLD_CMP_MASK) { + case FLD_CMP_EQUAL: + return range ? ((val >= sel1) && (val <= sel2)) : val == sel1; + + case FLD_CMP_NOT|FLD_CMP_EQUAL: + return range ? !((val >= sel1) && (val <= sel2)) : val != sel1; + + case FLD_CMP_NUMBER|FLD_CMP_GT: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_NUMBER, &val, fs)) + return 0; + return range ? val > sel2 : val > sel1; + + case FLD_CMP_NUMBER|FLD_CMP_GT|FLD_CMP_EQUAL: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_NUMBER, &val, fs)) + return 0; + return val >= sel1; + + case FLD_CMP_NUMBER|FLD_CMP_LT: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_NUMBER, &val, fs)) + return 0; + return val < sel1; + + case FLD_CMP_NUMBER|FLD_CMP_LT|FLD_CMP_EQUAL: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_NUMBER, &val, fs)) + return 0; + return range ? val <= sel2 : val <= sel1; + + default: + log_error(INTERNAL_ERROR "_cmp_field_int: unsupported number " + "comparison type for field %s", field_id); + } + + return 0; +} + +static int _cmp_field_double(struct dm_report *rh, uint32_t field_num, const char *field_id, + double val, struct field_selection *fs) +{ + int range = fs->value->next != NULL; + double sel1 = fs->value->v.d; + double sel2 = range ? fs->value->next->v.d : 0; + + switch(fs->flags & FLD_CMP_MASK) { + case FLD_CMP_EQUAL: + return range ? (_dbl_greater_or_equal(val, sel1) && _dbl_less_or_equal(val, sel2)) + : _dbl_equal(val, sel1); + + case FLD_CMP_NOT|FLD_CMP_EQUAL: + return range ? !(_dbl_greater_or_equal(val, sel1) && _dbl_less_or_equal(val, sel2)) + : !_dbl_equal(val, sel1); + + case FLD_CMP_NUMBER|FLD_CMP_GT: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_SIZE, &val, fs)) + return 0; + return range ? _dbl_greater(val, sel2) + : _dbl_greater(val, sel1); + + case FLD_CMP_NUMBER|FLD_CMP_GT|FLD_CMP_EQUAL: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_SIZE, &val, fs)) + return 0; + return _dbl_greater_or_equal(val, sel1); + + case FLD_CMP_NUMBER|FLD_CMP_LT: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_SIZE, &val, fs)) + return 0; + return _dbl_less(val, sel1); + + case FLD_CMP_NUMBER|FLD_CMP_LT|FLD_CMP_EQUAL: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_SIZE, &val, fs)) + return 0; + return range ? _dbl_less_or_equal(val, sel2) : _dbl_less_or_equal(val, sel1); + + default: + log_error(INTERNAL_ERROR "_cmp_field_double: unsupported number " + "comparison type for selection field %s", field_id); + } + + return 0; +} + +static int _cmp_field_string(struct dm_report *rh __attribute__((unused)), + uint32_t field_num, const char *field_id, + const char *val, struct field_selection *fs) +{ + const char *sel = fs->value->v.s; + + switch (fs->flags & FLD_CMP_MASK) { + case FLD_CMP_EQUAL: + return !strcmp(val, sel); + case FLD_CMP_NOT|FLD_CMP_EQUAL: + return strcmp(val, sel); + default: + log_error(INTERNAL_ERROR "_cmp_field_string: unsupported string " + "comparison type for selection field %s", field_id); + } + + return 0; +} + +static int _cmp_field_time(struct dm_report *rh, + uint32_t field_num, const char *field_id, + time_t val, struct field_selection *fs) +{ + int range = fs->value->next != NULL; + time_t sel1 = fs->value->v.t; + time_t sel2 = range ? fs->value->next->v.t : 0; + + switch(fs->flags & FLD_CMP_MASK) { + case FLD_CMP_EQUAL: + return range ? ((val >= sel1) && (val <= sel2)) : val == sel1; + case FLD_CMP_NOT|FLD_CMP_EQUAL: + return range ? ((val >= sel1) && (val <= sel2)) : val != sel1; + case FLD_CMP_TIME|FLD_CMP_GT: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_TIME, &val, fs)) + return 0; + return range ? val > sel2 : val > sel1; + case FLD_CMP_TIME|FLD_CMP_GT|FLD_CMP_EQUAL: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_TIME, &val, fs)) + return 0; + return val >= sel1; + case FLD_CMP_TIME|FLD_CMP_LT: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_TIME, &val, fs)) + return 0; + return val < sel1; + case FLD_CMP_TIME|FLD_CMP_LT|FLD_CMP_EQUAL: + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_TIME, &val, fs)) + return 0; + return range ? val <= sel2 : val <= sel1; + default: + log_error(INTERNAL_ERROR "_cmp_field_time: unsupported time " + "comparison type for field %s", field_id); + } + + return 0; +} + +/* Matches if all items from selection string list match list value strictly 1:1. */ +static int _cmp_field_string_list_strict_all(const struct str_list_sort_value *val, + const struct selection_str_list *sel) +{ + unsigned int sel_list_size = dm_list_size(&sel->str_list.list); + struct dm_str_list *sel_item; + unsigned int i = 1; + + if (!val->items[0].len) { + if (sel_list_size == 1) { + /* match blank string list with selection defined as blank string only */ + sel_item = dm_list_item(dm_list_first(&sel->str_list.list), struct dm_str_list); + return !strcmp(sel_item->str, ""); + } + return 0; + } + + /* if item count differs, it's clear the lists do not match */ + if (val->items[0].len != sel_list_size) + return 0; + + /* both lists are sorted so they either match 1:1 or not */ + dm_list_iterate_items(sel_item, &sel->str_list.list) { + if ((strlen(sel_item->str) != val->items[i].len) || + strncmp(sel_item->str, val->value + val->items[i].pos, val->items[i].len)) + return 0; + i++; + } + + return 1; +} + +/* Matches if all items from selection string list match a subset of list value. */ +static int _cmp_field_string_list_subset_all(const struct str_list_sort_value *val, + const struct selection_str_list *sel) +{ + unsigned int sel_list_size = dm_list_size(&sel->str_list.list); + struct dm_str_list *sel_item; + unsigned int i, last_found = 1; + int r = 0; + + if (!val->items[0].len) { + if (sel_list_size == 1) { + /* match blank string list with selection defined as blank string only */ + sel_item = dm_list_item(dm_list_first(&sel->str_list.list), struct dm_str_list); + return !strcmp(sel_item->str, ""); + } + return 0; + } + + /* check selection is a subset of the value */ + dm_list_iterate_items(sel_item, &sel->str_list.list) { + r = 0; + for (i = last_found; i <= val->items[0].len; i++) { + if ((strlen(sel_item->str) == val->items[i].len) && + !strncmp(sel_item->str, val->value + val->items[i].pos, val->items[i].len)) { + last_found = i; + r = 1; + } + } + if (!r) + break; + } + + return r; +} + +/* Matches if any item from selection string list matches list value. */ +static int _cmp_field_string_list_any(const struct str_list_sort_value *val, + const struct selection_str_list *sel) +{ + struct dm_str_list *sel_item; + unsigned int i; + + /* match blank string list with selection that contains blank string */ + if (!val->items[0].len) { + dm_list_iterate_items(sel_item, &sel->str_list.list) { + if (!strcmp(sel_item->str, "")) + return 1; + } + return 0; + } + + dm_list_iterate_items(sel_item, &sel->str_list.list) { + /* + * TODO: Optimize this so we don't need to compare the whole lists' content. + * Make use of the fact that the lists are sorted! + */ + for (i = 1; i <= val->items[0].len; i++) { + if ((strlen(sel_item->str) == val->items[i].len) && + !strncmp(sel_item->str, val->value + val->items[i].pos, val->items[i].len)) + return 1; + } + } + + return 0; +} + +static int _cmp_field_string_list(struct dm_report *rh __attribute__((unused)), + uint32_t field_num, const char *field_id, + const struct str_list_sort_value *val, + struct field_selection *fs) +{ + const struct selection_str_list *sel = fs->value->v.l; + int subset, r; + + switch (sel->type & SEL_LIST_MASK) { + case SEL_LIST_LS: + subset = 0; + break; + case SEL_LIST_SUBSET_LS: + subset = 1; + break; + default: + log_error(INTERNAL_ERROR "_cmp_field_string_list: unknown list type"); + return 0; + } + + switch (sel->type & SEL_MASK) { + case SEL_AND: + r = subset ? _cmp_field_string_list_subset_all(val, sel) + : _cmp_field_string_list_strict_all(val, sel); + break; + case SEL_OR: + r = _cmp_field_string_list_any(val, sel); + break; + default: + log_error(INTERNAL_ERROR "_cmp_field_string_list: unsupported string " + "list type found, expecting either AND or OR list for " + "selection field %s", field_id); + return 0; + } + + return fs->flags & FLD_CMP_NOT ? !r : r; +} + +static int _cmp_field_regex(const char *s, struct field_selection *fs) +{ + int match = dm_regex_match(fs->value->v.r, s) >= 0; + return fs->flags & FLD_CMP_NOT ? !match : match; +} + +static int _compare_selection_field(struct dm_report *rh, + struct dm_report_field *f, + struct field_selection *fs) +{ + const struct dm_report_field_type *fields = f->props->implicit ? _implicit_report_fields + : rh->fields; + const char *field_id = fields[f->props->field_num].id; + int r = 0; + + if (!f->sort_value) { + log_error("_compare_selection_field: field without value :%d", + f->props->field_num); + return 0; + } + + if (fs->flags & FLD_CMP_REGEX) + r = _cmp_field_regex((const char *) f->sort_value, fs); + else { + switch(f->props->flags & DM_REPORT_FIELD_TYPE_MASK) { + case DM_REPORT_FIELD_TYPE_PERCENT: + /* + * Check against real percent values only. + * That means DM_PERCENT_0 <= percent <= DM_PERCENT_100. + */ + if (*(const uint64_t *) f->sort_value > DM_PERCENT_100) + return 0; + /* fall through */ + case DM_REPORT_FIELD_TYPE_NUMBER: + r = _cmp_field_int(rh, f->props->field_num, field_id, *(const uint64_t *) f->sort_value, fs); + break; + case DM_REPORT_FIELD_TYPE_SIZE: + r = _cmp_field_double(rh, f->props->field_num, field_id, *(const double *) f->sort_value, fs); + break; + case DM_REPORT_FIELD_TYPE_STRING: + r = _cmp_field_string(rh, f->props->field_num, field_id, (const char *) f->sort_value, fs); + break; + case DM_REPORT_FIELD_TYPE_STRING_LIST: + r = _cmp_field_string_list(rh, f->props->field_num, field_id, (const struct str_list_sort_value *) f->sort_value, fs); + break; + case DM_REPORT_FIELD_TYPE_TIME: + r = _cmp_field_time(rh, f->props->field_num, field_id, *(const time_t *) f->sort_value, fs); + break; + default: + log_error(INTERNAL_ERROR "_compare_selection_field: unknown field type for field %s", field_id); + } + } + + return r; +} + +static int _check_selection(struct dm_report *rh, struct selection_node *sn, + struct dm_list *fields) +{ + int r; + struct selection_node *iter_n; + struct dm_report_field *f; + + switch (sn->type & SEL_MASK) { + case SEL_ITEM: + r = 1; + dm_list_iterate_items(f, fields) { + if (sn->selection.item->fp != f->props) + continue; + if (!_compare_selection_field(rh, f, sn->selection.item)) + r = 0; + } + break; + case SEL_OR: + r = 0; + dm_list_iterate_items(iter_n, &sn->selection.set) + if ((r |= _check_selection(rh, iter_n, fields))) + break; + break; + case SEL_AND: + r = 1; + dm_list_iterate_items(iter_n, &sn->selection.set) + if (!(r &= _check_selection(rh, iter_n, fields))) + break; + break; + default: + log_error("Unsupported selection type"); + return 0; + } + + return (sn->type & SEL_MODIFIER_NOT) ? !r : r; +} + +static int _check_report_selection(struct dm_report *rh, struct dm_list *fields) +{ + if (!rh->selection || !rh->selection->selection_root) + return 1; + + return _check_selection(rh, rh->selection->selection_root, fields); +} + +static int _do_report_object(struct dm_report *rh, void *object, int do_output, int *selected) +{ + const struct dm_report_field_type *fields; + struct field_properties *fp; + struct row *row = NULL; + struct dm_report_field *field; + void *data = NULL; + int r = 0; + + if (!rh) { + log_error(INTERNAL_ERROR "_do_report_object: dm_report handler is NULL."); + return 0; + } + + if (!do_output && !selected) { + log_error(INTERNAL_ERROR "_do_report_object: output not requested and " + "selected output variable is NULL too."); + return 0; + } + + if (rh->flags & RH_ALREADY_REPORTED) + return 1; + + if (!(row = dm_pool_zalloc(rh->mem, sizeof(*row)))) { + log_error("_do_report_object: struct row allocation failed"); + return 0; + } + + if (!rh->first_row) + rh->first_row = row; + + row->rh = rh; + + if ((rh->flags & RH_SORT_REQUIRED) && + !(row->sort_fields = + dm_pool_zalloc(rh->mem, sizeof(struct dm_report_field *) * + rh->keys_count))) { + log_error("_do_report_object: " + "row sort value structure allocation failed"); + goto out; + } + + dm_list_init(&row->fields); + row->selected = 1; + + /* For each field to be displayed, call its report_fn */ + dm_list_iterate_items(fp, &rh->field_props) { + if (!(field = dm_pool_zalloc(rh->mem, sizeof(*field)))) { + log_error("_do_report_object: " + "struct dm_report_field allocation failed"); + goto out; + } + + if (fp->implicit) { + fields = _implicit_report_fields; + if (!strcmp(fields[fp->field_num].id, SPECIAL_FIELD_SELECTED_ID)) + row->field_sel_status = field; + } else + fields = rh->fields; + + field->props = fp; + + data = fp->implicit ? _report_get_implicit_field_data(rh, fp, row) + : _report_get_field_data(rh, fp, object); + if (!data) { + log_error("_do_report_object: " + "no data assigned to field %s", + fields[fp->field_num].id); + goto out; + } + + if (!fields[fp->field_num].report_fn(rh, rh->mem, + field, data, + rh->private)) { + log_error("_do_report_object: " + "report function failed for field %s", + fields[fp->field_num].id); + goto out; + } + + dm_list_add(&row->fields, &field->list); + } + + r = 1; + + if (!_check_report_selection(rh, &row->fields)) { + row->selected = 0; + + /* + * If the row is not selected, we still keep it for output if either: + * - we're displaying special "selected" field in the row, + * - or the report is supposed to be on output multiple times + * where each output can have a new selection defined. + */ + if (!row->field_sel_status && !(rh->flags & DM_REPORT_OUTPUT_MULTIPLE_TIMES)) + goto out; + + if (row->field_sel_status) { + /* + * If field with id "selected" is reported, + * report the row although it does not pass + * the selection criteria. + * The "selected" field reports the result + * of the selection. + */ + _implicit_report_fields[row->field_sel_status->props->field_num].report_fn(rh, + rh->mem, row->field_sel_status, row, rh->private); + /* + * If the "selected" field is not displayed, e.g. + * because it is part of the sort field list, + * skip the display of the row as usual unless + * we plan to do the output multiple times. + */ + if ((row->field_sel_status->props->flags & FLD_HIDDEN) && + !(rh->flags & DM_REPORT_OUTPUT_MULTIPLE_TIMES)) + goto out; + } + } + + if (!do_output) + goto out; + + dm_list_add(&rh->rows, &row->list); + + if (!(rh->flags & DM_REPORT_OUTPUT_BUFFERED)) + return dm_report_output(rh); +out: + if (selected) + *selected = row->selected; + if (!do_output || !r) + dm_pool_free(rh->mem, row); + return r; +} + +static int _do_report_compact_fields(struct dm_report *rh, int global) +{ + struct dm_report_field *field; + struct field_properties *fp; + struct row *row; + + if (!rh) { + log_error("dm_report_enable_compact_output: dm report handler is NULL."); + return 0; + } + + if (!(rh->flags & DM_REPORT_OUTPUT_BUFFERED) || + dm_list_empty(&rh->rows)) + return 1; + + /* + * At first, mark all fields with FLD_HIDDEN flag. + * Also, mark field with FLD_COMPACTED flag, but only + * the ones that didn't have FLD_HIDDEN set before. + * This prevents losing the original FLD_HIDDEN flag + * in next step... + */ + dm_list_iterate_items(fp, &rh->field_props) { + if (fp->flags & FLD_HIDDEN) + continue; + if (global || (fp->flags & FLD_COMPACT_ONE)) + fp->flags |= (FLD_COMPACTED | FLD_HIDDEN); + } + + /* + * ...check each field in a row and if its report value + * is not empty, drop the FLD_COMPACTED and FLD_HIDDEN + * flag if FLD_COMPACTED flag is set. It's important + * to keep FLD_HIDDEN flag for the fields that were + * already marked with FLD_HIDDEN before - these don't + * have FLD_COMPACTED set - check this condition! + */ + dm_list_iterate_items(row, &rh->rows) { + dm_list_iterate_items(field, &row->fields) { + if ((field->report_string && *field->report_string) && + field->props->flags & FLD_COMPACTED) + field->props->flags &= ~(FLD_COMPACTED | FLD_HIDDEN); + } + } + + /* + * The fields left with FLD_COMPACTED and FLD_HIDDEN flag are + * the ones which have blank value in all rows. The FLD_HIDDEN + * will cause such field to not be reported on output at all. + */ + + return 1; +} + +int dm_report_compact_fields(struct dm_report *rh) +{ + return _do_report_compact_fields(rh, 1); +} + +static int _field_to_compact_match(struct dm_report *rh, const char *field, size_t flen) +{ + struct field_properties *fp; + uint32_t f; + int implicit; + + if ((_get_field(rh, field, flen, &f, &implicit))) { + dm_list_iterate_items(fp, &rh->field_props) { + if ((fp->implicit == implicit) && (fp->field_num == f)) { + fp->flags |= FLD_COMPACT_ONE; + break; + } + } + return 1; + } + + return 0; +} + +static int _parse_fields_to_compact(struct dm_report *rh, const char *fields) +{ + const char *ws; /* Word start */ + const char *we = fields; /* Word end */ + + if (!fields) + return 1; + + while (*we) { + while (*we && *we == ',') + we++; + ws = we; + while (*we && *we != ',') + we++; + if (!_field_to_compact_match(rh, ws, (size_t) (we - ws))) { + log_error("dm_report: Unrecognized field: %.*s", (int) (we - ws), ws); + return 0; + } + } + + return 1; +} + +int dm_report_compact_given_fields(struct dm_report *rh, const char *fields) +{ + if (!_parse_fields_to_compact(rh, fields)) + return_0; + + return _do_report_compact_fields(rh, 0); +} + +int dm_report_object(struct dm_report *rh, void *object) +{ + return _do_report_object(rh, object, 1, NULL); +} + +int dm_report_object_is_selected(struct dm_report *rh, void *object, int do_output, int *selected) +{ + return _do_report_object(rh, object, do_output, selected); +} + +/* + * Selection parsing + */ + +/* + * Other tokens (FIELD, VALUE, STRING, NUMBER, REGEX) + * FIELD := <strings of alphabet, number and '_'> + * VALUE := NUMBER | STRING + * REGEX := <strings quoted by '"', '\'', '(', '{', '[' or unquoted> + * NUMBER := <strings of [0-9]> (because sort_value is unsigned) + * STRING := <strings quoted by '"', '\'' or unquoted> + */ + +static const char * _skip_space(const char *s) +{ + while (*s && isspace(*s)) + s++; + return s; +} + +static int _tok_op(struct op_def *t, const char *s, const char **end, + uint32_t expect) +{ + size_t len; + + s = _skip_space(s); + + for (; t->string; t++) { + if (expect && !(t->flags & expect)) + continue; + + len = strlen(t->string); + if (!strncmp(s, t->string, len)) { + if (end) + *end = s + len; + return t->flags; + } + } + + if (end) + *end = s; + return 0; +} + +static int _tok_op_log(const char *s, const char **end, uint32_t expect) +{ + return _tok_op(_op_log, s, end, expect); +} + +static int _tok_op_cmp(const char *s, const char **end) +{ + return _tok_op(_op_cmp, s, end, 0); +} + +static char _get_and_skip_quote_char(char const **s) +{ + char c = 0; + + if (**s == '"' || **s == '\'') { + c = **s; + (*s)++; + } + + return c; +} + + /* + * + * Input: + * s - a pointer to the parsed string + * Output: + * begin - a pointer to the beginning of the token + * end - a pointer to the end of the token + 1 + * or undefined if return value is NULL + * return value - a starting point of the next parsing or + * NULL if 's' doesn't match with token type + * (the parsing should be terminated) + */ +static const char *_tok_value_number(const char *s, + const char **begin, const char **end) + +{ + int is_float = 0; + + *begin = s; + while ((!is_float && (*s == '.') && ++is_float) || isdigit(*s)) + s++; + *end = s; + + if (*begin == *end) + return NULL; + + return s; +} + +/* + * Input: + * s - a pointer to the parsed string + * endchar - terminating character + * end_op_flags - terminating operator flags (see _op_log) + * (if endchar is non-zero then endflags is ignored) + * Output: + * begin - a pointer to the beginning of the token + * end - a pointer to the end of the token + 1 + * end_op_flag_hit - the flag from endflags hit during parsing + * return value - a starting point of the next parsing + */ +static const char *_tok_value_string(const char *s, + const char **begin, const char **end, + const char endchar, uint32_t end_op_flags, + uint32_t *end_op_flag_hit) +{ + uint32_t flag_hit = 0; + + *begin = s; + + /* + * If endchar is defined, scan the string till + * the endchar or the end of string is hit. + * This is in case the string is quoted and we + * know exact character that is the stopper. + */ + if (endchar) { + while (*s && *s != endchar) + s++; + if (*s != endchar) { + log_error("Missing end quote."); + return NULL; + } + *end = s; + s++; + } else { + /* + * If endchar is not defined then endchar is/are the + * operator/s as defined by 'endflags' arg or space char. + * This is in case the string is not quoted and + * we don't know which character is the exact stopper. + */ + while (*s) { + if ((flag_hit = _tok_op(_op_log, s, NULL, end_op_flags)) || *s == ' ') + break; + s++; + } + *end = s; + /* + * If we hit one of the strings as defined by 'endflags' + * and if 'endflag_hit' arg is provided, save the exact + * string flag that was hit. + */ + if (end_op_flag_hit) + *end_op_flag_hit = flag_hit; + } + + return s; +} + +static const char *_reserved_name(struct dm_report *rh, + const struct dm_report_reserved_value *reserved, + const struct dm_report_field_reserved_value *frv, + uint32_t field_num, const char *s, size_t len) +{ + dm_report_reserved_handler handler; + const char *canonical_name; + const char **name; + char *tmp_s; + char c; + int r; + + name = reserved->names; + while (*name) { + if ((strlen(*name) == len) && !strncmp(*name, s, len)) + return *name; + name++; + } + + if (reserved->type & DM_REPORT_FIELD_RESERVED_VALUE_FUZZY_NAMES) { + handler = (dm_report_reserved_handler) (frv ? frv->value : reserved->value); + c = s[len]; + tmp_s = (char *) s; + tmp_s[len] = '\0'; + if ((r = handler(rh, rh->selection->mem, field_num, + DM_REPORT_RESERVED_PARSE_FUZZY_NAME, + tmp_s, (const void **) &canonical_name)) <= 0) { + if (r == -1) + log_error(INTERNAL_ERROR "%s reserved value handler for field %s has missing " + "implementation of DM_REPORT_RESERVED_PARSE_FUZZY_NAME action", + (reserved->type & DM_REPORT_FIELD_TYPE_MASK) ? "type-specific" : "field-specific", + rh->fields[field_num].id); + else + log_error("Error occured while processing %s reserved value handler for field %s", + (reserved->type & DM_REPORT_FIELD_TYPE_MASK) ? "type-specific" : "field-specific", + rh->fields[field_num].id); + } + tmp_s[len] = c; + if (r && canonical_name) + return canonical_name; + } + + return NULL; +} + +/* + * Used to replace a string representation of the reserved value + * found in selection with the exact reserved value of certain type. + */ +static const char *_get_reserved(struct dm_report *rh, unsigned type, + uint32_t field_num, int implicit, + const char *s, const char **begin, const char **end, + struct reserved_value_wrapper *rvw) +{ + const struct dm_report_reserved_value *iter = implicit ? NULL : rh->reserved_values; + const struct dm_report_field_reserved_value *frv; + const char *tmp_begin, *tmp_end, *tmp_s = s; + const char *name = NULL; + char c; + + rvw->reserved = NULL; + + if (!iter) + return s; + + c = _get_and_skip_quote_char(&tmp_s); + if (!(tmp_s = _tok_value_string(tmp_s, &tmp_begin, &tmp_end, c, SEL_AND | SEL_OR | SEL_PRECEDENCE_PE, NULL))) + return s; + + while (iter->value) { + if (!(iter->type & DM_REPORT_FIELD_TYPE_MASK)) { + /* DM_REPORT_FIELD_TYPE_NONE - per-field reserved value */ + frv = (const struct dm_report_field_reserved_value *) iter->value; + if ((frv->field_num == field_num) && (name = _reserved_name(rh, iter, frv, field_num, + tmp_begin, tmp_end - tmp_begin))) + break; + } else if (iter->type & type) { + /* DM_REPORT_FIELD_TYPE_* - per-type reserved value */ + if ((name = _reserved_name(rh, iter, NULL, field_num, + tmp_begin, tmp_end - tmp_begin))) + break; + } + iter++; + } + + if (name) { + /* found! */ + *begin = tmp_begin; + *end = tmp_end; + s = tmp_s; + rvw->reserved = iter; + rvw->matched_name = name; + } + + return s; +} + +float dm_percent_to_float(dm_percent_t percent) +{ + /* Add 0.f to prevent returning -0.00 */ + return (float) percent / DM_PERCENT_1 + 0.f; +} + +float dm_percent_to_round_float(dm_percent_t percent, unsigned digits) +{ + static const float power10[] = { + 1.f, .1f, .01f, .001f, .0001f, .00001f, .000001f, + .0000001f, .00000001f, .000000001f, + .0000000001f + }; + float r; + float f = dm_percent_to_float(percent); + + if (digits >= DM_ARRAY_SIZE(power10)) + digits = DM_ARRAY_SIZE(power10) - 1; /* no better precision */ + + r = DM_PERCENT_1 * power10[digits]; + + if ((percent < r) && (percent > DM_PERCENT_0)) + f = power10[digits]; + else if ((percent > (DM_PERCENT_100 - r)) && (percent < DM_PERCENT_100)) + f = (float) (DM_PERCENT_100 - r) / DM_PERCENT_1; + + return f; +} + +dm_percent_t dm_make_percent(uint64_t numerator, uint64_t denominator) +{ + dm_percent_t percent; + + if (!denominator) + return DM_PERCENT_100; /* FIXME? */ + if (!numerator) + return DM_PERCENT_0; + if (numerator == denominator) + return DM_PERCENT_100; + switch (percent = DM_PERCENT_100 * ((double) numerator / (double) denominator)) { + case DM_PERCENT_100: + return DM_PERCENT_100 - 1; + case DM_PERCENT_0: + return DM_PERCENT_0 + 1; + default: + return percent; + } +} + +int dm_report_value_cache_set(struct dm_report *rh, const char *name, const void *data) +{ + if (!rh->value_cache && (!(rh->value_cache = dm_hash_create(64)))) { + log_error("Failed to create cache for values used during reporting."); + return 0; + } + + return dm_hash_insert(rh->value_cache, name, (void *) data); +} + +const void *dm_report_value_cache_get(struct dm_report *rh, const char *name) +{ + return (rh->value_cache) ? dm_hash_lookup(rh->value_cache, name) : NULL; +} + +/* + * Used to check whether the reserved_values definition passed to + * dm_report_init_with_selection contains only supported reserved value types. + */ +static int _check_reserved_values_supported(const struct dm_report_field_type fields[], + const struct dm_report_reserved_value reserved_values[]) +{ + const struct dm_report_reserved_value *iter; + const struct dm_report_field_reserved_value *field_res; + const struct dm_report_field_type *field; + static uint32_t supported_reserved_types = DM_REPORT_FIELD_TYPE_NUMBER | + DM_REPORT_FIELD_TYPE_SIZE | + DM_REPORT_FIELD_TYPE_PERCENT | + DM_REPORT_FIELD_TYPE_STRING | + DM_REPORT_FIELD_TYPE_TIME; + static uint32_t supported_reserved_types_with_range = DM_REPORT_FIELD_RESERVED_VALUE_RANGE | + DM_REPORT_FIELD_TYPE_NUMBER | + DM_REPORT_FIELD_TYPE_SIZE | + DM_REPORT_FIELD_TYPE_PERCENT | + DM_REPORT_FIELD_TYPE_TIME; + + + if (!reserved_values) + return 1; + + iter = reserved_values; + + while (iter->value) { + if (iter->type & DM_REPORT_FIELD_TYPE_MASK) { + if (!(iter->type & supported_reserved_types) || + ((iter->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) && + !(iter->type & supported_reserved_types_with_range))) { + log_error(INTERNAL_ERROR "_check_reserved_values_supported: " + "global reserved value for type 0x%x not supported", + iter->type); + return 0; + } + } else { + field_res = (const struct dm_report_field_reserved_value *) iter->value; + field = &fields[field_res->field_num]; + if (!(field->flags & supported_reserved_types) || + ((iter->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) && + !(iter->type & supported_reserved_types_with_range))) { + log_error(INTERNAL_ERROR "_check_reserved_values_supported: " + "field-specific reserved value of type 0x%x for " + "field %s not supported", + field->flags & DM_REPORT_FIELD_TYPE_MASK, field->id); + return 0; + } + } + iter++; + } + + return 1; +} + +/* + * Input: + * ft - field type for which the value is parsed + * s - a pointer to the parsed string + * Output: + * begin - a pointer to the beginning of the token + * end - a pointer to the end of the token + 1 + * flags - parsing flags + */ +static const char *_tok_value_regex(struct dm_report *rh, + const struct dm_report_field_type *ft, + const char *s, const char **begin, + const char **end, uint32_t *flags, + struct reserved_value_wrapper *rvw) +{ + char c; + rvw->reserved = NULL; + + s = _skip_space(s); + + if (!*s) { + log_error("Regular expression expected for selection field %s", ft->id); + return NULL; + } + + switch (*s) { + case '(': c = ')'; break; + case '{': c = '}'; break; + case '[': c = ']'; break; + case '"': /* fall through */ + case '\'': c = *s; break; + default: c = 0; + } + + if (!(s = _tok_value_string(c ? s + 1 : s, begin, end, c, SEL_AND | SEL_OR | SEL_PRECEDENCE_PE, NULL))) { + log_error("Failed to parse regex value for selection field %s.", ft->id); + return NULL; + } + + *flags |= DM_REPORT_FIELD_TYPE_STRING; + return s; +} + +static int _str_list_item_cmp(const void *a, const void *b) +{ + const struct dm_str_list * const *item_a = (const struct dm_str_list * const *) a; + const struct dm_str_list * const *item_b = (const struct dm_str_list * const *) b; + + return strcmp((*item_a)->str, (*item_b)->str); +} + +static int _add_item_to_string_list(struct dm_pool *mem, const char *begin, + const char *end, struct dm_list *list) +{ + struct dm_str_list *item; + + if (!(item = dm_pool_zalloc(mem, sizeof(*item))) || + !(item->str = begin == end ? "" : dm_pool_strndup(mem, begin, end - begin))) { + log_error("_add_item_to_string_list: memory allocation failed for string list item"); + return 0; + } + dm_list_add(list, &item->list); + + return 1; +} + +/* + * Input: + * ft - field type for which the value is parsed + * mem - memory pool to allocate from + * s - a pointer to the parsed string + * Output: + * begin - a pointer to the beginning of the token (whole list) + * end - a pointer to the end of the token + 1 (whole list) + * sel_str_list - the list of strings parsed + */ +static const char *_tok_value_string_list(const struct dm_report_field_type *ft, + struct dm_pool *mem, const char *s, + const char **begin, const char **end, + struct selection_str_list **sel_str_list) +{ + static const char _str_list_item_parsing_failed[] = "Failed to parse string list value " + "for selection field %s."; + struct selection_str_list *ssl = NULL; + struct dm_str_list *item; + const char *begin_item = NULL, *end_item = NULL, *tmp; + uint32_t op_flags, end_op_flag_expected, end_op_flag_hit = 0; + struct dm_str_list **arr; + size_t list_size; + unsigned int i; + int list_end = 0; + char c; + + if (!(ssl = dm_pool_alloc(mem, sizeof(*ssl)))) { + log_error("_tok_value_string_list: memory allocation failed for selection list"); + goto bad; + } + dm_list_init(&ssl->str_list.list); + ssl->type = 0; + *begin = s; + + if (!(op_flags = _tok_op_log(s, &tmp, SEL_LIST_LS | SEL_LIST_SUBSET_LS))) { + /* Only one item - SEL_LIST_{SUBSET_}LS and SEL_LIST_{SUBSET_}LE not used */ + c = _get_and_skip_quote_char(&s); + if (!(s = _tok_value_string(s, &begin_item, &end_item, c, SEL_AND | SEL_OR | SEL_PRECEDENCE_PE, NULL))) { + log_error(_str_list_item_parsing_failed, ft->id); + goto bad; + } + if (!_add_item_to_string_list(mem, begin_item, end_item, &ssl->str_list.list)) + goto_bad; + ssl->type = SEL_OR | SEL_LIST_LS; + goto out; + } + + /* More than one item - items enclosed in SEL_LIST_LS and SEL_LIST_LE + * or SEL_LIST_SUBSET_LS and SEL_LIST_SUBSET_LE. + * Each element is terminated by AND or OR operator or 'list end'. + * The first operator hit is then the one allowed for the whole list, + * no mixing allowed! + */ + + /* Are we using [] or {} for the list? */ + end_op_flag_expected = (op_flags == SEL_LIST_LS) ? SEL_LIST_LE : SEL_LIST_SUBSET_LE; + + op_flags = SEL_LIST_LE | SEL_LIST_SUBSET_LE | SEL_AND | SEL_OR; + s++; + while (*s) { + s = _skip_space(s); + c = _get_and_skip_quote_char(&s); + if (!(s = _tok_value_string(s, &begin_item, &end_item, c, op_flags, NULL))) { + log_error(_str_list_item_parsing_failed, ft->id); + goto bad; + } + s = _skip_space(s); + + if (!(end_op_flag_hit = _tok_op_log(s, &tmp, op_flags))) { + log_error("Invalid operator in selection list."); + goto bad; + } + + if (end_op_flag_hit & (SEL_LIST_LE | SEL_LIST_SUBSET_LE)) { + list_end = 1; + if (end_op_flag_hit != end_op_flag_expected) { + for (i = 0; _op_log[i].string; i++) + if (_op_log[i].flags == end_op_flag_expected) + break; + log_error("List ended with incorrect character, " + "expecting \'%s\'.", _op_log[i].string); + goto bad; + } + } + + if (ssl->type) { + if (!list_end && !(ssl->type & end_op_flag_hit)) { + log_error("Only one type of logical operator allowed " + "in selection list at a time."); + goto bad; + } + } else { + if (list_end) + ssl->type = end_op_flag_expected == SEL_LIST_LE ? SEL_AND : SEL_OR; + else + ssl->type = end_op_flag_hit; + } + + if (!_add_item_to_string_list(mem, begin_item, end_item, &ssl->str_list.list)) + goto_bad; + + s = tmp; + + if (list_end) + break; + } + + if (!(end_op_flag_hit & (SEL_LIST_LE | SEL_LIST_SUBSET_LE))) { + log_error("Missing list end for selection field %s", ft->id); + goto bad; + } + + /* Store information whether [] or {} was used. */ + if (end_op_flag_expected == SEL_LIST_LE) + ssl->type |= SEL_LIST_LS; + else + ssl->type |= SEL_LIST_SUBSET_LS; + + /* Sort the list. */ + if (!(list_size = dm_list_size(&ssl->str_list.list))) { + log_error(INTERNAL_ERROR "_tok_value_string_list: list has no items"); + goto bad; + } else if (list_size == 1) + goto out; + if (!(arr = dm_malloc(sizeof(item) * list_size))) { + log_error("_tok_value_string_list: memory allocation failed for sort array"); + goto bad; + } + + i = 0; + dm_list_iterate_items(item, &ssl->str_list.list) + arr[i++] = item; + qsort(arr, list_size, sizeof(item), _str_list_item_cmp); + dm_list_init(&ssl->str_list.list); + for (i = 0; i < list_size; i++) + dm_list_add(&ssl->str_list.list, &arr[i]->list); + + dm_free(arr); +out: + *end = s; + if (sel_str_list) + *sel_str_list = ssl; + + return s; +bad: + *end = s; + if (ssl) + dm_pool_free(mem, ssl); + if (sel_str_list) + *sel_str_list = NULL; + return s; +} + +struct time_value { + int range; + time_t t1; + time_t t2; +}; + +static const char *_out_of_range_msg = "Field selection value %s out of supported range for field %s."; + +/* + * Standard formatted date and time - ISO8601. + * + * date time timezone + * + * date: + * YYYY-MM-DD (or shortly YYYYMMDD) + * YYYY-MM (shortly YYYYMM), auto DD=1 + * YYYY, auto MM=01 and DD=01 + * + * time: + * hh:mm:ss (or shortly hhmmss) + * hh:mm (or shortly hhmm), auto ss=0 + * hh (or shortly hh), auto mm=0, auto ss=0 + * + * timezone: + * +hh:mm or -hh:mm (or shortly +hhmm or -hhmm) + * +hh or -hh +*/ + +#define DELIM_DATE '-' +#define DELIM_TIME ':' + +static int _days_in_month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + +static int _is_leap_year(long year) +{ + return (((year % 4==0) && (year % 100 != 0)) || (year % 400 == 0)); +} + +static int _get_days_in_month(long month, long year) +{ + return (month == 2 && _is_leap_year(year)) ? _days_in_month[month-1] + 1 + : _days_in_month[month-1]; +} + +typedef enum { + RANGE_NONE, + RANGE_SECOND, + RANGE_MINUTE, + RANGE_HOUR, + RANGE_DAY, + RANGE_MONTH, + RANGE_YEAR +} time_range_t; + +static char *_get_date(char *str, struct tm *tm, time_range_t *range) +{ + static const char incorrect_date_format_msg[] = "Incorrect date format."; + time_range_t tmp_range = RANGE_NONE; + long n1, n2 = -1, n3 = -1; + char *s = str, *end; + size_t len = 0; + + if (!isdigit(*s)) + /* we need a year at least */ + return NULL; + + n1 = strtol(s, &end, 10); + if (*end == DELIM_DATE) { + len += (4 - (end - s)); /* diff in length from standard YYYY */ + s = end + 1; + if (isdigit(*s)) { + n2 = strtol(s, &end, 10); + len += (2 - (end - s)); /* diff in length from standard MM */ + if (*end == DELIM_DATE) { + s = end + 1; + n3 = strtol(s, &end, 10); + len += (2 - (end - s)); /* diff in length from standard DD */ + } + } + } + + len = len + end - str; + + /* variations from standard YYYY-MM-DD */ + if (n3 == -1) { + if (n2 == -1) { + if (len == 4) { + /* YYYY */ + tmp_range = RANGE_YEAR; + n3 = n2 = 1; + } else if (len == 6) { + /* YYYYMM */ + tmp_range = RANGE_MONTH; + n3 = 1; + n2 = n1 % 100; + n1 = n1 / 100; + } else if (len == 8) { + tmp_range = RANGE_DAY; + /* YYYYMMDD */ + n3 = n1 % 100; + n2 = (n1 / 100) % 100; + n1 = n1 / 10000; + } else { + log_error(incorrect_date_format_msg); + return NULL; + } + } else { + if (len == 7) { + tmp_range = RANGE_MONTH; + /* YYYY-MM */ + n3 = 1; + } else { + log_error(incorrect_date_format_msg); + return NULL; + } + } + } + + if (n2 < 1 || n2 > 12) { + log_error("Specified month out of range."); + return NULL; + } + + if (n3 < 1 || n3 > _get_days_in_month(n2, n1)) { + log_error("Specified day out of range."); + return NULL; + } + + if (tmp_range == RANGE_NONE) + tmp_range = RANGE_DAY; + + tm->tm_year = n1 - 1900; + tm->tm_mon = n2 - 1; + tm->tm_mday = n3; + *range = tmp_range; + + return (char *) _skip_space(end); +} + +static char *_get_time(char *str, struct tm *tm, time_range_t *range) +{ + static const char incorrect_time_format_msg[] = "Incorrect time format."; + time_range_t tmp_range = RANGE_NONE; + long n1, n2 = -1, n3 = -1; + char *s = str, *end; + size_t len = 0; + + if (!isdigit(*s)) { + /* time is not compulsory */ + tm->tm_hour = tm->tm_min = tm->tm_sec = 0; + return (char *) _skip_space(s); + } + + n1 = strtol(s, &end, 10); + if (*end == DELIM_TIME) { + len += (2 - (end - s)); /* diff in length from standard HH */ + s = end + 1; + if (isdigit(*s)) { + n2 = strtol(s, &end, 10); + len += (2 - (end - s)); /* diff in length from standard MM */ + if (*end == DELIM_TIME) { + s = end + 1; + n3 = strtol(s, &end, 10); + len += (2 - (end - s)); /* diff in length from standard SS */ + } + } + } + + len = len + end - str; + + /* variations from standard HH:MM:SS */ + if (n3 == -1) { + if (n2 == -1) { + if (len == 2) { + /* HH */ + tmp_range = RANGE_HOUR; + n3 = n2 = 0; + } else if (len == 4) { + /* HHMM */ + tmp_range = RANGE_MINUTE; + n3 = 0; + n2 = n1 % 100; + n1 = n1 / 100; + } else if (len == 6) { + /* HHMMSS */ + tmp_range = RANGE_SECOND; + n3 = n1 % 100; + n2 = (n1 / 100) % 100; + n1 = n1 / 10000; + } else { + log_error(incorrect_time_format_msg); + return NULL; + } + } else { + if (len == 5) { + /* HH:MM */ + tmp_range = RANGE_MINUTE; + n3 = 0; + } else { + log_error(incorrect_time_format_msg); + return NULL; + } + } + } + + if (n1 < 0 || n1 > 23) { + log_error("Specified hours out of range."); + return NULL; + } + + if (n2 < 0 || n2 > 60) { + log_error("Specified minutes out of range."); + return NULL; + } + + if (n3 < 0 || n3 > 60) { + log_error("Specified seconds out of range."); + return NULL; + } + + /* Just time without exact date is incomplete! */ + if (*range != RANGE_DAY) { + log_error("Full date specification needed."); + return NULL; + } + + tm->tm_hour = n1; + tm->tm_min = n2; + tm->tm_sec = n3; + *range = tmp_range; + + return (char *) _skip_space(end); +} + +/* The offset is always an absolute offset against GMT! */ +static char *_get_tz(char *str, int *tz_supplied, int *offset) +{ + long n1, n2 = -1; + char *s = str, *end; + int sign = 1; /* +HH:MM by default */ + size_t len = 0; + + *tz_supplied = 0; + *offset = 0; + + if (!isdigit(*s)) { + if (*s == '+') { + sign = 1; + s = s + 1; + } else if (*s == '-') { + sign = -1; + s = s + 1; + } else + return (char *) _skip_space(s); + } + + n1 = strtol(s, &end, 10); + if (*end == DELIM_TIME) { + len = (2 - (end - s)); /* diff in length from standard HH */ + s = end + 1; + if (isdigit(*s)) { + n2 = strtol(s, &end, 10); + len = (2 - (end - s)); /* diff in length from standard MM */ + } + } + + len = len + end - s; + + /* variations from standard HH:MM */ + if (n2 == -1) { + if (len == 2) { + /* HH */ + n2 = 0; + } else if (len == 4) { + /* HHMM */ + n2 = n1 % 100; + n1 = n1 / 100; + } else + return NULL; + } + + if (n2 < 0 || n2 > 60) + return NULL; + + if (n1 < 0 || n1 > 14) + return NULL; + + /* timezone offset in seconds */ + *offset = sign * ((n1 * 3600) + (n2 * 60)); + *tz_supplied = 1; + return (char *) _skip_space(end); +} + +static int _local_tz_offset(time_t t_local) +{ + struct tm tm_gmt; + time_t t_gmt; + + gmtime_r(&t_local, &tm_gmt); + t_gmt = mktime(&tm_gmt); + + /* + * gmtime returns time that is adjusted + * for DST.Subtract this adjustment back + * to give us proper *absolute* offset + * for our local timezone. + */ + if (tm_gmt.tm_isdst) + t_gmt -= 3600; + + return t_local - t_gmt; +} + +static void _get_final_time(time_range_t range, struct tm *tm, + int tz_supplied, int offset, + struct time_value *tval) +{ + + struct tm tm_up = *tm; + + switch (range) { + case RANGE_SECOND: + if (tm_up.tm_sec < 59) { + tm_up.tm_sec += 1; + break; + } + /* fall through */ + case RANGE_MINUTE: + if (tm_up.tm_min < 59) { + tm_up.tm_min += 1; + break; + } + /* fall through */ + case RANGE_HOUR: + if (tm_up.tm_hour < 23) { + tm_up.tm_hour += 1; + break; + } + /* fall through */ + case RANGE_DAY: + if (tm_up.tm_mday < _get_days_in_month(tm_up.tm_mon, tm_up.tm_year)) { + tm_up.tm_mday += 1; + break; + } + /* fall through */ + case RANGE_MONTH: + if (tm_up.tm_mon < 11) { + tm_up.tm_mon += 1; + break; + } + /* fall through */ + case RANGE_YEAR: + tm_up.tm_year += 1; + break; + case RANGE_NONE: + /* nothing to do here */ + break; + } + + tval->range = (range != RANGE_NONE); + tval->t1 = mktime(tm); + tval->t2 = mktime(&tm_up) - 1; + + if (tz_supplied) { + /* + * The 'offset' is with respect to the GMT. + * Calculate what the offset is with respect + * to our local timezone and adjust times + * so they represent time in our local timezone. + */ + offset -= _local_tz_offset(tval->t1); + tval->t1 -= offset; + tval->t2 -= offset; + } +} + +static int _parse_formatted_date_time(char *str, struct time_value *tval) +{ + time_range_t range = RANGE_NONE; + struct tm tm = {0}; + int gmt_offset; + int tz_supplied; + + tm.tm_year = tm.tm_mday = tm.tm_mon = -1; + tm.tm_hour = tm.tm_min = tm.tm_sec = -1; + tm.tm_isdst = tm.tm_wday = tm.tm_yday = -1; + + if (!(str = _get_date(str, &tm, &range))) + return 0; + + if (!(str = _get_time(str, &tm, &range))) + return 0; + + if (!(str = _get_tz(str, &tz_supplied, &gmt_offset))) + return 0; + + if (*str) + return 0; + + _get_final_time(range, &tm, tz_supplied, gmt_offset, tval); + + return 1; +} + +static const char *_tok_value_time(const struct dm_report_field_type *ft, + struct dm_pool *mem, const char *s, + const char **begin, const char **end, + struct time_value *tval) +{ + char *time_str = NULL; + const char *r = NULL; + uint64_t t; + char c; + + s = _skip_space(s); + + if (*s == '@') { + /* Absolute time value in number of seconds since epoch. */ + if (!(s = _tok_value_number(s+1, begin, end))) + goto_out; + + if (!(time_str = dm_pool_strndup(mem, *begin, *end - *begin))) { + log_error("_tok_value_time: dm_pool_strndup failed"); + goto out; + } + + errno = 0; + if (((t = strtoull(time_str, NULL, 10)) == ULLONG_MAX) && errno == ERANGE) { + log_error(_out_of_range_msg, time_str, ft->id); + goto out; + } + + tval->range = 0; + tval->t1 = (time_t) t; + tval->t2 = 0; + r = s; + } else { + c = _get_and_skip_quote_char(&s); + if (!(s = _tok_value_string(s, begin, end, c, SEL_AND | SEL_OR | SEL_PRECEDENCE_PE, NULL))) + goto_out; + + if (!(time_str = dm_pool_strndup(mem, *begin, *end - *begin))) { + log_error("tok_value_time: dm_pool_strndup failed"); + goto out; + } + + if (!_parse_formatted_date_time(time_str, tval)) + goto_out; + r = s; + } +out: + if (time_str) + dm_pool_free(mem, time_str); + return r; +} + +/* + * Input: + * ft - field type for which the value is parsed + * s - a pointer to the parsed string + * mem - memory pool to allocate from + * Output: + * begin - a pointer to the beginning of the token + * end - a pointer to the end of the token + 1 + * flags - parsing flags + * custom - custom data specific to token type + * (e.g. size unit factor) + */ +static const char *_tok_value(struct dm_report *rh, + const struct dm_report_field_type *ft, + uint32_t field_num, int implicit, + const char *s, + const char **begin, const char **end, + uint32_t *flags, + struct reserved_value_wrapper *rvw, + struct dm_pool *mem, void *custom) +{ + int expected_type = ft->flags & DM_REPORT_FIELD_TYPE_MASK; + struct selection_str_list **str_list; + struct time_value *tval; + uint64_t *factor; + const char *tmp; + char c; + + s = _skip_space(s); + + s = _get_reserved(rh, expected_type, field_num, implicit, s, begin, end, rvw); + if (rvw->reserved) { + /* + * FLD_CMP_NUMBER shares operators with FLD_CMP_TIME, + * so adjust flags here based on expected type. + */ + if (expected_type == DM_REPORT_FIELD_TYPE_TIME) + *flags &= ~FLD_CMP_NUMBER; + else if (expected_type == DM_REPORT_FIELD_TYPE_NUMBER) + *flags &= ~FLD_CMP_TIME; + *flags |= expected_type; + return s; + } + + switch (expected_type) { + + case DM_REPORT_FIELD_TYPE_STRING: + c = _get_and_skip_quote_char(&s); + if (!(s = _tok_value_string(s, begin, end, c, SEL_AND | SEL_OR | SEL_PRECEDENCE_PE, NULL))) { + log_error("Failed to parse string value " + "for selection field %s.", ft->id); + return NULL; + } + *flags |= DM_REPORT_FIELD_TYPE_STRING; + break; + + case DM_REPORT_FIELD_TYPE_STRING_LIST: + if (!(str_list = (struct selection_str_list **) custom)) + goto_bad; + + s = _tok_value_string_list(ft, mem, s, begin, end, str_list); + if (!(*str_list)) { + log_error("Failed to parse string list value " + "for selection field %s.", ft->id); + return NULL; + } + *flags |= DM_REPORT_FIELD_TYPE_STRING_LIST; + break; + + case DM_REPORT_FIELD_TYPE_NUMBER: + /* fall through */ + case DM_REPORT_FIELD_TYPE_SIZE: + /* fall through */ + case DM_REPORT_FIELD_TYPE_PERCENT: + if (!(s = _tok_value_number(s, begin, end))) { + log_error("Failed to parse numeric value " + "for selection field %s.", ft->id); + return NULL; + } + + if (*s == DM_PERCENT_CHAR) { + s++; + c = DM_PERCENT_CHAR; + if (expected_type != DM_REPORT_FIELD_TYPE_PERCENT) { + log_error("Found percent value but %s value " + "expected for selection field %s.", + expected_type == DM_REPORT_FIELD_TYPE_NUMBER ? + "numeric" : "size", ft->id); + return NULL; + } + } else { + if (!(factor = (uint64_t *) custom)) + goto_bad; + + if ((*factor = dm_units_to_factor(s, &c, 0, &tmp))) { + s = tmp; + if (expected_type != DM_REPORT_FIELD_TYPE_SIZE) { + log_error("Found size unit specifier " + "but %s value expected for " + "selection field %s.", + expected_type == DM_REPORT_FIELD_TYPE_NUMBER ? + "numeric" : "percent", ft->id); + return NULL; + } + } else if (expected_type == DM_REPORT_FIELD_TYPE_SIZE) { + /* + * If size unit is not defined in the selection + * and the type expected is size, use use 'm' + * (1 MiB) for the unit by default. This is the + * same behaviour as seen in lvcreate -L <size>. + */ + *factor = 1024*1024; + } + } + + *flags |= expected_type; + /* + * FLD_CMP_NUMBER shares operators with FLD_CMP_TIME, + * but we have NUMBER here, so remove FLD_CMP_TIME. + */ + *flags &= ~FLD_CMP_TIME; + break; + + case DM_REPORT_FIELD_TYPE_TIME: + if (!(tval = (struct time_value *) custom)) + goto_bad; + + if (!(s = _tok_value_time(ft, mem, s, begin, end, tval))) { + log_error("Failed to parse time value " + "for selection field %s.", ft->id); + return NULL; + } + + *flags |= DM_REPORT_FIELD_TYPE_TIME; + /* + * FLD_CMP_TIME shares operators with FLD_CMP_NUMBER, + * but we have TIME here, so remove FLD_CMP_NUMBER. + */ + *flags &= ~FLD_CMP_NUMBER; + break; + } + + return s; +bad: + log_error(INTERNAL_ERROR "Forbidden NULL custom detected."); + + return NULL; +} + +/* + * Input: + * s - a pointer to the parsed string + * Output: + * begin - a pointer to the beginning of the token + * end - a pointer to the end of the token + 1 + */ +static const char *_tok_field_name(const char *s, + const char **begin, const char **end) +{ + char c; + s = _skip_space(s); + + *begin = s; + while ((c = *s) && + (isalnum(c) || c == '_' || c == '-')) + s++; + *end = s; + + if (*begin == *end) + return NULL; + + return s; +} + +static int _get_reserved_value(struct dm_report *rh, uint32_t field_num, + struct reserved_value_wrapper *rvw) +{ + const void *tmp_value; + dm_report_reserved_handler handler; + int r; + + if (!rvw->reserved) { + rvw->value = NULL; + return 1; + } + + if (rvw->reserved->type & DM_REPORT_FIELD_TYPE_MASK) + /* type reserved value */ + tmp_value = rvw->reserved->value; + else + /* per-field reserved value */ + tmp_value = ((const struct dm_report_field_reserved_value *) rvw->reserved->value)->value; + + if (rvw->reserved->type & (DM_REPORT_FIELD_RESERVED_VALUE_DYNAMIC_VALUE | DM_REPORT_FIELD_RESERVED_VALUE_FUZZY_NAMES)) { + handler = (dm_report_reserved_handler) tmp_value; + if ((r = handler(rh, rh->selection->mem, field_num, + DM_REPORT_RESERVED_GET_DYNAMIC_VALUE, + rvw->matched_name, &tmp_value)) <= 0) { + if (r == -1) + log_error(INTERNAL_ERROR "%s reserved value handler for field %s has missing" + "implementation of DM_REPORT_RESERVED_GET_DYNAMIC_VALUE action", + (rvw->reserved->type) & DM_REPORT_FIELD_TYPE_MASK ? "type-specific" : "field-specific", + rh->fields[field_num].id); + else + log_error("Error occured while processing %s reserved value handler for field %s", + (rvw->reserved->type) & DM_REPORT_FIELD_TYPE_MASK ? "type-specific" : "field-specific", + rh->fields[field_num].id); + return 0; + } + } + + rvw->value = tmp_value; + return 1; +} + +static struct field_selection *_create_field_selection(struct dm_report *rh, + uint32_t field_num, + int implicit, + const char *v, + size_t len, + uint32_t flags, + struct reserved_value_wrapper *rvw, + void *custom) +{ + static const char *_field_selection_value_alloc_failed_msg = "dm_report: struct field_selection_value allocation failed for selection field %s"; + const struct dm_report_field_type *fields = implicit ? _implicit_report_fields + : rh->fields; + struct field_properties *fp, *found = NULL; + struct field_selection *fs; + const char *field_id; + struct time_value *tval; + uint64_t factor; + char *s; + + dm_list_iterate_items(fp, &rh->field_props) { + if ((fp->implicit == implicit) && (fp->field_num == field_num)) { + found = fp; + break; + } + } + + /* The field is neither used in display options nor sort keys. */ + if (!found) { + if (rh->selection->add_new_fields) { + if (!(found = _add_field(rh, field_num, implicit, FLD_HIDDEN))) + return NULL; + rh->report_types |= fields[field_num].type; + } else { + log_error("Unable to create selection with field \'%s\' " + "which is not included in current report.", + implicit ? _implicit_report_fields[field_num].id + : rh->fields[field_num].id); + return NULL; + } + } + + field_id = fields[found->field_num].id; + + if (!(found->flags & flags & DM_REPORT_FIELD_TYPE_MASK)) { + log_error("dm_report: incompatible comparison " + "type for selection field %s", field_id); + return NULL; + } + + /* set up selection */ + if (!(fs = dm_pool_zalloc(rh->selection->mem, sizeof(struct field_selection)))) { + log_error("dm_report: struct field_selection " + "allocation failed for selection field %s", field_id); + return NULL; + } + + if (!(fs->value = dm_pool_zalloc(rh->selection->mem, sizeof(struct field_selection_value)))) { + log_error(_field_selection_value_alloc_failed_msg, field_id); + goto error; + } + + if (((rvw->reserved && (rvw->reserved->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE)) || + (((flags & DM_REPORT_FIELD_TYPE_MASK) == DM_REPORT_FIELD_TYPE_TIME) && + custom && ((struct time_value *) custom)->range)) + && + !(fs->value->next = dm_pool_zalloc(rh->selection->mem, sizeof(struct field_selection_value)))) { + log_error(_field_selection_value_alloc_failed_msg, field_id); + goto error; + } + + fs->fp = found; + fs->flags = flags; + + if (!_get_reserved_value(rh, field_num, rvw)) { + log_error("dm_report: could not get reserved value " + "while processing selection field %s", field_id); + goto error; + } + + /* store comparison operand */ + if (flags & FLD_CMP_REGEX) { + /* REGEX */ + if (!(s = dm_malloc(len + 1))) { + log_error("dm_report: dm_malloc failed to store " + "regex value for selection field %s", field_id); + goto error; + } + memcpy(s, v, len); + s[len] = '\0'; + + fs->value->v.r = dm_regex_create(rh->selection->mem, (const char * const *) &s, 1); + dm_free(s); + if (!fs->value->v.r) { + log_error("dm_report: failed to create regex " + "matcher for selection field %s", field_id); + goto error; + } + } else { + /* STRING, NUMBER, SIZE, PERCENT, STRING_LIST, TIME */ + if (!(s = dm_pool_strndup(rh->selection->mem, v, len))) { + log_error("dm_report: dm_pool_strndup for value " + "of selection field %s", field_id); + goto error; + } + + switch (flags & DM_REPORT_FIELD_TYPE_MASK) { + case DM_REPORT_FIELD_TYPE_STRING: + if (rvw->value) { + fs->value->v.s = (const char *) rvw->value; + if (rvw->reserved->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) + fs->value->next->v.s = (((const char * const *) rvw->value)[1]); + dm_pool_free(rh->selection->mem, s); + } else { + fs->value->v.s = s; + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_STRING, fs->value->v.s, NULL)) { + log_error("String value %s found in selection is reserved.", fs->value->v.s); + goto error; + } + } + break; + case DM_REPORT_FIELD_TYPE_NUMBER: + if (rvw->value) { + fs->value->v.i = *(const uint64_t *) rvw->value; + if (rvw->reserved->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) + fs->value->next->v.i = (((const uint64_t *) rvw->value)[1]); + } else { + errno = 0; + if (((fs->value->v.i = strtoull(s, NULL, 10)) == ULLONG_MAX) && + (errno == ERANGE)) { + log_error(_out_of_range_msg, s, field_id); + goto error; + } + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_NUMBER, &fs->value->v.i, NULL)) { + log_error("Numeric value %" PRIu64 " found in selection is reserved.", fs->value->v.i); + goto error; + } + } + dm_pool_free(rh->selection->mem, s); + break; + case DM_REPORT_FIELD_TYPE_SIZE: + if (rvw->value) { + fs->value->v.d = *(const double *) rvw->value; + if (rvw->reserved->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) + fs->value->next->v.d = (((const double *) rvw->value)[1]); + } else { + errno = 0; + fs->value->v.d = strtod(s, NULL); + if (errno == ERANGE) { + log_error(_out_of_range_msg, s, field_id); + goto error; + } + if (custom && (factor = *((const uint64_t *)custom))) + fs->value->v.d *= factor; + fs->value->v.d /= 512; /* store size in sectors! */ + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_SIZE, &fs->value->v.d, NULL)) { + log_error("Size value %f found in selection is reserved.", fs->value->v.d); + goto error; + } + } + dm_pool_free(rh->selection->mem, s); + break; + case DM_REPORT_FIELD_TYPE_PERCENT: + if (rvw->value) { + fs->value->v.i = *(const uint64_t *) rvw->value; + if (rvw->reserved->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) + fs->value->next->v.i = (((const uint64_t *) rvw->value)[1]); + } else { + errno = 0; + fs->value->v.d = strtod(s, NULL); + if ((errno == ERANGE) || (fs->value->v.d < 0) || (fs->value->v.d > 100)) { + log_error(_out_of_range_msg, s, field_id); + goto error; + } + + fs->value->v.i = (dm_percent_t) (DM_PERCENT_1 * fs->value->v.d); + + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_PERCENT, &fs->value->v.i, NULL)) { + log_error("Percent value %s found in selection is reserved.", s); + goto error; + } + } + break; + case DM_REPORT_FIELD_TYPE_STRING_LIST: + if (!custom) + goto_bad; + fs->value->v.l = *(struct selection_str_list **)custom; + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_STRING_LIST, fs->value->v.l, NULL)) { + log_error("String list value found in selection is reserved."); + goto error; + } + break; + case DM_REPORT_FIELD_TYPE_TIME: + if (rvw->value) { + fs->value->v.t = *(const time_t *) rvw->value; + if (rvw->reserved->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) + fs->value->next->v.t = (((const time_t *) rvw->value)[1]); + } else { + if (!(tval = (struct time_value *) custom)) + goto_bad; + fs->value->v.t = tval->t1; + if (tval->range) + fs->value->next->v.t = tval->t2; + if (_check_value_is_strictly_reserved(rh, field_num, DM_REPORT_FIELD_TYPE_TIME, &fs->value->v.t, NULL)) { + log_error("Time value found in selection is reserved."); + goto error; + } + } + break; + default: + log_error(INTERNAL_ERROR "_create_field_selection: " + "unknown type of selection field %s", field_id); + goto error; + } + } + + return fs; +bad: + log_error(INTERNAL_ERROR "Forbiden NULL custom detected."); +error: + dm_pool_free(rh->selection->mem, fs); + + return NULL; +} + +static struct selection_node *_alloc_selection_node(struct dm_pool *mem, uint32_t type) +{ + struct selection_node *sn; + + if (!(sn = dm_pool_zalloc(mem, sizeof(struct selection_node)))) { + log_error("dm_report: struct selection_node allocation failed"); + return NULL; + } + + dm_list_init(&sn->list); + sn->type = type; + if (!(type & SEL_ITEM)) + dm_list_init(&sn->selection.set); + + return sn; +} + +static void _display_selection_help(struct dm_report *rh) +{ + static const char _grow_object_failed_msg[] = "_display_selection_help: dm_pool_grow_object failed"; + struct op_def *t; + const struct dm_report_reserved_value *rv; + size_t len_all, len_final = 0; + const char **rvs; + char *rvs_all; + + log_warn("Selection operands"); + log_warn("------------------"); + log_warn(" field - Reporting field."); + log_warn(" number - Non-negative integer value."); + log_warn(" size - Floating point value with units, 'm' unit used by default if not specified."); + log_warn(" percent - Non-negative integer with or without %% suffix."); + log_warn(" string - Characters quoted by \' or \" or unquoted."); + log_warn(" string list - Strings enclosed by [ ] or { } and elements delimited by either"); + log_warn(" \"all items must match\" or \"at least one item must match\" operator."); + log_warn(" regular expression - Characters quoted by \' or \" or unquoted."); + log_warn(" "); + if (rh->reserved_values) { + log_warn("Reserved values"); + log_warn("---------------"); + + for (rv = rh->reserved_values; rv->type; rv++) { + for (len_all = 0, rvs = rv->names; *rvs; rvs++) + len_all += strlen(*rvs) + 2; + if (len_all > len_final) + len_final = len_all; + } + + for (rv = rh->reserved_values; rv->type; rv++) { + if (!dm_pool_begin_object(rh->mem, 256)) { + log_error("_display_selection_help: dm_pool_begin_object failed"); + break; + } + for (rvs = rv->names; *rvs; rvs++) { + if (((rvs != rv->names) && !dm_pool_grow_object(rh->mem, ", ", 2)) || + !dm_pool_grow_object(rh->mem, *rvs, strlen(*rvs))) { + log_error(_grow_object_failed_msg); + goto out_reserved_values; + } + } + if (!dm_pool_grow_object(rh->mem, "\0", 1)) { + log_error(_grow_object_failed_msg); + goto out_reserved_values; + } + rvs_all = dm_pool_end_object(rh->mem); + + log_warn(" %-*s - %s [%s]", (int) len_final, rvs_all, rv->description, + _get_field_type_name(rv->type)); + dm_pool_free(rh->mem, rvs_all); + } + log_warn(" "); + } +out_reserved_values: + log_warn("Selection operators"); + log_warn("-------------------"); + log_warn(" Comparison operators:"); + t = _op_cmp; + for (; t->string; t++) + log_warn(" %6s - %s", t->string, t->desc); + log_warn(" "); + log_warn(" Logical and grouping operators:"); + t = _op_log; + for (; t->string; t++) + log_warn(" %4s - %s", t->string, t->desc); + log_warn(" "); +} + +static const char _sel_syntax_error_at_msg[] = "Selection syntax error at '%s'."; +static const char _sel_help_ref_msg[] = "Use \'help\' for selection to get more help."; + +/* + * Selection parser + * + * _parse_* functions + * + * Input: + * s - a pointer to the parsed string + * Output: + * next - a pointer used for next _parse_*'s input, + * next == s if return value is NULL + * return value - a filter node pointer, + * NULL if s doesn't match + */ + +/* + * SELECTION := FIELD_NAME OP_CMP STRING | + * FIELD_NAME OP_CMP NUMBER | + * FIELD_NAME OP_REGEX REGEX + */ +static struct selection_node *_parse_selection(struct dm_report *rh, + const char *s, + const char **next) +{ + struct field_selection *fs; + struct selection_node *sn; + const char *ws, *we; /* field name */ + const char *vs, *ve; /* value */ + const char *last; + uint32_t flags, field_num; + int implicit; + const struct dm_report_field_type *ft; + struct selection_str_list *str_list; + struct reserved_value_wrapper rvw = {0}; + struct time_value tval; + uint64_t factor; + void *custom = NULL; + char *tmp; + char c; + + /* field name */ + if (!(last = _tok_field_name(s, &ws, &we))) { + log_error("Expecting field name"); + goto bad; + } + + /* check if the field with given name exists */ + if (!_get_field(rh, ws, (size_t) (we - ws), &field_num, &implicit)) { + c = we[0]; + tmp = (char *) we; + tmp[0] = '\0'; + _display_fields(rh, 0, 1); + log_warn(" "); + log_error("Unrecognised selection field: %s", ws); + tmp[0] = c; + goto bad; + } + + if (implicit) { + ft = &_implicit_report_fields[field_num]; + if (ft->flags & FLD_CMP_UNCOMPARABLE) { + c = we[0]; + tmp = (char *) we; + tmp[0] = '\0'; + _display_fields(rh, 0, 1); + log_warn(" "); + log_error("Selection field is uncomparable: %s.", ws); + tmp[0] = c; + goto bad; + } + } else + ft = &rh->fields[field_num]; + + /* comparison operator */ + if (!(flags = _tok_op_cmp(we, &last))) { + _display_selection_help(rh); + log_error("Unrecognised comparison operator: %s", we); + goto bad; + } + if (!last) { + _display_selection_help(rh); + log_error("Missing value after operator"); + goto bad; + } + + /* comparison value */ + if (flags & FLD_CMP_REGEX) { + /* + * REGEX value + */ + if (!(last = _tok_value_regex(rh, ft, last, &vs, &ve, &flags, &rvw))) + goto_bad; + } else { + /* + * STRING, NUMBER, SIZE, PERCENT, STRING_LIST, TIME value + */ + if (flags & FLD_CMP_NUMBER) { + if (!(ft->flags & (DM_REPORT_FIELD_TYPE_NUMBER | + DM_REPORT_FIELD_TYPE_SIZE | + DM_REPORT_FIELD_TYPE_PERCENT | + DM_REPORT_FIELD_TYPE_TIME))) { + _display_selection_help(rh); + log_error("Operator can be used only with number, size, time or percent fields: %s", ws); + goto bad; + } + } else if (flags & FLD_CMP_TIME) { + if (!(ft->flags & DM_REPORT_FIELD_TYPE_TIME)) { + _display_selection_help(rh); + log_error("Operator can be used only with time fields: %s", ws); + goto bad; + } + } + + if (ft->flags == DM_REPORT_FIELD_TYPE_SIZE || + ft->flags == DM_REPORT_FIELD_TYPE_NUMBER || + ft->flags == DM_REPORT_FIELD_TYPE_PERCENT) + custom = &factor; + else if (ft->flags & DM_REPORT_FIELD_TYPE_TIME) + custom = &tval; + else if (ft->flags == DM_REPORT_FIELD_TYPE_STRING_LIST) + custom = &str_list; + else + custom = NULL; + if (!(last = _tok_value(rh, ft, field_num, implicit, + last, &vs, &ve, &flags, + &rvw, rh->selection->mem, custom))) + goto_bad; + } + + *next = _skip_space(last); + + /* create selection */ + if (!(fs = _create_field_selection(rh, field_num, implicit, vs, (size_t) (ve - vs), flags, &rvw, custom))) + return_NULL; + + /* create selection node */ + if (!(sn = _alloc_selection_node(rh->selection->mem, SEL_ITEM))) + return_NULL; + + /* add selection to selection node */ + sn->selection.item = fs; + + return sn; +bad: + log_error(_sel_syntax_error_at_msg, s); + log_error(_sel_help_ref_msg); + *next = s; + return NULL; +} + +static struct selection_node *_parse_or_ex(struct dm_report *rh, + const char *s, + const char **next, + struct selection_node *or_sn); + +static struct selection_node *_parse_ex(struct dm_report *rh, + const char *s, + const char **next) +{ + static const char _ps_expected_msg[] = "Syntax error: left parenthesis expected at \'%s\'"; + static const char _pe_expected_msg[] = "Syntax error: right parenthesis expected at \'%s\'"; + struct selection_node *sn = NULL; + uint32_t t; + const char *tmp; + + t = _tok_op_log(s, next, SEL_MODIFIER_NOT | SEL_PRECEDENCE_PS); + if (t == SEL_MODIFIER_NOT) { + /* '!' '(' EXPRESSION ')' */ + if (!_tok_op_log(*next, &tmp, SEL_PRECEDENCE_PS)) { + log_error(_ps_expected_msg, *next); + goto error; + } + if (!(sn = _parse_or_ex(rh, tmp, next, NULL))) + goto error; + sn->type |= SEL_MODIFIER_NOT; + if (!_tok_op_log(*next, &tmp, SEL_PRECEDENCE_PE)) { + log_error(_pe_expected_msg, *next); + goto error; + } + *next = tmp; + } else if (t == SEL_PRECEDENCE_PS) { + /* '(' EXPRESSION ')' */ + if (!(sn = _parse_or_ex(rh, *next, &tmp, NULL))) + goto error; + if (!_tok_op_log(tmp, next, SEL_PRECEDENCE_PE)) { + log_error(_pe_expected_msg, *next); + goto error; + } + } else if ((s = _skip_space(s))) { + /* SELECTION */ + sn = _parse_selection(rh, s, next); + } else { + sn = NULL; + *next = s; + } + + return sn; +error: + *next = s; + return NULL; +} + +/* AND_EXPRESSION := EX (AND_OP AND_EXPRSSION) */ +static struct selection_node *_parse_and_ex(struct dm_report *rh, + const char *s, + const char **next, + struct selection_node *and_sn) +{ + struct selection_node *n; + const char *tmp; + + n = _parse_ex(rh, s, next); + if (!n) + goto error; + + if (!_tok_op_log(*next, &tmp, SEL_AND)) { + if (!and_sn) + return n; + dm_list_add(&and_sn->selection.set, &n->list); + return and_sn; + } + + if (!and_sn) { + if (!(and_sn = _alloc_selection_node(rh->selection->mem, SEL_AND))) + goto error; + } + dm_list_add(&and_sn->selection.set, &n->list); + + return _parse_and_ex(rh, tmp, next, and_sn); +error: + *next = s; + return NULL; +} + +/* OR_EXPRESSION := AND_EXPRESSION (OR_OP OR_EXPRESSION) */ +static struct selection_node *_parse_or_ex(struct dm_report *rh, + const char *s, + const char **next, + struct selection_node *or_sn) +{ + struct selection_node *n; + const char *tmp; + + n = _parse_and_ex(rh, s, next, NULL); + if (!n) + goto error; + + if (!_tok_op_log(*next, &tmp, SEL_OR)) { + if (!or_sn) + return n; + dm_list_add(&or_sn->selection.set, &n->list); + return or_sn; + } + + if (!or_sn) { + if (!(or_sn = _alloc_selection_node(rh->selection->mem, SEL_OR))) + goto error; + } + dm_list_add(&or_sn->selection.set, &n->list); + + return _parse_or_ex(rh, tmp, next, or_sn); +error: + *next = s; + return NULL; +} + +static int _alloc_rh_selection(struct dm_report *rh) +{ + if (!(rh->selection = dm_pool_zalloc(rh->mem, sizeof(struct selection))) || + !(rh->selection->mem = dm_pool_create("report selection", 10 * 1024))) { + log_error("Failed to allocate report selection structure."); + if (rh->selection) + dm_pool_free(rh->mem, rh->selection); + return 0; + } + + return 1; +} + +#define SPECIAL_SELECTION_ALL "all" + +static int _report_set_selection(struct dm_report *rh, const char *selection, int add_new_fields) +{ + struct selection_node *root = NULL; + const char *fin, *next; + + if (rh->selection) { + if (rh->selection->selection_root) + /* Trash any previous selection. */ + dm_pool_free(rh->selection->mem, rh->selection->selection_root); + rh->selection->selection_root = NULL; + } else { + if (!_alloc_rh_selection(rh)) + goto_bad; + } + + if (!selection || !selection[0] || !strcasecmp(selection, SPECIAL_SELECTION_ALL)) + return 1; + + rh->selection->add_new_fields = add_new_fields; + + if (!(root = _alloc_selection_node(rh->selection->mem, SEL_OR))) + return 0; + + if (!_parse_or_ex(rh, selection, &fin, root)) + goto_bad; + + next = _skip_space(fin); + if (*next) { + log_error("Expecting logical operator"); + log_error(_sel_syntax_error_at_msg, next); + log_error(_sel_help_ref_msg); + goto bad; + } + + rh->selection->selection_root = root; + return 1; +bad: + dm_pool_free(rh->selection->mem, root); + return 0; +} + +static void _reset_field_props(struct dm_report *rh) +{ + struct field_properties *fp; + dm_list_iterate_items(fp, &rh->field_props) + fp->width = fp->initial_width; + rh->flags |= RH_FIELD_CALC_NEEDED; +} + +int dm_report_set_selection(struct dm_report *rh, const char *selection) +{ + struct row *row; + + if (!_report_set_selection(rh, selection, 0)) + return_0; + + _reset_field_props(rh); + + dm_list_iterate_items(row, &rh->rows) { + row->selected = _check_report_selection(rh, &row->fields); + if (row->field_sel_status) + _implicit_report_fields[row->field_sel_status->props->field_num].report_fn(rh, + rh->mem, row->field_sel_status, row, rh->private); + } + + return 1; +} + +struct dm_report *dm_report_init_with_selection(uint32_t *report_types, + const struct dm_report_object_type *types, + const struct dm_report_field_type *fields, + const char *output_fields, + const char *output_separator, + uint32_t output_flags, + const char *sort_keys, + const char *selection, + const struct dm_report_reserved_value reserved_values[], + void *private_data) +{ + struct dm_report *rh; + + _implicit_report_fields = _implicit_special_report_fields_with_selection; + + if (!(rh = dm_report_init(report_types, types, fields, output_fields, + output_separator, output_flags, sort_keys, private_data))) + return NULL; + + if (!selection || !selection[0]) { + rh->selection = NULL; + return rh; + } + + if (!_check_reserved_values_supported(fields, reserved_values)) { + log_error(INTERNAL_ERROR "dm_report_init_with_selection: " + "trying to register unsupported reserved value type, " + "skipping report selection"); + return rh; + } + rh->reserved_values = reserved_values; + + if (!strcasecmp(selection, SPECIAL_FIELD_HELP_ID) || + !strcmp(selection, SPECIAL_FIELD_HELP_ALT_ID)) { + _display_fields(rh, 0, 1); + log_warn(" "); + _display_selection_help(rh); + rh->flags |= RH_ALREADY_REPORTED; + return rh; + } + + if (!_report_set_selection(rh, selection, 1)) + goto_bad; + + _dm_report_init_update_types(rh, report_types); + + return rh; +bad: + dm_report_free(rh); + return NULL; +} + +/* + * Print row of headings + */ +static int _report_headings(struct dm_report *rh) +{ + const struct dm_report_field_type *fields; + struct field_properties *fp; + const char *heading; + char *buf = NULL; + size_t buf_size = 0; + + rh->flags |= RH_HEADINGS_PRINTED; + + if (!(rh->flags & DM_REPORT_OUTPUT_HEADINGS)) + return 1; + + if (!dm_pool_begin_object(rh->mem, 128)) { + log_error("dm_report: " + "dm_pool_begin_object failed for headings"); + return 0; + } + + dm_list_iterate_items(fp, &rh->field_props) { + if ((int) buf_size < fp->width) + buf_size = (size_t) fp->width; + } + /* Including trailing '\0'! */ + buf_size++; + + if (!(buf = dm_malloc(buf_size))) { + log_error("dm_report: Could not allocate memory for heading buffer."); + goto bad; + } + + /* First heading line */ + dm_list_iterate_items(fp, &rh->field_props) { + if (fp->flags & FLD_HIDDEN) + continue; + + fields = fp->implicit ? _implicit_report_fields : rh->fields; + + heading = fields[fp->field_num].heading; + if (rh->flags & DM_REPORT_OUTPUT_ALIGNED) { + if (dm_snprintf(buf, buf_size, "%-*.*s", + fp->width, fp->width, heading) < 0) { + log_error("dm_report: snprintf heading failed"); + goto bad; + } + if (!dm_pool_grow_object(rh->mem, buf, fp->width)) { + log_error("dm_report: Failed to generate report headings for printing"); + goto bad; + } + } else if (!dm_pool_grow_object(rh->mem, heading, 0)) { + log_error("dm_report: Failed to generate report headings for printing"); + goto bad; + } + + if (!dm_list_end(&rh->field_props, &fp->list)) + if (!dm_pool_grow_object(rh->mem, rh->separator, 0)) { + log_error("dm_report: Failed to generate report headings for printing"); + goto bad; + } + } + if (!dm_pool_grow_object(rh->mem, "\0", 1)) { + log_error("dm_report: Failed to generate report headings for printing"); + goto bad; + } + + /* print all headings */ + heading = (char *) dm_pool_end_object(rh->mem); + log_print("%s", heading); + + dm_pool_free(rh->mem, (void *)heading); + dm_free(buf); + + return 1; + + bad: + dm_free(buf); + dm_pool_abandon_object(rh->mem); + return 0; +} + +static int _should_display_row(struct row *row) +{ + return row->field_sel_status || row->selected; +} + +static void _recalculate_fields(struct dm_report *rh) +{ + struct row *row; + struct dm_report_field *field; + int len; + + dm_list_iterate_items(row, &rh->rows) { + dm_list_iterate_items(field, &row->fields) { + if ((rh->flags & RH_SORT_REQUIRED) && + (field->props->flags & FLD_SORT_KEY)) { + (*row->sort_fields)[field->props->sort_posn] = field; + } + + if (_should_display_row(row)) { + len = (int) strlen(field->report_string); + if ((len > field->props->width)) + field->props->width = len; + + } + } + } + + rh->flags &= ~RH_FIELD_CALC_NEEDED; +} + +int dm_report_column_headings(struct dm_report *rh) +{ + /* Columns-as-rows does not use _report_headings. */ + if (rh->flags & DM_REPORT_OUTPUT_COLUMNS_AS_ROWS) + return 1; + + if (rh->flags & RH_FIELD_CALC_NEEDED) + _recalculate_fields(rh); + + return _report_headings(rh); +} + +/* + * Sort rows of data + */ +static int _row_compare(const void *a, const void *b) +{ + const struct row *rowa = *(const struct row * const *) a; + const struct row *rowb = *(const struct row * const *) b; + const struct dm_report_field *sfa, *sfb; + uint32_t cnt; + + for (cnt = 0; cnt < rowa->rh->keys_count; cnt++) { + sfa = (*rowa->sort_fields)[cnt]; + sfb = (*rowb->sort_fields)[cnt]; + if ((sfa->props->flags & DM_REPORT_FIELD_TYPE_NUMBER) || + (sfa->props->flags & DM_REPORT_FIELD_TYPE_SIZE) || + (sfa->props->flags & DM_REPORT_FIELD_TYPE_TIME)) { + const uint64_t numa = + *(const uint64_t *) sfa->sort_value; + const uint64_t numb = + *(const uint64_t *) sfb->sort_value; + + if (numa == numb) + continue; + + if (sfa->props->flags & FLD_ASCENDING) { + return (numa > numb) ? 1 : -1; + } else { /* FLD_DESCENDING */ + return (numa < numb) ? 1 : -1; + } + } else { + /* DM_REPORT_FIELD_TYPE_STRING + * DM_REPORT_FIELD_TYPE_STRING_LIST */ + const char *stra = (const char *) sfa->sort_value; + const char *strb = (const char *) sfb->sort_value; + int cmp = strcmp(stra, strb); + + if (!cmp) + continue; + + if (sfa->props->flags & FLD_ASCENDING) { + return (cmp > 0) ? 1 : -1; + } else { /* FLD_DESCENDING */ + return (cmp < 0) ? 1 : -1; + } + } + } + + return 0; /* Identical */ +} + +static int _sort_rows(struct dm_report *rh) +{ + struct row *(*rows)[]; + uint32_t count = 0; + struct row *row; + + if (!(rows = dm_pool_alloc(rh->mem, sizeof(**rows) * + dm_list_size(&rh->rows)))) { + log_error("dm_report: sort array allocation failed"); + return 0; + } + + dm_list_iterate_items(row, &rh->rows) + (*rows)[count++] = row; + + qsort(rows, count, sizeof(**rows), _row_compare); + + dm_list_init(&rh->rows); + while (count--) + dm_list_add_h(&rh->rows, &(*rows)[count]->list); + + return 1; +} + +#define STANDARD_QUOTE "\'" +#define STANDARD_PAIR "=" + +#define JSON_INDENT_UNIT 4 +#define JSON_SPACE " " +#define JSON_QUOTE "\"" +#define JSON_PAIR ":" +#define JSON_SEPARATOR "," +#define JSON_OBJECT_START "{" +#define JSON_OBJECT_END "}" +#define JSON_ARRAY_START "[" +#define JSON_ARRAY_END "]" +#define JSON_ESCAPE_CHAR "\\" + +#define UNABLE_TO_EXTEND_OUTPUT_LINE_MSG "dm_report: Unable to extend output line" + +static int _is_basic_report(struct dm_report *rh) +{ + return rh->group_item && + (rh->group_item->group->type == DM_REPORT_GROUP_BASIC); +} + +static int _is_json_report(struct dm_report *rh) +{ + return rh->group_item && + (rh->group_item->group->type == DM_REPORT_GROUP_JSON); +} + +/* + * Produce report output + */ +static int _output_field(struct dm_report *rh, struct dm_report_field *field) +{ + const struct dm_report_field_type *fields = field->props->implicit ? _implicit_report_fields + : rh->fields; + char *field_id; + int32_t width; + uint32_t align; + const char *repstr; + const char *p1_repstr, *p2_repstr; + char *buf = NULL; + size_t buf_size = 0; + + if (_is_json_report(rh)) { + if (!dm_pool_grow_object(rh->mem, JSON_QUOTE, 1) || + !dm_pool_grow_object(rh->mem, fields[field->props->field_num].id, 0) || + !dm_pool_grow_object(rh->mem, JSON_QUOTE, 1) || + !dm_pool_grow_object(rh->mem, JSON_PAIR, 1) || + !dm_pool_grow_object(rh->mem, JSON_QUOTE, 1)) { + log_error("dm_report: Unable to extend output line"); + return 0; + } + } else if (rh->flags & DM_REPORT_OUTPUT_FIELD_NAME_PREFIX) { + if (!(field_id = dm_strdup(fields[field->props->field_num].id))) { + log_error("dm_report: Failed to copy field name"); + return 0; + } + + if (!dm_pool_grow_object(rh->mem, rh->output_field_name_prefix, 0)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + dm_free(field_id); + return 0; + } + + if (!dm_pool_grow_object(rh->mem, _toupperstr(field_id), 0)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + dm_free(field_id); + return 0; + } + + dm_free(field_id); + + if (!dm_pool_grow_object(rh->mem, STANDARD_PAIR, 1)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + return 0; + } + + if (!(rh->flags & DM_REPORT_OUTPUT_FIELD_UNQUOTED) && + !dm_pool_grow_object(rh->mem, STANDARD_QUOTE, 1)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + return 0; + } + } + + repstr = field->report_string; + width = field->props->width; + if (!(rh->flags & DM_REPORT_OUTPUT_ALIGNED)) { + if (_is_json_report(rh)) { + /* Escape any JSON_QUOTE that may appear in reported string. */ + p1_repstr = repstr; + while ((p2_repstr = strstr(p1_repstr, JSON_QUOTE))) { + if (p2_repstr > p1_repstr) { + if (!dm_pool_grow_object(rh->mem, p1_repstr, p2_repstr - p1_repstr)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + return 0; + } + } + if (!dm_pool_grow_object(rh->mem, JSON_ESCAPE_CHAR, 1) || + !dm_pool_grow_object(rh->mem, JSON_QUOTE, 1)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + return 0; + } + p1_repstr = p2_repstr + 1; + } + + if (!dm_pool_grow_object(rh->mem, p1_repstr, 0)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + return 0; + } + } else { + if (!dm_pool_grow_object(rh->mem, repstr, 0)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + return 0; + } + } + } else { + if (!(align = field->props->flags & DM_REPORT_FIELD_ALIGN_MASK)) + align = ((field->props->flags & DM_REPORT_FIELD_TYPE_NUMBER) || + (field->props->flags & DM_REPORT_FIELD_TYPE_SIZE)) ? + DM_REPORT_FIELD_ALIGN_RIGHT : DM_REPORT_FIELD_ALIGN_LEFT; + + /* Including trailing '\0'! */ + buf_size = width + 1; + if (!(buf = dm_malloc(buf_size))) { + log_error("dm_report: Could not allocate memory for output line buffer."); + return 0; + } + + if (align & DM_REPORT_FIELD_ALIGN_LEFT) { + if (dm_snprintf(buf, buf_size, "%-*.*s", + width, width, repstr) < 0) { + log_error("dm_report: left-aligned snprintf() failed"); + goto bad; + } + if (!dm_pool_grow_object(rh->mem, buf, width)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + } else if (align & DM_REPORT_FIELD_ALIGN_RIGHT) { + if (dm_snprintf(buf, buf_size, "%*.*s", + width, width, repstr) < 0) { + log_error("dm_report: right-aligned snprintf() failed"); + goto bad; + } + if (!dm_pool_grow_object(rh->mem, buf, width)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + } + } + + if (rh->flags & DM_REPORT_OUTPUT_FIELD_NAME_PREFIX) { + if (!(rh->flags & DM_REPORT_OUTPUT_FIELD_UNQUOTED)) { + if (!dm_pool_grow_object(rh->mem, STANDARD_QUOTE, 1)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + } + } else if (_is_json_report(rh)) { + if (!dm_pool_grow_object(rh->mem, JSON_QUOTE, 1)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + } + + dm_free(buf); + return 1; + +bad: + dm_free(buf); + return 0; +} + +static void _destroy_rows(struct dm_report *rh) +{ + /* + * free the first row allocated to this report: since this is a + * pool allocation this will also free all subsequently allocated + * rows from the report and any associated string data. + */ + if (rh->first_row) + dm_pool_free(rh->mem, rh->first_row); + rh->first_row = NULL; + dm_list_init(&rh->rows); + + /* Reset field widths to original values. */ + _reset_field_props(rh); +} + +static int _output_as_rows(struct dm_report *rh) +{ + const struct dm_report_field_type *fields; + struct field_properties *fp; + struct dm_report_field *field; + struct row *row; + + dm_list_iterate_items(fp, &rh->field_props) { + if (fp->flags & FLD_HIDDEN) { + dm_list_iterate_items(row, &rh->rows) { + field = dm_list_item(dm_list_first(&row->fields), struct dm_report_field); + dm_list_del(&field->list); + } + continue; + } + + fields = fp->implicit ? _implicit_report_fields : rh->fields; + + if (!dm_pool_begin_object(rh->mem, 512)) { + log_error("dm_report: Unable to allocate output line"); + return 0; + } + + if ((rh->flags & DM_REPORT_OUTPUT_HEADINGS)) { + if (!dm_pool_grow_object(rh->mem, fields[fp->field_num].heading, 0)) { + log_error("dm_report: Failed to extend row for field name"); + goto bad; + } + if (!dm_pool_grow_object(rh->mem, rh->separator, 0)) { + log_error("dm_report: Failed to extend row with separator"); + goto bad; + } + } + + dm_list_iterate_items(row, &rh->rows) { + if ((field = dm_list_item(dm_list_first(&row->fields), struct dm_report_field))) { + if (!_output_field(rh, field)) + goto bad; + dm_list_del(&field->list); + } + + if (!dm_list_end(&rh->rows, &row->list)) + if (!dm_pool_grow_object(rh->mem, rh->separator, 0)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + } + + if (!dm_pool_grow_object(rh->mem, "\0", 1)) { + log_error("dm_report: Failed to terminate row"); + goto bad; + } + log_print("%s", (char *) dm_pool_end_object(rh->mem)); + } + + _destroy_rows(rh); + + return 1; + + bad: + dm_pool_abandon_object(rh->mem); + return 0; +} + +static int _output_as_columns(struct dm_report *rh) +{ + struct dm_list *fh, *rowh, *ftmp, *rtmp; + struct row *row = NULL; + struct dm_report_field *field; + struct dm_list *last_row; + int do_field_delim; + char *line; + + /* If headings not printed yet, calculate field widths and print them */ + if (!(rh->flags & RH_HEADINGS_PRINTED)) + _report_headings(rh); + + /* Print and clear buffer */ + last_row = dm_list_last(&rh->rows); + dm_list_iterate_safe(rowh, rtmp, &rh->rows) { + row = dm_list_item(rowh, struct row); + + if (!_should_display_row(row)) + continue; + + if (!dm_pool_begin_object(rh->mem, 512)) { + log_error("dm_report: Unable to allocate output line"); + return 0; + } + + if (_is_json_report(rh)) { + if (!dm_pool_grow_object(rh->mem, JSON_OBJECT_START, 0)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + } + + do_field_delim = 0; + + dm_list_iterate_safe(fh, ftmp, &row->fields) { + field = dm_list_item(fh, struct dm_report_field); + if (field->props->flags & FLD_HIDDEN) + continue; + + if (do_field_delim) { + if (_is_json_report(rh)) { + if (!dm_pool_grow_object(rh->mem, JSON_SEPARATOR, 0) || + !dm_pool_grow_object(rh->mem, JSON_SPACE, 0)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + } else { + if (!dm_pool_grow_object(rh->mem, rh->separator, 0)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + } + } else + do_field_delim = 1; + + if (!_output_field(rh, field)) + goto bad; + + if (!(rh->flags & DM_REPORT_OUTPUT_MULTIPLE_TIMES)) + dm_list_del(&field->list); + } + + if (_is_json_report(rh)) { + if (!dm_pool_grow_object(rh->mem, JSON_OBJECT_END, 0)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + if (rowh != last_row && + !dm_pool_grow_object(rh->mem, JSON_SEPARATOR, 0)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + } + + if (!dm_pool_grow_object(rh->mem, "\0", 1)) { + log_error("dm_report: Unable to terminate output line"); + goto bad; + } + + line = (char *) dm_pool_end_object(rh->mem); + log_print("%*s", rh->group_item ? rh->group_item->group->indent + (int) strlen(line) : 0, line); + if (!(rh->flags & DM_REPORT_OUTPUT_MULTIPLE_TIMES)) + dm_list_del(&row->list); + } + + if (!(rh->flags & DM_REPORT_OUTPUT_MULTIPLE_TIMES)) + _destroy_rows(rh); + + return 1; + + bad: + dm_pool_abandon_object(rh->mem); + return 0; +} + +int dm_report_is_empty(struct dm_report *rh) +{ + return dm_list_empty(&rh->rows) ? 1 : 0; +} + +static struct report_group_item *_get_topmost_report_group_item(struct dm_report_group *group) +{ + struct report_group_item *item; + + if (group && !dm_list_empty(&group->items)) + item = dm_list_item(dm_list_first(&group->items), struct report_group_item); + else + item = NULL; + + return item; +} + +static void _json_output_start(struct dm_report_group *group) +{ + if (!group->indent) { + log_print(JSON_OBJECT_START); + group->indent += JSON_INDENT_UNIT; + } +} + +static int _json_output_array_start(struct dm_pool *mem, struct report_group_item *item) +{ + const char *name = (const char *) item->data; + char *output; + + if (!dm_pool_begin_object(mem, 32)) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + return 0; + } + + if (!dm_pool_grow_object(mem, JSON_QUOTE, 1) || + !dm_pool_grow_object(mem, name, 0) || + !dm_pool_grow_object(mem, JSON_QUOTE JSON_PAIR JSON_SPACE JSON_ARRAY_START, 0) || + !dm_pool_grow_object(mem, "\0", 1) || + !(output = dm_pool_end_object(mem))) { + log_error(UNABLE_TO_EXTEND_OUTPUT_LINE_MSG); + goto bad; + } + + if (item->parent->store.finished_count > 0) + log_print("%*s", item->group->indent + (int) sizeof(JSON_SEPARATOR) - 1, JSON_SEPARATOR); + + if (item->parent->parent && item->parent->data) { + log_print("%*s", item->group->indent + (int) sizeof(JSON_OBJECT_START) - 1, JSON_OBJECT_START); + item->group->indent += JSON_INDENT_UNIT; + } + + log_print("%*s", item->group->indent + (int) strlen(output), output); + item->group->indent += JSON_INDENT_UNIT; + + dm_pool_free(mem, output); + return 1; +bad: + dm_pool_abandon_object(mem); + return 0; +} + +static int _prepare_json_report_output(struct dm_report *rh) +{ + _json_output_start(rh->group_item->group); + + if (rh->group_item->output_done && dm_list_empty(&rh->rows)) + return 1; + + /* + * If this report is in JSON group, it must be at the + * top of the stack of reports so the output from + * different reports do not interleave with each other. + */ + if (_get_topmost_report_group_item(rh->group_item->group) != rh->group_item) { + log_error("dm_report: dm_report_output: interleaved reports detected for JSON output"); + return 0; + } + + if (rh->group_item->needs_closing) { + log_error("dm_report: dm_report_output: unfinished JSON output detected"); + return 0; + } + + if (!_json_output_array_start(rh->mem, rh->group_item)) + return_0; + + rh->group_item->needs_closing = 1; + return 1; +} + +static int _print_basic_report_header(struct dm_report *rh) +{ + const char *report_name = (const char *) rh->group_item->data; + size_t len = strlen(report_name); + char *underline; + + if (!(underline = dm_pool_zalloc(rh->mem, len + 1))) + return_0; + + memset(underline, '=', len); + + if (rh->group_item->parent->store.finished_count > 0) + log_print("%s", ""); + log_print("%s", report_name); + log_print("%s", underline); + + dm_pool_free(rh->mem, underline); + return 1; +} + +int dm_report_output(struct dm_report *rh) +{ + int r = 0; + + if (_is_json_report(rh) && + !_prepare_json_report_output(rh)) + return_0; + + if (dm_list_empty(&rh->rows)) { + r = 1; + goto out; + } + + if (rh->flags & RH_FIELD_CALC_NEEDED) + _recalculate_fields(rh); + + if ((rh->flags & RH_SORT_REQUIRED)) + _sort_rows(rh); + + if (_is_basic_report(rh) && !_print_basic_report_header(rh)) + goto_out; + + if ((rh->flags & DM_REPORT_OUTPUT_COLUMNS_AS_ROWS)) + r = _output_as_rows(rh); + else + r = _output_as_columns(rh); +out: + if (r && rh->group_item) + rh->group_item->output_done = 1; + return r; +} + +void dm_report_destroy_rows(struct dm_report *rh) +{ + _destroy_rows(rh); +} + +struct dm_report_group *dm_report_group_create(dm_report_group_type_t type, void *data) +{ + struct dm_report_group *group; + struct dm_pool *mem; + struct report_group_item *item; + + if (!(mem = dm_pool_create("report_group", 1024))) { + log_error("dm_report: dm_report_init_group: failed to allocate mem pool"); + return NULL; + } + + if (!(group = dm_pool_zalloc(mem, sizeof(*group)))) { + log_error("dm_report: failed to allocate report group structure"); + goto bad; + } + + group->mem = mem; + group->type = type; + dm_list_init(&group->items); + + if (!(item = dm_pool_zalloc(mem, sizeof(*item)))) { + log_error("dm_report: faile to allocate root report group item"); + goto bad; + } + + dm_list_add_h(&group->items, &item->list); + + return group; +bad: + dm_pool_destroy(mem); + return NULL; +} + +static int _report_group_push_single(struct report_group_item *item, void *data) +{ + struct report_group_item *item_iter; + unsigned count = 0; + + dm_list_iterate_items(item_iter, &item->group->items) { + if (item_iter->report) + count++; + } + + if (count > 1) { + log_error("dm_report: unable to add more than one report " + "to current report group"); + return 0; + } + + return 1; +} + +static int _report_group_push_basic(struct report_group_item *item, const char *name) +{ + if (item->report) { + if (!(item->report->flags & DM_REPORT_OUTPUT_BUFFERED)) + item->report->flags &= ~(DM_REPORT_OUTPUT_MULTIPLE_TIMES); + } else { + if (!name && item->parent->store.finished_count > 0) + log_print("%s", ""); + } + + return 1; +} + +static int _report_group_push_json(struct report_group_item *item, const char *name) +{ + if (name && !(item->data = dm_pool_strdup(item->group->mem, name))) { + log_error("dm_report: failed to duplicate json item name"); + return 0; + } + + if (item->report) { + item->report->flags &= ~(DM_REPORT_OUTPUT_ALIGNED | + DM_REPORT_OUTPUT_HEADINGS | + DM_REPORT_OUTPUT_COLUMNS_AS_ROWS); + item->report->flags |= DM_REPORT_OUTPUT_BUFFERED; + } else { + _json_output_start(item->group); + if (name) { + if (!_json_output_array_start(item->group->mem, item)) + return_0; + } else { + if (!item->parent->parent) { + log_error("dm_report: can't use unnamed object at top level of JSON output"); + return 0; + } + if (item->parent->store.finished_count > 0) + log_print("%*s", item->group->indent + (int) sizeof(JSON_SEPARATOR) - 1, JSON_SEPARATOR); + log_print("%*s", item->group->indent + (int) sizeof(JSON_OBJECT_START) - 1, JSON_OBJECT_START); + item->group->indent += JSON_INDENT_UNIT; + } + + item->output_done = 1; + item->needs_closing = 1; + } + + return 1; +} + +int dm_report_group_push(struct dm_report_group *group, struct dm_report *report, void *data) +{ + struct report_group_item *item, *tmp_item; + + if (!group) + return 1; + + if (!(item = dm_pool_zalloc(group->mem, sizeof(*item)))) { + log_error("dm_report: dm_report_group_push: group item allocation failed"); + return 0; + } + + if ((item->report = report)) { + item->store.orig_report_flags = report->flags; + report->group_item = item; + } + + item->group = group; + item->data = data; + + dm_list_iterate_items(tmp_item, &group->items) { + if (!tmp_item->report) { + item->parent = tmp_item; + break; + } + } + + dm_list_add_h(&group->items, &item->list); + + switch (group->type) { + case DM_REPORT_GROUP_SINGLE: + if (!_report_group_push_single(item, data)) + goto_bad; + break; + case DM_REPORT_GROUP_BASIC: + if (!_report_group_push_basic(item, data)) + goto_bad; + break; + case DM_REPORT_GROUP_JSON: + if (!_report_group_push_json(item, data)) + goto_bad; + break; + default: + goto_bad; + } + + return 1; +bad: + dm_list_del(&item->list); + dm_pool_free(group->mem, item); + return 0; +} + +static int _report_group_pop_single(struct report_group_item *item) +{ + return 1; +} + +static int _report_group_pop_basic(struct report_group_item *item) +{ + return 1; +} + +static int _report_group_pop_json(struct report_group_item *item) +{ + if (item->output_done && item->needs_closing) { + if (item->data) { + item->group->indent -= JSON_INDENT_UNIT; + log_print("%*s", item->group->indent + (int) sizeof(JSON_ARRAY_END) - 1, JSON_ARRAY_END); + } + if (item->parent->data && item->parent->parent) { + item->group->indent -= JSON_INDENT_UNIT; + log_print("%*s", item->group->indent + (int) sizeof(JSON_OBJECT_END) - 1, JSON_OBJECT_END); + } + item->needs_closing = 0; + } + + return 1; +} + +int dm_report_group_pop(struct dm_report_group *group) +{ + struct report_group_item *item; + + if (!group) + return 1; + + if (!(item = _get_topmost_report_group_item(group))) { + log_error("dm_report: dm_report_group_pop: group has no items"); + return 0; + } + + switch (group->type) { + case DM_REPORT_GROUP_SINGLE: + if (!_report_group_pop_single(item)) + return_0; + break; + case DM_REPORT_GROUP_BASIC: + if (!_report_group_pop_basic(item)) + return_0; + break; + case DM_REPORT_GROUP_JSON: + if (!_report_group_pop_json(item)) + return_0; + break; + default: + return 0; + } + + dm_list_del(&item->list); + + if (item->report) { + item->report->flags = item->store.orig_report_flags; + item->report->group_item = NULL; + } + + if (item->parent) + item->parent->store.finished_count++; + + dm_pool_free(group->mem, item); + return 1; +} + +int dm_report_group_output_and_pop_all(struct dm_report_group *group) +{ + struct report_group_item *item, *tmp_item; + + dm_list_iterate_items_safe(item, tmp_item, &group->items) { + if (!item->parent) { + item->store.finished_count = 0; + continue; + } + if (item->report && !dm_report_output(item->report)) + return_0; + if (!dm_report_group_pop(group)) + return_0; + } + + if (group->type == DM_REPORT_GROUP_JSON) { + _json_output_start(group); + log_print(JSON_OBJECT_END); + group->indent -= JSON_INDENT_UNIT; + } + + return 1; +} + +int dm_report_group_destroy(struct dm_report_group *group) +{ + int r = 1; + + if (!group) + return 1; + + if (!dm_report_group_output_and_pop_all(group)) + r = 0; + + dm_pool_destroy(group->mem); + return r; +} diff --git a/device_mapper/libdm-stats.c b/device_mapper/libdm-stats.c new file mode 100644 index 0000000..6cd08a7 --- /dev/null +++ b/device_mapper/libdm-stats.c @@ -0,0 +1,5095 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. All rights reserved. + * + * _stats_get_extents_for_file() based in part on filefrag_fiemap() from + * e2fsprogs/misc/filefrag.c. Copyright 2003 by Theodore Ts'o. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" +#include "misc/kdev_t.h" + +#include "math.h" /* log10() */ + +#include <sys/sysmacros.h> +#include <sys/ioctl.h> +#include <sys/vfs.h> /* fstatfs */ +#include <unistd.h> + +#ifdef __linux__ + #include <linux/fs.h> /* FS_IOC_FIEMAP */ +#endif + +#ifdef HAVE_LINUX_FIEMAP_H + #include <linux/fiemap.h> /* fiemap */ +#endif + +#ifdef HAVE_LINUX_MAGIC_H + #include <linux/magic.h> /* BTRFS_SUPER_MAGIC */ +#endif + +#define DM_STATS_REGION_NOT_PRESENT UINT64_MAX +#define DM_STATS_GROUP_NOT_PRESENT DM_STATS_GROUP_NONE + +#define NSEC_PER_USEC 1000L +#define NSEC_PER_MSEC 1000000L +#define NSEC_PER_SEC 1000000000L + +#define PRECISE_ARG "precise_timestamps" +#define HISTOGRAM_ARG "histogram:" + +#define STATS_ROW_BUF_LEN 4096 +#define STATS_MSG_BUF_LEN 1024 +#define STATS_FIE_BUF_LEN 2048 + +#define SECTOR_SHIFT 9L + +/* Histogram bin */ +struct dm_histogram_bin { + uint64_t upper; /* Upper bound on this bin. */ + uint64_t count; /* Count value for this bin. */ +}; + +struct dm_histogram { + /* The stats handle this histogram belongs to. */ + const struct dm_stats *dms; + /* The region this histogram belongs to. */ + const struct dm_stats_region *region; + uint64_t sum; /* Sum of histogram bin counts. */ + int nr_bins; /* Number of histogram bins assigned. */ + struct dm_histogram_bin bins[0]; +}; + +/* + * See Documentation/device-mapper/statistics.txt for full descriptions + * of the device-mapper statistics counter fields. + */ +struct dm_stats_counters { + uint64_t reads; /* Num reads completed */ + uint64_t reads_merged; /* Num reads merged */ + uint64_t read_sectors; /* Num sectors read */ + uint64_t read_nsecs; /* Num milliseconds spent reading */ + uint64_t writes; /* Num writes completed */ + uint64_t writes_merged; /* Num writes merged */ + uint64_t write_sectors; /* Num sectors written */ + uint64_t write_nsecs; /* Num milliseconds spent writing */ + uint64_t io_in_progress; /* Num I/Os currently in progress */ + uint64_t io_nsecs; /* Num milliseconds spent doing I/Os */ + uint64_t weighted_io_nsecs; /* Weighted num milliseconds doing I/Os */ + uint64_t total_read_nsecs; /* Total time spent reading in milliseconds */ + uint64_t total_write_nsecs; /* Total time spent writing in milliseconds */ + struct dm_histogram *histogram; /* Histogram. */ +}; + +struct dm_stats_region { + uint64_t region_id; /* as returned by @stats_list */ + uint64_t group_id; + uint64_t start; + uint64_t len; + uint64_t step; + char *program_id; + char *aux_data; + uint64_t timescale; /* precise_timestamps is per-region */ + struct dm_histogram *bounds; /* histogram configuration */ + struct dm_histogram *histogram; /* aggregate cache */ + struct dm_stats_counters *counters; +}; + +struct dm_stats_group { + uint64_t group_id; + const char *alias; + dm_bitset_t regions; + struct dm_histogram *histogram; +}; + +struct dm_stats { + /* device binding */ + int bind_major; /* device major that this dm_stats object is bound to */ + int bind_minor; /* device minor that this dm_stats object is bound to */ + char *bind_name; /* device-mapper device name */ + char *bind_uuid; /* device-mapper UUID */ + char *program_id; /* default program_id for this handle */ + const char *name; /* cached device_name used for reporting */ + struct dm_pool *mem; /* memory pool for region and counter tables */ + struct dm_pool *hist_mem; /* separate pool for histogram tables */ + struct dm_pool *group_mem; /* separate pool for group tables */ + uint64_t nr_regions; /* total number of present regions */ + uint64_t max_region; /* size of the regions table */ + uint64_t interval_ns; /* sampling interval in nanoseconds */ + uint64_t timescale; /* default sample value multiplier */ + int precise; /* use precise_timestamps when creating regions */ + struct dm_stats_region *regions; + struct dm_stats_group *groups; + /* statistics cursor */ + uint64_t walk_flags; /* walk control flags */ + uint64_t cur_flags; + uint64_t cur_group; + uint64_t cur_region; + uint64_t cur_area; +}; + +#define PROC_SELF_COMM "/proc/self/comm" +static char *_program_id_from_proc(void) +{ + FILE *comm = NULL; + char buf[STATS_ROW_BUF_LEN]; + + if (!(comm = fopen(PROC_SELF_COMM, "r"))) + return_NULL; + + if (!fgets(buf, sizeof(buf), comm)) { + log_error("Could not read from %s", PROC_SELF_COMM); + if (fclose(comm)) + stack; + return NULL; + } + + if (fclose(comm)) + stack; + + return dm_strdup(buf); +} + +static uint64_t _nr_areas(uint64_t len, uint64_t step) +{ + /* Default is one area. */ + if (!len || !step) + return 1; + /* + * drivers/md/dm-stats.c::message_stats_create() + * A region may be sub-divided into areas with their own counters. + * Any partial area at the end of the region is treated as an + * additional complete area. + */ + return (len + step - 1) / step; +} + +static uint64_t _nr_areas_region(struct dm_stats_region *region) +{ + return _nr_areas(region->len, region->step); +} + +struct dm_stats *dm_stats_create(const char *program_id) +{ + size_t hist_hint = sizeof(struct dm_histogram_bin); + size_t group_hint = sizeof(struct dm_stats_group); + struct dm_stats *dms = NULL; + + if (!(dms = dm_zalloc(sizeof(*dms)))) + return_NULL; + + /* FIXME: better hint. */ + if (!(dms->mem = dm_pool_create("stats_pool", 4096))) { + dm_free(dms); + return_NULL; + } + + if (!(dms->hist_mem = dm_pool_create("histogram_pool", hist_hint))) + goto_bad; + + if (!(dms->group_mem = dm_pool_create("group_pool", group_hint))) + goto_bad; + + if (!program_id || !strlen(program_id)) + dms->program_id = _program_id_from_proc(); + else + dms->program_id = dm_strdup(program_id); + + if (!dms->program_id) { + log_error("Could not allocate memory for program_id"); + goto bad; + } + + dms->bind_major = -1; + dms->bind_minor = -1; + dms->bind_name = NULL; + dms->bind_uuid = NULL; + + dms->name = NULL; + + /* by default all regions use msec precision */ + dms->timescale = NSEC_PER_MSEC; + dms->precise = 0; + + dms->nr_regions = DM_STATS_REGION_NOT_PRESENT; + dms->max_region = DM_STATS_REGION_NOT_PRESENT; + dms->regions = NULL; + + /* maintain compatibility with earlier walk version */ + dms->walk_flags = dms->cur_flags = DM_STATS_WALK_DEFAULT; + + return dms; + +bad: + dm_pool_destroy(dms->mem); + if (dms->hist_mem) + dm_pool_destroy(dms->hist_mem); + if (dms->group_mem) + dm_pool_destroy(dms->group_mem); + dm_free(dms); + return NULL; +} + +/* + * Test whether the stats region pointed to by region is present. + */ +static int _stats_region_present(const struct dm_stats_region *region) +{ + return !(region->region_id == DM_STATS_REGION_NOT_PRESENT); +} + +/* + * Test whether the stats group pointed to by group is present. + */ +static int _stats_group_present(const struct dm_stats_group *group) +{ + return !(group->group_id == DM_STATS_GROUP_NOT_PRESENT); +} + +/* + * Test whether a stats group id is present. + */ +static int _stats_group_id_present(const struct dm_stats *dms, uint64_t id) +{ + struct dm_stats_group *group = NULL; + + if (id == DM_STATS_GROUP_NOT_PRESENT) + return 0; + + if (!dms) + return_0; + + if (!dms->regions) + return 0; + + if (id > dms->max_region) + return 0; + + group = &dms->groups[id]; + + return _stats_group_present(group); +} + +/* + * Test whether the given region_id is a member of any group. + */ +static uint64_t _stats_region_is_grouped(const struct dm_stats* dms, + uint64_t region_id) +{ + uint64_t group_id; + + if (region_id == DM_STATS_GROUP_NOT_PRESENT) + return 0; + + if (!_stats_region_present(&dms->regions[region_id])) + return 0; + + group_id = dms->regions[region_id].group_id; + + return group_id != DM_STATS_GROUP_NOT_PRESENT; +} + +static void _stats_histograms_destroy(struct dm_pool *mem, + struct dm_stats_region *region) +{ + /* Unpopulated handle. */ + if (!region->counters) + return; + + /* + * Free everything in the pool back to the first histogram. + */ + if (region->counters[0].histogram) + dm_pool_free(mem, region->counters[0].histogram); +} + +static void _stats_region_destroy(struct dm_stats_region *region) +{ + if (!_stats_region_present(region)) + return; + + region->start = region->len = region->step = 0; + region->timescale = 0; + + /* + * Don't free counters and histogram bounds here: they are + * dropped from the pool along with the corresponding + * regions table. + * + * The following objects are all allocated with dm_malloc. + */ + + region->counters = NULL; + region->bounds = NULL; + + dm_free(region->program_id); + region->program_id = NULL; + dm_free(region->aux_data); + region->aux_data = NULL; + region->region_id = DM_STATS_REGION_NOT_PRESENT; +} + +static void _stats_regions_destroy(struct dm_stats *dms) +{ + struct dm_pool *mem = dms->mem; + uint64_t i; + + if (!dms->regions) + return; + + /* walk backwards to obey pool order */ + for (i = dms->max_region; (i != DM_STATS_REGION_NOT_PRESENT); i--) { + _stats_histograms_destroy(dms->hist_mem, &dms->regions[i]); + _stats_region_destroy(&dms->regions[i]); + } + + dm_pool_free(mem, dms->regions); + dms->regions = NULL; +} + +static void _stats_group_destroy(struct dm_stats_group *group) +{ + if (!_stats_group_present(group)) + return; + + group->histogram = NULL; + + if (group->alias) { + dm_free((char *) group->alias); + group->alias = NULL; + } + if (group->regions) { + dm_bitset_destroy(group->regions); + group->regions = NULL; + } + group->group_id = DM_STATS_GROUP_NOT_PRESENT; +} + +static void _stats_groups_destroy(struct dm_stats *dms) +{ + uint64_t i; + + if (!dms->groups) + return; + + for (i = dms->max_region; (i != DM_STATS_REGION_NOT_PRESENT); i--) + _stats_group_destroy(&dms->groups[i]); + dm_pool_free(dms->group_mem, dms->groups); + dms->groups = NULL; +} + +static int _set_stats_device(struct dm_stats *dms, struct dm_task *dmt) +{ + if (dms->bind_name) + return dm_task_set_name(dmt, dms->bind_name); + if (dms->bind_uuid) + return dm_task_set_uuid(dmt, dms->bind_uuid); + if (dms->bind_major > 0) + return dm_task_set_major(dmt, dms->bind_major) + && dm_task_set_minor(dmt, dms->bind_minor); + return_0; +} + +static int _stats_bound(const struct dm_stats *dms) +{ + if (dms->bind_major > 0 || dms->bind_name || dms->bind_uuid) + return 1; + /* %p format specifier expects a void pointer. */ + log_error("Stats handle at %p is not bound.", dms); + return 0; +} + +static void _stats_clear_binding(struct dm_stats *dms) +{ + if (dms->bind_name) + dm_pool_free(dms->mem, dms->bind_name); + if (dms->bind_uuid) + dm_pool_free(dms->mem, dms->bind_uuid); + dm_free((char *) dms->name); + + dms->bind_name = dms->bind_uuid = NULL; + dms->bind_major = dms->bind_minor = -1; + dms->name = NULL; +} + +int dm_stats_bind_devno(struct dm_stats *dms, int major, int minor) +{ + _stats_clear_binding(dms); + _stats_regions_destroy(dms); + _stats_groups_destroy(dms); + + dms->bind_major = major; + dms->bind_minor = minor; + + return 1; +} + +int dm_stats_bind_name(struct dm_stats *dms, const char *name) +{ + _stats_clear_binding(dms); + _stats_regions_destroy(dms); + _stats_groups_destroy(dms); + + if (!(dms->bind_name = dm_pool_strdup(dms->mem, name))) + return_0; + + return 1; +} + +int dm_stats_bind_uuid(struct dm_stats *dms, const char *uuid) +{ + _stats_clear_binding(dms); + _stats_regions_destroy(dms); + _stats_groups_destroy(dms); + + if (!(dms->bind_uuid = dm_pool_strdup(dms->mem, uuid))) + return_0; + + return 1; +} + +int dm_stats_bind_from_fd(struct dm_stats *dms, int fd) +{ + int major, minor; + struct stat buf; + + if (fstat(fd, &buf)) { + log_error("fstat failed for fd %d.", fd); + return 0; + } + + major = (int) MAJOR(buf.st_dev); + minor = (int) MINOR(buf.st_dev); + + if (!dm_stats_bind_devno(dms, major, minor)) + return_0; + return 1; +} + +static int _stats_check_precise_timestamps(const struct dm_stats *dms) +{ + /* Already checked? */ + if (dms && dms->precise) + return 1; + + return dm_message_supports_precise_timestamps(); +} + +int dm_stats_driver_supports_precise(void) +{ + return _stats_check_precise_timestamps(NULL); +} + +int dm_stats_driver_supports_histogram(void) +{ + return _stats_check_precise_timestamps(NULL); +} + +static int _fill_hist_arg(char *hist_arg, size_t hist_len, uint64_t scale, + struct dm_histogram *bounds) +{ + int i, l, len = 0, nr_bins; + char *arg = hist_arg; + uint64_t value; + + nr_bins = bounds->nr_bins; + + for (i = 0; i < nr_bins; i++) { + value = bounds->bins[i].upper / scale; + if ((l = dm_snprintf(arg, hist_len - len, FMTu64"%s", value, + (i == (nr_bins - 1)) ? "" : ",")) < 0) + return_0; + len += l; + arg += l; + } + return 1; +} + +static void *_get_hist_arg(struct dm_histogram *bounds, uint64_t scale, + size_t *len) +{ + struct dm_histogram_bin *entry, *bins; + size_t hist_len = 1; /* terminating '\0' */ + double value; + + entry = bins = bounds->bins; + + entry += bounds->nr_bins - 1; + while(entry >= bins) { + value = (double) (entry--)->upper; + /* Use lround to avoid size_t -> double cast warning. */ + hist_len += 1 + (size_t) lround(log10(value / scale)); + if (entry != bins) + hist_len++; /* ',' */ + } + + *len = hist_len; + + return dm_zalloc(hist_len); +} + +static char *_build_histogram_arg(struct dm_histogram *bounds, int *precise) +{ + struct dm_histogram_bin *entry, *bins; + size_t hist_len; + char *hist_arg; + uint64_t scale; + + entry = bins = bounds->bins; + + /* Empty histogram is invalid. */ + if (!bounds->nr_bins) { + log_error("Cannot format empty histogram description."); + return NULL; + } + + /* Validate entries and set *precise if precision < 1ms. */ + entry += bounds->nr_bins - 1; + while (entry >= bins) { + if (entry != bins) { + if (entry->upper < (entry - 1)->upper) { + log_error("Histogram boundaries must be in " + "order of increasing magnitude."); + return 0; + } + } + + /* + * Only enable precise_timestamps automatically if any + * value in the histogram bounds uses precision < 1ms. + */ + if (((entry--)->upper % NSEC_PER_MSEC) && !*precise) + *precise = 1; + } + + scale = (*precise) ? 1 : NSEC_PER_MSEC; + + /* Calculate hist_len and allocate a character buffer. */ + if (!(hist_arg = _get_hist_arg(bounds, scale, &hist_len))) { + log_error("Could not allocate memory for histogram argument."); + return 0; + } + + /* Fill hist_arg with boundary strings. */ + if (!_fill_hist_arg(hist_arg, hist_len, scale, bounds)) + goto_bad; + + return hist_arg; + +bad: + log_error("Could not build histogram arguments."); + dm_free(hist_arg); + + return NULL; +} + +static struct dm_task *_stats_send_message(struct dm_stats *dms, char *msg) +{ + struct dm_task *dmt; + + if (!(dmt = dm_task_create(DM_DEVICE_TARGET_MSG))) + return_0; + + if (!_set_stats_device(dms, dmt)) + goto_bad; + + if (!dm_task_set_message(dmt, msg)) + goto_bad; + + if (!dm_task_run(dmt)) + goto_bad; + + return dmt; + +bad: + dm_task_destroy(dmt); + return NULL; +} + +/* + * Cache the dm device_name for the device bound to dms. + */ +static int _stats_set_name_cache(struct dm_stats *dms) +{ + struct dm_task *dmt; + + if (dms->name) + return 1; + + if (!(dmt = dm_task_create(DM_DEVICE_INFO))) + return_0; + + if (!_set_stats_device(dms, dmt)) + goto_bad; + + if (!dm_task_run(dmt)) + goto_bad; + + if (!(dms->name = dm_strdup(dm_task_get_name(dmt)))) + goto_bad; + + dm_task_destroy(dmt); + + return 1; + +bad: + log_error("Could not retrieve device-mapper name for device."); + dm_task_destroy(dmt); + return 0; +} + +/* + * update region group_id values + */ +static void _stats_update_groups(struct dm_stats *dms) +{ + struct dm_stats_group *group; + uint64_t group_id, i; + + for (group_id = 0; group_id < dms->max_region + 1; group_id++) { + if (!_stats_group_id_present(dms, group_id)) + continue; + + group = &dms->groups[group_id]; + + for (i = dm_bit_get_first(group->regions); + i != DM_STATS_GROUP_NOT_PRESENT; + i = dm_bit_get_next(group->regions, i)) + dms->regions[i].group_id = group_id; + } +} + +static void _check_group_regions_present(struct dm_stats *dms, + struct dm_stats_group *group) +{ + dm_bitset_t regions = group->regions; + int64_t i, group_id; + + group_id = i = dm_bit_get_first(regions); + + for (; i > 0; i = dm_bit_get_next(regions, i)) + if (!_stats_region_present(&dms->regions[i])) { + log_warn("Group descriptor " FMTd64 " contains " + "non-existent region_id " FMTd64 ".", + group_id, i); + dm_bit_clear(regions, i); + } +} + +/* + * Parse a DMS_GROUP group descriptor embedded in a region's aux_data. + * + * DMS_GROUP="ALIAS:MEMBERS" + * + * ALIAS: group alias + * MEMBERS: list of group member region ids. + * + */ +#define DMS_GROUP_TAG "DMS_GROUP=" +#define DMS_GROUP_TAG_LEN (sizeof(DMS_GROUP_TAG) - 1) +#define DMS_GROUP_SEP ':' +#define DMS_AUX_SEP "#" + +static int _parse_aux_data_group(struct dm_stats *dms, + struct dm_stats_region *region, + struct dm_stats_group *group) +{ + char *alias, *c, *end; + dm_bitset_t regions; + + memset(group, 0, sizeof(*group)); + group->group_id = DM_STATS_GROUP_NOT_PRESENT; + + /* find start of group tag */ + c = strstr(region->aux_data, DMS_GROUP_TAG); + if (!c) + return 1; /* no group is not an error */ + + alias = c + strlen(DMS_GROUP_TAG); + + c = strchr(c, DMS_GROUP_SEP); + + if (!c) { + log_error("Found malformed group tag while reading aux_data"); + return 0; + } + + /* terminate alias and advance to members */ + *(c++) = '\0'; + + log_debug("Read alias '%s' from aux_data", alias); + + if (!c) { + log_error("Found malformed group descriptor while " + "reading aux_data, expected '%c'", DMS_GROUP_SEP); + return 0; + } + + /* if user aux_data follows make sure we have a terminated + * string to pass to dm_bitset_parse_list(). + */ + end = strstr(c, DMS_AUX_SEP); + if (!end) + end = c + strlen(c); + *(end++) = '\0'; + + if (!(regions = dm_bitset_parse_list(c, NULL, 0))) { + log_error("Could not parse member list while " + "reading group aux_data"); + return 0; + } + + group->group_id = dm_bit_get_first(regions); + if (group->group_id != region->region_id) { + log_error("Found invalid group descriptor in region " FMTu64 + " aux_data.", region->region_id); + group->group_id = DM_STATS_GROUP_NOT_PRESENT; + goto bad; + } + + group->regions = regions; + group->alias = NULL; + if (strlen(alias)) { + group->alias = dm_strdup(alias); + if (!group->alias) { + log_error("Could not allocate memory for group alias"); + goto bad; + } + } + + /* separate group tag from user aux_data */ + if ((strlen(end) > 1) || strncmp(end, "-", 1)) + c = dm_strdup(end); + else + c = dm_strdup(""); + + if (!c) { + log_error("Could not allocate memory for user aux_data"); + goto bad_alias; + } + + dm_free(region->aux_data); + region->aux_data = c; + + log_debug("Found group_id " FMTu64 ": alias=\"%s\"", group->group_id, + (group->alias) ? group->alias : ""); + + return 1; + +bad_alias: + dm_free((char *) group->alias); +bad: + dm_bitset_destroy(regions); + return 0; +} + +/* + * Parse a histogram specification returned by the kernel in a + * @stats_list response. + */ +static int _stats_parse_histogram_spec(struct dm_stats *dms, + struct dm_stats_region *region, + const char *histogram) +{ + static const char _valid_chars[] = "0123456789,"; + uint64_t scale = region->timescale, this_val = 0; + struct dm_pool *mem = dms->hist_mem; + struct dm_histogram_bin cur; + struct dm_histogram hist; + int nr_bins = 1; + const char *c, *v, *val_start; + char *p, *endptr = NULL; + + /* Advance past "histogram:". */ + histogram = strchr(histogram, ':'); + if (!histogram) { + log_error("Could not parse histogram description."); + return 0; + } + histogram++; + + /* @stats_list rows are newline terminated. */ + if ((p = strchr(histogram, '\n'))) + *p = '\0'; + + if (!dm_pool_begin_object(mem, sizeof(cur))) + return_0; + + memset(&hist, 0, sizeof(hist)); + + hist.nr_bins = 0; /* fix later */ + hist.region = region; + hist.dms = dms; + + if (!dm_pool_grow_object(mem, &hist, sizeof(hist))) + goto_bad; + + c = histogram; + do { + for (v = _valid_chars; *v; v++) + if (*c == *v) + break; + if (!*v) { + stack; + goto badchar; + } + + if (*c == ',') { + log_error("Invalid histogram description: %s", + histogram); + goto bad; + } else { + val_start = c; + endptr = NULL; + + errno = 0; + this_val = strtoull(val_start, &endptr, 10); + if (errno || !endptr) { + log_error("Could not parse histogram boundary."); + goto bad; + } + + c = endptr; /* Advance to units, comma, or end. */ + + if (*c == ',') + c++; + else if (*c || (*c == ' ')) { /* Expected ',' or NULL. */ + stack; + goto badchar; + } + + if (*c == ',') + c++; + + cur.upper = scale * this_val; + cur.count = 0; + + if (!dm_pool_grow_object(mem, &cur, sizeof(cur))) + goto_bad; + + nr_bins++; + } + } while (*c && (*c != ' ')); + + /* final upper bound. */ + cur.upper = UINT64_MAX; + if (!dm_pool_grow_object(mem, &cur, sizeof(cur))) + goto_bad; + + region->bounds = dm_pool_end_object(mem); + + if (!region->bounds) + return_0; + + region->bounds->nr_bins = nr_bins; + + log_debug("Added region histogram spec with %d entries.", nr_bins); + return 1; + +badchar: + log_error("Invalid character in histogram: '%c' (0x%x)", *c, *c); +bad: + dm_pool_abandon_object(mem); + return 0; +} + +static int _stats_parse_list_region(struct dm_stats *dms, + struct dm_stats_region *region, char *line) +{ + char *p = NULL, string_data[STATS_ROW_BUF_LEN]; + char *program_id, *aux_data, *stats_args; + char *empty_string = (char *) ""; + int r; + + memset(string_data, 0, sizeof(string_data)); + + /* + * Parse fixed fields, line format: + * + * <region_id>: <start_sector>+<length> <step> <string data> + * + * Maximum string data size is 4096 - 1 bytes. + */ + r = sscanf(line, FMTu64 ": " FMTu64 "+" FMTu64 " " FMTu64 " %4095c", + &region->region_id, &region->start, &region->len, + &region->step, string_data); + + if (r != 5) + return_0; + + /* program_id is guaranteed to be first. */ + program_id = string_data; + + /* + * FIXME: support embedded '\ ' in string data: + * s/strchr/_find_unescaped_space()/ + */ + if ((p = strchr(string_data, ' '))) { + /* terminate program_id string. */ + *p = '\0'; + if (!strncmp(program_id, "-", 1)) + program_id = empty_string; + aux_data = p + 1; + if ((p = strchr(aux_data, ' '))) { + /* terminate aux_data string. */ + *p = '\0'; + stats_args = p + 1; + } else + stats_args = empty_string; + + /* no aux_data? */ + if (!strncmp(aux_data, "-", 1)) + aux_data = empty_string; + else + /* remove trailing newline */ + aux_data[strlen(aux_data) - 1] = '\0'; + } else + aux_data = stats_args = empty_string; + + if (strstr(stats_args, PRECISE_ARG)) + region->timescale = 1; + else + region->timescale = NSEC_PER_MSEC; + + if ((p = strstr(stats_args, HISTOGRAM_ARG))) { + if (!_stats_parse_histogram_spec(dms, region, p)) + return_0; + } else + region->bounds = NULL; + + /* clear aggregate cache */ + region->histogram = NULL; + + region->group_id = DM_STATS_GROUP_NOT_PRESENT; + + if (!(region->program_id = dm_strdup(program_id))) + return_0; + if (!(region->aux_data = dm_strdup(aux_data))) { + dm_free(region->program_id); + return_0; + } + + region->counters = NULL; + return 1; +} + +static int _stats_parse_list(struct dm_stats *dms, const char *resp) +{ + uint64_t max_region = 0, nr_regions = 0; + struct dm_stats_region cur, fill; + struct dm_stats_group cur_group; + struct dm_pool *mem = dms->mem, *group_mem = dms->group_mem; + char line[STATS_ROW_BUF_LEN]; + FILE *list_rows; + + if (!resp) { + log_error("Could not parse NULL @stats_list response."); + return 0; + } + + _stats_regions_destroy(dms); + _stats_groups_destroy(dms); + + /* no regions */ + if (!strlen(resp)) { + dms->nr_regions = dms->max_region = 0; + dms->regions = NULL; + return 1; + } + + /* + * dm_task_get_message_response() returns a 'const char *' but + * since fmemopen also permits "w" it expects a 'char *'. + */ + if (!(list_rows = fmemopen((char *)resp, strlen(resp), "r"))) + return_0; + + /* begin region table */ + if (!dm_pool_begin_object(mem, 1024)) + goto_bad; + + /* begin group table */ + if (!dm_pool_begin_object(group_mem, 32)) + goto_bad; + + while(fgets(line, sizeof(line), list_rows)) { + + cur_group.group_id = DM_STATS_GROUP_NOT_PRESENT; + cur_group.regions = NULL; + cur_group.alias = NULL; + + if (!_stats_parse_list_region(dms, &cur, line)) + goto_bad; + + /* handle holes in the list of region_ids */ + if (cur.region_id > max_region) { + memset(&fill, 0, sizeof(fill)); + memset(&cur_group, 0, sizeof(cur_group)); + fill.region_id = DM_STATS_REGION_NOT_PRESENT; + cur_group.group_id = DM_STATS_GROUP_NOT_PRESENT; + do { + if (!dm_pool_grow_object(mem, &fill, sizeof(fill))) + goto_bad; + if (!dm_pool_grow_object(group_mem, &cur_group, + sizeof(cur_group))) + goto_bad; + } while (max_region++ < (cur.region_id - 1)); + } + + if (cur.aux_data) + if (!_parse_aux_data_group(dms, &cur, &cur_group)) + log_error("Failed to parse group descriptor " + "from region_id " FMTu64 " aux_data:" + "'%s'", cur.region_id, cur.aux_data); + /* continue */ + + if (!dm_pool_grow_object(mem, &cur, sizeof(cur))) + goto_bad; + + if (!dm_pool_grow_object(group_mem, &cur_group, + sizeof(cur_group))) + goto_bad; + + max_region++; + nr_regions++; + } + + if (!nr_regions) + /* no region data read from @stats_list */ + goto bad; + + dms->nr_regions = nr_regions; + dms->max_region = max_region - 1; + dms->regions = dm_pool_end_object(mem); + dms->groups = dm_pool_end_object(group_mem); + + dm_stats_foreach_group(dms) + _check_group_regions_present(dms, &dms->groups[dms->cur_group]); + + _stats_update_groups(dms); + + if (fclose(list_rows)) + stack; + + return 1; + +bad: + if (fclose(list_rows)) + stack; + dm_pool_abandon_object(mem); + dm_pool_abandon_object(group_mem); + + return 0; +} + +int dm_stats_list(struct dm_stats *dms, const char *program_id) +{ + char msg[STATS_MSG_BUF_LEN]; + struct dm_task *dmt; + int r; + + if (!_stats_bound(dms)) + return_0; + + /* allow zero-length program_id for list */ + if (!program_id) + program_id = dms->program_id; + + if (!_stats_set_name_cache(dms)) + return_0; + + if (dms->regions) + _stats_regions_destroy(dms); + + r = dm_snprintf(msg, sizeof(msg), "@stats_list %s", program_id); + + if (r < 0) { + log_error("Failed to prepare stats message."); + return 0; + } + + if (!(dmt = _stats_send_message(dms, msg))) + return_0; + + if (!_stats_parse_list(dms, dm_task_get_message_response(dmt))) { + log_error("Could not parse @stats_list response."); + goto bad; + } + + dm_task_destroy(dmt); + return 1; + +bad: + dm_task_destroy(dmt); + return 0; +} + +/* + * Parse histogram data returned from a @stats_print operation. + */ +static int _stats_parse_histogram(struct dm_pool *mem, char *hist_str, + struct dm_histogram **histogram, + struct dm_stats_region *region) +{ + static const char _valid_chars[] = "0123456789:"; + struct dm_histogram *bounds = region->bounds; + struct dm_histogram hist = { + .nr_bins = region->bounds->nr_bins + }; + const char *c, *v, *val_start; + struct dm_histogram_bin cur; + uint64_t sum = 0, this_val; + char *endptr = NULL; + int bin = 0; + + c = hist_str; + + if (!dm_pool_begin_object(mem, sizeof(cur))) + return_0; + + if (!dm_pool_grow_object(mem, &hist, sizeof(hist))) + goto_bad; + + do { + memset(&cur, 0, sizeof(cur)); + for (v = _valid_chars; *v; v++) + if (*c == *v) + break; + if (!*v) + goto badchar; + + if (*c == ',') + goto badchar; + else { + val_start = c; + endptr = NULL; + + errno = 0; + this_val = strtoull(val_start, &endptr, 10); + if (errno || !endptr) { + log_error("Could not parse histogram value."); + goto bad; + } + c = endptr; /* Advance to colon, or end. */ + + if (*c == ':') + c++; + else if (*c & (*c != '\n')) + /* Expected ':', '\n', or NULL. */ + goto badchar; + + if (*c == ':') + c++; + + cur.upper = bounds->bins[bin].upper; + cur.count = this_val; + sum += this_val; + + if (!dm_pool_grow_object(mem, &cur, sizeof(cur))) + goto_bad; + + bin++; + } + } while (*c && (*c != '\n')); + + log_debug("Added region histogram data with %d entries.", hist.nr_bins); + + *histogram = dm_pool_end_object(mem); + (*histogram)->sum = sum; + + return 1; + +badchar: + log_error("Invalid character in histogram data: '%c' (0x%x)", *c, *c); +bad: + dm_pool_abandon_object(mem); + return 0; +} + +static int _stats_parse_region(struct dm_stats *dms, const char *resp, + struct dm_stats_region *region, + uint64_t timescale) +{ + struct dm_histogram *hist = NULL; + struct dm_pool *mem = dms->mem; + struct dm_stats_counters cur; + FILE *stats_rows = NULL; + uint64_t start = 0, len = 0; + char row[STATS_ROW_BUF_LEN]; + int r; + + if (!resp) { + log_error("Could not parse empty @stats_print response."); + return 0; + } + + region->start = UINT64_MAX; + + if (!dm_pool_begin_object(mem, 512)) + goto_bad; + + /* + * dm_task_get_message_response() returns a 'const char *' but + * since fmemopen also permits "w" it expects a 'char *'. + */ + stats_rows = fmemopen((char *)resp, strlen(resp), "r"); + if (!stats_rows) + goto_bad; + + /* + * Output format for each step-sized area of a region: + * + * <start_sector>+<length> counters + * + * The first 11 counters have the same meaning as + * /sys/block/ * /stat or /proc/diskstats. + * + * Please refer to Documentation/iostats.txt for details. + * + * 1. the number of reads completed + * 2. the number of reads merged + * 3. the number of sectors read + * 4. the number of milliseconds spent reading + * 5. the number of writes completed + * 6. the number of writes merged + * 7. the number of sectors written + * 8. the number of milliseconds spent writing + * 9. the number of I/Os currently in progress + * 10. the number of milliseconds spent doing I/Os + * 11. the weighted number of milliseconds spent doing I/Os + * + * Additional counters: + * 12. the total time spent reading in milliseconds + * 13. the total time spent writing in milliseconds + * + */ + while (fgets(row, sizeof(row), stats_rows)) { + r = sscanf(row, FMTu64 "+" FMTu64 /* start+len */ + /* reads */ + FMTu64 " " FMTu64 " " FMTu64 " " FMTu64 " " + /* writes */ + FMTu64 " " FMTu64 " " FMTu64 " " FMTu64 " " + /* in flight & io nsecs */ + FMTu64 " " FMTu64 " " FMTu64 " " + /* tot read/write nsecs */ + FMTu64 " " FMTu64, &start, &len, + &cur.reads, &cur.reads_merged, &cur.read_sectors, + &cur.read_nsecs, + &cur.writes, &cur.writes_merged, &cur.write_sectors, + &cur.write_nsecs, + &cur.io_in_progress, + &cur.io_nsecs, &cur.weighted_io_nsecs, + &cur.total_read_nsecs, &cur.total_write_nsecs); + if (r != 15) { + log_error("Could not parse @stats_print row."); + goto bad; + } + + /* scale time values up if needed */ + if (timescale != 1) { + cur.read_nsecs *= timescale; + cur.write_nsecs *= timescale; + cur.io_nsecs *= timescale; + cur.weighted_io_nsecs *= timescale; + cur.total_read_nsecs *= timescale; + cur.total_write_nsecs *= timescale; + } + + if (region->bounds) { + /* Find first histogram separator. */ + char *hist_str = strchr(row, ':'); + if (!hist_str) { + log_error("Could not parse histogram value."); + goto bad; + } + /* Find space preceding histogram. */ + while (hist_str && *(hist_str - 1) != ' ') + hist_str--; + + /* Use a separate pool for histogram objects since we + * are growing the area table and each area's histogram + * table simultaneously. + */ + if (!_stats_parse_histogram(dms->hist_mem, hist_str, + &hist, region)) + goto_bad; + hist->dms = dms; + hist->region = region; + } + + cur.histogram = hist; + + if (!dm_pool_grow_object(mem, &cur, sizeof(cur))) + goto_bad; + + if (region->start == UINT64_MAX) { + region->start = start; + region->step = len; /* area size is always uniform. */ + } + } + + if (region->start == UINT64_MAX) + /* no area data read from @stats_print */ + goto bad; + + region->len = (start + len) - region->start; + region->timescale = timescale; + region->counters = dm_pool_end_object(mem); + + if (fclose(stats_rows)) + stack; + + return 1; + +bad: + if (stats_rows) + if (fclose(stats_rows)) + stack; + dm_pool_abandon_object(mem); + + return 0; +} + +static void _stats_walk_next_present(const struct dm_stats *dms, + uint64_t *flags, + uint64_t *cur_r, uint64_t *cur_a, + uint64_t *cur_g) +{ + struct dm_stats_region *cur = NULL; + + /* start of walk: region loop advances *cur_r to 0. */ + if (*cur_r != DM_STATS_REGION_NOT_PRESENT) + cur = &dms->regions[*cur_r]; + + /* within current region? */ + if (cur && (*flags & DM_STATS_WALK_AREA)) { + if (++(*cur_a) < _nr_areas_region(cur)) + return; + else + *cur_a = 0; + } + + /* advance to next present, non-skipped region or end */ + while (++(*cur_r) <= dms->max_region) { + cur = &dms->regions[*cur_r]; + if (!_stats_region_present(cur)) + continue; + if ((*flags & DM_STATS_WALK_SKIP_SINGLE_AREA)) + if (!(*flags & DM_STATS_WALK_AREA)) + if (_nr_areas_region(cur) < 2) + continue; + /* matching region found */ + break; + } + return; +} + +static void _stats_walk_next(const struct dm_stats *dms, uint64_t *flags, + uint64_t *cur_r, uint64_t *cur_a, uint64_t *cur_g) +{ + if (!dms || !dms->regions) + return; + + if (*flags & DM_STATS_WALK_AREA) { + /* advance to next area, region, or end */ + _stats_walk_next_present(dms, flags, cur_r, cur_a, cur_g); + return; + } + + if (*flags & DM_STATS_WALK_REGION) { + /* enable region aggregation */ + *cur_a = DM_STATS_WALK_REGION; + _stats_walk_next_present(dms, flags, cur_r, cur_a, cur_g); + return; + } + + if (*flags & DM_STATS_WALK_GROUP) { + /* enable group aggregation */ + *cur_r = *cur_a = DM_STATS_WALK_GROUP; + while (!_stats_group_id_present(dms, ++(*cur_g)) + && (*cur_g) < dms->max_region + 1) + ; /* advance to next present group or end */ + return; + } + + log_error("stats_walk_next called with empty walk flags"); +} + +static void _group_walk_start(const struct dm_stats *dms, uint64_t *flags, + uint64_t *cur_r, uint64_t *cur_a, uint64_t *cur_g) +{ + if (!(*flags & DM_STATS_WALK_GROUP)) + return; + + *cur_a = *cur_r = DM_STATS_WALK_GROUP; + *cur_g = 0; + + /* advance to next present group or end */ + while ((*cur_g) <= dms->max_region) { + if (_stats_region_is_grouped(dms, *cur_g)) + break; + (*cur_g)++; + } + + if (*cur_g > dms->max_region) + /* no groups to walk */ + *flags &= ~DM_STATS_WALK_GROUP; +} + +static void _stats_walk_start(const struct dm_stats *dms, uint64_t *flags, + uint64_t *cur_r, uint64_t *cur_a, + uint64_t *cur_g) +{ + log_debug("starting stats walk with %s %s %s %s", + (*flags & DM_STATS_WALK_AREA) ? "AREA" : "", + (*flags & DM_STATS_WALK_REGION) ? "REGION" : "", + (*flags & DM_STATS_WALK_GROUP) ? "GROUP" : "", + (*flags & DM_STATS_WALK_SKIP_SINGLE_AREA) ? "SKIP" : ""); + + if (!dms->regions) + return; + + if (!(*flags & (DM_STATS_WALK_AREA | DM_STATS_WALK_REGION))) + return _group_walk_start(dms, flags, cur_r, cur_a, cur_g); + + /* initialise cursor state */ + *cur_a = 0; + *cur_r = DM_STATS_REGION_NOT_PRESENT; + *cur_g = DM_STATS_GROUP_NOT_PRESENT; + + if (!(*flags & DM_STATS_WALK_AREA)) + *cur_a = DM_STATS_WALK_REGION; + + /* advance to first present, non-skipped region */ + _stats_walk_next_present(dms, flags, cur_r, cur_a, cur_g); +} + +#define DM_STATS_WALK_MASK (DM_STATS_WALK_AREA \ + | DM_STATS_WALK_REGION \ + | DM_STATS_WALK_GROUP \ + | DM_STATS_WALK_SKIP_SINGLE_AREA) + +int dm_stats_walk_init(struct dm_stats *dms, uint64_t flags) +{ + if (!dms) + return_0; + + if (flags & ~DM_STATS_WALK_MASK) { + log_error("Unknown value in walk flags: 0x" FMTx64, + (uint64_t) (flags & ~DM_STATS_WALK_MASK)); + return 0; + } + dms->walk_flags = flags; + log_debug("dm_stats_walk_init: initialised flags to " FMTx64, flags); + return 1; +} + +void dm_stats_walk_start(struct dm_stats *dms) +{ + if (!dms || !dms->regions) + return; + + dms->cur_flags = dms->walk_flags; + + _stats_walk_start(dms, &dms->cur_flags, + &dms->cur_region, &dms->cur_area, + &dms->cur_group); +} + +void dm_stats_walk_next(struct dm_stats *dms) +{ + _stats_walk_next(dms, &dms->cur_flags, + &dms->cur_region, &dms->cur_area, + &dms->cur_group); +} + +void dm_stats_walk_next_region(struct dm_stats *dms) +{ + dms->cur_flags &= ~DM_STATS_WALK_AREA; + _stats_walk_next(dms, &dms->cur_flags, + &dms->cur_region, &dms->cur_area, + &dms->cur_group); +} + +/* + * Return 1 if any regions remain that are present and not skipped + * by the current walk flags or 0 otherwise. + */ +static uint64_t _stats_walk_any_unskipped(const struct dm_stats *dms, + uint64_t *flags, + uint64_t *cur_r, uint64_t *cur_a) +{ + struct dm_stats_region *region; + uint64_t i; + + if (*cur_r > dms->max_region) + return 0; + + for (i = *cur_r; i <= dms->max_region; i++) { + region = &dms->regions[i]; + if (!_stats_region_present(region)) + continue; + if ((*flags & DM_STATS_WALK_SKIP_SINGLE_AREA) + && !(*flags & DM_STATS_WALK_AREA)) + if (_nr_areas_region(region) < 2) + continue; + return 1; + } + return 0; +} + +static void _stats_walk_end_areas(const struct dm_stats *dms, uint64_t *flags, + uint64_t *cur_r, uint64_t *cur_a, + uint64_t *cur_g) +{ + int end = !_stats_walk_any_unskipped(dms, flags, cur_r, cur_a); + + if (!(*flags & DM_STATS_WALK_AREA)) + return; + + if (!end) + return; + + *flags &= ~DM_STATS_WALK_AREA; + if (*flags & DM_STATS_WALK_REGION) { + /* start region walk */ + *cur_a = DM_STATS_WALK_REGION; + *cur_r = DM_STATS_REGION_NOT_PRESENT; + _stats_walk_next_present(dms, flags, cur_r, cur_a, cur_g); + if (!_stats_walk_any_unskipped(dms, flags, cur_r, cur_a)) { + /* no more regions */ + *flags &= ~DM_STATS_WALK_REGION; + if (!(*flags & DM_STATS_WALK_GROUP)) + *cur_r = dms->max_region; + } + } + + if (*flags & DM_STATS_WALK_REGION) + return; + + if (*flags & DM_STATS_WALK_GROUP) + _group_walk_start(dms, flags, cur_r, cur_a, cur_g); +} + +static int _stats_walk_end(const struct dm_stats *dms, uint64_t *flags, + uint64_t *cur_r, uint64_t *cur_a, uint64_t *cur_g) +{ + if (*flags & DM_STATS_WALK_AREA) { + _stats_walk_end_areas(dms, flags, cur_r, cur_a, cur_g); + goto out; + } + + if (*flags & DM_STATS_WALK_REGION) { + if (!_stats_walk_any_unskipped(dms, flags, cur_r, cur_a)) { + *flags &= ~DM_STATS_WALK_REGION; + _group_walk_start(dms, flags, cur_r, cur_a, cur_g); + } + goto out; + } + + if (*flags & DM_STATS_WALK_GROUP) { + if (*cur_g <= dms->max_region) + goto out; + *flags &= ~DM_STATS_WALK_GROUP; + } +out: + return !(*flags & ~DM_STATS_WALK_SKIP_SINGLE_AREA); +} + +int dm_stats_walk_end(struct dm_stats *dms) +{ + if (!dms) + return 1; + + if (_stats_walk_end(dms, &dms->cur_flags, + &dms->cur_region, &dms->cur_area, + &dms->cur_group)) { + dms->cur_flags = dms->walk_flags; + return 1; + } + return 0; +} + +dm_stats_obj_type_t dm_stats_object_type(const struct dm_stats *dms, + uint64_t region_id, + uint64_t area_id) +{ + uint64_t group_id; + + region_id = (region_id == DM_STATS_REGION_CURRENT) + ? dms->cur_region : region_id ; + area_id = (area_id == DM_STATS_AREA_CURRENT) + ? dms->cur_area : area_id ; + + if (region_id == DM_STATS_REGION_NOT_PRESENT) + /* no region */ + return DM_STATS_OBJECT_TYPE_NONE; + + if (region_id & DM_STATS_WALK_GROUP) { + if (region_id == DM_STATS_WALK_GROUP) + /* indirect group_id from cursor */ + group_id = dms->cur_group; + else + /* immediate group_id encoded in region_id */ + group_id = region_id & ~DM_STATS_WALK_GROUP; + if (!_stats_group_id_present(dms, group_id)) + return DM_STATS_OBJECT_TYPE_NONE; + return DM_STATS_OBJECT_TYPE_GROUP; + } + + if (region_id > dms->max_region) + /* end of table */ + return DM_STATS_OBJECT_TYPE_NONE; + + if (area_id & DM_STATS_WALK_REGION) + /* aggregate region */ + return DM_STATS_OBJECT_TYPE_REGION; + + /* plain region_id and area_id */ + return DM_STATS_OBJECT_TYPE_AREA; +} + +dm_stats_obj_type_t dm_stats_current_object_type(const struct dm_stats *dms) +{ + /* dm_stats_object_type will decode region/area */ + return dm_stats_object_type(dms, + DM_STATS_REGION_CURRENT, + DM_STATS_AREA_CURRENT); +} + +uint64_t dm_stats_get_region_nr_areas(const struct dm_stats *dms, + uint64_t region_id) +{ + struct dm_stats_region *region = NULL; + + /* groups or aggregate regions cannot be subdivided */ + if (region_id & DM_STATS_WALK_GROUP) + return 1; + + region = &dms->regions[region_id]; + return _nr_areas_region(region); +} + +uint64_t dm_stats_get_current_nr_areas(const struct dm_stats *dms) +{ + /* groups or aggregate regions cannot be subdivided */ + if (dms->cur_region & DM_STATS_WALK_GROUP) + return 1; + + return dm_stats_get_region_nr_areas(dms, dms->cur_region); +} + +uint64_t dm_stats_get_nr_areas(const struct dm_stats *dms) +{ + uint64_t nr_areas = 0, flags = DM_STATS_WALK_AREA; + /* use a separate cursor */ + uint64_t cur_region = 0, cur_area = 0, cur_group = 0; + + /* no regions to visit? */ + if (!dms->regions) + return 0; + + flags = DM_STATS_WALK_AREA; + _stats_walk_start(dms, &flags, &cur_region, &cur_area, &cur_group); + do { + nr_areas += dm_stats_get_current_nr_areas(dms); + _stats_walk_next(dms, &flags, + &cur_region, &cur_area, + &cur_group); + } while (!_stats_walk_end(dms, &flags, + &cur_region, &cur_area, + &cur_group)); + return nr_areas; +} + +int dm_stats_group_present(const struct dm_stats *dms, uint64_t group_id) +{ + return _stats_group_id_present(dms, group_id); +} + +int dm_stats_get_region_nr_histogram_bins(const struct dm_stats *dms, + uint64_t region_id) +{ + region_id = (region_id == DM_STATS_REGION_CURRENT) + ? dms->cur_region : region_id ; + + /* FIXME: support group histograms if all region bounds match */ + if (region_id & DM_STATS_WALK_GROUP) + return 0; + + if (!dms->regions[region_id].bounds) + return 0; + + return dms->regions[region_id].bounds->nr_bins; +} + +/* + * Fill buf with a list of set regions in the regions bitmap. Consecutive + * ranges of set region IDs are output using "M-N" range notation. + * + * The number of bytes consumed is returned or zero on error. + */ +static size_t _stats_group_tag_fill(const struct dm_stats *dms, + dm_bitset_t regions, + char *buf, size_t buflen) +{ + int i, j, r, next, last = 0; + size_t used = 0; + + last = dm_bit_get_last(regions); + + i = dm_bit_get_first(regions); + for(; i >= 0; i = dm_bit_get_next(regions, i)) { + /* find range end */ + j = i; + do + next = j + 1; + while ((j = dm_bit_get_next(regions, j)) == next); + + /* set to last set bit */ + j = next - 1; + + /* handle range vs. single region */ + if (i != j) + r = dm_snprintf(buf, buflen, FMTu64 "-" FMTu64 "%s", + (uint64_t) i, (uint64_t) j, + (j == last) ? "" : ","); + else + r = dm_snprintf(buf, buflen, FMTu64 "%s", (uint64_t) i, + (i == last) ? "" : ","); + if (r < 0) + goto_bad; + + i = next; /* skip handled bits if in range */ + + buf += r; + used += r; + } + + return used; +bad: + log_error("Could not format group list."); + return 0; +} + +/* + * Calculate the space required to hold a string description of the group + * described by the regions bitset using comma separated list in range + * notation ("A,B,C,M-N"). + */ +static size_t _stats_group_tag_len(const struct dm_stats *dms, + dm_bitset_t regions) +{ + int64_t i, j, next, nr_regions = 0; + size_t buflen = 0, id_len = 0; + + /* check region ids and find last set bit */ + i = dm_bit_get_first(regions); + for (; i >= 0; i = dm_bit_get_next(regions, i)) { + /* length of region_id or range start in characters */ + id_len = (i) ? 1 + (size_t) log10(i) : 1; + buflen += id_len; + j = i; + do + next = j + 1; + while ((j = dm_bit_get_next(regions, j)) == next); + + /* set to last set bit */ + j = next - 1; + + nr_regions += j - i + 1; + + /* handle range */ + if (i != j) { + /* j is always > i, which is always >= 0 */ + id_len = 1 + (size_t) log10(j); + buflen += id_len + 1; /* range end plus "-" */ + } + buflen++; + i = next; /* skip bits if handling range */ + } + return buflen; +} + +/* + * Build a DMS_GROUP="..." tag for the group specified by group_id, + * to be stored in the corresponding region's aux_data field. + */ +static char *_build_group_tag(struct dm_stats *dms, uint64_t group_id) +{ + char *aux_string, *buf; + dm_bitset_t regions; + const char *alias; + size_t buflen = 0; + int r; + + regions = dms->groups[group_id].regions; + alias = dms->groups[group_id].alias; + + buflen = _stats_group_tag_len(dms, regions); + + if (!buflen) + return_0; + + buflen += DMS_GROUP_TAG_LEN; + buflen += 1 + (alias ? strlen(alias) : 0); /* 'alias:' */ + + buf = aux_string = dm_malloc(buflen); + if (!buf) { + log_error("Could not allocate memory for aux_data string."); + return NULL; + } + + if (!dm_strncpy(buf, DMS_GROUP_TAG, DMS_GROUP_TAG_LEN + 1)) + goto_bad; + + buf += DMS_GROUP_TAG_LEN; + buflen -= DMS_GROUP_TAG_LEN; + + r = dm_snprintf(buf, buflen, "%s%c", alias ? alias : "", DMS_GROUP_SEP); + if (r < 0) + goto_bad; + + buf += r; + buflen -= r; + + r = _stats_group_tag_fill(dms, regions, buf, buflen); + if (!r) + goto_bad; + + return aux_string; +bad: + log_error("Could not format group aux_data."); + dm_free(aux_string); + return NULL; +} + +/* + * Store updated aux_data for a region. The aux_data is passed to the + * kernel using the @stats_set_aux message. Any required group tag is + * generated from the current group table and included in the message. + */ +static int _stats_set_aux(struct dm_stats *dms, + uint64_t region_id, const char *aux_data) +{ + const char *group_tag = NULL; + struct dm_task *dmt = NULL; + char msg[STATS_MSG_BUF_LEN]; + + /* group data required? */ + if (_stats_group_id_present(dms, region_id)) { + group_tag = _build_group_tag(dms, region_id); + if (!group_tag) { + log_error("Could not build group descriptor for " + "region ID " FMTu64, region_id); + goto bad; + } + } + + if (dm_snprintf(msg, sizeof(msg), "@stats_set_aux " FMTu64 " %s%s%s ", + region_id, (group_tag) ? group_tag : "", + (group_tag) ? DMS_AUX_SEP : "", + (strlen(aux_data)) ? aux_data : "-") < 0) { + log_error("Could not prepare @stats_set_aux message"); + goto bad; + } + + if (!(dmt = _stats_send_message(dms, msg))) + goto_bad; + + dm_free((char *) group_tag); + + /* no response to a @stats_set_aux message */ + dm_task_destroy(dmt); + + return 1; +bad: + dm_free((char *) group_tag); + return 0; +} + +/* + * Maximum length of a "start+end" range string: + * Two 20 digit uint64_t, '+', and NULL. + */ +#define RANGE_LEN 42 +static int _stats_create_region(struct dm_stats *dms, uint64_t *region_id, + uint64_t start, uint64_t len, int64_t step, + int precise, const char *hist_arg, + const char *program_id, const char *aux_data) +{ + char msg[STATS_MSG_BUF_LEN], range[RANGE_LEN], *endptr = NULL; + const char *err_fmt = "Could not prepare @stats_create %s."; + const char *precise_str = PRECISE_ARG; + const char *resp, *opt_args = NULL; + struct dm_task *dmt = NULL; + int r = 0, nr_opt = 0; + + if (!_stats_bound(dms)) + return_0; + + if (!program_id || !strlen(program_id)) + program_id = dms->program_id; + + if (start || len) { + if (dm_snprintf(range, sizeof(range), FMTu64 "+" FMTu64, + start, len) < 0) { + log_error(err_fmt, "range"); + return 0; + } + } + + if (precise < 0) + precise = dms->precise; + + if (precise) + nr_opt++; + else + precise_str = ""; + + if (hist_arg) + nr_opt++; + else + hist_arg = ""; + + if (nr_opt) { + if ((dm_asprintf((char **)&opt_args, "%d %s %s%s", nr_opt, + precise_str, + (strlen(hist_arg)) ? HISTOGRAM_ARG : "", + hist_arg)) < 0) { + log_error(err_fmt, PRECISE_ARG " option."); + return 0; + } + } else + opt_args = dm_strdup(""); + + if (dm_snprintf(msg, sizeof(msg), "@stats_create %s %s" FMTu64 + " %s %s %s", (start || len) ? range : "-", + (step < 0) ? "/" : "", + (uint64_t)llabs(step), + opt_args, program_id, aux_data) < 0) { + log_error(err_fmt, "message"); + dm_free((void *) opt_args); + return 0; + } + + if (!(dmt = _stats_send_message(dms, msg))) + goto_out; + + resp = dm_task_get_message_response(dmt); + if (!resp) { + log_error("Could not parse empty @stats_create response."); + goto out; + } + + if (region_id) { + errno = 0; + *region_id = strtoull(resp, &endptr, 10); + if (errno || resp == endptr) + goto_out; + } + + r = 1; + +out: + if (dmt) + dm_task_destroy(dmt); + dm_free((void *) opt_args); + + return r; +} + +int dm_stats_create_region(struct dm_stats *dms, uint64_t *region_id, + uint64_t start, uint64_t len, int64_t step, + int precise, struct dm_histogram *bounds, + const char *program_id, const char *user_data) +{ + char *hist_arg = NULL; + int r = 0; + + /* Nanosecond counters and histograms both need precise_timestamps. */ + if ((precise || bounds) && !_stats_check_precise_timestamps(dms)) + return_0; + + if (bounds) { + /* _build_histogram_arg enables precise if vals < 1ms. */ + if (!(hist_arg = _build_histogram_arg(bounds, &precise))) + goto_out; + } + + r = _stats_create_region(dms, region_id, start, len, step, + precise, hist_arg, program_id, user_data); + dm_free(hist_arg); + +out: + return r; +} + +static void _stats_clear_group_regions(struct dm_stats *dms, uint64_t group_id) +{ + struct dm_stats_group *group; + uint64_t i; + + group = &dms->groups[group_id]; + for (i = dm_bit_get_first(group->regions); + i != DM_STATS_GROUP_NOT_PRESENT; + i = dm_bit_get_next(group->regions, i)) + dms->regions[i].group_id = DM_STATS_GROUP_NOT_PRESENT; +} + +static int _stats_remove_region_id_from_group(struct dm_stats *dms, + uint64_t region_id) +{ + struct dm_stats_region *region = &dms->regions[region_id]; + uint64_t group_id = region->group_id; + dm_bitset_t regions = dms->groups[group_id].regions; + + if (!_stats_region_is_grouped(dms, region_id)) + return_0; + + dm_bit_clear(regions, region_id); + + /* removing group leader? */ + if (region_id == group_id) { + _stats_clear_group_regions(dms, group_id); + _stats_group_destroy(&dms->groups[group_id]); + } + + return _stats_set_aux(dms, group_id, dms->regions[group_id].aux_data); +} + +static int _stats_delete_region(struct dm_stats *dms, uint64_t region_id) +{ + char msg[STATS_MSG_BUF_LEN]; + struct dm_task *dmt; + + if (_stats_region_is_grouped(dms, region_id)) + if (!_stats_remove_region_id_from_group(dms, region_id)) { + log_error("Could not remove region ID " FMTu64 " from " + "group ID " FMTu64, + region_id, dms->regions[region_id].group_id); + return 0; + } + + if (dm_snprintf(msg, sizeof(msg), "@stats_delete " FMTu64, region_id) < 0) { + log_error("Could not prepare @stats_delete message."); + return 0; + } + + dmt = _stats_send_message(dms, msg); + if (!dmt) + return_0; + dm_task_destroy(dmt); + + return 1; +} + +int dm_stats_delete_region(struct dm_stats *dms, uint64_t region_id) +{ + int listed = 0; + + if (!_stats_bound(dms)) + return_0; + + /* + * To correctly delete a region, that may be part of a group, a + * listed handle is required, since the region may need to be + * removed from another region's group descriptor; earlier + * versions of the region deletion interface do not have this + * requirement since there are no dependencies between regions. + * + * Listing a previously unlisted handle has numerous + * side-effects on other calls and operations (e.g. stats + * walks), especially when returning to a function that depends + * on the state of the region table, or statistics cursor. + * + * To avoid changing the semantics of the API, and the need for + * a versioned symbol, maintain a flag indicating when a listing + * has been carried out, and drop the region table before + * returning. + * + * This ensures compatibility with programs compiled against + * earlier versions of libdm. + */ + if (!dms->regions && !(listed = dm_stats_list(dms, dms->program_id))) { + log_error("Could not obtain region list while deleting " + "region ID " FMTu64, region_id); + goto bad; + } + + if (!dm_stats_get_nr_regions(dms)) { + log_error("Could not delete region ID " FMTu64 ": " + "no regions found", region_id); + goto bad; + } + + /* includes invalid and special region_id values */ + if (!dm_stats_region_present(dms, region_id)) { + log_error("Region ID " FMTu64 " does not exist", region_id); + goto bad; + } + + if (!_stats_delete_region(dms, region_id)) + goto bad; + + if (!listed) + /* wipe region and mark as not present */ + _stats_region_destroy(&dms->regions[region_id]); + else + /* return handle to prior state */ + _stats_regions_destroy(dms); + + return 1; +bad: + if (listed) + _stats_regions_destroy(dms); + + return 0; +} + +int dm_stats_clear_region(struct dm_stats *dms, uint64_t region_id) +{ + char msg[STATS_MSG_BUF_LEN]; + struct dm_task *dmt; + + if (!_stats_bound(dms)) + return_0; + + if (dm_snprintf(msg, sizeof(msg), "@stats_clear " FMTu64, region_id) < 0) { + log_error("Could not prepare @stats_clear message."); + return 0; + } + + dmt = _stats_send_message(dms, msg); + + if (!dmt) + return_0; + + dm_task_destroy(dmt); + + return 1; +} + +static struct dm_task *_stats_print_region(struct dm_stats *dms, + uint64_t region_id, unsigned start_line, + unsigned num_lines, unsigned clear) +{ + /* @stats_print[_clear] <region_id> [<start_line> <num_lines>] */ + const char *err_fmt = "Could not prepare @stats_print %s."; + char msg[STATS_MSG_BUF_LEN], lines[RANGE_LEN]; + struct dm_task *dmt = NULL; + + if (start_line || num_lines) + if (dm_snprintf(lines, sizeof(lines), + "%u %u", start_line, num_lines) < 0) { + log_error(err_fmt, "row specification"); + return NULL; + } + + if (dm_snprintf(msg, sizeof(msg), "@stats_print%s " FMTu64 " %s", + (clear) ? "_clear" : "", + region_id, (start_line || num_lines) ? lines : "") < 0) { + log_error(err_fmt, "message"); + return NULL; + } + + if (!(dmt = _stats_send_message(dms, msg))) + return_NULL; + + return dmt; +} + +char *dm_stats_print_region(struct dm_stats *dms, uint64_t region_id, + unsigned start_line, unsigned num_lines, + unsigned clear) +{ + char *resp = NULL; + struct dm_task *dmt = NULL; + const char *response; + + if (!_stats_bound(dms)) + return_0; + + /* + * FIXME: 'print' can be emulated for groups or aggregate regions + * by populating the handle and emitting aggregate counter data + * in the kernel print format. + */ + if (region_id == DM_STATS_WALK_GROUP) + return_0; + + dmt = _stats_print_region(dms, region_id, + start_line, num_lines, clear); + + if (!dmt) + return_0; + + if (!(response = dm_task_get_message_response(dmt))) + goto_out; + + if (!(resp = dm_pool_strdup(dms->mem, response))) + log_error("Could not allocate memory for response buffer."); +out: + dm_task_destroy(dmt); + + return resp; +} + +void dm_stats_buffer_destroy(struct dm_stats *dms, char *buffer) +{ + dm_pool_free(dms->mem, buffer); +} + +uint64_t dm_stats_get_nr_regions(const struct dm_stats *dms) +{ + if (!dms) + return_0; + + if (!dms->regions) + return 0; + + return dms->nr_regions; +} + +uint64_t dm_stats_get_nr_groups(const struct dm_stats *dms) +{ + uint64_t group_id, nr_groups = 0; + + if (!dms) + return_0; + + /* no regions or groups? */ + if (!dms->regions || !dms->groups) + return 0; + + for (group_id = 0; group_id <= dms->max_region; group_id++) + if (dms->groups[group_id].group_id + != DM_STATS_GROUP_NOT_PRESENT) + nr_groups++; + + return nr_groups; +} + +/** + * Test whether region_id is present in this set of stats data. + */ +int dm_stats_region_present(const struct dm_stats *dms, uint64_t region_id) +{ + if (!dms->regions) + return_0; + + if (region_id > dms->max_region) + return 0; + + return _stats_region_present(&dms->regions[region_id]); +} + +static int _dm_stats_populate_region(struct dm_stats *dms, uint64_t region_id, + const char *resp) +{ + struct dm_stats_region *region = &dms->regions[region_id]; + + if (!_stats_bound(dms)) + return_0; + + if (!region) { + log_error("Cannot populate empty handle before dm_stats_list()."); + return 0; + } + if (!_stats_parse_region(dms, resp, region, region->timescale)) { + log_error("Could not parse @stats_print message response."); + return 0; + } + region->region_id = region_id; + return 1; +} + +int dm_stats_populate(struct dm_stats *dms, const char *program_id, + uint64_t region_id) +{ + int all_regions = (region_id == DM_STATS_REGIONS_ALL); + struct dm_task *dmt = NULL; /* @stats_print task */ + uint64_t saved_flags; /* saved walk flags */ + const char *resp; + + /* + * We are about do destroy and re-create the region table, so it + * is safe to use the cursor embedded in the stats handle: just + * save a copy of the current walk_flags to restore later. + */ + saved_flags = dms->walk_flags; + + if (!_stats_bound(dms)) + return_0; + + if ((!all_regions) && (region_id & DM_STATS_WALK_GROUP)) { + log_error("Invalid region_id for dm_stats_populate: " + "DM_STATS_WALK_GROUP"); + return 0; + } + + if (!dms->nr_regions) { + log_error("No regions registered."); + return 0; + } + + /* allow zero-length program_id for populate */ + if (!program_id) + program_id = dms->program_id; + + if (all_regions && !dm_stats_list(dms, program_id)) { + log_error("Could not parse @stats_list response."); + goto bad; + } else if (!_stats_set_name_cache(dms)) { + goto_bad; + } + + dms->walk_flags = DM_STATS_WALK_REGION; + dm_stats_walk_start(dms); + do { + region_id = (all_regions) + ? dm_stats_get_current_region(dms) : region_id; + + /* obtain all lines and clear counter values */ + if (!(dmt = _stats_print_region(dms, region_id, 0, 0, 1))) + goto_bad; + + resp = dm_task_get_message_response(dmt); + if (!_dm_stats_populate_region(dms, region_id, resp)) { + dm_task_destroy(dmt); + goto_bad; + } + + dm_task_destroy(dmt); + dm_stats_walk_next(dms); + + } while (all_regions && !dm_stats_walk_end(dms)); + + dms->walk_flags = saved_flags; + return 1; + +bad: + dms->walk_flags = saved_flags; + _stats_regions_destroy(dms); + dms->regions = NULL; + return 0; +} + +/** + * destroy a dm_stats object and all associated regions and counter sets. + */ +void dm_stats_destroy(struct dm_stats *dms) +{ + if (!dms) + return; + + _stats_regions_destroy(dms); + _stats_groups_destroy(dms); + _stats_clear_binding(dms); + dm_pool_destroy(dms->mem); + dm_pool_destroy(dms->hist_mem); + dm_pool_destroy(dms->group_mem); + dm_free(dms->program_id); + dm_free((char *) dms->name); + dm_free(dms); +} + +/* + * Walk each area that is a member of region_id rid. + * i is a variable of type int that holds the current area_id. + */ +#define _foreach_region_area(dms, rid, i) \ +for ((i) = 0; (i) < _nr_areas_region(&dms->regions[(rid)]); (i)++) \ + +/* + * Walk each region that is a member of group_id gid. + * i is a variable of type int that holds the current region_id. + */ +#define _foreach_group_region(dms, gid, i) \ +for ((i) = dm_bit_get_first((dms)->groups[(gid)].regions); \ + (i) != DM_STATS_GROUP_NOT_PRESENT; \ + (i) = dm_bit_get_next((dms)->groups[(gid)].regions, (i))) \ + +/* + * Walk each region that is a member of group_id gid visiting each + * area within the region. + * i is a variable of type int that holds the current region_id. + * j is a variable of type int variable that holds the current area_id. + */ +#define _foreach_group_area(dms, gid, i, j) \ +_foreach_group_region(dms, gid, i) \ + _foreach_region_area(dms, i, j) + +static uint64_t _stats_get_counter(const struct dm_stats *dms, + const struct dm_stats_counters *area, + dm_stats_counter_t counter) +{ + switch(counter) { + case DM_STATS_READS_COUNT: + return area->reads; + case DM_STATS_READS_MERGED_COUNT: + return area->reads_merged; + case DM_STATS_READ_SECTORS_COUNT: + return area->read_sectors; + case DM_STATS_READ_NSECS: + return area->read_nsecs; + case DM_STATS_WRITES_COUNT: + return area->writes; + case DM_STATS_WRITES_MERGED_COUNT: + return area->writes_merged; + case DM_STATS_WRITE_SECTORS_COUNT: + return area->write_sectors; + case DM_STATS_WRITE_NSECS: + return area->write_nsecs; + case DM_STATS_IO_IN_PROGRESS_COUNT: + return area->io_in_progress; + case DM_STATS_IO_NSECS: + return area->io_nsecs; + case DM_STATS_WEIGHTED_IO_NSECS: + return area->weighted_io_nsecs; + case DM_STATS_TOTAL_READ_NSECS: + return area->total_read_nsecs; + case DM_STATS_TOTAL_WRITE_NSECS: + return area->total_write_nsecs; + case DM_STATS_NR_COUNTERS: + default: + log_error("Attempt to read invalid counter: %d", counter); + } + return 0; +} + +uint64_t dm_stats_get_counter(const struct dm_stats *dms, + dm_stats_counter_t counter, + uint64_t region_id, uint64_t area_id) +{ + uint64_t i, j, sum = 0; /* aggregation */ + int sum_regions = 0; + struct dm_stats_region *region; + struct dm_stats_counters *area; + + region_id = (region_id == DM_STATS_REGION_CURRENT) + ? dms->cur_region : region_id ; + area_id = (area_id == DM_STATS_REGION_CURRENT) + ? dms->cur_area : area_id ; + + sum_regions = !!(region_id & DM_STATS_WALK_GROUP); + + if (region_id == DM_STATS_WALK_GROUP) + /* group walk using the cursor */ + region_id = dms->cur_group; + else if (region_id & DM_STATS_WALK_GROUP) + /* group walk using immediate group_id */ + region_id &= ~DM_STATS_WALK_GROUP; + region = &dms->regions[region_id]; + + /* + * All statistics aggregation takes place here: aggregate metrics + * are calculated as normal using the aggregated counter values + * returned for the region or group specified. + */ + + if (_stats_region_is_grouped(dms, region_id) && (sum_regions)) { + /* group */ + if (area_id & DM_STATS_WALK_GROUP) + _foreach_group_area(dms, region->group_id, i, j) { + area = &dms->regions[i].counters[j]; + sum += _stats_get_counter(dms, area, counter); + } + else + _foreach_group_region(dms, region->group_id, i) { + area = &dms->regions[i].counters[area_id]; + sum += _stats_get_counter(dms, area, counter); + } + } else if (area_id == DM_STATS_WALK_REGION) { + /* aggregate region */ + _foreach_region_area(dms, region_id, j) { + area = &dms->regions[region_id].counters[j]; + sum += _stats_get_counter(dms, area, counter); + } + } else { + /* plain region / area */ + area = &region->counters[area_id]; + sum = _stats_get_counter(dms, area, counter); + } + + return sum; +} + +/* + * Methods for accessing named counter fields. All methods share the + * following naming scheme and prototype: + * + * uint64_t dm_stats_get_COUNTER(const struct dm_stats *, uint64_t, uint64_t) + * + * Where the two integer arguments are the region_id and area_id + * respectively. + * + * name is the name of the counter (lower case) + * counter is the part of the enum name following DM_STATS_ (upper case) + */ +#define MK_STATS_GET_COUNTER_FN(name, counter) \ +uint64_t dm_stats_get_ ## name(const struct dm_stats *dms, \ + uint64_t region_id, uint64_t area_id) \ +{ \ + return dm_stats_get_counter(dms, DM_STATS_ ## counter, \ + region_id, area_id); \ +} + +MK_STATS_GET_COUNTER_FN(reads, READS_COUNT) +MK_STATS_GET_COUNTER_FN(reads_merged, READS_MERGED_COUNT) +MK_STATS_GET_COUNTER_FN(read_sectors, READ_SECTORS_COUNT) +MK_STATS_GET_COUNTER_FN(read_nsecs, READ_NSECS) +MK_STATS_GET_COUNTER_FN(writes, WRITES_COUNT) +MK_STATS_GET_COUNTER_FN(writes_merged, WRITES_MERGED_COUNT) +MK_STATS_GET_COUNTER_FN(write_sectors, WRITE_SECTORS_COUNT) +MK_STATS_GET_COUNTER_FN(write_nsecs, WRITE_NSECS) +MK_STATS_GET_COUNTER_FN(io_in_progress, IO_IN_PROGRESS_COUNT) +MK_STATS_GET_COUNTER_FN(io_nsecs, IO_NSECS) +MK_STATS_GET_COUNTER_FN(weighted_io_nsecs, WEIGHTED_IO_NSECS) +MK_STATS_GET_COUNTER_FN(total_read_nsecs, TOTAL_READ_NSECS) +MK_STATS_GET_COUNTER_FN(total_write_nsecs, TOTAL_WRITE_NSECS) +#undef MK_STATS_GET_COUNTER_FN + +/* + * Floating point stats metric functions + * + * Called from dm_stats_get_metric() to calculate the value of + * the requested metric. + * + * int _metric_name(const struct dm_stats *dms, + * struct dm_stats_counters *c, + * double *value); + * + * Calculate a metric value from the counter data for the given + * identifiers and store it in the memory pointed to by value, + * applying group or region aggregation if enabled. + * + * Return one on success or zero on failure. + * + * To add a new metric: + * + * o Add a new name to the dm_stats_metric_t enum. + * o Create a _metric_fn() to calculate the new metric. + * o Add _metric_fn to the _metrics function table + * (entries in enum order). + * o Do not add a new named public function for the metric - + * users of new metrics are encouraged to convert to the enum + * based metric interface. + * + */ + +static int _rd_merges_per_sec(const struct dm_stats *dms, double *rrqm, + uint64_t region_id, uint64_t area_id) +{ + double mrgs; + mrgs = (double) dm_stats_get_counter(dms, DM_STATS_READS_MERGED_COUNT, + region_id, area_id); + + *rrqm = mrgs / (double) dms->interval_ns; + + return 1; +} + +static int _wr_merges_per_sec(const struct dm_stats *dms, double *wrqm, + uint64_t region_id, uint64_t area_id) +{ + double mrgs; + mrgs = (double) dm_stats_get_counter(dms, DM_STATS_WRITES_MERGED_COUNT, + region_id, area_id); + + *wrqm = mrgs / (double) dms->interval_ns; + + return 1; +} + +static int _reads_per_sec(const struct dm_stats *dms, double *rd_s, + uint64_t region_id, uint64_t area_id) +{ + double reads; + reads = (double) dm_stats_get_counter(dms, DM_STATS_READS_COUNT, + region_id, area_id); + + *rd_s = (reads * NSEC_PER_SEC) / (double) dms->interval_ns; + + return 1; +} + +static int _writes_per_sec(const struct dm_stats *dms, double *wr_s, + uint64_t region_id, uint64_t area_id) +{ + double writes; + writes = (double) dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, + region_id, area_id); + + *wr_s = (writes * NSEC_PER_SEC) / (double) dms->interval_ns; + + return 1; +} + +static int _read_sectors_per_sec(const struct dm_stats *dms, double *rsec_s, + uint64_t region_id, uint64_t area_id) +{ + double sect; + sect = (double) dm_stats_get_counter(dms, DM_STATS_READ_SECTORS_COUNT, + region_id, area_id); + + *rsec_s = (sect * (double) NSEC_PER_SEC) / (double) dms->interval_ns; + + return 1; +} + +static int _write_sectors_per_sec(const struct dm_stats *dms, double *wsec_s, + uint64_t region_id, uint64_t area_id) +{ + double sect; + sect = (double) dm_stats_get_counter(dms, DM_STATS_WRITE_SECTORS_COUNT, + region_id, area_id); + + *wsec_s = (sect * (double) NSEC_PER_SEC) / (double) dms->interval_ns; + + return 1; +} + +static int _average_request_size(const struct dm_stats *dms, double *arqsz, + uint64_t region_id, uint64_t area_id) +{ + double ios, sectors; + + ios = (double) (dm_stats_get_counter(dms, DM_STATS_READS_COUNT, + region_id, area_id) + + dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, + region_id, area_id)); + sectors = (double) (dm_stats_get_counter(dms, DM_STATS_READ_SECTORS_COUNT, + region_id, area_id) + + dm_stats_get_counter(dms, DM_STATS_WRITE_SECTORS_COUNT, + region_id, area_id)); + + if (ios > 0.0) + *arqsz = sectors / ios; + else + *arqsz = 0.0; + + return 1; +} + +static int _average_queue_size(const struct dm_stats *dms, double *qusz, + uint64_t region_id, uint64_t area_id) +{ + double io_ticks; + io_ticks = (double) dm_stats_get_counter(dms, DM_STATS_WEIGHTED_IO_NSECS, + region_id, area_id); + + if (io_ticks > 0.0) + *qusz = io_ticks / (double) dms->interval_ns; + else + *qusz = 0.0; + + return 1; +} + +static int _average_wait_time(const struct dm_stats *dms, double *await, + uint64_t region_id, uint64_t area_id) +{ + uint64_t io_ticks, nr_ios; + + io_ticks = dm_stats_get_counter(dms, DM_STATS_READ_NSECS, + region_id, area_id); + io_ticks += dm_stats_get_counter(dms, DM_STATS_WRITE_NSECS, + region_id, area_id); + + nr_ios = dm_stats_get_counter(dms, DM_STATS_READS_COUNT, + region_id, area_id); + nr_ios += dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, + region_id, area_id); + + if (nr_ios > 0) + *await = (double) io_ticks / (double) nr_ios; + else + *await = 0.0; + + return 1; +} + +static int _average_rd_wait_time(const struct dm_stats *dms, double *await, + uint64_t region_id, uint64_t area_id) +{ + uint64_t rd_io_ticks, nr_rd_ios; + + rd_io_ticks = dm_stats_get_counter(dms, DM_STATS_READ_NSECS, + region_id, area_id); + nr_rd_ios = dm_stats_get_counter(dms, DM_STATS_READS_COUNT, + region_id, area_id); + + /* + * If rd_io_ticks is > 0 this should imply that nr_rd_ios is + * also > 0 (unless a kernel bug exists). Test for both here + * before using the IO count as a divisor (Coverity). + */ + if (rd_io_ticks > 0 && nr_rd_ios > 0) + *await = (double) rd_io_ticks / (double) nr_rd_ios; + else + *await = 0.0; + + return 1; +} + +static int _average_wr_wait_time(const struct dm_stats *dms, double *await, + uint64_t region_id, uint64_t area_id) +{ + uint64_t wr_io_ticks, nr_wr_ios; + + wr_io_ticks = dm_stats_get_counter(dms, DM_STATS_WRITE_NSECS, + region_id, area_id); + nr_wr_ios = dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, + region_id, area_id); + + /* + * If wr_io_ticks is > 0 this should imply that nr_wr_ios is + * also > 0 (unless a kernel bug exists). Test for both here + * before using the IO count as a divisor (Coverity). + */ + if (wr_io_ticks > 0 && nr_wr_ios > 0) + *await = (double) wr_io_ticks / (double) nr_wr_ios; + else + *await = 0.0; + + return 1; +} + +static int _throughput(const struct dm_stats *dms, double *tput, + uint64_t region_id, uint64_t area_id) +{ + uint64_t nr_ios; + + nr_ios = dm_stats_get_counter(dms, DM_STATS_READS_COUNT, + region_id, area_id); + nr_ios += dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, + region_id, area_id); + + *tput = ((double) NSEC_PER_SEC * (double) nr_ios) + / (double) (dms->interval_ns); + + return 1; +} + +static int _utilization(const struct dm_stats *dms, double *util, + uint64_t region_id, uint64_t area_id) +{ + uint64_t io_nsecs, interval_ns = dms->interval_ns; + + /** + * If io_nsec > interval_ns there is something wrong with the clock + * for the last interval; do not allow a value > 100% utilization + * to be passed to a dm_make_percent() call. We expect to see these + * at startup if counters have not been cleared before the first read. + * + * A zero interval_ns is also an error since metrics cannot be + * calculated without a defined interval - return zero and emit a + * backtrace in this case. + */ + io_nsecs = dm_stats_get_counter(dms, DM_STATS_IO_NSECS, + region_id, area_id); + + if (!interval_ns) { + *util = 0.0; + return_0; + } + + io_nsecs = ((io_nsecs < interval_ns) ? io_nsecs : interval_ns); + + *util = (double) io_nsecs / (double) interval_ns; + + return 1; +} + +static int _service_time(const struct dm_stats *dms, double *svctm, + uint64_t region_id, uint64_t area_id) +{ + double tput, util; + + if (!_throughput(dms, &tput, region_id, area_id)) + return 0; + + if (!_utilization(dms, &util, region_id, area_id)) + return 0; + + util *= 100; + + /* avoid NAN with zero counter values */ + if ( (uint64_t) tput == 0 || (uint64_t) util == 0) { + *svctm = 0.0; + return 1; + } + + *svctm = ((double) NSEC_PER_SEC * dm_percent_to_float(util)) + / (100.0 * tput); + + return 1; +} + +/* + * Table in enum order: + * DM_STATS_RD_MERGES_PER_SEC, + * DM_STATS_WR_MERGES_PER_SEC, + * DM_STATS_READS_PER_SEC, + * DM_STATS_WRITES_PER_SEC, + * DM_STATS_READ_SECTORS_PER_SEC, + * DM_STATS_WRITE_SECTORS_PER_SEC, + * DM_STATS_AVERAGE_REQUEST_SIZE, + * DM_STATS_AVERAGE_QUEUE_SIZE, + * DM_STATS_AVERAGE_WAIT_TIME, + * DM_STATS_AVERAGE_RD_WAIT_TIME, + * DM_STATS_AVERAGE_WR_WAIT_TIME + * DM_STATS_SERVICE_TIME, + * DM_STATS_THROUGHPUT, + * DM_STATS_UTILIZATION + * +*/ + +typedef int (*_metric_fn_t)(const struct dm_stats *, double *, + uint64_t, uint64_t); + +_metric_fn_t _metrics[DM_STATS_NR_METRICS] = { + _rd_merges_per_sec, + _wr_merges_per_sec, + _reads_per_sec, + _writes_per_sec, + _read_sectors_per_sec, + _write_sectors_per_sec, + _average_request_size, + _average_queue_size, + _average_wait_time, + _average_rd_wait_time, + _average_wr_wait_time, + _service_time, + _throughput, + _utilization +}; + +int dm_stats_get_metric(const struct dm_stats *dms, int metric, + uint64_t region_id, uint64_t area_id, double *value) +{ + if (!dms->interval_ns) + return_0; + + /* + * Decode DM_STATS_{REGION,AREA}_CURRENT here; counters will then + * be returned for the actual current region and area. + * + * DM_STATS_WALK_GROUP is passed through to the counter methods - + * aggregates for the group are returned and used to calculate + * the metric for the group totals. + */ + region_id = (region_id == DM_STATS_REGION_CURRENT) + ? dms->cur_region : region_id ; + area_id = (area_id == DM_STATS_REGION_CURRENT) + ? dms->cur_area : area_id ; + + if (metric < 0 || metric >= DM_STATS_NR_METRICS) { + log_error("Attempt to read invalid metric: %d", metric); + return 0; + } + + return _metrics[metric](dms, value, region_id, area_id); +} + +/** + * Methods for accessing stats metrics. All methods share the + * following naming scheme and prototype: + * + * uint64_t dm_stats_get_metric(struct dm_stats *, + * int, int, + * uint64_t, uint64_t, + * double *v) + * + * Where the two integer arguments are the region_id and area_id + * respectively. + * + * name is the name of the metric (lower case) + * metric is the part of the enum name following DM_STATS_ (upper case) + */ +#define MK_STATS_GET_METRIC_FN(name, metric, meta) \ +int dm_stats_get_ ## name(const struct dm_stats *dms, double *meta, \ + uint64_t region_id, uint64_t area_id) \ +{ \ + return dm_stats_get_metric(dms, DM_STATS_ ## metric, \ + region_id, area_id, meta); \ +} + +MK_STATS_GET_METRIC_FN(rd_merges_per_sec, RD_MERGES_PER_SEC, rrqm) +MK_STATS_GET_METRIC_FN(wr_merges_per_sec, WR_MERGES_PER_SEC, wrqm) +MK_STATS_GET_METRIC_FN(reads_per_sec, READS_PER_SEC, rd_s) +MK_STATS_GET_METRIC_FN(writes_per_sec, WRITES_PER_SEC, wr_s) +MK_STATS_GET_METRIC_FN(read_sectors_per_sec, READ_SECTORS_PER_SEC, rsec_s) +MK_STATS_GET_METRIC_FN(write_sectors_per_sec, WRITE_SECTORS_PER_SEC, wsec_s) +MK_STATS_GET_METRIC_FN(average_request_size, AVERAGE_REQUEST_SIZE, arqsz) +MK_STATS_GET_METRIC_FN(average_queue_size, AVERAGE_QUEUE_SIZE, qusz) +MK_STATS_GET_METRIC_FN(average_wait_time, AVERAGE_WAIT_TIME, await) +MK_STATS_GET_METRIC_FN(average_rd_wait_time, AVERAGE_RD_WAIT_TIME, await) +MK_STATS_GET_METRIC_FN(average_wr_wait_time, AVERAGE_WR_WAIT_TIME, await) +MK_STATS_GET_METRIC_FN(service_time, SERVICE_TIME, svctm) +MK_STATS_GET_METRIC_FN(throughput, THROUGHPUT, tput) + +/* + * Utilization is an exception since it used the dm_percent_t type in the + * original named function based interface: preserve this behaviour for + * backwards compatibility with existing users. + * + * The same metric may be accessed as a double via the enum based metric + * interface. + */ +int dm_stats_get_utilization(const struct dm_stats *dms, dm_percent_t *util, + uint64_t region_id, uint64_t area_id) +{ + double _util; + + if (!dm_stats_get_metric(dms, DM_STATS_UTILIZATION, + region_id, area_id, &_util)) + return_0; + /* scale up utilization value in the range [0.00..1.00] */ + *util = dm_make_percent(DM_PERCENT_1 * _util, DM_PERCENT_1); + return 1; +} + +void dm_stats_set_sampling_interval_ms(struct dm_stats *dms, uint64_t interval_ms) +{ + /* All times use nsecs internally. */ + dms->interval_ns = interval_ms * NSEC_PER_MSEC; +} + +void dm_stats_set_sampling_interval_ns(struct dm_stats *dms, uint64_t interval_ns) +{ + dms->interval_ns = interval_ns; +} + +uint64_t dm_stats_get_sampling_interval_ms(const struct dm_stats *dms) +{ + /* All times use nsecs internally. */ + return (dms->interval_ns / NSEC_PER_MSEC); +} + +uint64_t dm_stats_get_sampling_interval_ns(const struct dm_stats *dms) +{ + /* All times use nsecs internally. */ + return (dms->interval_ns); +} + +int dm_stats_set_program_id(struct dm_stats *dms, int allow_empty, + const char *program_id) +{ + if (!allow_empty && (!program_id || !strlen(program_id))) { + log_error("Empty program_id not permitted without " + "allow_empty=1"); + return 0; + } + + if (!program_id) + program_id = ""; + + dm_free(dms->program_id); + + if (!(dms->program_id = dm_strdup(program_id))) + return_0; + + return 1; +} + +uint64_t dm_stats_get_current_region(const struct dm_stats *dms) +{ + return dms->cur_region; +} + +uint64_t dm_stats_get_current_area(const struct dm_stats *dms) +{ + return dms->cur_area & ~DM_STATS_WALK_ALL; +} + +int dm_stats_get_region_start(const struct dm_stats *dms, uint64_t *start, + uint64_t region_id) +{ + if (!dms || !dms->regions) + return_0; + + /* start is unchanged when aggregating areas */ + if (region_id & DM_STATS_WALK_REGION) + region_id &= ~DM_STATS_WALK_REGION; + + /* use start of first region as group start */ + if (region_id & DM_STATS_WALK_GROUP) { + if (region_id == DM_STATS_WALK_GROUP) + region_id = dms->cur_group; + else + region_id &= ~DM_STATS_WALK_GROUP; + } + + *start = dms->regions[region_id].start; + return 1; +} + +int dm_stats_get_region_len(const struct dm_stats *dms, uint64_t *len, + uint64_t region_id) +{ + uint64_t i; + if (!dms || !dms->regions) + return_0; + + *len = 0; + + /* length is unchanged when aggregating areas */ + if (region_id & DM_STATS_WALK_REGION) + region_id &= ~DM_STATS_WALK_REGION; + + if (region_id & DM_STATS_WALK_GROUP) { + /* decode region / group ID */ + if (region_id == DM_STATS_WALK_GROUP) + region_id = dms->cur_group; + else + region_id &= ~DM_STATS_WALK_GROUP; + + /* use sum of region sizes as group size */ + if (_stats_region_is_grouped(dms, region_id)) + _foreach_group_region(dms, dms->cur_group, i) + *len += dms->regions[i].len; + else { + log_error("Group ID " FMTu64 " does not exist", + region_id); + return 0; + } + } else + *len = dms->regions[region_id].len; + + return 1; +} + +int dm_stats_get_region_area_len(const struct dm_stats *dms, uint64_t *len, + uint64_t region_id) +{ + if (!dms || !dms->regions) + return_0; + + /* groups are not subdivided - area size equals group size */ + if (region_id & (DM_STATS_WALK_GROUP | DM_STATS_WALK_REGION)) + /* get_region_len will decode region_id */ + return dm_stats_get_region_len(dms, len, region_id); + + *len = dms->regions[region_id].step; + return 1; +} + +int dm_stats_get_current_region_start(const struct dm_stats *dms, + uint64_t *start) +{ + return dm_stats_get_region_start(dms, start, dms->cur_region); +} + +int dm_stats_get_current_region_len(const struct dm_stats *dms, + uint64_t *len) +{ + return dm_stats_get_region_len(dms, len, dms->cur_region); +} + +int dm_stats_get_current_region_area_len(const struct dm_stats *dms, + uint64_t *step) +{ + return dm_stats_get_region_area_len(dms, step, dms->cur_region); +} + +int dm_stats_get_area_start(const struct dm_stats *dms, uint64_t *start, + uint64_t region_id, uint64_t area_id) +{ + struct dm_stats_region *region; + if (!dms || !dms->regions) + return_0; + + /* group or region area start equals region start */ + if (region_id & (DM_STATS_WALK_GROUP | DM_STATS_WALK_REGION)) + return dm_stats_get_region_start(dms, start, region_id); + + region = &dms->regions[region_id]; + *start = region->start + region->step * area_id; + return 1; +} + +int dm_stats_get_area_offset(const struct dm_stats *dms, uint64_t *offset, + uint64_t region_id, uint64_t area_id) +{ + if (!dms || !dms->regions) + return_0; + + /* no areas for groups or aggregate regions */ + if (region_id & (DM_STATS_WALK_GROUP | DM_STATS_WALK_REGION)) + *offset = 0; + else + *offset = dms->regions[region_id].step * area_id; + + return 1; +} + +int dm_stats_get_current_area_start(const struct dm_stats *dms, + uint64_t *start) +{ + return dm_stats_get_area_start(dms, start, + dms->cur_region, dms->cur_area); +} + +int dm_stats_get_current_area_offset(const struct dm_stats *dms, + uint64_t *offset) +{ + return dm_stats_get_area_offset(dms, offset, + dms->cur_region, dms->cur_area); +} + +int dm_stats_get_current_area_len(const struct dm_stats *dms, + uint64_t *len) +{ + return dm_stats_get_region_area_len(dms, len, dms->cur_region); +} + +const char *dm_stats_get_region_program_id(const struct dm_stats *dms, + uint64_t region_id) +{ + const char *program_id = NULL; + + if (region_id & DM_STATS_WALK_GROUP) + return dms->program_id; + + if (region_id & DM_STATS_WALK_REGION) + region_id &= ~DM_STATS_WALK_REGION; + + program_id = dms->regions[region_id].program_id; + return (program_id) ? program_id : ""; +} + +const char *dm_stats_get_region_aux_data(const struct dm_stats *dms, + uint64_t region_id) +{ + const char *aux_data = NULL; + + if (region_id & DM_STATS_WALK_GROUP) + return ""; + + if (region_id & DM_STATS_WALK_REGION) + region_id &= ~DM_STATS_WALK_REGION; + + aux_data = dms->regions[region_id].aux_data; + return (aux_data) ? aux_data : "" ; +} + +int dm_stats_set_alias(struct dm_stats *dms, uint64_t group_id, const char *alias) +{ + struct dm_stats_group *group = NULL; + const char *old_alias = NULL; + + if (!dms->regions || !dms->groups || !alias) + return_0; + + if (!_stats_region_is_grouped(dms, group_id)) { + log_error("Cannot set alias for ungrouped region ID " + FMTu64, group_id); + return 0; + } + + if (group_id & DM_STATS_WALK_GROUP) { + if (group_id == DM_STATS_WALK_GROUP) + group_id = dms->cur_group; + else + group_id &= ~DM_STATS_WALK_GROUP; + } + + if (group_id != dms->regions[group_id].group_id) { + /* dm_stats_set_alias() must be called on the group ID. */ + log_error("Cannot set alias for group member " FMTu64 ".", + group_id); + return 0; + } + + group = &dms->groups[group_id]; + old_alias = group->alias; + + group->alias = dm_strdup(alias); + if (!group->alias) { + log_error("Could not allocate memory for alias."); + goto bad; + } + + if (!_stats_set_aux(dms, group_id, dms->regions[group_id].aux_data)) { + log_error("Could not set new aux_data"); + goto bad; + } + + dm_free((char *) old_alias); + + return 1; + +bad: + dm_free((char *) group->alias); + group->alias = old_alias; + return 0; +} + +const char *dm_stats_get_alias(const struct dm_stats *dms, uint64_t id) +{ + const struct dm_stats_region *region; + + id = (id == DM_STATS_REGION_CURRENT) ? dms->cur_region : id; + + if (id & DM_STATS_WALK_GROUP) { + if (id == DM_STATS_WALK_GROUP) + id = dms->cur_group; + else + id &= ~DM_STATS_WALK_GROUP; + } + + region = &dms->regions[id]; + if (!_stats_region_is_grouped(dms, id) + || !dms->groups[region->group_id].alias) + return dms->name; + + return dms->groups[region->group_id].alias; +} + +const char *dm_stats_get_current_region_program_id(const struct dm_stats *dms) +{ + return dm_stats_get_region_program_id(dms, dms->cur_region); +} + +const char *dm_stats_get_current_region_aux_data(const struct dm_stats *dms) +{ + return dm_stats_get_region_aux_data(dms, dms->cur_region); +} + +int dm_stats_get_region_precise_timestamps(const struct dm_stats *dms, + uint64_t region_id) +{ + struct dm_stats_region *region; + + if (region_id == DM_STATS_REGION_CURRENT) + region_id = dms->cur_region; + + if (region_id == DM_STATS_WALK_GROUP) + region_id = dms->cur_group; + else if (region_id & DM_STATS_WALK_GROUP) + region_id &= ~DM_STATS_WALK_GROUP; + + region = &dms->regions[region_id]; + return region->timescale == 1; +} + +int dm_stats_get_current_region_precise_timestamps(const struct dm_stats *dms) +{ + return dm_stats_get_region_precise_timestamps(dms, + DM_STATS_REGION_CURRENT); +} + +/* + * Histogram access methods. + */ + +static void _sum_histogram_bins(const struct dm_stats *dms, + struct dm_histogram *dmh_aggr, + uint64_t region_id, uint64_t area_id) +{ + struct dm_stats_region *region; + struct dm_histogram_bin *bins; + struct dm_histogram *dmh_cur; + int bin; + + region = &dms->regions[region_id]; + dmh_cur = region->counters[area_id].histogram; + bins = dmh_aggr->bins; + + for (bin = 0; bin < dmh_aggr->nr_bins; bin++) + bins[bin].count += dmh_cur->bins[bin].count; +} + +/* + * Create an aggregate histogram for a sub-divided region or a group. + */ +static struct dm_histogram *_aggregate_histogram(const struct dm_stats *dms, + uint64_t region_id, + uint64_t area_id) +{ + struct dm_histogram *dmh_aggr, *dmh_cur, **dmh_cachep; + uint64_t group_id = DM_STATS_GROUP_NOT_PRESENT; + int bin, nr_bins, group = 1; + size_t hist_size; + + if (area_id == DM_STATS_WALK_REGION) { + /* region aggregation */ + group = 0; + if (!_stats_region_present(&dms->regions[region_id])) + return_NULL; + + if (!dms->regions[region_id].bounds) + return_NULL; + + if (!dms->regions[region_id].counters) + return dms->regions[region_id].bounds; + + if (dms->regions[region_id].histogram) + return dms->regions[region_id].histogram; + + dmh_cur = dms->regions[region_id].counters[0].histogram; + dmh_cachep = &dms->regions[region_id].histogram; + nr_bins = dms->regions[region_id].bounds->nr_bins; + } else { + /* group aggregation */ + group_id = region_id; + area_id = DM_STATS_WALK_GROUP; + if (!_stats_group_id_present(dms, group_id)) + return_NULL; + + if (!dms->regions[group_id].bounds) + return_NULL; + + if (!dms->regions[group_id].counters) + return dms->regions[group_id].bounds; + + if (dms->groups[group_id].histogram) + return dms->groups[group_id].histogram; + + dmh_cur = dms->regions[group_id].counters[0].histogram; + dmh_cachep = &dms->groups[group_id].histogram; + nr_bins = dms->regions[group_id].bounds->nr_bins; + } + + hist_size = sizeof(*dmh_aggr) + + nr_bins * sizeof(struct dm_histogram_bin); + + if (!(dmh_aggr = dm_pool_zalloc(dms->hist_mem, hist_size))) { + log_error("Could not allocate group histogram"); + return 0; + } + + dmh_aggr->nr_bins = dmh_cur->nr_bins; + dmh_aggr->dms = dms; + + if (!group) + _foreach_region_area(dms, region_id, area_id) { + _sum_histogram_bins(dms, dmh_aggr, region_id, area_id); + } + else { + _foreach_group_area(dms, group_id, region_id, area_id) { + _sum_histogram_bins(dms, dmh_aggr, region_id, area_id); + } + } + + for (bin = 0; bin < nr_bins; bin++) { + dmh_aggr->sum += dmh_aggr->bins[bin].count; + dmh_aggr->bins[bin].upper = dmh_cur->bins[bin].upper; + } + + /* cache aggregate histogram for subsequent access */ + *dmh_cachep = dmh_aggr; + + return dmh_aggr; +} + +struct dm_histogram *dm_stats_get_histogram(const struct dm_stats *dms, + uint64_t region_id, + uint64_t area_id) +{ + int aggr = 0; + + if (region_id == DM_STATS_REGION_CURRENT) { + region_id = dms->cur_region; + if (region_id & DM_STATS_WALK_GROUP) { + region_id = dms->cur_group; + aggr = 1; + } + } else if (region_id & DM_STATS_WALK_GROUP) { + region_id &= ~DM_STATS_WALK_GROUP; + aggr = 1; + } + + area_id = (area_id == DM_STATS_AREA_CURRENT) + ? dms->cur_area : area_id ; + + if (area_id == DM_STATS_WALK_REGION) + aggr = 1; + + if (aggr) + return _aggregate_histogram(dms, region_id, area_id); + + if (region_id & DM_STATS_WALK_REGION) + region_id &= ~DM_STATS_WALK_REGION; + + if (!dms->regions[region_id].counters) + return dms->regions[region_id].bounds; + + return dms->regions[region_id].counters[area_id].histogram; +} + +int dm_histogram_get_nr_bins(const struct dm_histogram *dmh) +{ + return dmh->nr_bins; +} + +uint64_t dm_histogram_get_bin_lower(const struct dm_histogram *dmh, int bin) +{ + return (!bin) ? 0 : dmh->bins[bin - 1].upper; +} + +uint64_t dm_histogram_get_bin_upper(const struct dm_histogram *dmh, int bin) +{ + return dmh->bins[bin].upper; +} + +uint64_t dm_histogram_get_bin_width(const struct dm_histogram *dmh, int bin) +{ + uint64_t upper, lower; + upper = dm_histogram_get_bin_upper(dmh, bin); + lower = dm_histogram_get_bin_lower(dmh, bin); + return (upper - lower); +} + +uint64_t dm_histogram_get_bin_count(const struct dm_histogram *dmh, int bin) +{ + return dmh->bins[bin].count; +} + +uint64_t dm_histogram_get_sum(const struct dm_histogram *dmh) +{ + return dmh->sum; +} + +dm_percent_t dm_histogram_get_bin_percent(const struct dm_histogram *dmh, + int bin) +{ + uint64_t value = dm_histogram_get_bin_count(dmh, bin); + uint64_t width = dm_histogram_get_bin_width(dmh, bin); + uint64_t total = dm_histogram_get_sum(dmh); + + double val = (double) value; + + if (!total || !value || !width) + return DM_PERCENT_0; + + return dm_make_percent((uint64_t) val, total); +} + +/* + * Histogram string helper functions: used to construct histogram and + * bin boundary strings from numeric data. + */ + +/* + * Allocate an unbound histogram object with nr_bins bins. Only used + * for histograms used to hold bounds values as arguments for calls to + * dm_stats_create_region(). + */ +static struct dm_histogram *_alloc_dm_histogram(int nr_bins) +{ + /* Allocate space for dm_histogram + nr_entries. */ + size_t size = sizeof(struct dm_histogram) + + (unsigned) nr_bins * sizeof(struct dm_histogram_bin); + return dm_zalloc(size); +} + +/* + * Parse a histogram bounds string supplied by the user. The string + * consists of a list of numbers, "n1,n2,n3,..." with optional 'ns', + * 'us', 'ms', or 's' unit suffixes. + * + * The scale parameter indicates the timescale used for this region: one + * for nanoscale resolution and NSEC_PER_MSEC for miliseconds. + * + * On return bounds contains a pointer to an array of uint64_t + * histogram bounds values expressed in units of nanoseconds. + */ +struct dm_histogram *dm_histogram_bounds_from_string(const char *bounds_str) +{ + static const char _valid_chars[] = "0123456789,muns"; + uint64_t this_val = 0, mult = 1; + const char *c, *v, *val_start; + struct dm_histogram_bin *cur; + struct dm_histogram *dmh; + int nr_entries = 1; + char *endptr; + + c = bounds_str; + + /* Count number of bounds entries. */ + while(*c) + if (*(c++) == ',') + nr_entries++; + + c = bounds_str; + + if (!(dmh = _alloc_dm_histogram(nr_entries))) + return_0; + + dmh->nr_bins = nr_entries; + + cur = dmh->bins; + + do { + for (v = _valid_chars; *v; v++) + if (*c == *v) + break; + + if (!*v) { + stack; + goto badchar; + } + + if (*c == ',') { + log_error("Empty histogram bin not allowed: %s", + bounds_str); + goto bad; + } else { + val_start = c; + endptr = NULL; + + this_val = strtoull(val_start, &endptr, 10); + if (!endptr) { + log_error("Could not parse histogram bound."); + goto bad; + } + c = endptr; /* Advance to units, comma, or end. */ + + if (*c == 's') { + mult = NSEC_PER_SEC; + c++; /* Advance over 's'. */ + } else if (*(c + 1) == 's') { + if (*c == 'm') + mult = NSEC_PER_MSEC; + else if (*c == 'u') + mult = NSEC_PER_USEC; + else if (*c == 'n') + mult = 1; + else { + stack; + goto badchar; + } + c += 2; /* Advance over 'ms', 'us', or 'ns'. */ + } else if (*c == ',') + c++; + else if (*c) { /* Expected ',' or NULL. */ + stack; + goto badchar; + } + + if (*c == ',') + c++; + this_val *= mult; + (cur++)->upper = this_val; + } + } while (*c); + + /* Bounds histograms have no owner. */ + dmh->dms = NULL; + dmh->region = NULL; + + return dmh; + +badchar: + log_error("Invalid character in histogram: %c", *c); +bad: + dm_free(dmh); + return NULL; +} + +struct dm_histogram *dm_histogram_bounds_from_uint64(const uint64_t *bounds) +{ + const uint64_t *entry = bounds; + struct dm_histogram_bin *cur; + struct dm_histogram *dmh; + int nr_entries = 1; + + if (!bounds || !bounds[0]) { + log_error("Could not parse empty histogram bounds array"); + return 0; + } + + /* Count number of bounds entries. */ + while(*entry) + if (*(++entry)) + nr_entries++; + + entry = bounds; + + if (!(dmh = _alloc_dm_histogram(nr_entries))) + return_0; + + dmh->nr_bins = nr_entries; + + cur = dmh->bins; + + while (*entry) + (cur++)->upper = *(entry++); + + /* Bounds histograms have no owner. */ + dmh->dms = NULL; + dmh->region = NULL; + + return dmh; +} + +void dm_histogram_bounds_destroy(struct dm_histogram *bounds) +{ + if (!bounds) + return; + + /* Bounds histograms are not bound to any handle or region. */ + if (bounds->dms || bounds->region) { + log_error("Freeing invalid histogram bounds pointer %p.", + (void *) bounds); + stack; + } + /* dm_free() expects a (void *). */ + dm_free((void *) bounds); +} + +/* + * Scale a bounds value down from nanoseconds to the largest possible + * whole unit suffix. + */ +static void _scale_bound_value_to_suffix(uint64_t *bound, const char **suffix) +{ + *suffix = "ns"; + if (!(*bound % NSEC_PER_SEC)) { + *bound /= NSEC_PER_SEC; + *suffix = "s"; + } else if (!(*bound % NSEC_PER_MSEC)) { + *bound /= NSEC_PER_MSEC; + *suffix = "ms"; + } else if (!(*bound % NSEC_PER_USEC)) { + *bound /= NSEC_PER_USEC; + *suffix = "us"; + } +} + +#define DM_HISTOGRAM_BOUNDS_MASK 0x30 +#define BOUNDS_LEN 64 + +static int _make_bounds_string(char *buf, size_t size, uint64_t lower, + uint64_t upper, int flags, int width) +{ + char bound_buf[BOUNDS_LEN]; + const char *l_suff = NULL; + const char *u_suff = NULL; + const char *sep = ""; + int bounds = flags & DM_HISTOGRAM_BOUNDS_MASK; + + if (!bounds) + return_0; + + *buf = '\0'; + + if (flags & DM_HISTOGRAM_SUFFIX) { + _scale_bound_value_to_suffix(&lower, &l_suff); + _scale_bound_value_to_suffix(&upper, &u_suff); + } else + l_suff = u_suff = ""; + + if (flags & DM_HISTOGRAM_VALUES) + sep = ":"; + + if (bounds > DM_HISTOGRAM_BOUNDS_LOWER) { + /* Handle infinite uppermost bound. */ + if (upper == UINT64_MAX) { + if (dm_snprintf(bound_buf, sizeof(bound_buf), + ">" FMTu64 "%s", lower, l_suff) < 0) + goto_out; + /* Only display an 'upper' string for final bin. */ + bounds = DM_HISTOGRAM_BOUNDS_UPPER; + } else { + if (dm_snprintf(bound_buf, sizeof(bound_buf), + FMTu64 "%s", upper, u_suff) < 0) + goto_out; + } + } else if (bounds == DM_HISTOGRAM_BOUNDS_LOWER) { + if ((dm_snprintf(bound_buf, sizeof(bound_buf), FMTu64 "%s", + lower, l_suff)) < 0) + goto_out; + } + + switch (bounds) { + case DM_HISTOGRAM_BOUNDS_LOWER: + case DM_HISTOGRAM_BOUNDS_UPPER: + return dm_snprintf(buf, size, "%*s%s", width, bound_buf, sep); + case DM_HISTOGRAM_BOUNDS_RANGE: + return dm_snprintf(buf, size, FMTu64 "%s-%s%s", + lower, l_suff, bound_buf, sep); + } +out: + return 0; +} + +#define BOUND_WIDTH_NOSUFFIX 10 /* 999999999 nsecs */ +#define BOUND_WIDTH 6 /* bounds string up to 9999xs */ +#define COUNT_WIDTH 6 /* count string: up to 9999 */ +#define PERCENT_WIDTH 6 /* percent string : 0.00-100.00% */ +#define DM_HISTOGRAM_VALUES_MASK 0x06 + +const char *dm_histogram_to_string(const struct dm_histogram *dmh, int bin, + int width, int flags) +{ + char buf[BOUNDS_LEN], bounds_buf[BOUNDS_LEN]; + int minwidth, bounds, values, start, last; + uint64_t lower, upper, val_u64; /* bounds of the current bin. */ + /* Use the histogram pool for string building. */ + struct dm_pool *mem = dmh->dms->hist_mem; + const char *sep = ""; + int bounds_width; + ssize_t len = 0; + float val_flt; + + bounds = flags & DM_HISTOGRAM_BOUNDS_MASK; + values = flags & DM_HISTOGRAM_VALUES; + + if (bin < 0) { + start = 0; + last = dmh->nr_bins - 1; + } else + start = last = bin; + + minwidth = width; + + if (width < 0 || !values) + width = minwidth = 0; /* no padding */ + else if (flags & DM_HISTOGRAM_PERCENT) + width = minwidth = (width) ? : PERCENT_WIDTH; + else if (flags & DM_HISTOGRAM_VALUES) + width = minwidth = (width) ? : COUNT_WIDTH; + + if (values && !width) + sep = ":"; + + /* Set bounds string to the empty string. */ + bounds_buf[0] = '\0'; + + if (!dm_pool_begin_object(mem, 64)) + return_0; + + for (bin = start; bin <= last; bin++) { + if (bounds) { + /* Default bounds width depends on time suffixes. */ + bounds_width = (!(flags & DM_HISTOGRAM_SUFFIX)) + ? BOUND_WIDTH_NOSUFFIX + : BOUND_WIDTH ; + + bounds_width = (!width) ? width : bounds_width; + + lower = dm_histogram_get_bin_lower(dmh, bin); + upper = dm_histogram_get_bin_upper(dmh, bin); + + len = sizeof(bounds_buf); + len = _make_bounds_string(bounds_buf, len, + lower, upper, flags, + bounds_width); + /* + * Comma separates "bounds: value" pairs unless + * --noheadings is used. + */ + sep = (width || !values) ? "," : ":"; + + /* Adjust width by real bounds length if set. */ + width -= (width) ? (len - (bounds_width + 1)) : 0; + + /* -ve width indicates specified width was overrun. */ + width = (width > 0) ? width : 0; + } + + if (bin == last) + sep = ""; + + if (flags & DM_HISTOGRAM_PERCENT) { + dm_percent_t pr; + pr = dm_histogram_get_bin_percent(dmh, bin); + val_flt = dm_percent_to_float(pr); + len = dm_snprintf(buf, sizeof(buf), "%s%*.2f%%%s", + bounds_buf, width, val_flt, sep); + } else if (values) { + val_u64 = dmh->bins[bin].count; + len = dm_snprintf(buf, sizeof(buf), "%s%*"PRIu64"%s", + bounds_buf, width, val_u64, sep); + } else if (bounds) + len = dm_snprintf(buf, sizeof(buf), "%s%s", bounds_buf, + sep); + else { + *buf = '\0'; + len = 0; + } + + if (len < 0) + goto_bad; + + width = minwidth; /* re-set histogram column width. */ + if (!dm_pool_grow_object(mem, buf, (size_t) len)) + goto_bad; + } + + if (!dm_pool_grow_object(mem, "\0", 1)) + goto_bad; + + return (const char *) dm_pool_end_object(mem); + +bad: + dm_pool_abandon_object(mem); + return NULL; +} + +/* + * A lightweight representation of an extent (region, area, file + * system block or extent etc.). A table of extents can be used + * to sort and to efficiently find holes or overlaps among a set + * of tuples of the form (id, start, len). + */ +struct _extent { + struct dm_list list; + uint64_t id; + uint64_t start; + uint64_t len; +}; + +/* last address in an extent */ +#define _extent_end(a) ((a)->start + (a)->len - 1) + +/* a and b must be sorted by increasing start sector */ +#define _extents_overlap(a, b) (_extent_end(a) > (b)->start) + +/* + * Comparison function to sort extents in ascending start order. + */ +static int _extent_start_compare(const void *p1, const void *p2) +{ + const struct _extent *r1, *r2; + r1 = (const struct _extent *) p1; + r2 = (const struct _extent *) p2; + + if (r1->start < r2->start) + return -1; + else if (r1->start == r2->start) + return 0; + return 1; +} + +static int _stats_create_group(struct dm_stats *dms, dm_bitset_t regions, + const char *alias, uint64_t *group_id) +{ + struct dm_stats_group *group; + *group_id = dm_bit_get_first(regions); + + /* group has no regions? */ + if (*group_id == DM_STATS_GROUP_NOT_PRESENT) + return_0; + + group = &dms->groups[*group_id]; + + if (group->regions) { + log_error(INTERNAL_ERROR "Unexpected group state while" + "creating group ID bitmap" FMTu64, *group_id); + return 0; + } + + group->group_id = *group_id; + group->regions = regions; + + if (alias) + group->alias = dm_strdup(alias); + else + group->alias = NULL; + + /* force an update of the group tag stored in aux_data */ + if (!_stats_set_aux(dms, *group_id, dms->regions[*group_id].aux_data)) + return 0; + + return 1; +} + +static int _stats_group_check_overlap(const struct dm_stats *dms, + dm_bitset_t regions, int count) +{ + struct dm_list ext_list = DM_LIST_HEAD_INIT(ext_list); + struct _extent *ext, *tmp, *next, *map = NULL; + size_t map_size = (dms->max_region + 1) * sizeof(*map); + int i = 0, id, overlap, merged; + + map = dm_pool_alloc(dms->mem, map_size); + if (!map) { + log_error("Could not allocate memory for region map"); + return 0; + } + + /* build a table of extents in order of region_id */ + for (id = dm_bit_get_first(regions); id >= 0; + id = dm_bit_get_next(regions, id)) { + dm_list_init(&map[i].list); + map[i].id = id; + map[i].start = dms->regions[id].start; + map[i].len = dms->regions[id].len; + i++; + } + + /* A single region cannot overlap itself. */ + if (i == 1) { + dm_pool_free(dms->mem, map); + return 1; + } + + /* sort by extent.start */ + qsort(map, count, sizeof(*map), _extent_start_compare); + + for (i = 0; i < count; i++) + dm_list_add(&ext_list, &map[i].list); + + overlap = 0; +merge: + merged = 0; + dm_list_iterate_items_safe(ext, tmp, &ext_list) { + next = dm_list_item(dm_list_next(&ext_list, &ext->list), + struct _extent); + if (!next) + continue; + + if (_extents_overlap(ext, next)) { + log_warn("WARNING: region IDs " FMTu64 " and " + FMTu64 " overlap. Some events will be " + "counted twice.", ext->id, next->id); + /* merge larger extent into smaller */ + if (_extent_end(ext) > _extent_end(next)) { + next->id = ext->id; + next->len = ext->len; + } + if (ext->start < next->start) + next->start = ext->start; + dm_list_del(&ext->list); + overlap = merged = 1; + } + } + /* continue until no merge candidates remain */ + if (merged) + goto merge; + + dm_pool_free(dms->mem, map); + return (overlap == 0); +} + +static void _stats_copy_histogram_bounds(struct dm_histogram *to, + struct dm_histogram *from) +{ + int i; + + to->nr_bins = from->nr_bins; + + for (i = 0; i < to->nr_bins; i++) + to->bins[i].upper = from->bins[i].upper; +} + +/* + * Compare histogram bounds h1 and h2, and return 1 if they match (i.e. + * have the same number of bins and identical bin boundary values), or 0 + * otherwise. + */ +static int _stats_check_histogram_bounds(struct dm_histogram *h1, + struct dm_histogram *h2) +{ + int i; + + if (!h1 || !h2) + return 0; + + if (h1->nr_bins != h2->nr_bins) + return 0; + + for (i = 0; i < h1->nr_bins; i++) + if (h1->bins[i].upper != h2->bins[i].upper) + return 0; + return 1; +} + +/* + * Create a new group in stats handle dms from the group description + * passed in group. + */ +int dm_stats_create_group(struct dm_stats *dms, const char *members, + const char *alias, uint64_t *group_id) +{ + struct dm_histogram *check = NULL, *bounds; + int i, count = 0, precise = 0; + dm_bitset_t regions; + + if (!dms->regions || !dms->groups) { + log_error("Could not create group: no regions found."); + return 0; + }; + + if (!(regions = dm_bitset_parse_list(members, NULL, 0))) { + log_error("Could not parse list: '%s'", members); + return 0; + } + + if (!(check = dm_pool_zalloc(dms->hist_mem, sizeof(*check)))) { + log_error("Could not allocate memory for bounds check"); + goto bad; + } + + /* too many bits? */ + if ((*regions - 1) > dms->max_region) { + log_error("Invalid region ID: %d", *regions - 1); + goto bad; + } + + /* + * Check that each region_id in the bitmap meets the group + * constraints: present, not already grouped, and if any + * histogram is present that they all have the same bounds. + */ + for (i = dm_bit_get_first(regions); i >= 0; + i = dm_bit_get_next(regions, i)) { + if (!dm_stats_region_present(dms, i)) { + log_error("Region ID %d does not exist", i); + goto bad; + } + if (_stats_region_is_grouped(dms, i)) { + log_error("Region ID %d already a member of group ID " + FMTu64, i, dms->regions[i].group_id); + goto bad; + } + if (dms->regions[i].timescale == 1) + precise++; + + /* check for matching histogram bounds */ + bounds = dms->regions[i].bounds; + if (bounds && !check->nr_bins) + _stats_copy_histogram_bounds(check, bounds); + else if (bounds) { + if (!_stats_check_histogram_bounds(check, bounds)) { + log_error("All region histogram bounds " + "must match exactly"); + goto bad; + } + } + count++; + } + + if (precise && (precise != count)) + log_warn("WARNING: Grouping regions with different clock resolution: " + "precision may be lost."); + + if (!_stats_group_check_overlap(dms, regions, count)) + log_very_verbose("Creating group with overlapping regions."); + + if (!_stats_create_group(dms, regions, alias, group_id)) + goto bad; + + dm_pool_free(dms->hist_mem, check); + return 1; + +bad: + dm_pool_free(dms->hist_mem, check); + dm_bitset_destroy(regions); + return 0; +} + +/* + * Remove the specified group_id. + */ +int dm_stats_delete_group(struct dm_stats *dms, uint64_t group_id, + int remove_regions) +{ + struct dm_stats_region *leader; + dm_bitset_t regions; + uint64_t i; + + if (group_id > dms->max_region) { + log_error("Invalid group ID: " FMTu64, group_id); + return 0; + } + + if (!_stats_group_id_present(dms, group_id)) { + log_error("Group ID " FMTu64 " does not exist", group_id); + return 0; + } + + regions = dms->groups[group_id].regions; + leader = &dms->regions[group_id]; + + /* delete all but the group leader */ + for (i = (*regions - 1); i > leader->region_id; i--) { + if (dm_bit(regions, i)) { + dm_bit_clear(regions, i); + if (remove_regions && !dm_stats_delete_region(dms, i)) + log_warn("WARNING: Failed to delete region " + FMTu64 " on %s.", i, dms->name); + } + } + + /* clear group and mark as not present */ + _stats_clear_group_regions(dms, group_id); + _stats_group_destroy(&dms->groups[group_id]); + + /* delete leader or clear aux_data */ + if (remove_regions) + return dm_stats_delete_region(dms, group_id); + else if (!_stats_set_aux(dms, group_id, leader->aux_data)) + return 0; + + return 1; +} + +uint64_t dm_stats_get_group_id(const struct dm_stats *dms, uint64_t region_id) +{ + region_id = (region_id == DM_STATS_REGION_CURRENT) + ? dms->cur_region : region_id; + + if (region_id & DM_STATS_WALK_GROUP) { + if (region_id == DM_STATS_WALK_GROUP) + return dms->cur_group; + else + return region_id & ~DM_STATS_WALK_GROUP; + } + + if (region_id & DM_STATS_WALK_REGION) + region_id &= ~DM_STATS_WALK_REGION; + + return dms->regions[region_id].group_id; +} + +int dm_stats_get_group_descriptor(const struct dm_stats *dms, + uint64_t group_id, char **buf) +{ + dm_bitset_t regions = dms->groups[group_id].regions; + size_t buflen; + + buflen = _stats_group_tag_len(dms, regions); + + *buf = dm_pool_alloc(dms->mem, buflen); + if (!*buf) { + log_error("Could not allocate memory for regions string"); + return 0; + } + + if (!_stats_group_tag_fill(dms, regions, *buf, buflen)) + return 0; + + return 1; +} + +#ifdef HAVE_LINUX_FIEMAP_H +/* + * Resize the group bitmap corresponding to group_id so that it can + * contain at least num_regions members. + */ +static int _stats_resize_group(struct dm_stats_group *group, + uint64_t num_regions) +{ + uint64_t last_bit = dm_bit_get_last(group->regions); + dm_bitset_t new, old; + + if (last_bit >= num_regions) { + log_error("Cannot resize group bitmap to " FMTu64 + " with bit " FMTu64 " set.", num_regions, last_bit); + return 0; + } + + log_very_verbose("Resizing group bitmap from " FMTu32 " to " FMTu64 + " (last_bit: " FMTu64 ").", group->regions[0], + num_regions, last_bit); + + new = dm_bitset_create(NULL, (unsigned) num_regions); + if (!new) { + log_error("Could not allocate memory for new group bitmap."); + return 0; + } + + old = group->regions; + dm_bit_copy(new, old); + group->regions = new; + dm_bitset_destroy(old); + return 1; +} + +/* + * Group a table of region_ids corresponding to the extents of a file. + */ +static int _stats_group_file_regions(struct dm_stats *dms, uint64_t *region_ids, + uint64_t count, const char *alias) +{ + dm_bitset_t regions = dm_bitset_create(NULL, dms->nr_regions); + uint64_t i, group_id = DM_STATS_GROUP_NOT_PRESENT; + char *members = NULL; + size_t buflen; + + if (!regions) { + log_error("Cannot map file: failed to allocate group bitmap."); + return 0; + } + + for (i = 0; i < count; i++) + dm_bit_set(regions, region_ids[i]); + + buflen = _stats_group_tag_len(dms, regions); + members = dm_malloc(buflen); + + if (!members) { + log_error("Cannot map file: failed to allocate group " + "descriptor."); + dm_bitset_destroy(regions); + return 0; + } + + if (!_stats_group_tag_fill(dms, regions, members, buflen)) + goto bad; + + /* + * overlaps should not be possible: overlapping file extents + * returned by FIEMAP imply a kernel bug or a corrupt fs. + */ + if (!_stats_group_check_overlap(dms, regions, count)) + log_very_verbose("Creating group with overlapping regions."); + + if (!_stats_create_group(dms, regions, alias, &group_id)) + goto bad; + + dm_free(members); + return 1; +bad: + dm_bitset_destroy(regions); + dm_free(members); + return 0; +} + +static int _stats_add_file_extent(int fd, struct dm_pool *mem, uint64_t id, + struct fiemap_extent *fm_ext) +{ + struct _extent extent; + + /* final address of list is unknown */ + memset(&extent.list, 0, sizeof(extent.list)); + + /* convert bytes to dm (512b) sectors */ + extent.start = fm_ext->fe_physical >> SECTOR_SHIFT; + extent.len = fm_ext->fe_length >> SECTOR_SHIFT; + extent.id = id; + + log_very_verbose("Extent " FMTu64 " on fd %d at " FMTu64 "+" + FMTu64, extent.id, fd, extent.start, extent.len); + + if (!dm_pool_grow_object(mem, &extent, + sizeof(extent))) { + log_error("Cannot map file: failed to grow extent map."); + return 0; + } + return 1; +} + +/* test for the boundary of an extent */ +#define ext_boundary(ext, exp) \ +((ext).fe_logical != 0) && \ +((ext).fe_physical != (exp)) + +/* + * Copy fields from fiemap_extent 'from' to the fiemap_extent + * pointed to by 'to'. + */ +#define ext_copy(to, from) \ +do { \ + *(to) = *(from); \ +} while (0) + +static uint64_t _stats_map_extents(int fd, struct dm_pool *mem, + struct fiemap *fiemap, + struct fiemap_extent *fm_ext, + struct fiemap_extent *fm_last, + struct fiemap_extent *fm_pending, + uint64_t next_extent, + int *eof) +{ + uint64_t expected = 0, nr_extents = next_extent; + unsigned int i; + + /* + * Loop over the returned extents adding the fm_pending extent + * to the table of extents each time a discontinuity (or eof) + * is detected. + * + * We use a pointer to fm_pending in the caller since it is + * possible that logical extents comprising a single physical + * extent are returned by successive FIEMAP calls. + */ + for (i = 0; i < fiemap->fm_mapped_extents; i++) { + expected = fm_last->fe_physical + fm_last->fe_length; + + if (fm_ext[i].fe_flags & FIEMAP_EXTENT_LAST) + *eof = 1; + + /* cannot map extents that are not yet allocated. */ + if (fm_ext[i].fe_flags + & (FIEMAP_EXTENT_UNKNOWN | FIEMAP_EXTENT_DELALLOC)) + continue; + + /* + * Begin a new extent if the current physical address differs + * from the expected address yielded by fm_last.fe_physical + + * fm_last.fe_length. + * + * A logical discontinuity is seen at the start of the file if + * unwritten space exists before the first extent: do not add + * any extent record until we have accumulated a non-zero length + * in fm_pending. + */ + if (fm_pending->fe_length && + ext_boundary(fm_ext[i], expected)) { + if (!_stats_add_file_extent(fd, mem, nr_extents, + fm_pending)) + goto_bad; + nr_extents++; + /* Begin a new pending extent. */ + ext_copy(fm_pending, fm_ext + i); + } else { + expected = 0; + /* Begin a new pending extent for extent 0. If there is + * a hole at the start of the file, the first allocated + * extent will have a non-zero fe_logical. Detect this + * case by testing fm_pending->fe_length: if no length + * has been accumulated we are handling the first + * physical extent of the file. + */ + if (!fm_pending->fe_length || fm_ext[i].fe_logical == 0) + ext_copy(fm_pending, fm_ext + i); + else + /* accumulate this logical extent's length */ + fm_pending->fe_length += fm_ext[i].fe_length; + } + *fm_last = fm_ext[i]; + } + + /* + * If the file only has a single extent, no boundary is ever + * detected to trigger addition of the first extent. + */ + if (*eof || (fm_ext[i - 1].fe_logical == 0)) { + _stats_add_file_extent(fd, mem, nr_extents, fm_pending); + nr_extents++; + } + + fiemap->fm_start = (fm_ext[i - 1].fe_logical + + fm_ext[i - 1].fe_length); + + /* return the number of extents found in this call. */ + return nr_extents - next_extent; +bad: + /* signal mapping error to caller */ + *eof = -1; + return 0; +} + +/* + * Read the extents of an open file descriptor into a table of struct _extent. + * + * Based on e2fsprogs/misc/filefrag.c::filefrag_fiemap(). + * + * Copyright 2003 by Theodore Ts'o. + * + */ +static struct _extent *_stats_get_extents_for_file(struct dm_pool *mem, int fd, + uint64_t *count) +{ + struct fiemap_extent fm_last = {0}, fm_pending = {0}, *fm_ext = NULL; + struct fiemap *fiemap = NULL; + int eof = 0, nr_extents = 0; + struct _extent *extents; + unsigned long flags = 0; + uint64_t *buf; + + /* grow temporary extent table in the pool */ + if (!dm_pool_begin_object(mem, sizeof(*extents))) + return NULL; + + buf = dm_zalloc(STATS_FIE_BUF_LEN); + if (!buf) { + log_error("Could not allocate memory for FIEMAP buffer."); + goto bad; + } + + /* initialise pointers into the ioctl buffer. */ + fiemap = (struct fiemap *) buf; + fm_ext = &fiemap->fm_extents[0]; + + /* space available per ioctl */ + *count = (STATS_FIE_BUF_LEN - sizeof(*fiemap)) + / sizeof(struct fiemap_extent); + + flags = FIEMAP_FLAG_SYNC; + + do { + /* start of ioctl loop - zero size and set count to bufsize */ + fiemap->fm_length = ~0ULL; + fiemap->fm_flags = flags; + fiemap->fm_extent_count = *count; + + /* get count-sized chunk of extents */ + if (ioctl(fd, FS_IOC_FIEMAP, (unsigned long) fiemap) < 0) { + if (errno == EBADR) + log_err_once("FIEMAP failed with unknown " + "flags %x.", fiemap->fm_flags); + goto bad; + } + + /* If 0 extents are returned, more ioctls are not needed */ + if (fiemap->fm_mapped_extents == 0) + break; + + nr_extents += _stats_map_extents(fd, mem, fiemap, fm_ext, + &fm_last, &fm_pending, + nr_extents, &eof); + + /* check for extent mapping error */ + if (eof < 0) + goto bad; + + } while (eof == 0); + + if (!nr_extents) { + log_error("Cannot map file: no allocated extents."); + goto bad; + } + + /* return total number of extents */ + *count = nr_extents; + extents = dm_pool_end_object(mem); + + /* free FIEMAP buffer. */ + dm_free(buf); + + return extents; + +bad: + *count = 0; + dm_pool_abandon_object(mem); + dm_free(buf); + return NULL; +} + +#define MATCH_EXTENT(e, s, l) \ +(((e).start == (s)) && ((e).len == (l))) + +static struct _extent *_find_extent(uint64_t nr_extents, struct _extent *extents, + uint64_t start, uint64_t len) +{ + size_t i; + for (i = 0; i < nr_extents; i++) + if (MATCH_EXTENT(extents[i], start, len)) + return extents + i; + return NULL; +} + +/* + * Clean up a table of region_id values that were created during a + * failed dm_stats_create_regions_from_fd, or dm_stats_update_regions_from_fd + * operation. + */ +static void _stats_cleanup_region_ids(struct dm_stats *dms, uint64_t *regions, + uint64_t nr_regions) +{ + uint64_t i; + + for (i = 0; i < nr_regions; i++) + if (!_stats_delete_region(dms, regions[i])) + log_error("Could not delete region " FMTu64 ".", i); +} + +/* + * First update pass: prune no-longer-allocated extents from the group + * and build a table of the remaining extents so that their creation + * can be skipped in the second pass. + */ +static int _stats_unmap_regions(struct dm_stats *dms, uint64_t group_id, + struct dm_pool *mem, struct _extent *extents, + struct _extent **old_extents, uint64_t *count, + int *regroup) +{ + struct dm_stats_region *region = NULL; + struct dm_stats_group *group = NULL; + uint64_t nr_kept, nr_old; + struct _extent ext; + int64_t i; + + group = &dms->groups[group_id]; + + log_very_verbose("Checking for changed file extents in group ID " + FMTu64, group_id); + + if (!dm_pool_begin_object(mem, sizeof(**old_extents))) { + log_error("Could not allocate extent table."); + return 0; + } + + nr_kept = nr_old = 0; /* counts of old and retained extents */ + + /* + * First pass: delete de-allocated extents and set regroup=1 if + * deleting the current group leader. + */ + i = dm_bit_get_last(group->regions); + for (; i >= 0; i = dm_bit_get_prev(group->regions, i)) { + region = &dms->regions[i]; + nr_old++; + + if (extents && _find_extent(*count, extents, + region->start, region->len)) { + ext.start = region->start; + ext.len = region->len; + ext.id = i; + nr_kept++; + + if (!dm_pool_grow_object(mem, &ext, sizeof(ext))) + goto out; + + log_very_verbose("Kept region " FMTu64, i); + } else { + + if (i == group_id) + *regroup = 1; + + if (!_stats_delete_region(dms, i)) { + log_error("Could not remove region ID " FMTu64, + i); + goto out; + } + + log_very_verbose("Deleted region " FMTu64, i); + } + } + + *old_extents = dm_pool_end_object(mem); + if (!*old_extents) { + log_error("Could not finalize region extent table."); + goto out; + } + log_very_verbose("Kept " FMTd64 " of " FMTd64 " old extents", + nr_kept, nr_old); + log_very_verbose("Found " FMTu64 " new extents", + *count - nr_kept); + + return (int) nr_kept; +out: + dm_pool_abandon_object(mem); + return -1; +} + +/* + * Create or update a set of regions representing the extents of a file + * and return a table of uint64_t region_id values. The number of regions + * created is returned in the memory pointed to by count (which must be + * non-NULL). + * + * If group_id is not equal to DM_STATS_GROUP_NOT_PRESENT, it is assumed + * that group_id corresponds to a group containing existing regions that + * were mapped to this file at an earlier time: regions will be added or + * removed to reflect the current status of the file. + */ +static uint64_t *_stats_map_file_regions(struct dm_stats *dms, int fd, + struct dm_histogram *bounds, + int precise, uint64_t group_id, + uint64_t *count, int *regroup) +{ + struct _extent *extents = NULL, *old_extents = NULL; + uint64_t *regions = NULL, fail_region, i, num_bits; + struct dm_stats_group *group = NULL; + struct dm_pool *extent_mem = NULL; + struct _extent *old_ext; + char *hist_arg = NULL; + struct statfs fsbuf; + int64_t nr_kept = 0; + struct stat buf; + int update; + + *count = 0; + update = _stats_group_id_present(dms, group_id); + +#ifdef BTRFS_SUPER_MAGIC + if (fstatfs(fd, &fsbuf)) { + log_error("fstatfs failed for fd %d", fd); + return 0; + } + + if (fsbuf.f_type == BTRFS_SUPER_MAGIC) { + log_error("Cannot map file: btrfs does not provide " + "physical FIEMAP extent data."); + return 0; + } +#endif + + if (fstat(fd, &buf)) { + log_error("fstat failed for fd %d", fd); + return 0; + } + + if (!(buf.st_mode & S_IFREG)) { + log_error("Not a regular file"); + return 0; + } + + if (!dm_is_dm_major(major(buf.st_dev))) { + log_error("Cannot map file: not a device-mapper device."); + return 0; + } + + /* + * If regroup is set here, we are creating a new filemap: otherwise + * we are updating a group with a valid group identifier in group_id. + */ + if (update) + log_very_verbose("Updating extents from fd %d with group ID " + FMTu64 " on (%d:%d)", fd, group_id, + major(buf.st_dev), minor(buf.st_dev)); + else + log_very_verbose("Mapping extents from fd %d on (%d:%d)", + fd, major(buf.st_dev), minor(buf.st_dev)); + + /* Use a temporary, private pool for the extent table. This avoids + * hijacking the dms->mem (region table) pool which would lead to + * interleaving temporary allocations with dm_stats_list() data, + * causing complications in the error path. + */ + if (!(extent_mem = dm_pool_create("extents", sizeof(*extents)))) + return_NULL; + + if (!(extents = _stats_get_extents_for_file(extent_mem, fd, count))) { + log_very_verbose("No extents found in fd %d", fd); + if (!update) + goto out; + } + + if (update) { + group = &dms->groups[group_id]; + if ((nr_kept = _stats_unmap_regions(dms, group_id, extent_mem, + extents, &old_extents, + count, regroup)) < 0) + goto_out; + } + + if (bounds) + if (!(hist_arg = _build_histogram_arg(bounds, &precise))) + goto_out; + + /* make space for end-of-table marker */ + if (!(regions = dm_malloc((1 + *count) * sizeof(*regions)))) { + log_error("Could not allocate memory for region IDs."); + goto_out; + } + + /* + * Second pass (first for non-update case): create regions for + * all extents not retained from the prior mapping, and insert + * retained regions into the table of region_id values. + * + * If a regroup is not scheduled, set group bits for newly + * created regions in the group leader bitmap. + */ + for (i = 0; i < *count; i++) { + if (update) { + if ((old_ext = _find_extent((uint64_t) nr_kept, + old_extents, + extents[i].start, + extents[i].len))) { + regions[i] = old_ext->id; + continue; + } + } + if (!_stats_create_region(dms, regions + i, extents[i].start, + extents[i].len, -1, precise, hist_arg, + dms->program_id, "")) { + log_error("Failed to create region " FMTu64 " of " + FMTu64 " at " FMTu64 ".", i, *count, + extents[i].start); + goto out_remove; + } + + log_very_verbose("Created new region mapping " FMTu64 "+" FMTu64 + " with region ID " FMTu64, extents[i].start, + extents[i].len, regions[i]); + + if (!*regroup && update) { + /* expand group bitmap */ + if (regions[i] > (group->regions[0] - 1)) { + num_bits = regions[i] + *count; + if (!_stats_resize_group(group, num_bits)) { + log_error("Failed to resize group " + "bitmap."); + goto out_remove; + } + } + dm_bit_set(group->regions, regions[i]); + } + + } + regions[*count] = DM_STATS_REGION_NOT_PRESENT; + + /* Update group leader aux_data for new group members. */ + if (!*regroup && update) + if (!_stats_set_aux(dms, group_id, + dms->regions[group_id].aux_data)) + log_error("Failed to update group aux_data."); + + if (bounds) + dm_free(hist_arg); + + /* the extent table will be empty if the file has been truncated. */ + if (extents) + dm_pool_free(extent_mem, extents); + + dm_pool_destroy(extent_mem); + + return regions; + +out_remove: + /* New region creation may begin to fail part-way through creating + * a set of file mapped regions: in this case we need to roll back + * the regions that were already created and return the handle to + * a consistent state. A listed handle is required for this: use a + * single list operation and call _stats_delete_region() directly + * to avoid a @stats_list ioctl and list parsing for each region. + */ + if (!dm_stats_list(dms, NULL)) + goto out; + + fail_region = i; + _stats_cleanup_region_ids(dms, regions, fail_region); + *count = 0; + +out: + dm_pool_destroy(extent_mem); + dm_free(hist_arg); + dm_free(regions); + return NULL; +} + +uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd, + int group, int precise, + struct dm_histogram *bounds, + const char *alias) +{ + uint64_t *regions, count; + int regroup = 1; + + if (alias && !group) { + log_error("Cannot set alias without grouping regions."); + return NULL; + } + + if (!(regions = _stats_map_file_regions(dms, fd, bounds, precise, + DM_STATS_GROUP_NOT_PRESENT, + &count, &regroup))) + return NULL; + + if (!group) + return regions; + + /* refresh handle */ + if (!dm_stats_list(dms, NULL)) + goto_out; + + if (!_stats_group_file_regions(dms, regions, count, alias)) + goto_out; + + return regions; +out: + _stats_cleanup_region_ids(dms, regions, count); + dm_free(regions); + return NULL; +} + +uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, + uint64_t group_id) +{ + struct dm_histogram *bounds = NULL; + int nr_bins, precise, regroup; + uint64_t *regions, count = 0; + const char *alias = NULL; + + if (!dms->regions || !dm_stats_group_present(dms, group_id)) { + if (!dm_stats_list(dms, dms->program_id)) { + log_error("Could not obtain region list while " + "updating group " FMTu64 ".", group_id); + return NULL; + } + } + + if (!dm_stats_group_present(dms, group_id)) { + log_error("Group ID " FMTu64 " does not exist.", group_id); + return NULL; + } + + /* + * If the extent corresponding to the group leader's region has been + * deallocated, _stats_map_file_regions() will remove the region and + * the group. In this case, regroup will be set by the call and the + * group will be re-created using saved values. + */ + regroup = 0; + + /* + * A copy of the alias is needed to re-create the group when regroup=1. + */ + if (dms->groups[group_id].alias) { + alias = dm_strdup(dms->groups[group_id].alias); + if (!alias) { + log_error("Failed to allocate group alias string."); + return NULL; + } + } + + if (dms->regions[group_id].bounds) { + /* + * A copy of the histogram bounds must be passed to + * _stats_map_file_regions() to be used when creating new + * regions: it is not safe to use the copy in the current group + * leader since it may be destroyed during the first group + * update pass. + */ + nr_bins = dms->regions[group_id].bounds->nr_bins; + bounds = _alloc_dm_histogram(nr_bins); + if (!bounds) { + log_error("Could not allocate memory for group " + "histogram bounds."); + goto out; + } + _stats_copy_histogram_bounds(bounds, + dms->regions[group_id].bounds); + } + + precise = (dms->regions[group_id].timescale == 1); + + regions = _stats_map_file_regions(dms, fd, bounds, precise, + group_id, &count, &regroup); + + if (!regions) + goto bad; + + if (!dm_stats_list(dms, NULL)) + goto bad; + + /* regroup if there are regions to group */ + if (regroup && (*regions != DM_STATS_REGION_NOT_PRESENT)) + if (!_stats_group_file_regions(dms, regions, count, alias)) + goto bad; + + dm_free(bounds); + dm_free((char *) alias); + return regions; +bad: + _stats_cleanup_region_ids(dms, regions, count); + dm_free(bounds); + dm_free(regions); +out: + dm_free((char *) alias); + return NULL; +} +#else /* !HAVE_LINUX_FIEMAP */ +uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd, + int group, int precise, + struct dm_histogram *bounds, + const char *alias) +{ + log_error("File mapping requires FIEMAP ioctl support."); + return 0; +} + +uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, + uint64_t group_id) +{ + log_error("File mapping requires FIEMAP ioctl support."); + return 0; +} +#endif /* HAVE_LINUX_FIEMAP */ + +#ifdef DMFILEMAPD +static const char *_filemapd_mode_names[] = { + "inode", + "path", + NULL +}; + +dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str) +{ + dm_filemapd_mode_t mode = DM_FILEMAPD_FOLLOW_INODE; + const char **mode_name; + + if (mode_str) { + for (mode_name = _filemapd_mode_names; *mode_name; mode_name++) + if (!strcmp(*mode_name, mode_str)) + break; + if (*mode_name) + mode = DM_FILEMAPD_FOLLOW_INODE + + (mode_name - _filemapd_mode_names); + else { + log_error("Could not parse dmfilemapd mode: %s", + mode_str); + return DM_FILEMAPD_FOLLOW_NONE; + } + } + return mode; +} + +#define DM_FILEMAPD "dmfilemapd" +#define NR_FILEMAPD_ARGS 7 /* includes argv[0] */ +/* + * Start dmfilemapd to monitor the specified file descriptor, and to + * update the group given by 'group_id' when the file's allocation + * changes. + * + * usage: dmfilemapd <fd> <group_id> <mode> [<foreground>[<log_level>]] + */ +int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, + dm_filemapd_mode_t mode, unsigned foreground, + unsigned verbose) +{ + char fd_str[8], group_str[8], fg_str[2], verb_str[2]; + const char *mode_str = _filemapd_mode_names[mode]; + char *args[NR_FILEMAPD_ARGS + 1]; + pid_t pid = 0; + int argc = 0; + + if (fd < 0) { + log_error("dmfilemapd file descriptor must be " + "non-negative: %d", fd); + return 0; + } + + if (path[0] != '/') { + log_error("Path argument must specify an absolute path."); + return 0; + } + + if (mode > DM_FILEMAPD_FOLLOW_PATH) { + log_error("Invalid dmfilemapd mode argument: " + "Must be DM_FILEMAPD_FOLLOW_INODE or " + "DM_FILEMAPD_FOLLOW_PATH"); + return 0; + } + + if (foreground > 1) { + log_error("Invalid dmfilemapd foreground argument. " + "Must be 0 or 1: %d.", foreground); + return 0; + } + + if (verbose > 3) { + log_error("Invalid dmfilemapd verbose argument. " + "Must be 0..3: %d.", verbose); + return 0; + } + + /* set argv[0] */ + args[argc++] = (char *) DM_FILEMAPD; + + /* set <fd> */ + if ((dm_snprintf(fd_str, sizeof(fd_str), "%d", fd)) < 0) { + log_error("Could not format fd argument."); + return 0; + } + args[argc++] = fd_str; + + /* set <group_id> */ + if ((dm_snprintf(group_str, sizeof(group_str), FMTu64, group_id)) < 0) { + log_error("Could not format group_id argument."); + return 0; + } + args[argc++] = group_str; + + /* set <path> */ + args[argc++] = (char *) path; + + /* set <mode> */ + args[argc++] = (char *) mode_str; + + /* set <foreground> */ + if ((dm_snprintf(fg_str, sizeof(fg_str), "%u", foreground)) < 0) { + log_error("Could not format foreground argument."); + return 0; + } + args[argc++] = fg_str; + + /* set <verbose> */ + if ((dm_snprintf(verb_str, sizeof(verb_str), "%u", verbose)) < 0) { + log_error("Could not format verbose argument."); + return 0; + } + args[argc++] = verb_str; + + /* terminate args[argc] */ + args[argc] = NULL; + + log_very_verbose("Spawning daemon as '%s %d " FMTu64 " %s %s %u %u'", + *args, fd, group_id, path, mode_str, + foreground, verbose); + + if (!foreground && ((pid = fork()) < 0)) { + log_error("Failed to fork dmfilemapd process."); + return 0; + } + + if (pid > 0) { + log_very_verbose("Forked dmfilemapd process as pid %d", pid); + return 1; + } + + execvp(args[0], args); + log_sys_error("execvp", args[0]); + if (!foreground) + _exit(127); + return 0; +} +# else /* !DMFILEMAPD */ +dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str) +{ + return 0; +}; + +int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, + dm_filemapd_mode_t mode, unsigned foreground, + unsigned verbose) +{ + log_error("dmfilemapd support disabled."); + return 0; +} +#endif /* DMFILEMAPD */ + +/* + * Backward compatible dm_stats_create_region() implementations. + * + * Keep these at the end of the file to avoid adding clutter around the + * current dm_stats_create_region() version. + */ + +#if defined(__GNUC__) +int dm_stats_create_region_v1_02_106(struct dm_stats *dms, uint64_t *region_id, + uint64_t start, uint64_t len, int64_t step, + int precise, const char *program_id, + const char *aux_data); +int dm_stats_create_region_v1_02_106(struct dm_stats *dms, uint64_t *region_id, + uint64_t start, uint64_t len, int64_t step, + int precise, const char *program_id, + const char *aux_data) +{ + /* 1.02.106 lacks histogram argument. */ + return _stats_create_region(dms, region_id, start, len, step, precise, + NULL, program_id, aux_data); +} + +int dm_stats_create_region_v1_02_104(struct dm_stats *dms, uint64_t *region_id, + uint64_t start, uint64_t len, int64_t step, + const char *program_id, const char *aux_data); +int dm_stats_create_region_v1_02_104(struct dm_stats *dms, uint64_t *region_id, + uint64_t start, uint64_t len, int64_t step, + const char *program_id, const char *aux_data) +{ + /* 1.02.104 lacks histogram and precise arguments. */ + return _stats_create_region(dms, region_id, start, len, step, 0, NULL, + program_id, aux_data); +} +#endif diff --git a/device_mapper/libdm-string.c b/device_mapper/libdm-string.c new file mode 100644 index 0000000..8bd6c2d --- /dev/null +++ b/device_mapper/libdm-string.c @@ -0,0 +1,718 @@ +/* + * Copyright (C) 2006-2015 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" + +#include <ctype.h> +#include <stdarg.h> +#include <math.h> /* fabs() */ +#include <float.h> /* DBL_EPSILON */ + +/* + * consume characters while they match the predicate function. + */ +static char *_consume(char *buffer, int (*fn) (int)) +{ + while (*buffer && fn(*buffer)) + buffer++; + + return buffer; +} + +static int _isword(int c) +{ + return !isspace(c); +} + +/* + * Split buffer into NULL-separated words in argv. + * Returns number of words. + */ +int dm_split_words(char *buffer, unsigned max, + unsigned ignore_comments __attribute__((unused)), + char **argv) +{ + unsigned arg; + + for (arg = 0; arg < max; arg++) { + buffer = _consume(buffer, isspace); + if (!*buffer) + break; + + argv[arg] = buffer; + buffer = _consume(buffer, _isword); + + if (*buffer) { + *buffer = '\0'; + buffer++; + } + } + + return arg; +} + +/* + * Remove hyphen quoting from a component of a name. + * NULL-terminates the component and returns start of next component. + */ +static char *_unquote(char *component) +{ + char *c = component; + char *o = c; + char *r; + + while (*c) { + if (*(c + 1)) { + if (*c == '-') { + if (*(c + 1) == '-') + c++; + else + break; + } + } + *o = *c; + o++; + c++; + } + + r = (*c) ? c + 1 : c; + *o = '\0'; + + return r; +} + +int dm_split_lvm_name(struct dm_pool *mem, const char *dmname, + char **vgname, char **lvname, char **layer) +{ + if (!vgname || !lvname || !layer) { + log_error(INTERNAL_ERROR "dm_split_lvm_name: Forbidden NULL parameter detected."); + return 0; + } + + if (mem && (!dmname || !(*vgname = dm_pool_strdup(mem, dmname)))) { + log_error("Failed to duplicate lvm name."); + return 0; + } else if (!*vgname) { + log_error("Missing lvm name for split."); + return 0; + } + + _unquote(*layer = _unquote(*lvname = _unquote(*vgname))); + + return 1; +} + +/* + * On error, up to glibc 2.0.6, snprintf returned -1 if buffer was too small; + * From glibc 2.1 it returns number of chars (excl. trailing null) that would + * have been written had there been room. + * + * dm_snprintf reverts to the old behaviour. + */ +int dm_snprintf(char *buf, size_t bufsize, const char *format, ...) +{ + int n; + va_list ap; + + va_start(ap, format); + n = vsnprintf(buf, bufsize, format, ap); + va_end(ap); + + if (n < 0 || ((unsigned) n >= bufsize)) + return -1; + + return n; +} + +const char *dm_basename(const char *path) +{ + const char *p = strrchr(path, '/'); + + return p ? p + 1 : path; +} + +int dm_vasprintf(char **result, const char *format, va_list aq) +{ + int i, n, size = 16; + va_list ap; + char *buf = dm_malloc(size); + + *result = 0; + + if (!buf) + return -1; + + for (i = 0;; i++) { + va_copy(ap, aq); + n = vsnprintf(buf, size, format, ap); + va_end(ap); + + if (0 <= n && n < size) + break; + + dm_free(buf); + /* Up to glibc 2.0.6 returns -1 */ + size = (n < 0) ? size * 2 : n + 1; + if (!(buf = dm_malloc(size))) + return -1; + } + + if (i > 1) { + /* Reallocating more then once? */ + if (!(*result = dm_strdup(buf))) { + dm_free(buf); + return -1; + } + dm_free(buf); + } else + *result = buf; + + return n + 1; +} + +int dm_asprintf(char **result, const char *format, ...) +{ + int r; + va_list ap; + va_start(ap, format); + r = dm_vasprintf(result, format, ap); + va_end(ap); + return r; +} + +/* + * Count occurences of 'c' in 'str' until we reach a null char. + * + * Returns: + * len - incremented for each char we encounter. + * count - number of occurrences of 'c' and 'c2'. + */ +static void _count_chars(const char *str, size_t *len, int *count, + const int c1, const int c2) +{ + const char *ptr; + + for (ptr = str; *ptr; ptr++, (*len)++) + if (*ptr == c1 || *ptr == c2) + (*count)++; +} + +/* + * Count occurrences of 'c' in 'str' of length 'size'. + * + * Returns: + * Number of occurrences of 'c' + */ +unsigned dm_count_chars(const char *str, size_t len, const int c) +{ + size_t i; + unsigned count = 0; + + for (i = 0; i < len; i++) + if (str[i] == c) + count++; + + return count; +} + +/* + * Length of string after escaping double quotes and backslashes. + */ +size_t dm_escaped_len(const char *str) +{ + size_t len = 1; + int count = 0; + + _count_chars(str, &len, &count, '\"', '\\'); + + return count + len; +} + +/* + * Copies a string, quoting orig_char with quote_char. + * Optionally also quote quote_char. + */ +static void _quote_characters(char **out, const char *src, + const int orig_char, const int quote_char, + int quote_quote_char) +{ + while (*src) { + if (*src == orig_char || + (*src == quote_char && quote_quote_char)) + *(*out)++ = quote_char; + + *(*out)++ = *src++; + } +} + +static void _unquote_one_character(char *src, const char orig_char, + const char quote_char) +{ + char *out; + char s, n; + + /* Optimise for the common case where no changes are needed. */ + while ((s = *src++)) { + if (s == quote_char && + ((n = *src) == orig_char || n == quote_char)) { + out = src++; + *(out - 1) = n; + + while ((s = *src++)) { + if (s == quote_char && + ((n = *src) == orig_char || n == quote_char)) { + s = n; + src++; + } + *out = s; + out++; + } + + *out = '\0'; + return; + } + } +} + +/* + * Unquote each character given in orig_char array and unquote quote_char + * as well. Also save the first occurrence of each character from orig_char + * that was found unquoted in arr_substr_first_unquoted array. This way we can + * process several characters in one go. + */ +static void _unquote_characters(char *src, const char *orig_chars, + size_t num_orig_chars, + const char quote_char, + char *arr_substr_first_unquoted[]) +{ + char *out = src; + char c, s, n; + unsigned i; + + while ((s = *src++)) { + for (i = 0; i < num_orig_chars; i++) { + c = orig_chars[i]; + if (s == quote_char && + ((n = *src) == c || n == quote_char)) { + s = n; + src++; + break; + } + if (arr_substr_first_unquoted && (s == c) && + !arr_substr_first_unquoted[i]) + arr_substr_first_unquoted[i] = out; + }; + *out++ = s; + } + + *out = '\0'; +} + +/* + * Copies a string, quoting hyphens with hyphens. + */ +static void _quote_hyphens(char **out, const char *src) +{ + _quote_characters(out, src, '-', '-', 0); +} + +/* + * <vg>-<lv>-<layer> or if !layer just <vg>-<lv>. + */ +char *dm_build_dm_name(struct dm_pool *mem, const char *vgname, + const char *lvname, const char *layer) +{ + size_t len = 1; + int hyphens = 1; + char *r, *out; + + _count_chars(vgname, &len, &hyphens, '-', 0); + _count_chars(lvname, &len, &hyphens, '-', 0); + + if (layer && *layer) { + _count_chars(layer, &len, &hyphens, '-', 0); + hyphens++; + } + + len += hyphens; + + if (!(r = dm_pool_alloc(mem, len))) { + log_error("build_dm_name: Allocation failed for %" PRIsize_t + " for %s %s %s.", len, vgname, lvname, layer); + return NULL; + } + + out = r; + _quote_hyphens(&out, vgname); + *out++ = '-'; + _quote_hyphens(&out, lvname); + + if (layer && *layer) { + /* No hyphen if the layer begins with _ e.g. _mlog */ + if (*layer != '_') + *out++ = '-'; + _quote_hyphens(&out, layer); + } + *out = '\0'; + + return r; +} + +char *dm_build_dm_uuid(struct dm_pool *mem, const char *uuid_prefix, const char *lvid, const char *layer) +{ + char *dmuuid; + size_t len; + + if (!layer) + layer = ""; + + len = strlen(uuid_prefix) + strlen(lvid) + strlen(layer) + 2; + + if (!(dmuuid = dm_pool_alloc(mem, len))) { + log_error("build_dm_name: Allocation failed for %" PRIsize_t + " %s %s.", len, lvid, layer); + return NULL; + } + + sprintf(dmuuid, "%s%s%s%s", uuid_prefix, lvid, (*layer) ? "-" : "", layer); + + return dmuuid; +} + +/* + * Copies a string, quoting double quotes with backslashes. + */ +char *dm_escape_double_quotes(char *out, const char *src) +{ + char *buf = out; + + _quote_characters(&buf, src, '\"', '\\', 1); + *buf = '\0'; + + return out; +} + +/* + * Undo quoting in situ. + */ +void dm_unescape_double_quotes(char *src) +{ + _unquote_one_character(src, '\"', '\\'); +} + +/* + * Unescape colons and "at" signs in situ and save the substrings + * starting at the position of the first unescaped colon and the + * first unescaped "at" sign. This is normally used to unescape + * device names used as PVs. + */ +void dm_unescape_colons_and_at_signs(char *src, + char **substr_first_unquoted_colon, + char **substr_first_unquoted_at_sign) +{ + const char *orig_chars = ":@"; + char *arr_substr_first_unquoted[] = {NULL, NULL, NULL}; + + _unquote_characters(src, orig_chars, 2, '\\', arr_substr_first_unquoted); + + if (substr_first_unquoted_colon) + *substr_first_unquoted_colon = arr_substr_first_unquoted[0]; + + if (substr_first_unquoted_at_sign) + *substr_first_unquoted_at_sign = arr_substr_first_unquoted[1]; +} + +int dm_strncpy(char *dest, const char *src, size_t n) +{ + if (memccpy(dest, src, 0, n)) + return 1; + + if (n > 0) + dest[n - 1] = '\0'; + + return 0; +} + +/* Test if the doubles are close enough to be considered equal */ +static int _close_enough(double d1, double d2) +{ + return fabs(d1 - d2) < DBL_EPSILON; +} + +#define BASE_UNKNOWN 0 +#define BASE_SHARED 1 +#define BASE_1024 8 +#define BASE_1000 15 +#define BASE_SPECIAL 21 +#define NUM_UNIT_PREFIXES 6 +#define NUM_SPECIAL 3 + +#define SIZE_BUF 128 + +const char *dm_size_to_string(struct dm_pool *mem, uint64_t size, + char unit_type, int use_si_units, + uint64_t unit_factor, int include_suffix, + dm_size_suffix_t suffix_type) +{ + unsigned base = BASE_UNKNOWN; + unsigned s; + int precision; + double d; + uint64_t byte = UINT64_C(0); + uint64_t units = UINT64_C(1024); + char *size_buf = NULL; + char new_unit_type = '\0', unit_type_buf[2]; + const char *prefix = ""; + const char * const size_str[][3] = { + /* BASE_UNKNOWN */ + {" ", " ", " "}, /* [0] */ + + /* BASE_SHARED - Used if use_si_units = 0 */ + {" Exabyte", " EB", "E"}, /* [1] */ + {" Petabyte", " PB", "P"}, /* [2] */ + {" Terabyte", " TB", "T"}, /* [3] */ + {" Gigabyte", " GB", "G"}, /* [4] */ + {" Megabyte", " MB", "M"}, /* [5] */ + {" Kilobyte", " KB", "K"}, /* [6] */ + {" Byte ", " B", "B"}, /* [7] */ + + /* BASE_1024 - Used if use_si_units = 1 */ + {" Exbibyte", " EiB", "e"}, /* [8] */ + {" Pebibyte", " PiB", "p"}, /* [9] */ + {" Tebibyte", " TiB", "t"}, /* [10] */ + {" Gibibyte", " GiB", "g"}, /* [11] */ + {" Mebibyte", " MiB", "m"}, /* [12] */ + {" Kibibyte", " KiB", "k"}, /* [13] */ + {" Byte ", " B", "b"}, /* [14] */ + + /* BASE_1000 - Used if use_si_units = 1 */ + {" Exabyte", " EB", "E"}, /* [15] */ + {" Petabyte", " PB", "P"}, /* [16] */ + {" Terabyte", " TB", "T"}, /* [17] */ + {" Gigabyte", " GB", "G"}, /* [18] */ + {" Megabyte", " MB", "M"}, /* [19] */ + {" Kilobyte", " kB", "K"}, /* [20] */ + + /* BASE_SPECIAL */ + {" Byte ", " B ", "B"}, /* [21] (shared with BASE_1000) */ + {" Units ", " Un", "U"}, /* [22] */ + {" Sectors ", " Se", "S"}, /* [23] */ + }; + + if (!(size_buf = dm_pool_alloc(mem, SIZE_BUF))) { + log_error("no memory for size display buffer"); + return ""; + } + + if (!use_si_units) { + /* Case-independent match */ + for (s = 0; s < NUM_UNIT_PREFIXES; s++) + if (toupper((int) unit_type) == + *size_str[BASE_SHARED + s][2]) { + base = BASE_SHARED; + break; + } + } else { + /* Case-dependent match for powers of 1000 */ + for (s = 0; s < NUM_UNIT_PREFIXES; s++) + if (unit_type == *size_str[BASE_1000 + s][2]) { + base = BASE_1000; + break; + } + + /* Case-dependent match for powers of 1024 */ + if (base == BASE_UNKNOWN) + for (s = 0; s < NUM_UNIT_PREFIXES; s++) + if (unit_type == *size_str[BASE_1024 + s][2]) { + base = BASE_1024; + break; + } + } + + if (base == BASE_UNKNOWN) + /* Check for special units - s, b or u */ + for (s = 0; s < NUM_SPECIAL; s++) + if (toupper((int) unit_type) == + *size_str[BASE_SPECIAL + s][2]) { + base = BASE_SPECIAL; + break; + } + + if (size == UINT64_C(0)) { + if (base == BASE_UNKNOWN) + s = 0; + sprintf(size_buf, "0%s", include_suffix ? size_str[base + s][suffix_type] : ""); + return size_buf; + } + + size *= UINT64_C(512); + + if (base != BASE_UNKNOWN) { + if (!unit_factor) { + unit_type_buf[0] = unit_type; + unit_type_buf[1] = '\0'; + if (!(unit_factor = dm_units_to_factor(&unit_type_buf[0], &new_unit_type, 1, NULL)) || + unit_type != new_unit_type) { + /* The two functions should match (and unrecognised units get treated like 'h'). */ + log_error(INTERNAL_ERROR "Inconsistent units: %c and %c.", unit_type, new_unit_type); + return ""; + } + } + byte = unit_factor; + } else { + /* Human-readable style */ + if (unit_type == 'H' || unit_type == 'R') { + units = UINT64_C(1000); + base = BASE_1000; + } else { + units = UINT64_C(1024); + base = BASE_1024; + } + + if (!use_si_units) + base = BASE_SHARED; + + byte = units * units * units * units * units * units; + + for (s = 0; s < NUM_UNIT_PREFIXES && size < byte; s++) + byte /= units; + + if ((s < NUM_UNIT_PREFIXES) && + ((unit_type == 'R') || (unit_type == 'r'))) { + /* When the rounding would cause difference, add '<' prefix + * i.e. 2043M is more then 1.9949G prints <2.00G + * This version is for 2 digits fixed precision */ + d = 100. * (double) size / byte; + if (!_close_enough(floorl(d), nearbyintl(d))) + prefix = "<"; + } + + include_suffix = 1; + } + + /* FIXME Make precision configurable */ + switch (toupper(*size_str[base + s][DM_SIZE_UNIT])) { + case 'B': + case 'S': + precision = 0; + break; + default: + precision = 2; + } + + snprintf(size_buf, SIZE_BUF, "%s%.*f%s", prefix, precision, + (double) size / byte, include_suffix ? size_str[base + s][suffix_type] : ""); + + return size_buf; +} + +uint64_t dm_units_to_factor(const char *units, char *unit_type, + int strict, const char **endptr) +{ + char *ptr = NULL; + uint64_t v; + double custom_value = 0; + uint64_t multiplier; + + if (endptr) + *endptr = units; + + if (isdigit(*units)) { + custom_value = strtod(units, &ptr); + if (ptr == units) + return 0; + v = (uint64_t) strtoull(units, NULL, 10); + if (_close_enough((double) v, custom_value)) + custom_value = 0; /* Use integer arithmetic */ + units = ptr; + } else + v = 1; + + /* Only one units char permitted in strict mode. */ + if (strict && units[0] && units[1]) + return 0; + + if (v == 1) + *unit_type = *units; + else + *unit_type = 'U'; + + switch (*units) { + case 'h': + case 'H': + case 'r': + case 'R': + multiplier = v = UINT64_C(1); + *unit_type = *units; + break; + case 'b': + case 'B': + multiplier = UINT64_C(1); + break; +#define KILO UINT64_C(1024) + case 's': + case 'S': + multiplier = (KILO/2); + break; + case 'k': + multiplier = KILO; + break; + case 'm': + multiplier = KILO * KILO; + break; + case 'g': + multiplier = KILO * KILO * KILO; + break; + case 't': + multiplier = KILO * KILO * KILO * KILO; + break; + case 'p': + multiplier = KILO * KILO * KILO * KILO * KILO; + break; + case 'e': + multiplier = KILO * KILO * KILO * KILO * KILO * KILO; + break; +#undef KILO +#define KILO UINT64_C(1000) + case 'K': + multiplier = KILO; + break; + case 'M': + multiplier = KILO * KILO; + break; + case 'G': + multiplier = KILO * KILO * KILO; + break; + case 'T': + multiplier = KILO * KILO * KILO * KILO; + break; + case 'P': + multiplier = KILO * KILO * KILO * KILO * KILO; + break; + case 'E': + multiplier = KILO * KILO * KILO * KILO * KILO * KILO; + break; +#undef KILO + default: + return 0; + } + + if (endptr) + *endptr = units + 1; + + if (_close_enough(custom_value, 0.)) + return v * multiplier; /* Use integer arithmetic */ + else + return (uint64_t) (custom_value * multiplier); +} diff --git a/device_mapper/libdm-targets.c b/device_mapper/libdm-targets.c new file mode 100644 index 0000000..5ab4701 --- /dev/null +++ b/device_mapper/libdm-targets.c @@ -0,0 +1,565 @@ +/* + * Copyright (C) 2005-2015 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" +#include "libdm-common.h" + +int dm_get_status_snapshot(struct dm_pool *mem, const char *params, + struct dm_status_snapshot **status) +{ + struct dm_status_snapshot *s; + int r; + + if (!params) { + log_error("Failed to parse invalid snapshot params."); + return 0; + } + + if (!(s = dm_pool_zalloc(mem, sizeof(*s)))) { + log_error("Failed to allocate snapshot status structure."); + return 0; + } + + r = sscanf(params, FMTu64 "/" FMTu64 " " FMTu64, + &s->used_sectors, &s->total_sectors, + &s->metadata_sectors); + + if (r == 3 || r == 2) + s->has_metadata_sectors = (r == 3); + else if (!strcmp(params, "Invalid")) + s->invalid = 1; + else if (!strcmp(params, "Merge failed")) + s->merge_failed = 1; + else if (!strcmp(params, "Overflow")) + s->overflow = 1; + else { + dm_pool_free(mem, s); + log_error("Failed to parse snapshot params: %s.", params); + return 0; + } + + *status = s; + + return 1; +} + +/* + * Skip nr fields each delimited by a single space. + * FIXME Don't assume single space. + */ +static const char *_skip_fields(const char *p, unsigned nr) +{ + while (p && nr-- && (p = strchr(p, ' '))) + p++; + + return p; +} + +/* + * Count number of single-space delimited fields. + * Number of fields is number of spaces plus one. + */ +static unsigned _count_fields(const char *p) +{ + unsigned nr = 1; + + if (!p || !*p) + return 0; + + while ((p = _skip_fields(p, 1))) + nr++; + + return nr; +} + +/* + * Various RAID status versions include: + * Versions < 1.5.0 (4 fields): + * <raid_type> <#devs> <health_str> <sync_ratio> + * Versions 1.5.0+ (6 fields): + * <raid_type> <#devs> <health_str> <sync_ratio> <sync_action> <mismatch_cnt> + * Versions 1.9.0+ (7 fields): + * <raid_type> <#devs> <health_str> <sync_ratio> <sync_action> <mismatch_cnt> <data_offset> + */ +int dm_get_status_raid(struct dm_pool *mem, const char *params, + struct dm_status_raid **status) +{ + int i; + unsigned num_fields; + const char *p, *pp, *msg_fields = ""; + struct dm_status_raid *s = NULL; + unsigned a = 0; + + if ((num_fields = _count_fields(params)) < 4) + goto_bad; + + /* Second field holds the device count */ + msg_fields = "<#devs> "; + if (!(p = _skip_fields(params, 1)) || (sscanf(p, "%d", &i) != 1)) + goto_bad; + + msg_fields = ""; + if (!(s = dm_pool_zalloc(mem, sizeof(struct dm_status_raid)))) + goto_bad; + + if (!(s->raid_type = dm_pool_zalloc(mem, p - params))) + goto_bad; /* memory is freed when pool is destroyed */ + + if (!(s->dev_health = dm_pool_zalloc(mem, i + 1))) /* Space for health chars */ + goto_bad; + + msg_fields = "<raid_type> <#devices> <health_chars> and <sync_ratio> "; + if (sscanf(params, "%s %u %s " FMTu64 "/" FMTu64, + s->raid_type, + &s->dev_count, + s->dev_health, + &s->insync_regions, + &s->total_regions) != 5) + goto_bad; + + /* + * All pre-1.5.0 version parameters are read. Now we check + * for additional 1.5.0+ parameters (i.e. num_fields at least 6). + * + * Note that 'sync_action' will be NULL (and mismatch_count + * will be 0) if the kernel returns a pre-1.5.0 status. + */ + if (num_fields < 6) + goto out; + + msg_fields = "<sync_action> and <mismatch_cnt> "; + + /* Skip pre-1.5.0 params */ + if (!(p = _skip_fields(params, 4)) || !(pp = _skip_fields(p, 1))) + goto_bad; + + if (!(s->sync_action = dm_pool_zalloc(mem, pp - p))) + goto_bad; + + if (sscanf(p, "%s " FMTu64, s->sync_action, &s->mismatch_count) != 2) + goto_bad; + + if (num_fields < 7) + goto out; + + /* + * All pre-1.9.0 version parameters are read. Now we check + * for additional 1.9.0+ parameters (i.e. nr_fields at least 7). + * + * Note that data_offset will be 0 if the + * kernel returns a pre-1.9.0 status. + */ + msg_fields = "<data_offset>"; + if (!(p = _skip_fields(params, 6))) /* skip pre-1.9.0 params */ + goto bad; + if (sscanf(p, FMTu64, &s->data_offset) != 1) + goto bad; + +out: + *status = s; + + if (s->insync_regions == s->total_regions) { + /* FIXME: kernel gives misleading info here + * Trying to recognize a true state */ + while (i-- > 0) + if (s->dev_health[i] == 'a') + a++; /* Count number of 'a' */ + + if (a && a < s->dev_count) { + /* SOME legs are in 'a' */ + if (!strcasecmp(s->sync_action, "recover") + || !strcasecmp(s->sync_action, "idle")) + /* Kernel may possibly start some action + * in near-by future, do not report 100% */ + s->insync_regions--; + } + } + + return 1; + +bad: + log_error("Failed to parse %sraid params: %s", msg_fields, params); + + if (s) + dm_pool_free(mem, s); + + *status = NULL; + + return 0; +} + +/* + * <metadata block size> <#used metadata blocks>/<#total metadata blocks> + * <cache block size> <#used cache blocks>/<#total cache blocks> + * <#read hits> <#read misses> <#write hits> <#write misses> + * <#demotions> <#promotions> <#dirty> <#features> <features>* + * <#core args> <core args>* <policy name> <#policy args> <policy args>* + * + * metadata block size : Fixed block size for each metadata block in + * sectors + * #used metadata blocks : Number of metadata blocks used + * #total metadata blocks : Total number of metadata blocks + * cache block size : Configurable block size for the cache device + * in sectors + * #used cache blocks : Number of blocks resident in the cache + * #total cache blocks : Total number of cache blocks + * #read hits : Number of times a READ bio has been mapped + * to the cache + * #read misses : Number of times a READ bio has been mapped + * to the origin + * #write hits : Number of times a WRITE bio has been mapped + * to the cache + * #write misses : Number of times a WRITE bio has been + * mapped to the origin + * #demotions : Number of times a block has been removed + * from the cache + * #promotions : Number of times a block has been moved to + * the cache + * #dirty : Number of blocks in the cache that differ + * from the origin + * #feature args : Number of feature args to follow + * feature args : 'writethrough' (optional) + * #core args : Number of core arguments (must be even) + * core args : Key/value pairs for tuning the core + * e.g. migration_threshold + * *policy name : Name of the policy + * #policy args : Number of policy arguments to follow (must be even) + * policy args : Key/value pairs + * e.g. sequential_threshold + */ +int dm_get_status_cache(struct dm_pool *mem, const char *params, + struct dm_status_cache **status) +{ + int i, feature_argc; + char *str; + const char *p, *pp; + struct dm_status_cache *s; + + if (!(s = dm_pool_zalloc(mem, sizeof(struct dm_status_cache)))) + return_0; + + if (strstr(params, "Error")) { + s->error = 1; + s->fail = 1; /* This is also I/O fail state */ + goto out; + } + + if (strstr(params, "Fail")) { + s->fail = 1; + goto out; + } + + /* Read in args that have definitive placement */ + if (sscanf(params, + " " FMTu32 + " " FMTu64 "/" FMTu64 + " " FMTu32 + " " FMTu64 "/" FMTu64 + " " FMTu64 " " FMTu64 + " " FMTu64 " " FMTu64 + " " FMTu64 " " FMTu64 + " " FMTu64 + " %d", + &s->metadata_block_size, + &s->metadata_used_blocks, &s->metadata_total_blocks, + &s->block_size, /* AKA, chunk_size */ + &s->used_blocks, &s->total_blocks, + &s->read_hits, &s->read_misses, + &s->write_hits, &s->write_misses, + &s->demotions, &s->promotions, + &s->dirty_blocks, + &feature_argc) != 14) + goto bad; + + /* Now jump to "features" section */ + if (!(p = _skip_fields(params, 12))) + goto bad; + + /* Read in features */ + for (i = 0; i < feature_argc; i++) { + if (!strncmp(p, "writethrough ", 13)) + s->feature_flags |= DM_CACHE_FEATURE_WRITETHROUGH; + else if (!strncmp(p, "writeback ", 10)) + s->feature_flags |= DM_CACHE_FEATURE_WRITEBACK; + else if (!strncmp(p, "passthrough ", 12)) + s->feature_flags |= DM_CACHE_FEATURE_PASSTHROUGH; + else if (!strncmp(p, "metadata2 ", 10)) + s->feature_flags |= DM_CACHE_FEATURE_METADATA2; + else + log_error("Unknown feature in status: %s", params); + + if (!(p = _skip_fields(p, 1))) + goto bad; + } + + /* Read in core_args. */ + if (sscanf(p, "%d ", &s->core_argc) != 1) + goto bad; + if ((s->core_argc > 0) && + (!(s->core_argv = dm_pool_zalloc(mem, sizeof(char *) * s->core_argc)) || + !(p = _skip_fields(p, 1)) || + !(str = dm_pool_strdup(mem, p)) || + !(p = _skip_fields(p, (unsigned) s->core_argc)) || + (dm_split_words(str, s->core_argc, 0, s->core_argv) != s->core_argc))) + goto bad; + + /* Read in policy args */ + pp = p; + if (!(p = _skip_fields(p, 1)) || + !(s->policy_name = dm_pool_zalloc(mem, (p - pp)))) + goto bad; + if (sscanf(pp, "%s %d", s->policy_name, &s->policy_argc) != 2) + goto bad; + if (s->policy_argc && + (!(s->policy_argv = dm_pool_zalloc(mem, sizeof(char *) * s->policy_argc)) || + !(p = _skip_fields(p, 1)) || + !(str = dm_pool_strdup(mem, p)) || + (dm_split_words(str, s->policy_argc, 0, s->policy_argv) != s->policy_argc))) + goto bad; + + /* TODO: improve this parser */ + if (strstr(p, " ro")) + s->read_only = 1; + + if (strstr(p, " needs_check")) + s->needs_check = 1; +out: + *status = s; + return 1; + +bad: + log_error("Failed to parse cache params: %s", params); + dm_pool_free(mem, s); + *status = NULL; + + return 0; +} + +int parse_thin_pool_status(const char *params, struct dm_status_thin_pool *s) +{ + int pos; + + memset(s, 0, sizeof(*s)); + + if (!params) { + log_error("Failed to parse invalid thin params."); + return 0; + } + + if (strstr(params, "Error")) { + s->error = 1; + s->fail = 1; /* This is also I/O fail state */ + return 1; + } + + if (strstr(params, "Fail")) { + s->fail = 1; + return 1; + } + + /* FIXME: add support for held metadata root */ + if (sscanf(params, FMTu64 " " FMTu64 "/" FMTu64 " " FMTu64 "/" FMTu64 "%n", + &s->transaction_id, + &s->used_metadata_blocks, + &s->total_metadata_blocks, + &s->used_data_blocks, + &s->total_data_blocks, &pos) < 5) { + log_error("Failed to parse thin pool params: %s.", params); + return 0; + } + + /* New status flags */ + if (strstr(params + pos, "no_discard_passdown")) + s->discards = DM_THIN_DISCARDS_NO_PASSDOWN; + else if (strstr(params + pos, "ignore_discard")) + s->discards = DM_THIN_DISCARDS_IGNORE; + else /* default discard_passdown */ + s->discards = DM_THIN_DISCARDS_PASSDOWN; + + /* Default is 'writable' (rw) data */ + if (strstr(params + pos, "out_of_data_space")) + s->out_of_data_space = 1; + else if (strstr(params + pos, "ro ")) + s->read_only = 1; + + /* Default is 'queue_if_no_space' */ + if (strstr(params + pos, "error_if_no_space")) + s->error_if_no_space = 1; + + if (strstr(params + pos, "needs_check")) + s->needs_check = 1; + + return 1; +} + +int dm_get_status_thin_pool(struct dm_pool *mem, const char *params, + struct dm_status_thin_pool **status) +{ + struct dm_status_thin_pool *s; + + if (!(s = dm_pool_alloc(mem, sizeof(struct dm_status_thin_pool)))) { + log_error("Failed to allocate thin_pool status structure."); + return 0; + } + + if (!parse_thin_pool_status(params, s)) { + dm_pool_free(mem, s); + return_0; + } + + *status = s; + + return 1; +} + +int dm_get_status_thin(struct dm_pool *mem, const char *params, + struct dm_status_thin **status) +{ + struct dm_status_thin *s; + + if (!(s = dm_pool_zalloc(mem, sizeof(struct dm_status_thin)))) { + log_error("Failed to allocate thin status structure."); + return 0; + } + + if (strchr(params, '-')) { + /* nothing to parse */ + } else if (strstr(params, "Fail")) { + s->fail = 1; + } else if (sscanf(params, FMTu64 " " FMTu64, + &s->mapped_sectors, + &s->highest_mapped_sector) != 2) { + dm_pool_free(mem, s); + log_error("Failed to parse thin params: %s.", params); + return 0; + } + + *status = s; + + return 1; +} + +/* + * dm core parms: 0 409600 mirror + * Mirror core parms: 2 253:4 253:5 400/400 + * New-style failure params: 1 AA + * New-style log params: 3 cluster 253:3 A + * or 3 disk 253:3 A + * or 1 core + */ +#define DM_MIRROR_MAX_IMAGES 8 /* limited by kernel DM_KCOPYD_MAX_REGIONS */ + +int dm_get_status_mirror(struct dm_pool *mem, const char *params, + struct dm_status_mirror **status) +{ + struct dm_status_mirror *s; + const char *p, *pos = params; + unsigned num_devs, argc, i; + int used; + + if (!(s = dm_pool_zalloc(mem, sizeof(*s)))) { + log_error("Failed to alloc mem pool to parse mirror status."); + return 0; + } + + if (sscanf(pos, "%u %n", &num_devs, &used) != 1) + goto_out; + pos += used; + + if (num_devs > DM_MIRROR_MAX_IMAGES) { + log_error(INTERNAL_ERROR "More then " DM_TO_STRING(DM_MIRROR_MAX_IMAGES) + " reported in mirror status."); + goto out; + } + + if (!(s->devs = dm_pool_alloc(mem, num_devs * sizeof(*(s->devs))))) { + log_error("Allocation of devs failed."); + goto out; + } + + for (i = 0; i < num_devs; ++i, pos += used) + if (sscanf(pos, "%u:%u %n", + &(s->devs[i].major), &(s->devs[i].minor), &used) != 2) + goto_out; + + if (sscanf(pos, FMTu64 "/" FMTu64 "%n", + &s->insync_regions, &s->total_regions, &used) != 2) + goto_out; + pos += used; + + if (sscanf(pos, "%u %n", &argc, &used) != 1) + goto_out; + pos += used; + + for (i = 0; i < num_devs ; ++i) + s->devs[i].health = pos[i]; + + if (!(pos = _skip_fields(pos, argc))) + goto_out; + + if (strncmp(pos, "userspace", 9) == 0) { + pos += 9; + /* FIXME: support status of userspace mirror implementation */ + } + + if (sscanf(pos, "%u %n", &argc, &used) != 1) + goto_out; + pos += used; + + if (argc == 1) { + /* core, cluster-core */ + if (!(s->log_type = dm_pool_strdup(mem, pos))) { + log_error("Allocation of log type string failed."); + goto out; + } + } else { + if (!(p = _skip_fields(pos, 1))) + goto_out; + + /* disk, cluster-disk */ + if (!(s->log_type = dm_pool_strndup(mem, pos, p - pos - 1))) { + log_error("Allocation of log type string failed."); + goto out; + } + pos = p; + + if ((argc > 2) && !strcmp(s->log_type, "disk")) { + s->log_count = argc - 2; + + if (!(s->logs = dm_pool_alloc(mem, s->log_count * sizeof(*(s->logs))))) { + log_error("Allocation of logs failed."); + goto out; + } + + for (i = 0; i < s->log_count; ++i, pos += used) + if (sscanf(pos, "%u:%u %n", + &s->logs[i].major, &s->logs[i].minor, &used) != 2) + goto_out; + + for (i = 0; i < s->log_count; ++i) + s->logs[i].health = pos[i]; + } + } + + s->dev_count = num_devs; + *status = s; + + return 1; +out: + log_error("Failed to parse mirror status %s.", params); + dm_pool_free(mem, s); + *status = NULL; + + return 0; +} diff --git a/device_mapper/libdm-timestamp.c b/device_mapper/libdm-timestamp.c new file mode 100644 index 0000000..c2d0ad8 --- /dev/null +++ b/device_mapper/libdm-timestamp.c @@ -0,0 +1,178 @@ +/* + * Copyright (C) 2006 Rackable Systems All rights reserved. + * Copyright (C) 2015 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* + * Abstract out the time methods used so they can be adjusted later - + * the results of these routines should stay in-core. + */ + +#include "misc/dmlib.h" + +#include <stdlib.h> + +#define NSEC_PER_USEC UINT64_C(1000) +#define NSEC_PER_MSEC UINT64_C(1000000) +#define NSEC_PER_SEC UINT64_C(1000000000) + +/* + * The realtime section uses clock_gettime with the CLOCK_MONOTONIC + * parameter to prevent issues with time warps + * This implementation requires librt. + */ +#ifdef HAVE_REALTIME + +#include <time.h> + +struct dm_timestamp { + struct timespec t; +}; + +static uint64_t _timestamp_to_uint64(struct dm_timestamp *ts) +{ + uint64_t stamp = 0; + + stamp += (uint64_t) ts->t.tv_sec * NSEC_PER_SEC; + stamp += (uint64_t) ts->t.tv_nsec; + + return stamp; +} + +struct dm_timestamp *dm_timestamp_alloc(void) +{ + struct dm_timestamp *ts = NULL; + + if (!(ts = dm_zalloc(sizeof(*ts)))) + stack; + + return ts; +} + +int dm_timestamp_get(struct dm_timestamp *ts) +{ + if (!ts) + return 0; + + if (clock_gettime(CLOCK_MONOTONIC, &ts->t)) { + log_sys_error("clock_gettime", "get_timestamp"); + ts->t.tv_sec = 0; + ts->t.tv_nsec = 0; + return 0; + } + + return 1; +} + +#else /* ! HAVE_REALTIME */ + +/* + * The !realtime section just uses gettimeofday and is therefore subject + * to ntp-type time warps - not sure if should allow that. + */ + +#include <sys/time.h> + +struct dm_timestamp { + struct timeval t; +}; + +static uint64_t _timestamp_to_uint64(struct dm_timestamp *ts) +{ + uint64_t stamp = 0; + + stamp += ts->t.tv_sec * NSEC_PER_SEC; + stamp += ts->t.tv_usec * NSEC_PER_USEC; + + return stamp; +} + +struct dm_timestamp *dm_timestamp_alloc(void) +{ + struct dm_timestamp *ts; + + if (!(ts = dm_malloc(sizeof(*ts)))) + stack; + + return ts; +} + +int dm_timestamp_get(struct dm_timestamp *ts) +{ + if (!ts) + return 0; + + if (gettimeofday(&ts->t, NULL)) { + log_sys_error("gettimeofday", "get_timestamp"); + ts->t.tv_sec = 0; + ts->t.tv_usec = 0; + return 0; + } + + return 1; +} + +#endif /* HAVE_REALTIME */ + +/* + * Compare two timestamps. + * + * Return: -1 if ts1 is less than ts2 + * 0 if ts1 is equal to ts2 + * 1 if ts1 is greater than ts2 + */ +int dm_timestamp_compare(struct dm_timestamp *ts1, struct dm_timestamp *ts2) +{ + uint64_t t1, t2; + + t1 = _timestamp_to_uint64(ts1); + t2 = _timestamp_to_uint64(ts2); + + if (t2 < t1) + return 1; + + if (t1 < t2) + return -1; + + return 0; +} + +/* + * Return the absolute difference in nanoseconds between + * the dm_timestamp objects ts1 and ts2. + * + * Callers that need to know whether ts1 is before, equal to, or after ts2 + * in addition to the magnitude should use dm_timestamp_compare. + */ +uint64_t dm_timestamp_delta(struct dm_timestamp *ts1, struct dm_timestamp *ts2) +{ + uint64_t t1, t2; + + t1 = _timestamp_to_uint64(ts1); + t2 = _timestamp_to_uint64(ts2); + + if (t1 > t2) + return t1 - t2; + + return t2 - t1; +} + +void dm_timestamp_copy(struct dm_timestamp *ts_new, struct dm_timestamp *ts_old) +{ + *ts_new = *ts_old; +} + +void dm_timestamp_destroy(struct dm_timestamp *ts) +{ + dm_free(ts); +} diff --git a/device_mapper/misc/dm-ioctl.h b/device_mapper/misc/dm-ioctl.h new file mode 100644 index 0000000..79f574c --- /dev/null +++ b/device_mapper/misc/dm-ioctl.h @@ -0,0 +1,364 @@ +/* + * Copyright (C) 2001 - 2003 Sistina Software (UK) Limited. + * Copyright (C) 2004 - 2017 Red Hat, Inc. All rights reserved. + * + * This file is released under the LGPL. + */ + +#ifndef _LINUX_DM_IOCTL_V4_H +#define _LINUX_DM_IOCTL_V4_H + +#ifdef __linux__ +# include <linux/types.h> +#endif + +#define DM_DIR "mapper" /* Slashes not supported */ +#define DM_CONTROL_NODE "control" +#define DM_MAX_TYPE_NAME 16 +#define DM_NAME_LEN 128 +#define DM_UUID_LEN 129 + +/* + * A traditional ioctl interface for the device mapper. + * + * Each device can have two tables associated with it, an + * 'active' table which is the one currently used by io passing + * through the device, and an 'inactive' one which is a table + * that is being prepared as a replacement for the 'active' one. + * + * DM_VERSION: + * Just get the version information for the ioctl interface. + * + * DM_REMOVE_ALL: + * Remove all dm devices, destroy all tables. Only really used + * for debug. + * + * DM_LIST_DEVICES: + * Get a list of all the dm device names. + * + * DM_DEV_CREATE: + * Create a new device, neither the 'active' or 'inactive' table + * slots will be filled. The device will be in suspended state + * after creation, however any io to the device will get errored + * since it will be out-of-bounds. + * + * DM_DEV_REMOVE: + * Remove a device, destroy any tables. + * + * DM_DEV_RENAME: + * Rename a device or set its uuid if none was previously supplied. + * + * DM_SUSPEND: + * This performs both suspend and resume, depending which flag is + * passed in. + * Suspend: This command will not return until all pending io to + * the device has completed. Further io will be deferred until + * the device is resumed. + * Resume: It is no longer an error to issue this command on an + * unsuspended device. If a table is present in the 'inactive' + * slot, it will be moved to the active slot, then the old table + * from the active slot will be _destroyed_. Finally the device + * is resumed. + * + * DM_DEV_STATUS: + * Retrieves the status for the table in the 'active' slot. + * + * DM_DEV_WAIT: + * Wait for a significant event to occur to the device. This + * could either be caused by an event triggered by one of the + * targets of the table in the 'active' slot, or a table change. + * + * DM_TABLE_LOAD: + * Load a table into the 'inactive' slot for the device. The + * device does _not_ need to be suspended prior to this command. + * + * DM_TABLE_CLEAR: + * Destroy any table in the 'inactive' slot (ie. abort). + * + * DM_TABLE_DEPS: + * Return a set of device dependencies for the 'active' table. + * + * DM_TABLE_STATUS: + * Return the targets status for the 'active' table. + * + * DM_TARGET_MSG: + * Pass a message string to the target at a specific offset of a device. + * + * DM_DEV_SET_GEOMETRY: + * Set the geometry of a device by passing in a string in this format: + * + * "cylinders heads sectors_per_track start_sector" + * + * Beware that CHS geometry is nearly obsolete and only provided + * for compatibility with dm devices that can be booted by a PC + * BIOS. See struct hd_geometry for range limits. Also note that + * the geometry is erased if the device size changes. + */ + +/* + * All ioctl arguments consist of a single chunk of memory, with + * this structure at the start. If a uuid is specified any + * lookup (eg. for a DM_INFO) will be done on that, *not* the + * name. + */ +struct dm_ioctl { + /* + * The version number is made up of three parts: + * major - no backward or forward compatibility, + * minor - only backwards compatible, + * patch - both backwards and forwards compatible. + * + * All clients of the ioctl interface should fill in the + * version number of the interface that they were + * compiled with. + * + * All recognised ioctl commands (ie. those that don't + * return -ENOTTY) fill out this field, even if the + * command failed. + */ + uint32_t version[3]; /* in/out */ + uint32_t data_size; /* total size of data passed in + * including this struct */ + + uint32_t data_start; /* offset to start of data + * relative to start of this struct */ + + uint32_t target_count; /* in/out */ + int32_t open_count; /* out */ + uint32_t flags; /* in/out */ + + /* + * event_nr holds either the event number (input and output) or the + * udev cookie value (input only). + * The DM_DEV_WAIT ioctl takes an event number as input. + * The DM_SUSPEND, DM_DEV_REMOVE and DM_DEV_RENAME ioctls + * use the field as a cookie to return in the DM_COOKIE + * variable with the uevents they issue. + * For output, the ioctls return the event number, not the cookie. + */ + uint32_t event_nr; /* in/out */ + uint32_t padding; + + uint64_t dev; /* in/out */ + + char name[DM_NAME_LEN]; /* device name */ + char uuid[DM_UUID_LEN]; /* unique identifier for + * the block device */ + char data[7]; /* padding or data */ +}; + +/* + * Used to specify tables. These structures appear after the + * dm_ioctl. + */ +struct dm_target_spec { + uint64_t sector_start; + uint64_t length; + int32_t status; /* used when reading from kernel only */ + + /* + * Location of the next dm_target_spec. + * - When specifying targets on a DM_TABLE_LOAD command, this value is + * the number of bytes from the start of the "current" dm_target_spec + * to the start of the "next" dm_target_spec. + * - When retrieving targets on a DM_TABLE_STATUS command, this value + * is the number of bytes from the start of the first dm_target_spec + * (that follows the dm_ioctl struct) to the start of the "next" + * dm_target_spec. + */ + uint32_t next; + + char target_type[DM_MAX_TYPE_NAME]; + + /* + * Parameter string starts immediately after this object. + * Be careful to add padding after string to ensure correct + * alignment of subsequent dm_target_spec. + */ +}; + +/* + * Used to retrieve the target dependencies. + */ +struct dm_target_deps { + uint32_t count; /* Array size */ + uint32_t padding; /* unused */ + uint64_t dev[0]; /* out */ +}; + +/* + * Used to get a list of all dm devices. + */ +struct dm_name_list { + uint64_t dev; + uint32_t next; /* offset to the next record from + the _start_ of this */ + char name[0]; +}; + +/* + * Used to retrieve the target versions + */ +struct dm_target_versions { + uint32_t next; + uint32_t version[3]; + + char name[0]; +}; + +/* + * Used to pass message to a target + */ +struct dm_target_msg { + uint64_t sector; /* Device sector */ + + char message[0]; +}; + +/* + * If you change this make sure you make the corresponding change + * to dm-ioctl.c:lookup_ioctl() + */ +enum { + /* Top level cmds */ + DM_VERSION_CMD = 0, + DM_REMOVE_ALL_CMD, + DM_LIST_DEVICES_CMD, + + /* device level cmds */ + DM_DEV_CREATE_CMD, + DM_DEV_REMOVE_CMD, + DM_DEV_RENAME_CMD, + DM_DEV_SUSPEND_CMD, + DM_DEV_STATUS_CMD, + DM_DEV_WAIT_CMD, + + /* Table level cmds */ + DM_TABLE_LOAD_CMD, + DM_TABLE_CLEAR_CMD, + DM_TABLE_DEPS_CMD, + DM_TABLE_STATUS_CMD, + + /* Added later */ + DM_LIST_VERSIONS_CMD, + DM_TARGET_MSG_CMD, + DM_DEV_SET_GEOMETRY_CMD, + DM_DEV_ARM_POLL_CMD, +}; + +#define DM_IOCTL 0xfd + +#define DM_VERSION _IOWR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl) +#define DM_REMOVE_ALL _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, struct dm_ioctl) +#define DM_LIST_DEVICES _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, struct dm_ioctl) + +#define DM_DEV_CREATE _IOWR(DM_IOCTL, DM_DEV_CREATE_CMD, struct dm_ioctl) +#define DM_DEV_REMOVE _IOWR(DM_IOCTL, DM_DEV_REMOVE_CMD, struct dm_ioctl) +#define DM_DEV_RENAME _IOWR(DM_IOCTL, DM_DEV_RENAME_CMD, struct dm_ioctl) +#define DM_DEV_SUSPEND _IOWR(DM_IOCTL, DM_DEV_SUSPEND_CMD, struct dm_ioctl) +#define DM_DEV_STATUS _IOWR(DM_IOCTL, DM_DEV_STATUS_CMD, struct dm_ioctl) +#define DM_DEV_WAIT _IOWR(DM_IOCTL, DM_DEV_WAIT_CMD, struct dm_ioctl) +#define DM_DEV_ARM_POLL _IOWR(DM_IOCTL, DM_DEV_ARM_POLL_CMD, struct dm_ioctl) + +#define DM_TABLE_LOAD _IOWR(DM_IOCTL, DM_TABLE_LOAD_CMD, struct dm_ioctl) +#define DM_TABLE_CLEAR _IOWR(DM_IOCTL, DM_TABLE_CLEAR_CMD, struct dm_ioctl) +#define DM_TABLE_DEPS _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, struct dm_ioctl) +#define DM_TABLE_STATUS _IOWR(DM_IOCTL, DM_TABLE_STATUS_CMD, struct dm_ioctl) + +#define DM_LIST_VERSIONS _IOWR(DM_IOCTL, DM_LIST_VERSIONS_CMD, struct dm_ioctl) + +#define DM_TARGET_MSG _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl) +#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) + +#define DM_VERSION_MAJOR 4 +#define DM_VERSION_MINOR 36 +#define DM_VERSION_PATCHLEVEL 0 +#define DM_VERSION_EXTRA "-ioctl (2017-06-09)" + +/* Status bits */ +#define DM_READONLY_FLAG (1 << 0) /* In/Out */ +#define DM_SUSPEND_FLAG (1 << 1) /* In/Out */ +#define DM_PERSISTENT_DEV_FLAG (1 << 3) /* In */ + +/* + * Flag passed into ioctl STATUS command to get table information + * rather than current status. + */ +#define DM_STATUS_TABLE_FLAG (1 << 4) /* In */ + +/* + * Flags that indicate whether a table is present in either of + * the two table slots that a device has. + */ +#define DM_ACTIVE_PRESENT_FLAG (1 << 5) /* Out */ +#define DM_INACTIVE_PRESENT_FLAG (1 << 6) /* Out */ + +/* + * Indicates that the buffer passed in wasn't big enough for the + * results. + */ +#define DM_BUFFER_FULL_FLAG (1 << 8) /* Out */ + +/* + * This flag is now ignored. + */ +#define DM_SKIP_BDGET_FLAG (1 << 9) /* In */ + +/* + * Set this to avoid attempting to freeze any filesystem when suspending. + */ +#define DM_SKIP_LOCKFS_FLAG (1 << 10) /* In */ + +/* + * Set this to suspend without flushing queued ios. + * Also disables flushing uncommitted changes in the thin target before + * generating statistics for DM_TABLE_STATUS and DM_DEV_WAIT. + */ +#define DM_NOFLUSH_FLAG (1 << 11) /* In */ + +/* + * If set, any table information returned will relate to the inactive + * table instead of the live one. Always check DM_INACTIVE_PRESENT_FLAG + * is set before using the data returned. + */ +#define DM_QUERY_INACTIVE_TABLE_FLAG (1 << 12) /* In */ + +/* + * If set, a uevent was generated for which the caller may need to wait. + */ +#define DM_UEVENT_GENERATED_FLAG (1 << 13) /* Out */ + +/* + * If set, rename changes the uuid not the name. Only permitted + * if no uuid was previously supplied: an existing uuid cannot be changed. + */ +#define DM_UUID_FLAG (1 << 14) /* In */ + +/* + * If set, all buffers are wiped after use. Use when sending + * or requesting sensitive data such as an encryption key. + */ +#define DM_SECURE_DATA_FLAG (1 << 15) /* In */ + +/* + * If set, a message generated output data. + */ +#define DM_DATA_OUT_FLAG (1 << 16) /* Out */ + +/* + * If set with DM_DEV_REMOVE or DM_REMOVE_ALL this indicates that if + * the device cannot be removed immediately because it is still in use + * it should instead be scheduled for removal when it gets closed. + * + * On return from DM_DEV_REMOVE, DM_DEV_STATUS or other ioctls, this + * flag indicates that the device is scheduled to be removed when it + * gets closed. + */ +#define DM_DEFERRED_REMOVE (1 << 17) /* In/Out */ + +/* + * If set, the device is suspended internally. + */ +#define DM_INTERNAL_SUSPEND_FLAG (1 << 18) /* Out */ + +#endif /* _LINUX_DM_IOCTL_H */ diff --git a/device_mapper/misc/dm-log-userspace.h b/device_mapper/misc/dm-log-userspace.h new file mode 100644 index 0000000..a770ae6 --- /dev/null +++ b/device_mapper/misc/dm-log-userspace.h @@ -0,0 +1,418 @@ +/* + * Copyright (C) 2006-2009 Red Hat, Inc. + * + * This file is released under the LGPL. + */ + +#ifndef __DM_LOG_USERSPACE_H__ +#define __DM_LOG_USERSPACE_H__ + +#include <inttypes.h> + +#include "dm-ioctl.h" /* For DM_UUID_LEN */ + +/* + * The device-mapper userspace log module consists of a kernel component and + * a user-space component. The kernel component implements the API defined + * in dm-dirty-log.h. Its purpose is simply to pass the parameters and + * return values of those API functions between kernel and user-space. + * + * Below are defined the 'request_types' - DM_ULOG_CTR, DM_ULOG_DTR, etc. + * These request types represent the different functions in the device-mapper + * dirty log API. Each of these is described in more detail below. + * + * The user-space program must listen for requests from the kernel (representing + * the various API functions) and process them. + * + * User-space begins by setting up the communication link (error checking + * removed for clarity): + * fd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR); + * addr.nl_family = AF_NETLINK; + * addr.nl_groups = CN_IDX_DM; + * addr.nl_pid = 0; + * r = bind(fd, (struct sockaddr *) &addr, sizeof(addr)); + * opt = addr.nl_groups; + * setsockopt(fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, &opt, sizeof(opt)); + * + * User-space will then wait to receive requests from the kernel, which it + * will process as described below. The requests are received in the form, + * ((struct dm_ulog_request) + (additional data)). Depending on the request + * type, there may or may not be 'additional data'. In the descriptions below, + * you will see 'Payload-to-userspace' and 'Payload-to-kernel'. The + * 'Payload-to-userspace' is what the kernel sends in 'additional data' as + * necessary parameters to complete the request. The 'Payload-to-kernel' is + * the 'additional data' returned to the kernel that contains the necessary + * results of the request. The 'data_size' field in the dm_ulog_request + * structure denotes the availability and amount of payload data. + */ + +/* + * DM_ULOG_CTR corresponds to (found in dm-dirty-log.h): + * int (*ctr)(struct dm_dirty_log *log, struct dm_target *ti, + * unsigned argc, char **argv); + * + * Payload-to-userspace: + * A single string containing all the argv arguments separated by ' 's + * Payload-to-kernel: + * The name of the device that is used as the backing store for the log + * data. 'dm_get_device' will be called on this device. ('dm_put_device' + * will be called on this device automatically after calling DM_ULOG_DTR.) + * If there is no device needed for log data, 'data_size' in the + * dm_ulog_request struct should be 0. + * + * The UUID contained in the dm_ulog_request structure is the reference that + * will be used by all request types to a specific log. The constructor must + * record this assotiation with the instance created. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field, filling the + * data field with the log device if necessary, and setting 'data_size' + * appropriately. + */ +#define DM_ULOG_CTR 1 + +/* + * DM_ULOG_DTR corresponds to (found in dm-dirty-log.h): + * void (*dtr)(struct dm_dirty_log *log); + * + * Payload-to-userspace: + * A single string containing all the argv arguments separated by ' 's + * Payload-to-kernel: + * None. ('data_size' in the dm_ulog_request struct should be 0.) + * + * The UUID contained in the dm_ulog_request structure is all that is + * necessary to identify the log instance being destroyed. There is no + * payload data. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and clearing + * 'data_size' appropriately. + */ +#define DM_ULOG_DTR 2 + +/* + * DM_ULOG_PRESUSPEND corresponds to (found in dm-dirty-log.h): + * int (*presuspend)(struct dm_dirty_log *log); + * + * Payload-to-userspace: + * None. + * Payload-to-kernel: + * None. + * + * The UUID contained in the dm_ulog_request structure is all that is + * necessary to identify the log instance being presuspended. There is no + * payload data. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and + * 'data_size' appropriately. + */ +#define DM_ULOG_PRESUSPEND 3 + +/* + * DM_ULOG_POSTSUSPEND corresponds to (found in dm-dirty-log.h): + * int (*postsuspend)(struct dm_dirty_log *log); + * + * Payload-to-userspace: + * None. + * Payload-to-kernel: + * None. + * + * The UUID contained in the dm_ulog_request structure is all that is + * necessary to identify the log instance being postsuspended. There is no + * payload data. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and + * 'data_size' appropriately. + */ +#define DM_ULOG_POSTSUSPEND 4 + +/* + * DM_ULOG_RESUME corresponds to (found in dm-dirty-log.h): + * int (*resume)(struct dm_dirty_log *log); + * + * Payload-to-userspace: + * None. + * Payload-to-kernel: + * None. + * + * The UUID contained in the dm_ulog_request structure is all that is + * necessary to identify the log instance being resumed. There is no + * payload data. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and + * 'data_size' appropriately. + */ +#define DM_ULOG_RESUME 5 + +/* + * DM_ULOG_GET_REGION_SIZE corresponds to (found in dm-dirty-log.h): + * uint32_t (*get_region_size)(struct dm_dirty_log *log); + * + * Payload-to-userspace: + * None. + * Payload-to-kernel: + * uint64_t - contains the region size + * + * The region size is something that was determined at constructor time. + * It is returned in the payload area and 'data_size' is set to + * reflect this. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field appropriately. + */ +#define DM_ULOG_GET_REGION_SIZE 6 + +/* + * DM_ULOG_IS_CLEAN corresponds to (found in dm-dirty-log.h): + * int (*is_clean)(struct dm_dirty_log *log, region_t region); + * + * Payload-to-userspace: + * uint64_t - the region to get clean status on + * Payload-to-kernel: + * int64_t - 1 if clean, 0 otherwise + * + * Payload is sizeof(uint64_t) and contains the region for which the clean + * status is being made. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - filling the payload with 0 (not clean) or + * 1 (clean), setting 'data_size' and 'error' appropriately. + */ +#define DM_ULOG_IS_CLEAN 7 + +/* + * DM_ULOG_IN_SYNC corresponds to (found in dm-dirty-log.h): + * int (*in_sync)(struct dm_dirty_log *log, region_t region, + * int can_block); + * + * Payload-to-userspace: + * uint64_t - the region to get sync status on + * Payload-to-kernel: + * int64_t - 1 if in-sync, 0 otherwise + * + * Exactly the same as 'is_clean' above, except this time asking "has the + * region been recovered?" vs. "is the region not being modified?" + */ +#define DM_ULOG_IN_SYNC 8 + +/* + * DM_ULOG_FLUSH corresponds to (found in dm-dirty-log.h): + * int (*flush)(struct dm_dirty_log *log); + * + * Payload-to-userspace: + * None. + * Payload-to-kernel: + * None. + * + * No incoming or outgoing payload. Simply flush log state to disk. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and clearing + * 'data_size' appropriately. + */ +#define DM_ULOG_FLUSH 9 + +/* + * DM_ULOG_MARK_REGION corresponds to (found in dm-dirty-log.h): + * void (*mark_region)(struct dm_dirty_log *log, region_t region); + * + * Payload-to-userspace: + * uint64_t [] - region(s) to mark + * Payload-to-kernel: + * None. + * + * Incoming payload contains the one or more regions to mark dirty. + * The number of regions contained in the payload can be determined from + * 'data_size/sizeof(uint64_t)'. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and clearing + * 'data_size' appropriately. + */ +#define DM_ULOG_MARK_REGION 10 + +/* + * DM_ULOG_CLEAR_REGION corresponds to (found in dm-dirty-log.h): + * void (*clear_region)(struct dm_dirty_log *log, region_t region); + * + * Payload-to-userspace: + * uint64_t [] - region(s) to clear + * Payload-to-kernel: + * None. + * + * Incoming payload contains the one or more regions to mark clean. + * The number of regions contained in the payload can be determined from + * 'data_size/sizeof(uint64_t)'. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and clearing + * 'data_size' appropriately. + */ +#define DM_ULOG_CLEAR_REGION 11 + +/* + * DM_ULOG_GET_RESYNC_WORK corresponds to (found in dm-dirty-log.h): + * int (*get_resync_work)(struct dm_dirty_log *log, region_t *region); + * + * Payload-to-userspace: + * None. + * Payload-to-kernel: + * { + * int64_t i; -- 1 if recovery necessary, 0 otherwise + * uint64_t r; -- The region to recover if i=1 + * } + * 'data_size' should be set appropriately. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field appropriately. + */ +#define DM_ULOG_GET_RESYNC_WORK 12 + +/* + * DM_ULOG_SET_REGION_SYNC corresponds to (found in dm-dirty-log.h): + * void (*set_region_sync)(struct dm_dirty_log *log, + * region_t region, int in_sync); + * + * Payload-to-userspace: + * { + * uint64_t - region to set sync state on + * int64_t - 0 if not-in-sync, 1 if in-sync + * } + * Payload-to-kernel: + * None. + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and clearing + * 'data_size' appropriately. + */ +#define DM_ULOG_SET_REGION_SYNC 13 + +/* + * DM_ULOG_GET_SYNC_COUNT corresponds to (found in dm-dirty-log.h): + * region_t (*get_sync_count)(struct dm_dirty_log *log); + * + * Payload-to-userspace: + * None. + * Payload-to-kernel: + * uint64_t - the number of in-sync regions + * + * No incoming payload. Kernel-bound payload contains the number of + * regions that are in-sync (in a size_t). + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and + * 'data_size' appropriately. + */ +#define DM_ULOG_GET_SYNC_COUNT 14 + +/* + * DM_ULOG_STATUS_INFO corresponds to (found in dm-dirty-log.h): + * int (*status)(struct dm_dirty_log *log, STATUSTYPE_INFO, + * char *result, unsigned maxlen); + * + * Payload-to-userspace: + * None. + * Payload-to-kernel: + * Character string containing STATUSTYPE_INFO + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and + * 'data_size' appropriately. + */ +#define DM_ULOG_STATUS_INFO 15 + +/* + * DM_ULOG_STATUS_TABLE corresponds to (found in dm-dirty-log.h): + * int (*status)(struct dm_dirty_log *log, STATUSTYPE_TABLE, + * char *result, unsigned maxlen); + * + * Payload-to-userspace: + * None. + * Payload-to-kernel: + * Character string containing STATUSTYPE_TABLE + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and + * 'data_size' appropriately. + */ +#define DM_ULOG_STATUS_TABLE 16 + +/* + * DM_ULOG_IS_REMOTE_RECOVERING corresponds to (found in dm-dirty-log.h): + * int (*is_remote_recovering)(struct dm_dirty_log *log, region_t region); + * + * Payload-to-userspace: + * uint64_t - region to determine recovery status on + * Payload-to-kernel: + * { + * int64_t is_recovering; -- 0 if no, 1 if yes + * uint64_t in_sync_hint; -- lowest region still needing resync + * } + * + * When the request has been processed, user-space must return the + * dm_ulog_request to the kernel - setting the 'error' field and + * 'data_size' appropriately. + */ +#define DM_ULOG_IS_REMOTE_RECOVERING 17 + +/* + * (DM_ULOG_REQUEST_MASK & request_type) to get the request type + * + * Payload-to-userspace: + * A single string containing all the argv arguments separated by ' 's + * Payload-to-kernel: + * None. ('data_size' in the dm_ulog_request struct should be 0.) + * + * We are reserving 8 bits of the 32-bit 'request_type' field for the + * various request types above. The remaining 24-bits are currently + * set to zero and are reserved for future use and compatibility concerns. + * + * User-space should always use DM_ULOG_REQUEST_TYPE to acquire the + * request type from the 'request_type' field to maintain forward compatibility. + */ +#define DM_ULOG_REQUEST_MASK 0xFF +#define DM_ULOG_REQUEST_TYPE(request_type) \ + (DM_ULOG_REQUEST_MASK & (request_type)) + +/* + * DM_ULOG_REQUEST_VERSION is incremented when there is a + * change to the way information is passed between kernel + * and userspace. This could be a structure change of + * dm_ulog_request or a change in the way requests are + * issued/handled. Changes are outlined here: + * version 1: Initial implementation + * version 2: DM_ULOG_CTR allowed to return a string containing a + * device name that is to be registered with DM via + * 'dm_get_device'. + */ +#define DM_ULOG_REQUEST_VERSION 2 + +struct dm_ulog_request { + /* + * The local unique identifier (luid) and the universally unique + * identifier (uuid) are used to tie a request to a specific + * mirror log. A single machine log could probably make due with + * just the 'luid', but a cluster-aware log must use the 'uuid' and + * the 'luid'. The uuid is what is required for node to node + * communication concerning a particular log, but the 'luid' helps + * differentiate between logs that are being swapped and have the + * same 'uuid'. (Think "live" and "inactive" device-mapper tables.) + */ + uint64_t luid; + char uuid[DM_UUID_LEN]; + char padding[3]; /* Padding because DM_UUID_LEN = 129 */ + + uint32_t version; /* See DM_ULOG_REQUEST_VERSION */ + int32_t error; /* Used to report back processing errors */ + + uint32_t seq; /* Sequence number for request */ + uint32_t request_type; /* DM_ULOG_* defined above */ + uint32_t data_size; /* How much data (not including this struct) */ + + char data[]; +}; + +#endif /* __DM_LOG_USERSPACE_H__ */ diff --git a/device_mapper/misc/dm-logging.h b/device_mapper/misc/dm-logging.h new file mode 100644 index 0000000..a35480e --- /dev/null +++ b/device_mapper/misc/dm-logging.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2016 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _DM_LOGGING_H +#define _DM_LOGGING_H + +#include "libdevmapper.h" + +extern dm_log_with_errno_fn dm_log_with_errno; + +#define LOG_MESG(l, f, ln, e, x...) \ + dm_log_with_errno(l, f, ln, e, ## x) + +#define LOG_LINE(l, x...) LOG_MESG(l, __FILE__, __LINE__, 0, ## x) +#define LOG_LINE_WITH_ERRNO(l, e, x...) LOG_MESG(l, __FILE__, __LINE__, e, ## x) + +/* Debug messages may have a type instead of an errno */ +#define LOG_LINE_WITH_CLASS(l, c, x...) LOG_MESG(l, __FILE__, __LINE__, c, ## x) + +#include "lib/log/log.h" + +#endif diff --git a/device_mapper/misc/dmlib.h b/device_mapper/misc/dmlib.h new file mode 100644 index 0000000..ba376bc --- /dev/null +++ b/device_mapper/misc/dmlib.h @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* + * This file must be included first by every device-mapper library source file. + */ +#ifndef _DM_LIB_H +#define _DM_LIB_H + +// FIXME: get rid of this whole file + +#include "configure.h" + +#define _REENTRANT +#define _GNU_SOURCE + +#include "libdevmapper.h" +#include "lib/misc/util.h" +#include "dm-logging.h" + +#endif diff --git a/device_mapper/misc/kdev_t.h b/device_mapper/misc/kdev_t.h new file mode 100644 index 0000000..f88bb0a --- /dev/null +++ b/device_mapper/misc/kdev_t.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _LIBDM_KDEV_H +#define _LIBDM_KDEV_H + +#define MAJOR(dev) ((dev & 0xfff00) >> 8) +#define MINOR(dev) ((dev & 0xff) | ((dev >> 12) & 0xfff00)) +#define MKDEV(ma,mi) ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12)) + +#endif diff --git a/device_mapper/mm/dbg_malloc.c b/device_mapper/mm/dbg_malloc.c new file mode 100644 index 0000000..a17203c --- /dev/null +++ b/device_mapper/mm/dbg_malloc.c @@ -0,0 +1,413 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" + +#ifdef VALGRIND_POOL +#include "memcheck.h" +#endif +#include <assert.h> +#include <stdarg.h> +#include <unistd.h> + +void *dm_malloc_aux(size_t s, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +void *dm_malloc_aux_debug(size_t s, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +static void *_dm_malloc_aligned_aux(size_t s, size_t a, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +void *dm_zalloc_aux(size_t s, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +void *dm_zalloc_aux_debug(size_t s, const char *file, int line) + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +void *dm_realloc_aux(void *p, unsigned int s, const char *file, int line) + __attribute__((__warn_unused_result__)); +void dm_free_aux(void *p); +char *dm_strdup_aux(const char *str, const char *file, int line) + __attribute__((__warn_unused_result__)); +int dm_dump_memory_debug(void); +void dm_bounds_check_debug(void); + +char *dm_strdup_aux(const char *str, const char *file, int line) +{ + char *ret; + + if (!str) { + log_error(INTERNAL_ERROR "dm_strdup called with NULL pointer"); + return NULL; + } + + if ((ret = dm_malloc_aux_debug(strlen(str) + 1, file, line))) + strcpy(ret, str); + + return ret; +} + +struct memblock { + struct memblock *prev, *next; /* All allocated blocks are linked */ + size_t length; /* Size of the requested block */ + int id; /* Index of the block */ + const char *file; /* File that allocated */ + int line; /* Line that allocated */ + void *magic; /* Address of this block */ +} __attribute__((aligned(8))); + +static struct { + unsigned block_serialno;/* Non-decreasing serialno of block */ + unsigned blocks_allocated; /* Current number of blocks allocated */ + unsigned blocks_max; /* Max no of concurrently-allocated blocks */ + unsigned int bytes, mbytes; + +} _mem_stats = { +0, 0, 0, 0, 0}; + +static struct memblock *_head = 0; +static struct memblock *_tail = 0; + +void *dm_malloc_aux_debug(size_t s, const char *file, int line) +{ + struct memblock *nb; + size_t tsize = s + sizeof(*nb) + sizeof(unsigned long); + + if (s > 50000000) { + log_error("Huge memory allocation (size %" PRIsize_t + ") rejected - metadata corruption?", s); + return 0; + } + + if (!(nb = malloc(tsize))) { + log_error("couldn't allocate any memory, size = %" PRIsize_t, + s); + return 0; + } + + /* set up the file and line info */ + nb->file = file; + nb->line = line; + + dm_bounds_check(); + + /* setup fields */ + nb->magic = nb + 1; + nb->length = s; + nb->id = ++_mem_stats.block_serialno; + nb->next = 0; + + /* stomp a pretty pattern across the new memory + and fill in the boundary bytes */ + { + char *ptr = (char *) (nb + 1); + size_t i; + for (i = 0; i < s; i++) + *ptr++ = i & 0x1 ? (char) 0xba : (char) 0xbe; + + for (i = 0; i < sizeof(unsigned long); i++) + *ptr++ = (char) nb->id; + } + + nb->prev = _tail; + + /* link to tail of the list */ + if (!_head) + _head = _tail = nb; + else { + _tail->next = nb; + _tail = nb; + } + + _mem_stats.blocks_allocated++; + if (_mem_stats.blocks_allocated > _mem_stats.blocks_max) + _mem_stats.blocks_max = _mem_stats.blocks_allocated; + + _mem_stats.bytes += s; + if (_mem_stats.bytes > _mem_stats.mbytes) + _mem_stats.mbytes = _mem_stats.bytes; + + /* log_debug_mem("Allocated: %u %u %u", nb->id, _mem_stats.blocks_allocated, + _mem_stats.bytes); */ +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_UNDEFINED(nb + 1, s); +#endif + return nb + 1; +} + +void *dm_zalloc_aux_debug(size_t s, const char *file, int line) +{ + void *ptr = dm_malloc_aux_debug(s, file, line); + + if (ptr) + memset(ptr, 0, s); + + return ptr; +} + +void dm_free_aux(void *p) +{ + char *ptr; + size_t i; + struct memblock *mb = ((struct memblock *) p) - 1; + if (!p) + return; + + dm_bounds_check(); + + /* sanity check */ + assert(mb->magic == p); +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_DEFINED(p, mb->length); +#endif + /* check data at the far boundary */ + ptr = (char *) p + mb->length; + for (i = 0; i < sizeof(unsigned long); i++) + if (ptr[i] != (char) mb->id) + assert(!"Damage at far end of block"); + + /* have we freed this before ? */ + assert(mb->id != 0); + + /* unlink */ + if (mb->prev) + mb->prev->next = mb->next; + else + _head = mb->next; + + if (mb->next) + mb->next->prev = mb->prev; + else + _tail = mb->prev; + + mb->id = 0; + + /* stomp a different pattern across the memory */ + ptr = p; + for (i = 0; i < mb->length; i++) + ptr[i] = i & 1 ? (char) 0xde : (char) 0xad; + + assert(_mem_stats.blocks_allocated); + _mem_stats.blocks_allocated--; + _mem_stats.bytes -= mb->length; + + /* free the memory */ + free(mb); +} + +void *dm_realloc_aux(void *p, unsigned int s, const char *file, int line) +{ + void *r; + struct memblock *mb = ((struct memblock *) p) - 1; + + r = dm_malloc_aux_debug(s, file, line); + + if (r && p) { + memcpy(r, p, mb->length); + dm_free_aux(p); + } + + return r; +} + +int dm_dump_memory_debug(void) +{ + unsigned long tot = 0; + struct memblock *mb; + char str[32]; + + if (_head) + log_very_verbose("You have a memory leak:"); + + for (mb = _head; mb; mb = mb->next) { +#ifdef VALGRIND_POOL + /* + * We can't look at the memory in case it has had + * VALGRIND_MAKE_MEM_NOACCESS called on it. + */ + str[0] = '\0'; +#else + size_t c; + + for (c = 0; c < sizeof(str) - 1; c++) { + if (c >= mb->length) + str[c] = ' '; + else if (((char *)mb->magic)[c] == '\0') + str[c] = '\0'; + else if (((char *)mb->magic)[c] < ' ') + str[c] = '?'; + else + str[c] = ((char *)mb->magic)[c]; + } + str[sizeof(str) - 1] = '\0'; +#endif + + LOG_MESG(_LOG_INFO, mb->file, mb->line, 0, + "block %d at %p, size %" PRIsize_t "\t [%s]", + mb->id, mb->magic, mb->length, str); + tot += mb->length; + } + + if (_head) + log_very_verbose("%ld bytes leaked in total", tot); + + return 1; +} + +void dm_bounds_check_debug(void) +{ + struct memblock *mb = _head; + while (mb) { + size_t i; + char *ptr = ((char *) (mb + 1)) + mb->length; + for (i = 0; i < sizeof(unsigned long); i++) + if (*ptr++ != (char) mb->id) + assert(!"Memory smash"); + + mb = mb->next; + } +} + +void *dm_malloc_aux(size_t s, const char *file __attribute__((unused)), + int line __attribute__((unused))) +{ + if (s > 50000000) { + log_error("Huge memory allocation (size %" PRIsize_t + ") rejected - metadata corruption?", s); + return 0; + } + + return malloc(s); +} + +/* Allocate size s with alignment a (or page size if 0) */ +static void *_dm_malloc_aligned_aux(size_t s, size_t a, const char *file __attribute__((unused)), + int line __attribute__((unused))) +{ + void *memptr; + int r; + + if (!a) + a = getpagesize(); + + if (s > 50000000) { + log_error("Huge memory allocation (size %" PRIsize_t + ") rejected - metadata corruption?", s); + return 0; + } + + if ((r = posix_memalign(&memptr, a, s))) { + log_error("Failed to allocate %" PRIsize_t " bytes aligned to %" PRIsize_t ": %s", s, a, strerror(r)); + return 0; + } + + return memptr; +} + +void *dm_zalloc_aux(size_t s, const char *file, int line) +{ + void *ptr = dm_malloc_aux(s, file, line); + + if (ptr) + memset(ptr, 0, s); + + return ptr; +} + +#ifdef DEBUG_MEM + +void *dm_malloc_wrapper(size_t s, const char *file, int line) +{ + return dm_malloc_aux_debug(s, file, line); +} + +void *dm_malloc_aligned_wrapper(size_t s, size_t a, const char *file, int line) +{ + /* FIXME Implement alignment when debugging - currently just ignored */ + return _dm_malloc_aux_debug(s, file, line); +} + +void *dm_zalloc_wrapper(size_t s, const char *file, int line) +{ + return dm_zalloc_aux_debug(s, file, line); +} + +char *dm_strdup_wrapper(const char *str, const char *file, int line) +{ + return dm_strdup_aux(str, file, line); +} + +void dm_free_wrapper(void *ptr) +{ + dm_free_aux(ptr); +} + +void *dm_realloc_wrapper(void *p, unsigned int s, const char *file, int line) +{ + return dm_realloc_aux(p, s, file, line); +} + +int dm_dump_memory_wrapper(void) +{ + return dm_dump_memory_debug(); +} + +void dm_bounds_check_wrapper(void) +{ + dm_bounds_check_debug(); +} + +#else /* !DEBUG_MEM */ + +void *dm_malloc_wrapper(size_t s, const char *file, int line) +{ + return dm_malloc_aux(s, file, line); +} + +void *dm_malloc_aligned_wrapper(size_t s, size_t a, const char *file, int line) +{ + return _dm_malloc_aligned_aux(s, a, file, line); +} + +void *dm_zalloc_wrapper(size_t s, const char *file, int line) +{ + return dm_zalloc_aux(s, file, line); +} + +char *dm_strdup_wrapper(const char *str, + const char *file __attribute__((unused)), + int line __attribute__((unused))) +{ + return strdup(str); +} + +void dm_free_wrapper(void *ptr) +{ + free(ptr); +} + +void *dm_realloc_wrapper(void *p, unsigned int s, + const char *file __attribute__((unused)), + int line __attribute__((unused))) +{ + return realloc(p, s); +} + +int dm_dump_memory_wrapper(void) +{ + return 1; +} + +void dm_bounds_check_wrapper(void) +{ +} + +#endif /* DEBUG_MEM */ diff --git a/device_mapper/mm/pool-debug.c b/device_mapper/mm/pool-debug.c new file mode 100644 index 0000000..c523238 --- /dev/null +++ b/device_mapper/mm/pool-debug.c @@ -0,0 +1,292 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "dmlib.h" +#include <assert.h> + +struct block { + struct block *next; + size_t size; + void *data; +}; + +typedef struct { + unsigned block_serialno; /* Non-decreasing serialno of block */ + unsigned blocks_allocated; /* Current number of blocks allocated */ + unsigned blocks_max; /* Max no of concurrently-allocated blocks */ + unsigned int bytes, maxbytes; +} pool_stats; + +struct dm_pool { + struct dm_list list; + const char *name; + void *orig_pool; /* to pair it with first allocation call */ + unsigned locked; + long crc; + + int begun; + struct block *object; + + struct block *blocks; + struct block *tail; + + pool_stats stats; +}; + +/* by default things come out aligned for doubles */ +#define DEFAULT_ALIGNMENT __alignof__ (double) + +struct dm_pool *dm_pool_create(const char *name, size_t chunk_hint) +{ + struct dm_pool *mem = dm_zalloc(sizeof(*mem)); + + if (!mem) { + log_error("Couldn't create memory pool %s (size %" + PRIsize_t ")", name, sizeof(*mem)); + return NULL; + } + + mem->name = name; + mem->orig_pool = mem; + +#ifdef DEBUG_POOL + log_debug_mem("Created mempool %s at %p", name, mem); +#endif + + dm_list_add(&_dm_pools, &mem->list); + return mem; +} + +static void _free_blocks(struct dm_pool *p, struct block *b) +{ + struct block *n; + + if (p->locked) + log_error(INTERNAL_ERROR "_free_blocks from locked pool %s", + p->name); + + while (b) { + p->stats.bytes -= b->size; + p->stats.blocks_allocated--; + + n = b->next; + dm_free(b->data); + dm_free(b); + b = n; + } +} + +static void _pool_stats(struct dm_pool *p, const char *action) +{ +#ifdef DEBUG_POOL + log_debug_mem("%s mempool %s at %p: %u/%u bytes, %u/%u blocks, " + "%u allocations)", action, p->name, p, p->stats.bytes, + p->stats.maxbytes, p->stats.blocks_allocated, + p->stats.blocks_max, p->stats.block_serialno); +#else + ; +#endif +} + +void dm_pool_destroy(struct dm_pool *p) +{ + _pool_stats(p, "Destroying"); + _free_blocks(p, p->blocks); + dm_list_del(&p->list); + dm_free(p); +} + +void *dm_pool_alloc(struct dm_pool *p, size_t s) +{ + return dm_pool_alloc_aligned(p, s, DEFAULT_ALIGNMENT); +} + +static void _append_block(struct dm_pool *p, struct block *b) +{ + if (p->locked) + log_error(INTERNAL_ERROR "_append_blocks to locked pool %s", + p->name); + + if (p->tail) { + p->tail->next = b; + p->tail = b; + } else + p->blocks = p->tail = b; + + p->stats.block_serialno++; + p->stats.blocks_allocated++; + if (p->stats.blocks_allocated > p->stats.blocks_max) + p->stats.blocks_max = p->stats.blocks_allocated; + + p->stats.bytes += b->size; + if (p->stats.bytes > p->stats.maxbytes) + p->stats.maxbytes = p->stats.bytes; +} + +static struct block *_new_block(size_t s, unsigned alignment) +{ + /* FIXME: I'm currently ignoring the alignment arg. */ + size_t len = sizeof(struct block) + s; + struct block *b = dm_malloc(len); + + /* + * Too lazy to implement alignment for debug version, and + * I don't think LVM will use anything but default + * align. + */ + assert(alignment <= DEFAULT_ALIGNMENT); + + if (!b) { + log_error("Out of memory"); + return NULL; + } + + if (!(b->data = dm_malloc(s))) { + log_error("Out of memory"); + dm_free(b); + return NULL; + } + + b->next = NULL; + b->size = s; + + return b; +} + +void *dm_pool_alloc_aligned(struct dm_pool *p, size_t s, unsigned alignment) +{ + struct block *b = _new_block(s, alignment); + + if (!b) + return_NULL; + + _append_block(p, b); + + return b->data; +} + +void dm_pool_empty(struct dm_pool *p) +{ + _pool_stats(p, "Emptying"); + _free_blocks(p, p->blocks); + p->blocks = p->tail = NULL; +} + +void dm_pool_free(struct dm_pool *p, void *ptr) +{ + struct block *b, *prev = NULL; + + _pool_stats(p, "Freeing (before)"); + + for (b = p->blocks; b; b = b->next) { + if (b->data == ptr) + break; + prev = b; + } + + /* + * If this fires then you tried to free a + * pointer that either wasn't from this + * pool, or isn't the start of a block. + */ + assert(b); + + _free_blocks(p, b); + + if (prev) { + p->tail = prev; + prev->next = NULL; + } else + p->blocks = p->tail = NULL; + + _pool_stats(p, "Freeing (after)"); +} + +int dm_pool_begin_object(struct dm_pool *p, size_t init_size) +{ + assert(!p->begun); + p->begun = 1; + return 1; +} + +int dm_pool_grow_object(struct dm_pool *p, const void *extra, size_t delta) +{ + struct block *new; + size_t new_size; + + if (p->locked) + log_error(INTERNAL_ERROR "Grow objects in locked pool %s", + p->name); + + if (!delta) + delta = strlen(extra); + + assert(p->begun); + + if (p->object) + new_size = delta + p->object->size; + else + new_size = delta; + + if (!(new = _new_block(new_size, DEFAULT_ALIGNMENT))) { + log_error("Couldn't extend object."); + return 0; + } + + if (p->object) { + memcpy(new->data, p->object->data, p->object->size); + dm_free(p->object->data); + dm_free(p->object); + } + p->object = new; + + memcpy((char*)new->data + new_size - delta, extra, delta); + + return 1; +} + +void *dm_pool_end_object(struct dm_pool *p) +{ + assert(p->begun); + _append_block(p, p->object); + + p->begun = 0; + p->object = NULL; + return p->tail->data; +} + +void dm_pool_abandon_object(struct dm_pool *p) +{ + assert(p->begun); + dm_free(p->object); + p->begun = 0; + p->object = NULL; +} + +static long _pool_crc(const struct dm_pool *p) +{ +#ifndef DEBUG_ENFORCE_POOL_LOCKING +#warning pool crc not implemented with pool debug +#endif + return 0; +} + +static int _pool_protect(struct dm_pool *p, int prot) +{ +#ifdef DEBUG_ENFORCE_POOL_LOCKING +#warning pool mprotect not implemented with pool debug +#endif + return 1; +} diff --git a/device_mapper/mm/pool-fast.c b/device_mapper/mm/pool-fast.c new file mode 100644 index 0000000..895872e --- /dev/null +++ b/device_mapper/mm/pool-fast.c @@ -0,0 +1,363 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef VALGRIND_POOL +#include "memcheck.h" +#endif + +#include "misc/dmlib.h" +#include <stddef.h> /* For musl libc */ +#include <malloc.h> + +struct chunk { + char *begin, *end; + struct chunk *prev; +} __attribute__((aligned(8))); + +struct dm_pool { + struct dm_list list; + struct chunk *chunk, *spare_chunk; /* spare_chunk is a one entry free + list to stop 'bobbling' */ + const char *name; + size_t chunk_size; + size_t object_len; + unsigned object_alignment; + int locked; + long crc; +}; + +static void _align_chunk(struct chunk *c, unsigned alignment); +static struct chunk *_new_chunk(struct dm_pool *p, size_t s); +static void _free_chunk(struct chunk *c); + +/* by default things come out aligned for doubles */ +#define DEFAULT_ALIGNMENT __alignof__ (double) + +struct dm_pool *dm_pool_create(const char *name, size_t chunk_hint) +{ + size_t new_size = 1024; + struct dm_pool *p = dm_zalloc(sizeof(*p)); + + if (!p) { + log_error("Couldn't create memory pool %s (size %" + PRIsize_t ")", name, sizeof(*p)); + return 0; + } + + p->name = name; + /* round chunk_hint up to the next power of 2 */ + p->chunk_size = chunk_hint + sizeof(struct chunk); + while (new_size < p->chunk_size) + new_size <<= 1; + p->chunk_size = new_size; + pthread_mutex_lock(&_dm_pools_mutex); + dm_list_add(&_dm_pools, &p->list); + pthread_mutex_unlock(&_dm_pools_mutex); + return p; +} + +void dm_pool_destroy(struct dm_pool *p) +{ + struct chunk *c, *pr; + _free_chunk(p->spare_chunk); + c = p->chunk; + while (c) { + pr = c->prev; + _free_chunk(c); + c = pr; + } + + pthread_mutex_lock(&_dm_pools_mutex); + dm_list_del(&p->list); + pthread_mutex_unlock(&_dm_pools_mutex); + dm_free(p); +} + +void *dm_pool_alloc(struct dm_pool *p, size_t s) +{ + return dm_pool_alloc_aligned(p, s, DEFAULT_ALIGNMENT); +} + +void *dm_pool_alloc_aligned(struct dm_pool *p, size_t s, unsigned alignment) +{ + struct chunk *c = p->chunk; + void *r; + + /* realign begin */ + if (c) + _align_chunk(c, alignment); + + /* have we got room ? */ + if (!c || (c->begin > c->end) || ((c->end - c->begin) < (int) s)) { + /* allocate new chunk */ + size_t needed = s + alignment + sizeof(struct chunk); + c = _new_chunk(p, (needed > p->chunk_size) ? + needed : p->chunk_size); + + if (!c) + return_NULL; + + _align_chunk(c, alignment); + } + + r = c->begin; + c->begin += s; + +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_UNDEFINED(r, s); +#endif + + return r; +} + +void dm_pool_empty(struct dm_pool *p) +{ + struct chunk *c; + + for (c = p->chunk; c && c->prev; c = c->prev) + ; + + if (c) + dm_pool_free(p, (char *) (c + 1)); +} + +void dm_pool_free(struct dm_pool *p, void *ptr) +{ + struct chunk *c = p->chunk; + + while (c) { + if (((char *) c < (char *) ptr) && + ((char *) c->end > (char *) ptr)) { + c->begin = ptr; +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_NOACCESS(c->begin, c->end - c->begin); +#endif + break; + } + + if (p->spare_chunk) + _free_chunk(p->spare_chunk); + + c->begin = (char *) (c + 1); +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_NOACCESS(c->begin, c->end - c->begin); +#endif + + p->spare_chunk = c; + c = c->prev; + } + + if (!c) + log_error(INTERNAL_ERROR "pool_free asked to free pointer " + "not in pool"); + else + p->chunk = c; +} + +int dm_pool_begin_object(struct dm_pool *p, size_t hint) +{ + struct chunk *c = p->chunk; + const size_t align = DEFAULT_ALIGNMENT; + + p->object_len = 0; + p->object_alignment = align; + + if (c) + _align_chunk(c, align); + + if (!c || (c->begin > c->end) || ((c->end - c->begin) < (int) hint)) { + /* allocate a new chunk */ + c = _new_chunk(p, + hint > (p->chunk_size - sizeof(struct chunk)) ? + hint + sizeof(struct chunk) + align : + p->chunk_size); + + if (!c) + return 0; + + _align_chunk(c, align); + } + + return 1; +} + +int dm_pool_grow_object(struct dm_pool *p, const void *extra, size_t delta) +{ + struct chunk *c = p->chunk, *nc; + + if (!delta) + delta = strlen(extra); + + if ((c->end - (c->begin + p->object_len)) < (int) delta) { + /* move into a new chunk */ + if (p->object_len + delta > (p->chunk_size / 2)) + nc = _new_chunk(p, (p->object_len + delta) * 2); + else + nc = _new_chunk(p, p->chunk_size); + + if (!nc) + return 0; + + _align_chunk(p->chunk, p->object_alignment); + +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_UNDEFINED(p->chunk->begin, p->object_len); +#endif + + memcpy(p->chunk->begin, c->begin, p->object_len); + +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_NOACCESS(c->begin, p->object_len); +#endif + + c = p->chunk; + } + +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_UNDEFINED(p->chunk->begin + p->object_len, delta); +#endif + + memcpy(c->begin + p->object_len, extra, delta); + p->object_len += delta; + return 1; +} + +void *dm_pool_end_object(struct dm_pool *p) +{ + struct chunk *c = p->chunk; + void *r = c->begin; + c->begin += p->object_len; + p->object_len = 0u; + p->object_alignment = DEFAULT_ALIGNMENT; + return r; +} + +void dm_pool_abandon_object(struct dm_pool *p) +{ +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_NOACCESS(p->chunk, p->object_len); +#endif + p->object_len = 0; + p->object_alignment = DEFAULT_ALIGNMENT; +} + +static void _align_chunk(struct chunk *c, unsigned alignment) +{ + c->begin += alignment - ((unsigned long) c->begin & (alignment - 1)); +} + +static struct chunk *_new_chunk(struct dm_pool *p, size_t s) +{ + struct chunk *c; + + if (p->spare_chunk && + ((p->spare_chunk->end - p->spare_chunk->begin) >= (ptrdiff_t)s)) { + /* reuse old chunk */ + c = p->spare_chunk; + p->spare_chunk = 0; + } else { +#ifdef DEBUG_ENFORCE_POOL_LOCKING + if (!_pagesize) { + _pagesize = getpagesize(); /* lvm_pagesize(); */ + _pagesize_mask = _pagesize - 1; + } + /* + * Allocate page aligned size so malloc could work. + * Otherwise page fault would happen from pool unrelated + * memory writes of internal malloc pointers. + */ +# define aligned_malloc(s) (posix_memalign((void**)&c, _pagesize, \ + ALIGN_ON_PAGE(s)) == 0) +#else +# define aligned_malloc(s) (c = dm_malloc(s)) +#endif /* DEBUG_ENFORCE_POOL_LOCKING */ + if (!aligned_malloc(s)) { +#undef aligned_malloc + log_error("Out of memory. Requested %" PRIsize_t + " bytes.", s); + return NULL; + } + + c->begin = (char *) (c + 1); + c->end = (char *) c + s; + +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_NOACCESS(c->begin, c->end - c->begin); +#endif + } + + c->prev = p->chunk; + p->chunk = c; + return c; +} + +static void _free_chunk(struct chunk *c) +{ +#ifdef VALGRIND_POOL +# ifdef DEBUG_MEM + if (c) + VALGRIND_MAKE_MEM_UNDEFINED(c + 1, c->end - (char *) (c + 1)); +# endif +#endif +#ifdef DEBUG_ENFORCE_POOL_LOCKING + /* since DEBUG_MEM is using own memory list */ + free(c); /* for posix_memalign() */ +#else + dm_free(c); +#endif +} + + +/** + * Calc crc/hash from pool's memory chunks with internal pointers + */ +static long _pool_crc(const struct dm_pool *p) +{ + long crc_hash = 0; +#ifndef DEBUG_ENFORCE_POOL_LOCKING + const struct chunk *c; + const long *ptr, *end; + + for (c = p->chunk; c; c = c->prev) { + end = (const long *) (c->begin < c->end ? (long) c->begin & ~7: (long) c->end); + ptr = (const long *) c; +#ifdef VALGRIND_POOL + VALGRIND_MAKE_MEM_DEFINED(ptr, (end - ptr) * sizeof(*end)); +#endif + while (ptr < end) { + crc_hash += *ptr++; + crc_hash += (crc_hash << 10); + crc_hash ^= (crc_hash >> 6); + } + } +#endif /* DEBUG_ENFORCE_POOL_LOCKING */ + + return crc_hash; +} + +static int _pool_protect(struct dm_pool *p, int prot) +{ +#ifdef DEBUG_ENFORCE_POOL_LOCKING + struct chunk *c; + + for (c = p->chunk; c; c = c->prev) { + if (mprotect(c, (size_t) ((c->end - (char *) c) - 1), prot) != 0) { + log_sys_error("mprotect", ""); + return 0; + } + } +#endif + return 1; +} diff --git a/device_mapper/mm/pool.c b/device_mapper/mm/pool.c new file mode 100644 index 0000000..a710704 --- /dev/null +++ b/device_mapper/mm/pool.c @@ -0,0 +1,189 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" +#include <sys/mman.h> +#include <pthread.h> + +static DM_LIST_INIT(_dm_pools); +static pthread_mutex_t _dm_pools_mutex = PTHREAD_MUTEX_INITIALIZER; +void dm_pools_check_leaks(void); + +#ifdef DEBUG_ENFORCE_POOL_LOCKING +#ifdef DEBUG_POOL +#error Do not use DEBUG_POOL with DEBUG_ENFORCE_POOL_LOCKING +#endif + +/* + * Use mprotect system call to ensure all locked pages are not writable. + * Generates segmentation fault with write access to the locked pool. + * + * - Implementation is using posix_memalign() to get page aligned + * memory blocks (could be implemented also through malloc). + * - Only pool-fast is properly handled for now. + * - Checksum is slower compared to mprotect. + */ +static size_t _pagesize = 0; +static size_t _pagesize_mask = 0; +#define ALIGN_ON_PAGE(size) (((size) + (_pagesize_mask)) & ~(_pagesize_mask)) +#endif + +#ifdef DEBUG_POOL +#include "pool-debug.c" +#else +#include "pool-fast.c" +#endif + +char *dm_pool_strdup(struct dm_pool *p, const char *str) +{ + size_t len = strlen(str) + 1; + char *ret = dm_pool_alloc(p, len); + + if (ret) + memcpy(ret, str, len); + + return ret; +} + +char *dm_pool_strndup(struct dm_pool *p, const char *str, size_t n) +{ + char *ret = dm_pool_alloc(p, n + 1); + + if (ret) { + strncpy(ret, str, n); + ret[n] = '\0'; + } + + return ret; +} + +void *dm_pool_zalloc(struct dm_pool *p, size_t s) +{ + void *ptr = dm_pool_alloc(p, s); + + if (ptr) + memset(ptr, 0, s); + + return ptr; +} + +void dm_pools_check_leaks(void) +{ + struct dm_pool *p; + + pthread_mutex_lock(&_dm_pools_mutex); + if (dm_list_empty(&_dm_pools)) { + pthread_mutex_unlock(&_dm_pools_mutex); + return; + } + + log_error("You have a memory leak (not released memory pool):"); + dm_list_iterate_items(p, &_dm_pools) { +#ifdef DEBUG_POOL + log_error(" [%p] %s (%u bytes)", + p->orig_pool, + p->name, p->stats.bytes); +#else + log_error(" [%p] %s", p, p->name); +#endif + } + pthread_mutex_unlock(&_dm_pools_mutex); + log_error(INTERNAL_ERROR "Unreleased memory pool(s) found."); +} + +/** + * Status of locked pool. + * + * \param p + * Pool to be tested for lock status. + * + * \return + * 1 when the pool is locked, 0 otherwise. + */ +int dm_pool_locked(struct dm_pool *p) +{ + return p->locked; +} + +/** + * Lock memory pool. + * + * \param p + * Pool to be locked. + * + * \param crc + * Bool specifies whether to store the pool crc/hash checksum. + * + * \return + * 1 (success) when the pool was preperly locked, 0 otherwise. + */ +int dm_pool_lock(struct dm_pool *p, int crc) +{ + if (p->locked) { + log_error(INTERNAL_ERROR "Pool %s is already locked.", + p->name); + return 0; + } + + if (crc) + p->crc = _pool_crc(p); /* Get crc for pool */ + + if (!_pool_protect(p, PROT_READ)) { + _pool_protect(p, PROT_READ | PROT_WRITE); + return_0; + } + + p->locked = 1; + + log_debug_mem("Pool %s is locked.", p->name); + + return 1; +} + +/** + * Unlock memory pool. + * + * \param p + * Pool to be unlocked. + * + * \param crc + * Bool enables compare of the pool crc/hash with the stored value + * at pool lock. The pool is not properly unlocked if there is a mismatch. + * + * \return + * 1 (success) when the pool was properly unlocked, 0 otherwise. + */ +int dm_pool_unlock(struct dm_pool *p, int crc) +{ + if (!p->locked) { + log_error(INTERNAL_ERROR "Pool %s is already unlocked.", + p->name); + return 0; + } + + p->locked = 0; + + if (!_pool_protect(p, PROT_READ | PROT_WRITE)) + return_0; + + log_debug_mem("Pool %s is unlocked.", p->name); + + if (crc && (p->crc != _pool_crc(p))) { + log_error(INTERNAL_ERROR "Pool %s crc mismatch.", p->name); + return 0; + } + + return 1; +} diff --git a/device_mapper/regex/matcher.c b/device_mapper/regex/matcher.c new file mode 100644 index 0000000..375c1ab --- /dev/null +++ b/device_mapper/regex/matcher.c @@ -0,0 +1,575 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" +#include "parse_rx.h" +#include "ttree.h" +#include "assert.h" + +struct dfa_state { + struct dfa_state *next; + int final; + dm_bitset_t bits; + struct dfa_state *lookup[256]; +}; + +struct dm_regex { /* Instance variables for the lexer */ + struct dfa_state *start; + unsigned num_nodes; + unsigned num_charsets; + int nodes_entered; + struct rx_node **nodes; + int charsets_entered; + struct rx_node **charsets; + struct dm_pool *scratch, *mem; + + /* stuff for on the fly dfa calculation */ + dm_bitset_t charmap[256]; + dm_bitset_t dfa_copy; + struct ttree *tt; + dm_bitset_t bs; + struct dfa_state *h, *t; +}; + +static int _count_nodes(struct rx_node *rx) +{ + int r = 1; + + if (rx->left) + r += _count_nodes(rx->left); + + if (rx->right) + r += _count_nodes(rx->right); + + return r; +} + +static unsigned _count_charsets(struct rx_node *rx) +{ + if (rx->type == CHARSET) + return 1; + + return (rx->left ? _count_charsets(rx->left) : 0) + + (rx->right ? _count_charsets(rx->right) : 0); +} + +static void _enumerate_charsets_internal(struct rx_node *rx, unsigned *i) +{ + if (rx->type == CHARSET) + rx->charset_index = (*i)++; + else { + if (rx->left) + _enumerate_charsets_internal(rx->left, i); + if (rx->right) + _enumerate_charsets_internal(rx->right, i); + } +} + +static void _enumerate_charsets(struct rx_node *rx) +{ + unsigned i = 0; + _enumerate_charsets_internal(rx, &i); +} + +static void _fill_table(struct dm_regex *m, struct rx_node *rx) +{ + assert((rx->type != OR) || (rx->left && rx->right)); + + if (rx->left) + _fill_table(m, rx->left); + + if (rx->right) + _fill_table(m, rx->right); + + m->nodes[m->nodes_entered++] = rx; + if (rx->type == CHARSET) + m->charsets[m->charsets_entered++] = rx; +} + +static int _create_bitsets(struct dm_regex *m) +{ + unsigned i; + struct rx_node *n; + + for (i = 0; i < m->num_nodes; i++) { + n = m->nodes[i]; + if (!(n->firstpos = dm_bitset_create(m->scratch, m->num_charsets))) + return_0; + if (!(n->lastpos = dm_bitset_create(m->scratch, m->num_charsets))) + return_0; + if (!(n->followpos = dm_bitset_create(m->scratch, m->num_charsets))) + return_0; + } + + return 1; +} + +static void _calc_functions(struct dm_regex *m) +{ + unsigned i, j, final = 1; + struct rx_node *rx, *c1, *c2; + + for (i = 0; i < m->num_nodes; i++) { + rx = m->nodes[i]; + c1 = rx->left; + c2 = rx->right; + + if (rx->type == CHARSET && dm_bit(rx->charset, TARGET_TRANS)) + rx->final = final++; + + switch (rx->type) { + case CAT: + if (c1->nullable) + dm_bit_union(rx->firstpos, + c1->firstpos, c2->firstpos); + else + dm_bit_copy(rx->firstpos, c1->firstpos); + + if (c2->nullable) + dm_bit_union(rx->lastpos, + c1->lastpos, c2->lastpos); + else + dm_bit_copy(rx->lastpos, c2->lastpos); + + rx->nullable = c1->nullable && c2->nullable; + break; + + case PLUS: + dm_bit_copy(rx->firstpos, c1->firstpos); + dm_bit_copy(rx->lastpos, c1->lastpos); + rx->nullable = c1->nullable; + break; + + case OR: + dm_bit_union(rx->firstpos, c1->firstpos, c2->firstpos); + dm_bit_union(rx->lastpos, c1->lastpos, c2->lastpos); + rx->nullable = c1->nullable || c2->nullable; + break; + + case QUEST: + case STAR: + dm_bit_copy(rx->firstpos, c1->firstpos); + dm_bit_copy(rx->lastpos, c1->lastpos); + rx->nullable = 1; + break; + + case CHARSET: + dm_bit_set(rx->firstpos, rx->charset_index); + dm_bit_set(rx->lastpos, rx->charset_index); + rx->nullable = 0; + break; + + default: + log_error(INTERNAL_ERROR "Unknown calc node type"); + } + + /* + * followpos has it's own switch + * because PLUS and STAR do the + * same thing. + */ + switch (rx->type) { + case CAT: + for (j = 0; j < m->num_charsets; j++) { + struct rx_node *n = m->charsets[j]; + if (dm_bit(c1->lastpos, j)) + dm_bit_union(n->followpos, + n->followpos, c2->firstpos); + } + break; + + case PLUS: + case STAR: + for (j = 0; j < m->num_charsets; j++) { + struct rx_node *n = m->charsets[j]; + if (dm_bit(rx->lastpos, j)) + dm_bit_union(n->followpos, + n->followpos, rx->firstpos); + } + break; + } + } +} + +static struct dfa_state *_create_dfa_state(struct dm_pool *mem) +{ + return dm_pool_zalloc(mem, sizeof(struct dfa_state)); +} + +static struct dfa_state *_create_state_queue(struct dm_pool *mem, + struct dfa_state *dfa, + dm_bitset_t bits) +{ + if (!(dfa->bits = dm_bitset_create(mem, bits[0]))) /* first element is the size */ + return_NULL; + + dm_bit_copy(dfa->bits, bits); + dfa->next = 0; + dfa->final = -1; + + return dfa; +} + +static int _calc_state(struct dm_regex *m, struct dfa_state *dfa, int a) +{ + int set_bits = 0, i; + dm_bitset_t dfa_bits = dfa->bits; + dm_bit_and(m->dfa_copy, m->charmap[a], dfa_bits); + + /* iterate through all the states in firstpos */ + for (i = dm_bit_get_first(m->dfa_copy); i >= 0; i = dm_bit_get_next(m->dfa_copy, i)) { + if (a == TARGET_TRANS) + dfa->final = m->charsets[i]->final; + + dm_bit_union(m->bs, m->bs, m->charsets[i]->followpos); + set_bits = 1; + } + + if (set_bits) { + struct dfa_state *tmp; + struct dfa_state *ldfa = ttree_lookup(m->tt, m->bs + 1); + if (!ldfa) { + /* push */ + if (!(ldfa = _create_dfa_state(m->mem))) + return_0; + + ttree_insert(m->tt, m->bs + 1, ldfa); + if (!(tmp = _create_state_queue(m->scratch, ldfa, m->bs))) + return_0; + if (!m->h) + m->h = m->t = tmp; + else { + m->t->next = tmp; + m->t = tmp; + } + } + + dfa->lookup[a] = ldfa; + dm_bit_clear_all(m->bs); + } + + return 1; +} + +static int _calc_states(struct dm_regex *m, struct rx_node *rx) +{ + unsigned iwidth = (m->num_charsets / DM_BITS_PER_INT) + 1; + struct dfa_state *dfa; + struct rx_node *n; + unsigned i; + int a; + + if (!(m->tt = ttree_create(m->scratch, iwidth))) + return_0; + + if (!(m->bs = dm_bitset_create(m->scratch, m->num_charsets))) + return_0; + + /* build some char maps */ + for (a = 0; a < 256; a++) + if (!(m->charmap[a] = dm_bitset_create(m->scratch, m->num_charsets))) + return_0; + + for (i = 0; i < m->num_nodes; i++) { + n = m->nodes[i]; + if (n->type == CHARSET) { + for (a = dm_bit_get_first(n->charset); + a >= 0; a = dm_bit_get_next(n->charset, a)) + dm_bit_set(m->charmap[a], n->charset_index); + } + } + + /* create first state */ + if (!(dfa = _create_dfa_state(m->mem))) + return_0; + + m->start = dfa; + ttree_insert(m->tt, rx->firstpos + 1, dfa); + + /* prime the queue */ + if (!(m->h = m->t = _create_state_queue(m->scratch, dfa, rx->firstpos))) + return_0; + + if (!(m->dfa_copy = dm_bitset_create(m->scratch, m->num_charsets))) + return_0; + + return 1; +} + +/* + * Forces all the dfa states to be calculated up front, ie. what + * _calc_states() used to do before we switched to calculating on demand. + */ +static int _force_states(struct dm_regex *m) +{ + int a; + + /* keep processing until there's nothing in the queue */ + struct dfa_state *s; + while ((s = m->h)) { + /* pop state off front of the queue */ + m->h = m->h->next; + + /* iterate through all the inputs for this state */ + dm_bit_clear_all(m->bs); + for (a = 0; a < 256; a++) + if (!_calc_state(m, s, a)) + return_0; + } + + return 1; +} + +struct dm_regex *dm_regex_create(struct dm_pool *mem, const char * const *patterns, + unsigned num_patterns) +{ + char *all, *ptr; + unsigned i; + size_t len = 0; + struct rx_node *rx; + struct dm_regex *m; + struct dm_pool *scratch = mem; + + if (!(m = dm_pool_zalloc(mem, sizeof(*m)))) + return_NULL; + + /* join the regexps together, delimiting with zero */ + for (i = 0; i < num_patterns; i++) + len += strlen(patterns[i]) + 8; + + ptr = all = dm_pool_alloc(scratch, len + 1); + + if (!all) + goto_bad; + + for (i = 0; i < num_patterns; i++) { + ptr += sprintf(ptr, "(.*(%s)%c)", patterns[i], TARGET_TRANS); + if (i < (num_patterns - 1)) + *ptr++ = '|'; + } + + /* parse this expression */ + if (!(rx = rx_parse_tok(scratch, all, ptr))) { + log_error("Couldn't parse regex"); + goto bad; + } + + m->mem = mem; + m->scratch = scratch; + m->num_nodes = _count_nodes(rx); + m->num_charsets = _count_charsets(rx); + _enumerate_charsets(rx); + if (!(m->nodes = dm_pool_alloc(scratch, sizeof(*m->nodes) * m->num_nodes))) + goto_bad; + + if (!(m->charsets = dm_pool_alloc(scratch, sizeof(*m->charsets) * m->num_charsets))) + goto_bad; + + _fill_table(m, rx); + + if (!_create_bitsets(m)) + goto_bad; + + _calc_functions(m); + + if (!_calc_states(m, rx)) + goto_bad; + + return m; + + bad: + dm_pool_free(mem, m); + + return NULL; +} + +static struct dfa_state *_step_matcher(struct dm_regex *m, int c, struct dfa_state *cs, int *r) +{ + struct dfa_state *ns; + + if (!(ns = cs->lookup[(unsigned char) c])) { + if (!_calc_state(m, cs, (unsigned char) c)) + return_NULL; + + if (!(ns = cs->lookup[(unsigned char) c])) + return NULL; + } + + // yuck, we have to special case the target trans + if ((ns->final == -1) && + !_calc_state(m, ns, TARGET_TRANS)) + return_NULL; + + if (ns->final && (ns->final > *r)) + *r = ns->final; + + return ns; +} + +int dm_regex_match(struct dm_regex *regex, const char *s) +{ + struct dfa_state *cs = regex->start; + int r = 0; + + dm_bit_clear_all(regex->bs); + if (!(cs = _step_matcher(regex, HAT_CHAR, cs, &r))) + goto out; + + for (; *s; s++) + if (!(cs = _step_matcher(regex, *s, cs, &r))) + goto out; + + _step_matcher(regex, DOLLAR_CHAR, cs, &r); + + out: + /* subtract 1 to get back to zero index */ + return r - 1; +} + +/* + * The next block of code concerns calculating a fingerprint for the dfa. + * + * We're not calculating a minimal dfa in _calculate_state (maybe a future + * improvement). As such it's possible that two non-isomorphic dfas + * recognise the same language. This can only really happen if you start + * with equivalent, but different regexes (for example the simplifier in + * parse_rx.c may have changed). + * + * The code is inefficient; repeatedly searching a singly linked list for + * previously seen nodes. Not worried since this is test code. + */ +struct node_list { + unsigned node_id; + struct dfa_state *node; + struct node_list *next; +}; + +struct printer { + struct dm_pool *mem; + struct node_list *pending; + struct node_list *processed; + unsigned next_index; +}; + +static uint32_t _randomise(uint32_t n) +{ + /* 2^32 - 5 */ + uint32_t const prime = (~0) - 4; + return n * prime; +} + +static int _seen(struct node_list *n, struct dfa_state *node, uint32_t *i) +{ + while (n) { + if (n->node == node) { + *i = n->node_id; + return 1; + } + n = n->next; + } + + return 0; +} + +/* + * Push node if it's not been seen before, returning a unique index. + */ +static uint32_t _push_node(struct printer *p, struct dfa_state *node) +{ + uint32_t i; + struct node_list *n; + + if (_seen(p->pending, node, &i) || + _seen(p->processed, node, &i)) + return i; + + if (!(n = dm_pool_alloc(p->mem, sizeof(*n)))) + return_0; + + n->node_id = ++p->next_index; /* start from 1, keep 0 as error code */ + n->node = node; + n->next = p->pending; + p->pending = n; + + return n->node_id; +} + +/* + * Pop the front node, and fill out it's previously assigned index. + */ +static struct dfa_state *_pop_node(struct printer *p) +{ + struct dfa_state *node = NULL; + struct node_list *n; + + if (p->pending) { + n = p->pending; + p->pending = n->next; + n->next = p->processed; + p->processed = n; + + node = n->node; + } + + return node; +} + +static uint32_t _combine(uint32_t n1, uint32_t n2) +{ + return ((n1 << 8) | (n1 >> 24)) ^ _randomise(n2); +} + +static uint32_t _fingerprint(struct printer *p) +{ + int c; + uint32_t result = 0; + struct dfa_state *node; + + while ((node = _pop_node(p))) { + result = _combine(result, (node->final < 0) ? 0 : node->final); + for (c = 0; c < 256; c++) + result = _combine(result, + _push_node(p, node->lookup[c])); + } + + return result; +} + +uint32_t dm_regex_fingerprint(struct dm_regex *regex) +{ + struct printer p; + uint32_t result = 0; + struct dm_pool *mem = dm_pool_create("regex fingerprint", 1024); + + if (!mem) + return_0; + + if (!_force_states(regex)) + goto_out; + + p.mem = mem; + p.pending = NULL; + p.processed = NULL; + p.next_index = 0; + + if (!_push_node(&p, regex->start)) + goto_out; + + result = _fingerprint(&p); +out: + dm_pool_destroy(mem); + + return result; +} diff --git a/device_mapper/regex/parse_rx.c b/device_mapper/regex/parse_rx.c new file mode 100644 index 0000000..cc83bfe --- /dev/null +++ b/device_mapper/regex/parse_rx.c @@ -0,0 +1,667 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" +#include "parse_rx.h" + +#ifdef DEBUG +#include <ctype.h> + +__attribute__ ((__unused__)) +static void _regex_print(struct rx_node *rx, int depth, unsigned show_nodes) +{ + int i, numchars; + + if (rx->left) { + if (rx->left->type != CHARSET && (show_nodes || (!((rx->type == CAT || rx->type == OR) && rx->left->type == CAT)))) + printf("("); + + _regex_print(rx->left, depth + 1, show_nodes); + + if (rx->left->type != CHARSET && (show_nodes || (!((rx->type == CAT || rx->type == OR) && rx->left->type == CAT)))) + printf(")"); + } + + /* display info about the node */ + switch (rx->type) { + case CAT: + break; + + case OR: + printf("|"); + break; + + case STAR: + printf("*"); + break; + + case PLUS: + printf("+"); + break; + + case QUEST: + printf("?"); + break; + + case CHARSET: + numchars = 0; + for (i = 0; i < 256; i++) + if (dm_bit(rx->charset, i) && (isprint(i) || i == HAT_CHAR || i == DOLLAR_CHAR)) + numchars++; + if (numchars == 97) { + printf("."); + break; + } + if (numchars > 1) + printf("["); + for (i = 0; i < 256; i++) + if (dm_bit(rx->charset, i)) { + if (isprint(i)) + printf("%c", (char) i); + else if (i == HAT_CHAR) + printf("^"); + else if (i == DOLLAR_CHAR) + printf("$"); + } + if (numchars > 1) + printf("]"); + break; + + default: + fprintf(stderr, "Unknown type"); + } + + if (rx->right) { + if (rx->right->type != CHARSET && (show_nodes || (!(rx->type == CAT && rx->right->type == CAT) && rx->right->right))) + printf("("); + _regex_print(rx->right, depth + 1, show_nodes); + if (rx->right->type != CHARSET && (show_nodes || (!(rx->type == CAT && rx->right->type == CAT) && rx->right->right))) + printf(")"); + } + + if (!depth) + printf("\n"); +} +#endif /* DEBUG */ + +struct parse_sp { /* scratch pad for the parsing process */ + struct dm_pool *mem; + int type; /* token type, 0 indicates a charset */ + dm_bitset_t charset; /* The current charset */ + const char *cursor; /* where we are in the regex */ + const char *rx_end; /* 1pte for the expression being parsed */ +}; + +static struct rx_node *_or_term(struct parse_sp *ps); + +static void _single_char(struct parse_sp *ps, unsigned int c, const char *ptr) +{ + ps->type = 0; + ps->cursor = ptr + 1; + dm_bit_clear_all(ps->charset); + dm_bit_set(ps->charset, c); +} + +/* + * Get the next token from the regular expression. + * Returns: 1 success, 0 end of input, -1 error. + */ +static int _rx_get_token(struct parse_sp *ps) +{ + int neg = 0, range = 0; + char c, lc = 0; + const char *ptr = ps->cursor; + if (ptr == ps->rx_end) { /* end of input ? */ + ps->type = -1; + return 0; + } + + switch (*ptr) { + /* charsets and ncharsets */ + case '[': + ptr++; + if (*ptr == '^') { + dm_bit_set_all(ps->charset); + + /* never transition on zero */ + dm_bit_clear(ps->charset, 0); + neg = 1; + ptr++; + + } else + dm_bit_clear_all(ps->charset); + + while ((ptr < ps->rx_end) && (*ptr != ']')) { + if (*ptr == '\\') { + /* an escaped character */ + ptr++; + switch (*ptr) { + case 'n': + c = '\n'; + break; + case 'r': + c = '\r'; + break; + case 't': + c = '\t'; + break; + default: + c = *ptr; + } + } else if (*ptr == '-' && lc) { + /* we've got a range on our hands */ + range = 1; + ptr++; + if (ptr == ps->rx_end) { + log_error("Incomplete range" + "specification"); + return -1; + } + c = *ptr; + } else + c = *ptr; + + if (range) { + /* add lc - c into the bitset */ + if (lc > c) { + char tmp = c; + c = lc; + lc = tmp; + } + + for (; lc <= c; lc++) { + if (neg) + dm_bit_clear(ps->charset, lc); + else + dm_bit_set(ps->charset, lc); + } + range = 0; + } else { + /* add c into the bitset */ + if (neg) + dm_bit_clear(ps->charset, c); + else + dm_bit_set(ps->charset, c); + } + ptr++; + lc = c; + } + + if (ptr >= ps->rx_end) { + ps->type = -1; + return -1; + } + + ps->type = 0; + ps->cursor = ptr + 1; + break; + + /* These characters are special, we just return their ASCII + codes as the type. Sorted into ascending order to help the + compiler */ + case '(': + case ')': + case '*': + case '+': + case '?': + case '|': + ps->type = (int) *ptr; + ps->cursor = ptr + 1; + break; + + case '^': + _single_char(ps, HAT_CHAR, ptr); + break; + + case '$': + _single_char(ps, DOLLAR_CHAR, ptr); + break; + + case '.': + /* The 'all but newline' character set */ + ps->type = 0; + ps->cursor = ptr + 1; + dm_bit_set_all(ps->charset); + dm_bit_clear(ps->charset, (int) '\n'); + dm_bit_clear(ps->charset, (int) '\r'); + dm_bit_clear(ps->charset, 0); + break; + + case '\\': + /* escaped character */ + ptr++; + if (ptr >= ps->rx_end) { + log_error("Badly quoted character at end " + "of expression"); + ps->type = -1; + return -1; + } + + ps->type = 0; + ps->cursor = ptr + 1; + dm_bit_clear_all(ps->charset); + switch (*ptr) { + case 'n': + dm_bit_set(ps->charset, (int) '\n'); + break; + case 'r': + dm_bit_set(ps->charset, (int) '\r'); + break; + case 't': + dm_bit_set(ps->charset, (int) '\t'); + break; + default: + dm_bit_set(ps->charset, (int) *ptr); + } + break; + + default: + /* add a single character to the bitset */ + ps->type = 0; + ps->cursor = ptr + 1; + dm_bit_clear_all(ps->charset); + dm_bit_set(ps->charset, (int) (unsigned char) *ptr); + break; + } + + return 1; +} + +static struct rx_node *_node(struct dm_pool *mem, int type, + struct rx_node *l, struct rx_node *r) +{ + struct rx_node *n = dm_pool_zalloc(mem, sizeof(*n)); + + if (n) { + if (type == CHARSET && !(n->charset = dm_bitset_create(mem, 256))) { + dm_pool_free(mem, n); + return NULL; + } + + n->type = type; + n->left = l; + n->right = r; + } + + return n; +} + +static struct rx_node *_term(struct parse_sp *ps) +{ + struct rx_node *n; + + switch (ps->type) { + case 0: + if (!(n = _node(ps->mem, CHARSET, NULL, NULL))) + return_NULL; + + dm_bit_copy(n->charset, ps->charset); + _rx_get_token(ps); /* match charset */ + break; + + case '(': + _rx_get_token(ps); /* match '(' */ + n = _or_term(ps); + if (ps->type != ')') { + log_error("missing ')' in regular expression"); + return 0; + } + _rx_get_token(ps); /* match ')' */ + break; + + default: + n = 0; + } + + return n; +} + +static struct rx_node *_closure_term(struct parse_sp *ps) +{ + struct rx_node *l, *n; + + if (!(l = _term(ps))) + return NULL; + + for (;;) { + switch (ps->type) { + case '*': + n = _node(ps->mem, STAR, l, NULL); + break; + + case '+': + n = _node(ps->mem, PLUS, l, NULL); + break; + + case '?': + n = _node(ps->mem, QUEST, l, NULL); + break; + + default: + return l; + } + + if (!n) + return_NULL; + + _rx_get_token(ps); + l = n; + } + + return n; +} + +static struct rx_node *_cat_term(struct parse_sp *ps) +{ + struct rx_node *l, *r, *n; + + if (!(l = _closure_term(ps))) + return NULL; + + if (ps->type == '|') + return l; + + if (!(r = _cat_term(ps))) + return l; + + if (!(n = _node(ps->mem, CAT, l, r))) + stack; + + return n; +} + +static struct rx_node *_or_term(struct parse_sp *ps) +{ + struct rx_node *l, *r, *n; + + if (!(l = _cat_term(ps))) + return NULL; + + if (ps->type != '|') + return l; + + _rx_get_token(ps); /* match '|' */ + + if (!(r = _or_term(ps))) { + log_error("Badly formed 'or' expression"); + return NULL; + } + + if (!(n = _node(ps->mem, OR, l, r))) + stack; + + return n; +} + +/*----------------------------------------------------------------*/ + +/* Macros for left and right nodes. Inverted if 'leftmost' is set. */ +#define LEFT(a) (leftmost ? (a)->left : (a)->right) +#define RIGHT(a) (leftmost ? (a)->right : (a)->left) + +/* + * The optimiser spots common prefixes on either side of an 'or' node, and + * lifts them outside the 'or' with a 'cat'. + */ +static unsigned _depth(struct rx_node *r, unsigned leftmost) +{ + int count = 1; + + while (r->type != CHARSET && LEFT(r) && (leftmost || r->type != OR)) { + count++; + r = LEFT(r); + } + + return count; +} + +/* + * FIXME: a unique key could be built up as part of the parse, to make the + * comparison quick. Alternatively we could use cons-hashing, and then + * this would simply be a pointer comparison. + */ +static int _nodes_equal(struct rx_node *l, struct rx_node *r) +{ + if (l->type != r->type) + return 0; + + switch (l->type) { + case CAT: + case OR: + return _nodes_equal(l->left, r->left) && + _nodes_equal(l->right, r->right); + + case STAR: + case PLUS: + case QUEST: + return _nodes_equal(l->left, r->left); + + case CHARSET: + /* + * Never change anything containing TARGET_TRANS + * used by matcher as boundary marker between concatenated + * expressions. + */ + return (!dm_bit(l->charset, TARGET_TRANS) && dm_bitset_equal(l->charset, r->charset)); + } + + /* NOTREACHED */ + return_0; +} + +static int _find_leftmost_common(struct rx_node *or, + struct rx_node **l, + struct rx_node **r, + unsigned leftmost) +{ + struct rx_node *left = or->left, *right = or->right; + unsigned left_depth = _depth(left, leftmost); + unsigned right_depth = _depth(right, leftmost); + + while (left_depth > right_depth && left->type != OR) { + left = LEFT(left); + left_depth--; + } + + while (right_depth > left_depth && right->type != OR) { + right = LEFT(right); + right_depth--; + } + + if (left_depth != right_depth) + return 0; + + while (left_depth) { + if (left->type == CAT && right->type == CAT) { + if (_nodes_equal(LEFT(left), LEFT(right))) { + *l = left; + *r = right; + return 1; + } + } + if (left->type == OR || right->type == OR) + break; + left = LEFT(left); + right = LEFT(right); + left_depth--; + } + + return 0; +} + +/* If top node is OR, rotate (leftmost example) from ((ab)|((ac)|d)) to (((ab)|(ac))|d) */ +static int _rotate_ors(struct rx_node *r, unsigned leftmost) +{ + struct rx_node *old_node; + + if (r->type != OR || RIGHT(r)->type != OR) + return 0; + + old_node = RIGHT(r); + + if (leftmost) { + r->right = RIGHT(old_node); + old_node->right = LEFT(old_node); + old_node->left = LEFT(r); + r->left = old_node; + } else { + r->left = RIGHT(old_node); + old_node->left = LEFT(old_node); + old_node->right = LEFT(r); + r->right = old_node; + } + + return 1; +} + +static struct rx_node *_exchange_nodes(struct dm_pool *mem, struct rx_node *r, + struct rx_node *left_cat, struct rx_node *right_cat, + unsigned leftmost) +{ + struct rx_node *new_r; + + if (leftmost) + new_r = _node(mem, CAT, LEFT(left_cat), r); + else + new_r = _node(mem, CAT, r, LEFT(right_cat)); + + if (!new_r) + return_NULL; + + memcpy(left_cat, RIGHT(left_cat), sizeof(*left_cat)); + memcpy(right_cat, RIGHT(right_cat), sizeof(*right_cat)); + + return new_r; +} + +static struct rx_node *_pass(struct dm_pool *mem, + struct rx_node *r, + int *changed) +{ + struct rx_node *left, *right; + + /* + * walk the tree, optimising every 'or' node. + */ + switch (r->type) { + case CAT: + if (!(r->left = _pass(mem, r->left, changed))) + return_NULL; + + if (!(r->right = _pass(mem, r->right, changed))) + return_NULL; + + break; + + case STAR: + case PLUS: + case QUEST: + if (!(r->left = _pass(mem, r->left, changed))) + return_NULL; + + break; + case OR: + /* It's important we optimise sub nodes first */ + if (!(r->left = _pass(mem, r->left, changed))) + return_NULL; + + if (!(r->right = _pass(mem, r->right, changed))) + return_NULL; + /* + * If rotate_ors changes the tree, left and right are stale, + * so just set 'changed' to repeat the search. + * + * FIXME Check we can't 'bounce' between left and right rotations here. + */ + if (_find_leftmost_common(r, &left, &right, 1)) { + if (!_rotate_ors(r, 1)) + r = _exchange_nodes(mem, r, left, right, 1); + *changed = 1; + } else if (_find_leftmost_common(r, &left, &right, 0)) { + if (!_rotate_ors(r, 0)) + r = _exchange_nodes(mem, r, left, right, 0); + *changed = 1; + } + break; + + case CHARSET: + break; + } + + return r; +} + +static struct rx_node *_optimise(struct dm_pool *mem, struct rx_node *r) +{ + /* + * We're looking for (or (... (cat <foo> a)) (... (cat <foo> b))) + * and want to turn it into (cat <foo> (or (... a) (... b))) + * + * (fa)|(fb) becomes f(a|b) + */ + + /* + * Initially done as an inefficient multipass algorithm. + */ + int changed; + + do { + changed = 0; + r = _pass(mem, r, &changed); + } while (r && changed); + + return r; +} + +/*----------------------------------------------------------------*/ + +struct rx_node *rx_parse_tok(struct dm_pool *mem, + const char *begin, const char *end) +{ + struct rx_node *r; + struct parse_sp *ps = dm_pool_zalloc(mem, sizeof(*ps)); + + if (!ps) + return_NULL; + + ps->mem = mem; + if (!(ps->charset = dm_bitset_create(mem, 256))) { + log_error("Regex charset allocation failed"); + dm_pool_free(mem, ps); + return NULL; + } + ps->cursor = begin; + ps->rx_end = end; + _rx_get_token(ps); /* load the first token */ + + if (!(r = _or_term(ps))) { + log_error("Parse error in regex"); + dm_pool_free(mem, ps); + return NULL; + } + + if (!(r = _optimise(mem, r))) { + log_error("Regex optimisation error"); + dm_pool_free(mem, ps); + return NULL; + } + + return r; +} + +struct rx_node *rx_parse_str(struct dm_pool *mem, const char *str) +{ + return rx_parse_tok(mem, str, str + strlen(str)); +} diff --git a/device_mapper/regex/parse_rx.h b/device_mapper/regex/parse_rx.h new file mode 100644 index 0000000..0897060 --- /dev/null +++ b/device_mapper/regex/parse_rx.h @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _DM_PARSE_REGEX_H +#define _DM_PARSE_REGEX_H + +enum { + CAT, + STAR, + PLUS, + OR, + QUEST, + CHARSET +}; + +/* + * We're never going to be running the regex on non-printable + * chars, so we can use a couple of these chars to represent the + * start and end of a string. + */ +#define HAT_CHAR 0x2 +#define DOLLAR_CHAR 0x3 + +#define TARGET_TRANS '\0' + +struct rx_node { + int type; + dm_bitset_t charset; + struct rx_node *left, *right; + + /* used to build the dfa for the toker */ + unsigned charset_index; + int nullable, final; + dm_bitset_t firstpos; + dm_bitset_t lastpos; + dm_bitset_t followpos; +}; + +struct rx_node *rx_parse_str(struct dm_pool *mem, const char *str); +struct rx_node *rx_parse_tok(struct dm_pool *mem, + const char *begin, const char *end); + +#endif diff --git a/device_mapper/regex/ttree.c b/device_mapper/regex/ttree.c new file mode 100644 index 0000000..62c5bf7 --- /dev/null +++ b/device_mapper/regex/ttree.c @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "misc/dmlib.h" +#include "ttree.h" + +struct node { + unsigned k; + struct node *l, *m, *r; + void *data; +}; + +struct ttree { + int klen; + struct dm_pool *mem; + struct node *root; +}; + +__attribute__((nonnull(1))) +static struct node **_lookup_single(struct node **c, unsigned int k) +{ + while (*c) { + if (k < (*c)->k) + c = &((*c)->l); + + else if (k > (*c)->k) + c = &((*c)->r); + + else { + c = &((*c)->m); + break; + } + } + + return c; +} + +void *ttree_lookup(struct ttree *tt, unsigned *key) +{ + struct node **c = &tt->root; + int count = tt->klen; + + while (*c && count) { + c = _lookup_single(c, *key++); + count--; + } + + return *c ? (*c)->data : NULL; +} + +static struct node *_tree_node(struct dm_pool *mem, unsigned int k) +{ + struct node *n = dm_pool_zalloc(mem, sizeof(*n)); + + if (n) + n->k = k; + + return n; +} + +int ttree_insert(struct ttree *tt, unsigned int *key, void *data) +{ + struct node **c = &tt->root; + int count = tt->klen; + unsigned int k; + + do { + k = *key++; + c = _lookup_single(c, k); + count--; + + } while (*c && count); + + if (!*c) { + count++; + + while (count--) { + if (!(*c = _tree_node(tt->mem, k))) + return_0; + + if (count) { + k = *key++; + c = &((*c)->m); + } + } + } + (*c)->data = data; + + return 1; +} + +struct ttree *ttree_create(struct dm_pool *mem, unsigned int klen) +{ + struct ttree *tt; + + if (!(tt = dm_pool_zalloc(mem, sizeof(*tt)))) + return_NULL; + + tt->klen = klen; + tt->mem = mem; + return tt; +} diff --git a/device_mapper/regex/ttree.h b/device_mapper/regex/ttree.h new file mode 100644 index 0000000..8b62181 --- /dev/null +++ b/device_mapper/regex/ttree.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _DM_TTREE_H +#define _DM_TTREE_H + +struct ttree; + +struct ttree *ttree_create(struct dm_pool *mem, unsigned int klen); + +void *ttree_lookup(struct ttree *tt, unsigned *key); +int ttree_insert(struct ttree *tt, unsigned *key, void *data); + +#endif diff --git a/device_mapper/vdo/status.c b/device_mapper/vdo/status.c new file mode 100644 index 0000000..4bd15e4 --- /dev/null +++ b/device_mapper/vdo/status.c @@ -0,0 +1,248 @@ +#include "target.h" + +// For DM_ARRAY_SIZE! +#include "device_mapper/libdevmapper.h" + +#include <ctype.h> +#include <stdlib.h> +#include <string.h> + +//---------------------------------------------------------------- + +static char *_tok_cpy(const char *b, const char *e) +{ + char *new = malloc((e - b) + 1); + char *ptr = new; + + if (new) { + while (b != e) + *ptr++ = *b++; + *ptr = '\0'; + } + + return new; +} + +static bool _tok_eq(const char *b, const char *e, const char *str) +{ + while (b != e) { + if (!*str || *b != *str) + return false; + + b++; + str++; + } + + return !*str; +} + +static bool _parse_operating_mode(const char *b, const char *e, void *context) +{ + static struct { + const char *str; + enum vdo_operating_mode mode; + } _table[] = { + {"recovering", VDO_MODE_RECOVERING}, + {"read-only", VDO_MODE_READ_ONLY}, + {"normal", VDO_MODE_NORMAL} + }; + + enum vdo_operating_mode *r = context; + unsigned i; + for (i = 0; i < DM_ARRAY_SIZE(_table); i++) { + if (_tok_eq(b, e, _table[i].str)) { + *r = _table[i].mode; + return true; + } + } + + return false; +} + +static bool _parse_compression_state(const char *b, const char *e, void *context) +{ + static struct { + const char *str; + enum vdo_compression_state state; + } _table[] = { + {"online", VDO_COMPRESSION_ONLINE}, + {"offline", VDO_COMPRESSION_OFFLINE} + }; + + enum vdo_compression_state *r = context; + unsigned i; + for (i = 0; i < DM_ARRAY_SIZE(_table); i++) { + if (_tok_eq(b, e, _table[i].str)) { + *r = _table[i].state; + return true; + } + } + + return false; +} + +static bool _parse_recovering(const char *b, const char *e, void *context) +{ + bool *r = context; + + if (_tok_eq(b, e, "recovering")) + *r = true; + + else if (_tok_eq(b, e, "-")) + *r = false; + + else + return false; + + return true; +} + +static bool _parse_index_state(const char *b, const char *e, void *context) +{ + static struct { + const char *str; + enum vdo_index_state state; + } _table[] = { + {"error", VDO_INDEX_ERROR}, + {"closed", VDO_INDEX_CLOSED}, + {"opening", VDO_INDEX_OPENING}, + {"closing", VDO_INDEX_CLOSING}, + {"offline", VDO_INDEX_OFFLINE}, + {"online", VDO_INDEX_ONLINE}, + {"unknown", VDO_INDEX_UNKNOWN} + }; + + enum vdo_index_state *r = context; + unsigned i; + for (i = 0; i < DM_ARRAY_SIZE(_table); i++) { + if (_tok_eq(b, e, _table[i].str)) { + *r = _table[i].state; + return true; + } + } + + return false; +} + +static bool _parse_uint64(const char *b, const char *e, void *context) +{ + uint64_t *r = context, n; + + n = 0; + while (b != e) { + if (!isdigit(*b)) + return false; + + n = (n * 10) + (*b - '0'); + b++; + } + + *r = n; + return true; +} + +static const char *_eat_space(const char *b, const char *e) +{ + while (b != e && isspace(*b)) + b++; + + return b; +} + +static const char *_next_tok(const char *b, const char *e) +{ + const char *te = b; + while (te != e && !isspace(*te)) + te++; + + return te == b ? NULL : te; +} + +static void _set_error(struct vdo_status_parse_result *result, const char *fmt, ...) + __attribute__ ((format(printf, 2, 3))); + +static void _set_error(struct vdo_status_parse_result *result, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vsnprintf(result->error, sizeof(result->error), fmt, ap); + va_end(ap); +} + +static bool _parse_field(const char **b, const char *e, + bool (*p_fn)(const char *, const char *, void *), + void *field, const char *field_name, + struct vdo_status_parse_result *result) +{ + const char *te; + + te = _next_tok(*b, e); + if (!te) { + _set_error(result, "couldn't get token for '%s'", field_name); + return false; + } + + if (!p_fn(*b, te, field)) { + _set_error(result, "couldn't parse '%s'", field_name); + return false; + } + + *b = _eat_space(te, e); + return true; + +} + +bool vdo_status_parse(const char *input, struct vdo_status_parse_result *result) +{ + const char *b = b = input; + const char *e = input + strlen(input); + const char *te; + struct vdo_status *s = malloc(sizeof(*s)); + + if (!s) { + _set_error(result, "out of memory"); + return false; + } + + b = _eat_space(b, e); + te = _next_tok(b, e); + if (!te) { + _set_error(result, "couldn't get token for device"); + free(s); + return false; + } + + s->device = _tok_cpy(b, te); + if (!s->device) { + _set_error(result, "out of memory"); + free(s); + return false; + } + + b = _eat_space(te, e); + +#define XX(p, f, fn) if (!_parse_field(&b, e, p, f, fn, result)) goto bad; + XX(_parse_operating_mode, &s->operating_mode, "operating mode"); + XX(_parse_recovering, &s->recovering, "recovering"); + XX(_parse_index_state, &s->index_state, "index state"); + XX(_parse_compression_state, &s->compression_state, "compression state"); + XX(_parse_uint64, &s->used_blocks, "used blocks"); + XX(_parse_uint64, &s->total_blocks, "total blocks"); +#undef XX + + if (b != e) { + _set_error(result, "too many tokens"); + goto bad; + } + + result->status = s; + return true; + +bad: + free(s->device); + free(s); + return false; +} + +//---------------------------------------------------------------- diff --git a/device_mapper/vdo/target.h b/device_mapper/vdo/target.h new file mode 100644 index 0000000..3137e2c --- /dev/null +++ b/device_mapper/vdo/target.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2018 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef DEVICE_MAPPER_VDO_TARGET_H +#define DEVICE_MAPPER_VDO_TARGET_H + +#include <stdbool.h> +#include <stdint.h> + +//---------------------------------------------------------------- + +enum vdo_operating_mode { + VDO_MODE_RECOVERING, + VDO_MODE_READ_ONLY, + VDO_MODE_NORMAL +}; + +enum vdo_compression_state { + VDO_COMPRESSION_ONLINE, + VDO_COMPRESSION_OFFLINE +}; + +enum vdo_index_state { + VDO_INDEX_ERROR, + VDO_INDEX_CLOSED, + VDO_INDEX_OPENING, + VDO_INDEX_CLOSING, + VDO_INDEX_OFFLINE, + VDO_INDEX_ONLINE, + VDO_INDEX_UNKNOWN +}; + +struct vdo_status { + char *device; + enum vdo_operating_mode operating_mode; + bool recovering; + enum vdo_index_state index_state; + enum vdo_compression_state compression_state; + uint64_t used_blocks; + uint64_t total_blocks; +}; + +void vdo_status_destroy(struct vdo_status *s); + +#define VDO_MAX_ERROR 256 + +struct vdo_status_parse_result { + char error[VDO_MAX_ERROR]; + struct vdo_status *status; +}; + +// Parses the status line from the kernel target. +bool vdo_status_parse(const char *input, struct vdo_status_parse_result *result); + +//---------------------------------------------------------------- + +#endif diff --git a/lib/config/config.h b/lib/config/config.h index b797c78..146aae1 100644 --- a/lib/config/config.h +++ b/lib/config/config.h @@ -16,7 +16,7 @@ #ifndef _LVM_CONFIG_H #define _LVM_CONFIG_H -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include "lib/device/device.h" /* 16 bits: 3 bits for major, 4 bits for minor, 9 bits for patchlevel */ diff --git a/lib/device/bcache.c b/lib/device/bcache.c index aa6bb7a..d213758 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -15,7 +15,7 @@ #define _GNU_SOURCE #include "lib/device/bcache.h" -#include "libdm/misc/dm-logging.h" +#include "device_mapper/misc/dm-logging.h" #include "lib/log/log.h" #include <errno.h> diff --git a/lib/device/bcache.h b/lib/device/bcache.h index cf3d668..8f328c7 100644 --- a/lib/device/bcache.h +++ b/lib/device/bcache.h @@ -15,7 +15,7 @@ #ifndef BCACHE_H #define BCACHE_H -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include <linux/fs.h> #include <stdint.h> diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index f3c2326..38026a3 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -17,7 +17,7 @@ #include "lib/datastruct/btree.h" #include "lib/config/config.h" #include "lib/commands/toolcontext.h" -#include "libdm/misc/dm-ioctl.h" +#include "device_mapper/misc/dm-ioctl.h" #include "lib/misc/lvm-string.h" #ifdef UDEV_SYNC_SUPPORT diff --git a/lib/metadata/pv.h b/lib/metadata/pv.h index 23d2bd7..d5d91ce 100644 --- a/lib/metadata/pv.h +++ b/lib/metadata/pv.h @@ -16,7 +16,7 @@ #define _LVM_PV_H #include "lib/uuid/uuid.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" struct device; struct format_type; diff --git a/lib/metadata/vg.h b/lib/metadata/vg.h index b37c01d..3d24bba 100644 --- a/lib/metadata/vg.h +++ b/lib/metadata/vg.h @@ -16,7 +16,7 @@ #define _LVM_VG_H #include "lib/uuid/uuid.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" struct cmd_context; struct format_instance; diff --git a/lib/misc/lib.h b/lib/misc/lib.h index 13c7110..3ae3aac 100644 --- a/lib/misc/lib.h +++ b/lib/misc/lib.h @@ -79,7 +79,7 @@ #include "lib/misc/intl.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include "lib/misc/util.h" #ifdef DM diff --git a/lib/report/properties.h b/lib/report/properties.h index f52705e..38b6111 100644 --- a/lib/report/properties.h +++ b/lib/report/properties.h @@ -14,7 +14,7 @@ #ifndef _LVM_PROPERTIES_H #define _LVM_PROPERTIES_H -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include "lib/metadata/metadata.h" #include "lib/report/report.h" #include "lib/properties/prop_common.h" diff --git a/libdaemon/client/config-util.c b/libdaemon/client/config-util.c index 12baa99..f8526d7 100644 --- a/libdaemon/client/config-util.c +++ b/libdaemon/client/config-util.c @@ -17,7 +17,7 @@ #include "tools/tool.h" #include "libdaemon/client/daemon-io.h" -#include "libdm/misc/dm-logging.h" +#include "device_mapper/misc/dm-logging.h" #include <math.h> /* fabs() */ #include <float.h> /* DBL_EPSILON */ diff --git a/libdaemon/client/daemon-client.c b/libdaemon/client/daemon-client.c index b5dfbf1..28d7c04 100644 --- a/libdaemon/client/daemon-client.c +++ b/libdaemon/client/daemon-client.c @@ -18,7 +18,7 @@ #include "libdaemon/client/daemon-io.h" #include "libdaemon/client/daemon-client.h" -#include "libdm/misc/dm-logging.h" +#include "device_mapper/misc/dm-logging.h" #include <sys/un.h> #include <sys/socket.h> diff --git a/libdm/Makefile.in b/libdm/Makefile.in index 66ec395..eeef080 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -52,7 +52,7 @@ CFLOW_LIST_TARGET = libdevmapper.cflow EXPORTED_HEADER = $(srcdir)/libdevmapper.h EXPORTED_FN_PREFIX = dm -include $(top_builddir)/make.tmpl +include $(top_builddir)/libdm/make.tmpl PROGS_CFLAGS = $(UDEV_CFLAGS) diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in new file mode 100644 index 0000000..7e3f4a4 --- /dev/null +++ b/libdm/make.tmpl.in @@ -0,0 +1,578 @@ +# @configure_input@ +# +# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. +# Copyright (C) 2004-2014 Red Hat, Inc. All rights reserved. +# +# This file is part of LVM2. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +ifeq ($(V),1) + Q= +else + Q=@ +endif + +SHELL = @SHELL@ + +@SET_MAKE@ + +# Allow environment to override any built-in default value for CC. +# If there is a built-in default, CC is NOT set to @CC@ here. +CC ?= @CC@ + +# If $(CC) holds the usual built-in default value of 'cc' then replace it with +# the configured value. +# (To avoid this and force the use of 'cc' from the environment, supply its +# full path.) +ifeq ($(CC), cc) + CC = @CC@ +endif + +RANLIB = @RANLIB@ +INSTALL = @INSTALL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +LCOV = @LCOV@ +GENHTML = @GENHTML@ +LN_S = @LN_S@ +SED = @SED@ +CFLOW_CMD = @CFLOW_CMD@ +AWK = @AWK@ +CHMOD = @CHMOD@ +EGREP = @EGREP@ +GREP = @GREP@ +SORT = @SORT@ +WC = @WC@ +AR = @AR@ +RM = rm -f + +PYTHON2 = @PYTHON2@ +PYTHON3 = @PYTHON3@ +PYCOMPILE = $(top_srcdir)/autoconf/py-compile + +LIBS = @LIBS@ +# Extra libraries always linked with static binaries +STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) +DEFS += @DEFS@ +# FIXME set this only where it's needed, not globally? +CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ +LDFLAGS ?= @LDFLAGS@ +CLDFLAGS += @CLDFLAGS@ +ELDFLAGS += @ELDFLAGS@ +LDDEPS += @LDDEPS@ +LIB_SUFFIX = @LIB_SUFFIX@ +LVMINTERNAL_LIBS = -llvm-internal $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) +DL_LIBS = @DL_LIBS@ +RT_LIBS = @RT_LIBS@ +M_LIBS = @M_LIBS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ +READLINE_LIBS = @READLINE_LIBS@ +SELINUX_LIBS = @SELINUX_LIBS@ +UDEV_CFLAGS = @UDEV_CFLAGS@ +UDEV_LIBS = @UDEV_LIBS@ +BLKID_CFLAGS = @BLKID_CFLAGS@ +BLKID_LIBS = @BLKID_LIBS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ + +# Setup directory variables +prefix = @prefix@ +exec_prefix = @exec_prefix@ +udev_prefix = @udev_prefix@ +sysconfdir = @sysconfdir@ +rootdir = $(DESTDIR)/ +bindir = $(DESTDIR)@bindir@ +confdir = $(DESTDIR)@CONFDIR@/lvm +profiledir = $(confdir)/@DEFAULT_PROFILE_SUBDIR@ +includedir = $(DESTDIR)@includedir@ +libdir = $(DESTDIR)@libdir@ +libexecdir = $(DESTDIR)@libexecdir@ +usrlibdir = $(DESTDIR)@usrlibdir@ +sbindir = $(DESTDIR)@sbindir@ +usrsbindir = $(DESTDIR)@usrsbindir@ +datarootdir = @datarootdir@ +datadir = $(DESTDIR)@datadir@ +infodir = $(DESTDIR)@infodir@ +mandir = $(DESTDIR)@mandir@ +localedir = $(DESTDIR)@localedir@ +staticdir = $(DESTDIR)@STATICDIR@ +udevdir = $(DESTDIR)@udevdir@ +pkgconfigdir = $(usrlibdir)/pkgconfig +initdir = $(DESTDIR)$(sysconfdir)/rc.d/init.d +dbusconfdir = $(DESTDIR)$(sysconfdir)/dbus-1/system.d +dbusservicedir = $(datadir)/dbus-1/system-services +systemd_unit_dir = $(DESTDIR)@systemdsystemunitdir@ +systemd_generator_dir = $(DESTDIR)$(SYSTEMD_GENERATOR_DIR) +systemd_dir = $(DESTDIR)@systemdutildir@ +tmpfiles_dir = $(DESTDIR)@tmpfilesdir@ +ocf_scriptdir = $(DESTDIR)@OCFDIR@ +pythonprefix = $(DESTDIR)$(prefix) + +# N.B. No $(DESTDIR) prefix here. +python2dir = @PYTHON2DIR@ +python3dir = @PYTHON3DIR@ + +USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \ + $(AWK) -f $(top_srcdir)/scripts/relpath.awk) + +SYSTEMD_GENERATOR_DIR = @systemdutildir@/system-generators +DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@ +DEFAULT_ARCHIVE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_ARCHIVE_SUBDIR@ +DEFAULT_BACKUP_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_BACKUP_SUBDIR@ +DEFAULT_CACHE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_CACHE_SUBDIR@ +DEFAULT_PROFILE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_PROFILE_SUBDIR@ +DEFAULT_LOCK_DIR = @DEFAULT_LOCK_DIR@ +DEFAULT_RUN_DIR = @DEFAULT_RUN_DIR@ +DEFAULT_PID_DIR = @DEFAULT_PID_DIR@ +DEFAULT_MANGLING = @MANGLING@ + +# Setup vpath search paths for some suffixes +vpath %.c $(srcdir) +vpath %.cpp $(srcdir) +vpath %.in $(srcdir) +vpath %.po $(srcdir) +vpath %.exported_symbols $(srcdir) + +interface = @interface@ +interfacebuilddir = $(top_builddir)/libdm/$(interface) +rpmbuilddir = $(abs_top_builddir)/build + +# The number of jobs to run, if blank, defaults to the make standard +ifndef MAKEFLAGS +MAKEFLAGS = @JOBS@ +endif + +# Handle installation of files +ifeq ("@WRITE_INSTALL@", "yes") +# leaving defaults +M_INSTALL_SCRIPT = +M_INSTALL_DATA = -m 644 +else +M_INSTALL_PROGRAM = -m 555 +M_INSTALL_DATA = -m 444 +endif +INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP) +INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA) +INSTALL_WDATA = $(INSTALL) -p -m 644 + +INSTALL_DIR = $(INSTALL) -m 755 -d +INSTALL_ROOT_DIR = $(INSTALL) -m 700 -d +INSTALL_ROOT_DATA = $(INSTALL) -m 600 +INSTALL_SCRIPT = $(INSTALL) -p $(M_INSTALL_PROGRAM) + +.SUFFIXES: +.SUFFIXES: .c .cpp .d .o .so .a .po .pot .mo .dylib + +ifeq ("$(notdir $(CC))", "gcc") +WFLAGS +=\ + -Wall\ + -Wcast-align\ + -Wfloat-equal\ + -Wformat-security\ + -Winline\ + -Wmissing-format-attribute\ + -Wmissing-include-dirs\ + -Wmissing-noreturn\ + -Wpointer-arith\ + -Wredundant-decls\ + -Wshadow\ + -Wundef\ + -Wwrite-strings + +WCFLAGS +=\ + -Wmissing-declarations\ + -Wmissing-prototypes\ + -Wnested-externs\ + -Wold-style-definition\ + -Wstrict-prototypes\ + -Wuninitialized + +ifeq ("@HAVE_WJUMP@", "yes") +WCFLAGS += -Wjump-misses-init +endif + +ifeq ("@HAVE_WCLOBBERED@", "yes") +WFLAGS +=\ + -Wclobbered\ + -Wempty-body\ + -Wignored-qualifiers\ + -Wlogical-op\ + -Wtype-limits + +WCFLAGS +=\ + -Wmissing-parameter-type\ + -Wold-style-declaration\ + -Woverride-init +endif + +ifeq ("@HAVE_WSYNCNAND@", "yes") +WFLAGS += -Wsync-nand +endif +endif + +ifneq ("@STATIC_LINK@", "yes") +ifeq ("@HAVE_PIE@", "yes") +ifeq ("@HAVE_FULL_RELRO@", "yes") + EXTRA_EXEC_CFLAGS += -fPIE + EXTRA_EXEC_LDFLAGS += -Wl,-z,relro,-z,now -pie -fPIE + CLDFLAGS += -Wl,-z,relro +endif +endif +endif + +#WFLAGS += -W -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers +#WFLAGS += -Wsign-compare -Wunused-parameter -Wmissing-field-initializers +#WFLAGS += -Wconversion -Wbad-function-cast -Wcast-qual -Waggregate-return -Wpacked +#WFLAGS += -pedantic -std=gnu99 +#DEFS += -DDEBUG_CRC32 + +# +# Avoid recursive extension of CFLAGS +# by checking whether CFLAGS already has fPIC string +# +ifeq (,$(findstring fPIC,$(CFLAGS))) + +CFLAGS += -fPIC + +ifeq ("@DEBUG@", "yes") +ifeq (,$(findstring -g,$(CFLAGS))) + CFLAGS += -g +endif + CFLAGS += -fno-omit-frame-pointer + DEFS += -DDEBUG + # memory debugging is not thread-safe yet + ifneq ("@BUILD_DMEVENTD@", "yes") + ifneq ("@BUILD_DMFILEMAPD@", "yes") + ifneq ("@BUILD_LVMLOCKD@", "yes") + ifneq ("@BUILD_LVMPOLLD@", "yes") + ifneq ("@BUILD_LVMETAD@", "yes") + ifeq ("@CLVMD@", "none") + DEFS += -DDEBUG_MEM + endif + endif + endif + endif + endif + endif +endif + +# end of fPIC protection +endif + +DEFS += -D_BUILDING_LVM + +LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib +CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib + +DAEMON_LIBS = -ldaemonclient +LDFLAGS += -L$(top_builddir)/libdaemon/client +CLDFLAGS += -L$(top_builddir)/libdaemon/client + +ifeq ("@BUILD_DMEVENTD@", "yes") + DMEVENT_LIBS = -ldevmapper-event + LDFLAGS += -L$(top_builddir)/daemons/dmeventd + CLDFLAGS += -L$(top_builddir)/daemons/dmeventd +endif + +# Combination of DEBUG_POOL and DEBUG_ENFORCE_POOL_LOCKING is not suppored. +#DEFS += -DDEBUG_POOL +# Default pool locking is using the crc checksum. With mprotect memory +# enforcing compilation faulty memory write could be easily found. +#DEFS += -DDEBUG_ENFORCE_POOL_LOCKING +#DEFS += -DBOUNDS_CHECK + +# LVM is not supposed to use mmap while devices are suspended. +# This code causes a core dump if gets called. +#DEFS += -DDEBUG_MEMLOCK + +#CFLAGS += -pg +#LDFLAGS += -pg + +STRIP= +#STRIP = -s + +LVM_VERSION := $(shell cat $(top_srcdir)/VERSION) + +LIB_VERSION_LVM := $(shell $(AWK) -F '.' '{printf "%s.%s",$$1,$$2}' $(top_srcdir)/VERSION) + +LIB_VERSION_DM := $(shell $(AWK) -F '.' '{printf "%s.%s",$$1,$$2}' $(top_srcdir)/VERSION_DM) + +LIB_VERSION_APP := $(shell $(AWK) -F '[(). ]' '{printf "%s.%s",$$1,$$4}' $(top_srcdir)/VERSION) + +INCLUDES += -I$(top_srcdir) -I$(srcdir) -I$(top_builddir)/include + +DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \ + $(top_builddir)/Makefile + +OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o) +POTFILES = $(SOURCES:%.c=%.pot) + +.PHONY: all pofile distclean clean cleandir cflow device-mapper +.PHONY: install install_cluster install_device-mapper install_lvm2 +.PHONY: install_dbus_service +.PHONY: install_lib_shared install_dm_plugin install_lvm2_plugin +.PHONY: install_ocf install_systemd_generators install_all_man all_man man help +.PHONY: python_bindings install_python_bindings +.PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean) +.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow) +.PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper) +.PHONY: $(SUBDIRS.generate) generate + +SUBDIRS.device-mapper := $(SUBDIRS:=.device-mapper) +SUBDIRS.install := $(SUBDIRS:=.install) +SUBDIRS.install_cluster := $(SUBDIRS:=.install_cluster) +SUBDIRS.install_device-mapper := $(SUBDIRS:=.install_device-mapper) +SUBDIRS.install_lvm2 := $(SUBDIRS:=.install_lvm2) +SUBDIRS.install_ocf := $(SUBDIRS:=.install_ocf) +SUBDIRS.pofile := $(SUBDIRS:=.pofile) +SUBDIRS.cflow := $(SUBDIRS:=.cflow) +SUBDIRS.clean := $(SUBDIRS:=.clean) +SUBDIRS.distclean := $(SUBDIRS:=.distclean) + +TARGETS += $(LIB_SHARED) $(LIB_STATIC) + +all: $(SUBDIRS) $(TARGETS) + +install: all $(SUBDIRS.install) +install_cluster: all $(SUBDIRS.install_cluster) +install_device-mapper: $(SUBDIRS.install_device-mapper) +install_lvm2: $(SUBDIRS.install_lvm2) +install_ocf: $(SUBDIRS.install_ocf) +cflow: $(SUBDIRS.cflow) + +$(SUBDIRS): $(SUBDIRS.device-mapper) + $(MAKE) -C $@ + +$(SUBDIRS.device-mapper): + $(MAKE) -C $(@:.device-mapper=) device-mapper + +$(SUBDIRS.install): $(SUBDIRS) + $(MAKE) -C $(@:.install=) install + +$(SUBDIRS.install_cluster): $(SUBDIRS) + $(MAKE) -C $(@:.install_cluster=) install_cluster + +$(SUBDIRS.install_device-mapper): device-mapper + $(MAKE) -C $(@:.install_device-mapper=) install_device-mapper + +$(SUBDIRS.install_lvm2): $(SUBDIRS) + $(MAKE) -C $(@:.install_lvm2=) install_lvm2 + +$(SUBDIRS.install_ocf): + $(MAKE) -C $(@:.install_ocf=) install_ocf + +$(SUBDIRS.clean): + -$(MAKE) -C $(@:.clean=) clean + +$(SUBDIRS.distclean): + -$(MAKE) -C $(@:.distclean=) distclean + +$(SUBDIRS.cflow): + $(MAKE) -C $(@:.cflow=) cflow + +ifeq ("@INTL@", "yes") +pofile: $(SUBDIRS.pofile) $(POTFILES) + +$(SUBDIRS.pofile): + $(MAKE) -C $(@:.pofile=) pofile +endif + +$(SUBDIRS.generate): + $(MAKE) -C $(@:.generate=) generate + +ifneq ("$(CFLOW_LIST_TARGET)", "") +CLEAN_CFLOW += $(CFLOW_LIST_TARGET) +$(CFLOW_LIST_TARGET): $(CFLOW_LIST) + echo "CFLOW_SOURCES += $(addprefix \ + \$$(top_srcdir)$(subst $(top_srcdir),,$(srcdir))/, $(CFLOW_LIST))" > $@ +cflow: $(CFLOW_LIST_TARGET) +endif + +ifneq ("$(CFLOW_TARGET)", "") +CLEAN_CFLOW += \ + $(CFLOW_TARGET).cflow \ + $(CFLOW_TARGET).xref \ + $(CFLOW_TARGET).tree \ + $(CFLOW_TARGET).rtree \ + $(CFLOW_TARGET).rxref + +ifneq ("$(CFLOW_CMD)", "") +CFLOW_FLAGS +=\ + --cpp="$(CC) -E" \ + --symbol _ISbit:wrapper \ + --symbol __attribute__:wrapper \ + --symbol __const__:wrapper \ + --symbol __const:type \ + --symbol __restrict:type \ + --symbol __extension__:wrapper \ + --symbol __nonnull:wrapper \ + --symbol __nothrow__:wrapper \ + --symbol __pure__:wrapper \ + --symbol __REDIRECT:wrapper \ + --symbol __REDIRECT_NTH:wrapper \ + --symbol __wur:wrapper \ + -I$(top_srcdir)/libdm \ + -I$(top_srcdir)/libdm/ioctl \ + -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2/ \ + $(INCLUDES) $(DEFS) + +$(CFLOW_TARGET).cflow: $(CFLOW_SOURCES) + $(CFLOW_CMD) -o$@ $(CFLOW_FLAGS) $(CFLOW_SOURCES) +$(CFLOW_TARGET).rxref: $(CFLOW_SOURCES) + $(CFLOW_CMD) -o$@ $(CFLOW_FLAGS) -r --omit-arguments $(CFLOW_SOURCES) +$(CFLOW_TARGET).tree: $(CFLOW_SOURCES) + $(CFLOW_CMD) -o$@ $(CFLOW_FLAGS) --omit-arguments -T -b $(CFLOW_SOURCES) +$(CFLOW_TARGET).xref: $(CFLOW_SOURCES) + $(CFLOW_CMD) -o$@ $(CFLOW_FLAGS) --omit-arguments -x $(CFLOW_SOURCES) +#$(CFLOW_TARGET).rtree: $(CFLOW_SOURCES) +# $(CFLOW_CMD) -o$@ $(CFLOW_FLAGS) -r --omit-arguments -T -b $(CFLOW_SOURCES) +cflow: $(CFLOW_TARGET).cflow $(CFLOW_TARGET).tree $(CFLOW_TARGET).rxref $(CFLOW_TARGET).xref +#$(CFLOW_TARGET).rtree +endif +endif + +.LIBPATTERNS = lib%.so lib%.a + +DEPFLAGS=-MT $@ -MMD -MP -MF $*.d + +# still needed in 2018 for 32bit builds +DEFS+=-D_FILE_OFFSET_BITS=64 + +%.o: %.c + @echo " [CC] $<" + $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ + +%.o: %.cpp + @echo " [CXX] $<" + $(Q) $(CXX) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@ + +%.pot: %.c Makefile + @echo " [CC] $@" + $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/include/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@ + +%.so: %.o + @echo " [CC] $<" + $(Q) $(CC) -c $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@ + +ifneq (,$(LIB_SHARED)) + +TARGETS += $(LIB_SHARED).$(LIB_VERSION) +$(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS) + @echo " [CC] $@" +ifeq ("@LIB_SUFFIX@","so") + $(Q) $(CC) -shared -Wl,-soname,$(notdir $@) \ + $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ +endif +ifeq ("@LIB_SUFFIX@","dylib") + $(Q) $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \ + $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ +endif + +$(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION) + @echo " [LN] $<" + $(Q) $(LN_S) -f $(<F) $@ + +CLEAN_TARGETS += $(LDDEPS) .exported_symbols_generated + +install_lib_shared: $(LIB_SHARED) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION) + $(Q) $(INSTALL_DIR) $(usrlibdir) + $(Q) $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F) + +# FIXME: plugins are installed to subdirs +# and for compatibility links in libdir are created +# when the code is fixed links could be removed. +install_dm_plugin: $(LIB_SHARED) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F) + $(Q) $(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F) + +install_lvm2_plugin: $(LIB_SHARED) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F) + $(Q) $(LN_S) -f lvm2/$(<F) $(libdir)/$(<F) + $(Q) $(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION) +endif + +$(LIB_STATIC): $(OBJECTS) + @echo " [AR] $@" + $(Q) $(RM) $@ + $(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null + +%.d: +.PRECIOUS: %.d + +%.mo: %.po + @echo " [MSGFMT] $<" + $(Q) $(MSGFMT) -o $@ $< + +CLEAN_TARGETS += \ + $(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \ + $(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda) \ + $(POTFILES) $(CLEAN_CFLOW) + +cleandir: +ifneq (,$(firstword $(CLEAN_DIRS))) + $(RM) -r $(CLEAN_DIRS) +endif + $(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) core + +clean: $(SUBDIRS.clean) cleandir + +distclean: cleandir $(SUBDIRS.distclean) +ifneq (,$(firstword $(DISTCLEAN_DIRS))) + $(RM) -r $(DISTCLEAN_DIRS) +endif + $(RM) $(DISTCLEAN_TARGETS) Makefile + +.exported_symbols_generated: $(EXPORTED_HEADER) .exported_symbols $(DEPS) + $(Q) set -e; \ + ( cat $(srcdir)/.exported_symbols; \ + if test -n "$(EXPORTED_HEADER)"; then \ + $(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \ + $(SED) -ne "/^typedef|}/!s/.*[ *]$$(EXPORTED_FN_PREFIX)_[a-z0-9_]*$(.*/\1/p"; \ + fi \ + ) > $@ + +EXPORTED_UC := $(shell echo $(EXPORTED_FN_PREFIX) | tr '[a-z]' '[A-Z]') +EXPORTED_SYMBOLS := $(wildcard $(srcdir)/.exported_symbols.Base $(srcdir)/.exported_symbols.$(EXPORTED_UC)_[0-9_]*[0-9]) + +.export.sym: .exported_symbols_generated $(EXPORTED_SYMBOLS) +ifeq (,$(firstword $(EXPORTED_SYMBOLS))) + $(Q) set -e; (echo "Base {"; echo " global:";\ + $(SED) "s/^/ /;s/$$/;/" $<;\ + echo "};";\ + echo "Local {"; echo " local:"; echo " *;"; echo "};";\ + ) > $@ +else + $(Q) set -e;\ + R=$$($(SORT) $^ | uniq -u);\ + test -z "$$R" || { echo "Mismatch between symbols in shared library and lists in .exported_symbols.* files: $$R"; false; } ;\ + ( for i in $$(echo $(EXPORTED_SYMBOLS) | tr ' ' '\n' | $(SORT) -rnt_ -k5 ); do\ + echo "$${i##*.} {"; echo " global:";\ + $(SED) "s/^/ /;s/$$/;/" $$i;\ + echo "};";\ + done;\ + echo "Local {"; echo " local:"; echo " *;"; echo "};";\ + ) > $@ +endif + +ifeq ("@USE_TRACKING@","yes") +ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \ + help check check_local check_cluster check_lvmetad check_lvmpolld)) + ifdef SOURCES + -include $(SOURCES:.c=.d) $(CXXSOURCES:.cpp=.d) + endif + ifdef SOURCES2 + -include $(SOURCES2:.c=.d) + endif +endif +endif diff --git a/liblvm/Makefile.in b/liblvm/Makefile.in index be3049a..210ee37 100644 --- a/liblvm/Makefile.in +++ b/liblvm/Makefile.in @@ -43,7 +43,7 @@ LDDEPS += $(top_builddir)/lib/liblvm-internal.a include $(top_builddir)/make.tmpl LDFLAGS += -L$(top_builddir)/lib -L$(top_builddir)/daemons/dmeventd -LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio +LIBS += $(LVMINTERNAL_LIBS) -laio .PHONY: install_dynamic install_static install_include install_pkgconfig diff --git a/liblvm/lvm_misc.h b/liblvm/lvm_misc.h index 62f91ce..b83a443 100644 --- a/liblvm/lvm_misc.h +++ b/liblvm/lvm_misc.h @@ -14,7 +14,7 @@ #ifndef _LVM2APP_MISC_H #define _LVM2APP_MISC_H -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include "liblvm/lvm2app.h" #include "lib/metadata/metadata-exported.h" #include "lib/commands/toolcontext.h" diff --git a/liblvm/lvm_prop.c b/liblvm/lvm_prop.c index 1997596..5d274a6 100644 --- a/liblvm/lvm_prop.c +++ b/liblvm/lvm_prop.c @@ -13,7 +13,7 @@ */ #include "lvm_prop.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include "lib/metadata/metadata.h" /* lv create parameters */ diff --git a/make.tmpl.in b/make.tmpl.in index 7e3f4a4..c4d9d58 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -68,7 +68,9 @@ CLDFLAGS += @CLDFLAGS@ ELDFLAGS += @ELDFLAGS@ LDDEPS += @LDDEPS@ LIB_SUFFIX = @LIB_SUFFIX@ -LVMINTERNAL_LIBS = -llvm-internal $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) +LVMINTERNAL_LIBS=\ + -llvm-internal \ + $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) DL_LIBS = @DL_LIBS@ RT_LIBS = @RT_LIBS@ M_LIBS = @M_LIBS@ @@ -338,7 +340,7 @@ SUBDIRS.distclean := $(SUBDIRS:=.distclean) TARGETS += $(LIB_SHARED) $(LIB_STATIC) -all: $(SUBDIRS) $(TARGETS) +all: $(top_builddir)/device_mapper/libdevice-mapper.a $(SUBDIRS) $(TARGETS) install: all $(SUBDIRS.install) install_cluster: all $(SUBDIRS.install_cluster) @@ -347,7 +349,7 @@ install_lvm2: $(SUBDIRS.install_lvm2) install_ocf: $(SUBDIRS.install_ocf) cflow: $(SUBDIRS.cflow) -$(SUBDIRS): $(SUBDIRS.device-mapper) +$(SUBDIRS): $(SUBDIRS.device-mapper) $(top_builddir)/device_mapper/libdevice-mapper.a $(MAKE) -C $@ $(SUBDIRS.device-mapper): diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 720ae9f..eeac881 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -23,12 +23,12 @@ endif include $(top_builddir)/make.tmpl ifeq ("@APPLIB@", "yes") - DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so $(top_builddir)/libdm/libdevmapper.so + DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so LDFLAGS += -L$(top_builddir)/liblvm ifeq ("@BUILD_DMEVENTD@", "yes") LDFLAGS += -Wl,-rpath-link,$(top_builddir)/daemons/dmeventd endif - LVMLIBS = @LVM2APP_LIB@ -ldevmapper -laio + LVMLIBS = @LVM2APP_LIB@ -laio endif LVM_SCRIPTS = lvmdump.sh lvmconf.sh diff --git a/test/api/Makefile.in b/test/api/Makefile.in index e953675..6661149 100644 --- a/test/api/Makefile.in +++ b/test/api/Makefile.in @@ -41,9 +41,12 @@ endif include $(top_builddir)/make.tmpl DEFS += -D_REENTRANT -DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so $(top_builddir)/libdm/libdevmapper.so -LDFLAGS += -L$(top_builddir)/liblvm -L$(top_builddir)/daemons/dmeventd -LIBS += @LVM2APP_LIB@ $(DMEVENT_LIBS) -ldevmapper +DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so +LDFLAGS+=\ + -L$(top_builddir)/liblvm \ + -L$(top_builddir)/daemons/dmeventd \ + -L$(top_builddir)/device_mapper/libdevice-mapper.a +LIBS += @LVM2APP_LIB@ $(DMEVENT_LIBS) %.t: %.o $(DEPLIBS) $(CC) -o $@ $(<) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(LIBS) diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in index 9d18608..54b7d72 100644 --- a/test/unit/Makefile.in +++ b/test/unit/Makefile.in @@ -12,7 +12,7 @@ UNIT_SOURCE=\ base/data-struct/radix-tree.c \ - device-mapper/vdo/status.c \ + device_mapper/vdo/status.c \ \ test/unit/bcache_t.c \ test/unit/bcache_utils_t.c \ @@ -32,9 +32,9 @@ UNIT_SOURCE=\ UNIT_DEPENDS=$(subst .c,.d,$(UNIT_SOURCE)) UNIT_OBJECTS=$(UNIT_SOURCE:%.c=%.o) CLEAN_TARGETS+=$(UNIT_DEPENDS) $(UNIT_OBJECTS) -UNIT_LDLIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio +UNIT_LDLIBS += $(LVMINTERNAL_LIBS) -laio -test/unit/unit-test: $(UNIT_OBJECTS) libdm/libdevmapper.$(LIB_SUFFIX) lib/liblvm-internal.a +test/unit/unit-test: $(UNIT_OBJECTS) device_mapper/libdevice-mapper.a lib/liblvm-internal.a @echo " [LD] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) -L$(top_builddir)/libdm \ -o $@ $(UNIT_OBJECTS) $(UNIT_LDLIBS) diff --git a/test/unit/bitset_t.c b/test/unit/bitset_t.c index 66e0d32..9b18fcb 100644 --- a/test/unit/bitset_t.c +++ b/test/unit/bitset_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" enum { NR_BITS = 137 diff --git a/test/unit/config_t.c b/test/unit/config_t.c index e988706..21af551 100644 --- a/test/unit/config_t.c +++ b/test/unit/config_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" static void *_mem_init(void) { diff --git a/test/unit/dmlist_t.c b/test/unit/dmlist_t.c index 5a4951e..8a9948f 100644 --- a/test/unit/dmlist_t.c +++ b/test/unit/dmlist_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" static void test_dmlist_splice(void *fixture) { diff --git a/test/unit/dmstatus_t.c b/test/unit/dmstatus_t.c index 43fb0bf..f50dd75 100644 --- a/test/unit/dmstatus_t.c +++ b/test/unit/dmstatus_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" static void *_mem_init(void) { diff --git a/test/unit/framework.h b/test/unit/framework.h index a90a6e2..0a8a5f2 100644 --- a/test/unit/framework.h +++ b/test/unit/framework.h @@ -1,7 +1,7 @@ #ifndef TEST_UNIT_FRAMEWORK_H #define TEST_UNIT_FRAMEWORK_H -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include <stdbool.h> #include <stdint.h> diff --git a/test/unit/matcher_t.c b/test/unit/matcher_t.c index 8405a34..296c78a 100644 --- a/test/unit/matcher_t.c +++ b/test/unit/matcher_t.c @@ -14,7 +14,7 @@ */ #include "units.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include "matcher_data.h" diff --git a/test/unit/percent_t.c b/test/unit/percent_t.c index fc168d4..4341480 100644 --- a/test/unit/percent_t.c +++ b/test/unit/percent_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include <stdio.h> #include <string.h> diff --git a/test/unit/string_t.c b/test/unit/string_t.c index 74886f0..3557247 100644 --- a/test/unit/string_t.c +++ b/test/unit/string_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include <stdio.h> #include <string.h> diff --git a/test/unit/vdo_t.c b/test/unit/vdo_t.c index 21ecd1a..9c41887 100644 --- a/test/unit/vdo_t.c +++ b/test/unit/vdo_t.c @@ -12,7 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "device-mapper/vdo/target.h" +#include "device_mapper/vdo/target.h" #include "framework.h" #include "units.h" diff --git a/tools/Makefile.in b/tools/Makefile.in index 103b767..d4514a2 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -95,7 +95,7 @@ ifeq ("@STATIC_LINK@", "yes") INSTALL_CMDLIB_TARGETS += install_cmdlib_static endif -LVMLIBS = $(LVMINTERNAL_LIBS) -ldevmapper -laio +LVMLIBS = $(LVMINTERNAL_LIBS) -laio LIB_VERSION = $(LIB_VERSION_LVM) CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) $(TARGETS_DM) \ @@ -122,15 +122,15 @@ device-mapper: $(TARGETS_DM) CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) -dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX) +dmsetup: dmsetup.o $(top_builddir)/device_mapper/libdevice-mapper.a @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ - -o $@ dmsetup.o -ldevmapper $(LIBS) + -o $@ $+ $(LIBS) -lm -dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a +dmsetup.static: dmsetup.o $(top_builddir)/device_mapper/libdevice-mapper.a @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ - -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) + -o $@ $+ $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) all: device-mapper @@ -138,10 +138,10 @@ CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS) INCLUDES += -I$(top_builddir)/tools -lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a +lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a $(top_builddir)/device_mapper/libdevice-mapper.a @echo " [CC] $@" - $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \ - $(LVMLIBS) $(READLINE_LIBS) $(LIBS) + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $+ \ + $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -lm DEFS_man-generator.o += -DMAN_PAGE_GENERATOR @@ -157,7 +157,7 @@ ifeq ("@BUILD_LVMETAD@", "yes") lvm: $(top_builddir)/libdaemon/client/libdaemonclient.a endif -lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a +lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(top_builddir)/device_mapper/libdevice-mapper.a @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) @@ -222,7 +222,6 @@ $(SOURCES:%.c=%.o) $(SOURCES2:%.c=%.o): command-lines-input.h command-count.h cm ifneq ("$(CFLOW_CMD)", "") CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) --include $(top_builddir)/libdm/libdevmapper.cflow -include $(top_builddir)/lib/liblvm-internal.cflow endif diff --git a/tools/dmsetup.c b/tools/dmsetup.c index d3080bb..5486ed3 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -17,7 +17,7 @@ */ #include "tools/tool.h" -#include "libdm/misc/dm-logging.h" +#include "device_mapper/misc/dm-logging.h" #include <ctype.h> #include <dirent.h> diff --git a/tools/tool.h b/tools/tool.h index 656234c..51d530c 100644 --- a/tools/tool.h +++ b/tools/tool.h @@ -24,7 +24,7 @@ #include <unistd.h> -#include "libdm/libdevmapper.h" +#include "device_mapper/libdevmapper.h" #include "lib/misc/util.h" #endif /* _LVM_TOOL_H */

1 0

master - build: Don't generate symlinks in include/ dir
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7f97c7ea9ade36bab817a… Commit: 7f97c7ea9ade36bab817aca9eeee5c5177550127 Parent: 02b99be57eab4f55bd0db045a3873bdf5e500b92 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Mon May 14 10:30:20 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Mon May 14 10:30:20 2018 +0100 build: Don't generate symlinks in include/ dir As we start refactoring the code to break dependencies (see doc/refactoring.txt), I want us to use full paths in the includes (eg, #include "base/data-struct/list.h"). This makes it more obvious when we're breaking abstraction boundaries, eg, including a file in metadata/ from base/ --- configure | 3 +- configure.ac | 1 - daemons/clvmd/clvmd-cman.c | 2 +- daemons/clvmd/clvmd-command.c | 6 +- daemons/clvmd/clvmd-common.h | 4 +- daemons/clvmd/clvmd-corosync.c | 4 +- daemons/clvmd/clvmd-openais.c | 4 +- daemons/clvmd/clvmd-singlenode.c | 4 +- daemons/clvmd/clvmd.c | 2 +- daemons/clvmd/lvm-functions.c | 14 ++-- daemons/clvmd/refresh_clvmd.c | 2 +- daemons/cmirrord/cluster.c | 2 +- daemons/cmirrord/cluster.h | 4 +- daemons/cmirrord/compat.c | 2 +- daemons/cmirrord/functions.h | 2 +- daemons/dmeventd/dmeventd.c | 6 +- daemons/dmeventd/libdevmapper-event.c | 6 +- daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c | 6 +- daemons/dmeventd/plugins/mirror/dmeventd_mirror.c | 6 +- daemons/dmeventd/plugins/raid/dmeventd_raid.c | 6 +- .../dmeventd/plugins/snapshot/dmeventd_snapshot.c | 4 +- daemons/dmeventd/plugins/thin/dmeventd_thin.c | 6 +- daemons/dmfilemapd/dmfilemapd.c | 6 +- daemons/lvmetad/lvmetactl.c | 4 +- daemons/lvmetad/lvmetad-client.h | 2 +- daemons/lvmetad/lvmetad-core.c | 6 +- daemons/lvmetad/testclient.c | 10 +- daemons/lvmlockd/lvmlockctl.c | 4 +- daemons/lvmlockd/lvmlockd-client.h | 2 +- daemons/lvmlockd/lvmlockd-core.c | 10 +- daemons/lvmlockd/lvmlockd-dlm.c | 6 +- daemons/lvmlockd/lvmlockd-sanlock.c | 6 +- daemons/lvmpolld/lvmpolld-common.h | 4 +- daemons/lvmpolld/lvmpolld-data-utils.c | 2 +- daemons/lvmpolld/lvmpolld-protocol.h | 2 +- device-mapper/vdo/status.c | 2 +- doc/example_cmdlib.c | 2 +- include/.symlinks.in | 80 -------------------- include/Makefile.in | 20 +----- lib/activate/activate.c | 32 ++++---- lib/activate/activate.h | 2 +- lib/activate/dev_manager.c | 22 +++--- lib/activate/dev_manager.h | 2 +- lib/activate/fs.c | 12 ++-- lib/activate/fs.h | 2 +- lib/cache/lvmcache.c | 24 +++--- lib/cache/lvmcache.h | 10 +- lib/cache/lvmetad.c | 24 +++--- lib/cache/lvmetad.h | 2 +- lib/cache_segtype/cache.c | 24 +++--- lib/commands/toolcontext.c | 38 +++++----- lib/commands/toolcontext.h | 4 +- lib/config/config.c | 20 +++--- lib/config/config.h | 6 +- lib/config/config_settings.h | 2 +- lib/datastruct/btree.c | 4 +- lib/datastruct/str_list.c | 4 +- lib/device/bcache-utils.c | 2 +- lib/device/bcache.c | 6 +- lib/device/bcache.h | 2 +- lib/device/dev-cache.c | 12 ++-- lib/device/dev-cache.h | 4 +- lib/device/dev-dasd.c | 6 +- lib/device/dev-ext.c | 4 +- lib/device/dev-io.c | 12 ++-- lib/device/dev-luks.c | 4 +- lib/device/dev-lvm1-pool.c | 6 +- lib/device/dev-md.c | 8 +- lib/device/dev-swap.c | 4 +- lib/device/dev-type.c | 18 ++-- lib/device/dev-type.h | 8 +- lib/device/device.h | 2 +- lib/display/display.c | 16 ++-- lib/display/display.h | 6 +- lib/error/errseg.c | 16 ++-- lib/filters/filter-composite.c | 6 +- lib/filters/filter-fwraid.c | 6 +- lib/filters/filter-internal.c | 4 +- lib/filters/filter-md.c | 4 +- lib/filters/filter-mpath.c | 8 +- lib/filters/filter-partitioned.c | 4 +- lib/filters/filter-persistent.c | 8 +- lib/filters/filter-regex.c | 4 +- lib/filters/filter-signature.c | 4 +- lib/filters/filter-sysfs.c | 4 +- lib/filters/filter-type.c | 4 +- lib/filters/filter-usable.c | 8 +- lib/filters/filter.h | 4 +- lib/format_text/archive.c | 12 ++-- lib/format_text/archiver.c | 18 ++-- lib/format_text/archiver.h | 2 +- lib/format_text/export.c | 16 ++-- lib/format_text/flags.c | 6 +- lib/format_text/format-text.c | 30 ++++---- lib/format_text/format-text.h | 2 +- lib/format_text/import-export.h | 6 +- lib/format_text/import.c | 4 +- lib/format_text/import_vsn1.c | 26 +++--- lib/format_text/layout.h | 8 +- lib/format_text/text_label.c | 10 +- lib/freeseg/freeseg.c | 6 +- lib/label/label.c | 16 ++-- lib/label/label.h | 8 +- lib/locking/cluster_locking.c | 10 +- lib/locking/external_locking.c | 10 +- lib/locking/file_locking.c | 14 ++-- lib/locking/locking.c | 18 ++-- lib/locking/locking.h | 4 +- lib/locking/locking_types.h | 4 +- lib/locking/lvmlockd.c | 18 ++-- lib/locking/lvmlockd.h | 4 +- lib/locking/no_locking.c | 8 +- lib/log/log.c | 12 ++-- lib/log/lvm-logging.h | 4 +- lib/lvmpolld/lvmpolld-client.c | 16 ++-- lib/lvmpolld/polldaemon.h | 2 +- lib/metadata/cache_manip.c | 22 +++--- lib/metadata/lv.c | 16 ++-- lib/metadata/lv.h | 2 +- lib/metadata/lv_alloc.h | 2 +- lib/metadata/lv_manip.c | 34 ++++---- lib/metadata/merge.c | 14 ++-- lib/metadata/metadata-exported.h | 10 +- lib/metadata/metadata-liblvm.c | 16 ++-- lib/metadata/metadata.c | 38 +++++----- lib/metadata/metadata.h | 6 +- lib/metadata/mirror.c | 26 +++--- lib/metadata/pool_manip.c | 20 +++--- lib/metadata/pv.c | 6 +- lib/metadata/pv.h | 4 +- lib/metadata/pv_manip.c | 16 ++-- lib/metadata/pv_map.c | 2 +- lib/metadata/pv_map.h | 2 +- lib/metadata/raid_manip.c | 18 ++-- lib/metadata/segtype.c | 6 +- lib/metadata/segtype.h | 2 +- lib/metadata/snapshot_manip.c | 14 ++-- lib/metadata/thin_manip.c | 16 ++-- lib/metadata/vg.c | 16 ++-- lib/metadata/vg.h | 4 +- lib/mirror/mirrored.c | 24 +++--- lib/misc/crc.c | 6 +- lib/misc/crc_gen.c | 2 +- lib/misc/lib.h | 16 ++-- lib/misc/lvm-exec.c | 10 +- lib/misc/lvm-exec.h | 2 +- lib/misc/lvm-file.c | 4 +- lib/misc/lvm-flock.c | 10 +- lib/misc/lvm-globals.c | 10 +- lib/misc/lvm-maths.c | 2 +- lib/misc/lvm-percent.c | 4 +- lib/misc/lvm-signal.c | 6 +- lib/misc/lvm-string.c | 8 +- lib/misc/lvm-wrappers.c | 2 +- lib/misc/sharedlib.c | 8 +- lib/misc/sharedlib.h | 2 +- lib/mm/memlock.c | 10 +- lib/notify/lvmnotify.c | 6 +- lib/properties/prop_common.c | 4 +- lib/raid/raid.c | 22 +++--- lib/report/properties.c | 8 +- lib/report/properties.h | 8 +- lib/report/report.c | 22 +++--- lib/report/report.h | 6 +- lib/snapshot/snapshot.c | 14 ++-- lib/striped/striped.c | 26 +++--- lib/thin/thin.c | 16 ++-- lib/unknown/unknown.c | 10 +- lib/uuid/uuid.c | 6 +- lib/zero/zero.c | 8 +- libdaemon/client/config-util.c | 6 +- libdaemon/client/daemon-client.c | 8 +- libdaemon/client/daemon-client.h | 2 +- libdaemon/client/daemon-io.c | 4 +- libdaemon/client/daemon-io.h | 2 +- libdaemon/server/daemon-log.c | 2 +- libdaemon/server/daemon-server.c | 4 +- libdaemon/server/daemon-server.h | 2 +- libdm/datastruct/bitset.c | 2 +- libdm/datastruct/hash.c | 2 +- libdm/datastruct/list.c | 2 +- libdm/ioctl/libdm-iface.c | 6 +- libdm/libdm-common.c | 6 +- libdm/libdm-common.h | 2 +- libdm/libdm-config.c | 2 +- libdm/libdm-deptree.c | 6 +- libdm/libdm-file.c | 2 +- libdm/libdm-report.c | 2 +- libdm/libdm-stats.c | 4 +- libdm/libdm-string.c | 2 +- libdm/libdm-targets.c | 2 +- libdm/libdm-timestamp.c | 2 +- libdm/misc/dm-log-userspace.h | 2 +- libdm/misc/dm-logging.h | 4 +- libdm/misc/dmlib.h | 2 +- libdm/mm/dbg_malloc.c | 2 +- libdm/mm/pool-debug.c | 2 +- libdm/mm/pool-fast.c | 2 +- libdm/mm/pool.c | 2 +- libdm/regex/matcher.c | 2 +- libdm/regex/parse_rx.c | 2 +- libdm/regex/ttree.c | 2 +- liblvm/lvm_base.c | 10 +- liblvm/lvm_lv.c | 16 ++-- liblvm/lvm_misc.c | 6 +- liblvm/lvm_misc.h | 8 +- liblvm/lvm_prop.c | 4 +- liblvm/lvm_prop.h | 2 +- liblvm/lvm_pv.c | 16 ++-- liblvm/lvm_vg.c | 20 +++--- make.tmpl.in | 8 +- python/liblvm.c | 4 +- .../lvm2_activation_generator_systemd_red_hat.c | 4 +- test/api/lvtest.c | 2 +- test/api/pe_start.c | 2 +- test/api/percent.c | 2 +- test/api/test.c | 2 +- test/api/thin_percent.c | 2 +- test/api/vglist.c | 2 +- test/api/vgtest.c | 2 +- test/unit/bcache_t.c | 2 +- test/unit/bcache_utils_t.c | 2 +- test/unit/bitset_t.c | 2 +- test/unit/config_t.c | 2 +- test/unit/dmlist_t.c | 2 +- test/unit/dmstatus_t.c | 2 +- test/unit/framework.h | 2 +- test/unit/io_engine_t.c | 2 +- test/unit/matcher_t.c | 2 +- test/unit/percent_t.c | 2 +- test/unit/string_t.c | 2 +- tools/dmsetup.c | 6 +- tools/lvchange.c | 2 +- tools/lvconvert.c | 4 +- tools/lvconvert_poll.h | 2 +- tools/lvm2cmd-static.c | 2 +- tools/lvm2cmd.c | 2 +- tools/lvmcmdlib.c | 6 +- tools/lvmcmdline.c | 8 +- tools/lvpoll.c | 4 +- tools/polldaemon.c | 4 +- tools/pvmove.c | 6 +- tools/pvscan.c | 4 +- tools/reporter.c | 2 +- tools/tool.h | 4 +- tools/toollib.c | 2 +- tools/toollib.h | 4 +- tools/tools.h | 44 ++++++------ tools/vgcfgrestore.c | 2 +- tools/vgimportclone.c | 6 +- 250 files changed, 915 insertions(+), 1017 deletions(-) diff --git a/configure b/configure index e874932..3b88dad 100755 --- a/configure +++ b/configure @@ -15559,7 +15559,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/ Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lv m2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/li blvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_syst emd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16281,7 +16281,6 @@ do "conf/lvmlocal.conf") CONFIG_FILES="$CONFIG_FILES conf/lvmlocal.conf" ;; "conf/command_profile_template.profile") CONFIG_FILES="$CONFIG_FILES conf/command_profile_template.profile" ;; "conf/metadata_profile_template.profile") CONFIG_FILES="$CONFIG_FILES conf/metadata_profile_template.profile" ;; - "include/.symlinks") CONFIG_FILES="$CONFIG_FILES include/.symlinks" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/locking/Makefile") CONFIG_FILES="$CONFIG_FILES lib/locking/Makefile" ;; diff --git a/configure.ac b/configure.ac index 5738b05..a05f051 100644 --- a/configure.ac +++ b/configure.ac @@ -2113,7 +2113,6 @@ conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile -include/.symlinks include/Makefile lib/Makefile lib/locking/Makefile diff --git a/daemons/clvmd/clvmd-cman.c b/daemons/clvmd/clvmd-cman.c index ece9229..8cf7f17 100644 --- a/daemons/clvmd/clvmd-cman.c +++ b/daemons/clvmd/clvmd-cman.c @@ -22,7 +22,7 @@ #include <pthread.h> #include "clvmd-comms.h" -#include "clvm.h" +#include "daemons/clvmd/clvm.h" #include "clvmd.h" #include "lvm-functions.h" diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c index ce7f500..342adda 100644 --- a/daemons/clvmd/clvmd-command.c +++ b/daemons/clvmd/clvmd-command.c @@ -52,12 +52,12 @@ #include "clvmd-common.h" #include "clvmd-comms.h" -#include "clvm.h" +#include "daemons/clvmd/clvm.h" #include "clvmd.h" -#include "lvm-globals.h" +#include "lib/misc/lvm-globals.h" #include "lvm-functions.h" -#include "locking.h" +#include "lib/locking/locking.h" #include <sys/utsname.h> diff --git a/daemons/clvmd/clvmd-common.h b/daemons/clvmd/clvmd-common.h index 3be0e1d..fb1c487 100644 --- a/daemons/clvmd/clvmd-common.h +++ b/daemons/clvmd/clvmd-common.h @@ -20,8 +20,8 @@ #define _REENTRANT -#include "tool.h" +#include "tools/tool.h" -#include "lvm-logging.h" +#include "lib/log/lvm-logging.h" #endif diff --git a/daemons/clvmd/clvmd-corosync.c b/daemons/clvmd/clvmd-corosync.c index 2227cbf..6a9705d 100644 --- a/daemons/clvmd/clvmd-corosync.c +++ b/daemons/clvmd/clvmd-corosync.c @@ -21,12 +21,12 @@ #include <pthread.h> -#include "clvm.h" +#include "daemons/clvmd/clvm.h" #include "clvmd-comms.h" #include "clvmd.h" #include "lvm-functions.h" -#include "locking.h" +#include "lib/locking/locking.h" #include <corosync/cpg.h> #include <corosync/quorum.h> diff --git a/daemons/clvmd/clvmd-openais.c b/daemons/clvmd/clvmd-openais.c index 6e09bf6..6b4fb10 100644 --- a/daemons/clvmd/clvmd-openais.c +++ b/daemons/clvmd/clvmd-openais.c @@ -29,8 +29,8 @@ #include <corosync/corotypes.h> #include <corosync/cpg.h> -#include "locking.h" -#include "clvm.h" +#include "lib/locking/locking.h" +#include "daemons/clvmd/clvm.h" #include "clvmd-comms.h" #include "lvm-functions.h" #include "clvmd.h" diff --git a/daemons/clvmd/clvmd-singlenode.c b/daemons/clvmd/clvmd-singlenode.c index af0a544..2d53f13 100644 --- a/daemons/clvmd/clvmd-singlenode.c +++ b/daemons/clvmd/clvmd-singlenode.c @@ -16,8 +16,8 @@ #include <pthread.h> -#include "locking.h" -#include "clvm.h" +#include "lib/locking/locking.h" +#include "daemons/clvmd/clvm.h" #include "clvmd-comms.h" #include "clvmd.h" diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c index 829c5e5..73f4711 100644 --- a/daemons/clvmd/clvmd.c +++ b/daemons/clvmd/clvmd.c @@ -20,7 +20,7 @@ #include "clvmd-common.h" #include "clvmd-comms.h" -#include "clvm.h" +#include "daemons/clvmd/clvm.h" #include "clvmd.h" #include "lvm-functions.h" #include "lvm-version.h" diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index 34da66d..c287fad 100644 --- a/daemons/clvmd/lvm-functions.c +++ b/daemons/clvmd/lvm-functions.c @@ -17,18 +17,18 @@ #include <pthread.h> -#include "clvm.h" +#include "daemons/clvmd/clvm.h" #include "clvmd-comms.h" #include "clvmd.h" #include "lvm-functions.h" /* LVM2 headers */ -#include "toolcontext.h" -#include "lvmcache.h" -#include "lvm-globals.h" -#include "activate.h" -#include "archiver.h" -#include "memlock.h" +#include "lib/commands/toolcontext.h" +#include "lib/cache/lvmcache.h" +#include "lib/misc/lvm-globals.h" +#include "lib/activate/activate.h" +#include "lib/format_text/archiver.h" +#include "lib/mm/memlock.h" #include <syslog.h> diff --git a/daemons/clvmd/refresh_clvmd.c b/daemons/clvmd/refresh_clvmd.c index 6f89566..c80e09f 100644 --- a/daemons/clvmd/refresh_clvmd.c +++ b/daemons/clvmd/refresh_clvmd.c @@ -21,7 +21,7 @@ #include "clvmd-common.h" -#include "clvm.h" +#include "daemons/clvmd/clvm.h" #include "refresh_clvmd.h" #include <stddef.h> diff --git a/daemons/cmirrord/cluster.c b/daemons/cmirrord/cluster.c index 180e34a..6bb9d63 100644 --- a/daemons/cmirrord/cluster.c +++ b/daemons/cmirrord/cluster.c @@ -16,7 +16,7 @@ #include "functions.h" #include "link_mon.h" #include "local.h" -#include "xlate.h" +#include "lib/mm/xlate.h" #include <corosync/cpg.h> #include <errno.h> diff --git a/daemons/cmirrord/cluster.h b/daemons/cmirrord/cluster.h index 5b1e58b..0efbd64 100644 --- a/daemons/cmirrord/cluster.h +++ b/daemons/cmirrord/cluster.h @@ -12,8 +12,8 @@ #ifndef _LVM_CLOG_CLUSTER_H #define _LVM_CLOG_CLUSTER_H -#include "dm-log-userspace.h" -#include "libdevmapper.h" +#include "libdm/misc/dm-log-userspace.h" +#include "libdm/libdevmapper.h" #define DM_ULOG_RESPONSE 0x1000U /* in last byte of 32-bit value */ #define DM_ULOG_CHECKPOINT_READY 21 diff --git a/daemons/cmirrord/compat.c b/daemons/cmirrord/compat.c index a9696d7..c0dd793 100644 --- a/daemons/cmirrord/compat.c +++ b/daemons/cmirrord/compat.c @@ -8,7 +8,7 @@ #include "logging.h" #include "cluster.h" #include "compat.h" -#include "xlate.h" +#include "lib/mm/xlate.h" #include <errno.h> diff --git a/daemons/cmirrord/functions.h b/daemons/cmirrord/functions.h index 4620f99..c770459 100644 --- a/daemons/cmirrord/functions.h +++ b/daemons/cmirrord/functions.h @@ -12,7 +12,7 @@ #ifndef _LVM_CLOG_FUNCTIONS_H #define _LVM_CLOG_FUNCTIONS_H -#include "dm-log-userspace.h" +#include "libdm/misc/dm-log-userspace.h" #include "cluster.h" #define LOG_RESUMED 1 diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c index 8917422..438cf16 100644 --- a/daemons/dmeventd/dmeventd.c +++ b/daemons/dmeventd/dmeventd.c @@ -16,12 +16,12 @@ * dmeventd - dm event daemon to monitor active mapped devices */ -#include "dm-logging.h" +#include "libdm/misc/dm-logging.h" -#include "libdevmapper-event.h" +#include "daemons/dmeventd/libdevmapper-event.h" #include "dmeventd.h" -#include "tool.h" +#include "tools/tool.h" #include <dlfcn.h> #include <pthread.h> diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index 9aeb4c5..a75924c 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -12,9 +12,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dm-logging.h" -#include "dmlib.h" -#include "libdevmapper-event.h" +#include "libdm/misc/dm-logging.h" +#include "libdm/misc/dmlib.h" +#include "daemons/dmeventd/libdevmapper-event.h" #include "dmeventd.h" #include <fcntl.h> diff --git a/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c b/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c index 930f9fc..5861154 100644 --- a/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c +++ b/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c @@ -12,10 +12,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" #include "dmeventd_lvm.h" -#include "libdevmapper-event.h" -#include "lvm2cmd.h" +#include "daemons/dmeventd/libdevmapper-event.h" +#include "tools/lvm2cmd.h" #include <pthread.h> diff --git a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c index 071fb16..ca483fd 100644 --- a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c +++ b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c @@ -12,10 +12,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "libdevmapper-event.h" +#include "lib/misc/lib.h" +#include "daemons/dmeventd/libdevmapper-event.h" #include "dmeventd_lvm.h" -#include "activate.h" /* For TARGET_NAME* */ +#include "lib/activate/activate.h" /* FIXME Reformat to 80 char lines. */ diff --git a/daemons/dmeventd/plugins/raid/dmeventd_raid.c b/daemons/dmeventd/plugins/raid/dmeventd_raid.c index 52cf43d..7871500 100644 --- a/daemons/dmeventd/plugins/raid/dmeventd_raid.c +++ b/daemons/dmeventd/plugins/raid/dmeventd_raid.c @@ -12,10 +12,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "defaults.h" +#include "lib/misc/lib.h" +#include "lib/config/defaults.h" #include "dmeventd_lvm.h" -#include "libdevmapper-event.h" +#include "daemons/dmeventd/libdevmapper-event.h" /* Hold enough elements for the mximum number of RAID images */ #define RAID_DEVS_ELEMS ((DEFAULT_RAID_MAX_IMAGES + 63) / 64) diff --git a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c index 93697a0..6ffa9fc 100644 --- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c +++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c @@ -12,9 +12,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" #include "dmeventd_lvm.h" -#include "libdevmapper-event.h" +#include "daemons/dmeventd/libdevmapper-event.h" #include <sys/sysmacros.h> #include <sys/wait.h> diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c index 29b0391..14bfd80 100644 --- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c +++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c @@ -12,16 +12,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" /* using here lvm log */ +#include "lib/misc/lib.h" #include "dmeventd_lvm.h" -#include "libdevmapper-event.h" +#include "daemons/dmeventd/libdevmapper-event.h" #include <sys/wait.h> #include <stdarg.h> /* TODO - move this mountinfo code into library to be reusable */ #ifdef __linux__ -# include "kdev_t.h" +# include "libdm/misc/kdev_t.h" #else # define MAJOR(x) major((x)) # define MINOR(x) minor((x)) diff --git a/daemons/dmfilemapd/dmfilemapd.c b/daemons/dmfilemapd/dmfilemapd.c index 7519799..7fc95c8 100644 --- a/daemons/dmfilemapd/dmfilemapd.c +++ b/daemons/dmfilemapd/dmfilemapd.c @@ -14,11 +14,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "tool.h" +#include "tools/tool.h" -#include "dm-logging.h" +#include "libdm/misc/dm-logging.h" -#include "defaults.h" +#include "lib/config/defaults.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/daemons/lvmetad/lvmetactl.c b/daemons/lvmetad/lvmetactl.c index dd2ee1e..7805409 100644 --- a/daemons/lvmetad/lvmetactl.c +++ b/daemons/lvmetad/lvmetactl.c @@ -8,9 +8,9 @@ * of the GNU Lesser General Public License v.2.1. */ -#include "tool.h" +#include "tools/tool.h" -#include "lvmetad-client.h" +#include "daemons/lvmetad/lvmetad-client.h" daemon_handle h; diff --git a/daemons/lvmetad/lvmetad-client.h b/daemons/lvmetad/lvmetad-client.h index be2623a..a9d4d83 100644 --- a/daemons/lvmetad/lvmetad-client.h +++ b/daemons/lvmetad/lvmetad-client.h @@ -15,7 +15,7 @@ #ifndef _LVM_LVMETAD_CLIENT_H #define _LVM_LVMETAD_CLIENT_H -#include "daemon-client.h" +#include "libdaemon/client/daemon-client.h" #define LVMETAD_SOCKET DEFAULT_RUN_DIR "/lvmetad.socket" diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c index 72473d7..8858e29 100644 --- a/daemons/lvmetad/lvmetad-core.c +++ b/daemons/lvmetad/lvmetad-core.c @@ -16,13 +16,13 @@ #define _REENTRANT -#include "tool.h" +#include "tools/tool.h" -#include "daemon-io.h" +#include "libdaemon/client/daemon-io.h" #include "daemon-server.h" #include "daemon-log.h" #include "lvm-version.h" -#include "lvmetad-client.h" +#include "daemons/lvmetad/lvmetad-client.h" #include <assert.h> #include <errno.h> diff --git a/daemons/lvmetad/testclient.c b/daemons/lvmetad/testclient.c index c9efbe6..06fa332 100644 --- a/daemons/lvmetad/testclient.c +++ b/daemons/lvmetad/testclient.c @@ -11,12 +11,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "tool.h" +#include "tools/tool.h" -#include "lvmetad-client.h" -#include "label.h" -#include "lvmcache.h" -#include "metadata.h" +#include "daemons/lvmetad/lvmetad-client.h" +#include "lib/label/label.h" +#include "lib/cache/lvmcache.h" +#include "lib/metadata/metadata.h" const char *uuid1 = "abcd-efgh"; const char *uuid2 = "bbcd-efgh"; diff --git a/daemons/lvmlockd/lvmlockctl.c b/daemons/lvmlockd/lvmlockctl.c index 436221d..2442b46 100644 --- a/daemons/lvmlockd/lvmlockctl.c +++ b/daemons/lvmlockd/lvmlockctl.c @@ -8,9 +8,9 @@ * of the GNU Lesser General Public License v.2.1. */ -#include "tool.h" +#include "tools/tool.h" -#include "lvmlockd-client.h" +#include "daemons/lvmlockd/lvmlockd-client.h" #include <stddef.h> #include <getopt.h> diff --git a/daemons/lvmlockd/lvmlockd-client.h b/daemons/lvmlockd/lvmlockd-client.h index bc90596..16d1613 100644 --- a/daemons/lvmlockd/lvmlockd-client.h +++ b/daemons/lvmlockd/lvmlockd-client.h @@ -11,7 +11,7 @@ #ifndef _LVM_LVMLOCKD_CLIENT_H #define _LVM_LVMLOCKD_CLIENT_H -#include "daemon-client.h" +#include "libdaemon/client/daemon-client.h" #define LVMLOCKD_SOCKET DEFAULT_RUN_DIR "/lvmlockd.socket" diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c index df6e214..e75d02b 100644 --- a/daemons/lvmlockd/lvmlockd-core.c +++ b/daemons/lvmlockd/lvmlockd-core.c @@ -12,14 +12,14 @@ #define _ISOC99_SOURCE #define _REENTRANT -#include "tool.h" +#include "tools/tool.h" -#include "daemon-io.h" +#include "libdaemon/client/daemon-io.h" #include "daemon-server.h" #include "lvm-version.h" -#include "lvmetad-client.h" -#include "lvmlockd-client.h" -#include "dm-ioctl.h" /* for DM_UUID_LEN */ +#include "daemons/lvmetad/lvmetad-client.h" +#include "daemons/lvmlockd/lvmlockd-client.h" +#include "libdm/misc/dm-ioctl.h" /* #include <assert.h> */ #include <errno.h> diff --git a/daemons/lvmlockd/lvmlockd-dlm.c b/daemons/lvmlockd/lvmlockd-dlm.c index d9dfabb..668c75b 100644 --- a/daemons/lvmlockd/lvmlockd-dlm.c +++ b/daemons/lvmlockd/lvmlockd-dlm.c @@ -11,13 +11,13 @@ #define _XOPEN_SOURCE 500 /* pthread */ #define _ISOC99_SOURCE -#include "tool.h" +#include "tools/tool.h" #include "daemon-server.h" -#include "xlate.h" +#include "lib/mm/xlate.h" #include "lvmlockd-internal.h" -#include "lvmlockd-client.h" +#include "daemons/lvmlockd/lvmlockd-client.h" /* * Using synchronous _wait dlm apis so do not define _REENTRANT and diff --git a/daemons/lvmlockd/lvmlockd-sanlock.c b/daemons/lvmlockd/lvmlockd-sanlock.c index a91218b..d5d6864 100644 --- a/daemons/lvmlockd/lvmlockd-sanlock.c +++ b/daemons/lvmlockd/lvmlockd-sanlock.c @@ -11,13 +11,13 @@ #define _XOPEN_SOURCE 500 /* pthread */ #define _ISOC99_SOURCE -#include "tool.h" +#include "tools/tool.h" #include "daemon-server.h" -#include "xlate.h" +#include "lib/mm/xlate.h" #include "lvmlockd-internal.h" -#include "lvmlockd-client.h" +#include "daemons/lvmlockd/lvmlockd-client.h" #include "sanlock.h" #include "sanlock_rv.h" diff --git a/daemons/lvmpolld/lvmpolld-common.h b/daemons/lvmpolld/lvmpolld-common.h index b31081a..4ada581 100644 --- a/daemons/lvmpolld/lvmpolld-common.h +++ b/daemons/lvmpolld/lvmpolld-common.h @@ -20,10 +20,10 @@ #define _REENTRANT -#include "tool.h" +#include "tools/tool.h" #include "lvmpolld-cmd-utils.h" -#include "lvmpolld-protocol.h" +#include "daemons/lvmpolld/lvmpolld-protocol.h" #include <assert.h> #include <errno.h> diff --git a/daemons/lvmpolld/lvmpolld-data-utils.c b/daemons/lvmpolld/lvmpolld-data-utils.c index 8debcdd..d5e1139 100644 --- a/daemons/lvmpolld/lvmpolld-data-utils.c +++ b/daemons/lvmpolld/lvmpolld-data-utils.c @@ -14,7 +14,7 @@ #include "lvmpolld-common.h" -#include "config-util.h" +#include "libdaemon/client/config-util.h" #include <fcntl.h> #include <signal.h> diff --git a/daemons/lvmpolld/lvmpolld-protocol.h b/daemons/lvmpolld/lvmpolld-protocol.h index 4e6ae9e..9b9890d 100644 --- a/daemons/lvmpolld/lvmpolld-protocol.h +++ b/daemons/lvmpolld/lvmpolld-protocol.h @@ -15,7 +15,7 @@ #ifndef _LVM_LVMPOLLD_PROTOCOL_H #define _LVM_LVMPOLLD_PROTOCOL_H -#include "polling_ops.h" +#include "daemons/lvmpolld/polling_ops.h" #define LVMPOLLD_PROTOCOL "lvmpolld" #define LVMPOLLD_PROTOCOL_VERSION 1 diff --git a/device-mapper/vdo/status.c b/device-mapper/vdo/status.c index 157111f..1739a7e 100644 --- a/device-mapper/vdo/status.c +++ b/device-mapper/vdo/status.c @@ -1,7 +1,7 @@ #include "target.h" // For DM_ARRAY_SIZE! -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" #include <ctype.h> #include <stdlib.h> diff --git a/doc/example_cmdlib.c b/doc/example_cmdlib.c index 66e3532..ec5e028 100644 --- a/doc/example_cmdlib.c +++ b/doc/example_cmdlib.c @@ -12,7 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lvm2cmd.h" +#include "tools/lvm2cmd.h" #include <stdio.h> /* All output gets passed to this function line-by-line */ diff --git a/include/.symlinks.in b/include/.symlinks.in deleted file mode 100644 index 3d50750..0000000 --- a/include/.symlinks.in +++ /dev/null @@ -1,80 +0,0 @@ -@top_srcdir@/daemons/clvmd/clvm.h -@top_srcdir@/daemons/dmeventd/libdevmapper-event.h -@top_srcdir@/daemons/lvmetad/lvmetad-client.h -@top_srcdir@/daemons/lvmlockd/lvmlockd-client.h -@top_srcdir@/daemons/lvmpolld/lvmpolld-protocol.h -@top_srcdir@/daemons/lvmpolld/polling_ops.h -@top_srcdir@/lib/activate/activate.h -@top_srcdir@/lib/activate/targets.h -@top_srcdir@/lib/cache/lvmcache.h -@top_srcdir@/lib/cache/lvmetad.h -@top_srcdir@/lib/commands/toolcontext.h -@top_srcdir@/lib/config/config.h -@top_srcdir@/lib/config/config_settings.h -@top_srcdir@/lib/config/defaults.h -@top_srcdir@/lib/datastruct/btree.h -@top_srcdir@/lib/datastruct/str_list.h -@top_srcdir@/lib/device/bcache.h -@top_srcdir@/lib/device/dev-cache.h -@top_srcdir@/lib/device/dev-ext-udev-constants.h -@top_srcdir@/lib/device/dev-type.h -@top_srcdir@/lib/device/device-types.h -@top_srcdir@/lib/device/device.h -@top_srcdir@/lib/display/display.h -@top_srcdir@/lib/filters/filter.h -@top_srcdir@/lib/format1/format1.h -@top_srcdir@/lib/format_pool/format_pool.h -@top_srcdir@/lib/format_text/archiver.h -@top_srcdir@/lib/format_text/format-text.h -@top_srcdir@/lib/format_text/text_export.h -@top_srcdir@/lib/format_text/text_import.h -@top_srcdir@/lib/label/label.h -@top_srcdir@/lib/locking/locking.h -@top_srcdir@/lib/locking/lvmlockd.h -@top_srcdir@/lib/log/log.h -@top_srcdir@/lib/log/lvm-logging.h -@top_srcdir@/lib/lvmpolld/lvmpolld-client.h -@top_srcdir@/lib/lvmpolld/polldaemon.h -@top_srcdir@/lib/metadata/lv.h -@top_srcdir@/lib/metadata/lv_alloc.h -@top_srcdir@/lib/metadata/metadata-exported.h -@top_srcdir@/lib/metadata/metadata.h -@top_srcdir@/lib/metadata/pv.h -@top_srcdir@/lib/metadata/pv_alloc.h -@top_srcdir@/lib/metadata/segtype.h -@top_srcdir@/lib/metadata/vg.h -@top_srcdir@/lib/misc/crc.h -@top_srcdir@/lib/misc/intl.h -@top_srcdir@/lib/misc/last-path-component.h -@top_srcdir@/lib/misc/lib.h -@top_srcdir@/lib/misc/lvm-exec.h -@top_srcdir@/lib/misc/lvm-file.h -@top_srcdir@/lib/misc/lvm-flock.h -@top_srcdir@/lib/misc/lvm-globals.h -@top_srcdir@/lib/misc/lvm-maths.h -@top_srcdir@/lib/misc/lvm-percent.h -@top_srcdir@/lib/misc/lvm-signal.h -@top_srcdir@/lib/misc/lvm-string.h -@top_srcdir@/lib/misc/lvm-wrappers.h -@top_srcdir@/lib/misc/sharedlib.h -@top_srcdir@/lib/misc/util.h -@top_srcdir@/lib/mm/memlock.h -@top_srcdir@/lib/mm/xlate.h -@top_srcdir@/lib/notify/lvmnotify.h -@top_srcdir@/lib/properties/prop_common.h -@top_srcdir@/lib/report/properties.h -@top_srcdir@/lib/report/report.h -@top_srcdir@/lib/uuid/uuid.h -@top_srcdir@/libdaemon/client/config-util.h -@top_srcdir@/libdaemon/client/daemon-client.h -@top_srcdir@/libdaemon/client/daemon-io.h -@top_srcdir@/libdm/libdevmapper.h -@top_srcdir@/libdm/misc/dm-ioctl.h -@top_srcdir@/libdm/misc/dm-log-userspace.h -@top_srcdir@/libdm/misc/dm-logging.h -@top_srcdir@/libdm/misc/dmlib.h -@top_srcdir@/libdm/misc/kdev_t.h -@top_srcdir@/liblvm/lvm2app.h -@top_srcdir@/po/pogen.h -@top_srcdir@/tools/lvm2cmd.h -@top_srcdir@/tools/tool.h diff --git a/include/Makefile.in b/include/Makefile.in index b2571fd..cbbc003 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -18,22 +18,4 @@ top_builddir = @top_builddir@ include $(top_builddir)/make.tmpl -all: .symlinks_created - -LINKS := $(shell find . -maxdepth 1 -type l) - -.symlinks_created: .symlinks -ifneq (,$(firstword $(LINKS))) - $(RM) $(LINKS) -endif - for i in `cat $<`; do $(LN_S) $$i ; done - touch $@ - -pofile: all - -device-mapper: all - -cflow: all - -DISTCLEAN_TARGETS += .symlinks configure.h lvm-version.h -CLEAN_TARGETS += $(LINKS) .include_symlinks .symlinks_created +DISTCLEAN_TARGETS += .configure.h lvm-version.h diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 985215a..a15a2d7 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -13,23 +13,23 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "activate.h" -#include "memlock.h" -#include "display.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/activate/activate.h" +#include "lib/mm/memlock.h" +#include "lib/display/display.h" #include "fs.h" -#include "lvm-exec.h" -#include "lvm-file.h" -#include "lvm-string.h" -#include "toolcontext.h" +#include "lib/misc/lvm-exec.h" +#include "lib/misc/lvm-file.h" +#include "lib/misc/lvm-string.h" +#include "lib/commands/toolcontext.h" #include "dev_manager.h" -#include "str_list.h" -#include "config.h" -#include "segtype.h" -#include "sharedlib.h" -#include "lvmcache.h" -#include "metadata.h" +#include "lib/datastruct/str_list.h" +#include "lib/config/config.h" +#include "lib/metadata/segtype.h" +#include "lib/misc/sharedlib.h" +#include "lib/cache/lvmcache.h" +#include "lib/metadata/metadata.h" #include <limits.h> #include <fcntl.h> @@ -413,7 +413,7 @@ void fs_unlock(void) { } /* dev_manager.c */ -#include "targets.h" +#include "lib/activate/targets.h" int add_areas_line(struct dev_manager *dm, struct lv_segment *seg, struct dm_tree_node *node, uint32_t start_area, uint32_t areas) diff --git a/lib/activate/activate.h b/lib/activate/activate.h index d2c6db7..60ee4a7 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -16,7 +16,7 @@ #ifndef LVM_ACTIVATE_H #define LVM_ACTIVATE_H -#include "metadata-exported.h" +#include "lib/metadata/metadata-exported.h" struct lvinfo { int exists; diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index a7947d8..5dd0e6f 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -13,19 +13,19 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" #include "dev_manager.h" -#include "lvm-string.h" +#include "lib/misc/lvm-string.h" #include "fs.h" -#include "defaults.h" -#include "segtype.h" -#include "display.h" -#include "toolcontext.h" -#include "targets.h" -#include "config.h" -#include "activate.h" -#include "lvm-exec.h" -#include "str_list.h" +#include "lib/config/defaults.h" +#include "lib/metadata/segtype.h" +#include "lib/display/display.h" +#include "lib/commands/toolcontext.h" +#include "lib/activate/targets.h" +#include "lib/config/config.h" +#include "lib/activate/activate.h" +#include "lib/misc/lvm-exec.h" +#include "lib/datastruct/str_list.h" #include <limits.h> #include <dirent.h> diff --git a/lib/activate/dev_manager.h b/lib/activate/dev_manager.h index 5be417b..809fd04 100644 --- a/lib/activate/dev_manager.h +++ b/lib/activate/dev_manager.h @@ -16,7 +16,7 @@ #ifndef _LVM_DEV_MANAGER_H #define _LVM_DEV_MANAGER_H -#include "metadata-exported.h" +#include "lib/metadata/metadata-exported.h" struct logical_volume; struct lv_activate_opts; diff --git a/lib/activate/fs.c b/lib/activate/fs.c index 498ec8f..6e07eda 100644 --- a/lib/activate/fs.c +++ b/lib/activate/fs.c @@ -13,13 +13,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" #include "fs.h" -#include "activate.h" -#include "toolcontext.h" -#include "lvm-string.h" -#include "lvm-file.h" -#include "memlock.h" +#include "lib/activate/activate.h" +#include "lib/commands/toolcontext.h" +#include "lib/misc/lvm-string.h" +#include "lib/misc/lvm-file.h" +#include "lib/mm/memlock.h" #include <sys/stat.h> #include <fcntl.h> diff --git a/lib/activate/fs.h b/lib/activate/fs.h index 37938ec..b0dbadc 100644 --- a/lib/activate/fs.h +++ b/lib/activate/fs.h @@ -16,7 +16,7 @@ #ifndef _LVM_FS_H #define _LVM_FS_H -#include "metadata.h" +#include "lib/metadata/metadata.h" /* * These calls, private to the activate unit, set diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 290d733..dc72dee 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -13,19 +13,19 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "lvmcache.h" -#include "toolcontext.h" -#include "dev-cache.h" -#include "locking.h" -#include "metadata.h" -#include "memlock.h" -#include "str_list.h" -#include "format-text.h" -#include "config.h" - -#include "lvmetad.h" -#include "lvmetad-client.h" +#include "lib/misc/lib.h" +#include "lib/cache/lvmcache.h" +#include "lib/commands/toolcontext.h" +#include "lib/device/dev-cache.h" +#include "lib/locking/locking.h" +#include "lib/metadata/metadata.h" +#include "lib/mm/memlock.h" +#include "lib/datastruct/str_list.h" +#include "lib/format_text/format-text.h" +#include "lib/config/config.h" + +#include "lib/cache/lvmetad.h" +#include "daemons/lvmetad/lvmetad-client.h" #define CACHE_LOCKED 0x00000002 diff --git a/lib/cache/lvmcache.h b/lib/cache/lvmcache.h index 797ff21..3bda64a 100644 --- a/lib/cache/lvmcache.h +++ b/lib/cache/lvmcache.h @@ -16,11 +16,11 @@ #ifndef _LVM_CACHE_H #define _LVM_CACHE_H -#include "dev-cache.h" -#include "dev-type.h" -#include "uuid.h" -#include "label.h" -#include "locking.h" +#include "lib/device/dev-cache.h" +#include "lib/device/dev-type.h" +#include "lib/uuid/uuid.h" +#include "lib/label/label.h" +#include "lib/locking/locking.h" #define ORPHAN_PREFIX VG_ORPHANS #define ORPHAN_VG_NAME(fmt) ORPHAN_PREFIX "_" fmt diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index 235f72b..757d269 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -12,18 +12,18 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "metadata.h" -#include "device.h" -#include "lvmetad.h" -#include "lvmcache.h" -#include "lvmetad-client.h" -#include "format-text.h" // TODO for disk_locn, used as a DA representation -#include "crc.h" -#include "lvm-signal.h" -#include "lvmlockd.h" -#include "str_list.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/metadata.h" +#include "lib/device/device.h" +#include "lib/cache/lvmetad.h" +#include "lib/cache/lvmcache.h" +#include "daemons/lvmetad/lvmetad-client.h" +#include "lib/format_text/format-text.h" +#include "lib/misc/crc.h" +#include "lib/misc/lvm-signal.h" +#include "lib/locking/lvmlockd.h" +#include "lib/datastruct/str_list.h" #include <time.h> diff --git a/lib/cache/lvmetad.h b/lib/cache/lvmetad.h index 73c2645..3363607 100644 --- a/lib/cache/lvmetad.h +++ b/lib/cache/lvmetad.h @@ -15,7 +15,7 @@ #ifndef _LVM_METAD_H #define _LVM_METAD_H -#include "config-util.h" +#include "libdaemon/client/config-util.h" #include <stdint.h> diff --git a/lib/cache_segtype/cache.c b/lib/cache_segtype/cache.c index 26f3e32..b7119d2 100644 --- a/lib/cache_segtype/cache.c +++ b/lib/cache_segtype/cache.c @@ -12,18 +12,18 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "segtype.h" -#include "display.h" -#include "text_export.h" -#include "config.h" -#include "str_list.h" -#include "lvm-string.h" -#include "activate.h" -#include "metadata.h" -#include "lv_alloc.h" -#include "defaults.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" +#include "lib/display/display.h" +#include "lib/format_text/text_export.h" +#include "lib/config/config.h" +#include "lib/datastruct/str_list.h" +#include "lib/misc/lvm-string.h" +#include "lib/activate/activate.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/lv_alloc.h" +#include "lib/config/defaults.h" static const char _cache_module[] = "cache"; #define CACHE_POLICY_WHEN_MISSING "mq" diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index e9f9357..7d0640a 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -13,27 +13,27 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "metadata.h" -#include "defaults.h" -#include "lvm-string.h" -#include "activate.h" -#include "filter.h" -#include "label.h" -#include "lvm-file.h" -#include "format-text.h" -#include "display.h" -#include "memlock.h" -#include "str_list.h" -#include "segtype.h" -#include "lvmcache.h" -#include "lvmetad.h" -#include "archiver.h" -#include "lvmpolld-client.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/metadata.h" +#include "lib/config/defaults.h" +#include "lib/misc/lvm-string.h" +#include "lib/activate/activate.h" +#include "lib/filters/filter.h" +#include "lib/label/label.h" +#include "lib/misc/lvm-file.h" +#include "lib/format_text/format-text.h" +#include "lib/display/display.h" +#include "lib/mm/memlock.h" +#include "lib/datastruct/str_list.h" +#include "lib/metadata/segtype.h" +#include "lib/cache/lvmcache.h" +#include "lib/cache/lvmetad.h" +#include "lib/format_text/archiver.h" +#include "lib/lvmpolld/lvmpolld-client.h" #ifdef HAVE_LIBDL -#include "sharedlib.h" +#include "lib/misc/sharedlib.h" #endif #include <locale.h> diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index 83c8e82..b46e301 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -16,8 +16,8 @@ #ifndef _LVM_TOOLCONTEXT_H #define _LVM_TOOLCONTEXT_H -#include "dev-cache.h" -#include "dev-type.h" +#include "lib/device/dev-cache.h" +#include "lib/device/dev-type.h" #include <limits.h> diff --git a/lib/config/config.c b/lib/config/config.c index ad816c2..c638d75 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -14,16 +14,16 @@ */ -#include "lib.h" +#include "lib/misc/lib.h" -#include "config.h" -#include "crc.h" -#include "device.h" -#include "str_list.h" -#include "toolcontext.h" -#include "lvm-file.h" -#include "memlock.h" -#include "label.h" +#include "lib/config/config.h" +#include "lib/misc/crc.h" +#include "lib/device/device.h" +#include "lib/datastruct/str_list.h" +#include "lib/commands/toolcontext.h" +#include "lib/misc/lvm-file.h" +#include "lib/mm/memlock.h" +#include "lib/label/label.h" #include <sys/stat.h> #include <sys/mman.h> @@ -71,7 +71,7 @@ static struct cfg_def_item _cfg_def_items[CFG_COUNT + 1] = { #define cfg_runtime(id, name, parent, flags, type, since_version, deprecated_since_version, deprecation_comment, comment) {id, parent, name, type, {.fn_##type = get_default_##id}, (flags) | CFG_DEFAULT_RUN_TIME, since_version, {.fn_UNCONFIGURED = get_default_unconfigured_##id}, deprecated_since_version, (deprecation_comment), comment}, #define cfg_array(id, name, parent, flags, types, default_value, since_version, unconfigured_value, deprecated_since_version, deprecation_comment, comment) {id, parent, name, CFG_TYPE_ARRAY | (types), {.v_CFG_TYPE_STRING = (default_value)}, (flags), (since_version), {.v_UNCONFIGURED = (unconfigured_value)}, deprecated_since_version, deprecation_comment, comment}, #define cfg_array_runtime(id, name, parent, flags, types, since_version, deprecated_since_version, deprecation_comment, comment) {id, parent, name, CFG_TYPE_ARRAY | (types), {.fn_CFG_TYPE_STRING = get_default_##id}, (flags) | CFG_DEFAULT_RUN_TIME, (since_version), {.fn_UNCONFIGURED = get_default_unconfigured_##id}, deprecated_since_version, deprecation_comment, comment}, -#include "config_settings.h" +#include "lib/config/config_settings.h" #undef cfg_section #undef cfg #undef cfg_runtime diff --git a/lib/config/config.h b/lib/config/config.h index d01306b..b797c78 100644 --- a/lib/config/config.h +++ b/lib/config/config.h @@ -16,8 +16,8 @@ #ifndef _LVM_CONFIG_H #define _LVM_CONFIG_H -#include "libdevmapper.h" -#include "device.h" +#include "libdm/libdevmapper.h" +#include "lib/device/device.h" /* 16 bits: 3 bits for major, 4 bits for minor, 9 bits for patchlevel */ /* FIXME Max LVM version supported: 7.15.511. Extend bits when needed. */ @@ -196,7 +196,7 @@ enum { #define cfg_runtime(id, name, parent, flags, type, since_version, deprecated_since_version, deprecation_comment, comment) id, #define cfg_array(id, name, parent, flags, types, default_value, since_version, unconfigured_value, deprecated_since_version, deprecation_comment, comment) id, #define cfg_array_runtime(id, name, parent, flags, types, since_version, deprecated_since_version, deprecation_comment, comment) id, -#include "config_settings.h" +#include "lib/config/config_settings.h" #undef cfg_section #undef cfg #undef cfg_runtime diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index d8db7df..c591b8a 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -117,7 +117,7 @@ * default values, the new defaults are used by LVM unless * the previous default value was set (uncommented) in lvm.conf. */ -#include "defaults.h" +#include "lib/config/defaults.h" cfg_section(root_CFG_SECTION, "(root)", root_CFG_SECTION, 0, vsn(0, 0, 0), 0, NULL, NULL) diff --git a/lib/datastruct/btree.c b/lib/datastruct/btree.c index 67d1492..efb2166 100644 --- a/lib/datastruct/btree.c +++ b/lib/datastruct/btree.c @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "btree.h" +#include "lib/misc/lib.h" +#include "lib/datastruct/btree.h" struct node { uint32_t key; diff --git a/lib/datastruct/str_list.c b/lib/datastruct/str_list.c index 6fe5672..efbdeda 100644 --- a/lib/datastruct/str_list.c +++ b/lib/datastruct/str_list.c @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "str_list.h" +#include "lib/misc/lib.h" +#include "lib/datastruct/str_list.h" struct dm_list *str_list_create(struct dm_pool *mem) { diff --git a/lib/device/bcache-utils.c b/lib/device/bcache-utils.c index a533a66..2553554 100644 --- a/lib/device/bcache-utils.c +++ b/lib/device/bcache-utils.c @@ -12,7 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "bcache.h" +#include "lib/device/bcache.h" // FIXME: need to define this in a common place (that doesn't pull in deps) #ifndef SECTOR_SHIFT diff --git a/lib/device/bcache.c b/lib/device/bcache.c index 9085d87..aa6bb7a 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -14,9 +14,9 @@ #define _GNU_SOURCE -#include "bcache.h" -#include "dm-logging.h" -#include "log.h" +#include "lib/device/bcache.h" +#include "libdm/misc/dm-logging.h" +#include "lib/log/log.h" #include <errno.h> #include <fcntl.h> diff --git a/lib/device/bcache.h b/lib/device/bcache.h index b0aebb4..cf3d668 100644 --- a/lib/device/bcache.h +++ b/lib/device/bcache.h @@ -15,7 +15,7 @@ #ifndef BCACHE_H #define BCACHE_H -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" #include <linux/fs.h> #include <stdint.h> diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 15d4cdf..f3c2326 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -13,12 +13,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "btree.h" -#include "config.h" -#include "toolcontext.h" -#include "dm-ioctl.h" /* for DM_UUID_LEN */ -#include "lvm-string.h" /* for LVM's UUID_PREFIX */ +#include "lib/misc/lib.h" +#include "lib/datastruct/btree.h" +#include "lib/config/config.h" +#include "lib/commands/toolcontext.h" +#include "libdm/misc/dm-ioctl.h" +#include "lib/misc/lvm-string.h" #ifdef UDEV_SYNC_SUPPORT #include <libudev.h> diff --git a/lib/device/dev-cache.h b/lib/device/dev-cache.h index 4797274..1a822b8 100644 --- a/lib/device/dev-cache.h +++ b/lib/device/dev-cache.h @@ -16,8 +16,8 @@ #ifndef _LVM_DEV_CACHE_H #define _LVM_DEV_CACHE_H -#include "device.h" -#include "lvm-wrappers.h" +#include "lib/device/device.h" +#include "lib/misc/lvm-wrappers.h" /* * predicate for devices. diff --git a/lib/device/dev-dasd.c b/lib/device/dev-dasd.c index ab9b00f..dc11030 100644 --- a/lib/device/dev-dasd.c +++ b/lib/device/dev-dasd.c @@ -12,9 +12,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "dev-type.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/device/dev-type.h" #include <sys/ioctl.h> #ifdef __linux__ diff --git a/lib/device/dev-ext.c b/lib/device/dev-ext.c index 0c3b435..15e9c2b 100644 --- a/lib/device/dev-ext.c +++ b/lib/device/dev-ext.c @@ -12,8 +12,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "device.h" +#include "lib/misc/lib.h" +#include "lib/device/device.h" #ifdef UDEV_SYNC_SUPPORT #include <libudev.h> diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index cce5a94..225fb36 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -13,12 +13,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "device.h" -#include "metadata.h" -#include "lvmcache.h" -#include "memlock.h" -#include "locking.h" +#include "lib/misc/lib.h" +#include "lib/device/device.h" +#include "lib/metadata/metadata.h" +#include "lib/cache/lvmcache.h" +#include "lib/mm/memlock.h" +#include "lib/locking/locking.h" #include <limits.h> #include <sys/stat.h> diff --git a/lib/device/dev-luks.c b/lib/device/dev-luks.c index 25a8b2c..344a554 100644 --- a/lib/device/dev-luks.c +++ b/lib/device/dev-luks.c @@ -12,8 +12,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "dev-type.h" +#include "lib/misc/lib.h" +#include "lib/device/dev-type.h" #define LUKS_SIGNATURE "LUKS\xba\xbe" #define LUKS_SIGNATURE_SIZE 6 diff --git a/lib/device/dev-lvm1-pool.c b/lib/device/dev-lvm1-pool.c index 1fc3805..b51aba5 100644 --- a/lib/device/dev-lvm1-pool.c +++ b/lib/device/dev-lvm1-pool.c @@ -12,9 +12,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "dev-type.h" -#include "xlate.h" +#include "lib/misc/lib.h" +#include "lib/device/dev-type.h" +#include "lib/mm/xlate.h" /* * These lvm1 structs just used NAME_LEN in the previous format1 lvm2 code, but diff --git a/lib/device/dev-md.c b/lib/device/dev-md.c index f32c1c3..6e69e45 100644 --- a/lib/device/dev-md.c +++ b/lib/device/dev-md.c @@ -13,12 +13,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "dev-type.h" -#include "xlate.h" +#include "lib/misc/lib.h" +#include "lib/device/dev-type.h" +#include "lib/mm/xlate.h" #ifdef UDEV_SYNC_SUPPORT #include <libudev.h> /* for MD detection using udev db records */ -#include "dev-ext-udev-constants.h" +#include "lib/device/dev-ext-udev-constants.h" #endif #ifdef __linux__ diff --git a/lib/device/dev-swap.c b/lib/device/dev-swap.c index 3bfb72b..564bb58 100644 --- a/lib/device/dev-swap.c +++ b/lib/device/dev-swap.c @@ -12,8 +12,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "dev-type.h" +#include "lib/misc/lib.h" +#include "lib/device/dev-type.h" #ifdef __linux__ diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index 8d4a403..eb33b81 100644 --- a/lib/device/dev-type.c +++ b/lib/device/dev-type.c @@ -12,13 +12,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "dev-type.h" -#include "xlate.h" -#include "config.h" -#include "metadata.h" -#include "bcache.h" -#include "label.h" +#include "lib/misc/lib.h" +#include "lib/device/dev-type.h" +#include "lib/mm/xlate.h" +#include "lib/config/config.h" +#include "lib/metadata/metadata.h" +#include "lib/device/bcache.h" +#include "lib/label/label.h" #include <libgen.h> #include <ctype.h> @@ -29,10 +29,10 @@ #ifdef UDEV_SYNC_SUPPORT #include <libudev.h> -#include "dev-ext-udev-constants.h" +#include "lib/device/dev-ext-udev-constants.h" #endif -#include "device-types.h" +#include "lib/device/device-types.h" struct dev_types *create_dev_types(const char *proc_dir, const struct dm_config_node *cn) diff --git a/lib/device/dev-type.h b/lib/device/dev-type.h index 843e254..210a316 100644 --- a/lib/device/dev-type.h +++ b/lib/device/dev-type.h @@ -15,14 +15,14 @@ #ifndef _LVM_DEV_TYPE_H #define _LVM_DEV_TYPE_H -#include "device.h" -#include "display.h" -#include "label.h" +#include "lib/device/device.h" +#include "lib/display/display.h" +#include "lib/label/label.h" #define NUMBER_OF_MAJORS 4096 #ifdef __linux__ -# include "kdev_t.h" +# include "libdm/misc/kdev_t.h" #else # define MAJOR(x) major((x)) # define MINOR(x) minor((x)) diff --git a/lib/device/device.h b/lib/device/device.h index fd8cbb7..18b4150 100644 --- a/lib/device/device.h +++ b/lib/device/device.h @@ -16,7 +16,7 @@ #ifndef _LVM_DEVICE_H #define _LVM_DEVICE_H -#include "uuid.h" +#include "lib/uuid/uuid.h" #include <fcntl.h> diff --git a/lib/display/display.c b/lib/display/display.c index 9b4be88..c6f855b 100644 --- a/lib/display/display.c +++ b/lib/display/display.c @@ -13,14 +13,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "display.h" -#include "activate.h" -#include "toolcontext.h" -#include "segtype.h" -#include "defaults.h" -#include "lvm-signal.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/display/display.h" +#include "lib/activate/activate.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" +#include "lib/config/defaults.h" +#include "lib/misc/lvm-signal.h" #include <stdarg.h> diff --git a/lib/display/display.h b/lib/display/display.h index 9f9afe9..9911321 100644 --- a/lib/display/display.h +++ b/lib/display/display.h @@ -16,9 +16,9 @@ #ifndef _LVM_DISPLAY_H #define _LVM_DISPLAY_H -#include "metadata-exported.h" -#include "locking.h" -#include "lvm-string.h" +#include "lib/metadata/metadata-exported.h" +#include "lib/locking/locking.h" +#include "lib/misc/lvm-string.h" #include <stdint.h> diff --git a/lib/error/errseg.c b/lib/error/errseg.c index 6b355fc..9f0262a 100644 --- a/lib/error/errseg.c +++ b/lib/error/errseg.c @@ -12,14 +12,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "segtype.h" -#include "display.h" -#include "config.h" -#include "str_list.h" -#include "activate.h" -#include "str_list.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" +#include "lib/display/display.h" +#include "lib/config/config.h" +#include "lib/datastruct/str_list.h" +#include "lib/activate/activate.h" +#include "lib/datastruct/str_list.h" static int _errseg_merge_segments(struct lv_segment *seg1, struct lv_segment *seg2) { diff --git a/lib/filters/filter-composite.c b/lib/filters/filter-composite.c index f15ff12..8d9e061 100644 --- a/lib/filters/filter-composite.c +++ b/lib/filters/filter-composite.c @@ -13,9 +13,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" -#include "device.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" +#include "lib/device/device.h" static int _and_p(struct dev_filter *f, struct device *dev) { diff --git a/lib/filters/filter-fwraid.c b/lib/filters/filter-fwraid.c index 22ef74a..62022b3 100644 --- a/lib/filters/filter-fwraid.c +++ b/lib/filters/filter-fwraid.c @@ -12,12 +12,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" #ifdef UDEV_SYNC_SUPPORT #include <libudev.h> -#include "dev-ext-udev-constants.h" +#include "lib/device/dev-ext-udev-constants.h" #endif #ifdef __linux__ diff --git a/lib/filters/filter-internal.c b/lib/filters/filter-internal.c index cdaee4e..ebbee7e 100644 --- a/lib/filters/filter-internal.c +++ b/lib/filters/filter-internal.c @@ -12,8 +12,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" static DM_LIST_INIT(_allow_devs); diff --git a/lib/filters/filter-md.c b/lib/filters/filter-md.c index bb8a7cf..40d674a 100644 --- a/lib/filters/filter-md.c +++ b/lib/filters/filter-md.c @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" #ifdef __linux__ diff --git a/lib/filters/filter-mpath.c b/lib/filters/filter-mpath.c index 6763be3..a7dc12e 100644 --- a/lib/filters/filter-mpath.c +++ b/lib/filters/filter-mpath.c @@ -12,12 +12,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" -#include "activate.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" +#include "lib/activate/activate.h" #ifdef UDEV_SYNC_SUPPORT #include <libudev.h> -#include "dev-ext-udev-constants.h" +#include "lib/device/dev-ext-udev-constants.h" #endif #ifdef __linux__ diff --git a/lib/filters/filter-partitioned.c b/lib/filters/filter-partitioned.c index 5e1c4e8..a85e182 100644 --- a/lib/filters/filter-partitioned.c +++ b/lib/filters/filter-partitioned.c @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" #define MSG_SKIPPING "%s: Skipping: Partition table signature found" diff --git a/lib/filters/filter-persistent.c b/lib/filters/filter-persistent.c index 3fa57f1..4a17189 100644 --- a/lib/filters/filter-persistent.c +++ b/lib/filters/filter-persistent.c @@ -13,10 +13,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" -#include "config.h" -#include "lvm-file.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" +#include "lib/config/config.h" +#include "lib/misc/lvm-file.h" struct pfilter { char *file; diff --git a/lib/filters/filter-regex.c b/lib/filters/filter-regex.c index f7cc072..c642ec4 100644 --- a/lib/filters/filter-regex.c +++ b/lib/filters/filter-regex.c @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" struct rfilter { struct dm_pool *mem; diff --git a/lib/filters/filter-signature.c b/lib/filters/filter-signature.c index 23b01e7..3aa6284 100644 --- a/lib/filters/filter-signature.c +++ b/lib/filters/filter-signature.c @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" #ifdef __linux__ diff --git a/lib/filters/filter-sysfs.c b/lib/filters/filter-sysfs.c index 93862e6..5b54312 100644 --- a/lib/filters/filter-sysfs.c +++ b/lib/filters/filter-sysfs.c @@ -12,8 +12,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" #ifdef __linux__ diff --git a/lib/filters/filter-type.c b/lib/filters/filter-type.c index 092b023..8ec3025 100644 --- a/lib/filters/filter-type.c +++ b/lib/filters/filter-type.c @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" static int _passes_lvm_type_device_filter(struct dev_filter *f, struct device *dev) { diff --git a/lib/filters/filter-usable.c b/lib/filters/filter-usable.c index 2de2a0f..45c7832 100644 --- a/lib/filters/filter-usable.c +++ b/lib/filters/filter-usable.c @@ -12,12 +12,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "filter.h" -#include "activate.h" /* device_is_usable */ +#include "lib/misc/lib.h" +#include "lib/filters/filter.h" +#include "lib/activate/activate.h" #ifdef UDEV_SYNC_SUPPORT #include <libudev.h> -#include "dev-ext-udev-constants.h" +#include "lib/device/dev-ext-udev-constants.h" #endif static const char *_too_small_to_hold_pv_msg = "Too small to hold a PV"; diff --git a/lib/filters/filter.h b/lib/filters/filter.h index 6245827..ff9cc1b 100644 --- a/lib/filters/filter.h +++ b/lib/filters/filter.h @@ -17,8 +17,8 @@ #ifndef _LVM_FILTER_H #define _LVM_FILTER_H -#include "dev-cache.h" -#include "dev-type.h" +#include "lib/device/dev-cache.h" +#include "lib/device/dev-type.h" struct dev_filter *composite_filter_create(int n, int use_dev_ext_info, struct dev_filter **filters); diff --git a/lib/format_text/archive.c b/lib/format_text/archive.c index 690bc74..f0c4392 100644 --- a/lib/format_text/archive.c +++ b/lib/format_text/archive.c @@ -13,14 +13,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "format-text.h" +#include "lib/misc/lib.h" +#include "lib/format_text/format-text.h" -#include "config.h" +#include "lib/config/config.h" #include "import-export.h" -#include "lvm-string.h" -#include "lvm-file.h" -#include "toolcontext.h" +#include "lib/misc/lvm-string.h" +#include "lib/misc/lvm-file.h" +#include "lib/commands/toolcontext.h" #include <dirent.h> #include <unistd.h> diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c index c8aeb47..9d7be95 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -13,15 +13,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "archiver.h" -#include "format-text.h" -#include "lvm-string.h" -#include "lvmcache.h" -#include "lvmetad.h" -#include "memlock.h" -#include "toolcontext.h" -#include "locking.h" +#include "lib/misc/lib.h" +#include "lib/format_text/archiver.h" +#include "lib/format_text/format-text.h" +#include "lib/misc/lvm-string.h" +#include "lib/cache/lvmcache.h" +#include "lib/cache/lvmetad.h" +#include "lib/mm/memlock.h" +#include "lib/commands/toolcontext.h" +#include "lib/locking/locking.h" #include <unistd.h> diff --git a/lib/format_text/archiver.h b/lib/format_text/archiver.h index e949751..fa4c1a4 100644 --- a/lib/format_text/archiver.h +++ b/lib/format_text/archiver.h @@ -16,7 +16,7 @@ #ifndef _LVM_TOOL_ARCHIVE_H #define _LVM_TOOL_ARCHIVE_H -#include "metadata-exported.h" +#include "lib/metadata/metadata-exported.h" /* * There are two operations that come under the general area of diff --git a/lib/format_text/export.c b/lib/format_text/export.c index 7866d56..2924aea 100644 --- a/lib/format_text/export.c +++ b/lib/format_text/export.c @@ -13,16 +13,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" #include "import-export.h" -#include "metadata.h" -#include "display.h" -#include "lvm-string.h" -#include "segtype.h" -#include "text_export.h" +#include "lib/metadata/metadata.h" +#include "lib/display/display.h" +#include "lib/misc/lvm-string.h" +#include "lib/metadata/segtype.h" +#include "lib/format_text/text_export.h" #include "lvm-version.h" -#include "toolcontext.h" -#include "config-util.h" +#include "lib/commands/toolcontext.h" +#include "libdaemon/client/config-util.h" #include <stdarg.h> #include <time.h> diff --git a/lib/format_text/flags.c b/lib/format_text/flags.c index 7e793b3..69d8afc 100644 --- a/lib/format_text/flags.c +++ b/lib/format_text/flags.c @@ -13,10 +13,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" #include "import-export.h" -#include "lvm-string.h" +#include "lib/misc/lvm-string.h" /* * Bitsets held in the 'status' flags get diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 5c7b72f..c834335 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -13,23 +13,23 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "format-text.h" +#include "lib/misc/lib.h" +#include "lib/format_text/format-text.h" #include "import-export.h" -#include "device.h" -#include "lvm-file.h" -#include "config.h" -#include "display.h" -#include "toolcontext.h" -#include "lvm-string.h" -#include "uuid.h" +#include "lib/device/device.h" +#include "lib/misc/lvm-file.h" +#include "lib/config/config.h" +#include "lib/display/display.h" +#include "lib/commands/toolcontext.h" +#include "lib/misc/lvm-string.h" +#include "lib/uuid/uuid.h" #include "layout.h" -#include "crc.h" -#include "xlate.h" -#include "label.h" -#include "lvmcache.h" -#include "lvmetad.h" -#include "memlock.h" +#include "lib/misc/crc.h" +#include "lib/mm/xlate.h" +#include "lib/label/label.h" +#include "lib/cache/lvmcache.h" +#include "lib/cache/lvmetad.h" +#include "lib/mm/memlock.h" #include <unistd.h> #include <sys/param.h> diff --git a/lib/format_text/format-text.h b/lib/format_text/format-text.h index d6e6b03..1300e58 100644 --- a/lib/format_text/format-text.h +++ b/lib/format_text/format-text.h @@ -16,7 +16,7 @@ #ifndef _LVM_FORMAT_TEXT_H #define _LVM_FORMAT_TEXT_H -#include "metadata.h" +#include "lib/metadata/metadata.h" #define FMT_TEXT_NAME "lvm2" #define FMT_TEXT_ALIAS "text" diff --git a/lib/format_text/import-export.h b/lib/format_text/import-export.h index 920eb3e..b7a8fa6 100644 --- a/lib/format_text/import-export.h +++ b/lib/format_text/import-export.h @@ -16,9 +16,9 @@ #ifndef _LVM_TEXT_IMPORT_EXPORT_H #define _LVM_TEXT_IMPORT_EXPORT_H -#include "config.h" -#include "metadata.h" -#include "lvmcache.h" +#include "lib/config/config.h" +#include "lib/metadata/metadata.h" +#include "lib/cache/lvmcache.h" #include <stdio.h> diff --git a/lib/format_text/import.c b/lib/format_text/import.c index 4b34485..0836662 100644 --- a/lib/format_text/import.c +++ b/lib/format_text/import.c @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" #include "import-export.h" /* FIXME Use tidier inclusion method */ diff --git a/lib/format_text/import_vsn1.c b/lib/format_text/import_vsn1.c index 58f517e..15d4422 100644 --- a/lib/format_text/import_vsn1.c +++ b/lib/format_text/import_vsn1.c @@ -13,20 +13,20 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" #include "import-export.h" -#include "display.h" -#include "toolcontext.h" -#include "lvmcache.h" -#include "lvmetad.h" -#include "lvmlockd.h" -#include "lv_alloc.h" -#include "pv_alloc.h" -#include "segtype.h" -#include "text_import.h" -#include "defaults.h" -#include "str_list.h" +#include "lib/display/display.h" +#include "lib/commands/toolcontext.h" +#include "lib/cache/lvmcache.h" +#include "lib/cache/lvmetad.h" +#include "lib/locking/lvmlockd.h" +#include "lib/metadata/lv_alloc.h" +#include "lib/metadata/pv_alloc.h" +#include "lib/metadata/segtype.h" +#include "lib/format_text/text_import.h" +#include "lib/config/defaults.h" +#include "lib/datastruct/str_list.h" typedef int (*section_fn) (struct format_instance * fid, struct volume_group * vg, const struct dm_config_node * pvn, diff --git a/lib/format_text/layout.h b/lib/format_text/layout.h index 2671bbf..0a63708 100644 --- a/lib/format_text/layout.h +++ b/lib/format_text/layout.h @@ -16,10 +16,10 @@ #ifndef _LVM_TEXT_LAYOUT_H #define _LVM_TEXT_LAYOUT_H -#include "config.h" -#include "metadata.h" -#include "lvmcache.h" -#include "uuid.h" +#include "lib/config/config.h" +#include "lib/metadata/metadata.h" +#include "lib/cache/lvmcache.h" +#include "lib/uuid/uuid.h" /* disk_locn and data_area_list are defined in format-text.h */ diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c index 7d10e06..a7eaa6e 100644 --- a/lib/format_text/text_label.c +++ b/lib/format_text/text_label.c @@ -13,12 +13,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "format-text.h" +#include "lib/misc/lib.h" +#include "lib/format_text/format-text.h" #include "layout.h" -#include "label.h" -#include "xlate.h" -#include "lvmcache.h" +#include "lib/label/label.h" +#include "lib/mm/xlate.h" +#include "lib/cache/lvmcache.h" #include <sys/stat.h> #include <fcntl.h> diff --git a/lib/freeseg/freeseg.c b/lib/freeseg/freeseg.c index 5e22615..90e9cd3 100644 --- a/lib/freeseg/freeseg.c +++ b/lib/freeseg/freeseg.c @@ -12,9 +12,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "segtype.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" static void _freeseg_destroy(struct segment_type *segtype) { diff --git a/lib/label/label.c b/lib/label/label.c index 071c2e7..ba34c7d 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -13,14 +13,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "label.h" -#include "crc.h" -#include "xlate.h" -#include "lvmcache.h" -#include "bcache.h" -#include "toolcontext.h" -#include "activate.h" +#include "lib/misc/lib.h" +#include "lib/label/label.h" +#include "lib/misc/crc.h" +#include "lib/mm/xlate.h" +#include "lib/cache/lvmcache.h" +#include "lib/device/bcache.h" +#include "lib/commands/toolcontext.h" +#include "lib/activate/activate.h" #include <sys/stat.h> #include <fcntl.h> diff --git a/lib/label/label.h b/lib/label/label.h index 3483321..287d6d6 100644 --- a/lib/label/label.h +++ b/lib/label/label.h @@ -16,10 +16,10 @@ #ifndef _LVM_LABEL_H #define _LVM_LABEL_H -#include "uuid.h" -#include "device.h" -#include "bcache.h" -#include "toolcontext.h" +#include "lib/uuid/uuid.h" +#include "lib/device/device.h" +#include "lib/device/bcache.h" +#include "lib/commands/toolcontext.h" #define LABEL_ID "LABELONE" #define LABEL_SIZE SECTOR_SIZE /* Think very carefully before changing this */ diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c index 038f6b6..0830b48 100644 --- a/lib/locking/cluster_locking.c +++ b/lib/locking/cluster_locking.c @@ -19,12 +19,12 @@ * management operations across a cluster. */ -#include "lib.h" -#include "clvm.h" -#include "lvm-string.h" -#include "locking.h" +#include "lib/misc/lib.h" +#include "daemons/clvmd/clvm.h" +#include "lib/misc/lvm-string.h" +#include "lib/locking/locking.h" #include "locking_types.h" -#include "toolcontext.h" +#include "lib/commands/toolcontext.h" #include <assert.h> #include <stddef.h> diff --git a/lib/locking/external_locking.c b/lib/locking/external_locking.c index c89a167..a1169a5 100644 --- a/lib/locking/external_locking.c +++ b/lib/locking/external_locking.c @@ -13,12 +13,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" #include "locking_types.h" -#include "defaults.h" -#include "sharedlib.h" -#include "toolcontext.h" -#include "activate.h" +#include "lib/config/defaults.h" +#include "lib/misc/sharedlib.h" +#include "lib/commands/toolcontext.h" +#include "lib/activate/activate.h" static void *_locking_lib = NULL; static void (*_reset_fn) (void) = NULL; diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index 8dbc54e..d4f47c6 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -13,14 +13,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "locking.h" +#include "lib/misc/lib.h" +#include "lib/locking/locking.h" #include "locking_types.h" -#include "activate.h" -#include "config.h" -#include "defaults.h" -#include "lvm-string.h" -#include "lvm-flock.h" +#include "lib/activate/activate.h" +#include "lib/config/config.h" +#include "lib/config/defaults.h" +#include "lib/misc/lvm-string.h" +#include "lib/misc/lvm-flock.h" #include <limits.h> #include <unistd.h> diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 105419a..9db006f 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -13,16 +13,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "locking.h" +#include "lib/misc/lib.h" +#include "lib/locking/locking.h" #include "locking_types.h" -#include "lvm-string.h" -#include "activate.h" -#include "toolcontext.h" -#include "memlock.h" -#include "defaults.h" -#include "lvmcache.h" -#include "lvm-signal.h" +#include "lib/misc/lvm-string.h" +#include "lib/activate/activate.h" +#include "lib/commands/toolcontext.h" +#include "lib/mm/memlock.h" +#include "lib/config/defaults.h" +#include "lib/cache/lvmcache.h" +#include "lib/misc/lvm-signal.h" #include <assert.h> #include <sys/stat.h> diff --git a/lib/locking/locking.h b/lib/locking/locking.h index f2fbb00..8322bae 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -16,8 +16,8 @@ #ifndef _LVM_LOCKING_H #define _LVM_LOCKING_H -#include "uuid.h" -#include "config.h" +#include "lib/uuid/uuid.h" +#include "lib/config/config.h" struct logical_volume; diff --git a/lib/locking/locking_types.h b/lib/locking/locking_types.h index 3306a8b..c4c832a 100644 --- a/lib/locking/locking_types.h +++ b/lib/locking/locking_types.h @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "metadata.h" -#include "config.h" +#include "lib/metadata/metadata.h" +#include "lib/config/config.h" typedef int (*lock_resource_fn) (struct cmd_context * cmd, const char *resource, uint32_t flags, const struct logical_volume *lv); diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index d78b35c..6c67cf9 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -8,15 +8,15 @@ * of the GNU Lesser General Public License v.2.1. */ -#include "lib.h" -#include "toolcontext.h" -#include "metadata.h" -#include "segtype.h" -#include "activate.h" -#include "lvmetad.h" -#include "lvmlockd.h" -#include "lvmcache.h" -#include "lvmlockd-client.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/segtype.h" +#include "lib/activate/activate.h" +#include "lib/cache/lvmetad.h" +#include "lib/locking/lvmlockd.h" +#include "lib/cache/lvmcache.h" +#include "daemons/lvmlockd/lvmlockd-client.h" static daemon_handle _lvmlockd; static const char *_lvmlockd_socket = NULL; diff --git a/lib/locking/lvmlockd.h b/lib/locking/lvmlockd.h index cf23e9b..0a6ea96 100644 --- a/lib/locking/lvmlockd.h +++ b/lib/locking/lvmlockd.h @@ -11,8 +11,8 @@ #ifndef _LVMLOCKD_H #define _LVMLOCKD_H -#include "config-util.h" -#include "daemon-client.h" +#include "libdaemon/client/config-util.h" +#include "libdaemon/client/daemon-client.h" #define LOCKD_SANLOCK_LV_NAME "lvmlock" diff --git a/lib/locking/no_locking.c b/lib/locking/no_locking.c index 3011746..fa066cc 100644 --- a/lib/locking/no_locking.c +++ b/lib/locking/no_locking.c @@ -13,11 +13,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "locking.h" +#include "lib/misc/lib.h" +#include "lib/locking/locking.h" #include "locking_types.h" -#include "lvm-string.h" -#include "activate.h" +#include "lib/misc/lvm-string.h" +#include "lib/activate/activate.h" /* * No locking diff --git a/lib/log/log.c b/lib/log/log.c index 79fbd7a..a040ca5 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -13,12 +13,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "device.h" -#include "memlock.h" -#include "defaults.h" -#include "report.h" -#include "lvm-file.h" +#include "lib/misc/lib.h" +#include "lib/device/device.h" +#include "lib/mm/memlock.h" +#include "lib/config/defaults.h" +#include "lib/report/report.h" +#include "lib/misc/lvm-file.h" #include <stdio.h> #include <stdarg.h> diff --git a/lib/log/lvm-logging.h b/lib/log/lvm-logging.h index 64c1928..ca93ff4 100644 --- a/lib/log/lvm-logging.h +++ b/lib/log/lvm-logging.h @@ -16,7 +16,7 @@ #ifndef _LVM_LOGGING_H #define _LVM_LOGGING_H -#include "lvm-file.h" +#include "lib/misc/lvm-file.h" __attribute__ ((format(printf, 5, 6))) void print_log(int level, const char *file, int line, int dm_errno_or_class, @@ -35,7 +35,7 @@ void print_log_libdm(int level, const char *file, int line, int dm_errno_or_clas #define LOG_LINE_WITH_CLASS(l, c, x...) \ print_log(l, __FILE__, __LINE__ , c, ## x) -#include "log.h" +#include "lib/log/log.h" int init_custom_log_streams(struct custom_fds *custom_fds); int reopen_standard_stream(FILE **stream, const char *mode); diff --git a/lib/lvmpolld/lvmpolld-client.c b/lib/lvmpolld/lvmpolld-client.c index 6d52f2a..78cf813 100644 --- a/lib/lvmpolld/lvmpolld-client.c +++ b/lib/lvmpolld/lvmpolld-client.c @@ -12,15 +12,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" - -#include "daemon-io.h" -#include "lvmpolld-client.h" -#include "lvmpolld-protocol.h" -#include "metadata-exported.h" -#include "polldaemon.h" -#include "toolcontext.h" -#include "lvm2cmd.h" +#include "lib/misc/lib.h" + +#include "libdaemon/client/daemon-io.h" +#include "lib/lvmpolld/lvmpolld-client.h" +#include "daemons/lvmpolld/lvmpolld-protocol.h" +#include "lib/metadata/metadata-exported.h" +#include "lib/lvmpolld/polldaemon.h" +#include "lib/commands/toolcontext.h" +#include "tools/lvm2cmd.h" struct progress_info { unsigned error:1; diff --git a/lib/lvmpolld/polldaemon.h b/lib/lvmpolld/polldaemon.h index 11688fe..17ef7cb 100644 --- a/lib/lvmpolld/polldaemon.h +++ b/lib/lvmpolld/polldaemon.h @@ -16,7 +16,7 @@ #ifndef _LVM_TOOL_POLLDAEMON_H #define _LVM_TOOL_POLLDAEMON_H -#include "metadata-exported.h" +#include "lib/metadata/metadata-exported.h" typedef enum { PROGRESS_CHECK_FAILED = 0, diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index 2a54682..41a193d 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -12,17 +12,17 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "locking.h" -#include "lvm-string.h" -#include "toolcontext.h" -#include "display.h" -#include "segtype.h" -#include "activate.h" -#include "defaults.h" -#include "lv_alloc.h" -#include "lvm-signal.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/locking/locking.h" +#include "lib/misc/lvm-string.h" +#include "lib/commands/toolcontext.h" +#include "lib/display/display.h" +#include "lib/metadata/segtype.h" +#include "lib/activate/activate.h" +#include "lib/config/defaults.h" +#include "lib/metadata/lv_alloc.h" +#include "lib/misc/lvm-signal.h" /* https://github.com/jthornber/thin-provisioning-tools/blob/master/caching/ca… */ #define DM_TRANSACTION_OVERHEAD 4096 /* KiB */ diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index b19ae34..54edc88 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -13,14 +13,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "display.h" -#include "activate.h" -#include "toolcontext.h" -#include "segtype.h" -#include "str_list.h" -#include "lvmlockd.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/display/display.h" +#include "lib/activate/activate.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" +#include "lib/datastruct/str_list.h" +#include "lib/locking/lvmlockd.h" #include <time.h> #include <sys/utsname.h> diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h index 3fb10ae..920bcb5 100644 --- a/lib/metadata/lv.h +++ b/lib/metadata/lv.h @@ -15,7 +15,7 @@ #ifndef _LVM_LV_H #define _LVM_LV_H -#include "vg.h" +#include "lib/metadata/vg.h" union lvid; struct lv_segment; diff --git a/lib/metadata/lv_alloc.h b/lib/metadata/lv_alloc.h index df51df2..ec672d0 100644 --- a/lib/metadata/lv_alloc.h +++ b/lib/metadata/lv_alloc.h @@ -16,7 +16,7 @@ #ifndef _LVM_LV_ALLOC_H #define _LVM_LV_ALLOC_H -#include "metadata-exported.h" +#include "lib/metadata/metadata-exported.h" struct lv_segment *alloc_lv_segment(const struct segment_type *segtype, struct logical_volume *lv, diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 8c76a38..affc50b 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -13,24 +13,24 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "locking.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/locking/locking.h" #include "pv_map.h" -#include "lvm-string.h" -#include "toolcontext.h" -#include "lv_alloc.h" -#include "pv_alloc.h" -#include "display.h" -#include "segtype.h" -#include "archiver.h" -#include "activate.h" -#include "str_list.h" -#include "defaults.h" -#include "lvm-exec.h" -#include "memlock.h" -#include "lvmlockd.h" -#include "label.h" +#include "lib/misc/lvm-string.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/lv_alloc.h" +#include "lib/metadata/pv_alloc.h" +#include "lib/display/display.h" +#include "lib/metadata/segtype.h" +#include "lib/format_text/archiver.h" +#include "lib/activate/activate.h" +#include "lib/datastruct/str_list.h" +#include "lib/config/defaults.h" +#include "lib/misc/lvm-exec.h" +#include "lib/mm/memlock.h" +#include "lib/locking/lvmlockd.h" +#include "lib/label/label.h" typedef enum { PREFERRED, diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c index 7299620..cf8789c 100644 --- a/lib/metadata/merge.c +++ b/lib/metadata/merge.c @@ -13,13 +13,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include <defaults.h> -#include "metadata.h" -#include "lv_alloc.h" -#include "pv_alloc.h" -#include "str_list.h" -#include "segtype.h" +#include "lib/misc/lib.h" +#include "lib/config/defaults.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/lv_alloc.h" +#include "lib/metadata/pv_alloc.h" +#include "lib/datastruct/str_list.h" +#include "lib/metadata/segtype.h" /* * Attempt to merge two adjacent segments. diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 97184ed..b09c0e6 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -21,11 +21,11 @@ #ifndef _LVM_METADATA_EXPORTED_H #define _LVM_METADATA_EXPORTED_H -#include "uuid.h" -#include "pv.h" -#include "vg.h" -#include "lv.h" -#include "lvm-percent.h" +#include "lib/uuid/uuid.h" +#include "lib/metadata/pv.h" +#include "lib/metadata/vg.h" +#include "lib/metadata/lv.h" +#include "lib/misc/lvm-percent.h" #define MAX_STRIPES 128U #define SECTOR_SHIFT 9L diff --git a/lib/metadata/metadata-liblvm.c b/lib/metadata/metadata-liblvm.c index f7a07a5..cd34724 100644 --- a/lib/metadata/metadata-liblvm.c +++ b/lib/metadata/metadata-liblvm.c @@ -18,14 +18,14 @@ * Ideally this file should be empty as liblvm and toollib should be doing identical things. * FIXME Merge all the code into different parts of the tree. */ -#include "lib.h" -#include "toolcontext.h" -#include "lvm-string.h" -#include "metadata.h" -#include "label.h" -#include "lvm-signal.h" -#include "lvmcache.h" -#include "lvmetad.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/misc/lvm-string.h" +#include "lib/metadata/metadata.h" +#include "lib/label/label.h" +#include "lib/misc/lvm-signal.h" +#include "lib/cache/lvmcache.h" +#include "lib/cache/lvmetad.h" int vg_reduce(struct volume_group *vg, const char *pv_name) { diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index b8f1b97..ddb0fd7 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -13,26 +13,26 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "device.h" -#include "metadata.h" -#include "toolcontext.h" -#include "lvm-string.h" -#include "lvm-file.h" -#include "lvmcache.h" -#include "lvmetad.h" -#include "memlock.h" -#include "str_list.h" -#include "pv_alloc.h" -#include "segtype.h" -#include "activate.h" -#include "display.h" -#include "locking.h" -#include "archiver.h" -#include "defaults.h" -#include "lvmlockd.h" +#include "lib/misc/lib.h" +#include "lib/device/device.h" +#include "lib/metadata/metadata.h" +#include "lib/commands/toolcontext.h" +#include "lib/misc/lvm-string.h" +#include "lib/misc/lvm-file.h" +#include "lib/cache/lvmcache.h" +#include "lib/cache/lvmetad.h" +#include "lib/mm/memlock.h" +#include "lib/datastruct/str_list.h" +#include "lib/metadata/pv_alloc.h" +#include "lib/metadata/segtype.h" +#include "lib/activate/activate.h" +#include "lib/display/display.h" +#include "lib/locking/locking.h" +#include "lib/format_text/archiver.h" +#include "lib/config/defaults.h" +#include "lib/locking/lvmlockd.h" #include "time.h" -#include "lvmnotify.h" +#include "lib/notify/lvmnotify.h" #include <math.h> #include <sys/param.h> diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index 1e3dd1b..3d6750f 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -22,9 +22,9 @@ #define _LVM_METADATA_H #include "ctype.h" -#include "dev-cache.h" -#include "lvm-string.h" -#include "metadata-exported.h" +#include "lib/device/dev-cache.h" +#include "lib/misc/lvm-string.h" +#include "lib/metadata/metadata-exported.h" //#define MAX_STRIPES 128U //#define SECTOR_SHIFT 9L diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 054ca99..807259f 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -13,22 +13,22 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "toolcontext.h" -#include "segtype.h" -#include "display.h" -#include "archiver.h" -#include "activate.h" -#include "lv_alloc.h" -#include "lvm-string.h" -#include "str_list.h" -#include "locking.h" /* FIXME Should not be used in this file */ - -#include "defaults.h" /* FIXME: should this be defaults.h? */ +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" +#include "lib/display/display.h" +#include "lib/format_text/archiver.h" +#include "lib/activate/activate.h" +#include "lib/metadata/lv_alloc.h" +#include "lib/misc/lvm-string.h" +#include "lib/datastruct/str_list.h" +#include "lib/locking/locking.h" + +#include "lib/config/defaults.h" /* These are necessary for _write_log_header() */ -#include "xlate.h" +#include "lib/mm/xlate.h" #define MIRROR_MAGIC 0x4D695272 #define MIRROR_DISK_VERSION 2 diff --git a/lib/metadata/pool_manip.c b/lib/metadata/pool_manip.c index b832db7..20224d1 100644 --- a/lib/metadata/pool_manip.c +++ b/lib/metadata/pool_manip.c @@ -16,16 +16,16 @@ * This file holds common pool functions. */ -#include "lib.h" -#include "activate.h" -#include "locking.h" -#include "metadata.h" -#include "segtype.h" -#include "lv_alloc.h" -#include "defaults.h" -#include "dev-type.h" -#include "display.h" -#include "toolcontext.h" +#include "lib/misc/lib.h" +#include "lib/activate/activate.h" +#include "lib/locking/locking.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/segtype.h" +#include "lib/metadata/lv_alloc.h" +#include "lib/config/defaults.h" +#include "lib/device/dev-type.h" +#include "lib/display/display.h" +#include "lib/commands/toolcontext.h" #include <stddef.h> int attach_pool_metadata_lv(struct lv_segment *pool_seg, diff --git a/lib/metadata/pv.c b/lib/metadata/pv.c index 9bf6075..7b6f778 100644 --- a/lib/metadata/pv.c +++ b/lib/metadata/pv.c @@ -13,9 +13,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "lvmcache.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/cache/lvmcache.h" /* * FIXME: Check for valid handle before dereferencing field or log error? diff --git a/lib/metadata/pv.h b/lib/metadata/pv.h index e452ece..23d2bd7 100644 --- a/lib/metadata/pv.h +++ b/lib/metadata/pv.h @@ -15,8 +15,8 @@ #ifndef _LVM_PV_H #define _LVM_PV_H -#include "uuid.h" -#include "libdevmapper.h" +#include "lib/uuid/uuid.h" +#include "libdm/libdevmapper.h" struct device; struct format_type; diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c index e75be76..eaaa5e6 100644 --- a/lib/metadata/pv_manip.c +++ b/lib/metadata/pv_manip.c @@ -13,14 +13,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "pv_alloc.h" -#include "toolcontext.h" -#include "locking.h" -#include "defaults.h" -#include "display.h" -#include "archiver.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/pv_alloc.h" +#include "lib/commands/toolcontext.h" +#include "lib/locking/locking.h" +#include "lib/config/defaults.h" +#include "lib/display/display.h" +#include "lib/format_text/archiver.h" static struct pv_segment *_alloc_pv_segment(struct dm_pool *mem, struct physical_volume *pv, diff --git a/lib/metadata/pv_map.c b/lib/metadata/pv_map.c index 3707643..3ddb5c8 100644 --- a/lib/metadata/pv_map.c +++ b/lib/metadata/pv_map.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" #include "pv_map.h" #include <assert.h> diff --git a/lib/metadata/pv_map.h b/lib/metadata/pv_map.h index 4f8d0aa..6ffe36d 100644 --- a/lib/metadata/pv_map.h +++ b/lib/metadata/pv_map.h @@ -16,7 +16,7 @@ #ifndef _LVM_PV_MAP_H #define _LVM_PV_MAP_H -#include "metadata.h" +#include "lib/metadata/metadata.h" /* * The in core rep. only stores a mapping from diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 703f285..cef0427 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -12,15 +12,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "archiver.h" -#include "metadata.h" -#include "toolcontext.h" -#include "segtype.h" -#include "display.h" -#include "activate.h" -#include "lv_alloc.h" -#include "lvm-string.h" +#include "lib/misc/lib.h" +#include "lib/format_text/archiver.h" +#include "lib/metadata/metadata.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" +#include "lib/display/display.h" +#include "lib/activate/activate.h" +#include "lib/metadata/lv_alloc.h" +#include "lib/misc/lvm-string.h" typedef int (*fn_on_lv_t)(struct logical_volume *lv, void *data); static int _eliminate_extracted_lvs_optional_write_vg(struct volume_group *vg, diff --git a/lib/metadata/segtype.c b/lib/metadata/segtype.c index d0508ca..2fdbaa3 100644 --- a/lib/metadata/segtype.c +++ b/lib/metadata/segtype.c @@ -13,9 +13,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "segtype.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" struct segment_type *get_segtype_from_string(struct cmd_context *cmd, const char *str) diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h index 40b41ec..fe19b34 100644 --- a/lib/metadata/segtype.h +++ b/lib/metadata/segtype.h @@ -16,7 +16,7 @@ #ifndef _SEGTYPES_H #define _SEGTYPES_H -#include "metadata-exported.h" +#include "lib/metadata/metadata-exported.h" struct segtype_handler; struct cmd_context; diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c index 76d78f3..e3669ef 100644 --- a/lib/metadata/snapshot_manip.c +++ b/lib/metadata/snapshot_manip.c @@ -13,13 +13,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "segtype.h" -#include "locking.h" -#include "toolcontext.h" -#include "lv_alloc.h" -#include "activate.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/segtype.h" +#include "lib/locking/locking.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/lv_alloc.h" +#include "lib/activate/activate.h" #define SNAPSHOT_MIN_CHUNKS 3 /* Minimum number of chunks in snapshot */ diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c index 3dfbcc1..c5d2ffd 100644 --- a/lib/metadata/thin_manip.c +++ b/lib/metadata/thin_manip.c @@ -12,14 +12,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "activate.h" -#include "locking.h" -#include "memlock.h" -#include "metadata.h" -#include "segtype.h" -#include "defaults.h" -#include "display.h" +#include "lib/misc/lib.h" +#include "lib/activate/activate.h" +#include "lib/locking/locking.h" +#include "lib/mm/memlock.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/segtype.h" +#include "lib/config/defaults.h" +#include "lib/display/display.h" /* TODO: drop unused no_update */ int attach_pool_message(struct lv_segment *pool_seg, dm_thin_message_t type, diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c index b8b1501..71f6e14 100644 --- a/lib/metadata/vg.c +++ b/lib/metadata/vg.c @@ -13,14 +13,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "display.h" -#include "activate.h" -#include "toolcontext.h" -#include "lvmcache.h" -#include "archiver.h" -#include "lvmetad.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/display/display.h" +#include "lib/activate/activate.h" +#include "lib/commands/toolcontext.h" +#include "lib/cache/lvmcache.h" +#include "lib/format_text/archiver.h" +#include "lib/cache/lvmetad.h" struct volume_group *alloc_vg(const char *pool_name, struct cmd_context *cmd, const char *vg_name) diff --git a/lib/metadata/vg.h b/lib/metadata/vg.h index 7ecfafe..b37c01d 100644 --- a/lib/metadata/vg.h +++ b/lib/metadata/vg.h @@ -15,8 +15,8 @@ #ifndef _LVM_VG_H #define _LVM_VG_H -#include "uuid.h" -#include "libdevmapper.h" +#include "lib/uuid/uuid.h" +#include "libdm/libdevmapper.h" struct cmd_context; struct format_instance; diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c index 7c5c0a6..6746b1a 100644 --- a/lib/mirror/mirrored.c +++ b/lib/mirror/mirrored.c @@ -13,18 +13,18 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "metadata.h" -#include "segtype.h" -#include "display.h" -#include "text_export.h" -#include "text_import.h" -#include "config.h" -#include "lvm-string.h" -#include "targets.h" -#include "activate.h" -#include "str_list.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/segtype.h" +#include "lib/display/display.h" +#include "lib/format_text/text_export.h" +#include "lib/format_text/text_import.h" +#include "lib/config/config.h" +#include "lib/misc/lvm-string.h" +#include "lib/activate/targets.h" +#include "lib/activate/activate.h" +#include "lib/datastruct/str_list.h" #include <sys/utsname.h> diff --git a/lib/misc/crc.c b/lib/misc/crc.c index aacd82d..8dc107f 100644 --- a/lib/misc/crc.c +++ b/lib/misc/crc.c @@ -13,10 +13,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" -#include "crc.h" -#include "xlate.h" +#include "lib/misc/crc.h" +#include "lib/mm/xlate.h" /* Calculate an endian-independent CRC of supplied buffer */ #ifndef DEBUG_CRC32 diff --git a/lib/misc/crc_gen.c b/lib/misc/crc_gen.c index 1ed0186..56f2d25 100644 --- a/lib/misc/crc_gen.c +++ b/lib/misc/crc_gen.c @@ -15,7 +15,7 @@ /* * Helper program to generate table included in crc.c. */ -#include "lib.h" +#include "lib/misc/lib.h" int main(int argc, char **argv) { diff --git a/lib/misc/lib.h b/lib/misc/lib.h index d7fa5c7..13c7110 100644 --- a/lib/misc/lib.h +++ b/lib/misc/lib.h @@ -78,17 +78,17 @@ #endif -#include "intl.h" -#include "libdevmapper.h" -#include "util.h" +#include "lib/misc/intl.h" +#include "libdm/libdevmapper.h" +#include "lib/misc/util.h" #ifdef DM -# include "dm-logging.h" +# include "libdm/misc/dm-logging.h" #else -# include "lvm-logging.h" -# include "lvm-globals.h" -# include "lvm-wrappers.h" -# include "lvm-maths.h" +# include "lib/log/lvm-logging.h" +# include "lib/misc/lvm-globals.h" +# include "lib/misc/lvm-wrappers.h" +# include "lib/misc/lvm-maths.h" #endif #include <unistd.h> diff --git a/lib/misc/lvm-exec.c b/lib/misc/lvm-exec.c index 190d426..aea2abb 100644 --- a/lib/misc/lvm-exec.c +++ b/lib/misc/lvm-exec.c @@ -13,11 +13,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "device.h" -#include "locking.h" -#include "lvm-exec.h" -#include "toolcontext.h" +#include "lib/misc/lib.h" +#include "lib/device/device.h" +#include "lib/locking/locking.h" +#include "lib/misc/lvm-exec.h" +#include "lib/commands/toolcontext.h" #include <unistd.h> #include <sys/wait.h> diff --git a/lib/misc/lvm-exec.h b/lib/misc/lvm-exec.h index 43c5a42..8db9a35 100644 --- a/lib/misc/lvm-exec.h +++ b/lib/misc/lvm-exec.h @@ -16,7 +16,7 @@ #ifndef _LVM_EXEC_H #define _LVM_EXEC_H -#include "lib.h" +#include "lib/misc/lib.h" struct cmd_context; diff --git a/lib/misc/lvm-file.c b/lib/misc/lvm-file.c index 36caaa7..5c23b0a 100644 --- a/lib/misc/lvm-file.c +++ b/lib/misc/lvm-file.c @@ -13,8 +13,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "lvm-file.h" +#include "lib/misc/lib.h" +#include "lib/misc/lvm-file.h" #include <unistd.h> #include <sys/stat.h> diff --git a/lib/misc/lvm-flock.c b/lib/misc/lvm-flock.c index 4196313..00d74de 100644 --- a/lib/misc/lvm-flock.c +++ b/lib/misc/lvm-flock.c @@ -13,11 +13,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "config.h" -#include "lvm-flock.h" -#include "lvm-signal.h" -#include "locking.h" +#include "lib/misc/lib.h" +#include "lib/config/config.h" +#include "lib/misc/lvm-flock.h" +#include "lib/misc/lvm-signal.h" +#include "lib/locking/locking.h" #include <sys/file.h> #include <fcntl.h> diff --git a/lib/misc/lvm-globals.c b/lib/misc/lvm-globals.c index 9941489..b76ddb9 100644 --- a/lib/misc/lvm-globals.c +++ b/lib/misc/lvm-globals.c @@ -13,11 +13,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "device.h" -#include "lvm-string.h" -#include "defaults.h" -#include "metadata-exported.h" +#include "lib/misc/lib.h" +#include "lib/device/device.h" +#include "lib/misc/lvm-string.h" +#include "lib/config/defaults.h" +#include "lib/metadata/metadata-exported.h" #include <stdarg.h> diff --git a/lib/misc/lvm-maths.c b/lib/misc/lvm-maths.c index df3aa0a..ede073b 100644 --- a/lib/misc/lvm-maths.c +++ b/lib/misc/lvm-maths.c @@ -12,7 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" /* Greatest common divisor */ unsigned long gcd(unsigned long n1, unsigned long n2) diff --git a/lib/misc/lvm-percent.c b/lib/misc/lvm-percent.c index 30238f3..f76ae81 100644 --- a/lib/misc/lvm-percent.c +++ b/lib/misc/lvm-percent.c @@ -12,8 +12,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "lvm-percent.h" +#include "lib/misc/lib.h" +#include "lib/misc/lvm-percent.h" uint32_t percent_of_extents(uint32_t percents, uint32_t count, int roundup) { diff --git a/lib/misc/lvm-signal.c b/lib/misc/lvm-signal.c index 8a4ead4..b90a2db 100644 --- a/lib/misc/lvm-signal.c +++ b/lib/misc/lvm-signal.c @@ -13,9 +13,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "lvm-signal.h" -#include "memlock.h" +#include "lib/misc/lib.h" +#include "lib/misc/lvm-signal.h" +#include "lib/mm/memlock.h" #include <signal.h> diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c index a2098fd..1e9af66 100644 --- a/lib/misc/lvm-string.c +++ b/lib/misc/lvm-string.c @@ -13,10 +13,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "lvm-string.h" -#include "metadata-exported.h" -#include "display.h" +#include "lib/misc/lib.h" +#include "lib/misc/lvm-string.h" +#include "lib/metadata/metadata-exported.h" +#include "lib/display/display.h" #include <ctype.h> #include <stdarg.h> diff --git a/lib/misc/lvm-wrappers.c b/lib/misc/lvm-wrappers.c index e2b14aa..c36e2cf 100644 --- a/lib/misc/lvm-wrappers.c +++ b/lib/misc/lvm-wrappers.c @@ -12,7 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" #include <unistd.h> #include <fcntl.h> diff --git a/lib/misc/sharedlib.c b/lib/misc/sharedlib.c index 2532f79..d594470 100644 --- a/lib/misc/sharedlib.c +++ b/lib/misc/sharedlib.c @@ -13,10 +13,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "config.h" -#include "sharedlib.h" -#include "toolcontext.h" +#include "lib/misc/lib.h" +#include "lib/config/config.h" +#include "lib/misc/sharedlib.h" +#include "lib/commands/toolcontext.h" #include <limits.h> #include <sys/stat.h> diff --git a/lib/misc/sharedlib.h b/lib/misc/sharedlib.h index 825482d..5ff2dcb 100644 --- a/lib/misc/sharedlib.h +++ b/lib/misc/sharedlib.h @@ -16,7 +16,7 @@ #ifndef _LVM_SHAREDLIB_H #define _LVM_SHAREDLIB_H -#include "config.h" +#include "lib/config/config.h" #include <dlfcn.h> void get_shared_library_path(struct cmd_context *cmd, const char *libname, diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c index b15058e..571caab 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -13,11 +13,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "memlock.h" -#include "defaults.h" -#include "config.h" -#include "toolcontext.h" +#include "lib/misc/lib.h" +#include "lib/mm/memlock.h" +#include "lib/config/defaults.h" +#include "lib/config/config.h" +#include "lib/commands/toolcontext.h" #include <limits.h> #include <fcntl.h> diff --git a/lib/notify/lvmnotify.c b/lib/notify/lvmnotify.c index 1daee1e..e24b0ac 100644 --- a/lib/notify/lvmnotify.c +++ b/lib/notify/lvmnotify.c @@ -8,9 +8,9 @@ * of the GNU Lesser General Public License v.2.1. */ -#include "lib.h" -#include "toolcontext.h" -#include "lvmnotify.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/notify/lvmnotify.h" #define LVM_DBUS_DESTINATION "com.redhat.lvmdbus1" #define LVM_DBUS_PATH "/com/redhat/lvmdbus1/Manager" diff --git a/lib/properties/prop_common.c b/lib/properties/prop_common.c index 3fd9697..f8b63d6 100644 --- a/lib/properties/prop_common.c +++ b/lib/properties/prop_common.c @@ -12,8 +12,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "prop_common.h" +#include "lib/misc/lib.h" +#include "lib/properties/prop_common.h" int prop_not_implemented_get(const void *obj, struct lvm_property_type *prop) { diff --git a/lib/raid/raid.c b/lib/raid/raid.c index e926ae1..2efaf19 100644 --- a/lib/raid/raid.c +++ b/lib/raid/raid.c @@ -12,17 +12,17 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "segtype.h" -#include "display.h" -#include "text_export.h" -#include "config.h" -#include "str_list.h" -#include "targets.h" -#include "lvm-string.h" -#include "activate.h" -#include "metadata.h" -#include "lv_alloc.h" +#include "lib/misc/lib.h" +#include "lib/metadata/segtype.h" +#include "lib/display/display.h" +#include "lib/format_text/text_export.h" +#include "lib/config/config.h" +#include "lib/datastruct/str_list.h" +#include "lib/activate/targets.h" +#include "lib/misc/lvm-string.h" +#include "lib/activate/activate.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/lv_alloc.h" static int _raid_target_present(struct cmd_context *cmd, const struct lv_segment *seg __attribute__((unused)), diff --git a/lib/report/properties.c b/lib/report/properties.c index 8e86b7a..d944750 100644 --- a/lib/report/properties.c +++ b/lib/report/properties.c @@ -12,10 +12,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "properties.h" -#include "activate.h" -#include "metadata.h" +#include "lib/misc/lib.h" +#include "lib/report/properties.h" +#include "lib/activate/activate.h" +#include "lib/metadata/metadata.h" #define GET_VG_NUM_PROPERTY_FN(NAME, VALUE) \ diff --git a/lib/report/properties.h b/lib/report/properties.h index 6b9ab40..f52705e 100644 --- a/lib/report/properties.h +++ b/lib/report/properties.h @@ -14,10 +14,10 @@ #ifndef _LVM_PROPERTIES_H #define _LVM_PROPERTIES_H -#include "libdevmapper.h" -#include "metadata.h" -#include "report.h" -#include "prop_common.h" +#include "libdm/libdevmapper.h" +#include "lib/metadata/metadata.h" +#include "lib/report/report.h" +#include "lib/properties/prop_common.h" int lvseg_get_property(const struct lv_segment *lvseg, struct lvm_property_type *prop); diff --git a/lib/report/report.c b/lib/report/report.c index 01ab627..ad54ea7 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -13,17 +13,17 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "report.h" -#include "toolcontext.h" -#include "lvm-string.h" -#include "display.h" -#include "activate.h" -#include "segtype.h" -#include "lvmcache.h" -#include "device-types.h" -#include "str_list.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/report/report.h" +#include "lib/commands/toolcontext.h" +#include "lib/misc/lvm-string.h" +#include "lib/display/display.h" +#include "lib/activate/activate.h" +#include "lib/metadata/segtype.h" +#include "lib/cache/lvmcache.h" +#include "lib/device/device-types.h" +#include "lib/datastruct/str_list.h" #include <stddef.h> /* offsetof() */ #include <float.h> /* DBL_MAX */ diff --git a/lib/report/report.h b/lib/report/report.h index c787f56..380538a 100644 --- a/lib/report/report.h +++ b/lib/report/report.h @@ -16,9 +16,9 @@ #ifndef _LVM_REPORT_H #define _LVM_REPORT_H -#include "metadata-exported.h" -#include "label.h" -#include "activate.h" +#include "lib/metadata/metadata-exported.h" +#include "lib/label/label.h" +#include "lib/activate/activate.h" typedef enum { CMDLOG = 1, diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c index 5fd39e9..4d9cd7e 100644 --- a/lib/snapshot/snapshot.c +++ b/lib/snapshot/snapshot.c @@ -13,13 +13,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata.h" -#include "segtype.h" -#include "text_export.h" -#include "config.h" -#include "activate.h" -#include "str_list.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/segtype.h" +#include "lib/format_text/text_export.h" +#include "lib/config/config.h" +#include "lib/activate/activate.h" +#include "lib/datastruct/str_list.h" #define SEG_LOG_ERROR(t, p...) \ log_error(t " segment %s of logical volume %s.", ## p, \ diff --git a/lib/striped/striped.c b/lib/striped/striped.c index bca4c2c..9c8408c 100644 --- a/lib/striped/striped.c +++ b/lib/striped/striped.c @@ -13,19 +13,19 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "segtype.h" -#include "display.h" -#include "text_export.h" -#include "text_import.h" -#include "config.h" -#include "str_list.h" -#include "targets.h" -#include "lvm-string.h" -#include "activate.h" -#include "pv_alloc.h" -#include "metadata.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" +#include "lib/display/display.h" +#include "lib/format_text/text_export.h" +#include "lib/format_text/text_import.h" +#include "lib/config/config.h" +#include "lib/datastruct/str_list.h" +#include "lib/activate/targets.h" +#include "lib/misc/lvm-string.h" +#include "lib/activate/activate.h" +#include "lib/metadata/pv_alloc.h" +#include "lib/metadata/metadata.h" static const char *_striped_name(const struct lv_segment *seg) { diff --git a/lib/thin/thin.c b/lib/thin/thin.c index b6eb3aa..3c62008 100644 --- a/lib/thin/thin.c +++ b/lib/thin/thin.c @@ -12,14 +12,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "display.h" -#include "metadata.h" -#include "segtype.h" -#include "text_export.h" -#include "config.h" -#include "activate.h" -#include "str_list.h" +#include "lib/misc/lib.h" +#include "lib/display/display.h" +#include "lib/metadata/metadata.h" +#include "lib/metadata/segtype.h" +#include "lib/format_text/text_export.h" +#include "lib/config/config.h" +#include "lib/activate/activate.h" +#include "lib/datastruct/str_list.h" /* Dm kernel module name for thin provisiong */ static const char _thin_pool_module[] = "thin-pool"; diff --git a/lib/unknown/unknown.c b/lib/unknown/unknown.c index 7728545..7c2a54c 100644 --- a/lib/unknown/unknown.c +++ b/lib/unknown/unknown.c @@ -12,11 +12,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "segtype.h" -#include "text_export.h" -#include "config.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/segtype.h" +#include "lib/format_text/text_export.h" +#include "lib/config/config.h" static int _unknown_text_import(struct lv_segment *seg, const struct dm_config_node *sn, struct dm_hash_table *pv_hash) diff --git a/lib/uuid/uuid.c b/lib/uuid/uuid.c index 1833f2c..be4cbc3 100644 --- a/lib/uuid/uuid.c +++ b/lib/uuid/uuid.c @@ -13,9 +13,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "uuid.h" -#include "lvm-wrappers.h" +#include "lib/misc/lib.h" +#include "lib/uuid/uuid.h" +#include "lib/misc/lvm-wrappers.h" #include <assert.h> #include <sys/stat.h> diff --git a/lib/zero/zero.c b/lib/zero/zero.c index fc021cd..f1e4831 100644 --- a/lib/zero/zero.c +++ b/lib/zero/zero.c @@ -12,10 +12,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "segtype.h" -#include "str_list.h" -#include "activate.h" +#include "lib/misc/lib.h" +#include "lib/metadata/segtype.h" +#include "lib/datastruct/str_list.h" +#include "lib/activate/activate.h" static int _zero_merge_segments(struct lv_segment *seg1, struct lv_segment *seg2) { diff --git a/libdaemon/client/config-util.c b/libdaemon/client/config-util.c index 32f36f6..12baa99 100644 --- a/libdaemon/client/config-util.c +++ b/libdaemon/client/config-util.c @@ -14,10 +14,10 @@ #define _REENTRANT -#include "tool.h" +#include "tools/tool.h" -#include "daemon-io.h" -#include "dm-logging.h" +#include "libdaemon/client/daemon-io.h" +#include "libdm/misc/dm-logging.h" #include <math.h> /* fabs() */ #include <float.h> /* DBL_EPSILON */ diff --git a/libdaemon/client/daemon-client.c b/libdaemon/client/daemon-client.c index 5ce1fc0..b5dfbf1 100644 --- a/libdaemon/client/daemon-client.c +++ b/libdaemon/client/daemon-client.c @@ -14,11 +14,11 @@ #define _REENTRANT -#include "tool.h" +#include "tools/tool.h" -#include "daemon-io.h" -#include "daemon-client.h" -#include "dm-logging.h" +#include "libdaemon/client/daemon-io.h" +#include "libdaemon/client/daemon-client.h" +#include "libdm/misc/dm-logging.h" #include <sys/un.h> #include <sys/socket.h> diff --git a/libdaemon/client/daemon-client.h b/libdaemon/client/daemon-client.h index 5235bea..e1671a7 100644 --- a/libdaemon/client/daemon-client.h +++ b/libdaemon/client/daemon-client.h @@ -15,7 +15,7 @@ #ifndef _LVM_DAEMON_CLIENT_H #define _LVM_DAEMON_CLIENT_H -#include "config-util.h" +#include "libdaemon/client/config-util.h" typedef struct { int socket_fd; /* the fd we use to talk to the daemon */ diff --git a/libdaemon/client/daemon-io.c b/libdaemon/client/daemon-io.c index 5419d40..bd24cdb 100644 --- a/libdaemon/client/daemon-io.c +++ b/libdaemon/client/daemon-io.c @@ -14,9 +14,9 @@ #define _REENTRANT -#include "tool.h" +#include "tools/tool.h" -#include "daemon-io.h" +#include "libdaemon/client/daemon-io.h" #include <errno.h> diff --git a/libdaemon/client/daemon-io.h b/libdaemon/client/daemon-io.h index 013b0c8..761d468 100644 --- a/libdaemon/client/daemon-io.h +++ b/libdaemon/client/daemon-io.h @@ -15,7 +15,7 @@ #ifndef _LVM_DAEMON_IO_H #define _LVM_DAEMON_IO_H -#include "config-util.h" +#include "libdaemon/client/config-util.h" /* TODO function names */ diff --git a/libdaemon/server/daemon-log.c b/libdaemon/server/daemon-log.c index 3be5573..8c2a208 100644 --- a/libdaemon/server/daemon-log.c +++ b/libdaemon/server/daemon-log.c @@ -12,7 +12,7 @@ #define _REENTRANT -#include "tool.h" +#include "tools/tool.h" #include "daemon-server.h" #include "daemon-log.h" diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c index 3b19883..4acb00e 100644 --- a/libdaemon/server/daemon-server.c +++ b/libdaemon/server/daemon-server.c @@ -12,9 +12,9 @@ #define _REENTRANT -#include "tool.h" +#include "tools/tool.h" -#include "daemon-io.h" +#include "libdaemon/client/daemon-io.h" #include "daemon-server.h" #include "daemon-log.h" diff --git a/libdaemon/server/daemon-server.h b/libdaemon/server/daemon-server.h index 2b9ceac..f8c0ca6 100644 --- a/libdaemon/server/daemon-server.h +++ b/libdaemon/server/daemon-server.h @@ -15,7 +15,7 @@ #ifndef _LVM_DAEMON_SERVER_H #define _LVM_DAEMON_SERVER_H -#include "daemon-client.h" +#include "libdaemon/client/daemon-client.h" typedef struct { int socket_fd; /* the fd we use to talk to the client */ diff --git a/libdm/datastruct/bitset.c b/libdm/datastruct/bitset.c index b0826e1..06bd31a 100644 --- a/libdm/datastruct/bitset.c +++ b/libdm/datastruct/bitset.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include <ctype.h> diff --git a/libdm/datastruct/hash.c b/libdm/datastruct/hash.c index fb153ce..4c94003 100644 --- a/libdm/datastruct/hash.c +++ b/libdm/datastruct/hash.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" struct dm_hash_node { struct dm_hash_node *next; diff --git a/libdm/datastruct/list.c b/libdm/datastruct/list.c index bdd3b19..d80cb9a 100644 --- a/libdm/datastruct/list.c +++ b/libdm/datastruct/list.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" +#include "lib/misc/lib.h" #include <assert.h> /* diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c index 769b69c..e775da7 100644 --- a/libdm/ioctl/libdm-iface.c +++ b/libdm/ioctl/libdm-iface.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include "libdm-targets.h" #include "libdm-common.h" @@ -25,7 +25,7 @@ #include <limits.h> #ifdef __linux__ -# include "kdev_t.h" +# include "libdm/misc/kdev_t.h" # include <linux/limits.h> #else # define MAJOR(x) major((x)) @@ -33,7 +33,7 @@ # define MKDEV(x,y) makedev((x),(y)) #endif -#include "dm-ioctl.h" +#include "libdm/misc/dm-ioctl.h" /* * Ensure build compatibility. diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index 094e618..7c740d8 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -13,11 +13,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include "libdm-targets.h" #include "libdm-common.h" -#include "kdev_t.h" -#include "dm-ioctl.h" +#include "libdm/misc/kdev_t.h" +#include "libdm/misc/dm-ioctl.h" #include <stdarg.h> #include <sys/param.h> diff --git a/libdm/libdm-common.h b/libdm/libdm-common.h index 010d876..30adac0 100644 --- a/libdm/libdm-common.h +++ b/libdm/libdm-common.h @@ -16,7 +16,7 @@ #ifndef LIB_DMCOMMON_H #define LIB_DMCOMMON_H -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" #define DM_DEFAULT_NAME_MANGLING_MODE_ENV_VAR_NAME "DM_DEFAULT_NAME_MANGLING_MODE" diff --git a/libdm/libdm-config.c b/libdm/libdm-config.c index 3f0d251..3666fc9 100644 --- a/libdm/libdm-config.c +++ b/libdm/libdm-config.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include <sys/stat.h> #include <sys/mman.h> diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index ab05456..3e602e2 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -12,11 +12,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include "libdm-targets.h" #include "libdm-common.h" -#include "kdev_t.h" -#include "dm-ioctl.h" +#include "libdm/misc/kdev_t.h" +#include "libdm/misc/dm-ioctl.h" #include <stdarg.h> #include <sys/param.h> diff --git a/libdm/libdm-file.c b/libdm/libdm-file.c index e7416f1..fc93dda 100644 --- a/libdm/libdm-file.c +++ b/libdm/libdm-file.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include <sys/file.h> #include <fcntl.h> diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c index 6d140af..01255b4 100644 --- a/libdm/libdm-report.c +++ b/libdm/libdm-report.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include <ctype.h> #include <math.h> /* fabs() */ diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c index 94ad380..e9bfa9d 100644 --- a/libdm/libdm-stats.c +++ b/libdm/libdm-stats.c @@ -15,8 +15,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" -#include "kdev_t.h" +#include "libdm/misc/dmlib.h" +#include "libdm/misc/kdev_t.h" #include "math.h" /* log10() */ diff --git a/libdm/libdm-string.c b/libdm/libdm-string.c index cf9690c..1542229 100644 --- a/libdm/libdm-string.c +++ b/libdm/libdm-string.c @@ -12,7 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include <ctype.h> #include <stdarg.h> diff --git a/libdm/libdm-targets.c b/libdm/libdm-targets.c index 8766789..f2bac51 100644 --- a/libdm/libdm-targets.c +++ b/libdm/libdm-targets.c @@ -12,7 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include "libdm-common.h" int dm_get_status_snapshot(struct dm_pool *mem, const char *params, diff --git a/libdm/libdm-timestamp.c b/libdm/libdm-timestamp.c index 6164885..04b1006 100644 --- a/libdm/libdm-timestamp.c +++ b/libdm/libdm-timestamp.c @@ -18,7 +18,7 @@ * the results of these routines should stay in-core. */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include <stdlib.h> diff --git a/libdm/misc/dm-log-userspace.h b/libdm/misc/dm-log-userspace.h index a770ae6..b243194 100644 --- a/libdm/misc/dm-log-userspace.h +++ b/libdm/misc/dm-log-userspace.h @@ -9,7 +9,7 @@ #include <inttypes.h> -#include "dm-ioctl.h" /* For DM_UUID_LEN */ +#include "libdm/misc/dm-ioctl.h" /* * The device-mapper userspace log module consists of a kernel component and diff --git a/libdm/misc/dm-logging.h b/libdm/misc/dm-logging.h index 083664d..5bf16a7 100644 --- a/libdm/misc/dm-logging.h +++ b/libdm/misc/dm-logging.h @@ -16,7 +16,7 @@ #ifndef _DM_LOGGING_H #define _DM_LOGGING_H -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" extern dm_log_with_errno_fn dm_log_with_errno; @@ -29,6 +29,6 @@ extern dm_log_with_errno_fn dm_log_with_errno; /* Debug messages may have a type instead of an errno */ #define LOG_LINE_WITH_CLASS(l, c, x...) LOG_MESG(l, __FILE__, __LINE__, c, ## x) -#include "log.h" +#include "lib/log/log.h" #endif diff --git a/libdm/misc/dmlib.h b/libdm/misc/dmlib.h index 7d73657..bc14ece 100644 --- a/libdm/misc/dmlib.h +++ b/libdm/misc/dmlib.h @@ -21,6 +21,6 @@ #define DM -#include "lib.h" +#include "lib/misc/lib.h" #endif diff --git a/libdm/mm/dbg_malloc.c b/libdm/mm/dbg_malloc.c index 280213b..d8799d7 100644 --- a/libdm/mm/dbg_malloc.c +++ b/libdm/mm/dbg_malloc.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #ifdef VALGRIND_POOL #include "memcheck.h" diff --git a/libdm/mm/pool-debug.c b/libdm/mm/pool-debug.c index c523238..170c51d 100644 --- a/libdm/mm/pool-debug.c +++ b/libdm/mm/pool-debug.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include <assert.h> struct block { diff --git a/libdm/mm/pool-fast.c b/libdm/mm/pool-fast.c index 614e903..7be0788 100644 --- a/libdm/mm/pool-fast.c +++ b/libdm/mm/pool-fast.c @@ -17,7 +17,7 @@ #include "memcheck.h" #endif -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include <stddef.h> /* For musl libc */ #include <malloc.h> diff --git a/libdm/mm/pool.c b/libdm/mm/pool.c index 1321cc7..a8fe732 100644 --- a/libdm/mm/pool.c +++ b/libdm/mm/pool.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include <sys/mman.h> #include <pthread.h> diff --git a/libdm/regex/matcher.c b/libdm/regex/matcher.c index a837162..459ed2e 100644 --- a/libdm/regex/matcher.c +++ b/libdm/regex/matcher.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include "parse_rx.h" #include "ttree.h" #include "assert.h" diff --git a/libdm/regex/parse_rx.c b/libdm/regex/parse_rx.c index 80e97a4..fb5233f 100644 --- a/libdm/regex/parse_rx.c +++ b/libdm/regex/parse_rx.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include "parse_rx.h" #ifdef DEBUG diff --git a/libdm/regex/ttree.c b/libdm/regex/ttree.c index 0f54d04..0eb51fe 100644 --- a/libdm/regex/ttree.c +++ b/libdm/regex/ttree.c @@ -13,7 +13,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dmlib.h" +#include "libdm/misc/dmlib.h" #include "ttree.h" struct node { diff --git a/liblvm/lvm_base.c b/liblvm/lvm_base.c index fce994c..791c629 100644 --- a/liblvm/lvm_base.c +++ b/liblvm/lvm_base.c @@ -12,12 +12,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "locking.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/locking/locking.h" #include "lvm-version.h" -#include "metadata-exported.h" -#include "lvm2app.h" +#include "lib/metadata/metadata-exported.h" +#include "liblvm/lvm2app.h" #include "lvm_misc.h" const char *lvm_library_get_version(void) diff --git a/liblvm/lvm_lv.c b/liblvm/lvm_lv.c index e5a35c4..48774df 100644 --- a/liblvm/lvm_lv.c +++ b/liblvm/lvm_lv.c @@ -12,15 +12,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "metadata-exported.h" -#include "lvm-string.h" -#include "defaults.h" -#include "segtype.h" -#include "locking.h" -#include "activate.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata-exported.h" +#include "lib/misc/lvm-string.h" +#include "lib/config/defaults.h" +#include "lib/metadata/segtype.h" +#include "lib/locking/locking.h" +#include "lib/activate/activate.h" #include "lvm_misc.h" -#include "lvm2app.h" +#include "liblvm/lvm2app.h" /* FIXME Improve all the log messages to include context. Which VG/LV as a minimum? */ diff --git a/liblvm/lvm_misc.c b/liblvm/lvm_misc.c index 373ccde..2b24de2 100644 --- a/liblvm/lvm_misc.c +++ b/liblvm/lvm_misc.c @@ -12,10 +12,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "properties.h" +#include "lib/misc/lib.h" +#include "lib/report/properties.h" #include "lvm_misc.h" -#include "lvm2app.h" +#include "liblvm/lvm2app.h" #include "lvm_prop.h" struct dm_list *tag_list_copy(struct dm_pool *p, struct dm_list *tag_list) diff --git a/liblvm/lvm_misc.h b/liblvm/lvm_misc.h index 0a3fd73..62f91ce 100644 --- a/liblvm/lvm_misc.h +++ b/liblvm/lvm_misc.h @@ -14,10 +14,10 @@ #ifndef _LVM2APP_MISC_H #define _LVM2APP_MISC_H -#include "libdevmapper.h" -#include "lvm2app.h" -#include "metadata-exported.h" -#include "toolcontext.h" +#include "libdm/libdevmapper.h" +#include "liblvm/lvm2app.h" +#include "lib/metadata/metadata-exported.h" +#include "lib/commands/toolcontext.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/liblvm/lvm_prop.c b/liblvm/lvm_prop.c index d5b1493..1997596 100644 --- a/liblvm/lvm_prop.c +++ b/liblvm/lvm_prop.c @@ -13,8 +13,8 @@ */ #include "lvm_prop.h" -#include "libdevmapper.h" -#include "metadata.h" +#include "libdm/libdevmapper.h" +#include "lib/metadata/metadata.h" /* lv create parameters */ GET_LVCREATEPARAMS_NUM_PROPERTY_FN(skip_zero, lvcp->zero) diff --git a/liblvm/lvm_prop.h b/liblvm/lvm_prop.h index 00e7e48..5a30a76 100644 --- a/liblvm/lvm_prop.h +++ b/liblvm/lvm_prop.h @@ -11,7 +11,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "prop_common.h" +#include "lib/properties/prop_common.h" #ifndef _LIB_LVM_PROP_H #define _LIB_LVM_PROP_H diff --git a/liblvm/lvm_pv.c b/liblvm/lvm_pv.c index 143545b..bd6ee4f 100644 --- a/liblvm/lvm_pv.c +++ b/liblvm/lvm_pv.c @@ -13,16 +13,16 @@ */ #include <stddef.h> -#include "lib.h" -#include "metadata-exported.h" -#include "lvm-string.h" -#include "str_list.h" +#include "lib/misc/lib.h" +#include "lib/metadata/metadata-exported.h" +#include "lib/misc/lvm-string.h" +#include "lib/datastruct/str_list.h" #include "lvm_misc.h" -#include "lvm2app.h" -#include "locking.h" -#include "toolcontext.h" +#include "liblvm/lvm2app.h" +#include "lib/locking/locking.h" +#include "lib/commands/toolcontext.h" #include "lvm_misc.h" -#include "lvmetad.h" +#include "lib/cache/lvmetad.h" struct lvm_pv_create_params { diff --git a/liblvm/lvm_vg.c b/liblvm/lvm_vg.c index 616c78f..e8354e5 100644 --- a/liblvm/lvm_vg.c +++ b/liblvm/lvm_vg.c @@ -12,17 +12,17 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib.h" -#include "toolcontext.h" -#include "metadata.h" -#include "archiver.h" -#include "locking.h" -#include "lvmcache.h" -#include "lvmetad.h" +#include "lib/misc/lib.h" +#include "lib/commands/toolcontext.h" +#include "lib/metadata/metadata.h" +#include "lib/format_text/archiver.h" +#include "lib/locking/locking.h" +#include "lib/cache/lvmcache.h" +#include "lib/cache/lvmetad.h" #include "lvm_misc.h" -#include "lvm2app.h" -#include "display.h" -#include "lvmetad.h" +#include "liblvm/lvm2app.h" +#include "lib/display/display.h" +#include "lib/cache/lvmetad.h" int lvm_vg_add_tag(vg_t vg, const char *tag) { diff --git a/make.tmpl.in b/make.tmpl.in index d3a80ef..7e3f4a4 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -306,12 +306,10 @@ LIB_VERSION_DM := $(shell $(AWK) -F '.' '{printf "%s.%s",$$1,$$2}' $(top_srcdir) LIB_VERSION_APP := $(shell $(AWK) -F '[(). ]' '{printf "%s.%s",$$1,$$4}' $(top_srcdir)/VERSION) -INCLUDES += -I$(srcdir) -I$(top_builddir)/include - -INC_LNS = $(top_builddir)/include/.symlinks_created +INCLUDES += -I$(top_srcdir) -I$(srcdir) -I$(top_builddir)/include DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \ - $(top_builddir)/Makefile $(INC_LNS) + $(top_builddir)/Makefile OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o) POTFILES = $(SOURCES:%.c=%.pot) @@ -509,7 +507,7 @@ $(LIB_STATIC): $(OBJECTS) $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null -%.d: $(INC_LNS) +%.d: .PRECIOUS: %.d %.mo: %.po diff --git a/python/liblvm.c b/python/liblvm.c index 06120e6..ea9697a 100644 --- a/python/liblvm.c +++ b/python/liblvm.c @@ -23,8 +23,8 @@ #include <Python.h> #define _BUILDING_LVM -#include "lvm2app.h" -#include "defaults.h" +#include "liblvm/lvm2app.h" +#include "lib/config/defaults.h" #if PY_MAJOR_VERSION >= 3 #define IS_PY3K diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c index 0f7f89c..551b29a 100644 --- a/scripts/lvm2_activation_generator_systemd_red_hat.c +++ b/scripts/lvm2_activation_generator_systemd_red_hat.c @@ -21,8 +21,8 @@ #include <sys/stat.h> #include <fcntl.h> #include <limits.h> /* For PATH_MAX for musl libc */ -#include "lvm2app.h" -#include "configure.h" /* for LVM_PATH */ +#include "liblvm/lvm2app.h" +#include "configure.h" #define KMSG_DEV_PATH "/dev/kmsg" #define LVM_CONF_USE_LVMETAD "global/use_lvmetad" diff --git a/test/api/lvtest.c b/test/api/lvtest.c index 081c946..9a5fc22 100644 --- a/test/api/lvtest.c +++ b/test/api/lvtest.c @@ -14,7 +14,7 @@ #undef NDEBUG -#include "lvm2app.h" +#include "liblvm/lvm2app.h" #include "assert.h" #define err(args...) \ diff --git a/test/api/pe_start.c b/test/api/pe_start.c index 5e36c45..16b4c0d 100644 --- a/test/api/pe_start.c +++ b/test/api/pe_start.c @@ -14,7 +14,7 @@ #undef NDEBUG -#include "lvm2app.h" +#include "liblvm/lvm2app.h" #include "assert.h" int main(int argc, char *argv[]) diff --git a/test/api/percent.c b/test/api/percent.c index d0d1606..afc361c 100644 --- a/test/api/percent.c +++ b/test/api/percent.c @@ -14,7 +14,7 @@ #undef NDEBUG -#include "lvm2app.h" +#include "liblvm/lvm2app.h" #include "assert.h" int main(int argc, char *argv[]) diff --git a/test/api/test.c b/test/api/test.c index a79afc1..a4d200b 100644 --- a/test/api/test.c +++ b/test/api/test.c @@ -19,7 +19,7 @@ #include <ctype.h> #include "configure.h" -#include "lvm2app.h" +#include "liblvm/lvm2app.h" #ifdef READLINE_SUPPORT #include <readline/readline.h> diff --git a/test/api/thin_percent.c b/test/api/thin_percent.c index fdb48c3..7f99abf 100644 --- a/test/api/thin_percent.c +++ b/test/api/thin_percent.c @@ -14,7 +14,7 @@ #undef NDEBUG -#include "lvm2app.h" +#include "liblvm/lvm2app.h" #include "assert.h" int main(int argc, char *argv[]) diff --git a/test/api/vglist.c b/test/api/vglist.c index f9cd59c..daa21c2 100644 --- a/test/api/vglist.c +++ b/test/api/vglist.c @@ -17,7 +17,7 @@ #include <inttypes.h> #include <assert.h> -#include "lvm2app.h" +#include "liblvm/lvm2app.h" lvm_t handle; vg_t vg; diff --git a/test/api/vgtest.c b/test/api/vgtest.c index da04dda..ffc4ee1 100644 --- a/test/api/vgtest.c +++ b/test/api/vgtest.c @@ -21,7 +21,7 @@ #include <unistd.h> #include <inttypes.h> -#include "lvm2app.h" +#include "liblvm/lvm2app.h" lvm_t handle; vg_t vg; diff --git a/test/unit/bcache_t.c b/test/unit/bcache_t.c index e1c0e85..fcd121c 100644 --- a/test/unit/bcache_t.c +++ b/test/unit/bcache_t.c @@ -17,7 +17,7 @@ #include <stdlib.h> #include <unistd.h> -#include "bcache.h" +#include "lib/device/bcache.h" #include "framework.h" #include "units.h" diff --git a/test/unit/bcache_utils_t.c b/test/unit/bcache_utils_t.c index 4f15591..2c3bb0e 100644 --- a/test/unit/bcache_utils_t.c +++ b/test/unit/bcache_utils_t.c @@ -22,7 +22,7 @@ #include <fcntl.h> #include <unistd.h> -#include "bcache.h" +#include "lib/device/bcache.h" #include "framework.h" #include "units.h" diff --git a/test/unit/bitset_t.c b/test/unit/bitset_t.c index 106f60f..66e0d32 100644 --- a/test/unit/bitset_t.c +++ b/test/unit/bitset_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" enum { NR_BITS = 137 diff --git a/test/unit/config_t.c b/test/unit/config_t.c index 5331f79..e988706 100644 --- a/test/unit/config_t.c +++ b/test/unit/config_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" static void *_mem_init(void) { diff --git a/test/unit/dmlist_t.c b/test/unit/dmlist_t.c index 82789ba..5a4951e 100644 --- a/test/unit/dmlist_t.c +++ b/test/unit/dmlist_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" static void test_dmlist_splice(void *fixture) { diff --git a/test/unit/dmstatus_t.c b/test/unit/dmstatus_t.c index ae185ca..43fb0bf 100644 --- a/test/unit/dmstatus_t.c +++ b/test/unit/dmstatus_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" static void *_mem_init(void) { diff --git a/test/unit/framework.h b/test/unit/framework.h index 5a33ca6..a90a6e2 100644 --- a/test/unit/framework.h +++ b/test/unit/framework.h @@ -1,7 +1,7 @@ #ifndef TEST_UNIT_FRAMEWORK_H #define TEST_UNIT_FRAMEWORK_H -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" #include <stdbool.h> #include <stdint.h> diff --git a/test/unit/io_engine_t.c b/test/unit/io_engine_t.c index 01f659e..7eded30 100644 --- a/test/unit/io_engine_t.c +++ b/test/unit/io_engine_t.c @@ -22,7 +22,7 @@ #include <fcntl.h> #include <unistd.h> -#include "bcache.h" +#include "lib/device/bcache.h" #include "framework.h" #include "units.h" diff --git a/test/unit/matcher_t.c b/test/unit/matcher_t.c index 31109d2..8405a34 100644 --- a/test/unit/matcher_t.c +++ b/test/unit/matcher_t.c @@ -14,7 +14,7 @@ */ #include "units.h" -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" #include "matcher_data.h" diff --git a/test/unit/percent_t.c b/test/unit/percent_t.c index 84dd3bd..fc168d4 100644 --- a/test/unit/percent_t.c +++ b/test/unit/percent_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" #include <stdio.h> #include <string.h> diff --git a/test/unit/string_t.c b/test/unit/string_t.c index 2af0f37..74886f0 100644 --- a/test/unit/string_t.c +++ b/test/unit/string_t.c @@ -13,7 +13,7 @@ */ #include "units.h" -#include "libdevmapper.h" +#include "libdm/libdevmapper.h" #include <stdio.h> #include <string.h> diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 95a15dd..d3080bb 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "tool.h" +#include "tools/tool.h" -#include "dm-logging.h" +#include "libdm/misc/dm-logging.h" #include <ctype.h> #include <dirent.h> @@ -79,7 +79,7 @@ extern char *optarg; #endif #ifdef __linux__ -# include "kdev_t.h" +# include "libdm/misc/kdev_t.h" #else # define MAJOR(x) major((x)) # define MINOR(x) minor((x)) diff --git a/tools/lvchange.c b/tools/lvchange.c index 0aac5ac..0f53d8a 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -15,7 +15,7 @@ #include "tools.h" -#include "memlock.h" +#include "lib/mm/memlock.h" /* * Passed back from callee to request caller to diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 72f840a..c44f3aa 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -14,8 +14,8 @@ #include "tools.h" -#include "polldaemon.h" -#include "lv_alloc.h" +#include "lib/lvmpolld/polldaemon.h" +#include "lib/metadata/lv_alloc.h" #include "lvconvert_poll.h" #define MAX_PDATA_ARGS 10 /* Max number of accepted args for d-m-p-d tools */ diff --git a/tools/lvconvert_poll.h b/tools/lvconvert_poll.h index 7fdcb14..dcbc16b 100644 --- a/tools/lvconvert_poll.h +++ b/tools/lvconvert_poll.h @@ -15,7 +15,7 @@ #ifndef _LVM_LVCONVERT_H #define _LVM_LVCONVERT_H -#include "polldaemon.h" +#include "lib/lvmpolld/polldaemon.h" struct cmd_context; struct logical_volume; diff --git a/tools/lvm2cmd-static.c b/tools/lvm2cmd-static.c index 4fb109c..2b5f300 100644 --- a/tools/lvm2cmd-static.c +++ b/tools/lvm2cmd-static.c @@ -13,7 +13,7 @@ */ #include "lvm2cmdline.h" -#include "lvm2cmd.h" +#include "tools/lvm2cmd.h" void *lvm2_init(void) { diff --git a/tools/lvm2cmd.c b/tools/lvm2cmd.c index 235540c..54090ca 100644 --- a/tools/lvm2cmd.c +++ b/tools/lvm2cmd.c @@ -13,7 +13,7 @@ */ #include "lvm2cmdline.h" -#include "lvm2cmd.h" +#include "tools/lvm2cmd.h" void *lvm2_init(void) { diff --git a/tools/lvmcmdlib.c b/tools/lvmcmdlib.c index 5944576..9f94b5c 100644 --- a/tools/lvmcmdlib.c +++ b/tools/lvmcmdlib.c @@ -16,10 +16,10 @@ #include "tools.h" #include "lvm2cmdline.h" -#include "label.h" -#include "memlock.h" +#include "lib/label/label.h" +#include "lib/mm/memlock.h" -#include "lvm2cmd.h" +#include "tools/lvm2cmd.h" #include <signal.h> #include <sys/stat.h> diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 0dd24ec..be2a31b 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -16,13 +16,13 @@ #include "tools.h" #include "lvm2cmdline.h" -#include "label.h" +#include "lib/label/label.h" #include "lvm-version.h" -#include "lvmlockd.h" -#include "lvmetad-client.h" +#include "lib/locking/lvmlockd.h" +#include "daemons/lvmetad/lvmetad-client.h" #include "stub.h" -#include "last-path-component.h" +#include "lib/misc/last-path-component.h" #include <signal.h> #include <sys/stat.h> diff --git a/tools/lvpoll.c b/tools/lvpoll.c index 8b4580f..a4a698b 100644 --- a/tools/lvpoll.c +++ b/tools/lvpoll.c @@ -14,10 +14,10 @@ #include "tools.h" -#include "polldaemon.h" +#include "lib/lvmpolld/polldaemon.h" #include "pvmove_poll.h" #include "lvconvert_poll.h" -#include "polling_ops.h" +#include "daemons/lvmpolld/polling_ops.h" static struct poll_functions _pvmove_fns = { .poll_progress = poll_mirror_progress, diff --git a/tools/polldaemon.c b/tools/polldaemon.c index 5b5f57f..f2578ad 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -15,9 +15,9 @@ #include "tools.h" -#include "polldaemon.h" +#include "lib/lvmpolld/polldaemon.h" #include "lvm2cmdline.h" -#include "lvmpolld-client.h" +#include "lib/lvmpolld/lvmpolld-client.h" #include <time.h> diff --git a/tools/pvmove.c b/tools/pvmove.c index 754bd58..2f7bf60 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -15,10 +15,10 @@ #include "tools.h" -#include "polldaemon.h" -#include "display.h" +#include "lib/lvmpolld/polldaemon.h" +#include "lib/display/display.h" #include "pvmove_poll.h" -#include "lvmpolld-client.h" +#include "lib/lvmpolld/lvmpolld-client.h" #define PVMOVE_FIRST_TIME 0x00000001 /* Called for first time */ diff --git a/tools/pvscan.c b/tools/pvscan.c index 8493eaa..e31c7f9 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -15,8 +15,8 @@ #include "tools.h" -#include "lvmetad.h" -#include "lvmcache.h" +#include "lib/cache/lvmetad.h" +#include "lib/cache/lvmcache.h" struct pvscan_params { int new_pvs_found; diff --git a/tools/reporter.c b/tools/reporter.c index 98e3d12..7f5ad56 100644 --- a/tools/reporter.c +++ b/tools/reporter.c @@ -15,7 +15,7 @@ #include "tools.h" -#include "report.h" +#include "lib/report/report.h" typedef enum { REPORT_IDX_NULL = -1, diff --git a/tools/tool.h b/tools/tool.h index a2c8572..656234c 100644 --- a/tools/tool.h +++ b/tools/tool.h @@ -24,7 +24,7 @@ #include <unistd.h> -#include "libdevmapper.h" -#include "util.h" +#include "libdm/libdevmapper.h" +#include "lib/misc/util.h" #endif /* _LVM_TOOL_H */ diff --git a/tools/toollib.c b/tools/toollib.c index e633cdd..464dfff 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -14,7 +14,7 @@ */ #include "tools.h" -#include "format-text.h" +#include "lib/format_text/format-text.h" #include <sys/stat.h> #include <signal.h> diff --git a/tools/toollib.h b/tools/toollib.h index 0c9404c..9102f55 100644 --- a/tools/toollib.h +++ b/tools/toollib.h @@ -16,8 +16,8 @@ #ifndef _LVM_TOOLLIB_H #define _LVM_TOOLLIB_H -#include "metadata-exported.h" -#include "report.h" +#include "lib/metadata/metadata-exported.h" +#include "lib/report/report.h" int become_daemon(struct cmd_context *cmd, int skip_lvm); diff --git a/tools/tools.h b/tools/tools.h index 5fe3ba8..508da84 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -16,33 +16,33 @@ #ifndef _LVM_TOOLS_H #define _LVM_TOOLS_H -#include "tool.h" +#include "tools/tool.h" -#include "lvm-logging.h" +#include "lib/log/lvm-logging.h" -#include "activate.h" -#include "archiver.h" -#include "lvmcache.h" -#include "lvmetad.h" -#include "lvmlockd.h" +#include "lib/activate/activate.h" +#include "lib/format_text/archiver.h" +#include "lib/cache/lvmcache.h" +#include "lib/cache/lvmetad.h" +#include "lib/locking/lvmlockd.h" #include "lvm-version.h" -#include "config.h" -#include "defaults.h" -#include "dev-cache.h" -#include "device.h" -#include "display.h" +#include "lib/config/config.h" +#include "lib/config/defaults.h" +#include "lib/device/dev-cache.h" +#include "lib/device/device.h" +#include "lib/display/display.h" #include "errors.h" -#include "metadata-exported.h" -#include "locking.h" -#include "lvm-exec.h" -#include "lvm-file.h" -#include "lvm-signal.h" -#include "lvm-string.h" -#include "segtype.h" -#include "str_list.h" -#include "toolcontext.h" +#include "lib/metadata/metadata-exported.h" +#include "lib/locking/locking.h" +#include "lib/misc/lvm-exec.h" +#include "lib/misc/lvm-file.h" +#include "lib/misc/lvm-signal.h" +#include "lib/misc/lvm-string.h" +#include "lib/metadata/segtype.h" +#include "lib/datastruct/str_list.h" +#include "lib/commands/toolcontext.h" #include "toollib.h" -#include "lvmnotify.h" +#include "lib/notify/lvmnotify.h" #include <ctype.h> #include <sys/types.h> diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c index e9f1a4c..adcd45a 100644 --- a/tools/vgcfgrestore.c +++ b/tools/vgcfgrestore.c @@ -14,7 +14,7 @@ */ #include "tools.h" -#include "lvmetad-client.h" +#include "daemons/lvmetad/lvmetad-client.h" int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) { diff --git a/tools/vgimportclone.c b/tools/vgimportclone.c index 224d0b5..d1509bf 100644 --- a/tools/vgimportclone.c +++ b/tools/vgimportclone.c @@ -13,9 +13,9 @@ */ #include "tools.h" -#include "lvmcache.h" -#include "lvmetad-client.h" -#include "filter.h" +#include "lib/cache/lvmcache.h" +#include "daemons/lvmetad/lvmetad-client.h" +#include "lib/filters/filter.h" struct vgimportclone_params { unsigned done;

1 0

master - Revert "Revert "build: Calculate dependencies at same time as compiling.""
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=02b99be57eab4f55bd0db… Commit: 02b99be57eab4f55bd0db045a3873bdf5e500b92 Parent: 413488edc6dd077e79517e44a8d3b9a51c5138e5 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri May 11 14:40:05 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri May 11 14:40:05 2018 +0100 Revert "Revert "build: Calculate dependencies at same time as compiling."" This reverts commit ed837e6971ee84aa5b112e021df19901ae400216. --- make.tmpl.in | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/make.tmpl.in b/make.tmpl.in index 9d5d367..d3a80ef 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -442,12 +442,14 @@ endif .LIBPATTERNS = lib%.so lib%.a +DEPFLAGS=-MT $@ -MMD -MP -MF $*.d + # still needed in 2018 for 32bit builds DEFS+=-D_FILE_OFFSET_BITS=64 %.o: %.c @echo " [CC] $<" - $(Q) $(CC) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ + $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ %.o: %.cpp @echo " [CXX] $<" @@ -507,18 +509,9 @@ $(LIB_STATIC): $(OBJECTS) $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null -%.d: %.c $(INC_LNS) - @echo " [DEP] $<" - $(Q) $(MKDIR_P) $(dir $@); \ - set -e; \ - FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \ - DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \ - $(CC) -MM $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) -o $@ $<; \ - sed -i "s/$.*$\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \ - DEPLIST=`sed 's/ \\\\//;s/.*://;' < $@`; \ - echo $$DEPLIST | fmt -1 | sed 's/ //g;s/$.*$/\1:/' >> $@; \ - [ -s $@ ] || $(RM) $@ - +%.d: $(INC_LNS) +.PRECIOUS: %.d + %.mo: %.po @echo " [MSGFMT] $<" $(Q) $(MSGFMT) -o $@ $<

1 0

master - Merge branch '2018-05-30-bcache-radix-tree'
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=cb379c86c4b468858b781… Commit: cb379c86c4b468858b781695934d5ad5957108d2 Parent: 81f07c3cca417bbf8d290073a20586b47a6d127e d4d39d0f90e35c1f008f7e327902f622117fa8f9 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Fri Jun 1 12:45:33 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Fri Jun 1 12:45:33 2018 +0100 Merge branch '2018-05-30-bcache-radix-tree' lib/Makefile.in | 1 + lib/device/bcache.c | 212 ++++++++++++++++++++++++++++----------------------- make.tmpl.in | 2 +- 3 files changed, 117 insertions(+), 98 deletions(-)

1 0

master - Merge branch 'master' into 2018-05-30-bcache-radix-tree
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d4d39d0f90e35c1f008f7… Commit: d4d39d0f90e35c1f008f7e327902f622117fa8f9 Parent: 7635df8cce131b07b45024e690e4e6917cceb198 6d14d5d16b92c520b5f4ee464f171684cac40735 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Thu May 31 16:36:04 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Thu May 31 16:36:04 2018 +0100 Merge branch 'master' into 2018-05-30-bcache-radix-tree lib/device/dev-cache.c | 187 +++++++++++++++++++++++++++++++++------ lib/device/dev-cache.h | 2 + lib/filters/filter-persistent.c | 10 ++- lib/label/label.c | 65 +++++++++++--- 4 files changed, 219 insertions(+), 45 deletions(-)

1 0

master - bcache: switch to storing blocks in a radix tree.
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7635df8cce131b07b4502… Commit: 7635df8cce131b07b45024e690e4e6917cceb198 Parent: 272ec3fa73c92764ef6fe5466fc367fed66dd7f9 Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Wed May 30 14:17:26 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Wed May 30 14:17:26 2018 +0100 bcache: switch to storing blocks in a radix tree. Rather than a hash table. This will make invalidate_fd() more efficient since we can iterate just those blocks that are on a particular dev. --- lib/Makefile.in | 1 + lib/device/bcache.c | 212 ++++++++++++++++++++++++++++----------------------- make.tmpl.in | 2 +- 3 files changed, 117 insertions(+), 98 deletions(-) diff --git a/lib/Makefile.in b/lib/Makefile.in index 1d42235..4fb4fcf 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -21,6 +21,7 @@ ifeq ("@CLUSTER@", "shared") endif SOURCES =\ + ../base/data-struct/radix-tree.c \ activate/activate.c \ cache/lvmcache.c \ cache_segtype/cache.c \ diff --git a/lib/device/bcache.c b/lib/device/bcache.c index 9e94fcc..d9bacf8 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -15,6 +15,8 @@ #define _GNU_SOURCE #include "bcache.h" + +#include "base/data-struct/radix-tree.h" #include "lvm-logging.h" #include "log.h" @@ -453,12 +455,7 @@ struct bcache { struct dm_list clean; struct dm_list io_pending; - /* - * Hash table. - */ - unsigned nr_buckets; - unsigned hash_mask; - struct dm_list *buckets; + struct radix_tree *rtree; /* * Statistics @@ -473,75 +470,50 @@ struct bcache { //---------------------------------------------------------------- -/* 2^63 + 2^61 - 2^57 + 2^54 - 2^51 - 2^18 + 1 */ -#define GOLDEN_RATIO_PRIME_64 0x9e37fffffffc0001ULL +struct key_parts { + uint32_t fd; + uint64_t b; +} __attribute__ ((packed)); -static unsigned _hash(struct bcache *cache, int fd, uint64_t i) -{ - uint64_t h = (i << 10) & fd; - h *= GOLDEN_RATIO_PRIME_64; - return h & cache->hash_mask; -} +union key { + struct key_parts parts; + uint8_t bytes[12]; +}; -static struct block *_hash_lookup(struct bcache *cache, int fd, uint64_t i) +static struct block *_block_lookup(struct bcache *cache, int fd, uint64_t i) { - struct block *b; - unsigned h = _hash(cache, fd, i); - - dm_list_iterate_items_gen (b, cache->buckets + h, hash) - if (b->fd == fd && b->index == i) - return b; + union key k; + union radix_value v; - return NULL; -} + k.parts.fd = fd; + k.parts.b = i; -static void _hash_insert(struct block *b) -{ - unsigned h = _hash(b->cache, b->fd, b->index); - dm_list_add_h(b->cache->buckets + h, &b->hash); -} + if (radix_tree_lookup(cache->rtree, k.bytes, k.bytes + sizeof(k.bytes), &v)) + return v.ptr; -static inline void _hash_remove(struct block *b) -{ - dm_list_del(&b->hash); + return NULL; } -/* - * Must return a power of 2. - */ -static unsigned _calc_nr_buckets(unsigned nr_blocks) +static bool _block_insert(struct block *b) { - unsigned r = 8; - unsigned n = nr_blocks / 4; - - if (n < 8) - n = 8; + union key k; + union radix_value v; - while (r < n) - r <<= 1; + k.parts.fd = b->fd; + k.parts.b = b->index; + v.ptr = b; - return r; + return radix_tree_insert(b->cache->rtree, k.bytes, k.bytes + sizeof(k.bytes), v); } -static bool _hash_table_init(struct bcache *cache, unsigned nr_entries) +static void _block_remove(struct block *b) { - unsigned i; - - cache->nr_buckets = _calc_nr_buckets(nr_entries); - cache->hash_mask = cache->nr_buckets - 1; - cache->buckets = dm_malloc(cache->nr_buckets * sizeof(*cache->buckets)); - if (!cache->buckets) - return false; + union key k; - for (i = 0; i < cache->nr_buckets; i++) - dm_list_init(cache->buckets + i); + k.parts.fd = b->fd; + k.parts.b = b->index; - return true; -} - -static void _hash_table_exit(struct bcache *cache) -{ - dm_free(cache->buckets); + radix_tree_remove(b->cache->rtree, k.bytes, k.bytes + sizeof(k.bytes)); } //---------------------------------------------------------------- @@ -587,6 +559,11 @@ static struct block *_alloc_block(struct bcache *cache) return dm_list_struct_base(_list_pop(&cache->free), struct block, list); } +static void _free_block(struct block *b) +{ + dm_list_add(&b->cache->free, &b->list); +} + /*---------------------------------------------------------------- * Clean/dirty list management. * Always use these methods to ensure nr_dirty_ is correct. @@ -742,7 +719,7 @@ static struct block *_find_unused_clean_block(struct bcache *cache) dm_list_iterate_items (b, &cache->clean) { if (!b->ref_count) { _unlink_block(b); - _hash_remove(b); + _block_remove(b); return b; } } @@ -779,22 +756,12 @@ static struct block *_new_block(struct bcache *cache, int fd, block_address i, b b->ref_count = 0; b->error = 0; - _hash_insert(b); - } - -#if 0 - if (!b) { - log_error("bcache no new blocks for fd %d index %u " - "clean %u free %u dirty %u pending %u nr_data_blocks %u nr_cache_blocks %u", - fd, (uint32_t) i, - dm_list_size(&cache->clean), - dm_list_size(&cache->free), - dm_list_size(&cache->dirty), - dm_list_size(&cache->io_pending), - (uint32_t)cache->nr_data_blocks, - (uint32_t)cache->nr_cache_blocks); + if (!_block_insert(b)) { + log_error("bcache unable to insert block in radix tree (OOM?)"); + _free_block(b); + return NULL; + } } -#endif return b; } @@ -833,7 +800,7 @@ static struct block *_lookup_or_read_block(struct bcache *cache, int fd, block_address i, unsigned flags) { - struct block *b = _hash_lookup(cache, fd, i); + struct block *b = _block_lookup(cache, fd, i); if (b) { // FIXME: this is insufficient. We need to also catch a read @@ -937,7 +904,8 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks, dm_list_init(&cache->clean); dm_list_init(&cache->io_pending); - if (!_hash_table_init(cache, nr_cache_blocks)) { + cache->rtree = radix_tree_create(NULL, NULL); + if (!cache->rtree) { cache->engine->destroy(cache->engine); dm_free(cache); return NULL; @@ -952,7 +920,7 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks, if (!_init_free_list(cache, nr_cache_blocks, pgsize)) { cache->engine->destroy(cache->engine); - _hash_table_exit(cache); + radix_tree_destroy(cache->rtree); dm_free(cache); return NULL; } @@ -968,7 +936,7 @@ void bcache_destroy(struct bcache *cache) bcache_flush(cache); _wait_all(cache); _exit_free_list(cache); - _hash_table_exit(cache); + radix_tree_destroy(cache->rtree); cache->engine->destroy(cache->engine); dm_free(cache); } @@ -990,7 +958,7 @@ unsigned bcache_max_prefetches(struct bcache *cache) void bcache_prefetch(struct bcache *cache, int fd, block_address i) { - struct block *b = _hash_lookup(cache, fd, i); + struct block *b = _block_lookup(cache, fd, i); if (!b) { if (cache->nr_io_pending < cache->max_io) { @@ -1003,11 +971,13 @@ void bcache_prefetch(struct bcache *cache, int fd, block_address i) } } +//---------------------------------------------------------------- + static void _recycle_block(struct bcache *cache, struct block *b) { _unlink_block(b); - _hash_remove(b); - dm_list_add(&cache->free, &b->list); + _block_remove(b); + _free_block(b); } bool bcache_get(struct bcache *cache, int fd, block_address i, @@ -1041,6 +1011,8 @@ bool bcache_get(struct bcache *cache, int fd, block_address i, return false; } +//---------------------------------------------------------------- + static void _put_ref(struct block *b) { if (!b->ref_count) { @@ -1061,6 +1033,8 @@ void bcache_put(struct block *b) _preemptive_writeback(b->cache); } +//---------------------------------------------------------------- + bool bcache_flush(struct bcache *cache) { // Only dirty data is on the errored list, since bad read blocks get @@ -1083,6 +1057,7 @@ bool bcache_flush(struct bcache *cache) return dm_list_empty(&cache->errored); } +//---------------------------------------------------------------- /* * You can safely call this with a NULL block. */ @@ -1115,29 +1090,72 @@ static bool _invalidate_block(struct bcache *cache, struct block *b) bool bcache_invalidate(struct bcache *cache, int fd, block_address i) { - return _invalidate_block(cache, _hash_lookup(cache, fd, i)); + return _invalidate_block(cache, _block_lookup(cache, fd, i)); +} + +//---------------------------------------------------------------- + +struct invalidate_iterator { + bool success; + struct radix_tree_iterator it; +}; + +static bool _writeback_v(struct radix_tree_iterator *it, + uint8_t *kb, uint8_t *ke, union radix_value v) +{ + struct block *b = v.ptr; + + if (_test_flags(b, BF_DIRTY)) + _issue_write(b); + + return true; +} + +static bool _invalidate_v(struct radix_tree_iterator *it, + uint8_t *kb, uint8_t *ke, union radix_value v) +{ + struct block *b = v.ptr; + struct invalidate_iterator *iit = container_of(it, struct invalidate_iterator, it); + + if (b->error || _test_flags(b, BF_DIRTY)) { + log_warn("bcache_invalidate: block (%d, %llu) still dirty", + b->fd, (unsigned long long) b->index); + iit->success = false; + return true; + } + + if (b->ref_count) { + log_warn("bcache_invalidate: block (%d, %llu) still held", + b->fd, (unsigned long long) b->index); + iit->success = false; + return true; + } + + _unlink_block(b); + _free_block(b); + + // We can't remove the block from the radix tree yet because + // we're in the middle of an iteration. + return true; } -// FIXME: switch to a trie, or maybe 1 hash table per fd? To save iterating -// through the whole cache. bool bcache_invalidate_fd(struct bcache *cache, int fd) { - struct block *b, *tmp; - bool r = true; + union key k; + struct invalidate_iterator it; - // Start writing back any dirty blocks on this fd. - dm_list_iterate_items_safe (b, tmp, &cache->dirty) - if (b->fd == fd) - _issue_write(b); + k.parts.fd = fd; - _wait_all(cache); + it.it.visit = _writeback_v; + radix_tree_iterate(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.fd), &it.it); - // Everything should be in the clean list now. - dm_list_iterate_items_safe (b, tmp, &cache->clean) - if (b->fd == fd) - r = _invalidate_block(cache, b) && r; + _wait_all(cache); - return r; + it.success = true; + it.it.visit = _invalidate_v; + radix_tree_iterate(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.fd), &it.it); + radix_tree_remove_prefix(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.fd)); + return it.success; } //---------------------------------------------------------------- diff --git a/make.tmpl.in b/make.tmpl.in index 9d5d367..1f999ec 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -306,7 +306,7 @@ LIB_VERSION_DM := $(shell $(AWK) -F '.' '{printf "%s.%s",$$1,$$2}' $(top_srcdir) LIB_VERSION_APP := $(shell $(AWK) -F '[(). ]' '{printf "%s.%s",$$1,$$4}' $(top_srcdir)/VERSION) -INCLUDES += -I$(srcdir) -I$(top_builddir)/include +INCLUDES += -I$(top_srcdir) -I$(srcdir) -I$(top_builddir)/include INC_LNS = $(top_builddir)/include/.symlinks_created

1 0

master - radix-tree: fix some bugs in remove_prefix and iterate
by Joe Thornber 01 Jun '18

01 Jun '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=272ec3fa73c92764ef6fe… Commit: 272ec3fa73c92764ef6fe5466fc367fed66dd7f9 Parent: 1924426ad1e8a569c168e3d85c368ed531f382fe Author: Joe Thornber <ejt(a)redhat.com> AuthorDate: Wed May 30 14:14:59 2018 +0100 Committer: Joe Thornber <ejt(a)redhat.com> CommitterDate: Wed May 30 14:14:59 2018 +0100 radix-tree: fix some bugs in remove_prefix and iterate These weren't working if the prefix key was part of a prefix_chain. --- base/data-struct/radix-tree.c | 22 ++++++++++++++- test/unit/radix_tree_t.c | 56 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/base/data-struct/radix-tree.c b/base/data-struct/radix-tree.c index 8e8ac90..222b350 100644 --- a/base/data-struct/radix-tree.c +++ b/base/data-struct/radix-tree.c @@ -736,11 +736,29 @@ bool radix_tree_remove(struct radix_tree *rt, uint8_t *key_begin, uint8_t *key_e return false; } +static bool _prefix_chain_matches(struct lookup_result *lr, uint8_t *ke) +{ + // It's possible the top node is a prefix chain, and + // the remaining key matches part of it. + if (lr->v->type == PREFIX_CHAIN) { + unsigned i, rlen = ke - lr->kb; + struct prefix_chain *pc = lr->v->value.ptr; + if (rlen < pc->len) { + for (i = 0; i < rlen; i++) + if (pc->prefix[i] != lr->kb[i]) + return false; + return true; + } + } + + return false; +} + unsigned radix_tree_remove_prefix(struct radix_tree *rt, uint8_t *kb, uint8_t *ke) { unsigned count = 0; struct lookup_result lr = _lookup_prefix(&rt->root, kb, ke); - if (lr.kb == ke) { + if (lr.kb == ke || _prefix_chain_matches(&lr, ke)) { count = _free_node(rt, *lr.v); lr.v->type = UNSET; } @@ -837,7 +855,7 @@ void radix_tree_iterate(struct radix_tree *rt, uint8_t *kb, uint8_t *ke, struct radix_tree_iterator *it) { struct lookup_result lr = _lookup_prefix(&rt->root, kb, ke); - if (lr.kb == ke) + if (lr.kb == ke || _prefix_chain_matches(&lr, ke)) _iterate(lr.v, it); } diff --git a/test/unit/radix_tree_t.c b/test/unit/radix_tree_t.c index ba0d5e1..7266a8a 100644 --- a/test/unit/radix_tree_t.c +++ b/test/unit/radix_tree_t.c @@ -289,6 +289,18 @@ static void test_remove_prefix(void *fixture) T_ASSERT_EQUAL(radix_tree_remove_prefix(rt, k, k + 1), count); } +static void test_remove_prefix_single(void *fixture) +{ + struct radix_tree *rt = fixture; + uint8_t k[4]; + union radix_value v; + + _gen_key(k, k + sizeof(k)); + v.n = 1234; + T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); + T_ASSERT_EQUAL(radix_tree_remove_prefix(rt, k, k + 2), 1); +} + static void test_size(void *fixture) { struct radix_tree *rt = fixture; @@ -367,6 +379,47 @@ static void test_iterate_subset(void *fixture) T_ASSERT_EQUAL(vt.count, subset_count); } +static void test_iterate_single(void *fixture) +{ + struct radix_tree *rt = fixture; + uint8_t k[6]; + union radix_value v; + struct visitor vt; + + _gen_key(k, k + sizeof(k)); + v.n = 1234; + T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); + + vt.count = 0; + vt.it.visit = _visit; + radix_tree_iterate(rt, k, k + 3, &vt.it); + T_ASSERT_EQUAL(vt.count, 1); +} + +static void test_iterate_vary_middle(void *fixture) +{ + struct radix_tree *rt = fixture; + unsigned i; + uint8_t k[6]; + union radix_value v; + struct visitor vt; + + _gen_key(k, k + sizeof(k)); + for (i = 0; i < 16; i++) { + k[3] = i; + v.n = i; + T_ASSERT(radix_tree_insert(rt, k, k + sizeof(k), v)); + } + + vt.it.visit = _visit; + for (i = 0; i < 16; i++) { + vt.count = 0; + k[3] = i; + radix_tree_iterate(rt, k, k + 4, &vt.it); + T_ASSERT_EQUAL(vt.count, 1); + } +} + //---------------------------------------------------------------- #define T(path, desc, fn) register_test(ts, "/base/data-struct/radix-tree/" path, desc, fn) @@ -392,9 +445,12 @@ void radix_tree_tests(struct dm_list *all_tests) T("remove-prefix-keys", "remove a set of keys that have common prefixes", test_remove_prefix_keys); T("remove-prefix-keys-reversed", "remove a set of keys that have common prefixes (reversed)", test_remove_prefix_keys_reversed); T("remove-prefix", "remove a subrange", test_remove_prefix); + T("remove-prefix-single", "remove a subrange with a single entry", test_remove_prefix_single); T("size-spots-duplicates", "duplicate entries aren't counted twice", test_size); T("iterate-all", "iterate all entries in tree", test_iterate_all); T("iterate-subset", "iterate a subset of entries in tree", test_iterate_subset); + T("iterate-single", "iterate a subset that contains a single entry", test_iterate_single); + T("iterate-vary-middle", "iterate keys that vary in the middle", test_iterate_vary_middle); dm_list_add(all_tests, &ts->list); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits June 2018