Changeset d53a5ab0 in mainline

Timestamp:

2023-12-13T10:50:27Z (13 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, topic/simplify-dev-export

Children:

381c426

Parents:

4f6368c

Message:

Add IPC read/write test to libipctest/ipc test server + tester

Now really if IPC read/write didn't work, nothing would work.
Tester's readwrite test is mostly for sanity checking that
the read/write test in libipctest / ipc-test server work as intended.

Location:

uspace

Files:

• app/tester/ipc/readwrite.c (added)
• app/tester/ipc/readwrite.def (added)
• app/tester/meson.build (modified) (1 diff)
• app/tester/tester.c (modified) (1 diff)
• app/tester/tester.h (modified) (1 diff)
• lib/ipctest/include/ipc/ipc_test.h (modified) (1 diff)
• lib/ipctest/include/ipc_test.h (modified) (1 diff)
• lib/ipctest/src/ipc_test.c (modified) (2 diffs)
• srv/test/ipc-test/main.c (modified) (5 diffs)

uspace/app/tester/meson.build

@@ -52 +52 @@
         'float/float2.c',
         'vfs/vfs1.c',
+        'ipc/readwrite.c',
         'ipc/sharein.c',
         'ipc/starve.c',

uspace/app/tester/tester.c

@@ -68 +68 @@
 #include "float/float2.def"
 #include "vfs/vfs1.def"
+#include "ipc/readwrite.def"
 #include "ipc/sharein.def"
 #include "ipc/starve.def"

uspace/app/tester/tester.h

@@ -99 +99 @@
 extern const char *test_vfs1(void);
 extern const char *test_ping_pong(void);
+extern const char *test_readwrite(void);
 extern const char *test_sharein(void);
 extern const char *test_starve_ipc(void);

uspace/lib/ipctest/include/ipc/ipc_test.h

@@ -43 +43 @@
         IPC_TEST_GET_RW_AREA_SIZE,
         IPC_TEST_SHARE_IN_RO,
-        IPC_TEST_SHARE_IN_RW
+        IPC_TEST_SHARE_IN_RW,
+        IPC_TEST_SET_RW_BUF_SIZE,
+        IPC_TEST_READ,
+        IPC_TEST_WRITE
 } ipc_test_request_t;
 

uspace/lib/ipctest/include/ipc_test.h

@@ -50 +50 @@
 extern errno_t ipc_test_share_in_ro(ipc_test_t *, size_t, const void **);
 extern errno_t ipc_test_share_in_rw(ipc_test_t *, size_t, void **);
+extern errno_t ipc_test_set_rw_buf_size(ipc_test_t *, size_t);
+extern errno_t ipc_test_read(ipc_test_t *, void *, size_t);
+extern errno_t ipc_test_write(ipc_test_t *, const void *, size_t);
 
 #endif

uspace/lib/ipctest/src/ipc_test.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2018 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -221 +221 @@
 }
 
+/** Set server-side read/write buffer size.
+ *
+ * @param test IPC test service
+ * @param size Requested read/write buffer size
+ * @return EOK on success or an error code
+ */
+errno_t ipc_test_set_rw_buf_size(ipc_test_t *test, size_t size)
+{
+        async_exch_t *exch;
+        errno_t retval;
+
+        exch = async_exchange_begin(test->sess);
+        retval = async_req_1_0(exch, IPC_TEST_SET_RW_BUF_SIZE, size);
+        async_exchange_end(exch);
+
+        if (retval != EOK)
+                return retval;
+
+        return EOK;
+}
+
+/** Test IPC read.
+ *
+ * @param test IPC test service
+ * @param dest Destination buffer
+ * @param size Number of bytes to read / size of destination buffer
+ * @return EOK on success or an error code
+ */
+errno_t ipc_test_read(ipc_test_t *test, void *dest, size_t size)
+{
+        async_exch_t *exch;
+        ipc_call_t answer;
+        aid_t req;
+        errno_t rc;
+
+        exch = async_exchange_begin(test->sess);
+        req = async_send_0(exch, IPC_TEST_READ, &answer);
+
+        rc = async_data_read_start(exch, dest, size);
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+
+        async_exchange_end(exch);
+        async_wait_for(req, NULL);
+        return EOK;
+}
+
+/** Test IPC write.
+ *
+ * @param test IPC test service
+ * @param data Source buffer
+ * @param size Number of bytes to write
+ * @return EOK on success or an error code
+ */
+errno_t ipc_test_write(ipc_test_t *test, const void *data, size_t size)
+{
+        async_exch_t *exch;
+        ipc_call_t answer;
+        aid_t req;
+        errno_t rc;
+
+        exch = async_exchange_begin(test->sess);
+        req = async_send_0(exch, IPC_TEST_WRITE, &answer);
+
+        rc = async_data_write_start(exch, data, size);
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+
+        async_exchange_end(exch);
+        async_wait_for(req, NULL);
+        return EOK;
+}
+
 /** @}
  */

uspace/srv/test/ipc-test/main.c

@@ -48 +48 @@
 #include <mem.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <task.h>
 
@@ -53 +54 @@
 
 static service_id_t svc_id;
+
+enum {
+        max_rw_buf_size = 16384,
+};
 
 /** Object in read-only memory area that will be shared.
@@ -67 +72 @@
  */
 static char rw_data[] = "Hello, world!";
+
+/** Buffer for reading/writing via read/write messages.
+ *
+ * It is allocated / size is set by IPC_TEST_SET_RW_BUF_SIZE
+ */
+static void *rw_buf;
+/** Read/write buffer size */
+size_t rw_buf_size;
 
 static void ipc_test_get_ro_area_size_srv(ipc_call_t *icall)
@@ -182 +195 @@
 }
 
+static void ipc_test_set_rw_buf_size_srv(ipc_call_t *icall)
+{
+        size_t size;
+        void *nbuf;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ipc_test_set_rw_buf_size_srv");
+
+        size = ipc_get_arg1(icall);
+
+        if (size == 0) {
+                async_answer_0(icall, ERANGE);
+                log_msg(LOG_DEFAULT, LVL_ERROR,
+                    "Requested read/write buffer size is zero.");
+                return;
+        }
+
+        if (size > max_rw_buf_size) {
+                async_answer_0(icall, ERANGE);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Requested read/write buffer "
+                    "size > %u", max_rw_buf_size);
+                return;
+        }
+
+        nbuf = realloc(rw_buf, size);
+        if (nbuf == NULL) {
+                async_answer_0(icall, ENOMEM);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
+                return;
+        }
+
+        rw_buf = nbuf;
+        rw_buf_size = size;
+        async_answer_0(icall, EOK);
+}
+
+static void ipc_test_read_srv(ipc_call_t *icall)
+{
+        ipc_call_t call;
+        errno_t rc;
+        size_t size;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ipc_test_read_srv");
+
+        if (!async_data_read_receive(&call, &size)) {
+                async_answer_0(icall, EREFUSED);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "data_read_receive failed");
+                return;
+        }
+
+        if (size > rw_buf_size) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Invalid read size.");
+                return;
+        }
+
+        rc = async_data_read_finalize(&call, rw_buf, size);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR,
+                    "data_read_finalize failed");
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        async_answer_0(icall, EOK);
+}
+
+static void ipc_test_write_srv(ipc_call_t *icall)
+{
+        ipc_call_t call;
+        errno_t rc;
+        size_t size;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ipc_test_write_srv");
+
+        if (!async_data_write_receive(&call, &size)) {
+                async_answer_0(icall, EREFUSED);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "data_write_receive failed");
+                return;
+        }
+
+        if (size > rw_buf_size) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Invalid write size.");
+                return;
+        }
+
+        rc = async_data_write_finalize(&call, rw_buf, size);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR,
+                    "data_write_finalize failed");
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        async_answer_0(icall, EOK);
+}
+
 static void ipc_test_connection(ipc_call_t *icall, void *arg)
 {
@@ -211 +323 @@
                 case IPC_TEST_SHARE_IN_RW:
                         ipc_test_share_in_rw_srv(&call);
+                        break;
+                case IPC_TEST_SET_RW_BUF_SIZE:
+                        ipc_test_set_rw_buf_size_srv(&call);
+                        break;
+                case IPC_TEST_READ:
+                        ipc_test_read_srv(&call);
+                        break;
+                case IPC_TEST_WRITE:
+                        ipc_test_write_srv(&call);
                         break;
                 default: