Changeset 372df8f in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2015-10-09T07:00:23Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0ecfc62

Parents:

0bde8523

Message:

Let VBD handle unlabeled devices too. Now volsrv only cares about partitions.

File:

• uspace/srv/bd/vbd/disk.c (modified) (6 diffs)

uspace/srv/bd/vbd/disk.c

@@ -48 +48 @@
 #include "types/vbd.h"
 
+static fibril_mutex_t vbds_disks_lock;
 static list_t vbds_disks; /* of vbds_disk_t */
 static list_t vbds_parts; /* of vbds_part_t */
+
+static category_id_t part_cid;
 
 static int vbds_bd_open(bd_srvs_t *, bd_srv_t *);
@@ -83 +86 @@
 }
 
-void vbds_disks_init(void)
-{
+int vbds_disks_init(void)
+{
+        int rc;
+
+        fibril_mutex_initialize(&vbds_disks_lock);
         list_initialize(&vbds_disks);
         list_initialize(&vbds_parts);
-}
+
+        rc = loc_category_get_id("partition", &part_cid, 0);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Error looking up partition "
+                    "category.");
+                return EIO;
+        }
+
+        return EOK;
+}
+
+/** Check for new disk devices */
+static int vbds_disks_check_new(void)
+{
+        bool already_known;
+        category_id_t disk_cat;
+        service_id_t *svcs;
+        size_t count, i;
+        int rc;
+
+        fibril_mutex_lock(&vbds_disks_lock);
+
+        rc = loc_category_get_id("disk", &disk_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'disk'.");
+                fibril_mutex_unlock(&vbds_disks_lock);
+                return ENOENT;
+        }
+
+        rc = loc_category_get_svcs(disk_cat, &svcs, &count);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting list of disk "
+                    "devices.");
+                fibril_mutex_unlock(&vbds_disks_lock);
+                return EIO;
+        }
+
+        for (i = 0; i < count; i++) {
+                already_known = false;
+
+                list_foreach(vbds_disks, ldisks, vbds_disk_t, disk) {
+                        if (disk->svc_id == svcs[i]) {
+                                already_known = true;
+                                break;
+                        }
+                }
+
+                if (!already_known) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Found disk '%lu'",
+                            (unsigned long) svcs[i]);
+                        rc = vbds_disk_add(svcs[i]);
+                        if (rc != EOK) {
+                                log_msg(LOG_DEFAULT, LVL_ERROR, "Could not add "
+                                    "disk.");
+                        }
+                }
+        }
+
+        fibril_mutex_unlock(&vbds_disks_lock);
+        return EOK;
+}
+
 
 static int vbds_disk_by_svcid(service_id_t sid, vbds_disk_t **rdisk)
@@ -210 +277 @@
 }
 
+static void vbds_disk_cat_change_cb(void)
+{
+        (void) vbds_disks_check_new();
+}
+
+int vbds_disk_discovery_start(void)
+{
+        int rc;
+
+        rc = loc_register_cat_change_cb(vbds_disk_cat_change_cb);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback "
+                    "for disk discovery (%d).", rc);
+                return rc;
+        }
+
+        return vbds_disks_check_new();
+}
+
 int vbds_disk_add(service_id_t sid)
 {
@@ -277 +363 @@
                 rc = vbds_part_add(disk, part, NULL);
                 if (rc != EOK) {
-                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding partitio "
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding partition "
                             "(disk %s)", disk->svc_name);
                 }
@@ -313 +399 @@
         block_fini(sid);
         free(disk);
+        return EOK;
+}
+
+/** Get list of disks as array of service IDs. */
+int vbds_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(&vbds_disks_lock);
+
+        buf_cnt = buf_size / sizeof(service_id_t);
+
+        act_cnt = list_count(&vbds_disks);
+        *act_size = act_cnt * sizeof(service_id_t);
+
+        if (buf_size % sizeof(service_id_t) != 0) {
+                fibril_mutex_unlock(&vbds_disks_lock);
+                return EINVAL;
+        }
+
+        size_t pos = 0;
+        list_foreach(vbds_disks, ldisks, vbds_disk_t, disk) {
+                if (pos < buf_cnt)
+                        id_buf[pos] = disk->svc_id;
+                pos++;
+        }
+
+        fibril_mutex_unlock(&vbds_disks_lock);
         return EOK;
 }
@@ -751 +866 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering "
-                    "service %s.", name);
+                    "service %s (%d).", name, rc);
                 free(name);
                 free(part);
+                return EIO;
+        }
+
+        rc = loc_service_add_to_cat(psid, part_cid);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failled adding partition "
+                    "service %s to partition category.", name);
+                free(name);
+                free(part);
+
+                rc = loc_service_unregister(psid);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Error unregistering "
+                            "service. Rollback failed.");
+                }
                 return EIO;
         }