Changeset 635 for trunk/hal/tsar_mips32/drivers

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.

Location:

trunk/hal/tsar_mips32/drivers

Files:

• soclib_nic.c (modified) (3 diffs)
• soclib_pic.c (modified) (4 diffs)

trunk/hal/tsar_mips32/drivers/soclib_nic.c

@@ -2 +2 @@
  * soclib_nic.c - SOCLIB_NIC (Network Interface Controler) driver implementation.
  *
- * Author     Alain Greiner (2016)
+ * Author     Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -55 +55 @@
             "chbuf descriptor exceeds one page" );
 
-    req.type   = KMEM_PAGE;
-    req.size   = 0;
+    req.type   = KMEM_PPM;
+    req.order  = 0;
     req.flags  = AF_KERNEL;
 
-    nic_chbuf_t * chbuf = (nic_chbuf_t *)kmem_alloc( &req );
-
-    assert( (chbuf != NULL) ,
-             "cannot allocate chbuf descriptor" );
+    nic_chbuf_t * chbuf = kmem_alloc( &req );
+
+    if( chbuf == NULL )
+    {
+        printk("\n[PANIC] in %s : cannot allocate chbuf descriptor\n",
+        __FUNCTION__ );
+    }
 
     // initialise chbuf state
@@ -76 +79 @@
     for( i = 0 ; i < CONFIG_NIC_CHBUF_DEPTH ; i++ )
     {
-        uint32_t * container = (uint32_t *)kmem_alloc( &req );   
+        uint32_t * container = kmem_alloc( &req );   
 
         assert( (container != NULL) ,

trunk/hal/tsar_mips32/drivers/soclib_pic.c

@@ -2 +2 @@
  * soclib_pic.c - soclib PIC driver implementation.
  *
- * Author  Alain Greiner (2016,2017)
+ * Author  Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -27 +27 @@
 #include <errno.h>
 #include <string.h>
+#include <bits.h>
 #include <vfs.h>
 #include <rpc.h>
@@ -287 +288 @@
     {
         // allocate memory for core extension
-        req.type     = KMEM_GENERIC;
-        req.size     = sizeof(soclib_pic_core_t);
+        req.type     = KMEM_KCM;
+        req.order    = bits_log2( sizeof(soclib_pic_core_t) );
         req.flags    = AF_KERNEL;
         core_ext_ptr = kmem_alloc( &req );
 
-        assert( (core_ext_ptr != NULL) ,
-                "cannot allocate memory for core extension\n");
+        if( core_ext_ptr == NULL )
+        {
+            printk("\n[PANIC] in %s : cannot allocate memory for core extension\n",
+            __FUNCTION__ );
+        }
     
         // reset the HWI / WTI  interrupt vectors
@@ -304 +308 @@
 
     // allocate memory for cluster extension
-    req.type        = KMEM_GENERIC;
-    req.size        = sizeof(soclib_pic_cluster_t);
+    req.type        = KMEM_KCM;
+    req.order       = bits_log2( sizeof(soclib_pic_cluster_t) );
     req.flags       = AF_KERNEL;
     cluster_ext_ptr = kmem_alloc( &req );
 
-    assert( (cluster_ext_ptr != NULL) ,
-            "cannot allocate memory for cluster extension\n");
+    if( cluster_ext_ptr == NULL )
+    {
+        printk("\n[PANIC] in %s : cannot allocate memory for cluster extension\n",
+        __FUNCTION__ );
+    }
+    
+assert( (cluster_ext_ptr != NULL) , "cannot allocate memory for cluster extension");
 
     // get XCU characteristics from the XCU config register