d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vmm: another take at maximmum address passed to contigmalloc

Browse Source 
Just using vm_paddr_t value with all bits set.
That should work as long as the type is unsigned.

While there, fix a couple of whitespace issues nearby.

MFC after:	1 week
X-MFC with:	r307903
This commit is contained in:
Andriy Gapon 2016-10-28 14:38:01 +00:00
parent c371f1143c
commit 211029ce84
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/amd64/vmm/amd/svm.c
View File

@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <machine/vmm.h> #include <machine/vmm.h>
#include <machine/vmm_dev.h> #include <machine/vmm_dev.h>
#include <machine/vmm_instruction_emul.h> #include <machine/vmm_instruction_emul.h>
#include <machine/vmparam.h>
#include "vmm_lapic.h" #include "vmm_lapic.h"
#include "vmm_stat.h" #include "vmm_stat.h"
@ -515,11 +514,11 @@ svm_vminit(struct vm *vm, pmap_t pmap)
{ {
struct svm_softc *svm_sc; struct svm_softc *svm_sc;
struct svm_vcpu *vcpu; struct svm_vcpu *vcpu;
vm_paddr_t msrpm_pa, iopm_pa, pml4_pa; vm_paddr_t msrpm_pa, iopm_pa, pml4_pa
int i; int i;
svm_sc = contigmalloc(sizeof (*svm_sc), M_SVM, M_WAITOK | M_ZERO, svm_sc = contigmalloc(sizeof (*svm_sc), M_SVM, M_WAITOK | M_ZERO,
0, VM_MAX_ADDRESS, PAGE_SIZE, 0); 0, ~(vm_paddr_t)0, PAGE_SIZE, 0);
svm_sc->vm = vm; svm_sc->vm = vm;
svm_sc->nptp = (vm_offset_t)vtophys(pmap->pm_pml4); svm_sc->nptp = (vm_offset_t)vtophys(pmap->pm_pml4);
@ -536,7 +535,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_GSBASE);
svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_FSBASE); 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_KGSBASE);
svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_STAR); 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_LSTAR);
svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_CSTAR); svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_CSTAR);