Changeset f2c8f55 in mainline

Timestamp:

2018-08-03T12:41:38Z (6 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c92dfed

Parents:

f67d8ee

Message:

IPC_M_SHARE_IN: source has no business deciding destination address

Make the use of kernel-set arguments more consistent with
IPC_M_CONNECT_* methods (i.e. allocate the kernel-set arguments from the
end). Improve the documentation of IPC_M_SHARE_IN.

Files:

• abi/include/abi/ipc/methods.h (modified) (1 diff)
• kernel/generic/src/ipc/ops/sharein.c (modified) (1 diff)
• uspace/lib/c/generic/async/client.c (modified) (1 diff)
• uspace/lib/c/generic/async/server.c (modified) (1 diff)

abi/include/abi/ipc/methods.h

@@ -121 +121 @@
         IPC_M_PAGE_IN,
 
-        /** Receive as_area over IPC.
-         *
-         * - ARG1 - destination as_area size
-         * - ARG2 - user defined argument
-         *
-         * on answer, the recipient must set:
-         *
-         * - ARG1 - source as_area base address
-         * - ARG2 - flags that will be used for sharing
-         * - ARG3 - dst as_area lower bound
-         * - ARG4 - dst as_area base address (filled automatically by kernel)
+        /** Receive an address space area over IPC.
+         *
+         * Sender:
+         *  - uspace: arg1 .. address space area size
+         *            arg2 .. sender's address space area starting address
+         *                    lower bound
+         *            arg3 .. <custom>
+         *            arg4 .. <unused>
+         *            arg5 .. <unused>
+         *
+         * Recipient:
+         *  - uspace: arg1 .. recipient's address space area starting address
+         *            arg2 .. shared address space areas sharing flags
+         *            arg3 .. <unused>
+         *            arg4 .. <unused>
+         *  - kernel: arg5 .. new sender's address space area starting address
+         *
          */
         IPC_M_SHARE_IN,

kernel/generic/src/ipc/ops/sharein.c

@@ -51 +51 @@
                 errno_t rc = as_area_share(AS, IPC_GET_ARG1(answer->data),
                     IPC_GET_ARG1(*olddata), as, IPC_GET_ARG2(answer->data),
-                    &dst_base, IPC_GET_ARG3(answer->data));
-                IPC_SET_ARG4(answer->data, dst_base);
+                    &dst_base, IPC_GET_ARG2(*olddata));
+                IPC_SET_ARG5(answer->data, dst_base);
                 IPC_SET_RETVAL(answer->data, rc);
         }

uspace/lib/c/generic/async/client.c

@@ -937 +937 @@
         sysarg_t _flags = 0;
         sysarg_t _dst = (sysarg_t) -1;
-        errno_t res = async_req_2_4(exch, IPC_M_SHARE_IN, (sysarg_t) size,
-            arg, NULL, &_flags, NULL, &_dst);
+        errno_t res = async_req_3_5(exch, IPC_M_SHARE_IN, (sysarg_t) size,
+            (sysarg_t) __progsymbols.end, arg, NULL, &_flags, NULL, NULL,
+            &_dst);
 
         if (flags)

uspace/lib/c/generic/async/server.c

@@ -1228 +1228 @@
         assert(call);
 
-        // FIXME: The source has no business deciding destination address.
-        return ipc_answer_3(call->cap_handle, EOK, (sysarg_t) src, (sysarg_t) flags,
-            (sysarg_t) __progsymbols.end);
+        return ipc_answer_2(call->cap_handle, EOK, (sysarg_t) src, (sysarg_t) flags);
 }