From nobody Fri Dec 9 13:18:57 2022 X-Original-To: dev-commits-src-branches@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 4NTBS16gRBz4kWgQ; Fri, 9 Dec 2022 13:18:57 +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 4NTBS164WDz427x; Fri, 9 Dec 2022 13:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670591937; 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=nNWVR+b2ArxinoROVxpSfoHdHPQrtvedi77dUPUGNS4=; b=aaxeyRo6XwvoMH+Hl4dBDs6e0xqmHr2BQPLVWWDSX2IFUbHmcM2OW4C5LjjTWC6RcoBIZn A+h8M1m60nLexiDQgkQiV8A2dj4F+7Utmimk5f60IiacA03enZSTBuSLO5zdcpr5nj76ub Z/kGrvOS+90nMB9VFVy1nQ90VHBqRuUmIx8tXkxbtplnCHaF6OX7vzGbjPJKL2VEhAWGmP F+cIQ9DlSP7GxcutmGqshCawEllFeOpVyg47d2vzRYhS21bIQZOopU4QWnAKSSYIrGEv+z 8yrTSARZrR6eC8FeBLQLr8fxThIolAhF005u3lIokqJYqUoOULM+/fx1vS45cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670591937; 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=nNWVR+b2ArxinoROVxpSfoHdHPQrtvedi77dUPUGNS4=; b=o1TKNVbfmlwDMlumSMSEIsOlM9M+i0m32zw5DzeK557enE7yHTdxNU3Mnw8+nKKsrfNCFr voedUFfxUFilxLQRtws9BEs+5pzStdkIGtz0voeRCb3gn4blZ9PImld8TXhmIeIiPB3rP4 hFQVQMd/mcXA96wnUmN70Z9EAQtswh1PSS0PbZrVzLbEi6Ziy7YAPa9Z6YkrIS9/w2Wyfv q1adw+oqOj6910AWh1+BL897BdtEPOOqLSujSa+9vt5xbdf9KQTBuKJHcVyxkRkavr1M4+ JkgEPaQF+hZKvK3KaHbECXEOOpqzPJdiL1XNOMXlk9VfcYp0B/XPeXL06X/oog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670591937; a=rsa-sha256; cv=none; b=HlK6O3Of3JM0ZtK6g1ECP/XA6y19dfJ5fjUzEvtnVVwzzjEkDeQjjDehyovtR2wVsic0RD jiJ13DgLw+UXp/s3l3L0txCF8HYqB/JS+E1/lHJ++gsv1XPsSUm9MQBCVhx+sQcqm1aLF9 2G9ZVj6iPji3hSV4Np0RGpagPM9DvyY/MjylyNj+y3IP4I0w7LHZx6tKX3xSlI/Y9eqAH6 K6CZclWbBkXJVJNG+ly+VGT4e6iWVpta0Ube/XRxk7lQ1/HC5JNbF2+mmS37l3FuCZCslA X0e/8bXGLmLULvitz0d47gaBkCrKDWaeMAfOsGz5Cn7zNxcMqeVJSqB5KkoY2Q== 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 4NTBS15Bfpzcx6; Fri, 9 Dec 2022 13:18:57 +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 2B9DIvXj072709; Fri, 9 Dec 2022 13:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9DIvOT072708; Fri, 9 Dec 2022 13:18:57 GMT (envelope-from git) Date: Fri, 9 Dec 2022 13:18:57 GMT Message-Id: <202212091318.2B9DIvOT072708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: a46eccfd27c3 - stable/13 - bhyve: Initialize more registers in vcpu_reset() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: a46eccfd27c35affdb1e48b28e3f6ccd35001592 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=a46eccfd27c35affdb1e48b28e3f6ccd35001592 commit a46eccfd27c35affdb1e48b28e3f6ccd35001592 Author: Corvin Köhne AuthorDate: 2022-07-27 14:41:02 +0000 Commit: Corvin Köhne CommitDate: 2022-12-09 13:18:03 +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 (cherry picked from commit 56b8f5b11171375bf5da484577926b53ce56a3be) --- 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 4e4393d81961..f6d83dd0e08f 100644 --- a/lib/libvmmapi/vmmapi.c +++ b/lib/libvmmapi/vmmapi.c @@ -1174,13 +1174,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; @@ -1243,6 +1251,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) @@ -1261,6 +1272,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; @@ -1301,7 +1328,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: