From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXhkQ-0000sY-MM for qemu-devel@nongnu.org; Thu, 11 Aug 2016 00:37:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXhkM-0006hq-FQ for qemu-devel@nongnu.org; Thu, 11 Aug 2016 00:37:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50256) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXhkM-0006hf-9T for qemu-devel@nongnu.org; Thu, 11 Aug 2016 00:37:34 -0400 Date: Thu, 11 Aug 2016 10:07:30 +0530 From: Amit Shah Message-ID: <20160811043730.GA12933@grmbl.mre> References: <1470702146-24399-1-git-send-email-liang.z.li@intel.com> <20160809154635.GD2025@work-vm> <20160810175821.GH3172@work-vm> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160810175821.GH3172@work-vm> Subject: Re: [Qemu-devel] [PATCH] migration: fix live migration failure with compression List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert" Cc: "Li, Liang Z" , "qemu-devel@nongnu.org" , "quintela@redhat.com" , "berrange@redhat.com" , peter.maydell@linaro.org On (Wed) 10 Aug 2016 [18:58:21], Dr. David Alan Gilbert wrote: > * Li, Liang Z (liang.z.li@intel.com) wrote: > > > Subject: Re: [PATCH] migration: fix live migration failure with compression > > > > > > * Liang Li (liang.z.li@intel.com) wrote: > > > > Because of commit 11808bb0c422, which remove some condition checks of > > > > 'f->ops->writev_buffer', 'qemu_put_qemu_file' should be enhanced to > > > > clear the 'f_src->iovcnt', or 'f_src->iovcnt' may exceed the > > > > MAX_IOV_SIZE which will break live migration. This should be fixed. > > > > > > > > Signed-off-by: Liang Li > > > > Reported-by: Jinshi Zhang > > > > --- > > > > migration/qemu-file.c | 1 + > > > > 1 file changed, 1 insertion(+) > > > > > > > > diff --git a/migration/qemu-file.c b/migration/qemu-file.c index > > > > bbc565e..e9fae31 100644 > > > > --- a/migration/qemu-file.c > > > > +++ b/migration/qemu-file.c > > > > @@ -668,6 +668,7 @@ int qemu_put_qemu_file(QEMUFile *f_des, > > > QEMUFile *f_src) > > > > len = f_src->buf_index; > > > > qemu_put_buffer(f_des, f_src->buf, f_src->buf_index); > > > > f_src->buf_index = 0; > > > > + f_src->iovcnt = 0; > > > > } > > > > > > If you're just using the buf[] in the src, how does it end up incrementing the > > > iovcnt? > > > > > > Dave > > > > > > > return len; > > > > } > > > > 'qemu_put_be32' is used to put some data to an allocated 'f_src'. Before the 11808bb0c422, this operation > > won't increase the 'f_src->iovcnt', there is no issue. > > Commit 11808bb0c422 remove the checking of 'f->ops->writev_buffer', > > now 'qemu_put_be32' will increase 'f_src->iovcnt' and set 'f_src->iov []', once the 'f_src->iovcnt' reach to > > MAX_IOV_SIZE, 'qemu_fflush' will be trigged. Beacause 'f_src' is not writeable, 'qemu_fflsh' will return > > without wrapping around 'f_src->iovcnt' , the following 'qemu_put_be32' on 'f_src' will increase 'f_src->iovcnt' > > and make it exceed MAX_IOV_SIZE, then set 'f_src->iov[]' will corrupt memory. > > OK, thanks > > Signed-off-by: Dr. David Alan Gilbert Did you mean to Reviewed-by? > Amit, Peter: I think this is one for 2.7 because I think that's a regression > given that the 11808bb0c422 referenced is after 2.6. I'll send it out, thanks. Amit