Changeset ee9c703 in mainline

Timestamp:

2018-10-08T18:34:29Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

63c1dd5

Parents:

30785f1

git-author:

Jakub Jermar <jakub@…> (2018-10-07 18:54:36)

git-committer:

Jakub Jermar <jakub@…> (2018-10-08 18:34:29)

Message:

Make INTERFACE_LOC_SUPPLIER serial again

This commit entirely reverts commit cbdb38ff8f. The interface
unfortunately cannot be parallel/cloned due to the fact that each loc
supplier connection is stateful and is expected to begin with a
LOC_SERVER_REGISTER call. Failing that, cloned exchanges to the
location service supplier interface immediately fail with EREFUSED,
because the method mismatches.

This results in various sporadic failures to register services or add
services into categories, which in turn results in symptoms such as
non-functioning keyboard and mouse input.

If memory serves well, the issue that cbdb38ff8f addressed was that
category change events can transitively result in new requests to the
interface over the same phone. Around the time of cbdb38ff8f there used
to be a hard limit on the number of concurrent async calls and calls
that exceeded this limit got blocked. This is no longer the case, so the
loc supplier fibril is not waiting for any of its own IPC. Hence
reverting cbdb38ff8f should be safe.

Files:

• abi/include/abi/ipc/interfaces.h (modified) (1 diff)
• uspace/srv/locsrv/locsrv.c (modified) (1 diff)

abi/include/abi/ipc/interfaces.h

@@ -117 +117 @@
             FOURCC_COMPACT('v', 's', 'd', 'v') | IFACE_EXCHANGE_PARALLEL | IFACE_MOD_CALLBACK,
         INTERFACE_LOC_SUPPLIER =
-            FOURCC_COMPACT('l', 'o', 'c', 's') | IFACE_EXCHANGE_PARALLEL,
+            FOURCC_COMPACT('l', 'o', 'c', 's') | IFACE_EXCHANGE_SERIALIZE,
         INTERFACE_LOC_CONSUMER =
             FOURCC_COMPACT('l', 'o', 'c', 'c') | IFACE_EXCHANGE_SERIALIZE,

uspace/srv/locsrv/locsrv.c

@@ -1398 +1398 @@
         async_answer_0(icall, EOK);
 
+        /*
+         * Each connection begins by a LOC_SERVER_REGISTER, which precludes us
+         * from using parallel exchanges.
+         */
+        static_assert((INTERFACE_LOC_SUPPLIER & IFACE_EXCHANGE_MASK) ==
+            IFACE_EXCHANGE_SERIALIZE);
+
         loc_server_t *server = loc_server_register();
         if (server == NULL)