[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/5] file-posix: add sg_get_max_segments that actually works w
From: |
Maxim Levitsky |
Subject: |
[PATCH v2 2/5] file-posix: add sg_get_max_segments that actually works with sg |
Date: |
Wed, 9 Dec 2020 15:53:52 +0200 |
From: Tom Yan <tom.ty89@gmail.com>
sg devices have different major/minor than their corresponding
block devices. Using sysfs to get max segments never really worked
for them.
Fortunately the sg driver provides an ioctl to get sg_tablesize,
which is apparently equivalent to max segments.
Signed-off-by: Tom Yan <tom.ty89@gmail.com>
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
---
block/file-posix.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 226ddbbdad..10ebc4c5b7 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1181,6 +1181,26 @@ static int sg_get_max_transfer_length(int fd)
#endif
}
+static int sg_get_max_segments(int fd)
+{
+ /*
+ * /dev/sg* character devices report 'max_segments' via
+ * SG_GET_SG_TABLESIZE ioctl
+ */
+
+#ifdef SG_GET_SG_TABLESIZE
+ long max_segments = 0;
+
+ if (ioctl(fd, SG_GET_SG_TABLESIZE, &max_segments) == 0) {
+ return max_segments;
+ } else {
+ return -errno;
+ }
+#else
+ return -ENOSYS;
+#endif
+}
+
static int get_max_transfer_length(int fd)
{
#if defined(BLKSECTGET)
@@ -1267,7 +1287,7 @@ static void hdev_refresh_limits(BlockDriverState *bs,
Error **errp)
bs->bl.max_transfer = pow2floor(ret);
}
- ret = get_max_segments(s->fd);
+ 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);
--
2.26.2
- [PATCH v2 0/5] SCSI: fix transfer limits for SCSI passthrough, Maxim Levitsky, 2020/12/09
- [PATCH v2 1/5] file-posix: split hdev_refresh_limits from raw_refresh_limits, Maxim Levitsky, 2020/12/09
- [PATCH v2 2/5] file-posix: add sg_get_max_segments that actually works with sg,
Maxim Levitsky <=
- [PATCH v2 3/5] block: add max_ioctl_transfer to BlockLimits, Maxim Levitsky, 2020/12/09
- [PATCH v2 4/5] block: use blk_get_max_ioctl_transfer for SCSI passthrough, Maxim Levitsky, 2020/12/09
- [PATCH v2 5/5] block/scsi: correctly emulate the VPD block limits page, Maxim Levitsky, 2020/12/09
- Re: [PATCH v2 0/5] SCSI: fix transfer limits for SCSI passthrough, no-reply, 2020/12/09