From nobody Thu Jun 30 23:14:51 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 C7E40878832; Thu, 30 Jun 2022 23:14:51 +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 4LYvLM5BKxz3kpC; Thu, 30 Jun 2022 23:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656630891; 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=5c/+bZS2oxC7SgggmG/KYnqK96vsmsLY6R8+zK/UDuY=; b=dvK3llF9FPNAnFLB7tIuCKpTpTfPm/EedZuTEbzPnlJgJF27NHURaBkoJJCHbgMKdxNEIw RRFDFi0xCCVqC8LXxeYFObyUa9sxyDtGoJIhXW1rsxeKDH8okXBhF9/e5kNx14Fp4cCfb+ 2byQd3i6OwVGhPqElm6acKfeb4j4oAU1NXxeRjRTyKDOxk1jskg7ZzgEkhhjdzzPz0guvj 506J1C0t62jsUOwMfbPJe/rJcnTNm/mCavAAT+LBhBRPPWoclSSgVuK7eX6bWPD1CGLl7v Pku2t/bs3IEDwPSNJza08jtxydkjg2TqetOMo+2LUI51MeHc0DyYbP7q5RqQ6Q== 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 920D87F16; Thu, 30 Jun 2022 23:14:51 +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 25UNEpQS085704; Thu, 30 Jun 2022 23:14:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UNEpPC085703; Thu, 30 Jun 2022 23:14:51 GMT (envelope-from git) Date: Thu, 30 Jun 2022 23:14:51 GMT Message-Id: <202206302314.25UNEpPC085703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9aa02d5120ab - main - vmm: Fix snapshots for AMD CPUs 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9aa02d5120ab02bcbbc16fddb63e575df4ed6f61 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656630891; 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=5c/+bZS2oxC7SgggmG/KYnqK96vsmsLY6R8+zK/UDuY=; b=DcovH0q2cRjT8Jx7aRpaASjSsdbPE2e9TbNXb1IdIzOEA29/QZ6E38ftDRvHPaUZuwLWEy cIWpLZyz5bTHXsw/Y8t2E8/tW+Xp9t98vC2EgvZDb1IzgrQP7oi9l2lwVIt0Edi5Zyu23b 0Zo1s/G0hTq/SpUsxpJJssPh/po0OdVYEAGwCT9a5w+ZkDHZ67xr2cb/dFIzOU6PNFsPEe x9sH5Qtaop2tw9O0tnHDU9c4ZOJ8ry56l93qSnMNRV2eDr3zoMirZQ0pKpB6aSynDUPfCu QS4NT4h3zUw9ggRvtutNr2U0yCSndx5ouUUmMHkuCEuMuGLef8ia3aG5i3adrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656630891; a=rsa-sha256; cv=none; b=EzaXSskCyA+YASTFOekWW2PP+VsVknhbN1QmVWHfrwZcbBRG1fm5Effs3TZljcg34DBjRS C55HGSRfFN8JIG44GTxyJlLQnDelC5MjgSq7QPc/WYqpWkZETDb24+ymgKCfqgb3FBm/Ls fwaMe83v+U/ThMm96WBrCgvsBuW+HcVejXWAaJtWOM0e3dq2E8dGB7mNGcswsup+wvP9qJ ISBRuchhj0A38A7UUR3kG/l58mbMgNjrdK4FndIH8bpV0CbyzlE7k97fCE38M1Yh4vHwBr 1n8UMhrQOoeX5vpwfgLBrjiXDuC/g033LZT0/sCJMZqt1CZxUDNwbciSvMTNLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9aa02d5120ab02bcbbc16fddb63e575df4ed6f61 commit 9aa02d5120ab02bcbbc16fddb63e575df4ed6f61 Author: Mihai Burcea AuthorDate: 2022-06-30 23:11:17 +0000 Commit: John Baldwin CommitDate: 2022-06-30 23:13:55 +0000 vmm: Fix snapshots for AMD CPUs This patch fixes the AMD implementation for snapshotting. It removes unnecessary vmcb fields that should not be saved and duplicates. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D33431 --- sys/amd64/vmm/amd/svm.c | 146 +++++++++++++++-------------------------------- sys/amd64/vmm/amd/vmcb.c | 1 + sys/amd64/vmm/amd/vmcb.h | 15 +++++ 3 files changed, 62 insertions(+), 100 deletions(-) diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index a00494c98021..91e747774b24 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -2412,8 +2412,6 @@ svm_snapshot(void *arg, struct vm_snapshot_meta *meta) /* struct svm_softc is AMD's representation for SVM softc */ struct svm_softc *sc; struct svm_vcpu *vcpu; - struct vmcb *vmcb; - uint64_t val; int i; int ret; @@ -2421,78 +2419,8 @@ svm_snapshot(void *arg, struct vm_snapshot_meta *meta) KASSERT(sc != NULL, ("%s: arg was NULL", __func__)); - SNAPSHOT_VAR_OR_LEAVE(sc->nptp, meta, ret, done); - for (i = 0; i < VM_MAXCPU; i++) { vcpu = &sc->vcpu[i]; - vmcb = &vcpu->vmcb; - - /* VMCB fields for virtual cpu i */ - SNAPSHOT_VAR_OR_LEAVE(vmcb->ctrl.v_tpr, meta, ret, done); - val = vmcb->ctrl.v_tpr; - SNAPSHOT_VAR_OR_LEAVE(val, meta, ret, done); - vmcb->ctrl.v_tpr = val; - - SNAPSHOT_VAR_OR_LEAVE(vmcb->ctrl.asid, meta, ret, done); - val = vmcb->ctrl.np_enable; - SNAPSHOT_VAR_OR_LEAVE(val, meta, ret, done); - vmcb->ctrl.np_enable = val; - - val = vmcb->ctrl.intr_shadow; - SNAPSHOT_VAR_OR_LEAVE(val, meta, ret, done); - vmcb->ctrl.intr_shadow = val; - SNAPSHOT_VAR_OR_LEAVE(vmcb->ctrl.tlb_ctrl, meta, ret, done); - - SNAPSHOT_BUF_OR_LEAVE(vmcb->state.pad1, - sizeof(vmcb->state.pad1), - meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.cpl, meta, ret, done); - SNAPSHOT_BUF_OR_LEAVE(vmcb->state.pad2, - sizeof(vmcb->state.pad2), - meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.efer, meta, ret, done); - SNAPSHOT_BUF_OR_LEAVE(vmcb->state.pad3, - sizeof(vmcb->state.pad3), - meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.cr4, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.cr3, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.cr0, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.dr7, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.dr6, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.rflags, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.rip, meta, ret, done); - SNAPSHOT_BUF_OR_LEAVE(vmcb->state.pad4, - sizeof(vmcb->state.pad4), - meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.rsp, meta, ret, done); - SNAPSHOT_BUF_OR_LEAVE(vmcb->state.pad5, - sizeof(vmcb->state.pad5), - meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.rax, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.star, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.lstar, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.cstar, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.sfmask, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.kernelgsbase, - meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.sysenter_cs, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.sysenter_esp, - meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.sysenter_eip, - meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.cr2, meta, ret, done); - SNAPSHOT_BUF_OR_LEAVE(vmcb->state.pad6, - sizeof(vmcb->state.pad6), - meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.g_pat, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.dbgctl, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.br_from, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.br_to, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.int_from, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vmcb->state.int_to, meta, ret, done); - SNAPSHOT_BUF_OR_LEAVE(vmcb->state.pad7, - sizeof(vmcb->state.pad7), - meta, ret, done); /* Snapshot swctx for virtual cpu i */ SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_rbp, meta, ret, done); @@ -2514,15 +2442,6 @@ svm_snapshot(void *arg, struct vm_snapshot_meta *meta) SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_dr2, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_dr3, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.host_dr0, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.host_dr1, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.host_dr2, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.host_dr3, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.host_dr6, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.host_dr7, meta, ret, done); - SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.host_debugctl, meta, ret, - done); - /* Restore other svm_vcpu struct fields */ /* Restore NEXTRIP field */ @@ -2532,7 +2451,7 @@ svm_snapshot(void *arg, struct vm_snapshot_meta *meta) SNAPSHOT_VAR_OR_LEAVE(vcpu->lastcpu, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->dirty, meta, ret, done); - /* Restore EPTGEN field - EPT is Extended Page Tabel */ + /* Restore EPTGEN field - EPT is Extended Page Table */ SNAPSHOT_VAR_OR_LEAVE(vcpu->eptgen, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->asid.gen, meta, ret, done); @@ -2581,6 +2500,7 @@ svm_vmcx_snapshot(void *arg, struct vm_snapshot_meta *meta, int vcpu) err += svm_snapshot_reg(sc, vcpu, VM_REG_GUEST_CR3, meta); err += svm_snapshot_reg(sc, vcpu, VM_REG_GUEST_CR4, meta); + err += svm_snapshot_reg(sc, vcpu, VM_REG_GUEST_DR6, meta); err += svm_snapshot_reg(sc, vcpu, VM_REG_GUEST_DR7, meta); err += svm_snapshot_reg(sc, vcpu, VM_REG_GUEST_RAX, meta); @@ -2630,15 +2550,7 @@ svm_vmcx_snapshot(void *arg, struct vm_snapshot_meta *meta, int vcpu) err += vmcb_snapshot_desc(sc, vcpu, VM_REG_GUEST_GDTR, meta); /* Specific AMD registers */ - err += vmcb_snapshot_any(sc, vcpu, - VMCB_ACCESS(VMCB_OFF_SYSENTER_CS, 8), meta); - err += vmcb_snapshot_any(sc, vcpu, - VMCB_ACCESS(VMCB_OFF_SYSENTER_ESP, 8), meta); - err += vmcb_snapshot_any(sc, vcpu, - VMCB_ACCESS(VMCB_OFF_SYSENTER_EIP, 8), meta); - - err += vmcb_snapshot_any(sc, vcpu, - VMCB_ACCESS(VMCB_OFF_NPT_BASE, 8), meta); + err += svm_snapshot_reg(sc, vcpu, VM_REG_GUEST_INTR_SHADOW, meta); err += vmcb_snapshot_any(sc, vcpu, VMCB_ACCESS(VMCB_OFF_CR_INTERCEPT, 4), meta); @@ -2651,9 +2563,22 @@ svm_vmcx_snapshot(void *arg, struct vm_snapshot_meta *meta, int vcpu) err += vmcb_snapshot_any(sc, vcpu, VMCB_ACCESS(VMCB_OFF_INST2_INTERCEPT, 4), meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_PAUSE_FILTHRESH, 2), meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_PAUSE_FILCNT, 2), meta); + + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_ASID, 4), meta); + err += vmcb_snapshot_any(sc, vcpu, VMCB_ACCESS(VMCB_OFF_TLB_CTRL, 4), meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_VIRQ, 8), meta); + + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_EXIT_REASON, 8), meta); err += vmcb_snapshot_any(sc, vcpu, VMCB_ACCESS(VMCB_OFF_EXITINFO1, 8), meta); err += vmcb_snapshot_any(sc, vcpu, @@ -2662,10 +2587,7 @@ svm_vmcx_snapshot(void *arg, struct vm_snapshot_meta *meta, int vcpu) VMCB_ACCESS(VMCB_OFF_EXITINTINFO, 8), meta); err += vmcb_snapshot_any(sc, vcpu, - VMCB_ACCESS(VMCB_OFF_VIRQ, 8), meta); - - err += vmcb_snapshot_any(sc, vcpu, - VMCB_ACCESS(VMCB_OFF_GUEST_PAT, 8), meta); + VMCB_ACCESS(VMCB_OFF_NP_ENABLE, 1), meta); err += vmcb_snapshot_any(sc, vcpu, VMCB_ACCESS(VMCB_OFF_AVIC_BAR, 8), meta); @@ -2677,17 +2599,41 @@ svm_vmcx_snapshot(void *arg, struct vm_snapshot_meta *meta, int vcpu) VMCB_ACCESS(VMCB_OFF_AVIC_PT, 8), meta); err += vmcb_snapshot_any(sc, vcpu, - VMCB_ACCESS(VMCB_OFF_IO_PERM, 8), meta); + VMCB_ACCESS(VMCB_OFF_CPL, 1), meta); + + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_STAR, 8), meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_LSTAR, 8), meta); err += vmcb_snapshot_any(sc, vcpu, - VMCB_ACCESS(VMCB_OFF_MSR_PERM, 8), meta); + VMCB_ACCESS(VMCB_OFF_CSTAR, 8), meta); err += vmcb_snapshot_any(sc, vcpu, - VMCB_ACCESS(VMCB_OFF_ASID, 4), meta); + VMCB_ACCESS(VMCB_OFF_SFMASK, 8), meta); err += vmcb_snapshot_any(sc, vcpu, - VMCB_ACCESS(VMCB_OFF_EXIT_REASON, 8), meta); + VMCB_ACCESS(VMCB_OFF_KERNELGBASE, 8), meta); - err += svm_snapshot_reg(sc, vcpu, VM_REG_GUEST_INTR_SHADOW, meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_SYSENTER_CS, 8), meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_SYSENTER_ESP, 8), meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_SYSENTER_EIP, 8), meta); + + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_GUEST_PAT, 8), meta); + + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_DBGCTL, 8), meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_BR_FROM, 8), meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_BR_TO, 8), meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_INT_FROM, 8), meta); + err += vmcb_snapshot_any(sc, vcpu, + VMCB_ACCESS(VMCB_OFF_INT_TO, 8), meta); return (err); } diff --git a/sys/amd64/vmm/amd/vmcb.c b/sys/amd64/vmm/amd/vmcb.c index bf4a6d004bcd..0341e4e6c07c 100644 --- a/sys/amd64/vmm/amd/vmcb.c +++ b/sys/amd64/vmm/amd/vmcb.c @@ -139,6 +139,7 @@ vmcb_access(struct svm_softc *softc, int vcpu, int write, int ident, case 8: case 4: case 2: + case 1: if (write) memcpy(ptr + off, val, bytes); else diff --git a/sys/amd64/vmm/amd/vmcb.h b/sys/amd64/vmm/amd/vmcb.h index 847e1f6ad476..084f4465cb49 100644 --- a/sys/amd64/vmm/amd/vmcb.h +++ b/sys/amd64/vmm/amd/vmcb.h @@ -187,6 +187,8 @@ #define VMCB_OFF_EXC_INTERCEPT VMCB_OFF_CTRL(0x8) #define VMCB_OFF_INST1_INTERCEPT VMCB_OFF_CTRL(0xC) #define VMCB_OFF_INST2_INTERCEPT VMCB_OFF_CTRL(0x10) +#define VMCB_OFF_PAUSE_FILTHRESH VMCB_OFF_CTRL(0x3C) +#define VMCB_OFF_PAUSE_FILCNT VMCB_OFF_CTRL(0x3E) #define VMCB_OFF_IO_PERM VMCB_OFF_CTRL(0x40) #define VMCB_OFF_MSR_PERM VMCB_OFF_CTRL(0x48) #define VMCB_OFF_TSC_OFFSET VMCB_OFF_CTRL(0x50) @@ -197,15 +199,28 @@ #define VMCB_OFF_EXITINFO1 VMCB_OFF_CTRL(0x78) #define VMCB_OFF_EXITINFO2 VMCB_OFF_CTRL(0x80) #define VMCB_OFF_EXITINTINFO VMCB_OFF_CTRL(0x88) +#define VMCB_OFF_NP_ENABLE VMCB_OFF_CTRL(0x90) #define VMCB_OFF_AVIC_BAR VMCB_OFF_CTRL(0x98) #define VMCB_OFF_NPT_BASE VMCB_OFF_CTRL(0xB0) #define VMCB_OFF_AVIC_PAGE VMCB_OFF_CTRL(0xE0) #define VMCB_OFF_AVIC_LT VMCB_OFF_CTRL(0xF0) #define VMCB_OFF_AVIC_PT VMCB_OFF_CTRL(0xF8) + +#define VMCB_OFF_CPL VMCB_OFF_STATE(0xCB) +#define VMCB_OFF_STAR VMCB_OFF_STATE(0x200) +#define VMCB_OFF_LSTAR VMCB_OFF_STATE(0x208) +#define VMCB_OFF_CSTAR VMCB_OFF_STATE(0x210) +#define VMCB_OFF_SFMASK VMCB_OFF_STATE(0x218) +#define VMCB_OFF_KERNELGBASE VMCB_OFF_STATE(0x220) #define VMCB_OFF_SYSENTER_CS VMCB_OFF_STATE(0x228) #define VMCB_OFF_SYSENTER_ESP VMCB_OFF_STATE(0x230) #define VMCB_OFF_SYSENTER_EIP VMCB_OFF_STATE(0x238) #define VMCB_OFF_GUEST_PAT VMCB_OFF_STATE(0x268) +#define VMCB_OFF_DBGCTL VMCB_OFF_STATE(0x270) +#define VMCB_OFF_BR_FROM VMCB_OFF_STATE(0x278) +#define VMCB_OFF_BR_TO VMCB_OFF_STATE(0x280) +#define VMCB_OFF_INT_FROM VMCB_OFF_STATE(0x288) +#define VMCB_OFF_INT_TO VMCB_OFF_STATE(0x290) /* * Encode the VMCB offset and bytes that we want to read from VMCB.