Add server DMA allow list for pthread client-server test using file-scope DMA buffers

Author: jackctj117

test/wh_test_clientserver.c

@@ -1162,6 +1162,31 @@ int whTest_ClientServerSequential(whTestNvmBackendType nvmType)
 #endif /* WOLFHSM_CFG_ENABLE_CLIENT && WOLFHSM_CFG_ENABLE_SERVER */
 
 #ifdef WOLFHSM_CFG_ENABLE_CLIENT
+
+#ifdef WOLFHSM_CFG_DMA
+/* File-scope buffers for the client-config DMA tests so the server thread's
+ * allow list can reference them */
+static char              _ccfg_send[WOLFHSM_CFG_COMM_DATA_LEN];
+static char              _ccfg_recv[WOLFHSM_CFG_COMM_DATA_LEN];
+static whNvmMetadata     _ccfg_meta;
+static whServerDmaAddrAllowList _ccfg_dmaAllowList;
+static whServerDmaConfig        _ccfg_serverDmaConfig;
+
+static void _initClientCfgDma(void)
+{
+    memset(&_ccfg_dmaAllowList, 0, sizeof(_ccfg_dmaAllowList));
+    _ccfg_dmaAllowList.readList[0].addr  = _ccfg_send;
+    _ccfg_dmaAllowList.readList[0].size  = sizeof(_ccfg_send);
+    _ccfg_dmaAllowList.readList[1].addr  = &_ccfg_meta;
+    _ccfg_dmaAllowList.readList[1].size  = sizeof(_ccfg_meta);
+    _ccfg_dmaAllowList.writeList[0].addr = _ccfg_recv;
+    _ccfg_dmaAllowList.writeList[0].size = sizeof(_ccfg_recv);
+
+    memset(&_ccfg_serverDmaConfig, 0, sizeof(_ccfg_serverDmaConfig));
+    _ccfg_serverDmaConfig.dmaAddrAllowList = &_ccfg_dmaAllowList;
+}
+#endif /* WOLFHSM_CFG_DMA */
+
 int whTest_ClientServerClientConfig(whClientConfig* clientCfg)
 {
     int ret = 0;
@@ -1170,8 +1195,15 @@ int whTest_ClientServerClientConfig(whClientConfig* clientCfg)
     WH_TEST_RETURN_ON_FAIL(wh_Client_Init(client, clientCfg));
 
     int counter = 1;
-    char recv_buffer[WOLFHSM_CFG_COMM_DATA_LEN] = {0};
-    char send_buffer[WOLFHSM_CFG_COMM_DATA_LEN] = {0};
+#ifdef WOLFHSM_CFG_DMA
+    char* recv_buffer = _ccfg_recv;
+    char* send_buffer = _ccfg_send;
+#else
+    char recv_buffer[WOLFHSM_CFG_COMM_DATA_LEN];
+    char send_buffer[WOLFHSM_CFG_COMM_DATA_LEN];
+#endif
+    memset(recv_buffer, 0, WOLFHSM_CFG_COMM_DATA_LEN);
+    memset(send_buffer, 0, WOLFHSM_CFG_COMM_DATA_LEN);
     uint16_t send_len = 0;
     uint16_t recv_len = 0;
 
@@ -1354,17 +1386,15 @@ int whTest_ClientServerClientConfig(whClientConfig* clientCfg)
 
 #ifdef WOLFHSM_CFG_DMA
     /* Same writeback test, but with DMA.
-     * Note: this is a client-only test where the server runs separately,
-     * so we cannot register a DMA allow list here. The server must have
-     * its allow list configured externally. */
+     * Uses file-scope buffers so the server thread's DMA allow list can
+     * reference them (configured in wh_ClientServer_MemThreadTest). */
     for (counter = 0; counter < 5; counter++) {
-        whNvmMetadata meta = {
-            .id     = counter + 40,
-            .access = WH_NVM_ACCESS_ANY,
-            .flags  = WH_NVM_FLAGS_NONE,
-            .len    = 0,
-            .label  = {0},
-        };
+        whNvmMetadata* meta = &_ccfg_meta;
+        memset(meta, 0, sizeof(*meta));
+        meta->id     = counter + 40;
+        meta->access = WH_NVM_ACCESS_ANY;
+        meta->flags  = WH_NVM_FLAGS_NONE;
+        meta->len    = 0;
         whNvmSize len = 0;
 
         whNvmId     gid                         = 0;
@@ -1375,16 +1405,16 @@ int whTest_ClientServerClientConfig(whClientConfig* clientCfg)
 
         whNvmId lastAvailObjects = 0;
 
-        snprintf((char*)(meta.label), sizeof(meta.label), "Label:%d", meta.id);
-        len = snprintf(send_buffer, sizeof(send_buffer), "Data:%d Counter:%d",
-                       meta.id, counter);
+        snprintf((char*)(meta->label), sizeof(meta->label), "Label:%d", meta->id);
+        len = snprintf(send_buffer, WOLFHSM_CFG_COMM_DATA_LEN,
+                       "Data:%d Counter:%d", meta->id, counter);
 
         lastAvailObjects = avail_objects;
 
-        WH_TEST_RETURN_ON_FAIL(ret = wh_Client_NvmAddObjectDma(client, &meta, len, (uint8_t*)send_buffer, &server_rc));
+        WH_TEST_RETURN_ON_FAIL(ret = wh_Client_NvmAddObjectDma(client, meta, len, (uint8_t*)send_buffer, &server_rc));
 
         WH_TEST_PRINT("Client NvmAddObjectDma:%d, server_rc:%d, meta.len:%u\n",
-                      ret, (int)server_rc, meta.len);
+                      ret, (int)server_rc, meta->len);
         WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
 
         WH_TEST_RETURN_ON_FAIL(ret = wh_Client_NvmGetAvailable(client, &server_rc, &avail_size, &avail_objects, &reclaim_size, &reclaim_objects));
@@ -1395,20 +1425,20 @@ int whTest_ClientServerClientConfig(whClientConfig* clientCfg)
                       (int)reclaim_size, (int)reclaim_objects);
         WH_TEST_ASSERT_RETURN(lastAvailObjects - 1 == avail_objects);
 
-        WH_TEST_RETURN_ON_FAIL(ret = wh_Client_NvmGetMetadata(client, meta.id, &server_rc, &gid, &gaccess, &gflags, &glen, sizeof(glabel), (uint8_t*)glabel));
+        WH_TEST_RETURN_ON_FAIL(ret = wh_Client_NvmGetMetadata(client, meta->id, &server_rc, &gid, &gaccess, &gflags, &glen, sizeof(glabel), (uint8_t*)glabel));
 
         WH_TEST_PRINT("Client NvmGetMetadata:%d, id:%u, access:0x%x, "
                       "flags:0x%x, len:%u label:%s\n",
                       ret, (unsigned int)gid, (unsigned int)gaccess,
                       (unsigned int)gflags, (unsigned int)glen, glabel);
 
         /* Ensure metadata matches that of the object we just wrote */
-        WH_TEST_ASSERT_RETURN(gid == meta.id);
+        WH_TEST_ASSERT_RETURN(gid == meta->id);
 
 
-        memset(recv_buffer, 0, sizeof(recv_buffer));
+        memset(recv_buffer, 0, WOLFHSM_CFG_COMM_DATA_LEN);
         WH_TEST_RETURN_ON_FAIL(
-            ret = wh_Client_NvmReadDma(client, meta.id, 0, glen,
+            ret = wh_Client_NvmReadDma(client, meta->id, 0, glen,
                                        (uint8_t*)recv_buffer, &server_rc));
         WH_TEST_PRINT("Client NvmReadDma:%d, server_rc:%d id:%u, len:%u "
                       "data:%s\n",
@@ -1645,12 +1675,19 @@ static int wh_ClientServer_MemThreadTest(whTestNvmBackendType nvmType)
 #endif
 
 
+#ifdef WOLFHSM_CFG_DMA
+    _initClientCfgDma();
+#endif
+
     whServerConfig s_conf[1] = {{
         .comm_config = cs_conf,
         .nvm         = nvm,
 #ifndef WOLFHSM_CFG_NO_CRYPTO
         .crypto = crypto,
         .devId  = INVALID_DEVID,
+#endif
+#ifdef WOLFHSM_CFG_DMA
+        .dmaConfig = &_ccfg_serverDmaConfig,
 #endif
     }};