From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5bQ3-0008MH-KJ for qemu-devel@nongnu.org; Tue, 21 Jan 2014 08:31:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5bPy-0001b8-JO for qemu-devel@nongnu.org; Tue, 21 Jan 2014 08:31:07 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:47947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5bPy-0001b2-1w for qemu-devel@nongnu.org; Tue, 21 Jan 2014 08:31:02 -0500 Date: Tue, 21 Jan 2014 14:31:01 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140121133101.GF9834@irqsave.net> References: <1389968119-24771-1-git-send-email-kwolf@redhat.com> <1389968119-24771-12-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1389968119-24771-12-git-send-email-kwolf@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 11/29] block: Introduce bdrv_aligned_pwritev() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: pl@kamp.de, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, xiawenc@linux.vnet.ibm.com Le Friday 17 Jan 2014 =E0 15:15:01 (+0100), Kevin Wolf a =E9crit : > This separates the part of bdrv_co_do_writev() that needs to happen > before the request is modified to match the backend alignment, and a > part that needs to be executed afterwards and passes the request to the > BlockDriver. >=20 > Signed-off-by: Kevin Wolf > Reviewed-by: Max Reitz > --- > block.c | 62 +++++++++++++++++++++++++++++++++++++++++----------------= ----- > 1 file changed, 41 insertions(+), 21 deletions(-) >=20 > diff --git a/block.c b/block.c > index f378a10..70b72f0 100644 > --- a/block.c > +++ b/block.c > @@ -2964,34 +2964,20 @@ static int coroutine_fn bdrv_co_do_write_zeroes= (BlockDriverState *bs, > } > =20 > /* > - * Handle a write request in coroutine context > + * Forwards an already correctly aligned write request to the BlockDri= ver. > */ > -static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, > - int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, > - BdrvRequestFlags flags) > +static int coroutine_fn bdrv_aligned_pwritev(BlockDriverState *bs, > + int64_t offset, unsigned int bytes, QEMUIOVector *qiov, int flags) > { > BlockDriver *drv =3D bs->drv; > BdrvTrackedRequest req; > int ret; > =20 > - if (!bs->drv) { > - return -ENOMEDIUM; > - } > - if (bs->read_only) { > - return -EACCES; > - } > - if (bdrv_check_request(bs, sector_num, nb_sectors)) { > - return -EIO; > - } > - > - if (bs->copy_on_read_in_flight) { > - wait_for_overlapping_requests(bs, sector_num, nb_sectors); > - } > + int64_t sector_num =3D offset >> BDRV_SECTOR_BITS; > + unsigned int nb_sectors =3D bytes >> BDRV_SECTOR_BITS; > =20 > - /* throttling disk I/O */ > - if (bs->io_limits_enabled) { > - bdrv_io_limits_intercept(bs, nb_sectors, true); > - } > + assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); > + assert((bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); > =20 > tracked_request_begin(&req, bs, sector_num, nb_sectors, true); > =20 > @@ -3023,6 +3009,40 @@ static int coroutine_fn bdrv_co_do_writev(BlockD= riverState *bs, > return ret; > } > =20 > +/* > + * Handle a write request in coroutine context > + */ > +static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, > + int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, > + BdrvRequestFlags flags) > +{ > + int ret; > + > + if (!bs->drv) { > + return -ENOMEDIUM; > + } > + if (bs->read_only) { > + return -EACCES; > + } > + if (bdrv_check_request(bs, sector_num, nb_sectors)) { > + return -EIO; > + } > + > + if (bs->copy_on_read_in_flight) { > + wait_for_overlapping_requests(bs, sector_num, nb_sectors); > + } > + > + /* throttling disk I/O */ > + if (bs->io_limits_enabled) { > + bdrv_io_limits_intercept(bs, nb_sectors, true); > + } > + > + ret =3D bdrv_aligned_pwritev(bs, sector_num << BDRV_SECTOR_BITS, > + nb_sectors << BDRV_SECTOR_BITS, qiov, f= lags); > + > + return ret; > +} > + > int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_n= um, > int nb_sectors, QEMUIOVector *qiov) > { > --=20 > 1.8.1.4 >=20 >=20 Reviewed-by: Benoit Canet