Changes in uspace/srv/bd/rd/rd.c [52e4f526:47b7006] in mainline

File:

• uspace/srv/bd/rd/rd.c (modified) (10 diffs)

uspace/srv/bd/rd/rd.c

@@ -32 +32 @@
 /** @addtogroup rd
  * @{
- */ 
+ */
 
 /**
- * @file        rd.c
- * @brief       Initial RAM disk for HelenOS.
- */
-
-#include <ipc/ipc.h>
+ * @file rd.c
+ * @brief Initial RAM disk for HelenOS.
+ */
+
 #include <ipc/services.h>
 #include <ipc/ns.h>
@@ -51 +50 @@
 #include <align.h>
 #include <async.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <stdio.h>
 #include <devmap.h>
 #include <ipc/bd.h>
+#include <macros.h>
 
 #define NAME "rd"
 
-/** Pointer to the ramdisk's image. */
+/** Pointer to the ramdisk's image */
 static void *rd_addr;
-/** Size of the ramdisk. */
+
+/** Size of the ramdisk */
 static size_t rd_size;
 
-/**
- * This rwlock protects the ramdisk's data.
+/** Block size */
+static const size_t block_size = 512;
+
+static int rd_read_blocks(uint64_t ba, size_t cnt, void *buf);
+static int rd_write_blocks(uint64_t ba, size_t cnt, const void *buf);
+
+/** This rwlock protects the ramdisk's data.
+ *
  * If we were to serve multiple requests (read + write or several writes)
- * concurrently (i.e. from two or more threads), each read and write needs to be
- * protected by this rwlock.
- */ 
+ * concurrently (i.e. from two or more threads), each read and write needs to
+ * be protected by this rwlock.
+ *
+ */
 fibril_rwlock_t rd_lock;
 
 /** Handle one connection to ramdisk.
  *
- * @param iid           Hash of the request that opened the connection.
- * @param icall         Call data of the request that opened the connection.
+ * @param iid   Hash of the request that opened the connection.
+ * @param icall Call data of the request that opened the connection.
  */
 static void rd_connection(ipc_callid_t iid, ipc_call_t *icall)
@@ -82 +90 @@
         int retval;
         void *fs_va = NULL;
-        off_t offset;
-        size_t block_size;
-        size_t maxblock_size;
-
+        uint64_t ba;
+        size_t cnt;
+        size_t comm_size;
+        
         /*
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
-
+        async_answer_0(iid, EOK);
+        
         /*
          * Now we wait for the client to send us its communication as_area.
          */
-        int flags;
-        if (ipc_share_out_receive(&callid, &maxblock_size, &flags)) {
-                fs_va = as_get_mappable_page(maxblock_size);
+        unsigned int flags;
+        if (async_share_out_receive(&callid, &comm_size, &flags)) {
+                fs_va = as_get_mappable_page(comm_size);
                 if (fs_va) {
-                        (void) ipc_share_out_finalize(callid, fs_va);
+                        (void) async_share_out_finalize(callid, fs_va);
                 } else {
-                        ipc_answer_0(callid, EHANGUP);
-                        return;         
+                        async_answer_0(callid, EHANGUP);
+                        return;
                 }
         } else {
@@ -109 +117 @@
                  * Close the connection.
                  */
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -115 +123 @@
         while (true) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         /*
@@ -121 +129 @@
                          * Answer the message and exit the fibril.
                          */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
-                case BD_READ_BLOCK:
-                        offset = IPC_GET_ARG1(call);
-                        block_size = IPC_GET_ARG2(call);
-                        if (block_size > maxblock_size) {
-                                /*
-                                 * Maximum block size exceeded.
-                                 */
+                case BD_READ_BLOCKS:
+                        ba = MERGE_LOUP32(IPC_GET_ARG1(call),
+                            IPC_GET_ARG2(call));
+                        cnt = IPC_GET_ARG3(call);
+                        if (cnt * block_size > comm_size) {
                                 retval = ELIMIT;
                                 break;
                         }
-                        if (offset * block_size > rd_size - block_size) {
-                                /*
-                                 * Reading past the end of the device.
-                                 */
+                        retval = rd_read_blocks(ba, cnt, fs_va);
+                        break;
+                case BD_WRITE_BLOCKS:
+                        ba = MERGE_LOUP32(IPC_GET_ARG1(call),
+                            IPC_GET_ARG2(call));
+                        cnt = IPC_GET_ARG3(call);
+                        if (cnt * block_size > comm_size) {
                                 retval = ELIMIT;
                                 break;
                         }
-                        fibril_rwlock_read_lock(&rd_lock);
-                        memcpy(fs_va, rd_addr + offset * block_size, block_size);
-                        fibril_rwlock_read_unlock(&rd_lock);
-                        retval = EOK;
+                        retval = rd_write_blocks(ba, cnt, fs_va);
                         break;
-                case BD_WRITE_BLOCK:
-                        offset = IPC_GET_ARG1(call);
-                        block_size = IPC_GET_ARG2(call);
-                        if (block_size > maxblock_size) {
-                                /*
-                                 * Maximum block size exceeded.
-                                 */
-                                retval = ELIMIT;
-                                break;
-                        }
-                        if (offset * block_size > rd_size - block_size) {
-                                /*
-                                 * Writing past the end of the device.
-                                 */
-                                retval = ELIMIT;
-                                break;
-                        }
-                        fibril_rwlock_write_lock(&rd_lock);
-                        memcpy(rd_addr + offset * block_size, fs_va, block_size);
-                        fibril_rwlock_write_unlock(&rd_lock);
-                        retval = EOK;
-                        break;
+                case BD_GET_BLOCK_SIZE:
+                        async_answer_1(callid, EOK, block_size);
+                        continue;
+                case BD_GET_NUM_BLOCKS:
+                        async_answer_2(callid, EOK, LOWER32(rd_size / block_size),
+                            UPPER32(rd_size / block_size));
+                        continue;
                 default:
                         /*
@@ -177 +168 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
-        }
+                async_answer_0(callid, retval);
+        }
+}
+
+/** Read blocks from the device. */
+static int rd_read_blocks(uint64_t ba, size_t cnt, void *buf)
+{
+        if ((ba + cnt) * block_size > rd_size) {
+                /* Reading past the end of the device. */
+                return ELIMIT;
+        }
+        
+        fibril_rwlock_read_lock(&rd_lock);
+        memcpy(buf, rd_addr + ba * block_size, block_size * cnt);
+        fibril_rwlock_read_unlock(&rd_lock);
+        
+        return EOK;
+}
+
+/** Write blocks to the device. */
+static int rd_write_blocks(uint64_t ba, size_t cnt, const void *buf)
+{
+        if ((ba + cnt) * block_size > rd_size) {
+                /* Writing past the end of the device. */
+                return ELIMIT;
+        }
+        
+        fibril_rwlock_write_lock(&rd_lock);
+        memcpy(rd_addr + ba * block_size, buf, block_size * cnt);
+        fibril_rwlock_write_unlock(&rd_lock);
+        
+        return EOK;
 }
 
@@ -184 +205 @@
 static bool rd_init(void)
 {
-        rd_size = sysinfo_value("rd.size");
-        void *rd_ph_addr = (void *) sysinfo_value("rd.address.physical");
-        
-        if (rd_size == 0) {
-                printf(NAME ": No RAM disk found\n");
+        int ret = sysinfo_get_value("rd.size", &rd_size);
+        if ((ret != EOK) || (rd_size == 0)) {
+                printf("%s: No RAM disk found\n", NAME);
+                return false;
+        }
+        
+        sysarg_t rd_ph_addr;
+        ret = sysinfo_get_value("rd.address.physical", &rd_ph_addr);
+        if ((ret != EOK) || (rd_ph_addr == 0)) {
+                printf("%s: Invalid RAM disk physical address\n", NAME);
                 return false;
         }
@@ -195 +221 @@
         
         int flags = AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
-        int retval = physmem_map(rd_ph_addr, rd_addr,
+        int retval = physmem_map((void *) rd_ph_addr, rd_addr,
             ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
         
         if (retval < 0) {
-                printf(NAME ": Error mapping RAM disk\n");
-                return false;
-        }
-        
-        printf(NAME ": Found RAM disk at %p, %d bytes\n", rd_ph_addr, rd_size);
+                printf("%s: Error mapping RAM disk\n", NAME);
+                return false;
+        }
+        
+        printf("%s: Found RAM disk at %p, %zu bytes\n", NAME,
+            (void *) rd_ph_addr, rd_size);
         
         int rc = devmap_driver_register(NAME, rd_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register driver (%d)\n", rc);
-                return false;
-        }
-        
-        dev_handle_t dev_handle;
-        if (devmap_device_register("initrd", &dev_handle) != EOK) {
-                devmap_hangup_phone(DEVMAP_DRIVER);
-                printf(NAME ": Unable to register device\n");
+                printf("%s: Unable to register driver (%d)\n", NAME, rc);
+                return false;
+        }
+        
+        devmap_handle_t devmap_handle;
+        if (devmap_device_register("bd/initrd", &devmap_handle) != EOK) {
+                printf("%s: Unable to register device\n", NAME);
                 return false;
         }
@@ -225 +251 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS RAM disk server\n");
+        printf("%s: HelenOS RAM disk server\n", NAME);
         
         if (!rd_init())
                 return -1;
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         async_manager();