Commit 3edc4db7 authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Jim Harris
Browse files

env: move VALUE_2MB defines into a new internal header 



We use those values in various places in SPDK,
so let's define them in a single place now.

Change-Id: Iad9a5745d69166a6e6032370d4e5a0e604914e45
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/439369


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent ca3962bf

include/spdk_internal/memory.h

0 → 100644
+58 −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.

 */



#ifndef SPDK_INTERNAL_MEMORY_H

#define SPDK_INTERNAL_MEMORY_H



#include "spdk/stdinc.h"



#ifdef __cplusplus

extern "C" {

#endif



#define SHIFT_2MB		21 /* (1 << 21) == 2MB */

#define MASK_2MB		((1ULL << SHIFT_2MB) - 1)

#define VALUE_2MB		(1 << SHIFT_2MB)



#define SHIFT_4KB		12 /* (1 << 12) == 4KB */

#define MASK_4KB		((1ULL << SHIFT_4KB) - 1)

#define VALUE_4KB		(1 << SHIFT_4KB)



#define _2MB_OFFSET(ptr)	(((uintptr_t)(ptr)) &  (VALUE_2MB - 1))

#define _2MB_PAGE(ptr)		((ptr) & ~(0x200000 - 1))



#ifdef __cplusplus

}

#endif



#endif /* SPDK_INTERNAL_MEMORY_H */

lib/env_dpdk/env_internal.h

+0 −8
Original line number Diff line number Diff line
@@ -64,14 +64,6 @@ extern struct rte_pci_bus rte_pci_bus; 
#define SHIFT_1GB	30 /* (1 << 30) == 1 GB */

#define MASK_1GB	((1ULL << SHIFT_1GB) - 1)



#define SHIFT_2MB	21 /* (1 << 21) == 2MB */

#define MASK_2MB	((1ULL << SHIFT_2MB) - 1)

#define VALUE_2MB	(1 << SHIFT_2MB)



#define SHIFT_4KB	12 /* (1 << 12) == 4KB */

#define MASK_4KB	((1ULL << SHIFT_4KB) - 1)

#define VALUE_4KB	(1 << SHIFT_4KB)



#define SPDK_PMD_REGISTER_PCI(pci_drv)									\

__attribute__((constructor)) static void pci_drv ## _register(void)					\

{													\

lib/env_dpdk/memory.c

+1 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <rte_eal_memconfig.h>



#include "spdk_internal/assert.h"

#include "spdk_internal/memory.h"



#include "spdk/assert.h"

#include "spdk/likely.h"
@@ -57,8 +58,6 @@ 
#define MAP_256TB_IDX(vfn_2mb)	((vfn_2mb) >> (SHIFT_1GB - SHIFT_2MB))

#define MAP_1GB_IDX(vfn_2mb)	((vfn_2mb) & ((1ULL << (SHIFT_1GB - SHIFT_2MB)) - 1))



#define _2MB_OFFSET(ptr)	(((uintptr_t)(ptr)) &  (VALUE_2MB - 1))



/* Page is registered */

#define REG_MAP_REGISTERED	(1ULL << 62)

lib/env_dpdk/vtophys.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <rte_eal_memconfig.h>



#include "spdk_internal/assert.h"

#include "spdk_internal/memory.h"



#include "spdk/assert.h"

#include "spdk/likely.h"

lib/ioat/ioat.c

+1 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "spdk/util.h"



#include "spdk_internal/log.h"

#include "spdk_internal/memory.h"



struct ioat_driver {

	pthread_mutex_t			lock;
@@ -582,9 +583,6 @@ spdk_ioat_detach(struct spdk_ioat_chan *ioat) 
	free(ioat);

}



#define _2MB_PAGE(ptr)		((ptr) & ~(0x200000 - 1))

#define _2MB_OFFSET(ptr)	((ptr) &  (0x200000 - 1))



int

spdk_ioat_submit_copy(struct spdk_ioat_chan *ioat, void *cb_arg, spdk_ioat_req_cb cb_fn,

		      void *dst, const void *src, uint64_t nbytes)