Changeset 683 for trunk/kernel/mm/ppm.c

Timestamp:

Jan 13, 2021, 12:36:17 AM (4 years ago)

Author:

alain

Message:

All modifications required to support the <tcp_chat> application
including error recovery in case of packet loss.A

File:

• trunk/kernel/mm/ppm.c (modified) (17 diffs)

trunk/kernel/mm/ppm.c

@@ -60 +60 @@
 
    void   * base_ptr = ppm->vaddr_base + 
-                       ((page_ptr - ppm->pages_tbl)<<CONFIG_PPM_PAGE_SHIFT);
+                       ((page_ptr - ppm->pages_tbl)<<CONFIG_PPM_PAGE_ORDER);
 
         return XPTR( page_cxy , base_ptr );
@@ -75 +75 @@
 
         page_t * page_ptr = ppm->pages_tbl + 
-                        ((base_ptr - ppm->vaddr_base)>>CONFIG_PPM_PAGE_SHIFT);
+                        ((base_ptr - ppm->vaddr_base)>>CONFIG_PPM_PAGE_ORDER);
 
         return XPTR( base_cxy , page_ptr );
@@ -91 +91 @@
     page_t * page_ptr = GET_PTR( page_xp );
 
-    paddr_t  paddr    = PADDR( page_cxy , (page_ptr - ppm->pages_tbl)<<CONFIG_PPM_PAGE_SHIFT );
-
-    return (ppn_t)(paddr >> CONFIG_PPM_PAGE_SHIFT);
+    paddr_t  paddr    = PADDR( page_cxy , (page_ptr - ppm->pages_tbl)<<CONFIG_PPM_PAGE_ORDER );
+
+    return (ppn_t)(paddr >> CONFIG_PPM_PAGE_ORDER);
 
 }  // end hal_page2ppn()
@@ -102 +102 @@
         ppm_t   * ppm  = &LOCAL_CLUSTER->ppm;
 
-    paddr_t  paddr = ((paddr_t)ppn) << CONFIG_PPM_PAGE_SHIFT;
+    paddr_t  paddr = ((paddr_t)ppn) << CONFIG_PPM_PAGE_ORDER;
 
     cxy_t    cxy   = CXY_FROM_PADDR( paddr );
     lpa_t    lpa   = LPA_FROM_PADDR( paddr );
 
-    return XPTR( cxy , &ppm->pages_tbl[lpa>>CONFIG_PPM_PAGE_SHIFT] );
+    return XPTR( cxy , &ppm->pages_tbl[lpa>>CONFIG_PPM_PAGE_ORDER] );
 
 }  // end hal_ppn2page
@@ -118 +118 @@
         ppm_t  * ppm   = &LOCAL_CLUSTER->ppm;
    
-    paddr_t  paddr = ((paddr_t)ppn) << CONFIG_PPM_PAGE_SHIFT;
+    paddr_t  paddr = ((paddr_t)ppn) << CONFIG_PPM_PAGE_ORDER;
 
     cxy_t    cxy   = CXY_FROM_PADDR( paddr );
@@ -137 +137 @@
     paddr_t  paddr    = PADDR( base_cxy , (base_ptr - ppm->vaddr_base) );
 
-    return (ppn_t)(paddr >> CONFIG_PPM_PAGE_SHIFT);
+    return (ppn_t)(paddr >> CONFIG_PPM_PAGE_ORDER);
 
 }  // end ppm_base2ppn()
@@ -159 +159 @@
 
 assert( __FUNCTION__, !page_is_flag( page , PG_FREE ) ,
-"page already released : ppn = %x\n" , ppm_page2ppn( XPTR( local_cxy , page ) ) );
+"page already released : ppn = %x" , ppm_page2ppn( XPTR( local_cxy , page ) ) );
 
 assert( __FUNCTION__, !page_is_flag( page , PG_RESERVED ) ,
-"reserved page : ppn = %x\n" , ppm_page2ppn( XPTR( local_cxy , page ) ) );
+"reserved page : ppn = %x" , ppm_page2ppn( XPTR( local_cxy , page ) ) );
 
         // set FREE flag in released page descriptor
@@ -214 +214 @@
         page_t   * found_block;  
 
-    thread_t * this = CURRENT_THREAD;
-
         ppm_t    * ppm = &LOCAL_CLUSTER->ppm;
 
-#if DEBUG_PPM_ALLOC_PAGES
-uint32_t cycle = (uint32_t)hal_get_cycles();
+#if DEBUG_PPM_ALLOC_PAGES || DEBUG_PPM_ERROR
+thread_t * this  = CURRENT_THREAD;
+uint32_t   cycle = (uint32_t)hal_get_cycles();
 #endif
 
@@ -232 +231 @@
 
 // check order
-assert( __FUNCTION__, (order < CONFIG_PPM_MAX_ORDER) , "illegal order argument = %d\n" , order );
+assert( __FUNCTION__, (order < CONFIG_PPM_MAX_ORDER) ,
+"illegal order argument = %d" , order );
 
     //build extended pointer on lock protecting remote PPM
@@ -273 +273 @@
         if( current_block == NULL ) // return failure if no free block found
         {
-                // release lock protecting free lists
+
+#if DEBUG_PPM_ERROR
+printk("\n[ERROR] in %s thread[%x,%x] cannot allocate %d page(s) in cluster %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, 1<<order, local_cxy, cycle );
+#endif
+        // release lock protecting free lists
                 remote_busylock_release( lock_xp );
-
-        printk("\n[%s] thread[%x,%x] cannot allocate %d page(s) in cluster %x\n",
-        __FUNCTION__, this->process->pid, this->trdid, 1<<order, local_cxy );
-
                 return NULL;
         }
@@ -385 +386 @@
     page_t   * found_block;
 
-    thread_t * this  = CURRENT_THREAD;
-
 // check order
-assert( __FUNCTION__, (order < CONFIG_PPM_MAX_ORDER) , "illegal order argument = %d\n" , order );
+assert( __FUNCTION__, (order < CONFIG_PPM_MAX_ORDER) ,
+"illegal order argument = %d" , order );
 
     // get local pointer on PPM (same in all clusters)
         ppm_t * ppm = &LOCAL_CLUSTER->ppm;
 
-#if DEBUG_PPM_REMOTE_ALLOC_PAGES
+#if DEBUG_PPM_ALLOC_PAGES || DEBUG_PPM_ERROR
+thread_t * this  = CURRENT_THREAD;
 uint32_t   cycle = (uint32_t)hal_get_cycles();
 #endif
 
-#if DEBUG_PPM_REMOTE_ALLOC_PAGES 
-if( DEBUG_PPM_REMOTE_ALLOC_PAGES < cycle )
+#if DEBUG_PPM_ALLOC_PAGES
+if( DEBUG_PPM_ALLOC_PAGES < cycle )
 {
     printk("\n[%s] thread[%x,%x] enter for %d page(s) in cluster %x / cycle %d\n",
     __FUNCTION__, this->process->pid, this->trdid, 1<<order, cxy, cycle );
-    if( DEBUG_PPM_REMOTE_ALLOC_PAGES & 1 ) ppm_remote_display( cxy );
+    if( DEBUG_PPM_ALLOC_PAGES & 1 ) ppm_remote_display( cxy );
 }
 #endif
@@ -445 +446 @@
         if( current_block == NULL ) // return failure
         {
+
+#if DEBUG_PPM_ERROR
+ printk("\n[ERROR] in %s : thread[%x,%x] cannot allocate %d page(s) in cluster %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, 1<<order, cxy, cycle );
+#endif
                 // release lock protecting free lists
                 remote_busylock_release( lock_xp );
-
-        printk("\n[ERROR] in %s : thread[%x,%x] cannot allocate %d page(s) in cluster %x\n",
-        __FUNCTION__, this->process->pid, this->trdid, 1<<order, cxy );
-
                 return XPTR_NULL;
         }
@@ -489 +491 @@
     hal_fence();
 
-#if DEBUG_PPM_REMOTE_ALLOC_PAGES
-if( DEBUG_PPM_REMOTE_ALLOC_PAGES < cycle )
+#if DEBUG_PPM_ALLOC_PAGES
+if( DEBUG_PPM_ALLOC_PAGES < cycle )
 {
     printk("\n[%s] thread[%x,%x] allocated %d page(s) in cluster %x / ppn %x / cycle %d\n",
     __FUNCTION__, this->process->pid, this->trdid, 
     1<<order, cxy, ppm_page2ppn(XPTR( cxy , found_block )), cycle );
-    if( DEBUG_PPM_REMOTE_ALLOC_PAGES & 1 ) ppm_remote_display( cxy );
+    if( DEBUG_PPM_ALLOC_PAGES & 1 ) ppm_remote_display( cxy );
 }
 #endif
@@ -521 +523 @@
     uint32_t   order = hal_remote_l32( XPTR( page_cxy , &page_ptr->order ) );
 
-#if DEBUG_PPM_REMOTE_FREE_PAGES
+#if DEBUG_PPM_FREE_PAGES
 thread_t * this  = CURRENT_THREAD;
 uint32_t   cycle = (uint32_t)hal_get_cycles();
@@ -527 +529 @@
 #endif
 
-#if DEBUG_PPM_REMOTE_FREE_PAGES
-if( DEBUG_PPM_REMOTE_FREE_PAGES < cycle )
+#if DEBUG_PPM_FREE_PAGES
+if( DEBUG_PPM_FREE_PAGES < cycle )
 {
     printk("\n[%s] thread[%x,%x] enter for %d page(s) in cluster %x / ppn %x / cycle %d\n",
     __FUNCTION__, this->process->pid, this->trdid, 1<<order, page_cxy, ppn, cycle );
-    if( DEBUG_PPM_REMOTE_FREE_PAGES & 1 ) ppm_remote_display( page_cxy );
+    if( DEBUG_PPM_FREE_PAGES & 1 ) ppm_remote_display( page_cxy );
 }
 #endif
@@ -549 +551 @@
 
 assert( __FUNCTION__, !page_remote_is_flag( page_xp , PG_FREE ) ,
-"page already released : ppn = %x\n" , ppm_page2ppn(XPTR( page_cxy , page_ptr ) ) );
+"page already released : ppn = %x" , ppm_page2ppn(XPTR( page_cxy , page_ptr ) ) );
 
 assert( __FUNCTION__, !page_remote_is_flag( page_xp , PG_RESERVED ) ,
-"reserved page : ppn = %x\n" , ppm_page2ppn(XPTR( page_cxy , page_ptr ) ) );
+"reserved page : ppn = %x" , ppm_page2ppn(XPTR( page_cxy , page_ptr ) ) );
 
         // set the FREE flag in released page descriptor
@@ -607 +609 @@
     hal_fence();
 
-#if DEBUG_PPM_REMOTE_FREE_PAGES
-if( DEBUG_PPM_REMOTE_FREE_PAGES < cycle )
+#if DEBUG_PPM_FREE_PAGES
+if( DEBUG_PPM_FREE_PAGES < cycle )
 {
     printk("\n[%s] thread[%x,%x] released %d page(s) in cluster %x / ppn %x / cycle %d\n",
     __FUNCTION__, this->process->pid, this->trdid, 1<<order, page_cxy, ppn, cycle );
-    if( DEBUG_PPM_REMOTE_FREE_PAGES & 1 ) ppm_remote_display( page_cxy );
+    if( DEBUG_PPM_FREE_PAGES & 1 ) ppm_remote_display( page_cxy );
 }
 #endif