Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-UPF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-UPF
Commits
7f008304
Commit
7f008304
authored
Jul 21, 2021
by
wangyongshou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modiry config pci
parent
3149592b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
93 deletions
+4
-93
etc/template/startup_debug.template
etc/template/startup_debug.template
+2
-6
etc/template/vppe.conf
etc/template/vppe.conf
+0
-83
scripts/new_run_upf.sh
scripts/new_run_upf.sh
+2
-4
No files found.
etc/template/startup_debug.template
View file @
7f008304
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
...
...
etc/template/vppe.conf
deleted
100755 → 0
View file @
3149592b
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
2
G
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
}
}
scripts/new_run_upf.sh
View file @
7f008304
...
@@ -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_DRI
V
ER
=
$upf_n3_driver
UPF_N6_DRIER
=
$upf_n6_driver
UPF_N6_DRI
V
ER
=
$upf_n6_driver
}
}
function
get_inter_info
()
function
get_inter_info
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment