ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost: move global definitions to common header

Browse Source 
Move FLOOR_2MB() and CEIL_2MB() definitions to spdk_internal/memory.h
because that is where common memory functions are located.

Change-Id: I0d366686f86520e5564be07254d98a579faa3650
Signed-off-by: Vitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471713
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Vitaliy Mysak 2019-10-18 10:40:06 +02:00 committed by Tomasz Zawadzki
parent 6231a197f5
commit 3f7e2ba18e
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdk_internal/memory.h
View File

@ -50,6 +50,8 @@ extern "C" {
#define _2MB_OFFSET(ptr) (((uintptr_t)(ptr)) & (VALUE_2MB - 1))
#define _2MB_PAGE(ptr) ((ptr) & ~(0x200000 - 1))
#define FLOOR_2MB(x) (((uintptr_t)x) / VALUE_2MB) << SHIFT_2MB
#define CEIL_2MB(x) ((((uintptr_t)x) + VALUE_2MB - 1) / VALUE_2MB) << SHIFT_2MB
#ifdef __cplusplus
}

9
lib/vhost/vhost.c
View File

@ -524,11 +524,6 @@ vhost_session_find_by_vid(int vid)
return NULL;
}
#define SHIFT_2MB 21
#define SIZE_2MB (1ULL << SHIFT_2MB)
#define FLOOR_2MB(x) (((uintptr_t)x) / SIZE_2MB) << SHIFT_2MB
#define CEIL_2MB(x) ((((uintptr_t)x) + SIZE_2MB - 1) / SIZE_2MB) << SHIFT_2MB
static void
vhost_session_mem_register(struct rte_vhost_memory *mem)
{
@ -542,7 +537,7 @@ vhost_session_mem_register(struct rte_vhost_memory *mem)
start = FLOOR_2MB(region->mmap_addr);
end = CEIL_2MB(region->mmap_addr + region->mmap_size);
if (start == previous_start) {
start += (size_t) SIZE_2MB;
start += (size_t) VALUE_2MB;
}
previous_start = start;
len = end - start;
@ -570,7 +565,7 @@ vhost_session_mem_unregister(struct rte_vhost_memory *mem)
start = FLOOR_2MB(region->mmap_addr);
end = CEIL_2MB(region->mmap_addr + region->mmap_size);
if (start == previous_start) {
start += (size_t) SIZE_2MB;
start += (size_t) VALUE_2MB;
}
previous_start = start;
len = end - start;