dm: only initialize full request_queue for request-based device
Subsystems (2)
PATCH v3 1/1 dm: only initialize full request_queue for request-based device
Allocate a minimalist request_queue structure initially (needed for both bio and request-based DM). A bio-based DM device no longer defaults to having a fully initialized request_queue (request_fn, elevator, etc). So bio-based DM devices no longer register elevator sysfs attributes ('iosched/' tree or 'scheduler' other than "none").
Initialization of a full request_queue (request_fn, elevator, etc) is deferred until it is known that the DM device is request-based -- at the end of the table load sequence.
Factor DM device's request_queue initialization:
- common to both request-based and bio-based into dm_init_md_queue().
- specific to request-based into dm_init_request_based_queue().
Adjust elv_iosched_show() to return "none" if !blk_queue_stackable. This allows the block layer to take bio-based DM into consideration.
NOTE: It is still possible, albeit unlikely, for a bio-based device to have a full request_queue. But in this case the unused elevator will not be registered with sysfs. A table switch from request-based to bio-based would be required, e.g.:
# dmsetup create --notable bio-based # echo "0 100 multipath ..." | dmsetup load bio-based # echo "0 100 linear ..." | dmsetup load bio-based # dmsetup resume bio-based
Future work, in conjunction with userspace changes, could allow DM to fix this by knowing which type of request_queue to initialize a priori (instead of waiting until the end of the table load sequence).
--- block/elevator.c | 2 +- drivers/md/dm-table.c | 6 +++ drivers/md/dm.c | 101 +++++++++++++++++++++++++++++++++++++------------ drivers/md/dm.h | 3 + 4 files changed, 86 insertions(+), 26 deletions(-)
block/elevator.c +1 -1
@@ -1086,7 +1086,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)struct elevator_type *__e;int len =0 ; -if (!q->elevator) +if (!q->elevator || !blk_queue_stackable (q))return sprintf (name,"none\n" ); elv = e->elevator_type;
drivers/md/dm-table.c +6 -0
@@ -803,6 +803,7 @@ int dm_table_set_type(struct dm_table *t)if (bio_based) {/* We must use this table as bio-based */ t->type =DM_TYPE_BIO_BASED ; +dm_clear_request_based_queue (t->md);return 0 ; }
@@ -829,6 +830,11 @@ int dm_table_set_type(struct dm_table *t)return -EINVAL ; } +if (!dm_init_request_based_queue (t->md)) { +DMWARN ("Cannot initialize queue for Request-based dm" ); +return -EINVAL ; + } + t->type =DM_TYPE_REQUEST_BASED ;return 0 ;
drivers/md/dm.c +76 -25
128 lines not on this page · raw message
drivers/md/dm.h +3 -0
@@ -113,6 +113,9 @@ void dm_sysfs_exit(struct mapped_device *md);struct kobject *dm_kobject (struct mapped_device *md);struct mapped_device *dm_get_from_kobject (struct kobject *kobj); +int dm_init_request_based_queue (struct mapped_device *md); +void dm_clear_request_based_queue (struct mapped_device *md); +/* * Targets for linear and striped mappings */
PATCH v4 1/1 dm: only initialize full request_queue for request-based device
Allocate a minimalist request_queue structure initially (needed for both bio and request-based DM). A bio-based DM device no longer defaults to having a fully initialized request_queue (request_fn, elevator, etc). So bio-based DM devices no longer register elevator sysfs attributes ('iosched/' tree or 'scheduler' other than "none").
Initialization of a full request_queue (request_fn, elevator, etc) is deferred until it is known that the DM device is request-based -- at the end of the table load sequence.
Factor DM device's request_queue initialization:
- common to both request-based and bio-based into dm_init_md_queue().
- specific to request-based into dm_init_request_based_queue().
Adjust elv_iosched_show() to return "none" if !blk_queue_stackable. This allows the block layer to take bio-based DM into consideration.
NOTE: It is still possible, albeit unlikely, for a bio-based device to have a full request_queue. But in this case the unused elevator will not be registered with sysfs. A table switch from request-based to bio-based would be required, e.g.:
# dmsetup create --notable bio-based # echo "0 100 multipath ..." | dmsetup load bio-based # echo "0 100 linear ..." | dmsetup load bio-based # dmsetup resume bio-based
Future work, in conjunction with userspace changes, could allow DM to fix this by knowing which type of request_queue to initialize a priori (instead of waiting until the end of the table load sequence).
--- block/elevator.c | 2 +- drivers/md/dm-table.c | 6 +++ drivers/md/dm.c | 119 ++++++++++++++++++++++++++++++++++++++---------- drivers/md/dm.h | 3 + 4 files changed, 104 insertions(+), 26 deletions(-)
v4: add synchronization to dm_{init,clear}_request_based_queue
v3: consolidate to 1 patch, introduce dm_init_md_queue
block/elevator.c +1 -1
@@ -1086,7 +1086,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)struct elevator_type *__e;int len =0 ; -if (!q->elevator) +if (!q->elevator || !blk_queue_stackable (q))return sprintf (name,"none\n" ); elv = e->elevator_type;
drivers/md/dm-table.c +6 -0
@@ -803,6 +803,7 @@ int dm_table_set_type(struct dm_table *t)if (bio_based) {/* We must use this table as bio-based */ t->type =DM_TYPE_BIO_BASED ; +dm_clear_request_based_queue (t->md);return 0 ; }
@@ -829,6 +830,11 @@ int dm_table_set_type(struct dm_table *t)return -EINVAL ; } +if (!dm_init_request_based_queue (t->md)) { +DMWARN ("Cannot initialize queue for Request-based dm" ); +return -EINVAL ; + } + t->type =DM_TYPE_REQUEST_BASED ;return 0 ;
drivers/md/dm.c +94 -25
158 lines not on this page · raw message
drivers/md/dm.h +3 -0
@@ -113,6 +113,9 @@ void dm_sysfs_exit(struct mapped_device *md);struct kobject *dm_kobject (struct mapped_device *md);struct mapped_device *dm_get_from_kobject (struct kobject *kobj); +int dm_init_request_based_queue (struct mapped_device *md); +void dm_clear_request_based_queue (struct mapped_device *md); +/* * Targets for linear and striped mappings */
PATCH v5 1/1 dm: only initialize full request_queue for request-based device
Allocate a minimalist request_queue structure initially (needed for both bio and request-based DM). A bio-based DM device no longer defaults to having a fully initialized request_queue (request_fn, elevator, etc). So bio-based DM devices no longer register elevator sysfs attributes ('iosched/' tree or 'scheduler' other than "none").
Initialization of a full request_queue (request_fn, elevator, etc) is deferred until it is known that the DM device is request-based -- at the end of the table load sequence.
Factor DM device's request_queue initialization:
- common to both request-based and bio-based into dm_init_md_queue().
- specific to request-based into dm_init_request_based_queue().
Adjust elv_iosched_show() to return "none" if !blk_queue_stackable. This allows the block layer to take bio-based DM into consideration.
NOTE: It is still possible, albeit unlikely, for a bio-based device to have a full request_queue. But in this case the unused elevator will not be registered with sysfs. A table switch from request-based to bio-based would be required, e.g.:
# dmsetup create --notable bio-based # echo "0 100 multipath ..." | dmsetup load bio-based # echo "0 100 linear ..." | dmsetup load bio-based # dmsetup resume bio-based
Future work, in conjunction with userspace changes, could allow DM to fix this by knowing which type of request_queue to initialize a priori (instead of waiting until the end of the table load sequence).
--- block/elevator.c | 2 +- drivers/md/dm-ioctl.c | 8 ++++ drivers/md/dm-table.c | 17 ++++++++ drivers/md/dm.c | 101 +++++++++++++++++++++++++++++++++++++------------ drivers/md/dm.h | 4 ++ 5 files changed, 106 insertions(+), 26 deletions(-)
v5: revert v4's synchronization, localize table load queue manipulation
to _hash_lock protected critical section in dm-ioctl.c:table_load()
v4: add synchronization to dm_{init,clear}_request_based_queue
v3: consolidate to 1 patch, introduce dm_init_md_queue
block/elevator.c +1 -1
@@ -1086,7 +1086,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)struct elevator_type *__e;int len =0 ; -if (!q->elevator) +if (!q->elevator || !blk_queue_stackable (q))return sprintf (name,"none\n" ); elv = e->elevator_type;
drivers/md/dm-ioctl.c +8 -0
@@ -1180,6 +1180,14 @@ static int table_load(struct dm_ioctl *param, size_t param_size) goto out; } + r =dm_table_setup_md_queue (t); +if (r) { +DMWARN ("unable to setup device queue for this table" ); +dm_table_destroy (t); +up_write (&_hash_lock); + goto out; + } +if (hc->new_map)dm_table_destroy (hc->new_map); hc->new_map = t;
drivers/md/dm-table.c +17 -0
@@ -844,6 +844,23 @@ bool dm_table_request_based(struct dm_table *t)return dm_table_get_type (t) ==DM_TYPE_REQUEST_BASED ; } +/* +* Setup the DM device's queue based on table's type. +* Caller must serialize access to table's md. +*/ +int dm_table_setup_md_queue (struct dm_table *t) +{ +if (dm_table_request_based (t)) { +if (!dm_init_request_based_queue (t->md)) { +DMWARN ("Cannot initialize queue for Request-based dm" ); +return -EINVAL ; + } + }else +dm_clear_request_based_queue (t->md); + +return 0 ; +} +int dm_table_alloc_md_mempools (struct dm_table *t) {unsigned type =dm_table_get_type (t);
drivers/md/dm.c +76 -25
128 lines not on this page · raw message
drivers/md/dm.h +4 -0
@@ -65,6 +65,7 @@ bool dm_table_request_based(struct dm_table *t);int dm_table_alloc_md_mempools (struct dm_table *t);void dm_table_free_md_mempools (struct dm_table *t);struct dm_md_mempools *dm_table_get_md_mempools (struct dm_table *t); +int dm_table_setup_md_queue (struct dm_table *t);/* * To check the return value from dm_table_find_target().
@@ -113,6 +114,9 @@ void dm_sysfs_exit(struct mapped_device *md);struct kobject *dm_kobject (struct mapped_device *md);struct mapped_device *dm_get_from_kobject (struct kobject *kobj); +int dm_init_request_based_queue (struct mapped_device *md); +void dm_clear_request_based_queue (struct mapped_device *md); +/* * Targets for linear and striped mappings */
PATCH v6 1/1 dm: only initialize full request_queue for request-based device
Allocate a minimalist request_queue structure initially (needed for both bio and request-based DM). A bio-based DM device no longer defaults to having a fully initialized request_queue (request_fn, elevator, etc). So bio-based DM devices no longer register elevator sysfs attributes ('iosched/' tree or 'scheduler' other than "none").
Initialization of a full request_queue (request_fn, elevator, etc) is deferred until it is known that the DM device is request-based -- at the end of the table load sequence.
Factor DM device's request_queue initialization:
- common to both request-based and bio-based into dm_init_md_queue().
- specific to request-based into dm_init_request_based_queue().
Adjust elv_iosched_show() to return "none" if !blk_queue_stackable. This allows the block layer to take bio-based DM into consideration.
NOTE: It is still possible, albeit unlikely, for a bio-based device to have a full request_queue. But in this case the unused elevator will not be registered with sysfs. A table switch from request-based to bio-based would be required, e.g.:
# dmsetup create --notable bio-based # echo "0 100 multipath ..." | dmsetup load bio-based # echo "0 100 linear ..." | dmsetup load bio-based # dmsetup resume bio-based
Future work, in conjunction with userspace changes, could allow DM to fix this by knowing which type of request_queue to initialize a priori (instead of waiting until the end of the table load sequence).
--- block/elevator.c | 2 +- drivers/md/dm-ioctl.c | 11 ++++ drivers/md/dm-table.c | 32 ++++++++++++- drivers/md/dm.c | 124 ++++++++++++++++++++++++++++++++++++------------- drivers/md/dm.h | 6 ++ 5 files changed, 141 insertions(+), 34 deletions(-)
v6: use dm_{lock,unlock}_md_queue to protect md->queue during table_load(),
move conflicting table type check from resume to table load.
v5: revert v4's synchronization, localize table load queue manipulation
to _hash_lock protected critical section in dm-ioctl.c:table_load()
v4: add synchronization to dm_{init,clear}_request_based_queue
v3: consolidate to 1 patch, introduce dm_init_md_queue
block/elevator.c +1 -1
@@ -1088,7 +1088,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)struct elevator_type *__e;int len =0 ; -if (!q->elevator) +if (!q->elevator || !blk_queue_stackable (q))return sprintf (name,"none\n" ); elv = e->elevator_type;
drivers/md/dm-ioctl.c +11 -0
@@ -1170,12 +1170,22 @@ static int table_load(struct dm_ioctl *param, size_t param_size) goto out; } +dm_lock_md_queue (md); + r =dm_table_setup_md_queue (t); +if (r) { +DMWARN ("unable to setup device queue for this table" ); +dm_table_destroy (t); +dm_unlock_md_queue (md); + goto out; + } +down_write (&_hash_lock); hc =dm_get_mdptr (md);if (!hc || hc->md != md) {DMWARN ("device has been removed from the dev hash table." );dm_table_destroy (t);up_write (&_hash_lock); +dm_unlock_md_queue (md); r = -ENXIO ; goto out; }
@@ -1184,6 +1194,7 @@ static int table_load(struct dm_ioctl *param, size_t param_size)dm_table_destroy (hc->new_map); hc->new_map = t;up_write (&_hash_lock); +dm_unlock_md_queue (md); param->flags |=DM_INACTIVE_PRESENT_FLAG ; r =__dev_status (md, param);
drivers/md/dm-table.c +31 -1
@@ -782,6 +782,7 @@ int dm_table_set_type(struct dm_table *t) {unsigned i;unsigned bio_based =0 , request_based =0 ; +struct dm_table *live_table =NULL ;struct dm_target *tgt;struct dm_dev_internal *dd;struct list_head *devices;
@@ -803,7 +804,7 @@ int dm_table_set_type(struct dm_table *t)if (bio_based) {/* We must use this table as bio-based */ t->type =DM_TYPE_BIO_BASED ; -return 0 ; + goto finish; }BUG_ON (!request_based);/* No targets in this table */
@@ -831,6 +832,18 @@ int dm_table_set_type(struct dm_table *t) t->type =DM_TYPE_REQUEST_BASED ; +finish: +/* cannot change the device type, once a table is bound */ + live_table =dm_get_live_table (t->md); +if (live_table) { +if (dm_table_get_type (live_table) !=dm_table_get_type (t)) { +DMWARN ("can't change the device type after a table is bound" ); +dm_table_put (live_table); +return -EINVAL ; + } +dm_table_put (live_table); + } +return 0 ; }
@@ -844,6 +857,23 @@ bool dm_table_request_based(struct dm_table *t)return dm_table_get_type (t) ==DM_TYPE_REQUEST_BASED ; } +/* +* Setup the DM device's queue based on table's type. +* Caller must serialize access to table's md. +*/ +int dm_table_setup_md_queue (struct dm_table *t) +{ +if (dm_table_request_based (t)) { +if (!dm_init_request_based_queue (t->md)) { +DMWARN ("Cannot initialize queue for Request-based dm" ); +return -EINVAL ; + } + }else +dm_clear_request_based_queue (t->md); + +return 0 ; +} +int dm_table_alloc_md_mempools (struct dm_table *t) {unsigned type =dm_table_get_type (t);
drivers/md/dm.c +92 -32
169 lines not on this page · raw message
drivers/md/dm.h +6 -0
@@ -65,6 +65,12 @@ bool dm_table_request_based(struct dm_table *t);int dm_table_alloc_md_mempools (struct dm_table *t);void dm_table_free_md_mempools (struct dm_table *t);struct dm_md_mempools *dm_table_get_md_mempools (struct dm_table *t); +int dm_table_setup_md_queue (struct dm_table *t); + +void dm_lock_md_queue (struct mapped_device *md); +void dm_unlock_md_queue (struct mapped_device *md); +int dm_init_request_based_queue (struct mapped_device *md); +void dm_clear_request_based_queue (struct mapped_device *md);/* * To check the return value from dm_table_find_target().
PATCH v7 1/1 dm: only initialize full request_queue for request-based device
Allocate a minimalist request_queue structure initially (needed for both bio and request-based DM). A bio-based DM device no longer defaults to having a fully initialized request_queue (request_fn, elevator, etc). So bio-based DM devices no longer register elevator sysfs attributes ('iosched/' tree or 'scheduler' other than "none").
Initialization of a full request_queue (request_fn, elevator, etc) is deferred until it is known that the DM device is request-based -- at the end of the table load sequence.
Factor DM device's request_queue initialization:
- common to both request-based and bio-based into dm_init_md_queue().
- specific to request-based into dm_init_request_based_queue().
Introduce 'queue_lock' in mapped_device structure and use it to protect md->queue during table_load() and do_resume().
Adjust elv_iosched_show() to return "none" if !blk_queue_stackable. This allows the block layer to take bio-based DM into consideration.
NOTE: It is still possible, albeit unlikely, for a bio-based device to have a full request_queue. But in this case the unused elevator will not be registered with sysfs. A table switch from request-based to bio-based would be required, e.g.:
# dmsetup create --notable bio-based # echo "0 100 multipath ..." | dmsetup load bio-based # echo "0 100 linear ..." | dmsetup load bio-based # dmsetup resume bio-based
--- block/elevator.c | 2 drivers/md/dm-ioctl.c | 34 +++++++++++++- drivers/md/dm-table.c | 27 +++++++++++ drivers/md/dm.c | 121 +++++++++++++++++++++++++++++++++++++++----------- drivers/md/dm.h | 8 +++ 5 files changed, 164 insertions(+), 28 deletions(-)
v7: fix locking to properly protect md->queue during do_resume(), don't
change queue if device already has a live table
v6: use dm_{lock,unlock}_md_queue to protect md->queue during table_load(),
move conflicting table type check from resume to table load.
v5: revert v4's synchronization, localize table load queue manipulation
to _hash_lock protected critical section in dm-ioctl.c:table_load()
v4: add synchronization to dm_{init,clear}_request_based_queue
v3: consolidate to 1 patch, introduce dm_init_md_queue
block/elevator.c +1 -1
@@ -1086,7 +1086,7 @@ ssize_t elv_iosched_show(struct request_struct elevator_type *__e;int len =0 ; -if (!q->elevator) +if (!q->elevator || !blk_queue_stackable (q))return sprintf (name,"none\n" ); elv = e->elevator_type;
drivers/md/dm-ioctl.c +32 -2
@@ -862,7 +862,6 @@ static int do_resume(struct dm_ioctl *pastruct dm_table *new_map, *old_map =NULL ;down_write (&_hash_lock); - hc =__find_device_hash_cell (param);if (!hc) {DMWARN ("device doesn't appear to be in the dev hash table." );
@@ -871,11 +870,27 @@ static int do_resume(struct dm_ioctl *pa } md = hc->md; +up_write (&_hash_lock); + +/* +* Protect against md->queue changing via competing table_load +* until the device is known to have a live table. +*/ +dm_lock_md_queue (md); + +down_write (&_hash_lock); + hc =dm_get_mdptr (md); +if (!hc || hc->md != md) { +DMWARN ("device has been removed from the dev hash table." ); +up_write (&_hash_lock); +dm_unlock_md_queue (md); +dm_put (md); +return -ENXIO ; + } new_map = hc->new_map; hc->new_map =NULL ; param->flags &= ~DM_INACTIVE_PRESENT_FLAG ; -up_write (&_hash_lock);/* Do we need to load a new map ? */
@@ -891,6 +906,7 @@ static int do_resume(struct dm_ioctl *pa old_map =dm_swap_table (md, new_map);if (IS_ERR (old_map)) {dm_table_destroy (new_map); +dm_unlock_md_queue (md);dm_put (md);return PTR_ERR (old_map); }
@@ -901,6 +917,9 @@ static int do_resume(struct dm_ioctl *paset_disk_ro (dm_disk (md),1 ); } +/* The device has a live table at this point. */ +dm_unlock_md_queue (md); +if (dm_suspended_md (md)) { r =dm_resume (md);if (!r && !dm_kobject_uevent (md,KOBJ_CHANGE , param->event_nr))
@@ -1170,12 +1189,22 @@ static int table_load(struct dm_ioctl *p goto out; } +dm_lock_md_queue (md); + r =dm_table_setup_md_queue (t); +if (r) { +DMWARN ("unable to setup device queue for this table" ); +dm_table_destroy (t); +dm_unlock_md_queue (md); + goto out; + } +down_write (&_hash_lock); hc =dm_get_mdptr (md);if (!hc || hc->md != md) {DMWARN ("device has been removed from the dev hash table." );dm_table_destroy (t);up_write (&_hash_lock); +dm_unlock_md_queue (md); r = -ENXIO ; goto out; }
@@ -1184,6 +1213,7 @@ static int table_load(struct dm_ioctl *pdm_table_destroy (hc->new_map); hc->new_map = t;up_write (&_hash_lock); +dm_unlock_md_queue (md); param->flags |=DM_INACTIVE_PRESENT_FLAG ; r =__dev_status (md, param);
drivers/md/dm-table.c +27 -0
@@ -866,6 +866,33 @@ bool dm_table_request_based(struct dm_tareturn dm_table_get_type (t) ==DM_TYPE_REQUEST_BASED ; } +/* +* Setup the DM device's queue based on table's type. +*/ +int dm_table_setup_md_queue (struct dm_table *t) +{ +struct dm_table *live_table =NULL ; + +BUG_ON (!dm_md_queue_is_locked (t->md)); + +/* don't change queue if device already has a live table */ + live_table =dm_get_live_table (t->md); +if (live_table) { +dm_table_put (live_table); +return 0 ; + } + +if (dm_table_request_based (t)) { +if (!dm_init_request_based_queue (t->md)) { +DMWARN ("Cannot initialize queue for Request-based dm" ); +return -EINVAL ; + } + }else +dm_clear_request_based_queue (t->md); + +return 0 ; +} +int dm_table_alloc_md_mempools (struct dm_table *t) {unsigned type =dm_table_get_type (t);
drivers/md/dm.c +96 -25
160 lines not on this page · raw message
drivers/md/dm.h +8 -0
@@ -66,6 +66,14 @@ bool dm_table_request_based(struct dm_taint dm_table_alloc_md_mempools (struct dm_table *t);void dm_table_free_md_mempools (struct dm_table *t);struct dm_md_mempools *dm_table_get_md_mempools (struct dm_table *t); +int dm_table_setup_md_queue (struct dm_table *t); + +int dm_init_request_based_queue (struct mapped_device *md); +void dm_clear_request_based_queue (struct mapped_device *md); + +void dm_lock_md_queue (struct mapped_device *md); +void dm_unlock_md_queue (struct mapped_device *md); +int dm_md_queue_is_locked (struct mapped_device *md);/* * To check the return value from dm_table_find_target().