diff --git a/CHANGELOG.md b/CHANGELOG.md index b2e420adc..9441ca721 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,8 +79,7 @@ The software accel engine implemenation has added support for compare. ### dpdk -Updated DPDK submodule to DPDK 19.11.2, which includes fixes for DPDK vulnerabilities: -CVE-2020-10722, CVE-2020-10723, CVE-2020-10724, CVE-2020-10725, CVE-2020-10724. +Updated DPDK submodule to DPDK 20.05. ### idxd diff --git a/dpdk b/dpdk index ac4876aba..a38450c5a 160000 --- a/dpdk +++ b/dpdk @@ -1 +1 @@ -Subproject commit ac4876ababd46dd926f733823dcf32c7b0bd8934 +Subproject commit a38450c5ae4a20f6966872b1a4f5d797c65951d7 diff --git a/test/external_code/hello_world/Makefile b/test/external_code/hello_world/Makefile index 9cdbd4664..263992e2d 100644 --- a/test/external_code/hello_world/Makefile +++ b/test/external_code/hello_world/Makefile @@ -54,7 +54,7 @@ alone_static: $(CC) $(COMMON_CFLAGS) -o hello_bdev ./hello_bdev.c -Wl,--whole-archive -lspdk_bdev_malloc -lspdk_event_bdev -lspdk_event_accel -lspdk_event_vmd \ -lspdk_event_sock -lspdk_bdev -lspdk_accel -lspdk_event -lspdk_thread -lspdk_util -lspdk_conf -lspdk_trace -lspdk_log -lspdk_json \ -lspdk_jsonrpc -lspdk_rpc -lspdk_sock -lspdk_notify -lspdk_vmd -lspdk_env_dpdk -lrte_eal -lrte_mempool -lrte_ring \ - -lrte_mbuf -lrte_mempool_ring -lrte_pci -lrte_bus_pci -lrte_kvargs -lrte_vhost -lrte_net -lrte_hash \ + -lrte_mbuf -lrte_mempool_ring -lrte_pci -lrte_bus_pci -lrte_kvargs -lrte_vhost -lrte_net -lrte_hash -lrte_telemetry \ -lrte_cryptodev -Wl,--no-whole-archive -lnuma -luuid -lpthread -ldl -lrt # Shows how to compile and external bdev and application sgainst the SPDK archives. @@ -62,5 +62,5 @@ bdev_static: $(CC) $(COMMON_CFLAGS) -L../passthru -o hello_bdev ./hello_bdev.c -Wl,--whole-archive -lpassthru_external -lspdk_bdev_malloc -lspdk_event_bdev \ -lspdk_event_accel -lspdk_event_vmd -lspdk_event_sock -lspdk_bdev -lspdk_accel -lspdk_event -lspdk_thread -lspdk_util -lspdk_conf -lspdk_trace \ -lspdk_log -lspdk_json -lspdk_jsonrpc -lspdk_rpc -lspdk_sock -lspdk_notify -lspdk_vmd -lspdk_env_dpdk -lrte_eal -lrte_mempool \ - -lrte_ring -lrte_mbuf -lrte_mempool_ring -lrte_pci -lrte_bus_pci -lrte_kvargs -lrte_vhost -lrte_net -lrte_hash -lrte_cryptodev \ + -lrte_ring -lrte_mbuf -lrte_mempool_ring -lrte_pci -lrte_bus_pci -lrte_kvargs -lrte_vhost -lrte_net -lrte_hash -lrte_telemetry -lrte_cryptodev \ -Wl,--no-whole-archive -lnuma -luuid -lpthread -ldl -lrt