Changeset 7c0e1f5 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2017-11-23T22:20:17Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b1f36e3

Parents:

40e5d66

Message:

Rework userspace call tracking

Setting the address of the userspace call structure in the kernel
call_t structure on send allows us to remove lots of userspace
scaffolding. More importantly, it also opens the door for not needing
the callid (later capability) on answer receive.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (7 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -347 +347 @@
 /** Make a fast asynchronous call over IPC.
  *
- * This function can only handle four arguments of payload, but is faster than
+ * This function can only handle three arguments of payload, but is faster than
  * the generic function sys_ipc_call_async_slow().
  *
@@ -355 +355 @@
  * @param arg2     Service-defined payload argument.
  * @param arg3     Service-defined payload argument.
- * @param arg4     Service-defined payload argument.
+ * @param label    User-defined label.
  *
  * @return Call hash on success.
@@ -362 +362 @@
  */
 sysarg_t sys_ipc_call_async_fast(sysarg_t handle, sysarg_t imethod,
-    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t label)
 {
         kobject_t *kobj = kobject_get(TASK, handle, KOBJECT_TYPE_PHONE);
@@ -378 +378 @@
         IPC_SET_ARG2(call->data, arg2);
         IPC_SET_ARG3(call->data, arg3);
-        IPC_SET_ARG4(call->data, arg4);
         
         /*
@@ -385 +384 @@
          */
         IPC_SET_ARG5(call->data, 0);
+
+        /* Set the user-defined label */
+        call->data.label = label;
         
         int res = request_preprocess(call, kobj->phone);
@@ -401 +403 @@
  * @param handle  Phone capability for the call.
  * @param data    Userspace address of call data with the request.
+ * @param label   User-defined label.
  *
  * @return See sys_ipc_call_async_fast().
  *
  */
-sysarg_t sys_ipc_call_async_slow(sysarg_t handle, ipc_data_t *data)
+sysarg_t sys_ipc_call_async_slow(sysarg_t handle, ipc_data_t *data,
+    sysarg_t label)
 {
         kobject_t *kobj = kobject_get(TASK, handle, KOBJECT_TYPE_PHONE);
@@ -424 +428 @@
                 return (sysarg_t) rc;
         }
+
+        /* Set the user-defined label */
+        call->data.label = label;
         
         int res = request_preprocess(call, kobj->phone);