Changeset 640 for trunk/kernel/syscalls

Timestamp:

Oct 1, 2019, 1:19:00 PM (5 years ago)

Author:

alain

Message:

Remove all RPCs in page-fault handling.

Location:

trunk/kernel/syscalls

Files:

• sys_display.c (modified) (3 diffs)
• sys_munmap.c (modified) (1 diff)
• syscalls.h (modified) (1 diff)

trunk/kernel/syscalls/sys_display.c

@@ -134 +134 @@
         case DISPLAY_VMM:
         {
-            cxy_t cxy = (cxy_t)arg0;
-            pid_t pid = (pid_t)arg1;
+            cxy_t cxy      = (cxy_t)arg0;
+            pid_t pid      = (pid_t)arg1;
+            bool_t mapping = (arg2 != 0);
 
             // check cxy argument
@@ -163 +164 @@
 
             // call kernel function
-                hal_vmm_display( process_xp , true );
+                hal_vmm_display( process_xp , mapping );
 
             break;
@@ -197 +198 @@
             }
 
-            if( cxy == local_cxy )
-            {
-                    sched_display( lid );
-            }
-            else
-            {
-                sched_remote_display( cxy , lid );
-            }
+            // call kernel function
+            sched_remote_display( cxy , lid );
 
             break;

trunk/kernel/syscalls/sys_munmap.c

@@ -72 +72 @@
     }
 
+    // compute unmapped region min an max
+    intptr_t addr_min = (intptr_t)vaddr;
+    intptr_t addr_max = addr_min + size;
+
+
+    // get vseg min & max addresses
+    intptr_t vseg_min = vseg->min; 
+    intptr_t vseg_max = vseg->max; 
+
     // enable IRQs
     hal_enable_irq( &save_sr );
 
-    // call relevant kernel function
-    error = vmm_resize_vseg( process , (intptr_t)vaddr , (intptr_t)size );
-
-    if ( error )
+    // action depend on both vseg and region bases & sizes
+    if( (vseg_min > addr_min) || (vseg_max < addr_max) )   // region not included in vseg
     {
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : cannot remove mapping\n", __FUNCTION__ );
+printk("\n[ERROR] in %s : region[%x->%x] / vseg[%x->%x] => non included in vseg\n",
+__FUNCTION__, process->pid, this->trdid, addr_min, addr_max, vseg_min, vseg_max );
 #endif
                 this->errno = EINVAL;
                 return -1;
+    }
+    else if( (vseg_min == addr_min) && (vseg_min == vseg_max) )  
+    {
+
+#if( DEBUG_SYS_MUNMAP & 1 )
+if( DEBUG_SYS_MUNMAP < cycle )
+printk("\n[%s] unmapped region[%x->%x[ / vseg[%x->%x[ => vseg deleted\n",
+__FUNCTION__, addr_min, addr_max, vseg_min, vseg_max );
+#endif
+        // delete existing vseg
+        vmm_global_delete_vseg( process,
+                                vseg_min );
+    }
+    else if( (vseg_min == addr_min) || (vseg_min == vseg_max) )  
+    {
+
+#if( DEBUG_SYS_MUNMAP & 1 )
+if( DEBUG_SYS_MUNMAP < cycle )
+printk("\n[%s] unmapped region[%x->%x[ / vseg[%x->%x[ => vseg resized\n",
+__FUNCTION__, addr_min, addr_max, vseg_min, vseg_max );
+#endif
+        // resize existing vseg
+        vmm_global_resize_vseg( process,
+                                vseg_min,
+                                addr_min,
+                                addr_max - addr_min );
+    }
+    else     //  vseg_min < addr_min) && (addr_max < vseg_max)          
+    {
+
+#if( DEBUG_SYS_MUNMAP & 1 )
+if( DEBUG_SYS_MUNMAP < cycle )
+printk("\n[%s] unmapped region[%x->%x[ / vseg[%x->%x[ => vseg resized & new vseg created\n",
+__FUNCTION__, addr_min, addr_max, vseg_min, vseg_max );
+#endif
+        // resize existing vseg
+        vmm_global_resize_vseg( process,
+                                vseg_min,
+                                vseg_min,
+                                addr_min - vseg_min ); 
+
+        // create new vseg
+        vmm_create_vseg( process,
+                         vseg->type,
+                         addr_max,
+                         vseg_max - addr_max,
+                         vseg->file_offset,
+                         vseg->file_size,
+                         vseg->mapper_xp,
+                         vseg->cxy );
     }
 

trunk/kernel/syscalls/syscalls.h

@@ -187 +187 @@
 /****************************************************************************************** 
  * [11] This function remove an existing mapping defined by the <addr> and <size>
- * arguments in user space.
- ******************************************************************************************
+ * arguments in user space. This can modify the number of vsegs:
+ * (a) if the region is not entirely mapped in one existing vseg, it's an error.
+ * (b) if the region has same base and size as an existing vseg, the vseg is removed.
+ * (c) if the removed region cut the exiting vseg in two parts, it is resized.
+ * (d) if the removed region cut the vseg in three parts, it is modified, and a new
+ *     vseg is created with same type.
+ * All existing VSL copies are updated.
+******************************************************************************************
  * @ addr  : base address in user space.
- * # size  : number of bytes.
+ * @ size  : number of bytes.
  * @ return 0 if success / return -1 if failure.
  *****************************************************************************************/