Fix devdax_open_ipc_handle()

The consumer should use another /dev/dax device than the producer.

Fix devdax_open_ipc_handle().
Fix ipc_devdax_prov.sh.
Fix ipc_devdax_prov_consumer.

Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>

Author: ldorau

src/provider/provider_devdax_memory.c

@@ -442,47 +442,33 @@ static umf_result_t devdax_open_ipc_handle(void *provider,
         (devdax_memory_provider_t *)provider;
     devdax_ipc_data_t *devdax_ipc_data = (devdax_ipc_data_t *)providerIpcData;
 
-    // verify it is the same devdax - first verify the path
-    if (strncmp(devdax_ipc_data->dd_path, devdax_provider->path, PATH_MAX)) {
-        LOG_ERR("devdax path mismatch (local: %s, ipc: %s)",
-                devdax_provider->path, devdax_ipc_data->dd_path);
-        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
-    }
-
-    // verify the size of the /dev/dax
-    if (devdax_ipc_data->dd_size != devdax_provider->size) {
-        LOG_ERR("devdax size mismatch (local: %zu, ipc: %zu)",
-                devdax_provider->size, devdax_ipc_data->dd_size);
-        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
-    }
-
     umf_result_t ret = UMF_RESULT_SUCCESS;
-    int fd = utils_devdax_open(devdax_provider->path);
+    int fd = utils_devdax_open(devdax_ipc_data->dd_path);
     if (fd == -1) {
-        LOG_PERR("opening a devdax (%s) failed", devdax_provider->path);
+        LOG_PERR("opening a devdax (%s) failed", devdax_ipc_data->dd_path);
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 
     unsigned map_sync_flag = 0;
     utils_translate_mem_visibility_flag(UMF_MEM_MAP_SYNC, &map_sync_flag);
 
     // mmap /dev/dax with the MAP_SYNC xor MAP_SHARED flag (if MAP_SYNC fails)
-    char *base = utils_mmap_file(NULL, devdax_provider->size,
+    char *base = utils_mmap_file(NULL, devdax_ipc_data->dd_size,
                                  devdax_provider->protection, map_sync_flag, fd,
                                  0 /* offset */);
     if (base == NULL) {
         devdax_store_last_native_error(UMF_DEVDAX_RESULT_ERROR_ALLOC_FAILED,
                                        errno);
         LOG_PERR("devdax mapping failed (path: %s, size: %zu, protection: %i, "
                  "fd: %i)",
-                 devdax_provider->path, devdax_provider->size,
+                 devdax_ipc_data->dd_path, devdax_ipc_data->dd_size,
                  devdax_provider->protection, fd);
         ret = UMF_RESULT_ERROR_MEMORY_PROVIDER_SPECIFIC;
     }
 
     LOG_DEBUG("devdax mapped (path: %s, size: %zu, protection: %i, fd: %i, "
               "offset: %zu)",
-              devdax_provider->path, devdax_provider->size,
+              devdax_ipc_data->dd_path, devdax_ipc_data->dd_size,
               devdax_provider->protection, fd, devdax_ipc_data->offset);
 
     (void)utils_close_fd(fd);

test/ipc_devdax_prov.sh

@@ -19,6 +19,16 @@ if [ "$UMF_TESTS_DEVDAX_SIZE" = "" ]; then
 	exit 0
 fi
 
+if [ "$UMF_TESTS_DEVDAX_PATH_2" = "" ]; then
+	echo "Test skipped, UMF_TESTS_DEVDAX_PATH_2 is not set"
+	exit 0
+fi
+
+if [ "$UMF_TESTS_DEVDAX_SIZE_2" = "" ]; then
+	echo "Test skipped, UMF_TESTS_DEVDAX_SIZE_2 is not set"
+	exit 0
+fi
+
 # port should be a number from the range <1024, 65535>
 PORT=$(( 1024 + ( $$ % ( 65535 - 1024 ))))
 

test/ipc_devdax_prov_consumer.c

@@ -21,15 +21,15 @@ int main(int argc, char *argv[]) {
 
     int port = atoi(argv[1]);
 
-    char *path = getenv("UMF_TESTS_DEVDAX_PATH");
+    char *path = getenv("UMF_TESTS_DEVDAX_PATH_2");
     if (path == NULL || path[0] == 0) {
-        fprintf(stderr, "Test skipped, UMF_TESTS_DEVDAX_PATH is not set\n");
+        fprintf(stderr, "Test skipped, UMF_TESTS_DEVDAX_PATH_2 is not set\n");
         return 0;
     }
 
-    char *size = getenv("UMF_TESTS_DEVDAX_SIZE");
+    char *size = getenv("UMF_TESTS_DEVDAX_SIZE_2");
     if (size == NULL || size[0] == 0) {
-        fprintf(stderr, "Test skipped, UMF_TESTS_DEVDAX_SIZE is not set\n");
+        fprintf(stderr, "Test skipped, UMF_TESTS_DEVDAX_SIZE_2 is not set\n");
         return 0;
     }