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>

1 files changed, 43 insertions, 0 deletions

diff --git a/cicn-plugin/cicn/cicn_infra_inlines.h b/cicn-plugin/cicn/cicn_infra_inlines.h
new file mode 100644
index 00000000..c9333f53
--- /dev/null
+++ b/cicn-plugin/cicn/cicn_infra_inlines.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2016 by Cisco Systems Inc. All Rights Reserved.
+ *
+ */
+#ifndef _CICN_INFRA_INLINES_H_
+#define _CICN_INFRA_INLINES_H_ 1
+
+#if !CICN_VPP_PLUGIN
+#error "cicn-internal file included externally"
+#endif
+
+#include <vlib/vlib.h>
+
+/*
+ * Wrapper for buffer allocation that returns pointer rather than index
+ */
+static inline vlib_buffer_t *
+cicn_infra_vlib_buffer_alloc (vlib_main_t * vm)
+{
+  vlib_buffer_t *b0;
+  u32 bi0;
+  if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+    {
+      b0 = 0;
+      goto done;
+    }
+  b0 = vlib_get_buffer (vm, bi0);
+
+done:
+  return (b0);
+}
+
+/*
+ * Wrapper for buffer free that uses pointer rather than index
+ */
+static inline void
+cicn_infra_vlib_buffer_free (vlib_buffer_t * b0, vlib_main_t * vm)
+{
+  u32 bi0 = vlib_get_buffer_index (vm, b0);
+  vlib_buffer_free_one (vm, bi0);
+}
+
+#endif // CICN_INFRA_INLINES_H_