ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dpdk: move to uio_pci_generic

Browse Source 
Change-Id: I3d8b7947ae6d721e9b514a59a7d2de49aed419b5
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2017-01-31 17:29:33 +01:00
committed by Dave Barach
parent bfe4dfa708
commit d0f673ee92
6 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build-root/deb/debian/vpp.service
View File

@ -4,10 +4,10 @@ After=network.target
[Service]
Type=simple
ExecStartPre=-/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api
ExecStartPre=-/sbin/modprobe igb_uio
ExecStartPre=-/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api
ExecStartPre=-/sbin/modprobe uio_pci_generic
ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf
ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api
ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api
Restart=always
[Install]

2
build-root/deb/debian/vpp.upstart
View File

@ -8,7 +8,7 @@ respawn
pre-start script
rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api || true
# should be there via dkms, but if not, start anyway
modprobe igb_uio || true
modprobe uio_pci_generic || true
end script

2
build-root/rpm/vpp.spec
View File

@ -118,7 +118,7 @@ mkdir -p -m755 %{buildroot}/usr/share/vpp/api
mkdir -p -m755 %{buildroot}/etc/vpp
mkdir -p -m755 %{buildroot}/etc/sysctl.d
install -p -m 644 %{_mu_build_dir}/rpm/vpp.service %{buildroot}%{_unitdir}
install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/startup.conf %{buildroot}/etc/vpp/startup.conf
install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
#
# libraries

2
src/vnet/devices/dpdk/init.c
View File

@ -1165,7 +1165,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
}
if (!conf->uio_driver_name)
conf->uio_driver_name = format (0, "igb_uio%c", 0);
conf->uio_driver_name = format (0, "uio_pci_generic%c", 0);
/*
* Use 1G huge pages if available.

6
src/vpp/conf/startup.conf
View File

@ -80,9 +80,9 @@ dpdk {
# num-rx-queues 2
# }
## Change UIO driver used by VPP, Options are: uio_pci_generic, vfio-pci
## and igb_uio (default)
# uio-driver uio_pci_generic
## Change UIO driver used by VPP, Options are: igb_uio, vfio-pci
## and uio_pci_generic (default)
# uio-driver vfio-pci
## Disable mutli-segment buffers, improves performance but
## disables Jumbo MTU support

18
src/vpp/conf/startup.uiopcigeneric.conf
View File

@ -1,18 +0,0 @@
unix {
nodaemon
log /tmp/vpp.log
full-coredump
}
dpdk {
uio-driver uio_pci_generic
}
api-trace {
on
}
api-segment {
gid vpp
}