d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vtophys: add default translation to mem map

Browse Source 
This will allow returning a different default value per mem map.

Change-Id: I94d3de197acfb2e6ad40092ab0588ba4e951af80
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2017-03-01 14:21:19 -07:00
parent 2c43c9bcca
commit b98eb28d85
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/env_dpdk/vtophys.c
View File

@ -95,15 +95,17 @@ struct map_128tb {
struct spdk_mem_map { struct spdk_mem_map {
struct map_128tb map_128tb; struct map_128tb map_128tb;
pthread_mutex_t mutex; pthread_mutex_t mutex;
uint64_t default_translation;
}; };
static struct spdk_mem_map g_vtophys_map = {{}, PTHREAD_MUTEX_INITIALIZER}; static struct spdk_mem_map g_vtophys_map = {{}, PTHREAD_MUTEX_INITIALIZER, SPDK_VTOPHYS_ERROR};
static struct map_1gb * static struct map_1gb *
spdk_mem_map_get_map_1gb(struct spdk_mem_map *map, uint64_t vfn_2mb) spdk_mem_map_get_map_1gb(struct spdk_mem_map *map, uint64_t vfn_2mb)
{ {
struct map_1gb *map_1gb; struct map_1gb *map_1gb;
uint64_t idx_128tb = MAP_128TB_IDX(vfn_2mb); uint64_t idx_128tb = MAP_128TB_IDX(vfn_2mb);
size_t i;
map_1gb = map->map_128tb.map[idx_128tb]; map_1gb = map->map_128tb.map[idx_128tb];
@ -115,8 +117,10 @@ spdk_mem_map_get_map_1gb(struct spdk_mem_map *map, uint64_t vfn_2mb)
if (!map_1gb) { if (!map_1gb) {
map_1gb = malloc(sizeof(struct map_1gb)); map_1gb = malloc(sizeof(struct map_1gb));
if (map_1gb) { if (map_1gb) {
/* initialize all entries to all 0xFF (SPDK_VTOPHYS_ERROR) */ /* initialize all entries to default translation */
memset(map_1gb->map, 0xFF, sizeof(map_1gb->map)); for (i = 0; i < sizeof(map_1gb->map) / sizeof(map_1gb->map[0]); i++) {
map_1gb->map[i].translation_2mb = map->default_translation;
}
memset(map_1gb->ref_count, 0, sizeof(map_1gb->ref_count)); memset(map_1gb->ref_count, 0, sizeof(map_1gb->ref_count));
map->map_128tb.map[idx_128tb] = map_1gb; map->map_128tb.map[idx_128tb] = map_1gb;
} }
@ -211,7 +215,7 @@ spdk_mem_map_unregister(struct spdk_mem_map *map, uint64_t vaddr, uint64_t size)
(*ref_count)--; (*ref_count)--;
if (*ref_count == 0) { if (*ref_count == 0) {
map_2mb->translation_2mb = SPDK_VTOPHYS_ERROR; map_2mb->translation_2mb = map->default_translation;
} }
} }
@ -228,7 +232,7 @@ spdk_mem_map_translate(const struct spdk_mem_map *map, uint64_t vaddr)
#ifdef DEBUG #ifdef DEBUG
printf("invalid usermode virtual address %p\n", (void *)vaddr); printf("invalid usermode virtual address %p\n", (void *)vaddr);
#endif #endif
return SPDK_VTOPHYS_ERROR; return map->default_translation;
} }
vfn_2mb = vaddr >> SHIFT_2MB; vfn_2mb = vaddr >> SHIFT_2MB;
@ -237,7 +241,7 @@ spdk_mem_map_translate(const struct spdk_mem_map *map, uint64_t vaddr)
map_1gb = map->map_128tb.map[idx_128tb]; map_1gb = map->map_128tb.map[idx_128tb];
if (spdk_unlikely(!map_1gb)) { if (spdk_unlikely(!map_1gb)) {
return SPDK_VTOPHYS_ERROR; return map->default_translation;
} }
map_2mb = &map_1gb->map[idx_1gb]; map_2mb = &map_1gb->map[idx_1gb];