Changeset f5837524 in mainline for uspace/srv

Timestamp:

2018-10-29T17:15:02Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Children:

eec201d

Parents:

184f2f8a

git-author:

Jakub Jermar <jakub@…> (2018-10-28 12:42:35)

git-committer:

Jakub Jermar <jakub@…> (2018-10-29 17:15:02)

Message:

Use user-defined labels instead of phone hashes

This commit changes the way how the async framework maps incomming calls
to connections. Instead of abusing the kernel addresses of attached
phones as identifiers, the IPC_M_CONNECT_TO_ME and IPC_M_CONNECT_ME_TO
messages allow the server to specify an arbitrary label which is
remembered in the connected phone and consequently imprinted on each
call which is routed through this phone.

The async framework uses the address of the connection structure as the
label. This removes the need for a connection hash table because each
incoming call already remembers the connection in its label.

To disambiguate this new label and the other user-defined label used for
answers, the call structure now has the request_label member for the
former and answer_label member for the latter.

This commit also moves the kernel definition of ipc_data_t to abi/ and
removes the uspace redefinition thereof. Finally, when forwarding the
IPC_M_CONNECT_TO_ME call, the phone capability and the kernel object
allocated in request_process are now correctly disposed of.

Location:

uspace/srv

Files:

• audio/hound/audio_device.c (modified) (1 diff)
• bd/vbd/vbd.c (modified) (1 diff)
• clipboard/clipboard.c (modified) (1 diff)
• devman/client_conn.c (modified) (1 diff)
• devman/drv_conn.c (modified) (1 diff)
• hid/compositor/compositor.c (modified) (2 diffs)
• hid/input/input.c (modified) (1 diff)
• hid/isdv4_tablet/main.c (modified) (1 diff)
• hid/output/output.c (modified) (1 diff)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (1 diff)
• loader/main.c (modified) (1 diff)
• locsrv/locsrv.c (modified) (2 diffs)
• logger/ctl.c (modified) (1 diff)
• logger/writer.c (modified) (1 diff)
• net/dhcp/main.c (modified) (1 diff)
• net/dnsrsrv/dnsrsrv.c (modified) (1 diff)
• net/inetsrv/inetcfg.c (modified) (1 diff)
• net/inetsrv/inetping.c (modified) (1 diff)
• net/inetsrv/inetsrv.c (modified) (1 diff)
• net/tcp/service.c (modified) (1 diff)
• net/udp/service.c (modified) (1 diff)
• ns/ns.c (modified) (1 diff)
• ns/task.c (modified) (8 diffs)
• taskmon/taskmon.c (modified) (1 diff)
• vfs/vfs.c (modified) (2 diffs)
• vfs/vfs_ipc.c (modified) (1 diff)
• volsrv/volsrv.c (modified) (1 diff)

uspace/srv/audio/hound/audio_device.c

@@ -269 +269 @@
 
         /* Answer initial request */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
         audio_device_t *dev = arg;
         assert(dev);

uspace/srv/bd/vbd/vbd.c

@@ -365 +365 @@
 
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/clipboard/clipboard.c

@@ -155 +155 @@
 {
         /* Accept connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/devman/client_conn.c

@@ -748 +748 @@
 {
         /* Accept connection. */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/devman/drv_conn.c

@@ -588 +588 @@
 
         /* Accept the connection. */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         client = async_get_client_data();

uspace/srv/hid/compositor/compositor.c

@@ -918 +918 @@
         /* Allocate resources for new window and register it to the location service. */
         if (service_id == winreg_id) {
-                async_answer_0(icall, EOK);
+                async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
                 async_get_call(&call);
@@ -997 +997 @@
 
         if (win) {
-                async_answer_0(icall, EOK);
+                async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
         } else {
                 async_answer_0(icall, EINVAL);

uspace/srv/hid/input/input.c

@@ -328 +328 @@
         }
 
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/hid/isdv4_tablet/main.c

@@ -65 +65 @@
 static void mouse_connection(ipc_call_t *icall, void *arg)
 {
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         async_sess_t *sess =

uspace/srv/hid/output/output.c

@@ -398 +398 @@
 {
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -372 +372 @@
 static void s3c24xx_ts_connection(ipc_call_t *icall, void *arg)
 {
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/loader/main.c

@@ -366 +366 @@
 
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         /* Ignore parameters, the connection is already open */

uspace/srv/locsrv/locsrv.c

@@ -1396 +1396 @@
 {
         /* Accept connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         /*
@@ -1463 +1463 @@
 {
         /* Accept connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/logger/ctl.c

@@ -68 +68 @@
         int fd;
 
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
         logger_log("control: new client.\n");
 

uspace/srv/logger/writer.c

@@ -98 +98 @@
 
         /* Acknowledge the connection. */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         logger_log("writer: new client.\n");

uspace/srv/net/dhcp/main.c

@@ -128 +128 @@
 
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -213 +213 @@
 
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/net/inetsrv/inetcfg.c

@@ -742 +742 @@
 
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/net/inetsrv/inetping.c

@@ -284 +284 @@
 
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         inetping_client_t client;

uspace/srv/net/inetsrv/inetsrv.c

@@ -390 +390 @@
 
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         inet_client_init(&client);

uspace/srv/net/tcp/service.c

@@ -1169 +1169 @@
 
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_client_conn() - client=%p",

uspace/srv/net/udp/service.c

@@ -667 +667 @@
 
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_client_conn()");

uspace/srv/ns/ns.c

@@ -70 +70 @@
         }
 
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/ns/task.c

@@ -91 +91 @@
 typedef struct {
         ht_link_t link;
-        sysarg_t in_phone_hash;  /**< Incoming phone hash. */
-        task_id_t id;            /**< Task ID. */
+        sysarg_t label;  /**< Incoming phone label. */
+        task_id_t id;    /**< Task ID. */
 } p2i_entry_t;
 
-/* phone-to-id hash table operations */
+/* label-to-id hash table operations */
 
 static size_t p2i_key_hash(void *key)
 {
-        sysarg_t in_phone_hash = *(sysarg_t *)key;
-        return in_phone_hash;
+        sysarg_t label = *(sysarg_t *)key;
+        return label;
 }
 
@@ -106 +106 @@
 {
         p2i_entry_t *entry = hash_table_get_inst(item, p2i_entry_t, link);
-        return entry->in_phone_hash;
+        return entry->label;
 }
 
 static bool p2i_key_equal(void *key, const ht_link_t *item)
 {
-        sysarg_t in_phone_hash = *(sysarg_t *)key;
+        sysarg_t label = *(sysarg_t *)key;
         p2i_entry_t *entry = hash_table_get_inst(item, p2i_entry_t, link);
 
-        return (in_phone_hash == entry->in_phone_hash);
+        return (label == entry->label);
 }
 
@@ -137 +137 @@
 };
 
-/** Map phone hash to task ID */
+/** Map phone label to task ID */
 static hash_table_t phone_to_id;
 
@@ -227 +227 @@
         task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
 
-        ht_link_t *link = hash_table_find(&phone_to_id, &call->in_phone_hash);
+        ht_link_t *link = hash_table_find(&phone_to_id, &call->request_label);
         if (link != NULL)
                 return EEXIST;
@@ -245 +245 @@
          */
 
-        entry->in_phone_hash = call->in_phone_hash;
+        assert(call->request_label);
+        entry->label = call->request_label;
         entry->id = id;
         hash_table_insert(&phone_to_id, &entry->link);
@@ -262 +263 @@
 }
 
-static errno_t get_id_by_phone(sysarg_t phone_hash, task_id_t *id)
-{
-        ht_link_t *link = hash_table_find(&phone_to_id, &phone_hash);
+static errno_t get_id_by_phone(sysarg_t label, task_id_t *id)
+{
+        assert(label);
+        ht_link_t *link = hash_table_find(&phone_to_id, &label);
         if (link == NULL)
                 return ENOENT;
@@ -276 +278 @@
 errno_t ns_task_retval(ipc_call_t *call)
 {
-        task_id_t id = call->in_task_id;
+        task_id_t id = call->task_id;
 
         ht_link_t *link = hash_table_find(&task_hash_table, &id);
@@ -297 +299 @@
 {
         task_id_t id;
-        errno_t rc = get_id_by_phone(call->in_phone_hash, &id);
+        errno_t rc = get_id_by_phone(call->request_label, &id);
         if (rc != EOK)
                 return rc;
 
         /* Delete from phone-to-id map. */
-        hash_table_remove(&phone_to_id, &call->in_phone_hash);
+        hash_table_remove(&phone_to_id, &call->request_label);
 
         /* Mark task as finished. */

uspace/srv/taskmon/taskmon.c

@@ -108 +108 @@
 {
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {

uspace/srv/vfs/vfs.c

@@ -56 +56 @@
 static void vfs_pager(ipc_call_t *icall, void *arg)
 {
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {
@@ -83 +83 @@
                 vfs_op_pass_handle(
                     (task_id_t) MERGE_LOUP32(IPC_GET_ARG4(*call),
-                    IPC_GET_ARG5(*call)), call->in_task_id,
+                    IPC_GET_ARG5(*call)), call->task_id,
                     (int) IPC_GET_ARG2(*call));
 }

uspace/srv/vfs/vfs_ipc.c

@@ -324 +324 @@
          * This call needs to be answered.
          */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (cont) {

uspace/srv/volsrv/volsrv.c

@@ -551 +551 @@
 
         /* Accept the connection */
-        async_answer_0(icall, EOK);
+        async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
 
         while (true) {