| Message ID | 20241003153036.411721-1-kbusch@meta.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [PATCHv2] block: enable passthrough command statistics | expand |
On 10/3/24 9:30 AM, Keith Busch wrote: > From: Keith Busch <kbusch@kernel.org> > > Applications using the passthrough interfaces for IO want to continue > seeing the disk stats. These requests had been fenced off from this > block layer feature. While the block layer doesn't necessarily know what > a passthrough command does, we do know the data size and direction, > which is enough to account for the command's stats. > > Since tracking these has the potential to produce unexpected results, > the passthrough stats are locked behind a new queue flag that needs to > be enabled with the /sys/block/<dev>/queue/iostats_passthrough > attribute. Looks good to me.
On Thu, 03 Oct 2024 08:30:36 -0700, Keith Busch wrote: > Applications using the passthrough interfaces for IO want to continue > seeing the disk stats. These requests had been fenced off from this > block layer feature. While the block layer doesn't necessarily know what > a passthrough command does, we do know the data size and direction, > which is enough to account for the command's stats. > > Since tracking these has the potential to produce unexpected results, > the passthrough stats are locked behind a new queue flag that needs to > be enabled with the /sys/block/<dev>/queue/iostats_passthrough > attribute. > > [...] Applied, thanks! [1/1] block: enable passthrough command statistics commit: 663db31a86bc7da797ec62f301ef0d6058ff0721 Best regards,
On Thu, Oct 03, 2024 at 08:30:36AM -0700, Keith Busch wrote: > +What: /sys/block/<disk>/queue/iostats_passthrough > +Date: October 2024 > +Contact: linux-block@vger.kernel.org > +Description: > + [RW] This file is used to control (on/off) the iostats > + accounting of the disk for passthrough commands. > + > > What: /sys/block/<disk>/queue/logical_block_size > Date: May 2009 > diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c > index 5463697a84428..d9d7fd441297e 100644 > --- a/block/blk-mq-debugfs.c > +++ b/block/blk-mq-debugfs.c > @@ -93,6 +93,7 @@ static const char *const blk_queue_flag_name[] = { > QUEUE_FLAG_NAME(RQ_ALLOC_TIME), > QUEUE_FLAG_NAME(HCTX_ACTIVE), > QUEUE_FLAG_NAME(SQ_SCHED), > + QUEUE_FLAG_NAME(IOSTATS_PASSTHROUGH), > }; > #undef QUEUE_FLAG_NAME > > diff --git a/block/blk-mq.c b/block/blk-mq.c > index 8e75e3471ea58..cf309b39bac04 100644 > --- a/block/blk-mq.c > +++ b/block/blk-mq.c > @@ -993,13 +993,38 @@ static inline void blk_account_io_done(struct request *req, u64 now) > } > } > > +static inline bool blk_rq_passthrough_stats(struct request *req) > +{ > + struct bio *bio = req->bio; > + > + if (!blk_queue_passthrough_stat(req->q)) > + return false; > + > + /* > + * Stats are accumulated in the bdev part, so must have one attached to > + * a bio to do this > + */ > + if (!bio) > + return false; > + if (!bio->bi_bdev) > + return false; Missing. At the end of the sentence. But even then this doesn't explain why not accouting these requests is fine. - requests without a bio are all those that don't transfer data - requests with a bio but not bdev are almost all passthrough requests as far as I can tell, with the only exception of nvme I/O command passthrough. I.e. what we have here is a special casing for nvme I/O commands. Maybe that's fine, but the comments and commit log should leave a clearly visible trace of that and not confuse the hell out of people trying to understand the logic later. > + /* > + * Ensuring the size is aligned to the block size prevents observing an > + * invalid sectors stat. > + */ > + if (blk_rq_bytes(req) & (bdev_logical_block_size(bio->bi_bdev) - 1)) > + return false; Now this probably won't trigger anyway for the usual workload (although it might for odd NVMe command sets like KV and the SLM), but I'd expect the size to be rounded (probably up?) and not entirely dropped. > + ret = queue_var_store(&ios, page, count); > + if (ret < 0) > + return ret; > + > + if (ios) > + blk_queue_flag_set(QUEUE_FLAG_IOSTATS_PASSTHROUGH, > + disk->queue); > + else > + blk_queue_flag_clear(QUEUE_FLAG_IOSTATS_PASSTHROUGH, > + disk->queue); Why is this using queue flags now? This isn't really blk-mq internal, so it should be using queue_limits->flag as pointed out last round.
On Fri, Oct 04, 2024 at 07:38:28AM +0200, Christoph Hellwig wrote: > > Missing. At the end of the sentence. But even then this doesn't > explain why not accouting these requests is fine. > > - requests without a bio are all those that don't transfer data > - requests with a bio but not bdev are almost all passthrough requests > as far as I can tell, with the only exception of nvme I/O command > passthrough. > > I.e. what we have here is a special casing for nvme I/O commands. Maybe > that's fine, but the comments and commit log should leave a clearly > visible trace of that and not confuse the hell out of people trying to > understand the logic later. Even Jens was a little surprised to find nvme passthrough sets the bio bi_bdev. I didn't think it was unusual, but sounds like we are doing something special here. > > + /* > > + * Ensuring the size is aligned to the block size prevents observing an > > + * invalid sectors stat. > > + */ > > + if (blk_rq_bytes(req) & (bdev_logical_block_size(bio->bi_bdev) - 1)) > > + return false; > > Now this probably won't trigger anyway for the usual workload (although > it might for odd NVMe command sets like KV and the SLM), but I'd expect the > size to be rounded (probably up?) and not entirely dropped. This prevents commands with payload sizes that are not representative of sector access. Examples from NVMe include Copy, Dataset Management, and all the Reservation commands. The transfer size of those commands are unlikely to be a block aligned, so it's a simple way to filter them out. Rounding the payload size up will produce misleading stats, so I think it's better if they don't get to use the feature. > > + ret = queue_var_store(&ios, page, count); > > + if (ret < 0) > > + return ret; > > + > > + if (ios) > > + blk_queue_flag_set(QUEUE_FLAG_IOSTATS_PASSTHROUGH, > > + disk->queue); > > + else > > + blk_queue_flag_clear(QUEUE_FLAG_IOSTATS_PASSTHROUGH, > > + disk->queue); > > Why is this using queue flags now? This isn't really blk-mq internal, > so it should be using queue_limits->flag as pointed out last round. So many flags... The atomic limit update seemed overkill for just this flag, but okay.
diff --git a/Documentation/ABI/stable/sysfs-block b/Documentation/ABI/stable/sysfs-block index cea8856f798dd..8353611107154 100644 --- a/Documentation/ABI/stable/sysfs-block +++ b/Documentation/ABI/stable/sysfs-block @@ -424,6 +424,13 @@ Description: [RW] This file is used to control (on/off) the iostats accounting of the disk. +What: /sys/block/<disk>/queue/iostats_passthrough +Date: October 2024 +Contact: linux-block@vger.kernel.org +Description: + [RW] This file is used to control (on/off) the iostats + accounting of the disk for passthrough commands. + What: /sys/block/<disk>/queue/logical_block_size Date: May 2009 diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 5463697a84428..d9d7fd441297e 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -93,6 +93,7 @@ static const char *const blk_queue_flag_name[] = { QUEUE_FLAG_NAME(RQ_ALLOC_TIME), QUEUE_FLAG_NAME(HCTX_ACTIVE), QUEUE_FLAG_NAME(SQ_SCHED), + QUEUE_FLAG_NAME(IOSTATS_PASSTHROUGH), }; #undef QUEUE_FLAG_NAME diff --git a/block/blk-mq.c b/block/blk-mq.c index 8e75e3471ea58..cf309b39bac04 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -993,13 +993,38 @@ static inline void blk_account_io_done(struct request *req, u64 now) } } +static inline bool blk_rq_passthrough_stats(struct request *req) +{ + struct bio *bio = req->bio; + + if (!blk_queue_passthrough_stat(req->q)) + return false; + + /* + * Stats are accumulated in the bdev part, so must have one attached to + * a bio to do this + */ + if (!bio) + return false; + if (!bio->bi_bdev) + return false; + + /* + * Ensuring the size is aligned to the block size prevents observing an + * invalid sectors stat. + */ + if (blk_rq_bytes(req) & (bdev_logical_block_size(bio->bi_bdev) - 1)) + return false; + return true; +} + static inline void blk_account_io_start(struct request *req) { trace_block_io_start(req); if (!blk_queue_io_stat(req->q)) return; - if (blk_rq_is_passthrough(req)) + if (blk_rq_is_passthrough(req) && !blk_rq_passthrough_stats(req)) return; req->rq_flags |= RQF_IO_STAT; diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index e85941bec857b..a4b32047ff680 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -272,6 +272,30 @@ static ssize_t queue_nr_zones_show(struct gendisk *disk, char *page) return queue_var_show(disk_nr_zones(disk), page); } +static ssize_t queue_iostats_passthrough_show(struct gendisk *disk, char *page) +{ + return queue_var_show(blk_queue_passthrough_stat(disk->queue), page); +} + +static ssize_t queue_iostats_passthrough_store(struct gendisk *disk, + const char *page, size_t count) +{ + unsigned long ios; + ssize_t ret; + + ret = queue_var_store(&ios, page, count); + if (ret < 0) + return ret; + + if (ios) + blk_queue_flag_set(QUEUE_FLAG_IOSTATS_PASSTHROUGH, + disk->queue); + else + blk_queue_flag_clear(QUEUE_FLAG_IOSTATS_PASSTHROUGH, + disk->queue); + + return count; +} static ssize_t queue_nomerges_show(struct gendisk *disk, char *page) { return queue_var_show((blk_queue_nomerges(disk->queue) << 1) | @@ -460,6 +484,7 @@ 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_iostats_passthrough, "iostats_passthrough"); QUEUE_RW_ENTRY(queue_rq_affinity, "rq_affinity"); QUEUE_RW_ENTRY(queue_poll, "io_poll"); QUEUE_RW_ENTRY(queue_poll_delay, "io_poll_delay"); @@ -586,6 +611,7 @@ static struct attribute *queue_attrs[] = { &queue_max_open_zones_entry.attr, &queue_max_active_zones_entry.attr, &queue_nomerges_entry.attr, + &queue_iostats_passthrough_entry.attr, &queue_iostats_entry.attr, &queue_stable_writes_entry.attr, &queue_add_random_entry.attr, diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 50c3b959da281..734a32efa77d7 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -602,6 +602,7 @@ enum { QUEUE_FLAG_RQ_ALLOC_TIME, /* record rq->alloc_time_ns */ QUEUE_FLAG_HCTX_ACTIVE, /* at least one blk-mq hctx is active */ QUEUE_FLAG_SQ_SCHED, /* single queue style io dispatch */ + QUEUE_FLAG_IOSTATS_PASSTHROUGH, /* passthrough command IO accounting */ QUEUE_FLAG_MAX }; @@ -617,6 +618,8 @@ void blk_queue_flag_clear(unsigned int flag, struct request_queue *q); test_bit(QUEUE_FLAG_NOXMERGES, &(q)->queue_flags) #define blk_queue_nonrot(q) (!((q)->limits.features & BLK_FEAT_ROTATIONAL)) #define blk_queue_io_stat(q) ((q)->limits.features & BLK_FEAT_IO_STAT) +#define blk_queue_passthrough_stat(q) \ + test_bit(QUEUE_FLAG_IOSTATS_PASSTHROUGH, &(q)->queue_flags) #define blk_queue_dax(q) ((q)->limits.features & BLK_FEAT_DAX) #define blk_queue_pci_p2pdma(q) ((q)->limits.features & BLK_FEAT_PCI_P2PDMA) #ifdef CONFIG_BLK_RQ_ALLOC_TIME