Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dpdk for openSUSE:Factory checked in at 2021-04-22 18:04:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dpdk (Old) and /work/SRC/openSUSE:Factory/.dpdk.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dpdk" Thu Apr 22 18:04:42 2021 rev:47 rq:887814 version:19.11.4 Changes: -------- --- /work/SRC/openSUSE:Factory/dpdk/dpdk.changes 2020-09-29 19:05:46.002051611 +0200 +++ /work/SRC/openSUSE:Factory/.dpdk.new.12324/dpdk.changes 2021-04-22 18:06:18.806729318 +0200 @@ -1,0 +2,8 @@ +Wed Apr 21 10:36:13 UTC 2021 - Matthias Gerstner <matthias.gerst...@suse.com> + +- add 0001-kni-fix-build-with-Linux-5.9.patch: fixes the build against kernel + >= 5.9. Also see here: + + http://inbox.dpdk.org/users/cajfav8w8ozekdskdbhehxjdxpchorga1jusnecpmptg30bw...@mail.gmail.com/T + +------------------------------------------------------------------- New: ---- 0001-kni-fix-build-with-Linux-5.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dpdk.spec ++++++ --- /var/tmp/diff_new_pack.0K2Mrh/_old 2021-04-22 18:06:19.358730232 +0200 +++ /var/tmp/diff_new_pack.0K2Mrh/_new 2021-04-22 18:06:19.362730238 +0200 @@ -1,7 +1,7 @@ # # spec file for package dpdk # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -69,6 +69,7 @@ Patch6: 0004-vhost-crypto-fix-incorrect-write-back-source.patch Patch7: 0005-vhost-crypto-fix-data-length-check.patch Patch8: 0006-vhost-crypto-fix-possible-TOCTOU-attack.patch +Patch9: 0001-kni-fix-build-with-Linux-5.9.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: libelf-devel @@ -173,6 +174,7 @@ %patch6 -p1 -z .init %patch7 -p1 -z .init %patch8 -p1 -z .init +%patch9 -p1 -z .init # This fixes CROSS compilation (broken) in the mk file for ThunderX sed -i '/^CROSS /s/^/#/' mk/machine/thunderx/rte.vars.mk ++++++ 0001-kni-fix-build-with-Linux-5.9.patch ++++++ >From 87efaea6376c8ae1a69e471450744a973995726b Mon Sep 17 00:00:00 2001 From: Ferruh Yigit <ferruh.yi...@intel.com> Date: Mon, 17 Aug 2020 11:32:47 +0100 Subject: [PATCH] kni: fix build with Linux 5.9 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: sta...@dpdk.org Signed-off-by: Ferruh Yigit <ferruh.yi...@intel.com> --- kernel/linux/kni/compat.h | 4 ++++ kernel/linux/kni/kni_dev.h | 5 +++++ 2 files changed, 9 insertions(+) Index: dpdk-stable-19.11.4/kernel/linux/kni/compat.h =================================================================== --- dpdk-stable-19.11.4.orig/kernel/linux/kni/compat.h +++ dpdk-stable-19.11.4/kernel/linux/kni/compat.h @@ -138,3 +138,7 @@ (SLE_VERSION_CODE && SLE_VERSION_CODE == SLE_VERSION(15, 3, 0)) #define HAVE_TX_TIMEOUT_TXQUEUE #endif + +#if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE +#define HAVE_TSK_IN_GUP +#endif Index: dpdk-stable-19.11.4/kernel/linux/kni/kni_dev.h =================================================================== --- dpdk-stable-19.11.4.orig/kernel/linux/kni/kni_dev.h +++ dpdk-stable-19.11.4/kernel/linux/kni/kni_dev.h @@ -101,8 +101,13 @@ static inline phys_addr_t iova_to_phys(s 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;
