Commit c56ee92f authored by Roman Kagan's avatar Roman Kagan Committed by Kevin Wolf
Browse files

block: consolidate blocksize properties consistency checks 



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: default avatarRoman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPaul Durrant <paul@xen.org>
Message-Id: <20200528225516.1676602-3-rvkagan@yandex-team.ru>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 6abee260

hw/block/block.c

+29 −1
Original line number Diff line number Diff line
@@ -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,

hw/block/fdc.c

+4 −1
Original line number Diff line number Diff line
@@ -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)

    {

hw/block/nvme.c

+3 −1
Original line number Diff line number Diff line
@@ -1425,7 +1425,9 @@ static void nvme_init_state(NvmeCtrl *n) 


static void nvme_init_blk(NvmeCtrl *n, Error **errp)

{

    blkconf_blocksizes(&n->conf);

    if (!blkconf_blocksizes(&n->conf, errp)) {

        return;

    }

    blkconf_apply_backend_options(&n->conf, blk_is_read_only(n->conf.blk),

                                  false, errp);

}

hw/block/swim.c

+4 −1
Original line number Diff line number Diff line
@@ -189,7 +189,10 @@ static void swim_drive_realize(DeviceState *qdev, Error **errp) 
        assert(ret == 0);

    }



    blkconf_blocksizes(&dev->conf);

    if (!blkconf_blocksizes(&dev->conf, errp)) {

        return;

    }



    if (dev->conf.logical_block_size != 512 ||

        dev->conf.physical_block_size != 512)

    {

hw/block/virtio-blk.c

+1 −6
Original line number Diff line number Diff line
@@ -1174,12 +1174,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;

    }