From 9b7d7440e82b8cd9d77b9e3abeb87530799baeb4 Mon Sep 17 00:00:00 2001 From: Ophir Munk Date: Mon, 28 Dec 2020 11:54:18 +0200 Subject: [PATCH] common/mlx5: wrap memory allocation on Windows This commit is the Windows equivalent of the Linux implementation. The APIs included in this commit: mlx5_os_malloc(), mlx5_os_free(). For memory allocations (with or without alignment) we always call _aligned_malloc(). Even if zero alignment was requested in the first place - we always select a minimal alignment value. In this way when the memory is free - it is always safe to call _aligned_free(). Signed-off-by: Ophir Munk Acked-by: Matan Azrad --- drivers/common/mlx5/windows/mlx5_common_os.h | 51 ++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 drivers/common/mlx5/windows/mlx5_common_os.h diff --git a/drivers/common/mlx5/windows/mlx5_common_os.h b/drivers/common/mlx5/windows/mlx5_common_os.h new file mode 100644 index 0000000000..cce7c88c6a --- /dev/null +++ b/drivers/common/mlx5/windows/mlx5_common_os.h @@ -0,0 +1,51 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2020 Mellanox Technologies, Ltd + */ + +#ifndef RTE_PMD_MLX5_COMMON_OS_H_ +#define RTE_PMD_MLX5_COMMON_OS_H_ + +#include + +#include "mlx5_autoconf.h" +#include "mlx5_glue.h" +#include "mlx5_malloc.h" + +/** + * This API allocates aligned or non-aligned memory. The free can be on either + * aligned or nonaligned memory. To be protected - even though there may be no + * alignment - in Windows this API will unconditioanlly call _aligned_malloc() + * with at least a minimal alignment size. + * + * @param[in] align + * The alignment value, which must be an integer power of 2 (or 0 for + * non-alignment) + * @param[in] size + * Size in bytes to allocate + * + * @return + * Valid pointer to allocated memory, NULL in case of failure + */ +static inline void * +mlx5_os_malloc(size_t align, size_t size) +{ + if (align < MLX5_MALLOC_ALIGNMENT) + align = MLX5_MALLOC_ALIGNMENT; + return _aligned_malloc(size, align); +} + +/** + * This API de-allocates a memory that originally could have been allocated + * aligned or non-aligned. In Windows since the allocation was with + * _aligned_malloc() - it is safe to always call _aligned_free(). + * + * @param[in] addr + * Pointer to address to free + * + */ +static inline void +mlx5_os_free(void *addr) +{ + _aligned_free(addr); +} +#endif /* RTE_PMD_MLX5_COMMON_OS_H_ */ -- 2.20.1