From nobody Tue Feb 28 12:38:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PQxk91MbBz3vPx1; Tue, 28 Feb 2023 12:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQxk86mkBz442T; Tue, 28 Feb 2023 12:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQkxFSKs5lEoCtTSOy1iQ11sKLwjijRpW2IqZ3c77VI=; b=p+jcxh9l/17knpDt/A5OiY7SMF7PHwlvXkOakWeI14M8ZuTIT6yjAeqwvTzetBX+/EqURR D2SZ+LKu6lyA0g12gIMYAMyRmfdKulJcrAb7qmUMjnUcxXy4F9y0x7fCZJEdLvKtpkKeum OWAE/Y6/1GwjfP6wJdcv2Z/8T3P+lgUoQbcjE1nbnJ1J7lFNIWwM59RJzb98q3dlJRnjDi YSj9zilwrRVEKU7jWkmSZCUpSjqlSfxyOQQ82/JxyZdq/qEM1nFmcnUmrWB8vB1+rScY2+ 21VAb/m6l75WxXY5usnyLDna1rZGYbtVcr5IOpYftZvMrOLuLlAbEToN3Bpf7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQkxFSKs5lEoCtTSOy1iQ11sKLwjijRpW2IqZ3c77VI=; b=ekcVMhH3ic2efEW8YennvNaIG9FMJuDze/zqM/HJp/HGCPdwtH0glYdX6zr5BdibfTh4eL pjO/j4GF0aRBVrTJgiB1La7cLd2v0h3kWGcWgPb8vPqecfjD8TvDVZzYVUexPb+4Ng/BRX GHaUYZM/6L6InbJNw30lnh+aJSf+vo3T+gBH6m0/g6D6PkRyISbgAtryGhdvIVhaEY+d05 KwRyCI35kablvk3XXo098rSiGx0cASsZl73DpRf8YrXQ6411XIgl55i2vdk3aDZEDa22px eFnfSTIxiB81me4Z1yHkM9VlHzdYG4k6toWigueUd96ugWqQdmbF67xqF8GAVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677587920; a=rsa-sha256; cv=none; b=KzQF8yW0DofgWenGJ1+AO9qYedmr+BJkIcOWeXy1fbG+ynchk0Jdry0Z4k54Eo2LAz/h8s mgNCR85O7R+a6LcrMkvFl3/g23ZewkiDS+BjtzC+wItSylxk4BZgKb8hAGaXdtv3FemD2C 0qkKvzImfdnR4jMsxkFC7+D7WkWz6OIr/rFnphNuN3s18TM0jDkYAWbo2DOu75CVbJR7Y+ TctF7IYSuTfzNsrZr6idx4OsJQqTp+z4eboYsO+pQSLfQFmp2wbm+8un5CrHuWRLIlzLF9 p2RRHwLWPbBvLxqqRKBXa6lfkbZuqKGouSu3Il8T98EGpkRGZdUxZ3yK7V0ptg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQxk85tmxz16dJ; Tue, 28 Feb 2023 12:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31SCcesi043106; Tue, 28 Feb 2023 12:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SCce3V043105; Tue, 28 Feb 2023 12:38:40 GMT (envelope-from git) Date: Tue, 28 Feb 2023 12:38:40 GMT Message-Id: <202302281238.31SCce3V043105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 9ff3e8b7f090 - main - bhyve: fix resume for vms with guest_ncpus > 1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ff3e8b7f09034202ad1f24f4fbbe52cf7f56117 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=9ff3e8b7f09034202ad1f24f4fbbe52cf7f56117 commit 9ff3e8b7f09034202ad1f24f4fbbe52cf7f56117 Author: Vitaliy Gusev AuthorDate: 2023-02-28 10:28:40 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 12:37:58 +0000 bhyve: fix resume for vms with guest_ncpus > 1 This error occurs because vm->vcpu[1] has not been allocated yet when vm_snapshot_vm() is called. To fix this, move spinup_vcpu() before restore code. Reviewed by: corvink, markj MFC after: 2 weeks Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38477 --- usr.sbin/bhyve/bhyverun.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index caa284a8dd63..3ff83f55474b 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -552,7 +552,7 @@ fbsdrun_start_thread(void *param) } static void -fbsdrun_addcpu(struct vmctx *ctx, int newcpu, bool suspend) +fbsdrun_addcpu(struct vmctx *ctx, int newcpu) { int error; @@ -562,8 +562,7 @@ fbsdrun_addcpu(struct vmctx *ctx, int newcpu, bool suspend) CPU_SET_ATOMIC(newcpu, &cpumask); - if (suspend) - vm_suspend_cpu(ctx, newcpu); + vm_suspend_cpu(ctx, newcpu); mt_vmm_info[newcpu].mt_ctx = ctx; mt_vmm_info[newcpu].mt_vcpu = newcpu; @@ -1138,7 +1137,7 @@ do_open(const char *vmname) } static void -spinup_vcpu(struct vmctx *ctx, int vcpu, bool suspend) +spinup_vcpu(struct vmctx *ctx, int vcpu) { int error; @@ -1154,7 +1153,7 @@ spinup_vcpu(struct vmctx *ctx, int vcpu, bool suspend) assert(error == 0); } - fbsdrun_addcpu(ctx, vcpu, suspend); + fbsdrun_addcpu(ctx, vcpu); } static bool @@ -1488,6 +1487,16 @@ main(int argc, char *argv[]) assert(error == 0); } + /* Allocate per-VCPU resources. */ + mt_vmm_info = calloc(guest_ncpus, sizeof(*mt_vmm_info)); + + /* + * Add all vCPUs. + */ + for (int vcpu = 0; vcpu < guest_ncpus; vcpu++) { + spinup_vcpu(ctx, vcpu); + } + #ifdef BHYVE_SNAPSHOT if (restore_file != NULL) { fprintf(stdout, "Pausing pci devs...\r\n"); @@ -1564,9 +1573,6 @@ main(int argc, char *argv[]) #endif #ifdef BHYVE_SNAPSHOT - if (restore_file != NULL) - destroy_restore_state(&rstate); - /* initialize mutex/cond variables */ init_snapshot(); @@ -1576,24 +1582,18 @@ main(int argc, char *argv[]) if (init_checkpoint_thread(ctx) < 0) printf("Failed to start checkpoint thread!\r\n"); - if (restore_file != NULL) + if (restore_file != NULL) { + destroy_restore_state(&rstate); vm_restore_time(ctx); -#endif - - /* Allocate per-VCPU resources. */ - mt_vmm_info = calloc(guest_ncpus, sizeof(*mt_vmm_info)); - /* - * Add all vCPUs. - */ - for (int vcpu = 0; vcpu < guest_ncpus; vcpu++) { - bool suspend = (vcpu != BSP); -#ifdef BHYVE_SNAPSHOT - if (restore_file != NULL) - suspend = false; -#endif - spinup_vcpu(ctx, vcpu, suspend); + for (int i = 0; i < guest_ncpus; i++) { + if (i == BSP) + continue; + vm_resume_cpu(ctx, i); + } } +#endif + vm_resume_cpu(ctx, BSP); /* * Head off to the main event dispatch loop