From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFomR-00065S-8m for qemu-devel@nongnu.org; Wed, 22 Jun 2016 16:29:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFomP-0005Dz-8U for qemu-devel@nongnu.org; Wed, 22 Jun 2016 16:29:46 -0400 References: <1466625064-11280-1-git-send-email-jsnow@redhat.com> <1466625064-11280-3-git-send-email-jsnow@redhat.com> From: Eric Blake Message-ID: <576AF531.3070706@redhat.com> Date: Wed, 22 Jun 2016 14:29:37 -0600 MIME-Version: 1.0 In-Reply-To: <1466625064-11280-3-git-send-email-jsnow@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Et8pOf732f5fQgIvSIpTVeQekrPNaRggp" Subject: Re: [Qemu-devel] [PATCH 2/3] mirror: limit niov to IOV_MAX elements, again List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow , qemu-block@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Et8pOf732f5fQgIvSIpTVeQekrPNaRggp From: Eric Blake To: John Snow , qemu-block@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Message-ID: <576AF531.3070706@redhat.com> Subject: Re: [Qemu-devel] [PATCH 2/3] mirror: limit niov to IOV_MAX elements, again References: <1466625064-11280-1-git-send-email-jsnow@redhat.com> <1466625064-11280-3-git-send-email-jsnow@redhat.com> In-Reply-To: <1466625064-11280-3-git-send-email-jsnow@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 06/22/2016 01:51 PM, John Snow wrote: > During the refactor of mirror_iteration in e5b43573, > we regressed the fix introduced in cae98cb8. >=20 > This patch re-adds IOV_MAX checking to cases where we > aren't checking alignment (and size) already. >=20 > Signed-off-by: John Snow > --- > block/mirror.c | 3 +++ > 1 file changed, 3 insertions(+) Reviewed-by: Eric Blake >=20 > diff --git a/block/mirror.c b/block/mirror.c > index 2ba9642..377339d 100644 > --- a/block/mirror.c > +++ b/block/mirror.c > @@ -231,11 +231,14 @@ static int mirror_do_read(MirrorBlockJob *s, int6= 4_t sector_num, > int sectors_per_chunk, nb_chunks; > int ret; > MirrorOp *op; > + int max_sectors; > =20 > sectors_per_chunk =3D s->granularity >> BDRV_SECTOR_BITS; > + max_sectors =3D sectors_per_chunk * s->max_iov; > =20 > /* We can only handle as much as buf_size at a time. */ > nb_sectors =3D MIN(s->buf_size >> BDRV_SECTOR_BITS, nb_sectors); > + nb_sectors =3D MIN(max_sectors, nb_sectors); > assert(nb_sectors); > ret =3D nb_sectors; > =20 >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --Et8pOf732f5fQgIvSIpTVeQekrPNaRggp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJXavUxAAoJEKeha0olJ0Nqp0QH/28AMC+w8SHXdF73wOhkcfEh l5p8KOWdjHAKOXUxR+gpGs8ByYiM8oOxyTx6kBNWMN0fCeGkbIXuKaRwosTUKjkf Wes5xlRk2Xa9slsO5N9jwUEf7Rvt+IJWP//4tolwWxZXLnyH+Wf71g5FVCaYgkBn gvAYjWbXk4EuCwHIOloMwU88kNKZX1FtElNxMQWzq+wS1ztYN/oNQrNFkwS/ZyxI kUuoDBKkwfqRwh5ld3DlMNWa/P4Qp0vUc7w05tYYxXm5FM7OR34+xu7RX+Dz6Sbf qyehlKdnNXQzn9jOXYf5WGacVp0qcDC2s+rj6jHjYiqZKfFPXBV6fqLVaXlf3i4= =tMk4 -----END PGP SIGNATURE----- --Et8pOf732f5fQgIvSIpTVeQekrPNaRggp--