Refactored stdlib.h compatiblity.

- Added nvme/stdlib.h
- Renamed platform_aligned_free to aligned_free
- Updated code to use new header
- Removed stdlib compatiblity from windows.h and linux.h

Author: bgoing-micron-oss

libnvme/src/meson.build

@@ -39,6 +39,7 @@ headers = [
     'nvme/linux.h',
     'nvme/nvme-cmds.h',
     'nvme/nvme-types.h',
+    'nvme/stdlib.h',
     'nvme/tree.h',
     'nvme/types.h',
     'nvme/util.h',

libnvme/src/nvme/lib.h

@@ -12,6 +12,7 @@
 #include <stdio.h>
 
 #include <nvme/lib-types.h>
+#include <nvme/stdlib.h>
 
 #include <platform/includes.h> /* for libnvme_fd_t */
 

libnvme/src/nvme/stdlib.h

@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (c) 2026 Micron Technology, Inc.
+ *
+ * Cross-platform compatibility for stdlib.h.
+ * Provides functionality that may be missing on some platforms.
+ * Compatibility is not comprehensive. Only functionality required by
+ * nvme-cli and libnvme is included.
+ * 
+ * Authors: Broc Going <[email protected]>
+ *          Brandon Capener <[email protected]>
+ */
+
+#pragma once
+
+#include <stdlib.h>
+
+#if defined(_WIN32) || defined(_WIN64)
+
+#include <malloc.h>
+
+/* Aligned memory allocation function, use aligned_free to free. */
+static inline int posix_memalign(void **memptr, size_t alignment, size_t size)
+{
+	*memptr = _aligned_malloc(size, alignment);
+	return (*memptr == NULL) ? ENOMEM : 0;
+}
+
+/* reallocarray implementation for Windows */
+static inline void *reallocarray(void *ptr, size_t nmemb, size_t size)
+{
+	size_t total_size;
+
+	/* Check for multiplication overflow */
+	if (nmemb != 0 && size > SIZE_MAX / nmemb) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	total_size = nmemb * size;
+	return realloc(ptr, total_size);
+}
+
+#endif
+
+/*
+ * Cross-platform compatible free for aligned memory allocations.
+ * Use when posix_memalign is used to allocate memory.
+ */
+static inline void aligned_free(void *p)
+{
+#if defined(_WIN32) || defined(_WIN64)
+	_aligned_free(p);
+#else
+	free(p);
+#endif
+}

libnvme/src/nvme/util.c

@@ -12,7 +12,6 @@
 #include <malloc.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -27,6 +26,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <nvme/stdlib.h>
+
 #include <ccan/endian/endian.h>
 #include <ccan/minmax/minmax.h>
 
@@ -983,7 +984,7 @@ void *__libnvme_realloc(void *p, size_t len)
 
 void __libnvme_free(void *p)
 {
-	platform_aligned_free(p);
+	aligned_free(p);
 }
 
 #ifdef CONFIG_FABRICS

libnvme/src/platform/linux.h

@@ -68,12 +68,3 @@ static inline int random_uuid(unsigned char *uuid, size_t len)
 	close(f);
 	return ret;
 }
-
-/*
- * Platform-specific free for aligned memory allocations.
- * Use when posix_memalign is used to allocate memory.
- */
-static inline void platform_aligned_free(void *p)
-{
-	free(p);
-}

libnvme/src/platform/windows.h

@@ -167,40 +167,6 @@ static inline FILE *open_memstream(char **ptr, size_t *sizeloc)
 }
 
 
-/* stdlib.h compatibility */
-
-/* Aligned memory allocation function, use platform_aligned_free to free. */
-static inline int posix_memalign(void **memptr, size_t alignment, size_t size)
-{
-	*memptr = _aligned_malloc(size, alignment);
-	return (*memptr == NULL) ? ENOMEM : 0;
-}
-
-/*
- * Platform-specific free for aligned memory allocations.
- * Use when posix_memalign is used to allocate memory.
- */
-static inline void platform_aligned_free(void *p)
-{
-	_aligned_free(p);
-}
-
-/* reallocarray implementation for Windows */
-static inline void *reallocarray(void *ptr, size_t nmemb, size_t size)
-{
-	size_t total_size;
-
-	/* Check for multiplication overflow */
-	if (nmemb != 0 && size > SIZE_MAX / nmemb) {
-		errno = ENOMEM;
-		return NULL;
-	}
-
-	total_size = nmemb * size;
-	return realloc(ptr, total_size);
-}
-
-
 /* malloc.h compatibility*/
 
 static inline size_t malloc_usable_size(void *ptr)

nvme-rpmb.c

@@ -194,7 +194,7 @@ static int read_file(const char *file, unsigned char **data, unsigned int *len)
 		err = -errno;
 		fprintf(stderr, "Failed to read data from file"
 				" %s with %s\n", file, libnvme_strerror(errno));
-		platform_aligned_free(buf);
+		aligned_free(buf);
 		goto out;
 	}
 	*data = buf; 

plugins/memblaze/memblaze-nvme.c

@@ -861,7 +861,7 @@ static int mb_selective_download(int argc, char **argv, struct command *acmd, st
 	}
 
 out_free:
-	platform_aligned_free(fw_buf);
+	aligned_free(fw_buf);
 out_close:
 	close(fw_fd);
 out:

plugins/micron/micron-nvme.c

@@ -686,7 +686,7 @@ static int micron_selective_download(int argc, char **argv,
 	}
 
 out_free:
-	platform_aligned_free(fw_buf);
+	aligned_free(fw_buf);
 out:
 	close(fw_fd);
 	return err;

plugins/netapp/netapp-nvme.c

@@ -831,12 +831,12 @@ static int netapp_ontapdevices_get_info(struct libnvme_transport_handle *hdl,
 		fprintf(stderr, "Unable to identify namespace descriptor for %s (%s)\n",
 			dev, err < 0 ? libnvme_strerror(-err) :
 			libnvme_status_to_string(err, false));
-		platform_aligned_free(nsdescs);
+		aligned_free(nsdescs);
 		return 0;
 	}
 
 	memcpy(item->uuid, nsdescs + sizeof(struct nvme_ns_id_desc), sizeof(item->uuid));
-	platform_aligned_free(nsdescs);
+	aligned_free(nsdescs);
 
 	err = nvme_get_ontap_c2_log(hdl, item->nsid, item->log_data, ONTAP_C2_LOG_SIZE);
 	if (err) {