Changeset 22fb7ab in mainline for uspace/srv/volsrv

Timestamp:

2015-06-26T16:15:31Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

28ed0d95

Parents:

1356f85a

Message:

Delegate disks to volsrv and labels to vbd.

Location:

uspace/srv/volsrv

Files:

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

uspace/srv/volsrv/disk.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
+#include <vbd.h>
 
 #include "disk.h"
@@ -48 +49 @@
 static int vol_disk_add(service_id_t);
 
-static LIST_INITIALIZE(vol_disks);
+static LIST_INITIALIZE(vol_disks); /* of vol_disk_t */
 static FIBRIL_MUTEX_INITIALIZE(vol_disks_lock);
+static vbd_t *vbd;
 
 /** Check for new disk devices */
@@ -113 +115 @@
 
         link_initialize(&disk->ldisks);
+        disk->dcnt = dc_empty;
 
         return disk;
@@ -129 +132 @@
 {
         vol_disk_t *disk;
+        vbd_disk_info_t dinfo;
         int rc;
 
@@ -147 +151 @@
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "Probe disk %s", disk->svc_name);
-/*      rc = inetcfg_link_add(sid);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed configuring link "
-                    "'%s'.\n", nlink->svc_name);
-                goto error;
-        }
-*/
+
+        rc = vbd_disk_add(vbd, sid);
+        if (rc == EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Disk %s accepted by VBD.",
+                    disk->svc_name);
+
+                rc = vbd_disk_info(vbd, sid, &dinfo);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Cannot get disk label "
+                            "information.");
+                        rc = EIO;
+                        goto error;
+                }
+
+                disk->dcnt = dc_label;
+                disk->ltype = dinfo.ltype;
+        } else {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Disk %s not accepted by VBD.",
+                    disk->svc_name);
+                disk->dcnt = dc_unknown;
+        }
+
         list_append(&disk->ldisks, &vol_disks);
 
@@ -168 +187 @@
 }
 
+int vol_disk_init(void)
+{
+        int rc;
+
+        rc = vbd_create(&vbd);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing VBD.");
+                return EIO;
+        }
+
+        return EOK;
+}
+
 int vol_disk_discovery_start(void)
 {
@@ -182 +214 @@
 }
 
+/** Get list of disks as array of service IDs. */
+int vol_disk_get_ids(service_id_t *id_buf, size_t buf_size, size_t *act_size)
+{
+        size_t act_cnt;
+        size_t buf_cnt;
+
+        fibril_mutex_lock(&vol_disks_lock);
+
+        buf_cnt = buf_size / sizeof(service_id_t);
+
+        act_cnt = list_count(&vol_disks);
+        *act_size = act_cnt * sizeof(service_id_t);
+
+        if (buf_size % sizeof(service_id_t) != 0) {
+                fibril_mutex_unlock(&vol_disks_lock);
+                return EINVAL;
+        }
+
+        size_t pos = 0;
+        list_foreach(vol_disks, ldisks, vol_disk_t, disk) {
+                if (pos < buf_cnt)
+                        id_buf[pos] = disk->svc_id;
+                pos++;
+        }
+
+        fibril_mutex_unlock(&vol_disks_lock);
+        return EOK;
+}
+
+int vol_disk_find_by_id(service_id_t sid, vol_disk_t **rdisk)
+{
+        list_foreach(vol_disks, ldisks, vol_disk_t, disk) {
+                if (disk->svc_id == sid) {
+                        *rdisk = disk;
+                        /* XXX Add reference */
+                        return EOK;
+                }
+        }
+
+        return ENOENT;
+}
+
 /** @}
  */

uspace/srv/volsrv/disk.h

@@ -39 +39 @@
 
 #include <sys/types.h>
+#include "types/disk.h"
 
+extern int vol_disk_init(void);
 extern int vol_disk_discovery_start(void);
+extern int vol_disk_get_ids(service_id_t *, size_t, size_t *);
+extern int vol_disk_find_by_id(service_id_t, vol_disk_t **);
 
 #endif

uspace/srv/volsrv/types/disk.h

@@ -38 +38 @@
 #define TYPES_DISK_H_
 
+#include <types/label.h>
+
 /** Disk */
 typedef struct {
@@ -46 +48 @@
         /** Service name */
         char *svc_name;
+        /** Disk contents */
+        label_disk_cnt_t dcnt;
+        /** Label type */
+        label_type_t ltype;
 } vol_disk_t;
 

uspace/srv/volsrv/volsrv.c

@@ -38 +38 @@
 #include <io/log.h>
 #include <ipc/services.h>
+#include <ipc/vol.h>
 #include <loc.h>
 #include <stdio.h>
@@ -54 +55 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_init()");
 
+        rc = vol_disk_init();
+        if (rc != EOK)
+                return rc;
+
         rc = vol_disk_discovery_start();
         if (rc != EOK)
@@ -76 +81 @@
 }
 
+static void vol_get_disks_srv(ipc_callid_t iid, ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        size_t act_size;
+        int rc;
+
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+
+        service_id_t *id_buf = (service_id_t *) malloc(size);
+        if (id_buf == NULL) {
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        rc = vol_disk_get_ids(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 vol_disk_info_srv(ipc_callid_t iid, ipc_call_t *icall)
+{
+        service_id_t sid;
+        vol_disk_t *disk;
+        int rc;
+
+        sid = IPC_GET_ARG1(*icall);
+        rc = vol_disk_find_by_id(sid, &disk);
+        if (rc != EOK) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        async_answer_2(iid, rc, disk->dcnt, disk->ltype);
+}
+
+static void vol_label_create_srv(ipc_callid_t iid, ipc_call_t *icall)
+{
+        service_id_t sid;
+        vol_disk_t *disk;
+        label_type_t ltype;
+        int rc;
+
+        sid = IPC_GET_ARG1(*icall);
+        ltype = IPC_GET_ARG2(*icall);
+
+        rc = vol_disk_find_by_id(sid, &disk);
+        if (rc != EOK) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        disk->dcnt = dc_label;
+        disk->ltype = ltype;
+
+        async_answer_0(iid, EOK);
+}
+
+static void vol_disk_empty_srv(ipc_callid_t iid, ipc_call_t *icall)
+{
+        service_id_t sid;
+        vol_disk_t *disk;
+        int rc;
+
+        sid = IPC_GET_ARG1(*icall);
+
+        rc = vol_disk_find_by_id(sid, &disk);
+        if (rc != EOK) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        disk->dcnt = dc_empty;
+
+        async_answer_0(iid, EOK);
+}
 
 static void vol_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
@@ -96 +190 @@
 
                 switch (method) {
+                case VOL_GET_DISKS:
+                        vol_get_disks_srv(callid, &call);
+                        break;
+                case VOL_DISK_INFO:
+                        vol_disk_info_srv(callid, &call);
+                        break;
+                case VOL_LABEL_CREATE:
+                        vol_label_create_srv(callid, &call);
+                        break;
+                case VOL_DISK_EMPTY:
+                        vol_disk_empty_srv(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, EINVAL);