diff options
author | Jim Gibson <gibson+fdio@cisco.com> | 2017-06-01 15:30:03 -0400 |
---|---|---|
committer | Jim Gibson <gibson+fdio@cisco.com> | 2017-06-02 16:51:22 -0400 |
commit | 716eb01c0b25f7b5bd74e91ec3a1c8d51d402c00 (patch) | |
tree | 919b6c07dd9a4a9bf6c430e382efed18e9162916 /cicn-plugin/cmake/Modules/FindVppDpdk.cmake | |
parent | 2c8098d53b946eec9526dbb5cb4086efb6fa3366 (diff) |
Update cicn-plugin for vpp v17.04 (from v17.01)Vpp-plugin-v17.04
1. Changes for cicn-plugin to build under v17.04:
- update build files to v17.04, including
- no longer need/want plugin to include dpdk headers (though
still link in dpdk plugin)
- vpp include changes
- relocation of vpe.api.h
- relocation of pneum.h
- for modprobe, replace igb_uio with uio_pci_generic
- vnet/ip/udp.h => vnet/udp/udp.h
- update cicn vpp plugin registration per vpp changes
- use new VLIB_PLUGIN_REGISTER() macro
- delete no-loger-supported vlib_plugin_register() function,
moving contents of latter to cicn_init
- remove sm->ethernet_main, which was not used and is no longer part of
plugin boilerplate.
- cicn_api_test_plugin.so (plugin for vpp_api_test)
- update per 17.04 updated requirements:
vat_api_hookup => cicn_vat_api_hookup
- buffering/cloning changes needed for building
- CICN_FEATURE_VPP_VLIB_CLONING hard-coded enabled and removed,
- CICN_FEATURE_DPDK_RTEMBUF_CLONING removed
- Small indentation updates from vpp checkstyle.sh
2. Updates for new vlib_buffer_attach_clone() API now exported by vpp
- remove code to manage rte_mbuf: cicn plugin now longer depends
on dpdk being present.
- remove use of indirect header for cloned cs entry: new scheme
supports having hdr buffer point directly to shared buffer rather
that requiring hdr buffer to poitn to indirect header that
points to cs buffer
- cicn_rte_mbuf_inlines.h replaced by much smaller cicn_infra_inlines.h
- report new characteristic of whether cloning replication is enabled
- "cicn show internal" (dbg cli), "cicn_api_node_params_get"
(vpp_api_test)
- update output accordingly
- cicn_show: other tweaks to output
3. In node.c, in code for dropping possibly multiple buffers
- delete ifdef'd-out code block for dropping using the drop node
[this codepath possibly had buffer problems.]
- retain code that instead drops by freeing buffers directly.
[this codepath has been robust with respect to buffer management]
Change-Id: I6e3d18153f52d8b94773332a39cc452873589baf
Signed-off-by: Jim Gibson <gibson+fdio@cisco.com>
Diffstat (limited to 'cicn-plugin/cmake/Modules/FindVppDpdk.cmake')
-rw-r--r-- | cicn-plugin/cmake/Modules/FindVppDpdk.cmake | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/cicn-plugin/cmake/Modules/FindVppDpdk.cmake b/cicn-plugin/cmake/Modules/FindVppDpdk.cmake deleted file mode 100644 index 5c6bd62a..00000000 --- a/cicn-plugin/cmake/Modules/FindVppDpdk.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -######################################## -# -# Find the VPP libraries and includes -# This module sets: -# VPP_DPDK_FOUND: True if VPP was found -# VPP_DPDK_INCLUDE_DIR: The VPP include dir -# - -set(VPP_DPDK_SEARCH_PATH_LIST - ${VPP_DPDK_ROOT} - $ENV{VPP_DODK_ROOT} - /usr/local - /opt - /usr) - -find_path(VPP_DPDK_INCLUDE_DIR vpp-dpdk/rte_version.h - HINTS ${VPP_DPDK_SEARCH_PATH_LIST} - PATH_SUFFIXES include - DOC "Find the VPP-DPDK includes") - -set(VPP_DPDK_INCLUDE_DIRS ${VPP_DPDK_INCLUDE_DIR} ${VPP_DPDK_INCLUDE_DIR}/vpp-dpdk) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(VppDpdk DEFAULT_MSG VPP_DPDK_INCLUDE_DIR) |