Changeset 656 for trunk/kernel/mm/kmem.c

Timestamp:

Dec 6, 2019, 12:07:51 PM (4 years ago)

Author:

alain

Message:

Fix several bugs in the FATFS and in the VFS,
related to the creation of big files requiring
more than 4 Kbytes (one cluster) on device.

File:

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

trunk/kernel/mm/kmem.c

@@ -45 +45 @@
         flags = req->flags;
 
-    ////////////////////////////////// PPM 
+    ////////////////////// 
         if( type == KMEM_PPM )
         {
@@ -76 +76 @@
         return ptr;
         }
-    ///////////////////////////////////// KCM 
+    /////////////////////////// 
         else if( type == KMEM_KCM )
         {
@@ -102 +102 @@
         return ptr;
         }
-    //////////////////////////////////// KHM 
+    /////////////////////////// 
         else if( type == KMEM_KHM )
         {
@@ -140 +140 @@
     uint32_t type = req->type;
 
+    //////////////////////
         if( type == KMEM_PPM )
         {
@@ -146 +147 @@
         ppm_free_pages( page );
     }
+    ///////////////////////////
     else if( type == KMEM_KCM )
     {
         kcm_free( req->ptr );
         }
+    ///////////////////////////
     else if( type == KMEM_KHM )
     {
@@ -172 +175 @@
         flags = req->flags;
 
-        ///////////////////////////////// PPM
-        if( type == KMEM_PPM )
-        {
-                // allocate the number of requested pages
-                page_t * page_ptr = ppm_remote_alloc_pages( cxy , order );
-
-                if( page_ptr == NULL )
+        //////////////////////
+        if( type == KMEM_PPM )
+        {
+                // allocate the number of requested pages from remote cluster
+                xptr_t page_xp = ppm_remote_alloc_pages( cxy , order );
+
+                if( page_xp == XPTR_NULL )
                 {
                         printk("\n[ERROR] in %s : failed for PPM / order %d in cluster %x\n",
@@ -185 +188 @@
                 }
 
-        xptr_t page_xp = XPTR( cxy , page_ptr );
-
-        // get pointer on buffer from the page descriptor
+        // get extended pointer on remote buffer
         xptr_t base_xp = ppm_page2base( page_xp );
 
@@ -193 +194 @@
                 if( flags & AF_ZERO ) hal_remote_memset( base_xp , 0 , CONFIG_PPM_PAGE_SIZE );
 
-        void * ptr = GET_PTR( base_xp );
 
 #if DEBUG_KMEM_REMOTE
@@ -201 +201 @@
 printk("\n[%s] thread[%x,%x] from PPM / %d page(s) / ppn %x / cxy %x / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid,
-1<<order, ppm_page2ppn(XPTR(local_cxy,ptr)), cxy, cycle );
-#endif
-        return ptr;
-        }
-    /////////////////////////////////// KCM
+1<<order, ppm_page2ppn( page_xp ), cxy, cycle );
+#endif
+        return GET_PTR( base_xp );
+        }
+    ///////////////////////////
         else if( type == KMEM_KCM ) 
         {
@@ -231 +231 @@
         return ptr;
         }
-        /////////////////////////////////// KHM 
+        /////////////////////////// 
         else if( type == KMEM_KHM )                
         {
@@ -250 +250 @@
     uint32_t type = req->type;
 
+    //////////////////////
         if( type == KMEM_PPM )
         {
@@ -256 +257 @@
         ppm_remote_free_pages( cxy , page );
     }
+    ///////////////////////////
     else if( type == KMEM_KCM )
     {
         kcm_remote_free( cxy , req->ptr );
         }
+    ///////////////////////////
     else if( type == KMEM_KHM )
     {