diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-02-08 14:46:49 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-08 13:43:08 -0700 |
| commit | 1e739730c5b9ea80a2f25e9cf6e1025d47e3d8ed (patch) | |
| tree | 4f48ed6c92153fb9941185182e918232eb3472f4 /block/blk-sysfs.c | |
| parent | 34fe7c05400663e01e23cddd1fea68bb7a2b3d29 (diff) | |
| download | linux-0-day-1e739730c5b9ea80a2f25e9cf6e1025d47e3d8ed.tar.gz linux-0-day-1e739730c5b9ea80a2f25e9cf6e1025d47e3d8ed.tar.xz | |
block: optionally merge discontiguous discard bios into a single request
Add a new merge strategy that merges discard bios into a request until the
maximum number of discard ranges (or the maximum discard size) is reached
from the plug merging code. I/O scheduler merging is not wired up yet
but might also be useful, although not for fast devices like NVMe which
are the only user for now.
Note that for now we don't support limiting the size of each discard range,
but if needed that can be added later.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-sysfs.c')
| -rw-r--r-- | block/blk-sysfs.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 48032c4759a7d..070d81bae1d50 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -121,6 +121,12 @@ static ssize_t queue_max_segments_show(struct request_queue *q, char *page) return queue_var_show(queue_max_segments(q), (page)); } +static ssize_t queue_max_discard_segments_show(struct request_queue *q, + char *page) +{ + return queue_var_show(queue_max_discard_segments(q), (page)); +} + static ssize_t queue_max_integrity_segments_show(struct request_queue *q, char *page) { return queue_var_show(q->limits.max_integrity_segments, (page)); @@ -545,6 +551,11 @@ static struct queue_sysfs_entry queue_max_segments_entry = { .show = queue_max_segments_show, }; +static struct queue_sysfs_entry queue_max_discard_segments_entry = { + .attr = {.name = "max_discard_segments", .mode = S_IRUGO }, + .show = queue_max_discard_segments_show, +}; + static struct queue_sysfs_entry queue_max_integrity_segments_entry = { .attr = {.name = "max_integrity_segments", .mode = S_IRUGO }, .show = queue_max_integrity_segments_show, @@ -697,6 +708,7 @@ static struct attribute *default_attrs[] = { &queue_max_hw_sectors_entry.attr, &queue_max_sectors_entry.attr, &queue_max_segments_entry.attr, + &queue_max_discard_segments_entry.attr, &queue_max_integrity_segments_entry.attr, &queue_max_segment_size_entry.attr, &queue_iosched_entry.attr, |