From 9e1a841eb1cd21c5b790d628a4adf230ba99e972 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 19 Apr 2022 17:04:01 +0100 Subject: [PATCH] net/dpdk: update to 19.11.12 point release PR: 263423 --- net/dpdk/Makefile | 2 +- net/dpdk/distinfo | 6 +-- net/dpdk/files/patch-examples_meson.build | 15 -------- ...patch-kernel_freebsd_contigmem_contigmem.c | 27 ------------- ..._librte__eal_freebsd_eal_include_rte__os.h | 38 +++++-------------- net/dpdk/files/patch-meson.build | 11 ------ net/dpdk/pkg-plist | 2 +- 7 files changed, 14 insertions(+), 87 deletions(-) delete mode 100644 net/dpdk/files/patch-examples_meson.build delete mode 100644 net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c delete mode 100644 net/dpdk/files/patch-meson.build diff --git a/net/dpdk/Makefile b/net/dpdk/Makefile index 29555076a5f14..ee3cacd447e6a 100644 --- a/net/dpdk/Makefile +++ b/net/dpdk/Makefile @@ -1,5 +1,5 @@ PORTNAME= dpdk -DISTVERSION= 19.11.7 +DISTVERSION= 19.11.12 CATEGORIES= net MASTER_SITES= http://fast.dpdk.org/rel/ diff --git a/net/dpdk/distinfo b/net/dpdk/distinfo index 203f3c67e36f3..e90497b863c9e 100644 --- a/net/dpdk/distinfo +++ b/net/dpdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616152895 -SHA256 (dpdk-19.11.7.tar.xz) = 6060d4f87e985c8d03ccdc223e96ecb3e115fd43912113408f3c57c025b02c2d -SIZE (dpdk-19.11.7.tar.xz) = 12454792 +TIMESTAMP = 1650379156 +SHA256 (dpdk-19.11.12.tar.xz) = 17d9b6f8c662de7d29b0f2308d6c218886db364a06971aadaeed8e955ed36f34 +SIZE (dpdk-19.11.12.tar.xz) = 12480488 diff --git a/net/dpdk/files/patch-examples_meson.build b/net/dpdk/files/patch-examples_meson.build deleted file mode 100644 index b56efb70245cd..0000000000000 --- a/net/dpdk/files/patch-examples_meson.build +++ /dev/null @@ -1,15 +0,0 @@ ---- examples/meson.build -+++ examples/meson.build -@@ -48,6 +48,12 @@ all_examples = [ - 'vmdq', 'vmdq_dcb', - ] - -+# on install, skip copying all meson.build files -+ex_file_excludes = ['meson.build'] -+foreach ex:all_examples -+ ex_file_excludes += [ex + '/meson.build'] -+endforeach -+ - if get_option('examples') == '' - subdir_done() - endif diff --git a/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c b/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c deleted file mode 100644 index fd780ff5b67c8..0000000000000 --- a/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c +++ /dev/null @@ -1,27 +0,0 @@ ---- kernel/freebsd/contigmem/contigmem.c.orig 2020-01-03 12:22:51 UTC -+++ kernel/freebsd/contigmem/contigmem.c -@@ -297,19 +297,22 @@ contigmem_cdev_pager_fault(vm_object_t object, vm_ooff - VM_OBJECT_WLOCK(object); - vm_page_updatefake(page, paddr, memattr); - } else { -- vm_page_t mret; - /* - * Replace the passed in reqpage page with our own fake page and - * free up the original page. - */ - page = vm_page_getfake(paddr, memattr); - VM_OBJECT_WLOCK(object); -- mret = vm_page_replace(page, object, (*mres)->pindex); -+#if __FreeBSD__ >= 13 -+ vm_page_replace(page, object, (*mres)->pindex, *mres); -+#else -+ vm_page_t mret = vm_page_replace(page, object, (*mres)->pindex); - KASSERT(mret == *mres, - ("invalid page replacement, old=%p, ret=%p", *mres, mret)); - vm_page_lock(mret); - vm_page_free(mret); - vm_page_unlock(mret); -+#endif - *mres = page; - } - diff --git a/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h b/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h index 6e63d49836aca..ab5c07dcae510 100644 --- a/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h +++ b/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h @@ -1,10 +1,9 @@ ---- lib/librte_eal/freebsd/eal/include/rte_os.h.orig 2021-03-17 16:43:15 UTC +--- lib/librte_eal/freebsd/eal/include/rte_os.h.orig 2021-03-08 17:40:08 UTC +++ lib/librte_eal/freebsd/eal/include/rte_os.h -@@ -14,8 +14,30 @@ +@@ -14,6 +14,28 @@ #include - + typedef cpuset_t rte_cpuset_t; --#define RTE_CPU_AND(dst, src1, src2) do \ + +/* FreeBSD 14 uses GLIBC compatible CPU_AND, CPU_OR, ... */ +#ifdef CPU_ALLOC @@ -12,7 +11,7 @@ +#define RTE_CPU_AND(dst, src1, src2) CPU_AND(dst, src1, src2) +#define RTE_CPU_OR(dst, src1, src2) CPU_OR(dst, src1, src2) +#define RTE_CPU_FILL(set) do \ - { \ ++{ \ + unsigned int i; \ + CPU_ZERO(set); \ + for (i = 0; i < CPU_SETSIZE; i++) \ @@ -27,35 +26,16 @@ + +#else + -+#define RTE_CPU_AND(dst, src1, src2) do \ -+{ \ - cpuset_t tmp; \ - CPU_COPY(src1, &tmp); \ - CPU_AND(&tmp, src2); \ -@@ -29,6 +51,9 @@ typedef cpuset_t rte_cpuset_t; - CPU_COPY(&tmp, dst); \ - } while (0) - #define RTE_CPU_FILL(set) CPU_FILL(set) -+ -+/* In FreeBSD 13 CPU_NAND macro is CPU_ANDNOT */ -+#ifdef CPU_NAND - #define RTE_CPU_NOT(dst, src) do \ + #define RTE_CPU_AND(dst, src1, src2) do \ { \ cpuset_t tmp; \ -@@ -36,5 +61,16 @@ typedef cpuset_t rte_cpuset_t; - CPU_NAND(&tmp, src); \ +@@ -47,6 +69,8 @@ typedef cpuset_t rte_cpuset_t; + CPU_ANDNOT(&tmp, src); \ CPU_COPY(&tmp, dst); \ } while (0) -+#else -+#define RTE_CPU_NOT(dst, src) do \ -+{ \ -+ cpuset_t tmp; \ -+ CPU_FILL(&tmp); \ -+ CPU_ANDNOT(&tmp, src); \ -+ CPU_COPY(&tmp, dst); \ -+} while (0) +-#endif +#endif /* CPU_NAND */ + +#endif /* CPU_ALLOC */ - + #endif /* _RTE_OS_H_ */ diff --git a/net/dpdk/files/patch-meson.build b/net/dpdk/files/patch-meson.build deleted file mode 100644 index 5402e919091b7..0000000000000 --- a/net/dpdk/files/patch-meson.build +++ /dev/null @@ -1,11 +0,0 @@ ---- meson.build -+++ meson.build -@@ -61,7 +61,7 @@ subdir('doc') - subdir('examples') - install_subdir('examples', - install_dir: get_option('datadir') + '/dpdk', -- exclude_files: 'meson.build') -+ exclude_files: ex_file_excludes) - - # build kernel modules if enabled - if get_option('enable_kmods') diff --git a/net/dpdk/pkg-plist b/net/dpdk/pkg-plist index 032497124903d..32dd9aee66c43 100644 --- a/net/dpdk/pkg-plist +++ b/net/dpdk/pkg-plist @@ -236,6 +236,7 @@ include/rte_stack.h include/rte_stack_lf.h include/rte_stack_lf_c11.h include/rte_stack_lf_generic.h +include/rte_stack_lf_stubs.h include/rte_stack_std.h include/rte_string_fns.h include/rte_table.h @@ -1056,5 +1057,4 @@ lib/librte_table.so.20.0 lib/librte_timer.a lib/librte_timer.so lib/librte_timer.so.20.0 -libdata/pkgconfig/libdpdk-libs.pc libdata/pkgconfig/libdpdk.pc