improve the block queue sysfs helper macros
Hi Jens,
this series improves the macros to generate the queue sysfs boilerplate.
Diffstat:
blk-sysfs.c | 272 +++++++++++++----------------------------------------------- 1 file changed, 63 insertions(+), 209 deletions(-)
PATCH 1/2 block: add helper macros for queue sysfs entries
Add two helpers macros to avoid boilerplate code for the queue sysfs entries.
Signed-off-by Christoph Hellwig <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
--- block/blk-sysfs.c | 248 +++++++++++----------------------------------- 1 file changed, 58 insertions(+), 190 deletions(-)
block/blk-sysfs.c +58 -190
@@ -547,159 +547,75 @@ static ssize_t queue_dax_show(struct request_queue *q, char *page)return queue_var_show (blk_queue_dax (q), page); } -static struct queue_sysfs_entry queue_requests_entry = { - .attr = {.name ="nr_requests" , .mode =0644 }, - .show = queue_requests_show, - .store = queue_requests_store, -}; - -static struct queue_sysfs_entry queue_ra_entry = { - .attr = {.name ="read_ahead_kb" , .mode =0644 }, - .show = queue_ra_show, - .store = queue_ra_store, -}; - -static struct queue_sysfs_entry queue_max_sectors_entry = { - .attr = {.name ="max_sectors_kb" , .mode =0644 }, - .show = queue_max_sectors_show, - .store = queue_max_sectors_store, -}; +#define QUEUE_RO_ENTRY (_prefix, _name) \ +static struct queue_sysfs_entry _prefix##_entry = { \ + .attr = { .name = _name, .mode = 0444 }, \ + .show = _prefix##_show, \ +}; + +#define QUEUE_RW_ENTRY (_prefix, _name) \ +static struct queue_sysfs_entry _prefix##_entry = { \ + .attr = { .name = _name, .mode = 0644 }, \ + .show = _prefix##_show, \ + .store = _prefix##_store, \ +}; + +QUEUE_RW_ENTRY (queue_requests,"nr_requests" ); +QUEUE_RW_ENTRY (queue_ra,"read_ahead_kb" ); +QUEUE_RW_ENTRY (queue_max_sectors,"max_sectors_kb" ); +QUEUE_RO_ENTRY (queue_max_hw_sectors,"max_hw_sectors_kb" ); +QUEUE_RO_ENTRY (queue_max_segments,"max_segments" ); +QUEUE_RO_ENTRY (queue_max_integrity_segments,"max_integrity_segments" ); +QUEUE_RO_ENTRY (queue_max_segment_size,"max_segment_size" ); +QUEUE_RW_ENTRY (elv_iosched,"scheduler" ); + +QUEUE_RO_ENTRY (queue_logical_block_size,"logical_block_size" ); +QUEUE_RO_ENTRY (queue_physical_block_size,"physical_block_size" ); +QUEUE_RO_ENTRY (queue_chunk_sectors,"chunk_sectors" ); +QUEUE_RO_ENTRY (queue_io_min,"minimum_io_size" ); +QUEUE_RO_ENTRY (queue_io_opt,"optimal_io_size" ); + +QUEUE_RO_ENTRY (queue_max_discard_segments,"max_discard_segments" ); +QUEUE_RO_ENTRY (queue_discard_granularity,"discard_granularity" ); +QUEUE_RO_ENTRY (queue_discard_max_hw,"discard_max_hw_bytes" ); +QUEUE_RW_ENTRY (queue_discard_max,"discard_max_bytes" ); +QUEUE_RO_ENTRY (queue_discard_zeroes_data,"discard_zeroes_data" ); + +QUEUE_RO_ENTRY (queue_write_same_max,"write_same_max_bytes" ); +QUEUE_RO_ENTRY (queue_write_zeroes_max,"write_zeroes_max_bytes" ); +QUEUE_RO_ENTRY (queue_zone_append_max,"zone_append_max_bytes" ); + +QUEUE_RO_ENTRY (queue_zoned,"zoned" ); +QUEUE_RO_ENTRY (queue_nr_zones,"nr_zones" ); +QUEUE_RO_ENTRY (queue_max_open_zones,"max_open_zones" ); +QUEUE_RO_ENTRY (queue_max_active_zones,"max_active_zones" ); + +QUEUE_RW_ENTRY (queue_nomerges,"nomerges" ); +QUEUE_RW_ENTRY (queue_rq_affinity,"rq_affinity" ); +QUEUE_RW_ENTRY (queue_poll,"io_poll" ); +QUEUE_RW_ENTRY (queue_poll_delay,"io_poll_delay" ); +QUEUE_RW_ENTRY (queue_wc,"write_cache" ); +QUEUE_RO_ENTRY (queue_fua,"fua" ); +QUEUE_RO_ENTRY (queue_dax,"dax" ); +QUEUE_RW_ENTRY (queue_io_timeout,"io_timeout" ); +QUEUE_RW_ENTRY (queue_wb_lat,"wbt_lat_usec" ); -static struct queue_sysfs_entry queue_max_hw_sectors_entry = { - .attr = {.name ="max_hw_sectors_kb" , .mode =0444 }, - .show = queue_max_hw_sectors_show, -}; - -static struct queue_sysfs_entry queue_max_segments_entry = { - .attr = {.name ="max_segments" , .mode =0444 }, - .show = queue_max_segments_show, -}; - -static struct queue_sysfs_entry queue_max_discard_segments_entry = { - .attr = {.name ="max_discard_segments" , .mode =0444 }, - .show = queue_max_discard_segments_show, -}; - -static struct queue_sysfs_entry queue_max_integrity_segments_entry = { - .attr = {.name ="max_integrity_segments" , .mode =0444 }, - .show = queue_max_integrity_segments_show, -}; - -static struct queue_sysfs_entry queue_max_segment_size_entry = { - .attr = {.name ="max_segment_size" , .mode =0444 }, - .show = queue_max_segment_size_show, -}; - -static struct queue_sysfs_entry queue_iosched_entry = { - .attr = {.name ="scheduler" , .mode =0644 }, - .show = elv_iosched_show, - .store = elv_iosched_store, -}; +#ifdef CONFIG_BLK_DEV_THROTTLING_LOW +QUEUE_RW_ENTRY (blk_throtl_sample_time,"throttle_sample_time" ); +#endif +/* legacy alias for logical_block_size: */ static struct queue_sysfs_entry queue_hw_sector_size_entry = { .attr = {.name ="hw_sector_size" , .mode =0444 }, .show = queue_logical_block_size_show, }; -static struct queue_sysfs_entry queue_logical_block_size_entry = { - .attr = {.name ="logical_block_size" , .mode =0444 }, - .show = queue_logical_block_size_show, -}; - -static struct queue_sysfs_entry queue_physical_block_size_entry = { - .attr = {.name ="physical_block_size" , .mode =0444 }, - .show = queue_physical_block_size_show, -}; - -static struct queue_sysfs_entry queue_chunk_sectors_entry = { - .attr = {.name ="chunk_sectors" , .mode =0444 }, - .show = queue_chunk_sectors_show, -}; - -static struct queue_sysfs_entry queue_io_min_entry = { - .attr = {.name ="minimum_io_size" , .mode =0444 }, - .show = queue_io_min_show, -}; - -static struct queue_sysfs_entry queue_io_opt_entry = { - .attr = {.name ="optimal_io_size" , .mode =0444 }, - .show = queue_io_opt_show, -}; - -static struct queue_sysfs_entry queue_discard_granularity_entry = { - .attr = {.name ="discard_granularity" , .mode =0444 }, - .show = queue_discard_granularity_show, -}; - -static struct queue_sysfs_entry queue_discard_max_hw_entry = { - .attr = {.name ="discard_max_hw_bytes" , .mode =0444 }, - .show = queue_discard_max_hw_show, -}; - -static struct queue_sysfs_entry queue_discard_max_entry = { - .attr = {.name ="discard_max_bytes" , .mode =0644 }, - .show = queue_discard_max_show, - .store = queue_discard_max_store, -}; - -static struct queue_sysfs_entry queue_discard_zeroes_data_entry = { - .attr = {.name ="discard_zeroes_data" , .mode =0444 }, - .show = queue_discard_zeroes_data_show, -}; - -static struct queue_sysfs_entry queue_write_same_max_entry = { - .attr = {.name ="write_same_max_bytes" , .mode =0444 }, - .show = queue_write_same_max_show, -}; - -static struct queue_sysfs_entry queue_write_zeroes_max_entry = { - .attr = {.name ="write_zeroes_max_bytes" , .mode =0444 }, - .show = queue_write_zeroes_max_show, -}; - -static struct queue_sysfs_entry queue_zone_append_max_entry = { - .attr = {.name ="zone_append_max_bytes" , .mode =0444 }, - .show = queue_zone_append_max_show, -}; -static struct queue_sysfs_entry queue_nonrot_entry = { .attr = {.name ="rotational" , .mode =0644 }, .show = queue_show_nonrot, .store = queue_store_nonrot, }; -static struct queue_sysfs_entry queue_zoned_entry = { - .attr = {.name ="zoned" , .mode =0444 }, - .show = queue_zoned_show, -}; - -static struct queue_sysfs_entry queue_nr_zones_entry = { - .attr = {.name ="nr_zones" , .mode =0444 }, - .show = queue_nr_zones_show, -}; - -static struct queue_sysfs_entry queue_max_open_zones_entry = { - .attr = {.name ="max_open_zones" , .mode =0444 }, - .show = queue_max_open_zones_show, -}; - -static struct queue_sysfs_entry queue_max_active_zones_entry = { - .attr = {.name ="max_active_zones" , .mode =0444 }, - .show = queue_max_active_zones_show, -}; - -static struct queue_sysfs_entry queue_nomerges_entry = { - .attr = {.name ="nomerges" , .mode =0644 }, - .show = queue_nomerges_show, - .store = queue_nomerges_store, -}; - -static struct queue_sysfs_entry queue_rq_affinity_entry = { - .attr = {.name ="rq_affinity" , .mode =0644 }, - .show = queue_rq_affinity_show, - .store = queue_rq_affinity_store, -}; -static struct queue_sysfs_entry queue_iostats_entry = { .attr = {.name ="iostats" , .mode =0644 }, .show = queue_show_iostats,
@@ -712,54 +628,6 @@ static struct queue_sysfs_entry queue_random_entry = { .store = queue_store_random, }; -static struct queue_sysfs_entry queue_poll_entry = { - .attr = {.name ="io_poll" , .mode =0644 }, - .show = queue_poll_show, - .store = queue_poll_store, -}; - -static struct queue_sysfs_entry queue_poll_delay_entry = { - .attr = {.name ="io_poll_delay" , .mode =0644 }, - .show = queue_poll_delay_show, - .store = queue_poll_delay_store, -}; - -static struct queue_sysfs_entry queue_wc_entry = { - .attr = {.name ="write_cache" , .mode =0644 }, - .show = queue_wc_show, - .store = queue_wc_store, -}; - -static struct queue_sysfs_entry queue_fua_entry = { - .attr = {.name ="fua" , .mode =0444 }, - .show = queue_fua_show, -}; - -static struct queue_sysfs_entry queue_dax_entry = { - .attr = {.name ="dax" , .mode =0444 }, - .show = queue_dax_show, -}; - -static struct queue_sysfs_entry queue_io_timeout_entry = { - .attr = {.name ="io_timeout" , .mode =0644 }, - .show = queue_io_timeout_show, - .store = queue_io_timeout_store, -}; - -static struct queue_sysfs_entry queue_wb_lat_entry = { - .attr = {.name ="wbt_lat_usec" , .mode =0644 }, - .show = queue_wb_lat_show, - .store = queue_wb_lat_store, -}; - -#ifdef CONFIG_BLK_DEV_THROTTLING_LOW -static struct queue_sysfs_entry throtl_sample_time_entry = { - .attr = {.name ="throttle_sample_time" , .mode =0644 }, - .show = blk_throtl_sample_time_show, - .store = blk_throtl_sample_time_store, -}; -#endif -static struct attribute *queue_attrs[] = { &queue_requests_entry.attr, &queue_ra_entry.attr,
@@ -769,7 +637,7 @@ static struct attribute *queue_attrs[] = { &queue_max_discard_segments_entry.attr, &queue_max_integrity_segments_entry.attr, &queue_max_segment_size_entry.attr, - &queue_iosched_entry.attr, + &elv_iosched_entry.attr, &queue_hw_sector_size_entry.attr, &queue_logical_block_size_entry.attr, &queue_physical_block_size_entry.attr,
@@ -800,7 +668,7 @@ static struct attribute *queue_attrs[] = { &queue_poll_delay_entry.attr, &queue_io_timeout_entry.attr, #ifdef CONFIG_BLK_DEV_THROTTLING_LOW - &throtl_sample_time_entry.attr, + &blk_throtl_sample_time_entry.attr, #endif NULL, };
Signature · 1 line
2.28.0
PATCH 2/2 block: make QUEUE_SYSFS_BIT_FNS more useful
In reply to Christoph HellwigSwitch to the naming used by the other entries so that we can use the QUEUE_RW_ENTRY helper.
Signed-off-by Christoph Hellwig <[email protected]>
--- block/blk-sysfs.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-)
block/blk-sysfs.c +5 -19
@@ -260,14 +260,14 @@ static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page)#define QUEUE_SYSFS_BIT_FNS (name, flag, neg) \ static ssize_t \ -queue_show_##name(struct request_queue *q, char *page) \ +queue_##name##_show(struct request_queue *q, char *page) \ { \ int bit; \ bit = test_bit(QUEUE_FLAG_##flag, &q->queue_flags); \ return queue_var_show(neg ? !bit : bit, page); \ } \ static ssize_t \ -queue_store_##name(struct request_queue *q, const char *page, size_t count) \ +queue_##name##_store(struct request_queue *q, const char *page, size_t count) \ { \ unsigned long val; \ ssize_t ret; \
@@ -610,23 +610,9 @@ static struct queue_sysfs_entry queue_hw_sector_size_entry = { .show = queue_logical_block_size_show, }; -static struct queue_sysfs_entry queue_nonrot_entry = { - .attr = {.name ="rotational" , .mode =0644 }, - .show = queue_show_nonrot, - .store = queue_store_nonrot, -}; - -static struct queue_sysfs_entry queue_iostats_entry = { - .attr = {.name ="iostats" , .mode =0644 }, - .show = queue_show_iostats, - .store = queue_store_iostats, -}; - -static struct queue_sysfs_entry queue_random_entry = { - .attr = {.name ="add_random" , .mode =0644 }, - .show = queue_show_random, - .store = queue_store_random, -}; +QUEUE_RW_ENTRY (queue_nonrot,"rotational" ); +QUEUE_RW_ENTRY (queue_iostats,"iostats" ); +QUEUE_RW_ENTRY (queue_random,"add_random" );static struct attribute *queue_attrs[] = { &queue_requests_entry.attr,
Signature · 1 line
2.28.0
Quoted 3 lines · Christoph Hellwig
Hi Jens,
this series improves the macros to generate the queue sysfs boilerplate.
Applied, thanks.
Signature · 1 line
Jens Axboe
Quoted 3 lines · Christoph Hellwig
Hi Jens,
this series improves the macros to generate the queue sysfs boilerplate.
can you take a look at this series? I have another pile sitting on top of it waiting..