* [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties
@ 2020-05-26 8:17 Roman Kagan
2020-05-26 8:17 ` [PATCH v5 1/5] virtio-blk: store opt_io_size with correct size Roman Kagan
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Roman Kagan @ 2020-05-26 8:17 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, Fam Zheng, Daniel P. Berrangé,
Eduardo Habkost, qemu-block, Michael S. Tsirkin, John Snow,
Philippe Mathieu-Daudé,
Gerd Hoffmann, Stefan Hajnoczi, Keith Busch, Paolo Bonzini,
Max Reitz
BlockConf includes several properties counted in bytes.
Enhance their handling in a some aspects, specifically
- accept common size suffixes (k, m)
- perform consistency checks on the values, to prevent their silent
truncation and rounding
- lift the upper limit on physical_block_size and logical_block_size
Also fix the accessor for opt_io_size in virtio-blk to make it match the size
of the field.
History:
v4 -> v5:
- re-split the patches [Philippe]
- fix/reword error messages [Philippe, Kevin]
- do early return on failed consistency check [Philippe]
- use QEMU_IS_ALIGNED instead of open coding [Philippe]
- make all BlockConf size props support suffixes
- expand the log for virtio-blk opt_io_size [Michael]
v3 -> v4:
- add patch to fix opt_io_size width in virtio-blk
- add patch to perform consistency checks [Kevin]
- check min_io_size against truncation [Kevin]
v2 -> v3:
- mention qcow2 cluster size limit in the log and comment [Eric]
v1 -> v2:
- cap the property at 2 MiB [Eric]
- accept size suffixes
Roman Kagan (5):
virtio-blk: store opt_io_size with correct size
block: consolidate blocksize properties consistency checks
qdev-properties: blocksize: use same limits in code and description
block: make size-related BlockConf properties accept size suffixes
block: lift blocksize property limit to 2 MiB
include/hw/block/block.h | 18 +-
include/hw/qdev-properties.h | 2 +-
hw/block/block.c | 64 ++++-
hw/block/fdc.c | 5 +-
hw/block/nvme.c | 5 +-
hw/block/virtio-blk.c | 9 +-
hw/core/qdev-properties.c | 109 +++----
hw/ide/qdev.c | 5 +-
hw/scsi/scsi-disk.c | 12 +-
hw/usb/dev-storage.c | 5 +-
tests/qemu-iotests/172.out | 532 +++++++++++++++++------------------
11 files changed, 423 insertions(+), 343 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v5 1/5] virtio-blk: store opt_io_size with correct size
2020-05-26 8:17 [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties Roman Kagan
@ 2020-05-26 8:17 ` Roman Kagan
2020-05-26 8:17 ` [PATCH v5 2/5] block: consolidate blocksize properties consistency checks Roman Kagan
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Roman Kagan @ 2020-05-26 8:17 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, Fam Zheng, Daniel P. Berrangé,
Eduardo Habkost, qemu-block, Michael S. Tsirkin, John Snow,
Philippe Mathieu-Daudé,
Gerd Hoffmann, Stefan Hajnoczi, Keith Busch, Paolo Bonzini,
Max Reitz
The width of opt_io_size in virtio_blk_config is 32bit. However, it's
written with virtio_stw_p; this may result in value truncation, and on
big-endian systems with legacy virtio in completely bogus readings in
the guest.
Use the appropriate accessor to store it.
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
v4 -> v5:
- expand the log [Michael]
hw/block/virtio-blk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index f5f6fc925e..413083e62f 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -918,7 +918,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
virtio_stw_p(vdev, &blkcfg.geometry.cylinders, conf->cyls);
virtio_stl_p(vdev, &blkcfg.blk_size, blk_size);
virtio_stw_p(vdev, &blkcfg.min_io_size, conf->min_io_size / blk_size);
- virtio_stw_p(vdev, &blkcfg.opt_io_size, conf->opt_io_size / blk_size);
+ virtio_stl_p(vdev, &blkcfg.opt_io_size, conf->opt_io_size / blk_size);
blkcfg.geometry.heads = conf->heads;
/*
* We must ensure that the block device capacity is a multiple of
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v5 2/5] block: consolidate blocksize properties consistency checks
2020-05-26 8:17 [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties Roman Kagan
2020-05-26 8:17 ` [PATCH v5 1/5] virtio-blk: store opt_io_size with correct size Roman Kagan
@ 2020-05-26 8:17 ` Roman Kagan
2020-05-26 8:17 ` [PATCH v5 3/5] qdev-properties: blocksize: use same limits in code and description Roman Kagan
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Roman Kagan @ 2020-05-26 8:17 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, Fam Zheng, Daniel P. Berrangé,
Eduardo Habkost, qemu-block, Michael S. Tsirkin, John Snow,
Philippe Mathieu-Daudé,
Gerd Hoffmann, Stefan Hajnoczi, Keith Busch, Paolo Bonzini,
Max Reitz
Several block device properties related to blocksize configuration must
be in certain relationship WRT each other: physical block must be no
smaller than logical block; min_io_size, opt_io_size, and
discard_granularity must be a multiple of a logical block.
To ensure these requirements are met, add corresponding consistency
checks to blkconf_blocksizes, adjusting its signature to communicate
possible error to the caller. Also remove the now redundant consistency
checks from the specific devices.
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
---
v4 -> v5:
- fix/reword error messages [Philippe, Kevin]
- do early return on failed consistency check [Philippe]
- use QEMU_IS_ALIGNED instead of open coding [Philippe]
include/hw/block/block.h | 2 +-
hw/block/block.c | 30 +++++++++++++++++++++++++++++-
hw/block/fdc.c | 5 ++++-
hw/block/nvme.c | 5 ++++-
hw/block/virtio-blk.c | 7 +------
hw/ide/qdev.c | 5 ++++-
hw/scsi/scsi-disk.c | 12 +++++-------
hw/usb/dev-storage.c | 5 ++++-
tests/qemu-iotests/172.out | 2 +-
9 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/include/hw/block/block.h b/include/hw/block/block.h
index d7246f3862..784953a237 100644
--- a/include/hw/block/block.h
+++ b/include/hw/block/block.h
@@ -87,7 +87,7 @@ bool blk_check_size_and_read_all(BlockBackend *blk, void *buf, hwaddr size,
bool blkconf_geometry(BlockConf *conf, int *trans,
unsigned cyls_max, unsigned heads_max, unsigned secs_max,
Error **errp);
-void blkconf_blocksizes(BlockConf *conf);
+bool blkconf_blocksizes(BlockConf *conf, Error **errp);
bool blkconf_apply_backend_options(BlockConf *conf, bool readonly,
bool resizable, Error **errp);
diff --git a/hw/block/block.c b/hw/block/block.c
index bf56c7612b..b22207c921 100644
--- a/hw/block/block.c
+++ b/hw/block/block.c
@@ -61,7 +61,7 @@ bool blk_check_size_and_read_all(BlockBackend *blk, void *buf, hwaddr size,
return true;
}
-void blkconf_blocksizes(BlockConf *conf)
+bool blkconf_blocksizes(BlockConf *conf, Error **errp)
{
BlockBackend *blk = conf->blk;
BlockSizes blocksizes;
@@ -83,6 +83,34 @@ void blkconf_blocksizes(BlockConf *conf)
conf->logical_block_size = BDRV_SECTOR_SIZE;
}
}
+
+ if (conf->logical_block_size > conf->physical_block_size) {
+ error_setg(errp,
+ "logical_block_size > physical_block_size not supported");
+ return false;
+ }
+
+ if (!QEMU_IS_ALIGNED(conf->min_io_size, conf->logical_block_size)) {
+ error_setg(errp,
+ "min_io_size must be a multiple of logical_block_size");
+ return false;
+ }
+
+ if (!QEMU_IS_ALIGNED(conf->opt_io_size, conf->logical_block_size)) {
+ error_setg(errp,
+ "opt_io_size must be a multiple of logical_block_size");
+ return false;
+ }
+
+ if (conf->discard_granularity != -1 &&
+ !QEMU_IS_ALIGNED(conf->discard_granularity,
+ conf->logical_block_size)) {
+ error_setg(errp, "discard_granularity must be "
+ "a multiple of logical_block_size");
+ return false;
+ }
+
+ return true;
}
bool blkconf_apply_backend_options(BlockConf *conf, bool readonly,
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index c5fb9d6ece..8eda572ef4 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -554,7 +554,10 @@ static void floppy_drive_realize(DeviceState *qdev, Error **errp)
read_only = !blk_bs(dev->conf.blk) || blk_is_read_only(dev->conf.blk);
}
- blkconf_blocksizes(&dev->conf);
+ if (!blkconf_blocksizes(&dev->conf, errp)) {
+ return;
+ }
+
if (dev->conf.logical_block_size != 512 ||
dev->conf.physical_block_size != 512)
{
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 2f3100e56c..672650e162 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1390,7 +1390,10 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
host_memory_backend_set_mapped(n->pmrdev, true);
}
- blkconf_blocksizes(&n->conf);
+ if (!blkconf_blocksizes(&n->conf, errp)) {
+ return;
+ }
+
if (!blkconf_apply_backend_options(&n->conf, blk_is_read_only(n->conf.blk),
false, errp)) {
return;
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 413083e62f..4ffdb130be 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -1162,12 +1162,7 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
return;
}
- blkconf_blocksizes(&conf->conf);
-
- if (conf->conf.logical_block_size >
- conf->conf.physical_block_size) {
- error_setg(errp,
- "logical_block_size > physical_block_size not supported");
+ if (!blkconf_blocksizes(&conf->conf, errp)) {
return;
}
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 06b11583f5..b4821b2403 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -187,7 +187,10 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp)
return;
}
- blkconf_blocksizes(&dev->conf);
+ if (!blkconf_blocksizes(&dev->conf, errp)) {
+ return;
+ }
+
if (dev->conf.logical_block_size != 512) {
error_setg(errp, "logical_block_size must be 512 for IDE");
return;
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 387503e11b..8ce68a9dd6 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -2346,12 +2346,7 @@ static void scsi_realize(SCSIDevice *dev, Error **errp)
return;
}
- blkconf_blocksizes(&s->qdev.conf);
-
- if (s->qdev.conf.logical_block_size >
- s->qdev.conf.physical_block_size) {
- error_setg(errp,
- "logical_block_size > physical_block_size not supported");
+ if (!blkconf_blocksizes(&s->qdev.conf, errp)) {
return;
}
@@ -2436,7 +2431,9 @@ static void scsi_hd_realize(SCSIDevice *dev, Error **errp)
if (s->qdev.conf.blk) {
ctx = blk_get_aio_context(s->qdev.conf.blk);
aio_context_acquire(ctx);
- blkconf_blocksizes(&s->qdev.conf);
+ if (!blkconf_blocksizes(&s->qdev.conf, errp)) {
+ goto out;
+ }
}
s->qdev.blocksize = s->qdev.conf.logical_block_size;
s->qdev.type = TYPE_DISK;
@@ -2444,6 +2441,7 @@ static void scsi_hd_realize(SCSIDevice *dev, Error **errp)
s->product = g_strdup("QEMU HARDDISK");
}
scsi_realize(&s->qdev, errp);
+out:
if (ctx) {
aio_context_release(ctx);
}
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 4eba47538d..de461f37bd 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -599,7 +599,10 @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp)
return;
}
- blkconf_blocksizes(&s->conf);
+ if (!blkconf_blocksizes(&s->conf, errp)) {
+ return;
+ }
+
if (!blkconf_apply_backend_options(&s->conf, blk_is_read_only(blk), true,
errp)) {
return;
diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out
index 7abbe82427..59cc70aebb 100644
--- a/tests/qemu-iotests/172.out
+++ b/tests/qemu-iotests/172.out
@@ -1204,7 +1204,7 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica
drive-type = "144"
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical_block_size=4096
-QEMU_PROG: -device floppy,drive=none0,logical_block_size=4096: Physical and logical block size must be 512 for floppy
+QEMU_PROG: -device floppy,drive=none0,logical_block_size=4096: logical_block_size > physical_block_size not supported
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physical_block_size=1024
QEMU_PROG: -device floppy,drive=none0,physical_block_size=1024: Physical and logical block size must be 512 for floppy
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v5 3/5] qdev-properties: blocksize: use same limits in code and description
2020-05-26 8:17 [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties Roman Kagan
2020-05-26 8:17 ` [PATCH v5 1/5] virtio-blk: store opt_io_size with correct size Roman Kagan
2020-05-26 8:17 ` [PATCH v5 2/5] block: consolidate blocksize properties consistency checks Roman Kagan
@ 2020-05-26 8:17 ` Roman Kagan
2020-05-26 8:17 ` [PATCH v5 4/5] block: make size-related BlockConf properties accept size suffixes Roman Kagan
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Roman Kagan @ 2020-05-26 8:17 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, Fam Zheng, Daniel P. Berrangé,
Eduardo Habkost, qemu-block, Michael S. Tsirkin, John Snow,
Philippe Mathieu-Daudé,
Gerd Hoffmann, Stefan Hajnoczi, Keith Busch, Paolo Bonzini,
Max Reitz
Make it easier (more visible) to maintain the limits on the blocksize
properties in sync with the respective description, by using macros both
in the code and in the description.
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
---
v4 -> v5:
- split out into separate patch [Philippe]
hw/core/qdev-properties.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index cc924815da..249dc69bd8 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -729,6 +729,13 @@ const PropertyInfo qdev_prop_pci_devfn = {
/* --- blocksize --- */
+/* lower limit is sector size */
+#define MIN_BLOCK_SIZE 512
+#define MIN_BLOCK_SIZE_STR stringify(MIN_BLOCK_SIZE)
+/* upper limit is the max power of 2 that fits in uint16_t */
+#define MAX_BLOCK_SIZE 32768
+#define MAX_BLOCK_SIZE_STR stringify(MAX_BLOCK_SIZE)
+
static void set_blocksize(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
@@ -736,8 +743,6 @@ static void set_blocksize(Object *obj, Visitor *v, const char *name,
Property *prop = opaque;
uint16_t value, *ptr = qdev_get_prop_ptr(dev, prop);
Error *local_err = NULL;
- const int64_t min = 512;
- const int64_t max = 32768;
if (dev->realized) {
qdev_prop_set_after_realize(dev, name, errp);
@@ -750,9 +755,12 @@ static void set_blocksize(Object *obj, Visitor *v, const char *name,
return;
}
/* value of 0 means "unset" */
- if (value && (value < min || value > max)) {
- error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE,
- dev->id ? : "", name, (int64_t)value, min, max);
+ if (value && (value < MIN_BLOCK_SIZE || value > MAX_BLOCK_SIZE)) {
+ error_setg(errp,
+ "Property %s.%s doesn't take value %" PRIu16
+ " (minimum: " MIN_BLOCK_SIZE_STR
+ ", maximum: " MAX_BLOCK_SIZE_STR ")",
+ dev->id ? : "", name, value);
return;
}
@@ -769,7 +777,8 @@ static void set_blocksize(Object *obj, Visitor *v, const char *name,
const PropertyInfo qdev_prop_blocksize = {
.name = "uint16",
- .description = "A power of two between 512 and 32768",
+ .description = "A power of two between " MIN_BLOCK_SIZE_STR
+ " and " MAX_BLOCK_SIZE_STR,
.get = get_uint16,
.set = set_blocksize,
.set_default_value = set_default_value_uint,
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v5 4/5] block: make size-related BlockConf properties accept size suffixes
2020-05-26 8:17 [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties Roman Kagan
` (2 preceding siblings ...)
2020-05-26 8:17 ` [PATCH v5 3/5] qdev-properties: blocksize: use same limits in code and description Roman Kagan
@ 2020-05-26 8:17 ` Roman Kagan
2020-05-26 8:17 ` [PATCH v5 5/5] block: lift blocksize property limit to 2 MiB Roman Kagan
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Roman Kagan @ 2020-05-26 8:17 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, Fam Zheng, Daniel P. Berrangé,
Eduardo Habkost, qemu-block, Michael S. Tsirkin, John Snow,
Philippe Mathieu-Daudé,
Gerd Hoffmann, Stefan Hajnoczi, Keith Busch, Paolo Bonzini,
Max Reitz
Several BlockConf properties represent respective sizes in bytes so it
makes sense to accept size suffixes for them.
Turn them into uint64_t and use size-suffix-capable setters/getters on
them.
Also, as some of them are exposed to the guest by scsi and virtio-blk
devices as an integer of a specific width (uint16_t for min_io_size and
uint32_t for opt_io_size and discard_granularity) in units of logical
blocks, introduce extra checks in blkconf_blocksizes to prevent their
silent truncation.
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
---
v4 -> v5:
- make all BlockConf size props support suffixes
- move qdev_prop_blocksize after qdev_prop_size, to reuse get_size
- reword error messages [Kevin]
include/hw/block/block.h | 16 +-
include/hw/qdev-properties.h | 2 +-
hw/block/block.c | 34 +++
hw/core/qdev-properties.c | 115 ++++----
tests/qemu-iotests/172.out | 530 +++++++++++++++++------------------
5 files changed, 366 insertions(+), 331 deletions(-)
diff --git a/include/hw/block/block.h b/include/hw/block/block.h
index 784953a237..3ba2a33604 100644
--- a/include/hw/block/block.h
+++ b/include/hw/block/block.h
@@ -18,12 +18,12 @@
typedef struct BlockConf {
BlockBackend *blk;
- uint16_t physical_block_size;
- uint16_t logical_block_size;
- uint16_t min_io_size;
- uint32_t opt_io_size;
+ uint64_t physical_block_size;
+ uint64_t logical_block_size;
+ uint64_t min_io_size;
+ uint64_t opt_io_size;
int32_t bootindex;
- uint32_t discard_granularity;
+ uint64_t discard_granularity;
/* geometry, not all devices use this */
uint32_t cyls, heads, secs;
uint32_t lcyls, lheads, lsecs;
@@ -51,9 +51,9 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)
_conf.logical_block_size), \
DEFINE_PROP_BLOCKSIZE("physical_block_size", _state, \
_conf.physical_block_size), \
- DEFINE_PROP_UINT16("min_io_size", _state, _conf.min_io_size, 0), \
- DEFINE_PROP_UINT32("opt_io_size", _state, _conf.opt_io_size, 0), \
- DEFINE_PROP_UINT32("discard_granularity", _state, \
+ DEFINE_PROP_SIZE("min_io_size", _state, _conf.min_io_size, 0), \
+ DEFINE_PROP_SIZE("opt_io_size", _state, _conf.opt_io_size, 0), \
+ DEFINE_PROP_SIZE("discard_granularity", _state, \
_conf.discard_granularity, -1), \
DEFINE_PROP_ON_OFF_AUTO("write-cache", _state, _conf.wce, \
ON_OFF_AUTO_AUTO), \
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index f161604fb6..c3bea7dba6 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -197,7 +197,7 @@ extern const PropertyInfo qdev_prop_pcie_link_width;
#define DEFINE_PROP_BIOS_CHS_TRANS(_n, _s, _f, _d) \
DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_bios_chs_trans, int)
#define DEFINE_PROP_BLOCKSIZE(_n, _s, _f) \
- DEFINE_PROP_UNSIGNED(_n, _s, _f, 0, qdev_prop_blocksize, uint16_t)
+ DEFINE_PROP_UNSIGNED(_n, _s, _f, 0, qdev_prop_blocksize, uint64_t)
#define DEFINE_PROP_PCI_HOST_DEVADDR(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_pci_host_devaddr, PCIHostDeviceAddress)
#define DEFINE_PROP_OFF_AUTO_PCIBAR(_n, _s, _f, _d) \
diff --git a/hw/block/block.c b/hw/block/block.c
index b22207c921..0e11c531aa 100644
--- a/hw/block/block.c
+++ b/hw/block/block.c
@@ -96,12 +96,34 @@ bool blkconf_blocksizes(BlockConf *conf, Error **errp)
return false;
}
+ /*
+ * all devices which support min_io_size (scsi and virtio-blk) expose it to
+ * the guest as a uint16_t in units of logical blocks
+ */
+ if (conf->min_io_size > conf->logical_block_size * UINT16_MAX) {
+ error_setg(errp,
+ "min_io_size must not exceed " stringify(UINT16_MAX)
+ " logical blocks");
+ return false;
+ }
+
if (!QEMU_IS_ALIGNED(conf->opt_io_size, conf->logical_block_size)) {
error_setg(errp,
"opt_io_size must be a multiple of logical_block_size");
return false;
}
+ /*
+ * all devices which support opt_io_size (scsi and virtio-blk) expose it to
+ * the guest as a uint32_t in units of logical blocks
+ */
+ if (conf->opt_io_size > conf->logical_block_size * UINT32_MAX) {
+ error_setg(errp,
+ "opt_io_size must not exceed " stringify(UINT32_MAX)
+ " logical blocks");
+ return false;
+ }
+
if (conf->discard_granularity != -1 &&
!QEMU_IS_ALIGNED(conf->discard_granularity,
conf->logical_block_size)) {
@@ -110,6 +132,18 @@ bool blkconf_blocksizes(BlockConf *conf, Error **errp)
return false;
}
+ /*
+ * all devices which support discard_granularity (scsi) expose it to the
+ * guest as a uint32_t in units of logical blocks
+ */
+ if (conf->discard_granularity != -1 &&
+ conf->discard_granularity > conf->logical_block_size * UINT32_MAX) {
+ error_setg(errp,
+ "discard_granularity must not exceed " stringify(UINT32_MAX)
+ " logical blocks");
+ return false;
+ }
+
return true;
}
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 249dc69bd8..fd945ce77f 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -14,6 +14,7 @@
#include "qapi/visitor.h"
#include "chardev/char.h"
#include "qemu/uuid.h"
+#include "qemu/units.h"
void qdev_prop_set_after_realize(DeviceState *dev, const char *name,
Error **errp)
@@ -727,63 +728,6 @@ const PropertyInfo qdev_prop_pci_devfn = {
.set_default_value = set_default_value_int,
};
-/* --- blocksize --- */
-
-/* lower limit is sector size */
-#define MIN_BLOCK_SIZE 512
-#define MIN_BLOCK_SIZE_STR stringify(MIN_BLOCK_SIZE)
-/* upper limit is the max power of 2 that fits in uint16_t */
-#define MAX_BLOCK_SIZE 32768
-#define MAX_BLOCK_SIZE_STR stringify(MAX_BLOCK_SIZE)
-
-static void set_blocksize(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- DeviceState *dev = DEVICE(obj);
- Property *prop = opaque;
- uint16_t value, *ptr = qdev_get_prop_ptr(dev, prop);
- Error *local_err = NULL;
-
- if (dev->realized) {
- qdev_prop_set_after_realize(dev, name, errp);
- return;
- }
-
- visit_type_uint16(v, name, &value, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- return;
- }
- /* value of 0 means "unset" */
- if (value && (value < MIN_BLOCK_SIZE || value > MAX_BLOCK_SIZE)) {
- error_setg(errp,
- "Property %s.%s doesn't take value %" PRIu16
- " (minimum: " MIN_BLOCK_SIZE_STR
- ", maximum: " MAX_BLOCK_SIZE_STR ")",
- dev->id ? : "", name, value);
- return;
- }
-
- /* We rely on power-of-2 blocksizes for bitmasks */
- if ((value & (value - 1)) != 0) {
- error_setg(errp,
- "Property %s.%s doesn't take value '%" PRId64 "', it's not a power of 2",
- dev->id ?: "", name, (int64_t)value);
- return;
- }
-
- *ptr = value;
-}
-
-const PropertyInfo qdev_prop_blocksize = {
- .name = "uint16",
- .description = "A power of two between " MIN_BLOCK_SIZE_STR
- " and " MAX_BLOCK_SIZE_STR,
- .get = get_uint16,
- .set = set_blocksize,
- .set_default_value = set_default_value_uint,
-};
-
/* --- pci host address --- */
static void get_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
@@ -1257,6 +1201,63 @@ const PropertyInfo qdev_prop_size = {
.set_default_value = set_default_value_uint,
};
+/* --- blocksize --- */
+
+/* lower limit is sector size */
+#define MIN_BLOCK_SIZE 512
+#define MIN_BLOCK_SIZE_STR "512 B"
+/* upper limit is the max power of 2 that fits in uint16_t */
+#define MAX_BLOCK_SIZE (32 * KiB)
+#define MAX_BLOCK_SIZE_STR "32 KiB"
+
+static void set_blocksize(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
+{
+ DeviceState *dev = DEVICE(obj);
+ Property *prop = opaque;
+ uint64_t value, *ptr = qdev_get_prop_ptr(dev, prop);
+ Error *local_err = NULL;
+
+ if (dev->realized) {
+ qdev_prop_set_after_realize(dev, name, errp);
+ return;
+ }
+
+ visit_type_size(v, name, &value, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+ /* value of 0 means "unset" */
+ if (value && (value < MIN_BLOCK_SIZE || value > MAX_BLOCK_SIZE)) {
+ error_setg(errp,
+ "Property %s.%s doesn't take value %" PRIu64
+ " (minimum: " MIN_BLOCK_SIZE_STR
+ ", maximum: " MAX_BLOCK_SIZE_STR ")",
+ dev->id ? : "", name, value);
+ return;
+ }
+
+ /* We rely on power-of-2 blocksizes for bitmasks */
+ if ((value & (value - 1)) != 0) {
+ error_setg(errp,
+ "Property %s.%s doesn't take value '%" PRId64 "', it's not a power of 2",
+ dev->id ?: "", name, (int64_t)value);
+ return;
+ }
+
+ *ptr = value;
+}
+
+const PropertyInfo qdev_prop_blocksize = {
+ .name = "size",
+ .description = "A power of two between " MIN_BLOCK_SIZE_STR
+ " and " MAX_BLOCK_SIZE_STR,
+ .get = get_size,
+ .set = set_blocksize,
+ .set_default_value = set_default_value_uint,
+};
+
/* --- object link property --- */
static void create_link_property(ObjectClass *oc, Property *prop)
diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out
index 59cc70aebb..cde0276c3b 100644
--- a/tests/qemu-iotests/172.out
+++ b/tests/qemu-iotests/172.out
@@ -24,11 +24,11 @@ Testing:
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "288"
@@ -54,11 +54,11 @@ Testing: -fda TEST_DIR/t.qcow2
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -81,22 +81,22 @@ Testing: -fdb TEST_DIR/t.qcow2
dev: floppy, id ""
unit = 1 (0x1)
drive = "floppy1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "288"
@@ -119,22 +119,22 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
dev: floppy, id ""
unit = 1 (0x1)
drive = "floppy1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -160,11 +160,11 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -187,22 +187,22 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
dev: floppy, id ""
unit = 1 (0x1)
drive = "floppy1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "288"
@@ -225,22 +225,22 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
dev: floppy, id ""
unit = 1 (0x1)
drive = "floppy1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -266,11 +266,11 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global isa-fdc.driveA=none0
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -293,11 +293,11 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global isa-fdc.driveB=none0
dev: floppy, id ""
unit = 1 (0x1)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -320,22 +320,22 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
dev: floppy, id ""
unit = 1 (0x1)
drive = "none1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -361,11 +361,11 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -388,11 +388,11 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,unit=1
dev: floppy, id ""
unit = 1 (0x1)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -415,22 +415,22 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
dev: floppy, id ""
unit = 1 (0x1)
drive = "none1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -456,22 +456,22 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global is
dev: floppy, id ""
unit = 1 (0x1)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -494,22 +494,22 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global is
dev: floppy, id ""
unit = 1 (0x1)
drive = "floppy1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -532,11 +532,11 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global is
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -559,11 +559,11 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global is
dev: floppy, id ""
unit = 1 (0x1)
drive = "floppy1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -589,22 +589,22 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
dev: floppy, id ""
unit = 1 (0x1)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -627,22 +627,22 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
dev: floppy, id ""
unit = 1 (0x1)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -665,22 +665,22 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 1 (0x1)
drive = "floppy1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -703,22 +703,22 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 1 (0x1)
drive = "floppy1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -750,22 +750,22 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
dev: floppy, id ""
unit = 1 (0x1)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -788,22 +788,22 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
dev: floppy, id ""
unit = 1 (0x1)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "floppy0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -832,22 +832,22 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
dev: floppy, id ""
unit = 1 (0x1)
drive = "none1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -870,22 +870,22 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
dev: floppy, id ""
unit = 1 (0x1)
drive = "none1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -908,22 +908,22 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
dev: floppy, id ""
unit = 0 (0x0)
drive = "none1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 1 (0x1)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -946,22 +946,22 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
dev: floppy, id ""
unit = 0 (0x0)
drive = "none1"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
dev: floppy, id ""
unit = 1 (0x1)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -999,11 +999,11 @@ Testing: -device floppy
dev: floppy, id ""
unit = 0 (0x0)
drive = ""
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "288"
@@ -1026,11 +1026,11 @@ Testing: -device floppy,drive-type=120
dev: floppy, id ""
unit = 0 (0x0)
drive = ""
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "120"
@@ -1053,11 +1053,11 @@ Testing: -device floppy,drive-type=144
dev: floppy, id ""
unit = 0 (0x0)
drive = ""
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -1080,11 +1080,11 @@ Testing: -device floppy,drive-type=288
dev: floppy, id ""
unit = 0 (0x0)
drive = ""
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "288"
@@ -1110,11 +1110,11 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "120"
@@ -1137,11 +1137,11 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "288"
@@ -1167,11 +1167,11 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
@@ -1194,11 +1194,11 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica
dev: floppy, id ""
unit = 0 (0x0)
drive = "none0"
- logical_block_size = 512 (0x200)
- physical_block_size = 512 (0x200)
- min_io_size = 0 (0x0)
- opt_io_size = 0 (0x0)
- discard_granularity = 4294967295 (0xffffffff)
+ logical_block_size = 512 (512 B)
+ physical_block_size = 512 (512 B)
+ min_io_size = 0 (0 B)
+ opt_io_size = 0 (0 B)
+ discard_granularity = 18446744073709551615 (16 EiB)
write-cache = "auto"
share-rw = false
drive-type = "144"
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v5 5/5] block: lift blocksize property limit to 2 MiB
2020-05-26 8:17 [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties Roman Kagan
` (3 preceding siblings ...)
2020-05-26 8:17 ` [PATCH v5 4/5] block: make size-related BlockConf properties accept size suffixes Roman Kagan
@ 2020-05-26 8:17 ` Roman Kagan
2020-05-26 10:42 ` [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties no-reply
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Roman Kagan @ 2020-05-26 8:17 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, Fam Zheng, Daniel P. Berrangé,
Eduardo Habkost, qemu-block, Michael S. Tsirkin, John Snow,
Philippe Mathieu-Daudé,
Gerd Hoffmann, Stefan Hajnoczi, Keith Busch, Paolo Bonzini,
Max Reitz
Logical and physical block sizes in QEMU are limited to 32 KiB.
This appears unnecessary tight, and we've seen bigger block sizes handy
at times.
Lift the limitation up to 2 MiB which appears to be good enough for
everybody, and matches the qcow2 cluster size limit.
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
---
v4 -> v5:
- split out into separate patch [Philippe]
- as this patch has changed significantly lose Eric's r-b
hw/core/qdev-properties.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index fd945ce77f..01589e1ad6 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1206,9 +1206,12 @@ const PropertyInfo qdev_prop_size = {
/* lower limit is sector size */
#define MIN_BLOCK_SIZE 512
#define MIN_BLOCK_SIZE_STR "512 B"
-/* upper limit is the max power of 2 that fits in uint16_t */
-#define MAX_BLOCK_SIZE (32 * KiB)
-#define MAX_BLOCK_SIZE_STR "32 KiB"
+/*
+ * upper limit is arbitrary, 2 MiB looks sufficient for all sensible uses, and
+ * matches qcow2 cluster size limit
+ */
+#define MAX_BLOCK_SIZE (2 * MiB)
+#define MAX_BLOCK_SIZE_STR "2 MiB"
static void set_blocksize(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties
2020-05-26 8:17 [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties Roman Kagan
` (4 preceding siblings ...)
2020-05-26 8:17 ` [PATCH v5 5/5] block: lift blocksize property limit to 2 MiB Roman Kagan
@ 2020-05-26 10:42 ` no-reply
2020-05-26 10:46 ` no-reply
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: no-reply @ 2020-05-26 10:42 UTC (permalink / raw)
To: rvkagan
Cc: kwolf, fam, berrange, ehabkost, qemu-block, mst, philmd,
qemu-devel, mreitz, kraxel, stefanha, kbusch, pbonzini, jsnow
Patchew URL: https://patchew.org/QEMU/20200526081740.256236-1-rvkagan@yandex-team.ru/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1
=== TEST SCRIPT END ===
CC hw/core/hotplug.o
CC hw/core/vmstate-if.o
/tmp/qemu-test/src/hw/block/xen-block.c: In function 'xen_block_realize':
/tmp/qemu-test/src/hw/block/xen-block.c:242:5: error: too few arguments to function 'blkconf_blocksizes'
blkconf_blocksizes(conf);
^
In file included from /tmp/qemu-test/src/include/hw/xen/xen-block.h:12:0,
from /tmp/qemu-test/src/hw/block/xen-block.c:25:
/tmp/qemu-test/src/include/hw/block/block.h:90:6: note: declared here
bool blkconf_blocksizes(BlockConf *conf, Error **errp);
^
/tmp/qemu-test/src/hw/block/xen-block.c:260:35: error: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'uint64_t' [-Werror=format=]
conf->discard_granularity);
^
/tmp/qemu-test/src/hw/block/xen-block.c:274:31: error: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'uint64_t' [-Werror=format=]
conf->logical_block_size);
^
cc1: all warnings being treated as errors
CC hw/core/irq.o
make: *** [hw/block/xen-block.o] Error 1
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
File "./tests/docker/docker.py", line 664, in <module>
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=241d08d624884dde8ed7b9b977600893', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-31zomjr6/src/docker-src.2020-05-26-06.40.14.18987:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=241d08d624884dde8ed7b9b977600893
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-31zomjr6/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 2m12.190s
user 0m8.441s
The full log is available at
http://patchew.org/logs/20200526081740.256236-1-rvkagan@yandex-team.ru/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties
2020-05-26 8:17 [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties Roman Kagan
` (5 preceding siblings ...)
2020-05-26 10:42 ` [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties no-reply
@ 2020-05-26 10:46 ` no-reply
2020-05-26 10:47 ` no-reply
2020-05-26 11:00 ` Roman Kagan
8 siblings, 0 replies; 10+ messages in thread
From: no-reply @ 2020-05-26 10:46 UTC (permalink / raw)
To: rvkagan
Cc: kwolf, fam, berrange, ehabkost, qemu-block, mst, philmd,
qemu-devel, mreitz, kraxel, stefanha, kbusch, pbonzini, jsnow
Patchew URL: https://patchew.org/QEMU/20200526081740.256236-1-rvkagan@yandex-team.ru/
Hi,
This series failed the asan build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
=== TEST SCRIPT END ===
CC hw/display/ramfb-standalone.o
CC hw/display/cirrus_vga.o
CC hw/display/cirrus_vga_isa.o
/tmp/qemu-test/src/hw/block/xen-block.c:242:28: error: too few arguments to function call, expected 2, have 1
blkconf_blocksizes(conf);
~~~~~~~~~~~~~~~~~~ ^
/tmp/qemu-test/src/include/hw/block/block.h:90:1: note: 'blkconf_blocksizes' declared here
bool blkconf_blocksizes(BlockConf *conf, Error **errp);
^
/usr/lib64/clang/8.0.0/include/stdbool.h:31:14: note: expanded from macro 'bool'
#define bool _Bool
^
/tmp/qemu-test/src/hw/block/xen-block.c:260:35: error: format specifies type 'unsigned int' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
conf->discard_granularity);
^~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/hw/block/xen-block.c:274:31: error: format specifies type 'unsigned int' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
conf->logical_block_size);
^~~~~~~~~~~~~~~~~~~~~~~~
3 errors generated.
CC hw/display/xenfb.o
make: *** [/tmp/qemu-test/src/rules.mak:69: hw/block/xen-block.o] Error 1
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
File "./tests/docker/docker.py", line 664, in <module>
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=51c33fdd1b004bd7aea32bcbcf627ced', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=x86_64-softmmu', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-dii29f5p/src/docker-src.2020-05-26-06.43.06.26195:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-debug']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=51c33fdd1b004bd7aea32bcbcf627ced
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-dii29f5p/src'
make: *** [docker-run-test-debug@fedora] Error 2
real 3m36.906s
user 0m9.145s
The full log is available at
http://patchew.org/logs/20200526081740.256236-1-rvkagan@yandex-team.ru/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties
2020-05-26 8:17 [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties Roman Kagan
` (6 preceding siblings ...)
2020-05-26 10:46 ` no-reply
@ 2020-05-26 10:47 ` no-reply
2020-05-26 11:00 ` Roman Kagan
8 siblings, 0 replies; 10+ messages in thread
From: no-reply @ 2020-05-26 10:47 UTC (permalink / raw)
To: rvkagan
Cc: kwolf, fam, berrange, ehabkost, qemu-block, mst, philmd,
qemu-devel, mreitz, kraxel, stefanha, kbusch, pbonzini, jsnow
Patchew URL: https://patchew.org/QEMU/20200526081740.256236-1-rvkagan@yandex-team.ru/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Message-id: 20200526081740.256236-1-rvkagan@yandex-team.ru
Subject: [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
6611c53 block: lift blocksize property limit to 2 MiB
1efe094 block: make size-related BlockConf properties accept size suffixes
f9d88df qdev-properties: blocksize: use same limits in code and description
bee66cf block: consolidate blocksize properties consistency checks
8b2fdc1 virtio-blk: store opt_io_size with correct size
=== OUTPUT BEGIN ===
1/5 Checking commit 8b2fdc1b18b2 (virtio-blk: store opt_io_size with correct size)
2/5 Checking commit bee66cfde76f (block: consolidate blocksize properties consistency checks)
3/5 Checking commit f9d88df4c03e (qdev-properties: blocksize: use same limits in code and description)
4/5 Checking commit 1efe094b7637 (block: make size-related BlockConf properties accept size suffixes)
ERROR: line over 90 characters
#200: FILE: hw/core/qdev-properties.c:1244:
+ "Property %s.%s doesn't take value '%" PRId64 "', it's not a power of 2",
total: 1 errors, 0 warnings, 1070 lines checked
Patch 4/5 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/5 Checking commit 6611c538915a (block: lift blocksize property limit to 2 MiB)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20200526081740.256236-1-rvkagan@yandex-team.ru/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties
2020-05-26 8:17 [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties Roman Kagan
` (7 preceding siblings ...)
2020-05-26 10:47 ` no-reply
@ 2020-05-26 11:00 ` Roman Kagan
8 siblings, 0 replies; 10+ messages in thread
From: Roman Kagan @ 2020-05-26 11:00 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, Fam Zheng, Daniel P. Berrangé,
Eduardo Habkost, qemu-block, Michael S. Tsirkin,
Philippe Mathieu-Daudé,
Max Reitz, Gerd Hoffmann, Stefan Hajnoczi, Keith Busch,
Paolo Bonzini, John Snow
Please ignore the series, I forgot xen-block device.
Roman.
On Tue, May 26, 2020 at 11:17:35AM +0300, Roman Kagan wrote:
> BlockConf includes several properties counted in bytes.
>
> Enhance their handling in a some aspects, specifically
>
> - accept common size suffixes (k, m)
> - perform consistency checks on the values, to prevent their silent
> truncation and rounding
> - lift the upper limit on physical_block_size and logical_block_size
>
> Also fix the accessor for opt_io_size in virtio-blk to make it match the size
> of the field.
>
> History:
> v4 -> v5:
> - re-split the patches [Philippe]
> - fix/reword error messages [Philippe, Kevin]
> - do early return on failed consistency check [Philippe]
> - use QEMU_IS_ALIGNED instead of open coding [Philippe]
> - make all BlockConf size props support suffixes
> - expand the log for virtio-blk opt_io_size [Michael]
>
> v3 -> v4:
> - add patch to fix opt_io_size width in virtio-blk
> - add patch to perform consistency checks [Kevin]
> - check min_io_size against truncation [Kevin]
>
> v2 -> v3:
> - mention qcow2 cluster size limit in the log and comment [Eric]
>
> v1 -> v2:
> - cap the property at 2 MiB [Eric]
> - accept size suffixes
>
> Roman Kagan (5):
> virtio-blk: store opt_io_size with correct size
> block: consolidate blocksize properties consistency checks
> qdev-properties: blocksize: use same limits in code and description
> block: make size-related BlockConf properties accept size suffixes
> block: lift blocksize property limit to 2 MiB
>
> include/hw/block/block.h | 18 +-
> include/hw/qdev-properties.h | 2 +-
> hw/block/block.c | 64 ++++-
> hw/block/fdc.c | 5 +-
> hw/block/nvme.c | 5 +-
> hw/block/virtio-blk.c | 9 +-
> hw/core/qdev-properties.c | 109 +++----
> hw/ide/qdev.c | 5 +-
> hw/scsi/scsi-disk.c | 12 +-
> hw/usb/dev-storage.c | 5 +-
> tests/qemu-iotests/172.out | 532 +++++++++++++++++------------------
> 11 files changed, 423 insertions(+), 343 deletions(-)
>
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-05-26 11:02 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-26 8:17 [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties Roman Kagan
2020-05-26 8:17 ` [PATCH v5 1/5] virtio-blk: store opt_io_size with correct size Roman Kagan
2020-05-26 8:17 ` [PATCH v5 2/5] block: consolidate blocksize properties consistency checks Roman Kagan
2020-05-26 8:17 ` [PATCH v5 3/5] qdev-properties: blocksize: use same limits in code and description Roman Kagan
2020-05-26 8:17 ` [PATCH v5 4/5] block: make size-related BlockConf properties accept size suffixes Roman Kagan
2020-05-26 8:17 ` [PATCH v5 5/5] block: lift blocksize property limit to 2 MiB Roman Kagan
2020-05-26 10:42 ` [PATCH v5 0/5] block: widen and check consistency of size-related BlockConf properties no-reply
2020-05-26 10:46 ` no-reply
2020-05-26 10:47 ` no-reply
2020-05-26 11:00 ` Roman Kagan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.