summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-01-31 17:29:33 +0100
committerDave Barach <openvpp@barachs.net>2017-02-04 12:42:49 +0000
commitd0f673ee92121e13a88ad7002e0c860b2cfc5e4b (patch)
treeee8f951d2672f4420594d0eca5bc11f4943bdfd0
parentbfe4dfa7089b5d2c03aa607ab72abbcd840cbbce (diff)
dpdk: move to uio_pci_generic
Change-Id: I3d8b7947ae6d721e9b514a59a7d2de49aed419b5 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--build-root/deb/debian/vpp.service6
-rw-r--r--build-root/deb/debian/vpp.upstart2
-rw-r--r--build-root/rpm/vpp.spec2
-rwxr-xr-xsrc/vnet/devices/dpdk/init.c2
-rw-r--r--src/vpp/conf/startup.conf6
-rw-r--r--src/vpp/conf/startup.uiopcigeneric.conf18
6 files changed, 9 insertions, 27 deletions
diff --git a/build-root/deb/debian/vpp.service b/build-root/deb/debian/vpp.service
index 40549856a96..aa1651c4119 100644
--- a/build-root/deb/debian/vpp.service
+++ b/build-root/deb/debian/vpp.service
@@ -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]
diff --git a/build-root/deb/debian/vpp.upstart b/build-root/deb/debian/vpp.upstart
index f5908783d11..62e1d2780e6 100644
--- a/build-root/deb/debian/vpp.upstart
+++ b/build-root/deb/debian/vpp.upstart
@@ -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
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 5575b5b1b62..95196e9be6e 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -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
diff --git a/src/vnet/devices/dpdk/init.c b/src/vnet/devices/dpdk/init.c
index 01ef48cb0f3..7249cc52e9b 100755
--- a/src/vnet/devices/dpdk/init.c
+++ b/src/vnet/devices/dpdk/init.c
@@ -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.
diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
index bce002027bf..a100e3e6ea7 100644
--- a/src/vpp/conf/startup.conf
+++ b/src/vpp/conf/startup.conf
@@ -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
diff --git a/src/vpp/conf/startup.uiopcigeneric.conf b/src/vpp/conf/startup.uiopcigeneric.conf
deleted file mode 100644
index 03a89dff70f..00000000000
--- a/src/vpp/conf/startup.uiopcigeneric.conf
+++ /dev/null
@@ -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
-}