lkml.org 
[lkml]   [2023]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH -next v2 6/6] blk-sysfs: add a new attr_group for blk_mq
From
Date
Hi, Christoph

在 2023/05/12 17:35, Yu Kuai 写道:
> From: Yu Kuai <yukuai3@huawei.com>
>
> Currently wbt sysfs entry is created for bio based device, and wbt can
> be enabled for such device through sysfs while it doesn't make sense
> because wbt can only work for rq based device. In the meantime, there
> are other similar sysfs entries.
>
> Fix this by adding a new attr_group for blk_mq, and sysfs entries will
> only be created when the device is rq based.
>
> Suggested-by: Christoph Hellwig <hch@lst.de>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>

Any comments about this patch?

Thanks,
Kuai
> ---
> block/blk-sysfs.c | 42 +++++++++++++++++++++++++++++++-----------
> 1 file changed, 31 insertions(+), 11 deletions(-)
>
> diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
> index 6c1c4ba66bc0..afc797fb0dfc 100644
> --- a/block/blk-sysfs.c
> +++ b/block/blk-sysfs.c
> @@ -621,7 +621,6 @@ QUEUE_RW_ENTRY(queue_wb_lat, "wbt_lat_usec");
> #endif
>
> static struct attribute *queue_attrs[] = {
> - &queue_requests_entry.attr,
> &queue_ra_entry.attr,
> &queue_max_hw_sectors_entry.attr,
> &queue_max_sectors_entry.attr,
> @@ -629,7 +628,6 @@ static struct attribute *queue_attrs[] = {
> &queue_max_discard_segments_entry.attr,
> &queue_max_integrity_segments_entry.attr,
> &queue_max_segment_size_entry.attr,
> - &elv_iosched_entry.attr,
> &queue_hw_sector_size_entry.attr,
> &queue_logical_block_size_entry.attr,
> &queue_physical_block_size_entry.attr,
> @@ -650,7 +648,6 @@ static struct attribute *queue_attrs[] = {
> &queue_max_open_zones_entry.attr,
> &queue_max_active_zones_entry.attr,
> &queue_nomerges_entry.attr,
> - &queue_rq_affinity_entry.attr,
> &queue_iostats_entry.attr,
> &queue_stable_writes_entry.attr,
> &queue_random_entry.attr,
> @@ -658,11 +655,7 @@ static struct attribute *queue_attrs[] = {
> &queue_wc_entry.attr,
> &queue_fua_entry.attr,
> &queue_dax_entry.attr,
> -#ifdef CONFIG_BLK_WBT
> - &queue_wb_lat_entry.attr,
> -#endif
> &queue_poll_delay_entry.attr,
> - &queue_io_timeout_entry.attr,
> #ifdef CONFIG_BLK_DEV_THROTTLING_LOW
> &blk_throtl_sample_time_entry.attr,
> #endif
> @@ -671,16 +664,23 @@ static struct attribute *queue_attrs[] = {
> NULL,
> };
>
> +static struct attribute *blk_mq_queue_attrs[] = {
> + &queue_requests_entry.attr,
> + &elv_iosched_entry.attr,
> + &queue_rq_affinity_entry.attr,
> + &queue_io_timeout_entry.attr,
> +#ifdef CONFIG_BLK_WBT
> + &queue_wb_lat_entry.attr,
> +#endif
> + NULL,
> +};
> +
> static umode_t queue_attr_visible(struct kobject *kobj, struct attribute *attr,
> int n)
> {
> struct gendisk *disk = container_of(kobj, struct gendisk, queue_kobj);
> struct request_queue *q = disk->queue;
>
> - if (attr == &queue_io_timeout_entry.attr &&
> - (!q->mq_ops || !q->mq_ops->timeout))
> - return 0;
> -
> if ((attr == &queue_max_open_zones_entry.attr ||
> attr == &queue_max_active_zones_entry.attr) &&
> !blk_queue_is_zoned(q))
> @@ -689,11 +689,30 @@ static umode_t queue_attr_visible(struct kobject *kobj, struct attribute *attr,
> return attr->mode;
> }
>
> +static umode_t blk_mq_queue_attr_visible(struct kobject *kobj,
> + struct attribute *attr, int n)
> +{
> + struct gendisk *disk = container_of(kobj, struct gendisk, queue_kobj);
> + struct request_queue *q = disk->queue;
> +
> + if (!queue_is_mq(q))
> + return 0;
> +
> + if (attr == &queue_io_timeout_entry.attr && !q->mq_ops->timeout)
> + return 0;
> +
> + return attr->mode;
> +}
> +
> static struct attribute_group queue_attr_group = {
> .attrs = queue_attrs,
> .is_visible = queue_attr_visible,
> };
>
> +static struct attribute_group blk_mq_queue_attr_group = {
> + .attrs = blk_mq_queue_attrs,
> + .is_visible = blk_mq_queue_attr_visible,
> +};
>
> #define to_queue(atr) container_of((atr), struct queue_sysfs_entry, attr)
>
> @@ -738,6 +757,7 @@ static const struct sysfs_ops queue_sysfs_ops = {
>
> static const struct attribute_group *blk_queue_attr_groups[] = {
> &queue_attr_group,
> + &blk_mq_queue_attr_group,
> NULL
> };
>
>

\
 
 \ /
  Last update: 2023-05-26 11:41    [W:0.153 / U:0.300 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site