Merge pull request #9 from alex4nder/dpdk-1.7.1

Update to use DPDK v1.7.1

Author: anttikantee

.travis.yml

@@ -7,6 +7,7 @@ before_install:
 
 script:
  - sudo ln -sf $(ls /lib/modules | sed 1q) /lib/modules/$(uname -r)
+ - .travis/dpdk_disablekni.sh
  - make
 
 notifications:

.travis/dpdk_disablekni.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+patch -p0 <<EOF
+--- dpdk/config/common_linuxapp
++++ dpdk/config/common_linuxapp
+@@ -381,7 +381,7 @@ CONFIG_RTE_LIBRTE_PIPELINE=y
+ #
+ # Compile librte_kni
+ #
+-CONFIG_RTE_LIBRTE_KNI=y
++CONFIG_RTE_LIBRTE_KNI=n
+ CONFIG_RTE_KNI_KO_DEBUG=n
+ CONFIG_RTE_KNI_VHOST=n
+ CONFIG_RTE_KNI_VHOST_MAX_CACHE_SIZE=1024
+EOF

buildme.sh

@@ -19,7 +19,7 @@ RUMPDEST=$(pwd)/rump
 set -e
 ( cd buildrump.sh && ./buildrump.sh -T ${RUMPTOOLS} -d ${RUMPDEST} -q \
     checkout fullbuild || die buildrump.sh failed )
-( cd dpdk ; make T=$(uname -m)-default-linuxapp-gcc config && make \
+( cd dpdk ; make T=$(uname -m)-native-linuxapp-gcc config && make \
     || die dpdk build failed )
 ( cd src && ${RUMPMAKE} dependall && ${RUMPMAKE} install \
     || dpdkif build failed )

dpdk

@@ -2,4 +2,4 @@ BINDIR=		/usr/bin
 
 LDFLAGS+=	-L${RTE_SDK}/${RTE_TARGET}/lib -Wl,--no-as-needed
 
-LDADD+=		-Wl,--whole-archive -lrumpnet_dpdkif -lrumpnet_config -lrumpdev_bpf -lrumpnet_netinet6 -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump -lrumpuser -lethdev -lrte_eal -lrte_hash -lrte_lpm -lrte_malloc -lrte_mbuf -lrte_mempool -lrte_pmd_ixgbe -lrte_pmd_e1000 -lrte_pmd_ring -lrte_pmd_virtio -lrte_pmd_vmxnet3 -lrte_ring -lrte_timer -Wl,--no-whole-archive
+LDADD+=		-Wl,--whole-archive -lrumpnet_dpdkif -lrumpnet_config -lrumpdev_bpf -lrumpnet_netinet6 -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump -lrumpuser -lethdev -lrte_eal -lrte_hash -lrte_lpm -lrte_malloc -lrte_mbuf -lrte_mempool -lrte_pmd_ixgbe -lrte_pmd_e1000 -lrte_pmd_ring -lrte_pmd_virtio_uio -lrte_pmd_vmxnet3_uio -lrte_ring -lrte_timer -lrte_kvargs -Wl,--no-whole-archive

examples/Makefile.inc

@@ -18,10 +18,5 @@ static const char *ealargs[] = {
 /* change PORTID to the one your want to use */
 #define IF_PORTID 0
 
-/* change to the init method of your NIC driver */
-#ifndef PMD_INIT
-#define PMD_INIT rte_pmd_init_all
-#endif
-
 /* Receive packets in bursts of 16 per read */
 #define MAX_PKT_BURST 16

src/libdpdkif/configuration.h

@@ -134,10 +134,6 @@ globalinit(struct virtif_user *viu)
 		OUT("mbuf pool tx");
 	}
 
-	if ((rv = PMD_INIT()) < 0)
-		OUT("pmd init");
-	if ((rv = rte_eal_pci_probe()) < 0)
-		OUT("PCI probe");
 	if (rte_eth_dev_count() == 0) {
 		rv = -1;
 		OUT("no ports");