Changeset 437 for trunk/kernel/mm

Timestamp:

Mar 28, 2018, 2:40:29 PM (6 years ago)

Author:

alain

Message:

Fix various bugs

Location:

trunk/kernel/mm

Files:

• kcm.c (modified) (2 diffs)
• kcm.h (modified) (1 diff)
• ppm.c (modified) (6 diffs)
• vmm.c (modified) (4 diffs)
• vmm.h (modified) (1 diff)

trunk/kernel/mm/kcm.c

@@ -3 +3 @@
  *
  * Author  Ghassan Almaless (2008,2009,2010,2011,2012)
- *         Alain Greiner    (2016,2017)
+ *         Alain Greiner    (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -239 +239 @@
         uint32_t  blocks_nr = (CONFIG_PPM_PAGE_SIZE - CONFIG_KCM_SLOT_SIZE) / block_size;
         kcm->blocks_nr = blocks_nr;
-
-        kcm_dmsg("\n[DBG] %s : KCM %s initialised / block_size = %d / blocks_nr = %d\n",
-                 __FUNCTION__ , kmem_type_str( type ) , kcm->block_size , kcm->blocks_nr );
 }
 

trunk/kernel/mm/kcm.h

@@ -3 +3 @@
  *
  * Authors  Ghassan Almaless (2008,2009,2010,2011,2012)
- *          Alain Greiner    (2016)
+ *          Alain Greiner    (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites

trunk/kernel/mm/ppm.c

@@ -54 +54 @@
 
     cxy_t    page_cxy = GET_CXY( page_xp );
-    page_t * page_ptr = (page_t *)GET_PTR( page_xp );
+    page_t * page_ptr = GET_PTR( page_xp );
 
    void   * base_ptr = ppm->vaddr_base + 
@@ -69 +69 @@
 
     cxy_t    base_cxy = GET_CXY( base_xp );
-    void   * base_ptr = (void *)GET_PTR( base_xp );
+    void   * base_ptr = GET_PTR( base_xp );
 
         page_t * page_ptr = ppm->pages_tbl + 
@@ -86 +86 @@
 
     cxy_t    page_cxy = GET_CXY( page_xp );
-    page_t * page_ptr = (page_t *)GET_PTR( page_xp );
+    page_t * page_ptr = GET_PTR( page_xp );
 
     paddr_t  paddr    = PADDR( page_cxy , (page_ptr - ppm->pages_tbl)<<CONFIG_PPM_PAGE_SHIFT );
 
-    return paddr >> CONFIG_PPM_PAGE_SHIFT;
+    return (ppn_t)(paddr >> CONFIG_PPM_PAGE_SHIFT);
 
 }  // end hal_page2ppn()
@@ -97 +97 @@
 inline xptr_t ppm_ppn2page( ppn_t ppn )
 {
-        ppm_t  * ppm      = &LOCAL_CLUSTER->ppm;
-
-    paddr_t  paddr    = ppn << CONFIG_PPM_PAGE_SHIFT;
-
-    cxy_t    page_cxy = CXY_FROM_PADDR( paddr );
-    lpa_t    page_lpa = LPA_FROM_PADDR( paddr );
-
-    return XPTR( page_cxy , &ppm->pages_tbl[page_lpa>>CONFIG_PPM_PAGE_SHIFT] );
+        ppm_t   * ppm  = &LOCAL_CLUSTER->ppm;
+
+    paddr_t  paddr = ((paddr_t)ppn) << CONFIG_PPM_PAGE_SHIFT;
+
+    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] );
 
 }  // end hal_ppn2page
@@ -113 +113 @@
 inline xptr_t ppm_ppn2base( ppn_t ppn )
 {
-        ppm_t  * ppm      = &LOCAL_CLUSTER->ppm;
+        ppm_t  * ppm   = &LOCAL_CLUSTER->ppm;
    
-    paddr_t  paddr    = ppn << CONFIG_PPM_PAGE_SHIFT;
-
-    cxy_t    page_cxy = CXY_FROM_PADDR( paddr );
-    lpa_t    page_lpa = LPA_FROM_PADDR( paddr );
-
-    void   * base_ptr = (void *)ppm->vaddr_base + (page_lpa & ~CONFIG_PPM_PAGE_SHIFT);
-  
-        return XPTR( page_cxy , base_ptr );
+    paddr_t  paddr = ((paddr_t)ppn) << CONFIG_PPM_PAGE_SHIFT;
+
+    cxy_t    cxy   = CXY_FROM_PADDR( paddr );
+    lpa_t    lpa   = LPA_FROM_PADDR( paddr );
+
+        return XPTR( cxy , (void *)ppm->vaddr_base + lpa );
 
 }  // end ppm_ppn2base()
@@ -132 +130 @@
 
     cxy_t    base_cxy = GET_CXY( base_xp );
-    void   * base_ptr = (void *)GET_PTR( base_xp );
+    void   * base_ptr = GET_PTR( base_xp );
 
     paddr_t  paddr    = PADDR( base_cxy , (base_ptr - ppm->vaddr_base) );
 
-    return paddr >> CONFIG_PPM_PAGE_SHIFT;
+    return (ppn_t)(paddr >> CONFIG_PPM_PAGE_SHIFT);
 
 }  // end ppm_base2ppn()

trunk/kernel/mm/vmm.c

@@ -673 +673 @@
 #endif
 
+#if (CONFIG_DEBUG_VMM_DESTROY & 1 )
+vmm_display( process , true );
+#endif
+
     // get pointer on local VMM
     vmm_t  * vmm = &process->vmm;
@@ -690 +694 @@
         vseg    = GET_PTR( vseg_xp );
 
-        // unmap rand release physical pages if required)
+#if( CONFIG_DEBUG_VMM_DESTROY & 1 )
+if( CONFIG_DEBUG_VMM_DESTROY < cycle )
+printk("\n[DBG] %s : %s / vpn_base %x / vpn_size %d\n",
+__FUNCTION__ , vseg_type_str( vseg->type ), vseg->vpn_base, vseg->vpn_size );
+#endif
+
+        // unmap and release physical pages 
         vmm_unmap_vseg( process , vseg );
 
@@ -1120 +1130 @@
         if( attr & GPT_MAPPED )  // entry is mapped
         { 
+
+#if( CONFIG_DEBUG_VMM_UNMAP_VSEG & 1 )
+if( CONFIG_DEBUG_VMM_UNMAP_VSEG < cycle )
+printk("- vpn %x / ppn %x\n" , vpn , ppn );
+#endif
+
             // check small page
             assert( (attr & GPT_SMALL) , __FUNCTION__ ,
@@ -1140 +1156 @@
                 // FIXME lock the physical page
 
-                // get extended pointer on pending forks counter
-                forks_xp = XPTR( page_cxy , &page_ptr->forks );
-
                 // get pending forks counter
-                count = hal_remote_lw( forks_xp );
+                count = hal_remote_lw( XPTR( page_cxy , &page_ptr->forks ) );
                 
                 if( count )  // decrement pending forks counter
                 {
+                    forks_xp = XPTR( page_cxy , &page_ptr->forks );
                     hal_remote_atomic_add( forks_xp , -1 );
                 }  

trunk/kernel/mm/vmm.h

@@ -4 +4 @@
  * Authors   Ghassan Almaless (2008,2009,2010,2011, 2012)
  *           Mohamed Lamine Karaoui (2015)
- *           Alain Greiner (2016,2017)
+ *           Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites