Changeset 76d7305 in mainline

Timestamp:

2006-05-31T14:13:35Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

343fc179

Parents:

4fded58

Message:

Slightly changed semantics of AS_AREA_SEND/RECV.

Location:

generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/sysipc.c (modified) (3 diffs)
• src/mm/as.c (modified) (2 diffs)

generic/include/ipc/ipc.h

@@ -132 +132 @@
  * - ARG1 - Where the area will be mapped
  * - ARG2 - Expected size of area
- * - ARG3 - Requested rights for the area
+ * - ARG3 - User defined argument
  * on answer - the server sets ARG1 as src as address of the as_area
- * to be shared
- *
- *
+ * to be shared, ARG2 is set to rights that will be used for sharing,
+ * which is returned as part of answer back to the receiver
  */
 #define IPC_M_AS_AREA_RECV      6

generic/src/ipc/sysipc.c

@@ -137 +137 @@
                 if (!IPC_GET_RETVAL(answer->data)) { /* Accepted, handle as_area receipt */
                         ipl_t ipl;
+                        int rc;
                         as_t *as;
                         
@@ -145 +146 @@
                         interrupts_restore(ipl);
                         
-                        return as_area_share(as, IPC_GET_ARG1(*olddata), IPC_GET_ARG2(*olddata),
-                                             AS, IPC_GET_ARG1(answer->data), IPC_GET_ARG3(*olddata));
+                        rc = as_area_share(as, IPC_GET_ARG1(*olddata), IPC_GET_ARG2(*olddata),
+                                           AS, IPC_GET_ARG1(answer->data), IPC_GET_ARG3(*olddata));
+                        IPC_SET_RETVAL(answer->data, rc);
+                        return rc;
                 }
         } else if (IPC_GET_METHOD(*olddata) == IPC_M_AS_AREA_RECV) {
@@ -161 +164 @@
                         
                         rc = as_area_share(AS, IPC_GET_ARG1(answer->data), IPC_GET_ARG2(*olddata),
-                                           as, IPC_GET_ARG1(*olddata), IPC_GET_ARG3(*olddata));
+                                           as, IPC_GET_ARG1(*olddata), IPC_GET_ARG2(answer->data));
                         IPC_SET_RETVAL(answer->data, rc);
                 }

generic/src/mm/as.c

@@ -517 +517 @@
         src_backend_data = src_area->backend_data;
         
-        if (src_size != acc_size) {
+        if (src_size != acc_size || (src_flags & dst_flags_mask) != dst_flags_mask) {
                 mutex_unlock(&src_area->lock);
                 mutex_unlock(&src_as->lock);
@@ -555 +555 @@
          * to support sharing in less privileged mode.
          */
-        dst_area = as_area_create(dst_as, src_flags & dst_flags_mask, src_size, dst_base,
+        dst_area = as_area_create(dst_as, dst_flags_mask, src_size, dst_base,
                                   AS_AREA_ATTR_PARTIAL, src_backend, &src_backend_data);
         if (!dst_area) {