ShareVG
cover ShareVG
Another incarnation of sharing VG structures.
This version changes free_vg() to release_vg() to avoid term confusion (free should be free).
Reference counting moved to VG structure - though I'm not 100% conviced it's the best choice here - as every counter is touching pool - this makes a bit more problematic following memory pool locking (keeping the reference within vginfo referenced from VG would make it simplier).
Some name corrections happend with the pool locking debug.
Option verify_vg_crc was added to make crc runtime configurable for debug.
As a bit unrelated patch is the first one where INCONSISTENG_VG. (It's part of this patchset as it's made this patchset simplier there is no need for dropping VG from cache now)
This patchset also needs inspection as there is small change in code behaviour which might be seen as a bugfix?
Zdenek Kabelac (7):
Remove INCONSISTENG_VG flag
Change free_vg to release_vg
Add cache_vg
Pool locking code
Lock memory for shared VG
Add verify_vg_crc
Spaces
WHATS_NEW | 2 + daemons/clvmd/lvm-functions.c | 2 +- doc/example.conf.in | 5 ++ lib/activate/activate.c | 14 ++-- lib/cache/lvmcache.c | 29 ++++++++- lib/cache/lvmcache.h | 2 + lib/commands/toolcontext.c | 2 + lib/format_pool/format_pool.c | 2 +- lib/format_text/archive.c | 2 +- lib/format_text/archiver.c | 6 +- lib/format_text/format-text.c | 4 +- lib/format_text/import_vsn1.c | 2 +- lib/locking/locking.h | 4 +- lib/metadata/metadata-exported.h | 6 -- lib/metadata/metadata.c | 115 +++++++++++++++++++------------------- lib/metadata/metadata.h | 1 - lib/metadata/replicator_manip.c | 6 +- lib/metadata/vg.c | 62 ++++++++++++++++++++ lib/metadata/vg.h | 12 ++++ lib/misc/lvm-globals.c | 11 ++++ lib/misc/lvm-globals.h | 2 + libdm/libdevmapper.h | 9 +++ libdm/mm/pool-debug.c | 30 ++++++++++ libdm/mm/pool-fast.c | 66 +++++++++++++++++++++- libdm/mm/pool.c | 106 ++++++++++++++++++++++++++++++++++- liblvm/lvm_vg.c | 8 +- make.tmpl.in | 2 + test/lib/aux.sh | 1 + tools/lvconvert.c | 10 ++-- tools/lvcreate.c | 4 +- tools/lvrename.c | 4 +- tools/lvresize.c | 4 +- tools/polldaemon.c | 10 ++-- tools/pvchange.c | 8 +- tools/pvcreate.c | 2 +- tools/pvdisplay.c | 4 +- tools/pvmove.c | 4 +- tools/pvresize.c | 4 +- tools/reporter.c | 4 +- tools/toollib.c | 10 ++-- tools/vgcreate.c | 6 +- tools/vgextend.c | 6 +- tools/vgmerge.c | 12 ++-- tools/vgreduce.c | 6 +- tools/vgrename.c | 10 ++-- tools/vgsplit.c | 18 +++--- 46 files changed, 480 insertions(+), 159 deletions(-)
Signature · 1 line
1.7.6
PATCH 1/7 Remove INCONSISTENG_VG flag
As this flag could not have been set - remove it from the code.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
NOTE: because of wrong code logic the call:
lvmcache_update_vg(correct_vg, correct_vg->status & PRECOMMITTED &
(inconsistent ? INCONSISTENT_VG : 0));
used to always pass '0' - now with remove flag it's passing PRECOMMITTED flag in - tests on my machine are passing - but this present functinal change in this patch.
To match original functionality - 0 had to be always passed.
--- lib/metadata/metadata.c | 11 +++-------- lib/metadata/metadata.h | 1 - 2 files changed, 3 insertions(+), 9 deletions(-)
lib/metadata/metadata.c +3 -8
@@ -2862,12 +2862,8 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,* the missing PV logic below. */ if ((correct_vg =lvmcache_get_vg (vgid, precommitted)) && - (use_precommitted || !*consistent || !(correct_vg->status &INCONSISTENT_VG ))) { -if (!(correct_vg->status &INCONSISTENT_VG )) - *consistent =1 ; -else /* Inconsistent but we can't repair it */ - correct_vg->status &= ~INCONSISTENT_VG ; - + (use_precommitted || !*consistent)) { + *consistent =1 ;return correct_vg; }else {free_vg (correct_vg);
@@ -3134,8 +3130,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,* If there is no precommitted metadata, committed metadata * is read and stored in the cache even if use_precommitted is set */ -lvmcache_update_vg (correct_vg, correct_vg->status &PRECOMMITTED & - (inconsistent ?INCONSISTENT_VG :0 )); +lvmcache_update_vg (correct_vg, (correct_vg->status &PRECOMMITTED ));if (inconsistent) {/* FIXME Test should be if we're *using* precommitted metadata not if we were searching for it */
lib/metadata/metadata.h +0 -1
@@ -75,7 +75,6 @@//#define CONVERTING 0x00400000U /* LV */ //#define MISSING_PV 0x00800000U /* PV */ -#define INCONSISTENT_VG 0x00800000U/* VG - internal use only */ //#define PARTIAL_LV 0x01000000U /* LV - derived flag, not // written out in metadata*/
Signature · 1 line
1.7.6
PATCH 2/7 Change free_vg to release_vg
In reply to Zdenek KabelacMove the free_vg() to vg.c and replace free_vg with release_vg and make the _free_vg internal.
--- daemons/clvmd/lvm-functions.c | 2 +- lib/activate/activate.c | 14 +++--- lib/cache/lvmcache.c | 2 +- lib/format_pool/format_pool.c | 2 +- lib/format_text/archive.c | 2 +- lib/format_text/archiver.c | 6 +- lib/format_text/format-text.c | 4 +- lib/format_text/import_vsn1.c | 2 +- lib/locking/locking.h | 4 +- lib/metadata/metadata-exported.h | 6 --- lib/metadata/metadata.c | 82 +++++++++++++++---------------------- lib/metadata/replicator_manip.c | 6 +- lib/metadata/vg.c | 22 ++++++++++ lib/metadata/vg.h | 6 +++ liblvm/lvm_vg.c | 8 ++-- tools/lvconvert.c | 10 ++-- tools/lvcreate.c | 4 +- tools/lvrename.c | 4 +- tools/lvresize.c | 4 +- tools/polldaemon.c | 10 ++-- tools/pvchange.c | 8 ++-- tools/pvcreate.c | 2 +- tools/pvdisplay.c | 4 +- tools/pvmove.c | 4 +- tools/pvresize.c | 4 +- tools/reporter.c | 4 +- tools/toollib.c | 10 ++-- tools/vgcreate.c | 6 +- tools/vgextend.c | 6 +- tools/vgmerge.c | 12 +++--- tools/vgreduce.c | 6 +- tools/vgrename.c | 10 ++-- tools/vgsplit.c | 18 ++++---- 33 files changed, 150 insertions(+), 144 deletions(-)
daemons/clvmd/lvm-functions.c +1 -1
@@ -880,7 +880,7 @@ void lvm_do_backup(const char *vgname)else log_error ("Error backing up metadata, can't find VG for group %s" , vgname); -free_vg (vg); +release_vg (vg);dm_pool_empty (cmd->mem);pthread_mutex_unlock (&lvm_lock);
lib/activate/activate.c +7 -7
@@ -521,7 +521,7 @@ int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s, origin_only =0 ; r =lv_info (cmd, lv, origin_only, info, with_open_count, with_read_ahead); -free_vg (lv->vg); +release_vg (lv->vg);return r; }
@@ -1267,10 +1267,10 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s, r =1 ; out:if (lv_pre) -free_vg (lv_pre->vg); +release_vg (lv_pre->vg);if (lv) {lv_release_replicator_vgs (lv); -free_vg (lv->vg); +release_vg (lv->vg); }return r;
@@ -1351,7 +1351,7 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s, r =1 ; out:if (lv) -free_vg (lv->vg); +release_vg (lv->vg);return r; }
@@ -1458,7 +1458,7 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s) out:if (lv) {lv_release_replicator_vgs (lv); -free_vg (lv->vg); +release_vg (lv->vg); }return r;
@@ -1488,7 +1488,7 @@ int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s, r =1 ; out:if (lv) -free_vg (lv->vg); +release_vg (lv->vg);return r; }
@@ -1557,7 +1557,7 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, out:if (lv) {lv_release_replicator_vgs (lv); -free_vg (lv->vg); +release_vg (lv->vg); }return r;
lib/cache/lvmcache.c +1 -1
@@ -684,7 +684,7 @@ struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted)return vg; bad: -free_vg (vg); +release_vg (vg);_free_cached_vgmetadata (vginfo);return NULL ; }
lib/format_pool/format_pool.c +1 -1
@@ -156,7 +156,7 @@ static struct volume_group *_pool_vg_read(struct format_instance *fid,return vg; bad: -free_vg (vg); +release_vg (vg);return NULL ; }
lib/format_text/archive.c +1 -1
@@ -332,7 +332,7 @@ static void _display_archive(struct cmd_context *cmd, struct archive_file *af)log_print ("Description:\t%s" , desc ? :"<No description>" );log_print ("Backup Time:\t%s" ,ctime (&when)); -free_vg (vg); +release_vg (vg); }int archive_list (struct cmd_context *cmd,const char *dir,const char *vgname)
lib/format_text/archiver.c +3 -3
@@ -362,7 +362,7 @@ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name,log_error ("Cannot restore Volume Group %s with %i PVs " "marked as missing." , vg->name, missing_pvs); -free_vg (vg); +release_vg (vg);return r; }
@@ -447,7 +447,7 @@ void check_current_backup(struct volume_group *vg) (vg->seqno == vg_backup->seqno) && (id_equal(&vg->id, &vg_backup->id))) {log_suppress (old_suppress); -free_vg (vg_backup); +release_vg (vg_backup);return ; }log_suppress (old_suppress);
@@ -455,7 +455,7 @@ void check_current_backup(struct volume_group *vg)if (vg_backup) {if (!archive (vg_backup)) stack; -free_vg (vg_backup); +release_vg (vg_backup); }if (!archive (vg)) stack;
lib/format_text/format-text.c +2 -2
@@ -855,7 +855,7 @@ static struct volume_group *_vg_read_file_name(struct format_instance *fid,* check that it contains the correct volume group. */ if (vgname &&strcmp (vgname, vg->name)) { -free_vg (vg); +release_vg (vg);log_error ("'%s' does not contain volume group '%s'." , read_path, vgname);return NULL ;
@@ -1091,7 +1091,7 @@ static int _scan_file(const struct format_type *fmt, const char *vgname) path))) {/* FIXME Store creation host in vg */ lvmcache_update_vg (vg,0 ); -free_vg (vg); +release_vg (vg); } }
lib/format_text/import_vsn1.c +1 -1
@@ -811,7 +811,7 @@ static struct volume_group *_read_vg(struct format_instance *fid,if (lv_hash)dm_hash_destroy (lv_hash); -free_vg (vg); +release_vg (vg);return NULL ; }
lib/locking/locking.h +2 -2
@@ -156,10 +156,10 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname);sync_dev_names (cmd); \lock_vol (cmd, vol,LCK_VG_UNLOCK ); \ } while (0) -#define unlock_and_free_vg (cmd, vg, vol) \ +#define unlock_and_release_vg (cmd, vg, vol) \ do { \ unlock_vg(cmd, vol); \ - free_vg(vg); \ + release_vg(vg); \ } while (0)#define resume_lv (cmd, lv) lock_lv_vol(cmd, lv, LCK_LV_RESUME)
lib/metadata/metadata-exported.h +0 -6
@@ -469,12 +469,6 @@ int remove_lvs_in_vg(struct cmd_context *cmd,*/ void free_pv_fid (struct physical_volume *pv); -/* -* free_vg() must be called on every struct volume_group allocated -* by vg_create() or vg_read_internal() to free it when no longer required. -*/ -void free_vg (struct volume_group *vg); -/* Manipulate LVs */ struct logical_volume *lv_create_empty(const char *name, union lvid *lvid,
lib/metadata/metadata.c +33 -49
273 lines not on this page · raw message
lib/metadata/replicator_manip.c +3 -3
@@ -597,9 +597,9 @@ void free_cmd_vgs(struct dm_list *cmd_vgs)/* Backward iterate cmd_vg list */ dm_list_iterate_back_items(cvl, cmd_vgs) {if (vg_read_error (cvl->vg)) -free_vg (cvl->vg); +release_vg (cvl->vg);else -unlock_and_free_vg (cvl->vg->cmd, cvl->vg, cvl->vg_name); +unlock_and_release_vg (cvl->vg->cmd, cvl->vg, cvl->vg_name); cvl->vg =NULL ; } }
@@ -687,7 +687,7 @@ void lv_release_replicator_vgs(struct logical_volume *lv) dm_list_iterate_back_items(rsite, &first_seg(lv)->replicator->rsites)if (rsite->vg_name && rsite->vg) { -free_vg (rsite->vg); +release_vg (rsite->vg); rsite->vg =NULL ; } }
lib/metadata/vg.c +22 -0
@@ -17,6 +17,7 @@#include "metadata.h" #include "display.h" #include "activate.h" +#include "toolcontext.h" struct volume_group *alloc_vg (const char *pool_name,struct cmd_context *cmd,const char *vg_name)
@@ -51,6 +52,27 @@ struct volume_group *alloc_vg(const char *pool_name, struct cmd_context *cmd,return vg; } +static void _free_vg (struct volume_group *vg) +{ +vg_set_fid (vg,NULL ); + +if (vg->cmd && vg->vgmem == vg->cmd->mem) { +log_error (INTERNAL_ERROR "global memory pool used for VG %s" , + vg->name); +return ; + } + +dm_pool_destroy (vg->vgmem); +} + +void release_vg (struct volume_group *vg) +{ +if (!vg) +return ; + +_free_vg (vg); +} +char *vg_fmt_dup (const struct volume_group *vg) {if (!vg->fid || !vg->fid->fmt)
lib/metadata/vg.h +6 -0
@@ -111,6 +111,12 @@ struct volume_group {struct volume_group *alloc_vg (const char *pool_name,struct cmd_context *cmd,const char *vg_name); +/* +* release_vg() must be called on every struct volume_group allocated +* by vg_create() or vg_read_internal() to free it when no longer required. +*/ +void release_vg (struct volume_group *vg); +char *vg_fmt_dup (const struct volume_group *vg);char *vg_name_dup (const struct volume_group *vg);char *vg_system_id_dup (const struct volume_group *vg);
liblvm/lvm_vg.c +4 -4
@@ -56,7 +56,7 @@ vg_t lvm_vg_create(lvm_t libh, const char *vg_name) vg =vg_create ((struct cmd_context *)libh, vg_name);/* FIXME: error handling is still TBD */ if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg);return NULL ; } vg->open_mode ='w' ;
@@ -160,9 +160,9 @@ int lvm_vg_write(vg_t vg)int lvm_vg_close (vg_t vg) {if (vg_read_error (vg) ==FAILED_LOCKING ) -free_vg (vg); +release_vg (vg);else -unlock_and_free_vg (vg->cmd, vg, vg->name); +unlock_and_release_vg (vg->cmd, vg, vg->name);return 0 ; }
@@ -197,7 +197,7 @@ vg_t lvm_vg_open(lvm_t libh, const char *vgname, const char *mode, vg =vg_read ((struct cmd_context *)libh, vgname,NULL , internal_flags);if (vg_read_error (vg)) {/* FIXME: use log_errno either here in inside vg_read */ -free_vg (vg); +release_vg (vg);return NULL ; }/* FIXME: combine this with locking ? */
tools/lvconvert.c +5 -5
@@ -1615,7 +1615,7 @@ static struct logical_volume *get_vg_lock_and_logical_volume(struct cmd_context {/* * Returns NULL if the requested LV doesn't exist; -* otherwise the caller must free_vg(lv->vg) +* otherwise the caller must release_vg(lv->vg) * - it is also up to the caller to unlock_vg() as needed */ struct volume_group *vg;
@@ -1623,13 +1623,13 @@ static struct logical_volume *get_vg_lock_and_logical_volume(struct cmd_context vg =_get_lvconvert_vg (cmd, vg_name,NULL );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg); return_NULL; }if (!(lv =_get_lvconvert_lv (cmd, vg, lv_name,NULL ,0 ))) {log_error ("Can't find LV %s in VG %s" , lv_name, vg_name); -unlock_and_free_vg (cmd, vg, vg_name); +unlock_and_release_vg (cmd, vg, vg_name);return NULL ; }
@@ -1682,7 +1682,7 @@ bad: ret =poll_logical_volume (cmd, lp->lv_to_poll, lp->wait_completion); -free_vg (lv->vg); +release_vg (lv->vg); out:init_ignore_suspended_devices (saved_ignore_suspended_devices);return ret;
@@ -1732,7 +1732,7 @@ static int lvconvert_merge_single(struct cmd_context *cmd, struct logical_volume } } -free_vg (refreshed_lv->vg); +release_vg (refreshed_lv->vg);return ret; }
tools/lvcreate.c +2 -2
@@ -553,7 +553,7 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv)log_verbose ("Finding volume group \"%s\"" , lp.vg_name); vg =vg_read_for_update (cmd, lp.vg_name,NULL ,0 );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg); stack;return ECMD_FAILED ; }
@@ -568,6 +568,6 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv) r =ECMD_FAILED ; } out: -unlock_and_free_vg (cmd, vg, lp.vg_name); +unlock_and_release_vg (cmd, vg, lp.vg_name);return r; }
tools/lvrename.c +2 -2
@@ -104,7 +104,7 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)log_verbose ("Checking for existing volume group \"%s\"" , vg_name); vg =vg_read_for_update (cmd, vg_name,NULL ,0 );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg); stack;return ECMD_FAILED ; }
@@ -123,6 +123,6 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv) r =ECMD_PROCESSED ; error: -unlock_and_free_vg (cmd, vg, vg_name); +unlock_and_release_vg (cmd, vg, vg_name);return r; }
tools/lvresize.c +2 -2
@@ -773,7 +773,7 @@ int lvresize(struct cmd_context *cmd, int argc, char **argv)log_verbose ("Finding volume group %s" , lp.vg_name); vg =vg_read_for_update (cmd, lp.vg_name,NULL ,0 );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg); stack;return ECMD_FAILED ; }
@@ -781,7 +781,7 @@ int lvresize(struct cmd_context *cmd, int argc, char **argv)if (!(r =_lvresize (cmd, vg, &lp))) stack; -unlock_and_free_vg (cmd, vg, lp.vg_name); +unlock_and_release_vg (cmd, vg, lp.vg_name);return r; }
tools/polldaemon.c +5 -5
@@ -187,7 +187,7 @@ static int _wait_for_single_lv(struct cmd_context *cmd, const char *name, const/* Locks the (possibly renamed) VG again */ vg = parms->poll_fns->get_copy_vg (cmd, name, uuid);if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg);log_error ("ABORTING: Can't reread VG for %s" , name);/* What more could we do here? */ return 0 ;
@@ -198,23 +198,23 @@ static int _wait_for_single_lv(struct cmd_context *cmd, const char *name, constif (!lv && parms->lv_type ==PVMOVE ) {log_print ("%s: no pvmove in progress - already finished or aborted." , name); -unlock_and_free_vg (cmd, vg, vg->name); +unlock_and_release_vg (cmd, vg, vg->name);return 1 ; }if (!lv) {log_error ("ABORTING: Can't find LV in %s for %s" , vg->name, name); -unlock_and_free_vg (cmd, vg, vg->name); +unlock_and_release_vg (cmd, vg, vg->name);return 0 ; }if (!_check_lv_status (cmd, vg, lv, name, parms, &finished)) { -unlock_and_free_vg (cmd, vg, vg->name); +unlock_and_release_vg (cmd, vg, vg->name); return_0; } -unlock_and_free_vg (cmd, vg, vg->name); +unlock_and_release_vg (cmd, vg, vg->name);/* * FIXME Sleeping after testing, while preferred, also works around
tools/pvchange.c +4 -4
@@ -218,7 +218,7 @@ int pvchange(struct cmd_context *cmd, int argc, char **argv) } vg =vg_read_for_update (cmd, vg_name,NULL ,0 );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg); stack;continue ; }
@@ -232,7 +232,7 @@ int pvchange(struct cmd_context *cmd, int argc, char **argv) total++; done +=_pvchange_single (cmd, vg, pvl->pv,NULL ); -unlock_and_free_vg (cmd, vg, vg_name); +unlock_and_release_vg (cmd, vg, vg_name); } }else {log_verbose ("Scanning for physical volume names" );
@@ -253,7 +253,7 @@ int pvchange(struct cmd_context *cmd, int argc, char **argv) dm_list_iterate_items(sll, vgnames) { vg =vg_read_for_update (cmd, sll->str,NULL ,0 );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg); stack;continue ; }
@@ -263,7 +263,7 @@ int pvchange(struct cmd_context *cmd, int argc, char **argv) pvl->pv, NULL); } -unlock_and_free_vg (cmd, vg, sll->str); +unlock_and_release_vg (cmd, vg, sll->str); } }unlock_vg (cmd,VG_GLOBAL );
tools/pvcreate.c +1 -1
@@ -74,7 +74,7 @@ static int pvcreate_restore_params_validate(struct cmd_context *cmd, pp->pe_start =pv_pe_start (existing_pvl->pv); pp->extent_size =pv_pe_size (existing_pvl->pv); pp->extent_count =pv_pe_count (existing_pvl->pv); -free_vg (vg); +release_vg (vg); }if (arg_sign_value (cmd, physicalvolumesize_ARG,0 ) ==SIGN_MINUS ) {
tools/pvdisplay.c +2 -2
@@ -32,7 +32,7 @@ static int _pvdisplay_single(struct cmd_context *cmd, vg =vg_read (cmd, vg_name, (char *)&pv->vgid,0 );if (vg_read_error (vg)) {log_error ("Skipping volume group %s" , vg_name); -free_vg (vg); +release_vg (vg);/* FIXME If CLUSTERED should return ECMD_PROCESSED here */ return ECMD_FAILED ; }
@@ -85,7 +85,7 @@ out:if (vg_name)unlock_vg (cmd, vg_name);if (!old_vg) -free_vg (vg); +release_vg (vg);return ret; }
tools/pvmove.c +2 -2
@@ -460,7 +460,7 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name, vg =_get_vg (cmd,pv_vg_name (pv));if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg); stack;return ECMD_FAILED ; }
@@ -526,7 +526,7 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name, r =ECMD_PROCESSED ; out:free_pv_fid (pv); -unlock_and_free_vg (cmd, vg,pv_vg_name (pv)); +unlock_and_release_vg (cmd, vg,pv_vg_name (pv));return r; }
tools/pvresize.c +2 -2
@@ -52,7 +52,7 @@ static int _pv_resize_single(struct cmd_context *cmd, vg =vg_read_for_update (cmd, vg_name,NULL ,0 );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg);log_error ("Unable to read volume group \"%s\"." , vg_name);return 0 ;
@@ -129,7 +129,7 @@ out:if (is_orphan_vg (vg_name))free_pv_fid (pv);if (!old_vg) -free_vg (vg); +release_vg (vg);return r; }
tools/reporter.c +2 -2
@@ -142,7 +142,7 @@ static int _pvs_single(struct cmd_context *cmd, struct volume_group *vg, vg =vg_read (cmd, vg_name, (char *)&pv->vgid,0 );if (vg_read_error (vg)) {log_error ("Skipping volume group %s" , vg_name); -free_vg (vg); +release_vg (vg);return ECMD_FAILED ; }
@@ -182,7 +182,7 @@ out:unlock_vg (cmd, vg_name);if (!old_vg) -free_vg (vg); +release_vg (vg);return ret; }
tools/toollib.c +5 -5
@@ -403,7 +403,7 @@ int process_each_segment_in_pv(struct cmd_context *cmd, vg =vg_read (cmd, vg_name,NULL ,0 );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg);log_error ("Skipping volume group %s" , vg_name);return ECMD_FAILED ; }
@@ -415,7 +415,7 @@ int process_each_segment_in_pv(struct cmd_context *cmd,if (!(pvl =find_pv_in_vg (vg,pv_dev_name (pv)))) {log_error ("Unable to find %s in volume group %s" ,pv_dev_name (pv), vg_name); -unlock_and_free_vg (cmd, vg, vg_name); +unlock_and_release_vg (cmd, vg, vg_name);return ECMD_FAILED ; }
@@ -438,7 +438,7 @@ int process_each_segment_in_pv(struct cmd_context *cmd,if (vg_name)unlock_vg (cmd, vg_name);if (!old_vg) -free_vg (vg); +release_vg (vg);return ret_max; }
@@ -795,7 +795,7 @@ int process_each_pv(struct cmd_context *cmd, int argc, char **argv, vg =vg_read (cmd, sll->str,NULL , flags);if (vg_read_error (vg)) { ret_max =ECMD_FAILED ; -free_vg (vg); +release_vg (vg); stack;continue ; }
@@ -804,7 +804,7 @@ int process_each_pv(struct cmd_context *cmd, int argc, char **argv, handle, process_single_pv); -unlock_and_free_vg (cmd, vg, sll->str); +unlock_and_release_vg (cmd, vg, sll->str);if (ret > ret_max) ret_max = ret;
tools/vgcreate.c +3 -3
@@ -56,7 +56,7 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv)log_error ("A volume group called %s already exists." , vp_new.vg_name); else log_error("Can't get lock for %s.", vp_new.vg_name); -free_vg (vg); +release_vg (vg);return ECMD_FAILED ; }
@@ -120,13 +120,13 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv)log_print ("%s%colume group \"%s\" successfully created" , clustered_message, *clustered_message ?'v' :'V' , vg->name); -free_vg (vg); +release_vg (vg);return ECMD_PROCESSED ; bad:unlock_vg (cmd,VG_ORPHANS ); bad_orphan: -free_vg (vg); +release_vg (vg);unlock_vg (cmd, vp_new.vg_name);return ECMD_FAILED ; }
tools/vgextend.c +3 -3
@@ -72,7 +72,7 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv)log_verbose ("Checking for volume group \"%s\"" , vg_name); vg =vg_read_for_update (cmd, vg_name,NULL ,0 );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg); stack;return ECMD_FAILED ; }
@@ -92,7 +92,7 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv) }else {/* no --restore, normal vgextend */ if (!lock_vol (cmd,VG_ORPHANS ,LCK_VG_WRITE )) {log_error ("Can't get lock for orphan PVs" ); -unlock_and_free_vg (cmd, vg, vg_name); +unlock_and_release_vg (cmd, vg, vg_name);return ECMD_FAILED ; }
@@ -135,6 +135,6 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv) bad:if (!arg_count (cmd, restoremissing_ARG))unlock_vg (cmd,VG_ORPHANS ); -unlock_and_free_vg (cmd, vg, vg_name); +unlock_and_release_vg (cmd, vg, vg_name);return r; }
tools/vgmerge.c +6 -6
@@ -22,7 +22,7 @@ static struct volume_group *_vgmerge_vg_read(struct cmd_context *cmd,log_verbose ("Checking for volume group \"%s\"" , vg_name); vg =vg_read_for_update (cmd, vg_name,NULL ,0 );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg);return NULL ; }return vg;
@@ -54,7 +54,7 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, vg_to =_vgmerge_vg_read (cmd, vg_name_to);if (!vg_to) { stack; -unlock_and_free_vg (cmd, vg_from, vg_name_from); +unlock_and_release_vg (cmd, vg_from, vg_name_from);return ECMD_FAILED ; } }else {
@@ -67,7 +67,7 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, vg_from =_vgmerge_vg_read (cmd, vg_name_from);if (!vg_from) { stack; -unlock_and_free_vg (cmd, vg_to, vg_name_to); +unlock_and_release_vg (cmd, vg_to, vg_name_to);return ECMD_FAILED ; } }
@@ -153,10 +153,10 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, bad:/* * Note: as vg_to is referencing moved elements from vg_from -* the order of free_vg calls is mandatory. +* the order of release_vg calls is mandatory. */ -unlock_and_free_vg (cmd, vg_to, vg_name_to); -unlock_and_free_vg (cmd, vg_from, vg_name_from); +unlock_and_release_vg (cmd, vg_to, vg_name_to); +unlock_and_release_vg (cmd, vg_from, vg_name_from);return r; }
tools/vgreduce.c +3 -3
@@ -194,7 +194,7 @@ static int _vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, bad:if (pvl)free_pv_fid (pvl->pv); -unlock_and_free_vg (cmd, orphan_vg,VG_ORPHANS ); +unlock_and_release_vg (cmd, orphan_vg,VG_ORPHANS );return r; }
@@ -268,7 +268,7 @@ int vgreduce(struct cmd_context *cmd, int argc, char **argv) goto out; } -free_vg (vg); +release_vg (vg);log_verbose ("Trying to open VG %s for recovery..." , vg_name); vg = vg_read_for_update(cmd, vg_name, NULL,
@@ -314,7 +314,7 @@ int vgreduce(struct cmd_context *cmd, int argc, char **argv) } out:init_ignore_suspended_devices (saved_ignore_suspended_devices); -unlock_and_free_vg (cmd, vg, vg_name); +unlock_and_release_vg (cmd, vg, vg_name);return ret;
tools/vgrename.c +5 -5
@@ -25,7 +25,7 @@ static struct volume_group *_get_old_vg_for_rename(struct cmd_context *cmd,nevertheless. */ vg =vg_read_for_update (cmd, vg_name_old, vgid,READ_ALLOW_EXPORTED );if (vg_read_error (vg)) { -free_vg (vg); +release_vg (vg); return_NULL; }
@@ -117,7 +117,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path, return_0;if (!_lock_new_vg_for_rename (cmd, vg_name_new)) { -unlock_and_free_vg (cmd, vg, vg_name_old); +unlock_and_release_vg (cmd, vg, vg_name_old); return_0; } }else {
@@ -170,7 +170,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path, stack;unlock_vg (cmd, vg_name_new); -unlock_and_free_vg (cmd, vg, vg_name_old); +unlock_and_release_vg (cmd, vg, vg_name_old);log_print ("Volume group \"%s\" successfully renamed to \"%s\"" , vg_name_old, vg_name_new);
@@ -184,9 +184,9 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path, error:if (lock_vg_old_first) {unlock_vg (cmd, vg_name_new); -unlock_and_free_vg (cmd, vg, vg_name_old); +unlock_and_release_vg (cmd, vg, vg_name_old); }else { -unlock_and_free_vg (cmd, vg, vg_name_old); +unlock_and_release_vg (cmd, vg, vg_name_old);unlock_vg (cmd, vg_name_new); }return 0 ;
tools/vgsplit.c +9 -9
@@ -224,16 +224,16 @@ static struct volume_group *_vgsplit_to(struct cmd_context *cmd, vg_to =vg_create (cmd, vg_name_to);if (vg_read_error (vg_to) ==FAILED_LOCKING ) {log_error ("Can't get lock for %s" , vg_name_to); -free_vg (vg_to); +release_vg (vg_to);return NULL ; }if (vg_read_error (vg_to) ==FAILED_EXIST ) { *existing_vg =1 ; -free_vg (vg_to); +release_vg (vg_to); vg_to =vg_read_for_update (cmd, vg_name_to,NULL ,0 );if (vg_read_error (vg_to)) { -free_vg (vg_to); +release_vg (vg_to); stack;return NULL ; }
@@ -259,7 +259,7 @@ static struct volume_group *_vgsplit_from(struct cmd_context *cmd, vg_from =vg_read_for_update (cmd, vg_name_from,NULL ,0 );if (vg_read_error (vg_from)) { -free_vg (vg_from); +release_vg (vg_from);return NULL ; }return vg_from;
@@ -334,7 +334,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) vg_to =_vgsplit_to (cmd, vg_name_to, &existing_vg);if (!vg_to) { -unlock_and_free_vg (cmd, vg_from, vg_name_from); +unlock_and_release_vg (cmd, vg_from, vg_name_from); stack;return ECMD_FAILED ; }
@@ -346,7 +346,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) } vg_from =_vgsplit_from (cmd, vg_name_from);if (!vg_from) { -unlock_and_free_vg (cmd, vg_to, vg_name_to); +unlock_and_release_vg (cmd, vg_to, vg_name_to); stack;return ECMD_FAILED ; }
@@ -463,7 +463,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv)* Finally, remove the EXPORTED flag from the new VG and write it out. */ if (!test_mode ()) { -free_vg (vg_to); +release_vg (vg_to); vg_to =vg_read_for_update (cmd, vg_name_to,NULL ,READ_ALLOW_EXPORTED );if (vg_read_error (vg_to)) {
@@ -491,8 +491,8 @@ bad:* vg_to references elements moved from vg_from * so vg_to has to be freed first. */ -unlock_and_free_vg (cmd, vg_to, vg_name_to); -unlock_and_free_vg (cmd, vg_from, vg_name_from); +unlock_and_release_vg (cmd, vg_to, vg_name_to); +unlock_and_release_vg (cmd, vg_from, vg_name_from);return r; }
Signature · 1 line
1.7.6
PATCH 3/7 Add cache_vg
In reply to Zdenek Kabelac--- WHATS_NEW | 2 ++ lib/cache/lvmcache.c | 24 ++++++++++++++++++++---- lib/cache/lvmcache.h | 1 + lib/metadata/metadata.c | 6 ++++++ lib/metadata/vg.c | 17 ++++++++++++++++- lib/metadata/vg.h | 3 +++ 6 files changed, 48 insertions(+), 5 deletions(-)
WHATS_NEW +2 -0
@@ -1,5 +1,7 @@ Version 2.02.87 - =============================== + Cache and share generated VG structs. + Add ref count to struct volume_group and use release_vg instead of free_vg. Version 2.02.86 - 8th July 2011 ===============================
lib/cache/lvmcache.c +20 -4
@@ -1,6 +1,6 @@/* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. -* Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved. +* Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. *
@@ -90,6 +90,10 @@ static void _free_cached_vgmetadata(struct lvmcache_vginfo *vginfo) }log_debug ("Metadata cache: VG %s wiped." , vginfo->vgname); + +release_vg (vginfo->cached_vg); + + vginfo->cached_vg =NULL ; }/*
@@ -662,6 +666,12 @@ struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted) (!precommitted && vginfo->precommitted && !critical_section()))return NULL ; +/* +* Use already-cached VG struct when available +*/ +if ((vg = vginfo->cached_vg)) + goto out; + fic.type =FMT_INSTANCE_VG |FMT_INSTANCE_MDAS |FMT_INSTANCE_AUX_MDAS ; fic.context.vg_ref.vg_name = vginfo->vgname; fic.context.vg_ref.vg_id = vgid;
@@ -678,13 +688,19 @@ struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted)if (!(vg =import_vg_from_config_tree (vginfo->cft, fid))) goto_bad; -log_debug ("Using cached %smetadata for VG %s." , - vginfo->precommitted ?"pre-committed" :"" , vginfo->vgname); +/* +* Cache VG struct for potential reuse +*/ + vginfo->cached_vg = vg; + +out: +increment_vg_holders (vg); +log_debug ("Using cached %smetadata for VG %s with %u holder(s)." , + vginfo->precommitted ?"pre-committed" :"" , vginfo->vgname, vg->holders);return vg; bad: -release_vg (vg);_free_cached_vgmetadata (vginfo);return NULL ; }
lib/cache/lvmcache.h +1 -0
@@ -50,6 +50,7 @@ struct lvmcache_vginfo {char *vgmetadata;/* Copy of VG metadata as format_text string */ struct config_tree *cft;/* Config tree created from vgmetadata */ /* Lifetime is directly tied to vgmetadata */ +struct volume_group *cached_vg;unsigned precommitted;/* Is vgmetadata live or precommitted? */ };
lib/metadata/metadata.c +6 -0
@@ -866,6 +866,12 @@ static struct volume_group *_vg_make_handle(struct cmd_context *cmd, struct volume_group *vg, uint32_t failure) { +/* Never return a shared VG struct for a failure */ +if (vg && vg->holders >1 && failure !=SUCCESS ) { +release_vg (vg); + vg =NULL ; + } +if (!vg && !(vg =alloc_vg ("vg_make_handle" , cmd,NULL ))) return_NULL;
lib/metadata/vg.c +16 -1
@@ -42,6 +42,7 @@ struct volume_group *alloc_vg(const char *pool_name, struct cmd_context *cmd, vg->cmd = cmd; vg->vgmem = vgmem; vg->alloc =ALLOC_NORMAL ; + vg->holders =1 ;dm_list_init (&vg->pvs);dm_list_init (&vg->pvs_to_create);
@@ -49,9 +50,18 @@ struct volume_group *alloc_vg(const char *pool_name, struct cmd_context *cmd,dm_list_init (&vg->tags);dm_list_init (&vg->removed_pvs); +log_debug ("Allocated VG %s with 1 holder at %p." , vg->name, vg); +return vg; } +void increment_vg_holders (struct volume_group *vg) +{ + vg->holders++; + +log_debug ("Incrementing VG %s holder(s) to %d at %p." , vg->name, vg->holders, vg); +} +static void _free_vg (struct volume_group *vg) {vg_set_fid (vg,NULL );
@@ -62,6 +72,8 @@ static void _free_vg(struct volume_group *vg)return ; } +log_debug ("Freeing VG %s at %p." , vg->name, vg); +dm_pool_destroy (vg->vgmem); }
@@ -70,7 +82,10 @@ void release_vg(struct volume_group *vg)if (!vg)return ; -_free_vg (vg); +log_debug ("Releasing VG %s with %d holder(s) at %p." , vg->name, vg->holders, vg); + +if (!--vg->holders) +_free_vg (vg); }char *vg_fmt_dup (const struct volume_group *vg)
lib/metadata/vg.h +3 -0
@@ -41,6 +41,7 @@ struct volume_group {struct cmd_context *cmd;struct dm_pool *vgmem;struct format_instance *fid; +unsigned holders;struct dm_list *cmd_vgs;/* List of wanted/locked and opened VGs */ uint32_t cmd_missing_vgs;/* Flag marks missing VG */ uint32_t seqno;/* Metadata sequence number */
@@ -111,6 +112,8 @@ struct volume_group {struct volume_group *alloc_vg (const char *pool_name,struct cmd_context *cmd,const char *vg_name); +void increment_vg_holders (struct volume_group *vg); +/* * release_vg() must be called on every struct volume_group allocated * by vg_create() or vg_read_internal() to free it when no longer required.
Signature · 1 line
1.7.6
PATCH 4/7 Pool locking code
In reply to Zdenek KabelacAdding specific debug functions to lock and unlock memory pool.
2 ways to debug code:
mprotect - quite fast all the time - but requires more memory and
currently it is using posix_memalign() - this could be later modified to use dm_malloc() and align internally. Tool segfaults when locked memory is modified and core could be checked for problematic code section (backtrace).
crc - checksum of locked pool - implemented via quick simple hash.
But this may get quite slow when the pool is larger - so the check is only made when VG is finaly released and it has been used more then once - so the result it's rather informative - and mprotect recompiled version is needed to detect real cause of troubles.
Only fast memory pools are using mprotect -
so such debug builds cannot be combined with DEBUG_POOL.
--- libdm/libdevmapper.h | 9 ++++ libdm/mm/pool-debug.c | 30 ++++++++++++++ libdm/mm/pool-fast.c | 66 +++++++++++++++++++++++++++++- libdm/mm/pool.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++- make.tmpl.in | 2 + 5 files changed, 210 insertions(+), 3 deletions(-)
libdm/libdevmapper.h +9 -0
@@ -605,6 +605,15 @@ void *dm_pool_alloc_aligned(struct dm_pool *p, size_t s, unsigned alignment);void dm_pool_empty (struct dm_pool *p);void dm_pool_free (struct dm_pool *p,void *ptr); +/* 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: *
libdm/mm/pool-debug.c +30 -0
@@ -33,6 +33,8 @@ 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;
@@ -71,6 +73,10 @@ 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--;
@@ -109,6 +115,10 @@ void *dm_pool_alloc(struct dm_pool *p, size_t s)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;
@@ -216,6 +226,10 @@ 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);
@@ -260,3 +274,19 @@ void dm_pool_abandon_object(struct dm_pool *p) 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 ; +}
libdm/mm/pool-fast.c +64 -2
92 lines not on this page · raw message
libdm/mm/pool.c +105 -1
125 lines not on this page · raw message
make.tmpl.in +2 -0
@@ -148,7 +148,9 @@ ifeq ("@DM_IOCTLS@", "yes") DEFS += -DDM_IOCTLS endif +# Combination of DEBUG_POOL and DEBUG_ENFORCE_POOL_LOCKING is not suppored #DEFS += -DDEBUG_POOL +#DEFS += -DDEBUG_ENFORCE_POOL_LOCKING #DEFS += -DBOUNDS_CHECK #CFLAGS += -pg
Signature · 1 line
1.7.6
PATCH 5/7 Lock memory for shared VG
In reply to Zdenek KabelacAdd debug pool locking functionality. So the command could check, whether the memory in the pool was not modified.
For lv_postoder() instead of unlocking and locking for every changed struct status member do it once when entering and leaving function. Currently lv_postoder() does not modify other part of vg structure then status flags of each LV with flags that are reverted back to its original state after fucntion exit.
--- lib/cache/lvmcache.c | 5 +++++ lib/cache/lvmcache.h | 1 + lib/metadata/metadata.c | 16 ++++++++++++++++ lib/metadata/vg.c | 24 ++++++++++++++++++++++++ lib/metadata/vg.h | 1 + 5 files changed, 47 insertions(+), 0 deletions(-)
lib/cache/lvmcache.c +5 -0
@@ -692,9 +692,14 @@ struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted)* Cache VG struct for potential reuse */ vginfo->cached_vg = vg; + vg->vginfo = vginfo; + +if (!dm_pool_lock (vg->vgmem,1 )) + goto_bad; out:increment_vg_holders (vg); + vginfo->use_count++;log_debug ("Using cached %smetadata for VG %s with %u holder(s)." , vginfo->precommitted ?"pre-committed" :"" , vginfo->vgname, vg->holders);
lib/cache/lvmcache.h +1 -0
@@ -52,6 +52,7 @@ struct lvmcache_vginfo {/* Lifetime is directly tied to vgmetadata */ struct volume_group *cached_vg;unsigned precommitted;/* Is vgmetadata live or precommitted? */ +unsigned use_count;/* counter of vg reusage */ };/* One per device */
lib/metadata/metadata.c +16 -0
@@ -2107,8 +2107,17 @@ static int _lv_postorder(struct logical_volume *lv, void *data) {int r; +int lck =dm_pool_locked (lv->vg->vgmem); + +if (lck && !dm_pool_unlock (lv->vg->vgmem,0 )) + return_0; + r =_lv_postorder_visit (lv, fn, data);_lv_postorder_cleanup (lv,0 ); + +if (lck && !dm_pool_lock (lv->vg->vgmem,0 )) + return_0; +return r; }
@@ -2122,6 +2131,10 @@ static int _lv_postorder_vg(struct volume_group *vg, {struct lv_list *lvl;int r =1 ; +int lck =dm_pool_locked (vg->vgmem); + +if (lck && !dm_pool_unlock (vg->vgmem,0 )) + return_0; dm_list_iterate_items(lvl, &vg->lvs)if (!_lv_postorder_visit (lvl->lv, fn, data)) {
@@ -2132,6 +2145,9 @@ static int _lv_postorder_vg(struct volume_group *vg, dm_list_iterate_items(lvl, &vg->lvs)_lv_postorder_cleanup (lvl->lv,0 ); +if (lck && !dm_pool_lock (vg->vgmem,0 )) + return_0; +return r; }
lib/metadata/vg.c +24 -0
@@ -17,6 +17,7 @@#include "metadata.h" #include "display.h" #include "activate.h" +#include "lvmcache.h" #include "toolcontext.h" struct volume_group *alloc_vg(const char *pool_name, struct cmd_context *cmd,
@@ -57,9 +58,17 @@ struct volume_group *alloc_vg(const char *pool_name, struct cmd_context *cmd,void increment_vg_holders (struct volume_group *vg) { +int lck =dm_pool_locked (vg->vgmem); + +if (lck && !dm_pool_unlock (vg->vgmem,0 )) + stack; + vg->holders++;log_debug ("Incrementing VG %s holder(s) to %d at %p." , vg->name, vg->holders, vg); + +if (lck && !dm_pool_lock (vg->vgmem,0 )) + stack; }static void _free_vg (struct volume_group *vg)
@@ -72,6 +81,9 @@ static void _free_vg(struct volume_group *vg)return ; } +if (vg->vginfo && vg->vginfo->use_count >1 ) +log_debug ("VG %s reused %d times." , vg->name, vg->vginfo->use_count); +log_debug ("Freeing VG %s at %p." , vg->name, vg);dm_pool_destroy (vg->vgmem);
@@ -79,13 +91,25 @@ static void _free_vg(struct volume_group *vg)void release_vg (struct volume_group *vg) { +int lck; +if (!vg)return ; + lck =dm_pool_locked (vg->vgmem); +log_debug ("Releasing VG %s with %d holder(s) at %p." , vg->name, vg->holders, vg); +/* Debug perform crc check only when it's been used more then once */ +if (lck && !dm_pool_unlock (vg->vgmem, (vg->vginfo && + vg->vginfo->use_count >1 && + vg->holders ==1 ))) + stack; +if (!--vg->holders)_free_vg (vg); +else if (lck && !dm_pool_lock (vg->vgmem,0 )) + stack; }char *vg_fmt_dup (const struct volume_group *vg)
lib/metadata/vg.h +1 -0
@@ -42,6 +42,7 @@ struct volume_group {struct dm_pool *vgmem;struct format_instance *fid;unsigned holders; +struct lvmcache_vginfo *vginfo;struct dm_list *cmd_vgs;/* List of wanted/locked and opened VGs */ uint32_t cmd_missing_vgs;/* Flag marks missing VG */ uint32_t seqno;/* Metadata sequence number */
Signature · 1 line
1.7.6
PATCH 6/7 Add verify_vg_crc
In reply to Zdenek KabelacAdd config option to enable crc checking of VG structures.
--- doc/example.conf.in | 5 +++++ lib/cache/lvmcache.c | 2 +- lib/commands/toolcontext.c | 2 ++ lib/metadata/vg.c | 3 ++- lib/misc/lvm-globals.c | 11 +++++++++++ lib/misc/lvm-globals.h | 2 ++ test/lib/aux.sh | 1 + 7 files changed, 24 insertions(+), 2 deletions(-)
doc/example.conf.in +5 -0
@@ -402,6 +402,11 @@ global { # encountered the internal error. Please only enable for debugging. abort_on_internal_errors = 0 + # Check whether CRC is matching when parsed VG is used multiple times. + # This is useful to catch unexpected internal volume group structure + # modification. Please only enable for debugging. + verify_vg_crc = 0 + # If set to 1, no operations that change on-disk metadata will be permitted. # Additionally, read-only commands that encounter metadata in need of repair # will still be allowed to proceed exactly as if the repair had been
lib/cache/lvmcache.c +1 -1
@@ -694,7 +694,7 @@ struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted) vginfo->cached_vg = vg; vg->vginfo = vginfo; -if (!dm_pool_lock (vg->vgmem,1 )) +if (!dm_pool_lock (vg->vgmem,verify_vg_crc ())) goto_bad; out:
lib/commands/toolcontext.c +2 -0
@@ -373,6 +373,8 @@ static int _process_config(struct cmd_context *cmd)/* LVM stores sizes internally in units of 512-byte sectors. */ init_pv_min_size ((uint64_t )pv_min_kb * (1024 >>SECTOR_SHIFT )); +init_verify_vg_crc (find_config_tree_int (cmd,"global/verify_vg_crc" ,0 )); +return 1 ; }
lib/metadata/vg.c +2 -1
@@ -101,7 +101,8 @@ void release_vg(struct volume_group *vg)log_debug ("Releasing VG %s with %d holder(s) at %p." , vg->name, vg->holders, vg);/* Debug perform crc check only when it's been used more then once */ -if (lck && !dm_pool_unlock (vg->vgmem, (vg->vginfo && +if (lck && !dm_pool_unlock (vg->vgmem, (verify_vg_crc () && + vg->vginfo && vg->vginfo->use_count >1 && vg->holders ==1 ))) stack;
lib/misc/lvm-globals.c +11 -0
@@ -46,6 +46,7 @@ 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 int _verify_vg_crc =0 ;void init_verbose (int level) {
@@ -150,6 +151,11 @@ void init_pv_min_size(uint64_t sectors) _pv_min_size = sectors; } +void init_verify_vg_crc (int verify) +{ + _verify_vg_crc = verify; +} +void set_cmd_name (const char *cmd) {strncpy (_cmd_name, cmd,sizeof (_cmd_name));
@@ -284,3 +290,8 @@ uint64_t pv_min_size(void) {return _pv_min_size; } + +int verify_vg_crc (void ) +{ +return _verify_vg_crc; +}
lib/misc/lvm-globals.h +2 -0
@@ -41,6 +41,7 @@ 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_verify_vg_crc (int verify);void set_cmd_name (const char *cmd_name);void set_sysfs_dir_path (const char *path);
@@ -65,6 +66,7 @@ int udev_checking(void);const char *sysfs_dir_path (void );uint64_t pv_min_size (void );int activation_checks (void ); +int verify_vg_crc (void );#define DMEVENTD_MONITOR_IGNORE -1int dmeventd_monitor_mode (void );
test/lib/aux.sh +1 -0
@@ -391,6 +391,7 @@ global/locking_dir = "$TESTDIR/var/lock/lvm" global/locking_type=$LVM_TEST_LOCKING global/si_unit_consistency = 1 global/fallback_to_local_locking = 0 +global/verify_vg_crc = 1 activation/checks = 1 activation/udev_sync = 1 activation/udev_rules = 1
Signature · 1 line
1.7.6
PATCH 7/7 Spaces
In reply to Zdenek Kabelac--- lib/metadata/vg.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
lib/metadata/vg.h +2 -0
@@ -143,10 +143,12 @@ uint32_t vg_mda_count(const struct volume_group *vg);uint32_t vg_mda_used_count (const struct volume_group *vg);uint32_t vg_mda_copies (const struct volume_group *vg);int vg_set_mda_copies (struct volume_group *vg,uint32_t mda_copies); +/* * Returns visible LV count - number of LVs from user perspective */ unsigned vg_visible_lvs (const struct volume_group *vg); +/* * Count snapshot LVs. */
Signature · 1 line
1.7.6