From nobody Wed Jul 27 16:21:27 2022 X-Original-To: dev-commits-src-main@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 4LtJtw0Vl4z4Wymk; Wed, 27 Jul 2022 16:21:28 +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 4LtJtv73Dfz3xYF; Wed, 27 Jul 2022 16:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658938888; 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=kpncpf/bTXsmZJ8OxRLti48XYcaDCm01W25hFe1ONN8=; b=pHK8N3OTUDxuh45nvNnPq08kTcNrUvU4Hy2a3sB0ms368/xvPgicl0NhY/9/lWLNTApmSE 7qUAeEQSsOUDQLrzoq5jiqUFaPzO9DIy+favPriu605nprTQsG2lrf+e8cQJuCZFff4I+N FFFNglIRX7Lb6g5Xy4cs5YgfJ+p5m0fx+4jWgsf2Tm0Bpex8c9dc96sLKjF05UanEN1ePJ nJQfuRwqA52okJTdmPihZucezfFsl5dWm9BTUdzqhGls8u6UhTReJfbIMGrDQILTRgtnd6 xv7RZnG7Yqz4m86uZM1IJDeo+ok/6UX3pg/zVXtfxY8b02f0UqQFstAAFRr4oA== 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 4LtJtv68MKzNWJ; Wed, 27 Jul 2022 16:21:27 +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 26RGLR1S027107; Wed, 27 Jul 2022 16:21:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RGLR7b027106; Wed, 27 Jul 2022 16:21:27 GMT (envelope-from git) Date: Wed, 27 Jul 2022 16:21:27 GMT Message-Id: <202207271621.26RGLR7b027106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 56b8f5b11171 - main - bhyve: Initialize more registers in vcpu_reset() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56b8f5b11171375bf5da484577926b53ce56a3be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658938888; 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=kpncpf/bTXsmZJ8OxRLti48XYcaDCm01W25hFe1ONN8=; b=jBD69ScQlOUf4zuCcXqp9TSvDqXFd1VpnfxeUJaY+czpBSIXIC0AR2MHbDBpJ+foDRvOkF NFYJNyf7Ehqtv5u0QHOT0zZpToro6waevpTkbFX2u2088m7aMXZ6cP2AjIofUBtQyCXcg2 5qCcfQZd02zUiLCAiTYHhi8wwK3BTr/GsT806c4q2BH+Smn4C56nvwuZtl/9esB+tNxz0Q wvefVqcKg8JZ9C7HvNYMO3XndbtPdZ/JwAP0rfOSkEyTcNai/SogMMpNp0HPWFbSj1yS6f pYpf2qwGBeMRWm7zyAzSGLfzMe3dRP9mpvfHC1QGuFxjZ288q/eg3jjYlfTMHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658938888; a=rsa-sha256; cv=none; b=cQF3iZRd3TZtiLXu0Mypt1uuQW52RkjrYspLeVdvzBY+RL9RiMy2FegNEDZXC5BnSByfuC yrnhPsdls/+pJTew0yPfFriEPJjY/lGvYTs2qz9KQdyeA5Gm9dsuJtC971XGG3BShLQ9Og Q2buFS0Lri4J7Gu99UDH/ejfaQlGT0y1MopOrq82eni/rlQqA0qTM79EuoZV1JGwOJLhwB 6twfKftr8OR6/cVPvT3zy4qaeRu1Nidd0Xw64dxXKLuYNw+qyErWbSZPfq+6a4ca2AY9Mo G4CSkMeJ2MvMmHOGyE+f8iBV/sN1yJhJZ8J1UZx4NVbeWl8nK/skME0D5NGSTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=56b8f5b11171375bf5da484577926b53ce56a3be commit 56b8f5b11171375bf5da484577926b53ce56a3be Author: Corvin Köhne AuthorDate: 2022-07-27 14:41:02 +0000 Commit: Emmanuel Vadot CommitDate: 2022-07-27 16:20:47 +0000 bhyve: Initialize more registers in vcpu_reset() - Clear CR2, EFER, and R8-15 to zero. - Reset DR6 and DR7 to their documented reset values. - Reset interrupt shadow state. - Document the reason CR0 is reset to a value that doesn't match its documented value. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D35622 Sponsored by: Beckhoff Automation GmbH & Co. KG --- lib/libvmmapi/vmmapi.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c index 260c2a2439ff..62f1e0a766fb 100644 --- a/lib/libvmmapi/vmmapi.c +++ b/lib/libvmmapi/vmmapi.c @@ -1178,13 +1178,21 @@ vcpu_reset(struct vmctx *vmctx, int vcpu) if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_RIP, rip)) != 0) goto done; + /* + * According to Intels Software Developer Manual CR0 should be + * initialized with CR0_ET | CR0_NW | CR0_CD but that crashes some + * guests like Windows. + */ cr0 = CR0_NE; if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_CR0, cr0)) != 0) goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_CR2, zero)) != 0) + goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_CR3, zero)) != 0) goto done; - + cr4 = 0; if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_CR4, cr4)) != 0) goto done; @@ -1247,6 +1255,9 @@ vcpu_reset(struct vmctx *vmctx, int vcpu) if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_GS, sel)) != 0) goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_EFER, zero)) != 0) + goto done; + /* General purpose registers */ rdx = 0xf00; if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_RAX, zero)) != 0) @@ -1265,6 +1276,22 @@ vcpu_reset(struct vmctx *vmctx, int vcpu) goto done; if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_RSP, zero)) != 0) goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_R8, zero)) != 0) + goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_R9, zero)) != 0) + goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_R10, zero)) != 0) + goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_R11, zero)) != 0) + goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_R12, zero)) != 0) + goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_R13, zero)) != 0) + goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_R14, zero)) != 0) + goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_R15, zero)) != 0) + goto done; /* GDTR, IDTR */ desc_base = 0; @@ -1305,7 +1332,16 @@ vcpu_reset(struct vmctx *vmctx, int vcpu) if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_LDTR, 0)) != 0) goto done; - /* XXX cr2, debug registers */ + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_DR6, + 0xffff0ff0)) != 0) + goto done; + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_DR7, 0x400)) != + 0) + goto done; + + if ((error = vm_set_register(vmctx, vcpu, VM_REG_GUEST_INTR_SHADOW, + zero)) != 0) + goto done; error = 0; done: