From 010674478cb18b2ce1824ee5950da41a6cc0a754 Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Mon, 5 Sep 2022 21:57:31 +0800 Subject: dpdk-module/21.11 : update version to 21.11.2 Drops upstreamed patch: * 0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- recipes-extended/dpdk/dpdk-module_21.11.1.bb | 50 ---------------------- recipes-extended/dpdk/dpdk-module_21.11.2.bb | 49 +++++++++++++++++++++ ...net.c-use-netif_rx-instead-of-netif_rx_ni.patch | 30 ------------- 3 files changed, 49 insertions(+), 80 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk-module_21.11.1.bb create mode 100644 recipes-extended/dpdk/dpdk-module_21.11.2.bb delete mode 100644 recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch diff --git a/recipes-extended/dpdk/dpdk-module_21.11.1.bb b/recipes-extended/dpdk/dpdk-module_21.11.1.bb deleted file mode 100644 index 3089ec9..0000000 --- a/recipes-extended/dpdk/dpdk-module_21.11.1.bb +++ /dev/null @@ -1,50 +0,0 @@ -include dpdk.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" - -SRC_URI += " \ - file://0001-Makefile-add-makefile.patch \ - file://0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch \ -" -STABLE = "-stable" -BRANCH = "21.11" -SRCREV = "fcd039e4663bf2b595d7af3a8175a3e0bc09b367" -S = "${WORKDIR}/git" - -inherit module - -#kernel module needs 'rte_build_config.h', which is generated at buid time -DEPENDS += "dpdk" - -COMPATIBLE_MACHINE = "null" -COMPATIBLE_HOST:libc-musl:class-target = "null" -COMPATIBLE_HOST:linux-gnux32 = "null" - -export S -export STAGING_KERNEL_DIR -export STAGING_INCDIR -export INSTALL_MOD_DIR="dpdk" - -do_configure[noexec] = "1" - -do_compile() { - cd ${S}/kernel/linux/kni - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" \ - O=${STAGING_KERNEL_BUILDDIR} \ - KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \ - ${MAKE_TARGETS} -} - -do_install() { - cd ${S}/kernel/linux/kni - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \ - INSTALL_FW_PATH="${D}${nonarch_base_libdir}/firmware" \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - O=${STAGING_KERNEL_BUILDDIR} \ - ${MODULES_INSTALL_TARGET} -} diff --git a/recipes-extended/dpdk/dpdk-module_21.11.2.bb b/recipes-extended/dpdk/dpdk-module_21.11.2.bb new file mode 100644 index 0000000..d7ce6a0 --- /dev/null +++ b/recipes-extended/dpdk/dpdk-module_21.11.2.bb @@ -0,0 +1,49 @@ +include dpdk.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" + +SRC_URI += " \ + file://0001-Makefile-add-makefile.patch \ +" +STABLE = "-stable" +BRANCH = "21.11" +SRCREV = "7bcd45ce824d0ea2a9f30d16855613a93521851b" +S = "${WORKDIR}/git" + +inherit module + +#kernel module needs 'rte_build_config.h', which is generated at buid time +DEPENDS += "dpdk" + +COMPATIBLE_MACHINE = "null" +COMPATIBLE_HOST:libc-musl:class-target = "null" +COMPATIBLE_HOST:linux-gnux32 = "null" + +export S +export STAGING_KERNEL_DIR +export STAGING_INCDIR +export INSTALL_MOD_DIR="dpdk" + +do_configure[noexec] = "1" + +do_compile() { + cd ${S}/kernel/linux/kni + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + O=${STAGING_KERNEL_BUILDDIR} \ + KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \ + ${MAKE_TARGETS} +} + +do_install() { + cd ${S}/kernel/linux/kni + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \ + INSTALL_FW_PATH="${D}${nonarch_base_libdir}/firmware" \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + O=${STAGING_KERNEL_BUILDDIR} \ + ${MODULES_INSTALL_TARGET} +} diff --git a/recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch b/recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch deleted file mode 100644 index 383d657..0000000 --- a/recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5c19a02979d3414f1326359494c1df38eac2730b Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 11 May 2022 17:47:09 +0800 -Subject: [PATCH] kni_net.c: use netif_rx() instead of netif_rx_ni() - -The netif_rx_ni is removed in below commit after kernel upgraded -to 5.18, so change accordingly to fix the gap. -2655926aea9b net: Remove netif_rx_any_context() and netif_rx_ni(). - -Upstream-Status: Submitted [https://mails.dpdk.org/archives/dev/2022-May/240924.html] - -Signed-off-by: Mingli Yu - ---- - kernel/linux/kni/kni_net.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c -index 29e5b9e21f..e66b35314a 100644 ---- a/kernel/linux/kni/kni_net.c -+++ b/kernel/linux/kni/kni_net.c -@@ -441,7 +441,7 @@ kni_net_rx_normal(struct kni_dev *kni) - skb->ip_summed = CHECKSUM_UNNECESSARY; - - /* Call netif interface */ -- netif_rx_ni(skb); -+ netif_rx(skb); - - /* Update statistics */ - dev->stats.rx_bytes += len; -- cgit v1.2.3-54-g00ecf