Changeset 4285f384 in mainline for uspace/srv

Timestamp:

2025-02-25T20:25:43Z (8 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

d30e067, f35749e

Parents:

d231a54

Message:

Allow physically ejecting CD-ROM using vol eject -s

Location:

uspace/srv

Files:

• bd/vbd/disk.c (modified) (5 diffs)
• system/system.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/system/system.c

@@ -533 +533 @@
 
         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/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);