Changeset 1626cd4 in mainline for uspace/srv

Timestamp:

2015-07-02T19:01:37Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6a0d4ce2

Parents:

3faa03d

Message:

Propagate label and partition block ranges and other info up through the stack.

Location:

uspace/srv

Files:

• bd/vbd/disk.c (modified) (3 diffs)
• bd/vbd/disk.h (modified) (1 diff)
• bd/vbd/types/vbd.h (modified) (3 diffs)
• bd/vbd/vbd.c (modified) (4 diffs)
• volsrv/disk.c (modified) (2 diffs)

uspace/srv/bd/vbd/disk.c

@@ -268 +268 @@
 int vbds_disk_info(service_id_t sid, vbds_disk_info_t *info)
 {
+        vbds_disk_t *disk;
+        label_info_t linfo;
+        int rc;
+
         log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_disk_info(%zu)", sid);
-        info->ltype = lt_mbr;
-        return EOK;
-}
+
+        rc = vbds_disk_by_svcid(sid, &disk);
+        if (rc != EOK)
+                return rc;
+
+        rc = label_get_info(disk->label, &linfo);
+
+        info->ltype = linfo.ltype;
+        info->ablock0 = linfo.ablock0;
+        info->anblocks = linfo.anblocks;
+        info->block_size = disk->block_size;
+        return EOK;
+}
+
+int vbds_get_parts(service_id_t sid, service_id_t *id_buf, size_t buf_size,
+    size_t *act_size)
+{
+        vbds_disk_t *disk;
+        size_t act_cnt;
+        size_t buf_cnt;
+        int rc;
+
+        rc = vbds_disk_by_svcid(sid, &disk);
+        if (rc != EOK)
+                return rc;
+
+        buf_cnt = buf_size / sizeof(service_id_t);
+
+        act_cnt = list_count(&disk->parts);
+        *act_size = act_cnt * sizeof(service_id_t);
+
+        if (buf_size % sizeof(service_id_t) != 0)
+                return EINVAL;
+
+        size_t pos = 0;
+        list_foreach(disk->parts, ldisk, vbds_part_t, part) {
+                if (pos < buf_cnt)
+                        id_buf[pos] = part->id;
+                pos++;
+        }
+
+        return EOK;
+}
+
 
 int vbds_label_create(service_id_t sid, label_type_t ltype)
@@ -328 +373 @@
 {
         vbds_part_t *part;
+        label_part_info_t lpinfo;
         int rc;
 
@@ -334 +380 @@
                 return rc;
 
+        label_part_get_info(part->lpart, &lpinfo);
+
+        pinfo->index = lpinfo.index;
+        pinfo->block0 = lpinfo.block0;
+        pinfo->nblocks = lpinfo.nblocks;
         return EOK;
 }

uspace/srv/bd/vbd/disk.h

@@ -45 +45 @@
 extern int vbds_disk_remove(service_id_t);
 extern int vbds_disk_info(service_id_t, vbds_disk_info_t *);
+extern int vbds_get_parts(service_id_t, service_id_t *, size_t, size_t *);
 extern int vbds_label_create(service_id_t, label_type_t);
 extern int vbds_label_delete(service_id_t);

uspace/srv/bd/vbd/types/vbd.h

@@ -42 +42 @@
 #include <label.h>
 #include <loc.h>
+#include <sys/types.h>
 #include <types/label.h>
 
@@ -48 +49 @@
 /** Disk info */
 typedef struct {
-        /** Label */
-        label_t *label;
         /** Label type */
         label_type_t ltype;
+        /** First block that can be allocated */
+        aoff64_t ablock0;
+        /** Number of blocks that can be allocated */
+        aoff64_t anblocks;
+        /** Block size */
+        size_t block_size;
 } vbds_disk_info_t;
 
@@ -92 +97 @@
 } vbds_disk_t;
 
+/** Partition info */
 typedef struct {
+        /** Partition index */
+        int index;
+        /** First block */
+        aoff64_t block0;
+        /** Number of blocks */
+        aoff64_t nblocks;
 } vbds_part_info_t;
 

uspace/srv/bd/vbd/vbd.c

@@ -40 +40 @@
 #include <ipc/vbd.h>
 #include <loc.h>
+#include <macros.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -112 +113 @@
         disk_sid = IPC_GET_ARG1(*icall);
         rc = vbds_disk_info(disk_sid, &dinfo);
-        async_answer_1(iid, (sysarg_t)rc, (sysarg_t)dinfo.ltype);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() call failed");
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() data_read_receive");
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_read_receive(&callid, &size)) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() failed");
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() check size");
+        if (size != sizeof(vbds_disk_info_t)) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() wrong size");
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() data_read_finalize");
+        rc = async_data_read_finalize(callid, &dinfo,
+            min(size, sizeof(dinfo)));
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() reply EOK");
+        async_answer_0(iid, EOK);
 }
 
@@ -143 +178 @@
 static void vbds_label_get_parts_srv(ipc_callid_t iid, ipc_call_t *icall)
 {
-//      service_id_t disk_sid;
-//      int rc;
+        ipc_callid_t callid;
+        size_t size;
+        size_t act_size;
+        service_id_t sid;
+        int rc;
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_label_get_parts_srv()");
 
-//      disk_sid = IPC_GET_ARG1(*icall);
-//      rc = vbds_label_delete(disk_sid);
-//      async_answer_0(iid, (sysarg_t) rc);
-        async_answer_0(iid, ENOTSUP);
-}
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+
+        sid = IPC_GET_ARG1(*icall);
+
+        category_id_t *id_buf = (category_id_t *) malloc(size);
+        if (id_buf == NULL) {
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        rc = vbds_get_parts(sid, id_buf, size, &act_size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        sysarg_t retval = async_data_read_finalize(callid, id_buf, size);
+        free(id_buf);
+
+        async_answer_1(iid, retval, act_size);
+}
+
 
 static void vbds_part_get_info_srv(ipc_callid_t iid, ipc_call_t *icall)
@@ -164 +225 @@
         part = IPC_GET_ARG1(*icall);
         rc = vbds_part_get_info(part, &pinfo);
-        async_answer_0(iid, (sysarg_t)rc);
+        async_answer_5(iid, (sysarg_t)rc, pinfo.index,
+            LOWER32(pinfo.block0), UPPER32(pinfo.block0),
+            LOWER32(pinfo.nblocks), UPPER32(pinfo.nblocks));
 }
 

uspace/srv/volsrv/disk.c

@@ -137 +137 @@
         assert(fibril_mutex_is_locked(&vol_disks_lock));
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_disk_add()");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_disk_add()");
         disk = vol_disk_new();
         if (disk == NULL)
@@ -158 +158 @@
 
                 rc = vbd_disk_info(vbd, sid, &dinfo);
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Got disk info.");
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_NOTE, "Cannot get disk label "