diff options
| author | Qiuwen Lu <[email protected]> | 2017-06-13 10:20:45 +0800 |
|---|---|---|
| committer | Qiuwen Lu <[email protected]> | 2017-06-13 10:20:45 +0800 |
| commit | eeaa3f7b310b33e981bef1417e0025f6efec72bb (patch) | |
| tree | f4dac530ae6d8eba836b0016bc2692c3ccdad897 | |
| parent | 0331de962d2513e8778c2723f07fd4583215265c (diff) | |
调整默认配置文件，准备现网测试。v4.2.0-20170613
| -rw-r--r-- | conf/mrglobal.conf | 51 | ||||
| -rw-r--r-- | conf/mrzcpd.sysconfig.in | 4 | ||||
| -rw-r--r-- | infra/src/vnode_common.h | 12 | ||||
| -rw-r--r-- | service/src/vdev.c | 2 |
4 files changed, 44 insertions, 25 deletions
diff --git a/conf/mrglobal.conf b/conf/mrglobal.conf index dd1d6e0..a783a5f 100644 --- a/conf/mrglobal.conf +++ b/conf/mrglobal.conf @@ -1,26 +1,33 @@ [device] -device=meth0,meth1 -sz_tunnel=2048 -sz_buffer=0 +device=enp6s0f0,enp6s0f1,enp10s0f0,enp10s0f1 +#default_sz_tunnel=32768 +#default_sz_buffer=32 -[device:meth1] -promisc=0 -mtu=1500 +[device:enp6s0f0] +in_addr=1.3.1.123 +in_mask=255.255.0.0 +gateway=1.3.1.254 -[device:meth0] -promisc=0 -mtu=1500 +[device:enp6s0f1] +in_addr=1.0.1.123 +in_mask=255.255.0.0 +gateway=1.0.1.254 + +[device:enp10s0f0] +in_addr=1.2.1.123 +in_mask=255.255.0.0 +#drop_en=1 + +[device:enp10s0f1] +in_addr=1.1.1.123 +in_mask=255.255.0.0 +#drop_en=1 [service] # lcore id for i/o service, use comma to split -iocore=6,7 -# packet distributer mode -# value can be: -# 0:tuple2,source ip and dest ip(software) -# 1:tuple4,source ip port and dest ip port(software) -# 2:use hardware rss result -distmode=0 -keepalive=1 +iocore=28,29,30,31 +#distmode=0 +#hashmode=0 [eal] virtaddr=0x7f40c4a00000 @@ -29,7 +36,11 @@ loglevel=7 [keepalive] check_spinlock=1 +#[ctrlzone] +#ctrlzone0=janus,64 + [pool] -sz_direct_pktmbuf=65536 -sz_indirect_pktmbuf=65536 -sz_cache=256 +create_mode=3 +sz_direct_pktmbuf=4194304 +sz_indirect_pktmbuf=8192 +sz_cache=256
\ No newline at end of file diff --git a/conf/mrzcpd.sysconfig.in b/conf/mrzcpd.sysconfig.in index 206cd2b..08d8825 100644 --- a/conf/mrzcpd.sysconfig.in +++ b/conf/mrzcpd.sysconfig.in @@ -1,6 +1,6 @@ # Marsio ZeroCopy Install Path MRZCPD_ROOT=@CMAKE_INSTALL_PREFIX@ # HUGEPAGES Count -HUGEPAGE_NUM_2M=20000 +HUGEPAGE_NUM_2M=16384 # PCI Resource Address using IXGBE_UIO drivers -PCI_ADDR_IXGBE=0000:06:00.0,0000:06:00.1,0000:0a:00.0,0000:0a:00.1
\ No newline at end of file +# PCI_ADDR_IXGBE=0000:06:00.0,0000:06:00.1,0000:0a:00.0,0000:0a:00.1
\ No newline at end of file diff --git a/infra/src/vnode_common.h b/infra/src/vnode_common.h index 55d19ba..207ce59 100644 --- a/infra/src/vnode_common.h +++ b/infra/src/vnode_common.h @@ -12,6 +12,10 @@ #define VNODE_CHECK_THREAD_SAFE 0 #endif +#ifndef VNODE_STAT_ENABLE +#define VNODE_STAT_ENABLE 1 +#endif + /* Tunnel Description Structure */ struct tunnel_desc { @@ -109,11 +113,15 @@ struct vnode #define MR_LIBVNODE_MAX_SZ_BURST MR_BURST_MAX #endif +#if VNODE_STAT_ENABLE #define VNODE_STAT_UPDATE(desc, queue, item, value) \ do { \ rte_atomic64_add(&desc->stat[queue].item,value); \ -} while(0) \ - +} while(0) +#else +#define VNODE_STAT_UPDATE(desc, queue, item, value) \ +do {} while(0) +#endif static inline struct tunnel_desc ** tunnel_block_locate(struct tunnel_block * block, unsigned int prodq_id, unsigned int consq_id) diff --git a/service/src/vdev.c b/service/src/vdev.c index 6ff0813..3a94251 100644 --- a/service/src/vdev.c +++ b/service/src/vdev.c @@ -218,7 +218,7 @@ int vdev_usercfg_query_vdev_in_addr(struct sc_main * sc, const char * devsym, ret = inet_pton(AF_INET, str_gateway, gateway); if (ret < 0) { - MR_CFGERR_INVALID_FORMAT(sc->local_cfgfile, str_section, "in_mask"); + MR_CFGERR_INVALID_FORMAT(sc->local_cfgfile, str_section, "gateway"); return RT_ERR; } } |