Accepting request 1195103 from network

- Update to LTS release version v22.11.5
  * http://doc.dpdk.org/guides-22.11/rel_notes/release_22_11.html
- Drop patches (included upstream):
  * 0001-kni-fix-build-with-Linux-6.3.patch (22.11.3)
  * 0001-kni-fix-build-with-Linux-6.5.patch (22.11.3)

OBS-URL: https://build.opensuse.org/request/show/1195103
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpdk?expand=0&rev=63

0001-kni-fix-build-with-Linux-6.3.patch

@@ -1,55 +0,0 @@
-From: Ferruh Yigit <ferruh.yigit@amd.com>
-Date: Fri, 14 Apr 2023 16:25:22 +0100
-Subject: kni: fix build with Linux 6.3
-Patch-mainline: yes
-Git-commit: 5f34cc454df420b9b2da8deb949fb76cba058b87
-References: kernel 6.3
-
-KNI calls `get_user_pages_remote()` API which is using `FOLL_TOUCH`
-flag, but `FOLL_TOUCH` is no more in public headers since v6.3,
-causing a build error.
-
-`FOLL_*` defines in Linux kernel first moved to another header [1],
-later some of them moved to memory subsystem internal header [2] for 6.3
-
-`get_user_pages_remote()` already sets `FOLL_TOUCH` internally,
-no need to set this flag externally anyway, moving flag from the call
-altogether.
-
-[1]
-Commit b5054174ac7c ("mm: move FOLL_* defs to mm_types.h")
-
-[2]
-Commit 2c2241081f7d ("mm/gup: move private gup FOLL_ flags to internal.h")
-
-Fixes: e73831dc6c26 ("kni: support userspace VA")
-Cc: stable@dpdk.org
-
-Signed-off-by: Ferruh Yigit <ferruh.yigit@amd.com>
-Reviewed-by: David Marchand <david.marchand@redhat.com>
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- kernel/linux/kni/kni_dev.h | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
-index a2c6d9fc..21bfb689 100644
---- a/kernel/linux/kni/kni_dev.h
-+++ b/kernel/linux/kni/kni_dev.h
-@@ -105,11 +105,9 @@ static inline phys_addr_t iova_to_phys(struct task_struct *tsk,
- 
- 	/* 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);
-+	ret = get_user_pages_remote(tsk, tsk->mm, iova, 1, 0, &page, NULL, NULL);
- #else
--	ret = get_user_pages_remote(tsk->mm, iova, 1,
--				    FOLL_TOUCH, &page, NULL, NULL);
-+	ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL, NULL);
- #endif
- 	if (ret < 0)
- 		return 0;
--- 
-2.35.3
-

0001-kni-fix-build-with-Linux-6.5.patch

@@ -1,50 +0,0 @@
-From: Ferruh Yigit <ferruh.yigit@amd.com>
-Date: Tue, 11 Jul 2023 11:09:41 +0100
-Subject: kni: fix build with Linux 6.5
-Git-repo: https://dpdk.org/git/dpdk
-Git-commit: dd33d53b9a032d7376aa04a28a1235338e1fd78f
-Patch-mainline: yes
-References: kernel 6.5
-
-The get_user_pages_remote() API has been modified in Linux kernel v6.5
-[1], "struct vm_area_struct **vmas" parameter removed from the API.
-
-To fix KNI build with Linux kernel v6.5, version check added around the
-get_user_pages_remote() API.
-
-[1]
-ca5e863233e8 ("mm/gup: remove vmas parameter from get_user_pages_remote()")
-
-Cc: stable@dpdk.org
-
-Signed-off-by: Ferruh Yigit <ferruh.yigit@amd.com>
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- kernel/linux/kni/compat.h  |    4 ++++
- kernel/linux/kni/kni_dev.h |    4 ++++
- 2 files changed, 8 insertions(+)
-
---- a/kernel/linux/kni/compat.h
-+++ b/kernel/linux/kni/compat.h
-@@ -153,3 +153,7 @@
- #if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE
- #define HAVE_NETIF_RX_NI
- #endif
-+
-+#if KERNEL_VERSION(6, 5, 0) > LINUX_VERSION_CODE
-+#define HAVE_VMA_IN_GUP
-+#endif
---- a/kernel/linux/kni/kni_dev.h
-+++ b/kernel/linux/kni/kni_dev.h
-@@ -107,7 +107,11 @@ static inline phys_addr_t iova_to_phys(s
- #ifdef HAVE_TSK_IN_GUP
- 	ret = get_user_pages_remote(tsk, tsk->mm, iova, 1, 0, &page, NULL, NULL);
- #else
-+  #ifdef HAVE_VMA_IN_GUP
- 	ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL, NULL);
-+  #else
-+	ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL);
-+  #endif
- #endif
- 	if (ret < 0)
- 		return 0;

dpdk-22.11.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:916805aee46246b81f71f831221231ef3de9c1f70223d179621980ec5d1bdf73
+size 15617920

dpdk.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Aug 17 13:47:42 UTC 2024 - Aeneas Jaißle <aj@ajaissle.de>
+
+- Update to LTS release version v22.11.5
+  * http://doc.dpdk.org/guides-22.11/rel_notes/release_22_11.html
+
+- Drop patches (included upstream):
+  * 0001-kni-fix-build-with-Linux-6.3.patch (22.11.3)
+  * 0001-kni-fix-build-with-Linux-6.5.patch (22.11.3)
+
 -------------------------------------------------------------------
 Wed Jul 24 06:25:38 UTC 2024 - Jiri Slaby <jslaby@suse.cz>
 

dpdk.spec

@@ -46,7 +46,7 @@
 %bcond_without tools
 #
 Name:           dpdk%{name_tag}
-Version:        22.11.1
+Version:        22.11.5
 Release:        0
 Summary:        Set of libraries and drivers for fast packet processing
 License:        BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only
@@ -57,8 +57,6 @@ Source1:        preamble
 # PATCH-FIX-OPENSUSE PATCH-FEATURE-UPSTREAM
 Patch0:         0001-fix-cpu-compatibility.patch
 Patch1:         0002-SLE15-SP3-compatibility-patch-for-kni.patch
-Patch2:         0001-kni-fix-build-with-Linux-6.3.patch
-Patch3:         0001-kni-fix-build-with-Linux-6.5.patch
 Patch4:         kni-fix-build-with-Linux-6.8.patch
 Patch100:       kni-fix-build-with-Linux-6.10.patch
 BuildRequires:  binutils