Changeset 619 for trunk/kernel/mm/kcm.c

Timestamp:

Feb 12, 2019, 1:15:47 PM (5 years ago)

Author:

alain

Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.

File:

• trunk/kernel/mm/kcm.c (modified) (8 diffs)

trunk/kernel/mm/kcm.c

@@ -3 +3 @@
  *
  * Author  Ghassan Almaless (2008,2009,2010,2011,2012)
- *         Alain Greiner    (2016,2017,2018)
+ *         Alain Greiner    (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -51 +51 @@
 
 #if DEBUG_KCM
+thread_t * this = CURRENT_THREAD;
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_KCM < cycle )
-printk("\n[DBG] %s : thread %x enters for %s / page %x / count %d / active %d\n",
-__FUNCTION__ , CURRENT_THREAD , kmem_type_str( kcm->type ) ,
+printk("\n[%s] thread[%x,%x] enters for %s / page %x / count %d / active %d\n",
+__FUNCTION__, this->process->pid, this->trdid, kmem_type_str(kcm->type),
 (intptr_t)kcm_page , kcm_page->count , kcm_page->active );
 #endif
 
-        assert( kcm_page->active , "kcm_page should be active" );
+assert( kcm_page->active , "kcm_page should be active" );
 
         // get first block available
         int32_t index = bitmap_ffs( kcm_page->bitmap , kcm->blocks_nr );
 
-        assert( (index != -1) , "kcm_page should not be full" );
+assert( (index != -1) , "kcm_page should not be full" );
 
         // allocate block
@@ -90 +91 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_KCM < cycle )
-printk("\n[DBG] %s : thread %x exit / type  %s / ptr %x / page %x / count %d\n",
-       __FUNCTION__ , CURRENT_THREAD , kmem_type_str( kcm->type ) , (intptr_t)ptr ,
-(intptr_t)kcm_page , kcm_page->count );
+printk("\n[%s] thread[%x,%x] exit for %s / ptr %x / page %x / count %d\n",
+__FUNCTION__, this->process->pid, this->trdid, kmem_type_str(kcm->type),
+(intptr_t)ptr, (intptr_t)kcm_page, kcm_page->count );
 #endif
 
@@ -115 +116 @@
         index = ((uint8_t *)ptr - (uint8_t *)kcm_page - CONFIG_KCM_SLOT_SIZE) / kcm->block_size;
 
-        assert( !bitmap_state( kcm_page->bitmap , index ) , "page already freed" );
-        assert( (kcm_page->count > 0) , "count already zero" );
+assert( !bitmap_state( kcm_page->bitmap , index ) , "page already freed" );
+
+assert( (kcm_page->count > 0) , "count already zero" );
 
         bitmap_set( kcm_page->bitmap , index );
@@ -163 +165 @@
         if( page == NULL )
         {
-                printk("\n[ERROR] in %s : failed to allocate page in cluster %d\n",
-                       __FUNCTION__ , local_cxy );
+                printk("\n[ERROR] in %s : failed to allocate page in cluster %x\n",
+            __FUNCTION__ , local_cxy );
                 return ENOMEM;
         }
@@ -216 +218 @@
                    uint32_t   type )
 {
-        // the kcm_page descriptor mut fit in the KCM slot
-        assert( (sizeof(kcm_page_t) <= CONFIG_KCM_SLOT_SIZE) ,
-                "KCM slot too small\n" );
+
+// the kcm_page descriptor must fit in the KCM slot
+assert( (sizeof(kcm_page_t) <= CONFIG_KCM_SLOT_SIZE) , "KCM slot too small\n" );
+
+// the allocated object must fit in one single page
+assert( (kmem_type_size(type) <= (CONFIG_PPM_PAGE_SIZE - CONFIG_KCM_SLOT_SIZE)),
+"allocated object requires more than one single page\n" );
 
         // initialize lock
@@ -241 +247 @@
         uint32_t  blocks_nr = (CONFIG_PPM_PAGE_SIZE - CONFIG_KCM_SLOT_SIZE) / block_size;
         kcm->blocks_nr = blocks_nr;
+
+#if DEBUG_KCM
+thread_t * this  = CURRENT_THREAD;
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+if( DEBUG_KCM < cycle )
+printk("\n[%s] thread[%x,%x] initialised KCM %s : block_size %d / blocks_nr %d\n",
+__FUNCTION__, this->process->pid, this->trdid,
+kmem_type_str( kcm->type ), block_size, blocks_nr );
+#endif
+
 }
 
@@ -331 +347 @@
         kcm_t      * kcm;
 
-        assert( (ptr != NULL) , "pointer cannot be NULL" );
+// check argument
+assert( (ptr != NULL) , "pointer cannot be NULL" );
 
         kcm_page = (kcm_page_t *)((intptr_t)ptr & ~CONFIG_PPM_PAGE_MASK);