Fix open and close

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

src/provider/provider_devdax_memory.c

@@ -443,17 +443,6 @@ static umf_result_t devdax_open_ipc_handle(void *provider,
 
     devdax_ipc_data_t *devdax_ipc_data = (devdax_ipc_data_t *)providerIpcData;
 
-    // length and offset passed to mmap() have to be page-aligned
-    if (IS_NOT_ALIGNED(devdax_ipc_data->offset, DEVDAX_PAGE_SIZE_2MB)) {
-        LOG_ERR("incorrect offset (%zu) in IPC handle - it is not page-aligned",
-                devdax_ipc_data->offset);
-        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
-    }
-
-    // length and offset passed to mmap() have to be page-aligned
-    size_t length_aligned =
-        ALIGN_UP(devdax_ipc_data->length, DEVDAX_PAGE_SIZE_2MB);
-
     int fd = utils_devdax_open(devdax_ipc_data->path);
     if (fd == -1) {
         LOG_PERR("opening the devdax (%s) failed", devdax_ipc_data->path);
@@ -464,15 +453,26 @@ static umf_result_t devdax_open_ipc_handle(void *provider,
     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 *addr =
-        utils_mmap_file(NULL, length_aligned, devdax_ipc_data->protection,
-                        map_sync_flag, fd, devdax_ipc_data->offset);
+    char *addr = utils_mmap_file(NULL, devdax_ipc_data->length,
+                                 devdax_ipc_data->protection, map_sync_flag, fd,
+                                 devdax_ipc_data->offset);
     if (addr == NULL) {
         devdax_store_last_native_error(UMF_DEVDAX_RESULT_ERROR_ALLOC_FAILED,
                                        errno);
+
+        if (IS_NOT_ALIGNED(devdax_ipc_data->offset, DEVDAX_PAGE_SIZE_2MB)) {
+            LOG_WARN("offset (%zu) is not aligned to the page size (%zu)",
+                     devdax_ipc_data->offset, DEVDAX_PAGE_SIZE_2MB);
+        }
+
+        if (IS_NOT_ALIGNED(devdax_ipc_data->length, DEVDAX_PAGE_SIZE_2MB)) {
+            LOG_WARN("length (%zu) is not aligned to the page size (%zu)",
+                     devdax_ipc_data->length, DEVDAX_PAGE_SIZE_2MB);
+        }
+
         LOG_PERR("devdax mapping failed (path: %s, size: %zu, protection: %i, "
                  "fd: %i, offset: %zu)",
-                 devdax_ipc_data->path, length_aligned,
+                 devdax_ipc_data->path, devdax_ipc_data->length,
                  devdax_ipc_data->protection, fd, devdax_ipc_data->offset);
 
         *ptr = NULL;
@@ -483,7 +483,7 @@ static umf_result_t devdax_open_ipc_handle(void *provider,
 
     LOG_DEBUG("devdax mapped (path: %s, size: %zu, protection: %i, fd: %i, "
               "offset: %zu) to address %p",
-              devdax_ipc_data->path, length_aligned,
+              devdax_ipc_data->path, devdax_ipc_data->length,
               devdax_ipc_data->protection, fd, devdax_ipc_data->offset, addr);
 
     *ptr = addr;
@@ -499,15 +499,17 @@ static umf_result_t devdax_close_ipc_handle(void *provider, void *ptr,
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 
-    // size passed to munmap() has to have the same value as in devdax_open_ipc_handle()
-    size = ALIGN_UP(size, DEVDAX_PAGE_SIZE_2MB);
-
     errno = 0;
     int ret = utils_munmap(ptr, size);
     // ignore error when size == 0
     if (ret && (size > 0)) {
         devdax_store_last_native_error(UMF_DEVDAX_RESULT_ERROR_FREE_FAILED,
                                        errno);
+        if (IS_NOT_ALIGNED(size, DEVDAX_PAGE_SIZE_2MB)) {
+            LOG_WARN("size (%zu) is not aligned to the page size (%zu)", size,
+                     DEVDAX_PAGE_SIZE_2MB);
+        }
+
         LOG_PERR("memory unmapping failed (ptr: %p, size: %zu)", ptr, size);
 
         return UMF_RESULT_ERROR_MEMORY_PROVIDER_SPECIFIC;