Implement NVMM_GPA_MAP ioctl

Author: dalmemail

src/add-ons/kernel/drivers/nvmm/Jamfile

@@ -9,6 +9,9 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) x86 ] ;
 SubDirCcFlags [ FDefines _KERNEL=1 ] ;
 SubDirC++Flags [ FDefines _KERNEL=1 ] ;
 
+# Needed to include X86GPAtoHPATranslationMap
+UseHeaders [ FDirName $(HAIKU_TOP) src system kernel arch x86 ] : true ;
+
 KernelAddon nvmm :
 	nvmm.c
 	nvmm_haiku.cpp

src/add-ons/kernel/drivers/nvmm/nvmm.c

@@ -840,7 +840,6 @@ nvmm_hva_unmap(struct nvmm_owner *owner, struct nvmm_ioc_hva_unmap *args)
 
 /* -------------------------------------------------------------------------- */
 
-#if 0
 static int
 nvmm_gpa_map(struct nvmm_owner *owner, struct nvmm_ioc_gpa_map *args)
 {
@@ -896,16 +895,25 @@ nvmm_gpa_map(struct nvmm_owner *owner, struct nvmm_ioc_gpa_map *args)
 		goto out;
 	}
 
+#if defined(__HAIKU__)
+	os_vmmap_t *vm_map = os_vmspace_get_vmmap(mach->vm);
+	/* Map the vmobj into the machine address space, as pageable. */
+	error = os_vmobj_map(vm_map, &gpa, args->size, vmobj, off,
+	    false /* !wired */, true /* fixed */, false /* !shared */,
+	    args->prot, PROT_READ | PROT_WRITE | PROT_EXEC);
+#else
 	/* Map the vmobj into the machine address space, as pageable. */
 	error = os_vmobj_map(&mach->vm->vm_map, &gpa, args->size, vmobj, off,
 	    false /* !wired */, true /* fixed */, false /* !shared */,
 	    args->prot, PROT_READ | PROT_WRITE | PROT_EXEC);
+#endif
 
 out:
 	nvmm_machine_put(mach);
 	return error;
 }
 
+#if 0
 static int
 nvmm_gpa_unmap(struct nvmm_owner *owner, struct nvmm_ioc_gpa_unmap *args)
 {
@@ -1087,9 +1095,9 @@ nvmm_ioctl(struct nvmm_owner *owner, unsigned long cmd, void *data)
 	case NVMM_IOC_VCPU_INJECT:
 		return nvmm_vcpu_inject(owner, data);
 	case NVMM_IOC_VCPU_RUN:
-		return nvmm_vcpu_run(owner, data);
+		return nvmm_vcpu_run(owner, data);*/
 	case NVMM_IOC_GPA_MAP:
-		return nvmm_gpa_map(owner, data);
+		return nvmm_gpa_map(owner, data);/*
 	case NVMM_IOC_GPA_UNMAP:
 		return nvmm_gpa_unmap(owner, data);*/
 	case NVMM_IOC_HVA_MAP:

src/add-ons/kernel/drivers/nvmm/nvmm_haiku.cpp

@@ -28,6 +28,8 @@ extern "C" {
 #include <vm/VMCache.h>
 #include <vm/VMAddressSpace.h>
 
+#include <paging/64bit/X86GPAtoHPATranslationMap.h>
+
 #define __unused __attribute__ ((unused))
 
 
@@ -132,7 +134,10 @@ extern "C" struct haiku_vmobj {
 
 // aka os_vmspace_t
 extern "C" struct haiku_vmspace {
-	VMCache *cache;
+	VMAddressSpace *address_space;
+	// this holds exactly the same as address_space (duplicated)
+	// but os_vmobj_map expects an os_vmmap_t*
+	os_vmmap_t *vm_map;
 	struct pmap pmap;
 };
 
@@ -215,23 +220,22 @@ os_vmspace_create(vaddr_t vmin, vaddr_t vmax)
 	if (ret == NULL)
 		return NULL;
 
-	status_t status = VMCacheFactory::CreateAnonymousCache(ret->cache, false,
-				0, 0, true, 0);
-	if (status != B_OK) {
-		os_mem_free(ret, sizeof(os_vmobj_t));
+	ret->vm_map = (os_vmmap_t *)os_mem_alloc(sizeof(os_vmmap_t));
+	if (ret->vm_map == NULL) {
+		os_mem_free(ret, sizeof(os_vmspace_t));
 		return NULL;
 	}
 
-	ret->pmap.pm_invgen = 0;
-
-	// PML4 must be 512 entries of 8 bytes each
-	STATIC_ASSERT(PAGE_SIZE == 4096);
-	status = os_contigpa_zalloc(&ret->pmap.pm_pml4pa, (vaddr_t *)&ret->pmap.pm_pml4, 1);
+	size_t size = vmax - vmin + 1;
+	status_t status = VMAddressSpace::Create(0, vmin, size, false, true, &ret->address_space);
 	if (status != B_OK) {
-		ret->cache->Delete();
-		os_mem_free(ret, sizeof(os_vmobj_t));
+		os_mem_free(ret->vm_map, sizeof(os_vmmap_t));
+		os_mem_free(ret, sizeof(os_vmspace_t));
 		return NULL;
 	}
+	ret->vm_map->address_space = ret->address_space;
+
+	ret->pmap.pm_invgen = 0;
 
 	return ret;
 }
@@ -241,20 +245,18 @@ extern "C"
 void
 os_vmspace_destroy(os_vmspace_t *vm)
 {
-	if (vm) {
-		vm->cache->Delete();
-		os_contigpa_free(vm->pmap.pm_pml4pa, (vaddr_t)vm->pmap.pm_pml4, 1);
-		os_mem_free(vm, sizeof(os_vmspace_t));
-	}
+	vm->address_space->Put();
+	os_mem_free(vm->vm_map, sizeof(os_vmmap_t));
+	os_mem_free(vm, sizeof(os_vmspace_t));
 }
 
 
 extern "C"
 int
 os_vmspace_fault(os_vmspace_t *vm, vaddr_t va, vm_prot_t prot)
 {
-	vm_page *page = vm->cache->LookupPage(va);
-	if (page == NULL)
+	VMArea *area = vm->address_space->LookupArea(va);
+	if (area == NULL)
 		return 1;
 
 	// TODO: Probably through page->cache_ref->cache
@@ -279,7 +281,18 @@ extern "C"
 paddr_t
 os_vmspace_pdirpa(os_vmspace_t *vm)
 {
-	return vm->pmap.pm_pml4pa;
+	X86GPAtoHPATranslationMap *map;
+	map = (X86GPAtoHPATranslationMap *)vm->address_space->TranslationMap();
+
+	return map->PhysicalPML4();
+}
+
+
+extern "C"
+os_vmmap_t *
+os_vmspace_get_vmmap(os_vmspace_t *vm)
+{
+	return vm->vm_map;
 }
 
 

src/add-ons/kernel/drivers/nvmm/nvmm_os.h

@@ -262,13 +262,11 @@ extern bool pmap_ept_has_ad;
 // present at struct pmap from DragonFlyBSD
 // see sys/platform/pc64/include/pmap.h
 struct pmap {
-	uint64_t* pm_pml4; // Kernel virtual address (KVA)
-			   // of level 4 page table
-	paddr_t pm_pml4pa;
 	uint64_t pm_invgen;
 };
 struct pmap *os_vmspace_pmap(os_vmspace_t *vm);
 paddr_t os_vmspace_pdirpa(os_vmspace_t *vm);
+os_vmmap_t *os_vmspace_get_vmmap(os_vmspace_t *vm);
 #endif
 
 /* CPU. */
@@ -381,6 +379,7 @@ extern cpu_status *interrupt_status;
 #if defined(__HAIKU__)
 #define PROT_READ	B_READ_AREA
 #define PROT_WRITE	B_WRITE_AREA
+#define PROT_EXEC	B_EXECUTE_AREA
 #endif
 
 /* -------------------------------------------------------------------------- */