dm: discard support for the linear target
PATCH 1/1 dm: discard support for the linear target
Allow discards to be passed through to a single device linear mapping. Introduce DM_TARGET_SUPPORTS_DISCARDS target features flag that each target must set once discard support is added.
Signed-off-by Mike Snitzer <[email protected]>
--- drivers/md/dm-linear.c | 1 + drivers/md/dm-table.c | 20 +++++++++++++ drivers/md/dm.c | 61 +++++++++++++++++++++++++++++++++-------- drivers/md/dm.h | 1 + include/linux/device-mapper.h | 1 + 5 files changed, 72 insertions(+), 12 deletions(-)
drivers/md/dm-linear.c +1 -0
@@ -152,6 +152,7 @@ static struct target_type linear_target = { .ioctl = linear_ioctl, .merge = linear_merge, .iterate_devices = linear_iterate_devices, + .features = DM_TARGET_SUPPORTS_DISCARDS, };int __init dm_linear_init (void )
drivers/md/dm-table.c +20 -0
@@ -54,6 +54,8 @@ struct dm_table {sector_t *highs;struct dm_target *targets; + unsigned discards_supported:1; +/* * Indicates the rw permissions for the new logical * device. This should be a combination of FMODE_READ
@@ -203,6 +205,7 @@ int dm_table_create(struct dm_table **result, fmode_t mode,INIT_LIST_HEAD (&t->devices);atomic_set (&t->holders,0 ); + t->discards_supported =1 ;if (!num_targets) num_targets =KEYS_PER_NODE ;
@@ -770,6 +773,9 @@ int dm_table_add_target(struct dm_table *t, const char *type, t->highs[t->num_targets++] = tgt->begin + tgt->len -1 ; +if (!(tgt->type->features &DM_TARGET_SUPPORTS_DISCARDS )) + t->discards_supported =0 ; +return 0 ; bad:
@@ -905,6 +911,12 @@ int dm_table_complete(struct dm_table *t)int r =0 ;unsigned int leaf_nodes; +/* +* We only support discards if there is exactly one underlying device. +*/ +if (!list_is_singular (&t->devices)) + t->discards_supported =0 ; +/* how many indexes will the btree have ? */ leaf_nodes =dm_div_up (t->num_targets,KEYS_PER_NODE ); t->depth =1 +int_log (leaf_nodes,CHILDREN_PER_NODE );
@@ -1086,6 +1098,9 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,else queue_flag_set_unlocked (QUEUE_FLAG_CLUSTER , q); +if (dm_table_supports_discards (t)) +queue_flag_set_unlocked (QUEUE_FLAG_DISCARD , q); +dm_table_set_integrity (t);/*
@@ -1232,6 +1247,11 @@ struct mapped_device *dm_table_get_md(struct dm_table *t)return t->md; } +bool dm_table_supports_discards (struct dm_table *t) +{ +return t->discards_supported; +} +EXPORT_SYMBOL (dm_vcalloc);EXPORT_SYMBOL (dm_get_device);EXPORT_SYMBOL (dm_put_device);
drivers/md/dm.c +49 -12
100 lines not on this page · raw message
drivers/md/dm.h +1 -0
@@ -62,6 +62,7 @@ int dm_table_any_busy_target(struct dm_table *t);int dm_table_set_type (struct dm_table *t);unsigned dm_table_get_type (struct dm_table *t);bool dm_table_request_based (struct dm_table *t); +bool dm_table_supports_discards (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);
include/linux/device-mapper.h +1 -0
@@ -130,6 +130,7 @@ void dm_put_device(struct dm_target *ti, struct dm_dev *d);/* * Target features */ +#define DM_TARGET_SUPPORTS_DISCARDS 0x00000001struct target_type {uint64_t features;