| Message ID | 20201217165612.942849-5-mlevitsk@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | SCSI: fix transfer limits for SCSI passthrough | expand |
On 17.12.20 17:56, Maxim Levitsky wrote: > Switch file-posix to expose only the max_ioctl_transfer limit. > > Let the iscsi driver work as it did before since it is bound by the transfer > limit in both regular read/write and in SCSI passthrough case. > > Switch the scsi-disk and scsi-block drivers to read the SG max transfer limits > using the new blk_get_max_ioctl_transfer interface. > > > Fixes: 867eccfed8 ("file-posix: Use max transfer length/segment count only for SCSI passthrough") > Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> > --- > block/file-posix.c | 7 ++++--- > block/iscsi.c | 1 + > hw/scsi/scsi-generic.c | 4 ++-- > 3 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/block/file-posix.c b/block/file-posix.c > index 2bf4d095a7..c34a7a9599 100644 > --- a/block/file-posix.c > +++ b/block/file-posix.c > @@ -1282,13 +1282,14 @@ static void hdev_refresh_limits(BlockDriverState *bs, Error **errp) > get_max_transfer_length(s->fd); > > if (ret > 0 && ret <= BDRV_REQUEST_MAX_BYTES) { > - bs->bl.max_transfer = pow2floor(ret); > + bs->bl.max_ioctl_transfer = pow2floor(ret); > } > > ret = bs->sg ? sg_get_max_segments(s->fd) : get_max_segments(s->fd); > if (ret > 0) { > - bs->bl.max_transfer = MIN_NON_ZERO(bs->bl.max_transfer, > - ret * qemu_real_host_page_size); > + bs->bl.max_ioctl_transfer = > + MIN_NON_ZERO(bs->bl.max_ioctl_transfer, > + ret * qemu_real_host_page_size); > } Do non-SG devices even have a max transfer length then? I would’ve thought max_ioctl_transfer simply doesn’t apply to them and so could be left 0. (Rest looks good – from what I can tell...) Max > > raw_refresh_limits(bs, errp);
diff --git a/block/file-posix.c b/block/file-posix.c index 2bf4d095a7..c34a7a9599 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1282,13 +1282,14 @@ static void hdev_refresh_limits(BlockDriverState *bs, Error **errp) get_max_transfer_length(s->fd); if (ret > 0 && ret <= BDRV_REQUEST_MAX_BYTES) { - bs->bl.max_transfer = pow2floor(ret); + bs->bl.max_ioctl_transfer = pow2floor(ret); } ret = bs->sg ? sg_get_max_segments(s->fd) : get_max_segments(s->fd); if (ret > 0) { - bs->bl.max_transfer = MIN_NON_ZERO(bs->bl.max_transfer, - ret * qemu_real_host_page_size); + bs->bl.max_ioctl_transfer = + MIN_NON_ZERO(bs->bl.max_ioctl_transfer, + ret * qemu_real_host_page_size); } raw_refresh_limits(bs, errp); diff --git a/block/iscsi.c b/block/iscsi.c index 7d4b3b56d5..b74fdf149d 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2063,6 +2063,7 @@ static void iscsi_refresh_limits(BlockDriverState *bs, Error **errp) if (max_xfer_len * block_size < INT_MAX) { bs->bl.max_transfer = max_xfer_len * iscsilun->block_size; + bs->bl.max_ioctl_transfer = bs->bl.max_transfer; } if (iscsilun->lbp.lbpu) { diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 2cb23ca891..6df67bf889 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -167,7 +167,7 @@ static void scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s) page = r->req.cmd.buf[2]; if (page == 0xb0) { uint32_t max_transfer = - blk_get_max_transfer(s->conf.blk) / s->blocksize; + blk_get_max_ioctl_transfer(s->conf.blk) / s->blocksize; assert(max_transfer); stl_be_p(&r->buf[8], max_transfer); @@ -210,7 +210,7 @@ static int scsi_generic_emulate_block_limits(SCSIGenericReq *r, SCSIDevice *s) uint8_t buf[64]; SCSIBlockLimits bl = { - .max_io_sectors = blk_get_max_transfer(s->conf.blk) / s->blocksize + .max_io_sectors = blk_get_max_ioctl_transfer(s->conf.blk) / s->blocksize }; memset(r->buf, 0, r->buflen);
Switch file-posix to expose only the max_ioctl_transfer limit. Let the iscsi driver work as it did before since it is bound by the transfer limit in both regular read/write and in SCSI passthrough case. Switch the scsi-disk and scsi-block drivers to read the SG max transfer limits using the new blk_get_max_ioctl_transfer interface. Fixes: 867eccfed8 ("file-posix: Use max transfer length/segment count only for SCSI passthrough") Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> --- block/file-posix.c | 7 ++++--- block/iscsi.c | 1 + hw/scsi/scsi-generic.c | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-)