env: Move malloc/free wrappers into env (b9fbdd18) · Commits · Public Repositories / spdk

include/spdk/env.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -42,8 +42,23 @@
		extern "C" {
		#endif

		#include <stddef.h>
		#include <stdint.h>

		/**
		* Allocate a pinned, physically contiguous memory buffer with the
		* given size and alignment. The buffer will be zeroed.
		*/
		void *
		spdk_zmalloc(size_t size, size_t align, uint64_t *phys_addr);

		/**
		* Free a memory buffer previously allocated with spdk_malloc.
		* This call is never made from the performance path.
		*/
		void
		spdk_free(void *buf);

		#define SPDK_VTOPHYS_ERROR (0xFFFFFFFFFFFFFFFFULL)

		uint64_t spdk_vtophys(void *buf);

lib/env/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		CFLAGS += $(DPDK_INC)
		C_SRCS = vtophys.c
		C_SRCS = env.c vtophys.c
		LIBNAME = env

		include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

lib/env/env.c

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*-
		* BSD LICENSE
		*
		* Copyright (c) Intel Corporation.
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		* * Neither the name of Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/

		#include "spdk/env.h"

		#include <string.h>

		#include <rte_config.h>
		#include <rte_malloc.h>

		void *
		spdk_zmalloc(size_t size, size_t align, uint64_t *phys_addr)
		{
		void *buf = rte_malloc(NULL, size, align);
		if (buf) {
		memset(buf, 0, size);
		*phys_addr = rte_malloc_virt2phy(buf);
		}
		return buf;
		}

		void
		spdk_free(void *buf)
		{
		return rte_free(buf);
		}

lib/ioat/ioat.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -402,7 +402,7 @@ ioat_channel_start(struct spdk_ioat_chan *ioat)
		ioat->max_xfer_size = 1U << xfercap;
		}

		ioat->comp_update = ioat_zmalloc(NULL, sizeof(*ioat->comp_update), SPDK_IOAT_CHANCMP_ALIGN,
		ioat->comp_update = ioat_zmalloc(sizeof(*ioat->comp_update), SPDK_IOAT_CHANCMP_ALIGN,
		&comp_update_bus_addr);
		if (ioat->comp_update == NULL) {
		return -1;
		@@ -417,7 +417,7 @@ ioat_channel_start(struct spdk_ioat_chan *ioat)
		return -1;
		}

		ioat->hw_ring = ioat_zmalloc(NULL, num_descriptors * sizeof(union spdk_ioat_hw_desc), 64,
		ioat->hw_ring = ioat_zmalloc(num_descriptors * sizeof(union spdk_ioat_hw_desc), 64,
		&ioat->hw_ring_phys_addr);
		if (!ioat->hw_ring) {
		return -1;

lib/ioat/ioat_impl.h

+2 −12

Original line number	Diff line number	Diff line
		@@ -30,22 +30,12 @@
		* Allocate a pinned, physically contiguous memory buffer with the
		* given size and alignment.
		*/
		static inline void *
		ioat_zmalloc(const char tag, size_t size, unsigned align, uint64_t phys_addr)
		{
		void *buf = rte_malloc(tag, size, align);

		if (buf) {
		memset(buf, 0, size);
		*phys_addr = rte_malloc_virt2phy(buf);
		}
		return buf;
		}
		#define ioat_zmalloc spdk_zmalloc

		/**
		* Free a memory buffer previously allocated with ioat_zmalloc.
		*/
		#define ioat_free(buf) rte_free(buf)
		#define ioat_free spdk_free

		/**
		* Return the physical address for the specified virtual address.