From 6c1b9b6cfe495ed5e62e1d2b8f75f24a790ee696 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 27 Aug 2021 23:39:00 +0800 Subject: dpdk/19.11: upgrade 19.11.5 -> 19.11.9 Signed-off-by: Anuj Mittal --- ...om-Linux-5.9-get_user_pages_remote-API-do.patch | 54 ------ .../0001-test-table-fix-build-with-GCC-11.patch | 56 ------ ...evbind-fix-binding-for-built-in-kernel-dr.patch | 54 ------ recipes-extended/dpdk/dpdk_19.11.5.bb | 197 --------------------- recipes-extended/dpdk/dpdk_19.11.9.bb | 194 ++++++++++++++++++++ 5 files changed, 194 insertions(+), 361 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk/0001-Starting-from-Linux-5.9-get_user_pages_remote-API-do.patch delete mode 100644 recipes-extended/dpdk/dpdk/0001-test-table-fix-build-with-GCC-11.patch delete mode 100644 recipes-extended/dpdk/dpdk/usertools-devbind-fix-binding-for-built-in-kernel-dr.patch delete mode 100644 recipes-extended/dpdk/dpdk_19.11.5.bb create mode 100644 recipes-extended/dpdk/dpdk_19.11.9.bb diff --git a/recipes-extended/dpdk/dpdk/0001-Starting-from-Linux-5.9-get_user_pages_remote-API-do.patch b/recipes-extended/dpdk/dpdk/0001-Starting-from-Linux-5.9-get_user_pages_remote-API-do.patch deleted file mode 100644 index ad6fd93..0000000 --- a/recipes-extended/dpdk/dpdk/0001-Starting-from-Linux-5.9-get_user_pages_remote-API-do.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7e0102a6d29732b92c25ca4793d641ce6c98e95a Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Wed, 23 Sep 2020 11:00:03 +0800 -Subject: [PATCH] Starting from Linux 5.9 'get_user_pages_remote()' API doesn't - get 'struct task_struct' parameter: commit 64019a2e467a ("mm/gup: remove - task_struct pointer for all gup code") - -The change reflected to the KNI with version check. - -Cc: stable@dpdk.org - -Signed-off-by: Ferruh Yigit - -Upstream-Status: Backport [https://patches.dpdk.org/patch/75577/] - -Signed-off-by: He Zhe ---- - kernel/linux/kni/compat.h | 4 ++++ - kernel/linux/kni/kni_dev.h | 5 +++++ - 2 files changed, 9 insertions(+) - -diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h -index 9ee45dbf6..d515b2766 100644 ---- a/kernel/linux/kni/compat.h -+++ b/kernel/linux/kni/compat.h -@@ -134,3 +134,7 @@ - #if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE - #define HAVE_TX_TIMEOUT_TXQUEUE - #endif -+ -+#if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE -+#define HAVE_TSK_IN_GUP -+#endif -diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h -index ca5f92a47..c15da311b 100644 ---- a/kernel/linux/kni/kni_dev.h -+++ b/kernel/linux/kni/kni_dev.h -@@ -101,8 +101,13 @@ static inline phys_addr_t iova_to_phys(struct task_struct *tsk, - offset = iova & (PAGE_SIZE - 1); - - /* Read one page struct info */ -+#ifdef HAVE_TSK_IN_GUP - ret = get_user_pages_remote(tsk, tsk->mm, iova, 1, - FOLL_TOUCH, &page, NULL, NULL); -+#else -+ ret = get_user_pages_remote(tsk->mm, iova, 1, -+ FOLL_TOUCH, &page, NULL, NULL); -+#endif - if (ret < 0) - return 0; - --- -2.17.1 - diff --git a/recipes-extended/dpdk/dpdk/0001-test-table-fix-build-with-GCC-11.patch b/recipes-extended/dpdk/dpdk/0001-test-table-fix-build-with-GCC-11.patch deleted file mode 100644 index 4f76290..0000000 --- a/recipes-extended/dpdk/dpdk/0001-test-table-fix-build-with-GCC-11.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 33c12ac5ba5f09727c6de807e71403dd260a7bbc Mon Sep 17 00:00:00 2001 -From: Ferruh Yigit -Date: Mon, 17 May 2021 16:57:39 +0100 -Subject: [PATCH] test/table: fix build with GCC 11 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Build error: -../app/test/test_table_tables.c: In function ‘test_table_stub’: -../app/test/test_table_tables.c:31:9: - warning: ‘memset’ offset [0, 31] is out of the bounds [0, 0] - [-Warray-bounds] - memset((uint8_t *)mbuf + sizeof(struct rte_mbuf) + 32, 0, 32); \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -../app/test/test_table_tables.c:151:25: - note: in expansion of macro ‘PREPARE_PACKET’ - 151 | PREPARE_PACKET(mbufs[i], 0xadadadad); - | ^~~~~~~~~~~~~~ - -'key' points to mbuf header + 32 bytes, and memset clears next 32 bytes -of 'key', so overall there needs to be 64 bytes after mbuf header. -Adding a mbuf size check before memset. - -The original code has an assumption that mbuf data buffer follows mbuf -header, this patch accepts same assumption. - -Bugzilla ID: 677 -Fixes: 5205954791cb ("app/test: packet framework unit tests") -Cc: stable@dpdk.org - -Upstream-Status: Backport [https://github.com/DPDK/dpdk/commit/33c12ac5ba5f09727c6de807e71403dd260a7bbc] - -Signed-off-by: Ferruh Yigit -Signed-off-by: Mingli Yu ---- - app/test/test_table_tables.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/app/test/test_table_tables.c b/app/test/test_table_tables.c -index 1aa269f95..4ff6ab16a 100644 ---- a/app/test/test_table_tables.c -+++ b/app/test/test_table_tables.c -@@ -28,7 +28,8 @@ table_test table_tests[] = { - APP_METADATA_OFFSET(0)); \ - key = RTE_MBUF_METADATA_UINT8_PTR(mbuf, \ - APP_METADATA_OFFSET(32)); \ -- memset(key, 0, 32); \ -+ if (mbuf->priv_size + mbuf->buf_len >= 64) \ -+ memset(key, 0, 32); \ - k32 = (uint32_t *) key; \ - k32[0] = (value); \ - *signature = pipeline_test_hash(key, NULL, 0, 0); \ --- -2.17.1 - diff --git a/recipes-extended/dpdk/dpdk/usertools-devbind-fix-binding-for-built-in-kernel-dr.patch b/recipes-extended/dpdk/dpdk/usertools-devbind-fix-binding-for-built-in-kernel-dr.patch deleted file mode 100644 index 7eb28f8..0000000 --- a/recipes-extended/dpdk/dpdk/usertools-devbind-fix-binding-for-built-in-kernel-dr.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b2a1d7a4661dc78a4c070de5542bf2c201762cb2 Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Mon, 23 Nov 2020 11:02:52 +0800 -Subject: [PATCH] usertools/devbind: fix binding for built-in kernel drivers - -A driver can be loaded as a dynamic module or a built-in module. -In commit 681a67288655 ("usertools: check if module is loaded -before binding"), script only checks modules in /sys/module/. - -However, for built-in kernel driver, it only shows up in /sys/module/, -if it has a version or at least one parameter. So add check for -modules in /lib/modules/$(uname -r)/modules.builtin. - -Upstream-Status: Submitted [https://patches.dpdk.org/patch/84454] - -Signed-off-by: Yongxin Liu ---- - usertools/dpdk-devbind.py | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py -index b1d149876..89a0ab1c9 100755 ---- a/usertools/dpdk-devbind.py -+++ b/usertools/dpdk-devbind.py -@@ -8,6 +8,7 @@ - import os - import getopt - import subprocess -+import platform - from os.path import exists, abspath, dirname, basename - - # The PCI base class for all devices -@@ -172,7 +173,17 @@ def module_is_loaded(module): - - loaded_modules = sysfs_mods - -- return module in sysfs_mods -+ # add built-in modules as loaded -+ release = platform.uname().release -+ filename = os.path.join("/lib/modules/", release, "modules.builtin") -+ if os.path.exists(filename): -+ try: -+ with open(filename) as f: -+ loaded_modules += [os.path.splitext(os.path.basename(mod))[0] for mod in f] -+ except IOError: -+ print("Warning: cannot read list of built-in kernel modules") -+ -+ return module in loaded_modules - - - def check_modules(): --- -2.14.4 - diff --git a/recipes-extended/dpdk/dpdk_19.11.5.bb b/recipes-extended/dpdk/dpdk_19.11.5.bb deleted file mode 100644 index 41f56b0..0000000 --- a/recipes-extended/dpdk/dpdk_19.11.5.bb +++ /dev/null @@ -1,197 +0,0 @@ -include dpdk.inc - -SRC_URI += " \ - file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ - file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ - file://0001-Starting-from-Linux-5.9-get_user_pages_remote-API-do.patch \ - file://usertools-devbind-fix-binding-for-built-in-kernel-dr.patch \ - file://0001-test-table-fix-build-with-GCC-11.patch" - - -STABLE = "-stable" -BRANCH = "19.11" -SRCREV = "1d28832feb881d4512993791d30d695cc9c7160b" -S = "${WORKDIR}/git" - -COMPATIBLE_MACHINE = "null" -COMPATIBLE_HOST:libc-musl:class-target = "null" -COMPATIBLE_HOST:linux-gnux32 = "null" - -# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat. -# fuse is in meta-filesystems and qat is not yet upstreamed. -# So adding mechanism to explicitly disable the use of fuse and qat. -# To enable, uncomment the below line or include in .bbappend. -# PACKAGECONFIG ?= " dpdk_qat vhost libvirt" - -PACKAGECONFIG[dpdk_qat] = ",,virtual/qat" -PACKAGECONFIG[vhost] = ",,fuse" -PACKAGECONFIG[libvirt] = ",,libvirt" -PACKAGECONFIG[numa] = ",,numactl" - -export CONFIG_EXAMPLE_DPDK_QAT = "${@bb.utils.contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}" -export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}" -export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}" -export CONFIG_HAVE_NUMA = "${@bb.utils.contains('PACKAGECONFIG', 'numa', 'y', 'n', d)}" - -# Don't use the default value of datadir and let the dpdk set it to a dpdk -# specific directory -datadir[unexport] = "1" - -RDEPENDS:${PN} += "pciutils python3-core" -DEPENDS = "virtual/kernel" -do_configure[depends] += "virtual/kernel:do_shared_workdir" - -inherit module - -export MODULE_DIR="${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net" -export RTE_SDK = "${S}" - -export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include" -export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib" -export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}" -export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}" -export INSTALL_PATH = "${prefix}/share/dpdk" -export RTE_OUTPUT = "${S}/${RTE_TARGET}" -export ETHTOOL_LIB_PATH = "${S}/examples/ethtool/lib/${RTE_TARGET}/" -export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}" -export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}" -export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" - -export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" -export ARCHDIR = "generic" - -DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc" -DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc" -DPDK_RTE_TARGET:aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc" -export RTE_TARGET = "${DPDK_RTE_TARGET}" - -# Workaround failure on gcc10 -TOOLCHAIN_OPTIONS += "-Wno-error=maybe-uninitialized" - -CONFIG_NAME = "common_linux" -TEST_DIR = "app/test" - -# The list of intel Comms platforms and their target machine -# process mapping. The supported target machine is listed under -# dpdk/mk/machine -def get_dpdk_target_mach(bb, d): - target_arch = d.getVar('DPDK_TARGET_MACHINE', True) - if target_arch: - return target_arch - return "default" - -do_configure () { - ############################################################# - ### default value for prefix is "usr", unsetting it, so it - ### will not be concatenated in ${RTE_TARGET}/Makefile - ### which will cause compilation failure - ############################################################# - unset prefix - - # Fix-up CONFIG_RTE_MACHINE based on target machine - sed -e "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#" -i ${S}/config/defconfig_${RTE_TARGET} - - # Fix-up vhost configs based on package config - sed -e "s#CONFIG_RTE_KNI_VHOST=n#CONFIG_RTE_KNI_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME} - sed -e "s#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME} - sed -e "s#CONFIG_RTE_LIBRTE_VHOST=n#CONFIG_RTE_LIBRTE_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME} - sed -e "s#CONFIG_RTE_LIBRTE_VHOST_NUMA=.*#CONFIG_RTE_LIBRTE_VHOST_NUMA=${CONFIG_HAVE_NUMA}#" -i ${S}/config/${CONFIG_NAME} - sed -e "s#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=.*#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=${CONFIG_HAVE_NUMA}#" -i ${S}/config/${CONFIG_NAME} - - # Fix-up CONFIG_RTE_LIBRTE_POWER based on package config for libvirt - sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/${CONFIG_NAME} - - make O=$RTE_TARGET T=$RTE_TARGET config -} - -do_compile () { - unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS - - cd ${S}/${RTE_TARGET} - oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" \ - EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \ - CROSS="${TARGET_PREFIX}" \ - prefix="" LDFLAGS="${TUNE_LDARGS}" WERROR_FLAGS="-w" V=1 - - cd ${S}/examples/ - oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \ - EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -O3 -I${STAGING_INCDIR}" \ - CROSS="${TARGET_PREFIX}" O="${S}/examples/$@/" - - cd ${S}/${TEST_DIR}/ - oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \ - EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -O3 -I${STAGING_INCDIR}" \ - CROSS="${TARGET_PREFIX}" O="${S}/${TEST_DIR}/$@/" -} - -do_install () { - oe_runmake O=${RTE_OUTPUT} T= install-runtime DESTDIR=${D} - oe_runmake O=${RTE_OUTPUT} T= install-kmod DESTDIR=${D} kerneldir=${MODULE_DIR} - oe_runmake O=${RTE_OUTPUT} T= install-sdk DESTDIR=${D} - - # Install examples - for dirname in ${S}/examples/* - do - install -m 0755 -d ${D}/${INSTALL_PATH}/examples/`basename ${dirname}` - - for appname in `find ${dirname} -regex ".*${EXAMPLES_BUILD_DIR}\/app\/[-0-9a-zA-Z0-9/_]*$"` - do - install -m 755 ${appname} ${D}/${INSTALL_PATH}/examples/`basename ${dirname}`/ - done - done - - # Install test - for dirname in ${S}/${TEST_DIR}/app/* - do - install -m 0755 -d ${D}/${INSTALL_PATH}/test - - for appname in `find ${dirname} -regex ".*test\/app\/[-0-9a-zA-Z0-9/_]*$"` - do - install -m 755 ${appname} ${D}/${INSTALL_PATH}/test - done - done - - cp -r ${S}/mk ${D}${INSTALL_PATH}/ - - for ss in $(find ${D} -type f -name "*.py"); do - sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${ss} - done - - # Remove the unneeded dir - rm -rf ${D}/${INSTALL_PATH}/${RTE_TARGET}/app -} - -PACKAGES += "${PN}-examples ${PN}-test" - -FILES:${PN}-dbg += " \ - ${INSTALL_PATH}/.debug \ - ${INSTALL_PATH}/examples/*/.debug \ - " - -FILES:${PN}-doc += "\ - ${INSTALL_PATH}/doc \ - " - -FILES:${PN}-dev += " \ - ${INSTALL_PATH}/${RTE_TARGET}/.config \ - ${includedir} \ - ${includedir}/${ARCHDIR} \ - ${includedir}/exec-env \ - ${INSTALL_PATH}/buildtools/ \ - ${INSTALL_PATH}/${RTE_TARGET}/include \ - ${INSTALL_PATH}/${RTE_TARGET}/lib \ - ${INSTALL_PATH}/mk \ - " - -FILES:${PN} += " ${INSTALL_PATH}/usertools/ \ - ${prefix}/sbin/ \ - ${prefix}/bin/ \ - ${libdir}/ \ - " -FILES:${PN}-examples += " \ - ${INSTALL_PATH}/examples/* \ - " - -FILES:${PN}-test += " \ - ${INSTALL_PATH}/test \ - " diff --git a/recipes-extended/dpdk/dpdk_19.11.9.bb b/recipes-extended/dpdk/dpdk_19.11.9.bb new file mode 100644 index 0000000..3c3f035 --- /dev/null +++ b/recipes-extended/dpdk/dpdk_19.11.9.bb @@ -0,0 +1,194 @@ +include dpdk.inc + +SRC_URI += " \ + file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ + file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ + " + +STABLE = "-stable" +BRANCH = "19.11" +SRCREV = "a3d97ddaead03cb19b5160bc78e724659795aea7" +S = "${WORKDIR}/git" + +COMPATIBLE_MACHINE = "null" +COMPATIBLE_HOST:libc-musl:class-target = "null" +COMPATIBLE_HOST:linux-gnux32 = "null" + +# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat. +# fuse is in meta-filesystems and qat is not yet upstreamed. +# So adding mechanism to explicitly disable the use of fuse and qat. +# To enable, uncomment the below line or include in .bbappend. +# PACKAGECONFIG ?= " dpdk_qat vhost libvirt" + +PACKAGECONFIG[dpdk_qat] = ",,virtual/qat" +PACKAGECONFIG[vhost] = ",,fuse" +PACKAGECONFIG[libvirt] = ",,libvirt" +PACKAGECONFIG[numa] = ",,numactl" + +export CONFIG_EXAMPLE_DPDK_QAT = "${@bb.utils.contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}" +export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}" +export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}" +export CONFIG_HAVE_NUMA = "${@bb.utils.contains('PACKAGECONFIG', 'numa', 'y', 'n', d)}" + +# Don't use the default value of datadir and let the dpdk set it to a dpdk +# specific directory +datadir[unexport] = "1" + +RDEPENDS:${PN} += "pciutils python3-core" +DEPENDS = "virtual/kernel" +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +inherit module + +export MODULE_DIR="${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net" +export RTE_SDK = "${S}" + +export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include" +export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib" +export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}" +export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}" +export INSTALL_PATH = "${prefix}/share/dpdk" +export RTE_OUTPUT = "${S}/${RTE_TARGET}" +export ETHTOOL_LIB_PATH = "${S}/examples/ethtool/lib/${RTE_TARGET}/" +export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}" +export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}" +export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" + +export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" +export ARCHDIR = "generic" + +DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc" +DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc" +DPDK_RTE_TARGET:aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc" +export RTE_TARGET = "${DPDK_RTE_TARGET}" + +# Workaround failure on gcc10 +TOOLCHAIN_OPTIONS += "-Wno-error=maybe-uninitialized" + +CONFIG_NAME = "common_linux" +TEST_DIR = "app/test" + +# The list of intel Comms platforms and their target machine +# process mapping. The supported target machine is listed under +# dpdk/mk/machine +def get_dpdk_target_mach(bb, d): + target_arch = d.getVar('DPDK_TARGET_MACHINE', True) + if target_arch: + return target_arch + return "default" + +do_configure () { + ############################################################# + ### default value for prefix is "usr", unsetting it, so it + ### will not be concatenated in ${RTE_TARGET}/Makefile + ### which will cause compilation failure + ############################################################# + unset prefix + + # Fix-up CONFIG_RTE_MACHINE based on target machine + sed -e "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#" -i ${S}/config/defconfig_${RTE_TARGET} + + # Fix-up vhost configs based on package config + sed -e "s#CONFIG_RTE_KNI_VHOST=n#CONFIG_RTE_KNI_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME} + sed -e "s#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME} + sed -e "s#CONFIG_RTE_LIBRTE_VHOST=n#CONFIG_RTE_LIBRTE_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME} + sed -e "s#CONFIG_RTE_LIBRTE_VHOST_NUMA=.*#CONFIG_RTE_LIBRTE_VHOST_NUMA=${CONFIG_HAVE_NUMA}#" -i ${S}/config/${CONFIG_NAME} + sed -e "s#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=.*#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=${CONFIG_HAVE_NUMA}#" -i ${S}/config/${CONFIG_NAME} + + # Fix-up CONFIG_RTE_LIBRTE_POWER based on package config for libvirt + sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/${CONFIG_NAME} + + make O=$RTE_TARGET T=$RTE_TARGET config +} + +do_compile () { + unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS + + cd ${S}/${RTE_TARGET} + oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" \ + EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \ + CROSS="${TARGET_PREFIX}" \ + prefix="" LDFLAGS="${TUNE_LDARGS}" WERROR_FLAGS="-w" V=1 + + cd ${S}/examples/ + oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \ + EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -O3 -I${STAGING_INCDIR}" \ + CROSS="${TARGET_PREFIX}" O="${S}/examples/$@/" + + cd ${S}/${TEST_DIR}/ + oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \ + EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -O3 -I${STAGING_INCDIR}" \ + CROSS="${TARGET_PREFIX}" O="${S}/${TEST_DIR}/$@/" +} + +do_install () { + oe_runmake O=${RTE_OUTPUT} T= install-runtime DESTDIR=${D} + oe_runmake O=${RTE_OUTPUT} T= install-kmod DESTDIR=${D} kerneldir=${MODULE_DIR} + oe_runmake O=${RTE_OUTPUT} T= install-sdk DESTDIR=${D} + + # Install examples + for dirname in ${S}/examples/* + do + install -m 0755 -d ${D}/${INSTALL_PATH}/examples/`basename ${dirname}` + + for appname in `find ${dirname} -regex ".*${EXAMPLES_BUILD_DIR}\/app\/[-0-9a-zA-Z0-9/_]*$"` + do + install -m 755 ${appname} ${D}/${INSTALL_PATH}/examples/`basename ${dirname}`/ + done + done + + # Install test + for dirname in ${S}/${TEST_DIR}/app/* + do + install -m 0755 -d ${D}/${INSTALL_PATH}/test + + for appname in `find ${dirname} -regex ".*test\/app\/[-0-9a-zA-Z0-9/_]*$"` + do + install -m 755 ${appname} ${D}/${INSTALL_PATH}/test + done + done + + cp -r ${S}/mk ${D}${INSTALL_PATH}/ + + for ss in $(find ${D} -type f -name "*.py"); do + sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${ss} + done + + # Remove the unneeded dir + rm -rf ${D}/${INSTALL_PATH}/${RTE_TARGET}/app +} + +PACKAGES += "${PN}-examples ${PN}-test" + +FILES:${PN}-dbg += " \ + ${INSTALL_PATH}/.debug \ + ${INSTALL_PATH}/examples/*/.debug \ + " + +FILES:${PN}-doc += "\ + ${INSTALL_PATH}/doc \ + " + +FILES:${PN}-dev += " \ + ${INSTALL_PATH}/${RTE_TARGET}/.config \ + ${includedir} \ + ${includedir}/${ARCHDIR} \ + ${includedir}/exec-env \ + ${INSTALL_PATH}/buildtools/ \ + ${INSTALL_PATH}/${RTE_TARGET}/include \ + ${INSTALL_PATH}/${RTE_TARGET}/lib \ + ${INSTALL_PATH}/mk \ + " + +FILES:${PN} += " ${INSTALL_PATH}/usertools/ \ + ${prefix}/sbin/ \ + ${prefix}/bin/ \ + ${libdir}/ \ + " +FILES:${PN}-examples += " \ + ${INSTALL_PATH}/examples/* \ + " + +FILES:${PN}-test += " \ + ${INSTALL_PATH}/test \ + " -- cgit v1.2.3-54-g00ecf