scsi: core: Fix sbitmap depth in scsi_realloc_sdev_budget_map()
PATCH v2 1/1 scsi: core: Fix sbitmap depth in scsi_realloc_sdev_budget_map()
In commit edb854a3680b ("scsi: core: Reallocate device's budget map on queue depth change"), the sbitmap for the device budget map may be reallocated after the slave device depth is configured.
When the sbitmap is reallocated we use the result from scsi_device_max_queue_depth() for the sbitmap size, but don't resize to match the actual device queue depth.
Fix by resizing the sbitmap after reallocating the budget sbitmap. We do this instead of init'ing the sbitmap to the device queue depth as the user may want to change the queue depth later via sysfs or other.
---
Changes since v1 (apart from sending as a separate patch):
- Add fixes and RB tag (thanks)
- mention in commit message why we don't init sbitmap at queue depth
drivers/scsi/scsi_scan.c +5 -0
@@ -223,6 +223,8 @@ static int scsi_realloc_sdev_budget_map(struct scsi_device *sdev,int ret;struct sbitmap sb_backup; + depth = min_t(unsigned int, depth, scsi_device_max_queue_depth(sdev)); +/* * realloc if new shift is calculated, which is caused by setting * up one new default queue depth after calling ->slave_configure
@@ -245,6 +247,9 @@ static int scsi_realloc_sdev_budget_map(struct scsi_device *sdev,scsi_device_max_queue_depth (sdev), new_shift,GFP_KERNEL , sdev->request_queue->node, false, true); +if (!ret) +sbitmap_resize (&sdev->budget_map, depth); +if (need_free) {if (ret) sdev->budget_map = sb_backup;
Signature · 1 line
2.26.2
Quoted 34 lines · John Garry
In commit
edb854a3680b("scsi: core: Reallocate device's budget map on queue depth change"), the sbitmap for the device budget map may be reallocated after the slave device depth is configured.When the sbitmap is reallocated we use the result from
scsi_device_max_queue_depth()for the sbitmap size, but don't resize to match the actual device queue depth.Fix by resizing the sbitmap after reallocating the budget sbitmap. We do this instead of init'ing the sbitmap to the device queue depth as the user may want to change the queue depth later via sysfs or other.
Fixes edb854a3680b ("scsi: core: Reallocate device's budget map on queue depth change")Signed-off-by John Garry <[email protected]>Reviewed-by Ming Lei <[email protected]>---
Changes since v1 (apart from sending as a separate patch):
- Add fixes and RB tag (thanks)
- mention in commit message why we don't init sbitmap at queue depthdrivers/scsi/scsi_scan.c +2
-0@@ -223,6 +223,8 @@ static int scsi_realloc_sdev_budget_map(struct scsi_device *sdev,int ret;struct sbitmap sb_backup; + depth = min_t(unsigned int, depth, scsi_device_max_queue_depth(sdev)); +/* * realloc if new shift is calculated, which is caused by setting * up one new default queue depth after calling ->slave_configure
drivers/scsi/scsi_scan.c static int scsi_realloc_sdev_budget_map(struct scsi_device *sdev, · line 255
Quoted 9 lines
drivers/scsi/scsi_scan.c +3
-0@@ -245,6 +247,9 @@ static int scsi_realloc_sdev_budget_map(struct scsi_device *sdev,scsi_device_max_queue_depth (sdev), new_shift,GFP_KERNEL , sdev->request_queue->node, false, true); +if (!ret) +sbitmap_resize (&sdev->budget_map, depth); +if (need_free) {if (ret) sdev->budget_map = sb_backup;
Signature · 2 lines
Damien Le Moal Western Digital Research
Quoted 11 lines · John Garry
In commit
edb854a3680b("scsi: core: Reallocate device's budget map on queue depth change"), the sbitmap for the device budget map may be reallocated after the slave device depth is configured.When the sbitmap is reallocated we use the result from
scsi_device_max_queue_depth()for the sbitmap size, but don't resize to match the actual device queue depth.Fix by resizing the sbitmap after reallocating the budget sbitmap. We do this instead of init'ing the sbitmap to the device queue depth as the user may want to change the queue depth later via sysfs or other.
Martin K. Petersen
AppliedJohn,
Quoted 3 lines
In commit
edb854a3680b("scsi: core: Reallocate device's budget map on queue depth change"), the sbitmap for the device budget map may be reallocated after the slave device depth is configured.
Applied to 5.18/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 9 lines · John Garry
In commit
edb854a3680b("scsi: core: Reallocate device's budget map on queue depth change"), the sbitmap for the device budget map may be reallocated after the slave device depth is configured.When the sbitmap is reallocated we use the result from
scsi_device_max_queue_depth()for the sbitmap size, but don't resize to match the actual device queue depth.[...]
Applied to 5.18/scsi-fixes, thanks!
[1/1] scsi: core: Fix sbitmap depth in scsi_realloc_sdev_budget_map()
https://git.kernel.org/mkp/scsi/c/eaba83b5b850
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering