From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrQFc-0007jK-FM for qemu-devel@nongnu.org; Tue, 25 Jun 2013 06:13:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UrQFZ-0003yV-Dr for qemu-devel@nongnu.org; Tue, 25 Jun 2013 06:13:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61414) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrQFY-0003yC-S0 for qemu-devel@nongnu.org; Tue, 25 Jun 2013 06:13:25 -0400 Message-ID: <51C96D39.2020603@redhat.com> Date: Tue, 25 Jun 2013 12:13:13 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1372125485-11795-1-git-send-email-mrhines@linux.vnet.ibm.com> <1372125485-11795-15-git-send-email-mrhines@linux.vnet.ibm.com> <8761x21pvx.fsf@elfo.elfo> In-Reply-To: <8761x21pvx.fsf@elfo.elfo> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v11 14/15] rdma: introduce MIG_STATE_NONE and change MIG_STATE_SETUP state transition List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: quintela@redhat.com Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org, mrhines@linux.vnet.ibm.com, owasserm@redhat.com, abali@us.ibm.com, mrhines@us.ibm.com, gokul@us.ibm.com, chegu_vinod@hp.com, knoel@redhat.com Il 25/06/2013 11:49, Juan Quintela ha scritto: > mrhines@linux.vnet.ibm.com wrote: >> From: "Michael R. Hines" >> >> As described in the previous patch, until now, the MIG_STATE_SETUP >> state was not really a 'formal' state. It has been used as a 'zero' state >> (what we're calling 'NONE' here) and QEMU has been unconditionally transitioning >> into this state when the QMP migration command was called. Instead we want to >> introduce MIG_STATE_NONE, which is our starting state in the state machine, and >> then immediately transition into the MIG_STATE_SETUP state when the QMP migrate >> command is issued. >> >> In order to do this, we must delay the transition into MIG_STATE_ACTIVE until >> later in the migration_thread(). This is done to be able to timestamp the amount of >> time spent in the SETUP state for proper accounting to the user during >> an RDMA migration. >> >> Furthermore, the management software, until now, has never been aware of the >> existence of the SETUP state whatsoever. This must change, because, timing of this >> state implies that the state actually exists. >> >> These two patches cannot be separated because the 'query_migrate' QMP >> switch statement needs to know how to handle this new state transition. >> >> Tested-by: Michael R. Hines >> Signed-off-by: Michael R. Hines > >> @@ -316,6 +321,7 @@ static void migrate_fd_cancel(MigrationState *s) >> { >> DPRINTF("cancelling migration\n"); >> >> + migrate_set_state(s, MIG_STATE_SETUP, MIG_STATE_CANCELLED); >> migrate_set_state(s, MIG_STATE_ACTIVE, MIG_STATE_CANCELLED); >> } > > This chunk is wrong. > > we can call qme_migrate_cancel() at any point, and it is going to be > called normally from MIG_STATE_ACTIVE. > > migrate_set_satet(s, s->state, MIG_STATE_CANCELLED) > > should do the trick. Or something like that, what do you think? I don't like the three-arguments migrate_set_state, but I don't have any better idea. With Juan's modification, it is fine (but not reviewed-by me :)). While you resend, the first 13 patches of v10 can be merged (pull request). You can then rebase the last three on top. Michael, did you look at the "debugging/getting the protocol ready" mode where all pages are unpinned? Paolo