From nobody Thu Apr 21 17:45:52 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DA73011C855D; Thu, 21 Apr 2022 17:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KklM455Cnz4j1y; Thu, 21 Apr 2022 17:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650563152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zy6A64y7s0CTVbD1VsxG0p3FgzMkhG/7iMxWpIrF03k=; b=SFESzghdSm7gZiWmWolgi65jdYRG8V/RlR+wulZKtJWUpeveLWfBz9GngFQLGFO8rY7Jr9 jL63+rY118Ug6xBK5gC+wrjY4rPm5BC6wN2L0yhtgL++Qi9pVsiU7EISozSZaO1wnItK52 RelJ7FKzDqg2rvBSWQEL5CW5DAEjliHgpwDhc5/4/HunvlR4VP/QV/V9G/ujY+3ZtlG0aJ bOOhRbsARmZ+nYHK6zG5BxDRK5akywfZhbwng4JDJMJRJK+dmI3qFpJLVw1RjiGTvglBI+ 8drN2W3/gtHbey7D737m793rXrtwWd9Wov7a6JhAji5GcQ83bceZfs4H4ZerNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 630AE51DC; Thu, 21 Apr 2022 17:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23LHjqK8027664; Thu, 21 Apr 2022 17:45:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LHjqHp027663; Thu, 21 Apr 2022 17:45:52 GMT (envelope-from git) Date: Thu, 21 Apr 2022 17:45:52 GMT Message-Id: <202204211745.23LHjqHp027663@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 9e1a841eb1cd - main - net/dpdk: update to 19.11.12 point release List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e1a841eb1cd21c5b790d628a4adf230ba99e972 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650563152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zy6A64y7s0CTVbD1VsxG0p3FgzMkhG/7iMxWpIrF03k=; b=CKDIKpR2Dzk6B3MKvHXssEKq+BVRxy2k8M6+aHEv9/tZp3kwA5aYg13AplEgRGFLOMsxeL 853qlPp8oMZu0uZohYNiaJggWKPKtor90G/SLpJEYqHvstOdWljQHL92uKnjtWypPs0HEA rObBa/sHhRUFQYMZkQoWFdiWi+zMgYhyGrBn85opZ2vI0OLlmjH+TSsozRilxoWh/B7yeg /rUPC69fqYY27MnaDiczEUFtCj7AShOwhX/YdSQ6T9y8Y67adhcmm0vXCYg640yh3sWaKy Ko0l6xaI2y+KCoW23D3jzX2pEkgPDqcfcrghvgTLRHbgAvA6qRNPa1UFs5HnUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650563152; a=rsa-sha256; cv=none; b=vQRn8ST6ohQUXvW7ZOZ+1atUS6kd0HCH8LQK0XOhp2/12ZgtmNpcghqkUclKwQfmlIFvSo JL/ujNIQsA9ewoRi7imkcekuh2yCrYXGLoV/ISyrfkisvHghpNjgEeqe3fhAWVwgOqggm3 daMipfXbh2+PN+xgx2EY30CrC+cWAjzwzrzGXGA0HVHNf2XQVAlgkagbJekPVCYakiQfLo o6NIjPrpqoQVHzaQV4xE0TCrN7ZChm+gX9MXIWVpq44aX0zMeTQjpavg1k65kn3hE4EGL/ O6SpWxyg5YBCtYER4X1ZmioVG/wR1TwXLy6VgrRwJJC2lcL4yQVv6MQM7P4kmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e1a841eb1cd21c5b790d628a4adf230ba99e972 commit 9e1a841eb1cd21c5b790d628a4adf230ba99e972 Author: Bruce Richardson AuthorDate: 2022-04-19 16:04:01 +0000 Commit: Neel Chauhan CommitDate: 2022-04-21 17:45:29 +0000 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 --------------- ...h-lib_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(-) diff --git a/net/dpdk/Makefile b/net/dpdk/Makefile index 29555076a5f1..ee3cacd447e6 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 203f3c67e36f..e90497b863c9 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 b56efb70245c..000000000000 --- 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 fd780ff5b67c..000000000000 --- 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 6e63d49836ac..ab5c07dcae51 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 5402e919091b..000000000000 --- 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 032497124903..32dd9aee66c4 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