From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 31384C43334 for ; Thu, 23 Jun 2022 08:41:57 +0000 (UTC) Received: from localhost ([::1]:59634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4IPU-0003i2-6q for qemu-devel@archiver.kernel.org; Thu, 23 Jun 2022 04:41:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4INr-0002b5-2h for qemu-devel@nongnu.org; Thu, 23 Jun 2022 04:40:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:26840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4INp-0006Ey-7P for qemu-devel@nongnu.org; Thu, 23 Jun 2022 04:40:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655973612; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=6fnolT6Hd8Ux+10kME6lcVnFcw5aelrzGj/RNiR2DLg=; b=Qj3uMC3kCloZEsR/M8EklMyriQdplbtryuhwmzhC+sKkznABY4PeXIhik/yB+EZQDDb1Qg dNqN8/JhvLAEFZG6Dd8t8ICxpKSFKs4hKqzNmSj7ARRnEQq5IrOHDjBEhktAOrIeXpa7J+ 1bG5LKlFI8pOb/Gy735Zmfzq5ZOCpSk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-587-cBIhTLdFMvS-Z5WtJwQ1Tg-1; Thu, 23 Jun 2022 04:40:09 -0400 X-MC-Unique: cBIhTLdFMvS-Z5WtJwQ1Tg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 34AB718188A1; Thu, 23 Jun 2022 08:40:09 +0000 (UTC) Received: from redhat.com (unknown [10.33.36.77]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DEB6C111F5; Thu, 23 Jun 2022 08:40:07 +0000 (UTC) Date: Thu, 23 Jun 2022 09:40:05 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Peter Xu Cc: "Dr. David Alan Gilbert (git)" , qemu-devel@nongnu.org, huangy81@chinatelecom.cn, quintela@redhat.com, leobras@redhat.com, jdenemar@redhat.com Subject: Re: [PULL 22/33] migration: remove the QEMUFileOps 'get_buffer' callback Message-ID: References: <20220622183917.155308-1-dgilbert@redhat.com> <20220622183917.155308-23-dgilbert@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.2.1 (2022-02-19) X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Jun 22, 2022 at 03:34:52PM -0400, Peter Xu wrote: > On Wed, Jun 22, 2022 at 07:39:06PM +0100, Dr. David Alan Gilbert (git) wrote: > > diff --git a/migration/qemu-file.c b/migration/qemu-file.c > > index 74f919de67..e206b05550 100644 > > --- a/migration/qemu-file.c > > +++ b/migration/qemu-file.c > > @@ -377,8 +377,22 @@ static ssize_t qemu_fill_buffer(QEMUFile *f) > > return 0; > > } > > > > - len = f->ops->get_buffer(f->ioc, f->buf + pending, f->total_transferred, > > - IO_BUF_SIZE - pending, &local_error); > > + do { > > + len = qio_channel_read(f->ioc, > > + (char *)f->buf + pending, > > + IO_BUF_SIZE - pending, > > + &local_error); > > + if (len == QIO_CHANNEL_ERR_BLOCK) { > > + if (qemu_in_coroutine()) { > > + qio_channel_yield(f->ioc, G_IO_IN); > > + } else { > > + qio_channel_wait(f->ioc, G_IO_IN); > > + } > > + } else if (len < 0) { > > + len = EIO; > > This should be -EIO. Yes, that's correct change. /facepalm > > > + } > > + } while (len == QIO_CHANNEL_ERR_BLOCK); > > It's failing only with the new TLS test I added for postcopy somehow (at > least /x86_64/migration/postcopy/recovery/tls).. I also verified after the > change it'll work again. Yeah, I guess this is a rare failure condition that's not easily hit in our tests. Makes sense that recovery tests could hit it though. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|