Changeset 614 for trunk/kernel/mm/vmm.c

Timestamp:

Jan 15, 2019, 1:59:32 PM (6 years ago)

Author:

alain

Message:

1) introduce a dev_ioc_sync_write() function in IOC API,

to improve the DEVFS synchronous update.

2) fix a big bug in both the user_dir_create() and user_dir_destroy()

functions: add an extended pointer on the reference client process
in the function's arguments.

File:

• trunk/kernel/mm/vmm.c (modified) (12 diffs)

trunk/kernel/mm/vmm.c

@@ -64 +64 @@
     intptr_t  base;
     intptr_t  size;
+    uint32_t  i;
 
 #if DEBUG_VMM_INIT
@@ -69 +70 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_VMM_INIT )
-printk("\n[%s] thread[%x,%x] enter for process %x / cycle %d\n", 
-__FUNCTION__ , this->process->pid, this->trdid, process->pid , cycle );
+printk("\n[%s] thread[%x,%x] enter for process %x in cluster %x / cycle %d\n", 
+__FUNCTION__ , this->process->pid, this->trdid, process->pid, local_cxy, cycle );
 #endif
 
@@ -183 +184 @@
     vmm->mmap_mgr.first_free_vpn  = CONFIG_VMM_HEAP_BASE;
     busylock_init( &vmm->mmap_mgr.lock , LOCK_VMM_MMAP );
-
-    uint32_t i;
     for( i = 0 ; i < 32 ; i++ ) list_root_init( &vmm->mmap_mgr.zombi_list[i] );
 
@@ -195 +194 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_VMM_INIT )
-printk("\n[%s] thread[%x,%x] exit / process %x / entry_point %x / cycle %d\n", 
-__FUNCTION__, this->process->pid, this->trdid, process->pid, process->vmm.entry_point, cycle );
+printk("\n[%s] thread[%x,%x] exit for process %x in cluster %x / cycle %d\n", 
+__FUNCTION__, this->process->pid, this->trdid, process->pid, local_cxy, cycle );
 #endif
 
@@ -944 +943 @@
     vpn_t      free;
 
-    // mmap vseg size must be power of 2
+#if DEBUG_VMM_MMAP_ALLOC
+thread_t * this = CURRENT_THREAD;
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( DEBUG_VMM_MMAP_ALLOC < cycle )
+printk("\n[%s] thread[%x,%x] enter / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, cycle );
+#endif
+
+    // vseg size must be power of 2
     // compute actual size and index in zombi_list array
     size  = POW2_ROUNDUP( npages );
@@ -952 +959 @@
     mmap_mgr_t * mgr = &vmm->mmap_mgr;
 
+printk("\n@@@ in %s : size = %d / index = %d / first = %d / empty = %d\n",
+__FUNCTION__, size, index, mgr->vpn_size, list_is_empty(&mgr->zombi_list[index]) );
+
     // get lock on mmap allocator
     busylock_acquire( &mgr->lock );
@@ -958 +968 @@
     if( list_is_empty( &mgr->zombi_list[index] ) )     // from mmap zone
     {
+
+printk("\n@@@ from mmap zone\n" );
+
         // check overflow
         free = mgr->first_free_vpn;
-        if( (free + size) > mgr->vpn_size ) return ENOMEM;
-
-        // update STACK allocator
+        if( (free + size) > mgr->vpn_size ) return -1;
+
+        // update MMAP allocator
         mgr->first_free_vpn += size;
 
@@ -970 +983 @@
     else                                             // from zombi_list
     {
+
+printk("\n@@@ from zombi_list\n" );
+
         // get pointer on zombi vseg from zombi_list
         vseg = LIST_FIRST( &mgr->zombi_list[index] , vseg_t , zlist );
@@ -982 +998 @@
     // release lock on mmap allocator
     busylock_release( &mgr->lock );
+
+#if DEBUG_VMM_MMAP_ALLOC
+cycle = (uint32_t)hal_get_cycles();
+if( DEBUG_VMM_DESTROY < cycle )
+printk("\n[%s] thread[%x,%x] exit / vpn_base %x / vpn_size %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, base, size, cycle );
+#endif
 
     // returns vpn_base, vpn_size
@@ -1009 +1032 @@
 uint32_t   cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_VMM_CREATE_VSEG < cycle )
-printk("\n[%s] thread[%x,%x] enter / %s / cxy %x / cycle %d\n",
-__FUNCTION__, this->process->pid, this->trdid, vseg_type_str(type), cxy, cycle );
+printk("\n[%s] thread[%x,%x] enter for process %x / %s / cxy %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, process->pid, vseg_type_str(type), cxy, cycle );
 #endif
 
@@ -1092 +1115 @@
     if( vseg != NULL )
     {
-        printk("\n[ERROR] in %s for process %x : new vseg [vpn_base = %x / vpn_size = %x]\n"
-               "  overlap existing vseg [vpn_base = %x / vpn_size = %x]\n",
+        printk("\n[ERROR] in %s for process %x : new vseg [vpn_base %x / vpn_size %x]\n"
+               "  overlap existing vseg [vpn_base %x / vpn_size %x]\n",
         __FUNCTION__ , process->pid, vpn_base, vpn_size, vseg->vpn_base, vseg->vpn_size );
         return NULL;
@@ -1106 +1129 @@
         return NULL;
         }
+
+#if DEBUG_VMM_CREATE_VSEG
+if( DEBUG_VMM_CREATE_VSEG < cycle )
+printk("\n[%s] thread[%x,%x] : base %x / size %x / vpn_base %x / vpn_size %x\n",
+__FUNCTION__, this->process->pid, this->trdid, base, size, vpn_base, vpn_size );
+#endif
 
     // initialize vseg descriptor