Attachment 209150 Details for Bug 241949 – V2 Patch of diff for update

[patch] V2 Patch of diff for update

update-to-dpdk-18.11.4_v2.patch (text/plain), 15.96 KB, created by Bruce Richardson on 2019-11-14 17:42:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bruce Richardson

Created: 2019-11-14 17:42:20 UTC

Size: 15.96 KB

patch

obsolete

>Index: net/dpdk/Makefile
>===================================================================
>--- net/dpdk/Makefile	(revision 517602)
>+++ net/dpdk/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	dpdk
>-PORTVERSION=	18.05.1
>+PORTVERSION=	18.11.4
> CATEGORIES=	net
> MASTER_SITES=	http://fast.dpdk.org/rel/
> 
>Index: net/dpdk/distinfo
>===================================================================
>--- net/dpdk/distinfo	(revision 517602)
>+++ net/dpdk/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1547152584
>-SHA256 (dpdk-18.05.1.tar.gz) = be0da492290a303b0b09b79b8c9f6976ea7703ecf9f04d50aeead021c82b94b0
>-SIZE (dpdk-18.05.1.tar.gz) = 13919248
>+TIMESTAMP = 1573652267
>+SHA256 (dpdk-18.11.4.tar.gz) = e9272f8d59296b3d71b5c6bbbc592513d185ee1653f831f714901e4de6e6b266
>+SIZE (dpdk-18.11.4.tar.gz) = 14473510
>Index: net/dpdk/files/patch-kernel-freebsd-contigmem-contigmem.c
>===================================================================
>--- net/dpdk/files/patch-kernel-freebsd-contigmem-contigmem.c	(revision 517602)
>+++ net/dpdk/files/patch-kernel-freebsd-contigmem-contigmem.c	(nonexistent)
>@@ -1,15 +0,0 @@
>---- kernel/freebsd/contigmem/contigmem.c.orig	2018-09-05 14:29:02 UTC
>-+++ kernel/freebsd/contigmem/contigmem.c
>-@@ -9,9 +9,12 @@
>- #include <sys/bio.h>
>- #include <sys/bus.h>
>- #include <sys/conf.h>
>-+#include <sys/eventhandler.h>
>- #include <sys/kernel.h>
>-+#include <sys/lock.h>
>- #include <sys/malloc.h>
>- #include <sys/module.h>
>-+#include <sys/mutex.h>
>- #include <sys/proc.h>
>- #include <sys/rwlock.h>
>- #include <sys/systm.h>
>
>Property changes on: net/dpdk/files/patch-kernel-freebsd-contigmem-contigmem.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/dpdk/files/patch-kernel-freebsd-nic_uio-nic_uio.c
>===================================================================
>--- net/dpdk/files/patch-kernel-freebsd-nic_uio-nic_uio.c	(revision 517602)
>+++ net/dpdk/files/patch-kernel-freebsd-nic_uio-nic_uio.c	(nonexistent)
>@@ -1,10 +0,0 @@
>---- kernel/freebsd/nic_uio/nic_uio.c.orig	2018-09-05 14:29:02 UTC
>-+++ kernel/freebsd/nic_uio/nic_uio.c
>-@@ -9,6 +9,7 @@
>- #include <sys/kernel.h> /* types used in module initialization */
>- #include <sys/conf.h> /* cdevsw struct */
>- #include <sys/bus.h> /* structs, prototypes for pci bus stuff and DEVMETHOD */
>-+#include <sys/lock.h> /* used by vm_pager.h => MPASS() */
>- #include <sys/rman.h>
>- #include <sys/systm.h>
>- #include <sys/rwlock.h>
>
>Property changes on: net/dpdk/files/patch-kernel-freebsd-nic_uio-nic_uio.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/dpdk/files/patch-lib_librte__eal_common_include_rte__dev.h
>===================================================================
>--- net/dpdk/files/patch-lib_librte__eal_common_include_rte__dev.h	(nonexistent)
>+++ net/dpdk/files/patch-lib_librte__eal_common_include_rte__dev.h	(working copy)
>@@ -0,0 +1,21 @@
>+--- lib/librte_eal/common/include/rte_dev.h.orig	2019-11-14 17:31:56 UTC
>++++ lib/librte_eal/common/include/rte_dev.h
>+@@ -43,7 +43,9 @@ typedef void (*rte_dev_event_cb_fn)(const char *device
>+ 					enum rte_dev_event_type event,
>+ 					void *cb_arg);
>+ 
>+-__attribute__((format(printf, 2, 0)))
>++#pragma GCC diagnostic push
>++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
>++__attribute__((format(printf, 2, 3)))
>+ static inline void
>+ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...)
>+ {
>+@@ -64,6 +66,7 @@ rte_pmd_debug_trace(const char *func_name, const char 
>+ 			func_name, buffer);
>+ 	}
>+ }
>++#pragma GCC diagnostic pop
>+ 
>+ /*
>+  * Enable RTE_PMD_DEBUG_TRACE() when at least one component relying on the
>
>Property changes on: net/dpdk/files/patch-lib_librte__eal_common_include_rte__dev.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/dpdk/pkg-plist
>===================================================================
>--- net/dpdk/pkg-plist	(revision 517602)
>+++ net/dpdk/pkg-plist	(working copy)
>@@ -1,5 +1,6 @@
> /%%KMODDIR%%/contigmem.ko
> /%%KMODDIR%%/nic_uio.ko
>+%%TOOLS%%bin/dpdk-pmdinfo.py
> include/dpdk
> lib/dpdk
> %%DATADIR%%/examples/Makefile
>@@ -38,6 +39,17 @@
> %%DATADIR%%/examples/exception_path/Makefile
> %%DATADIR%%/examples/exception_path/main.c
> %%DATADIR%%/examples/exception_path/meson.build
>+%%DATADIR%%/examples/fips_validation/Makefile
>+%%DATADIR%%/examples/fips_validation/fips_validation.c
>+%%DATADIR%%/examples/fips_validation/fips_validation.h
>+%%DATADIR%%/examples/fips_validation/fips_validation_aes.c
>+%%DATADIR%%/examples/fips_validation/fips_validation_ccm.c
>+%%DATADIR%%/examples/fips_validation/fips_validation_cmac.c
>+%%DATADIR%%/examples/fips_validation/fips_validation_gcm.c
>+%%DATADIR%%/examples/fips_validation/fips_validation_hmac.c
>+%%DATADIR%%/examples/fips_validation/fips_validation_tdes.c
>+%%DATADIR%%/examples/fips_validation/main.c
>+%%DATADIR%%/examples/fips_validation/meson.build
> %%DATADIR%%/examples/flow_classify/Makefile
> %%DATADIR%%/examples/flow_classify/flow_classify.c
> %%DATADIR%%/examples/flow_classify/ipv4_rules_file.txt
>@@ -60,15 +72,17 @@
> %%DATADIR%%/examples/ip_pipeline/common.h
> %%DATADIR%%/examples/ip_pipeline/conn.c
> %%DATADIR%%/examples/ip_pipeline/conn.h
>+%%DATADIR%%/examples/ip_pipeline/cryptodev.c
>+%%DATADIR%%/examples/ip_pipeline/cryptodev.h
> %%DATADIR%%/examples/ip_pipeline/examples/firewall.cli
> %%DATADIR%%/examples/ip_pipeline/examples/flow.cli
>+%%DATADIR%%/examples/ip_pipeline/examples/flow_crypto.cli
> %%DATADIR%%/examples/ip_pipeline/examples/kni.cli
> %%DATADIR%%/examples/ip_pipeline/examples/l2fwd.cli
> %%DATADIR%%/examples/ip_pipeline/examples/route.cli
> %%DATADIR%%/examples/ip_pipeline/examples/route_ecmp.cli
>+%%DATADIR%%/examples/ip_pipeline/examples/rss.cli
> %%DATADIR%%/examples/ip_pipeline/examples/tap.cli
>-%%DATADIR%%/examples/ip_pipeline/hash_func.h
>-%%DATADIR%%/examples/ip_pipeline/hash_func_arm64.h
> %%DATADIR%%/examples/ip_pipeline/kni.c
> %%DATADIR%%/examples/ip_pipeline/kni.h
> %%DATADIR%%/examples/ip_pipeline/link.c
>@@ -140,7 +154,10 @@
> %%DATADIR%%/examples/l3fwd-acl/meson.build
> %%DATADIR%%/examples/l3fwd-power/Makefile
> %%DATADIR%%/examples/l3fwd-power/main.c
>+%%DATADIR%%/examples/l3fwd-power/main.h
> %%DATADIR%%/examples/l3fwd-power/meson.build
>+%%DATADIR%%/examples/l3fwd-power/perf_core.c
>+%%DATADIR%%/examples/l3fwd-power/perf_core.h
> %%DATADIR%%/examples/l3fwd-vf/Makefile
> %%DATADIR%%/examples/l3fwd-vf/main.c
> %%DATADIR%%/examples/l3fwd-vf/meson.build
>@@ -185,10 +202,10 @@
> %%DATADIR%%/examples/multi_process/client_server_mp/mp_server/init.h
> %%DATADIR%%/examples/multi_process/client_server_mp/mp_server/main.c
> %%DATADIR%%/examples/multi_process/client_server_mp/shared/common.h
>-%%DATADIR%%/examples/multi_process/l2fwd_fork/Makefile
>-%%DATADIR%%/examples/multi_process/l2fwd_fork/flib.c
>-%%DATADIR%%/examples/multi_process/l2fwd_fork/flib.h
>-%%DATADIR%%/examples/multi_process/l2fwd_fork/main.c
>+%%DATADIR%%/examples/multi_process/hotplug_mp/Makefile
>+%%DATADIR%%/examples/multi_process/hotplug_mp/commands.c
>+%%DATADIR%%/examples/multi_process/hotplug_mp/commands.h
>+%%DATADIR%%/examples/multi_process/hotplug_mp/main.c
> %%DATADIR%%/examples/multi_process/meson.build
> %%DATADIR%%/examples/multi_process/simple_mp/Makefile
> %%DATADIR%%/examples/multi_process/simple_mp/main.c
>@@ -310,6 +327,9 @@
> %%DATADIR%%/examples/timer/Makefile
> %%DATADIR%%/examples/timer/main.c
> %%DATADIR%%/examples/timer/meson.build
>+%%DATADIR%%/examples/vdpa/Makefile
>+%%DATADIR%%/examples/vdpa/main.c
>+%%DATADIR%%/examples/vdpa/meson.build
> %%DATADIR%%/examples/vhost/Makefile
> %%DATADIR%%/examples/vhost/main.c
> %%DATADIR%%/examples/vhost/main.h
>@@ -331,10 +351,18 @@
> %%DATADIR%%/examples/vm_power_manager/channel_monitor.h
> %%DATADIR%%/examples/vm_power_manager/guest_cli/Makefile
> %%DATADIR%%/examples/vm_power_manager/guest_cli/main.c
>+%%DATADIR%%/examples/vm_power_manager/guest_cli/meson.build
>+%%DATADIR%%/examples/vm_power_manager/guest_cli/parse.c
>+%%DATADIR%%/examples/vm_power_manager/guest_cli/parse.h
> %%DATADIR%%/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
> %%DATADIR%%/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h
> %%DATADIR%%/examples/vm_power_manager/main.c
> %%DATADIR%%/examples/vm_power_manager/meson.build
>+%%DATADIR%%/examples/vm_power_manager/oob_monitor.h
>+%%DATADIR%%/examples/vm_power_manager/oob_monitor_nop.c
>+%%DATADIR%%/examples/vm_power_manager/oob_monitor_x86.c
>+%%DATADIR%%/examples/vm_power_manager/parse.c
>+%%DATADIR%%/examples/vm_power_manager/parse.h
> %%DATADIR%%/examples/vm_power_manager/power_manager.c
> %%DATADIR%%/examples/vm_power_manager/power_manager.h
> %%DATADIR%%/examples/vm_power_manager/vm_power_cli.c
>@@ -464,6 +492,7 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_byteorder_32.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_byteorder_64.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cfgfile.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_class.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_common.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_comp.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_compat.h
>@@ -473,6 +502,7 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_config.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cpuflags.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_crypto.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_crypto_asym.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_crypto_sym.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cryptodev.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cryptodev_pmd.h
>@@ -494,7 +524,6 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_eth_bond_8023ad.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_eth_ctrl.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_eth_ring.h
>-%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_eth_softnic.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ethdev.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ethdev_core.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ethdev_driver.h
>@@ -503,6 +532,7 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ether.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_event_crypto_adapter.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_event_eth_rx_adapter.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_event_eth_tx_adapter.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_event_ring.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_event_timer_adapter.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_event_timer_adapter_pmd.h
>@@ -552,10 +582,12 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_memzone.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_meter.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_metrics.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_mpls.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_mtr.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_mtr_driver.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_net.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_net_crc.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_option.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_pause.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_pci.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_pci_dev_feature_defs.h
>@@ -575,6 +607,7 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_port_ring.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_port_sched.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_port_source_sink.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_port_sym_crypto.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_prefetch.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_random.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_rawdev.h
>@@ -602,6 +635,8 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_array.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_hash.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_hash_cuckoo.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_hash_func.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_hash_func_arm64.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_lpm.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_lpm_ipv6.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_stub.h
>@@ -614,6 +649,7 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_tm.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_tm_driver.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_udp.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_uuid.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_vect.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_version.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_vfio.h
>@@ -627,6 +663,7 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_bus_vdev.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_cfgfile.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_cmdline.a
>+%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_common_cpt.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_common_octeontx.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_compressdev.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_cryptodev.a
>@@ -658,6 +695,7 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pdump.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pipeline.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_ark.a
>+%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_atlantic.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_avf.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_axgbe.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_bbdev_null.a
>@@ -665,6 +703,7 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_bond.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_crypto_scheduler.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_cxgbe.a
>+%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_dsw_event.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_e1000.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_ena.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_enic.a
>@@ -677,14 +716,16 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_null.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_null_crypto.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_octeontx.a
>+%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_octeontx_crypto.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_octeontx_ssovf.a
>+%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_octeontx_zip.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_opdl_event.a
>+%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_qat.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_qede.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_ring.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_sfc_efx.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_skeleton_event.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_skeleton_rawdev.a
>-%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_softnic.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_sw_event.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_thunderx_nicvf.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_virtio.a
>@@ -698,5 +739,4 @@
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_security.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_table.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_timer.a
>-%%TOOLS%%bin/dpdk-pmdinfo.py
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%

Actions: View | Diff

Attachments on bug 241949: 209133 | 209150 | 209227