Changeset 626 for trunk/kernel/devices/dev_ioc.c

Timestamp:

Apr 29, 2019, 7:25:09 PM (5 years ago)

Author:

alain

Message:

This version has been tested on the sort multithreaded application
for TSAR_IOB architectures ranging from 1 to 8 clusters.
It fixes three bigs bugs:
1) the dev_ioc device API has been modified: the dev_ioc_sync_read()
and dev_ioc_sync_write() function use now extended pointers on the
kernel buffer to access a mapper stored in any cluster.
2) the hal_uspace API has been modified: the hal_copy_to_uspace()
and hal_copy_from_uspace() functions use now a (cxy,ptr) couple
to identify the target buffer (equivalent to an extended pointer.
3) an implementation bug has been fixed in the assembly code contained
in the hal_copy_to_uspace() and hal_copy_from_uspace() functions.

File:

• trunk/kernel/devices/dev_ioc.c (modified) (7 diffs)

trunk/kernel/devices/dev_ioc.c

@@ -2 +2 @@
  * dev_ioc.c - IOC (Block Device Controler) generic device API implementation.
  *
- * Author  Alain Greiner    (2016,2017,2018)
+ * Author  Alain Greiner    (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -36 +36 @@
 
 extern chdev_directory_t  chdev_dir;     // allocated in kernel_init.c
+
+////////////////////////////////////////
+char * dev_ioc_cmd_str( cmd_type_t cmd )
+{
+    if     ( cmd == IOC_READ       )  return "READ";
+    else if( cmd == IOC_WRITE      )  return "WRITE";
+    else if( cmd == IOC_SYNC_READ  )  return "SYNC_READ";
+    else if( cmd == IOC_SYNC_WRITE )  return "SYNC_WRITE";
+    else                              return "undefined";
+}
 
 //////////////////////////////////
@@ -192 +202 @@
 ////////////////////////////////////i/////////////////////////////////////////////
 error_t dev_ioc_sync_access( uint32_t   cmd_type,
-                             uint8_t  * buffer,
+                             xptr_t     buffer_xp,
                              uint32_t   lba,
                              uint32_t   count )
@@ -202 +212 @@
     if( chdev_dir.iob )
     {
-        if (cmd_type == IOC_SYNC_READ) dev_mmc_inval( XPTR(local_cxy,buffer) , count<<9 );
-        else                           dev_mmc_sync ( XPTR(local_cxy,buffer) , count<<9 );
+        if (cmd_type == IOC_SYNC_READ) dev_mmc_inval( buffer_xp , count<<9 );
+        else                           dev_mmc_sync ( buffer_xp , count<<9 );
     }
 
@@ -215 +225 @@
     this->ioc_cmd.dev_xp    = ioc_xp;
     this->ioc_cmd.type      = cmd_type;
-    this->ioc_cmd.buf_xp    = XPTR( local_cxy , buffer );
+    this->ioc_cmd.buf_xp    = buffer_xp;
     this->ioc_cmd.lba       = lba;
     this->ioc_cmd.count     = count;
@@ -241 +251 @@
     return this->ioc_cmd.error;
 
-}  // end ioc_sync_access()
-
-/////////////////////////////////////////////
-error_t dev_ioc_sync_read( uint8_t  * buffer,
+}  // end dev_ioc_sync_access()
+
+////////////////////////////////////////////////
+error_t dev_ioc_sync_read( xptr_t     buffer_xp,
                            uint32_t   lba,
                            uint32_t   count )
@@ -253 +263 @@
 uint32_t   cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_IOC_RX < cycle )
-printk("\n[%s] thread[%x,%x] : lba  %x / buffer %x / cycle %d\n",
-__FUNCTION__ , this->process->pid, this->trdid, lba, buffer, cycle );
-#endif
-
-    return dev_ioc_sync_access( IOC_SYNC_READ , buffer , lba , count );
+printk("\n[%s] thread[%x,%x] : lba  %x / buffer(%x,%x) / count %d / cycle %d\n",
+__FUNCTION__ , this->process->pid, this->trdid, 
+lba, GET_CXY(buffer_xp), GET_PTR(buffer_xp), count, cycle );
+#endif
+
+    return dev_ioc_sync_access( IOC_SYNC_READ , buffer_xp , lba , count );
 } 
 
-//////////////////////////////////////////////
-error_t dev_ioc_sync_write( uint8_t  * buffer,
+/////////////////////////////////////////////////
+error_t dev_ioc_sync_write( xptr_t     buffer_xp,
                             uint32_t   lba,
                             uint32_t   count )
 {
 
-#if DEBUG_DEV_IOC_RX
-thread_t * this  = CURRENT_THREAD;
-uint32_t   cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_DEV_IOC_RX < cycle )
-printk("\n[%s] thread[%x,%x] enters / lba  %x / buffer %x / cycle %d\n",
-__FUNCTION__ , this->process->pid, this->trdid, lba, buffer, cycle );
-#endif
-
-    return dev_ioc_sync_access( IOC_SYNC_WRITE , buffer , lba , count );
+#if DEBUG_DEV_IOC_TX
+thread_t * this  = CURRENT_THREAD;
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+if( DEBUG_DEV_IOC_TX < cycle )
+printk("\n[%s] thread[%x,%x] : lba  %x / buffer(%x,%x) / count %d / cycle %d\n",
+__FUNCTION__ , this->process->pid, this->trdid,
+lba, GET_CXY(buffer_xp), GET_PTR(buffer_xp), count, cycle );
+#endif
+
+    return dev_ioc_sync_access( IOC_SYNC_WRITE , buffer_xp , lba , count );
 }