From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y86Yk-000398-OO for qemu-devel@nongnu.org; Mon, 05 Jan 2015 07:14:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y86Yg-00076J-OV for qemu-devel@nongnu.org; Mon, 05 Jan 2015 07:14:58 -0500 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:39513 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y86Yg-00076D-Eu for qemu-devel@nongnu.org; Mon, 05 Jan 2015 07:14:54 -0500 Message-ID: <54AA8038.7090608@kamp.de> Date: Mon, 05 Jan 2015 13:14:48 +0100 From: Peter Lieven MIME-Version: 1.0 References: <1420457389-16332-1-git-send-email-pl@kamp.de> <54AA7AB2.6040305@parallels.com> In-Reply-To: <54AA7AB2.6040305@parallels.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH] block: limited request size in write zeroes unsupported path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" , qemu-devel@nongnu.org Cc: kwolf@redhat.com, den@openvz.org, famz@redhat.com, stefanha@redhat.com, mreitz@redhat.com On 05.01.2015 12:51, Denis V. Lunev wrote: > On 05/01/15 14:29, Peter Lieven wrote: >> If bs->bl.max_write_zeroes is large and we end up in the unsupported >> path we might allocate a lot of memory for the iovector and/or even >> generate an oversized requests. >> >> Fix this by limiting the request by the minimum of the reported >> maximum transfer size or 16MB (32768 sectors). >> >> Reported-by: Denis V. Lunev >> Signed-off-by: Peter Lieven >> --- >> block.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/block.c b/block.c >> index a612594..8009478 100644 >> --- a/block.c >> +++ b/block.c >> @@ -3203,6 +3203,9 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs, >> >> if (ret == -ENOTSUP) { >> /* Fall back to bounce buffer if write zeroes is unsupported */ >> + int max_xfer_len = MIN_NON_ZERO(bs->bl.max_transfer_length, >> + MAX_WRITE_ZEROES_DEFAULT); >> + num = MIN(num, max_xfer_len); >> iov.iov_len = num * BDRV_SECTOR_SIZE; >> if (iov.iov_base == NULL) { >> iov.iov_base = qemu_try_blockalign(bs, num * BDRV_SECTOR_SIZE); >> @@ -3219,7 +3222,7 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs, >> /* Keep bounce buffer around if it is big enough for all >> * all future requests. >> */ >> - if (num < max_write_zeroes) { >> + if (num < max_xfer_len) { >> qemu_vfree(iov.iov_base); >> iov.iov_base = NULL; >> } >> > this is not going to work IMHO. num is the number in sectors. > max_xfer_len is in bytes. bs->bl.max_transfer_length is in sectors. Peter > > I will send my updated version using your approach in a > couple of minutes. Would like to test it a bit. -- Mit freundlichen Grüßen Peter Lieven ........................................................... KAMP Netzwerkdienste GmbH Vestische Str. 89-91 | 46117 Oberhausen Tel: +49 (0) 208.89 402-50 | Fax: +49 (0) 208.89 402-40 pl@kamp.de | http://www.kamp.de Geschäftsführer: Heiner Lante | Michael Lante Amtsgericht Duisburg | HRB Nr. 12154 USt-Id-Nr.: DE 120607556 ...........................................................