From nobody Fri Dec 29 18:14:44 2023 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 4T1tnc3jKKz54tQb; Fri, 29 Dec 2023 18:14:44 +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 4T1tnc39Z9z3CG1; Fri, 29 Dec 2023 18:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703873684; 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=gJOaoOTSGRLkYtTKsDi4unVczCBctucvBmMaAixq3jw=; b=appw8sg77UHQHplO/XZLIfUkwX3lnVKdcUBbihy0qIcl8qjFk+KB9tzQCscNXa8zlL+wOe 1B0oS1aV++fNbVWUx3jj5vg7fM5BmDU8Afsos6DUvT05Z9LnAQWzOQDkImXhFkb4MmdMuB wq0LVziOSJqiiL9y6+vaEee49MMJq1itjq4k5C9Meku5465X1yO0aiMv8tNKNVdZjjoep0 CsMsfO9xhCzyP8shAoFML5GzzRUdAFV9qDdqRSOymdhQHLh47iBDwVrCxWNadP98b2gEhn 3qVOxfRpSR/kN4En0VW1umiKojckJg7E2Ghur44rGI325LMMRnjIl9Dxl0EPeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703873684; a=rsa-sha256; cv=none; b=rgOnVRw2rf4vrgVDzvlj8fQvN1hh62zvKxRTLzCrGX9aq7jY5Vqdbu8A0Oo3yfXN3eVa2H MtHbWCHKm4+ORAezsRluPx5XBHaneHtaXbgzWvfZ5udBlO4THLHQnFcqDl/Hnri6hdXh6/ 4sJ2e/eWuzy1QlbK+HKhQOzhwzENkkpIzsaTzHUNHZk2ivDjtYFssxJPc1tM7jHQdyCg59 ONcH5xETRLcxed3IkF1BPUVio0ZjThOOKB3Pmiypzm67DlERYZe/PbNOwU4wfBMA5j1rLU IQiw7ym1+h88BP+CJZXb7wg7M1LP/r4LooJCm9LiZMmSSVM+BO96HhHlUxVwxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703873684; 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=gJOaoOTSGRLkYtTKsDi4unVczCBctucvBmMaAixq3jw=; b=ns1K7idVRg0LkChN05xR4kXS6XPYoCnSDhzlJSxDvxVNnTq0FXbTPlepQG/dhjqf3r2MxB KTnT2QuxvgiDT7dr7UlQKa4R6LNaCm5wSoSFw0nlvwMPdZBJfzgceFXTLxuv5d8ukw013F pHuuqyTMX+DgMZbKEoo+WhfrZcXYBzJr3J2559wVA4TxX9K7qxeA7cX78fM1yGuHAYutep YLagXR2EkhAibXj6Fs9CNLWopVOQ/L4saihFZ/kYQ3Ezzfxm7l/aMMGAJ1A7fjkQ8oWCwg WffWyfEiBG1dMxhJm6+B0Ak5m7m8lJtt3E8C2XXP9mpHNkK00LRuUVlc9vVDdA== 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 4T1tnc2CYlz2Lv; Fri, 29 Dec 2023 18:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTIEiPn086072; Fri, 29 Dec 2023 18:14:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTIEi0g086069; Fri, 29 Dec 2023 18:14:44 GMT (envelope-from git) Date: Fri, 29 Dec 2023 18:14:44 GMT Message-Id: <202312291814.3BTIEi0g086069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 683ea4d22bbc - main - vmm: MTRR should be saved/restored 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: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 683ea4d22bbcc892ac7c5bb996d1b134831dfdc3 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=683ea4d22bbcc892ac7c5bb996d1b134831dfdc3 commit 683ea4d22bbcc892ac7c5bb996d1b134831dfdc3 Author: Vitaliy Gusev AuthorDate: 2023-12-29 18:03:20 +0000 Commit: Robert Wing CommitDate: 2023-12-29 18:03:20 +0000 vmm: MTRR should be saved/restored This fixes restoring a Linux VM if it was suspended while in the GRUB menu. Adding MTTR increases the kernel dump size by 256 bytes per vCPU. Sponsored by: vStack Reviewed by: markj, rew Differential Revision: https://reviews.freebsd.org/D43226 --- sys/amd64/vmm/amd/svm.c | 2 ++ sys/amd64/vmm/intel/vmx.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index 3fda9454090b..f1106158e44e 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -2781,6 +2781,8 @@ svm_vcpu_snapshot(void *vcpui, struct vm_snapshot_meta *meta) SNAPSHOT_VAR_OR_LEAVE(vcpu->asid.gen, meta, err, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->asid.num, meta, err, done); + SNAPSHOT_BUF_OR_LEAVE(&vcpu->mtrr, sizeof(vcpu->mtrr), meta, err, done); + /* Set all caches dirty */ if (meta->op == VM_SNAPSHOT_RESTORE) svm_set_dirty(vcpu, 0xffffffff); diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 317ed7e5d7fb..b7c1544ac0b3 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -4200,6 +4200,9 @@ vmx_vcpu_snapshot(void *vcpui, struct vm_snapshot_meta *meta) SNAPSHOT_BUF_OR_LEAVE(vcpu->pir_desc, sizeof(*vcpu->pir_desc), meta, err, done); + SNAPSHOT_BUF_OR_LEAVE(&vcpu->mtrr, + sizeof(vcpu->mtrr), meta, err, done); + vmxctx = &vcpu->ctx; SNAPSHOT_VAR_OR_LEAVE(vmxctx->guest_rdi, meta, err, done); SNAPSHOT_VAR_OR_LEAVE(vmxctx->guest_rsi, meta, err, done);