cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #559 from hawkxiang/parse_multi_processes_config 

Config: Support parse "--file-prefix"&"--pci-whitelist" for multi-processes
This commit is contained in:
johnjiang 2020-11-19 14:43:26 +08:00 committed by GitHub
parent db7072c6b2 199154d90d
commit 9817534a21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ff_config.c
View File

@ -567,6 +567,10 @@ ini_parse_handler(void* user, const char* section, const char* name,
return parse_lcore_mask(pconfig, pconfig->dpdk.lcore_mask); return parse_lcore_mask(pconfig, pconfig->dpdk.lcore_mask);
} else if (MATCH("dpdk", "base_virtaddr")) { } else if (MATCH("dpdk", "base_virtaddr")) {
pconfig->dpdk.base_virtaddr= strdup(value); pconfig->dpdk.base_virtaddr= strdup(value);
} else if (MATCH("dpdk", "file_prefix")) {
pconfig->dpdk.file_prefix = strdup(value);
} else if (MATCH("dpdk", "pci_whitelist")) {
pconfig->dpdk.pci_whitelist = strdup(value);
} else if (MATCH("dpdk", "port_list")) { } else if (MATCH("dpdk", "port_list")) {
return parse_port_list(pconfig, value); return parse_port_list(pconfig, value);
} else if (MATCH("dpdk", "nb_vdev")) { } else if (MATCH("dpdk", "nb_vdev")) {
@ -664,6 +668,14 @@ dpdk_args_setup(struct ff_config *cfg)
sprintf(temp, "--base-virtaddr=%s", cfg->dpdk.base_virtaddr); sprintf(temp, "--base-virtaddr=%s", cfg->dpdk.base_virtaddr);
dpdk_argv[n++] = strdup(temp); dpdk_argv[n++] = strdup(temp);
} }
if (cfg->dpdk.file_prefix) {
sprintf(temp, "--file-prefix=container-%s", cfg->dpdk.file_prefix);
dpdk_argv[n++] = strdup(temp);
}
if (cfg->dpdk.pci_whitelist) {
sprintf(temp, "--pci-whitelist=%s", cfg->dpdk.pci_whitelist);
dpdk_argv[n++] = strdup(temp);
}
if (cfg->dpdk.nb_vdev) { if (cfg->dpdk.nb_vdev) {
for (i=0; i<cfg->dpdk.nb_vdev; i++) { for (i=0; i<cfg->dpdk.nb_vdev; i++) {
@ -694,9 +706,11 @@ dpdk_args_setup(struct ff_config *cfg)
} }
sprintf(temp, "--no-pci"); sprintf(temp, "--no-pci");
dpdk_argv[n++] = strdup(temp); dpdk_argv[n++] = strdup(temp);
if (!cfg->dpdk.file_prefix) {
sprintf(temp, "--file-prefix=container"); sprintf(temp, "--file-prefix=container");
dpdk_argv[n++] = strdup(temp); dpdk_argv[n++] = strdup(temp);
} }
}
if (cfg->dpdk.nb_bond) { if (cfg->dpdk.nb_bond) {
for (i=0; i<cfg->dpdk.nb_bond; i++) { for (i=0; i<cfg->dpdk.nb_bond; i++) {

6
lib/ff_config.h
View File

@ -116,6 +116,12 @@ struct ff_config {
/* specify base virtual address to map. */ /* specify base virtual address to map. */
char *base_virtaddr; char *base_virtaddr;
/* allow processes that do not want to co-operate to have different memory regions */
char *file_prefix;
/* load an external driver */
char *pci_whitelist;
int nb_channel; int nb_channel;
int memory; int memory;
int no_huge; int no_huge;