Changeset d30e067 in mainline for uspace/srv

Timestamp:

2025-03-02T20:02:33Z (10 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

Location:

uspace/srv

Files:

• bd/vbd/disk.c (modified) (5 diffs)
• devman/dev.c (modified) (3 diffs)
• devman/dev.h (modified) (2 diffs)
• devman/devman.h (modified) (3 diffs)
• devman/devtree.c (modified) (2 diffs)
• devman/devtree.h (modified) (2 diffs)
• devman/driver.c (modified) (5 diffs)
• devman/drv_conn.c (modified) (3 diffs)
• devman/main.c (modified) (2 diffs)
• loader/main.c (modified) (1 diff)
• logger/logs.c (modified) (2 diffs)
• system/system.c (modified) (3 diffs)
• vfs/vfs_register.c (modified) (1 diff)
• volsrv/meson.build (modified) (2 diffs)
• volsrv/part.c (modified) (5 diffs)
• volsrv/part.h (modified) (2 diffs)
• volsrv/volsrv.c (modified) (3 diffs)

uspace/srv/bd/vbd/disk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -35 +35 @@
 
 #include <adt/list.h>
+#include <bd.h>
 #include <bd_srv.h>
 #include <block.h>
@@ -71 +72 @@
 static errno_t vbds_bd_get_block_size(bd_srv_t *, size_t *);
 static errno_t vbds_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t vbds_bd_eject(bd_srv_t *);
 
 static errno_t vbds_bsa_translate(vbds_part_t *, aoff64_t, size_t, aoff64_t *);
@@ -93 +95 @@
         .write_blocks = vbds_bd_write_blocks,
         .get_block_size = vbds_bd_get_block_size,
-        .get_num_blocks = vbds_bd_get_num_blocks
+        .get_num_blocks = vbds_bd_get_num_blocks,
+        .eject = vbds_bd_eject
 };
 
@@ -1070 +1073 @@
 
         return EOK;
+}
+
+static errno_t vbds_bd_eject(bd_srv_t *bd)
+{
+        vbds_part_t *part = bd_srv_part(bd);
+        async_sess_t *sess;
+        bd_t *bdc;
+        errno_t rc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_bd_eject()");
+
+        fibril_rwlock_read_lock(&part->lock);
+
+        sess = loc_service_connect(part->disk->svc_id, INTERFACE_BLOCK, 0);
+        if (sess == NULL) {
+                log_msg(LOG_DEFAULT, LVL_WARN,
+                    "vbds_bd_eject() - failed connect");
+                fibril_rwlock_read_unlock(&part->lock);
+                return EIO;
+        }
+
+        rc = bd_open(sess, &bdc);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_WARN,
+                    "vbds_bd_eject() - failed open");
+                async_hangup(sess);
+                fibril_rwlock_read_unlock(&part->lock);
+                return EIO;
+        }
+
+        rc = bd_eject(bdc);
+
+        bd_close(bdc);
+        async_hangup(sess);
+
+        fibril_rwlock_read_unlock(&part->lock);
+        return rc;
 }
 

uspace/srv/devman/dev.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -50 +51 @@
         refcount_init(&dev->refcnt);
         list_initialize(&dev->functions);
+        fibril_mutex_initialize(&dev->state_lock);
+        fibril_condvar_initialize(&dev->state_cv);
         link_initialize(&dev->driver_devices);
 
@@ -87 +90 @@
         if (refcount_down(&dev->refcnt))
                 delete_dev_node(dev);
+}
+
+/** Wait until the device node enters stable state.
+ *
+ * @param dev Device node
+ */
+void dev_wait_stable(dev_node_t *dev)
+{
+        fibril_mutex_lock(&dev->state_lock);
+        while (dev->state == DEVICE_ATTACHING)
+                fibril_condvar_wait(&dev->state_cv, &dev->state_lock);
+        fibril_mutex_unlock(&dev->state_lock);
 }
 

uspace/srv/devman/dev.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
- * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 extern void dev_add_ref(dev_node_t *);
 extern void dev_del_ref(dev_node_t *);
+extern void dev_wait_stable(dev_node_t *);
 
 extern dev_node_t *find_dev_node_no_lock(dev_tree_t *tree,

uspace/srv/devman/devman.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
- * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -105 +105 @@
 typedef enum {
         DEVICE_NOT_INITIALIZED = 0,
+        DEVICE_ATTACHING,
         DEVICE_USABLE,
         DEVICE_NOT_PRESENT,
@@ -129 +130 @@
         /** The state of the device. */
         device_state_t state;
+        /** Protect device state field */
+        fibril_mutex_t state_lock;
+        /** Signalled when device state changes */
+        fibril_condvar_t state_cv;
         /** Link to list of devices owned by driver (driver_t.devices) */
         link_t driver_devices;

uspace/srv/devman/devtree.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -314 +315 @@
 }
 
+/** Wait for device tree to stabilize.
+ *
+ * Blocks until the entire device tree had a chance to finish attaching
+ * all devices.
+ *
+ * @param tree Device tree
+ */
+void dev_tree_wait_stable(dev_tree_t *tree)
+{
+        dev_wait_stable(tree->root_node->child);
+}
+
 /** @}
  */

uspace/srv/devman/devtree.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
- * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -45 +45 @@
 extern bool insert_fun_node(dev_tree_t *, fun_node_t *, char *, dev_node_t *);
 extern void remove_fun_node(dev_tree_t *, fun_node_t *);
+extern void dev_tree_wait_stable(dev_tree_t *);
 
 #endif

uspace/srv/devman/driver.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2018 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -284 +284 @@
         dev->drv = drv;
         dev->passed_to_driver = false;
-        dev->state = DEVICE_NOT_INITIALIZED;
+        fibril_mutex_lock(&dev->state_lock);
+        dev->state = DEVICE_ATTACHING;
+        fibril_mutex_unlock(&dev->state_lock);
+        fibril_condvar_broadcast(&dev->state_cv);
         list_append(&dev->driver_devices, &drv->devices);
 
@@ -631 +634 @@
 void add_device(driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
 {
+        link_t *link;
+        fun_node_t *fun;
+
         /*
          * We do not expect to have driver's mutex locked as we do not
@@ -664 +670 @@
                 async_wait_for(req, &rc);
         }
+
+        if (rc == EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Device was added. Wait for "
+                    "child functions' devices to stabilize.");
+                fibril_rwlock_read_lock(&tree->rwlock);
+                link = list_first(&dev->functions);
+                while (link != NULL) {
+                        fun = list_get_instance(link, fun_node_t,
+                            dev_functions);
+
+                        if (fun->child != NULL) {
+                                log_msg(LOG_DEFAULT, LVL_DEBUG2, "Wait for "
+                                    "child device %p.", (void *)fun->child);
+                                fun_add_ref(fun);
+                                fibril_rwlock_read_unlock(&tree->rwlock);
+                                dev_wait_stable(fun->child);
+                                fibril_rwlock_read_lock(&tree->rwlock);
+                                fun_del_ref(fun);
+                        }
+
+                        link = list_next(link, &dev->functions);
+                }
+
+                fibril_rwlock_read_unlock(&tree->rwlock);
+                log_msg(LOG_DEFAULT, LVL_DEBUG,
+                    "Finished waiting for children.");
+        }
+
+        fibril_mutex_lock(&dev->state_lock);
 
         switch (rc) {
@@ -677 +712 @@
         }
 
+        fibril_mutex_unlock(&dev->state_lock);
+        fibril_condvar_broadcast(&dev->state_cv);
+
         dev->passed_to_driver = true;
 }

uspace/srv/devman/drv_conn.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -453 +453 @@
         fun_busy_unlock(fun);
         fun_del_ref(fun);
+        async_answer_0(icall, EOK);
+}
+
+/** Wait for function to become stable.
+ *
+ */
+static void devman_drv_fun_wait_stable(ipc_call_t *icall, driver_t *drv)
+{
+        fun_node_t *fun;
+        dev_node_t *dev;
+
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+
+        fun = find_fun_node(&device_tree, ipc_get_arg1(icall));
+        if (fun == NULL) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(icall, ENOENT);
+                return;
+        }
+
+        if (fun->child == NULL) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                fun_del_ref(fun);
+                async_answer_0(icall, EOK);
+                return;
+        }
+
+        dev = fun->child;
+        dev_add_ref(dev);
+
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+
+        dev_wait_stable(dev);
+        dev_del_ref(dev);
+
         async_answer_0(icall, EOK);
 }
@@ -642 +677 @@
                         devman_drv_fun_offline(&call, driver);
                         break;
+                case DEVMAN_DRV_FUN_WAIT_STABLE:
+                        devman_drv_fun_wait_stable(&call, driver);
+                        break;
                 case DEVMAN_REMOVE_FUNCTION:
                         devman_remove_function(&call);

uspace/srv/devman/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -369 +369 @@
 
         printf("%s: Accepting connections.\n", NAME);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Wait for device tree to stabilize.");
+        dev_tree_wait_stable(&device_tree);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Device tree stable.");
         task_retval(0);
         async_manager();

uspace/srv/loader/main.c

@@ -300 +300 @@
 
 #ifdef CONFIG_RTLD
-        if (prog_info.env) {
-                pcb.tcb = rtld_tls_make(prog_info.env);
-        } else {
-                pcb.tcb = tls_make(prog_info.finfo.base);
-        }
+        assert(prog_info.env != NULL);
+        pcb.tcb = rtld_tls_make(prog_info.env);
 #else
         pcb.tcb = tls_make(prog_info.finfo.base);

uspace/srv/logger/logs.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2012 Vojtech Horky
  * All rights reserved.
@@ -55 +56 @@
         if (result == NULL)
                 return ENOMEM;
-        if (asprintf(&result->filename, "/log/%s", name) < 0) {
+        if (asprintf(&result->filename, "/log/%s.txt", name) < 0) {
                 free(result);
                 return ENOMEM;

uspace/srv/system/system.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2005 Martin Decky
  * All rights reserved.
@@ -382 +382 @@
                 printf("%s: System volume is configured.\n", NAME);
 
-                /* Wait until system volume is mounted */
+                /* Verify that system volume is mounted */
                 sv_mounted = false;
 
-                while (true) {
-                        rc = vol_get_parts(vol, &part_ids, &nparts);
+                rc = vol_get_parts(vol, &part_ids, &nparts);
+                if (rc != EOK) {
+                        printf("Error getting list of volumes.\n");
+                        goto error;
+                }
+
+                for (i = 0; i < nparts; i++) {
+                        rc = vol_part_info(vol, part_ids[i], &pinfo);
                         if (rc != EOK) {
-                                printf("Error getting list of volumes.\n");
+                                printf("Error getting partition "
+                                    "information.\n");
+                                rc = EIO;
                                 goto error;
                         }
 
-                        for (i = 0; i < nparts; i++) {
-                                rc = vol_part_info(vol, part_ids[i], &pinfo);
-                                if (rc != EOK) {
-                                        printf("Error getting partition "
-                                            "information.\n");
-                                        rc = EIO;
-                                        goto error;
-                                }
-
-                                if (str_cmp(pinfo.cur_mp, "/w") == 0) {
-                                        sv_mounted = true;
-                                        break;
-                                }
+                        if (str_cmp(pinfo.cur_mp, "/w") == 0) {
+                                sv_mounted = true;
+                                break;
                         }
-
-                        if (sv_mounted)
-                                break;
-
-                        free(part_ids);
-                        part_ids = NULL;
-
-                        fibril_sleep(1);
-                        printf("Sleeping(1) for system volume.\n");
-                }
+                }
+
+                if (sv_mounted == false) {
+                        printf("System volume not found.\n");
+                        rc = EIO;
+                        goto error;
+                }
+
+                free(part_ids);
+                part_ids = NULL;
+
         }
 
@@ -535 +534 @@
 
         for (i = 0; i < nparts; i++) {
-                rc = vol_part_eject(vol, part_ids[i]);
+                rc = vol_part_eject(vol, part_ids[i], vef_none);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Error ejecting "

uspace/srv/vfs/vfs_register.c

@@ -369 +369 @@
         }
 
-        fstypes->fstypes = calloc(sizeof(char *), count);
+        fstypes->fstypes = calloc(count, sizeof(char *));
         if (fstypes->fstypes == NULL) {
                 free(fstypes->buf);

uspace/srv/volsrv/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2015 Jiri Svoboda
+# Copyright (c) 2025 Jiri Svoboda
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-deps = [ 'block', 'label', 'sif' ]
+deps = [ 'block', 'device', 'label', 'sif' ]
 
 src = files(

uspace/srv/volsrv/part.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 
 #include <adt/list.h>
+#include <bd.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -642 +643 @@
 }
 
-errno_t vol_part_eject_part(vol_part_t *part)
+static errno_t vol_part_eject_device(service_id_t svcid)
+{
+        async_sess_t *sess;
+        errno_t rc;
+        bd_t *bd;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_eject_device(%zu)",
+            (size_t)svcid);
+
+        sess = loc_service_connect(svcid, INTERFACE_BLOCK, 0);
+        if (sess == NULL)
+                return EIO;
+
+        rc = bd_open(sess, &bd);
+        if (rc != EOK) {
+                async_hangup(sess);
+                return EIO;
+        }
+
+        rc = bd_eject(bd);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "vol_part_eject_device(): "
+                    "eject fail");
+                bd_close(bd);
+                async_hangup(sess);
+                return EIO;
+        }
+
+        bd_close(bd);
+        async_hangup(sess);
+        return EOK;
+}
+
+errno_t vol_part_eject_part(vol_part_t *part, vol_eject_flags_t flags)
 {
         int rc;
@@ -667 +701 @@
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Failed deleting "
                             "mount directory %s.", part->cur_mp);
+                }
+        }
+
+        if ((flags & vef_physical) != 0) {
+                rc = vol_part_eject_device(part->svc_id);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed physically "
+                            "ejecting device %s.", part->svc_name);
                 }
         }
@@ -819 +861 @@
 
         if (part->cur_mp != NULL) {
-                rc = vol_part_eject_part(part);
+                rc = vol_part_eject_part(part, vef_none);
                 if (rc != EOK)
                         return rc;

uspace/srv/volsrv/part.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -55 +55 @@
     vol_part_t **);
 extern void vol_part_del_ref(vol_part_t *);
-extern errno_t vol_part_eject_part(vol_part_t *);
+extern errno_t vol_part_eject_part(vol_part_t *, vol_eject_flags_t);
 extern errno_t vol_part_empty_part(vol_part_t *);
 extern errno_t vol_part_insert_part(vol_part_t *);

uspace/srv/volsrv/volsrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -205 +205 @@
 {
         service_id_t sid;
+        vol_eject_flags_t flags;
         vol_part_t *part;
         errno_t rc;
 
         sid = ipc_get_arg1(icall);
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_eject_srv(%zu)", sid);
+        flags = ipc_get_arg2(icall);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_eject_srv(%zu, %x)",
+            sid, flags);
 
         rc = vol_part_find_by_id_ref(parts, sid, &part);
@@ -217 +221 @@
         }
 
-        rc = vol_part_eject_part(part);
+        rc = vol_part_eject_part(part, flags);
         if (rc != EOK) {
                 async_answer_0(icall, EIO);