Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177744244
D61733.1795183326.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None
D61733.1795183326.diff
View Options
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -4172,6 +4172,7 @@
struct vmx *vmx;
struct vmx_vcpu *vcpu;
struct vmxctx *vmxctx;
+ uint64_t guest_msrs[GUEST_MSR_NUM];
int err, run, hostcpu;
err = 0;
@@ -4241,8 +4242,13 @@
if (err != 0)
goto done;
- SNAPSHOT_BUF_OR_LEAVE(vcpu->guest_msrs,
- sizeof(vcpu->guest_msrs), meta, err, done);
+ memcpy(guest_msrs, vcpu->guest_msrs, sizeof(guest_msrs));
+ SNAPSHOT_BUF_OR_LEAVE(guest_msrs, sizeof(guest_msrs), meta, err, done);
+ if (meta->op == VM_SNAPSHOT_RESTORE) {
+ err = vmx_msr_guest_restore(vcpu, guest_msrs);
+ if (err != 0)
+ goto done;
+ }
SNAPSHOT_BUF_OR_LEAVE(vcpu->pir_desc,
sizeof(*vcpu->pir_desc), meta, err, done);
diff --git a/sys/amd64/vmm/intel/vmx_msr.h b/sys/amd64/vmm/intel/vmx_msr.h
--- a/sys/amd64/vmm/intel/vmx_msr.h
+++ b/sys/amd64/vmm/intel/vmx_msr.h
@@ -37,6 +37,9 @@
void vmx_msr_guest_enter(struct vmx_vcpu *vcpu);
void vmx_msr_guest_exit(struct vmx_vcpu *vcpu);
void vmx_msr_guest_exit_tsc_aux(struct vmx *vmx, struct vmx_vcpu *vcpu);
+#ifdef BHYVE_SNAPSHOT
+int vmx_msr_guest_restore(struct vmx_vcpu *vcpu, const uint64_t *msrs);
+#endif
int vmx_rdmsr(struct vmx_vcpu *vcpu, u_int num, uint64_t *val, bool *retu);
int vmx_wrmsr(struct vmx_vcpu *vcpu, u_int num, uint64_t val, bool *retu);
diff --git a/sys/amd64/vmm/intel/vmx_msr.c b/sys/amd64/vmm/intel/vmx_msr.c
--- a/sys/amd64/vmm/intel/vmx_msr.c
+++ b/sys/amd64/vmm/intel/vmx_msr.c
@@ -26,6 +26,8 @@
* SUCH DAMAGE.
*/
+#include "opt_bhyve_snapshot.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
@@ -398,6 +400,41 @@
wrmsr(MSR_TSC_AUX, host_aux);
}
+#ifdef BHYVE_SNAPSHOT
+static bool
+canonical_addr(uint64_t addr)
+{
+ uint64_t mask;
+
+ /*
+ * WRMSR checks an address against the widest linear address that the
+ * CPU supports, whether or not 5-level paging is in use.
+ */
+ mask = ~0UL <<
+ ((cpu_stdext_feature2 & CPUID_STDEXT2_LA57) != 0 ? 56 : 47);
+ return ((addr & mask) == 0 || (addr & mask) == mask);
+}
+
+/*
+ * Install guest MSR values supplied by userspace. The values are later
+ * written to the host's MSRs, so reject any for which WRMSR would raise #GP.
+ * STAR and SF_MASK accept all values.
+ */
+int
+vmx_msr_guest_restore(struct vmx_vcpu *vcpu, const uint64_t *msrs)
+{
+ if (!canonical_addr(msrs[IDX_MSR_LSTAR]) ||
+ !canonical_addr(msrs[IDX_MSR_CSTAR]) ||
+ !canonical_addr(msrs[IDX_MSR_KGSBASE]) ||
+ !pat_valid(msrs[IDX_MSR_PAT]) ||
+ (msrs[IDX_MSR_TSC_AUX] >> 32) != 0)
+ return (EINVAL);
+
+ memcpy(vcpu->guest_msrs, msrs, sizeof(vcpu->guest_msrs));
+ return (0);
+}
+#endif
+
int
vmx_rdmsr(struct vmx_vcpu *vcpu, u_int num, uint64_t *val, bool *retu)
{
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 20, 2:02 PM (20 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41857185
Default Alt Text
D61733.1795183326.diff (2 KB)
Attached To
Mode
D61733: amd64/vmm: Validate guest MSRs restored from a snapshot
Attached
Detach File
Event Timeline