vitalif
/
mtcp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sdnfv-update_onvm_18.11' into devel

master
M. Asim Jamshed 2019-01-14 19:10:32 -08:00
parent fde981ebcb 56b8acbfa3
commit e043f1e077
9 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -230,7 +230,7 @@ to a error(s) resembling the one mentioned below:
To prevent this, use the base virtual address parameter to run the ONVM manager, e.g.:
cd openNetVM/onvm
./go.sh 1,2,3 1 -s stdout -v 0x7f000000000
./go.sh 1,2,3 1 -s stdout -a 0x7f000000000
- NETMAP VERSION -

2
README.md
View File

@ -281,7 +281,7 @@ To prevent this, use the base virtual address parameter to run the ONVM manager,
```bash
cd openNetVM/onvm
./go.sh 1,2,3 1 -s stdout -v 0x7f000000000
./go.sh 1,2,3 1 -s stdout -a 0x7f000000000
```
### ***NETMAP VERSION***

2
apps/example/Makefile.in
View File

@ -54,8 +54,10 @@ $(error "Please define RTE_TARGET environment variable")
endif
INC += -I@ONVMLIBPATH@/onvm_nflib
INC += -I@ONVMLIBPATH@/lib
INC += -DENABLE_ONVM
LIBS += @ONVMLIBPATH@/onvm_nflib/$(RTE_TARGET)/libonvm.a
LIBS += @ONVMLIBPATH@/lib/$(RTE_TARGET)/lib/libonvmhelper.a -lm
endif
ifeq ($V,) # no echo

2
apps/lighttpd-1.4.32/configure.ac
View File

@ -712,7 +712,9 @@ LIBONVM_LIBS=""
if test "$WITH_LIBONVM" != "no"; then
LIBONVM_CFLAGS="-I$WITH_LIBONVM/onvm_nflib"
LIBONVM_CFLAGS="-I$WITH_LIBONVM/lib"
LIBONVM_LIBS="$WITH_LIBONVM/onvm_nflib/$RTE_TARGET/libonvm.a"
LIBONVM_LIBS="$WITH_LIBONVM/lib/$RTE_TARGET/lib/libonvmhelper.a -lm"
CFLAGS="${CFLAGS} ${LIBONVM_CFLAGS}"
AC_DEFINE([HAVE_LIBONVM], [1], [libonvm support])
AC_MSG_RESULT(yes)

2
mtcp/src/Makefile.in
View File

@ -79,8 +79,10 @@ ifeq ($(RTE_TARGET),)
$(error "Please define RTE_SDK environment variable")
endif
INC += -I@ONVMLIBPATH@/onvm_nflib
INC += -I@ONVMLIBPATH@/lib
INC += -DENABLE_ONVM
LDFLAGS += @ONVMLIBPATH@/onvm_nflib/$(RTE_TARGET)/libonvm.a
LDFLAGS += @ONVMLIBPATH@/lib/$(RTE_TARGET)/lib/libonvmhelper.a -lm
endif

2
mtcp/src/core.c
View File

@ -92,7 +92,7 @@ HandleSignal(int signal)
#ifdef ENABLE_ONVM
if (current_iomodule_func == &onvm_module_func)
onvm_nflib_stop();
onvm_nflib_stop(CONFIG.nf_info);
#endif
core = sched_getcpu();
clock_gettime(CLOCK_REALTIME, &cur_ts);

5
mtcp/src/include/mtcp.h
View File

@ -23,6 +23,10 @@
#include "stat.h"
#include "io_module.h"
#ifdef ENABLE_ONVM
#include "onvm_nflib.h"
#endif
#ifndef TRUE
#define TRUE (1)
#endif
@ -166,6 +170,7 @@ struct mtcp_config
uint8_t multi_process_is_master;
#ifdef ENABLE_ONVM
struct onvm_nf_info *nf_info;
/* onvm specific args */
uint16_t onvm_serv;
uint16_t onvm_inst;

2
mtcp/src/io_module.c
View File

@ -587,7 +587,7 @@ SetNetEnv(char *dev_name_list, char *port_stat_list)
optind = 0;
/* initialize the dpdk eal env */
ret = onvm_nflib_init(argc, argv, "mtcp_nf");
ret = onvm_nflib_init(argc, argv, "mtcp_nf", &CONFIG.nf_info);
if (ret < 0) {
TRACE_ERROR("Invalid EAL args!\n");
exit(EXIT_FAILURE);

4
mtcp/src/onvm_module.c
View File

@ -134,10 +134,10 @@ onvm_init_handle(struct mtcp_thread_context *ctxt)
dpc->pktmbuf_pool = pktmbuf_pool;
/* Complete onvm handshake */
onvm_nflib_nf_ready(nf_info);
onvm_nflib_nf_ready(CONFIG.nf_info);
/* Initialize onvm rings*/
nf = onvm_nflib_get_nf(nf_info->instance_id);
nf = onvm_nflib_get_nf(CONFIG.nf_info->instance_id);
rx_ring = nf->rx_q;
tx_ring = nf->tx_q;