Commit 7f008304 authored by wangyongshou's avatar wangyongshou

modiry config pci

parent 3149592b
unix { unix {
nodaemon #nodaemon
log /var/log/upf/vpp/vpp.log log /var/log/upf/vpp/vpp.log
full-coredump full-coredump
interactive #interactive
gid vpp gid vpp
cli-listen /run/vpp/cli.sock cli-listen /run/vpp/cli.sock
logsize 100 logsize 100
...@@ -37,10 +37,6 @@ cpu { ...@@ -37,10 +37,6 @@ cpu {
scheduler-priority 50 scheduler-priority 50
} }
#buffers {
#buffers-per-numa 128000
#Default is 2048
#}
dpdk { dpdk {
dev default { dev default {
num-rx-queues 1 num-rx-queues 1
......
unix {
#nodaemon
log /var/log/upf/vpp/vpp.log
full-coredump
#interactive
gid vpp
cli-listen /run/vpp/cli.sock
logsize 100
}
api-trace {
on
}
api-segment {
gid vpp
}
logging
{
default-log-level info
default-syslog-log-level info
}
statseg {
default
per-node-counters on
}
cpu {
main-core @MAINCORE@
corelist-workers @WORKERCORE@
scheduler-policy fifo
scheduler-priority 50
}
dpdk {
dev default {
num-rx-queues 1
}
dev @N3_PCI@
{
name if_n3
num-rx-queues 2
num-tx-queues 1
ipaddr @N3_IP@
netmask 32
gateway @N3_GW@
}
dev @N6_PCI@
{
name if_n6
num-rx-queues 1
ipaddr @N6_IP@
netmask 32
gateway @N6_GW@
}
uio-driver vfio-pci
no-multi-seg
socket-mem 2048,2048
no-tx-checksum-offload
}
nat { endpoint-dependent }
heapsize 2G
plugins {
path /usr/lib/x86_64-linux-gnu/vpp_plugins
plugin default { enable }
plugin dpdk_plugin.so { enable }
plugin gtpu_plugin.so { enable }
plugin upf_plugin.so { enable }
}
...@@ -162,7 +162,6 @@ function net_state() ...@@ -162,7 +162,6 @@ function net_state()
function get_inter_ip() function get_inter_ip()
{ {
INTER_NAME=$1 INTER_NAME=$1
#RES=$(echo "ifconfig $INTER_NAME |grep inet| sed -n '1p'|awk '{print $2}'")
UPF_INTER_IP=$(echo `ifconfig ${INTER_NAME} | grep inet | sed -n '1p' | awk '{print $2}'`) UPF_INTER_IP=$(echo `ifconfig ${INTER_NAME} | grep inet | sed -n '1p' | awk '{print $2}'`)
} }
...@@ -170,7 +169,6 @@ function get_inter_pci() ...@@ -170,7 +169,6 @@ function get_inter_pci()
{ {
INTER_NAME=$1 INTER_NAME=$1
UPF_INTER_PCI=$(echo `$base/tools/ethtool -i ${INTER_NAME} | grep "bus-info" | awk '{print $2}'`) UPF_INTER_PCI=$(echo `$base/tools/ethtool -i ${INTER_NAME} | grep "bus-info" | awk '{print $2}'`)
#UPF_INTER_PCI=$(echo ` ./dpdk-devbind.py --status | grep "if=${INTER_NAME}" | awk '{print $1}'`)
} }
function is_configured(){ function is_configured(){
...@@ -266,8 +264,8 @@ function get_inter_info_from_netcard() ...@@ -266,8 +264,8 @@ function get_inter_info_from_netcard()
UPF_N3_PCI=$upf_n3_pci UPF_N3_PCI=$upf_n3_pci
UPF_N6_PCI=$upf_n6_pci UPF_N6_PCI=$upf_n6_pci
UPF_N3_DRIER=$upf_n3_driver UPF_N3_DRIVER=$upf_n3_driver
UPF_N6_DRIER=$upf_n6_driver UPF_N6_DRIVER=$upf_n6_driver
} }
function get_inter_info() function get_inter_info()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment