From nobody Thu Apr 25 16:23:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1570670208; cv=none; d=zoho.com; s=zohoarc; b=gNaShBvdfgVPIvLoKtC4M7yw5CiIAmCnApRLvoy3blV92HukXPKp5xRy2gJ5aiS8mklmiJnCJwo5Eq2TgdXHnYFLhMbJttgoTtLe9LIxkAbXb7ccQ9TRNsvGItKS/jwfwvfWbjW/F9umzZqWsss4Rf02SWkaVfizRdVcwvfweb8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570670208; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=y15ZwhVjifDdfxDGnQlee2U/tKAWsvsWWWNfW4F2uJc=; b=fLEektNZqARMillu+Fl2uvlubm2y+6mVSPgJHZgKjoJqX9+qhWIKMkYU5AgbsiwftjqHGfOl+dFTYWOCrKf7mFABDY+t7TwPV2Emh/B+t3ylKUlcIlCk/uZSzZPa0WtPyCTrvDotwNyVlQUegZF0IZWFEPlwM9RZCkg/5QJD2Q0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570670208213782.502880558991; Wed, 9 Oct 2019 18:16:48 -0700 (PDT) Received: from localhost ([::1]:33124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIN4Q-00016H-Js for importer@patchew.org; Wed, 09 Oct 2019 21:16:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49155) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIN2a-000864-Dp for qemu-devel@nongnu.org; Wed, 09 Oct 2019 21:14:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIN2Z-00066S-CM for qemu-devel@nongnu.org; Wed, 09 Oct 2019 21:14:52 -0400 Received: from mga03.intel.com ([134.134.136.65]:16853) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIN2Z-0005Xk-3d for qemu-devel@nongnu.org; Wed, 09 Oct 2019 21:14:51 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Oct 2019 18:13:45 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga003.jf.intel.com with ESMTP; 09 Oct 2019 18:13:43 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,278,1566889200"; d="scan'208";a="197087536" From: Wei Yang To: quintela@redhat.com, dgilbert@redhat.com, peterx@redhat.com Subject: [PATCH v2 1/2] migration/postcopy: rename postcopy_ram_enable_notify to postcopy_ram_incoming_setup Date: Thu, 10 Oct 2019 09:13:15 +0800 Message-Id: <20191010011316.31363-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191010011316.31363-1-richardw.yang@linux.intel.com> References: <20191010011316.31363-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Wei Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Function postcopy_ram_incoming_setup and postcopy_ram_incoming_cleanup is a pair. Rename to make it clear for audience. Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/postcopy-ram.c | 4 ++-- migration/postcopy-ram.h | 2 +- migration/savevm.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 1f63e65ed7..b24c4a10c2 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -1094,7 +1094,7 @@ retry: return NULL; } =20 -int postcopy_ram_enable_notify(MigrationIncomingState *mis) +int postcopy_ram_incoming_setup(MigrationIncomingState *mis) { /* Open the fd for the kernel to give us userfaults */ mis->userfault_fd =3D syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK= ); @@ -1321,7 +1321,7 @@ int postcopy_request_shared_page(struct PostCopyFD *p= cfd, RAMBlock *rb, return -1; } =20 -int postcopy_ram_enable_notify(MigrationIncomingState *mis) +int postcopy_ram_incoming_setup(MigrationIncomingState *mis) { assert(0); return -1; diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h index 9c8bd2bae0..d2668cc820 100644 --- a/migration/postcopy-ram.h +++ b/migration/postcopy-ram.h @@ -20,7 +20,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingStat= e *mis); * Make all of RAM sensitive to accesses to areas that haven't yet been wr= itten * and wire up anything necessary to deal with it. */ -int postcopy_ram_enable_notify(MigrationIncomingState *mis); +int postcopy_ram_incoming_setup(MigrationIncomingState *mis); =20 /* * Initialise postcopy-ram, setting the RAM to a state where we can go into diff --git a/migration/savevm.c b/migration/savevm.c index bb9462a54d..78c2965ca4 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1865,7 +1865,7 @@ static int loadvm_postcopy_handle_listen(MigrationInc= omingState *mis) * shouldn't be doing anything yet so don't actually expect requests */ if (migrate_postcopy_ram()) { - if (postcopy_ram_enable_notify(mis)) { + if (postcopy_ram_incoming_setup(mis)) { postcopy_ram_incoming_cleanup(mis); return -1; } --=20 2.17.1 From nobody Thu Apr 25 16:23:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1570670209; cv=none; d=zoho.com; s=zohoarc; b=NlUWWtrzWeKqjadKeZYulOaJXthT/gYsXZaAZe8q0fFsLQg56JnCiFgQCJGMs5NDN9W2ikUwFZIR2ajnJt2Mpp37WFNl0+w8Z/EXyx2BdRXQRc1aoNb0yzKrdLNbTmblk+P/wQ0EuaglsodS8qw4Pk9Q2kdZyh3ZLea0FbfCrX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570670209; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=fvpTpujjC006BpAP7s5z24Bz7SgjqJiJ0yIzzZBeANA=; b=RpPGCq9xeQsIUHwhO/t/lRKwPWjdbA4lC1ODOKBggC77pD/nJcHWjuMjMBaaWEj/lhOTMp7P2IEQ2RTt9ab5qYjiUkSDaZ4sWwXOceSrwdm5MQ1ten+dgb76GkbDyQ3yq7CysonmYKtTVETaY21bLPN8MWoj+c8RWSTZe2ZXlPQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570670209637720.9762631453058; Wed, 9 Oct 2019 18:16:49 -0700 (PDT) Received: from localhost ([::1]:33126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIN4Q-00016J-5W for importer@patchew.org; Wed, 09 Oct 2019 21:16:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49157) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIN2a-000868-K2 for qemu-devel@nongnu.org; Wed, 09 Oct 2019 21:14:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIN2Z-00066Y-Gc for qemu-devel@nongnu.org; Wed, 09 Oct 2019 21:14:52 -0400 Received: from mga03.intel.com ([134.134.136.65]:16855) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIN2Z-0005aN-8P for qemu-devel@nongnu.org; Wed, 09 Oct 2019 21:14:51 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Oct 2019 18:13:47 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga003.jf.intel.com with ESMTP; 09 Oct 2019 18:13:45 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,278,1566889200"; d="scan'208";a="197087540" From: Wei Yang To: quintela@redhat.com, dgilbert@redhat.com, peterx@redhat.com Subject: [PATCH v2 2/2] migration/postcopy: check PostcopyState before setting to POSTCOPY_INCOMING_RUNNING Date: Thu, 10 Oct 2019 09:13:16 +0800 Message-Id: <20191010011316.31363-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191010011316.31363-1-richardw.yang@linux.intel.com> References: <20191010011316.31363-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Wei Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently, we set PostcopyState blindly to RUNNING, even we found the previous state is not LISTENING. This will lead to a corner case. First let's look at the code flow: qemu_loadvm_state_main() ret =3D loadvm_process_command() loadvm_postcopy_handle_run() return -1; if (ret < 0) { if (postcopy_state_get() =3D=3D POSTCOPY_INCOMING_RUNNING) ... } >From above snippet, the corner case is loadvm_postcopy_handle_run() always sets state to RUNNING. And then it checks the previous state. If the previous state is not LISTENING, it will return -1. But at this moment, PostcopyState is already been set to RUNNING. Then ret is checked in qemu_loadvm_state_main(), when it is -1 PostcopyState is checked. Current logic would pause postcopy and retry if PostcopyState is RUNNING. This is not what we expect, because postcopy is not active yet. This patch makes sure state is set to RUNNING only previous state is LISTENING by checking the state first. Signed-off-by: Wei Yang Suggested by: Peter Xu Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 78c2965ca4..b9f30a7090 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1934,7 +1934,7 @@ static void loadvm_postcopy_handle_run_bh(void *opaqu= e) /* After all discards we can start running and asking for pages */ static int loadvm_postcopy_handle_run(MigrationIncomingState *mis) { - PostcopyState ps =3D postcopy_state_set(POSTCOPY_INCOMING_RUNNING); + PostcopyState ps =3D postcopy_state_get(); =20 trace_loadvm_postcopy_handle_run(); if (ps !=3D POSTCOPY_INCOMING_LISTENING) { @@ -1942,6 +1942,7 @@ static int loadvm_postcopy_handle_run(MigrationIncomi= ngState *mis) return -1; } =20 + postcopy_state_set(POSTCOPY_INCOMING_RUNNING); mis->bh =3D qemu_bh_new(loadvm_postcopy_handle_run_bh, mis); qemu_bh_schedule(mis->bh); =20 --=20 2.17.1