From patchwork Wed Aug 15 07:44:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 177559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BD1492C0088 for ; Wed, 15 Aug 2012 17:44:36 +1000 (EST) Received: from localhost ([::1]:41689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1YHK-00080Q-SP for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 03:44:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1YH7-0007yr-TV for qemu-devel@nongnu.org; Wed, 15 Aug 2012 03:44:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1YH6-0000HX-GI for qemu-devel@nongnu.org; Wed, 15 Aug 2012 03:44:21 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:51350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1YH6-0000HI-4g for qemu-devel@nongnu.org; Wed, 15 Aug 2012 03:44:20 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 15 Aug 2012 08:44:19 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 15 Aug 2012 08:44:17 +0100 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps4076.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7F7iAK016711904 for ; Wed, 15 Aug 2012 07:44:10 GMT Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7F7iGPF009773 for ; Wed, 15 Aug 2012 01:44:16 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q7F7iFpE009761; Wed, 15 Aug 2012 01:44:15 -0600 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 1122) id B5C13122443A; Wed, 15 Aug 2012 09:44:15 +0200 (CEST) From: Jens Freimann To: Alexander Graf Date: Wed, 15 Aug 2012 09:44:08 +0200 Message-Id: <1345016649-4792-2-git-send-email-jfrei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1345016649-4792-1-git-send-email-jfrei@linux.vnet.ibm.com> References: <1345016649-4792-1-git-send-email-jfrei@linux.vnet.ibm.com> x-cbid: 12081507-1948-0000-0000-000002ACD808 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.110 Cc: Heinz Graalfs , qemu-devel , Christian Borntraeger , Jens Freimann , Cornelia Huck , Paolo Bonzini , Stefan Weinhuber , Einar Lueck Subject: [Qemu-devel] [PATCH 1/2] virtio-block: support auto-sensing of block sizes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Einar Lueck Virtio-blk does not impose fixed block sizes for access to backing devices. This patch introduces support for auto lookup of the block sizes of the backing block device. This automatic lookup needs to be enabled explicitly. Users may do this by specifying (physical|logical)_block_size=0. Machine types may do this for their defaults, too. To achieve this, a new function blkconf_blocksizes is implemented. If physical or logical block size are zero a corresponding ioctl tries to find an appropriate value. If this does not work, 512 is used. blkconf_blocksizes is therefore only called w/in the virtio-blk context. For s390-virtio, this patch configures auto lookup as default. Signed-off-by: Einar Lueck Signed-off-by: Jens Freimann --- hw/block-common.c | 28 ++++++++++++++++++++++++++++ hw/block-common.h | 12 +++++++++--- hw/qdev-properties.c | 4 +++- hw/s390-virtio-bus.c | 2 +- hw/virtio-blk.c | 1 + 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/hw/block-common.c b/hw/block-common.c index f0196d7..336a891 100644 --- a/hw/block-common.c +++ b/hw/block-common.c @@ -10,6 +10,9 @@ #include "blockdev.h" #include "hw/block-common.h" #include "qemu-error.h" +#ifdef __linux__ +#include +#endif void blkconf_serial(BlockConf *conf, char **serial) { @@ -24,6 +27,31 @@ void blkconf_serial(BlockConf *conf, char **serial) } } +void blkconf_blocksizes(BlockConf *conf) +{ +#ifdef __linux__ + int block_size; + + if (!conf->physical_block_size) { + if (bdrv_ioctl(conf->bs, BLKPBSZGET, &block_size) == 0) { + conf->physical_block_size = (uint16_t) block_size; + } else { + conf->physical_block_size = BLOCK_PROPERTY_STD_BLKSIZE; + } + } + if (!conf->logical_block_size) { + if (bdrv_ioctl(conf->bs, BLKSSZGET, &block_size) == 0) { + conf->logical_block_size = (uint16_t) block_size; + } else { + conf->logical_block_size = BLOCK_PROPERTY_STD_BLKSIZE; + } + } +#else + conf->physical_block_size = BLOCK_PROPERTY_STD_BLKSIZE; + conf->logical_block_size = BLOCK_PROPERTY_STD_BLKSIZE; +#endif +} + int blkconf_geometry(BlockConf *conf, int *ptrans, unsigned cyls_max, unsigned heads_max, unsigned secs_max) { diff --git a/hw/block-common.h b/hw/block-common.h index bb808f7..d593128 100644 --- a/hw/block-common.h +++ b/hw/block-common.h @@ -40,18 +40,23 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) return exp; } -#define DEFINE_BLOCK_PROPERTIES(_state, _conf) \ +#define BLOCK_PROPERTY_STD_BLKSIZE 512 +#define DEFINE_BLOCK_PROPERTIES_EXTENDED(_state, _conf, _blksize) \ DEFINE_PROP_DRIVE("drive", _state, _conf.bs), \ DEFINE_PROP_BLOCKSIZE("logical_block_size", _state, \ - _conf.logical_block_size, 512), \ + _conf.logical_block_size, _blksize), \ DEFINE_PROP_BLOCKSIZE("physical_block_size", _state, \ - _conf.physical_block_size, 512), \ + _conf.physical_block_size, _blksize), \ 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_INT32("bootindex", _state, _conf.bootindex, -1), \ DEFINE_PROP_UINT32("discard_granularity", _state, \ _conf.discard_granularity, 0) +#define DEFINE_BLOCK_PROPERTIES(_state, _conf) \ + DEFINE_BLOCK_PROPERTIES_EXTENDED(_state, _conf, \ + BLOCK_PROPERTY_STD_BLKSIZE) + #define DEFINE_BLOCK_CHS_PROPERTIES(_state, _conf) \ DEFINE_PROP_UINT32("cyls", _state, _conf.cyls, 0), \ DEFINE_PROP_UINT32("heads", _state, _conf.heads, 0), \ @@ -60,6 +65,7 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) /* Configuration helpers */ void blkconf_serial(BlockConf *conf, char **serial); +void blkconf_blocksizes(BlockConf *conf); int blkconf_geometry(BlockConf *conf, int *trans, unsigned cyls_max, unsigned heads_max, unsigned secs_max); diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 8aca0d4..e99dee4 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -904,7 +904,9 @@ static void set_blocksize(Object *obj, Visitor *v, void *opaque, error_propagate(errp, local_err); return; } - if (value < min || value > max) { + + /* value == 0 indicates that block size should be sensed later on */ + if ((value < min || value > max) && value > 0) { error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, dev->id?:"", name, (int64_t)value, min, max); return; diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index a245684..562964e 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -401,7 +401,7 @@ static TypeInfo s390_virtio_net = { }; static Property s390_virtio_blk_properties[] = { - DEFINE_BLOCK_PROPERTIES(VirtIOS390Device, blk.conf), + DEFINE_BLOCK_PROPERTIES_EXTENDED(VirtIOS390Device, blk.conf, 0), DEFINE_BLOCK_CHS_PROPERTIES(VirtIOS390Device, blk.conf), DEFINE_PROP_STRING("serial", VirtIOS390Device, blk.serial), #ifdef __linux__ diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index fd8fa90..d2d73dc 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -625,6 +625,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) } blkconf_serial(&blk->conf, &blk->serial); + blkconf_blocksizes(&blk->conf); if (blkconf_geometry(&blk->conf, NULL, 65535, 255, 255) < 0) { return NULL; }