rpm/dpdk
SHA256
1
0
Fork 0
forked from pool/dpdk
Code Pull Requests Activity

Accepting request 1083285 from network

Browse Source 
- raise constraints to 8GB to cover SLE15 builds as well

- add 0001-kni-fix-build-with-Linux-6.3.patch to fix build against
  kernel 6.3.

OBS-URL: https://build.opensuse.org/request/show/1083285
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpdk?expand=0&rev=57
This commit is contained in:
Dominique Leuenberger 2023-05-03 10:56:33 +00:00 committed by Git OBS Bridge
commit c0fc51c1db
4 changed files with 85 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
0001-kni-fix-build-with-Linux-6.3.patch Normal file
View File

@ -0,0 +1,55 @@
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

37
_constraints
View File

@ -1,22 +1,21 @@
<?xml version="1.0"?>
<constraints>
<overwrite>
<conditions>
<arch>i586</arch>
<arch>x86_64</arch>
</conditions>
<hardware>
<cpu>
<flag>mmx</flag>
<flag>sse</flag>
<flag>sse2</flag>
<flag>ssse3</flag>
<flag>sse4_2</flag>
</cpu>
<disk>
<size unit="G">6</size>
</disk>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>i586</arch>
<arch>x86_64</arch>
</conditions>
<hardware>
<cpu>
<flag>mmx</flag>
<flag>sse</flag>
<flag>sse2</flag>
<flag>ssse3</flag>
<flag>sse4_2</flag>
</cpu>
<disk>
<size unit="G">8</size>
</disk>
</hardware>
</overwrite>
</constraints>

11
dpdk.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Apr 27 14:50:31 UTC 2023 - Dirk Müller <dmueller@suse.com>
- raise constraints to 8GB to cover SLE15 builds as well
-------------------------------------------------------------------
Wed Apr 26 05:28:15 UTC 2023 - Jiri Slaby <jslaby@suse.cz>
- add 0001-kni-fix-build-with-Linux-6.3.patch to fix build against
kernel 6.3.
-------------------------------------------------------------------
Wed Apr 5 21:10:54 UTC 2023 - Duraisankar P <Duraisankar.pitchumani@suse.com>

1
dpdk.spec
View File

@ -57,6 +57,7 @@ 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
BuildRequires: binutils
BuildRequires: doxygen
BuildRequires: fdupes