xen-blkfront: fix sector_size propagation to the block layer
Subsystems (3)
PATCH 1/1 xen-blkfront: fix sector_size propagation to the block layer
Ensure that info->sector_size and info->physical_sector_size are set before the call to blkif_set_queue_limits by doing away with the local variables and arguments that propagate them.
Thanks to Marek Marczykowski-Górecki and Jürgen Groß for root causing the issue.
--- drivers/block/xen-blkfront.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/block/xen-blkfront.c +5 -11
@@ -1070,8 +1070,7 @@ static char *encode_disk_name(char *ptr, unsigned int n) }static int xlvbd_alloc_gendisk (blkif_sector_t capacity, -struct blkfront_info *info,u16 sector_size, -unsigned int physical_sector_size) +struct blkfront_info *info) {struct queue_limits lim = {};struct gendisk *gd;
@@ -1165,8 +1164,6 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity, info->rq = gd->queue; info->gd = gd; - info->sector_size = sector_size; - info->physical_sector_size = physical_sector_size;xlvbd_flush (info);
@@ -2320,8 +2317,6 @@ static void blkfront_gather_backend_features(struct blkfront_info *info)static void blkfront_connect (struct blkfront_info *info) {unsigned long long sectors; -unsigned long sector_size; -unsigned int physical_sector_size;int err, i;struct blkfront_ring_info *rinfo;
@@ -2360,7 +2355,7 @@ static void blkfront_connect(struct blkfront_info *info) err =xenbus_gather (XBT_NIL , info->xbdev->otherend,"sectors" ,"%llu" , §ors,"info" ,"%u" , &info->vdisk_info, -"sector-size" ,"%lu" , §or_size, +"sector-size" ,"%lu" , &info->sector_size,NULL );if (err) { xenbus_dev_fatal(info->xbdev, err,
@@ -2374,9 +2369,9 @@ static void blkfront_connect(struct blkfront_info *info)* provide this. Assume physical sector size to be the same as * sector_size in that case. */ - physical_sector_size =xenbus_read_unsigned (info->xbdev->otherend, + info->physical_sector_size =xenbus_read_unsigned (info->xbdev->otherend,"physical-sector-size" , - sector_size); + info->sector_size);blkfront_gather_backend_features (info);for_each_rinfo (info, rinfo, i) { err =blkfront_setup_indirect (rinfo);
@@ -2388,8 +2383,7 @@ static void blkfront_connect(struct blkfront_info *info) } } - err =xlvbd_alloc_gendisk (sectors, info, sector_size, - physical_sector_size); + err =xlvbd_alloc_gendisk (sectors, info);if (err) {xenbus_dev_fatal (info->xbdev, err,"xlvbd_add at %s" , info->xbdev->otherend);
Signature · 1 line
2.43.0
Quoted 10 lines · Christoph Hellwig
Ensure that
info->sector_sizeandinfo->physical_sector_sizeare set before the call toblkif_set_queue_limitsby doing away with the local variables and arguments that propagate them.Thanks to Marek Marczykowski-Górecki and Jürgen Groß for root causing the issue.
Fixes ba3f67c11638 ("xen-blkfront: atomically update queue limits")Reported-by Rusty Bird <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>
Thanks for debugging this.
Roger.
Juergen Gross
maintainerQuoted 10 lines · Christoph Hellwig
Ensure that
info->sector_sizeandinfo->physical_sector_sizeare set before the call toblkif_set_queue_limitsby doing away with the local variables and arguments that propagate them.Thanks to Marek Marczykowski-Górecki and Jürgen Groß for root causing the issue.
Fixes ba3f67c11638 ("xen-blkfront: atomically update queue limits")Reported-by Rusty Bird <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>
I guess this should go through the block tree?
Juergen
Quoted 8 lines · Christoph Hellwig
Ensure that
info->sector_sizeandinfo->physical_sector_sizeare set before the call toblkif_set_queue_limitsby doing away with the local variables and arguments that propagate them.Thanks to Marek Marczykowski-Górecki and Jürgen Groß for root causing the issue.
[...]
Applied, thanks!
[1/1] xen-blkfront: fix sector_size propagation to the block layer
commit: 98d34c087249d39838874b83e17671e7d5eb1ca7
Best regards,
Signature · 1 line
Jens Axboe