Changeset 64ffd83 in mainline

Timestamp:

2018-07-24T09:43:38Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bec18a9

Parents:

05208d9

git-author:

Jiri Svoboda <jiri@…> (2018-07-23 18:41:45)

git-committer:

Jiri Svoboda <jiri@…> (2018-07-24 09:43:38)

Message:

Configuring mount point for (newly created) paritions.

Files:

• .gitignore (modified) (1 diff)
• boot/Makefile.common (modified) (1 diff)
• uspace/app/fdisk/fdisk.c (modified) (5 diffs)
• uspace/app/sysinst/sysinst.c (modified) (1 diff)
• uspace/lib/c/generic/vol.c (modified) (5 diffs)
• uspace/lib/c/include/ipc/vol.h (modified) (1 diff)
• uspace/lib/c/include/vol.h (modified) (1 diff)
• uspace/lib/fdisk/include/types/fdisk.h (modified) (1 diff)
• uspace/lib/fdisk/src/fdisk.c (modified) (3 diffs)
• uspace/srv/volsrv/Makefile (modified) (1 diff)
• uspace/srv/volsrv/part.c (modified) (12 diffs)
• uspace/srv/volsrv/part.h (modified) (2 diffs)
• uspace/srv/volsrv/test/main.c (added)
• uspace/srv/volsrv/test/volume.c (added)
• uspace/srv/volsrv/types/part.h (modified) (2 diffs)
• uspace/srv/volsrv/types/volume.h (added)
• uspace/srv/volsrv/volsrv.c (modified) (7 diffs)
• uspace/srv/volsrv/volume.c (added)
• uspace/srv/volsrv/volume.h (added)

.gitignore

@@ -427 +427 @@
 uspace/srv/test/chardev-test/chardev-test
 uspace/srv/vfs/vfs
+uspace/srv/volsrv/test-volsrv
 uspace/srv/volsrv/volsrv

boot/Makefile.common

@@ -243 +243 @@
         $(USPACE_PATH)/drv/bus/usb/xhci/test-xhci \
         $(USPACE_PATH)/app/bdsh/test-bdsh \
-        $(USPACE_PATH)/srv/net/tcp/test-tcp
+        $(USPACE_PATH)/srv/net/tcp/test-tcp \
+        $(USPACE_PATH)/srv/volsrv/test-volsrv \
 
 RD_DATA_ESSENTIAL = \

uspace/app/fdisk/fdisk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -432 +432 @@
         char *smcap = NULL;
         char *label = NULL;
+        char *mountp = NULL;
 
         if (pkind == lpk_logical)
@@ -506 +507 @@
         }
 
+        /* Ask for mount point */
+        tinput = tinput_new();
+        if (tinput == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        rc = tinput_set_prompt(tinput, "?> ");
+        if (rc != EOK)
+                goto error;
+
+        while (true) {
+                printf("Enter mount point for new partition (Auto, None or /path).\n");
+                rc = tinput_read_i(tinput, "Auto", &mountp);
+                if (rc != EOK)
+                        goto error;
+
+                rc = vol_mountp_validate(mountp);
+                if (rc == EOK)
+                        break;
+
+                free(mountp);
+                mountp = NULL;
+        }
+
+        tinput_destroy(tinput);
+        tinput = NULL;
+
         fdisk_pspec_init(&pspec);
         pspec.capacity = cap;
@@ -511 +540 @@
         pspec.fstype = fstype;
         pspec.label = label;
+        pspec.mountp = mountp;
 
         rc = fdisk_part_create(dev, &pspec, NULL);
@@ -519 +549 @@
 
         free(label);
+        free(mountp);
         return EOK;
 error:
         free(smcap);
         free(label);
+        free(mountp);
         if (tinput != NULL)
                 tinput_destroy(tinput);

uspace/app/sysinst/sysinst.c

@@ -132 +132 @@
         pspec.pkind = lpk_primary;
         pspec.fstype = fs_minix;
+        pspec.mountp = "";
 
         rc = fdisk_part_create(fdev, &pspec, &part);

uspace/lib/c/generic/vol.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <str.h>
+#include <vfs/vfs.h>
 #include <vol.h>
 
@@ -220 +221 @@
         exch = async_exchange_begin(vol->sess);
         aid_t req = async_send_1(exch, VOL_PART_INFO, sid, &answer);
+
         errno_t rc = async_data_read_start(exch, vinfo, sizeof(vol_part_info_t));
         async_exchange_end(exch);
-
         if (rc != EOK) {
                 async_forget(req);
@@ -294 +295 @@
 }
 
-/** Create file system. */
+/** Create file system.
+ *
+ * @param vol Volume service
+ * @param sid Partition service ID
+ * @param fstype File system type
+ * @param label Volume label
+ * @param mountp Mount point
+ *
+ * @return EOK on success or an error code
+ */
 errno_t vol_part_mkfs(vol_t *vol, service_id_t sid, vol_fstype_t fstype,
-    const char *label)
+    const char *label, const char *mountp)
 {
         async_exch_t *exch;
@@ -304 +314 @@
         exch = async_exchange_begin(vol->sess);
         aid_t req = async_send_2(exch, VOL_PART_MKFS, sid, fstype, &answer);
+
         retval = async_data_write_start(exch, label, str_size(label));
-        async_exchange_end(exch);
-
         if (retval != EOK) {
+                async_exchange_end(exch);
                 async_forget(req);
                 return retval;
         }
 
+        retval = async_data_write_start(exch, mountp, str_size(mountp));
+        if (retval != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return retval;
+        }
+
+        async_exchange_end(exch);
         async_wait_for(req, &retval);
 
@@ -394 +412 @@
 }
 
+/** Validate mount point.
+ *
+ * Verify that mount point is valid. A valid mount point is
+ * one of:
+ *  - 'Auto'
+ *  - 'None'
+ *  - /path (string beginning with '/') to an existing directory
+ *
+ * @return EOK if mount point is in valid, EINVAL if the format is invalid,
+ *         ENOENT if the directory does not exist
+ */
+errno_t vol_mountp_validate(const char *mountp)
+{
+        errno_t rc;
+        vfs_stat_t stat;
+
+        if (str_cmp(mountp, "Auto") == 0 || str_cmp(mountp, "auto") == 0)
+                return EOK;
+
+        if (str_casecmp(mountp, "None") == 0 || str_cmp(mountp, "none") == 0)
+                return EOK;
+
+        if (mountp[0] == '/') {
+                rc = vfs_stat_path(mountp, &stat);
+                if (rc != EOK || !stat.is_directory)
+                        return ENOENT;
+
+                return EOK;
+        }
+
+        return EINVAL;
+}
+
 /** @}
  */

uspace/lib/c/include/ipc/vol.h

@@ -37 +37 @@
 
 #define VOL_LABEL_MAXLEN 63
+#define VOL_MOUNTP_MAXLEN 4096
 
 typedef enum {

uspace/lib/c/include/vol.h

@@ -51 +51 @@
 extern errno_t vol_part_empty(vol_t *, service_id_t);
 extern errno_t vol_part_get_lsupp(vol_t *, vol_fstype_t, vol_label_supp_t *);
-extern errno_t vol_part_mkfs(vol_t *, service_id_t, vol_fstype_t, const char *);
+extern errno_t vol_part_mkfs(vol_t *, service_id_t, vol_fstype_t, const char *,
+    const char *);
 
 extern errno_t vol_fstype_format(vol_fstype_t, char **);
 extern errno_t vol_pcnt_fs_format(vol_part_cnt_t, vol_fstype_t, char **);
+extern errno_t vol_mountp_validate(const char *);
 
 #endif

uspace/lib/fdisk/include/types/fdisk.h

@@ -156 +156 @@
         vol_fstype_t fstype;
         /** Volume label */
-        char *label;
+        const char *label;
+        /** Mount point */
+        const char *mountp;
 } fdisk_part_spec_t;
 

uspace/lib/fdisk/src/fdisk.c

@@ -729 +729 @@
 }
 
+/** Create partition.
+ *
+ * Create new partition based on a specification.
+ *
+ * @param dev Fdisk device
+ * @param pspec Partition specification
+ * @param rpart Place to store pointer to new partition
+ *
+ * @return EOK on success or error code
+ */
 errno_t fdisk_part_create(fdisk_dev_t *dev, fdisk_part_spec_t *pspec,
     fdisk_part_t **rpart)
@@ -737 +747 @@
         vol_part_info_t vpinfo;
         const char *label;
+        const char *mountp;
         errno_t rc;
 
         label = pspec->label != NULL ? pspec->label : "";
+        mountp = pspec->mountp != NULL ? pspec->mountp : "";
 
         rc = fdisk_part_spec_prepare(dev, pspec, &vpspec);
@@ -761 +773 @@
         if (part->svc_id != 0) {
                 rc = vol_part_mkfs(dev->fdisk->vol, part->svc_id, pspec->fstype,
-                    label);
+                    label, mountp);
                 if (rc != EOK && rc != ENOTSUP) {
                         rc = EIO;

uspace/srv/volsrv/Makefile

@@ -37 +37 @@
         mkfs.c \
         part.c \
-        volsrv.c
+        volsrv.c \
+        volume.c
+
+TEST_SOURCES = \
+        volume.c \
+        test/main.c \
+        test/volume.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/volsrv/part.c

@@ -45 +45 @@
 #include <str_error.h>
 #include <vfs/vfs.h>
+#include <vol.h>
 
 #include "empty.h"
@@ -50 +51 @@
 #include "part.h"
 #include "types/part.h"
+#include "volume.h"
 
 static errno_t vol_part_add_locked(vol_parts_t *, service_id_t);
@@ -191 +193 @@
                 return;
 
+        if (part->volume != NULL)
+                vol_volume_del_ref(part->volume);
+
         free(part->cur_mp);
         free(part->svc_name);
@@ -202 +207 @@
         struct fsname_type *fst;
         char *label;
+        vol_volume_t *volume;
         errno_t rc;
 
@@ -250 +256 @@
         }
 
+        /* Look up new or existing volume. */
+        rc = vol_volume_lookup_ref(part->parts->volumes, part->label, &volume);
+        if (rc != EOK)
+                goto error;
+
+        part->volume = volume;
         return EOK;
 
@@ -275 +287 @@
 }
 
+/** Determine the default mount point for a partition.
+ *
+ * @param part Partition
+ * @return Pointer to the constant string "Auto" or "None"
+ */
+static const char *vol_part_def_mountp(vol_part_t *part)
+{
+        return vol_part_allow_mount_by_def(part) ? "Auto" : "None";
+}
+
+/** Mount partition.
+ *
+ * @param part Partition
+ */
 static errno_t vol_part_mount(vol_part_t *part)
 {
+        const char *cfg_mp;
         char *mp;
         int err;
-        errno_t rc;
-
-        if (str_size(part->label) < 1) {
-                /* Don't mount nameless volumes */
-                log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting nameless partition.");
+        bool mp_auto;
+        errno_t rc;
+
+        /* Get configured mount point */
+        if (str_size(part->volume->mountp) > 0) {
+                cfg_mp = part->volume->mountp;
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Configured mount point '%s",
+                    cfg_mp);
+        } else {
+                cfg_mp = vol_part_def_mountp(part);
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Default mount point '%s",
+                    cfg_mp);
+        }
+
+        if (str_cmp(cfg_mp, "Auto") == 0 || str_cmp(cfg_mp, "auto") == 0) {
+
+                if (str_size(part->label) < 1) {
+                        /* Don't mount nameless volumes */
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting nameless volume.");
+                        return EOK;
+                }
+
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Determine MP label='%s'", part->label);
+                err = asprintf(&mp, "/vol/%s", part->label);
+                if (err < 0) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory");
+                        return ENOMEM;
+                }
+
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Create mount point '%s'", mp);
+                rc = vfs_link_path(mp, KIND_DIRECTORY, NULL);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Error creating mount point '%s'",
+                            mp);
+                        free(mp);
+                        return EIO;
+                }
+
+                mp_auto = true;
+        } else if (str_cmp(cfg_mp, "None") == 0 || str_cmp(cfg_mp, "none") == 0) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting volume.");
                 return EOK;
-        }
-
-        if (!vol_part_allow_mount_by_def(part)) {
-                /* Don't mount partition by default */
-                log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting per default policy.");
-                return EOK;
-        }
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "Determine MP label='%s'", part->label);
-        err = asprintf(&mp, "/vol/%s", part->label);
-        if (err < 0) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory");
-                return ENOMEM;
-        }
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "Create mount point '%s'", mp);
-        rc = vfs_link_path(mp, KIND_DIRECTORY, NULL);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Error creating mount point '%s'",
-                    mp);
-                free(mp);
-                return EIO;
+        } else {
+                mp = str_dup(cfg_mp);
+                mp_auto = false;
         }
 
@@ -319 +363 @@
 
         part->cur_mp = mp;
-        part->cur_mp_auto = true;
+        part->cur_mp_auto = mp_auto;
 
         return rc;
@@ -385 +429 @@
 }
 
-errno_t vol_part_add(vol_parts_t *parts, service_id_t sid)
+errno_t vol_part_add_part(vol_parts_t *parts, service_id_t sid)
 {
         errno_t rc;
@@ -403 +447 @@
 }
 
-errno_t vol_parts_create(vol_parts_t **rparts)
+errno_t vol_parts_create(vol_volumes_t *volumes, vol_parts_t **rparts)
 {
         vol_parts_t *parts;
@@ -413 +457 @@
         fibril_mutex_initialize(&parts->lock);
         list_initialize(&parts->parts);
+        parts->volumes = volumes;
 
         *rparts = parts;
@@ -557 +602 @@
 }
 
+/** Set mount point.
+ *
+ * Verify and set a mount point. If the value of the mount point is
+ * the same as the default value, we will actually unset the mount point
+ * value (therefore effectively changing it to use the default).
+ *
+ * @return EOK on success, error code otherwise
+ */
+static errno_t vol_part_mountp_set(vol_part_t *part, const char *mountp)
+{
+        errno_t rc;
+        const char *def_mp;
+        const char *mp;
+
+        rc = vol_mountp_validate(mountp);
+        if (rc != EOK)
+                return rc;
+
+        def_mp = vol_part_def_mountp(part);
+
+        /* If the value is the same as default, set to empty string. */
+        if (str_cmp(def_mp, mountp) == 0)
+                mp = "";
+        else
+                mp = mountp;
+
+        rc = vol_volume_set_mountp(part->volume, mp);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 errno_t vol_part_mkfs_part(vol_part_t *part, vol_fstype_t fstype,
-    const char *label)
+    const char *label, const char *mountp)
 {
         errno_t rc;
@@ -585 +663 @@
         }
 
+        rc = vol_part_mountp_set(part, mountp);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&part->parts->lock);
+                return rc;
+        }
+
         rc = vol_part_mount(part);
         if (rc != EOK) {

uspace/srv/volsrv/part.h

@@ -42 +42 @@
 #include <types/vol.h>
 #include "types/part.h"
+#include "types/volume.h"
 
-extern errno_t vol_parts_create(vol_parts_t **);
+extern errno_t vol_parts_create(vol_volumes_t *, vol_parts_t **);
 extern void vol_parts_destroy(vol_parts_t *);
 extern errno_t vol_part_discovery_start(vol_parts_t *);
-extern errno_t vol_part_add(vol_parts_t *, service_id_t);
+extern errno_t vol_part_add_part(vol_parts_t *, service_id_t);
 extern errno_t vol_part_get_ids(vol_parts_t *, service_id_t *, size_t,
     size_t *);
@@ -54 +55 @@
 extern errno_t vol_part_eject_part(vol_part_t *);
 extern errno_t vol_part_empty_part(vol_part_t *);
-extern errno_t vol_part_mkfs_part(vol_part_t *, vol_fstype_t, const char *);
+extern errno_t vol_part_mkfs_part(vol_part_t *, vol_fstype_t, const char *,
+    const char *);
 extern errno_t vol_part_get_info(vol_part_t *, vol_part_info_t *);
 

uspace/srv/volsrv/types/part.h

@@ -66 +66 @@
         /** Mounted at automatic mount point */
         bool cur_mp_auto;
+        /** Volume */
+        struct vol_volume *volume;
 } vol_part_t;
 
@@ -74 +76 @@
         /** Partitions (list of vol_part_t) */
         list_t parts;
+        /** Underlying volumes */
+        struct vol_volumes *volumes;
 } vol_parts_t;
 

uspace/srv/volsrv/volsrv.c

@@ -49 +49 @@
 #include "mkfs.h"
 #include "part.h"
+#include "volume.h"
 
 #define NAME  "volsrv"
@@ -57 +58 @@
 {
         errno_t rc;
+        vol_volumes_t *volumes = NULL;
         vol_parts_t *parts = NULL;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_init()");
 
-        rc = vol_parts_create(&parts);
+        rc = vol_volumes_create(&volumes);
+        if (rc != EOK)
+                goto error;
+
+        rc = vol_parts_create(volumes, &parts);
         if (rc != EOK)
                 goto error;
@@ -87 +93 @@
         return EOK;
 error:
+        vol_volumes_destroy(volumes);
         vol_parts_destroy(parts);
         return rc;
@@ -131 +138 @@
         sid = IPC_GET_ARG1(*icall);
 
-        rc = vol_part_add(parts, sid);
+        rc = vol_part_add_part(parts, sid);
         if (rc != EOK) {
                 async_answer_0(icall, rc);
@@ -285 +292 @@
         vol_fstype_t fstype;
         char *label;
+        char *mountp;
         errno_t rc;
 
@@ -304 +312 @@
         }
 
+        rc = async_data_write_accept((void **)&mountp, true, 0, VOL_MOUNTP_MAXLEN,
+            0, NULL);
+        if (rc != EOK) {
+                free(label);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        if (mountp != NULL) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_srv: mountp='%s'",
+                    mountp);
+        }
+
         rc = vol_part_find_by_id_ref(parts, sid, &part);
         if (rc != EOK) {
@@ -311 +332 @@
         }
 
-        rc = vol_part_mkfs_part(part, fstype, label);
+        rc = vol_part_mkfs_part(part, fstype, label, mountp);
         if (rc != EOK) {
                 free(label);