svn commit: r308436 - stable/10/sys/amd64/vmm/amd

[Andriy Gapon]

Author: avg
Date: Tue Nov  8 07:18:39 2016
New Revision: 308436
URL: https://svnweb.freebsd.org/changeset/base/308436

Log:
  MFC r307903,307904,308039,308050: vmm/svm: iopm_bitmap and msr_bitmap
  must be contiguous in physical memory

Modified:
  stable/10/sys/amd64/vmm/amd/svm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/vmm/amd/svm.c
==============================================================================
--- stable/10/sys/amd64/vmm/amd/svm.c   Tue Nov  8 07:18:33 2016        
(r308435)
+++ stable/10/sys/amd64/vmm/amd/svm.c   Tue Nov  8 07:18:39 2016        
(r308436)
@@ -515,10 +515,11 @@ svm_vminit(struct vm *vm, pmap_t pmap)
 {
        struct svm_softc *svm_sc;
        struct svm_vcpu *vcpu;
-       vm_paddr_t msrpm_pa, iopm_pa, pml4_pa;  
+       vm_paddr_t msrpm_pa, iopm_pa, pml4_pa;
        int i;
 
-       svm_sc = malloc(sizeof (struct svm_softc), M_SVM, M_WAITOK | M_ZERO);
+       svm_sc = contigmalloc(sizeof (*svm_sc), M_SVM, M_WAITOK | M_ZERO,
+           0, ~(vm_paddr_t)0, PAGE_SIZE, 0);
        svm_sc->vm = vm;
        svm_sc->nptp = (vm_offset_t)vtophys(pmap->pm_pml4);
 
@@ -535,7 +536,7 @@ svm_vminit(struct vm *vm, pmap_t pmap)
        svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_GSBASE);
        svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_FSBASE);
        svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_KGSBASE);
-       
+
        svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_STAR);
        svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_LSTAR);
        svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_CSTAR);
@@ -2043,7 +2044,7 @@ svm_vmcleanup(void *arg)
 {
        struct svm_softc *sc = arg;
 
-       free(sc, M_SVM);
+       contigfree(sc, sizeof (*sc), M_SVM);
 }
 
 static register_t *
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"