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

Timestamp:

May 29, 2019, 3:26:44 PM (5 years ago)

Author:

alain

Message:

Fix a bug in hal_irqmask.c

File:

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

trunk/kernel/mm/ppm.c

@@ -42 +42 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////
+//         global variables
+////////////////////////////////////////////////////////////////////////////////////////
+
+extern chdev_directory_t    chdev_dir;          // allocated in kernel_init.c
+
+////////////////////////////////////////////////////////////////////////////////////////
 //     functions to  translate [ page <-> base <-> ppn ]
 ////////////////////////////////////////////////////////////////////////////////////////
-
 
 /////////////////////////////////////////////
@@ -212 +217 @@
 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 );
+__FUNCTION__, this->process->pid, this->trdid, 1<<order, local_cxy, cycle );
 #endif
 
@@ -266 +271 @@
 if( DEBUG_PPM_ALLOC_PAGES < cycle )
 printk("\n[%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 );
+__FUNCTION__, this->process->pid, this->trdid, 1<<order, local_cxy, cycle );
 #endif
 
@@ -307 +312 @@
 printk("\n[%s] thread[%x,%x] exit for %d page(s) in cluster %x / ppn = %x / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
-1<<order, ppm_page2ppn(XPTR( local_cxy , found_block )), cxy, cycle );
+1<<order, ppm_page2ppn(XPTR( local_cxy , found_block )), local_cxy, cycle );
 #endif
 
@@ -377 +382 @@
     page_t   * found_block;
 
-#if DEBUG_PPM_ALLOC_PAGES
+#if DEBUG_PPM_REMOTE_ALLOC_PAGES
 thread_t * this  = CURRENT_THREAD;
 uint32_t   cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_PPM_ALLOC_PAGES < cycle )
+if( DEBUG_PPM_REMOTE_ALLOC_PAGES < cycle )
 printk("\n[%s] thread[%x,%x] enter for %d small page(s) in cluster %x / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 1<<order, cxy, cycle );
 #endif
 
-#if(DEBUG_PPM_ALLOC_PAGES & 0x1)
-if( DEBUG_PPM_ALLOC_PAGES < cycle )
+#if(DEBUG_PPM_REMOTE_ALLOC_PAGES & 0x1)
+if( DEBUG_PPM_REMOTE_ALLOC_PAGES < cycle )
 ppm_remote_display( cxy );
 #endif
@@ -436 +441 @@
                 remote_busylock_release( lock_xp );
 
-#if DEBUG_PPM_ALLOC_PAGES
+#if DEBUG_REMOTE_PPM_ALLOC_PAGES
 cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_PPM_ALLOC_PAGES < cycle )
+if( DEBUG_PPM_REMOTE_ALLOC_PAGES < cycle )
 printk("\n[%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 );
@@ -468 +473 @@
         }
 
-        // update refcount, flags and order fields in found block remote page descriptor
+        // update refcount, flags and order fields in found block 
         page_remote_clear_flag( XPTR( cxy , found_block ), PG_FREE );
         page_remote_refcount_up( XPTR( cxy , found_block ) );
@@ -479 +484 @@
     dqdt_increment_pages( cxy , order );
 
-#if DEBUG_PPM_ALLOC_PAGES
+#if DEBUG_PPM_REMOTE_ALLOC_PAGES
 cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_PPM_ALLOC_PAGES < cycle )
+if( DEBUG_PPM_REMOTE_ALLOC_PAGES < cycle )
 printk("\n[%s] thread[%x,%x] exit for %d page(s) / ppn = %x in cluster %x / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -487 +492 @@
 #endif
 
-#if(DEBUG_PPM_ALLOC_PAGES & 0x1)
-if( DEBUG_PPM_ALLOC_PAGES < cycle )
+#if(DEBUG_PPM_REMOTE_ALLOC_PAGES & 0x1)
+if( DEBUG_PPM_REMOTE_ALLOC_PAGES < cycle )
 ppm_remote_display( cxy );
 #endif
@@ -509 +514 @@
         uint32_t   current_order;    // current (merged) block order
 
-#if DEBUG_PPM_FREE_PAGES
+#if DEBUG_PPM_REMOTE_FREE_PAGES
 thread_t * this  = CURRENT_THREAD;
 uint32_t   cycle = (uint32_t)hal_get_cycles();
-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",
+if( DEBUG_PPM_REMOTE_FREE_PAGES < cycle )
+printk("\n[%s] thread[%x,%x] enter for %d page(s) / cxy %x / ppn %x / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
 1<<page->order, cxy, ppm_page2ppn(XPTR(cxy , page)), cycle );
 #endif
 
-#if(DEBUG_PPM_FREE_PAGES & 0x1)
-if( DEBUG_PPM_FREE_PAGES < cycle )
+#if(DEBUG_PPM_REMOTE_FREE_PAGES & 0x1)
+if( DEBUG_PPM_REMOTE_FREE_PAGES < cycle )
 ppm_remote_display( cxy );
 #endif
@@ -594 +599 @@
     dqdt_decrement_pages( cxy , page->order );
 
-#if DEBUG_PPM_FREE_PAGES
+#if DEBUG_PPM_REMOTE_FREE_PAGES
 cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_PPM_FREE_PAGES < cycle )
+if( DEBUG_PPM_REMOTE_FREE_PAGES < cycle )
 printk("\n[%s] thread[%x,%x] exit for %d page(s) in cluster %x / ppn %x / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -602 +607 @@
 #endif
 
-#if(DEBUG_PPM_FREE_PAGES & 0x1)
-if( DEBUG_PPM_FREE_PAGES < cycle )
+#if(DEBUG_PPM_REMOTE_FREE_PAGES & 0x1)
+if( DEBUG_PPM_REMOTE_FREE_PAGES < cycle )
 ppm_remote_display( cxy );
 #endif
@@ -614 +619 @@
         uint32_t       order;
         list_entry_t * iter;
-        page_t       * page;
+    xptr_t         page_xp;
 
     ppm_t * ppm = &LOCAL_CLUSTER->ppm;
 
     // build extended pointer on lock protecting remote PPM
-    xptr_t lock_xp = XPTR( cxy , &ppm->free_lock );
-
-        // get lock protecting free lists in remote cluster
-        remote_busylock_acquire( lock_xp );
-
-        printk("\n***** PPM in cluster %x / %d pages\n", local_cxy , ppm->pages_nr );
+    xptr_t ppm_lock_xp = XPTR( cxy , &ppm->free_lock );
+
+    // get pointers on TXT0 chdev
+    xptr_t    txt0_xp  = chdev_dir.txt_tx[0];
+    cxy_t     txt0_cxy = GET_CXY( txt0_xp );
+    chdev_t * txt0_ptr = GET_PTR( txt0_xp );
+
+    // build extended pointer on remote TXT0 lock
+    xptr_t  txt_lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
+
+        // get PPM lock 
+        remote_busylock_acquire( ppm_lock_xp );
+
+    // get TXT0 lock 
+    remote_busylock_acquire( txt_lock_xp );
+
+        nolock_printk("\n***** PPM in cluster %x / %d pages\n", local_cxy , ppm->pages_nr );
 
         for( order = 0 ; order < CONFIG_PPM_MAX_ORDER ; order++ )
@@ -630 +646 @@
         // get number of free pages for free_list[order] in remote cluster
         uint32_t n = hal_remote_l32( XPTR( cxy , &ppm->free_pages_nr[order] ) );
-                printk("- order = %d / free_pages = %d\t: ", order , n );
+
+                nolock_printk("- order = %d / n = %d\t: ", order , n );
 
                 LIST_REMOTE_FOREACH( cxy , &ppm->free_pages_root[order] , iter )
                 {
-                        page = LIST_ELEMENT( iter , page_t , list );
-                        printk("%x," , page - ppm->pages_tbl );
+            // build extended pointer on page descriptor
+            page_xp = XPTR( cxy , LIST_ELEMENT( iter , page_t , list ) );
+
+            // display PPN
+                        nolock_printk("%x," , ppm_page2ppn( page_xp ) );
                 }
 
-                printk("\n");
-        }
-
-        // release lock protecting free lists in remote cluster
-        remote_busylock_release( lock_xp );
+                nolock_printk("\n");
+        }
+
+        // release TXT0 lock
+        remote_busylock_release( txt_lock_xp );
+
+        // release PPM lock
+        remote_busylock_release( ppm_lock_xp );
 }