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

env/vtophys: allow registration of >2MB regions

Browse Source 
Change-Id: I4f005ce979a94b07bbaa109795ce0f6708b7fb8c
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2017-03-08 11:56:47 -07:00 committed by Jim Harris
parent 93982c19bb
commit ee2eda24bc
1 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
lib/env_dpdk/vtophys.c
View File

@ -295,35 +295,40 @@ spdk_mem_map_set_translation(struct spdk_mem_map *map, uint64_t vaddr, uint64_t
struct map_2mb *map_2mb; struct map_2mb *map_2mb;
uint16_t *ref_count; uint16_t *ref_count;
/* For now, only 2 MB registrations are supported */ /* For now, only 2 MB-aligned registrations are supported */
assert(size == 2 * 1024 * 1024); assert(size % (2 * 1024 * 1024) == 0);
assert((vaddr & MASK_2MB) == 0); assert((vaddr & MASK_2MB) == 0);
vfn_2mb = vaddr >> SHIFT_2MB; vfn_2mb = vaddr >> SHIFT_2MB;
map_1gb = spdk_mem_map_get_map_1gb(map, vfn_2mb); while (size) {
if (!map_1gb) { map_1gb = spdk_mem_map_get_map_1gb(map, vfn_2mb);
if (!map_1gb) {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "could not get %p map\n", (void *)vaddr); fprintf(stderr, "could not get %p map\n", (void *)vaddr);
#endif #endif
return; return;
} }
idx_1gb = MAP_1GB_IDX(vfn_2mb); idx_1gb = MAP_1GB_IDX(vfn_2mb);
map_2mb = &map_1gb->map[idx_1gb]; map_2mb = &map_1gb->map[idx_1gb];
ref_count = &map_1gb->ref_count[idx_1gb]; ref_count = &map_1gb->ref_count[idx_1gb];
if (*ref_count == VTOPHYS_MAX_REF_COUNT) { if (*ref_count == VTOPHYS_MAX_REF_COUNT) {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "ref count for %p already at %d\n", fprintf(stderr, "ref count for %p already at %d\n",
(void *)vaddr, VTOPHYS_MAX_REF_COUNT); (void *)vaddr, VTOPHYS_MAX_REF_COUNT);
#endif #endif
return; return;
}
map_2mb->translation_2mb = translation;
(*ref_count)++;
size -= 2 * 1024 * 1024;
vfn_2mb++;
} }
map_2mb->translation_2mb = translation;
(*ref_count)++;
} }
void void
@ -335,34 +340,39 @@ spdk_mem_map_clear_translation(struct spdk_mem_map *map, uint64_t vaddr, uint64_
struct map_2mb *map_2mb; struct map_2mb *map_2mb;
uint16_t *ref_count; uint16_t *ref_count;
/* For now, only 2 MB registrations are supported */ /* For now, only 2 MB-aligned registrations are supported */
assert(size == 2 * 1024 * 1024); assert(size % (2 * 1024 * 1024) == 0);
assert((vaddr & MASK_2MB) == 0); assert((vaddr & MASK_2MB) == 0);
vfn_2mb = vaddr >> SHIFT_2MB; vfn_2mb = vaddr >> SHIFT_2MB;
map_1gb = spdk_mem_map_get_map_1gb(map, vfn_2mb); while (size) {
if (!map_1gb) { map_1gb = spdk_mem_map_get_map_1gb(map, vfn_2mb);
if (!map_1gb) {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "could not get %p map\n", (void *)vaddr); fprintf(stderr, "could not get %p map\n", (void *)vaddr);
#endif #endif
return; return;
} }
idx_1gb = MAP_1GB_IDX(vfn_2mb); idx_1gb = MAP_1GB_IDX(vfn_2mb);
map_2mb = &map_1gb->map[idx_1gb]; map_2mb = &map_1gb->map[idx_1gb];
ref_count = &map_1gb->ref_count[idx_1gb]; ref_count = &map_1gb->ref_count[idx_1gb];
if (*ref_count == 0) { if (*ref_count == 0) {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "vaddr %p not registered\n", (void *)vaddr); fprintf(stderr, "vaddr %p not registered\n", (void *)vaddr);
#endif #endif
return; return;
} }
(*ref_count)--; (*ref_count)--;
if (*ref_count == 0) { if (*ref_count == 0) {
map_2mb->translation_2mb = map->default_translation; map_2mb->translation_2mb = map->default_translation;
}
size -= 2 * 1024 * 1024;
vfn_2mb++;
} }
} }