Skip to content

blk-mq/scsi: tracking device queue depth via sbitmap

Ming Lei linux-block linux-scsi virtualization 9 versions – Applied

Status from this message: Applied to 5.13/scsi-queue, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v8 Latest13 patches 1 replyApplied
  2. v713 patches 4 repliesSuperseded
  3. v613 patches 1 replySuperseded
Earlier versions · 6
VersionPostedPatchesRepliesStatus
v5 posting 2/213 patches1 replySuperseded
v5 posting 1/29 of 13 patches1 replySuperseded
v412 patches19 repliesSuperseded
v312 patches14 repliesSuperseded
v210 patches0 repliesSuperseded
v110 patches4 repliesSuperseded

Changes in v8 from the cover letter

- fix handling for device_blocked, only patch 13 is changed
- rebase on latest for-5.12/block, only patch 10 is changed

Patches in v8 Applied

#Subject and filesSizeRepliesApplied
1/13sbitmap: remove sbitmap_clear_bit_unlockinclude/linux/sbitmap.h+0 -60 replies
2/13sbitmap: maintain allocation round_robin in sbitmapblock/blk-mq.c block/kyber-iosched.c drivers/vhost/scsi.c +2 more+29 -280 replies
3/13sbitmap: add helpers for updating allocation hintlib/sbitmap.c+54 -390 replies
4/13sbitmap: move allocation hint into sbitmapblock/blk-mq.c block/kyber-iosched.c drivers/vhost/scsi.c +2 more+96 -650 replies
5/13sbitmap: export sbitmap_weightinclude/linux/sbitmap.h lib/sbitmap.c+16 -50 replies
6/13sbitmap: add helper of sbitmap_calculate_shiftinclude/linux/sbitmap.h lib/sbitmap.c+21 -130 replies
7/13blk-mq: add callbacks for storing & retrieving budget tokendrivers/scsi/scsi_lib.c include/linux/blk-mq.h include/scsi/scsi_cmnd.h+29 -00 replies
8/13blk-mq: return budget token from .get_budget callbackblock/blk-mq-sched.c block/blk-mq.c block/blk-mq.h +2 more+72 -260 replies
9/13scsi: put hot fields of scsi_host_template into one cachelineinclude/scsi/scsi_host.h+39 -330 replies
10/13megaraid_sas: v2 replace sdev_busy with local counterdrivers/scsi/megaraid/megaraid_sas.h drivers/scsi/megaraid/megaraid_sas_fusion.c+41 -80 replies
11/13scsi: add scsi_device_busy() to read sdev->device_busydrivers/message/fusion/mptsas.c drivers/scsi/mpt3sas/mpt3sas_scsih.c drivers/scsi/scsi_lib.c +3 more+11 -60 replies
12/13scsi: make sure sdev->queue_depth is <= max(shost->can_queue, 1024)drivers/scsi/scsi.c+11 -00 replies
13/13scsi: replace sdev->device_busy with sbitmapdrivers/scsi/scsi.c drivers/scsi/scsi_lib.c drivers/scsi/scsi_priv.h +3 more+50 -220 replies

Reviews trailers per patch

All 13 patches have a Reviewed-by or Acked-by.

PatchHannes ReineckeSumanesh SamantaJohannes ThumshirnChristoph Hellwig
1/13R-b T-b R-b
2/13R-b T-b
3/13R-b T-b
4/13R-b T-b
5/13R-b T-b
6/13R-b T-b
7/13R-b T-b
8/13R-b T-b
9/13R-b T-b R-b
10/13R-b
11/13R-b T-b
12/13R-b T-b
13/13R-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v8 thread

Cover letter [PATCH V8 00/13] blk-mq/scsi: tracking device queue depth via sbitmap

Hi,

scsi uses one global atomic variable to track queue depth for each LUN/request queue. This way can't scale well when there is lots of CPU cores and the disk is very fast. Broadcom guys has complained that their high end HBA can't reach top performance because .device_busy is operated in IO path.

Replace the atomic variable sdev->device_busy with sbitmap for tracking scsi device queue depth.

Test on scsi_debug shows this way improve IOPS > 20%. Meantime the IOPS difference is just ~1% compared with bypassing .device_busy on scsi_debug via patches[1]

The 1st 6 patches moves percpu allocation hint into sbitmap, since the improvement by doing percpu allocation hint on sbitmap is observable. Meantime export helpers for SCSI.

Patch 7 and 8 prepares for the conversion by returning budget token from .get_budget callback, meantime passes the budget token to driver via 'struct blk_mq_queue_data' in .queue_rq().

The last four patches changes SCSI for switching to track device queue depth via sbitmap.

The patchset have been tested by Broadcom, and obvious performance boost can be observed on megaraid_sas.

V8:
- fix handling for device_blocked, only patch 13 is changed
- rebase on latest for-5.12/block, only patch 10 is changed

V7:
- fix build failure on drivers/vhost/scsi.c, only patch 2 & 4 are changed

V6:
- rebase on for-5.12/block

V5:
- add comment on sbitmap_weight()
- add patch 'megaraid_sas: v2 replace sdev_busy with local counter' for fixing build failure

V4:
- limit max sdev->queue_depth as max(1024, shost->can_queue)
- simplify code for moving per-cpu allocation hint into sbitmap

V3:
- rebase on both for-5.10/block and 5.10/scsi-queue.

V2:
- fix one build failure

Kashyap Desai (1):
megaraid_sas: v2 replace sdev_busy with local counter

Ming Lei (12):
sbitmap: remove sbitmap_clear_bit_unlock
sbitmap: maintain allocation round_robin in sbitmap
sbitmap: add helpers for updating allocation hint
sbitmap: move allocation hint into sbitmap
sbitmap: export sbitmap_weight
sbitmap: add helper of sbitmap_calculate_shift
blk-mq: add callbacks for storing & retrieving budget token
blk-mq: return budget token from .get_budget callback
scsi: put hot fields of scsi_host_template into one cacheline
scsi: add scsi_device_busy() to read sdev->device_busy
scsi: make sure sdev->queue_depth is <= max(shost->can_queue, 1024)
scsi: replace sdev->device_busy with sbitmap

 block/blk-mq-sched.c                        |  17 +-
 block/blk-mq.c                              |  38 ++--
 block/blk-mq.h                              |  25 ++-
 block/kyber-iosched.c                       |   3 +-
 drivers/message/fusion/mptsas.c             |   2 +-
 drivers/scsi/megaraid/megaraid_sas.h        |   2 +
 drivers/scsi/megaraid/megaraid_sas_fusion.c |  47 ++++-
 drivers/scsi/mpt3sas/mpt3sas_scsih.c        |   2 +-
 drivers/scsi/scsi.c                         |  13 ++
 drivers/scsi/scsi_lib.c                     |  71 ++++---
 drivers/scsi/scsi_priv.h                    |   3 +
 drivers/scsi/scsi_scan.c                    |  23 ++-
 drivers/scsi/scsi_sysfs.c                   |   4 +-
 drivers/scsi/sg.c                           |   2 +-
 drivers/vhost/scsi.c                        |   4 +-
 include/linux/blk-mq.h                      |  13 +-
 include/linux/sbitmap.h                     |  85 +++++---
 include/scsi/scsi_cmnd.h                    |   2 +
 include/scsi/scsi_device.h                  |   8 +-
 include/scsi/scsi_host.h                    |  72 ++++---
 lib/sbitmap.c                               | 210 +++++++++++---------
 21 files changed, 432 insertions(+), 214 deletions(-)
Cc Omar Sandoval <[email protected]>
Cc Kashyap Desai <[email protected]>
Cc Sumanesh Samanta <[email protected]>
Cc Ewan D. Milne <[email protected]>
Cc Hannes Reinecke <[email protected]>
Signature · 1 line
2.29.2