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

mem: refactor segment resizing function

Browse Source 
Currently, segment resizing code sits in one giant function which
handles both in-memory and regular modes. Split them up into
individual functions.

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
This commit is contained in:
Anatoly Burakov 2019-03-29 17:55:28 +00:00 committed by Thomas Monjalon
parent ea4e3ab7bd
commit 848cbff836
1 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
lib/librte_eal/linux/eal/eal_memalloc.c
View File

@ -425,37 +425,37 @@ get_seg_fd(char *path, int buflen, struct hugepage_info *hi,
} }
static int static int
resize_hugefile(int fd, char *path, int list_idx, int seg_idx, resize_hugefile_in_memory(int fd, int list_idx, uint64_t fa_offset,
uint64_t page_sz, bool grow)
{
int flags = grow ? 0 : FALLOC_FL_PUNCH_HOLE |
FALLOC_FL_KEEP_SIZE;
int ret;
/* grow or shrink the file */
ret = fallocate(fd, flags, fa_offset, page_sz);
if (ret < 0) {
RTE_LOG(DEBUG, EAL, "%s(): fallocate() failed: %s\n",
__func__,
strerror(errno));
return -1;
}
/* increase/decrease total segment count */
fd_list[list_idx].count += (grow ? 1 : -1);
if (!grow && fd_list[list_idx].count == 0) {
close(fd_list[list_idx].memseg_list_fd);
fd_list[list_idx].memseg_list_fd = -1;
}
return 0;
}
static int
resize_hugefile_in_filesystem(int fd, char *path, int list_idx, int seg_idx,
uint64_t fa_offset, uint64_t page_sz, bool grow) uint64_t fa_offset, uint64_t page_sz, bool grow)
{ {
bool again = false; bool again = false;
/* in-memory mode is a special case, because we don't need to perform
* any locking, and we can be sure that fallocate() is supported.
*/
if (internal_config.in_memory) {
int flags = grow ? 0 : FALLOC_FL_PUNCH_HOLE |
FALLOC_FL_KEEP_SIZE;
int ret;
/* grow or shrink the file */
ret = fallocate(fd, flags, fa_offset, page_sz);
if (ret < 0) {
RTE_LOG(DEBUG, EAL, "%s(): fallocate() failed: %s\n",
__func__,
strerror(errno));
return -1;
}
/* increase/decrease total segment count */
fd_list[list_idx].count += (grow ? 1 : -1);
if (!grow && fd_list[list_idx].count == 0) {
close(fd_list[list_idx].memseg_list_fd);
fd_list[list_idx].memseg_list_fd = -1;
}
return 0;
}
do { do {
if (fallocate_supported == 0) { if (fallocate_supported == 0) {
/* we cannot deallocate memory if fallocate() is not /* we cannot deallocate memory if fallocate() is not
@ -583,9 +583,27 @@ resize_hugefile(int fd, char *path, int list_idx, int seg_idx,
} }
} }
} while (again); } while (again);
return 0; return 0;
} }
static int
resize_hugefile(int fd, char *path, int list_idx, int seg_idx,
uint64_t fa_offset, uint64_t page_sz, bool grow)
{
/* in-memory mode is a special case, because we don't need to perform
* any locking, and we can be sure that fallocate() is supported.
*/
if (internal_config.in_memory)
return resize_hugefile_in_memory(fd, list_idx, fa_offset,
page_sz, grow);
return resize_hugefile_in_filesystem(fd, path, list_idx, seg_idx,
fa_offset, page_sz, grow);
}
static int static int
alloc_seg(struct rte_memseg *ms, void *addr, int socket_id, alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
struct hugepage_info *hi, unsigned int list_idx, struct hugepage_info *hi, unsigned int list_idx,