适配DPDK17.11.6

3 files changed, 13 insertions, 43 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dad4418..2fc6d87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,11 +39,10 @@ build-debug:
     stage: build
     extends: .build_mrzcpd
     tags:
-    - mrzcpd
-    - centos-7.4.1708
+    - share
     variables:
         BUILD_TYPE: "Debug"
-        BUILD_PREFIX: "/opt/dpdk-17.05-debug"
+        BUILD_PREFIX: "/opt/dpdk-17.11.6-debug"
     except:
     - tags
 
@@ -51,11 +50,10 @@ build-release:
     stage: build
     extends: .build_mrzcpd
     tags:
-    - mrzcpd
-    - centos-7.4.1708
+    - share
     variables:
         BUILD_TYPE: "RelWithDebInfo"
-        BUILD_PREFIX: "/opt/dpdk-17.05-rel"
+        BUILD_PREFIX: "/opt/dpdk-17.11.6-rel"
     except:
     - tags
 
@@ -63,11 +61,10 @@ package-debug:
     stage: package
     extends: .package_mrzcpd
     tags:
-    - mrzcpd
-    - centos-7.4.1708
+    - share
     variables:
         BUILD_TYPE: "Debug"
-        BUILD_PREFIX: "/opt/dpdk-17.05-debug"
+        BUILD_PREFIX: "/opt/dpdk-17.11.6-debug"
     artifacts:
         name: "mrzcpd-debug-$CI_COMMIT_REF_NAME-binary"
         paths:
@@ -79,40 +76,13 @@ package-release:
     stage: package
     extends: .package_mrzcpd
     tags:
-    - mrzcpd
-    - centos-7.4.1708
+    - share
     variables:
         BUILD_TYPE: "RelWithDebInfo"
-        BUILD_PREFIX: "/opt/dpdk-17.05-rel"
+        BUILD_PREFIX: "/opt/dpdk-17.11.6-rel"
     artifacts:
         name: "mrzcpd-$CI_COMMIT_REF_NAME-binary"
         paths:
         - build/*.rpm
     only:
     - tags
-
-deploy-debug:
-    stage: deploy
-    tags:
-    - package-server
-    dependencies:
-    - package-debug
-    variables:
-        GIT_STRATEGY: "none"
-        RPM_REPO_PATH: "/data/ci/repos/mrzcpd"
-    extends: .deploy_to_package_server
-    only:
-    - tags
-
-deploy_release:
-    stage: deploy
-    tags:
-    - package-server
-    dependencies:
-    - package-release
-    variables:
-        GIT_STRATEGY: "none"
-        RPM_REPO_PATH: "/data/ci/repos/mrzcpd"
-    extends: .deploy_to_package_server
-    only:
-    - tags
diff --git a/cmake/FindDPDK.cmake b/cmake/FindDPDK.cmake
index 60539d3..6b037c6 100644
--- a/cmake/FindDPDK.cmake
+++ b/cmake/FindDPDK.cmake
@@ -106,7 +106,7 @@ endif()
 
 # Additional library
 file(GLOB DPDK_LIBRARY_GEN "${DPDK_LIBRARY_DIR}/librte*.a" "${DPDK_LIBRARY_DIR}/libeth*.a")
-set(DPDK_LIBRARY -Wl,--whole-archive ${DPDK_LIBRARY_GEN} -Wl,--no-whole-archive rt m dl pcap)
+set(DPDK_LIBRARY -Wl,--whole-archive ${DPDK_LIBRARY_GEN} -Wl,--no-whole-archive rt m dl pcap numa)
 
 # Force Include
 set(DPDK_FORCE_INCLUDE "-include ${DPDK_INCLUDE_DIR}/rte_config.h")
@@ -121,4 +121,4 @@ mark_as_advanced(
     DPDK_LIBRARY
 	DPDK_C_PREDEFINED
 	DPDK_CXX_PREDEFINED
-)
\ No newline at end of file
+)
diff --git a/service/src/phydev.c b/service/src/phydev.c
index 4ac8703..bef2d2f 100644
--- a/service/src/phydev.c
+++ b/service/src/phydev.c
@@ -7,6 +7,7 @@
 
 #include <rte_malloc.h>
 #include <rte_pci.h>
+#include <rte_bus_pci.h>
 #include <rte_config.h>
 #include <rte_debug.h>
 #include <rte_ethdev.h>
@@ -589,7 +590,7 @@ static int phydev_scan_raw_socket(struct sc_main * sc, struct phydev_main * phyd
 
     for (int i = 0; i < nr_rawsyms; i++)
     {
-        uint8_t port_id;
+        uint16_t port_id;
         char str_attach_args[MR_STRING_MAX];
 
         snprintf(str_attach_args, sizeof(str_attach_args),
@@ -627,8 +628,7 @@ static int phydev_scan_uio(struct phydev_main * phydev_main)
 
         if (dev_info.pci_dev != NULL)
         {
-            phydev = phydev_lookup_by_pci_addr(phydev_main,
-                dev_info.pci_dev->addr);
+            phydev = phydev_lookup_by_pci_addr(phydev_main, dev_info.pci_dev->addr);
         }
 
         /* HWFILE里面没有定义，或虚拟设备 */