Changeset 635 for trunk/kernel/libk/user_dir.c

Timestamp:

Jun 26, 2019, 11:42:37 AM (5 years ago)

Author:

alain

Message:

This version is a major evolution: The physical memory allocators,
defined in the kmem.c, ppm.c, and kcm.c files have been modified
to support remote accesses. The RPCs that were previously user
to allocate physical memory in a remote cluster have been removed.
This has been done to cure a dead-lock in case of concurrent page-faults.

This version 2.2 has been tested on a (4 clusters / 2 cores per cluster)
TSAR architecture, for both the "sort" and the "fft" applications.

File:

• trunk/kernel/libk/user_dir.c (modified) (11 diffs)

trunk/kernel/libk/user_dir.c

@@ -93 +93 @@
     uint32_t        attr;              // attributes for all GPT entries
     uint32_t        dirents_per_page;  // number of dirent descriptors per page
-    xptr_t          page_xp;           // extended pointer on page descriptor  
     page_t        * page;              // local pointer on page descriptor
-    xptr_t          base_xp;           // extended pointer on physical page base 
     struct dirent * base;              // local pointer on physical page base
     uint32_t        total_dirents;     // total number of dirents in dirent array
@@ -126 +124 @@
 
 // check dirent size 
-assert( ( sizeof(struct dirent) == 64), "sizeof(dirent) != 64\n");
+assert( ( sizeof(struct dirent) == 64), "sizeof(dirent) must be 64\n");
 
     // compute number of dirent per page
@@ -135 +133 @@
 
     // allocate memory for a local user_dir descriptor
-    req.type  = KMEM_DIR;
-    req.flags = AF_ZERO;
+    req.type  = KMEM_KCM;
+    req.order = bits_log2( sizeof(user_dir_t) );
+    req.flags = AF_ZERO | AF_KERNEL;
     dir       = kmem_alloc( &req );
 
@@ -146 +145 @@
     }
 
-    // Build an initialize the dirent array as a list of physical pages.
+    // Build an initialize the dirent array as a list of pages.
     // For each iteration in this while loop:
     // - allocate one physical 4 Kbytes (64 dirent slots)
@@ -163 +162 @@
     {
         // allocate one physical page
-        req.type  = KMEM_PAGE;
-        req.size  = 0;
+        req.type  = KMEM_PPM;
+        req.order = 0;
         req.flags = AF_ZERO;
-        page      = kmem_alloc( &req );
-
-        if( page == NULL )
+        base      = kmem_alloc( &req );
+
+        if( base == NULL )
         {
             printk("\n[ERROR] in %s : cannot allocate page in cluster %x\n",
@@ -174 +173 @@
             goto user_dir_create_failure;
         }
-
-        // get pointer on page base (array of dirents)
-        page_xp  = XPTR( local_cxy , page );
-        base_xp  = ppm_page2base( page_xp );
-        base     = GET_PTR( base_xp );
 
         // call the relevant FS specific function to copy up to 64 dirents in page
@@ -198 +192 @@
         total_dirents += entries;
 
+        // get page descriptor pointer from base
+        page = GET_PTR( ppm_base2page( XPTR( local_cxy , base ) ) );
+
         // register page in temporary list
         list_add_last( &root , &page->list ); 
@@ -303 +300 @@
 
             // release the user_dir descriptor
-            req.type = KMEM_DIR;
+            req.type = KMEM_KCM;
             req.ptr  = dir;
             kmem_free( &req );
@@ -364 +361 @@
 
     // release local user_dir_t structure
-    req.type = KMEM_DIR;
+    req.type = KMEM_KCM;
     req.ptr  = dir;
     kmem_free( &req );
@@ -372 +369 @@
     {
         page = LIST_FIRST( &root , page_t , list );
-        req.type  = KMEM_PAGE;
-        req.ptr   = page;
+
+        // get base from page descriptor pointer 
+        base = GET_PTR( ppm_page2base( XPTR( local_cxy , page ) ) );
+ 
+        req.type  = KMEM_PPM;
+        req.ptr   = base;
         kmem_free( &req );
     }
@@ -492 +493 @@
     // release local user_dir_t structure
     kmem_req_t  req;
-    req.type = KMEM_DIR;
+    req.type = KMEM_KCM;
     req.ptr  = dir;
     kmem_free( &req );