Register client-side DMA allow lists and update tests for removed server-side allow list check

Author: jackctj117

test/wh_test_clientserver.c

@@ -351,18 +351,6 @@ static int _testDma(whServerContext* server, whClientContext* client)
     WH_TEST_ASSERT_RETURN(0 == memcmp(testMem.srvBufAllow, testMem.cliBuf,
                                       sizeof(testMem.srvBufAllow)));
 
-    /* Now try and copy from the denylisted addresses */
-    WH_TEST_ASSERT_RETURN(WH_ERROR_ACCESS ==
-                          whServerDma_CopyFromClient(server, testMem.srvBufDeny,
-                                                     (uintptr_t)testMem.cliBuf,
-                                                     sizeof(testMem.cliBuf),
-                                                     (whServerDmaFlags){0}));
-    WH_TEST_ASSERT_RETURN(
-        WH_ERROR_ACCESS ==
-        whServerDma_CopyToClient(server, (uintptr_t)testMem.cliBuf,
-                                 testMem.srvBufDeny, sizeof(testMem.srvBufDeny),
-                                 (whServerDmaFlags){0}));
-
     /* Check that zero-sized copies fail, even from allowed addresses */
     WH_TEST_ASSERT_RETURN(WH_ERROR_BADARGS == whServerDma_CopyFromClient(
                                                   server, testMem.srvBufAllow,

test/wh_test_multiclient.c

@@ -460,7 +460,7 @@ static int _testGlobalKeyDma(whClientContext* client1, whServerContext* server1,
            sizeof("GlobalDmaExportTestKey12345!") - 1);
     memset(outBuf, 0, sizeof(outBuf));
 
-    /* Register DMA allow list for both servers */
+    /* Register DMA allow list for both servers and clients */
     dmaAllowList.readList[0].addr  = keyData1;
     dmaAllowList.readList[0].size  = sizeof(keyData1);
     dmaAllowList.readList[1].addr  = keyData2;
@@ -471,6 +471,10 @@ static int _testGlobalKeyDma(whClientContext* client1, whServerContext* server1,
         wh_Server_DmaRegisterAllowList(server1, &dmaAllowList));
     WH_TEST_RETURN_ON_FAIL(
         wh_Server_DmaRegisterAllowList(server2, &dmaAllowList));
+    WH_TEST_RETURN_ON_FAIL(
+        wh_Client_DmaRegisterAllowList(client1, &dmaAllowList));
+    WH_TEST_RETURN_ON_FAIL(
+        wh_Client_DmaRegisterAllowList(client2, &dmaAllowList));
 
     WH_TEST_PRINT("Test: DMA operations with global keys\n");
 

test/wh_test_posix_threadsafe_stress.c

@@ -505,6 +505,8 @@ typedef struct {
     /* DMA configuration */
     whServerDmaConfig        dmaConfig;
     whServerDmaAddrAllowList dmaAllowList;
+    whClientDmaConfig        clientDmaConfig;
+    whDmaAddrAllowList       clientDmaAllowList;
 #endif
 } ClientServerPair;
 
@@ -676,6 +678,23 @@ static int initClientServerPair(StressTestContext* ctx, int pairIndex)
     memset(&pair->dmaConfig, 0, sizeof(pair->dmaConfig));
     pair->dmaConfig.dmaAddrAllowList = &pair->dmaAllowList;
     pair->serverConfig.dmaConfig     = &pair->dmaConfig;
+
+    /* Configure client DMA allow list (same buffers) */
+    memset(&pair->clientDmaAllowList, 0, sizeof(pair->clientDmaAllowList));
+    pair->clientDmaAllowList.readList[0].addr = pair->dmaKeyBuffer;
+    pair->clientDmaAllowList.readList[0].size = sizeof(pair->dmaKeyBuffer);
+    pair->clientDmaAllowList.readList[1].addr = pair->dmaNvmBuffer;
+    pair->clientDmaAllowList.readList[1].size = sizeof(pair->dmaNvmBuffer);
+    pair->clientDmaAllowList.readList[2].addr = &pair->dmaNvmMeta;
+    pair->clientDmaAllowList.readList[2].size = sizeof(pair->dmaNvmMeta);
+    pair->clientDmaAllowList.writeList[0].addr = pair->dmaKeyBuffer;
+    pair->clientDmaAllowList.writeList[0].size = sizeof(pair->dmaKeyBuffer);
+    pair->clientDmaAllowList.writeList[1].addr = pair->dmaNvmBuffer;
+    pair->clientDmaAllowList.writeList[1].size = sizeof(pair->dmaNvmBuffer);
+
+    memset(&pair->clientDmaConfig, 0, sizeof(pair->clientDmaConfig));
+    pair->clientDmaConfig.dmaAddrAllowList = &pair->clientDmaAllowList;
+    pair->clientConfig.dmaConfig           = &pair->clientDmaConfig;
 #endif
 
     /* Initialize client in the main thread to avoid concurrent calls to